specified gomobile version

3.21.8
CertPool Fix (#96 )
2024-10-20 21:33:20 +08:00 · 2024-10-20 11:33:07 +08:00 · 2024-08-02 14:23:47 +08:00 · 2024-08-02 14:22:31 +08:00 · 2024-07-26 22:27:24 +08:00 · 2024-07-26 22:07:48 +08:00
66 changed files with 6619 additions and 3233 deletions
@@ -15,4 +15,10 @@ libs/
 openp2p.app.jks
 openp2p.aar
 openp2p-sources.jar
-build.gradle
+wintun/
 wintun.dll
 .vscode/
 app/.idea/
 *_debug_bin*
 cmd/openp2p
 vendor/
@@ -19,9 +19,9 @@
 [查看详细](#安全性)
 ### 4. 轻量
-文件大小2MB+，运行内存2MB+；全部在应用层实现，没有虚拟网卡，没有内核程序
+文件大小2MB+，运行内存2MB+；它可以仅跑在应用层，或者配合wintun驱动使用组网功能
 ### 5. 跨平台
-因为轻量，所以很容易支持各个平台。支持主流的操作系统：Windows,Linux,MacOS；和主流的cpu架构：386、amd64、arm、arm64、mipsle、mipsle64、mips、mips64
+因为轻量，所以很容易支持各个平台。支持主流的操作系统：Windows,Linux,MacOS；和主流的cpu架构：386、amd64、arm、arm64、mipsle、mipsle64、mips、mips64、s390x、ppc64le
 ### 6. 高效
 P2P直连可以让你的设备跑满带宽。不论你的设备在任何网络环境，无论NAT1-4（Cone或Symmetric），UDP或TCP打洞,UPNP,IPv6都支持。依靠Quic协议优秀的拥塞算法，能在糟糕的网络环境获得高带宽低延时。
@@ -31,7 +31,7 @@ P2P直连可以让你的设备跑满带宽。不论你的设备在任何网络
 ## 快速入门
 仅需简单4步就能用起来。  
 下面是一个远程办公例子：在家里连入办公室Windows电脑。  
-（另外一个快速入门视频 https://www.bilibili.com/video/BV1Et4y1P7bF/）
+（另外一个快速入门视频 <https://www.bilibili.com/video/BV1Et4y1P7bF/>）
 ### 1.注册
 前往<https://console.openp2p.cn> 注册新用户，暂无需任何认证
@@ -96,7 +96,7 @@ Windows默认会阻止没有花钱买它家证书签名过的程序，选择“
 服务端有个调度模型，根据带宽、ping值、稳定性、服务时长，尽可能地使共享节点均匀地提供服务。连接共享节点使用TOTP密码，hmac-sha256算法校验，它是一次性密码，和我们平时使用的手机验证码或银行密码器一样的原理。
 ## 编译
-go version go1.18.1+  
+go version 1.20 only (支持win7) 
 cd到代码根目录，执行
 ```
 make
@@ -128,13 +128,15 @@ CGO_ENABLED=0 env GOOS=linux GOARCH=amd64 go build -o openp2p --ldflags '-s -w '
 6. 客户端提供WebUI
 7. ~~支持自有服务器，开源服务器程序~~(100%)
 8. 共享节点调度模型优化，对不同的运营商优化
-9. 方便二次开发，提供API和lib
+9. ~~方便二次开发，提供API和lib~~(100%)
 10. ~~应用层支持UDP协议，实现很简单，但UDP应用较少暂不急~~(100%)
-11. 底层通信支持KCP协议，目前仅支持Quic；KCP专门对延时优化，被游戏加速器广泛使用，可以牺牲一定的带宽降低延时
+11. ~~底层通信支持KCP协议，目前仅支持Quic；KCP专门对延时优化，被游戏加速器广泛使用，可以牺牲一定的带宽降低延时~~(100%)
 12. ~~支持Android系统，让旧手机焕发青春变成移动网关~~(100%)
-13. 支持Windows网上邻居共享文件
+13. ~~支持Windows网上邻居共享文件~~(100%)
-14. 内网直连优化，用处不大，估计就用户测试时用到
+14. ~~内网直连优化~~(100%)
 15. ~~支持UPNP~~(100%)
 16. ~~支持Android~~(100%)
 17. 支持IOS
 远期计划：
 1. 利用区块链技术去中心化，让共享设备的用户有收益，从而促进更多用户共享，达到正向闭环。
@@ -19,10 +19,10 @@ The code is open source, the P2P tunnel uses TLS1.3+AES double encryption, and t
 [details](#Safety)
 ### 4. Lightweight
-2MB+ filesize, 2MB+ memory. It runs at appllication layer, no vitrual NIC, no kernel driver.
+2MB+ filesize, 2MB+ memory. It could only runs at application layer, or uses wintun driver for SDWAN.
 ### 5. Cross-platform
-Benefit from lightweight, it easily supports most of major OS, like Windows, Linux, MacOS, also most of CPU architecture, like 386、amd64、arm、arm64、mipsle、mipsle64、mips、mips64.
+Benefit from lightweight, it easily supports most of major OS, like Windows, Linux, MacOS, also most of CPU architecture, like 386、amd64、arm、arm64、mipsle、mipsle64、mips、mips64、s390x、ppc64le.
 ### 6. Efficient
 P2P direct connection lets your devices make good use of bandwidth.  Your device can be connected in any network environments, even supports NAT1-4 (Cone or Symmetric),UDP or TCP punching,UPNP,IPv6.  Relying on the excellent congestion algorithm of the Quic protocol, high bandwidth and low latency can be obtained in a bad network environment.
@@ -103,7 +103,7 @@ That's right, the relay node is naturally an man-in-middle, so AES encryption is
 The server side has a scheduling model, which calculate  bandwith, ping value,stability and service duration to provide a well-proportioned service to every share node. It uses TOTP(Time-based One-time Password) with hmac-sha256 algorithem, its theory as same as the cellphone validation code or bank cipher coder.
 ## Build
-go version go1.18.1+  
+go version 1.20 only (support win7)
 cd root directory of the socure code and execute
 ```
 make
@@ -136,14 +136,15 @@ Short-Term:
 6. Provide WebUI on client side.
 7. ~~Support private server, open source server program.~~(100%)
 8. Optimize our share scheduling model for different network operators.
-9. Provide REST APIs and libary for secondary development.
+9. ~~Provide REST APIs and libary for secondary development.~~(100%)
 10. ~~Support UDP at application layer, it is easy to implement but not urgent due to only a few applicaitons using UDP protocol.~~(100%)
-11. Support KCP protocol underlay, currently support Quic only. KCP focus on delay optimization,which has been widely used as game accelerator,it can sacrifice part of bandwidth to reduce timelag. 
+11. ~~Support KCP protocol underlay, currently support Quic only. KCP focus on delay optimization,which has been widely used as game accelerator,it can sacrifice part of bandwidth to reduce timelag. ~~(100%)
 12. ~~Support Android platform, let the phones to be mobile gateway.~~(100%)
-13. Support SMB Windows neighborhood.
+13. ~~Support SMB Windows neighborhood.~~(100%)
-14. Direct connection on intranet, for testing.
+14. ~~Direct connection on intranet, for testing.~~(100%)
 15. ~~Support UPNP.~~(100%)
-
+16. ~~Support Android~~(100%)
 17. Support IOS
 Long-Term:
 1. Use blockchain technology to decentralize, so that users who share equipment have benefits, thereby promoting more users to share, and achieving a positive closed loop.
@@ -1,107 +1,108 @@
-# 手动运行说明
+# 手动运行说明
-大部分情况通过<https://console.openp2p.cn> 操作即可。有些情况需要手动运行  
+大部分情况通过<https://console.openp2p.cn> 操作即可。有些情况需要手动运行  
-> :warning: 本文所有命令, Windows环境使用"openp2p.exe", Linux环境使用"./openp2p"
+> :warning: 本文所有命令, Windows环境使用"openp2p.exe", Linux环境使用"./openp2p"
-
+
-
+
-## 安装和监听
+## 安装和监听
-```
+```
-./openp2p install -node OFFICEPC1 -token TOKEN  
+./openp2p install -node OFFICEPC1 -token TOKEN  
-或
+或
-./openp2p -d -node OFFICEPC1 -token TOKEN  
+./openp2p -d -node OFFICEPC1 -token TOKEN  
-# 注意Windows系统把“./openp2p” 换成“openp2p.exe”
+# 注意Windows系统把“./openp2p” 换成“openp2p.exe”
-```
+```
->* install: 安装模式【推荐】，会安装成系统服务，这样它就能随系统自动启动
+>* install: 安装模式【推荐】，会安装成系统服务，这样它就能随系统自动启动
->* -d: daemon模式。发现worker进程意外退出就会自动启动新的worker进程
+>* -d: daemon模式。发现worker进程意外退出就会自动启动新的worker进程
->* -node: 独一无二的节点名字，唯一标识
+>* -node: 独一无二的节点名字，唯一标识
->* -token: 在<console.openp2p.cn>“我的”里面找到
+>* -token: 在<console.openp2p.cn>“我的”里面找到
->* -sharebandwidth: 作为共享节点时提供带宽，默认10mbps. 如果是光纤大带宽，设置越大效果越好. 0表示不共享，该节点只在私有的P2P网络使用。不加入共享的P2P网络，这样也意味着无法使用别人的共享节点
+>* -sharebandwidth: 作为共享节点时提供带宽，默认10mbps. 如果是光纤大带宽，设置越大效果越好. 0表示不共享，该节点只在私有的P2P网络使用。不加入共享的P2P网络，这样也意味着无法使用别人的共享节点
->* -loglevel: 需要查看更多调试日志，设置0；默认是1
+>* -loglevel: 需要查看更多调试日志，设置0；默认是1
-
+
-### 在docker容器里运行openp2p
+### 在docker容器里运行openp2p
-我们暂时还没提供官方docker镜像，你可以在随便一个容器里运行
+我们暂时还没提供官方docker镜像，你可以在随便一个容器里运行
-```
+```
-nohup ./openp2p -d -node OFFICEPC1 -token TOKEN  &
+nohup ./openp2p -d -node OFFICEPC1 -token TOKEN  &
-#这里由于一般的镜像都精简过，install系统服务会失败，所以使用直接daemon模式后台运行
+#这里由于一般的镜像都精简过，install系统服务会失败，所以使用直接daemon模式后台运行
-```
+```
-## 连接
+## 连接
-```
+```
-./openp2p -d -node HOMEPC123 -token TOKEN -appname OfficeWindowsRemote -peernode OFFICEPC1 -dstip 127.0.0.1 -dstport 3389 -srcport 23389
+./openp2p -d -node HOMEPC123 -token TOKEN -appname OfficeWindowsRemote -peernode OFFICEPC1 -dstip 127.0.0.1 -dstport 3389 -srcport 23389
-使用配置文件，建立多个P2PApp
+使用配置文件，建立多个P2PApp
-./openp2p -d   
+./openp2p -d   
-```
+```
->* -appname: 这个P2P应用名字
+>* -appname: 这个P2P应用名字
->* -peernode: 目标节点名字
+>* -peernode: 目标节点名字
->* -dstip: 目标服务地址，默认本机127.0.0.1
+>* -dstip: 目标服务地址，默认本机127.0.0.1
->* -dstport: 目标服务端口，常见的如windows远程桌面3389，Linux ssh 22
+>* -dstport: 目标服务端口，常见的如windows远程桌面3389，Linux ssh 22
->* -protocol: 目标服务协议 tcp、udp
+>* -protocol: 目标服务协议 tcp、udp
-
+
-## 配置文件
+## 配置文件
-一般保存在当前目录，安装模式下会保存到 `C:\Program Files\OpenP2P\config.json` 或 `/usr/local/openp2p/config.json`
+一般保存在当前目录，安装模式下会保存到 `C:\Program Files\OpenP2P\config.json` 或 `/usr/local/openp2p/config.json`
-希望修改参数，或者配置多个P2PApp可手动修改配置文件
+希望修改参数，或者配置多个P2PApp可手动修改配置文件
-
+
-配置实例
+配置实例
-```
+```
-{
+{
-  "network": {
+  "network": {
-    "Node": "hhd1207-222",
+    "Node": "YOUR-NODE-NAME",
-    "Token": "TOKEN",
+    "Token": "TOKEN",
-    "ShareBandwidth": 0,
+    "ShareBandwidth": 0,
-    "ServerHost": "api.openp2p.cn",
+    "ServerHost": "api.openp2p.cn",
-    "ServerPort": 27183,
+    "ServerPort": 27183,
-    "UDPPort1": 27182,
+    "UDPPort1": 27182,
-    "UDPPort2": 27183
+    "UDPPort2": 27183
-  },
+  },
-  "apps": [
+  "apps": [
-    {
+    {
-      "AppName": "OfficeWindowsPC",
+      "AppName": "OfficeWindowsPC",
-      "Protocol": "tcp",
+      "Protocol": "tcp",
-      "SrcPort": 23389,
+      "SrcPort": 23389,
-      "PeerNode": "OFFICEPC1",
+      "PeerNode": "OFFICEPC1",
-      "DstPort": 3389,
+      "DstPort": 3389,
-      "DstHost": "localhost",
+      "DstHost": "localhost",
-    },
+    },
-    {
+    {
-      "AppName": "OfficeServerSSH",
+      "AppName": "OfficeServerSSH",
-      "Protocol": "tcp",
+      "Protocol": "tcp",
-      "SrcPort": 22,
+      "SrcPort": 22,
-      "PeerNode": "OFFICEPC1",
+      "PeerNode": "OFFICEPC1",
-      "DstPort": 22,
+      "DstPort": 22,
-      "DstHost": "192.168.1.5",
+      "DstHost": "192.168.1.5",
-    }
+    }
-  ]
+  ]
-}
+}
-```
+```
-
+
-## 升级客户端
+## 升级客户端
-```
+```
-# update local client
+# update local client
-./openp2p update  
+./openp2p update  
-# update remote client
+# update remote client
-curl --insecure 'https://api.openp2p.cn:27183/api/v1/device/YOUR-NODE-NAME/update?user=&password='
+curl --insecure 'https://api.openp2p.cn:27183/api/v1/device/YOUR-NODE-NAME/update?user=&password='
-```
+```
-
+
-Windows系统需要设置防火墙放行本程序，程序会自动设置，如果设置失败会影响连接功能。
+Windows系统需要设置防火墙放行本程序，程序会自动设置，如果设置失败会影响连接功能。
-Linux系统（Ubuntu和CentOS7）的防火墙默认配置均不会有影响，如果不行可尝试关闭防火墙
+Linux系统（Ubuntu和CentOS7）的防火墙默认配置均不会有影响，如果不行可尝试关闭防火墙
-```
+```
-systemctl stop firewalld.service
+systemctl stop firewalld.service
-systemctl start firewalld.service
+systemctl start firewalld.service
-firewall-cmd --state
+firewall-cmd --state
-```
+```
-
+## 停止
-## 卸载
+TODO: windows linux macos
-```
+## 卸载
-./openp2p uninstall
+```
-# 已安装时
+./openp2p uninstall
-# windows
+# 已安装时
-C:\Program Files\OpenP2P\openp2p.exe uninstall
+# windows
-# linux,macos
+C:\Program Files\OpenP2P\openp2p.exe uninstall
-sudo /usr/local/openp2p/openp2p uninstall
+# linux,macos
-```
+sudo /usr/local/openp2p/openp2p uninstall
-
+```
-## Docker运行
+
-```
+## Docker运行
-# 把YOUR-TOKEN和YOUR-NODE-NAME替换成自己的
+```
-docker run -d --restart=always --net host --name openp2p-client -e OPENP2P_TOKEN=YOUR-TOKEN -e OPENP2P_NODE=YOUR-NODE-NAME  openp2pcn/openp2p-client:latest 
+# 把YOUR-TOKEN和YOUR-NODE-NAME替换成自己的
-OR
+docker run -d --restart=always --net host --name openp2p-client -e OPENP2P_TOKEN=YOUR-TOKEN -e OPENP2P_NODE=YOUR-NODE-NAME  openp2pcn/openp2p-client:latest 
-docker run -d --restart=always --net host --name openp2p-client  openp2pcn/openp2p-client:latest -token YOUR-TOKEN -node YOUR-NODE-NAME
+OR
-```
+docker run -d --restart=always --net host --name openp2p-client  openp2pcn/openp2p-client:latest -token YOUR-TOKEN -node YOUR-NODE-NAME
 ```
@@ -1,109 +1,109 @@
-
+
-
+
-# Parameters details
+# Parameters details
-In most cases, you can operate it through <https://console.openp2p.cn>. In some cases it is necessary to run manually
+In most cases, you can operate it through <https://console.openp2p.cn>. In some cases it is necessary to run manually
-> :warning: all commands in this doc, Windows env uses "openp2p.exe", Linux env uses "./openp2p" 
+> :warning: all commands in this doc, Windows env uses "openp2p.exe", Linux env uses "./openp2p" 
-
+
-
+
-## Install and Listen
+## Install and Listen
-```
+```
-./openp2p install -node OFFICEPC1 -token TOKEN  
+./openp2p install -node OFFICEPC1 -token TOKEN  
-Or
+Or
-./openp2p -d -node OFFICEPC1 -token TOKEN  
+./openp2p -d -node OFFICEPC1 -token TOKEN  
-
+
-```
+```
->* install: [recommand] will install as system service. So it will autorun when system booting.
+>* install: [recommand] will install as system service. So it will autorun when system booting.
->* -d: daemon mode run once. When the worker process is found to exit unexpectedly, a new worker process will be automatically started
+>* -d: daemon mode run once. When the worker process is found to exit unexpectedly, a new worker process will be automatically started
->* -node: Unique node name, unique identification
+>* -node: Unique node name, unique identification
->* -token: See <console.openp2p.cn> "Profile"
+>* -token: See <console.openp2p.cn> "Profile"
->* -sharebandwidth: Provides bandwidth when used as a shared node, the default is 10mbps. If it is a large bandwidth of optical fiber, the larger the setting, the better the effect. 0 means not shared, the node is only used in a private P2P network. Do not join the shared P2P network, which also means that you CAN NOT use other people’s shared nodes
+>* -sharebandwidth: Provides bandwidth when used as a shared node, the default is 10mbps. If it is a large bandwidth of optical fiber, the larger the setting, the better the effect. 0 means not shared, the node is only used in a private P2P network. Do not join the shared P2P network, which also means that you CAN NOT use other people’s shared nodes
->* -loglevel: Need to view more debug logs, set 0; the default is 1
+>* -loglevel: Need to view more debug logs, set 0; the default is 1
-
+
-### Run in Docker container
+### Run in Docker container
-We don't provide official docker image yet, you can run it in any container
+We don't provide official docker image yet, you can run it in any container
-```
+```
-nohup ./openp2p -d -node OFFICEPC1 -token TOKEN  &
+nohup ./openp2p -d -node OFFICEPC1 -token TOKEN  &
-# Since many docker images have been simplified, the install system service will fail, so the daemon mode is used to run in the background
+# Since many docker images have been simplified, the install system service will fail, so the daemon mode is used to run in the background
-```
+```
-
+
-## Connect
+## Connect
-```
+```
-./openp2p -d -node HOMEPC123 -token TOKEN -appname OfficeWindowsRemote -peernode OFFICEPC1 -dstip 127.0.0.1 -dstport 3389 -srcport 23389
+./openp2p -d -node HOMEPC123 -token TOKEN -appname OfficeWindowsRemote -peernode OFFICEPC1 -dstip 127.0.0.1 -dstport 3389 -srcport 23389
-Create multiple P2PApp by config file
+Create multiple P2PApp by config file
-./openp2p -d    
+./openp2p -d    
-```
+```
->* -appname: This P2PApp name
+>* -appname: This P2PApp name
->* -peernode: Target node name
+>* -peernode: Target node name
->* -dstip: Target service address, default local 127.0.0.1
+>* -dstip: Target service address, default local 127.0.0.1
->* -dstport: Target service port, such as windows remote desktop 3389, Linux ssh 22
+>* -dstport: Target service port, such as windows remote desktop 3389, Linux ssh 22
->* -protocol: Target service protocol tcp, udp
+>* -protocol: Target service protocol tcp, udp
-
+
-## Config file
+## Config file
-Generally saved in the current directory, in installation mode it will be saved to `C:\Program Files\OpenP2P\config.json` or `/usr/local/openp2p/config.json`
+Generally saved in the current directory, in installation mode it will be saved to `C:\Program Files\OpenP2P\config.json` or `/usr/local/openp2p/config.json`
-If you want to modify the parameters, or configure multiple P2PApps, you can manually modify the configuration file
+If you want to modify the parameters, or configure multiple P2PApps, you can manually modify the configuration file
-
+
-Configuration example
+Configuration example
-```
+```
-{
+{
-  "network": {
+  "network": {
-    "Node": "hhd1207-222",
+    "Node": "YOUR-NODE-NAME",
-    "Token": "TOKEN",
+    "Token": "TOKEN",
-    "ShareBandwidth": 0,
+    "ShareBandwidth": 0,
-    "ServerHost": "api.openp2p.cn",
+    "ServerHost": "api.openp2p.cn",
-    "ServerPort": 27183,
+    "ServerPort": 27183,
-    "UDPPort1": 27182,
+    "UDPPort1": 27182,
-    "UDPPort2": 27183
+    "UDPPort2": 27183
-  },
+  },
-  "apps": [
+  "apps": [
-    {
+    {
-      "AppName": "OfficeWindowsPC",
+      "AppName": "OfficeWindowsPC",
-      "Protocol": "tcp",
+      "Protocol": "tcp",
-      "SrcPort": 23389,
+      "SrcPort": 23389,
-      "PeerNode": "OFFICEPC1",
+      "PeerNode": "OFFICEPC1",
-      "DstPort": 3389,
+      "DstPort": 3389,
-      "DstHost": "localhost",
+      "DstHost": "localhost",
-    },
+    },
-    {
+    {
-      "AppName": "OfficeServerSSH",
+      "AppName": "OfficeServerSSH",
-      "Protocol": "tcp",
+      "Protocol": "tcp",
-      "SrcPort": 22,
+      "SrcPort": 22,
-      "PeerNode": "OFFICEPC1",
+      "PeerNode": "OFFICEPC1",
-      "DstPort": 22,
+      "DstPort": 22,
-      "DstHost": "192.168.1.5",
+      "DstHost": "192.168.1.5",
-    }
+    }
-  ]
+  ]
-}
+}
-```
+```
-## Client update
+## Client update
-```
+```
-# update local client
+# update local client
-./openp2p update  
+./openp2p update  
-# update remote client
+# update remote client
-curl --insecure 'https://api.openp2p.cn:27183/api/v1/device/YOUR-NODE-NAME/update?user=&password='
+curl --insecure 'https://api.openp2p.cn:27183/api/v1/device/YOUR-NODE-NAME/update?user=&password='
-```
+```
-
+
-Windows system needs to set up firewall for this program, the program will automatically set the firewall, if the setting fails, the UDP punching will be affected.  
+Windows system needs to set up firewall for this program, the program will automatically set the firewall, if the setting fails, the UDP punching will be affected.  
-The default firewall configuration of Linux system (Ubuntu and CentOS7) will not have any effect, if not, you can try to turn off the firewall
+The default firewall configuration of Linux system (Ubuntu and CentOS7) will not have any effect, if not, you can try to turn off the firewall
-```
+```
-systemctl stop firewalld.service
+systemctl stop firewalld.service
-systemctl start firewalld.service
+systemctl start firewalld.service
-firewall-cmd --state
+firewall-cmd --state
-```
+```
-
+
-## Uninstall
+## Uninstall
-```
+```
-./openp2p uninstall
+./openp2p uninstall
-# when already installed
+# when already installed
-# windows
+# windows
-C:\Program Files\OpenP2P\openp2p.exe uninstall
+C:\Program Files\OpenP2P\openp2p.exe uninstall
-# linux,macos
+# linux,macos
-sudo /usr/local/openp2p/openp2p uninstall
+sudo /usr/local/openp2p/openp2p uninstall
-```
+```
-
+
-## Run with Docker
+## Run with Docker
-```
+```
-# Replace YOUR-TOKEN and YOUR-NODE-NAME with yours
+# Replace YOUR-TOKEN and YOUR-NODE-NAME with yours
-docker run -d --net host --name openp2p-client -e OPENP2P_TOKEN=YOUR-TOKEN -e OPENP2P_NODE=YOUR-NODE-NAME  openp2pcn/openp2p-client:latest 
+docker run -d --net host --name openp2p-client -e OPENP2P_TOKEN=YOUR-TOKEN -e OPENP2P_NODE=YOUR-NODE-NAME  openp2pcn/openp2p-client:latest 
-OR
+OR
-docker run -d --net host --name openp2p-client  openp2pcn/openp2p-client:latest -token YOUR-TOKEN -node YOUR-NODE-NAME
+docker run -d --net host --name openp2p-client  openp2pcn/openp2p-client:latest -token YOUR-TOKEN -node YOUR-NODE-NAME
 ```
@@ -1,10 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="RunConfigurationProducerService">
    <option name="ignoredProducers">
      <set>
        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
      </set>
    </option>
  </component>
 </project>
@@ -1,7 +1,12 @@
 ## Build
 depends on openjdk 11, gradle 8.1.3, ndk 21
 ```
 # latest version not support go1.20
 go install golang.org/x/mobile/cmd/gomobile@7c4916698cc93475ebfea76748ee0faba2deb2a5
 gomobile init
 go get -v golang.org/x/mobile/bind@7c4916698cc93475ebfea76748ee0faba2deb2a5
 cd core
 go get -v golang.org/x/mobile/bind
 gomobile bind -target android -v
 if [[ $? -ne 0 ]]; then
    echo "build error"
@@ -11,6 +16,17 @@ echo "build ok"
 cp openp2p.aar openp2p-sources.jar ../app/app/libs
 echo "copy to APP libs"
 edit app/app/build.gradle 
 ```
 signingConfigs {
        release {
            storeFile file('YOUR-JKS-PATH')
            storePassword 'YOUR-PASSWORD'
            keyAlias 'openp2p.keys'
            keyPassword 'YOUR-PASSWORD'
        }
    }
 ```
 cd ../app
 ./gradlew build
@@ -0,0 +1,63 @@
 plugins {
    id 'com.android.application'
    id 'kotlin-android'
 }
 android {
    signingConfigs {
        release {
            storeFile file('C:\\work\\src\\openp2p-client\\app\\openp2p.jks')
            storePassword 'YOUR-PASSWORD'
            keyAlias 'openp2p.keys'
            keyPassword 'YOUR-PASSWORD'
        }
    }
    compileSdkVersion 31
    buildToolsVersion "30.0.3"
    defaultConfig {
        applicationId "cn.openp2p"
        minSdkVersion 16
        targetSdkVersion 31
        versionCode 1
        versionName "2718281828"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        namespace "cn.openp2p"
    }
    buildTypes {
        release {
            minifyEnabled true
            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
            signingConfig signingConfigs.release
        }
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
    kotlinOptions {
        jvmTarget = '1.8'
    }
    buildFeatures {
        viewBinding true
    }
 }
 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
    implementation 'androidx.core:core-ktx:1.3.1'
    implementation 'androidx.appcompat:appcompat:1.2.0'
    implementation 'com.google.android.material:material:1.2.1'
    implementation 'androidx.annotation:annotation:1.1.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
    testImplementation 'junit:junit:4.+'
    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
    implementation files('libs\\openp2p-sources.jar')
 }
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    package="cn.openp2p">
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <application
        android:allowBackup="true"
@@ -27,13 +26,21 @@
        <activity
            android:name=".ui.login.LoginActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        <receiver android:name="BootReceiver"
            android:exported="true"
            android:enabled="true">
            <intent-filter>
                <action android:name="android.intent.action.BOOT_COMPLETED"/>
            </intent-filter>
        </receiver>
    </application>
 </manifest>
@@ -0,0 +1,27 @@
 package cn.openp2p
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import cn.openp2p.ui.login.LoginActivity
 class BootReceiver : BroadcastReceiver() {
    override fun onReceive(context: Context, intent: Intent) {
 //        Logger.log("pp onReceive "+intent.action.toString())
        Log.i("onReceive","start "+intent.action.toString())
        // if (Intent.ACTION_BOOT_COMPLETED == intent.action) {
        //     Log.i("onReceive","match "+intent.action.toString())
        //     VpnService.prepare(context)
        //     val intent = Intent(context, OpenP2PService::class.java)
        //     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
        //         context.startForegroundService(intent)
        //     } else {
        //         context.startService(intent)
        //     }
        // }
        Log.i("onReceive","end "+intent.action.toString())
    }
 }
@@ -4,9 +4,12 @@ import android.app.*
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import java.io.IOException
 import android.net.VpnService
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import android.os.ParcelFileDescriptor
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
@@ -14,9 +17,22 @@ import cn.openp2p.ui.login.LoginActivity
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import openp2p.Openp2p
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.nio.ByteBuffer
 import kotlinx.coroutines.*
 import org.json.JSONObject
 data class Node(val name: String, val ip: String, val resource: String? = null)
-class OpenP2PService : Service() {
+data class Network(
    val id: Long,
    val name: String,
    val gateway: String,
    val Nodes: List<Node>
 )
 class OpenP2PService : VpnService() {
    companion object {
        private val LOG_TAG = OpenP2PService::class.simpleName
    }
@@ -29,10 +45,12 @@ class OpenP2PService : Service() {
    private lateinit var network: openp2p.P2PNetwork
    private lateinit var mToken: String
    private var running:Boolean =true
    private var sdwanRunning:Boolean =false
    private var vpnInterface: ParcelFileDescriptor? = null
    private  var sdwanJob: Job? = null
    override fun onCreate() {
        Log.i(LOG_TAG, "onCreate - Thread ID = " + Thread.currentThread().id)
-        var channelId: String? = null
+        var channelId = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
        channelId = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            createNotificationChannel("kim.hsl", "ForegroundService")
        } else {
            ""
@@ -41,7 +59,7 @@ class OpenP2PService : Service() {
        val pendingIntent = PendingIntent.getActivity(
            this, 0,
-            notificationIntent, 0
+            notificationIntent, PendingIntent.FLAG_IMMUTABLE
        )
        val notification = channelId?.let {
@@ -54,7 +72,7 @@ class OpenP2PService : Service() {
        startForeground(1337, notification)
        super.onCreate()
-
+        refreshSDWAN()
    }
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -62,23 +80,172 @@ class OpenP2PService : Service() {
            LOG_TAG,
            "onStartCommand - startId = " + startId + ", Thread ID = " + Thread.currentThread().id
        )
        startOpenP2P(null)
        return super.onStartCommand(intent, flags, startId)
    }
    override fun onBind(p0: Intent?): IBinder? {
        val token = p0?.getStringExtra("token")
-        Log.i(LOG_TAG, "onBind - Thread ID = " + Thread.currentThread().id + token)
+        Log.i(LOG_TAG, "onBind token=$token")
        startOpenP2P(token)
        return binder
    }
    private fun startOpenP2P(token : String?): Boolean {
        if (sdwanRunning) {
            return true
        }
        Log.i(LOG_TAG, "startOpenP2P - Thread ID = " + Thread.currentThread().id + token)
        val oldToken = Openp2p.getToken(getExternalFilesDir(null).toString())
        Log.i(LOG_TAG, "startOpenP2P oldtoken=$oldToken newtoken=$token")
        if (oldToken=="0" && token==null){
            return false
        }
        sdwanRunning = true
        //        runSDWAN()
        GlobalScope.launch {
-            network = Openp2p.runAsModule(getExternalFilesDir(null).toString(), token, 0, 1)
+            network = Openp2p.runAsModule(
                getExternalFilesDir(null).toString(),
                token,
                0,
                1
            ) // /storage/emulated/0/Android/data/cn.openp2p/files/
            val isConnect = network.connect(30000)  // ms
-            Log.i(OpenP2PService.LOG_TAG, "login result: " + isConnect.toString());
+            Log.i(LOG_TAG, "login result: " + isConnect.toString());
            do {
                Thread.sleep(1000)
-            }while(network.connect(30000)&&running)
+            } while (network.connect(30000) && running)
            stopSelf()
        }
-        return binder
+        return false
    }
    private fun refreshSDWAN() {
        GlobalScope.launch {
            Log.i(OpenP2PService.LOG_TAG, "refreshSDWAN start");
            while (true) {
                Log.i(OpenP2PService.LOG_TAG, "waiting new sdwan config");
                val buf = ByteArray(4096)
                val buffLen = Openp2p.getAndroidSDWANConfig(buf)
                Log.i(OpenP2PService.LOG_TAG, "closing running sdwan instance");
                sdwanRunning = false
                vpnInterface?.close()
                vpnInterface = null
                Thread.sleep(10000)
                runSDWAN(buf.copyOfRange(0,buffLen.toInt() ))
            }
            Log.i(OpenP2PService.LOG_TAG, "refreshSDWAN end");
        }
    }
    private suspend fun readTunLoop() {
        val inputStream = FileInputStream(vpnInterface?.fileDescriptor).channel
        if (inputStream==null){
            Log.i(OpenP2PService.LOG_TAG, "open FileInputStream error: ");
            return
        }
        Log.d(LOG_TAG, "read tun loop start")
        val buffer = ByteBuffer.allocate(4096)
        val byteArrayRead = ByteArray(4096)
        while (sdwanRunning) {
            buffer.clear()
            val readBytes = inputStream.read(buffer)
            if (readBytes <= 0) {
 //                Log.i(OpenP2PService.LOG_TAG, "inputStream.read error: ")
                delay(1)
                continue
            }
            buffer.flip()
            buffer.get(byteArrayRead,0,readBytes)
            Log.i(OpenP2PService.LOG_TAG, String.format("Openp2p.androidRead: %d", readBytes))
            Openp2p.androidRead(byteArrayRead, readBytes.toLong())
        }
        Log.d(LOG_TAG, "read tun loop end")
    }
    private fun runSDWAN(buf:ByteArray) {
        sdwanRunning=true
        sdwanJob=GlobalScope.launch(context = Dispatchers.IO) {
            Log.i(OpenP2PService.LOG_TAG, "runSDWAN start:${buf.decodeToString()}");
            try{
                var builder = Builder()
                val jsonObject = JSONObject(buf.decodeToString())
                val id = jsonObject.getLong("id")
                val name = jsonObject.getString("name")
                val gateway = jsonObject.getString("gateway")
                val nodesArray = jsonObject.getJSONArray("Nodes")
                val nodesList = mutableListOf<JSONObject>()
                for (i in 0 until nodesArray.length()) {
                    nodesList.add(nodesArray.getJSONObject(i))
                }
                val myNodeName = Openp2p.getAndroidNodeName()
                Log.i(OpenP2PService.LOG_TAG, "getAndroidNodeName:${myNodeName}");
                val nodeList = nodesList.map {
                    val nodeName = it.getString("name")
                    val nodeIp = it.getString("ip")
                    if (nodeName==myNodeName){
                        builder.addAddress(nodeIp, 24)
                    }
                    val nodeResource = if (it.has("resource")) it.getString("resource") else null
                    val parts = nodeResource?.split("/")
                    if (parts?.size == 2) {
                        val ipAddress = parts[0]
                        val subnetMask = parts[1]
                        builder.addRoute(ipAddress, subnetMask.toInt())
                        Log.i(OpenP2PService.LOG_TAG, "sdwan addRoute:${ipAddress},${subnetMask.toInt()}");
                    }
                    Node(nodeName, nodeIp, nodeResource)
                }
                val network = Network(id, name, gateway, nodeList)
                println(network)
                Log.i(OpenP2PService.LOG_TAG, "onBind");
                builder.addDnsServer("8.8.8.8")
                builder.addRoute("10.2.3.0", 24)
 //            builder.addRoute("0.0.0.0", 0);
                builder.setSession(LOG_TAG!!)
                builder.setMtu(1420)
                vpnInterface = builder.establish()
                if (vpnInterface==null){
                    Log.e(OpenP2PService.LOG_TAG, "start vpnservice error: ");
                }
               val outputStream = FileOutputStream(vpnInterface?.fileDescriptor).channel
               if (outputStream==null){
                   Log.e(OpenP2PService.LOG_TAG, "open FileOutputStream error: ");
                   return@launch
               }
               val byteArrayWrite = ByteArray(4096)
                launch {
                        readTunLoop()
                    }
                Log.d(LOG_TAG, "write tun loop start")
               while (sdwanRunning) {
                   val len = Openp2p.androidWrite(byteArrayWrite)
                   Log.i(OpenP2PService.LOG_TAG, String.format("Openp2p.androidWrite: %d",len));
                   val writeBytes = outputStream?.write(ByteBuffer.wrap(byteArrayWrite))
                   if (writeBytes != null && writeBytes <= 0) {
                       Log.i(OpenP2PService.LOG_TAG, "outputStream?.write error: ");
                       continue
                   }
               }
               outputStream.close()
 // 关闭 VPN 接口
                vpnInterface?.close()
 // 置空变量以释放资源
                vpnInterface = null
                Log.d(LOG_TAG, "write tun loop end")
            }catch (e: Exception) {
                // 捕获异常并记录
                Log.e("VPN Connection", "发生异常: ${e.message}")
            }
            Log.i(OpenP2PService.LOG_TAG, "runSDWAN end");
        }
    }
    override fun onDestroy() {
@@ -93,12 +260,13 @@ class OpenP2PService : Service() {
    }
    fun isConnected(): Boolean {
        if (!::network.isInitialized) return false
-        return network?.connect(1000)
+        return network.connect(1000)
    }
    fun stop() {
        running=false
        stopSelf()
        Openp2p.stop()
    }
    @RequiresApi(Build.VERSION_CODES.O)
    private fun createNotificationChannel(channelId: String, channelName: String): String? {
@@ -0,0 +1,45 @@
 package cn.openp2p
 import android.content.*
 import java.io.File
 import java.io.FileWriter
 import java.text.SimpleDateFormat
 import java.util.*
 import android.app.*
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import java.io.IOException
 import android.net.VpnService
 import android.os.Binder
 import android.os.Build
 import android.os.IBinder
 import android.os.ParcelFileDescriptor
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import cn.openp2p.ui.login.LoginActivity
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import openp2p.Openp2p
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.nio.ByteBuffer
 import kotlinx.coroutines.*
 import org.json.JSONObject
 object Logger {
    private val logFile: File = File("app.log")
    fun log(message: String) {
        val timestamp = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(Date())
        val logMessage = "$timestamp: $message\n"
        try {
            val fileWriter = FileWriter(logFile, true)
            fileWriter.append(logMessage)
            fileWriter.close()
        } catch (e: Exception) {
            e.printStackTrace()
        }
    }
 }
@@ -5,6 +5,7 @@ import android.app.Activity
 import android.app.ActivityManager
 import android.app.Notification
 import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
@@ -25,6 +26,7 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import cn.openp2p.Logger
 import cn.openp2p.OpenP2PService
 import cn.openp2p.R
 import cn.openp2p.databinding.ActivityLoginBinding
@@ -51,6 +53,14 @@ class LoginActivity : AppCompatActivity() {
    private lateinit var loginViewModel: LoginViewModel
    private lateinit var binding: ActivityLoginBinding
    private lateinit var mService: OpenP2PService
    @RequiresApi(Build.VERSION_CODES.O)
    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        super.onActivityResult(requestCode, resultCode, data)
        if (requestCode == 0 && resultCode == Activity.RESULT_OK) {
            startService(Intent(this, OpenP2PService::class.java))
        }
    }
    @RequiresApi(Build.VERSION_CODES.O)
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -78,22 +88,18 @@ class LoginActivity : AppCompatActivity() {
                token.error = getString(loginState.passwordError)
            }
        })
-        val intent1 = VpnService.prepare(this) ?: return
+        openp2pLog.setText(R.string.phone_setting)
-        loginViewModel.loginResult.observe(this@LoginActivity, Observer {
+        val intent = VpnService.prepare(this)
-            val loginResult = it ?: return@Observer
+         if (intent != null)
         {
             Log.i("openp2p", "VpnService.prepare need permission");
             startActivityForResult(intent, 0)
         }
         else {
             Log.i("openp2p", "VpnService.prepare ready");
             onActivityResult(0, Activity.RESULT_OK, null)
         }
            loading.visibility = View.GONE
            if (loginResult.error != null) {
                showLoginFailed(loginResult.error)
            }
            if (loginResult.success != null) {
                updateUiWithUser(loginResult.success)
            }
            setResult(Activity.RESULT_OK)
            //Complete and destroy login activity once successful
            finish()
        })
        profile.setOnClickListener {
            val url = "https://console.openp2p.cn/profile"
@@ -110,17 +116,23 @@ class LoginActivity : AppCompatActivity() {
            }
            openp2pLog.setText(R.string.phone_setting)
-            token.setText(Openp2p.getToken(getExternalFilesDir(null).toString()))
+
            login.setOnClickListener {
                if (login.text.toString()=="退出"){
-//                    val intent = Intent(this@LoginActivity, OpenP2PService::class.java)
+                //    val intent = Intent(this@LoginActivity, OpenP2PService::class.java)
-//                    stopService(intent)
+                //    stopService(intent)
                    Log.i(LOG_TAG, "quit")
                    mService.stop()
-                    unbindService(connection)
+
                    val intent = Intent(this@LoginActivity, OpenP2PService::class.java)
                    stopService(intent)
                    // 解绑服务
                    unbindService(connection)
                    // 结束当前 Activity
                    finish() // 或者使用 finishAffinity() 来结束整个应用程序
                    exitAPP()
                    // finishAffinity()
                }
                login.setText("退出")
@@ -139,13 +151,20 @@ class LoginActivity : AppCompatActivity() {
                            if (isConnect) {
                                onlineState.setText("在线")
                            } else {
-                                onlineState.setText("离线")
+                                onlineState.setText("正在登录")
                            }
                        }
                    } while (true)
                }
            }
            val tokenText = Openp2p.getToken(getExternalFilesDir(null).toString())
            token.setText(tokenText.toString())
            // Check token length and automatically click login if length > 10
            if (tokenText.length > 10) {
 //                Logger.log("performClick ")
                login.performClick()
            }
        }
    }
    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
@@ -13,28 +13,27 @@
    <EditText
        android:id="@+id/token"
-        android:layout_width="225dp"
+        android:layout_width="250dp"
-        android:layout_height="46dp"
+        android:layout_height="45dp"
        android:hint="Token"
        android:imeActionLabel="@string/action_sign_in_short"
        android:imeOptions="actionDone"
        android:selectAllOnFocus="true"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
         />
    <Button
        android:id="@+id/login"
-        android:layout_width="wrap_content"
+        android:layout_width="85dp"
-        android:layout_height="wrap_content"
+        android:layout_height="45dp"
        android:layout_gravity="start"
        android:layout_marginStart="24dp"
        android:layout_marginLeft="24dp"
        android:enabled="false"
        android:text="@string/action_sign_in"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@+id/token"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
        tools:layout_editor_absoluteY="-2dp" />
@@ -58,28 +57,36 @@
        android:id="@+id/openp2pLog"
        android:layout_width="359dp"
        android:layout_height="548dp"
        android:layout_marginTop="24dp"
        android:ems="10"
        android:inputType="none"
        android:textIsSelectable="true"
        android:focusable="false"
        android:inputType="none"
        android:text="Name"
        android:textIsSelectable="true"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/onlineState" />
    <Button
        android:id="@+id/profile"
-        android:layout_width="wrap_content"
+        android:layout_width="250dp"
-        android:layout_height="wrap_content"
+        android:layout_height="45dp"
        android:layout_marginTop="8dp"
        android:text="打开控制台查看Token"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/token" />
    <EditText
        android:id="@+id/onlineState"
-        android:layout_width="113dp"
+        android:layout_width="85dp"
        android:layout_height="45dp"
        android:layout_marginStart="24dp"
        android:layout_marginLeft="24dp"
        android:layout_marginTop="8dp"
        android:ems="10"
        android:inputType="textPersonName"
        android:text="未登录"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@+id/profile"
        app:layout_constraintTop_toBottomOf="@+id/login" />
@@ -10,7 +10,14 @@
    <string name="invalid_password">Token可以在 https://console.openp2p.cn/profile 获得</string>
    <string name="login_failed">"Login failed"</string>
    <string name="phone_setting">"安卓系统默认设置的”杀后台进程“会导致 OpenP2P 在后台运行一会后，被系统杀死进程，导致您的体验受到影响。您可以通过以下方式修改几个设置，解决此问题：
-
+华为鸿蒙：
    1. 允许应用后台运行：进入设置 → 搜索进入 应用启动管理 → 关闭 OpenP2P 的 自动管理 开关 → 在弹框中勾选 允许后台活动 
    2. 避免应用被电池优化程序清理：进入设置 → 搜索进入电池优化 → 不允许 →选择所有应用 → 找到无法后台运行的应用 → 设置为不允许
    3. 关闭省电模式：进入设置 → 电池 → 关闭 省电模式 开关
    4. 保持设备网络连接：进入设置  → 电池 → 更多电池设置 → 开启 休眠时始终保持网络连接 开关。
    5. 给后台运行的应用加锁：打开应用后 → 进入多任务界面 → 下拉选中的卡片进行加锁 → 然后点击清理图标清理其他不经常使用的应用
    6. 设置开发人员选项中相关开关：进入设置 → 搜索进入 开发人员选项 → 找到 不保留活动 开关后关闭 → 并在 后台进程限制 选择 标准限制
 华为手机：
    进入”设置“，搜索并进入“电池优化“界面，选中 OpenP2P 程序，不允许系统对其进行电池优化；
    进入”设置“，进入”应用管理“界面，选中 OpenP2P 程序，点击”耗电情况“，开启”允许后台活动“即可；
@@ -0,0 +1,30 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
    ext.kotlin_version = "1.8.20"
    repositories {
        google()
        mavenCentral()
    }
    dependencies {
        classpath "com.android.tools.build:gradle:8.1.3"
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
    }
 }
 allprojects {
    repositories {
        google()
        mavenCentral()
        jcenter() // Warning: this repository is going to shut down soon
    }
 }
 task clean(type: Delete) {
    delete rootProject.buildDir
 }
@@ -1,6 +1,6 @@
-#Sat Oct 22 21:46:24 CST 2022
+#Tue Dec 05 16:04:08 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,9 +1,9 @@
-package main
+package main
-
+
-import (
+import (
-	core "openp2p/core"
+	op "openp2p/core"
-)
+)
-
+
-func main() {
+func main() {
-	core.Run()
+	op.Run()
-}
+}
@@ -1,45 +0,0 @@
 package openp2p
 import (
 	"sync"
 	"time"
 )
 // BandwidthLimiter ...
 type BandwidthLimiter struct {
 	ts           time.Time
 	bw           int // mbps
 	freeBytes    int // bytes
 	maxFreeBytes int // bytes
 	mtx          sync.Mutex
 }
 // mbps
 func newBandwidthLimiter(bw int) *BandwidthLimiter {
 	return &BandwidthLimiter{
 		bw:           bw,
 		ts:           time.Now(),
 		maxFreeBytes: bw * 1024 * 1024 / 8,
 		freeBytes:    bw * 1024 * 1024 / 8,
 	}
 }
 // Add ...
 func (bl *BandwidthLimiter) Add(bytes int) {
 	if bl.bw <= 0 {
 		return
 	}
 	bl.mtx.Lock()
 	defer bl.mtx.Unlock()
 	// calc free flow 1000*1000/1024/1024=0.954; 1024*1024/1000/1000=1.048
 	bl.freeBytes += int(time.Since(bl.ts) * time.Duration(bl.bw) / 8 / 954)
 	if bl.freeBytes > bl.maxFreeBytes {
 		bl.freeBytes = bl.maxFreeBytes
 	}
 	bl.freeBytes -= bytes
 	bl.ts = time.Now()
 	if bl.freeBytes < 0 {
 		// sleep for the overflow
 		time.Sleep(time.Millisecond * time.Duration(-bl.freeBytes/(bl.bw*1048/8)))
 	}
 }
@@ -5,8 +5,10 @@ import (
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/tls"
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
 	"math/big"
 	"math/rand"
 	"net"
 	"net/http"
@@ -197,8 +199,12 @@ func parseMajorVer(ver string) int {
 	return 0
 }
-func IsIPv6(address string) bool {
+func IsIPv6(ipStr string) bool {
-	return strings.Count(address, ":") >= 2
+	ip := net.ParseIP(ipStr)
 	if ip == nil {
 		return false
 	}
 	return ip.To16() != nil && ip.To4() == nil
 }
 var letters = []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-")
@@ -210,3 +216,67 @@ func randStr(n int) string {
 	}
 	return string(b)
 }
 func execCommand(commandPath string, wait bool, arg ...string) (err error) {
 	command := exec.Command(commandPath, arg...)
 	err = command.Start()
 	if err != nil {
 		return
 	}
 	if wait {
 		err = command.Wait()
 	}
 	return
 }
 func sanitizeFileName(fileName string) string {
 	validFileName := fileName
 	invalidChars := []string{"\\", "/", ":", "*", "?", "\"", "<", ">", "|"}
 	for _, char := range invalidChars {
 		validFileName = strings.ReplaceAll(validFileName, char, " ")
 	}
 	return validFileName
 }
 func prettyJson(s interface{}) string {
 	jsonData, err := json.MarshalIndent(s, "", "  ")
 	if err != nil {
 		fmt.Println("Error marshalling JSON:", err)
 		return ""
 	}
 	return string(jsonData)
 }
 func inetAtoN(ipstr string) (uint32, error) { // support both ipnet or single ip
 	i, _, err := net.ParseCIDR(ipstr)
 	if err != nil {
 		i = net.ParseIP(ipstr)
 		if i == nil {
 			return 0, err
 		}
 	}
 	ret := big.NewInt(0)
 	ret.SetBytes(i.To4())
 	return uint32(ret.Int64()), nil
 }
 func calculateChecksum(data []byte) uint16 {
 	length := len(data)
 	sum := uint32(0)
 	// Calculate the sum of 16-bit words
 	for i := 0; i < length-1; i += 2 {
 		sum += uint32(binary.BigEndian.Uint16(data[i : i+2]))
 	}
 	// Add the last byte (if odd length)
 	if length%2 != 0 {
 		sum += uint32(data[length-1])
 	}
 	// Fold 32-bit sum to 16 bits
 	sum = (sum >> 16) + (sum & 0xffff)
 	sum += (sum >> 16)
 	return uint16(^sum)
 }
@@ -1,6 +1,7 @@
 package openp2p
 import (
 	"fmt"
 	"log"
 	"testing"
 )
@@ -94,3 +95,35 @@ func TestParseMajorVer(t *testing.T) {
 	assertParseMajorVer(t, "3.0.0", 3)
 }
 func TestIsIPv6(t *testing.T) {
 	tests := []struct {
 		ipStr string
 		want  bool
 	}{
 		{"2001:0db8:85a3:0000:0000:8a2e:0370:7334", true}, // 有效的 IPv6 地址
 		{"2001:db8::2:1", true},                           // 有效的 IPv6 地址
 		{"192.168.1.1", false},                            // 无效的 IPv6 地址，是 IPv4
 		{"2001:db8::G:1", false},                          // 无效的 IPv6 地址，包含非法字符
 		// 可以添加更多测试用例
 	}
 	for _, tt := range tests {
 		got := IsIPv6(tt.ipStr)
 		if got != tt.want {
 			t.Errorf("isValidIPv6(%s) = %v, want %v", tt.ipStr, got, tt.want)
 		}
 	}
 }
 func TestNodeID(t *testing.T) {
 	node1 := "n1-stable"
 	node2 := "tony-stable"
 	nodeID1 := NodeNameToID(node1)
 	nodeID2 := NodeNameToID(node2)
 	if nodeID1 < nodeID2 {
 		fmt.Printf("%s < %s\n", node1, node2)
 	} else {
 		fmt.Printf("%s >= %s\n", node1, node2)
 	}
 }
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 )
@@ -15,20 +15,25 @@ var gConf Config
 type AppConfig struct {
 	// required
-	AppName   string
+	AppName          string
-	Protocol  string
+	Protocol         string
-	Whitelist string
+	UnderlayProtocol string
-	SrcPort   int
+	PunchPriority    int // bitwise DisableTCP|DisableUDP|TCPFirst  0:tcp and udp both enable, udp first
-	PeerNode  string
+	Whitelist        string
-	DstPort   int
+	SrcPort          int
-	DstHost   string
+	PeerNode         string
-	PeerUser  string
+	DstPort          int
-	RelayNode string
+	DstHost          string
-	Enabled   int // default:1
+	PeerUser         string
 	RelayNode        string
 	ForceRelay       int // default:0 disable;1 enable
 	Enabled          int // default:1
 	// runtime info
 	relayMode        string // private|public
 	peerVersion      string
 	peerToken        uint64
 	peerNatType      int
 	peerLanIP        string
 	hasIPv4          int
 	peerIPv6         string
 	hasUPNPorNATPMP  int
@@ -42,20 +47,103 @@ type AppConfig struct {
 	connectTime      time.Time
 	fromToken        uint64
 	linkMode         string
-	isUnderlayServer int // TODO: bool?
+	isUnderlayServer int
 }
-func (c *AppConfig) ID() string {
+const (
-	return fmt.Sprintf("%s%d", c.Protocol, c.SrcPort)
+	PunchPriorityTCPFirst   = 1
 	PunchPriorityUDPDisable = 1 << 1
 	PunchPriorityTCPDisable = 1 << 2
 )
 func (c *AppConfig) ID() uint64 {
 	if c.SrcPort == 0 { // memapp
 		return NodeNameToID(c.PeerNode)
 	}
 	if c.Protocol == "tcp" {
 		return uint64(c.SrcPort) * 10
 	}
 	return uint64(c.SrcPort)*10 + 1
 }
 func (c *AppConfig) LogPeerNode() string {
 	if c.relayMode == "public" { // memapp
 		return fmt.Sprintf("%d", NodeNameToID(c.PeerNode))
 	}
 	return c.PeerNode
 }
 // TODO: add loglevel, maxlogfilesize
 type Config struct {
-	Network    NetworkConfig `json:"network"`
+	Network NetworkConfig `json:"network"`
-	Apps       []*AppConfig  `json:"apps"`
+	Apps    []*AppConfig  `json:"apps"`
 	LogLevel   int
 	MaxLogSize int
 	daemonMode bool
 	mtx        sync.Mutex
 	sdwanMtx   sync.Mutex
 	sdwan      SDWANInfo
 	delNodes   []*SDWANNode
 	addNodes   []*SDWANNode
 }
 func (c *Config) getSDWAN() SDWANInfo {
 	c.sdwanMtx.Lock()
 	defer c.sdwanMtx.Unlock()
 	return c.sdwan
 }
 func (c *Config) getDelNodes() []*SDWANNode {
 	c.sdwanMtx.Lock()
 	defer c.sdwanMtx.Unlock()
 	return c.delNodes
 }
 func (c *Config) getAddNodes() []*SDWANNode {
 	c.sdwanMtx.Lock()
 	defer c.sdwanMtx.Unlock()
 	return c.addNodes
 }
 func (c *Config) resetSDWAN() {
 	c.sdwanMtx.Lock()
 	defer c.sdwanMtx.Unlock()
 	c.delNodes = []*SDWANNode{}
 	c.addNodes = []*SDWANNode{}
 	c.sdwan = SDWANInfo{}
 }
 func (c *Config) setSDWAN(s SDWANInfo) {
 	c.sdwanMtx.Lock()
 	defer c.sdwanMtx.Unlock()
 	// get old-new
 	c.delNodes = []*SDWANNode{}
 	for _, oldNode := range c.sdwan.Nodes {
 		isDeleted := true
 		for _, newNode := range s.Nodes {
 			if oldNode.Name == newNode.Name && oldNode.IP == newNode.IP && oldNode.Resource == newNode.Resource && c.sdwan.Mode == s.Mode && c.sdwan.CentralNode == s.CentralNode {
 				isDeleted = false
 				break
 			}
 		}
 		if isDeleted {
 			c.delNodes = append(c.delNodes, oldNode)
 		}
 	}
 	// get new-old
 	c.addNodes = []*SDWANNode{}
 	for _, newNode := range s.Nodes {
 		isNew := true
 		for _, oldNode := range c.sdwan.Nodes {
 			if oldNode.Name == newNode.Name && oldNode.IP == newNode.IP && oldNode.Resource == newNode.Resource && c.sdwan.Mode == s.Mode && c.sdwan.CentralNode == s.CentralNode {
 				isNew = false
 				break
 			}
 		}
 		if isNew {
 			c.addNodes = append(c.addNodes, newNode)
 		}
 	}
 	c.sdwan = s
 }
 func (c *Config) switchApp(app AppConfig, enabled int) {
@@ -71,28 +159,72 @@ func (c *Config) switchApp(app AppConfig, enabled int) {
 	}
 	c.save()
 }
 func (c *Config) retryApp(peerNode string) {
-	c.mtx.Lock()
+	GNetwork.apps.Range(func(id, i interface{}) bool {
-	defer c.mtx.Unlock()
+		app := i.(*p2pApp)
-	for i := 0; i < len(c.Apps); i++ {
+		if app.config.PeerNode == peerNode {
-		if c.Apps[i].PeerNode == peerNode {
+			gLog.Println(LvDEBUG, "retry app ", app.config.LogPeerNode())
-			c.Apps[i].retryNum = 0
+			app.config.retryNum = 0
-			c.Apps[i].nextRetryTime = time.Now()
+			app.config.nextRetryTime = time.Now()
 			app.retryRelayNum = 0
 			app.nextRetryRelayTime = time.Now()
 			app.hbMtx.Lock()
 			app.hbTimeRelay = time.Now().Add(-TunnelHeartbeatTime * 3)
 			app.hbMtx.Unlock()
 		}
-	}
+		if app.config.RelayNode == peerNode {
 			gLog.Println(LvDEBUG, "retry app ", app.config.LogPeerNode())
 			app.retryRelayNum = 0
 			app.nextRetryRelayTime = time.Now()
 			app.hbMtx.Lock()
 			app.hbTimeRelay = time.Now().Add(-TunnelHeartbeatTime * 3)
 			app.hbMtx.Unlock()
 		}
 		return true
 	})
 }
 func (c *Config) retryAllApp() {
 	GNetwork.apps.Range(func(id, i interface{}) bool {
 		app := i.(*p2pApp)
 		gLog.Println(LvDEBUG, "retry app ", app.config.LogPeerNode())
 		app.config.retryNum = 0
 		app.config.nextRetryTime = time.Now()
 		app.retryRelayNum = 0
 		app.nextRetryRelayTime = time.Now()
 		app.hbMtx.Lock()
 		defer app.hbMtx.Unlock()
 		app.hbTimeRelay = time.Now().Add(-TunnelHeartbeatTime * 3)
 		return true
 	})
 }
 func (c *Config) retryAllMemApp() {
 	GNetwork.apps.Range(func(id, i interface{}) bool {
 		app := i.(*p2pApp)
 		if app.config.SrcPort != 0 {
 			return true
 		}
 		gLog.Println(LvDEBUG, "retry app ", app.config.LogPeerNode())
 		app.config.retryNum = 0
 		app.config.nextRetryTime = time.Now()
 		app.retryRelayNum = 0
 		app.nextRetryRelayTime = time.Now()
 		app.hbMtx.Lock()
 		defer app.hbMtx.Unlock()
 		app.hbTimeRelay = time.Now().Add(-TunnelHeartbeatTime * 3)
 		return true
 	})
 }
 func (c *Config) add(app AppConfig, override bool) {
 	c.mtx.Lock()
 	defer c.mtx.Unlock()
 	defer c.save()
 	if app.SrcPort == 0 || app.DstPort == 0 {
 		gLog.Println(LvERROR, "invalid app ", app)
 		return
 	}
 	if override {
 		for i := 0; i < len(c.Apps); i++ {
-			if c.Apps[i].Protocol == app.Protocol && c.Apps[i].SrcPort == app.SrcPort {
+			if c.Apps[i].PeerNode == app.PeerNode && c.Apps[i].Protocol == app.Protocol && c.Apps[i].SrcPort == app.SrcPort {
 				c.Apps[i] = &app // override it
 				return
 			}
@@ -102,33 +234,51 @@ func (c *Config) add(app AppConfig, override bool) {
 }
 func (c *Config) delete(app AppConfig) {
 	if app.SrcPort == 0 || app.DstPort == 0 {
 		return
 	}
 	c.mtx.Lock()
 	defer c.mtx.Unlock()
 	defer c.save()
 	for i := 0; i < len(c.Apps); i++ {
-		if c.Apps[i].Protocol == app.Protocol && c.Apps[i].SrcPort == app.SrcPort {
+		if (app.SrcPort != 0 && c.Apps[i].Protocol == app.Protocol && c.Apps[i].SrcPort == app.SrcPort) || // normal app
-			c.Apps = append(c.Apps[:i], c.Apps[i+1:]...)
+			(app.SrcPort == 0 && c.Apps[i].PeerNode == app.PeerNode) { // memapp
 			if i == len(c.Apps)-1 {
 				c.Apps = c.Apps[:i]
 			} else {
 				c.Apps = append(c.Apps[:i], c.Apps[i+1:]...)
 			}
 			return
 		}
 	}
 }
 func (c *Config) save() {
 	// c.mtx.Lock()
 	// defer c.mtx.Unlock()  // internal call
 	if c.Network.Token == 0 {
 		return
 	}
 	data, _ := json.MarshalIndent(c, "", "  ")
-	err := ioutil.WriteFile("config.json", data, 0644)
+	err := os.WriteFile("config.json", data, 0644)
 	if err != nil {
 		gLog.Println(LvERROR, "save config.json error:", err)
 	}
 }
 func (c *Config) saveCache() {
 	// c.mtx.Lock()
 	// defer c.mtx.Unlock()  // internal call
 	if c.Network.Token == 0 {
 		return
 	}
 	data, _ := json.MarshalIndent(c, "", "  ")
 	err := os.WriteFile("config.json0", data, 0644)
 	if err != nil {
 		gLog.Println(LvERROR, "save config.json0 error:", err)
 	}
 }
 func init() {
 	gConf.LogLevel = int(LvINFO)
 	gConf.MaxLogSize = 1024 * 1024
 	gConf.Network.ShareBandwidth = 10
 	gConf.Network.ServerHost = "api.openp2p.cn"
 	gConf.Network.ServerPort = WsPort
@@ -138,19 +288,41 @@ func init() {
 func (c *Config) load() error {
 	c.mtx.Lock()
 	defer c.mtx.Unlock()
-	data, err := ioutil.ReadFile("config.json")
+	data, err := os.ReadFile("config.json")
 	if err != nil {
-		// gLog.Println(LevelERROR, "read config.json error:", err)
+		return c.loadCache()
 		return err
 	}
 	err = json.Unmarshal(data, &c)
 	if err != nil {
 		gLog.Println(LvERROR, "parse config.json error:", err)
 		// try cache
 		return c.loadCache()
 	}
 	// load ok. cache it
 	var filteredApps []*AppConfig // filter memapp
 	for _, app := range c.Apps {
 		if app.SrcPort != 0 {
 			filteredApps = append(filteredApps, app)
 		}
 	}
 	c.Apps = filteredApps
 	c.saveCache()
 	return err
 }
 func (c *Config) loadCache() error {
 	data, err := os.ReadFile("config.json0")
 	if err != nil {
 		return err
 	}
 	err = json.Unmarshal(data, &c)
 	if err != nil {
 		gLog.Println(LvERROR, "parse config.json0 error:", err)
 	}
 	return err
 }
-// TODO: deal with multi-thread r/w
+// deal with multi-thread r/w
 func (c *Config) setToken(token uint64) {
 	c.mtx.Lock()
 	defer c.mtx.Unlock()
@@ -170,6 +342,15 @@ func (c *Config) setNode(node string) {
 	defer c.mtx.Unlock()
 	defer c.save()
 	c.Network.Node = node
 	c.Network.nodeID = NodeNameToID(c.Network.Node)
 }
 func (c *Config) nodeID() uint64 {
 	c.mtx.Lock()
 	defer c.mtx.Unlock()
 	if c.Network.nodeID == 0 {
 		c.Network.nodeID = NodeNameToID(c.Network.Node)
 	}
 	return c.Network.nodeID
 }
 func (c *Config) setShareBandwidth(bw int) {
 	c.mtx.Lock()
@@ -192,6 +373,7 @@ type NetworkConfig struct {
 	// local info
 	Token           uint64
 	Node            string
 	nodeID          uint64
 	User            string
 	localIP         string
 	mac             string
@@ -210,7 +392,7 @@ type NetworkConfig struct {
 	TCPPort    int
 }
-func parseParams(subCommand string) {
+func parseParams(subCommand string, cmd string) {
 	fset := flag.NewFlagSet(subCommand, flag.ExitOnError)
 	serverHost := fset.String("serverhost", "api.openp2p.cn", "server host ")
 	serverPort := fset.Int("serverport", WsPort, "server port ")
@@ -224,6 +406,8 @@ func parseParams(subCommand string) {
 	srcPort := fset.Int("srcport", 0, "source port ")
 	tcpPort := fset.Int("tcpport", 0, "tcp port for upnp or publicip")
 	protocol := fset.String("protocol", "tcp", "tcp or udp")
 	underlayProtocol := fset.String("underlay_protocol", "quic", "quic or kcp")
 	punchPriority := fset.Int("punch_priority", 0, "bitwise DisableTCP|DisableUDP|UDPFirst  0:tcp and udp both enable, tcp first")
 	appName := fset.String("appname", "", "app name")
 	relayNode := fset.String("relaynode", "", "relaynode")
 	shareBandwidth := fset.Int("sharebandwidth", 10, "N mbps share bandwidth limit, private network no limit")
@@ -231,12 +415,20 @@ func parseParams(subCommand string) {
 	notVerbose := fset.Bool("nv", false, "not log console")
 	newconfig := fset.Bool("newconfig", false, "not load existing config.json")
 	logLevel := fset.Int("loglevel", 1, "0:debug 1:info 2:warn 3:error")
-	if subCommand == "" { // no subcommand
+	maxLogSize := fset.Int("maxlogsize", 1024*1024, "default 1MB")
-		fset.Parse(os.Args[1:])
+	if cmd == "" {
 		if subCommand == "" { // no subcommand
 			fset.Parse(os.Args[1:])
 		} else {
 			fset.Parse(os.Args[2:])
 		}
 	} else {
-		fset.Parse(os.Args[2:])
+		gLog.Println(LvINFO, "cmd=", cmd)
 		args := strings.Split(cmd, " ")
 		fset.Parse(args)
 	}
 	gLog.setMaxSize(int64(*maxLogSize))
 	config := AppConfig{Enabled: 1}
 	config.PeerNode = *peerNode
 	config.DstHost = *dstIP
@@ -244,12 +436,14 @@ func parseParams(subCommand string) {
 	config.DstPort = *dstPort
 	config.SrcPort = *srcPort
 	config.Protocol = *protocol
 	config.UnderlayProtocol = *underlayProtocol
 	config.PunchPriority = *punchPriority
 	config.AppName = *appName
 	config.RelayNode = *relayNode
 	if !*newconfig {
 		gConf.load() // load old config. otherwise will clear all apps
 	}
-	if config.SrcPort != 0 {
+	if config.SrcPort != 0 { // filter memapp
 		gConf.add(config, true)
 	}
 	// gConf.mtx.Lock() // when calling this func it's single-thread no lock
@@ -260,7 +454,7 @@ func parseParams(subCommand string) {
 			gConf.Network.ShareBandwidth = *shareBandwidth
 		}
 		if f.Name == "node" {
-			gConf.Network.Node = *node
+			gConf.setNode(*node)
 		}
 		if f.Name == "serverhost" {
 			gConf.Network.ServerHost = *serverHost
@@ -268,6 +462,9 @@ func parseParams(subCommand string) {
 		if f.Name == "loglevel" {
 			gConf.LogLevel = *logLevel
 		}
 		if f.Name == "maxlogsize" {
 			gConf.MaxLogSize = *maxLogSize
 		}
 		if f.Name == "tcpport" {
 			gConf.Network.TCPPort = *tcpPort
 		}
@@ -280,19 +477,19 @@ func parseParams(subCommand string) {
 		gConf.Network.ServerHost = *serverHost
 	}
 	if *node != "" {
-		gConf.Network.Node = *node
+		gConf.setNode(*node)
 	} else {
 		envNode := os.Getenv("OPENP2P_NODE")
 		if envNode != "" {
-			gConf.Network.Node = envNode
+			gConf.setNode(envNode)
 		}
 		if gConf.Network.Node == "" { // if node name not set. use os.Hostname
-			gConf.Network.Node = defaultNodeName()
+			gConf.setNode(defaultNodeName())
 		}
 	}
 	if gConf.Network.TCPPort == 0 {
 		if *tcpPort == 0 {
-			p := int(nodeNameToID(gConf.Network.Node)%15000 + 50000)
+			p := int(gConf.nodeID()%15000 + 50000)
 			tcpPort = &p
 		}
 		gConf.Network.TCPPort = *tcpPort
@@ -0,0 +1,178 @@
 package openp2p
 import (
 	"encoding/json"
 	"testing"
 )
 func TestSetSDWAN_ChangeNode(t *testing.T) {
 	conf := Config{}
 	sdwanInfo := SDWANInfo{}
 	sdwanStr := `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mate60pro","ip":"10.2.3.60"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"},{"name":"tony-stable","ip":"10.2.3.4","resource":"10.1.0.0/16"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo)
 	if len(conf.getDelNodes()) > 0 {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	if len(conf.getAddNodes()) != 7 {
 		t.Errorf("getAddNodes error")
 		return
 	}
 	sdwanInfo2 := SDWANInfo{}
 	sdwanStr = `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mate60pro","ip":"10.2.3.60"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo2); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo2)
 	diff := conf.getDelNodes()
 	if len(diff) != 1 && diff[0].IP != "10.2.3.4" {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	sdwanInfo3 := SDWANInfo{}
 	sdwanStr = `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo3); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo3)
 	diff = conf.getDelNodes()
 	if len(diff) != 1 && diff[0].IP != "10.2.3.60" {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	// add new node
 	sdwanInfo4 := SDWANInfo{}
 	sdwanStr = `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mate60pro","ip":"10.2.3.60"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo4); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo4)
 	diff = conf.getDelNodes()
 	if len(diff) > 0 {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	diff = conf.getAddNodes()
 	if len(diff) != 1 && diff[0].IP != "10.2.3.60" {
 		t.Errorf("getAddNodes error")
 		return
 	}
 }
 func TestSetSDWAN_ChangeNodeIP(t *testing.T) {
 	conf := Config{}
 	sdwanInfo := SDWANInfo{}
 	sdwanStr := `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mate60pro","ip":"10.2.3.60"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"},{"name":"tony-stable","ip":"10.2.3.4","resource":"10.1.0.0/16"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo)
 	if len(conf.getDelNodes()) > 0 {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	sdwanInfo2 := SDWANInfo{}
 	sdwanStr = `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mate60pro","ip":"10.2.3.60"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"},{"name":"tony-stable","ip":"10.2.3.44","resource":"10.1.0.0/16"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo2); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo2)
 	diff := conf.getDelNodes()
 	if len(diff) != 1 && diff[0].IP != "10.2.3.4" {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	diff = conf.getAddNodes()
 	if len(diff) != 1 || diff[0].IP != "10.2.3.44" {
 		t.Errorf("getAddNodes error")
 		return
 	}
 }
 func TestSetSDWAN_ClearAll(t *testing.T) {
 	conf := Config{}
 	sdwanInfo := SDWANInfo{}
 	sdwanStr := `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mate60pro","ip":"10.2.3.60"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"},{"name":"tony-stable","ip":"10.2.3.4","resource":"10.1.0.0/16"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo)
 	if len(conf.getDelNodes()) > 0 {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	sdwanInfo2 := SDWANInfo{}
 	sdwanStr = `{"Nodes":null}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo2); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo2)
 	diff := conf.getDelNodes()
 	if len(diff) != 7 {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	diff = conf.getAddNodes()
 	if len(diff) != 0 {
 		t.Errorf("getAddNodes error")
 		return
 	}
 }
 func TestSetSDWAN_ChangeNodeResource(t *testing.T) {
 	conf := Config{}
 	sdwanInfo := SDWANInfo{}
 	sdwanStr := `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mate60pro","ip":"10.2.3.60"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"},{"name":"tony-stable","ip":"10.2.3.4","resource":"10.1.0.0/16"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo)
 	if len(conf.getDelNodes()) > 0 {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	sdwanInfo2 := SDWANInfo{}
 	sdwanStr = `{"id":1312667996276071700,"name":"network1","gateway":"10.2.3.254/24","mode":"fullmesh","centralNode":"n1-stable","enable":1,"Nodes":[{"name":"222-debug","ip":"10.2.3.13"},{"name":"222stable","ip":"10.2.3.222"},{"name":"5800-debug","ip":"10.2.3.56"},{"name":"Mate60pro","ip":"10.2.3.60"},{"name":"Mymatepad2023","ip":"10.2.3.23"},{"name":"n1-stable","ip":"10.2.3.29","resource":"192.168.3.0/24"},{"name":"tony-stable","ip":"10.2.3.4","resource":"10.11.0.0/16"}]}`
 	if err := json.Unmarshal([]byte(sdwanStr), &sdwanInfo2); err != nil {
 		t.Errorf("unmarshal error")
 		return
 	}
 	conf.setSDWAN(sdwanInfo2)
 	diff := conf.getDelNodes()
 	if len(diff) != 1 && diff[0].IP != "10.2.3.4" {
 		t.Errorf("getDelNodes error")
 		return
 	}
 	diff = conf.getAddNodes()
 	if len(diff) != 1 || diff[0].Resource != "10.11.0.0/16" {
 		t.Errorf("getAddNodes error")
 		return
 	}
 }
 func TestInetAtoN(t *testing.T) {
 	ipa, _ := inetAtoN("121.5.147.4")
 	t.Log(ipa)
 	ipa, _ = inetAtoN("121.5.147.4/32")
 	t.Log(ipa)
 }
@@ -1,115 +1,115 @@
-package openp2p
+package openp2p
-
+
-import (
+import (
-	"fmt"
+	"fmt"
-	"os"
+	"os"
-	"path/filepath"
+	"path/filepath"
-	"time"
+	"time"
-
+
-	"github.com/openp2p-cn/service"
+	"github.com/openp2p-cn/service"
-)
+)
-
+
-type daemon struct {
+type daemon struct {
-	running bool
+	running bool
-	proc    *os.Process
+	proc    *os.Process
-}
+}
-
+
-func (d *daemon) Start(s service.Service) error {
+func (d *daemon) Start(s service.Service) error {
-	gLog.Println(LvINFO, "daemon start")
+	gLog.Println(LvINFO, "daemon start")
-	return nil
+	return nil
-}
+}
-
+
-func (d *daemon) Stop(s service.Service) error {
+func (d *daemon) Stop(s service.Service) error {
-	gLog.Println(LvINFO, "service stop")
+	gLog.Println(LvINFO, "service stop")
-	d.running = false
+	d.running = false
-	if d.proc != nil {
+	if d.proc != nil {
-		gLog.Println(LvINFO, "stop worker")
+		gLog.Println(LvINFO, "stop worker")
-		d.proc.Kill()
+		d.proc.Kill()
-	}
+	}
-	if service.Interactive() {
+	if service.Interactive() {
-		gLog.Println(LvINFO, "stop daemon")
+		gLog.Println(LvINFO, "stop daemon")
-		os.Exit(0)
+		os.Exit(0)
-	}
+	}
-	return nil
+	return nil
-}
+}
-
+
-func (d *daemon) run() {
+func (d *daemon) run() {
-	gLog.Println(LvINFO, "daemon run start")
+	gLog.Println(LvINFO, "daemon run start")
-	defer gLog.Println(LvINFO, "daemon run end")
+	defer gLog.Println(LvINFO, "daemon run end")
-	d.running = true
+	d.running = true
-	binPath, _ := os.Executable()
+	binPath, _ := os.Executable()
-	mydir, err := os.Getwd()
+	mydir, err := os.Getwd()
-	if err != nil {
+	if err != nil {
-		fmt.Println(err)
+		fmt.Println(err)
-	}
+	}
-	gLog.Println(LvINFO, mydir)
+	gLog.Println(LvINFO, mydir)
-	conf := &service.Config{
+	conf := &service.Config{
-		Name:        ProductName,
+		Name:        ProductName,
-		DisplayName: ProductName,
+		DisplayName: ProductName,
-		Description: ProductName,
+		Description: ProductName,
-		Executable:  binPath,
+		Executable:  binPath,
-	}
+	}
-
+
-	s, _ := service.New(d, conf)
+	s, _ := service.New(d, conf)
-	go s.Run()
+	go s.Run()
-	var args []string
+	var args []string
-	// rm -d parameter
+	// rm -d parameter
-	for i := 0; i < len(os.Args); i++ {
+	for i := 0; i < len(os.Args); i++ {
-		if os.Args[i] == "-d" {
+		if os.Args[i] == "-d" {
-			args = append(os.Args[0:i], os.Args[i+1:]...)
+			args = append(os.Args[0:i], os.Args[i+1:]...)
-			break
+			break
-		}
+		}
-	}
+	}
-	args = append(args, "-nv")
+	args = append(args, "-nv")
-	for {
+	for {
-		// start worker
+		// start worker
-		tmpDump := filepath.Join("log", "dump.log.tmp")
+		tmpDump := filepath.Join("log", "dump.log.tmp")
-		dumpFile := filepath.Join("log", "dump.log")
+		dumpFile := filepath.Join("log", "dump.log")
-		f, err := os.Create(filepath.Join(tmpDump))
+		f, err := os.Create(filepath.Join(tmpDump))
-		if err != nil {
+		if err != nil {
-			gLog.Printf(LvERROR, "start worker error:%s", err)
+			gLog.Printf(LvERROR, "start worker error:%s", err)
-			return
+			return
-		}
+		}
-		gLog.Println(LvINFO, "start worker process, args:", args)
+		gLog.Println(LvINFO, "start worker process, args:", args)
-		execSpec := &os.ProcAttr{Env: append(os.Environ(), "GOTRACEBACK=crash"), Files: []*os.File{os.Stdin, os.Stdout, f}}
+		execSpec := &os.ProcAttr{Env: append(os.Environ(), "GOTRACEBACK=crash"), Files: []*os.File{os.Stdin, os.Stdout, f}}
-		p, err := os.StartProcess(binPath, args, execSpec)
+		p, err := os.StartProcess(binPath, args, execSpec)
-		if err != nil {
+		if err != nil {
-			gLog.Printf(LvERROR, "start worker error:%s", err)
+			gLog.Printf(LvERROR, "start worker error:%s", err)
-			return
+			return
-		}
+		}
-		d.proc = p
+		d.proc = p
-		_, _ = p.Wait()
+		_, _ = p.Wait()
-		f.Close()
+		f.Close()
-		time.Sleep(time.Second)
+		time.Sleep(time.Second)
-		err = os.Rename(tmpDump, dumpFile)
+		err = os.Rename(tmpDump, dumpFile)
-		if err != nil {
+		if err != nil {
-			gLog.Printf(LvERROR, "rename dump error:%s", err)
+			gLog.Printf(LvERROR, "rename dump error:%s", err)
-		}
+		}
-		if !d.running {
+		if !d.running {
-			return
+			return
-		}
+		}
-		gLog.Printf(LvERROR, "worker stop, restart it after 10s")
+		gLog.Printf(LvERROR, "worker stop, restart it after 10s")
-		time.Sleep(time.Second * 10)
+		time.Sleep(time.Second * 10)
-	}
+	}
-}
+}
-
+
-func (d *daemon) Control(ctrlComm string, exeAbsPath string, args []string) error {
+func (d *daemon) Control(ctrlComm string, exeAbsPath string, args []string) error {
-	svcConfig := &service.Config{
+	svcConfig := &service.Config{
-		Name:        ProductName,
+		Name:        ProductName,
-		DisplayName: ProductName,
+		DisplayName: ProductName,
-		Description: ProductName,
+		Description: ProductName,
-		Executable:  exeAbsPath,
+		Executable:  exeAbsPath,
-		Arguments:   args,
+		Arguments:   args,
-	}
+	}
-
+
-	s, e := service.New(d, svcConfig)
+	s, e := service.New(d, svcConfig)
-	if e != nil {
+	if e != nil {
-		return e
+		return e
-	}
+	}
-	e = service.Control(s, ctrlComm)
+	e = service.Control(s, ctrlComm)
-	if e != nil {
+	if e != nil {
-		return e
+		return e
-	}
+	}
-
+
-	return nil
+	return nil
-}
+}
@@ -13,10 +13,21 @@ var (
 	ErrorNewUser             = errors.New("new user")
 	ErrorLogin               = errors.New("user or password not correct")
 	ErrNodeTooShort          = errors.New("node name too short, it must >=8 charaters")
 	ErrReadDB                = errors.New("read db error")
 	ErrNoUpdate              = errors.New("there are currently no updates available")
 	ErrPeerOffline           = errors.New("peer offline")
 	ErrNetwork               = errors.New("network error")
 	ErrMsgFormat             = errors.New("message format wrong")
 	ErrVersionNotCompatible  = errors.New("version not compatible")
 	ErrOverlayConnDisconnect = errors.New("overlay connection is disconnected")
 	ErrConnectRelayNode      = errors.New("connect relay node error")
 	ErrConnectPublicV4       = errors.New("connect public ipv4 error")
 	ErrMsgChannelNotFound    = errors.New("message channel not found")
 	ErrRelayTunnelNotFound   = errors.New("relay tunnel not found")
 	ErrSymmetricLimit        = errors.New("symmetric limit")
 	ErrForceRelay            = errors.New("force relay")
 	ErrPeerConnectRelay      = errors.New("peer connect relayNode error")
 	ErrBuildTunnelBusy       = errors.New("build tunnel busy")
 	ErrMemAppTunnelNotFound  = errors.New("memapp tunnel not found")
 	ErrRemoteServiceUnable   = errors.New("remote service unable")
 )
@@ -1,298 +1,482 @@
-package openp2p
+package openp2p
-
+
-import (
+import (
-	"bytes"
+	"bytes"
-	"encoding/binary"
+	"encoding/binary"
-	"encoding/json"
+	"encoding/json"
-	"fmt"
+	"fmt"
-	"os"
+	"net"
-	"path/filepath"
+	"os"
-	"reflect"
+	"path/filepath"
-	"time"
+	"reflect"
-
+	"runtime"
-	"github.com/openp2p-cn/totp"
+	"time"
-)
+
-
+	"github.com/openp2p-cn/totp"
-func handlePush(pn *P2PNetwork, subType uint16, msg []byte) error {
+)
-	pushHead := PushHeader{}
+
-	err := binary.Read(bytes.NewReader(msg[openP2PHeaderSize:openP2PHeaderSize+PushHeaderSize]), binary.LittleEndian, &pushHead)
+func handlePush(subType uint16, msg []byte) error {
-	if err != nil {
+	pushHead := PushHeader{}
-		return err
+	err := binary.Read(bytes.NewReader(msg[openP2PHeaderSize:openP2PHeaderSize+PushHeaderSize]), binary.LittleEndian, &pushHead)
-	}
+	if err != nil {
-	gLog.Printf(LvDEBUG, "handle push msg type:%d, push header:%+v", subType, pushHead)
+		return err
-	switch subType {
+	}
-	case MsgPushConnectReq: // TODO: handle a msg move to a new function
+	gLog.Printf(LvDEBUG, "handle push msg type:%d, push header:%+v", subType, pushHead)
-		err = handleConnectReq(pn, subType, msg)
+	switch subType {
-	case MsgPushRsp:
+	case MsgPushConnectReq:
-		rsp := PushRsp{}
+		err = handleConnectReq(msg)
-		if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
+	case MsgPushRsp:
-			gLog.Printf(LvERROR, "wrong pushRsp:%s", err)
+		rsp := PushRsp{}
-			return err
+		if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
-		}
+			gLog.Printf(LvERROR, "wrong pushRsp:%s", err)
-		if rsp.Error == 0 {
+			return err
-			gLog.Printf(LvDEBUG, "push ok, detail:%s", rsp.Detail)
+		}
-		} else {
+		if rsp.Error == 0 {
-			gLog.Printf(LvERROR, "push error:%d, detail:%s", rsp.Error, rsp.Detail)
+			gLog.Printf(LvDEBUG, "push ok, detail:%s", rsp.Detail)
-		}
+		} else {
-	case MsgPushAddRelayTunnelReq:
+			gLog.Printf(LvERROR, "push error:%d, detail:%s", rsp.Error, rsp.Detail)
-		req := AddRelayTunnelReq{}
+		}
-		if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
+	case MsgPushAddRelayTunnelReq:
-			gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
+		req := AddRelayTunnelReq{}
-			return err
+		if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
-		}
+			gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
-		config := AppConfig{}
+			return err
-		config.PeerNode = req.RelayName
+		}
-		config.peerToken = req.RelayToken
+		config := AppConfig{}
-		go func(r AddRelayTunnelReq) {
+		config.PeerNode = req.RelayName
-			t, errDt := pn.addDirectTunnel(config, 0)
+		config.peerToken = req.RelayToken
-			if errDt == nil {
+		config.relayMode = req.RelayMode
-				// notify peer relay ready
+		go func(r AddRelayTunnelReq) {
-				msg := TunnelMsg{ID: t.id}
+			t, errDt := GNetwork.addDirectTunnel(config, 0)
-				pn.push(r.From, MsgPushAddRelayTunnelRsp, msg)
+			if errDt == nil {
-			} else {
+				// notify peer relay ready
-				pn.push(r.From, MsgPushAddRelayTunnelRsp, "error") // compatible with old version client, trigger unmarshal error
+				msg := TunnelMsg{ID: t.id}
-			}
+				GNetwork.push(r.From, MsgPushAddRelayTunnelRsp, msg)
-		}(req)
+				appConfig := config
-	case MsgPushAPPKey:
+				appConfig.PeerNode = req.From
-		req := APPKeySync{}
+			} else {
-		if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
+				gLog.Printf(LvERROR, "addDirectTunnel error:%s", errDt)
-			gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
+				GNetwork.push(r.From, MsgPushAddRelayTunnelRsp, "error") // compatible with old version client, trigger unmarshal error
-			return err
+			}
-		}
+		}(req)
-		SaveKey(req.AppID, req.AppKey)
+	case MsgPushServerSideSaveMemApp:
-	case MsgPushUpdate:
+		req := ServerSideSaveMemApp{}
-		gLog.Println(LvINFO, "MsgPushUpdate")
+		if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
-		err := update(pn.config.ServerHost, pn.config.ServerPort)
+			gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
-		if err == nil {
+			return err
-			os.Exit(0)
+		}
-		}
+		gLog.Println(LvDEBUG, "handle MsgPushServerSideSaveMemApp:", prettyJson(req))
-		return err
+		var existTunnel *P2PTunnel
-	case MsgPushRestart:
+		i, ok := GNetwork.allTunnels.Load(req.TunnelID)
-		gLog.Println(LvINFO, "MsgPushRestart")
+		if !ok {
-		os.Exit(0)
+			time.Sleep(time.Millisecond * 100)
-		return err
+			i, ok = GNetwork.allTunnels.Load(req.TunnelID) // retry sometimes will receive MsgPushServerSideSaveMemApp but p2ptunnel not store yet.
-	case MsgPushReportApps:
+			if !ok {
-		err = handleReportApps(pn, subType, msg)
+				gLog.Println(LvERROR, "handle MsgPushServerSideSaveMemApp error:", ErrMemAppTunnelNotFound)
-	case MsgPushReportLog:
+				return ErrMemAppTunnelNotFound
-		err = handleLog(pn, subType, msg)
+			}
-	case MsgPushEditApp:
+		}
-		err = handleEditApp(pn, subType, msg)
+		existTunnel = i.(*P2PTunnel)
-	case MsgPushEditNode:
+		peerID := NodeNameToID(req.From)
-		gLog.Println(LvINFO, "MsgPushEditNode")
+		existApp, appok := GNetwork.apps.Load(peerID)
-		req := EditNode{}
+		if appok {
-		if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
+			app := existApp.(*p2pApp)
-			gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
+			app.config.AppName = fmt.Sprintf("%d", peerID)
-			return err
+			app.id = req.AppID
-		}
+			app.setRelayTunnelID(req.RelayTunnelID)
-		gConf.setNode(req.NewName)
+			app.relayMode = req.RelayMode
-		gConf.setShareBandwidth(req.Bandwidth)
+			app.hbTimeRelay = time.Now()
-		// TODO: hot reload
+			if req.RelayTunnelID == 0 {
-		os.Exit(0)
+				app.setDirectTunnel(existTunnel)
-	case MsgPushSwitchApp:
+			} else {
-		gLog.Println(LvINFO, "MsgPushSwitchApp")
+				app.setRelayTunnel(existTunnel)
-		app := AppInfo{}
+			}
-		if err = json.Unmarshal(msg[openP2PHeaderSize:], &app); err != nil {
+			gLog.Println(LvDEBUG, "find existing memapp, update it")
-			gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(app), err, string(msg[openP2PHeaderSize:]))
+		} else {
-			return err
+			appConfig := existTunnel.config
-		}
+			appConfig.SrcPort = 0
-		config := AppConfig{Enabled: app.Enabled, SrcPort: app.SrcPort, Protocol: app.Protocol}
+			appConfig.Protocol = ""
-		gLog.Println(LvINFO, app.AppName, " switch to ", app.Enabled)
+			appConfig.AppName = fmt.Sprintf("%d", peerID)
-		gConf.switchApp(config, app.Enabled)
+			appConfig.PeerNode = req.From
-		if app.Enabled == 0 {
+			app := p2pApp{
-			// disable APP
+				id:          req.AppID,
-			pn.DeleteApp(config)
+				config:      appConfig,
-		}
+				relayMode:   req.RelayMode,
-	case MsgPushDstNodeOnline:
+				running:     true,
-		gLog.Println(LvINFO, "MsgPushDstNodeOnline")
+				hbTimeRelay: time.Now(),
-		req := PushDstNodeOnline{}
+			}
-		if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
+			if req.RelayTunnelID == 0 {
-			gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
+				app.setDirectTunnel(existTunnel)
-			return err
+			} else {
-		}
+				app.setRelayTunnel(existTunnel)
-		gLog.Println(LvINFO, "retry peerNode ", req.Node)
+				app.setRelayTunnelID(req.RelayTunnelID)
-		gConf.retryApp(req.Node)
+			}
-	default:
+			if req.RelayTunnelID != 0 {
-		pn.msgMapMtx.Lock()
+				app.relayNode = req.Node
-		ch := pn.msgMap[pushHead.From]
+			}
-		pn.msgMapMtx.Unlock()
+			GNetwork.apps.Store(NodeNameToID(req.From), &app)
-		ch <- pushMsg{data: msg, ts: time.Now()}
+		}
-	}
+
-	return err
+		return nil
-}
+	case MsgPushAPPKey:
-
+		req := APPKeySync{}
-func handleEditApp(pn *P2PNetwork, subType uint16, msg []byte) (err error) {
+		if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
-	gLog.Println(LvINFO, "MsgPushEditApp")
+			gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
-	newApp := AppInfo{}
+			return err
-	if err = json.Unmarshal(msg[openP2PHeaderSize:], &newApp); err != nil {
+		}
-		gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(newApp), err, string(msg[openP2PHeaderSize:]))
+		SaveKey(req.AppID, req.AppKey)
-		return err
+	case MsgPushUpdate:
-	}
+		gLog.Println(LvINFO, "MsgPushUpdate")
-	oldConf := AppConfig{Enabled: 1}
+		err := update(gConf.Network.ServerHost, gConf.Network.ServerPort)
-	// protocol0+srcPort0 exist, delApp
+		if err == nil {
-	oldConf.AppName = newApp.AppName
+			os.Exit(0)
-	oldConf.Protocol = newApp.Protocol0
+		}
-	oldConf.Whitelist = newApp.Whitelist
+		return err
-	oldConf.SrcPort = newApp.SrcPort0
+	case MsgPushRestart:
-	oldConf.PeerNode = newApp.PeerNode
+		gLog.Println(LvINFO, "MsgPushRestart")
-	oldConf.DstHost = newApp.DstHost
+		os.Exit(0)
-	oldConf.DstPort = newApp.DstPort
+		return err
-
+	case MsgPushReportApps:
-	gConf.delete(oldConf)
+		err = handleReportApps()
-	// AddApp
+	case MsgPushReportMemApps:
-	newConf := oldConf
+		err = handleReportMemApps()
-	newConf.Protocol = newApp.Protocol
+	case MsgPushReportLog:
-	newConf.SrcPort = newApp.SrcPort
+		err = handleLog(msg)
-	gConf.add(newConf, false)
+	case MsgPushReportGoroutine:
-	pn.DeleteApp(oldConf) // DeleteApp may cost some times, execute at the end
+		err = handleReportGoroutine()
-	return nil
+	case MsgPushCheckRemoteService:
-	// autoReconnect will auto AddApp
+		err = handleCheckRemoteService(msg)
-	// pn.AddApp(config)
+	case MsgPushEditApp:
-	// TODO: report result
+		err = handleEditApp(msg)
-}
+	case MsgPushEditNode:
-
+		gLog.Println(LvINFO, "MsgPushEditNode")
-func handleConnectReq(pn *P2PNetwork, subType uint16, msg []byte) (err error) {
+		req := EditNode{}
-	req := PushConnectReq{}
+		if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
-	if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
+			gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
-		gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
+			return err
-		return err
+		}
-	}
+		gConf.setNode(req.NewName)
-	gLog.Printf(LvDEBUG, "%s is connecting...", req.From)
+		gConf.setShareBandwidth(req.Bandwidth)
-	gLog.Println(LvDEBUG, "push connect response to ", req.From)
+		os.Exit(0)
-	if compareVersion(req.Version, LeastSupportVersion) == LESS {
+	case MsgPushSwitchApp:
-		gLog.Println(LvERROR, ErrVersionNotCompatible.Error(), ":", req.From)
+		gLog.Println(LvINFO, "MsgPushSwitchApp")
-		rsp := PushConnectRsp{
+		app := AppInfo{}
-			Error:  10,
+		if err = json.Unmarshal(msg[openP2PHeaderSize:], &app); err != nil {
-			Detail: ErrVersionNotCompatible.Error(),
+			gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(app), err, string(msg[openP2PHeaderSize:]))
-			To:     req.From,
+			return err
-			From:   pn.config.Node,
+		}
-		}
+		config := AppConfig{Enabled: app.Enabled, SrcPort: app.SrcPort, Protocol: app.Protocol}
-		pn.push(req.From, MsgPushConnectRsp, rsp)
+		gLog.Println(LvINFO, app.AppName, " switch to ", app.Enabled)
-		return ErrVersionNotCompatible
+		gConf.switchApp(config, app.Enabled)
-	}
+		if app.Enabled == 0 {
-	// verify totp token or token
+			// disable APP
-	t := totp.TOTP{Step: totp.RelayTOTPStep}
+			GNetwork.DeleteApp(config)
-	if t.Verify(req.Token, pn.config.Token, time.Now().Unix()-pn.dt/int64(time.Second)) { // localTs may behind, auto adjust ts
+		}
-		gLog.Printf(LvINFO, "Access Granted\n")
+	case MsgPushDstNodeOnline:
-		config := AppConfig{}
+		gLog.Println(LvINFO, "MsgPushDstNodeOnline")
-		config.peerNatType = req.NatType
+		req := PushDstNodeOnline{}
-		config.peerConeNatPort = req.ConeNatPort
+		if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
-		config.peerIP = req.FromIP
+			gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
-		config.PeerNode = req.From
+			return err
-		config.peerVersion = req.Version
+		}
-		config.fromToken = req.Token
+		gLog.Println(LvINFO, "retry peerNode ", req.Node)
-		config.peerIPv6 = req.IPv6
+		gConf.retryApp(req.Node)
-		config.hasIPv4 = req.HasIPv4
+	default:
-		config.hasUPNPorNATPMP = req.HasUPNPorNATPMP
+		i, ok := GNetwork.msgMap.Load(pushHead.From)
-		config.linkMode = req.LinkMode
+		if !ok {
-		config.isUnderlayServer = req.IsUnderlayServer
+			return ErrMsgChannelNotFound
-		// share relay node will limit bandwidth
+		}
-		if req.Token != pn.config.Token {
+		ch := i.(chan msgCtx)
-			gLog.Printf(LvINFO, "set share bandwidth %d mbps", pn.config.ShareBandwidth)
+		ch <- msgCtx{data: msg, ts: time.Now()}
-			config.shareBandwidth = pn.config.ShareBandwidth
+	}
-		}
+	return err
-		// go pn.AddTunnel(config, req.ID)
+}
-		go pn.addDirectTunnel(config, req.ID)
+
-		return nil
+func handleEditApp(msg []byte) (err error) {
-	}
+	gLog.Println(LvINFO, "MsgPushEditApp")
-	gLog.Println(LvERROR, "Access Denied:", req.From)
+	newApp := AppInfo{}
-	rsp := PushConnectRsp{
+	if err = json.Unmarshal(msg[openP2PHeaderSize:], &newApp); err != nil {
-		Error:  1,
+		gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(newApp), err, string(msg[openP2PHeaderSize:]))
-		Detail: fmt.Sprintf("connect to %s error: Access Denied", pn.config.Node),
+		return err
-		To:     req.From,
+	}
-		From:   pn.config.Node,
+	oldConf := AppConfig{Enabled: 1}
-	}
+	// protocol0+srcPort0 exist, delApp
-	return pn.push(req.From, MsgPushConnectRsp, rsp)
+	oldConf.AppName = newApp.AppName
-}
+	oldConf.Protocol = newApp.Protocol0
-
+	oldConf.Whitelist = newApp.Whitelist
-func handleReportApps(pn *P2PNetwork, subType uint16, msg []byte) (err error) {
+	oldConf.SrcPort = newApp.SrcPort0
-	gLog.Println(LvINFO, "MsgPushReportApps")
+	oldConf.PeerNode = newApp.PeerNode
-	req := ReportApps{}
+	oldConf.DstHost = newApp.DstHost
-	gConf.mtx.Lock()
+	oldConf.DstPort = newApp.DstPort
-	defer gConf.mtx.Unlock()
+	if newApp.Protocol0 != "" && newApp.SrcPort0 != 0 { // not edit
-	for _, config := range gConf.Apps {
+		gConf.delete(oldConf)
-		appActive := 0
+	}
-		relayNode := ""
+
-		relayMode := ""
+	// AddApp
-		linkMode := LinkModeUDPPunch
+	newConf := oldConf
-		i, ok := pn.apps.Load(config.ID())
+	newConf.Protocol = newApp.Protocol
-		if ok {
+	newConf.SrcPort = newApp.SrcPort
-			app := i.(*p2pApp)
+	newConf.RelayNode = newApp.SpecRelayNode
-			if app.isActive() {
+	newConf.PunchPriority = newApp.PunchPriority
-				appActive = 1
+	gConf.add(newConf, false)
-			}
+	if newApp.Protocol0 != "" && newApp.SrcPort0 != 0 { // not edit
-			relayNode = app.relayNode
+		GNetwork.DeleteApp(oldConf) // DeleteApp may cost some times, execute at the end
-			relayMode = app.relayMode
+	}
-			linkMode = app.tunnel.linkModeWeb
+	return nil
-		}
+}
-		appInfo := AppInfo{
+
-			AppName:     config.AppName,
+func handleConnectReq(msg []byte) (err error) {
-			Error:       config.errMsg,
+	req := PushConnectReq{}
-			Protocol:    config.Protocol,
+	if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
-			Whitelist:   config.Whitelist,
+		gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
-			SrcPort:     config.SrcPort,
+		return err
-			RelayNode:   relayNode,
+	}
-			RelayMode:   relayMode,
+	gLog.Printf(LvDEBUG, "%s is connecting...", req.From)
-			LinkMode:    linkMode,
+	gLog.Println(LvDEBUG, "push connect response to ", req.From)
-			PeerNode:    config.PeerNode,
+	if compareVersion(req.Version, LeastSupportVersion) < 0 {
-			DstHost:     config.DstHost,
+		gLog.Println(LvERROR, ErrVersionNotCompatible.Error(), ":", req.From)
-			DstPort:     config.DstPort,
+		rsp := PushConnectRsp{
-			PeerUser:    config.PeerUser,
+			Error:  10,
-			PeerIP:      config.peerIP,
+			Detail: ErrVersionNotCompatible.Error(),
-			PeerNatType: config.peerNatType,
+			To:     req.From,
-			RetryTime:   config.retryTime.Local().Format("2006-01-02T15:04:05-0700"),
+			From:   gConf.Network.Node,
-			ConnectTime: config.connectTime.Local().Format("2006-01-02T15:04:05-0700"),
+		}
-			IsActive:    appActive,
+		GNetwork.push(req.From, MsgPushConnectRsp, rsp)
-			Enabled:     config.Enabled,
+		return ErrVersionNotCompatible
-		}
+	}
-		req.Apps = append(req.Apps, appInfo)
+	// verify totp token or token
-	}
+	t := totp.TOTP{Step: totp.RelayTOTPStep}
-	return pn.write(MsgReport, MsgReportApps, &req)
+	if t.Verify(req.Token, gConf.Network.Token, time.Now().Unix()-GNetwork.dt/int64(time.Second)) { // localTs may behind, auto adjust ts
-}
+		gLog.Printf(LvINFO, "Access Granted")
-
+		config := AppConfig{}
-func handleLog(pn *P2PNetwork, subType uint16, msg []byte) (err error) {
+		config.peerNatType = req.NatType
-	gLog.Println(LvDEBUG, "MsgPushReportLog")
+		config.peerConeNatPort = req.ConeNatPort
-	const defaultLen = 1024 * 128
+		config.peerIP = req.FromIP
-	const maxLen = 1024 * 1024
+		config.PeerNode = req.From
-	req := ReportLogReq{}
+		config.peerVersion = req.Version
-	if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
+		config.fromToken = req.Token
-		gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
+		config.peerIPv6 = req.IPv6
-		return err
+		config.hasIPv4 = req.HasIPv4
-	}
+		config.hasUPNPorNATPMP = req.HasUPNPorNATPMP
-	if req.FileName == "" {
+		config.linkMode = req.LinkMode
-		req.FileName = "openp2p.log"
+		config.isUnderlayServer = req.IsUnderlayServer
-	}
+		config.UnderlayProtocol = req.UnderlayProtocol
-	f, err := os.Open(filepath.Join("log", req.FileName))
+		// share relay node will limit bandwidth
-	if err != nil {
+		if req.Token != gConf.Network.Token {
-		gLog.Println(LvERROR, "read log file error:", err)
+			gLog.Printf(LvINFO, "set share bandwidth %d mbps", gConf.Network.ShareBandwidth)
-		return err
+			config.shareBandwidth = gConf.Network.ShareBandwidth
-	}
+		}
-	fi, err := f.Stat()
+		// go GNetwork.AddTunnel(config, req.ID)
-	if err != nil {
+		go func() {
-		return err
+			GNetwork.addDirectTunnel(config, req.ID)
-	}
+		}()
-	if req.Offset > fi.Size() {
+		return nil
-		req.Offset = fi.Size() - defaultLen
+	}
-	}
+	gLog.Println(LvERROR, "Access Denied:", req.From)
-	// verify input parameters
+	rsp := PushConnectRsp{
-	if req.Offset < 0 {
+		Error:  1,
-		req.Offset = 0
+		Detail: fmt.Sprintf("connect to %s error: Access Denied", gConf.Network.Node),
-	}
+		To:     req.From,
-	if req.Len <= 0 || req.Len > maxLen {
+		From:   gConf.Network.Node,
-		req.Len = defaultLen
+	}
-	}
+	return GNetwork.push(req.From, MsgPushConnectRsp, rsp)
-
+}
-	f.Seek(req.Offset, 0)
+
-	buff := make([]byte, req.Len)
+func handleReportApps() (err error) {
-	readLength, err := f.Read(buff)
+	gLog.Println(LvINFO, "MsgPushReportApps")
-	f.Close()
+	req := ReportApps{}
-	if err != nil {
+	gConf.mtx.Lock()
-		gLog.Println(LvERROR, "read log content error:", err)
+	defer gConf.mtx.Unlock()
-		return err
+
-	}
+	for _, config := range gConf.Apps {
-	rsp := ReportLogRsp{}
+		appActive := 0
-	rsp.Content = string(buff[:readLength])
+		relayNode := ""
-	rsp.FileName = req.FileName
+		specRelayNode := ""
-	rsp.Total = fi.Size()
+		relayMode := ""
-	rsp.Len = req.Len
+		linkMode := LinkModeUDPPunch
-	return pn.write(MsgReport, MsgPushReportLog, &rsp)
+		var connectTime string
-}
+		var retryTime string
 		var app *p2pApp
 		i, ok := GNetwork.apps.Load(config.ID())
 		if ok {
 			app = i.(*p2pApp)
 			if app.isActive() {
 				appActive = 1
 			}
 			if app.config.SrcPort == 0 { // memapp
 				continue
 			}
 			specRelayNode = app.config.RelayNode
 			if !app.isDirect() { // TODO: should always report relay node for app edit
 				relayNode = app.relayNode
 				relayMode = app.relayMode
 			}
 			if app.Tunnel() != nil {
 				linkMode = app.Tunnel().linkModeWeb
 			}
 			retryTime = app.RetryTime().Local().Format("2006-01-02T15:04:05-0700")
 			connectTime = app.ConnectTime().Local().Format("2006-01-02T15:04:05-0700")
 		}
 		appInfo := AppInfo{
 			AppName:       config.AppName,
 			Error:         config.errMsg,
 			Protocol:      config.Protocol,
 			PunchPriority: config.PunchPriority,
 			Whitelist:     config.Whitelist,
 			SrcPort:       config.SrcPort,
 			RelayNode:     relayNode,
 			SpecRelayNode: specRelayNode,
 			RelayMode:     relayMode,
 			LinkMode:      linkMode,
 			PeerNode:      config.PeerNode,
 			DstHost:       config.DstHost,
 			DstPort:       config.DstPort,
 			PeerUser:      config.PeerUser,
 			PeerIP:        config.peerIP,
 			PeerNatType:   config.peerNatType,
 			RetryTime:     retryTime,
 			ConnectTime:   connectTime,
 			IsActive:      appActive,
 			Enabled:       config.Enabled,
 		}
 		req.Apps = append(req.Apps, appInfo)
 	}
 	return GNetwork.write(MsgReport, MsgReportApps, &req)
 }
 func handleReportMemApps() (err error) {
 	gLog.Println(LvINFO, "handleReportMemApps")
 	req := ReportApps{}
 	gConf.mtx.Lock()
 	defer gConf.mtx.Unlock()
 	GNetwork.sdwan.sysRoute.Range(func(key, value interface{}) bool {
 		node := value.(*sdwanNode)
 		appActive := 0
 		relayMode := ""
 		var connectTime string
 		var retryTime string
 		i, ok := GNetwork.apps.Load(node.id)
 		var app *p2pApp
 		if ok {
 			app = i.(*p2pApp)
 			if app.isActive() {
 				appActive = 1
 			}
 			if !app.isDirect() {
 				relayMode = app.relayMode
 			}
 			retryTime = app.RetryTime().Local().Format("2006-01-02T15:04:05-0700")
 			connectTime = app.ConnectTime().Local().Format("2006-01-02T15:04:05-0700")
 		}
 		appInfo := AppInfo{
 			RelayMode: relayMode,
 			PeerNode:  node.name,
 			IsActive:  appActive,
 			Enabled:   1,
 		}
 		if app != nil {
 			appInfo.AppName = app.config.AppName
 			appInfo.Error = app.config.errMsg
 			appInfo.Protocol = app.config.Protocol
 			appInfo.Whitelist = app.config.Whitelist
 			appInfo.SrcPort = app.config.SrcPort
 			if !app.isDirect() {
 				appInfo.RelayNode = app.relayNode
 			}
 			if app.Tunnel() != nil {
 				appInfo.LinkMode = app.Tunnel().linkModeWeb
 			}
 			appInfo.DstHost = app.config.DstHost
 			appInfo.DstPort = app.config.DstPort
 			appInfo.PeerUser = app.config.PeerUser
 			appInfo.PeerIP = app.config.peerIP
 			appInfo.PeerNatType = app.config.peerNatType
 			appInfo.RetryTime = retryTime
 			appInfo.ConnectTime = connectTime
 		}
 		req.Apps = append(req.Apps, appInfo)
 		return true
 	})
 	gLog.Println(LvDEBUG, "handleReportMemApps res:", prettyJson(req))
 	return GNetwork.write(MsgReport, MsgReportMemApps, &req)
 }
 func handleLog(msg []byte) (err error) {
 	gLog.Println(LvDEBUG, "MsgPushReportLog")
 	const defaultLen = 1024 * 128
 	const maxLen = 1024 * 1024
 	req := ReportLogReq{}
 	if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
 		gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
 		return err
 	}
 	if req.FileName == "" {
 		req.FileName = "openp2p.log"
 	} else {
 		req.FileName = sanitizeFileName(req.FileName)
 	}
 	f, err := os.Open(filepath.Join("log", req.FileName))
 	if err != nil {
 		gLog.Println(LvERROR, "read log file error:", err)
 		return err
 	}
 	fi, err := f.Stat()
 	if err != nil {
 		return err
 	}
 	if req.Offset > fi.Size() {
 		req.Offset = fi.Size() - defaultLen
 	}
 	// verify input parameters
 	if req.Offset < 0 {
 		req.Offset = 0
 	}
 	if req.Len <= 0 || req.Len > maxLen {
 		req.Len = defaultLen
 	}
 	f.Seek(req.Offset, 0)
 	buff := make([]byte, req.Len)
 	readLength, err := f.Read(buff)
 	f.Close()
 	if err != nil {
 		gLog.Println(LvERROR, "read log content error:", err)
 		return err
 	}
 	rsp := ReportLogRsp{}
 	rsp.Content = string(buff[:readLength])
 	rsp.FileName = req.FileName
 	rsp.Total = fi.Size()
 	rsp.Len = req.Len
 	return GNetwork.write(MsgReport, MsgPushReportLog, &rsp)
 }
 func handleReportGoroutine() (err error) {
 	gLog.Println(LvDEBUG, "handleReportGoroutine")
 	buf := make([]byte, 1024*128)
 	stackLen := runtime.Stack(buf, true)
 	return GNetwork.write(MsgReport, MsgPushReportLog, string(buf[:stackLen]))
 }
 func handleCheckRemoteService(msg []byte) (err error) {
 	gLog.Println(LvDEBUG, "handleCheckRemoteService")
 	req := CheckRemoteService{}
 	if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
 		gLog.Printf(LvERROR, "wrong %v:%s  %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
 		return err
 	}
 	rsp := PushRsp{Error: 0}
 	conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", req.Host, req.Port), time.Second*3)
 	if err != nil {
 		rsp.Error = 1
 		rsp.Detail = ErrRemoteServiceUnable.Error()
 	} else {
 		conn.Close()
 	}
 	return GNetwork.write(MsgReport, MsgReportResponse, rsp)
 }
@@ -3,6 +3,7 @@ package openp2p
 import (
 	"bytes"
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
 	"math/rand"
 	"net"
@@ -10,7 +11,7 @@ import (
 )
 func handshakeC2C(t *P2PTunnel) (err error) {
-	gLog.Printf(LvDEBUG, "handshakeC2C %s:%d:%d to %s:%d", t.pn.config.Node, t.coneLocalPort, t.coneNatPort, t.config.peerIP, t.config.peerConeNatPort)
+	gLog.Printf(LvDEBUG, "handshakeC2C %s:%d:%d to %s:%d", gConf.Network.Node, t.coneLocalPort, t.coneNatPort, t.config.peerIP, t.config.peerConeNatPort)
 	defer gLog.Printf(LvDEBUG, "handshakeC2C end")
 	conn, err := net.ListenUDP("udp", t.la)
 	if err != nil {
@@ -22,18 +23,22 @@ func handshakeC2C(t *P2PTunnel) (err error) {
 		gLog.Println(LvDEBUG, "handshakeC2C write MsgPunchHandshake error:", err)
 		return err
 	}
-	ra, head, _, _, err := UDPRead(conn, HandshakeTimeout)
+	ra, head, buff, _, err := UDPRead(conn, HandshakeTimeout)
 	if err != nil {
-		time.Sleep(time.Millisecond * 200)
+		gLog.Println(LvDEBUG, "handshakeC2C read MsgPunchHandshake error:", err)
-		gLog.Println(LvDEBUG, err, ", return this error when ip was not reachable, retry read")
+		return err
 		ra, head, _, _, err = UDPRead(conn, HandshakeTimeout)
 		if err != nil {
 			gLog.Println(LvDEBUG, "handshakeC2C read MsgPunchHandshake error:", err)
 			return err
 		}
 	}
 	t.ra, _ = net.ResolveUDPAddr("udp", ra.String())
-	if head.MainType == MsgP2P && head.SubType == MsgPunchHandshake {
+	var tunnelID uint64
 	if len(buff) > openP2PHeaderSize {
 		req := P2PHandshakeReq{}
 		if err := json.Unmarshal(buff[openP2PHeaderSize:openP2PHeaderSize+int(head.DataLen)], &req); err == nil {
 			tunnelID = req.ID
 		}
 	} else { // compatible with old version
 		tunnelID = t.id
 	}
 	if head.MainType == MsgP2P && head.SubType == MsgPunchHandshake && tunnelID == t.id {
 		gLog.Printf(LvDEBUG, "read %d handshake ", t.id)
 		UDPWrite(conn, t.ra, MsgP2P, MsgPunchHandshakeAck, P2PHandshakeReq{ID: t.id})
 		_, head, _, _, err = UDPRead(conn, HandshakeTimeout)
@@ -42,7 +47,7 @@ func handshakeC2C(t *P2PTunnel) (err error) {
 			return err
 		}
 	}
-	if head.MainType == MsgP2P && head.SubType == MsgPunchHandshakeAck {
+	if head.MainType == MsgP2P && head.SubType == MsgPunchHandshakeAck && tunnelID == t.id {
 		gLog.Printf(LvDEBUG, "read %d handshake ack ", t.id)
 		_, err = UDPWrite(conn, t.ra, MsgP2P, MsgPunchHandshakeAck, P2PHandshakeReq{ID: t.id})
 		if err != nil {
@@ -57,6 +62,12 @@ func handshakeC2C(t *P2PTunnel) (err error) {
 func handshakeC2S(t *P2PTunnel) error {
 	gLog.Printf(LvDEBUG, "handshakeC2S start")
 	defer gLog.Printf(LvDEBUG, "handshakeC2S end")
 	if !buildTunnelMtx.TryLock() {
 		// time.Sleep(time.Second * 3)
 		return ErrBuildTunnelBusy
 	}
 	defer buildTunnelMtx.Unlock()
 	startTime := time.Now()
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 	randPorts := r.Perm(65532)
 	conn, err := net.ListenUDP("udp", t.la)
@@ -68,7 +79,6 @@ func handshakeC2S(t *P2PTunnel) error {
 	go func() error {
 		gLog.Printf(LvDEBUG, "send symmetric handshake to %s from %d:%d start", t.config.peerIP, t.coneLocalPort, t.coneNatPort)
 		for i := 0; i < SymmetricHandshakeNum; i++ {
 			// TODO: auto calc cost time
 			// time.Sleep(SymmetricHandshakeInterval)
 			dst, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", t.config.peerIP, randPorts[i]+2))
 			if err != nil {
@@ -89,30 +99,48 @@ func handshakeC2S(t *P2PTunnel) error {
 		return err
 	}
 	// read response of the punching hole ok port
-	result := make([]byte, 1024)
+	buff := make([]byte, 1024)
-	_, dst, err := conn.ReadFrom(result)
+	_, dst, err := conn.ReadFrom(buff)
 	if err != nil {
 		gLog.Println(LvERROR, "handshakeC2S wait timeout")
 		return err
 	}
 	head := &openP2PHeader{}
-	err = binary.Read(bytes.NewReader(result[:openP2PHeaderSize]), binary.LittleEndian, head)
+	err = binary.Read(bytes.NewReader(buff[:openP2PHeaderSize]), binary.LittleEndian, head)
 	if err != nil {
 		gLog.Println(LvERROR, "parse p2pheader error:", err)
 		return err
 	}
 	t.ra, _ = net.ResolveUDPAddr("udp", dst.String())
-	if head.MainType == MsgP2P && head.SubType == MsgPunchHandshake {
+	var tunnelID uint64
 	if len(buff) > openP2PHeaderSize {
 		req := P2PHandshakeReq{}
 		if err := json.Unmarshal(buff[openP2PHeaderSize:openP2PHeaderSize+int(head.DataLen)], &req); err == nil {
 			tunnelID = req.ID
 		}
 	} else { // compatible with old version
 		tunnelID = t.id
 	}
 	if head.MainType == MsgP2P && head.SubType == MsgPunchHandshake && tunnelID == t.id {
 		gLog.Printf(LvDEBUG, "handshakeC2S read %d handshake ", t.id)
 		UDPWrite(conn, t.ra, MsgP2P, MsgPunchHandshakeAck, P2PHandshakeReq{ID: t.id})
 		for {
-			_, head, _, _, err = UDPRead(conn, HandshakeTimeout)
+			_, head, buff, _, err = UDPRead(conn, HandshakeTimeout)
 			if err != nil {
 				gLog.Println(LvDEBUG, "handshakeC2S handshake error")
 				return err
 			}
 			var tunnelID uint64
 			if len(buff) > openP2PHeaderSize {
 				req := P2PHandshakeReq{}
 				if err := json.Unmarshal(buff[openP2PHeaderSize:openP2PHeaderSize+int(head.DataLen)], &req); err == nil {
 					tunnelID = req.ID
 				}
 			} else { // compatible with old version
 				tunnelID = t.id
 			}
 			// waiting ack
-			if head.MainType == MsgP2P && head.SubType == MsgPunchHandshakeAck {
+			if head.MainType == MsgP2P && head.SubType == MsgPunchHandshakeAck && tunnelID == t.id {
 				break
 			}
 		}
@@ -124,19 +152,24 @@ func handshakeC2S(t *P2PTunnel) error {
 	} else {
 		gLog.Println(LvDEBUG, "handshakeS2C read msg but not MsgPunchHandshakeAck")
 	}
-	gLog.Printf(LvINFO, "handshakeC2S ok")
+	gLog.Printf(LvINFO, "handshakeC2S ok. cost %d ms", time.Since(startTime)/time.Millisecond)
 	return nil
 }
 func handshakeS2C(t *P2PTunnel) error {
 	gLog.Printf(LvDEBUG, "handshakeS2C start")
 	defer gLog.Printf(LvDEBUG, "handshakeS2C end")
 	if !buildTunnelMtx.TryLock() {
 		// time.Sleep(time.Second * 3)
 		return ErrBuildTunnelBusy
 	}
 	defer buildTunnelMtx.Unlock()
 	startTime := time.Now()
 	gotCh := make(chan *net.UDPAddr, 5)
 	// sequencely udp send handshake, do not parallel send
 	gLog.Printf(LvDEBUG, "send symmetric handshake to %s:%d start", t.config.peerIP, t.config.peerConeNatPort)
 	gotIt := false
 	for i := 0; i < SymmetricHandshakeNum; i++ {
 		// TODO: auto calc cost time
 		// time.Sleep(SymmetricHandshakeInterval)
 		go func(t *P2PTunnel) error {
 			conn, err := net.ListenUDP("udp", nil) // TODO: system allocated port really random?
@@ -146,7 +179,7 @@ func handshakeS2C(t *P2PTunnel) error {
 			}
 			defer conn.Close()
 			UDPWrite(conn, t.ra, MsgP2P, MsgPunchHandshake, P2PHandshakeReq{ID: t.id})
-			_, head, _, _, err := UDPRead(conn, HandshakeTimeout)
+			_, head, buff, _, err := UDPRead(conn, HandshakeTimeout)
 			if err != nil {
 				// gLog.Println(LevelDEBUG, "one of the handshake error:", err)
 				return err
@@ -154,18 +187,35 @@ func handshakeS2C(t *P2PTunnel) error {
 			if gotIt {
 				return nil
 			}
 			var tunnelID uint64
 			if len(buff) >= openP2PHeaderSize+8 {
 				req := P2PHandshakeReq{}
 				if err := json.Unmarshal(buff[openP2PHeaderSize:openP2PHeaderSize+int(head.DataLen)], &req); err == nil {
 					tunnelID = req.ID
 				}
 			} else { // compatible with old version
 				tunnelID = t.id
 			}
-			if head.MainType == MsgP2P && head.SubType == MsgPunchHandshake {
+			if head.MainType == MsgP2P && head.SubType == MsgPunchHandshake && tunnelID == t.id {
 				gLog.Printf(LvDEBUG, "handshakeS2C read %d handshake ", t.id)
 				UDPWrite(conn, t.ra, MsgP2P, MsgPunchHandshakeAck, P2PHandshakeReq{ID: t.id})
-				// may read sereral MsgPunchHandshake
+				// may read several MsgPunchHandshake
 				for {
-					_, head, _, _, err = UDPRead(conn, HandshakeTimeout)
+					_, head, buff, _, err = UDPRead(conn, HandshakeTimeout)
 					if err != nil {
 						gLog.Println(LvDEBUG, "handshakeS2C handshake error")
 						return err
 					}
-					if head.MainType == MsgP2P && head.SubType == MsgPunchHandshakeAck {
+					if len(buff) > openP2PHeaderSize {
 						req := P2PHandshakeReq{}
 						if err := json.Unmarshal(buff[openP2PHeaderSize:openP2PHeaderSize+int(head.DataLen)], &req); err == nil {
 							tunnelID = req.ID
 						}
 					} else { // compatible with old version
 						tunnelID = t.id
 					}
 					if head.MainType == MsgP2P && head.SubType == MsgPunchHandshakeAck && tunnelID == t.id {
 						break
 					} else {
 						gLog.Println(LvDEBUG, "handshakeS2C read msg but not MsgPunchHandshakeAck")
@@ -186,18 +236,18 @@ func handshakeS2C(t *P2PTunnel) error {
 		}(t)
 	}
 	gLog.Printf(LvDEBUG, "send symmetric handshake end")
-	if compareVersion(t.config.peerVersion, SymmetricSimultaneouslySendVersion) == LESS { // compatible with old client
+	if compareVersion(t.config.peerVersion, SymmetricSimultaneouslySendVersion) < 0 { // compatible with old client
 		gLog.Println(LvDEBUG, "handshakeS2C ready, notify peer connect")
 		t.pn.push(t.config.PeerNode, MsgPushHandshakeStart, TunnelMsg{ID: t.id})
 	}
 	select {
 	case <-time.After(HandshakeTimeout):
-		return fmt.Errorf("wait handshake failed")
+		return fmt.Errorf("wait handshake timeout")
 	case la := <-gotCh:
 		t.la = la
 		gLog.Println(LvDEBUG, "symmetric handshake ok", la)
-		gLog.Printf(LvINFO, "handshakeS2C ok")
+		gLog.Printf(LvINFO, "handshakeS2C ok. cost %dms", time.Since(startTime)/time.Millisecond)
 	}
 	return nil
 }
@@ -1,129 +1,124 @@
-package openp2p
+package openp2p
-
+
-import (
+import (
-	"fmt"
+	"fmt"
-	"io"
+	"io"
-	"os"
+	"os"
-	"os/exec"
+	"os/exec"
-	"path/filepath"
+	"path/filepath"
-	"strings"
+	"strings"
-	"time"
+	"time"
-)
+)
-
+
-// examples:
+func install() {
-// listen:
+	gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
-// ./openp2p install -node hhd1207-222 -token YOUR-TOKEN -sharebandwidth 0
+	gLog.Println(LvINFO, "Contact: QQ group 16947733, Email [email protected]")
-// listen and build p2papp:
+	gLog.Println(LvINFO, "install start")
-// ./openp2p install -node hhd1207-222 -token YOUR-TOKEN -sharebandwidth 0 -peernode hhdhome-n1 -dstip 127.0.0.1 -dstport 50022 -protocol tcp -srcport 22
+	defer gLog.Println(LvINFO, "install end")
-func install() {
+	// auto uninstall
-	gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
+	err := os.MkdirAll(defaultInstallPath, 0775)
-	gLog.Println(LvINFO, "Contact: QQ group 16947733, Email [email protected]")
+
-	gLog.Println(LvINFO, "install start")
+	if err != nil {
-	defer gLog.Println(LvINFO, "install end")
+		gLog.Printf(LvERROR, "MkdirAll %s error:%s", defaultInstallPath, err)
-	// auto uninstall
+		return
-	err := os.MkdirAll(defaultInstallPath, 0775)
+	}
-
+	err = os.Chdir(defaultInstallPath)
-	if err != nil {
+	if err != nil {
-		gLog.Printf(LvERROR, "MkdirAll %s error:%s", defaultInstallPath, err)
+		gLog.Println(LvERROR, "cd error:", err)
-		return
+		return
-	}
+	}
-	err = os.Chdir(defaultInstallPath)
+
-	if err != nil {
+	uninstall()
-		gLog.Println(LvERROR, "cd error:", err)
+	// save config file
-		return
+	parseParams("install", "")
-	}
+	targetPath := filepath.Join(defaultInstallPath, defaultBinName)
-
+	d := daemon{}
-	uninstall()
+	// copy files
-	// save config file
+
-	parseParams("install")
+	binPath, _ := os.Executable()
-	targetPath := filepath.Join(defaultInstallPath, defaultBinName)
+	src, errFiles := os.Open(binPath) // can not use args[0], on Windows call openp2p is ok(=openp2p.exe)
-	d := daemon{}
+	if errFiles != nil {
-	// copy files
+		gLog.Printf(LvERROR, "os.OpenFile %s error:%s", os.Args[0], errFiles)
-
+		return
-	binPath, _ := os.Executable()
+	}
-	src, errFiles := os.Open(binPath) // can not use args[0], on Windows call openp2p is ok(=openp2p.exe)
+
-	if errFiles != nil {
+	dst, errFiles := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0775)
-		gLog.Printf(LvERROR, "os.OpenFile %s error:%s", os.Args[0], errFiles)
+	if errFiles != nil {
-		return
+		gLog.Printf(LvERROR, "os.OpenFile %s error:%s", targetPath, errFiles)
-	}
+		return
-
+	}
-	dst, errFiles := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0775)
+
-	if errFiles != nil {
+	_, errFiles = io.Copy(dst, src)
-		gLog.Printf(LvERROR, "os.OpenFile %s error:%s", targetPath, errFiles)
+	if errFiles != nil {
-		return
+		gLog.Printf(LvERROR, "io.Copy error:%s", errFiles)
-	}
+		return
-
+	}
-	_, errFiles = io.Copy(dst, src)
+	src.Close()
-	if errFiles != nil {
+	dst.Close()
-		gLog.Printf(LvERROR, "io.Copy error:%s", errFiles)
+
-		return
+	// install system service
-	}
+	gLog.Println(LvINFO, "targetPath:", targetPath)
-	src.Close()
+	err = d.Control("install", targetPath, []string{"-d"})
-	dst.Close()
+	if err == nil {
-
+		gLog.Println(LvINFO, "install system service ok.")
-	// install system service
+	}
-	gLog.Println(LvINFO, "targetPath:", targetPath)
+	time.Sleep(time.Second * 2)
-	err = d.Control("install", targetPath, []string{"-d"})
+	err = d.Control("start", targetPath, []string{"-d"})
-	if err == nil {
+	if err != nil {
-		gLog.Println(LvINFO, "install system service ok.")
+		gLog.Println(LvERROR, "start openp2p service error:", err)
-	}
+	} else {
-	time.Sleep(time.Second * 2)
+		gLog.Println(LvINFO, "start openp2p service ok.")
-	err = d.Control("start", targetPath, []string{"-d"})
+	}
-	if err != nil {
+	gLog.Println(LvINFO, "Visit WebUI on https://console.openp2p.cn")
-		gLog.Println(LvERROR, "start openp2p service error:", err)
+}
-	} else {
+
-		gLog.Println(LvINFO, "start openp2p service ok.")
+func installByFilename() {
-	}
+	params := strings.Split(filepath.Base(os.Args[0]), "-")
-	gLog.Println(LvINFO, "Visit WebUI on https://console.openp2p.cn")
+	if len(params) < 4 {
-}
+		return
-
+	}
-func installByFilename() {
+	serverHost := params[1]
-	params := strings.Split(filepath.Base(os.Args[0]), "-")
+	token := params[2]
-	if len(params) < 4 {
+	gLog.Println(LvINFO, "install start")
-		return
+	targetPath := os.Args[0]
-	}
+	args := []string{"install"}
-	serverHost := params[1]
+	args = append(args, "-serverhost")
-	token := params[2]
+	args = append(args, serverHost)
-	gLog.Println(LvINFO, "install start")
+	args = append(args, "-token")
-	targetPath := os.Args[0]
+	args = append(args, token)
-	args := []string{"install"}
+	env := os.Environ()
-	args = append(args, "-serverhost")
+	cmd := exec.Command(targetPath, args...)
-	args = append(args, serverHost)
+	cmd.Stdout = os.Stdout
-	args = append(args, "-token")
+	cmd.Stderr = os.Stderr
-	args = append(args, token)
+	cmd.Stdin = os.Stdin
-	env := os.Environ()
+	cmd.Env = env
-	cmd := exec.Command(targetPath, args...)
+	err := cmd.Run()
-	cmd.Stdout = os.Stdout
+	if err != nil {
-	cmd.Stderr = os.Stderr
+		gLog.Println(LvERROR, "install by filename, start process error:", err)
-	cmd.Stdin = os.Stdin
+		return
-	cmd.Env = env
+	}
-	err := cmd.Run()
+	gLog.Println(LvINFO, "install end")
-	if err != nil {
+	gLog.Println(LvINFO, "Visit WebUI on https://console.openp2p.cn")
-		gLog.Println(LvERROR, "install by filename, start process error:", err)
+	fmt.Println("Press the Any Key to exit")
-		return
+	fmt.Scanln()
-	}
+	os.Exit(0)
-	gLog.Println(LvINFO, "install end")
+}
-	gLog.Println(LvINFO, "Visit WebUI on https://console.openp2p.cn")
+func uninstall() {
-	fmt.Println("Press the Any Key to exit")
+	gLog.Println(LvINFO, "uninstall start")
-	fmt.Scanln()
+	defer gLog.Println(LvINFO, "uninstall end")
-	os.Exit(0)
+	d := daemon{}
-}
+	err := d.Control("stop", "", nil)
-func uninstall() {
+	if err != nil { // service maybe not install
-	gLog.Println(LvINFO, "uninstall start")
+		return
-	defer gLog.Println(LvINFO, "uninstall end")
+	}
-	d := daemon{}
+	err = d.Control("uninstall", "", nil)
-	err := d.Control("stop", "", nil)
+	if err != nil {
-	if err != nil { // service maybe not install
+		gLog.Println(LvERROR, "uninstall system service error:", err)
-		return
+	} else {
-	}
+		gLog.Println(LvINFO, "uninstall system service ok.")
-	err = d.Control("uninstall", "", nil)
+	}
-	if err != nil {
+	binPath := filepath.Join(defaultInstallPath, defaultBinName)
-		gLog.Println(LvERROR, "uninstall system service error:", err)
+	os.Remove(binPath + "0")
-	} else {
+	os.Remove(binPath)
-		gLog.Println(LvINFO, "uninstall system service ok.")
+	// os.RemoveAll(defaultInstallPath)  // reserve config.json
-	}
+}
 	binPath := filepath.Join(defaultInstallPath, defaultBinName)
 	os.Remove(binPath + "0")
 	os.Remove(binPath)
 	// os.RemoveAll(defaultInstallPath)  // reserve config.json
 }
@@ -0,0 +1,74 @@
 package openp2p
 import (
 	"log"
 	"os/exec"
 	"runtime"
 )
 func allowTunForward() {
 	if runtime.GOOS != "linux" { // only support Linux
 		return
 	}
 	exec.Command("sh", "-c", `iptables -t filter -D FORWARD -i optun -j ACCEPT`).Run()
 	exec.Command("sh", "-c", `iptables -t filter -D FORWARD -o optun -j ACCEPT`).Run()
 	err := exec.Command("sh", "-c", `iptables -t filter -I FORWARD -i optun -j ACCEPT`).Run()
 	if err != nil {
 		log.Println("allow foward in error:", err)
 	}
 	err = exec.Command("sh", "-c", `iptables -t filter -I FORWARD -o optun -j ACCEPT`).Run()
 	if err != nil {
 		log.Println("allow foward out error:", err)
 	}
 }
 func clearSNATRule() {
 	if runtime.GOOS != "linux" {
 		return
 	}
 	execCommand("iptables", true, "-t", "nat", "-D", "POSTROUTING", "-j", "OPSDWAN")
 	execCommand("iptables", true, "-t", "nat", "-F", "OPSDWAN")
 	execCommand("iptables", true, "-t", "nat", "-X", "OPSDWAN")
 }
 func initSNATRule(localNet string) {
 	if runtime.GOOS != "linux" {
 		return
 	}
 	clearSNATRule()
 	err := execCommand("iptables", true, "-t", "nat", "-N", "OPSDWAN")
 	if err != nil {
 		log.Println("iptables new sdwan chain error:", err)
 		return
 	}
 	err = execCommand("iptables", true, "-t", "nat", "-A", "POSTROUTING", "-j", "OPSDWAN")
 	if err != nil {
 		log.Println("iptables append postrouting error:", err)
 		return
 	}
 	err = execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN",
 		"-o", "optun", "!", "-s", localNet, "-j", "MASQUERADE")
 	if err != nil {
 		log.Println("add optun snat error:", err)
 		return
 	}
 	err = execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN", "!", "-o", "optun",
 		"-s", localNet, "-j", "MASQUERADE")
 	if err != nil {
 		log.Println("add optun snat error:", err)
 		return
 	}
 }
 func addSNATRule(target string) {
 	if runtime.GOOS != "linux" {
 		return
 	}
 	err := execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN", "!", "-o", "optun",
 		"-s", target, "-j", "MASQUERADE")
 	if err != nil {
 		log.Println("iptables add optun snat error:", err)
 		return
 	}
 }
@@ -17,9 +17,18 @@ type IPTree struct {
 	tree    *avltree.Tree
 	treeMtx sync.RWMutex
 }
 type IPTreeValue struct {
 	maxIP uint32
 	v     interface{}
 }
 // TODO: deal interset
 func (iptree *IPTree) DelIntIP(minIP uint32, maxIP uint32) {
 	iptree.tree.Remove(minIP)
 }
 // add 120k cost 0.5s
-func (iptree *IPTree) AddIntIP(minIP uint32, maxIP uint32) bool {
+func (iptree *IPTree) AddIntIP(minIP uint32, maxIP uint32, v interface{}) bool {
 	if minIP > maxIP {
 		return false
 	}
@@ -32,15 +41,15 @@ func (iptree *IPTree) AddIntIP(minIP uint32, maxIP uint32) bool {
 		if cur == nil {
 			break
 		}
-		curMaxIP := cur.Value.(uint32)
+		tv := cur.Value.(*IPTreeValue)
 		curMinIP := cur.Key.(uint32)
 		// newNode all in existNode, treat as inserted.
-		if newMinIP >= curMinIP && newMaxIP <= curMaxIP {
+		if newMinIP >= curMinIP && newMaxIP <= tv.maxIP {
 			return true
 		}
 		// has no interset
-		if newMinIP > curMaxIP {
+		if newMinIP > tv.maxIP {
 			cur = cur.Children[1]
 			continue
 		}
@@ -53,49 +62,64 @@ func (iptree *IPTree) AddIntIP(minIP uint32, maxIP uint32) bool {
 		if curMinIP < newMinIP {
 			newMinIP = curMinIP
 		}
-		if curMaxIP > newMaxIP {
+		if tv.maxIP > newMaxIP {
-			newMaxIP = curMaxIP
+			newMaxIP = tv.maxIP
 		}
 		cur = iptree.tree.Root
 	}
 	//  put in the tree
-	iptree.tree.Put(newMinIP, newMaxIP)
+	iptree.tree.Put(newMinIP, &IPTreeValue{newMaxIP, v})
 	return true
 }
-func (iptree *IPTree) Add(minIPStr string, maxIPStr string) bool {
+func (iptree *IPTree) Add(minIPStr string, maxIPStr string, v interface{}) bool {
 	var minIP, maxIP uint32
 	binary.Read(bytes.NewBuffer(net.ParseIP(minIPStr).To4()), binary.BigEndian, &minIP)
 	binary.Read(bytes.NewBuffer(net.ParseIP(maxIPStr).To4()), binary.BigEndian, &maxIP)
-	return iptree.AddIntIP(minIP, maxIP)
+	return iptree.AddIntIP(minIP, maxIP, v)
 }
 func (iptree *IPTree) Del(minIPStr string, maxIPStr string) {
 	var minIP, maxIP uint32
 	binary.Read(bytes.NewBuffer(net.ParseIP(minIPStr).To4()), binary.BigEndian, &minIP)
 	binary.Read(bytes.NewBuffer(net.ParseIP(maxIPStr).To4()), binary.BigEndian, &maxIP)
 	iptree.DelIntIP(minIP, maxIP)
 }
 func (iptree *IPTree) Contains(ipStr string) bool {
 	var ip uint32
 	binary.Read(bytes.NewBuffer(net.ParseIP(ipStr).To4()), binary.BigEndian, &ip)
-	return iptree.ContainsInt(ip)
+	_, ok := iptree.Load(ip)
 	return ok
 }
-func (iptree *IPTree) ContainsInt(ip uint32) bool {
+func IsLocalhost(ipStr string) bool {
 	if ipStr == "localhost" || ipStr == "127.0.0.1" || ipStr == "::1" {
 		return true
 	}
 	return false
 }
 func (iptree *IPTree) Load(ip uint32) (interface{}, bool) {
 	iptree.treeMtx.RLock()
 	defer iptree.treeMtx.RUnlock()
 	if iptree.tree == nil {
-		return false
+		return nil, false
 	}
 	n := iptree.tree.Root
 	for n != nil {
-		curMaxIP := n.Value.(uint32)
+		tv := n.Value.(*IPTreeValue)
 		curMinIP := n.Key.(uint32)
 		switch {
-		case ip >= curMinIP && ip <= curMaxIP: // hit
+		case ip >= curMinIP && ip <= tv.maxIP: // hit
-			return true
+			return tv.v, true
 		case ip < curMinIP:
 			n = n.Children[0]
 		default:
 			n = n.Children[1]
 		}
 	}
-	return false
+	return nil, false
 }
 func (iptree *IPTree) Size() int {
@@ -135,12 +159,12 @@ func NewIPTree(ips string) *IPTree {
 			}
 			minIP := ipNet.IP.Mask(ipNet.Mask).String()
 			maxIP := calculateMaxIP(ipNet).String()
-			iptree.Add(minIP, maxIP)
+			iptree.Add(minIP, maxIP, nil)
 		} else if strings.Contains(ip, "-") { // x.x.x.x-y.y.y.y
 			minAndMax := strings.Split(ip, "-")
-			iptree.Add(minAndMax[0], minAndMax[1])
+			iptree.Add(minAndMax[0], minAndMax[1], nil)
 		} else { // single ip
-			iptree.Add(ip, ip)
+			iptree.Add(ip, ip, nil)
 		}
 	}
 	return iptree
@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"net"
 	"testing"
 	"time"
 )
 func wrapTestContains(t *testing.T, iptree *IPTree, ip string, result bool) {
@@ -40,14 +41,14 @@ func TestAllInputFormat(t *testing.T) {
 func TestSingleIP(t *testing.T) {
 	iptree := NewIPTree("")
-	iptree.Add("219.137.185.70", "219.137.185.70")
+	iptree.Add("219.137.185.70", "219.137.185.70", nil)
 	wrapTestContains(t, iptree, "219.137.185.70", true)
 	wrapTestContains(t, iptree, "219.137.185.71", false)
 }
 func TestWrongSegment(t *testing.T) {
 	iptree := NewIPTree("")
-	inserted := iptree.Add("87.251.75.0", "82.251.75.255")
+	inserted := iptree.Add("87.251.75.0", "82.251.75.255", nil)
 	if inserted {
 		t.Errorf("TestWrongSegment failed\n")
 	}
@@ -56,20 +57,20 @@ func TestWrongSegment(t *testing.T) {
 func TestSegment2(t *testing.T) {
 	iptree := NewIPTree("")
 	iptree.Clear()
-	iptree.Add("10.1.5.50", "10.1.5.100")
+	iptree.Add("10.1.5.50", "10.1.5.100", nil)
-	iptree.Add("10.1.1.50", "10.1.1.100")
+	iptree.Add("10.1.1.50", "10.1.1.100", nil)
-	iptree.Add("10.1.2.50", "10.1.2.100")
+	iptree.Add("10.1.2.50", "10.1.2.100", nil)
-	iptree.Add("10.1.6.50", "10.1.6.100")
+	iptree.Add("10.1.6.50", "10.1.6.100", nil)
-	iptree.Add("10.1.7.50", "10.1.7.100")
+	iptree.Add("10.1.7.50", "10.1.7.100", nil)
-	iptree.Add("10.1.3.50", "10.1.3.100")
+	iptree.Add("10.1.3.50", "10.1.3.100", nil)
-	iptree.Add("10.1.1.1", "10.1.1.10")    // no interset
+	iptree.Add("10.1.1.1", "10.1.1.10", nil)    // no interset
-	iptree.Add("10.1.1.200", "10.1.1.250") // no interset
+	iptree.Add("10.1.1.200", "10.1.1.250", nil) // no interset
 	iptree.Print()
-	iptree.Add("10.1.1.80", "10.1.1.90") // all in
+	iptree.Add("10.1.1.80", "10.1.1.90", nil) // all in
-	iptree.Add("10.1.1.40", "10.1.1.60") // interset
+	iptree.Add("10.1.1.40", "10.1.1.60", nil) // interset
 	iptree.Print()
-	iptree.Add("10.1.1.90", "10.1.1.110") // interset
+	iptree.Add("10.1.1.90", "10.1.1.110", nil) // interset
 	iptree.Print()
 	t.Logf("ipTree size:%d\n", iptree.Size())
 	wrapTestContains(t, iptree, "10.1.1.40", true)
@@ -86,7 +87,7 @@ func TestSegment2(t *testing.T) {
 	wrapTestContains(t, iptree, "10.1.100.30", false)
 	wrapTestContains(t, iptree, "10.1.200.30", false)
-	iptree.Add("10.0.0.0", "10.255.255.255") // will merge all segment
+	iptree.Add("10.0.0.0", "10.255.255.255", nil) // will merge all segment
 	iptree.Print()
 	if iptree.Size() != 1 {
 		t.Errorf("merge ip segment error\n")
@@ -97,17 +98,17 @@ func TestSegment2(t *testing.T) {
 func BenchmarkBuildipTree20k(t *testing.B) {
 	iptree := NewIPTree("")
 	iptree.Clear()
-	iptree.Add("10.1.5.50", "10.1.5.100")
+	iptree.Add("10.1.5.50", "10.1.5.100", nil)
-	iptree.Add("10.1.1.50", "10.1.1.100")
+	iptree.Add("10.1.1.50", "10.1.1.100", nil)
-	iptree.Add("10.1.2.50", "10.1.2.100")
+	iptree.Add("10.1.2.50", "10.1.2.100", nil)
-	iptree.Add("10.1.6.50", "10.1.6.100")
+	iptree.Add("10.1.6.50", "10.1.6.100", nil)
-	iptree.Add("10.1.7.50", "10.1.7.100")
+	iptree.Add("10.1.7.50", "10.1.7.100", nil)
-	iptree.Add("10.1.3.50", "10.1.3.100")
+	iptree.Add("10.1.3.50", "10.1.3.100", nil)
-	iptree.Add("10.1.1.1", "10.1.1.10")    // no interset
+	iptree.Add("10.1.1.1", "10.1.1.10", nil)    // no interset
-	iptree.Add("10.1.1.200", "10.1.1.250") // no interset
+	iptree.Add("10.1.1.200", "10.1.1.250", nil) // no interset
-	iptree.Add("10.1.1.80", "10.1.1.90")   // all in
+	iptree.Add("10.1.1.80", "10.1.1.90", nil)   // all in
-	iptree.Add("10.1.1.40", "10.1.1.60")   // interset
+	iptree.Add("10.1.1.40", "10.1.1.60", nil)   // interset
-	iptree.Add("10.1.1.90", "10.1.1.110")  // interset
+	iptree.Add("10.1.1.90", "10.1.1.110", nil)  // interset
 	var minIP uint32
 	binary.Read(bytes.NewBuffer(net.ParseIP("10.1.1.1").To4()), binary.BigEndian, &minIP)
@@ -115,57 +116,59 @@ func BenchmarkBuildipTree20k(t *testing.B) {
 	nodeNum := uint32(10000 * 1)
 	gap := uint32(10)
 	for i := minIP; i < minIP+nodeNum*gap; i += gap {
-		iptree.AddIntIP(i, i)
+		iptree.AddIntIP(i, i, nil)
 		// t.Logf("ipTree size:%d\n", iptree.Size())
 	}
 	binary.Read(bytes.NewBuffer(net.ParseIP("100.1.1.1").To4()), binary.BigEndian, &minIP)
 	// insert 100k block ip segment
 	for i := minIP; i < minIP+nodeNum*gap; i += gap {
-		iptree.AddIntIP(i, i+5)
+		iptree.AddIntIP(i, i+5, nil)
 	}
 	t.Logf("ipTree size:%d\n", iptree.Size())
 	iptree.Clear()
 	t.Logf("clear. ipTree size:%d\n", iptree.Size())
 }
 func BenchmarkQuery(t *testing.B) {
 	ts := time.Now()
 	iptree := NewIPTree("")
 	iptree.Clear()
-	iptree.Add("10.1.5.50", "10.1.5.100")
+	iptree.Add("10.1.5.50", "10.1.5.100", nil)
-	iptree.Add("10.1.1.50", "10.1.1.100")
+	iptree.Add("10.1.1.50", "10.1.1.100", nil)
-	iptree.Add("10.1.2.50", "10.1.2.100")
+	iptree.Add("10.1.2.50", "10.1.2.100", nil)
-	iptree.Add("10.1.6.50", "10.1.6.100")
+	iptree.Add("10.1.6.50", "10.1.6.100", nil)
-	iptree.Add("10.1.7.50", "10.1.7.100")
+	iptree.Add("10.1.7.50", "10.1.7.100", nil)
-	iptree.Add("10.1.3.50", "10.1.3.100")
+	iptree.Add("10.1.3.50", "10.1.3.100", nil)
-	iptree.Add("10.1.1.1", "10.1.1.10")    // no interset
+	iptree.Add("10.1.1.1", "10.1.1.10", nil)    // no interset
-	iptree.Add("10.1.1.200", "10.1.1.250") // no interset
+	iptree.Add("10.1.1.200", "10.1.1.250", nil) // no interset
-	iptree.Add("10.1.1.80", "10.1.1.90")   // all in
+	iptree.Add("10.1.1.80", "10.1.1.90", nil)   // all in
-	iptree.Add("10.1.1.40", "10.1.1.60")   // interset
+	iptree.Add("10.1.1.40", "10.1.1.60", nil)   // interset
-	iptree.Add("10.1.1.90", "10.1.1.110")  // interset
+	iptree.Add("10.1.1.90", "10.1.1.110", nil)  // interset
 	var minIP uint32
 	binary.Read(bytes.NewBuffer(net.ParseIP("10.1.1.1").To4()), binary.BigEndian, &minIP)
 	// insert 10k block ip single
-	nodeNum := uint32(10000 * 100)
+	nodeNum := uint32(10000 * 1000)
 	gap := uint32(10)
 	for i := minIP; i < minIP+nodeNum*gap; i += gap {
-		iptree.AddIntIP(i, i)
+		iptree.AddIntIP(i, i, nil)
 		// t.Logf("ipTree size:%d\n", iptree.Size())
 	}
 	binary.Read(bytes.NewBuffer(net.ParseIP("100.1.1.1").To4()), binary.BigEndian, &minIP)
 	// insert 100k block ip segment
 	for i := minIP; i < minIP+nodeNum*gap; i += gap {
-		iptree.AddIntIP(i, i+5)
+		iptree.AddIntIP(i, i+5, nil)
 	}
-	t.Logf("ipTree size:%d\n", iptree.Size())
+	t.Logf("ipTree size:%d cost:%dms\n", iptree.Size(), time.Since(ts)/time.Millisecond)
-	t.ResetTimer()
+	ts = time.Now()
 	// t.ResetTimer()
 	queryNum := 100 * 10000
 	for i := 0; i < queryNum; i++ {
-		iptree.ContainsInt(minIP + uint32(i))
+		iptree.Load(minIP + uint32(i))
 		wrapBenchmarkContains(t, iptree, "10.1.5.55", true)
 		wrapBenchmarkContains(t, iptree, "10.1.1.1", true)
 		wrapBenchmarkContains(t, iptree, "10.1.5.200", false)
 		wrapBenchmarkContains(t, iptree, "200.1.1.1", false)
 	}
-	t.Logf("query list:%d\n", queryNum*4)
+	t.Logf("query num:%d cost:%dms\n", queryNum*4, time.Since(ts)/time.Millisecond)
 }
@@ -13,6 +13,7 @@ type LogLevel int
 var gLog *logger
 const (
 	LvDev   LogLevel = -1
 	LvDEBUG LogLevel = iota
 	LvINFO
 	LvWARN
@@ -32,12 +33,13 @@ func init() {
 	loglevel[LvINFO] = "INFO"
 	loglevel[LvWARN] = "WARN"
 	loglevel[LvERROR] = "ERROR"
 	loglevel[LvDev] = "Dev"
 }
 const (
-	LogFile = 1 << iota
+	LogFile    = 1
-	LogConsole
+	LogConsole = 1 << 1
 )
 type logger struct {
@@ -92,6 +94,13 @@ func (l *logger) setLevel(level LogLevel) {
 	defer l.mtx.Unlock()
 	l.level = level
 }
 func (l *logger) setMaxSize(size int64) {
 	l.mtx.Lock()
 	defer l.mtx.Unlock()
 	l.maxLogSize = size
 }
 func (l *logger) setMode(mode int) {
 	l.mtx.Lock()
 	defer l.mtx.Unlock()
@@ -139,10 +148,10 @@ func (l *logger) Printf(level LogLevel, format string, params ...interface{}) {
 	}
 	pidAndLevel := []interface{}{l.pid, loglevel[level]}
 	params = append(pidAndLevel, params...)
-	if l.mode & LogFile != 0 {
+	if l.mode&LogFile != 0 {
 		l.loggers[0].Printf("%d %s "+format+l.lineEnding, params...)
 	}
-	if l.mode & LogConsole != 0 {
+	if l.mode&LogConsole != 0 {
 		l.stdLogger.Printf("%d %s "+format+l.lineEnding, params...)
 	}
 }
@@ -156,10 +165,10 @@ func (l *logger) Println(level LogLevel, params ...interface{}) {
 	pidAndLevel := []interface{}{l.pid, " ", loglevel[level], " "}
 	params = append(pidAndLevel, params...)
 	params = append(params, l.lineEnding)
-	if l.mode & LogFile != 0 {
+	if l.mode&LogFile != 0 {
 		l.loggers[0].Print(params...)
 	}
-	if l.mode & LogConsole != 0 {
+	if l.mode&LogConsole != 0 {
 		l.stdLogger.Print(params...)
 	}
 }
@@ -1,188 +1,189 @@
-package openp2p
+package openp2p
-
+
-import (
+import (
-	"encoding/json"
+	"encoding/json"
-	"fmt"
+	"fmt"
-	"math/rand"
+	"math/rand"
-	"net"
+	"net"
-	"strconv"
+	"strconv"
-	"strings"
+	"strings"
-	"time"
+	"time"
-
+
-	reuse "github.com/openp2p-cn/go-reuseport"
+	reuse "github.com/openp2p-cn/go-reuseport"
-)
+)
-
+
-func natTCP(serverHost string, serverPort int) (publicIP string, publicPort int, localPort int) {
+func natTCP(serverHost string, serverPort int) (publicIP string, publicPort int, localPort int) {
-	// dialer := &net.Dialer{
+	// dialer := &net.Dialer{
-	// 	LocalAddr: &net.TCPAddr{
+	// 	LocalAddr: &net.TCPAddr{
-	// 		IP:   net.ParseIP("0.0.0.0"),
+	// 		IP:   net.ParseIP("0.0.0.0"),
-	// 		Port: localPort,
+	// 		Port: localPort,
-	// 	},
+	// 	},
-	// }
+	// }
-	conn, err := reuse.DialTimeout("tcp4", fmt.Sprintf("%s:%d", "0.0.0.0", 0), fmt.Sprintf("%s:%d", serverHost, serverPort), NatTestTimeout)
+	conn, err := reuse.DialTimeout("tcp4", fmt.Sprintf("%s:%d", "0.0.0.0", 0), fmt.Sprintf("%s:%d", serverHost, serverPort), NatTestTimeout)
-	// conn, err := net.Dial("tcp4", fmt.Sprintf("%s:%d", serverHost, serverPort))
+	// conn, err := net.Dial("tcp4", fmt.Sprintf("%s:%d", serverHost, serverPort))
-	// log.Println(LvINFO, conn.LocalAddr())
+	// log.Println(LvINFO, conn.LocalAddr())
-	if err != nil {
+	if err != nil {
-		fmt.Printf("Dial tcp4 %s:%d error:%s", serverHost, serverPort, err)
+		fmt.Printf("Dial tcp4 %s:%d error:%s", serverHost, serverPort, err)
-		return
+		return
-	}
+	}
-	defer conn.Close()
+	defer conn.Close()
-	localPort, _ = strconv.Atoi(strings.Split(conn.LocalAddr().String(), ":")[1])
+	localPort, _ = strconv.Atoi(strings.Split(conn.LocalAddr().String(), ":")[1])
-	_, wrerr := conn.Write([]byte("1"))
+	_, wrerr := conn.Write([]byte("1"))
-	if wrerr != nil {
+	if wrerr != nil {
-		fmt.Printf("Write error: %s\n", wrerr)
+		fmt.Printf("Write error: %s\n", wrerr)
-		return
+		return
-	}
+	}
-	b := make([]byte, 1000)
+	b := make([]byte, 1000)
-	conn.SetReadDeadline(time.Now().Add(NatTestTimeout))
+	conn.SetReadDeadline(time.Now().Add(NatTestTimeout))
-	n, rderr := conn.Read(b)
+	n, rderr := conn.Read(b)
-	if rderr != nil {
+	if rderr != nil {
-		fmt.Printf("Read error: %s\n", rderr)
+		fmt.Printf("Read error: %s\n", rderr)
-		return
+		return
-	}
+	}
-	arr := strings.Split(string(b[:n]), ":")
+	arr := strings.Split(string(b[:n]), ":")
-	if len(arr) < 2 {
+	if len(arr) < 2 {
-		return
+		return
-	}
+	}
-	publicIP = arr[0]
+	publicIP = arr[0]
-	port, _ := strconv.ParseInt(arr[1], 10, 32)
+	port, _ := strconv.ParseInt(arr[1], 10, 32)
-	publicPort = int(port)
+	publicPort = int(port)
-	return
+	return
-
+
-}
+}
-func natTest(serverHost string, serverPort int, localPort int) (publicIP string, publicPort int, err error) {
+func natTest(serverHost string, serverPort int, localPort int) (publicIP string, publicPort int, err error) {
-	gLog.Println(LvDEBUG, "natTest start")
+	gLog.Println(LvDEBUG, "natTest start")
-	defer gLog.Println(LvDEBUG, "natTest end")
+	defer gLog.Println(LvDEBUG, "natTest end")
-	conn, err := net.ListenPacket("udp", fmt.Sprintf(":%d", localPort))
+	conn, err := net.ListenPacket("udp", fmt.Sprintf(":%d", localPort))
-	if err != nil {
+	if err != nil {
-		gLog.Println(LvERROR, "natTest listen udp error:", err)
+		gLog.Println(LvERROR, "natTest listen udp error:", err)
-		return "", 0, err
+		return "", 0, err
-	}
+	}
-	defer conn.Close()
+	defer conn.Close()
-
+
-	dst, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", serverHost, serverPort))
+	dst, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", serverHost, serverPort))
-	if err != nil {
+	if err != nil {
-		return "", 0, err
+		return "", 0, err
-	}
+	}
-
+
-	// The connection can write data to the desired address.
+	// The connection can write data to the desired address.
-	msg, err := newMessage(MsgNATDetect, 0, nil)
+	msg, err := newMessage(MsgNATDetect, 0, nil)
-	_, err = conn.WriteTo(msg, dst)
+	_, err = conn.WriteTo(msg, dst)
-	if err != nil {
+	if err != nil {
-		return "", 0, err
+		return "", 0, err
-	}
+	}
-	deadline := time.Now().Add(NatTestTimeout)
+	deadline := time.Now().Add(NatTestTimeout)
-	err = conn.SetReadDeadline(deadline)
+	err = conn.SetReadDeadline(deadline)
-	if err != nil {
+	if err != nil {
-		return "", 0, err
+		return "", 0, err
-	}
+	}
-	buffer := make([]byte, 1024)
+	buffer := make([]byte, 1024)
-	nRead, _, err := conn.ReadFrom(buffer)
+	nRead, _, err := conn.ReadFrom(buffer)
-	if err != nil {
+	if err != nil {
-		gLog.Println(LvERROR, "NAT detect error:", err)
+		gLog.Println(LvERROR, "NAT detect error:", err)
-		return "", 0, err
+		return "", 0, err
-	}
+	}
-	natRsp := NatDetectRsp{}
+	natRsp := NatDetectRsp{}
-	json.Unmarshal(buffer[openP2PHeaderSize:nRead], &natRsp)
+	json.Unmarshal(buffer[openP2PHeaderSize:nRead], &natRsp)
-
+
-	return natRsp.IP, natRsp.Port, nil
+	return natRsp.IP, natRsp.Port, nil
-}
+}
-
+
-func getNATType(host string, udp1 int, udp2 int) (publicIP string, NATType int, hasIPvr int, hasUPNPorNATPMP int, err error) {
+func getNATType(host string, udp1 int, udp2 int) (publicIP string, NATType int, err error) {
-	// the random local port may be used by other.
+	// the random local port may be used by other.
-	localPort := int(rand.Uint32()%15000 + 50000)
+	localPort := int(rand.Uint32()%15000 + 50000)
-	echoPort := gConf.Network.TCPPort
+
-	ip1, port1, err := natTest(host, udp1, localPort)
+	ip1, port1, err := natTest(host, udp1, localPort)
-	if err != nil {
+	if err != nil {
-		return "", 0, 0, 0, err
+		return "", 0, err
-	}
+	}
-	hasIPv4, hasUPNPorNATPMP := publicIPTest(ip1, echoPort)
+	_, port2, err := natTest(host, udp2, localPort) // 2rd nat test not need testing publicip
-	gLog.Printf(LvINFO, "local port:%d, nat port:%d, hasIPv4:%d, UPNP:%d", localPort, port1, hasIPv4, hasUPNPorNATPMP)
+	gLog.Printf(LvDEBUG, "local port:%d  nat port:%d", localPort, port2)
-	_, port2, err := natTest(host, udp2, localPort) // 2rd nat test not need testing publicip
+	if err != nil {
-	gLog.Printf(LvDEBUG, "local port:%d  nat port:%d", localPort, port2)
+		return "", 0, err
-	if err != nil {
+	}
-		return "", 0, hasIPv4, hasUPNPorNATPMP, err
+	natType := NATSymmetric
-	}
+	if port1 == port2 {
-	natType := NATSymmetric
+		natType = NATCone
-	if port1 == port2 {
+	}
-		natType = NATCone
+	return ip1, natType, nil
-	}
+}
-	return ip1, natType, hasIPv4, hasUPNPorNATPMP, nil
+
-}
+func publicIPTest(publicIP string, echoPort int) (hasPublicIP int, hasUPNPorNATPMP int) {
-
+	if publicIP == "" || echoPort == 0 {
-func publicIPTest(publicIP string, echoPort int) (hasPublicIP int, hasUPNPorNATPMP int) {
+		return
-	var echoConn *net.UDPConn
+	}
-	gLog.Println(LvDEBUG, "echo server start")
+	var echoConn *net.UDPConn
-	var err error
+	gLog.Println(LvDEBUG, "echo server start")
-	echoConn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: echoPort})
+	var err error
-	if err != nil { // listen error
+	echoConn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: echoPort})
-		gLog.Println(LvERROR, "echo server listen error:", err)
+	if err != nil { // listen error
-		return
+		gLog.Println(LvERROR, "echo server listen error:", err)
-	}
+		return
-	defer echoConn.Close()
+	}
-	go func() {
+	defer echoConn.Close()
-		// close outside for breaking the ReadFromUDP
+	go func() {
-		// wait 30s for echo testing
+		// close outside for breaking the ReadFromUDP
-		buf := make([]byte, 1600)
+		// wait 30s for echo testing
-		echoConn.SetReadDeadline(time.Now().Add(time.Second * 30))
+		buf := make([]byte, 1600)
-		n, addr, err := echoConn.ReadFromUDP(buf)
+		echoConn.SetReadDeadline(time.Now().Add(time.Second * 30))
-		if err != nil {
+		n, addr, err := echoConn.ReadFromUDP(buf)
-			return
+		if err != nil {
-		}
+			return
-		echoConn.WriteToUDP(buf[0:n], addr)
+		}
-		gLog.Println(LvDEBUG, "echo server end")
+		echoConn.WriteToUDP(buf[0:n], addr)
-	}()
+		gLog.Println(LvDEBUG, "echo server end")
-	// testing for public ip
+	}()
-	for i := 0; i < 2; i++ {
+	// testing for public ip
-		if i == 1 {
+	for i := 0; i < 2; i++ {
-			// test upnp or nat-pmp
+		if i == 1 {
-			gLog.Println(LvDEBUG, "upnp test start")
+			// test upnp or nat-pmp
-			nat, err := Discover()
+			gLog.Println(LvDEBUG, "upnp test start")
-			if err != nil || nat == nil {
+			nat, err := Discover()
-				gLog.Println(LvDEBUG, "could not perform UPNP discover:", err)
+			if err != nil || nat == nil {
-				break
+				gLog.Println(LvDEBUG, "could not perform UPNP discover:", err)
-			}
+				break
-			ext, err := nat.GetExternalAddress()
+			}
-			if err != nil {
+			ext, err := nat.GetExternalAddress()
-				gLog.Println(LvDEBUG, "could not perform UPNP external address:", err)
+			if err != nil {
-				break
+				gLog.Println(LvDEBUG, "could not perform UPNP external address:", err)
-			}
+				break
-			gLog.Println(LvINFO, "PublicIP:", ext)
+			}
-
+			gLog.Println(LvINFO, "PublicIP:", ext)
-			externalPort, err := nat.AddPortMapping("udp", echoPort, echoPort, "openp2p", 30) // 30 seconds fot upnp testing
+
-			if err != nil {
+			externalPort, err := nat.AddPortMapping("udp", echoPort, echoPort, "openp2p", 30) // 30 seconds fot upnp testing
-				gLog.Println(LvDEBUG, "could not add udp UPNP port mapping", externalPort)
+			if err != nil {
-				break
+				gLog.Println(LvDEBUG, "could not add udp UPNP port mapping", externalPort)
-			} else {
+				break
-				nat.AddPortMapping("tcp", echoPort, echoPort, "openp2p", 604800) // 7 days for tcp connection
+			} else {
-			}
+				nat.AddPortMapping("tcp", echoPort, echoPort, "openp2p", 604800) // 7 days for tcp connection
-		}
+			}
-		gLog.Printf(LvDEBUG, "public ip test start %s:%d", publicIP, echoPort)
+		}
-		conn, err := net.ListenUDP("udp", nil)
+		gLog.Printf(LvDEBUG, "public ip test start %s:%d", publicIP, echoPort)
-		if err != nil {
+		conn, err := net.ListenUDP("udp", nil)
-			break
+		if err != nil {
-		}
+			break
-		defer conn.Close()
+		}
-		dst, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", publicIP, echoPort))
+		defer conn.Close()
-		if err != nil {
+		dst, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", publicIP, echoPort))
-			break
+		if err != nil {
-		}
+			break
-		conn.WriteTo([]byte("echo"), dst)
+		}
-		buf := make([]byte, 1600)
+		conn.WriteTo([]byte("echo"), dst)
-
+		buf := make([]byte, 1600)
-		// wait for echo testing
+
-		conn.SetReadDeadline(time.Now().Add(PublicIPEchoTimeout))
+		// wait for echo testing
-		_, _, err = conn.ReadFromUDP(buf)
+		conn.SetReadDeadline(time.Now().Add(PublicIPEchoTimeout))
-		if err == nil {
+		_, _, err = conn.ReadFromUDP(buf)
-			if i == 1 {
+		if err == nil {
-				gLog.Println(LvDEBUG, "UPNP or NAT-PMP:YES")
+			if i == 1 {
-				hasUPNPorNATPMP = 1
+				gLog.Println(LvDEBUG, "UPNP or NAT-PMP:YES")
-			} else {
+				hasUPNPorNATPMP = 1
-				gLog.Println(LvDEBUG, "public ip:YES")
+			} else {
-				hasPublicIP = 1
+				gLog.Println(LvDEBUG, "public ip:YES")
-			}
+				hasPublicIP = 1
-			break
+			}
-		}
+			break
-	}
+		}
-	return
+	}
-}
+	return
 }
@@ -1,93 +1,121 @@
-package openp2p
+package openp2p
-
+
-import (
+import (
-	"fmt"
+	"fmt"
-	"math/rand"
+	"math/rand"
-	"os"
+	"os"
-	"path/filepath"
+	"path/filepath"
-	"strconv"
+	"strconv"
-	"time"
+	"time"
-)
+)
-
+
-func Run() {
+var GNetwork *P2PNetwork
-	rand.Seed(time.Now().UnixNano())
+
-	baseDir := filepath.Dir(os.Args[0])
+func Run() {
-	os.Chdir(baseDir) // for system service
+	rand.Seed(time.Now().UnixNano())
-	gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFile|LogConsole)
+	baseDir := filepath.Dir(os.Args[0])
-	// TODO: install sub command, deamon process
+	os.Chdir(baseDir) // for system service
-	if len(os.Args) > 1 {
+	gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFile|LogConsole)
-		switch os.Args[1] {
+	if len(os.Args) > 1 {
-		case "version", "-v", "--version":
+		switch os.Args[1] {
-			fmt.Println(OpenP2PVersion)
+		case "version", "-v", "--version":
-			return
+			fmt.Println(OpenP2PVersion)
-		case "install":
+			return
-			install()
+		case "install":
-			return
+			install()
-		case "uninstall":
+			return
-			uninstall()
+		case "uninstall":
-			return
+			uninstall()
-		}
+			return
-	} else {
+		}
-		installByFilename()
+	} else {
-	}
+		installByFilename()
-	parseParams("")
+	}
-	gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
+	parseParams("", "")
-	gLog.Println(LvINFO, "Contact: QQ group 16947733, Email [email protected]")
+	gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
-
+	gLog.Println(LvINFO, "Contact: QQ group 16947733, Email [email protected]")
-	if gConf.daemonMode {
+
-		d := daemon{}
+	if gConf.daemonMode {
-		d.run()
+		d := daemon{}
-		return
+		d.run()
-	}
+		return
-
+	}
-	gLog.Println(LvINFO, &gConf)
+
-	setFirewall()
+	gLog.Println(LvINFO, &gConf)
-	err := setRLimit()
+	setFirewall()
-	if err != nil {
+	err := setRLimit()
-		gLog.Println(LvINFO, "setRLimit error:", err)
+	if err != nil {
-	}
+		gLog.Println(LvINFO, "setRLimit error:", err)
-	network := P2PNetworkInstance(&gConf.Network)
+	}
-	if ok := network.Connect(30000); !ok {
+	GNetwork = P2PNetworkInstance()
-		gLog.Println(LvERROR, "P2PNetwork login error")
+	if ok := GNetwork.Connect(30000); !ok {
-		return
+		gLog.Println(LvERROR, "P2PNetwork login error")
-	}
+		return
-	gLog.Println(LvINFO, "waiting for connection...")
+	}
-	forever := make(chan bool)
+	// gLog.Println(LvINFO, "waiting for connection...")
-	<-forever
+	forever := make(chan bool)
-}
+	<-forever
-
+}
-var network *P2PNetwork
+
-
+// for Android app
-// for Android app
+// gomobile not support uint64 exported to java
-// gomobile not support uint64 exported to java
+
-func RunAsModule(baseDir string, token string, bw int, logLevel int) *P2PNetwork {
+func RunAsModule(baseDir string, token string, bw int, logLevel int) *P2PNetwork {
-	rand.Seed(time.Now().UnixNano())
+	rand.Seed(time.Now().UnixNano())
-	os.Chdir(baseDir) // for system service
+	os.Chdir(baseDir) // for system service
-	gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFile|LogConsole)
+	gLog = NewLogger(baseDir, ProductName, LvINFO, 1024*1024, LogFile|LogConsole)
-
+
-	parseParams("")
+	parseParams("", "")
-
+
-	n, err := strconv.ParseUint(token, 10, 64)
+	n, err := strconv.ParseUint(token, 10, 64)
-	if err == nil {
+	if err == nil && n > 0 {
-		gConf.setToken(n)
+		gConf.setToken(n)
-	}
+	}
-	gLog.setLevel(LogLevel(logLevel))
+	if n <= 0 && gConf.Network.Token == 0 { // not input token
-	gConf.setShareBandwidth(bw)
+		return nil
-	gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
+	}
-	gLog.Println(LvINFO, "Contact: QQ group 16947733, Email [email protected]")
+	// gLog.setLevel(LogLevel(logLevel))
-	gLog.Println(LvINFO, &gConf)
+	gConf.setShareBandwidth(bw)
-
+	gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
-	network = P2PNetworkInstance(&gConf.Network)
+	gLog.Println(LvINFO, "Contact: QQ group 16947733, Email [email protected]")
-	if ok := network.Connect(30000); !ok {
+	gLog.Println(LvINFO, &gConf)
-		gLog.Println(LvERROR, "P2PNetwork login error")
+
-		return nil
+	GNetwork = P2PNetworkInstance()
-	}
+	if ok := GNetwork.Connect(30000); !ok {
-	gLog.Println(LvINFO, "waiting for connection...")
+		gLog.Println(LvERROR, "P2PNetwork login error")
-	return network
+		return nil
-}
+	}
-
+	// gLog.Println(LvINFO, "waiting for connection...")
-func GetToken(baseDir string) string {
+	return GNetwork
-	os.Chdir(baseDir)
+}
-	gConf.load()
+
-	return fmt.Sprintf("%d", gConf.Network.Token)
+func RunCmd(cmd string) {
-}
+	rand.Seed(time.Now().UnixNano())
 	baseDir := filepath.Dir(os.Args[0])
 	os.Chdir(baseDir) // for system service
 	gLog = NewLogger(baseDir, ProductName, LvINFO, 1024*1024, LogFile|LogConsole)
 	parseParams("", cmd)
 	setFirewall()
 	err := setRLimit()
 	if err != nil {
 		gLog.Println(LvINFO, "setRLimit error:", err)
 	}
 	GNetwork = P2PNetworkInstance()
 	if ok := GNetwork.Connect(30000); !ok {
 		gLog.Println(LvERROR, "P2PNetwork login error")
 		return
 	}
 	forever := make(chan bool)
 	<-forever
 }
 func GetToken(baseDir string) string {
 	os.Chdir(baseDir)
 	gConf.load()
 	return fmt.Sprintf("%d", gConf.Network.Token)
 }
 func Stop() {
 	os.Exit(0)
 }
@@ -0,0 +1,20 @@
 package openp2p
 import (
 	"github.com/openp2p-cn/wireguard-go/tun"
 )
 var AndroidSDWANConfig chan []byte
 type optun struct {
 	tunName string
 	dev     tun.Device
 }
 func (t *optun) Stop() error {
 	t.dev.Close()
 	return nil
 }
 func init() {
 	AndroidSDWANConfig = make(chan []byte, 1)
 }
@@ -0,0 +1,85 @@
 // optun_android.go
 //go:build android
 // +build android
 package openp2p
 import (
 	"net"
 )
 const (
 	tunIfaceName = "optun"
 	PIHeaderSize = 0
 )
 var AndroidReadTun chan []byte // TODO: multi channel
 var AndroidWriteTun chan []byte
 func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
 	return nil
 }
 func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
 	bufs[0] = <-AndroidReadTun
 	sizes[0] = len(bufs[0])
 	return 1, nil
 }
 func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
 	AndroidWriteTun <- bufs[0]
 	return len(bufs[0]), nil
 }
 func AndroidRead(data []byte, len int) {
 	head := PacketHeader{}
 	parseHeader(data, &head)
 	gLog.Printf(LvDev, "AndroidRead tun dst ip=%s,len=%d", net.IP{byte(head.dst >> 24), byte(head.dst >> 16), byte(head.dst >> 8), byte(head.dst)}.String(), len)
 	buf := make([]byte, len)
 	copy(buf, data)
 	AndroidReadTun <- buf
 }
 func AndroidWrite(buf []byte) int {
 	p := <-AndroidWriteTun
 	copy(buf, p)
 	return len(p)
 }
 func GetAndroidSDWANConfig(buf []byte) int {
 	p := <-AndroidSDWANConfig
 	copy(buf, p)
 	gLog.Printf(LvINFO, "AndroidSDWANConfig=%s", p)
 	return len(p)
 }
 func GetAndroidNodeName() string {
 	gLog.Printf(LvINFO, "GetAndroidNodeName=%s", gConf.Network.Node)
 	return gConf.Network.Node
 }
 func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
 	// TODO:
 	return nil
 }
 func addRoute(dst, gw, ifname string) error {
 	// TODO:
 	return nil
 }
 func delRoute(dst, gw string) error {
 	// TODO:
 	return nil
 }
 func delRoutesByGateway(gateway string) error {
 	// TODO:
 	return nil
 }
 func init() {
 	AndroidReadTun = make(chan []byte, 1000)
 	AndroidWriteTun = make(chan []byte, 1000)
 }
@@ -0,0 +1,88 @@
 package openp2p
 import (
 	"fmt"
 	"net"
 	"os/exec"
 	"strings"
 	"github.com/openp2p-cn/wireguard-go/tun"
 )
 const (
 	tunIfaceName = "utun"
 	PIHeaderSize = 4 // utun has no IFF_NO_PI
 )
 func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
 	var err error
 	t.tunName = tunIfaceName
 	t.dev, err = tun.CreateTUN(t.tunName, 1420)
 	if err != nil {
 		return err
 	}
 	t.tunName, _ = t.dev.Name()
 	return nil
 }
 func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
 	return t.dev.Read(bufs, sizes, offset)
 }
 func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
 	return t.dev.Write(bufs, offset)
 }
 func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
 	li, _, err := net.ParseCIDR(localAddr)
 	if err != nil {
 		return fmt.Errorf("parse local addr fail:%s", err)
 	}
 	ri, _, err := net.ParseCIDR(remoteAddr)
 	if err != nil {
 		return fmt.Errorf("parse remote addr fail:%s", err)
 	}
 	err = exec.Command("ifconfig", ifname, "inet", li.String(), ri.String(), "up").Run()
 	return err
 }
 func addRoute(dst, gw, ifname string) error {
 	err := exec.Command("route", "add", dst, gw).Run()
 	return err
 }
 func delRoute(dst, gw string) error {
 	err := exec.Command("route", "delete", dst, "-gateway", gw).Run()
 	return err
 }
 func delRoutesByGateway(gateway string) error {
 	cmd := exec.Command("netstat", "-rn")
 	output, err := cmd.Output()
 	if err != nil {
 		return err
 	}
 	lines := strings.Split(string(output), "\n")
 	for _, line := range lines {
 		if !strings.Contains(line, gateway) {
 			continue
 		}
 		fields := strings.Fields(line)
 		if len(fields) >= 2 {
 			cmd := exec.Command("route", "delete", fields[0], gateway)
 			err := cmd.Run()
 			if err != nil {
 				gLog.Printf(LvERROR, "Delete route %s error:%s", fields[0], err)
 				continue
 			}
 			gLog.Printf(LvINFO, "Delete route ok: %s %s\n", fields[0], gateway)
 		}
 	}
 	return nil
 }
 func addTunAddr(localAddr, remoteAddr string) error {
 	return nil
 }
 func delTunAddr(localAddr, remoteAddr string) error {
 	return nil
 }
@@ -0,0 +1,134 @@
 //go:build !android
 // +build !android
 // optun_linux.go
 package openp2p
 import (
 	"fmt"
 	"net"
 	"os/exec"
 	"strings"
 	"github.com/openp2p-cn/wireguard-go/tun"
 	"github.com/vishvananda/netlink"
 )
 const (
 	tunIfaceName = "optun"
 	PIHeaderSize = 0
 )
 var previousIP = ""
 func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
 	var err error
 	t.tunName = tunIfaceName
 	t.dev, err = tun.CreateTUN(t.tunName, 1420)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
 	return t.dev.Read(bufs, sizes, offset)
 }
 func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
 	return t.dev.Write(bufs, offset)
 }
 func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
 	ifce, err := netlink.LinkByName(ifname)
 	if err != nil {
 		return err
 	}
 	netlink.LinkSetMTU(ifce, 1375)
 	netlink.LinkSetTxQLen(ifce, 100)
 	netlink.LinkSetUp(ifce)
 	ln, err := netlink.ParseIPNet(localAddr)
 	if err != nil {
 		return err
 	}
 	ln.Mask = net.CIDRMask(32, 32)
 	rn, err := netlink.ParseIPNet(remoteAddr)
 	if err != nil {
 		return err
 	}
 	rn.Mask = net.CIDRMask(32, 32)
 	addr := &netlink.Addr{
 		IPNet: ln,
 		Peer:  rn,
 	}
 	if previousIP != "" {
 		lnDel, err := netlink.ParseIPNet(previousIP)
 		if err != nil {
 			return err
 		}
 		lnDel.Mask = net.CIDRMask(32, 32)
 		addrDel := &netlink.Addr{
 			IPNet: lnDel,
 			Peer:  rn,
 		}
 		netlink.AddrDel(ifce, addrDel)
 	}
 	previousIP = localAddr
 	return netlink.AddrAdd(ifce, addr)
 }
 func addRoute(dst, gw, ifname string) error {
 	_, networkid, err := net.ParseCIDR(dst)
 	if err != nil {
 		return err
 	}
 	ipGW := net.ParseIP(gw)
 	if ipGW == nil {
 		return fmt.Errorf("parse gateway %s failed", gw)
 	}
 	route := &netlink.Route{
 		Dst: networkid,
 		Gw:  ipGW,
 	}
 	return netlink.RouteAdd(route)
 }
 func delRoute(dst, gw string) error {
 	_, networkid, err := net.ParseCIDR(dst)
 	if err != nil {
 		return err
 	}
 	route := &netlink.Route{
 		Dst: networkid,
 	}
 	return netlink.RouteDel(route)
 }
 func delRoutesByGateway(gateway string) error {
 	cmd := exec.Command("route", "-n")
 	output, err := cmd.Output()
 	if err != nil {
 		return err
 	}
 	lines := strings.Split(string(output), "\n")
 	for _, line := range lines {
 		if !strings.Contains(line, gateway) {
 			continue
 		}
 		fields := strings.Fields(line)
 		if len(fields) >= 8 && fields[1] == "0.0.0.0" && fields[7] == gateway {
 			delCmd := exec.Command("route", "del", "-net", fields[0], "gw", gateway)
 			err := delCmd.Run()
 			if err != nil {
 				gLog.Printf(LvERROR, "Delete route %s error:%s", fields[0], err)
 				continue
 			}
 			gLog.Printf(LvINFO, "Delete route ok: %s %s %s\n", fields[0], fields[1], gateway)
 		}
 	}
 	return nil
 }
@@ -0,0 +1,42 @@
 //go:build !linux && !windows && !darwin
 // +build !linux,!windows,!darwin
 package openp2p
 import "github.com/openp2p-cn/wireguard-go/tun"
 const (
 	tunIfaceName = "optun"
 	PIHeaderSize = 0
 )
 func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
 	var err error
 	t.tunName = tunIfaceName
 	t.dev, err = tun.CreateTUN(t.tunName, 1420)
 	if err != nil {
 		return err
 	}
 	err = setTunAddr(t.tunName, localAddr, detail.Gateway, t.dev)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 func addRoute(dst, gw, ifname string) error {
 	return nil
 }
 func delRoute(dst, gw string) error {
 	return nil
 }
 func addTunAddr(localAddr, remoteAddr string) error {
 	return nil
 }
 func delTunAddr(localAddr, remoteAddr string) error {
 	return nil
 }
@@ -0,0 +1,143 @@
 package openp2p
 import (
 	"fmt"
 	"net"
 	"net/netip"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
 	"github.com/openp2p-cn/wireguard-go/tun"
 	"golang.org/x/sys/windows"
 	"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
 )
 const (
 	tunIfaceName = "optun"
 	PIHeaderSize = 0
 )
 func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
 	// check wintun.dll
 	tmpFile := filepath.Dir(os.Args[0]) + "/wintun.dll"
 	fs, err := os.Stat(tmpFile)
 	if err != nil || fs.Size() == 0 {
 		url := fmt.Sprintf("https://openp2p.cn/download/v1/latest/wintun/%s/wintun.dll", runtime.GOARCH)
 		err = downloadFile(url, "", tmpFile)
 		if err != nil {
 			os.Remove(tmpFile)
 			return err
 		}
 	}
 	t.tunName = tunIfaceName
 	uuid := &windows.GUID{
 		Data1: 0xf411e821,
 		Data2: 0xb310,
 		Data3: 0x4567,
 		Data4: [8]byte{0x80, 0x42, 0x83, 0x7e, 0xf4, 0x56, 0xce, 0x13},
 	}
 	t.dev, err = tun.CreateTUNWithRequestedGUID(t.tunName, uuid, 1420)
 	if err != nil { // retry
 		t.dev, err = tun.CreateTUNWithRequestedGUID(t.tunName, uuid, 1420)
 	}
 	if err != nil {
 		return err
 	}
 	return nil
 }
 func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
 	return t.dev.Read(bufs, sizes, offset)
 }
 func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
 	return t.dev.Write(bufs, offset)
 }
 func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
 	nativeTunDevice := wintun.(*tun.NativeTun)
 	link := winipcfg.LUID(nativeTunDevice.LUID())
 	ip, err := netip.ParsePrefix(localAddr)
 	if err != nil {
 		gLog.Printf(LvERROR, "ParsePrefix error:%s, luid:%d,localAddr:%s", err, nativeTunDevice.LUID(), localAddr)
 		return err
 	}
 	err = link.SetIPAddresses([]netip.Prefix{ip})
 	if err != nil {
 		gLog.Printf(LvERROR, "SetIPAddresses error:%s, netip.Prefix:%+v", err, []netip.Prefix{ip})
 		return err
 	}
 	return nil
 }
 func addRoute(dst, gw, ifname string) error {
 	_, dstNet, err := net.ParseCIDR(dst)
 	if err != nil {
 		return err
 	}
 	i, err := net.InterfaceByName(ifname)
 	if err != nil {
 		return err
 	}
 	params := make([]string, 0)
 	params = append(params, "add")
 	params = append(params, dstNet.IP.String())
 	params = append(params, "mask")
 	params = append(params, net.IP(dstNet.Mask).String())
 	params = append(params, gw)
 	params = append(params, "if")
 	params = append(params, strconv.Itoa(i.Index))
 	// gLogger.Println(LevelINFO, "windows add route params:", params)
 	execCommand("route", true, params...)
 	return nil
 }
 func delRoute(dst, gw string) error {
 	_, dstNet, err := net.ParseCIDR(dst)
 	if err != nil {
 		return err
 	}
 	params := make([]string, 0)
 	params = append(params, "delete")
 	params = append(params, dstNet.IP.String())
 	params = append(params, "mask")
 	params = append(params, net.IP(dstNet.Mask).String())
 	params = append(params, gw)
 	// gLogger.Println(LevelINFO, "windows delete route params:", params)
 	execCommand("route", true, params...)
 	return nil
 }
 func delRoutesByGateway(gateway string) error {
 	cmd := exec.Command("route", "print", "-4")
 	output, err := cmd.Output()
 	if err != nil {
 		return err
 	}
 	lines := strings.Split(string(output), "\n")
 	for _, line := range lines {
 		if !strings.Contains(line, gateway) {
 			continue
 		}
 		fields := strings.Fields(line)
 		if len(fields) >= 5 {
 			cmd := exec.Command("route", "delete", fields[0], "mask", fields[1], gateway)
 			err := cmd.Run()
 			if err != nil {
 				gLog.Printf(LvERROR, "Delete route %s error:%s", fields[0], err)
 				continue
 			}
 			gLog.Printf(LvINFO, "Delete route ok: %s %s %s\n", fields[0], fields[1], gateway)
 		}
 	}
 	return nil
 }
@@ -23,15 +23,16 @@ func (e *DeadlineExceededError) Temporary() bool { return true }
 // implement io.Writer
 type overlayConn struct {
-	tunnel      *P2PTunnel
+	tunnel      *P2PTunnel // TODO: del
 	app         *p2pApp
 	connTCP     net.Conn
 	id          uint64
 	rtid        uint64
 	running     bool
 	isClient    bool
-	appID       uint64
+	appID       uint64 // TODO: del
-	appKey      uint64
+	appKey      uint64 // TODO: del
-	appKeyBytes []byte
+	appKeyBytes []byte // TODO: del
 	// for udp
 	connUDP       *net.UDPConn
 	remoteAddr    net.Addr
@@ -65,15 +66,16 @@ func (oConn *overlayConn) run() {
 			payload, _ = encryptBytes(oConn.appKeyBytes, encryptData, readBuff[:dataLen], dataLen)
 		}
 		writeBytes := append(tunnelHead.Bytes(), payload...)
 		// TODO: app.write
 		if oConn.rtid == 0 {
 			oConn.tunnel.conn.WriteBytes(MsgP2P, MsgOverlayData, writeBytes)
-			gLog.Printf(LvDEBUG, "write overlay data to %d:%d bodylen=%d", oConn.rtid, oConn.id, len(writeBytes))
+			gLog.Printf(LvDev, "write overlay data to tid:%d,oid:%d bodylen=%d", oConn.tunnel.id, oConn.id, len(writeBytes))
 		} else {
 			// write raley data
 			all := append(relayHead.Bytes(), encodeHeader(MsgP2P, MsgOverlayData, uint32(len(writeBytes)))...)
 			all = append(all, writeBytes...)
 			oConn.tunnel.conn.WriteBytes(MsgP2P, MsgRelayData, all)
-			gLog.Printf(LvDEBUG, "write relay data to %d:%d bodylen=%d", oConn.rtid, oConn.id, len(writeBytes))
+			gLog.Printf(LvDev, "write relay data to tid:%d,rtid:%d,oid:%d bodylen=%d", oConn.tunnel.id, oConn.rtid, oConn.id, len(writeBytes))
 		}
 	}
 	if oConn.connTCP != nil {
@@ -85,14 +87,7 @@ func (oConn *overlayConn) run() {
 	oConn.tunnel.overlayConns.Delete(oConn.id)
 	// notify peer disconnect
 	req := OverlayDisconnectReq{ID: oConn.id}
-	if oConn.rtid == 0 {
+	oConn.tunnel.WriteMessage(oConn.rtid, MsgP2P, MsgOverlayDisconnectReq, &req)
 		oConn.tunnel.conn.WriteMessage(MsgP2P, MsgOverlayDisconnectReq, &req)
 	} else {
 		// write relay data
 		msg, _ := newMessage(MsgP2P, MsgOverlayDisconnectReq, &req)
 		msgWithHead := append(relayHead.Bytes(), msg...)
 		oConn.tunnel.conn.WriteBytes(MsgP2P, MsgRelayData, msgWithHead)
 	}
 }
 func (oConn *overlayConn) Read(reuseBuff []byte) (buff []byte, dataLen int, err error) {
@@ -163,11 +158,11 @@ func (oConn *overlayConn) Close() (err error) {
 	oConn.running = false
 	if oConn.connTCP != nil {
 		oConn.connTCP.Close()
-		oConn.connTCP = nil
+		// oConn.connTCP = nil
 	}
 	if oConn.connUDP != nil {
 		oConn.connUDP.Close()
-		oConn.connUDP = nil
+		// oConn.connUDP = nil
 	}
 	return nil
 }
@@ -13,50 +13,386 @@ import (
 )
 type p2pApp struct {
-	config      AppConfig
+	config       AppConfig
-	listener    net.Listener
+	listener     net.Listener
-	listenerUDP *net.UDPConn
+	listenerUDP  *net.UDPConn
-	tunnel      *P2PTunnel
+	directTunnel *P2PTunnel
-	iptree      *IPTree
+	relayTunnel  *P2PTunnel
-	rtid        uint64 // relay tunnelID
+	tunnelMtx    sync.Mutex
-	relayNode   string
+	iptree       *IPTree // for whitelist
-	relayMode   string
+	rtid         uint64  // relay tunnelID
-	hbTime      time.Time
+	relayNode    string
-	hbMtx       sync.Mutex
+	relayMode    string // public/private
-	running     bool
+	hbTimeRelay  time.Time
-	id          uint64
+	hbMtx        sync.Mutex
-	key         uint64
+	running      bool
-	wg          sync.WaitGroup
+	id           uint64
 	key          uint64 // aes
 	wg           sync.WaitGroup
 	relayHead    *bytes.Buffer
 	once         sync.Once
 	// for relayTunnel
 	retryRelayNum      int
 	retryRelayTime     time.Time
 	nextRetryRelayTime time.Time
 	errMsg             string
 	connectTime        time.Time
 }
 func (app *p2pApp) Tunnel() *P2PTunnel {
 	app.tunnelMtx.Lock()
 	defer app.tunnelMtx.Unlock()
 	if app.directTunnel != nil {
 		return app.directTunnel
 	}
 	return app.relayTunnel
 }
 func (app *p2pApp) DirectTunnel() *P2PTunnel {
 	app.tunnelMtx.Lock()
 	defer app.tunnelMtx.Unlock()
 	return app.directTunnel
 }
 func (app *p2pApp) setDirectTunnel(t *P2PTunnel) {
 	app.tunnelMtx.Lock()
 	defer app.tunnelMtx.Unlock()
 	app.directTunnel = t
 }
 func (app *p2pApp) RelayTunnel() *P2PTunnel {
 	app.tunnelMtx.Lock()
 	defer app.tunnelMtx.Unlock()
 	return app.relayTunnel
 }
 func (app *p2pApp) setRelayTunnel(t *P2PTunnel) {
 	app.tunnelMtx.Lock()
 	defer app.tunnelMtx.Unlock()
 	app.relayTunnel = t
 }
 func (app *p2pApp) isDirect() bool {
 	return app.directTunnel != nil
 }
 func (app *p2pApp) RelayTunnelID() uint64 {
 	if app.isDirect() {
 		return 0
 	}
 	return app.rtid
 }
 func (app *p2pApp) ConnectTime() time.Time {
 	if app.isDirect() {
 		return app.config.connectTime
 	}
 	return app.connectTime
 }
 func (app *p2pApp) RetryTime() time.Time {
 	if app.isDirect() {
 		return app.config.retryTime
 	}
 	return app.retryRelayTime
 }
 func (app *p2pApp) checkP2PTunnel() error {
 	for app.running {
 		app.checkDirectTunnel()
 		app.checkRelayTunnel()
 		time.Sleep(time.Second * 3)
 	}
 	return nil
 }
 func (app *p2pApp) directRetryLimit() int {
 	if app.config.peerIP == gConf.Network.publicIP && compareVersion(app.config.peerVersion, SupportIntranetVersion) >= 0 {
 		return retryLimit
 	}
 	if IsIPv6(app.config.peerIPv6) && IsIPv6(gConf.IPv6()) {
 		return retryLimit
 	}
 	if app.config.hasIPv4 == 1 || gConf.Network.hasIPv4 == 1 || app.config.hasUPNPorNATPMP == 1 || gConf.Network.hasUPNPorNATPMP == 1 {
 		return retryLimit
 	}
 	if gConf.Network.natType == NATCone && app.config.peerNatType == NATCone {
 		return retryLimit
 	}
 	if app.config.peerNatType == NATSymmetric && gConf.Network.natType == NATSymmetric {
 		return 0
 	}
 	return retryLimit / 10 // c2s or s2c
 }
 func (app *p2pApp) checkDirectTunnel() error {
 	if app.config.ForceRelay == 1 && app.config.RelayNode != app.config.PeerNode {
 		return nil
 	}
 	if app.DirectTunnel() != nil && app.DirectTunnel().isActive() {
 		return nil
 	}
 	if app.config.nextRetryTime.After(time.Now()) || app.config.Enabled == 0 || app.config.retryNum >= app.directRetryLimit() {
 		return nil
 	}
 	if time.Now().Add(-time.Minute * 15).After(app.config.retryTime) { // run normally 15min, reset retrynum
 		app.config.retryNum = 1
 	}
 	if app.config.retryNum > 0 { // first time not show reconnect log
 		gLog.Printf(LvINFO, "detect app %s appid:%d disconnect, reconnecting the %d times...", app.config.LogPeerNode(), app.id, app.config.retryNum)
 	}
 	app.config.retryNum++
 	app.config.retryTime = time.Now()
 	app.config.nextRetryTime = time.Now().Add(retryInterval)
 	app.config.connectTime = time.Now()
 	err := app.buildDirectTunnel()
 	if err != nil {
 		app.config.errMsg = err.Error()
 		if err == ErrPeerOffline && app.config.retryNum > 2 { // stop retry, waiting for online
 			app.config.retryNum = retryLimit
 			gLog.Printf(LvINFO, " %s offline, it will auto reconnect when peer node online", app.config.LogPeerNode())
 		}
 		if err == ErrBuildTunnelBusy {
 			app.config.retryNum--
 		}
 	}
 	if app.Tunnel() != nil {
 		app.once.Do(func() {
 			go app.listen()
 			// memapp also need
 			go app.relayHeartbeatLoop()
 		})
 	}
 	return nil
 }
 func (app *p2pApp) buildDirectTunnel() error {
 	relayNode := ""
 	peerNatType := NATUnknown
 	peerIP := ""
 	errMsg := ""
 	var t *P2PTunnel
 	var err error
 	pn := GNetwork
 	initErr := pn.requestPeerInfo(&app.config)
 	if initErr != nil {
 		gLog.Printf(LvERROR, "%s init error:%s", app.config.LogPeerNode(), initErr)
 		return initErr
 	}
 	t, err = pn.addDirectTunnel(app.config, 0)
 	if t != nil {
 		peerNatType = t.config.peerNatType
 		peerIP = t.config.peerIP
 	}
 	if err != nil {
 		errMsg = err.Error()
 	}
 	req := ReportConnect{
 		Error:          errMsg,
 		Protocol:       app.config.Protocol,
 		SrcPort:        app.config.SrcPort,
 		NatType:        gConf.Network.natType,
 		PeerNode:       app.config.PeerNode,
 		DstPort:        app.config.DstPort,
 		DstHost:        app.config.DstHost,
 		PeerNatType:    peerNatType,
 		PeerIP:         peerIP,
 		ShareBandwidth: gConf.Network.ShareBandwidth,
 		RelayNode:      relayNode,
 		Version:        OpenP2PVersion,
 	}
 	pn.write(MsgReport, MsgReportConnect, &req)
 	if err != nil {
 		return err
 	}
 	// if rtid != 0 || t.conn.Protocol() == "tcp" {
 	// sync appkey
 	if t == nil {
 		return err
 	}
 	syncKeyReq := APPKeySync{
 		AppID:  app.id,
 		AppKey: app.key,
 	}
 	gLog.Printf(LvDEBUG, "sync appkey direct to %s", app.config.LogPeerNode())
 	pn.push(app.config.PeerNode, MsgPushAPPKey, &syncKeyReq)
 	app.setDirectTunnel(t)
 	// if memapp notify peer addmemapp
 	if app.config.SrcPort == 0 {
 		req := ServerSideSaveMemApp{From: gConf.Network.Node, Node: gConf.Network.Node, TunnelID: t.id, RelayTunnelID: 0, AppID: app.id}
 		pn.push(app.config.PeerNode, MsgPushServerSideSaveMemApp, &req)
 		gLog.Printf(LvDEBUG, "push %s ServerSideSaveMemApp: %s", app.config.LogPeerNode(), prettyJson(req))
 	}
 	gLog.Printf(LvDEBUG, "%s use tunnel %d", app.config.AppName, t.id)
 	return nil
 }
 func (app *p2pApp) checkRelayTunnel() error {
 	// if app.config.ForceRelay == 1 && (gConf.sdwan.CentralNode == app.config.PeerNode && compareVersion(app.config.peerVersion, SupportDualTunnelVersion) < 0) {
 	if app.config.SrcPort == 0 && (gConf.sdwan.CentralNode == app.config.PeerNode || gConf.sdwan.CentralNode == gConf.Network.Node) { // memapp central node not build relay tunnel
 		return nil
 	}
 	app.hbMtx.Lock()
 	if app.RelayTunnel() != nil && time.Now().Before(app.hbTimeRelay.Add(TunnelHeartbeatTime*2)) { // must check app.hbtime instead of relayTunnel
 		app.hbMtx.Unlock()
 		return nil
 	}
 	app.hbMtx.Unlock()
 	if app.nextRetryRelayTime.After(time.Now()) || app.config.Enabled == 0 || app.retryRelayNum >= retryLimit {
 		return nil
 	}
 	if time.Now().Add(-time.Minute * 15).After(app.retryRelayTime) { // run normally 15min, reset retrynum
 		app.retryRelayNum = 1
 	}
 	if app.retryRelayNum > 0 { // first time not show reconnect log
 		gLog.Printf(LvINFO, "detect app %s appid:%d relay disconnect, reconnecting the %d times...", app.config.LogPeerNode(), app.id, app.retryRelayNum)
 	}
 	app.setRelayTunnel(nil) // reset relayTunnel
 	app.retryRelayNum++
 	app.retryRelayTime = time.Now()
 	app.nextRetryRelayTime = time.Now().Add(retryInterval)
 	app.connectTime = time.Now()
 	err := app.buildRelayTunnel()
 	if err != nil {
 		app.errMsg = err.Error()
 		if err == ErrPeerOffline && app.retryRelayNum > 2 { // stop retry, waiting for online
 			app.retryRelayNum = retryLimit
 			gLog.Printf(LvINFO, " %s offline, it will auto reconnect when peer node online", app.config.LogPeerNode())
 		}
 	}
 	if app.Tunnel() != nil {
 		app.once.Do(func() {
 			go app.listen()
 			// memapp also need
 			go app.relayHeartbeatLoop()
 		})
 	}
 	return nil
 }
 func (app *p2pApp) buildRelayTunnel() error {
 	var rtid uint64
 	relayNode := ""
 	relayMode := ""
 	peerNatType := NATUnknown
 	peerIP := ""
 	errMsg := ""
 	var t *P2PTunnel
 	var err error
 	pn := GNetwork
 	config := app.config
 	initErr := pn.requestPeerInfo(&config)
 	if initErr != nil {
 		gLog.Printf(LvERROR, "%s init error:%s", config.LogPeerNode(), initErr)
 		return initErr
 	}
 	t, rtid, relayMode, err = pn.addRelayTunnel(config)
 	if t != nil {
 		relayNode = t.config.PeerNode
 	}
 	if err != nil {
 		errMsg = err.Error()
 	}
 	req := ReportConnect{
 		Error:          errMsg,
 		Protocol:       config.Protocol,
 		SrcPort:        config.SrcPort,
 		NatType:        gConf.Network.natType,
 		PeerNode:       config.PeerNode,
 		DstPort:        config.DstPort,
 		DstHost:        config.DstHost,
 		PeerNatType:    peerNatType,
 		PeerIP:         peerIP,
 		ShareBandwidth: gConf.Network.ShareBandwidth,
 		RelayNode:      relayNode,
 		Version:        OpenP2PVersion,
 	}
 	pn.write(MsgReport, MsgReportConnect, &req)
 	if err != nil {
 		return err
 	}
 	// if rtid != 0 || t.conn.Protocol() == "tcp" {
 	// sync appkey
 	syncKeyReq := APPKeySync{
 		AppID:  app.id,
 		AppKey: app.key,
 	}
 	gLog.Printf(LvDEBUG, "sync appkey relay to %s", config.LogPeerNode())
 	pn.push(config.PeerNode, MsgPushAPPKey, &syncKeyReq)
 	app.setRelayTunnelID(rtid)
 	app.setRelayTunnel(t)
 	app.relayNode = relayNode
 	app.relayMode = relayMode
 	app.hbTimeRelay = time.Now()
 	// if memapp notify peer addmemapp
 	if config.SrcPort == 0 {
 		req := ServerSideSaveMemApp{From: gConf.Network.Node, Node: relayNode, TunnelID: rtid, RelayTunnelID: t.id, AppID: app.id, RelayMode: relayMode}
 		pn.push(config.PeerNode, MsgPushServerSideSaveMemApp, &req)
 		gLog.Printf(LvDEBUG, "push %s relay ServerSideSaveMemApp: %s", config.LogPeerNode(), prettyJson(req))
 	}
 	gLog.Printf(LvDEBUG, "%s use tunnel %d", app.config.AppName, t.id)
 	return nil
 }
 func (app *p2pApp) buildOfficialTunnel() error {
 	return nil
 }
 // cache relayHead, refresh when rtid change
 func (app *p2pApp) RelayHead() *bytes.Buffer {
 	if app.relayHead == nil {
 		app.relayHead = new(bytes.Buffer)
 		binary.Write(app.relayHead, binary.LittleEndian, app.rtid)
 	}
 	return app.relayHead
 }
 func (app *p2pApp) setRelayTunnelID(rtid uint64) {
 	app.rtid = rtid
 	app.relayHead = new(bytes.Buffer)
 	binary.Write(app.relayHead, binary.LittleEndian, app.rtid)
 }
 func (app *p2pApp) isActive() bool {
-	if app.tunnel == nil {
+	if app.Tunnel() == nil {
 		// gLog.Printf(LvDEBUG, "isActive app.tunnel==nil")
 		return false
 	}
-	if app.rtid == 0 { // direct mode app heartbeat equals to tunnel heartbeat
+	if app.isDirect() { // direct mode app heartbeat equals to tunnel heartbeat
-		return app.tunnel.isActive()
+		return app.Tunnel().isActive()
 	}
 	// relay mode calc app heartbeat
 	app.hbMtx.Lock()
 	defer app.hbMtx.Unlock()
-	return time.Now().Before(app.hbTime.Add(TunnelIdleTimeout))
+	res := time.Now().Before(app.hbTimeRelay.Add(TunnelHeartbeatTime * 2))
 	// if !res {
 	// 	gLog.Printf(LvDEBUG, "%d app isActive false. peer=%s", app.id, app.config.PeerNode)
 	// }
 	return res
 }
 func (app *p2pApp) updateHeartbeat() {
 	app.hbMtx.Lock()
 	defer app.hbMtx.Unlock()
-	app.hbTime = time.Now()
+	app.hbTimeRelay = time.Now()
 }
 func (app *p2pApp) listenTCP() error {
 	gLog.Printf(LvDEBUG, "tcp accept on port %d start", app.config.SrcPort)
 	defer gLog.Printf(LvDEBUG, "tcp accept on port %d end", app.config.SrcPort)
 	var err error
-	app.listener, err = net.Listen("tcp", fmt.Sprintf("0.0.0.0:%d", app.config.SrcPort)) // support tcp4 and tcp6
+	listenAddr := ""
 	if IsLocalhost(app.config.Whitelist) { // not expose port
 		listenAddr = "127.0.0.1"
 	}
 	app.listener, err = net.Listen("tcp", fmt.Sprintf("%s:%d", listenAddr, app.config.SrcPort))
 	if err != nil {
 		gLog.Printf(LvERROR, "listen error:%s", err)
 		return err
 	}
 	defer app.listener.Close()
 	for app.running {
 		conn, err := app.listener.Accept()
 		if err != nil {
@@ -65,25 +401,33 @@ func (app *p2pApp) listenTCP() error {
 			}
 			break
 		}
 		if app.Tunnel() == nil {
 			gLog.Printf(LvDEBUG, "srcPort=%d, app.Tunnel()==nil, not ready", app.config.SrcPort)
 			time.Sleep(time.Second)
 			continue
 		}
 		// check white list
 		if app.config.Whitelist != "" {
-			remoteIP := strings.Split(conn.RemoteAddr().String(), ":")[0]
+			remoteIP := conn.RemoteAddr().(*net.TCPAddr).IP.String()
-			if !app.iptree.Contains(remoteIP) {
+			if !app.iptree.Contains(remoteIP) && !IsLocalhost(remoteIP) {
 				conn.Close()
 				gLog.Printf(LvERROR, "%s not in whitelist, access denied", remoteIP)
 				continue
 			}
 		}
 		oConn := overlayConn{
-			tunnel:   app.tunnel,
+			tunnel:   app.Tunnel(),
 			app:      app,
 			connTCP:  conn,
 			id:       rand.Uint64(),
 			isClient: true,
 			rtid:     app.rtid,
 			appID:    app.id,
 			appKey:   app.key,
 			running:  true,
 		}
 		if !app.isDirect() {
 			oConn.rtid = app.rtid
 		}
 		// pre-calc key bytes for encrypt
 		if oConn.appKey != 0 {
 			encryptKey := make([]byte, AESKeySize)
@@ -91,26 +435,20 @@ func (app *p2pApp) listenTCP() error {
 			binary.LittleEndian.PutUint64(encryptKey[8:], oConn.appKey)
 			oConn.appKeyBytes = encryptKey
 		}
-		app.tunnel.overlayConns.Store(oConn.id, &oConn)
+		app.Tunnel().overlayConns.Store(oConn.id, &oConn)
 		gLog.Printf(LvDEBUG, "Accept TCP overlayID:%d, %s", oConn.id, oConn.connTCP.RemoteAddr())
 		// tell peer connect
 		req := OverlayConnectReq{ID: oConn.id,
-			Token:    app.tunnel.pn.config.Token,
+			Token:    gConf.Network.Token,
 			DstIP:    app.config.DstHost,
 			DstPort:  app.config.DstPort,
 			Protocol: app.config.Protocol,
 			AppID:    app.id,
 		}
-		if app.rtid == 0 {
+		if !app.isDirect() {
-			app.tunnel.conn.WriteMessage(MsgP2P, MsgOverlayConnectReq, &req)
+			req.RelayTunnelID = app.Tunnel().id
 		} else {
 			req.RelayTunnelID = app.tunnel.id
 			relayHead := new(bytes.Buffer)
 			binary.Write(relayHead, binary.LittleEndian, app.rtid)
 			msg, _ := newMessage(MsgP2P, MsgOverlayConnectReq, &req)
 			msgWithHead := append(relayHead.Bytes(), msg...)
 			app.tunnel.conn.WriteBytes(MsgP2P, MsgRelayData, msgWithHead)
 		}
 		app.Tunnel().WriteMessage(app.RelayTunnelID(), MsgP2P, MsgOverlayConnectReq, &req)
 		// TODO: wait OverlayConnectRsp instead of sleep
 		time.Sleep(time.Second) // waiting remote node connection ok
 		go oConn.run()
@@ -127,6 +465,7 @@ func (app *p2pApp) listenUDP() error {
 		gLog.Printf(LvERROR, "listen error:%s", err)
 		return err
 	}
 	defer app.listenerUDP.Close()
 	buffer := make([]byte, 64*1024+PaddingSize)
 	udpID := make([]byte, 8)
 	for {
@@ -140,6 +479,11 @@ func (app *p2pApp) listenUDP() error {
 				break
 			}
 		} else {
 			if app.Tunnel() == nil {
 				gLog.Printf(LvDEBUG, "srcPort=%d, app.Tunnel()==nil, not ready", app.config.SrcPort)
 				time.Sleep(time.Second)
 				continue
 			}
 			dupData := bytes.Buffer{} // should uses memory pool
 			dupData.Write(buffer[:len+PaddingSize])
 			// load from app.tunnel.overlayConns by remoteAddr error, new udp connection
@@ -153,20 +497,22 @@ func (app *p2pApp) listenUDP() error {
 			udpID[4] = byte(port)
 			udpID[5] = byte(port >> 8)
 			id := binary.LittleEndian.Uint64(udpID) // convert remoteIP:port to uint64
-			s, ok := app.tunnel.overlayConns.Load(id)
+			s, ok := app.Tunnel().overlayConns.Load(id)
 			if !ok {
 				oConn := overlayConn{
-					tunnel:     app.tunnel,
+					tunnel:     app.Tunnel(),
 					connUDP:    app.listenerUDP,
 					remoteAddr: remoteAddr,
 					udpData:    make(chan []byte, 1000),
 					id:         id,
 					isClient:   true,
 					rtid:       app.rtid,
 					appID:      app.id,
 					appKey:     app.key,
 					running:    true,
 				}
 				if !app.isDirect() {
 					oConn.rtid = app.rtid
 				}
 				// calc key bytes for encrypt
 				if oConn.appKey != 0 {
 					encryptKey := make([]byte, AESKeySize)
@@ -174,26 +520,20 @@ func (app *p2pApp) listenUDP() error {
 					binary.LittleEndian.PutUint64(encryptKey[8:], oConn.appKey)
 					oConn.appKeyBytes = encryptKey
 				}
-				app.tunnel.overlayConns.Store(oConn.id, &oConn)
+				app.Tunnel().overlayConns.Store(oConn.id, &oConn)
 				gLog.Printf(LvDEBUG, "Accept UDP overlayID:%d", oConn.id)
 				// tell peer connect
 				req := OverlayConnectReq{ID: oConn.id,
-					Token:    app.tunnel.pn.config.Token,
+					Token:    gConf.Network.Token,
 					DstIP:    app.config.DstHost,
 					DstPort:  app.config.DstPort,
 					Protocol: app.config.Protocol,
 					AppID:    app.id,
 				}
-				if app.rtid == 0 {
+				if !app.isDirect() {
-					app.tunnel.conn.WriteMessage(MsgP2P, MsgOverlayConnectReq, &req)
+					req.RelayTunnelID = app.Tunnel().id
 				} else {
 					req.RelayTunnelID = app.tunnel.id
 					relayHead := new(bytes.Buffer)
 					binary.Write(relayHead, binary.LittleEndian, app.rtid)
 					msg, _ := newMessage(MsgP2P, MsgOverlayConnectReq, &req)
 					msgWithHead := append(relayHead.Bytes(), msg...)
 					app.tunnel.conn.WriteBytes(MsgP2P, MsgRelayData, msgWithHead)
 				}
 				app.Tunnel().WriteMessage(app.RelayTunnelID(), MsgP2P, MsgOverlayConnectReq, &req)
 				// TODO: wait OverlayConnectRsp instead of sleep
 				time.Sleep(time.Second) // waiting remote node connection ok
 				go oConn.run()
@@ -212,15 +552,14 @@ func (app *p2pApp) listenUDP() error {
 }
 func (app *p2pApp) listen() error {
 	if app.config.SrcPort == 0 {
 		return nil
 	}
 	gLog.Printf(LvINFO, "LISTEN ON PORT %s:%d START", app.config.Protocol, app.config.SrcPort)
 	defer gLog.Printf(LvINFO, "LISTEN ON PORT %s:%d END", app.config.Protocol, app.config.SrcPort)
 	app.wg.Add(1)
 	defer app.wg.Done()
-	app.running = true
+	for app.running {
 	if app.rtid != 0 {
 		go app.relayHeartbeatLoop()
 	}
 	for app.tunnel.isRuning() {
 		if app.config.Protocol == "udp" {
 			app.listenUDP()
 		} else {
@@ -242,8 +581,11 @@ func (app *p2pApp) close() {
 	if app.listenerUDP != nil {
 		app.listenerUDP.Close()
 	}
-	if app.tunnel != nil {
+	if app.DirectTunnel() != nil {
-		app.tunnel.closeOverlayConns(app.id)
+		app.DirectTunnel().closeOverlayConns(app.id)
 	}
 	if app.RelayTunnel() != nil {
 		app.RelayTunnel().closeOverlayConns(app.id)
 	}
 	app.wg.Wait()
 }
@@ -252,16 +594,23 @@ func (app *p2pApp) close() {
 func (app *p2pApp) relayHeartbeatLoop() {
 	app.wg.Add(1)
 	defer app.wg.Done()
-	gLog.Printf(LvDEBUG, "relayHeartbeat to %d start", app.rtid)
+	gLog.Printf(LvDEBUG, "%s appid:%d relayHeartbeat to rtid:%d start", app.config.LogPeerNode(), app.id, app.rtid)
-	defer gLog.Printf(LvDEBUG, "relayHeartbeat to %d end", app.rtid)
+	defer gLog.Printf(LvDEBUG, "%s appid:%d relayHeartbeat to rtid%d end", app.config.LogPeerNode(), app.id, app.rtid)
-	relayHead := new(bytes.Buffer)
+
-	binary.Write(relayHead, binary.LittleEndian, app.rtid)
+	for app.running {
-	req := RelayHeartbeat{RelayTunnelID: app.tunnel.id,
+		if app.RelayTunnel() == nil || !app.RelayTunnel().isRuning() {
-		AppID: app.id}
+			time.Sleep(TunnelHeartbeatTime)
-	msg, _ := newMessage(MsgP2P, MsgRelayHeartbeat, &req)
+			continue
-	msgWithHead := append(relayHead.Bytes(), msg...)
+		}
-	for app.tunnel.isRuning() && app.running {
+		req := RelayHeartbeat{From: gConf.Network.Node, RelayTunnelID: app.RelayTunnel().id,
-		app.tunnel.conn.WriteBytes(MsgP2P, MsgRelayData, msgWithHead)
+			AppID: app.id}
 		err := app.RelayTunnel().WriteMessage(app.rtid, MsgP2P, MsgRelayHeartbeat, &req)
 		if err != nil {
 			gLog.Printf(LvERROR, "%s appid:%d rtid:%d write relay tunnel heartbeat error %s", app.config.LogPeerNode(), app.id, app.rtid, err)
 			return
 		}
 		// TODO: debug relay heartbeat
 		gLog.Printf(LvDEBUG, "%s appid:%d rtid:%d write relay tunnel heartbeat ok", app.config.LogPeerNode(), app.id, app.rtid)
 		time.Sleep(TunnelHeartbeatTime)
 	}
 }
@@ -1,815 +1,977 @@
-package openp2p
+package openp2p
-
+
-import (
+import (
-	"bytes"
+	"bytes"
-	"crypto/tls"
+	"crypto/tls"
-	"crypto/x509"
+	"crypto/x509"
-	"encoding/binary"
+	"encoding/binary"
-	"encoding/json"
+	"encoding/json"
-	"errors"
+	"errors"
-	"fmt"
+	"fmt"
-	"math/rand"
+	"math/rand"
-	"net/http"
+	"net/http"
-	"net/url"
+	"net/url"
-	"reflect"
+	"reflect"
-	"strings"
+	"strings"
-	"sync"
+	"sync"
-	"time"
+	"time"
-
+
-	"github.com/gorilla/websocket"
+	"github.com/gorilla/websocket"
-)
+)
-
+
-var (
+var (
-	instance *P2PNetwork
+	v4l            *v4Listener
-	once     sync.Once
+	instance       *P2PNetwork
-)
+	onceP2PNetwork sync.Once
-
+	onceV4Listener sync.Once
-const (
+)
-	retryLimit    = 20
+
-	retryInterval = 10 * time.Second
+const (
-)
+	retryLimit                  = 20
-
+	retryInterval               = 10 * time.Second
-// golang not support float64 const
+	DefaultLoginMaxDelaySeconds = 60
-var (
+)
-	ma10 float64 = 1.0 / 10
+
-	ma20 float64 = 1.0 / 20
+// golang not support float64 const
-)
+var (
-
+	ma10 float64 = 1.0 / 10
-type P2PNetwork struct {
+	ma5  float64 = 1.0 / 5
-	conn        *websocket.Conn
+)
-	online      bool
+
-	running     bool
+type NodeData struct {
-	restartCh   chan bool
+	NodeID uint64
-	wgReconnect sync.WaitGroup
+	Data   []byte
-	writeMtx    sync.Mutex
+}
-	hbTime      time.Time
+
-	// for sync server time
+type P2PNetwork struct {
-	t1    int64 // nanoSeconds
+	conn          *websocket.Conn
-	dt    int64 // client faster then server dt nanoSeconds
+	online        bool
-	ddtma int64
+	running       bool
-	ddt   int64 // differential of dt
+	restartCh     chan bool
-	// msgMap    sync.Map
+	wgReconnect   sync.WaitGroup
-	msgMap     map[uint64]chan pushMsg //key: nodeID
+	writeMtx      sync.Mutex
-	msgMapMtx  sync.Mutex
+	reqGatewayMtx sync.Mutex
-	config     NetworkConfig
+	hbTime        time.Time
-	allTunnels sync.Map
+	// for sync server time
-	apps       sync.Map //key: protocol+srcport; value: p2pApp
+	t1     int64 // nanoSeconds
-	limiter    *BandwidthLimiter
+	preRtt int64 // nanoSeconds
-}
+	dt     int64 // client faster then server dt nanoSeconds
-
+	ddtma  int64
-type pushMsg struct {
+	ddt    int64    // differential of dt
-	data []byte
+	msgMap sync.Map //key: nodeID
-	ts   time.Time
+	// msgMap     map[uint64]chan pushMsg //key: nodeID
-}
+	allTunnels           sync.Map // key: tid
-
+	apps                 sync.Map //key: config.ID(); value: *p2pApp
-const msgExpiredTime = time.Minute
+	limiter              *SpeedLimiter
-
+	nodeData             chan *NodeData
-func P2PNetworkInstance(config *NetworkConfig) *P2PNetwork {
+	sdwan                *p2pSDWAN
-	if instance == nil {
+	tunnelCloseCh        chan *P2PTunnel
-		once.Do(func() {
+	loginMaxDelaySeconds int
-			instance = &P2PNetwork{
+}
-				restartCh: make(chan bool, 2),
+
-				online:    false,
+type msgCtx struct {
-				running:   true,
+	data []byte
-				msgMap:    make(map[uint64]chan pushMsg),
+	ts   time.Time
-				limiter:   newBandwidthLimiter(config.ShareBandwidth),
+}
-				dt:        0,
+
-				ddt:       0,
+func P2PNetworkInstance() *P2PNetwork {
-			}
+	if instance == nil {
-			instance.msgMap[0] = make(chan pushMsg) // for gateway
+		onceP2PNetwork.Do(func() {
-			if config != nil {
+			instance = &P2PNetwork{
-				instance.config = *config
+				restartCh:            make(chan bool, 1),
-			}
+				tunnelCloseCh:        make(chan *P2PTunnel, 100),
-			instance.init()
+				nodeData:             make(chan *NodeData, 10000),
-			go instance.run()
+				online:               false,
-			go func() {
+				running:              true,
-				for {
+				limiter:              newSpeedLimiter(gConf.Network.ShareBandwidth*1024*1024/8, 1),
-					instance.refreshIPv6(false)
+				dt:                   0,
-					time.Sleep(time.Hour)
+				ddt:                  0,
-				}
+				loginMaxDelaySeconds: DefaultLoginMaxDelaySeconds,
-			}()
+			}
-			cleanTempFiles()
+			instance.msgMap.Store(uint64(0), make(chan msgCtx, 50)) // for gateway
-		})
+			instance.StartSDWAN()
-	}
+			instance.init()
-	return instance
+			go instance.run()
-}
+			go func() {
-
+				for {
-func (pn *P2PNetwork) run() {
+					instance.refreshIPv6()
-	heartbeatTimer := time.NewTicker(NetworkHeartbeatTime)
+					time.Sleep(time.Hour)
-	pn.t1 = time.Now().UnixNano()
+				}
-	pn.write(MsgHeartbeat, 0, "")
+			}()
-	for pn.running {
+			cleanTempFiles()
-		select {
+		})
-		case <-heartbeatTimer.C:
+	}
-			pn.t1 = time.Now().UnixNano()
+	return instance
-			pn.write(MsgHeartbeat, 0, "")
+}
-		case <-pn.restartCh:
+
-			pn.online = false
+func (pn *P2PNetwork) run() {
-			pn.wgReconnect.Wait() // wait read/autorunapp goroutine end
+	heartbeatTimer := time.NewTicker(NetworkHeartbeatTime)
-			time.Sleep(ClientAPITimeout)
+	pn.t1 = time.Now().UnixNano()
-			err := pn.init()
+	pn.write(MsgHeartbeat, 0, "")
-			if err != nil {
+	for {
-				gLog.Println(LvERROR, "P2PNetwork init error:", err)
+		select {
-			}
+		case <-heartbeatTimer.C:
-		}
+			pn.t1 = time.Now().UnixNano()
-	}
+			pn.write(MsgHeartbeat, 0, "")
-}
+		case <-pn.restartCh:
-
+			gLog.Printf(LvDEBUG, "got restart channel")
-func (pn *P2PNetwork) Connect(timeout int) bool {
+			GNetwork.sdwan.reset()
-	// waiting for heartbeat
+			pn.online = false
-	for i := 0; i < (timeout / 1000); i++ {
+			pn.wgReconnect.Wait() // wait read/autorunapp goroutine end
-		if pn.hbTime.After(time.Now().Add(-NetworkHeartbeatTime)) {
+			delay := ClientAPITimeout + time.Duration(rand.Int()%pn.loginMaxDelaySeconds)*time.Second
-			return true
+			time.Sleep(delay)
-		}
+			err := pn.init()
-		time.Sleep(time.Second)
+			if err != nil {
-	}
+				gLog.Println(LvERROR, "P2PNetwork init error:", err)
-	return false
+			}
-}
+			gConf.retryAllApp()
-
+
-func (pn *P2PNetwork) runAll() {
+		case t := <-pn.tunnelCloseCh:
-	gConf.mtx.Lock() // lock for copy gConf.Apps and the modification of config(it's pointer)
+			gLog.Printf(LvDEBUG, "got tunnelCloseCh %s", t.config.LogPeerNode())
-	defer gConf.mtx.Unlock()
+			pn.apps.Range(func(id, i interface{}) bool {
-	allApps := gConf.Apps // read a copy, other thread will modify the gConf.Apps
+				app := i.(*p2pApp)
-
+				if app.DirectTunnel() == t {
-	for _, config := range allApps {
+					app.setDirectTunnel(nil)
-		if config.nextRetryTime.After(time.Now()) || config.Enabled == 0 || config.retryNum >= retryLimit {
+				}
-			continue
+				if app.RelayTunnel() == t {
-		}
+					app.setRelayTunnel(nil)
-		if config.AppName == "" {
+				}
-			config.AppName = config.ID()
+				return true
-		}
+			})
-		if i, ok := pn.apps.Load(config.ID()); ok {
+		}
-			if app := i.(*p2pApp); app.isActive() {
+	}
-				continue
+}
-			}
+
-			pn.DeleteApp(*config)
+func (pn *P2PNetwork) NotifyTunnelClose(t *P2PTunnel) bool {
-		}
+	select {
-
+	case pn.tunnelCloseCh <- t:
-		if config.retryNum > 0 { // first time not show reconnect log
+		return true
-			gLog.Printf(LvINFO, "detect app %s disconnect, reconnecting the %d times...", config.AppName, config.retryNum)
+	default:
-			if time.Now().Add(-time.Minute * 15).After(config.retryTime) { // run normally 15min, reset retrynum
+	}
-				config.retryNum = 0
+	return false
-			}
+}
-		}
+
-		config.retryNum++
+func (pn *P2PNetwork) Connect(timeout int) bool {
-		config.retryTime = time.Now()
+	// waiting for heartbeat
-		config.nextRetryTime = time.Now().Add(retryInterval)
+	for i := 0; i < (timeout / 1000); i++ {
-		config.connectTime = time.Now()
+		if pn.hbTime.After(time.Now().Add(-NetworkHeartbeatTime)) {
-		config.peerToken = pn.config.Token
+			return true
-		gConf.mtx.Unlock() // AddApp will take a period of time, let outside modify gConf
+		}
-		err := pn.AddApp(*config)
+		time.Sleep(time.Second)
-		gConf.mtx.Lock()
+	}
-		if err != nil {
+	return false
-			config.errMsg = err.Error()
+}
-			if err == ErrPeerOffline { // stop retry, waiting for online
+
-				config.retryNum = retryLimit
+func (pn *P2PNetwork) runAll() {
-				gLog.Printf(LvINFO, " %s offline, it will auto reconnect when peer node online", config.PeerNode)
+	gConf.mtx.Lock() // lock for copy gConf.Apps and the modification of config(it's pointer)
-			}
+	defer gConf.mtx.Unlock()
-		}
+	allApps := gConf.Apps // read a copy, other thread will modify the gConf.Apps
-	}
+	for _, config := range allApps {
-}
+		if config.AppName == "" {
-
+			config.AppName = fmt.Sprintf("%d", config.ID())
-func (pn *P2PNetwork) autorunApp() {
+		}
-	gLog.Println(LvINFO, "autorunApp start")
+		if config.Enabled == 0 {
-	pn.wgReconnect.Add(1)
+			continue
-	defer pn.wgReconnect.Done()
+		}
-	for pn.running && pn.online {
+		if _, ok := pn.apps.Load(config.ID()); ok {
-		time.Sleep(time.Second)
+			continue
-		pn.runAll()
+		}
-	}
+
-	gLog.Println(LvINFO, "autorunApp end")
+		config.peerToken = gConf.Network.Token
-}
+		gConf.mtx.Unlock() // AddApp will take a period of time, let outside modify gConf
-
+		pn.AddApp(*config)
-func (pn *P2PNetwork) addRelayTunnel(config AppConfig) (*P2PTunnel, uint64, string, error) {
+		gConf.mtx.Lock()
-	gLog.Printf(LvINFO, "addRelayTunnel to %s start", config.PeerNode)
+
-	defer gLog.Printf(LvINFO, "addRelayTunnel to %s end", config.PeerNode)
+	}
-	// request a relay node or specify manually(TODO)
+}
-	relayConfig := config
+
-	relayMode := "private"
+func (pn *P2PNetwork) autorunApp() {
-	if config.RelayNode == "" {
+	gLog.Println(LvINFO, "autorunApp start")
-		pn.write(MsgRelay, MsgRelayNodeReq, &RelayNodeReq{config.PeerNode})
+	pn.wgReconnect.Add(1)
-		head, body := pn.read("", MsgRelay, MsgRelayNodeRsp, ClientAPITimeout)
+	defer pn.wgReconnect.Done()
-		if head == nil {
+	for pn.running && pn.online {
-			return nil, 0, "", errors.New("read MsgRelayNodeRsp error")
+		time.Sleep(time.Second)
-		}
+		pn.runAll()
-		rsp := RelayNodeRsp{}
+	}
-		if err := json.Unmarshal(body, &rsp); err != nil {
+	gLog.Println(LvINFO, "autorunApp end")
-			return nil, 0, "", errors.New("unmarshal MsgRelayNodeRsp error")
+}
-		}
+
-		if rsp.RelayName == "" || rsp.RelayToken == 0 {
+func (pn *P2PNetwork) addRelayTunnel(config AppConfig) (*P2PTunnel, uint64, string, error) {
-			gLog.Printf(LvERROR, "MsgRelayNodeReq error")
+	gLog.Printf(LvINFO, "addRelayTunnel to %s start", config.LogPeerNode())
-			return nil, 0, "", errors.New("MsgRelayNodeReq error")
+	defer gLog.Printf(LvINFO, "addRelayTunnel to %s end", config.LogPeerNode())
-		}
+	relayConfig := AppConfig{
-		gLog.Printf(LvINFO, "got relay node:%s", rsp.RelayName)
+		PeerNode:  config.RelayNode,
-
+		peerToken: config.peerToken,
-		relayConfig.PeerNode = rsp.RelayName
+		relayMode: "private"}
-		relayConfig.peerToken = rsp.RelayToken
+	if relayConfig.PeerNode == "" {
-		relayMode = rsp.Mode
+		// find existing relay tunnel
-	} else {
+		pn.apps.Range(func(id, i interface{}) bool {
-		relayConfig.PeerNode = config.RelayNode
+			app := i.(*p2pApp)
-	}
+			if app.config.PeerNode != config.PeerNode {
-	///
+				return true
-	t, err := pn.addDirectTunnel(relayConfig, 0)
+			}
-	if err != nil {
+			if app.RelayTunnel() == nil {
-		gLog.Println(LvERROR, "direct connect error:", err)
+				return true
-		return nil, 0, "", ErrConnectRelayNode // relay offline will stop retry
+			}
-	}
+			relayConfig.PeerNode = app.RelayTunnel().config.PeerNode
-	// notify peer addRelayTunnel
+			gLog.Printf(LvDEBUG, "found existing relay tunnel %s", relayConfig.LogPeerNode())
-	req := AddRelayTunnelReq{
+			return false
-		From:       pn.config.Node,
+		})
-		RelayName:  relayConfig.PeerNode,
+		if relayConfig.PeerNode == "" { // request relay node
-		RelayToken: relayConfig.peerToken,
+			pn.reqGatewayMtx.Lock()
-	}
+			pn.write(MsgRelay, MsgRelayNodeReq, &RelayNodeReq{config.PeerNode})
-	gLog.Printf(LvINFO, "push relay %s---------%s", config.PeerNode, relayConfig.PeerNode)
+			head, body := pn.read("", MsgRelay, MsgRelayNodeRsp, ClientAPITimeout)
-	pn.push(config.PeerNode, MsgPushAddRelayTunnelReq, &req)
+			pn.reqGatewayMtx.Unlock()
-
+			if head == nil {
-	// wait relay ready
+				return nil, 0, "", errors.New("read MsgRelayNodeRsp error")
-	head, body := pn.read(config.PeerNode, MsgPush, MsgPushAddRelayTunnelRsp, PeerAddRelayTimeount)
+			}
-	if head == nil {
+			rsp := RelayNodeRsp{}
-		gLog.Printf(LvERROR, "read MsgPushAddRelayTunnelRsp error")
+			if err := json.Unmarshal(body, &rsp); err != nil {
-		return nil, 0, "", errors.New("read MsgPushAddRelayTunnelRsp error")
+				return nil, 0, "", errors.New("unmarshal MsgRelayNodeRsp error")
-	}
+			}
-	rspID := TunnelMsg{}
+			if rsp.RelayName == "" || rsp.RelayToken == 0 {
-	if err = json.Unmarshal(body, &rspID); err != nil {
+				gLog.Printf(LvERROR, "MsgRelayNodeReq error")
-		return nil, 0, "", errors.New("peer connect relayNode error")
+				return nil, 0, "", errors.New("MsgRelayNodeReq error")
-	}
+			}
-	return t, rspID.ID, relayMode, err
+			gLog.Printf(LvDEBUG, "got relay node:%s", relayConfig.LogPeerNode())
-}
+
-
+			relayConfig.PeerNode = rsp.RelayName
-// use *AppConfig to save status
+			relayConfig.peerToken = rsp.RelayToken
-func (pn *P2PNetwork) AddApp(config AppConfig) error {
+			relayConfig.relayMode = rsp.Mode
-	gLog.Printf(LvINFO, "addApp %s to %s:%s:%d start", config.AppName, config.PeerNode, config.DstHost, config.DstPort)
+		}
-	defer gLog.Printf(LvINFO, "addApp %s to %s:%s:%d end", config.AppName, config.PeerNode, config.DstHost, config.DstPort)
+
-	if !pn.online {
+	}
-		return errors.New("P2PNetwork offline")
+	///
-	}
+	t, err := pn.addDirectTunnel(relayConfig, 0)
-	// check if app already exist?
+	if err != nil {
-	appExist := false
+		gLog.Println(LvERROR, "direct connect error:", err)
-	_, ok := pn.apps.Load(config.ID())
+		return nil, 0, "", ErrConnectRelayNode // relay offline will stop retry
-	if ok {
+	}
-		appExist = true
+	// notify peer addRelayTunnel
-	}
+	req := AddRelayTunnelReq{
-	if appExist {
+		From:          gConf.Network.Node,
-		return errors.New("P2PApp already exist")
+		RelayName:     relayConfig.PeerNode,
-	}
+		RelayToken:    relayConfig.peerToken,
-	appID := rand.Uint64()
+		RelayMode:     relayConfig.relayMode,
-	appKey := uint64(0)
+		RelayTunnelID: t.id,
-	var rtid uint64
+	}
-	relayNode := ""
+	gLog.Printf(LvDEBUG, "push %s the relay node(%s)", config.LogPeerNode(), relayConfig.LogPeerNode())
-	relayMode := ""
+	pn.push(config.PeerNode, MsgPushAddRelayTunnelReq, &req)
-	peerNatType := NATUnknown
+
-	peerIP := ""
+	// wait relay ready
-	errMsg := ""
+	head, body := pn.read(config.PeerNode, MsgPush, MsgPushAddRelayTunnelRsp, PeerAddRelayTimeount)
-	t, err := pn.addDirectTunnel(config, 0)
+	if head == nil {
-	if t != nil {
+		gLog.Printf(LvERROR, "read MsgPushAddRelayTunnelRsp error")
-		peerNatType = t.config.peerNatType
+		return nil, 0, "", errors.New("read MsgPushAddRelayTunnelRsp error")
-		peerIP = t.config.peerIP
+	}
-	}
+	rspID := TunnelMsg{}
-	// TODO: if tcp failed, should try udp punching, nattype should refactor also, when NATNONE and failed we don't know the peerNatType
+	if err = json.Unmarshal(body, &rspID); err != nil {
-
+		gLog.Println(LvDEBUG, ErrPeerConnectRelay)
-	if err != nil && err == ErrorHandshake {
+		return nil, 0, "", ErrPeerConnectRelay
-		gLog.Println(LvERROR, "direct connect failed, try to relay")
+	}
-		t, rtid, relayMode, err = pn.addRelayTunnel(config)
+	return t, rspID.ID, relayConfig.relayMode, err
-		if t != nil {
+}
-			relayNode = t.config.PeerNode
+
-		}
+// use *AppConfig to save status
-	}
+func (pn *P2PNetwork) AddApp(config AppConfig) error {
-
+	gLog.Printf(LvINFO, "addApp %s to %s:%s:%d start", config.AppName, config.LogPeerNode(), config.DstHost, config.DstPort)
-	if err != nil {
+	defer gLog.Printf(LvINFO, "addApp %s to %s:%s:%d end", config.AppName, config.LogPeerNode(), config.DstHost, config.DstPort)
-		errMsg = err.Error()
+	if !pn.online {
-	}
+		return errors.New("P2PNetwork offline")
-	req := ReportConnect{
+	}
-		Error:          errMsg,
+	if _, ok := pn.msgMap.Load(NodeNameToID(config.PeerNode)); !ok {
-		Protocol:       config.Protocol,
+		pn.msgMap.Store(NodeNameToID(config.PeerNode), make(chan msgCtx, 50))
-		SrcPort:        config.SrcPort,
+	}
-		NatType:        pn.config.natType,
+	// check if app already exist?
-		PeerNode:       config.PeerNode,
+	if _, ok := pn.apps.Load(config.ID()); ok {
-		DstPort:        config.DstPort,
+		return errors.New("P2PApp already exist")
-		DstHost:        config.DstHost,
+	}
-		PeerNatType:    peerNatType,
+
-		PeerIP:         peerIP,
+	app := p2pApp{
-		ShareBandwidth: pn.config.ShareBandwidth,
+		// tunnel:    t,
-		RelayNode:      relayNode,
+		id:          rand.Uint64(),
-		Version:        OpenP2PVersion,
+		key:         rand.Uint64(),
-	}
+		config:      config,
-	pn.write(MsgReport, MsgReportConnect, &req)
+		iptree:      NewIPTree(config.Whitelist),
-	if err != nil {
+		running:     true,
-		return err
+		hbTimeRelay: time.Now(),
-	}
+	}
-	if rtid != 0 || t.conn.Protocol() == "tcp" {
+	if _, ok := pn.msgMap.Load(NodeNameToID(config.PeerNode)); !ok {
-		// sync appkey
+		pn.msgMap.Store(NodeNameToID(config.PeerNode), make(chan msgCtx, 50))
-		appKey = rand.Uint64()
+	}
-		req := APPKeySync{
+	pn.apps.Store(config.ID(), &app)
-			AppID:  appID,
+	gLog.Printf(LvDEBUG, "Store app %d", config.ID())
-			AppKey: appKey,
+	go app.checkP2PTunnel()
-		}
+	return nil
-		gLog.Printf(LvINFO, "sync appkey to %s", config.PeerNode)
+}
-		pn.push(config.PeerNode, MsgPushAPPKey, &req)
+
-	}
+func (pn *P2PNetwork) DeleteApp(config AppConfig) {
-	app := p2pApp{
+	gLog.Printf(LvINFO, "DeleteApp %s to %s:%s:%d start", config.AppName, config.LogPeerNode(), config.DstHost, config.DstPort)
-		id:        appID,
+	defer gLog.Printf(LvINFO, "DeleteApp %s to %s:%s:%d end", config.AppName, config.LogPeerNode(), config.DstHost, config.DstPort)
-		key:       appKey,
+	// close the apps of this config
-		tunnel:    t,
+	i, ok := pn.apps.Load(config.ID())
-		config:    config,
+	if ok {
-		iptree:    NewIPTree(config.Whitelist),
+		app := i.(*p2pApp)
-		rtid:      rtid,
+		gLog.Printf(LvINFO, "app %s exist, delete it", app.config.AppName)
-		relayNode: relayNode,
+		app.close()
-		relayMode: relayMode,
+		pn.apps.Delete(config.ID())
-		hbTime:    time.Now()}
+	}
-	pn.apps.Store(config.ID(), &app)
+}
-	gLog.Printf(LvINFO, "%s use tunnel %d", app.config.AppName, app.tunnel.id)
+
-	if err == nil {
+func (pn *P2PNetwork) findTunnel(peerNode string) (t *P2PTunnel) {
-		go app.listen()
+	t = nil
-	}
+	// find existing tunnel to peer
-	return err
+	pn.allTunnels.Range(func(id, i interface{}) bool {
-}
+		tmpt := i.(*P2PTunnel)
-
+		if tmpt.config.PeerNode == peerNode {
-func (pn *P2PNetwork) DeleteApp(config AppConfig) {
+			gLog.Println(LvINFO, "tunnel already exist ", peerNode)
-	gLog.Printf(LvINFO, "DeleteApp %s%d start", config.Protocol, config.SrcPort)
+			isActive := tmpt.checkActive()
-	defer gLog.Printf(LvINFO, "DeleteApp %s%d end", config.Protocol, config.SrcPort)
+			// inactive, close it
-	// close the apps of this config
+			if !isActive {
-	i, ok := pn.apps.Load(config.ID())
+				gLog.Println(LvINFO, "but it's not active, close it ", peerNode)
-	if ok {
+				tmpt.close()
-		app := i.(*p2pApp)
+			} else {
-		gLog.Printf(LvINFO, "app %s exist, delete it", app.config.AppName)
+				t = tmpt
-		app.close()
+			}
-		pn.apps.Delete(config.ID())
+			return false
-	}
+		}
-}
+		return true
-
+	})
-func (pn *P2PNetwork) findTunnel(config *AppConfig) (t *P2PTunnel) {
+	return t
-	// find existing tunnel to peer
+}
-	pn.allTunnels.Range(func(id, i interface{}) bool {
+
-		tmpt := i.(*P2PTunnel)
+func (pn *P2PNetwork) addDirectTunnel(config AppConfig, tid uint64) (t *P2PTunnel, err error) {
-		if tmpt.config.PeerNode == config.PeerNode {
+	gLog.Printf(LvDEBUG, "addDirectTunnel %s%d to %s:%s:%d tid:%d start", config.Protocol, config.SrcPort, config.LogPeerNode(), config.DstHost, config.DstPort, tid)
-			gLog.Println(LvINFO, "tunnel already exist ", config.PeerNode)
+	defer gLog.Printf(LvDEBUG, "addDirectTunnel %s%d to %s:%s:%d tid:%d end", config.Protocol, config.SrcPort, config.LogPeerNode(), config.DstHost, config.DstPort, tid)
-			isActive := tmpt.checkActive()
+	isClient := false
-			// inactive, close it
+	// client side tid=0, assign random uint64
-			if !isActive {
+	if tid == 0 {
-				gLog.Println(LvINFO, "but it's not active, close it ", config.PeerNode)
+		tid = rand.Uint64()
-				tmpt.close()
+		isClient = true
-			} else {
+	}
-				t = tmpt
+	if _, ok := pn.msgMap.Load(NodeNameToID(config.PeerNode)); !ok {
-			}
+		pn.msgMap.Store(NodeNameToID(config.PeerNode), make(chan msgCtx, 50))
-			return false
+	}
-		}
+
-		return true
+	// server side
-	})
+	if !isClient {
-	return t
+		t, err = pn.newTunnel(config, tid, isClient)
-}
+		return t, err // always return
-
+	}
-func (pn *P2PNetwork) addDirectTunnel(config AppConfig, tid uint64) (t *P2PTunnel, err error) {
+	// client side
-	gLog.Printf(LvDEBUG, "addDirectTunnel %s%d to %s:%s:%d start", config.Protocol, config.SrcPort, config.PeerNode, config.DstHost, config.DstPort)
+	// peer info
-	defer gLog.Printf(LvDEBUG, "addDirectTunnel %s%d to %s:%s:%d end", config.Protocol, config.SrcPort, config.PeerNode, config.DstHost, config.DstPort)
+	initErr := pn.requestPeerInfo(&config)
-	isClient := false
+	if initErr != nil {
-	// client side tid=0, assign random uint64
+		gLog.Printf(LvERROR, "%s init error:%s", config.LogPeerNode(), initErr)
-	if tid == 0 {
+
-		tid = rand.Uint64()
+		return nil, initErr
-		isClient = true
+	}
-	}
+	gLog.Printf(LvDEBUG, "config.peerNode=%s,config.peerVersion=%s,config.peerIP=%s,config.peerLanIP=%s,gConf.Network.publicIP=%s,config.peerIPv6=%s,config.hasIPv4=%d,config.hasUPNPorNATPMP=%d,gConf.Network.hasIPv4=%d,gConf.Network.hasUPNPorNATPMP=%d,config.peerNatType=%d,gConf.Network.natType=%d,",
-
+		config.LogPeerNode(), config.peerVersion, config.peerIP, config.peerLanIP, gConf.Network.publicIP, config.peerIPv6, config.hasIPv4, config.hasUPNPorNATPMP, gConf.Network.hasIPv4, gConf.Network.hasUPNPorNATPMP, config.peerNatType, gConf.Network.natType)
-	pn.msgMapMtx.Lock()
+	// try Intranet
-	pn.msgMap[nodeNameToID(config.PeerNode)] = make(chan pushMsg, 50)
+	if config.peerIP == gConf.Network.publicIP && compareVersion(config.peerVersion, SupportIntranetVersion) >= 0 { // old version client has no peerLanIP
-	pn.msgMapMtx.Unlock()
+		gLog.Println(LvINFO, "try Intranet")
-	// server side
+		config.linkMode = LinkModeIntranet
-	if !isClient {
+		config.isUnderlayServer = 0
-		t, err = pn.newTunnel(config, tid, isClient)
+		if t, err = pn.newTunnel(config, tid, isClient); err == nil {
-		return t, err // always return
+			return t, nil
-	}
+		}
-	// client side
+	}
-	// peer info
+	// try TCP6
-	initErr := pn.requestPeerInfo(&config)
+	if IsIPv6(config.peerIPv6) && IsIPv6(gConf.IPv6()) {
-	if initErr != nil {
+		gLog.Println(LvINFO, "try TCP6")
-		gLog.Println(LvERROR, "init error:", initErr)
+		config.linkMode = LinkModeTCP6
-
+		config.isUnderlayServer = 0
-		return nil, initErr
+		if t, err = pn.newTunnel(config, tid, isClient); err == nil {
-	}
+			return t, nil
-	// try TCP6
+		}
-	if IsIPv6(config.peerIPv6) && IsIPv6(gConf.IPv6()) {
+	}
-		gLog.Println(LvINFO, "try TCP6")
+
-		config.linkMode = LinkModeTCP6
+	// try UDP6? maybe no
-		config.isUnderlayServer = 0
+
-		if t, err = pn.newTunnel(config, tid, isClient); err == nil {
+	// try TCP4
-			return t, nil
+	if config.hasIPv4 == 1 || gConf.Network.hasIPv4 == 1 || config.hasUPNPorNATPMP == 1 || gConf.Network.hasUPNPorNATPMP == 1 {
-		}
+		gLog.Println(LvINFO, "try TCP4")
-	}
+		config.linkMode = LinkModeTCP4
-
+		if gConf.Network.hasIPv4 == 1 || gConf.Network.hasUPNPorNATPMP == 1 {
-	// TODO: try UDP6
+			config.isUnderlayServer = 1
-
+		} else {
-	// try TCP4
+			config.isUnderlayServer = 0
-	if config.hasIPv4 == 1 || pn.config.hasIPv4 == 1 || config.hasUPNPorNATPMP == 1 || pn.config.hasUPNPorNATPMP == 1 {
+		}
-		gLog.Println(LvINFO, "try TCP4")
+		if t, err = pn.newTunnel(config, tid, isClient); err == nil {
-		config.linkMode = LinkModeTCP4
+			return t, nil
-		if config.hasIPv4 == 1 || config.hasUPNPorNATPMP == 1 {
+		}
-			config.isUnderlayServer = 0
+	}
-		} else {
+	// try UDP4? maybe no
-			config.isUnderlayServer = 1
+	var primaryPunchFunc func() (*P2PTunnel, error)
-		}
+	var secondaryPunchFunc func() (*P2PTunnel, error)
-		if t, err = pn.newTunnel(config, tid, isClient); err == nil {
+	funcUDP := func() (t *P2PTunnel, err error) {
-			return t, nil
+		if config.PunchPriority&PunchPriorityUDPDisable != 0 {
-		}
+			return
-	}
+		}
-	// TODO: try UDP4
+		// try UDPPunch
-
+		for i := 0; i < Cone2ConeUDPPunchMaxRetry; i++ { // when both 2 nats has restrict firewall, simultaneous punching needs to be very precise, it takes a few tries
-	// try TCPPunch
+			if config.peerNatType == NATCone || gConf.Network.natType == NATCone {
-	for i := 0; i < Cone2ConePunchMaxRetry; i++ { // when both 2 nats has restrict firewall, simultaneous punching needs to be very precise, it takes a few tries
+				gLog.Println(LvINFO, "try UDP4 Punch")
-		if config.peerNatType == NATCone && pn.config.natType == NATCone { // TODO: support c2s
+				config.linkMode = LinkModeUDPPunch
-			gLog.Println(LvINFO, "try TCP4 Punch")
+				config.isUnderlayServer = 0
-			config.linkMode = LinkModeTCPPunch
+				if t, err = pn.newTunnel(config, tid, isClient); err == nil {
-			config.isUnderlayServer = 0
+					return t, nil
-			if t, err = pn.newTunnel(config, tid, isClient); err == nil {
+				}
-				gLog.Println(LvINFO, "TCP4 Punch ok")
+			}
-				return t, nil
+			if !(config.peerNatType == NATCone && gConf.Network.natType == NATCone) { // not cone2cone, no more try
-			}
+				break
-		}
+			}
-	}
+		}
-
+		return
-	// try UDPPunch
+	}
-	for i := 0; i < Cone2ConePunchMaxRetry; i++ { // when both 2 nats has restrict firewall, simultaneous punching needs to be very precise, it takes a few tries
+	funcTCP := func() (t *P2PTunnel, err error) {
-		if config.peerNatType == NATCone || pn.config.natType == NATCone {
+		if config.PunchPriority&PunchPriorityTCPDisable != 0 {
-			gLog.Println(LvINFO, "try UDP4 Punch")
+			return
-			config.linkMode = LinkModeUDPPunch
+		}
-			config.isUnderlayServer = 0
+		// try TCPPunch
-			if t, err = pn.newTunnel(config, tid, isClient); err == nil {
+		for i := 0; i < Cone2ConeTCPPunchMaxRetry; i++ { // when both 2 nats has restrict firewall, simultaneous punching needs to be very precise, it takes a few tries
-				return t, nil
+			if config.peerNatType == NATCone || gConf.Network.natType == NATCone {
-			}
+				gLog.Println(LvINFO, "try TCP4 Punch")
-		}
+				config.linkMode = LinkModeTCPPunch
-		if !(config.peerNatType == NATCone && pn.config.natType == NATCone) { // not cone2cone, no more try
+				config.isUnderlayServer = 0
-			break
+				if t, err = pn.newTunnel(config, tid, isClient); err == nil {
-		}
+					gLog.Println(LvINFO, "TCP4 Punch ok")
-	}
+					return t, nil
-	return nil, ErrorHandshake // only ErrorHandshake will try relay
+				}
-}
+			}
-
+		}
-func (pn *P2PNetwork) newTunnel(config AppConfig, tid uint64, isClient bool) (t *P2PTunnel, err error) {
+		return
-	if isClient { // only client side find existing tunnel
+	}
-		if existTunnel := pn.findTunnel(&config); existTunnel != nil {
+	if config.PunchPriority&PunchPriorityTCPFirst != 0 {
-			return existTunnel, nil
+		primaryPunchFunc = funcTCP
-		}
+		secondaryPunchFunc = funcUDP
-	}
+	} else {
-
+		primaryPunchFunc = funcTCP
-	t = &P2PTunnel{pn: pn,
+		secondaryPunchFunc = funcUDP
-		config: config,
+	}
-		id:     tid,
+	if t, err = primaryPunchFunc(); t != nil && err == nil {
-	}
+		return t, err
-	t.initPort()
+	}
-	if isClient {
+	if t, err = secondaryPunchFunc(); t != nil && err == nil {
-		if err = t.connect(); err != nil {
+		return t, err
-			gLog.Println(LvERROR, "p2pTunnel connect error:", err)
+	}
-			return
+
-		}
+	// TODO: s2s won't return err
-	} else {
+	return nil, err
-		if err = t.listen(); err != nil {
+}
-			gLog.Println(LvERROR, "p2pTunnel listen error:", err)
+
-			return
+func (pn *P2PNetwork) newTunnel(config AppConfig, tid uint64, isClient bool) (t *P2PTunnel, err error) {
-		}
+	if isClient { // only client side find existing tunnel
-	}
+		if existTunnel := pn.findTunnel(config.PeerNode); existTunnel != nil {
-	// store it when success
+			return existTunnel, nil
-	gLog.Printf(LvDEBUG, "store tunnel %d", tid)
+		}
-	pn.allTunnels.Store(tid, t)
+	}
-	return
+
-}
+	t = &P2PTunnel{pn: pn,
-func (pn *P2PNetwork) init() error {
+		config:         config,
-	gLog.Println(LvINFO, "init start")
+		id:             tid,
-	pn.wgReconnect.Add(1)
+		writeData:      make(chan []byte, WriteDataChanSize),
-	defer pn.wgReconnect.Done()
+		writeDataSmall: make(chan []byte, WriteDataChanSize/30),
-	var err error
+	}
-	for {
+	t.initPort()
-		// detect nat type
+	if isClient {
-		pn.config.publicIP, pn.config.natType, pn.config.hasIPv4, pn.config.hasUPNPorNATPMP, err = getNATType(pn.config.ServerHost, pn.config.UDPPort1, pn.config.UDPPort2)
+		if err = t.connect(); err != nil {
-		// for testcase
+			gLog.Println(LvERROR, "p2pTunnel connect error:", err)
-		if strings.Contains(pn.config.Node, "openp2pS2STest") {
+			return
-			pn.config.natType = NATSymmetric
+		}
-			pn.config.hasIPv4 = 0
+	} else {
-			pn.config.hasUPNPorNATPMP = 0
+		if err = t.listen(); err != nil {
-			gLog.Println(LvINFO, "openp2pS2STest debug")
+			gLog.Println(LvERROR, "p2pTunnel listen error:", err)
-
+			return
-		}
+		}
-		if strings.Contains(pn.config.Node, "openp2pC2CTest") {
+	}
-			pn.config.natType = NATCone
+	// store it when success
-			pn.config.hasIPv4 = 0
+	gLog.Printf(LvDEBUG, "store tunnel %d", tid)
-			pn.config.hasUPNPorNATPMP = 0
+	pn.allTunnels.Store(tid, t)
-			gLog.Println(LvINFO, "openp2pC2CTest debug")
+	return
-		}
+}
-		if err != nil {
+func (pn *P2PNetwork) init() error {
-			gLog.Println(LvDEBUG, "detect NAT type error:", err)
+	gLog.Println(LvINFO, "P2PNetwork init start")
-			break
+	defer gLog.Println(LvINFO, "P2PNetwork init end")
-		}
+	pn.wgReconnect.Add(1)
-		gLog.Println(LvDEBUG, "detect NAT type:", pn.config.natType, " publicIP:", pn.config.publicIP)
+	defer pn.wgReconnect.Done()
-		gatewayURL := fmt.Sprintf("%s:%d", pn.config.ServerHost, pn.config.ServerPort)
+	var err error
-		uri := "/api/v1/login"
+	for {
-		caCertPool, err := x509.SystemCertPool()
+		// detect nat type
-		if err != nil {
+		gConf.Network.publicIP, gConf.Network.natType, err = getNATType(gConf.Network.ServerHost, gConf.Network.UDPPort1, gConf.Network.UDPPort2)
-			gLog.Println(LvERROR, "Failed to load system root CAs:", err)
+		if err != nil {
-		} else {
+			gLog.Println(LvDEBUG, "detect NAT type error:", err)
-			caCertPool = x509.NewCertPool()
+			break
-		}
+		}
-		caCertPool.AppendCertsFromPEM([]byte(rootCA))
+		if gConf.Network.hasIPv4 == 0 && gConf.Network.hasUPNPorNATPMP == 0 { // if already has ipv4 or upnp no need test again
-		caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
+			gConf.Network.hasIPv4, gConf.Network.hasUPNPorNATPMP = publicIPTest(gConf.Network.publicIP, gConf.Network.TCPPort)
-		config := tls.Config{
+		}
-			RootCAs:            caCertPool,
+
-			InsecureSkipVerify: false} // let's encrypt root cert "DST Root CA X3" expired at 2021/09/29. many old system(windows server 2008 etc) will not trust our cert
+		// for testcase
-		websocket.DefaultDialer.TLSClientConfig = &config
+		if strings.Contains(gConf.Network.Node, "openp2pS2STest") {
-		u := url.URL{Scheme: "wss", Host: gatewayURL, Path: uri}
+			gConf.Network.natType = NATSymmetric
-		q := u.Query()
+			gConf.Network.hasIPv4 = 0
-		q.Add("node", pn.config.Node)
+			gConf.Network.hasUPNPorNATPMP = 0
-		q.Add("token", fmt.Sprintf("%d", pn.config.Token))
+			gLog.Println(LvINFO, "openp2pS2STest debug")
-		q.Add("version", OpenP2PVersion)
+
-		q.Add("nattype", fmt.Sprintf("%d", pn.config.natType))
+		}
-		q.Add("sharebandwidth", fmt.Sprintf("%d", pn.config.ShareBandwidth))
+		if strings.Contains(gConf.Network.Node, "openp2pC2CTest") {
-		u.RawQuery = q.Encode()
+			gConf.Network.natType = NATCone
-		var ws *websocket.Conn
+			gConf.Network.hasIPv4 = 0
-		ws, _, err = websocket.DefaultDialer.Dial(u.String(), nil)
+			gConf.Network.hasUPNPorNATPMP = 0
-		if err != nil {
+			gLog.Println(LvINFO, "openp2pC2CTest debug")
-			break
+		}
-		}
+
-		pn.online = true
+		if gConf.Network.hasIPv4 == 1 || gConf.Network.hasUPNPorNATPMP == 1 {
-		pn.conn = ws
+			onceV4Listener.Do(func() {
-		localAddr := strings.Split(ws.LocalAddr().String(), ":")
+				v4l = &v4Listener{port: gConf.Network.TCPPort}
-		if len(localAddr) == 2 {
+				go v4l.start()
-			pn.config.localIP = localAddr[0]
+			})
-		} else {
+		}
-			err = errors.New("get local ip failed")
+		gLog.Printf(LvINFO, "hasIPv4:%d, UPNP:%d, NAT type:%d, publicIP:%s", gConf.Network.hasIPv4, gConf.Network.hasUPNPorNATPMP, gConf.Network.natType, gConf.Network.publicIP)
-			break
+		gatewayURL := fmt.Sprintf("%s:%d", gConf.Network.ServerHost, gConf.Network.ServerPort)
-		}
+		uri := "/api/v1/login"
-		go pn.readLoop()
+		caCertPool, errCert := x509.SystemCertPool()
-		pn.config.mac = getmac(pn.config.localIP)
+		if errCert != nil {
-		pn.config.os = getOsName()
+			gLog.Println(LvERROR, "Failed to load system root CAs:", errCert)
-		go func() {
+			caCertPool = x509.NewCertPool()
-			req := ReportBasic{
+		}
-				Mac:             pn.config.mac,
+		caCertPool.AppendCertsFromPEM([]byte(rootCA))
-				LanIP:           pn.config.localIP,
+		caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
-				OS:              pn.config.os,
+		config := tls.Config{
-				HasIPv4:         pn.config.hasIPv4,
+			RootCAs:            caCertPool,
-				HasUPNPorNATPMP: pn.config.hasUPNPorNATPMP,
+			InsecureSkipVerify: false} // let's encrypt root cert "DST Root CA X3" expired at 2021/09/29. many old system(windows server 2008 etc) will not trust our cert
-				Version:         OpenP2PVersion,
+		websocket.DefaultDialer.TLSClientConfig = &config
-			}
+		websocket.DefaultDialer.HandshakeTimeout = ClientAPITimeout
-			rsp := netInfo()
+		u := url.URL{Scheme: "wss", Host: gatewayURL, Path: uri}
-			gLog.Println(LvDEBUG, "netinfo:", rsp)
+		q := u.Query()
-			if rsp != nil && rsp.Country != "" {
+		q.Add("node", gConf.Network.Node)
-				if IsIPv6(rsp.IP.String()) {
+		q.Add("token", fmt.Sprintf("%d", gConf.Network.Token))
-					gConf.setIPv6(rsp.IP.String())
+		q.Add("version", OpenP2PVersion)
-				}
+		q.Add("nattype", fmt.Sprintf("%d", gConf.Network.natType))
-				req.NetInfo = *rsp
+		q.Add("sharebandwidth", fmt.Sprintf("%d", gConf.Network.ShareBandwidth))
-			} else {
+		u.RawQuery = q.Encode()
-				pn.refreshIPv6(true)
+		var ws *websocket.Conn
-			}
+		ws, _, err = websocket.DefaultDialer.Dial(u.String(), nil)
-			req.IPv6 = gConf.IPv6()
+		if err != nil {
-			pn.write(MsgReport, MsgReportBasic, &req)
+			gLog.Println(LvERROR, "Dial error:", err)
-		}()
+			break
-		go pn.autorunApp()
+		}
-		gLog.Println(LvDEBUG, "P2PNetwork init ok")
+		pn.running = true
-		break
+		pn.online = true
-	}
+		pn.conn = ws
-	if err != nil {
+		localAddr := strings.Split(ws.LocalAddr().String(), ":")
-		// init failed, retry
+		if len(localAddr) == 2 {
-		pn.restartCh <- true
+			gConf.Network.localIP = localAddr[0]
-		gLog.Println(LvERROR, "P2PNetwork init error:", err)
+		} else {
-	}
+			err = errors.New("get local ip failed")
-	return err
+			break
-}
+		}
-
+		go pn.readLoop()
-func (pn *P2PNetwork) handleMessage(t int, msg []byte) {
+		gConf.Network.mac = getmac(gConf.Network.localIP)
-	head := openP2PHeader{}
+		gConf.Network.os = getOsName()
-	err := binary.Read(bytes.NewReader(msg[:openP2PHeaderSize]), binary.LittleEndian, &head)
+		go func() {
-	if err != nil {
+			req := ReportBasic{
-		gLog.Println(LvERROR, "handleMessage error:", err)
+				Mac:             gConf.Network.mac,
-		return
+				LanIP:           gConf.Network.localIP,
-	}
+				OS:              gConf.Network.os,
-	switch head.MainType {
+				HasIPv4:         gConf.Network.hasIPv4,
-	case MsgLogin:
+				HasUPNPorNATPMP: gConf.Network.hasUPNPorNATPMP,
-		// gLog.Println(LevelINFO,string(msg))
+				Version:         OpenP2PVersion,
-		rsp := LoginRsp{}
+			}
-		if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
+			rsp := netInfo()
-			gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(rsp), err)
+			gLog.Println(LvDEBUG, "netinfo:", rsp)
-			return
+			if rsp != nil && rsp.Country != "" {
-		}
+				if IsIPv6(rsp.IP.String()) {
-		if rsp.Error != 0 {
+					gConf.setIPv6(rsp.IP.String())
-			gLog.Printf(LvERROR, "login error:%d, detail:%s", rsp.Error, rsp.Detail)
+				}
-			pn.running = false
+				req.NetInfo = *rsp
-		} else {
+			} else {
-			pn.config.Token = rsp.Token
+				pn.refreshIPv6()
-			pn.config.User = rsp.User
+			}
-			gConf.setToken(rsp.Token)
+			req.IPv6 = gConf.IPv6()
-			gConf.setUser(rsp.User)
+			pn.write(MsgReport, MsgReportBasic, &req)
-			if len(rsp.Node) >= MinNodeNameLen {
+		}()
-				gConf.setNode(rsp.Node)
+		go pn.autorunApp()
-				pn.config.Node = rsp.Node
+		pn.write(MsgSDWAN, MsgSDWANInfoReq, nil)
-			}
+		gLog.Println(LvDEBUG, "P2PNetwork init ok")
-			gLog.Printf(LvINFO, "login ok. user=%s,node=%s", rsp.User, rsp.Node)
+		break
-		}
+	}
-	case MsgHeartbeat:
+	if err != nil {
-		gLog.Printf(LvDEBUG, "P2PNetwork heartbeat ok")
+		// init failed, retry
-		pn.hbTime = time.Now()
+		pn.close()
-		rtt := pn.hbTime.UnixNano() - pn.t1
+		gLog.Println(LvERROR, "P2PNetwork init error:", err)
-		t2 := int64(binary.LittleEndian.Uint64(msg[openP2PHeaderSize : openP2PHeaderSize+8]))
+	}
-		dt := pn.t1 + rtt/2 - t2
+	return err
-		if pn.dt != 0 {
+}
-			ddt := dt - pn.dt
+
-			if pn.ddtma > 0 && (ddt > (pn.ddtma+pn.ddtma/3) || ddt < (pn.ddtma-pn.ddtma/3)) {
+func (pn *P2PNetwork) handleMessage(msg []byte) {
-				newdt := pn.dt + pn.ddtma
+	head := openP2PHeader{}
-				gLog.Printf(LvDEBUG, "server time auto adjust dt=%.2fms to %.2fms", float64(dt)/float64(time.Millisecond), float64(newdt)/float64(time.Millisecond))
+	err := binary.Read(bytes.NewReader(msg[:openP2PHeaderSize]), binary.LittleEndian, &head)
-				dt = newdt
+	if err != nil {
-			}
+		gLog.Println(LvERROR, "handleMessage error:", err)
-			pn.ddt = ddt
+		return
-			if pn.ddtma == 0 {
+	}
-				pn.ddtma = pn.ddt
+	switch head.MainType {
-			} else {
+	case MsgLogin:
-				pn.ddtma = int64(float64(pn.ddtma)*(1-ma10) + float64(pn.ddt)*ma10) // avoid int64 overflow
+		// gLog.Println(LevelINFO,string(msg))
-			}
+		rsp := LoginRsp{}
-		}
+		if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
-		pn.dt = dt
+			gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(rsp), err)
-
+			return
-		gLog.Printf(LvDEBUG, "server time dt=%dms ddt=%dns ddtma=%dns rtt=%dms ", pn.dt/int64(time.Millisecond), pn.ddt, pn.ddtma, rtt/int64(time.Millisecond))
+		}
-	case MsgPush:
+		if rsp.Error != 0 {
-		handlePush(pn, head.SubType, msg)
+			gLog.Printf(LvERROR, "login error:%d, detail:%s", rsp.Error, rsp.Detail)
-	default:
+			pn.running = false
-		pn.msgMapMtx.Lock()
+		} else {
-		ch := pn.msgMap[0]
+			gConf.setToken(rsp.Token)
-		pn.msgMapMtx.Unlock()
+			gConf.setUser(rsp.User)
-		ch <- pushMsg{data: msg, ts: time.Now()}
+			if len(rsp.Node) >= MinNodeNameLen {
-		return
+				gConf.setNode(rsp.Node)
-	}
+			}
-}
+			if rsp.LoginMaxDelay > 0 {
-
+				pn.loginMaxDelaySeconds = rsp.LoginMaxDelay
-func (pn *P2PNetwork) readLoop() {
+			}
-	gLog.Printf(LvDEBUG, "P2PNetwork readLoop start")
+			gLog.Printf(LvINFO, "login ok. user=%s,node=%s", rsp.User, rsp.Node)
-	pn.wgReconnect.Add(1)
+		}
-	defer pn.wgReconnect.Done()
+	case MsgHeartbeat:
-	for pn.running {
+		gLog.Printf(LvDev, "P2PNetwork heartbeat ok")
-		pn.conn.SetReadDeadline(time.Now().Add(NetworkHeartbeatTime + 10*time.Second))
+		pn.hbTime = time.Now()
-		t, msg, err := pn.conn.ReadMessage()
+		rtt := pn.hbTime.UnixNano() - pn.t1
-		if err != nil {
+		if rtt > int64(PunchTsDelay) || (pn.preRtt > 0 && rtt > pn.preRtt*5) {
-			gLog.Printf(LvERROR, "P2PNetwork read error:%s", err)
+			gLog.Printf(LvINFO, "rtt=%d too large ignore", rtt)
-			pn.conn.Close()
+			return // invalid hb rsp
-			pn.restartCh <- true
+		}
-			break
+		pn.preRtt = rtt
-		}
+		t2 := int64(binary.LittleEndian.Uint64(msg[openP2PHeaderSize : openP2PHeaderSize+8]))
-		pn.handleMessage(t, msg)
+		thisdt := pn.t1 + rtt/2 - t2
-	}
+		newdt := thisdt
-	gLog.Printf(LvDEBUG, "P2PNetwork readLoop end")
+		if pn.dt != 0 {
-}
+			ddt := thisdt - pn.dt
-
+			pn.ddt = ddt
-func (pn *P2PNetwork) write(mainType uint16, subType uint16, packet interface{}) error {
+			if pn.ddtma == 0 {
-	if !pn.online {
+				pn.ddtma = pn.ddt
-		return errors.New("P2P network offline")
+			} else {
-	}
+				pn.ddtma = int64(float64(pn.ddtma)*(1-ma10) + float64(pn.ddt)*ma10) // avoid int64 overflow
-	msg, err := newMessage(mainType, subType, packet)
+				newdt = pn.dt + pn.ddtma
-	if err != nil {
+			}
-		return err
+		}
-	}
+		pn.dt = newdt
-	pn.writeMtx.Lock()
+		gLog.Printf(LvDEBUG, "synctime thisdt=%dms dt=%dms ddt=%dns ddtma=%dns rtt=%dms ", thisdt/int64(time.Millisecond), pn.dt/int64(time.Millisecond), pn.ddt, pn.ddtma, rtt/int64(time.Millisecond))
-	defer pn.writeMtx.Unlock()
+	case MsgPush:
-	if err = pn.conn.WriteMessage(websocket.BinaryMessage, msg); err != nil {
+		handlePush(head.SubType, msg)
-		gLog.Printf(LvERROR, "write msgType %d,%d error:%s", mainType, subType, err)
+	case MsgSDWAN:
-		pn.conn.Close()
+		handleSDWAN(head.SubType, msg)
-	}
+	default:
-	return err
+		i, ok := pn.msgMap.Load(uint64(0))
-}
+		if ok {
-
+			ch := i.(chan msgCtx)
-func (pn *P2PNetwork) relay(to uint64, body []byte) error {
+			ch <- msgCtx{data: msg, ts: time.Now()}
-	gLog.Printf(LvDEBUG, "relay data to %d", to)
+		}
-	i, ok := pn.allTunnels.Load(to)
+
-	if !ok {
+		return
-		return nil
+	}
-	}
+}
-	tunnel := i.(*P2PTunnel)
+
-	if tunnel.config.shareBandwidth > 0 {
+func (pn *P2PNetwork) readLoop() {
-		pn.limiter.Add(len(body))
+	gLog.Printf(LvDEBUG, "P2PNetwork readLoop start")
-	}
+	pn.wgReconnect.Add(1)
-	tunnel.conn.WriteBuffer(body)
+	defer pn.wgReconnect.Done()
-	return nil
+	for pn.running {
-}
+		pn.conn.SetReadDeadline(time.Now().Add(NetworkHeartbeatTime + 10*time.Second))
-
+		_, msg, err := pn.conn.ReadMessage()
-func (pn *P2PNetwork) push(to string, subType uint16, packet interface{}) error {
+		if err != nil {
-	gLog.Printf(LvDEBUG, "push msgType %d to %s", subType, to)
+			gLog.Printf(LvERROR, "P2PNetwork read error:%s", err)
-	if !pn.online {
+			pn.close()
-		return errors.New("client offline")
+			break
-	}
+		}
-	pushHead := PushHeader{}
+		pn.handleMessage(msg)
-	pushHead.From = nodeNameToID(pn.config.Node)
+	}
-	pushHead.To = nodeNameToID(to)
+	gLog.Printf(LvDEBUG, "P2PNetwork readLoop end")
-	pushHeadBuf := new(bytes.Buffer)
+}
-	err := binary.Write(pushHeadBuf, binary.LittleEndian, pushHead)
+
-	if err != nil {
+func (pn *P2PNetwork) write(mainType uint16, subType uint16, packet interface{}) error {
-		return err
+	if !pn.online {
-	}
+		return errors.New("P2P network offline")
-	data, err := json.Marshal(packet)
+	}
-	if err != nil {
+	msg, err := newMessage(mainType, subType, packet)
-		return err
+	if err != nil {
-	}
+		return err
-	// gLog.Println(LevelINFO,"write packet:", string(data))
+	}
-	pushMsg := append(encodeHeader(MsgPush, subType, uint32(len(data)+PushHeaderSize)), pushHeadBuf.Bytes()...)
+	pn.writeMtx.Lock()
-	pushMsg = append(pushMsg, data...)
+	defer pn.writeMtx.Unlock()
-	pn.writeMtx.Lock()
+	if err = pn.conn.WriteMessage(websocket.BinaryMessage, msg); err != nil {
-	defer pn.writeMtx.Unlock()
+		gLog.Printf(LvERROR, "write msgType %d,%d error:%s", mainType, subType, err)
-	if err = pn.conn.WriteMessage(websocket.BinaryMessage, pushMsg); err != nil {
+		pn.close()
-		gLog.Printf(LvERROR, "push to %s error:%s", to, err)
+	}
-		pn.conn.Close()
+	return err
-	}
+}
-	return err
+
-}
+func (pn *P2PNetwork) relay(to uint64, body []byte) error {
-
+	i, ok := pn.allTunnels.Load(to)
-func (pn *P2PNetwork) read(node string, mainType uint16, subType uint16, timeout time.Duration) (head *openP2PHeader, body []byte) {
+	if !ok {
-	var nodeID uint64
+		return ErrRelayTunnelNotFound
-	if node == "" {
+	}
-		nodeID = 0
+	tunnel := i.(*P2PTunnel)
-	} else {
+	if tunnel.config.shareBandwidth > 0 {
-		nodeID = nodeNameToID(node)
+		pn.limiter.Add(len(body), true)
-	}
+	}
-	pn.msgMapMtx.Lock()
+	var err error
-	ch := pn.msgMap[nodeID]
+	if err = tunnel.conn.WriteBuffer(body); err != nil {
-	pn.msgMapMtx.Unlock()
+		gLog.Printf(LvERROR, "relay to %d len=%d error:%s", to, len(body), err)
-	for {
+	}
-		select {
+	return err
-		case <-time.After(timeout):
+}
-			gLog.Printf(LvERROR, "wait msg%d:%d timeout", mainType, subType)
+
-			return
+func (pn *P2PNetwork) push(to string, subType uint16, packet interface{}) error {
-		case msg := <-ch:
+	// gLog.Printf(LvDEBUG, "push msgType %d to %s", subType, to)
-			if msg.ts.Before(time.Now().Add(-msgExpiredTime)) {
+	if !pn.online {
-				gLog.Printf(LvDEBUG, "msg expired error %d:%d", head.MainType, head.SubType)
+		return errors.New("client offline")
-				continue
+	}
-			}
+	pushHead := PushHeader{}
-			head = &openP2PHeader{}
+	pushHead.From = gConf.nodeID()
-			err := binary.Read(bytes.NewReader(msg.data[:openP2PHeaderSize]), binary.LittleEndian, head)
+	pushHead.To = NodeNameToID(to)
-			if err != nil {
+	pushHeadBuf := new(bytes.Buffer)
-				gLog.Println(LvERROR, "read msg error:", err)
+	err := binary.Write(pushHeadBuf, binary.LittleEndian, pushHead)
-				break
+	if err != nil {
-			}
+		return err
-			if head.MainType != mainType || head.SubType != subType {
+	}
-				gLog.Printf(LvDEBUG, "read msg type error %d:%d, requeue it", head.MainType, head.SubType)
+	data, err := json.Marshal(packet)
-				ch <- msg
+	if err != nil {
-				continue
+		return err
-			}
+	}
-			if mainType == MsgPush {
+	// gLog.Println(LevelINFO,"write packet:", string(data))
-				body = msg.data[openP2PHeaderSize+PushHeaderSize:]
+	pushMsg := append(encodeHeader(MsgPush, subType, uint32(len(data)+PushHeaderSize)), pushHeadBuf.Bytes()...)
-			} else {
+	pushMsg = append(pushMsg, data...)
-				body = msg.data[openP2PHeaderSize:]
+	pn.writeMtx.Lock()
-			}
+	defer pn.writeMtx.Unlock()
-			return
+	if err = pn.conn.WriteMessage(websocket.BinaryMessage, pushMsg); err != nil {
-		}
+		gLog.Printf(LvERROR, "push to %s error:%s", to, err)
-	}
+		pn.close()
-}
+	}
-
+	return err
-func (pn *P2PNetwork) updateAppHeartbeat(appID uint64) {
+}
-	pn.apps.Range(func(id, i interface{}) bool {
+
-		app := i.(*p2pApp)
+func (pn *P2PNetwork) close() {
-		if app.id != appID {
+	if pn.running {
-			return true
+		if pn.conn != nil {
-		}
+			pn.conn.Close()
-		app.updateHeartbeat()
+		}
-		return false
+		pn.running = false
-	})
+	}
-}
+	select {
-
+	case pn.restartCh <- true:
-// ipv6 will expired need to refresh.
+	default:
-func (pn *P2PNetwork) refreshIPv6(force bool) {
+	}
-	if !force && !IsIPv6(gConf.IPv6()) { // not support ipv6, not refresh
+}
-		return
+
-	}
+func (pn *P2PNetwork) read(node string, mainType uint16, subType uint16, timeout time.Duration) (head *openP2PHeader, body []byte) {
-	for i := 0; i < 3; i++ {
+	var nodeID uint64
-		client := &http.Client{Timeout: time.Second * 10}
+	if node == "" {
-		r, err := client.Get("http://6.ipw.cn")
+		nodeID = 0
-		if err != nil {
+	} else {
-			gLog.Println(LvDEBUG, "refreshIPv6 error:", err)
+		nodeID = NodeNameToID(node)
-			continue
+	}
-		}
+	i, ok := pn.msgMap.Load(nodeID)
-		defer r.Body.Close()
+	if !ok {
-		buf := make([]byte, 1024)
+		gLog.Printf(LvERROR, "read msg error: %s not found", node)
-		n, err := r.Body.Read(buf)
+		return
-		if n <= 0 {
+	}
-			gLog.Println(LvINFO, "refreshIPv6 error:", err, n)
+	ch := i.(chan msgCtx)
-			continue
+	for {
-		}
+		select {
-		gConf.setIPv6(string(buf[:n]))
+		case <-time.After(timeout):
-		break
+			gLog.Printf(LvERROR, "read msg error %d:%d timeout", mainType, subType)
-	}
+			return
-
+		case msg := <-ch:
-}
+			head = &openP2PHeader{}
-
+			err := binary.Read(bytes.NewReader(msg.data[:openP2PHeaderSize]), binary.LittleEndian, head)
-func (pn *P2PNetwork) requestPeerInfo(config *AppConfig) error {
+			if err != nil {
-	// request peer info
+				gLog.Println(LvERROR, "read msg error:", err)
-	pn.write(MsgQuery, MsgQueryPeerInfoReq, &QueryPeerInfoReq{config.peerToken, config.PeerNode})
+				break
-	head, body := pn.read("", MsgQuery, MsgQueryPeerInfoRsp, ClientAPITimeout)
+			}
-	if head == nil {
+			if time.Since(msg.ts) > ReadMsgTimeout {
-		return ErrNetwork // network error, should not be ErrPeerOffline
+				gLog.Printf(LvDEBUG, "read msg error expired %d:%d", head.MainType, head.SubType)
-	}
+				continue
-	rsp := QueryPeerInfoRsp{}
+			}
-	if err := json.Unmarshal(body, &rsp); err != nil {
+			if head.MainType != mainType || head.SubType != subType {
-		return ErrMsgFormat
+				gLog.Printf(LvDEBUG, "read msg error type %d:%d, requeue it", head.MainType, head.SubType)
-	}
+				ch <- msg
-	if rsp.Online == 0 {
+				time.Sleep(time.Second)
-		return ErrPeerOffline
+				continue
-	}
+			}
-	if compareVersion(rsp.Version, LeastSupportVersion) == LESS {
+			if mainType == MsgPush {
-		return ErrVersionNotCompatible
+				body = msg.data[openP2PHeaderSize+PushHeaderSize:]
-	}
+			} else {
-	config.peerVersion = rsp.Version
+				body = msg.data[openP2PHeaderSize:]
-	config.hasIPv4 = rsp.HasIPv4
+			}
-	config.peerIP = rsp.IPv4
+			return
-	config.peerIPv6 = rsp.IPv6
+		}
-	config.hasUPNPorNATPMP = rsp.HasUPNPorNATPMP
+	}
-	config.peerNatType = rsp.NatType
+}
-	///
+
-	return nil
+func (pn *P2PNetwork) updateAppHeartbeat(appID uint64) {
-}
+	pn.apps.Range(func(id, i interface{}) bool {
 		app := i.(*p2pApp)
 		if app.id == appID {
 			app.updateHeartbeat()
 		}
 		return true
 	})
 }
 // ipv6 will expired need to refresh.
 func (pn *P2PNetwork) refreshIPv6() {
 	for i := 0; i < 2; i++ {
 		client := &http.Client{Timeout: time.Second * 10}
 		r, err := client.Get("http://ipv6.ddnspod.com/")
 		if err != nil {
 			gLog.Println(LvDEBUG, "refreshIPv6 error:", err)
 			continue
 		}
 		defer r.Body.Close()
 		buf := make([]byte, 1024)
 		n, err := r.Body.Read(buf)
 		if n <= 0 {
 			gLog.Println(LvINFO, "refreshIPv6 error:", err, n)
 			continue
 		}
 		if IsIPv6(string(buf[:n])) {
 			gConf.setIPv6(string(buf[:n]))
 		}
 		break
 	}
 }
 func (pn *P2PNetwork) requestPeerInfo(config *AppConfig) error {
 	// request peer info
 	// TODO: multi-thread issue
 	pn.reqGatewayMtx.Lock()
 	pn.write(MsgQuery, MsgQueryPeerInfoReq, &QueryPeerInfoReq{config.peerToken, config.PeerNode})
 	head, body := pn.read("", MsgQuery, MsgQueryPeerInfoRsp, ClientAPITimeout)
 	pn.reqGatewayMtx.Unlock()
 	if head == nil {
 		gLog.Println(LvERROR, "requestPeerInfo error")
 		return ErrNetwork // network error, should not be ErrPeerOffline
 	}
 	rsp := QueryPeerInfoRsp{}
 	if err := json.Unmarshal(body, &rsp); err != nil {
 		return ErrMsgFormat
 	}
 	if rsp.Online == 0 {
 		return ErrPeerOffline
 	}
 	if compareVersion(rsp.Version, LeastSupportVersion) < 0 {
 		return ErrVersionNotCompatible
 	}
 	config.peerVersion = rsp.Version
 	config.peerLanIP = rsp.LanIP
 	config.hasIPv4 = rsp.HasIPv4
 	config.peerIP = rsp.IPv4
 	config.peerIPv6 = rsp.IPv6
 	config.hasUPNPorNATPMP = rsp.HasUPNPorNATPMP
 	config.peerNatType = rsp.NatType
 	///
 	return nil
 }
 func (pn *P2PNetwork) StartSDWAN() {
 	// request peer info
 	pn.sdwan = &p2pSDWAN{}
 }
 func (pn *P2PNetwork) ConnectNode(node string) error {
 	if gConf.nodeID() < NodeNameToID(node) {
 		return errors.New("only the bigger nodeid connect")
 	}
 	peerNodeID := fmt.Sprintf("%d", NodeNameToID(node))
 	config := AppConfig{Enabled: 1}
 	config.AppName = peerNodeID
 	config.SrcPort = 0
 	config.PeerNode = node
 	sdwan := gConf.getSDWAN()
 	config.PunchPriority = int(sdwan.PunchPriority)
 	if node != sdwan.CentralNode && gConf.Network.Node != sdwan.CentralNode { // neither is centralnode
 		config.RelayNode = sdwan.CentralNode
 		config.ForceRelay = int(sdwan.ForceRelay)
 		if sdwan.Mode == SDWANModeCentral {
 			config.ForceRelay = 1
 		}
 	}
 	gConf.add(config, true)
 	return nil
 }
 func (pn *P2PNetwork) WriteNode(nodeID uint64, buff []byte) error {
 	i, ok := pn.apps.Load(nodeID)
 	if !ok {
 		return errors.New("peer not found")
 	}
 	var err error
 	app := i.(*p2pApp)
 	if app.Tunnel() == nil {
 		return errors.New("peer tunnel nil")
 	}
 	// TODO: move to app.write
 	gLog.Printf(LvDev, "%d tunnel write node data bodylen=%d, relay=%t", app.Tunnel().id, len(buff), !app.isDirect())
 	if app.isDirect() { // direct
 		app.Tunnel().asyncWriteNodeData(MsgP2P, MsgNodeData, buff)
 	} else { // relay
 		fromNodeIDHead := new(bytes.Buffer)
 		binary.Write(fromNodeIDHead, binary.LittleEndian, gConf.nodeID())
 		all := app.RelayHead().Bytes()
 		all = append(all, encodeHeader(MsgP2P, MsgRelayNodeData, uint32(len(buff)+overlayHeaderSize))...)
 		all = append(all, fromNodeIDHead.Bytes()...)
 		all = append(all, buff...)
 		app.Tunnel().asyncWriteNodeData(MsgP2P, MsgRelayData, all)
 	}
 	return err
 }
 func (pn *P2PNetwork) WriteBroadcast(buff []byte) error {
 	///
 	pn.apps.Range(func(id, i interface{}) bool {
 		// newDestIP := net.ParseIP("10.2.3.2")
 		// copy(buff[16:20], newDestIP.To4())
 		// binary.BigEndian.PutUint16(buff[10:12], 0) // set checksum=0 for calc checksum
 		// ipChecksum := calculateChecksum(buff[0:20])
 		// binary.BigEndian.PutUint16(buff[10:12], ipChecksum)
 		// binary.BigEndian.PutUint16(buff[26:28], 0x082e)
 		app := i.(*p2pApp)
 		if app.Tunnel() == nil {
 			return true
 		}
 		if app.config.SrcPort != 0 { // normal portmap app
 			return true
 		}
 		if app.config.peerIP == gConf.Network.publicIP { // mostly in a lan
 			return true
 		}
 		if app.isDirect() { // direct
 			app.Tunnel().conn.WriteBytes(MsgP2P, MsgNodeData, buff)
 		} else { // relay
 			fromNodeIDHead := new(bytes.Buffer)
 			binary.Write(fromNodeIDHead, binary.LittleEndian, gConf.nodeID())
 			all := app.RelayHead().Bytes()
 			all = append(all, encodeHeader(MsgP2P, MsgRelayNodeData, uint32(len(buff)+overlayHeaderSize))...)
 			all = append(all, fromNodeIDHead.Bytes()...)
 			all = append(all, buff...)
 			app.Tunnel().conn.WriteBytes(MsgP2P, MsgRelayData, all)
 		}
 		return true
 	})
 	return nil
 }
 func (pn *P2PNetwork) ReadNode(tm time.Duration) *NodeData {
 	select {
 	case nd := <-pn.nodeData:
 		return nd
 	case <-time.After(tm):
 	}
 	return nil
 }
@@ -1,603 +1,806 @@
-package openp2p
+package openp2p
-
+
-import (
+import (
-	"bytes"
+	"bytes"
-	"encoding/binary"
+	"encoding/binary"
-	"encoding/json"
+	"encoding/json"
-	"errors"
+	"errors"
-	"fmt"
+	"fmt"
-	"math/rand"
+	"math/rand"
-	"net"
+	"net"
-	"reflect"
+	"reflect"
-	"sync"
+	"sync"
-	"time"
+	"sync/atomic"
-)
+	"time"
-
+)
-type P2PTunnel struct {
+
-	pn            *P2PNetwork
+const WriteDataChanSize int = 3000
-	conn          underlay
+
-	hbTime        time.Time
+var buildTunnelMtx sync.Mutex
-	hbMtx         sync.Mutex
+
-	hbTimeRelay   time.Time
+type P2PTunnel struct {
-	config        AppConfig
+	pn             *P2PNetwork
-	la            *net.UDPAddr // local hole address
+	conn           underlay
-	ra            *net.UDPAddr // remote hole address
+	hbTime         time.Time
-	overlayConns  sync.Map     // both TCP and UDP
+	hbMtx          sync.Mutex
-	id            uint64
+	config         AppConfig
-	running       bool
+	la             *net.UDPAddr // local hole address
-	runMtx        sync.Mutex
+	ra             *net.UDPAddr // remote hole address
-	tunnelServer  bool // different from underlayServer
+	overlayConns   sync.Map     // both TCP and UDP
-	coneLocalPort int
+	id             uint64       // client side alloc rand.uint64 = server side
-	coneNatPort   int
+	running        bool
-	linkModeWeb   string // use config.linkmode
+	runMtx         sync.Mutex
-	punchTs       uint64
+	tunnelServer   bool // different from underlayServer
-}
+	coneLocalPort  int
-
+	coneNatPort    int
-func (t *P2PTunnel) initPort() {
+	linkModeWeb    string // use config.linkmode
-	t.running = true
+	punchTs        uint64
-	t.hbMtx.Lock()
+	writeData      chan []byte
-	t.hbTime = time.Now()
+	writeDataSmall chan []byte
-	t.hbMtx.Unlock()
+}
-	t.hbTimeRelay = time.Now().Add(time.Second * 600) // TODO: test fake time
+
-	localPort := int(rand.Uint32()%15000 + 50000)     // if the process has bug, will add many upnp port. use specify p2p port by param
+func (t *P2PTunnel) initPort() {
-	if t.config.linkMode == LinkModeTCP6 || t.config.linkMode == LinkModeTCP4 {
+	t.running = true
-		t.coneLocalPort = t.pn.config.TCPPort
+	localPort := int(rand.Uint32()%15000 + 50000) // if the process has bug, will add many upnp port. use specify p2p port by param
-		t.coneNatPort = t.pn.config.TCPPort // symmetric doesn't need coneNatPort
+	if t.config.linkMode == LinkModeTCP6 || t.config.linkMode == LinkModeTCP4 || t.config.linkMode == LinkModeIntranet {
-	}
+		t.coneLocalPort = gConf.Network.TCPPort
-	if t.config.linkMode == LinkModeUDPPunch {
+		t.coneNatPort = gConf.Network.TCPPort // symmetric doesn't need coneNatPort
-		// prepare one random cone hole manually
+	}
-		_, natPort, _ := natTest(t.pn.config.ServerHost, t.pn.config.UDPPort1, localPort)
+	if t.config.linkMode == LinkModeUDPPunch {
-		t.coneLocalPort = localPort
+		// prepare one random cone hole manually
-		t.coneNatPort = natPort
+		_, natPort, _ := natTest(gConf.Network.ServerHost, gConf.Network.UDPPort1, localPort)
-	}
+		t.coneLocalPort = localPort
-	if t.config.linkMode == LinkModeTCPPunch {
+		t.coneNatPort = natPort
-		// prepare one random cone hole by system automatically
+	}
-		_, natPort, localPort2 := natTCP(t.pn.config.ServerHost, IfconfigPort1)
+	if t.config.linkMode == LinkModeTCPPunch {
-		t.coneLocalPort = localPort2
+		// prepare one random cone hole by system automatically
-		t.coneNatPort = natPort
+		_, natPort, localPort2 := natTCP(gConf.Network.ServerHost, IfconfigPort1)
-	}
+		t.coneLocalPort = localPort2
-	t.la = &net.UDPAddr{IP: net.ParseIP(t.pn.config.localIP), Port: t.coneLocalPort}
+		t.coneNatPort = natPort
-	gLog.Printf(LvDEBUG, "prepare punching port %d:%d", t.coneLocalPort, t.coneNatPort)
+	}
-}
+	t.la = &net.UDPAddr{IP: net.ParseIP(gConf.Network.localIP), Port: t.coneLocalPort}
-
+	gLog.Printf(LvDEBUG, "prepare punching port %d:%d", t.coneLocalPort, t.coneNatPort)
-func (t *P2PTunnel) connect() error {
+}
-	gLog.Printf(LvDEBUG, "start p2pTunnel to %s ", t.config.PeerNode)
+
-	t.tunnelServer = false
+func (t *P2PTunnel) connect() error {
-	appKey := uint64(0)
+	gLog.Printf(LvDEBUG, "start p2pTunnel to %s ", t.config.LogPeerNode())
-	req := PushConnectReq{
+	t.tunnelServer = false
-		Token:            t.config.peerToken,
+	appKey := uint64(0)
-		From:             t.pn.config.Node,
+	req := PushConnectReq{
-		FromIP:           t.pn.config.publicIP,
+		Token:            t.config.peerToken,
-		ConeNatPort:      t.coneNatPort,
+		From:             gConf.Network.Node,
-		NatType:          t.pn.config.natType,
+		FromIP:           gConf.Network.publicIP,
-		HasIPv4:          t.pn.config.hasIPv4,
+		ConeNatPort:      t.coneNatPort,
-		IPv6:             gConf.IPv6(),
+		NatType:          gConf.Network.natType,
-		HasUPNPorNATPMP:  t.pn.config.hasUPNPorNATPMP,
+		HasIPv4:          gConf.Network.hasIPv4,
-		ID:               t.id,
+		IPv6:             gConf.IPv6(),
-		AppKey:           appKey,
+		HasUPNPorNATPMP:  gConf.Network.hasUPNPorNATPMP,
-		Version:          OpenP2PVersion,
+		ID:               t.id,
-		LinkMode:         t.config.linkMode,
+		AppKey:           appKey,
-		IsUnderlayServer: t.config.isUnderlayServer ^ 1, // peer
+		Version:          OpenP2PVersion,
-	}
+		LinkMode:         t.config.linkMode,
-	if req.Token == 0 { // no relay token
+		IsUnderlayServer: t.config.isUnderlayServer ^ 1, // peer
-		req.Token = t.pn.config.Token
+		UnderlayProtocol: t.config.UnderlayProtocol,
-	}
+	}
-	t.pn.push(t.config.PeerNode, MsgPushConnectReq, req)
+	if req.Token == 0 { // no relay token
-	head, body := t.pn.read(t.config.PeerNode, MsgPush, MsgPushConnectRsp, HandshakeTimeout*3)
+		req.Token = gConf.Network.Token
-	if head == nil {
+	}
-		return errors.New("connect error")
+	t.pn.push(t.config.PeerNode, MsgPushConnectReq, req)
-	}
+	head, body := t.pn.read(t.config.PeerNode, MsgPush, MsgPushConnectRsp, UnderlayConnectTimeout*3)
-	rsp := PushConnectRsp{}
+	if head == nil {
-	if err := json.Unmarshal(body, &rsp); err != nil {
+		return errors.New("connect error")
-		gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(rsp), err)
+	}
-		return err
+	rsp := PushConnectRsp{}
-	}
+	if err := json.Unmarshal(body, &rsp); err != nil {
-	// gLog.Println(LevelINFO, rsp)
+		gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(rsp), err)
-	if rsp.Error != 0 {
+		return err
-		return errors.New(rsp.Detail)
+	}
-	}
+	// gLog.Println(LevelINFO, rsp)
-	t.config.peerNatType = rsp.NatType
+	if rsp.Error != 0 {
-	t.config.hasIPv4 = rsp.HasIPv4
+		return errors.New(rsp.Detail)
-	t.config.peerIPv6 = rsp.IPv6
+	}
-	t.config.hasUPNPorNATPMP = rsp.HasUPNPorNATPMP
+	t.config.peerNatType = rsp.NatType
-	t.config.peerVersion = rsp.Version
+	t.config.hasIPv4 = rsp.HasIPv4
-	t.config.peerConeNatPort = rsp.ConeNatPort
+	t.config.peerIPv6 = rsp.IPv6
-	t.config.peerIP = rsp.FromIP
+	t.config.hasUPNPorNATPMP = rsp.HasUPNPorNATPMP
-	t.punchTs = rsp.PunchTs
+	t.config.peerVersion = rsp.Version
-	err := t.start()
+	t.config.peerConeNatPort = rsp.ConeNatPort
-	if err != nil {
+	t.config.peerIP = rsp.FromIP
-		gLog.Println(LvERROR, "handshake error:", err)
+	t.punchTs = rsp.PunchTs
-		err = ErrorHandshake
+	err := t.start()
-	}
+	if err != nil {
-	return err
+		gLog.Println(LvERROR, "handshake error:", err)
-}
+	}
-
+	return err
-func (t *P2PTunnel) isRuning() bool {
+}
-	t.runMtx.Lock()
+
-	defer t.runMtx.Unlock()
+func (t *P2PTunnel) isRuning() bool {
-	return t.running
+	t.runMtx.Lock()
-}
+	defer t.runMtx.Unlock()
-
+	return t.running
-func (t *P2PTunnel) setRun(running bool) {
+}
-	t.runMtx.Lock()
+
-	defer t.runMtx.Unlock()
+func (t *P2PTunnel) setRun(running bool) {
-	t.running = running
+	t.runMtx.Lock()
-}
+	defer t.runMtx.Unlock()
-
+	t.running = running
-func (t *P2PTunnel) isActive() bool {
+}
-	if !t.isRuning() || t.conn == nil {
+
-		return false
+func (t *P2PTunnel) isActive() bool {
-	}
+	if !t.isRuning() || t.conn == nil {
-	t.hbMtx.Lock()
+		return false
-	defer t.hbMtx.Unlock()
+	}
-	return time.Now().Before(t.hbTime.Add(TunnelHeartbeatTime * 2))
+	t.hbMtx.Lock()
-}
+	defer t.hbMtx.Unlock()
-
+	res := time.Now().Before(t.hbTime.Add(TunnelHeartbeatTime * 2))
-func (t *P2PTunnel) checkActive() bool {
+	if !res {
-	if !t.isActive() {
+		gLog.Printf(LvDEBUG, "%d tunnel isActive false", t.id)
-		return false
+	}
-	}
+	return res
-	hbt := time.Now()
+}
-	t.conn.WriteBytes(MsgP2P, MsgTunnelHeartbeat, nil)
+
-	isActive := false
+func (t *P2PTunnel) checkActive() bool {
-	// wait at most 5s
+	if !t.isActive() {
-	for i := 0; i < 50 && !isActive; i++ {
+		return false
-		t.hbMtx.Lock()
+	}
-		if t.hbTime.After(hbt) {
+	hbt := time.Now()
-			isActive = true
+	t.conn.WriteBytes(MsgP2P, MsgTunnelHeartbeat, nil)
-		}
+	isActive := false
-		t.hbMtx.Unlock()
+	// wait at most 5s
-		time.Sleep(time.Millisecond * 100)
+	for i := 0; i < 50 && !isActive; i++ {
-	}
+		t.hbMtx.Lock()
-	gLog.Printf(LvINFO, "checkActive %t. hbtime=%d", isActive, t.hbTime)
+		if t.hbTime.After(hbt) {
-	return isActive
+			isActive = true
-}
+		}
-
+		t.hbMtx.Unlock()
-// call when user delete tunnel
+		time.Sleep(time.Millisecond * 100)
-func (t *P2PTunnel) close() {
+	}
-	t.setRun(false)
+	gLog.Printf(LvINFO, "checkActive %t. hbtime=%d", isActive, t.hbTime)
-	t.pn.allTunnels.Delete(t.id)
+	return isActive
-}
+}
-
+
-func (t *P2PTunnel) start() error {
+// call when user delete tunnel
-	if t.config.linkMode == LinkModeUDPPunch {
+func (t *P2PTunnel) close() {
-		if err := t.handshake(); err != nil {
+	t.pn.NotifyTunnelClose(t)
-			return err
+	if !t.running {
-		}
+		return
-	}
+	}
-	err := t.connectUnderlay()
+	t.setRun(false)
-	if err != nil {
+	if t.conn != nil {
-		gLog.Println(LvERROR, err)
+		t.conn.Close()
-		return err
+	}
-	}
+	t.pn.allTunnels.Delete(t.id)
-	return nil
+	gLog.Printf(LvINFO, "%d p2ptunnel close %s ", t.id, t.config.LogPeerNode())
-}
+}
-
+
-func (t *P2PTunnel) handshake() error {
+func (t *P2PTunnel) start() error {
-	if t.config.peerConeNatPort > 0 { // only peer is cone should prepare t.ra
+	if t.config.linkMode == LinkModeUDPPunch {
-		var err error
+		if err := t.handshake(); err != nil {
-		t.ra, err = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", t.config.peerIP, t.config.peerConeNatPort))
+			return err
-		if err != nil {
+		}
-			return err
+	}
-		}
+	err := t.connectUnderlay()
-	}
+	if err != nil {
-	if compareVersion(t.config.peerVersion, SyncServerTimeVersion) == LESS {
+		gLog.Println(LvERROR, err)
-		gLog.Printf(LvDEBUG, "peer version %s less than %s", t.config.peerVersion, SyncServerTimeVersion)
+		return err
-	} else {
+	}
-		ts := time.Duration(int64(t.punchTs) + t.pn.dt + t.pn.ddt*int64(time.Since(t.pn.hbTime)+PunchTsDelay)/int64(NetworkHeartbeatTime) - time.Now().UnixNano())
+	return nil
-		gLog.Printf(LvDEBUG, "sleep %d ms", ts/time.Millisecond)
+}
-		time.Sleep(ts)
+
-	}
+func (t *P2PTunnel) handshake() error {
-	gLog.Println(LvDEBUG, "handshake to ", t.config.PeerNode)
+	if t.config.peerConeNatPort > 0 { // only peer is cone should prepare t.ra
-	var err error
+		var err error
-	// TODO: handle NATNone, nodes with public ip has no punching
+		t.ra, err = net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", t.config.peerIP, t.config.peerConeNatPort))
-	if t.pn.config.natType == NATCone && t.config.peerNatType == NATCone {
+		if err != nil {
-		err = handshakeC2C(t)
+			return err
-	} else if t.config.peerNatType == NATSymmetric && t.pn.config.natType == NATSymmetric {
+		}
-		err = ErrorS2S
+	}
-		t.close()
+	if compareVersion(t.config.peerVersion, SyncServerTimeVersion) < 0 {
-	} else if t.config.peerNatType == NATSymmetric && t.pn.config.natType == NATCone {
+		gLog.Printf(LvDEBUG, "peer version %s less than %s", t.config.peerVersion, SyncServerTimeVersion)
-		err = handshakeC2S(t)
+	} else {
-	} else if t.config.peerNatType == NATCone && t.pn.config.natType == NATSymmetric {
+		ts := time.Duration(int64(t.punchTs) + t.pn.dt + t.pn.ddtma*int64(time.Since(t.pn.hbTime)+PunchTsDelay)/int64(NetworkHeartbeatTime) - time.Now().UnixNano())
-		err = handshakeS2C(t)
+		if ts > PunchTsDelay || ts < 0 {
-	} else {
+			ts = PunchTsDelay
-		return errors.New("unknown error")
+		}
-	}
+		gLog.Printf(LvDEBUG, "sleep %d ms", ts/time.Millisecond)
-	if err != nil {
+		time.Sleep(ts)
-		gLog.Println(LvERROR, "punch handshake error:", err)
+	}
-		return err
+	gLog.Println(LvDEBUG, "handshake to ", t.config.LogPeerNode())
-	}
+	var err error
-	gLog.Printf(LvDEBUG, "handshake to %s ok", t.config.PeerNode)
+	if gConf.Network.natType == NATCone && t.config.peerNatType == NATCone {
-	return nil
+		err = handshakeC2C(t)
-}
+	} else if t.config.peerNatType == NATSymmetric && gConf.Network.natType == NATSymmetric {
-
+		err = ErrorS2S
-func (t *P2PTunnel) connectUnderlay() (err error) {
+		t.close()
-	switch t.config.linkMode {
+	} else if t.config.peerNatType == NATSymmetric && gConf.Network.natType == NATCone {
-	case LinkModeTCP6:
+		err = handshakeC2S(t)
-		t.conn, err = t.connectUnderlayTCP6()
+	} else if t.config.peerNatType == NATCone && gConf.Network.natType == NATSymmetric {
-	case LinkModeTCP4:
+		err = handshakeS2C(t)
-		t.conn, err = t.connectUnderlayTCP() // TODO: can not listen the same tcp port in pararell
+	} else {
-	case LinkModeTCPPunch:
+		return errors.New("unknown error")
-		t.conn, err = t.connectUnderlayTCP()
+	}
-	case LinkModeUDPPunch:
+	if err != nil {
-		t.conn, err = t.connectUnderlayQuic()
+		gLog.Println(LvERROR, "punch handshake error:", err)
-
+		return err
-	}
+	}
-	if err != nil {
+	gLog.Printf(LvDEBUG, "handshake to %s ok", t.config.LogPeerNode())
-		return err
+	return nil
-	}
+}
-	if t.conn == nil {
+
-		return errors.New("connect underlay error")
+func (t *P2PTunnel) connectUnderlay() (err error) {
-	}
+	switch t.config.linkMode {
-	t.setRun(true)
+	case LinkModeTCP6:
-	go t.readLoop()
+		t.conn, err = t.connectUnderlayTCP6()
-	go t.heartbeatLoop()
+	case LinkModeTCP4:
-	return nil
+		t.conn, err = t.connectUnderlayTCP()
-}
+	case LinkModeTCPPunch:
-
+		if gConf.Network.natType == NATSymmetric || t.config.peerNatType == NATSymmetric {
-func (t *P2PTunnel) connectUnderlayQuic() (c underlay, err error) {
+			t.conn, err = t.connectUnderlayTCPSymmetric()
-	gLog.Println(LvINFO, "connectUnderlayQuic start")
+		} else {
-	defer gLog.Println(LvINFO, "connectUnderlayQuic end")
+			t.conn, err = t.connectUnderlayTCP()
-	var qConn *underlayQUIC
+		}
-	if t.config.isUnderlayServer == 1 {
+	case LinkModeIntranet:
-		time.Sleep(time.Millisecond * 10) // punching udp port will need some times in some env
+		t.conn, err = t.connectUnderlayTCP()
-		qConn, err = listenQuic(t.la.String(), TunnelIdleTimeout)
+	case LinkModeUDPPunch:
-		if err != nil {
+		t.conn, err = t.connectUnderlayUDP()
-			gLog.Println(LvINFO, "listen quic error:", err, ", retry...")
+
-		}
+	}
-		t.pn.push(t.config.PeerNode, MsgPushUnderlayConnect, nil)
+	if err != nil {
-		err = qConn.Accept()
+		return err
-		if err != nil {
+	}
-			qConn.CloseListener()
+	if t.conn == nil {
-			return nil, fmt.Errorf("accept quic error:%s", err)
+		return errors.New("connect underlay error")
-		}
+	}
-		_, buff, err := qConn.ReadBuffer()
+	t.setRun(true)
-		if err != nil {
+	go t.readLoop()
-			qConn.listener.Close()
+	go t.writeLoop()
-			return nil, fmt.Errorf("read start msg error:%s", err)
+	return nil
-		}
+}
-		if buff != nil {
+
-			gLog.Println(LvDEBUG, string(buff))
+func (t *P2PTunnel) connectUnderlayUDP() (c underlay, err error) {
-		}
+	gLog.Printf(LvDEBUG, "connectUnderlayUDP %s start ", t.config.LogPeerNode())
-		qConn.WriteBytes(MsgP2P, MsgTunnelHandshakeAck, []byte("OpenP2P,hello2"))
+	defer gLog.Printf(LvDEBUG, "connectUnderlayUDP %s end ", t.config.LogPeerNode())
-		gLog.Println(LvDEBUG, "quic connection ok")
+	var ul underlay
-		return qConn, nil
+	underlayProtocol := t.config.UnderlayProtocol
-	}
+	if underlayProtocol == "" {
-
+		underlayProtocol = "quic"
-	//else
+	}
-	conn, e := net.ListenUDP("udp", t.la)
+	if t.config.isUnderlayServer == 1 {
-	if e != nil {
+		time.Sleep(time.Millisecond * 10) // punching udp port will need some times in some env
-		time.Sleep(time.Millisecond * 10)
+		go t.pn.push(t.config.PeerNode, MsgPushUnderlayConnect, nil)
-		conn, e = net.ListenUDP("udp", t.la)
+		if t.config.UnderlayProtocol == "kcp" {
-		if e != nil {
+			ul, err = listenKCP(t.la.String(), TunnelIdleTimeout)
-			return nil, fmt.Errorf("quic listen error:%s", e)
+		} else {
-		}
+			ul, err = listenQuic(t.la.String(), TunnelIdleTimeout)
-	}
+		}
-	t.pn.read(t.config.PeerNode, MsgPush, MsgPushUnderlayConnect, HandshakeTimeout*3)
+
-	gLog.Println(LvDEBUG, "quic dial to ", t.ra.String())
+		if err != nil {
-	qConn, e = dialQuic(conn, t.ra, TunnelIdleTimeout)
+			gLog.Printf(LvINFO, "listen %s error:%s", underlayProtocol, err)
-	if e != nil {
+			return nil, err
-		return nil, fmt.Errorf("quic dial to %s error:%s", t.ra.String(), e)
+		}
-	}
+
-	handshakeBegin := time.Now()
+		_, buff, err := ul.ReadBuffer()
-	qConn.WriteBytes(MsgP2P, MsgTunnelHandshake, []byte("OpenP2P,hello"))
+		if err != nil {
-	_, buff, err := qConn.ReadBuffer()
+			ul.Close()
-	if e != nil {
+			return nil, fmt.Errorf("read start msg error:%s", err)
-		qConn.listener.Close()
+		}
-		return nil, fmt.Errorf("read MsgTunnelHandshake error:%s", err)
+		if buff != nil {
-	}
+			gLog.Println(LvDEBUG, string(buff))
-	if buff != nil {
+		}
-		gLog.Println(LvDEBUG, string(buff))
+		ul.WriteBytes(MsgP2P, MsgTunnelHandshakeAck, []byte("OpenP2P,hello2"))
-	}
+		gLog.Printf(LvDEBUG, "%s connection ok", underlayProtocol)
-
+		return ul, nil
-	gLog.Println(LvINFO, "rtt=", time.Since(handshakeBegin))
+	}
-	gLog.Println(LvDEBUG, "quic connection ok")
+
-	t.linkModeWeb = LinkModeUDPPunch
+	//else
-	return qConn, nil
+	conn, errL := net.ListenUDP("udp", t.la)
-}
+	if errL != nil {
-
+		time.Sleep(time.Millisecond * 10)
-// websocket
+		conn, errL = net.ListenUDP("udp", t.la)
-func (t *P2PTunnel) connectUnderlayTCP() (c underlay, err error) {
+		if errL != nil {
-	gLog.Println(LvINFO, "connectUnderlayTCP start")
+			return nil, fmt.Errorf("%s listen error:%s", underlayProtocol, errL)
-	defer gLog.Println(LvINFO, "connectUnderlayTCP end")
+		}
-	var qConn *underlayTCP
+	}
-	if t.config.isUnderlayServer == 1 {
+	t.pn.read(t.config.PeerNode, MsgPush, MsgPushUnderlayConnect, ReadMsgTimeout)
-		qConn, err = listenTCP(t.config.peerIP, t.config.peerConeNatPort, t.coneLocalPort, t.config.linkMode, t)
+	gLog.Printf(LvDEBUG, "%s dial to %s", underlayProtocol, t.ra.String())
-		if err != nil {
+	if t.config.UnderlayProtocol == "kcp" {
-			return nil, fmt.Errorf("listen TCP error:%s", err)
+		ul, errL = dialKCP(conn, t.ra, TunnelIdleTimeout)
-		}
+	} else {
-
+		ul, errL = dialQuic(conn, t.ra, TunnelIdleTimeout)
-		_, buff, err := qConn.ReadBuffer()
+	}
-		if err != nil {
+
-			return nil, fmt.Errorf("read start msg error:%s", err)
+	if errL != nil {
-		}
+		return nil, fmt.Errorf("%s dial to %s error:%s", underlayProtocol, t.ra.String(), errL)
-		if buff != nil {
+	}
-			gLog.Println(LvDEBUG, string(buff))
+	handshakeBegin := time.Now()
-		}
+	ul.WriteBytes(MsgP2P, MsgTunnelHandshake, []byte("OpenP2P,hello"))
-		qConn.WriteBytes(MsgP2P, MsgTunnelHandshakeAck, []byte("OpenP2P,hello2"))
+	_, buff, err := ul.ReadBuffer() // TODO: kcp need timeout
-		gLog.Println(LvINFO, "TCP connection ok")
+	if err != nil {
-		return qConn, nil
+		ul.Close()
-	}
+		return nil, fmt.Errorf("read MsgTunnelHandshake error:%s", err)
-
+	}
-	// client side
+	if buff != nil {
-	if t.config.linkMode == LinkModeTCP4 {
+		gLog.Println(LvDEBUG, string(buff))
-		t.pn.read(t.config.PeerNode, MsgPush, MsgPushUnderlayConnect, HandshakeTimeout*3)
+	}
-	} else { //tcp punch should sleep for punch the same time
+
-		if compareVersion(t.config.peerVersion, SyncServerTimeVersion) == LESS {
+	gLog.Println(LvINFO, "rtt=", time.Since(handshakeBegin))
-			gLog.Printf(LvDEBUG, "peer version %s less than %s", t.config.peerVersion, SyncServerTimeVersion)
+	gLog.Printf(LvINFO, "%s connection ok", underlayProtocol)
-		} else {
+	t.linkModeWeb = LinkModeUDPPunch
-			ts := time.Duration(int64(t.punchTs) + t.pn.dt + t.pn.ddt*int64(time.Since(t.pn.hbTime)+PunchTsDelay)/int64(NetworkHeartbeatTime) - time.Now().UnixNano())
+	return ul, nil
-			gLog.Printf(LvDEBUG, "sleep %d ms", ts/time.Millisecond)
+}
-			time.Sleep(ts)
+
-		}
+func (t *P2PTunnel) connectUnderlayTCP() (c underlay, err error) {
-	}
+	gLog.Printf(LvDEBUG, "connectUnderlayTCP %s start ", t.config.LogPeerNode())
-
+	defer gLog.Printf(LvDEBUG, "connectUnderlayTCP %s end ", t.config.LogPeerNode())
-	gLog.Println(LvDEBUG, (time.Now().UnixNano()-t.pn.dt)/(int64)(time.Millisecond), " send tcp punch: ", fmt.Sprintf("0.0.0.0:%d", t.coneLocalPort), "-->", fmt.Sprintf("%s:%d", t.config.peerIP, t.config.peerConeNatPort))
+	var ul *underlayTCP
-	qConn, err = dialTCP(t.config.peerIP, t.config.peerConeNatPort, t.coneLocalPort, t.config.linkMode)
+	peerIP := t.config.peerIP
-	if err != nil {
+	if t.config.linkMode == LinkModeIntranet {
-		return nil, fmt.Errorf("TCP dial to %s:%d error:%s", t.config.peerIP, t.config.peerConeNatPort, err)
+		peerIP = t.config.peerLanIP
-	}
+	}
-	handshakeBegin := time.Now()
+	// server side
-	qConn.WriteBytes(MsgP2P, MsgTunnelHandshake, []byte("OpenP2P,hello"))
+	if t.config.isUnderlayServer == 1 {
-	_, buff, err := qConn.ReadBuffer()
+		ul, err = listenTCP(peerIP, t.config.peerConeNatPort, t.coneLocalPort, t.config.linkMode, t)
-	if err != nil {
+		if err != nil {
-		return nil, fmt.Errorf("read MsgTunnelHandshake error:%s", err)
+			return nil, fmt.Errorf("listen TCP error:%s", err)
-	}
+		}
-	if buff != nil {
+		gLog.Println(LvINFO, "TCP connection ok")
-		gLog.Println(LvDEBUG, string(buff))
+		t.linkModeWeb = LinkModeIPv4
-	}
+		if t.config.linkMode == LinkModeIntranet {
-
+			t.linkModeWeb = LinkModeIntranet
-	gLog.Println(LvINFO, "rtt=", time.Since(handshakeBegin))
+		}
-	gLog.Println(LvINFO, "TCP connection ok")
+		return ul, nil
-	t.linkModeWeb = LinkModeIPv4
+	}
-	return qConn, nil
+
-}
+	// client side
-
+	if t.config.linkMode == LinkModeTCP4 {
-func (t *P2PTunnel) connectUnderlayTCP6() (c underlay, err error) {
+		t.pn.read(t.config.PeerNode, MsgPush, MsgPushUnderlayConnect, ReadMsgTimeout)
-	gLog.Println(LvINFO, "connectUnderlayTCP6 start")
+	} else { //tcp punch should sleep for punch the same time
-	defer gLog.Println(LvINFO, "connectUnderlayTCP6 end")
+		if compareVersion(t.config.peerVersion, SyncServerTimeVersion) < 0 {
-	var qConn *underlayTCP6
+			gLog.Printf(LvDEBUG, "peer version %s less than %s", t.config.peerVersion, SyncServerTimeVersion)
-	if t.config.isUnderlayServer == 1 {
+		} else {
-		t.pn.push(t.config.PeerNode, MsgPushUnderlayConnect, nil)
+			ts := time.Duration(int64(t.punchTs) + t.pn.dt + t.pn.ddtma*int64(time.Since(t.pn.hbTime)+PunchTsDelay)/int64(NetworkHeartbeatTime) - time.Now().UnixNano())
-		qConn, err = listenTCP6(t.coneNatPort, HandshakeTimeout)
+			if ts > PunchTsDelay || ts < 0 {
-		if err != nil {
+				ts = PunchTsDelay
-			return nil, fmt.Errorf("listen TCP6 error:%s", err)
+			}
-		}
+			gLog.Printf(LvDEBUG, "sleep %d ms", ts/time.Millisecond)
-		_, buff, err := qConn.ReadBuffer()
+			time.Sleep(ts)
-		if err != nil {
+		}
-			qConn.listener.Close()
+	}
-			return nil, fmt.Errorf("read start msg error:%s", err)
+	ul, err = dialTCP(peerIP, t.config.peerConeNatPort, t.coneLocalPort, t.config.linkMode)
-		}
+	if err != nil {
-		if buff != nil {
+		return nil, fmt.Errorf("TCP dial to %s:%d error:%s", t.config.peerIP, t.config.peerConeNatPort, err)
-			gLog.Println(LvDEBUG, string(buff))
+	}
-		}
+	handshakeBegin := time.Now()
-		qConn.WriteBytes(MsgP2P, MsgTunnelHandshakeAck, []byte("OpenP2P,hello2"))
+	tidBuff := new(bytes.Buffer)
-		gLog.Println(LvDEBUG, "TCP6 connection ok")
+	binary.Write(tidBuff, binary.LittleEndian, t.id)
-		return qConn, nil
+	ul.WriteBytes(MsgP2P, MsgTunnelHandshake, tidBuff.Bytes()) //  tunnelID
-	}
+	_, buff, err := ul.ReadBuffer()
-
+	if err != nil {
-	//else
+		return nil, fmt.Errorf("read MsgTunnelHandshake error:%s", err)
-	t.pn.read(t.config.PeerNode, MsgPush, MsgPushUnderlayConnect, HandshakeTimeout*3)
+	}
-	gLog.Println(LvDEBUG, "TCP6 dial to ", t.config.peerIPv6)
+	if buff != nil {
-	qConn, err = dialTCP6(t.config.peerIPv6, t.config.peerConeNatPort)
+		gLog.Println(LvDEBUG, "hello ", string(buff))
-	if err != nil {
+	}
-		return nil, fmt.Errorf("TCP6 dial to %s:%d error:%s", t.config.peerIPv6, t.config.peerConeNatPort, err)
+
-	}
+	gLog.Println(LvINFO, "rtt=", time.Since(handshakeBegin))
-	handshakeBegin := time.Now()
+	gLog.Println(LvINFO, "TCP connection ok")
-	qConn.WriteBytes(MsgP2P, MsgTunnelHandshake, []byte("OpenP2P,hello"))
+	t.linkModeWeb = LinkModeIPv4
-	_, buff, err := qConn.ReadBuffer()
+	if t.config.linkMode == LinkModeIntranet {
-	if err != nil {
+		t.linkModeWeb = LinkModeIntranet
-		qConn.listener.Close()
+	}
-		return nil, fmt.Errorf("read MsgTunnelHandshake error:%s", err)
+	return ul, nil
-	}
+}
-	if buff != nil {
+
-		gLog.Println(LvDEBUG, string(buff))
+func (t *P2PTunnel) connectUnderlayTCPSymmetric() (c underlay, err error) {
-	}
+	gLog.Printf(LvDEBUG, "connectUnderlayTCPSymmetric %s start ", t.config.LogPeerNode())
-
+	defer gLog.Printf(LvDEBUG, "connectUnderlayTCPSymmetric %s end ", t.config.LogPeerNode())
-	gLog.Println(LvINFO, "rtt=", time.Since(handshakeBegin))
+	ts := time.Duration(int64(t.punchTs) + t.pn.dt + t.pn.ddtma*int64(time.Since(t.pn.hbTime)+PunchTsDelay)/int64(NetworkHeartbeatTime) - time.Now().UnixNano())
-	gLog.Println(LvDEBUG, "TCP6 connection ok")
+	if ts > PunchTsDelay || ts < 0 {
-	t.linkModeWeb = LinkModeIPv6
+		ts = PunchTsDelay
-	return qConn, nil
+	}
-}
+	gLog.Printf(LvDEBUG, "sleep %d ms", ts/time.Millisecond)
-
+	time.Sleep(ts)
-func (t *P2PTunnel) readLoop() {
+	startTime := time.Now()
-	decryptData := make([]byte, ReadBuffLen+PaddingSize) // 16 bytes for padding
+	t.linkModeWeb = LinkModeTCPPunch
-	gLog.Printf(LvDEBUG, "%d tunnel readloop start", t.id)
+	gotCh := make(chan *underlayTCP, 1)
-	for t.isRuning() {
+	var wg sync.WaitGroup
-		t.conn.SetReadDeadline(time.Now().Add(TunnelIdleTimeout))
+	var success atomic.Int32
-		head, body, err := t.conn.ReadBuffer()
+	if t.config.peerNatType == NATSymmetric { // c2s
-		if err != nil {
+		randPorts := rand.Perm(65532)
-			if t.isRuning() {
+		for i := 0; i < SymmetricHandshakeNum; i++ {
-				gLog.Printf(LvERROR, "%d tunnel read error:%s", t.id, err)
+			wg.Add(1)
-			}
+			go func(port int) {
-			break
+				defer wg.Done()
-		}
+				ul, err := dialTCP(t.config.peerIP, port, t.coneLocalPort, LinkModeTCPPunch)
-		if head.MainType != MsgP2P {
+				if err != nil {
-			continue
+					return
-		}
+				}
-		switch head.SubType {
+				if !success.CompareAndSwap(0, 1) {
-		case MsgTunnelHeartbeat:
+					ul.Close() // only cone side close
-			t.hbTime = time.Now()
+					return
-			t.conn.WriteBytes(MsgP2P, MsgTunnelHeartbeatAck, nil)
+				}
-			gLog.Printf(LvDEBUG, "%d read tunnel heartbeat", t.id)
+				err = ul.WriteMessage(MsgP2P, MsgPunchHandshakeAck, P2PHandshakeReq{ID: t.id})
-		case MsgTunnelHeartbeatAck:
+				if err != nil {
-			t.hbMtx.Lock()
+					ul.Close()
-			t.hbTime = time.Now()
+					return
-			t.hbMtx.Unlock()
+				}
-			gLog.Printf(LvDEBUG, "%d read tunnel heartbeat ack", t.id)
+				_, buff, err := ul.ReadBuffer()
-		case MsgOverlayData:
+				if err != nil {
-			if len(body) < overlayHeaderSize {
+					gLog.Println(LvDEBUG, "c2s ul.ReadBuffer error:", err)
-				continue
+					return
-			}
+				}
-			overlayID := binary.LittleEndian.Uint64(body[:8])
+				req := P2PHandshakeReq{}
-			gLog.Printf(LvDEBUG, "%d tunnel read overlay data %d bodylen=%d", t.id, overlayID, head.DataLen)
+				if err = json.Unmarshal(buff, &req); err != nil {
-			s, ok := t.overlayConns.Load(overlayID)
+					return
-			if !ok {
+				}
-				// debug level, when overlay connection closed, always has some packet not found tunnel
+				if req.ID != t.id {
-				gLog.Printf(LvDEBUG, "%d tunnel not found overlay connection %d", t.id, overlayID)
+					return
-				continue
+				}
-			}
+				gLog.Printf(LvINFO, "handshakeS2C TCP ok. cost %dms", time.Since(startTime)/time.Millisecond)
-			overlayConn, ok := s.(*overlayConn)
+
-			if !ok {
+				gotCh <- ul
-				continue
+				close(gotCh)
-			}
+			}(randPorts[i] + 2)
-			payload := body[overlayHeaderSize:]
+		}
-			var err error
+
-			if overlayConn.appKey != 0 {
+	} else { // s2c
-				payload, _ = decryptBytes(overlayConn.appKeyBytes, decryptData, body[overlayHeaderSize:], int(head.DataLen-uint32(overlayHeaderSize)))
+		for i := 0; i < SymmetricHandshakeNum; i++ {
-			}
+			wg.Add(1)
-			_, err = overlayConn.Write(payload)
+			go func() {
-			if err != nil {
+				defer wg.Done()
-				gLog.Println(LvERROR, "overlay write error:", err)
+				ul, err := dialTCP(t.config.peerIP, t.config.peerConeNatPort, 0, LinkModeTCPPunch)
-			}
+				if err != nil {
-		case MsgRelayData:
+					return
-			gLog.Printf(LvDEBUG, "got relay data datalen=%d", head.DataLen)
+				}
-			if len(body) < 8 {
+
-				continue
+				_, buff, err := ul.ReadBuffer()
-			}
+				if err != nil {
-			tunnelID := binary.LittleEndian.Uint64(body[:8])
+					gLog.Println(LvDEBUG, "s2c ul.ReadBuffer error:", err)
-			t.pn.relay(tunnelID, body[8:])
+					return
-		case MsgRelayHeartbeat:
+				}
-			req := RelayHeartbeat{}
+				req := P2PHandshakeReq{}
-			if err := json.Unmarshal(body, &req); err != nil {
+				if err = json.Unmarshal(buff, &req); err != nil {
-				gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
+					return
-				continue
+				}
-			}
+				if req.ID != t.id {
-			gLog.Printf(LvDEBUG, "got MsgRelayHeartbeat from %d:%d", req.RelayTunnelID, req.AppID)
+					return
-			relayHead := new(bytes.Buffer)
+				}
-			binary.Write(relayHead, binary.LittleEndian, req.RelayTunnelID)
+				err = ul.WriteMessage(MsgP2P, MsgPunchHandshakeAck, P2PHandshakeReq{ID: t.id})
-			msg, _ := newMessage(MsgP2P, MsgRelayHeartbeatAck, &req)
+				if err != nil {
-			msgWithHead := append(relayHead.Bytes(), msg...)
+					ul.Close()
-			t.conn.WriteBytes(MsgP2P, MsgRelayData, msgWithHead)
+					return
-		case MsgRelayHeartbeatAck:
+				}
-			req := RelayHeartbeat{}
+				if success.CompareAndSwap(0, 1) {
-			err := json.Unmarshal(body, &req)
+					gotCh <- ul
-			if err != nil {
+					close(gotCh)
-				gLog.Printf(LvERROR, "wrong RelayHeartbeat:%s", err)
+				}
-				continue
+			}()
-			}
+		}
-			gLog.Printf(LvDEBUG, "got MsgRelayHeartbeatAck to %d", req.AppID)
+	}
-			t.pn.updateAppHeartbeat(req.AppID)
+	select {
-		case MsgOverlayConnectReq:
+	case <-time.After(HandshakeTimeout):
-			req := OverlayConnectReq{}
+		return nil, fmt.Errorf("wait tcp handshake timeout")
-			if err := json.Unmarshal(body, &req); err != nil {
+	case ul := <-gotCh:
-				gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
+		return ul, nil
-				continue
+	}
-			}
+}
-			// app connect only accept token(not relay totp token), avoid someone using the share relay node's token
+
-			if req.Token != t.pn.config.Token {
+func (t *P2PTunnel) connectUnderlayTCP6() (c underlay, err error) {
-				gLog.Println(LvERROR, "Access Denied:", req.Token)
+	gLog.Printf(LvDEBUG, "connectUnderlayTCP6 %s start ", t.config.LogPeerNode())
-				continue
+	defer gLog.Printf(LvDEBUG, "connectUnderlayTCP6 %s end ", t.config.LogPeerNode())
-			}
+	var ul *underlayTCP6
-
+	if t.config.isUnderlayServer == 1 {
-			overlayID := req.ID
+		t.pn.push(t.config.PeerNode, MsgPushUnderlayConnect, nil)
-			gLog.Printf(LvDEBUG, "App:%d overlayID:%d connect %s:%d", req.AppID, overlayID, req.DstIP, req.DstPort)
+		ul, err = listenTCP6(t.coneNatPort, UnderlayConnectTimeout)
-			oConn := overlayConn{
+		if err != nil {
-				tunnel:   t,
+			return nil, fmt.Errorf("listen TCP6 error:%s", err)
-				id:       overlayID,
+		}
-				isClient: false,
+		_, buff, err := ul.ReadBuffer()
-				rtid:     req.RelayTunnelID,
+		if err != nil {
-				appID:    req.AppID,
+			return nil, fmt.Errorf("read start msg error:%s", err)
-				appKey:   GetKey(req.AppID),
+		}
-				running:  true,
+		if buff != nil {
-			}
+			gLog.Println(LvDEBUG, string(buff))
-			if req.Protocol == "udp" {
+		}
-				oConn.connUDP, err = net.DialUDP("udp", nil, &net.UDPAddr{IP: net.ParseIP(req.DstIP), Port: req.DstPort})
+		ul.WriteBytes(MsgP2P, MsgTunnelHandshakeAck, []byte("OpenP2P,hello2"))
-			} else {
+		gLog.Println(LvDEBUG, "TCP6 connection ok")
-				oConn.connTCP, err = net.DialTimeout("tcp", fmt.Sprintf("%s:%d", req.DstIP, req.DstPort), HandshakeTimeout)
+		t.linkModeWeb = LinkModeIPv6
-
+		return ul, nil
-			}
+	}
-			if err != nil {
+
-				gLog.Println(LvERROR, err)
+	//else
-				continue
+	t.pn.read(t.config.PeerNode, MsgPush, MsgPushUnderlayConnect, ReadMsgTimeout)
-			}
+	gLog.Println(LvDEBUG, "TCP6 dial to ", t.config.peerIPv6)
-
+	ul, err = dialTCP6(t.config.peerIPv6, t.config.peerConeNatPort)
-			// calc key bytes for encrypt
+	if err != nil || ul == nil {
-			if oConn.appKey != 0 {
+		return nil, fmt.Errorf("TCP6 dial to %s:%d error:%s", t.config.peerIPv6, t.config.peerConeNatPort, err)
-				encryptKey := make([]byte, AESKeySize)
+	}
-				binary.LittleEndian.PutUint64(encryptKey, oConn.appKey)
+	handshakeBegin := time.Now()
-				binary.LittleEndian.PutUint64(encryptKey[8:], oConn.appKey)
+	ul.WriteBytes(MsgP2P, MsgTunnelHandshake, []byte("OpenP2P,hello"))
-				oConn.appKeyBytes = encryptKey
+	_, buff, errR := ul.ReadBuffer()
-			}
+	if errR != nil {
-
+		return nil, fmt.Errorf("read MsgTunnelHandshake error:%s", errR)
-			t.overlayConns.Store(oConn.id, &oConn)
+	}
-			go oConn.run()
+	if buff != nil {
-		case MsgOverlayDisconnectReq:
+		gLog.Println(LvDEBUG, string(buff))
-			req := OverlayDisconnectReq{}
+	}
-			if err := json.Unmarshal(body, &req); err != nil {
+
-				gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
+	gLog.Println(LvINFO, "rtt=", time.Since(handshakeBegin))
-				continue
+	gLog.Println(LvINFO, "TCP6 connection ok")
-			}
+	t.linkModeWeb = LinkModeIPv6
-			overlayID := req.ID
+	return ul, nil
-			gLog.Printf(LvDEBUG, "%d disconnect overlay connection %d", t.id, overlayID)
+}
-			i, ok := t.overlayConns.Load(overlayID)
+
-			if ok {
+func (t *P2PTunnel) readLoop() {
-				oConn := i.(*overlayConn)
+	decryptData := make([]byte, ReadBuffLen+PaddingSize) // 16 bytes for padding
-				oConn.Close()
+	gLog.Printf(LvDEBUG, "%d tunnel readloop start", t.id)
-			}
+	for t.isRuning() {
-		default:
+		t.conn.SetReadDeadline(time.Now().Add(TunnelHeartbeatTime * 2))
-		}
+		head, body, err := t.conn.ReadBuffer()
-	}
+		if err != nil {
-	t.setRun(false)
+			if t.isRuning() {
-	t.conn.Close()
+				gLog.Printf(LvERROR, "%d tunnel read error:%s", t.id, err)
-	gLog.Printf(LvDEBUG, "%d tunnel readloop end", t.id)
+			}
-}
+			break
-
+		}
-func (t *P2PTunnel) heartbeatLoop() {
+		if head.MainType != MsgP2P {
-	tc := time.NewTicker(TunnelHeartbeatTime)
+			gLog.Printf(LvWARN, "%d head.MainType != MsgP2P", t.id)
-	defer tc.Stop()
+			continue
-	gLog.Printf(LvDEBUG, "%d tunnel heartbeatLoop start", t.id)
+		}
-	defer gLog.Printf(LvDEBUG, "%d tunnel heartbeatLoop end", t.id)
+		// TODO: replace some case implement to functions
-	for t.isRuning() {
+		switch head.SubType {
-		select {
+		case MsgTunnelHeartbeat:
-		case <-tc.C:
+			t.hbMtx.Lock()
-			// tunnel send
+			t.hbTime = time.Now()
-			err := t.conn.WriteBytes(MsgP2P, MsgTunnelHeartbeat, nil)
+			t.hbMtx.Unlock()
-			if err != nil {
+			t.conn.WriteBytes(MsgP2P, MsgTunnelHeartbeatAck, nil)
-				gLog.Printf(LvERROR, "%d write tunnel heartbeat error %s", t.id, err)
+			gLog.Printf(LvDev, "%d read tunnel heartbeat", t.id)
-				t.setRun(false)
+		case MsgTunnelHeartbeatAck:
-				return
+			t.hbMtx.Lock()
-			}
+			t.hbTime = time.Now()
-			gLog.Printf(LvDEBUG, "%d write tunnel heartbeat ok", t.id)
+			t.hbMtx.Unlock()
-		}
+			gLog.Printf(LvDev, "%d read tunnel heartbeat ack", t.id)
-	}
+		case MsgOverlayData:
-}
+			if len(body) < overlayHeaderSize {
-
+				gLog.Printf(LvWARN, "%d len(body) < overlayHeaderSize", t.id)
-func (t *P2PTunnel) listen() error {
+				continue
-	// notify client to connect
+			}
-	rsp := PushConnectRsp{
+			overlayID := binary.LittleEndian.Uint64(body[:8])
-		Error:   0,
+			gLog.Printf(LvDev, "%d tunnel read overlay data %d bodylen=%d", t.id, overlayID, head.DataLen)
-		Detail:  "connect ok",
+			s, ok := t.overlayConns.Load(overlayID)
-		To:      t.config.PeerNode,
+			if !ok {
-		From:    t.pn.config.Node,
+				// debug level, when overlay connection closed, always has some packet not found tunnel
-		NatType: t.pn.config.natType,
+				gLog.Printf(LvDEBUG, "%d tunnel not found overlay connection %d", t.id, overlayID)
-		HasIPv4: t.pn.config.hasIPv4,
+				continue
-		// IPv6:            t.pn.config.IPv6,
+			}
-		HasUPNPorNATPMP: t.pn.config.hasUPNPorNATPMP,
+			overlayConn, ok := s.(*overlayConn)
-		FromIP:          t.pn.config.publicIP,
+			if !ok {
-		ConeNatPort:     t.coneNatPort,
+				continue
-		ID:              t.id,
+			}
-		PunchTs:         uint64(time.Now().UnixNano() + int64(PunchTsDelay) - t.pn.dt),
+			payload := body[overlayHeaderSize:]
-		Version:         OpenP2PVersion,
+			var err error
-	}
+			if overlayConn.appKey != 0 {
-	t.punchTs = rsp.PunchTs
+				payload, _ = decryptBytes(overlayConn.appKeyBytes, decryptData, body[overlayHeaderSize:], int(head.DataLen-uint32(overlayHeaderSize)))
-	// only private node set ipv6
+			}
-	if t.config.fromToken == t.pn.config.Token {
+			_, err = overlayConn.Write(payload)
-		rsp.IPv6 = gConf.IPv6()
+			if err != nil {
-	}
+				gLog.Println(LvERROR, "overlay write error:", err)
-
+			}
-	t.pn.push(t.config.PeerNode, MsgPushConnectRsp, rsp)
+		case MsgNodeData:
-	gLog.Printf(LvDEBUG, "p2ptunnel wait for connecting")
+			t.handleNodeData(head, body, false)
-	t.tunnelServer = true
+		case MsgRelayNodeData:
-	return t.start()
+			t.handleNodeData(head, body, true)
-}
+		case MsgRelayData:
-
+			if len(body) < 8 {
-func (t *P2PTunnel) closeOverlayConns(appID uint64) {
+				continue
-	t.overlayConns.Range(func(_, i interface{}) bool {
+			}
-		oConn := i.(*overlayConn)
+			tunnelID := binary.LittleEndian.Uint64(body[:8])
-		if oConn.appID == appID {
+			gLog.Printf(LvDev, "relay data to %d, len=%d", tunnelID, head.DataLen-RelayHeaderSize)
-			oConn.Close()
+			if err := t.pn.relay(tunnelID, body[RelayHeaderSize:]); err != nil {
-		}
+				gLog.Printf(LvERROR, "%s:%d relay to %d len=%d error:%s", t.config.LogPeerNode(), t.id, tunnelID, len(body), ErrRelayTunnelNotFound)
-		return true
+			}
-	})
+		case MsgRelayHeartbeat:
-}
+			req := RelayHeartbeat{}
 			if err := json.Unmarshal(body, &req); err != nil {
 				gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
 				continue
 			}
 			// TODO: debug relay heartbeat
 			gLog.Printf(LvDEBUG, "read MsgRelayHeartbeat from rtid:%d,appid:%d", req.RelayTunnelID, req.AppID)
 			// update app hbtime
 			t.pn.updateAppHeartbeat(req.AppID)
 			req.From = gConf.Network.Node
 			t.WriteMessage(req.RelayTunnelID, MsgP2P, MsgRelayHeartbeatAck, &req)
 		case MsgRelayHeartbeatAck:
 			req := RelayHeartbeat{}
 			err := json.Unmarshal(body, &req)
 			if err != nil {
 				gLog.Printf(LvERROR, "wrong RelayHeartbeat:%s", err)
 				continue
 			}
 			// TODO: debug relay heartbeat
 			gLog.Printf(LvDEBUG, "read MsgRelayHeartbeatAck to appid:%d", req.AppID)
 			t.pn.updateAppHeartbeat(req.AppID)
 		case MsgOverlayConnectReq:
 			req := OverlayConnectReq{}
 			if err := json.Unmarshal(body, &req); err != nil {
 				gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
 				continue
 			}
 			// app connect only accept token(not relay totp token), avoid someone using the share relay node's token
 			if req.Token != gConf.Network.Token {
 				gLog.Println(LvERROR, "Access Denied:", req.Token)
 				continue
 			}
 			overlayID := req.ID
 			gLog.Printf(LvDEBUG, "App:%d overlayID:%d connect %s:%d", req.AppID, overlayID, req.DstIP, req.DstPort)
 			oConn := overlayConn{
 				tunnel:   t,
 				id:       overlayID,
 				isClient: false,
 				rtid:     req.RelayTunnelID,
 				appID:    req.AppID,
 				appKey:   GetKey(req.AppID),
 				running:  true,
 			}
 			if req.Protocol == "udp" {
 				oConn.connUDP, err = net.DialUDP("udp", nil, &net.UDPAddr{IP: net.ParseIP(req.DstIP), Port: req.DstPort})
 			} else {
 				oConn.connTCP, err = net.DialTimeout("tcp", fmt.Sprintf("%s:%d", req.DstIP, req.DstPort), ReadMsgTimeout)
 			}
 			if err != nil {
 				gLog.Println(LvERROR, err)
 				continue
 			}
 			// calc key bytes for encrypt
 			if oConn.appKey != 0 {
 				encryptKey := make([]byte, AESKeySize)
 				binary.LittleEndian.PutUint64(encryptKey, oConn.appKey)
 				binary.LittleEndian.PutUint64(encryptKey[8:], oConn.appKey)
 				oConn.appKeyBytes = encryptKey
 			}
 			t.overlayConns.Store(oConn.id, &oConn)
 			go oConn.run()
 		case MsgOverlayDisconnectReq:
 			req := OverlayDisconnectReq{}
 			if err := json.Unmarshal(body, &req); err != nil {
 				gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
 				continue
 			}
 			overlayID := req.ID
 			gLog.Printf(LvDEBUG, "%d disconnect overlay connection %d", t.id, overlayID)
 			i, ok := t.overlayConns.Load(overlayID)
 			if ok {
 				oConn := i.(*overlayConn)
 				oConn.Close()
 			}
 		default:
 		}
 	}
 	t.close()
 	gLog.Printf(LvDEBUG, "%d tunnel readloop end", t.id)
 }
 func (t *P2PTunnel) writeLoop() {
 	t.hbMtx.Lock()
 	t.hbTime = time.Now() // init
 	t.hbMtx.Unlock()
 	tc := time.NewTicker(TunnelHeartbeatTime)
 	defer tc.Stop()
 	gLog.Printf(LvDEBUG, "%s:%d tunnel writeLoop start", t.config.LogPeerNode(), t.id)
 	defer gLog.Printf(LvDEBUG, "%s:%d tunnel writeLoop end", t.config.LogPeerNode(), t.id)
 	for t.isRuning() {
 		select {
 		case buff := <-t.writeDataSmall:
 			t.conn.WriteBuffer(buff)
 			// gLog.Printf(LvDEBUG, "write icmp %d", time.Now().Unix())
 		default:
 			select {
 			case buff := <-t.writeDataSmall:
 				t.conn.WriteBuffer(buff)
 				// gLog.Printf(LvDEBUG, "write icmp %d", time.Now().Unix())
 			case buff := <-t.writeData:
 				t.conn.WriteBuffer(buff)
 			case <-tc.C:
 				// tunnel send
 				err := t.conn.WriteBytes(MsgP2P, MsgTunnelHeartbeat, nil)
 				if err != nil {
 					gLog.Printf(LvERROR, "%d write tunnel heartbeat error %s", t.id, err)
 					t.close()
 					return
 				}
 				gLog.Printf(LvDev, "%d write tunnel heartbeat ok", t.id)
 			}
 		}
 	}
 }
 func (t *P2PTunnel) listen() error {
 	// notify client to connect
 	rsp := PushConnectRsp{
 		Error:   0,
 		Detail:  "connect ok",
 		To:      t.config.PeerNode,
 		From:    gConf.Network.Node,
 		NatType: gConf.Network.natType,
 		HasIPv4: gConf.Network.hasIPv4,
 		// IPv6:            gConf.Network.IPv6,
 		HasUPNPorNATPMP: gConf.Network.hasUPNPorNATPMP,
 		FromIP:          gConf.Network.publicIP,
 		ConeNatPort:     t.coneNatPort,
 		ID:              t.id,
 		PunchTs:         uint64(time.Now().UnixNano() + int64(PunchTsDelay) - t.pn.dt),
 		Version:         OpenP2PVersion,
 	}
 	t.punchTs = rsp.PunchTs
 	// only private node set ipv6
 	if t.config.fromToken == gConf.Network.Token {
 		rsp.IPv6 = gConf.IPv6()
 	}
 	t.pn.push(t.config.PeerNode, MsgPushConnectRsp, rsp)
 	gLog.Printf(LvDEBUG, "p2ptunnel wait for connecting")
 	t.tunnelServer = true
 	return t.start()
 }
 func (t *P2PTunnel) closeOverlayConns(appID uint64) {
 	t.overlayConns.Range(func(_, i interface{}) bool {
 		oConn := i.(*overlayConn)
 		if oConn.appID == appID {
 			oConn.Close()
 		}
 		return true
 	})
 }
 func (t *P2PTunnel) handleNodeData(head *openP2PHeader, body []byte, isRelay bool) {
 	gLog.Printf(LvDev, "%d tunnel read node data bodylen=%d, relay=%t", t.id, head.DataLen, isRelay)
 	ch := t.pn.nodeData
 	// if body[9] == 1 { // TODO: deal relay
 	// 	ch = t.pn.nodeDataSmall
 	// 	gLog.Printf(LvDEBUG, "read icmp %d", time.Now().Unix())
 	// }
 	if isRelay {
 		fromPeerID := binary.LittleEndian.Uint64(body[:8])
 		ch <- &NodeData{fromPeerID, body[8:]} // TODO: cache peerNodeID; encrypt/decrypt
 	} else {
 		ch <- &NodeData{NodeNameToID(t.config.PeerNode), body} // TODO: cache peerNodeID; encrypt/decrypt
 	}
 }
 func (t *P2PTunnel) asyncWriteNodeData(mainType, subType uint16, data []byte) {
 	writeBytes := append(encodeHeader(mainType, subType, uint32(len(data))), data...)
 	// if len(data) < 192 {
 	if data[9] == 1 { // icmp
 		select {
 		case t.writeDataSmall <- writeBytes:
 			// gLog.Printf(LvWARN, "%s:%d t.writeDataSmall write %d", t.config.PeerNode, t.id, len(t.writeDataSmall))
 		default:
 			gLog.Printf(LvWARN, "%s:%d t.writeDataSmall is full, drop it", t.config.LogPeerNode(), t.id)
 		}
 	} else {
 		select {
 		case t.writeData <- writeBytes:
 		default:
 			gLog.Printf(LvWARN, "%s:%d t.writeData is full, drop it", t.config.LogPeerNode(), t.id)
 		}
 	}
 }
 func (t *P2PTunnel) WriteMessage(rtid uint64, mainType uint16, subType uint16, req interface{}) error {
 	if rtid == 0 {
 		return t.conn.WriteMessage(mainType, subType, &req)
 	}
 	relayHead := new(bytes.Buffer)
 	binary.Write(relayHead, binary.LittleEndian, rtid)
 	msg, _ := newMessage(mainType, subType, &req)
 	msgWithHead := append(relayHead.Bytes(), msg...)
 	return t.conn.WriteBytes(mainType, MsgRelayData, msgWithHead)
 }
@@ -0,0 +1,24 @@
 package openp2p
 import (
 	"fmt"
 	"testing"
 )
 func TestSelectPriority(t *testing.T) {
 	writeData := make(chan []byte, WriteDataChanSize)
 	writeDataSmall := make(chan []byte, WriteDataChanSize/30)
 	for i := 0; i < 100; i++ {
 		writeData <- []byte("data")
 		writeDataSmall <- []byte("small data")
 	}
 	for i := 0; i < 100; i++ {
 		select {
 		case buff := <-writeDataSmall:
 			fmt.Printf("got small data:%s\n", string(buff))
 		case buff := <-writeData:
 			fmt.Printf("got data:%s\n", string(buff))
 		}
 	}
 }
@@ -0,0 +1,87 @@
 package openp2p
 import (
 	"fmt"
 	"net"
 	"os"
 	"time"
 	"golang.org/x/net/icmp"
 	"golang.org/x/net/ipv4"
 )
 // 定义ICMP回显请求和应答的结构
 type ICMPMessage struct {
 	Type     uint8
 	Code     uint8
 	Checksum uint16
 	Ident    uint16
 	Seq      uint16
 	Data     []byte
 }
 // Ping sends an ICMP Echo request to the specified host and returns the response time.
 func Ping(host string) (time.Duration, error) {
 	// Resolve the IP address of the host
 	ipAddr, err := net.ResolveIPAddr("ip4", host)
 	if err != nil {
 		return 0, fmt.Errorf("failed to resolve host: %v", err)
 	}
 	// Create an ICMP listener
 	conn, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
 	if err != nil {
 		return 0, fmt.Errorf("failed to create ICMP connection: %v", err)
 	}
 	defer conn.Close()
 	// Create an ICMP Echo request message
 	message := icmp.Message{
 		Type: ipv4.ICMPTypeEcho,
 		Code: 0,
 		Body: &icmp.Echo{
 			ID:   os.Getpid() & 0xffff,
 			Seq:  1,
 			Data: []byte("HELLO-R-U-THERE"),
 		},
 	}
 	// Marshal the message into binary form
 	messageBytes, err := message.Marshal(nil)
 	if err != nil {
 		return 0, fmt.Errorf("failed to marshal ICMP message: %v", err)
 	}
 	// Send the ICMP Echo request
 	start := time.Now()
 	if _, err := conn.WriteTo(messageBytes, ipAddr); err != nil {
 		return 0, fmt.Errorf("failed to send ICMP request: %v", err)
 	}
 	// Set a deadline for the response
 	err = conn.SetReadDeadline(time.Now().Add(3 * time.Second))
 	if err != nil {
 		return 0, fmt.Errorf("failed to set read deadline: %v", err)
 	}
 	// Read the ICMP response
 	response := make([]byte, 1500)
 	n, _, err := conn.ReadFrom(response)
 	if err != nil {
 		return 0, fmt.Errorf("failed to read ICMP response: %v", err)
 	}
 	// Parse the ICMP response message
 	parsedMessage, err := icmp.ParseMessage(ipv4.ICMPTypeEchoReply.Protocol(), response[:n])
 	if err != nil {
 		return 0, fmt.Errorf("failed to parse ICMP response: %v", err)
 	}
 	// Check if the response is an Echo reply
 	if parsedMessage.Type == ipv4.ICMPTypeEchoReply {
 		duration := time.Since(start)
 		return duration, nil
 	} else {
 		return 0, fmt.Errorf("unexpected ICMP message: %+v", parsedMessage)
 	}
 }
@@ -10,11 +10,14 @@ import (
 	"time"
 )
-const OpenP2PVersion = "3.10.9"
+const OpenP2PVersion = "3.21.8"
 const ProductName string = "openp2p"
 const LeastSupportVersion = "3.0.0"
 const SyncServerTimeVersion = "3.9.0"
 const SymmetricSimultaneouslySendVersion = "3.10.7"
 const PublicIPVersion = "3.11.2"
 const SupportIntranetVersion = "3.14.5"
 const SupportDualTunnelVersion = "3.15.5"
 const (
 	IfconfigPort1 = 27180
@@ -39,6 +42,8 @@ type PushHeader struct {
 var PushHeaderSize = binary.Size(PushHeader{})
 const RelayHeaderSize = 8
 type overlayHeader struct {
 	id uint64
 }
@@ -79,26 +84,31 @@ const (
 	MsgRelay     = 5
 	MsgReport    = 6
 	MsgQuery     = 7
 	MsgSDWAN     = 8
 )
 // TODO: seperate node push and web push.
 const (
-	MsgPushRsp               = 0
+	MsgPushRsp                  = 0
-	MsgPushConnectReq        = 1
+	MsgPushConnectReq           = 1
-	MsgPushConnectRsp        = 2
+	MsgPushConnectRsp           = 2
-	MsgPushHandshakeStart    = 3
+	MsgPushHandshakeStart       = 3
-	MsgPushAddRelayTunnelReq = 4
+	MsgPushAddRelayTunnelReq    = 4
-	MsgPushAddRelayTunnelRsp = 5
+	MsgPushAddRelayTunnelRsp    = 5
-	MsgPushUpdate            = 6
+	MsgPushUpdate               = 6
-	MsgPushReportApps        = 7
+	MsgPushReportApps           = 7
-	MsgPushUnderlayConnect   = 8
+	MsgPushUnderlayConnect      = 8
-	MsgPushEditApp           = 9
+	MsgPushEditApp              = 9
-	MsgPushSwitchApp         = 10
+	MsgPushSwitchApp            = 10
-	MsgPushRestart           = 11
+	MsgPushRestart              = 11
-	MsgPushEditNode          = 12
+	MsgPushEditNode             = 12
-	MsgPushAPPKey            = 13
+	MsgPushAPPKey               = 13
-	MsgPushReportLog         = 14
+	MsgPushReportLog            = 14
-	MsgPushDstNodeOnline     = 15
+	MsgPushDstNodeOnline        = 15
 	MsgPushReportGoroutine      = 16
 	MsgPushReportMemApps        = 17
 	MsgPushServerSideSaveMemApp = 18
 	MsgPushCheckRemoteService   = 19
 )
 // MsgP2P sub type message
@@ -116,6 +126,8 @@ const (
 	MsgRelayData
 	MsgRelayHeartbeat
 	MsgRelayHeartbeatAck
 	MsgNodeData
 	MsgRelayNodeData
 )
 // MsgRelay sub type message
@@ -131,30 +143,40 @@ const (
 	MsgReportConnect
 	MsgReportApps
 	MsgReportLog
 	MsgReportMemApps
 	MsgReportResponse
 )
 const (
-	ReadBuffLen           = 4096             // for UDP maybe not enough
+	ReadBuffLen               = 4096 // for UDP maybe not enough
-	NetworkHeartbeatTime  = time.Second * 30 // TODO: server no response hb, save flow
+	NetworkHeartbeatTime      = time.Second * 30
-	TunnelHeartbeatTime   = time.Second * 10 // some nat udp session expired time less than 15s. change to 10s
+	TunnelHeartbeatTime       = time.Second * 10 // some nat udp session expired time less than 15s. change to 10s
-	TunnelIdleTimeout     = time.Minute
+	UnderlayTCPKeepalive      = time.Second * 5
-	SymmetricHandshakeNum = 800 // 0.992379
+	UnderlayTCPConnectTimeout = time.Second * 5
 	TunnelIdleTimeout         = time.Minute
 	SymmetricHandshakeNum     = 800 // 0.992379
 	// SymmetricHandshakeNum        = 1000 // 0.999510
 	SymmetricHandshakeInterval = time.Millisecond
-	HandshakeTimeout           = time.Second * 10
+	HandshakeTimeout           = time.Second * 7
-	PeerAddRelayTimeount       = time.Second * 30 // peer need times
+	PunchTsDelay               = time.Second * 3
 	PeerAddRelayTimeount       = time.Second * 30 // peer need times. S2C\TCP\TCP Punch\UDP Punch
 	CheckActiveTimeout         = time.Second * 5
 	ReadMsgTimeout             = time.Second * 5
 	PaddingSize                = 16
 	AESKeySize                 = 16
 	MaxRetry                   = 10
-	Cone2ConePunchMaxRetry     = 1
+	Cone2ConeTCPPunchMaxRetry  = 1
 	Cone2ConeUDPPunchMaxRetry  = 1
 	PublicIPEchoTimeout        = time.Second * 1
 	NatTestTimeout             = time.Second * 5
 	UDPReadTimeout             = time.Second * 5
 	ClientAPITimeout           = time.Second * 10
 	UnderlayConnectTimeout     = time.Second * 10
 	MaxDirectTry               = 3
-	PunchTsDelay               = time.Second * 3
+
 	// sdwan
 	ReadTunBuffSize = 1600
 	ReadTunBuffNum  = 10
 )
 // NATNone has public ip
@@ -176,8 +198,9 @@ const (
 const (
 	LinkModeUDPPunch = "udppunch"
 	LinkModeTCPPunch = "tcppunch"
-	LinkModeIPv4     = "ipv4" // for web
+	LinkModeIPv4     = "ipv4"     // for web
-	LinkModeIPv6     = "ipv6" // for web
+	LinkModeIntranet = "intranet" // for web
 	LinkModeIPv6     = "ipv6"     // for web
 	LinkModeTCP6     = "tcp6"
 	LinkModeTCP4     = "tcp4"
 	LinkModeUDP6     = "udp6"
@@ -189,6 +212,11 @@ const (
 	MsgQueryPeerInfoRsp
 )
 const (
 	MsgSDWANInfoReq = iota
 	MsgSDWANInfoRsp
 )
 func newMessage(mainType uint16, subType uint16, packet interface{}) ([]byte, error) {
 	data, err := json.Marshal(packet)
 	if err != nil {
@@ -209,7 +237,7 @@ func newMessage(mainType uint16, subType uint16, packet interface{}) ([]byte, er
 	return writeBytes, nil
 }
-func nodeNameToID(name string) uint64 {
+func NodeNameToID(name string) uint64 {
 	return crc64.Checksum([]byte(name), crc64.MakeTable(crc64.ISO))
 }
@@ -227,7 +255,8 @@ type PushConnectReq struct {
 	ID               uint64 `json:"id,omitempty"`
 	AppKey           uint64 `json:"appKey,omitempty"` // for underlay tcp
 	LinkMode         string `json:"linkMode,omitempty"`
-	IsUnderlayServer int    `json:"isServer,omitempty"` // Requset spec peer is server
+	IsUnderlayServer int    `json:"isServer,omitempty"`         // Requset spec peer is server
 	UnderlayProtocol string `json:"underlayProtocol,omitempty"` // quic or kcp, default quic
 }
 type PushDstNodeOnline struct {
 	Node string `json:"node,omitempty"`
@@ -253,12 +282,13 @@ type PushRsp struct {
 }
 type LoginRsp struct {
-	Error  int    `json:"error,omitempty"`
+	Error         int    `json:"error,omitempty"`
-	Detail string `json:"detail,omitempty"`
+	Detail        string `json:"detail,omitempty"`
-	User   string `json:"user,omitempty"`
+	User          string `json:"user,omitempty"`
-	Node   string `json:"node,omitempty"`
+	Node          string `json:"node,omitempty"`
-	Token  uint64 `json:"token,omitempty"`
+	Token         uint64 `json:"token,omitempty"`
-	Ts     int64  `json:"ts,omitempty"`
+	Ts            int64  `json:"ts,omitempty"`
 	LoginMaxDelay int    `json:"loginMaxDelay,omitempty"` // seconds
 }
 type NatDetectReq struct {
@@ -303,11 +333,13 @@ type RelayNodeRsp struct {
 }
 type AddRelayTunnelReq struct {
-	From       string `json:"from,omitempty"`
+	From          string `json:"from,omitempty"`
-	RelayName  string `json:"relayName,omitempty"`
+	RelayName     string `json:"relayName,omitempty"`
-	RelayToken uint64 `json:"relayToken,omitempty"`
+	RelayTunnelID uint64 `json:"relayTunnelID,omitempty"`
-	AppID      uint64 `json:"appID,omitempty"`  // deprecated
+	RelayToken    uint64 `json:"relayToken,omitempty"`
-	AppKey     uint64 `json:"appKey,omitempty"` // deprecated
+	RelayMode     string `json:"relayMode,omitempty"`
 	AppID         uint64 `json:"appID,omitempty"`  // deprecated
 	AppKey        uint64 `json:"appKey,omitempty"` // deprecated
 }
 type APPKeySync struct {
@@ -316,6 +348,7 @@ type APPKeySync struct {
 }
 type RelayHeartbeat struct {
 	From          string `json:"from,omitempty"`
 	RelayTunnelID uint64 `json:"relayTunnelID,omitempty"`
 	AppID         uint64 `json:"appID,omitempty"`
 }
@@ -351,6 +384,7 @@ type AppInfo struct {
 	AppName        string `json:"appName,omitempty"`
 	Error          string `json:"error,omitempty"`
 	Protocol       string `json:"protocol,omitempty"`
 	PunchPriority  int    `json:"punchPriority,omitempty"`
 	Whitelist      string `json:"whitelist,omitempty"`
 	SrcPort        int    `json:"srcPort,omitempty"`
 	Protocol0      string `json:"protocol0,omitempty"`
@@ -364,6 +398,7 @@ type AppInfo struct {
 	PeerIP         string `json:"peerIP,omitempty"`
 	ShareBandwidth int    `json:"shareBandWidth,omitempty"`
 	RelayNode      string `json:"relayNode,omitempty"`
 	SpecRelayNode  string `json:"specRelayNode,omitempty"`
 	RelayMode      string `json:"relayMode,omitempty"`
 	LinkMode       string `json:"linkMode,omitempty"`
 	Version        string `json:"version,omitempty"`
@@ -433,15 +468,55 @@ type QueryPeerInfoReq struct {
 	PeerNode string `json:"peerNode,omitempty"`
 }
 type QueryPeerInfoRsp struct {
 	PeerNode        string `json:"peerNode,omitempty"`
 	Online          int    `json:"online,omitempty"`
 	Version         string `json:"version,omitempty"`
 	NatType         int    `json:"natType,omitempty"`
 	IPv4            string `json:"IPv4,omitempty"`
 	LanIP           string `json:"lanIP,omitempty"`
 	HasIPv4         int    `json:"hasIPv4,omitempty"` // has public ipv4
 	IPv6            string `json:"IPv6,omitempty"`    // if public relay node, ipv6 not set
 	HasUPNPorNATPMP int    `json:"hasUPNPorNATPMP,omitempty"`
 }
 type SDWANNode struct {
 	Name     string `json:"name,omitempty"`
 	IP       string `json:"ip,omitempty"`
 	Resource string `json:"resource,omitempty"`
 	Enable   int32  `json:"enable,omitempty"`
 }
 type SDWANInfo struct {
 	ID            uint64 `json:"id,omitempty"`
 	Name          string `json:"name,omitempty"`
 	Gateway       string `json:"gateway,omitempty"`
 	Mode          string `json:"mode,omitempty"` // default: fullmesh; central
 	CentralNode   string `json:"centralNode,omitempty"`
 	ForceRelay    int32  `json:"forceRelay,omitempty"`
 	PunchPriority int32  `json:"punchPriority,omitempty"`
 	Enable        int32  `json:"enable,omitempty"`
 	Nodes         []*SDWANNode
 }
 const (
 	SDWANModeFullmesh = "fullmesh"
 	SDWANModeCentral  = "central"
 )
 type ServerSideSaveMemApp struct {
 	From          string `json:"from,omitempty"`
 	Node          string `json:"node,omitempty"`          // for server side findtunnel, maybe relayNode
 	TunnelID      uint64 `json:"tunnelID,omitempty"`      // save in app.tunnel or app.relayTunnel
 	RelayTunnelID uint64 `json:"relayTunnelID,omitempty"` // rtid, if not 0 relay
 	RelayMode     string `json:"relayMode,omitempty"`
 	AppID         uint64 `json:"appID,omitempty"`
 }
 type CheckRemoteService struct {
 	Host string `json:"host,omitempty"`
 	Port uint32 `json:"port,omitempty"`
 }
 const rootCA = `-----BEGIN CERTIFICATE-----
 MIIDhTCCAm0CFHm0cd8dnGCbUW/OcS56jf0gvRk7MA0GCSqGSIb3DQEBCwUAMH4x
 CzAJBgNVBAYTAkNOMQswCQYDVQQIDAJHRDETMBEGA1UECgwKb3BlbnAycC5jbjET
@@ -0,0 +1,323 @@
 package openp2p
 import (
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
 	"net"
 	"runtime"
 	"strings"
 	"sync"
 	"time"
 )
 type PacketHeader struct {
 	version int
 	// src     uint32
 	// prot    uint8
 	protocol byte
 	dst      uint32
 	port     uint16
 }
 func parseHeader(b []byte, h *PacketHeader) error {
 	if len(b) < 20 {
 		return fmt.Errorf("small packet")
 	}
 	h.version = int(b[0] >> 4)
 	h.protocol = byte(b[9])
 	if h.version == 4 {
 		h.dst = binary.BigEndian.Uint32(b[16:20])
 	} else if h.version != 6 {
 		return fmt.Errorf("unknown version in ip header:%d", h.version)
 	}
 	if h.protocol == 6 || h.protocol == 17 { // TCP or UDP
 		h.port = binary.BigEndian.Uint16(b[22:24])
 	}
 	return nil
 }
 type sdwanNode struct {
 	name string
 	id   uint64
 }
 type p2pSDWAN struct {
 	nodeName      string
 	tun           *optun
 	sysRoute      sync.Map // ip:sdwanNode
 	subnet        *net.IPNet
 	gateway       net.IP
 	virtualIP     *net.IPNet
 	internalRoute *IPTree
 }
 func (s *p2pSDWAN) reset() {
 	gLog.Println(LvINFO, "reset sdwan when network disconnected")
 	// clear sysroute
 	delRoutesByGateway(s.gateway.String())
 	// clear internel route
 	s.internalRoute = NewIPTree("")
 	// clear p2papp
 	for _, node := range gConf.getAddNodes() {
 		gConf.delete(AppConfig{SrcPort: 0, PeerNode: node.Name})
 	}
 	gConf.resetSDWAN()
 }
 func (s *p2pSDWAN) init(name string) error {
 	if gConf.getSDWAN().Gateway == "" {
 		gLog.Println(LvDEBUG, "sdwan init: not in sdwan clear all ")
 	}
 	if s.internalRoute == nil {
 		s.internalRoute = NewIPTree("")
 	}
 	s.nodeName = name
 	if gw, sn, err := net.ParseCIDR(gConf.getSDWAN().Gateway); err == nil { // preserve old gateway
 		s.gateway = gw
 		s.subnet = sn
 	}
 	for _, node := range gConf.getDelNodes() {
 		gLog.Println(LvDEBUG, "sdwan init: deal deleted node: ", node.Name)
 		gLog.Printf(LvDEBUG, "sdwan init: delRoute: %s, %s ", node.IP, s.gateway.String())
 		delRoute(node.IP, s.gateway.String())
 		s.internalRoute.Del(node.IP, node.IP)
 		ipNum, _ := inetAtoN(node.IP)
 		s.sysRoute.Delete(ipNum)
 		gConf.delete(AppConfig{SrcPort: 0, PeerNode: node.Name})
 		GNetwork.DeleteApp(AppConfig{SrcPort: 0, PeerNode: node.Name})
 		arr := strings.Split(node.Resource, ",")
 		for _, r := range arr {
 			_, ipnet, err := net.ParseCIDR(r)
 			if err != nil {
 				// fmt.Println("Error parsing CIDR:", err)
 				continue
 			}
 			if ipnet.Contains(net.ParseIP(gConf.Network.localIP)) { // local ip and resource in the same lan
 				continue
 			}
 			minIP := ipnet.IP
 			maxIP := make(net.IP, len(minIP))
 			copy(maxIP, minIP)
 			for i := range minIP {
 				maxIP[i] = minIP[i] | ^ipnet.Mask[i]
 			}
 			s.internalRoute.Del(minIP.String(), maxIP.String())
 			delRoute(ipnet.String(), s.gateway.String())
 			gLog.Printf(LvDEBUG, "sdwan init: resource delRoute: %s, %s ", ipnet.String(), s.gateway.String())
 		}
 	}
 	for _, node := range gConf.getAddNodes() {
 		gLog.Println(LvDEBUG, "sdwan init: deal add node: ", node.Name)
 		ipNet := &net.IPNet{
 			IP:   net.ParseIP(node.IP),
 			Mask: s.subnet.Mask,
 		}
 		if node.Name == s.nodeName {
 			s.virtualIP = ipNet
 			gLog.Println(LvINFO, "sdwan init: start tun ", ipNet.String())
 			err := s.StartTun()
 			if err != nil {
 				gLog.Println(LvERROR, "sdwan init: start tun error:", err)
 				return err
 			}
 			gLog.Println(LvINFO, "sdwan init: start tun ok")
 			allowTunForward()
 			gLog.Printf(LvDEBUG, "sdwan init: addRoute %s %s %s", s.subnet.String(), s.gateway.String(), s.tun.tunName)
 			addRoute(s.subnet.String(), s.gateway.String(), s.tun.tunName)
 			// addRoute("255.255.255.255/32", s.gateway.String(), s.tun.tunName) // for broadcast
 			// addRoute("224.0.0.0/4", s.gateway.String(), s.tun.tunName)        // for multicast
 			initSNATRule(s.subnet.String()) // for network resource
 			continue
 		}
 		ip, err := inetAtoN(ipNet.String())
 		if err != nil {
 			return err
 		}
 		s.sysRoute.Store(ip, &sdwanNode{name: node.Name, id: NodeNameToID(node.Name)})
 		s.internalRoute.AddIntIP(ip, ip, &sdwanNode{name: node.Name, id: NodeNameToID(node.Name)})
 	}
 	for _, node := range gConf.getAddNodes() {
 		if node.Name == s.nodeName { // not deal resource itself
 			continue
 		}
 		if len(node.Resource) > 0 {
 			gLog.Printf(LvINFO, "sdwan init: deal add node: %s resource: %s", node.Name, node.Resource)
 			arr := strings.Split(node.Resource, ",")
 			for _, r := range arr {
 				// add internal route
 				_, ipnet, err := net.ParseCIDR(r)
 				if err != nil {
 					fmt.Println("sdwan init: Error parsing CIDR:", err)
 					continue
 				}
 				if ipnet.Contains(net.ParseIP(gConf.Network.localIP)) { // local ip and resource in the same lan
 					gLog.Printf(LvDEBUG, "sdwan init: local ip %s in this resource %s, ignore", gConf.Network.localIP, ipnet.IP.String())
 					continue
 				}
 				// local net could access this single ip
 				if ipnet.Mask[0] == 255 && ipnet.Mask[1] == 255 && ipnet.Mask[2] == 255 && ipnet.Mask[3] == 255 {
 					gLog.Printf(LvDEBUG, "sdwan init: ping %s start", ipnet.IP.String())
 					if _, err := Ping(ipnet.IP.String()); err == nil {
 						gLog.Printf(LvDEBUG, "sdwan init: ping %s ok, ignore this resource", ipnet.IP.String())
 						continue
 					}
 					gLog.Printf(LvDEBUG, "sdwan init: ping %s failed", ipnet.IP.String())
 				}
 				minIP := ipnet.IP
 				maxIP := make(net.IP, len(minIP))
 				copy(maxIP, minIP)
 				for i := range minIP {
 					maxIP[i] = minIP[i] | ^ipnet.Mask[i]
 				}
 				s.internalRoute.Add(minIP.String(), maxIP.String(), &sdwanNode{name: node.Name, id: NodeNameToID(node.Name)})
 				// add sys route
 				gLog.Printf(LvDEBUG, "sdwan init: addRoute %s %s %s", ipnet.String(), s.gateway.String(), s.tun.tunName)
 				addRoute(ipnet.String(), s.gateway.String(), s.tun.tunName)
 			}
 		}
 	}
 	gConf.retryAllMemApp()
 	gLog.Printf(LvINFO, "sdwan init ok")
 	return nil
 }
 func (s *p2pSDWAN) run() {
 	s.sysRoute.Range(func(key, value interface{}) bool {
 		node := value.(*sdwanNode)
 		GNetwork.ConnectNode(node.name)
 		return true
 	})
 }
 func (s *p2pSDWAN) readNodeLoop() {
 	gLog.Printf(LvDEBUG, "sdwan readNodeLoop start")
 	defer gLog.Printf(LvDEBUG, "sdwan readNodeLoop end")
 	writeBuff := make([][]byte, 1)
 	for {
 		nd := GNetwork.ReadNode(time.Second * 10) // TODO: read multi packet
 		if nd == nil {
 			gLog.Printf(LvDev, "waiting for node data")
 			continue
 		}
 		head := PacketHeader{}
 		parseHeader(nd.Data, &head)
 		gLog.Printf(LvDev, "write tun dst ip=%s,len=%d", net.IP{byte(head.dst >> 24), byte(head.dst >> 16), byte(head.dst >> 8), byte(head.dst)}.String(), len(nd.Data))
 		if PIHeaderSize == 0 {
 			writeBuff[0] = nd.Data
 		} else {
 			writeBuff[0] = make([]byte, PIHeaderSize+len(nd.Data))
 			copy(writeBuff[0][PIHeaderSize:], nd.Data)
 		}
 		len, err := s.tun.Write(writeBuff, PIHeaderSize)
 		if err != nil {
 			gLog.Printf(LvDEBUG, "write tun dst ip=%s,len=%d,error:%s", net.IP{byte(head.dst >> 24), byte(head.dst >> 16), byte(head.dst >> 8), byte(head.dst)}.String(), len, err)
 		}
 	}
 }
 func isBroadcastOrMulticast(ipUint32 uint32, subnet *net.IPNet) bool {
 	// return ipUint32 == 0xffffffff || (byte(ipUint32) == 0xff) || (ipUint32>>28 == 0xe)
 	return ipUint32 == 0xffffffff || (ipUint32>>28 == 0xe) // 225.255.255.255/32, 224.0.0.0/4
 }
 func (s *p2pSDWAN) routeTunPacket(p []byte, head *PacketHeader) {
 	var node *sdwanNode
 	// v, ok := s.routes.Load(ih.dst)
 	v, ok := s.internalRoute.Load(head.dst)
 	if !ok || v == nil {
 		if isBroadcastOrMulticast(head.dst, s.subnet) {
 			gLog.Printf(LvDev, "multicast ip=%s", net.IP{byte(head.dst >> 24), byte(head.dst >> 16), byte(head.dst >> 8), byte(head.dst)}.String())
 			GNetwork.WriteBroadcast(p)
 		}
 		return
 	} else {
 		node = v.(*sdwanNode)
 	}
 	err := GNetwork.WriteNode(node.id, p)
 	if err != nil {
 		gLog.Printf(LvDev, "write packet to %s fail: %s", node.name, err)
 	}
 }
 func (s *p2pSDWAN) readTunLoop() {
 	gLog.Printf(LvDEBUG, "sdwan readTunLoop start")
 	defer gLog.Printf(LvDEBUG, "sdwan readTunLoop end")
 	readBuff := make([][]byte, ReadTunBuffNum)
 	for i := 0; i < ReadTunBuffNum; i++ {
 		readBuff[i] = make([]byte, ReadTunBuffSize+PIHeaderSize)
 	}
 	readBuffSize := make([]int, ReadTunBuffNum)
 	ih := PacketHeader{}
 	for {
 		n, err := s.tun.Read(readBuff, readBuffSize, PIHeaderSize)
 		if err != nil {
 			gLog.Printf(LvERROR, "read tun fail: ", err)
 			return
 		}
 		for i := 0; i < n; i++ {
 			if readBuffSize[i] > ReadTunBuffSize {
 				gLog.Printf(LvERROR, "read tun overflow: len=", readBuffSize[i])
 				continue
 			}
 			parseHeader(readBuff[i][PIHeaderSize:readBuffSize[i]+PIHeaderSize], &ih)
 			gLog.Printf(LvDev, "read tun dst ip=%s,len=%d", net.IP{byte(ih.dst >> 24), byte(ih.dst >> 16), byte(ih.dst >> 8), byte(ih.dst)}.String(), readBuffSize[0])
 			s.routeTunPacket(readBuff[i][PIHeaderSize:readBuffSize[i]+PIHeaderSize], &ih)
 		}
 	}
 }
 func (s *p2pSDWAN) StartTun() error {
 	sdwan := gConf.getSDWAN()
 	if s.tun == nil {
 		tun := &optun{}
 		err := tun.Start(s.virtualIP.String(), &sdwan)
 		if err != nil {
 			gLog.Println(LvERROR, "open tun fail:", err)
 			return err
 		}
 		s.tun = tun
 		go s.readTunLoop()
 		go s.readNodeLoop() // multi-thread read will cause packets out of order, resulting in slower speeds
 	}
 	err := setTunAddr(s.tun.tunName, s.virtualIP.String(), sdwan.Gateway, s.tun.dev)
 	if err != nil {
 		gLog.Printf(LvERROR, "setTunAddr error:%s,%s,%s,%s", err, s.tun.tunName, s.virtualIP.String(), sdwan.Gateway)
 		return err
 	}
 	return nil
 }
 func handleSDWAN(subType uint16, msg []byte) error {
 	gLog.Printf(LvDEBUG, "handle sdwan msg type:%d", subType)
 	var err error
 	switch subType {
 	case MsgSDWANInfoRsp:
 		rsp := SDWANInfo{}
 		if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
 			return ErrMsgFormat
 		}
 		gLog.Println(LvINFO, "sdwan init:", prettyJson(rsp))
 		if runtime.GOOS == "android" {
 			AndroidSDWANConfig <- msg[openP2PHeaderSize:]
 		}
 		// GNetwork.sdwan.detail = &rsp
 		gConf.setSDWAN(rsp)
 		err = GNetwork.sdwan.init(gConf.Network.Node)
 		if err != nil {
 			gLog.Println(LvERROR, "sdwan init fail: ", err)
 			if GNetwork.sdwan.tun != nil {
 				GNetwork.sdwan.tun.Stop()
 				GNetwork.sdwan.tun = nil
 				return err
 			}
 		}
 		go GNetwork.sdwan.run()
 	default:
 	}
 	return err
 }
@@ -0,0 +1,50 @@
 package openp2p
 import (
 	"sync"
 	"time"
 )
 // SpeedLimiter ...
 type SpeedLimiter struct {
 	lastUpdate time.Time
 	speed      int // per second
 	precision  int // seconds
 	freeCap    int
 	maxFreeCap int
 	mtx        sync.Mutex
 }
 func newSpeedLimiter(speed int, precision int) *SpeedLimiter {
 	return &SpeedLimiter{
 		speed:      speed,
 		precision:  precision,
 		lastUpdate: time.Now(),
 		maxFreeCap: speed * precision,
 		freeCap:    speed * precision,
 	}
 }
 // Add ...
 func (sl *SpeedLimiter) Add(increment int, wait bool) bool {
 	if sl.speed <= 0 {
 		return true
 	}
 	sl.mtx.Lock()
 	defer sl.mtx.Unlock()
 	sl.freeCap += int(time.Since(sl.lastUpdate) * time.Duration(sl.speed) / time.Second)
 	if sl.freeCap > sl.maxFreeCap {
 		sl.freeCap = sl.maxFreeCap
 	}
 	if !wait && sl.freeCap < increment {
 		return false
 	}
 	sl.freeCap -= increment
 	sl.lastUpdate = time.Now()
 	if sl.freeCap < 0 {
 		// sleep for the overflow
 		// fmt.Println("sleep ", time.Millisecond*time.Duration(-sl.freeCap*100)/time.Duration(sl.speed))
 		time.Sleep(time.Millisecond * time.Duration(-sl.freeCap*1000) / time.Duration(sl.speed)) // sleep ms
 	}
 	return true
 }
@@ -0,0 +1,59 @@
 package openp2p
 import (
 	"testing"
 	"time"
 )
 func TestBandwidth(t *testing.T) {
 	speed := 10 * 1024 * 1024 / 8 // 10mbps
 	speedl := newSpeedLimiter(speed, 1)
 	oneBuffSize := 4096
 	writeNum := 5000
 	expectTime := oneBuffSize * writeNum / speed
 	startTs := time.Now()
 	for i := 0; i < writeNum; i++ {
 		speedl.Add(oneBuffSize, true)
 	}
 	t.Logf("cost %ds, expect %ds", time.Since(startTs)/time.Second, expectTime)
 	if time.Since(startTs) > time.Duration(expectTime+1)*time.Second || time.Since(startTs) < time.Duration(expectTime-1)*time.Second {
 		t.Error("error")
 	}
 }
 func TestSymmetric(t *testing.T) {
 	speed := 20000 / 180
 	speedl := newSpeedLimiter(speed, 180)
 	oneBuffSize := 300
 	writeNum := 70
 	expectTime := (oneBuffSize*writeNum - 20000) / speed
 	t.Logf("expect %ds", expectTime)
 	startTs := time.Now()
 	for i := 0; i < writeNum; i++ {
 		speedl.Add(oneBuffSize, true)
 	}
 	t.Logf("cost %ds, expect %ds", time.Since(startTs)/time.Second, expectTime)
 	if time.Since(startTs) > time.Duration(expectTime+1)*time.Second || time.Since(startTs) < time.Duration(expectTime-1)*time.Second {
 		t.Error("error")
 	}
 }
 func TestSymmetric2(t *testing.T) {
 	speed := 30000 / 180
 	speedl := newSpeedLimiter(speed, 180)
 	oneBuffSize := 800
 	writeNum := 40
 	expectTime := (oneBuffSize*writeNum - 30000) / speed
 	startTs := time.Now()
 	for i := 0; i < writeNum; {
 		if speedl.Add(oneBuffSize, true) {
 			i++
 		} else {
 			time.Sleep(time.Millisecond)
 		}
 	}
 	t.Logf("cost %ds, expect %ds", time.Since(startTs)/time.Second, expectTime)
 	if time.Since(startTs) > time.Duration(expectTime+1)*time.Second || time.Since(startTs) < time.Duration(expectTime-1)*time.Second {
 		t.Error("error")
 	}
 }
@@ -18,7 +18,7 @@ func UDPWrite(conn *net.UDPConn, dst net.Addr, mainType uint16, subType uint16,
 	return conn.WriteTo(msg, dst)
 }
-func UDPRead(conn *net.UDPConn, timeout time.Duration) (ra net.Addr, head *openP2PHeader, result []byte, len int, err error) {
+func UDPRead(conn *net.UDPConn, timeout time.Duration) (ra net.Addr, head *openP2PHeader, buff []byte, length int, err error) {
 	if timeout > 0 {
 		err = conn.SetReadDeadline(time.Now().Add(timeout))
 		if err != nil {
@@ -27,15 +27,15 @@ func UDPRead(conn *net.UDPConn, timeout time.Duration) (ra net.Addr, head *openP
 		}
 	}
-	result = make([]byte, 1024)
+	buff = make([]byte, 1024)
-	len, ra, err = conn.ReadFrom(result)
+	length, ra, err = conn.ReadFrom(buff)
 	if err != nil {
 		// gLog.Println(LevelDEBUG, "ReadFrom error")
 		return nil, nil, nil, 0, err
 	}
 	head = &openP2PHeader{}
-	err = binary.Read(bytes.NewReader(result[:openP2PHeaderSize]), binary.LittleEndian, head)
+	err = binary.Read(bytes.NewReader(buff[:openP2PHeaderSize]), binary.LittleEndian, head)
-	if err != nil {
+	if err != nil || head.DataLen > uint32(len(buff)-openP2PHeaderSize) {
 		gLog.Println(LvERROR, "parse p2pheader error:", err)
 		return nil, nil, nil, 0, err
 	}
@@ -1,16 +1,65 @@
 package openp2p
 import (
 	"io"
 	"time"
 )
 type underlay interface {
 	Read([]byte) (int, error)
 	Write([]byte) (int, error)
 	ReadBuffer() (*openP2PHeader, []byte, error)
 	WriteBytes(uint16, uint16, []byte) error
 	WriteBuffer([]byte) error
 	WriteMessage(uint16, uint16, interface{}) error
 	Close() error
 	WLock()
 	WUnlock()
 	SetReadDeadline(t time.Time) error
 	SetWriteDeadline(t time.Time) error
 	Protocol() string
 }
 func DefaultReadBuffer(ul underlay) (*openP2PHeader, []byte, error) {
 	headBuf := make([]byte, openP2PHeaderSize)
 	_, err := io.ReadFull(ul, headBuf)
 	if err != nil {
 		return nil, nil, err
 	}
 	head, err := decodeHeader(headBuf)
 	if err != nil {
 		return nil, nil, err
 	}
 	dataBuf := make([]byte, head.DataLen)
 	_, err = io.ReadFull(ul, dataBuf)
 	return head, dataBuf, err
 }
 func DefaultWriteBytes(ul underlay, mainType, subType uint16, data []byte) error {
 	writeBytes := append(encodeHeader(mainType, subType, uint32(len(data))), data...)
 	ul.SetWriteDeadline(time.Now().Add(TunnelHeartbeatTime / 2))
 	ul.WLock()
 	_, err := ul.Write(writeBytes)
 	ul.WUnlock()
 	return err
 }
 func DefaultWriteBuffer(ul underlay, data []byte) error {
 	ul.SetWriteDeadline(time.Now().Add(TunnelHeartbeatTime / 2))
 	ul.WLock()
 	_, err := ul.Write(data)
 	ul.WUnlock()
 	return err
 }
 func DefaultWriteMessage(ul underlay, mainType uint16, subType uint16, packet interface{}) error {
 	writeBytes, err := newMessage(mainType, subType, packet)
 	if err != nil {
 		return err
 	}
 	ul.SetWriteDeadline(time.Now().Add(TunnelHeartbeatTime / 2))
 	ul.WLock()
 	_, err = ul.Write(writeBytes)
 	ul.WUnlock()
 	return err
 }
@@ -0,0 +1,94 @@
 package openp2p
 import (
 	"fmt"
 	"net"
 	"sync"
 	"time"
 	"github.com/xtaci/kcp-go/v5"
 )
 type underlayKCP struct {
 	listener *kcp.Listener
 	writeMtx *sync.Mutex
 	*kcp.UDPSession
 }
 func (conn *underlayKCP) Protocol() string {
 	return "kcp"
 }
 func (conn *underlayKCP) ReadBuffer() (*openP2PHeader, []byte, error) {
 	return DefaultReadBuffer(conn)
 }
 func (conn *underlayKCP) WriteBytes(mainType uint16, subType uint16, data []byte) error {
 	return DefaultWriteBytes(conn, mainType, subType, data)
 }
 func (conn *underlayKCP) WriteBuffer(data []byte) error {
 	return DefaultWriteBuffer(conn, data)
 }
 func (conn *underlayKCP) WriteMessage(mainType uint16, subType uint16, packet interface{}) error {
 	return DefaultWriteMessage(conn, mainType, subType, packet)
 }
 func (conn *underlayKCP) Close() error {
 	conn.UDPSession.Close()
 	return nil
 }
 func (conn *underlayKCP) WLock() {
 	conn.writeMtx.Lock()
 }
 func (conn *underlayKCP) WUnlock() {
 	conn.writeMtx.Unlock()
 }
 func (conn *underlayKCP) CloseListener() {
 	if conn.listener != nil {
 		conn.listener.Close()
 	}
 }
 func (conn *underlayKCP) Accept() error {
 	kConn, err := conn.listener.AcceptKCP()
 	if err != nil {
 		conn.listener.Close()
 		return err
 	}
 	kConn.SetNoDelay(0, 40, 0, 0)
 	kConn.SetWindowSize(512, 512)
 	kConn.SetWriteBuffer(1024 * 128)
 	kConn.SetReadBuffer(1024 * 128)
 	conn.UDPSession = kConn
 	return nil
 }
 func listenKCP(addr string, idleTimeout time.Duration) (*underlayKCP, error) {
 	gLog.Println(LvDEBUG, "kcp listen on ", addr)
 	listener, err := kcp.ListenWithOptions(addr, nil, 0, 0)
 	if err != nil {
 		return nil, fmt.Errorf("quic.ListenAddr error:%s", err)
 	}
 	ul := &underlayKCP{listener: listener, writeMtx: &sync.Mutex{}}
 	err = ul.Accept()
 	if err != nil {
 		ul.CloseListener()
 		return nil, fmt.Errorf("accept KCP error:%s", err)
 	}
 	return ul, nil
 }
 func dialKCP(conn *net.UDPConn, remoteAddr *net.UDPAddr, idleTimeout time.Duration) (*underlayKCP, error) {
 	kConn, err := kcp.NewConn(remoteAddr.String(), nil, 0, 0, conn)
 	if err != nil {
 		return nil, fmt.Errorf("quic.DialContext error:%s", err)
 	}
 	kConn.SetNoDelay(0, 40, 0, 0)
 	kConn.SetWindowSize(512, 512)
 	kConn.SetWriteBuffer(1024 * 128)
 	kConn.SetReadBuffer(1024 * 128)
 	ul := &underlayKCP{nil, &sync.Mutex{}, kConn}
 	return ul, nil
 }
@@ -6,10 +6,8 @@ import (
 	"crypto/rsa"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
 	"io"
 	"math/big"
 	"net"
 	"sync"
@@ -33,53 +31,33 @@ func (conn *underlayQUIC) Protocol() string {
 }
 func (conn *underlayQUIC) ReadBuffer() (*openP2PHeader, []byte, error) {
-	headBuf := make([]byte, openP2PHeaderSize)
+	return DefaultReadBuffer(conn)
 	_, err := io.ReadFull(conn, headBuf)
 	if err != nil {
 		return nil, nil, err
 	}
 	head, err := decodeHeader(headBuf)
 	if err != nil {
 		return nil, nil, err
 	}
 	dataBuf := make([]byte, head.DataLen)
 	_, err = io.ReadFull(conn, dataBuf)
 	return head, dataBuf, err
 }
 func (conn *underlayQUIC) WriteBytes(mainType uint16, subType uint16, data []byte) error {
-	writeBytes := append(encodeHeader(mainType, subType, uint32(len(data))), data...)
+	return DefaultWriteBytes(conn, mainType, subType, data)
 	conn.writeMtx.Lock()
 	_, err := conn.Write(writeBytes)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayQUIC) WriteBuffer(data []byte) error {
-	conn.writeMtx.Lock()
+	return DefaultWriteBuffer(conn, data)
 	_, err := conn.Write(data)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayQUIC) WriteMessage(mainType uint16, subType uint16, packet interface{}) error {
-	// TODO: call newMessage
+	return DefaultWriteMessage(conn, mainType, subType, packet)
 	data, err := json.Marshal(packet)
 	if err != nil {
 		return err
 	}
 	writeBytes := append(encodeHeader(mainType, subType, uint32(len(data))), data...)
 	conn.writeMtx.Lock()
 	_, err = conn.Write(writeBytes)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayQUIC) Close() error {
 	conn.Stream.CancelRead(1)
 	conn.Connection.CloseWithError(0, "")
 	conn.CloseListener()
 	return nil
 }
 func (conn *underlayQUIC) WLock() {
 	conn.writeMtx.Lock()
 }
 func (conn *underlayQUIC) WUnlock() {
 	conn.writeMtx.Unlock()
 }
 func (conn *underlayQUIC) CloseListener() {
 	if conn.listener != nil {
 		conn.listener.Close()
@@ -109,7 +87,13 @@ func listenQuic(addr string, idleTimeout time.Duration) (*underlayQUIC, error) {
 	if err != nil {
 		return nil, fmt.Errorf("quic.ListenAddr error:%s", err)
 	}
-	return &underlayQUIC{listener: listener, writeMtx: &sync.Mutex{}}, nil
+	ul := &underlayQUIC{listener: listener, writeMtx: &sync.Mutex{}}
 	err = ul.Accept()
 	if err != nil {
 		ul.CloseListener()
 		return nil, fmt.Errorf("accept quic error:%s", err)
 	}
 	return ul, nil
 }
 func dialQuic(conn *net.UDPConn, remoteAddr *net.UDPAddr, idleTimeout time.Duration) (*underlayQUIC, error) {
@@ -1,9 +1,8 @@
 package openp2p
 import (
-	"encoding/json"
+	"encoding/binary"
 	"fmt"
 	"io"
 	"net"
 	"sync"
 	"time"
@@ -14,6 +13,7 @@ import (
 type underlayTCP struct {
 	writeMtx *sync.Mutex
 	net.Conn
 	connectTime time.Time
 }
 func (conn *underlayTCP) Protocol() string {
@@ -21,97 +21,115 @@ func (conn *underlayTCP) Protocol() string {
 }
 func (conn *underlayTCP) ReadBuffer() (*openP2PHeader, []byte, error) {
-	headBuf := make([]byte, openP2PHeaderSize)
+	return DefaultReadBuffer(conn)
 	_, err := io.ReadFull(conn, headBuf)
 	if err != nil {
 		return nil, nil, err
 	}
 	head, err := decodeHeader(headBuf)
 	if err != nil {
 		return nil, nil, err
 	}
 	dataBuf := make([]byte, head.DataLen)
 	_, err = io.ReadFull(conn, dataBuf)
 	return head, dataBuf, err
 }
 func (conn *underlayTCP) WriteBytes(mainType uint16, subType uint16, data []byte) error {
-	writeBytes := append(encodeHeader(mainType, subType, uint32(len(data))), data...)
+	return DefaultWriteBytes(conn, mainType, subType, data)
 	conn.writeMtx.Lock()
 	_, err := conn.Write(writeBytes)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayTCP) WriteBuffer(data []byte) error {
-	conn.writeMtx.Lock()
+	return DefaultWriteBuffer(conn, data)
 	_, err := conn.Write(data)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayTCP) WriteMessage(mainType uint16, subType uint16, packet interface{}) error {
-	// TODO: call newMessage
+	return DefaultWriteMessage(conn, mainType, subType, packet)
 	data, err := json.Marshal(packet)
 	if err != nil {
 		return err
 	}
 	writeBytes := append(encodeHeader(mainType, subType, uint32(len(data))), data...)
 	conn.writeMtx.Lock()
 	_, err = conn.Write(writeBytes)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayTCP) Close() error {
 	return conn.Conn.Close()
 }
 func (conn *underlayTCP) WLock() {
 	conn.writeMtx.Lock()
 }
 func (conn *underlayTCP) WUnlock() {
 	conn.writeMtx.Unlock()
 }
 func listenTCP(host string, port int, localPort int, mode string, t *P2PTunnel) (*underlayTCP, error) {
 	if mode == LinkModeTCPPunch {
-		if compareVersion(t.config.peerVersion, SyncServerTimeVersion) == LESS {
+		if compareVersion(t.config.peerVersion, SyncServerTimeVersion) < 0 {
 			gLog.Printf(LvDEBUG, "peer version %s less than %s", t.config.peerVersion, SyncServerTimeVersion)
 		} else {
 			ts := time.Duration(int64(t.punchTs) + t.pn.dt - time.Now().UnixNano())
 			gLog.Printf(LvDEBUG, "sleep %d ms", ts/time.Millisecond)
 			time.Sleep(ts)
 		}
-		gLog.Println(LvDEBUG, (time.Now().UnixNano()-t.pn.dt)/(int64)(time.Millisecond), " send tcp punch: ", fmt.Sprintf("0.0.0.0:%d", localPort), "-->", fmt.Sprintf("%s:%d", host, port))
+		gLog.Println(LvDEBUG, " send tcp punch: ", fmt.Sprintf("0.0.0.0:%d", localPort), "-->", fmt.Sprintf("%s:%d", host, port))
 		c, err := reuse.DialTimeout("tcp", fmt.Sprintf("0.0.0.0:%d", localPort), fmt.Sprintf("%s:%d", host, port), CheckActiveTimeout)
 		if err != nil {
 			gLog.Println(LvDEBUG, "send tcp punch: ", err)
 			return nil, err
 		}
-		return &underlayTCP{writeMtx: &sync.Mutex{}, Conn: c}, nil
+		utcp := &underlayTCP{writeMtx: &sync.Mutex{}, Conn: c}
 		_, buff, err := utcp.ReadBuffer()
 		if err != nil {
 			return nil, fmt.Errorf("read start msg error:%s", err)
 		}
 		if buff != nil {
 			gLog.Println(LvDEBUG, string(buff))
 		}
 		utcp.WriteBytes(MsgP2P, MsgTunnelHandshakeAck, buff)
 		return utcp, nil
 	}
 	t.pn.push(t.config.PeerNode, MsgPushUnderlayConnect, nil)
-	addr, _ := net.ResolveTCPAddr("tcp", fmt.Sprintf("0.0.0.0:%d", localPort))
+	tid := t.id
-	l, err := net.ListenTCP("tcp", addr)
+	if compareVersion(t.config.peerVersion, PublicIPVersion) < 0 { // old version
-	if err != nil {
+		ipBytes := net.ParseIP(t.config.peerIP).To4()
-		return nil, err
+		tid = uint64(binary.BigEndian.Uint32(ipBytes))
 		gLog.Println(LvDEBUG, "compatible with old client, use ip as key:", tid)
 	}
-	l.SetDeadline(time.Now().Add(CheckActiveTimeout))
+	var utcp *underlayTCP
-	c, err := l.Accept()
+	if mode == LinkModeIntranet && gConf.Network.hasIPv4 == 0 && gConf.Network.hasUPNPorNATPMP == 0 {
-	defer l.Close()
+		addr, _ := net.ResolveTCPAddr("tcp4", fmt.Sprintf("0.0.0.0:%d", localPort))
-	if err != nil {
+		l, err := net.ListenTCP("tcp4", addr)
-		return nil, err
+		if err != nil {
 			gLog.Printf(LvERROR, "listen %d error:", localPort, err)
 			return nil, err
 		}
 		defer l.Close()
 		err = l.SetDeadline(time.Now().Add(UnderlayTCPConnectTimeout))
 		if err != nil {
 			gLog.Printf(LvERROR, "set listen timeout:", err)
 			return nil, err
 		}
 		c, err := l.Accept()
 		if err != nil {
 			return nil, err
 		}
 		utcp = &underlayTCP{writeMtx: &sync.Mutex{}, Conn: c}
 	} else {
 		if v4l != nil {
 			utcp = v4l.getUnderlayTCP(tid)
 		}
 	}
-	return &underlayTCP{writeMtx: &sync.Mutex{}, Conn: c}, nil
+
 	if utcp == nil {
 		return nil, ErrConnectPublicV4
 	}
 	return utcp, nil
 }
 func dialTCP(host string, port int, localPort int, mode string) (*underlayTCP, error) {
 	var c net.Conn
 	var err error
 	if mode == LinkModeTCPPunch {
-		c, err = reuse.DialTimeout("tcp", fmt.Sprintf("0.0.0.0:%d", localPort), fmt.Sprintf("%s:%d", host, port), CheckActiveTimeout)
+		gLog.Println(LvDev, " send tcp punch: ", fmt.Sprintf("0.0.0.0:%d", localPort), "-->", fmt.Sprintf("%s:%d", host, port))
 		if c, err = reuse.DialTimeout("tcp", fmt.Sprintf("0.0.0.0:%d", localPort), fmt.Sprintf("%s:%d", host, port), CheckActiveTimeout); err != nil {
 			gLog.Println(LvDev, "send tcp punch: ", err)
 		}
 	} else {
 		c, err = net.DialTimeout("tcp", fmt.Sprintf("%s:%d", host, port), CheckActiveTimeout)
 	}
 	if err != nil {
-		gLog.Printf(LvERROR, "Dial %s:%d error:%s", host, port, err)
+		gLog.Printf(LvDev, "Dial %s:%d error:%s", host, port, err)
 		return nil, err
 	}
 	tc := c.(*net.TCPConn)
 	tc.SetKeepAlive(true)
 	tc.SetKeepAlivePeriod(UnderlayTCPKeepalive)
 	gLog.Printf(LvDEBUG, "Dial %s:%d OK", host, port)
 	return &underlayTCP{writeMtx: &sync.Mutex{}, Conn: c}, nil
 }
@@ -1,16 +1,13 @@
 package openp2p
 import (
 	"encoding/json"
 	"fmt"
 	"io"
 	"net"
 	"sync"
 	"time"
 )
 type underlayTCP6 struct {
 	listener net.Listener
 	writeMtx *sync.Mutex
 	net.Conn
 }
@@ -20,60 +17,38 @@ func (conn *underlayTCP6) Protocol() string {
 }
 func (conn *underlayTCP6) ReadBuffer() (*openP2PHeader, []byte, error) {
-	headBuf := make([]byte, openP2PHeaderSize)
+	return DefaultReadBuffer(conn)
 	_, err := io.ReadFull(conn, headBuf)
 	if err != nil {
 		return nil, nil, err
 	}
 	head, err := decodeHeader(headBuf)
 	if err != nil {
 		return nil, nil, err
 	}
 	dataBuf := make([]byte, head.DataLen)
 	_, err = io.ReadFull(conn, dataBuf)
 	return head, dataBuf, err
 }
 func (conn *underlayTCP6) WriteBytes(mainType uint16, subType uint16, data []byte) error {
-	writeBytes := append(encodeHeader(mainType, subType, uint32(len(data))), data...)
+	return DefaultWriteBytes(conn, mainType, subType, data)
 	conn.writeMtx.Lock()
 	_, err := conn.Write(writeBytes)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayTCP6) WriteBuffer(data []byte) error {
-	conn.writeMtx.Lock()
+	return DefaultWriteBuffer(conn, data)
 	_, err := conn.Write(data)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayTCP6) WriteMessage(mainType uint16, subType uint16, packet interface{}) error {
-	// TODO: call newMessage
+	return DefaultWriteMessage(conn, mainType, subType, packet)
 	data, err := json.Marshal(packet)
 	if err != nil {
 		return err
 	}
 	writeBytes := append(encodeHeader(mainType, subType, uint32(len(data))), data...)
 	conn.writeMtx.Lock()
 	_, err = conn.Write(writeBytes)
 	conn.writeMtx.Unlock()
 	return err
 }
 func (conn *underlayTCP6) Close() error {
 	return conn.Conn.Close()
 }
-
+func (conn *underlayTCP6) WLock() {
-func listenTCP6(port int, idleTimeout time.Duration) (*underlayTCP6, error) {
+	conn.writeMtx.Lock()
 }
 func (conn *underlayTCP6) WUnlock() {
 	conn.writeMtx.Unlock()
 }
 func listenTCP6(port int, timeout time.Duration) (*underlayTCP6, error) {
 	addr, _ := net.ResolveTCPAddr("tcp6", fmt.Sprintf("[::]:%d", port))
 	l, err := net.ListenTCP("tcp6", addr)
 	if err != nil {
 		return nil, err
 	}
 	defer l.Close()
-	l.SetDeadline(time.Now().Add(HandshakeTimeout))
+	l.SetDeadline(time.Now().Add(timeout))
 	c, err := l.Accept()
 	defer l.Close()
 	if err != nil {
@@ -83,7 +58,7 @@ func listenTCP6(port int, idleTimeout time.Duration) (*underlayTCP6, error) {
 }
 func dialTCP6(host string, port int) (*underlayTCP6, error) {
-	c, err := net.DialTimeout("tcp6", fmt.Sprintf("[%s]:%d", host, port), HandshakeTimeout)
+	c, err := net.DialTimeout("tcp6", fmt.Sprintf("[%s]:%d", host, port), UnderlayConnectTimeout)
 	if err != nil {
 		gLog.Printf(LvERROR, "Dial %s:%d error:%s", host, port, err)
 		return nil, err
@@ -1,229 +1,239 @@
-package openp2p
+package openp2p
-
+
-import (
+import (
-	"archive/tar"
+	"archive/tar"
-	"archive/zip"
+	"archive/zip"
-	"compress/gzip"
+	"compress/gzip"
-	"crypto/tls"
+	"crypto/tls"
-	"crypto/x509"
+	"crypto/x509"
-	"encoding/json"
+	"encoding/json"
-	"fmt"
+	"fmt"
-	"io"
+	"io"
-	"io/ioutil"
+	"io/ioutil"
-	"net/http"
+	"net/http"
-	"os"
+	"net/url"
-	"path/filepath"
+	"os"
-	"runtime"
+	"path/filepath"
-	"time"
+	"runtime"
-)
+	"time"
-
+)
-func update(host string, port int) error {
+
-	gLog.Println(LvINFO, "update start")
+func update(host string, port int) error {
-	defer gLog.Println(LvINFO, "update end")
+	gLog.Println(LvINFO, "update start")
-	caCertPool, err := x509.SystemCertPool()
+	defer gLog.Println(LvINFO, "update end")
-	if err != nil {
+	caCertPool, err := x509.SystemCertPool()
-		gLog.Println(LvERROR, "Failed to load system root CAs:", err)
+	if err != nil {
-	} else {
+		gLog.Println(LvERROR, "Failed to load system root CAs:", err)
-		caCertPool = x509.NewCertPool()
+	} else {
-	}
+		caCertPool = x509.NewCertPool()
-	caCertPool.AppendCertsFromPEM([]byte(rootCA))
+	}
-	caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
+	caCertPool.AppendCertsFromPEM([]byte(rootCA))
-
+	caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
-	c := http.Client{
+
-		Transport: &http.Transport{
+	c := http.Client{
-			TLSClientConfig: &tls.Config{RootCAs: caCertPool,
+		Transport: &http.Transport{
-				InsecureSkipVerify: false},
+			TLSClientConfig: &tls.Config{RootCAs: caCertPool,
-		},
+				InsecureSkipVerify: false},
-		Timeout: time.Second * 30,
+		},
-	}
+		Timeout: time.Second * 30,
-	goos := runtime.GOOS
+	}
-	goarch := runtime.GOARCH
+	goos := runtime.GOOS
-	rsp, err := c.Get(fmt.Sprintf("https://%s:%d/api/v1/update?fromver=%s&os=%s&arch=%s&user=%s&node=%s", host, port, OpenP2PVersion, goos, goarch, gConf.Network.User, gConf.Network.Node))
+	goarch := runtime.GOARCH
-	if err != nil {
+	rsp, err := c.Get(fmt.Sprintf("https://%s:%d/api/v1/update?fromver=%s&os=%s&arch=%s&user=%s&node=%s", host, port, OpenP2PVersion, goos, goarch, url.QueryEscape(gConf.Network.User), url.QueryEscape(gConf.Network.Node)))
-		gLog.Println(LvERROR, "update:query update list failed:", err)
+	if err != nil {
-		return err
+		gLog.Println(LvERROR, "update:query update list failed:", err)
-	}
+		return err
-	defer rsp.Body.Close()
+	}
-	if rsp.StatusCode != http.StatusOK {
+	defer rsp.Body.Close()
-		gLog.Println(LvERROR, "get update info error:", rsp.Status)
+	if rsp.StatusCode != http.StatusOK {
-		return err
+		gLog.Println(LvERROR, "get update info error:", rsp.Status)
-	}
+		return err
-	rspBuf, err := ioutil.ReadAll(rsp.Body)
+	}
-	if err != nil {
+	rspBuf, err := ioutil.ReadAll(rsp.Body)
-		gLog.Println(LvERROR, "update:read update list failed:", err)
+	if err != nil {
-		return err
+		gLog.Println(LvERROR, "update:read update list failed:", err)
-	}
+		return err
-	updateInfo := UpdateInfo{}
+	}
-	if err = json.Unmarshal(rspBuf, &updateInfo); err != nil {
+	updateInfo := UpdateInfo{}
-		gLog.Println(LvERROR, rspBuf, " update info decode error:", err)
+	if err = json.Unmarshal(rspBuf, &updateInfo); err != nil {
-		return err
+		gLog.Println(LvERROR, rspBuf, " update info decode error:", err)
-	}
+		return err
-	if updateInfo.Error != 0 {
+	}
-		gLog.Println(LvERROR, "update error:", updateInfo.Error, updateInfo.ErrorDetail)
+	if updateInfo.Error != 0 {
-		return err
+		gLog.Println(LvERROR, "update error:", updateInfo.Error, updateInfo.ErrorDetail)
-	}
+		return err
-	err = updateFile(updateInfo.Url, "", "openp2p")
+	}
-	if err != nil {
+	err = updateFile(updateInfo.Url, "", "openp2p")
-		gLog.Println(LvERROR, "update: download failed:", err)
+	if err != nil {
-		return err
+		gLog.Println(LvERROR, "update: download failed:", err)
-	}
+		return err
-	return nil
+	}
-}
+	return nil
-
+}
-// todo rollback on error
+
-func updateFile(url string, checksum string, dst string) error {
+func downloadFile(url string, checksum string, dstFile string) error {
-	gLog.Println(LvINFO, "download ", url)
+	output, err := os.OpenFile(dstFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0776)
-	tmpFile := filepath.Dir(os.Args[0]) + "/openp2p.tmp"
+	if err != nil {
-	output, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0776)
+		gLog.Printf(LvERROR, "OpenFile %s error:%s", dstFile, err)
-	if err != nil {
+		return err
-		gLog.Printf(LvERROR, "OpenFile %s error:%s", tmpFile, err)
+	}
-		return err
+	caCertPool, err := x509.SystemCertPool()
-	}
+	if err != nil {
-	caCertPool, err := x509.SystemCertPool()
+		gLog.Println(LvERROR, "Failed to load system root CAs:", err)
-	if err != nil {
+	} else {
-		gLog.Println(LvERROR, "Failed to load system root CAs:", err)
+		caCertPool = x509.NewCertPool()
-	} else {
+	}
-		caCertPool = x509.NewCertPool()
+	caCertPool.AppendCertsFromPEM([]byte(rootCA))
-	}
+	caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
-	caCertPool.AppendCertsFromPEM([]byte(rootCA))
+	tr := &http.Transport{
-	caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
+		TLSClientConfig: &tls.Config{
-	tr := &http.Transport{
+			RootCAs:            caCertPool,
-		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: false},
-			RootCAs:            caCertPool,
+	}
-			InsecureSkipVerify: false},
+	client := &http.Client{Transport: tr}
-	}
+	response, err := client.Get(url)
-	client := &http.Client{Transport: tr}
+	if err != nil {
-	response, err := client.Get(url)
+		gLog.Printf(LvERROR, "download url %s error:%s", url, err)
-	if err != nil {
+		output.Close()
-		gLog.Printf(LvERROR, "download url %s error:%s", url, err)
+		return err
-		output.Close()
+	}
-		return err
+	defer response.Body.Close()
-	}
+	n, err := io.Copy(output, response.Body)
-	defer response.Body.Close()
+	if err != nil {
-	n, err := io.Copy(output, response.Body)
+		gLog.Printf(LvERROR, "io.Copy error:%s", err)
-	if err != nil {
+		output.Close()
-		gLog.Printf(LvERROR, "io.Copy error:%s", err)
+		return err
-		output.Close()
+	}
-		return err
+	output.Sync()
-	}
+	output.Close()
-	output.Sync()
+	gLog.Println(LvINFO, "download ", url, " ok")
-	output.Close()
+	gLog.Printf(LvINFO, "size: %d bytes", n)
-	gLog.Println(LvINFO, "download ", url, " ok")
+	return nil
-	gLog.Printf(LvINFO, "size: %d bytes", n)
+}
-
+
-	err = os.Rename(os.Args[0], os.Args[0]+"0") // the old daemon process was using the 0 file, so it will prevent override it
+func updateFile(url string, checksum string, dst string) error {
-	if err != nil {
+	gLog.Println(LvINFO, "download ", url)
-		gLog.Printf(LvINFO, " rename %s error:%s, retry 1", os.Args[0], err)
+	tmpFile := filepath.Dir(os.Args[0]) + "/openp2p.tmp"
-		err = os.Rename(os.Args[0], os.Args[0]+"1")
+	err := downloadFile(url, checksum, tmpFile)
-		if err != nil {
+	if err != nil {
-			gLog.Printf(LvINFO, " rename %s error:%s", os.Args[0], err)
+		return err
-		}
+	}
-	}
+	backupFile := os.Args[0] + "0"
-	// extract
+	err = os.Rename(os.Args[0], backupFile) // the old daemon process was using the 0 file, so it will prevent override it
-	gLog.Println(LvINFO, "extract files")
+	if err != nil {
-	err = extract(filepath.Dir(os.Args[0]), tmpFile)
+		gLog.Printf(LvINFO, " rename %s error:%s, retry 1", os.Args[0], err)
-	if err != nil {
+		backupFile = os.Args[0] + "1"
-		gLog.Printf(LvERROR, "extract error:%s. revert rename", err)
+		err = os.Rename(os.Args[0], backupFile)
-		os.Rename(os.Args[0]+"0", os.Args[0])
+		if err != nil {
-		return err
+			gLog.Printf(LvINFO, " rename %s error:%s", os.Args[0], err)
-	}
+		}
-	os.Remove(tmpFile)
+	}
-	return nil
+	// extract
-}
+	gLog.Println(LvINFO, "extract files")
-
+	err = extract(filepath.Dir(os.Args[0]), tmpFile)
-func extract(dst, src string) (err error) {
+	if err != nil {
-	if runtime.GOOS == "windows" {
+		gLog.Printf(LvERROR, "extract error:%s. revert rename", err)
-		return unzip(dst, src)
+		os.Rename(backupFile, os.Args[0])
-	} else {
+		return err
-		return extractTgz(dst, src)
+	}
-	}
+	os.Remove(tmpFile)
-}
+	return nil
-
+}
-func unzip(dst, src string) (err error) {
+
-	archive, err := zip.OpenReader(src)
+func extract(dst, src string) (err error) {
-	if err != nil {
+	if runtime.GOOS == "windows" {
-		return err
+		return unzip(dst, src)
-	}
+	} else {
-	defer archive.Close()
+		return extractTgz(dst, src)
-
+	}
-	for _, f := range archive.File {
+}
-		filePath := filepath.Join(dst, f.Name)
+
-		fmt.Println("unzipping file ", filePath)
+func unzip(dst, src string) (err error) {
-		if f.FileInfo().IsDir() {
+	archive, err := zip.OpenReader(src)
-			fmt.Println("creating directory...")
+	if err != nil {
-			os.MkdirAll(filePath, os.ModePerm)
+		return err
-			continue
+	}
-		}
+	defer archive.Close()
-		if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
+
-			return err
+	for _, f := range archive.File {
-		}
+		filePath := filepath.Join(dst, f.Name)
-		dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
+		fmt.Println("unzipping file ", filePath)
-		if err != nil {
+		if f.FileInfo().IsDir() {
-			return err
+			fmt.Println("creating directory...")
-		}
+			os.MkdirAll(filePath, os.ModePerm)
-		fileInArchive, err := f.Open()
+			continue
-		if err != nil {
+		}
-			return err
+		if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
-		}
+			return err
-		if _, err := io.Copy(dstFile, fileInArchive); err != nil {
+		}
-			return err
+		dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
-		}
+		if err != nil {
-		dstFile.Close()
+			return err
-		fileInArchive.Close()
+		}
-	}
+		fileInArchive, err := f.Open()
-	return nil
+		if err != nil {
-}
+			return err
-
+		}
-func extractTgz(dst, src string) error {
+		if _, err := io.Copy(dstFile, fileInArchive); err != nil {
-	gzipStream, err := os.Open(src)
+			return err
-	if err != nil {
+		}
-		return err
+		dstFile.Close()
-	}
+		fileInArchive.Close()
-	uncompressedStream, err := gzip.NewReader(gzipStream)
+	}
-	if err != nil {
+	return nil
-		return err
+}
-	}
+
-	tarReader := tar.NewReader(uncompressedStream)
+func extractTgz(dst, src string) error {
-	for {
+	gzipStream, err := os.Open(src)
-		header, err := tarReader.Next()
+	if err != nil {
-		if err == io.EOF {
+		return err
-			break
+	}
-		}
+	uncompressedStream, err := gzip.NewReader(gzipStream)
-		if err != nil {
+	if err != nil {
-			return err
+		return err
-		}
+	}
-		switch header.Typeflag {
+	tarReader := tar.NewReader(uncompressedStream)
-		case tar.TypeDir:
+	for {
-			if err := os.Mkdir(header.Name, 0755); err != nil {
+		header, err := tarReader.Next()
-				return err
+		if err == io.EOF {
-			}
+			break
-		case tar.TypeReg:
+		}
-			filePath := filepath.Join(dst, header.Name)
+		if err != nil {
-			outFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode))
+			return err
-			if err != nil {
+		}
-				return err
+		switch header.Typeflag {
-			}
+		case tar.TypeDir:
-			if err != nil {
+			if err := os.Mkdir(header.Name, 0755); err != nil {
-				return err
+				return err
-			}
+			}
-			defer outFile.Close()
+		case tar.TypeReg:
-			if _, err := io.Copy(outFile, tarReader); err != nil {
+			filePath := filepath.Join(dst, header.Name)
-				return err
+			outFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode))
-			}
+			if err != nil {
-		default:
+				return err
-			return err
+			}
-		}
+			defer outFile.Close()
-	}
+			if _, err := io.Copy(outFile, tarReader); err != nil {
-	return nil
+				return err
-}
+			}
-
+		default:
-func cleanTempFiles() {
+			return err
-	err := os.Remove(os.Args[0] + "0")
+		}
-	if err != nil {
+	}
-		gLog.Printf(LvDEBUG, " remove %s error:%s", os.Args[0]+"0", err)
+	return nil
-	}
+}
-	err = os.Remove(os.Args[0] + "1")
+
-	if err != nil {
+func cleanTempFiles() {
-		gLog.Printf(LvDEBUG, " remove %s error:%s", os.Args[0]+"0", err)
+	tmpFile := os.Args[0] + "0"
-	}
+	if _, err := os.Stat(tmpFile); err == nil {
-}
+		if err := os.Remove(tmpFile); err != nil {
 			gLog.Printf(LvDEBUG, " remove %s error:%s", tmpFile, err)
 		}
 	}
 	tmpFile = os.Args[0] + "1"
 	if _, err := os.Stat(tmpFile); err == nil {
 		if err := os.Remove(tmpFile); err != nil {
 			gLog.Printf(LvDEBUG, " remove %s error:%s", tmpFile, err)
 		}
 	}
 }
@@ -358,11 +358,6 @@ func (n *upnpNAT) AddPortMapping(protocol string, externalPort, internalPort int
 		return
 	}
 	// TODO: check response to see if the port was forwarded
 	// log.Println(message, response)
 	// JAE:
 	// body, err := ioutil.ReadAll(response.Body)
 	// fmt.Println(string(body), err)
 	mappedExternalPort = externalPort
 	_ = response
 	return
@@ -384,8 +379,6 @@ func (n *upnpNAT) DeletePortMapping(protocol string, externalPort, internalPort
 		return
 	}
 	// TODO: check response to see if the port was deleted
 	// log.Println(message, response)
 	_ = response
 	return
 }
@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"golang.org/x/sys/windows/registry"
@@ -23,6 +24,17 @@ func getOsName() (osName string) {
 	defer k.Close()
 	pn, _, err := k.GetStringValue("ProductName")
 	if err == nil {
 		currentBuild, _, err := k.GetStringValue("CurrentBuild")
 		if err != nil {
 			return
 		}
 		buildNumber, err := strconv.Atoi(currentBuild)
 		if err != nil {
 			return
 		}
 		if buildNumber >= 22000 {
 			pn = strings.Replace(pn, "Windows 10", "Windows 11", 1)
 		}
 		osName = pn
 	}
 	return
@@ -0,0 +1,92 @@
 package openp2p
 import (
 	"encoding/binary"
 	"fmt"
 	"net"
 	"sync"
 	"time"
 )
 type v4Listener struct {
 	conns    sync.Map
 	port     int
 	acceptCh chan bool
 }
 func (vl *v4Listener) start() error {
 	v4l.acceptCh = make(chan bool, 500)
 	for {
 		vl.listen()
 		time.Sleep(UnderlayTCPConnectTimeout)
 	}
 }
 func (vl *v4Listener) listen() error {
 	gLog.Printf(LvINFO, "v4Listener listen %d start", vl.port)
 	defer gLog.Printf(LvINFO, "v4Listener listen %d end", vl.port)
 	addr, _ := net.ResolveTCPAddr("tcp4", fmt.Sprintf("0.0.0.0:%d", vl.port))
 	l, err := net.ListenTCP("tcp4", addr)
 	if err != nil {
 		gLog.Printf(LvERROR, "v4Listener listen %d error:", vl.port, err)
 		return err
 	}
 	defer l.Close()
 	for {
 		c, err := l.Accept()
 		if err != nil {
 			break
 		}
 		go vl.handleConnection(c)
 	}
 	return nil
 }
 func (vl *v4Listener) handleConnection(c net.Conn) {
 	gLog.Println(LvDEBUG, "v4Listener accept connection: ", c.RemoteAddr().String())
 	utcp := &underlayTCP{writeMtx: &sync.Mutex{}, Conn: c, connectTime: time.Now()}
 	utcp.SetReadDeadline(time.Now().Add(UnderlayTCPConnectTimeout))
 	_, buff, err := utcp.ReadBuffer()
 	if err != nil {
 		gLog.Println(LvERROR, "utcp.ReadBuffer error:", err)
 	}
 	utcp.WriteBytes(MsgP2P, MsgTunnelHandshakeAck, buff)
 	var tid uint64
 	if string(buff) == "OpenP2P,hello" { // old client
 		// save remoteIP as key
 		remoteAddr := c.RemoteAddr().(*net.TCPAddr).IP
 		ipBytes := remoteAddr.To4()
 		tid = uint64(binary.BigEndian.Uint32(ipBytes)) // bytes not enough for uint64
 		gLog.Println(LvDEBUG, "hello ", string(buff))
 	} else {
 		if len(buff) < 8 {
 			return
 		}
 		tid = binary.LittleEndian.Uint64(buff[:8])
 		gLog.Println(LvDEBUG, "hello ", tid)
 	}
 	// clear timeout connection
 	vl.conns.Range(func(idx, i interface{}) bool {
 		ut := i.(*underlayTCP)
 		if ut.connectTime.Before(time.Now().Add(-UnderlayTCPConnectTimeout)) {
 			vl.conns.Delete(idx)
 		}
 		return true
 	})
 	vl.conns.Store(tid, utcp)
 	if len(vl.acceptCh) == 0 {
 		vl.acceptCh <- true
 	}
 }
 func (vl *v4Listener) getUnderlayTCP(tid uint64) *underlayTCP {
 	for i := 0; i < 100; i++ {
 		select {
 		case <-time.After(time.Millisecond * 50):
 		case <-vl.acceptCh:
 		}
 		if u, ok := vl.conns.LoadAndDelete(tid); ok {
 			return u.(*underlayTCP)
 		}
 	}
 	return nil
 }
@@ -2,7 +2,7 @@ FROM  alpine:3.18.2
 # Replace the default Alpine repositories with Aliyun mirrors
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
-    apk add --no-cache ca-certificates && \
+    apk add --no-cache ca-certificates iptables && \
    rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
 COPY get-client.sh /
@@ -0,0 +1,14 @@
 #include <iostream>
 #include <windows.h>
 using namespace std;
 typedef void (*pRun)(const char *);
 int main(int argc, char *argv[])
 {
 	HMODULE dll = LoadLibraryA("openp2p.dll");
 	pRun run = (pRun)GetProcAddress(dll, "RunCmd");
 	run("-node 5800-debug2 -token YOUR-TOKEN");
 	FreeLibrary(dll);
 	return 0;
 }
@@ -0,0 +1,42 @@
 package main
 import (
 	"fmt"
 	op "openp2p/core"
 	"time"
 )
 func main() {
 	op.Run()
 	for i := 0; i < 10; i++ {
 		go echoClient("5800-debug")
 	}
 	echoClient("5800-debug")
 }
 func echoClient(peerNode string) {
 	sendDatalen := op.ReadBuffLen
 	sendBuff := make([]byte, sendDatalen)
 	for i := 0; i < len(sendBuff); i++ {
 		sendBuff[i] = byte('A' + i/100)
 	}
 	// peerNode = "YOUR-PEER-NODE-NAME"
 	if err := op.GNetwork.ConnectNode(peerNode); err != nil {
 		fmt.Println("connect error:", err)
 		return
 	}
 	for i := 0; ; i++ {
 		sendBuff[1] = 'A' + byte(i%26)
 		if err := op.GNetwork.WriteNode(op.NodeNameToID(peerNode), sendBuff[:sendDatalen]); err != nil {
 			fmt.Println("write error:", err)
 			break
 		}
 		nd := op.GNetwork.ReadNode(time.Second * 10)
 		if nd == nil {
 			fmt.Printf("waiting for node data\n")
 			time.Sleep(time.Second * 10)
 			continue
 		}
 		fmt.Printf("read %d len=%d data=%s\n", nd.NodeID, len(nd.Data), nd.Data[:16]) // only print 16 bytes
 	}
 }
@@ -0,0 +1,32 @@
 package main
 import (
 	"fmt"
 	op "openp2p/core"
 	"time"
 )
 func main() {
 	op.Run()
 	echoServer()
 	forever := make(chan bool)
 	<-forever
 }
 func echoServer() {
 	// peerID := fmt.Sprintf("%d", core.NodeNameToID(peerNode))
 	for {
 		nd := op.GNetwork.ReadNode(time.Second * 10)
 		if nd == nil {
 			fmt.Printf("waiting for node data\n")
 			// time.Sleep(time.Second * 10)
 			continue
 		}
 		// fmt.Printf("read %s len=%d data=%s\n", nd.Node, len(nd.Data), nd.Data[:16])
 		nd.Data[0] = 'R' // echo server mark as replied
 		if err := op.GNetwork.WriteNode(nd.NodeID, nd.Data); err != nil {
 			fmt.Println("write error:", err)
 			break
 		}
 	}
 }
@@ -1,15 +1,19 @@
 module openp2p
-go 1.18
+go 1.20
 require (
 	github.com/emirpasic/gods v1.18.1
 	github.com/gorilla/websocket v1.4.2
 	github.com/openp2p-cn/go-reuseport v0.3.2
 	github.com/openp2p-cn/service v1.0.0
-	github.com/openp2p-cn/totp v0.0.0-20230102121327-8e02f6b392ed
+	github.com/openp2p-cn/totp v0.0.0-20230421034602-0f3320ffb25e
 	github.com/openp2p-cn/wireguard-go v0.0.20240223
 	github.com/quic-go/quic-go v0.34.0
-	golang.org/x/sys v0.5.0
+	github.com/vishvananda/netlink v1.1.0
 	github.com/xtaci/kcp-go/v5 v5.5.17
 	golang.org/x/sys v0.21.0
 	golang.zx2c4.com/wireguard/windows v0.5.3
 )
 require (
@@ -17,13 +21,22 @@ require (
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/kardianos/service v1.2.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/klauspost/reedsolomon v1.11.8 // indirect
 	github.com/onsi/ginkgo/v2 v2.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
 	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
-	golang.org/x/crypto v0.4.0 // indirect
+	github.com/templexxx/cpu v0.1.0 // indirect
 	github.com/templexxx/xorsimd v0.4.2 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
 	golang.org/x/crypto v0.24.0 // indirect
 	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
-	golang.org/x/mod v0.6.0 // indirect
+	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
-	golang.org/x/tools v0.2.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )
@@ -0,0 +1,18 @@
 package main
 // On Windows env
 // cd lib
 // go build -o openp2p.dll -buildmode=c-shared openp2p.go
 // caller example see example/dll
 import (
 	op "openp2p/core"
 )
 import "C"
 func main() {
 }
 //export RunCmd
 func RunCmd(cmd *C.char) {
 	op.RunCmd(C.GoString(cmd))
 }
Author	SHA1	Message	Date
TenderIronh	f015b828fc	specified gomobile version	2024-10-20 21:33:20 +08:00
TenderIronh	df1e16e708	3.21.8	2024-10-20 11:33:07 +08:00
W192547975	c68094cc12	CertPool Fix (#96 ) Remove caCertPool errCert “else” in p2pnetwork.go	2024-08-02 14:23:47 +08:00
CAESIUS_TIM	a0df0b1e95	[doc ]no bare urls (#80 )	2024-08-02 14:22:31 +08:00
TenderIronh	9c3d557f5d	LF	2024-07-26 22:27:24 +08:00
TenderIronh	2dea3a718d	check remote service	2024-07-26 22:07:48 +08:00
TenderIronh	9dda148232	3.18.4 virtual private network	2024-07-14 11:00:43 +08:00
TenderIronh	e7b696c474	miss build.gradle	2023-11-18 11:33:14 +08:00
TenderIronh	7e57237ec9	3.12.0	2023-10-28 18:03:42 +08:00
TenderIronh	52dfe5c938	fix client update bug	2023-10-28 17:56:58 +08:00