ipv6调试

Author: matteriot

netservice/handle/handle.go

@@ -16,10 +16,13 @@ import (
 
 func HandleStream(stream net.Conn, tokenStr string) {
 	var err error
-	tokenModel, err := models.DecodeUnverifiedToken(tokenStr)
-	if err != nil {
-		log.Println(err.Error())
-		return
+	var tokenModel *models.TokenClaims
+	if tokenStr != "" {
+		tokenModel, err = models.DecodeUnverifiedToken(tokenStr)
+		if err != nil {
+			log.Println(err.Error())
+			//return
+		}
 	}
 	rawMsg, err := msg.ReadMsg(stream)
 	if err != nil {
@@ -105,6 +108,10 @@ func HandleStream(stream net.Conn, tokenStr string) {
 		}
 	case *models.NewSubSession:
 		{
+			if tokenStr == "" {
+				stream.Close()
+				return
+			}
 			//:TODO 新创建一个全新的子连接
 			log.Printf("newSubSession")
 			//snappyConn, err := modelsSnappy.Convert(stream, []byte("BUDIS**$(&CHSKCNNCJSH"))
@@ -125,6 +132,10 @@ func HandleStream(stream net.Conn, tokenStr string) {
 
 	case *models.RequestNewWorkConn:
 		{
+			if tokenStr == "" {
+				stream.Close()
+				return
+			}
 			log.Println("server请求一个新的工作连接")
 			stream.Close()
 			go newWorkConn(tokenStr)
@@ -144,6 +155,10 @@ func HandleStream(stream net.Conn, tokenStr string) {
 	case *models.ReqNewP2PCtrlAsServer:
 		{
 			log.Printf("作为listener方式从洞中获取kcp连接")
+			if tokenModel == nil {
+				stream.Close()
+				return
+			}
 			go func() {
 				session, listener, err := gateway.MakeP2PSessionAsServer(stream, m, tokenModel)
 				if err != nil {
@@ -163,6 +178,10 @@ func HandleStream(stream net.Conn, tokenStr string) {
 	case *models.ReqNewP2PCtrlAsClient:
 		{
 			log.Printf("作为dial方式从从洞中创建kcp连接")
+			if tokenModel == nil {
+				stream.Close()
+				return
+			}
 			go func() {
 				session, listener, err := gateway.MakeP2PSessionAsClient(stream, m, tokenModel)
 				if err != nil {

tasks/ipv6ClientServer.go

@@ -21,24 +21,25 @@ func RunTasks() {
 func ipv6ClientTask() {
 	//	主动连接访问者的APP
 	for remoteIpv6Server := range chans.ClientTaskChan {
+		log.Println("====获取到任务")
 		ip := remoteIpv6Server.Ipv6AddrIp
 		port := remoteIpv6Server.Ipv6AddrPort
-		runId := remoteIpv6Server.RunId
+		//runId := remoteIpv6Server.RunId
 		//	使用配置创建连接，并且发送带RunId的凭证给访问者
 		ipv6conn, err := net.DialTCP("tcp", nil, &net.TCPAddr{
 			IP:   net.ParseIP(ip),
 			Port: port,
 		})
 		if err != nil {
+			log.Println("ipv6 net.DialTCP" + err.Error())
 			continue
 		}
+		log.Println("ipv6 net.DialTCP connected:" + remoteIpv6Server.Ipv6AddrIp)
 		//TODO 发送凭证
-		runIdMsg := &models.Msg{
-			MsgType:    "RunId",
-			MsgContent: runId,
-		}
+		runIdMsg := &models.JsonResponse{}
 		err = msg.WriteMsg(ipv6conn, runIdMsg)
 		if err != nil {
+			log.Println("ipv6 msg.WriteMsg" + err.Error())
 			ipv6conn.Close()
 			return
 		}
@@ -50,7 +51,7 @@ func ipv6ClientTask() {
 			ipv6conn.Close()
 			return
 		}
-		log.Printf("ipv6 p2p client login OK!")
+		log.Printf("ipv6 p2p client HandleSession")
 		go handle.HandleSession(session, "")
 	}
 }
@@ -71,6 +72,7 @@ func ipv6ServerTask() {
 			time.Sleep(100 * time.Millisecond)
 			continue
 		}
+		log.Println("ipv6 server handle conn", conn.RemoteAddr().String())
 		//	验证token，回复
 		go ipv6ClientHandle(conn)
 	}
@@ -91,5 +93,7 @@ func ipv6ClientHandle(conn net.Conn) {
 		conn.Close()
 		return
 	}
+	log.Println("ipv6 server handle session", conn.RemoteAddr().String())
+	//TODO token!!!!
 	go handle.HandleSession(session, "")
 }