-
-
Notifications
You must be signed in to change notification settings - Fork 142
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
15 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| --- pkg/mod/github.com/fatedier/[email protected]/client/service.go 2022-03-24 15:06:41.000000000 +0800 | ||
| +++ patches/service.go 2022-03-24 15:10:43.000000000 +0800 | ||
| @@ -36,12 +36,13 @@ | ||
| "github.com/fatedier/frp/pkg/util/util" | ||
| --- pkg/mod/github.com/fatedier/[email protected]/client/service.go 2022-04-22 14:59:20.000000000 +0800 | ||
| +++ patches/service.go 2022-04-22 15:10:29.000000000 +0800 | ||
| @@ -39,12 +39,13 @@ | ||
| "github.com/fatedier/frp/pkg/util/version" | ||
| "github.com/fatedier/frp/pkg/util/xlog" | ||
| "github.com/fatedier/golib/crypto" | ||
| libdial "github.com/fatedier/golib/net/dial" | ||
|
|
||
| fmux "github.com/hashicorp/yamux" | ||
| + frpmgr "github.com/koho/frpmgr/pkg/util" | ||
| ) | ||
|
|
||
| // Service is a client service. | ||
| type Service struct { | ||
| // uniq id got from frps, attach it in loginMsg | ||
| runID string | ||
| @@ -248,14 +249,20 @@ | ||
| func init() { | ||
| crypto.DefaultSalt = "frp" | ||
| rand.Seed(time.Now().UnixNano()) | ||
| } | ||
| @@ -271,14 +272,20 @@ | ||
| libdial.WithProxyAuth(auth), | ||
| libdial.WithTLSConfig(tlsConfig), | ||
| libdial.WithAfterHook(libdial.AfterHook{ | ||
| Hook: frpNet.DialHookCustomTLSHeadByte(tlsConfig != nil, svr.cfg.DisableCustomTLSFirstByte), | ||
| }), | ||
| ) | ||
| + var serverAddr = svr.cfg.ServerAddr | ||
| + if svr.cfg.DNSServer != "" && runtime.GOOS == "windows" { | ||
| + if svr.cfg.DNSServer != "" { | ||
| + if serverAddr, err = frpmgr.LookupIP(svr.cfg.ServerAddr, svr.cfg.DNSServer); err != nil { | ||
| + return nil, nil, err | ||
| + } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters