Allow remote host to be set in the client config file

cbeuw · Apr 3, 2020 · 2327420 · 2327420
1 parent d482661
commit 2327420
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmd/ck-client/ck-client.go b/cmd/ck-client/ck-client.go
@@ -277,7 +277,6 @@ func main() {
 	sta := &client.State{
 		LocalHost:  localHost,
 		LocalPort:  localPort,
-		RemoteHost: remoteHost,
 		RemotePort: remotePort,
 		Now:        time.Now,
 	}
@@ -291,6 +290,10 @@ func main() {
 		sta.ProxyMethod = proxyMethod
 	}
 
+	if remoteHost != "" {
+		sta.RemoteHost = remoteHost
+	}
+
 	if os.Getenv("SS_LOCAL_HOST") != "" {
 		sta.ProxyMethod = "shadowsocks"
 	}

diff --git a/internal/client/state.go b/internal/client/state.go
@@ -24,6 +24,7 @@ type rawConfig struct {
 	Transport        string
 	NumConn          int
 	StreamTimeout    int
+	RemoteHost       string
 	RemotePort       int
 }
 
@@ -128,6 +129,7 @@ func (sta *State) ParseConfig(conf string) (err error) {
 		sta.Transport = DirectTLS{}
 	}
 
+	sta.RemoteHost = preParse.RemoteHost
 	sta.ProxyMethod = preParse.ProxyMethod
 	sta.ServerName = preParse.ServerName
 	sta.NumConn = preParse.NumConn