From 594ae402618abc5bdd1e2aa6a81c7433721254a6 Mon Sep 17 00:00:00 2001
From: caohaidi <caohaidi@360.net>
Date: Thu, 27 Dec 2018 13:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=ADfrp?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=AF=E8=83=BD=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/service.go | 3 ++-
 server/service.go | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/service.go b/client/service.go
index 8cdc2fa7..98e39957 100644
--- a/client/service.go
+++ b/client/service.go
@@ -57,7 +57,7 @@ func NewService(pxyCfgs map[string]config.ProxyConf, visitorCfgs map[string]conf
 		visitorCfgs: visitorCfgs,
 		exit:        0,
 		closedCh:    make(chan bool),
-		closed:      false,
+		closed:      true,
 	}
 	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)
 	}
 
+	svr.closed = false
 	if cmd {
 		svr.closed = <-svr.closedCh
 		log.Info("svr closed")
diff --git a/server/service.go b/server/service.go
index 90c247dd..f8c2501a 100644
--- a/server/service.go
+++ b/server/service.go
@@ -98,6 +98,7 @@ func NewService() (svr *Service, err error) {
 		visitorManager: NewVisitorManager(),
 		tcpPortManager: ports.NewPortManager("tcp", cfg.ProxyBindAddr, cfg.AllowPorts),
 		udpPortManager: ports.NewPortManager("udp", cfg.ProxyBindAddr, cfg.AllowPorts),
+		Closed:         true,
 		closedCh:       make(chan bool),
 	}
 	svr.tcpGroupCtl = group.NewTcpGroupCtl(svr.tcpPortManager)
@@ -236,6 +237,7 @@ func (svr *Service) Run() {
 
 	go svr.HandleListener(svr.websocketListener)
 
+	svr.Closed = false
 	svr.HandleListener(svr.listener)
 }