From 183302d27cd545c806dab1d97bbdfe0d06abffd6 Mon Sep 17 00:00:00 2001 From: haidy Date: Thu, 17 May 2018 16:30:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81=E5=AF=BC=E8=87=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/control.go | 1 + cmd/frpc/sub/root.go | 2 ++ 2 files changed, 3 insertions(+) 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) }