cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改合并最新代码导致的bug

Browse Source
This commit is contained in:
haidy 2018-05-17 16:30:26 +08:00
parent c897e3e58d
commit 183302d27c
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/control.go
View File

@ -176,6 +176,7 @@ func (ctl *Control) Close() error {
ctl.exit = true ctl.exit = true
if ctl.conn != nil { if ctl.conn != nil {
ctl.conn.Close() ctl.conn.Close()
log.Info("conn closed")
} }
ctl.pm.CloseProxies() ctl.pm.CloseProxies()
return nil return nil

2
cmd/frpc/sub/root.go
View File

@ -34,6 +34,7 @@ import (
"github.com/fatedier/frp/models/config" "github.com/fatedier/frp/models/config"
"github.com/fatedier/frp/utils/log" "github.com/fatedier/frp/utils/log"
"github.com/fatedier/frp/utils/version" "github.com/fatedier/frp/utils/version"
"github.com/fatedier/golib/crypto"
) )
const ( const (
@ -109,6 +110,7 @@ func Execute() {
func RunFrpc(cfgFilePath string) (err error) { func RunFrpc(cfgFilePath string) (err error) {
cmd = false cmd = false
crypto.DefaultSalt = "frp"
return runClient(cfgFilePath) return runClient(cfgFilePath)
} }