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

修改判断frp状态可能错误的bug

Browse Source
This commit is contained in:
caohaidi 2018-12-27 13:32:20 +08:00
parent 531d708f7b
commit 594ae40261
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/service.go
View File

@ -57,7 +57,7 @@ func NewService(pxyCfgs map[string]config.ProxyConf, visitorCfgs map[string]conf
visitorCfgs: visitorCfgs, visitorCfgs: visitorCfgs,
exit: 0, exit: 0,
closedCh: make(chan bool), closedCh: make(chan bool),
closed: false, closed: true,
} }
return return
} }
@ -103,6 +103,7 @@ func (svr *Service) Run(cmd bool) error {
log.Info("admin server listen on %s:%d", g.GlbClientCfg.AdminAddr, g.GlbClientCfg.AdminPort) log.Info("admin server listen on %s:%d", g.GlbClientCfg.AdminAddr, g.GlbClientCfg.AdminPort)
} }
svr.closed = false
if cmd { if cmd {
svr.closed = <-svr.closedCh svr.closed = <-svr.closedCh
log.Info("svr closed") log.Info("svr closed")

2
server/service.go
View File

@ -98,6 +98,7 @@ func NewService() (svr *Service, err error) {
visitorManager: NewVisitorManager(), visitorManager: NewVisitorManager(),
tcpPortManager: ports.NewPortManager("tcp", cfg.ProxyBindAddr, cfg.AllowPorts), tcpPortManager: ports.NewPortManager("tcp", cfg.ProxyBindAddr, cfg.AllowPorts),
udpPortManager: ports.NewPortManager("udp", cfg.ProxyBindAddr, cfg.AllowPorts), udpPortManager: ports.NewPortManager("udp", cfg.ProxyBindAddr, cfg.AllowPorts),
Closed: true,
closedCh: make(chan bool), closedCh: make(chan bool),
} }
svr.tcpGroupCtl = group.NewTcpGroupCtl(svr.tcpPortManager) svr.tcpGroupCtl = group.NewTcpGroupCtl(svr.tcpPortManager)
@ -236,6 +237,7 @@ func (svr *Service) Run() {
go svr.HandleListener(svr.websocketListener) go svr.HandleListener(svr.websocketListener)
svr.Closed = false
svr.HandleListener(svr.listener) svr.HandleListener(svr.listener)
} }