diff --git a/client/control.go b/client/control.go index 710c577c..8d090df9 100644 --- a/client/control.go +++ b/client/control.go @@ -176,6 +176,7 @@ func (ctl *Control) Close() error { ctl.exit = true if ctl.conn != nil { ctl.conn.Close() + log.Info("conn closed") } ctl.pm.CloseProxies() return nil diff --git a/cmd/frpc/sub/root.go b/cmd/frpc/sub/root.go index 0c3e8dc5..8ffc1cb1 100644 --- a/cmd/frpc/sub/root.go +++ b/cmd/frpc/sub/root.go @@ -34,6 +34,7 @@ import ( "github.com/fatedier/frp/models/config" "github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/utils/version" + "github.com/fatedier/golib/crypto" ) const ( @@ -109,6 +110,7 @@ func Execute() { func RunFrpc(cfgFilePath string) (err error) { cmd = false + crypto.DefaultSalt = "frp" return runClient(cfgFilePath) }