客户端配置，端口白名单等

lib/common/const.go

@@ -1,19 +1,25 @@
 package common
 
 const (
+	CONN_DATA_SEQ        = "*#*"
 	COMPRESS_NONE_ENCODE = iota
 	COMPRESS_NONE_DECODE
 	COMPRESS_SNAPY_ENCODE
 	COMPRESS_SNAPY_DECODE
-	VERIFY_EER        = "vkey"
-	WORK_MAIN         = "main"
-	WORK_CHAN         = "chan"
-	RES_SIGN          = "sign"
-	RES_MSG           = "msg0"
-	RES_CLOSE         = "clse"
-	NEW_CONN          = "conn" //新连接标志
-	NEW_TASK          = "task" //新连接标志
-	CONN_SUCCESS      = "sucs"
+	VERIFY_EER     = "vkey"
+	VERIFY_SUCCESS = "sucs"
+	WORK_MAIN      = "main"
+	WORK_CHAN      = "chan"
+	WORK_CONFIG    = "conf"
+	WORK_STATUS    = "stus"
+	RES_SIGN       = "sign"
+	RES_MSG        = "msg0"
+	RES_CLOSE      = "clse"
+	NEW_CONN       = "conn" //新连接标志
+	NEW_TASK       = "task" //新连接标志
+	NEW_CONF       = "conf" //新连接标志
+	NEW_HOST       = "host" //新连接标志
+
 	CONN_TCP          = "tcp"
 	CONN_UDP          = "udp"
 	UnauthorizedBytes = `HTTP/1.1 401 Unauthorized

lib/common/run.go

@@ -56,7 +56,7 @@ func GetLogPath() string {
 }
 
 //interface pid file path
-func GetPidPath() string {
+func GetTmpPath() string {
 	var path string
 	if IsWindows() {
 		path = "./"

lib/common/util.go

@@ -144,7 +144,11 @@ func FileExists(name string) bool {
 //Judge whether the TCP port can open normally
 func TestTcpPort(port int) bool {
 	l, err := net.ListenTCP("tcp", &net.TCPAddr{net.ParseIP("0.0.0.0"), port, ""})
-	defer l.Close()
+	defer func() {
+		if l != nil {
+			l.Close()
+		}
+	}()
 	if err != nil {
 		return false
 	}
@@ -154,7 +158,11 @@ func TestTcpPort(port int) bool {
 //Judge whether the UDP port can open normally
 func TestUdpPort(port int) bool {
 	l, err := net.ListenUDP("udp", &net.UDPAddr{net.ParseIP("0.0.0.0"), port, ""})
-	defer l.Close()
+	defer func() {
+		if l != nil {
+			l.Close()
+		}
+	}()
 	if err != nil {
 		return false
 	}
@@ -168,9 +176,28 @@ func BinaryWrite(raw *bytes.Buffer, v ...string) {
 	buffer := new(bytes.Buffer)
 	var l int32
 	for _, v := range v {
-		l += int32(len([]byte(v))) + int32(len([]byte("#")))
+		l += int32(len([]byte(v))) + int32(len([]byte(CONN_DATA_SEQ)))
 		binary.Write(buffer, binary.LittleEndian, []byte(v))
-		binary.Write(buffer, binary.LittleEndian, []byte("#"))
+		binary.Write(buffer, binary.LittleEndian, []byte(CONN_DATA_SEQ))
 	}
+	binary.Write(raw, binary.LittleEndian, l)
 	binary.Write(raw, binary.LittleEndian, buffer.Bytes())
 }
+
+func InArr(arr []string, val string) bool {
+	for _, v := range arr {
+		if v == val {
+			return true
+		}
+	}
+	return false
+}
+
+func InIntArr(arr []int, val int) bool {
+	for _, v := range arr {
+		if v == val {
+			return true
+		}
+	}
+	return false
+}