Code optimization

client/client.go

@@ -49,12 +49,6 @@ retry:
 	s.processor(c)
 }
 
-func (s *TRPClient) Close() {
-	s.tunnel.Close()
-	s.signal.Close()
-	s.ticker.Stop()
-}
-
 //处理
 func (s *TRPClient) processor(c *conn.Conn) {
 	s.signal = c
@@ -232,3 +226,9 @@ loop:
 		}
 	}
 }
+
+func (s *TRPClient) Close() {
+	s.tunnel.Close()
+	s.signal.Close()
+	s.ticker.Stop()
+}

client/control.go

@@ -31,11 +31,9 @@ func GetTaskStatus(path string) {
 	if err != nil {
 		log.Fatalln(err)
 	}
-
 	if _, err := c.Write([]byte(common.WORK_STATUS)); err != nil {
 		log.Fatalln(err)
 	}
-
 	//read now vKey and write to server
 	if f, err := common.ReadAllFromFile(filepath.Join(common.GetTmpPath(), "npc_vkey.txt")); err != nil {
 		log.Fatalln(err)

client/local.go

@@ -11,7 +11,6 @@ import (
 	"github.com/cnlh/nps/vender/github.com/xtaci/kcp"
 	"net"
 	"net/http"
-	"strings"
 )
 
 var LocalServer []*net.TCPListener
@@ -51,21 +50,13 @@ func StartLocalServer(l *config.LocalServer, config *config.CommonConfig) error
 	}
 	LocalServer = append(LocalServer, listener)
 	logs.Info("successful start-up of local monitoring, port", l.Port)
-	for {
-		c, err := listener.AcceptTCP()
-		if err != nil {
-			if strings.Contains(err.Error(), "use of closed network connection") {
-				break
-			}
-			logs.Info(err)
-			continue
-		}
+	conn.Accept(listener, func(c net.Conn) {
 		if l.Type == "secret" {
-			go processSecret(c, config, l)
+			processSecret(c, config, l)
 		} else {
-			go processP2P(c, config, l)
+			processP2P(c, config, l)
 		}
-	}
+	})
 	return nil
 }