testing

api/web.go

@@ -182,6 +182,6 @@ func (c *Config) HandleDownload(w http.ResponseWriter, r *http.Request) {
 			"networkautodetect:i:"+strconv.Itoa(c.NetworkAutoDetect)+"\r\n"+
 			"bandwidthautodetect:i:"+strconv.Itoa(c.BandwidthAutoDetect)+"\r\n"+
 			"connection type:i:"+strconv.Itoa(c.ConnectionType)+"\r\n"+
-			"username:s:"+user+"\r\n"+
+			"username:s:"+token+"\r\n"+
 			"bitmapcachesize:i:32000\r\n"))
 }

protocol/common.go

@@ -110,6 +110,7 @@ func forward(in net.Conn, out transport.Transport) {
 		b1.Write(buf[:n])
 		out.WritePacket(createPacket(PKT_TYPE_DATA, b1.Bytes()))
 		b1.Reset()
+		log.Printf("Forward data")
 	}
 }
 
@@ -123,5 +124,6 @@ func receive(data []byte, out net.Conn) {
 	binary.Read(buf, binary.LittleEndian, &pkt)
 
 	out.Write(pkt)
+	log.Printf("Received data")
 }
 

protocol/server.go

@@ -66,6 +66,7 @@ func (s *Server) Process(ctx context.Context) error {
 			return err
 		}
 
+		log.Printf("%x", pkt)
 		switch pt {
 		case PKT_TYPE_HANDSHAKE_REQUEST:
 			log.Printf("Client handshakeRequest from %s", common.GetClientIp(ctx))
@@ -141,6 +142,7 @@ func (s *Server) Process(ctx context.Context) error {
 			go forward(s.Remote, s.Session.TransportOut)
 			s.State = SERVER_STATE_CHANNEL_CREATE
 		case PKT_TYPE_DATA:
+			log.Printf("Data received")
 			if s.State < SERVER_STATE_CHANNEL_CREATE {
 				log.Printf("Data received while in wrong state %d != %d", s.State, SERVER_STATE_CHANNEL_CREATE)
 				return errors.New("wrong state")

security/jwt.go

@@ -55,11 +55,11 @@ func VerifyServerFunc(ctx context.Context, host string) (bool, error) {
 		return false, nil
 	}
 
-	if s.ClientIp != common.GetClientIp(ctx) {
+	/*if s.ClientIp != common.GetClientIp(ctx) {
 		log.Printf("Current client ip address %s does not match token client ip %s",
 			common.GetClientIp(ctx), s.ClientIp)
 		return false, nil
-	}
+	}*/
 
 	return true, nil
 }