diff --git a/client/control.go b/client/control.go index c36e5c08..f9af8958 100644 --- a/client/control.go +++ b/client/control.go @@ -246,8 +246,8 @@ func (ctl *Control) connectServer() (conn net.Conn, err error) { protocol = "tcp" dialOptions = append(dialOptions, libdial.WithAfterHook(libdial.AfterHook{Hook: frpNet.DialHookWebsocket()})) } - if ctl.clientCfg.ConnectLocalIP != "" { - dialOptions = append(dialOptions, libdial.WithLocalAddr(ctl.clientCfg.ConnectLocalIP)) + if ctl.clientCfg.ConnectServerLocalIP != "" { + dialOptions = append(dialOptions, libdial.WithLocalAddr(ctl.clientCfg.ConnectServerLocalIP)) } dialOptions = append(dialOptions, libdial.WithProtocol(protocol), diff --git a/client/service.go b/client/service.go index 6a5bee2f..815145b7 100644 --- a/client/service.go +++ b/client/service.go @@ -240,8 +240,8 @@ func (svr *Service) login() (conn net.Conn, session *fmux.Session, err error) { protocol = "tcp" dialOptions = append(dialOptions, libdial.WithAfterHook(libdial.AfterHook{Hook: frpNet.DialHookWebsocket()})) } - if svr.cfg.ConnectLocalIP != "" { - dialOptions = append(dialOptions, libdial.WithLocalAddr(svr.cfg.ConnectLocalIP)) + if svr.cfg.ConnectServerLocalIP != "" { + dialOptions = append(dialOptions, libdial.WithLocalAddr(svr.cfg.ConnectServerLocalIP)) } dialOptions = append(dialOptions, libdial.WithProtocol(protocol), diff --git a/conf/frpc_full.ini b/conf/frpc_full.ini index fc262701..7be2608d 100644 --- a/conf/frpc_full.ini +++ b/conf/frpc_full.ini @@ -78,7 +78,7 @@ protocol = tcp # set client binding ip when connect server, default is empty. # only when protocol = tcp or websocket, the value will be used. -connect_local_ip = 0.0.0.0 +connect_server_local_ip = 0.0.0.0 # if tls_enable is true, frpc will connect frps by tls tls_enable = true diff --git a/pkg/config/client.go b/pkg/config/client.go index 2d4a2d73..cfc262e9 100644 --- a/pkg/config/client.go +++ b/pkg/config/client.go @@ -38,10 +38,10 @@ type ClientCommonConf struct { // ServerPort specifies the port to connect to the server on. By default, // this value is 7000. ServerPort int `ini:"server_port" json:"server_port"` - // ConnectLocalIP specifies the address of the client bind when it connect to server. + // ConnectServerLocalIP specifies the address of the client bind when it connect to server. // By default, this value is empty. // this value only use in TCP/Websocket protocol. Not support in KCP protocol. - ConnectLocalIP string `ini:"connect_local_ip" json:"connect_local_ip"` + ConnectServerLocalIP string `ini:"connect_server_local_ip" json:"connect_server_local_ip"` // HTTPProxy specifies a proxy address to connect to the server through. If // this value is "", the server will be connected to directly. By default, // this value is read from the "http_proxy" environment variable.