From ad47104fc72c8a7f1f0cd03f05fe6fb1cdcc6241 Mon Sep 17 00:00:00 2001 From: "arraykeys@gmail.com" Date: Tue, 13 Mar 2018 10:04:18 +0800 Subject: [PATCH] v4.5 --- services/mux_bridge.go | 3 +++ services/mux_client.go | 2 +- services/mux_server.go | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/services/mux_bridge.go b/services/mux_bridge.go index 6b46ac3..6c33246 100644 --- a/services/mux_bridge.go +++ b/services/mux_bridge.go @@ -138,6 +138,9 @@ func (s *MuxBridge) handler(inConn net.Conn) { if sess, ok := group.Get(index); ok && sess.(*smux.Session).IsClosed() { group.Remove(index) } + if group.IsEmpty() { + s.clientControlConns.Remove(groupKey) + } break } time.Sleep(time.Second * 5) diff --git a/services/mux_client.go b/services/mux_client.go index 56b6bbf..42cd43d 100644 --- a/services/mux_client.go +++ b/services/mux_client.go @@ -47,7 +47,7 @@ func (s *MuxClient) Start(args interface{}) (err error) { s.cfg = args.(MuxClientArgs) s.CheckArgs() s.InitService() - log.Printf("%s client on %s", *s.cfg.ParentType, *s.cfg.Parent) + log.Printf("client started") count := 1 if *s.cfg.SessionCount > 0 { count = *s.cfg.SessionCount diff --git a/services/mux_server.go b/services/mux_server.go index 69e47b1..413b216 100644 --- a/services/mux_server.go +++ b/services/mux_server.go @@ -205,7 +205,7 @@ func (s *MuxServer) Start(args interface{}) (err error) { if err != nil { return } - log.Printf("%s server on %s", *s.cfg.ParentType, (*s.sc.Listener).Addr()) + log.Printf("server on %s", (*s.sc.Listener).Addr()) } return }