mirror of
https://github.com/openp2p-cn/openp2p.git
synced 2026-05-11 00:48:22 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
9c3d557f5d | ||
|
|
2dea3a718d |
216
USAGE-ZH.md
216
USAGE-ZH.md
@@ -1,108 +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": "YOUR-NODE-NAME",
|
"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
|
TODO: windows linux macos
|
||||||
## 卸载
|
## 卸载
|
||||||
```
|
```
|
||||||
./openp2p uninstall
|
./openp2p uninstall
|
||||||
# 已安装时
|
# 已安装时
|
||||||
# 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
|
||||||
```
|
```
|
||||||
|
|
||||||
## Docker运行
|
## Docker运行
|
||||||
```
|
```
|
||||||
# 把YOUR-TOKEN和YOUR-NODE-NAME替换成自己的
|
# 把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
|
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
|
||||||
OR
|
OR
|
||||||
docker run -d --restart=always --net host --name openp2p-client openp2pcn/openp2p-client:latest -token YOUR-TOKEN -node YOUR-NODE-NAME
|
docker run -d --restart=always --net host --name openp2p-client openp2pcn/openp2p-client:latest -token YOUR-TOKEN -node YOUR-NODE-NAME
|
||||||
```
|
```
|
||||||
|
|||||||
216
USAGE.md
216
USAGE.md
@@ -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": "YOUR-NODE-NAME",
|
"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,9 +1,9 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
op "openp2p/core"
|
op "openp2p/core"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
op.Run()
|
op.Run()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package openp2p
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"flag"
|
"flag"
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -28,6 +29,7 @@ type AppConfig struct {
|
|||||||
ForceRelay int // default:0 disable;1 enable
|
ForceRelay int // default:0 disable;1 enable
|
||||||
Enabled int // default:1
|
Enabled int // default:1
|
||||||
// runtime info
|
// runtime info
|
||||||
|
relayMode string // private|public
|
||||||
peerVersion string
|
peerVersion string
|
||||||
peerToken uint64
|
peerToken uint64
|
||||||
peerNatType int
|
peerNatType int
|
||||||
@@ -64,6 +66,13 @@ func (c *AppConfig) ID() uint64 {
|
|||||||
return uint64(c.SrcPort)*10 + 1
|
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
|
||||||
|
}
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Network NetworkConfig `json:"network"`
|
Network NetworkConfig `json:"network"`
|
||||||
Apps []*AppConfig `json:"apps"`
|
Apps []*AppConfig `json:"apps"`
|
||||||
@@ -147,7 +156,7 @@ func (c *Config) retryApp(peerNode string) {
|
|||||||
GNetwork.apps.Range(func(id, i interface{}) bool {
|
GNetwork.apps.Range(func(id, i interface{}) bool {
|
||||||
app := i.(*p2pApp)
|
app := i.(*p2pApp)
|
||||||
if app.config.PeerNode == peerNode {
|
if app.config.PeerNode == peerNode {
|
||||||
gLog.Println(LvDEBUG, "retry app ", peerNode)
|
gLog.Println(LvDEBUG, "retry app ", app.config.LogPeerNode())
|
||||||
app.config.retryNum = 0
|
app.config.retryNum = 0
|
||||||
app.config.nextRetryTime = time.Now()
|
app.config.nextRetryTime = time.Now()
|
||||||
app.retryRelayNum = 0
|
app.retryRelayNum = 0
|
||||||
@@ -157,7 +166,7 @@ func (c *Config) retryApp(peerNode string) {
|
|||||||
app.hbMtx.Unlock()
|
app.hbMtx.Unlock()
|
||||||
}
|
}
|
||||||
if app.config.RelayNode == peerNode {
|
if app.config.RelayNode == peerNode {
|
||||||
gLog.Println(LvDEBUG, "retry app ", peerNode)
|
gLog.Println(LvDEBUG, "retry app ", app.config.LogPeerNode())
|
||||||
app.retryRelayNum = 0
|
app.retryRelayNum = 0
|
||||||
app.nextRetryRelayTime = time.Now()
|
app.nextRetryRelayTime = time.Now()
|
||||||
app.hbMtx.Lock()
|
app.hbMtx.Lock()
|
||||||
@@ -171,7 +180,7 @@ func (c *Config) retryApp(peerNode string) {
|
|||||||
func (c *Config) retryAllApp() {
|
func (c *Config) retryAllApp() {
|
||||||
GNetwork.apps.Range(func(id, i interface{}) bool {
|
GNetwork.apps.Range(func(id, i interface{}) bool {
|
||||||
app := i.(*p2pApp)
|
app := i.(*p2pApp)
|
||||||
gLog.Println(LvDEBUG, "retry app ", app.config.PeerNode)
|
gLog.Println(LvDEBUG, "retry app ", app.config.LogPeerNode())
|
||||||
app.config.retryNum = 0
|
app.config.retryNum = 0
|
||||||
app.config.nextRetryTime = time.Now()
|
app.config.nextRetryTime = time.Now()
|
||||||
app.retryRelayNum = 0
|
app.retryRelayNum = 0
|
||||||
@@ -189,7 +198,7 @@ func (c *Config) retryAllMemApp() {
|
|||||||
if app.config.SrcPort != 0 {
|
if app.config.SrcPort != 0 {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
gLog.Println(LvDEBUG, "retry app ", app.config.PeerNode)
|
gLog.Println(LvDEBUG, "retry app ", app.config.LogPeerNode())
|
||||||
app.config.retryNum = 0
|
app.config.retryNum = 0
|
||||||
app.config.nextRetryTime = time.Now()
|
app.config.nextRetryTime = time.Now()
|
||||||
app.retryRelayNum = 0
|
app.retryRelayNum = 0
|
||||||
@@ -246,6 +255,9 @@ func (c *Config) delete(app AppConfig) {
|
|||||||
func (c *Config) save() {
|
func (c *Config) save() {
|
||||||
// c.mtx.Lock()
|
// c.mtx.Lock()
|
||||||
// defer c.mtx.Unlock() // internal call
|
// defer c.mtx.Unlock() // internal call
|
||||||
|
if c.Network.Token == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
data, _ := json.MarshalIndent(c, "", " ")
|
data, _ := json.MarshalIndent(c, "", " ")
|
||||||
err := os.WriteFile("config.json", data, 0644)
|
err := os.WriteFile("config.json", data, 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -256,6 +268,9 @@ func (c *Config) save() {
|
|||||||
func (c *Config) saveCache() {
|
func (c *Config) saveCache() {
|
||||||
// c.mtx.Lock()
|
// c.mtx.Lock()
|
||||||
// defer c.mtx.Unlock() // internal call
|
// defer c.mtx.Unlock() // internal call
|
||||||
|
if c.Network.Token == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
data, _ := json.MarshalIndent(c, "", " ")
|
data, _ := json.MarshalIndent(c, "", " ")
|
||||||
err := os.WriteFile("config.json0", data, 0644)
|
err := os.WriteFile("config.json0", data, 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
230
core/daemon.go
230
core/daemon.go
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,4 +29,5 @@ var (
|
|||||||
ErrPeerConnectRelay = errors.New("peer connect relayNode error")
|
ErrPeerConnectRelay = errors.New("peer connect relayNode error")
|
||||||
ErrBuildTunnelBusy = errors.New("build tunnel busy")
|
ErrBuildTunnelBusy = errors.New("build tunnel busy")
|
||||||
ErrMemAppTunnelNotFound = errors.New("memapp tunnel not found")
|
ErrMemAppTunnelNotFound = errors.New("memapp tunnel not found")
|
||||||
|
ErrRemoteServiceUnable = errors.New("remote service unable")
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,460 +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"
|
||||||
"runtime"
|
"reflect"
|
||||||
"time"
|
"runtime"
|
||||||
|
"time"
|
||||||
"github.com/openp2p-cn/totp"
|
|
||||||
)
|
"github.com/openp2p-cn/totp"
|
||||||
|
)
|
||||||
func handlePush(subType uint16, msg []byte) error {
|
|
||||||
pushHead := PushHeader{}
|
func handlePush(subType uint16, msg []byte) error {
|
||||||
err := binary.Read(bytes.NewReader(msg[openP2PHeaderSize:openP2PHeaderSize+PushHeaderSize]), binary.LittleEndian, &pushHead)
|
pushHead := PushHeader{}
|
||||||
if err != nil {
|
err := binary.Read(bytes.NewReader(msg[openP2PHeaderSize:openP2PHeaderSize+PushHeaderSize]), binary.LittleEndian, &pushHead)
|
||||||
return err
|
if err != nil {
|
||||||
}
|
return err
|
||||||
gLog.Printf(LvDEBUG, "handle push msg type:%d, push header:%+v", subType, pushHead)
|
}
|
||||||
switch subType {
|
gLog.Printf(LvDEBUG, "handle push msg type:%d, push header:%+v", subType, pushHead)
|
||||||
case MsgPushConnectReq:
|
switch subType {
|
||||||
err = handleConnectReq(msg)
|
case MsgPushConnectReq:
|
||||||
case MsgPushRsp:
|
err = handleConnectReq(msg)
|
||||||
rsp := PushRsp{}
|
case MsgPushRsp:
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
|
rsp := PushRsp{}
|
||||||
gLog.Printf(LvERROR, "wrong pushRsp:%s", err)
|
if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
|
||||||
return err
|
gLog.Printf(LvERROR, "wrong pushRsp:%s", err)
|
||||||
}
|
return err
|
||||||
if rsp.Error == 0 {
|
}
|
||||||
gLog.Printf(LvDEBUG, "push ok, detail:%s", rsp.Detail)
|
if rsp.Error == 0 {
|
||||||
} else {
|
gLog.Printf(LvDEBUG, "push ok, detail:%s", rsp.Detail)
|
||||||
gLog.Printf(LvERROR, "push error:%d, detail:%s", rsp.Error, rsp.Detail)
|
} else {
|
||||||
}
|
gLog.Printf(LvERROR, "push error:%d, detail:%s", rsp.Error, rsp.Detail)
|
||||||
case MsgPushAddRelayTunnelReq:
|
}
|
||||||
req := AddRelayTunnelReq{}
|
case MsgPushAddRelayTunnelReq:
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
|
req := AddRelayTunnelReq{}
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
|
if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
|
||||||
return err
|
gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
|
||||||
}
|
return err
|
||||||
config := AppConfig{}
|
}
|
||||||
config.PeerNode = req.RelayName
|
config := AppConfig{}
|
||||||
config.peerToken = req.RelayToken
|
config.PeerNode = req.RelayName
|
||||||
go func(r AddRelayTunnelReq) {
|
config.peerToken = req.RelayToken
|
||||||
t, errDt := GNetwork.addDirectTunnel(config, 0)
|
config.relayMode = req.RelayMode
|
||||||
if errDt == nil {
|
go func(r AddRelayTunnelReq) {
|
||||||
// notify peer relay ready
|
t, errDt := GNetwork.addDirectTunnel(config, 0)
|
||||||
msg := TunnelMsg{ID: t.id}
|
if errDt == nil {
|
||||||
GNetwork.push(r.From, MsgPushAddRelayTunnelRsp, msg)
|
// notify peer relay ready
|
||||||
appConfig := config
|
msg := TunnelMsg{ID: t.id}
|
||||||
appConfig.PeerNode = req.From
|
GNetwork.push(r.From, MsgPushAddRelayTunnelRsp, msg)
|
||||||
} else {
|
appConfig := config
|
||||||
gLog.Printf(LvERROR, "addDirectTunnel error:%s", errDt)
|
appConfig.PeerNode = req.From
|
||||||
GNetwork.push(r.From, MsgPushAddRelayTunnelRsp, "error") // compatible with old version client, trigger unmarshal error
|
} else {
|
||||||
}
|
gLog.Printf(LvERROR, "addDirectTunnel error:%s", errDt)
|
||||||
}(req)
|
GNetwork.push(r.From, MsgPushAddRelayTunnelRsp, "error") // compatible with old version client, trigger unmarshal error
|
||||||
case MsgPushServerSideSaveMemApp:
|
}
|
||||||
req := ServerSideSaveMemApp{}
|
}(req)
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
|
case MsgPushServerSideSaveMemApp:
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
|
req := ServerSideSaveMemApp{}
|
||||||
return err
|
if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
|
||||||
}
|
gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
|
||||||
gLog.Println(LvDEBUG, "handle MsgPushServerSideSaveMemApp:", prettyJson(req))
|
return err
|
||||||
var existTunnel *P2PTunnel
|
}
|
||||||
i, ok := GNetwork.allTunnels.Load(req.TunnelID)
|
gLog.Println(LvDEBUG, "handle MsgPushServerSideSaveMemApp:", prettyJson(req))
|
||||||
if !ok {
|
var existTunnel *P2PTunnel
|
||||||
time.Sleep(time.Millisecond * 100)
|
i, ok := GNetwork.allTunnels.Load(req.TunnelID)
|
||||||
i, ok = GNetwork.allTunnels.Load(req.TunnelID) // retry sometimes will receive MsgPushServerSideSaveMemApp but p2ptunnel not store yet.
|
if !ok {
|
||||||
if !ok {
|
time.Sleep(time.Millisecond * 100)
|
||||||
gLog.Println(LvERROR, "handle MsgPushServerSideSaveMemApp error:", ErrMemAppTunnelNotFound)
|
i, ok = GNetwork.allTunnels.Load(req.TunnelID) // retry sometimes will receive MsgPushServerSideSaveMemApp but p2ptunnel not store yet.
|
||||||
return ErrMemAppTunnelNotFound
|
if !ok {
|
||||||
}
|
gLog.Println(LvERROR, "handle MsgPushServerSideSaveMemApp error:", ErrMemAppTunnelNotFound)
|
||||||
}
|
return ErrMemAppTunnelNotFound
|
||||||
existTunnel = i.(*P2PTunnel)
|
}
|
||||||
peerID := NodeNameToID(req.From)
|
}
|
||||||
existApp, appok := GNetwork.apps.Load(peerID)
|
existTunnel = i.(*P2PTunnel)
|
||||||
if appok {
|
peerID := NodeNameToID(req.From)
|
||||||
app := existApp.(*p2pApp)
|
existApp, appok := GNetwork.apps.Load(peerID)
|
||||||
app.config.AppName = fmt.Sprintf("%d", peerID)
|
if appok {
|
||||||
app.id = req.AppID
|
app := existApp.(*p2pApp)
|
||||||
app.setRelayTunnelID(req.RelayTunnelID)
|
app.config.AppName = fmt.Sprintf("%d", peerID)
|
||||||
app.relayMode = req.RelayMode
|
app.id = req.AppID
|
||||||
app.hbTimeRelay = time.Now()
|
app.setRelayTunnelID(req.RelayTunnelID)
|
||||||
if req.RelayTunnelID == 0 {
|
app.relayMode = req.RelayMode
|
||||||
app.setDirectTunnel(existTunnel)
|
app.hbTimeRelay = time.Now()
|
||||||
} else {
|
if req.RelayTunnelID == 0 {
|
||||||
app.setRelayTunnel(existTunnel)
|
app.setDirectTunnel(existTunnel)
|
||||||
}
|
} else {
|
||||||
gLog.Println(LvDEBUG, "find existing memapp, update it")
|
app.setRelayTunnel(existTunnel)
|
||||||
} else {
|
}
|
||||||
appConfig := existTunnel.config
|
gLog.Println(LvDEBUG, "find existing memapp, update it")
|
||||||
appConfig.SrcPort = 0
|
} else {
|
||||||
appConfig.Protocol = ""
|
appConfig := existTunnel.config
|
||||||
appConfig.AppName = fmt.Sprintf("%d", peerID)
|
appConfig.SrcPort = 0
|
||||||
appConfig.PeerNode = req.From
|
appConfig.Protocol = ""
|
||||||
app := p2pApp{
|
appConfig.AppName = fmt.Sprintf("%d", peerID)
|
||||||
id: req.AppID,
|
appConfig.PeerNode = req.From
|
||||||
config: appConfig,
|
app := p2pApp{
|
||||||
relayMode: req.RelayMode,
|
id: req.AppID,
|
||||||
running: true,
|
config: appConfig,
|
||||||
hbTimeRelay: time.Now(),
|
relayMode: req.RelayMode,
|
||||||
}
|
running: true,
|
||||||
if req.RelayTunnelID == 0 {
|
hbTimeRelay: time.Now(),
|
||||||
app.setDirectTunnel(existTunnel)
|
}
|
||||||
} else {
|
if req.RelayTunnelID == 0 {
|
||||||
app.setRelayTunnel(existTunnel)
|
app.setDirectTunnel(existTunnel)
|
||||||
app.setRelayTunnelID(req.RelayTunnelID)
|
} else {
|
||||||
}
|
app.setRelayTunnel(existTunnel)
|
||||||
if req.RelayTunnelID != 0 {
|
app.setRelayTunnelID(req.RelayTunnelID)
|
||||||
app.relayNode = req.Node
|
}
|
||||||
}
|
if req.RelayTunnelID != 0 {
|
||||||
GNetwork.apps.Store(NodeNameToID(req.From), &app)
|
app.relayNode = req.Node
|
||||||
}
|
}
|
||||||
|
GNetwork.apps.Store(NodeNameToID(req.From), &app)
|
||||||
return nil
|
}
|
||||||
case MsgPushAPPKey:
|
|
||||||
req := APPKeySync{}
|
return nil
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
|
case MsgPushAPPKey:
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
|
req := APPKeySync{}
|
||||||
return err
|
if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
|
||||||
}
|
gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
|
||||||
SaveKey(req.AppID, req.AppKey)
|
return err
|
||||||
case MsgPushUpdate:
|
}
|
||||||
gLog.Println(LvINFO, "MsgPushUpdate")
|
SaveKey(req.AppID, req.AppKey)
|
||||||
err := update(gConf.Network.ServerHost, gConf.Network.ServerPort)
|
case MsgPushUpdate:
|
||||||
if err == nil {
|
gLog.Println(LvINFO, "MsgPushUpdate")
|
||||||
os.Exit(0)
|
err := update(gConf.Network.ServerHost, gConf.Network.ServerPort)
|
||||||
}
|
if err == nil {
|
||||||
return err
|
os.Exit(0)
|
||||||
case MsgPushRestart:
|
}
|
||||||
gLog.Println(LvINFO, "MsgPushRestart")
|
return err
|
||||||
os.Exit(0)
|
case MsgPushRestart:
|
||||||
return err
|
gLog.Println(LvINFO, "MsgPushRestart")
|
||||||
case MsgPushReportApps:
|
os.Exit(0)
|
||||||
err = handleReportApps()
|
return err
|
||||||
case MsgPushReportMemApps:
|
case MsgPushReportApps:
|
||||||
err = handleReportMemApps()
|
err = handleReportApps()
|
||||||
case MsgPushReportLog:
|
case MsgPushReportMemApps:
|
||||||
err = handleLog(msg)
|
err = handleReportMemApps()
|
||||||
case MsgPushReportGoroutine:
|
case MsgPushReportLog:
|
||||||
err = handleReportGoroutine()
|
err = handleLog(msg)
|
||||||
case MsgPushEditApp:
|
case MsgPushReportGoroutine:
|
||||||
err = handleEditApp(msg)
|
err = handleReportGoroutine()
|
||||||
case MsgPushEditNode:
|
case MsgPushCheckRemoteService:
|
||||||
gLog.Println(LvINFO, "MsgPushEditNode")
|
err = handleCheckRemoteService(msg)
|
||||||
req := EditNode{}
|
case MsgPushEditApp:
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
|
err = handleEditApp(msg)
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
|
case MsgPushEditNode:
|
||||||
return err
|
gLog.Println(LvINFO, "MsgPushEditNode")
|
||||||
}
|
req := EditNode{}
|
||||||
gConf.setNode(req.NewName)
|
if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
|
||||||
gConf.setShareBandwidth(req.Bandwidth)
|
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
|
||||||
os.Exit(0)
|
return err
|
||||||
case MsgPushSwitchApp:
|
}
|
||||||
gLog.Println(LvINFO, "MsgPushSwitchApp")
|
gConf.setNode(req.NewName)
|
||||||
app := AppInfo{}
|
gConf.setShareBandwidth(req.Bandwidth)
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize:], &app); err != nil {
|
os.Exit(0)
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(app), err, string(msg[openP2PHeaderSize:]))
|
case MsgPushSwitchApp:
|
||||||
return err
|
gLog.Println(LvINFO, "MsgPushSwitchApp")
|
||||||
}
|
app := AppInfo{}
|
||||||
config := AppConfig{Enabled: app.Enabled, SrcPort: app.SrcPort, Protocol: app.Protocol}
|
if err = json.Unmarshal(msg[openP2PHeaderSize:], &app); err != nil {
|
||||||
gLog.Println(LvINFO, app.AppName, " switch to ", app.Enabled)
|
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(app), err, string(msg[openP2PHeaderSize:]))
|
||||||
gConf.switchApp(config, app.Enabled)
|
return err
|
||||||
if app.Enabled == 0 {
|
}
|
||||||
// disable APP
|
config := AppConfig{Enabled: app.Enabled, SrcPort: app.SrcPort, Protocol: app.Protocol}
|
||||||
GNetwork.DeleteApp(config)
|
gLog.Println(LvINFO, app.AppName, " switch to ", app.Enabled)
|
||||||
}
|
gConf.switchApp(config, app.Enabled)
|
||||||
case MsgPushDstNodeOnline:
|
if app.Enabled == 0 {
|
||||||
gLog.Println(LvINFO, "MsgPushDstNodeOnline")
|
// disable APP
|
||||||
req := PushDstNodeOnline{}
|
GNetwork.DeleteApp(config)
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
|
}
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
|
case MsgPushDstNodeOnline:
|
||||||
return err
|
gLog.Println(LvINFO, "MsgPushDstNodeOnline")
|
||||||
}
|
req := PushDstNodeOnline{}
|
||||||
gLog.Println(LvINFO, "retry peerNode ", req.Node)
|
if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
|
||||||
gConf.retryApp(req.Node)
|
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
|
||||||
default:
|
return err
|
||||||
i, ok := GNetwork.msgMap.Load(pushHead.From)
|
}
|
||||||
if !ok {
|
gLog.Println(LvINFO, "retry peerNode ", req.Node)
|
||||||
return ErrMsgChannelNotFound
|
gConf.retryApp(req.Node)
|
||||||
}
|
default:
|
||||||
ch := i.(chan msgCtx)
|
i, ok := GNetwork.msgMap.Load(pushHead.From)
|
||||||
ch <- msgCtx{data: msg, ts: time.Now()}
|
if !ok {
|
||||||
}
|
return ErrMsgChannelNotFound
|
||||||
return err
|
}
|
||||||
}
|
ch := i.(chan msgCtx)
|
||||||
|
ch <- msgCtx{data: msg, ts: time.Now()}
|
||||||
func handleEditApp(msg []byte) (err error) {
|
}
|
||||||
gLog.Println(LvINFO, "MsgPushEditApp")
|
return err
|
||||||
newApp := AppInfo{}
|
}
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize:], &newApp); err != nil {
|
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(newApp), err, string(msg[openP2PHeaderSize:]))
|
func handleEditApp(msg []byte) (err error) {
|
||||||
return err
|
gLog.Println(LvINFO, "MsgPushEditApp")
|
||||||
}
|
newApp := AppInfo{}
|
||||||
oldConf := AppConfig{Enabled: 1}
|
if err = json.Unmarshal(msg[openP2PHeaderSize:], &newApp); err != nil {
|
||||||
// protocol0+srcPort0 exist, delApp
|
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(newApp), err, string(msg[openP2PHeaderSize:]))
|
||||||
oldConf.AppName = newApp.AppName
|
return err
|
||||||
oldConf.Protocol = newApp.Protocol0
|
}
|
||||||
oldConf.Whitelist = newApp.Whitelist
|
oldConf := AppConfig{Enabled: 1}
|
||||||
oldConf.SrcPort = newApp.SrcPort0
|
// protocol0+srcPort0 exist, delApp
|
||||||
oldConf.PeerNode = newApp.PeerNode
|
oldConf.AppName = newApp.AppName
|
||||||
oldConf.DstHost = newApp.DstHost
|
oldConf.Protocol = newApp.Protocol0
|
||||||
oldConf.DstPort = newApp.DstPort
|
oldConf.Whitelist = newApp.Whitelist
|
||||||
if newApp.Protocol0 != "" && newApp.SrcPort0 != 0 { // not edit
|
oldConf.SrcPort = newApp.SrcPort0
|
||||||
gConf.delete(oldConf)
|
oldConf.PeerNode = newApp.PeerNode
|
||||||
}
|
oldConf.DstHost = newApp.DstHost
|
||||||
|
oldConf.DstPort = newApp.DstPort
|
||||||
// AddApp
|
if newApp.Protocol0 != "" && newApp.SrcPort0 != 0 { // not edit
|
||||||
newConf := oldConf
|
gConf.delete(oldConf)
|
||||||
newConf.Protocol = newApp.Protocol
|
}
|
||||||
newConf.SrcPort = newApp.SrcPort
|
|
||||||
newConf.RelayNode = newApp.SpecRelayNode
|
// AddApp
|
||||||
newConf.PunchPriority = newApp.PunchPriority
|
newConf := oldConf
|
||||||
gConf.add(newConf, false)
|
newConf.Protocol = newApp.Protocol
|
||||||
if newApp.Protocol0 != "" && newApp.SrcPort0 != 0 { // not edit
|
newConf.SrcPort = newApp.SrcPort
|
||||||
GNetwork.DeleteApp(oldConf) // DeleteApp may cost some times, execute at the end
|
newConf.RelayNode = newApp.SpecRelayNode
|
||||||
}
|
newConf.PunchPriority = newApp.PunchPriority
|
||||||
return nil
|
gConf.add(newConf, false)
|
||||||
}
|
if newApp.Protocol0 != "" && newApp.SrcPort0 != 0 { // not edit
|
||||||
|
GNetwork.DeleteApp(oldConf) // DeleteApp may cost some times, execute at the end
|
||||||
func handleConnectReq(msg []byte) (err error) {
|
}
|
||||||
req := PushConnectReq{}
|
return nil
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
|
}
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
|
|
||||||
return err
|
func handleConnectReq(msg []byte) (err error) {
|
||||||
}
|
req := PushConnectReq{}
|
||||||
gLog.Printf(LvDEBUG, "%s is connecting...", req.From)
|
if err = json.Unmarshal(msg[openP2PHeaderSize+PushHeaderSize:], &req); err != nil {
|
||||||
gLog.Println(LvDEBUG, "push connect response to ", req.From)
|
gLog.Printf(LvERROR, "wrong %v:%s", reflect.TypeOf(req), err)
|
||||||
if compareVersion(req.Version, LeastSupportVersion) < 0 {
|
return err
|
||||||
gLog.Println(LvERROR, ErrVersionNotCompatible.Error(), ":", req.From)
|
}
|
||||||
rsp := PushConnectRsp{
|
gLog.Printf(LvDEBUG, "%s is connecting...", req.From)
|
||||||
Error: 10,
|
gLog.Println(LvDEBUG, "push connect response to ", req.From)
|
||||||
Detail: ErrVersionNotCompatible.Error(),
|
if compareVersion(req.Version, LeastSupportVersion) < 0 {
|
||||||
To: req.From,
|
gLog.Println(LvERROR, ErrVersionNotCompatible.Error(), ":", req.From)
|
||||||
From: gConf.Network.Node,
|
rsp := PushConnectRsp{
|
||||||
}
|
Error: 10,
|
||||||
GNetwork.push(req.From, MsgPushConnectRsp, rsp)
|
Detail: ErrVersionNotCompatible.Error(),
|
||||||
return ErrVersionNotCompatible
|
To: req.From,
|
||||||
}
|
From: gConf.Network.Node,
|
||||||
// verify totp token or token
|
}
|
||||||
t := totp.TOTP{Step: totp.RelayTOTPStep}
|
GNetwork.push(req.From, MsgPushConnectRsp, rsp)
|
||||||
if t.Verify(req.Token, gConf.Network.Token, time.Now().Unix()-GNetwork.dt/int64(time.Second)) { // localTs may behind, auto adjust ts
|
return ErrVersionNotCompatible
|
||||||
gLog.Printf(LvINFO, "Access Granted")
|
}
|
||||||
config := AppConfig{}
|
// verify totp token or token
|
||||||
config.peerNatType = req.NatType
|
t := totp.TOTP{Step: totp.RelayTOTPStep}
|
||||||
config.peerConeNatPort = req.ConeNatPort
|
if t.Verify(req.Token, gConf.Network.Token, time.Now().Unix()-GNetwork.dt/int64(time.Second)) { // localTs may behind, auto adjust ts
|
||||||
config.peerIP = req.FromIP
|
gLog.Printf(LvINFO, "Access Granted")
|
||||||
config.PeerNode = req.From
|
config := AppConfig{}
|
||||||
config.peerVersion = req.Version
|
config.peerNatType = req.NatType
|
||||||
config.fromToken = req.Token
|
config.peerConeNatPort = req.ConeNatPort
|
||||||
config.peerIPv6 = req.IPv6
|
config.peerIP = req.FromIP
|
||||||
config.hasIPv4 = req.HasIPv4
|
config.PeerNode = req.From
|
||||||
config.hasUPNPorNATPMP = req.HasUPNPorNATPMP
|
config.peerVersion = req.Version
|
||||||
config.linkMode = req.LinkMode
|
config.fromToken = req.Token
|
||||||
config.isUnderlayServer = req.IsUnderlayServer
|
config.peerIPv6 = req.IPv6
|
||||||
config.UnderlayProtocol = req.UnderlayProtocol
|
config.hasIPv4 = req.HasIPv4
|
||||||
// share relay node will limit bandwidth
|
config.hasUPNPorNATPMP = req.HasUPNPorNATPMP
|
||||||
if req.Token != gConf.Network.Token {
|
config.linkMode = req.LinkMode
|
||||||
gLog.Printf(LvINFO, "set share bandwidth %d mbps", gConf.Network.ShareBandwidth)
|
config.isUnderlayServer = req.IsUnderlayServer
|
||||||
config.shareBandwidth = gConf.Network.ShareBandwidth
|
config.UnderlayProtocol = req.UnderlayProtocol
|
||||||
}
|
// share relay node will limit bandwidth
|
||||||
// go GNetwork.AddTunnel(config, req.ID)
|
if req.Token != gConf.Network.Token {
|
||||||
go func() {
|
gLog.Printf(LvINFO, "set share bandwidth %d mbps", gConf.Network.ShareBandwidth)
|
||||||
GNetwork.addDirectTunnel(config, req.ID)
|
config.shareBandwidth = gConf.Network.ShareBandwidth
|
||||||
}()
|
}
|
||||||
return nil
|
// go GNetwork.AddTunnel(config, req.ID)
|
||||||
}
|
go func() {
|
||||||
gLog.Println(LvERROR, "Access Denied:", req.From)
|
GNetwork.addDirectTunnel(config, req.ID)
|
||||||
rsp := PushConnectRsp{
|
}()
|
||||||
Error: 1,
|
return nil
|
||||||
Detail: fmt.Sprintf("connect to %s error: Access Denied", gConf.Network.Node),
|
}
|
||||||
To: req.From,
|
gLog.Println(LvERROR, "Access Denied:", req.From)
|
||||||
From: gConf.Network.Node,
|
rsp := PushConnectRsp{
|
||||||
}
|
Error: 1,
|
||||||
return GNetwork.push(req.From, MsgPushConnectRsp, rsp)
|
Detail: fmt.Sprintf("connect to %s error: Access Denied", gConf.Network.Node),
|
||||||
}
|
To: req.From,
|
||||||
|
From: gConf.Network.Node,
|
||||||
func handleReportApps() (err error) {
|
}
|
||||||
gLog.Println(LvINFO, "MsgPushReportApps")
|
return GNetwork.push(req.From, MsgPushConnectRsp, rsp)
|
||||||
req := ReportApps{}
|
}
|
||||||
gConf.mtx.Lock()
|
|
||||||
defer gConf.mtx.Unlock()
|
func handleReportApps() (err error) {
|
||||||
|
gLog.Println(LvINFO, "MsgPushReportApps")
|
||||||
for _, config := range gConf.Apps {
|
req := ReportApps{}
|
||||||
appActive := 0
|
gConf.mtx.Lock()
|
||||||
relayNode := ""
|
defer gConf.mtx.Unlock()
|
||||||
specRelayNode := ""
|
|
||||||
relayMode := ""
|
for _, config := range gConf.Apps {
|
||||||
linkMode := LinkModeUDPPunch
|
appActive := 0
|
||||||
var connectTime string
|
relayNode := ""
|
||||||
var retryTime string
|
specRelayNode := ""
|
||||||
var app *p2pApp
|
relayMode := ""
|
||||||
i, ok := GNetwork.apps.Load(config.ID())
|
linkMode := LinkModeUDPPunch
|
||||||
if ok {
|
var connectTime string
|
||||||
app = i.(*p2pApp)
|
var retryTime string
|
||||||
if app.isActive() {
|
var app *p2pApp
|
||||||
appActive = 1
|
i, ok := GNetwork.apps.Load(config.ID())
|
||||||
}
|
if ok {
|
||||||
if app.config.SrcPort == 0 { // memapp
|
app = i.(*p2pApp)
|
||||||
continue
|
if app.isActive() {
|
||||||
}
|
appActive = 1
|
||||||
specRelayNode = app.config.RelayNode
|
}
|
||||||
if !app.isDirect() { // TODO: should always report relay node for app edit
|
if app.config.SrcPort == 0 { // memapp
|
||||||
relayNode = app.relayNode
|
continue
|
||||||
relayMode = app.relayMode
|
}
|
||||||
}
|
specRelayNode = app.config.RelayNode
|
||||||
|
if !app.isDirect() { // TODO: should always report relay node for app edit
|
||||||
if app.Tunnel() != nil {
|
relayNode = app.relayNode
|
||||||
linkMode = app.Tunnel().linkModeWeb
|
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")
|
if app.Tunnel() != nil {
|
||||||
|
linkMode = app.Tunnel().linkModeWeb
|
||||||
}
|
}
|
||||||
appInfo := AppInfo{
|
retryTime = app.RetryTime().Local().Format("2006-01-02T15:04:05-0700")
|
||||||
AppName: config.AppName,
|
connectTime = app.ConnectTime().Local().Format("2006-01-02T15:04:05-0700")
|
||||||
Error: config.errMsg,
|
|
||||||
Protocol: config.Protocol,
|
}
|
||||||
PunchPriority: config.PunchPriority,
|
appInfo := AppInfo{
|
||||||
Whitelist: config.Whitelist,
|
AppName: config.AppName,
|
||||||
SrcPort: config.SrcPort,
|
Error: config.errMsg,
|
||||||
RelayNode: relayNode,
|
Protocol: config.Protocol,
|
||||||
SpecRelayNode: specRelayNode,
|
PunchPriority: config.PunchPriority,
|
||||||
RelayMode: relayMode,
|
Whitelist: config.Whitelist,
|
||||||
LinkMode: linkMode,
|
SrcPort: config.SrcPort,
|
||||||
PeerNode: config.PeerNode,
|
RelayNode: relayNode,
|
||||||
DstHost: config.DstHost,
|
SpecRelayNode: specRelayNode,
|
||||||
DstPort: config.DstPort,
|
RelayMode: relayMode,
|
||||||
PeerUser: config.PeerUser,
|
LinkMode: linkMode,
|
||||||
PeerIP: config.peerIP,
|
PeerNode: config.PeerNode,
|
||||||
PeerNatType: config.peerNatType,
|
DstHost: config.DstHost,
|
||||||
RetryTime: retryTime,
|
DstPort: config.DstPort,
|
||||||
ConnectTime: connectTime,
|
PeerUser: config.PeerUser,
|
||||||
IsActive: appActive,
|
PeerIP: config.peerIP,
|
||||||
Enabled: config.Enabled,
|
PeerNatType: config.peerNatType,
|
||||||
}
|
RetryTime: retryTime,
|
||||||
req.Apps = append(req.Apps, appInfo)
|
ConnectTime: connectTime,
|
||||||
}
|
IsActive: appActive,
|
||||||
return GNetwork.write(MsgReport, MsgReportApps, &req)
|
Enabled: config.Enabled,
|
||||||
|
}
|
||||||
}
|
req.Apps = append(req.Apps, appInfo)
|
||||||
|
}
|
||||||
func handleReportMemApps() (err error) {
|
return GNetwork.write(MsgReport, MsgReportApps, &req)
|
||||||
gLog.Println(LvINFO, "handleReportMemApps")
|
|
||||||
req := ReportApps{}
|
}
|
||||||
gConf.mtx.Lock()
|
|
||||||
defer gConf.mtx.Unlock()
|
func handleReportMemApps() (err error) {
|
||||||
GNetwork.sdwan.sysRoute.Range(func(key, value interface{}) bool {
|
gLog.Println(LvINFO, "handleReportMemApps")
|
||||||
node := value.(*sdwanNode)
|
req := ReportApps{}
|
||||||
appActive := 0
|
gConf.mtx.Lock()
|
||||||
relayMode := ""
|
defer gConf.mtx.Unlock()
|
||||||
var connectTime string
|
GNetwork.sdwan.sysRoute.Range(func(key, value interface{}) bool {
|
||||||
var retryTime string
|
node := value.(*sdwanNode)
|
||||||
|
appActive := 0
|
||||||
i, ok := GNetwork.apps.Load(node.id)
|
relayMode := ""
|
||||||
var app *p2pApp
|
var connectTime string
|
||||||
if ok {
|
var retryTime string
|
||||||
app = i.(*p2pApp)
|
|
||||||
if app.isActive() {
|
i, ok := GNetwork.apps.Load(node.id)
|
||||||
appActive = 1
|
var app *p2pApp
|
||||||
}
|
if ok {
|
||||||
if !app.isDirect() {
|
app = i.(*p2pApp)
|
||||||
relayMode = app.relayMode
|
if app.isActive() {
|
||||||
}
|
appActive = 1
|
||||||
retryTime = app.RetryTime().Local().Format("2006-01-02T15:04:05-0700")
|
}
|
||||||
connectTime = app.ConnectTime().Local().Format("2006-01-02T15:04:05-0700")
|
if !app.isDirect() {
|
||||||
}
|
relayMode = app.relayMode
|
||||||
appInfo := AppInfo{
|
}
|
||||||
RelayMode: relayMode,
|
retryTime = app.RetryTime().Local().Format("2006-01-02T15:04:05-0700")
|
||||||
PeerNode: node.name,
|
connectTime = app.ConnectTime().Local().Format("2006-01-02T15:04:05-0700")
|
||||||
IsActive: appActive,
|
}
|
||||||
Enabled: 1,
|
appInfo := AppInfo{
|
||||||
}
|
RelayMode: relayMode,
|
||||||
if app != nil {
|
PeerNode: node.name,
|
||||||
appInfo.AppName = app.config.AppName
|
IsActive: appActive,
|
||||||
appInfo.Error = app.config.errMsg
|
Enabled: 1,
|
||||||
appInfo.Protocol = app.config.Protocol
|
}
|
||||||
appInfo.Whitelist = app.config.Whitelist
|
if app != nil {
|
||||||
appInfo.SrcPort = app.config.SrcPort
|
appInfo.AppName = app.config.AppName
|
||||||
if !app.isDirect() {
|
appInfo.Error = app.config.errMsg
|
||||||
appInfo.RelayNode = app.relayNode
|
appInfo.Protocol = app.config.Protocol
|
||||||
}
|
appInfo.Whitelist = app.config.Whitelist
|
||||||
|
appInfo.SrcPort = app.config.SrcPort
|
||||||
if app.Tunnel() != nil {
|
if !app.isDirect() {
|
||||||
appInfo.LinkMode = app.Tunnel().linkModeWeb
|
appInfo.RelayNode = app.relayNode
|
||||||
}
|
}
|
||||||
appInfo.DstHost = app.config.DstHost
|
|
||||||
appInfo.DstPort = app.config.DstPort
|
if app.Tunnel() != nil {
|
||||||
appInfo.PeerUser = app.config.PeerUser
|
appInfo.LinkMode = app.Tunnel().linkModeWeb
|
||||||
appInfo.PeerIP = app.config.peerIP
|
}
|
||||||
appInfo.PeerNatType = app.config.peerNatType
|
appInfo.DstHost = app.config.DstHost
|
||||||
appInfo.RetryTime = retryTime
|
appInfo.DstPort = app.config.DstPort
|
||||||
appInfo.ConnectTime = connectTime
|
appInfo.PeerUser = app.config.PeerUser
|
||||||
}
|
appInfo.PeerIP = app.config.peerIP
|
||||||
req.Apps = append(req.Apps, appInfo)
|
appInfo.PeerNatType = app.config.peerNatType
|
||||||
return true
|
appInfo.RetryTime = retryTime
|
||||||
})
|
appInfo.ConnectTime = connectTime
|
||||||
gLog.Println(LvDEBUG, "handleReportMemApps res:", prettyJson(req))
|
}
|
||||||
return GNetwork.write(MsgReport, MsgReportMemApps, &req)
|
req.Apps = append(req.Apps, appInfo)
|
||||||
}
|
return true
|
||||||
|
})
|
||||||
func handleLog(msg []byte) (err error) {
|
gLog.Println(LvDEBUG, "handleReportMemApps res:", prettyJson(req))
|
||||||
gLog.Println(LvDEBUG, "MsgPushReportLog")
|
return GNetwork.write(MsgReport, MsgReportMemApps, &req)
|
||||||
const defaultLen = 1024 * 128
|
}
|
||||||
const maxLen = 1024 * 1024
|
|
||||||
req := ReportLogReq{}
|
func handleLog(msg []byte) (err error) {
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
|
gLog.Println(LvDEBUG, "MsgPushReportLog")
|
||||||
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
|
const defaultLen = 1024 * 128
|
||||||
return err
|
const maxLen = 1024 * 1024
|
||||||
}
|
req := ReportLogReq{}
|
||||||
if req.FileName == "" {
|
if err = json.Unmarshal(msg[openP2PHeaderSize:], &req); err != nil {
|
||||||
req.FileName = "openp2p.log"
|
gLog.Printf(LvERROR, "wrong %v:%s %s", reflect.TypeOf(req), err, string(msg[openP2PHeaderSize:]))
|
||||||
} else {
|
return err
|
||||||
req.FileName = sanitizeFileName(req.FileName)
|
}
|
||||||
}
|
if req.FileName == "" {
|
||||||
f, err := os.Open(filepath.Join("log", req.FileName))
|
req.FileName = "openp2p.log"
|
||||||
if err != nil {
|
} else {
|
||||||
gLog.Println(LvERROR, "read log file error:", err)
|
req.FileName = sanitizeFileName(req.FileName)
|
||||||
return err
|
}
|
||||||
}
|
f, err := os.Open(filepath.Join("log", req.FileName))
|
||||||
fi, err := f.Stat()
|
if err != nil {
|
||||||
if err != nil {
|
gLog.Println(LvERROR, "read log file error:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if req.Offset > fi.Size() {
|
fi, err := f.Stat()
|
||||||
req.Offset = fi.Size() - defaultLen
|
if err != nil {
|
||||||
}
|
return err
|
||||||
// verify input parameters
|
}
|
||||||
if req.Offset < 0 {
|
if req.Offset > fi.Size() {
|
||||||
req.Offset = 0
|
req.Offset = fi.Size() - defaultLen
|
||||||
}
|
}
|
||||||
if req.Len <= 0 || req.Len > maxLen {
|
// verify input parameters
|
||||||
req.Len = defaultLen
|
if req.Offset < 0 {
|
||||||
}
|
req.Offset = 0
|
||||||
|
}
|
||||||
f.Seek(req.Offset, 0)
|
if req.Len <= 0 || req.Len > maxLen {
|
||||||
buff := make([]byte, req.Len)
|
req.Len = defaultLen
|
||||||
readLength, err := f.Read(buff)
|
}
|
||||||
f.Close()
|
|
||||||
if err != nil {
|
f.Seek(req.Offset, 0)
|
||||||
gLog.Println(LvERROR, "read log content error:", err)
|
buff := make([]byte, req.Len)
|
||||||
return err
|
readLength, err := f.Read(buff)
|
||||||
}
|
f.Close()
|
||||||
rsp := ReportLogRsp{}
|
if err != nil {
|
||||||
rsp.Content = string(buff[:readLength])
|
gLog.Println(LvERROR, "read log content error:", err)
|
||||||
rsp.FileName = req.FileName
|
return err
|
||||||
rsp.Total = fi.Size()
|
}
|
||||||
rsp.Len = req.Len
|
rsp := ReportLogRsp{}
|
||||||
return GNetwork.write(MsgReport, MsgPushReportLog, &rsp)
|
rsp.Content = string(buff[:readLength])
|
||||||
}
|
rsp.FileName = req.FileName
|
||||||
|
rsp.Total = fi.Size()
|
||||||
func handleReportGoroutine() (err error) {
|
rsp.Len = req.Len
|
||||||
gLog.Println(LvDEBUG, "handleReportGoroutine")
|
return GNetwork.write(MsgReport, MsgPushReportLog, &rsp)
|
||||||
buf := make([]byte, 1024*128)
|
}
|
||||||
stackLen := runtime.Stack(buf, true)
|
|
||||||
return GNetwork.write(MsgReport, MsgPushReportLog, string(buf[:stackLen]))
|
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)
|
||||||
|
}
|
||||||
|
|||||||
248
core/install.go
248
core/install.go
@@ -1,124 +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"
|
||||||
)
|
)
|
||||||
|
|
||||||
func install() {
|
func install() {
|
||||||
gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
|
gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
|
||||||
gLog.Println(LvINFO, "Contact: QQ group 16947733, Email openp2p.cn@gmail.com")
|
gLog.Println(LvINFO, "Contact: QQ group 16947733, Email openp2p.cn@gmail.com")
|
||||||
gLog.Println(LvINFO, "install start")
|
gLog.Println(LvINFO, "install start")
|
||||||
defer gLog.Println(LvINFO, "install end")
|
defer gLog.Println(LvINFO, "install end")
|
||||||
// auto uninstall
|
// auto uninstall
|
||||||
err := os.MkdirAll(defaultInstallPath, 0775)
|
err := os.MkdirAll(defaultInstallPath, 0775)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "MkdirAll %s error:%s", defaultInstallPath, err)
|
gLog.Printf(LvERROR, "MkdirAll %s error:%s", defaultInstallPath, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = os.Chdir(defaultInstallPath)
|
err = os.Chdir(defaultInstallPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "cd error:", err)
|
gLog.Println(LvERROR, "cd error:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
uninstall()
|
uninstall()
|
||||||
// save config file
|
// save config file
|
||||||
parseParams("install", "")
|
parseParams("install", "")
|
||||||
targetPath := filepath.Join(defaultInstallPath, defaultBinName)
|
targetPath := filepath.Join(defaultInstallPath, defaultBinName)
|
||||||
d := daemon{}
|
d := daemon{}
|
||||||
// copy files
|
// copy files
|
||||||
|
|
||||||
binPath, _ := os.Executable()
|
binPath, _ := os.Executable()
|
||||||
src, errFiles := os.Open(binPath) // can not use args[0], on Windows call openp2p is ok(=openp2p.exe)
|
src, errFiles := os.Open(binPath) // can not use args[0], on Windows call openp2p is ok(=openp2p.exe)
|
||||||
if errFiles != nil {
|
if errFiles != nil {
|
||||||
gLog.Printf(LvERROR, "os.OpenFile %s error:%s", os.Args[0], errFiles)
|
gLog.Printf(LvERROR, "os.OpenFile %s error:%s", os.Args[0], errFiles)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
dst, errFiles := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0775)
|
dst, errFiles := os.OpenFile(targetPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0775)
|
||||||
if errFiles != nil {
|
if errFiles != nil {
|
||||||
gLog.Printf(LvERROR, "os.OpenFile %s error:%s", targetPath, errFiles)
|
gLog.Printf(LvERROR, "os.OpenFile %s error:%s", targetPath, errFiles)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
_, errFiles = io.Copy(dst, src)
|
_, errFiles = io.Copy(dst, src)
|
||||||
if errFiles != nil {
|
if errFiles != nil {
|
||||||
gLog.Printf(LvERROR, "io.Copy error:%s", errFiles)
|
gLog.Printf(LvERROR, "io.Copy error:%s", errFiles)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
src.Close()
|
src.Close()
|
||||||
dst.Close()
|
dst.Close()
|
||||||
|
|
||||||
// install system service
|
// install system service
|
||||||
gLog.Println(LvINFO, "targetPath:", targetPath)
|
gLog.Println(LvINFO, "targetPath:", targetPath)
|
||||||
err = d.Control("install", targetPath, []string{"-d"})
|
err = d.Control("install", targetPath, []string{"-d"})
|
||||||
if err == nil {
|
if err == nil {
|
||||||
gLog.Println(LvINFO, "install system service ok.")
|
gLog.Println(LvINFO, "install system service ok.")
|
||||||
}
|
}
|
||||||
time.Sleep(time.Second * 2)
|
time.Sleep(time.Second * 2)
|
||||||
err = d.Control("start", targetPath, []string{"-d"})
|
err = d.Control("start", targetPath, []string{"-d"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "start openp2p service error:", err)
|
gLog.Println(LvERROR, "start openp2p service error:", err)
|
||||||
} else {
|
} else {
|
||||||
gLog.Println(LvINFO, "start openp2p service ok.")
|
gLog.Println(LvINFO, "start openp2p service ok.")
|
||||||
}
|
}
|
||||||
gLog.Println(LvINFO, "Visit WebUI on https://console.openp2p.cn")
|
gLog.Println(LvINFO, "Visit WebUI on https://console.openp2p.cn")
|
||||||
}
|
}
|
||||||
|
|
||||||
func installByFilename() {
|
func installByFilename() {
|
||||||
params := strings.Split(filepath.Base(os.Args[0]), "-")
|
params := strings.Split(filepath.Base(os.Args[0]), "-")
|
||||||
if len(params) < 4 {
|
if len(params) < 4 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
serverHost := params[1]
|
serverHost := params[1]
|
||||||
token := params[2]
|
token := params[2]
|
||||||
gLog.Println(LvINFO, "install start")
|
gLog.Println(LvINFO, "install start")
|
||||||
targetPath := os.Args[0]
|
targetPath := os.Args[0]
|
||||||
args := []string{"install"}
|
args := []string{"install"}
|
||||||
args = append(args, "-serverhost")
|
args = append(args, "-serverhost")
|
||||||
args = append(args, serverHost)
|
args = append(args, serverHost)
|
||||||
args = append(args, "-token")
|
args = append(args, "-token")
|
||||||
args = append(args, token)
|
args = append(args, token)
|
||||||
env := os.Environ()
|
env := os.Environ()
|
||||||
cmd := exec.Command(targetPath, args...)
|
cmd := exec.Command(targetPath, args...)
|
||||||
cmd.Stdout = os.Stdout
|
cmd.Stdout = os.Stdout
|
||||||
cmd.Stderr = os.Stderr
|
cmd.Stderr = os.Stderr
|
||||||
cmd.Stdin = os.Stdin
|
cmd.Stdin = os.Stdin
|
||||||
cmd.Env = env
|
cmd.Env = env
|
||||||
err := cmd.Run()
|
err := cmd.Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "install by filename, start process error:", err)
|
gLog.Println(LvERROR, "install by filename, start process error:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
gLog.Println(LvINFO, "install end")
|
gLog.Println(LvINFO, "install end")
|
||||||
gLog.Println(LvINFO, "Visit WebUI on https://console.openp2p.cn")
|
gLog.Println(LvINFO, "Visit WebUI on https://console.openp2p.cn")
|
||||||
fmt.Println("Press the Any Key to exit")
|
fmt.Println("Press the Any Key to exit")
|
||||||
fmt.Scanln()
|
fmt.Scanln()
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
func uninstall() {
|
func uninstall() {
|
||||||
gLog.Println(LvINFO, "uninstall start")
|
gLog.Println(LvINFO, "uninstall start")
|
||||||
defer gLog.Println(LvINFO, "uninstall end")
|
defer gLog.Println(LvINFO, "uninstall end")
|
||||||
d := daemon{}
|
d := daemon{}
|
||||||
err := d.Control("stop", "", nil)
|
err := d.Control("stop", "", nil)
|
||||||
if err != nil { // service maybe not install
|
if err != nil { // service maybe not install
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = d.Control("uninstall", "", nil)
|
err = d.Control("uninstall", "", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "uninstall system service error:", err)
|
gLog.Println(LvERROR, "uninstall system service error:", err)
|
||||||
} else {
|
} else {
|
||||||
gLog.Println(LvINFO, "uninstall system service ok.")
|
gLog.Println(LvINFO, "uninstall system service ok.")
|
||||||
}
|
}
|
||||||
binPath := filepath.Join(defaultInstallPath, defaultBinName)
|
binPath := filepath.Join(defaultInstallPath, defaultBinName)
|
||||||
os.Remove(binPath + "0")
|
os.Remove(binPath + "0")
|
||||||
os.Remove(binPath)
|
os.Remove(binPath)
|
||||||
// os.RemoveAll(defaultInstallPath) // reserve config.json
|
// os.RemoveAll(defaultInstallPath) // reserve config.json
|
||||||
}
|
}
|
||||||
|
|||||||
148
core/iptables.go
148
core/iptables.go
@@ -1,74 +1,74 @@
|
|||||||
package openp2p
|
package openp2p
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"runtime"
|
"runtime"
|
||||||
)
|
)
|
||||||
|
|
||||||
func allowTunForward() {
|
func allowTunForward() {
|
||||||
if runtime.GOOS != "linux" { // only support Linux
|
if runtime.GOOS != "linux" { // only support Linux
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
exec.Command("sh", "-c", `iptables -t filter -D FORWARD -i optun -j ACCEPT`).Run()
|
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()
|
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()
|
err := exec.Command("sh", "-c", `iptables -t filter -I FORWARD -i optun -j ACCEPT`).Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("allow foward in error:", err)
|
log.Println("allow foward in error:", err)
|
||||||
}
|
}
|
||||||
err = exec.Command("sh", "-c", `iptables -t filter -I FORWARD -o optun -j ACCEPT`).Run()
|
err = exec.Command("sh", "-c", `iptables -t filter -I FORWARD -o optun -j ACCEPT`).Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("allow foward out error:", err)
|
log.Println("allow foward out error:", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func clearSNATRule() {
|
func clearSNATRule() {
|
||||||
if runtime.GOOS != "linux" {
|
if runtime.GOOS != "linux" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
execCommand("iptables", true, "-t", "nat", "-D", "POSTROUTING", "-j", "OPSDWAN")
|
execCommand("iptables", true, "-t", "nat", "-D", "POSTROUTING", "-j", "OPSDWAN")
|
||||||
execCommand("iptables", true, "-t", "nat", "-F", "OPSDWAN")
|
execCommand("iptables", true, "-t", "nat", "-F", "OPSDWAN")
|
||||||
execCommand("iptables", true, "-t", "nat", "-X", "OPSDWAN")
|
execCommand("iptables", true, "-t", "nat", "-X", "OPSDWAN")
|
||||||
}
|
}
|
||||||
|
|
||||||
func initSNATRule(localNet string) {
|
func initSNATRule(localNet string) {
|
||||||
if runtime.GOOS != "linux" {
|
if runtime.GOOS != "linux" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
clearSNATRule()
|
clearSNATRule()
|
||||||
|
|
||||||
err := execCommand("iptables", true, "-t", "nat", "-N", "OPSDWAN")
|
err := execCommand("iptables", true, "-t", "nat", "-N", "OPSDWAN")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("iptables new sdwan chain error:", err)
|
log.Println("iptables new sdwan chain error:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = execCommand("iptables", true, "-t", "nat", "-A", "POSTROUTING", "-j", "OPSDWAN")
|
err = execCommand("iptables", true, "-t", "nat", "-A", "POSTROUTING", "-j", "OPSDWAN")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("iptables append postrouting error:", err)
|
log.Println("iptables append postrouting error:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN",
|
err = execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN",
|
||||||
"-o", "optun", "!", "-s", localNet, "-j", "MASQUERADE")
|
"-o", "optun", "!", "-s", localNet, "-j", "MASQUERADE")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("add optun snat error:", err)
|
log.Println("add optun snat error:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN", "!", "-o", "optun",
|
err = execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN", "!", "-o", "optun",
|
||||||
"-s", localNet, "-j", "MASQUERADE")
|
"-s", localNet, "-j", "MASQUERADE")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("add optun snat error:", err)
|
log.Println("add optun snat error:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func addSNATRule(target string) {
|
func addSNATRule(target string) {
|
||||||
if runtime.GOOS != "linux" {
|
if runtime.GOOS != "linux" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
err := execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN", "!", "-o", "optun",
|
err := execCommand("iptables", true, "-t", "nat", "-A", "OPSDWAN", "!", "-o", "optun",
|
||||||
"-s", target, "-j", "MASQUERADE")
|
"-s", target, "-j", "MASQUERADE")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("iptables add optun snat error:", err)
|
log.Println("iptables add optun snat error:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
378
core/nat.go
378
core/nat.go
@@ -1,189 +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, 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)
|
||||||
|
|
||||||
ip1, port1, err := natTest(host, udp1, localPort)
|
ip1, port1, err := natTest(host, udp1, localPort)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", 0, err
|
return "", 0, err
|
||||||
}
|
}
|
||||||
_, port2, err := natTest(host, udp2, localPort) // 2rd nat test not need testing publicip
|
_, port2, err := natTest(host, udp2, localPort) // 2rd nat test not need testing publicip
|
||||||
gLog.Printf(LvDEBUG, "local port:%d nat port:%d", localPort, port2)
|
gLog.Printf(LvDEBUG, "local port:%d nat port:%d", localPort, port2)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", 0, err
|
return "", 0, err
|
||||||
}
|
}
|
||||||
natType := NATSymmetric
|
natType := NATSymmetric
|
||||||
if port1 == port2 {
|
if port1 == port2 {
|
||||||
natType = NATCone
|
natType = NATCone
|
||||||
}
|
}
|
||||||
return ip1, natType, nil
|
return ip1, natType, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func publicIPTest(publicIP string, echoPort int) (hasPublicIP int, hasUPNPorNATPMP int) {
|
func publicIPTest(publicIP string, echoPort int) (hasPublicIP int, hasUPNPorNATPMP int) {
|
||||||
if publicIP == "" || echoPort == 0 {
|
if publicIP == "" || echoPort == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var echoConn *net.UDPConn
|
var echoConn *net.UDPConn
|
||||||
gLog.Println(LvDEBUG, "echo server start")
|
gLog.Println(LvDEBUG, "echo server start")
|
||||||
var err error
|
var err error
|
||||||
echoConn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: echoPort})
|
echoConn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: echoPort})
|
||||||
if err != nil { // listen error
|
if err != nil { // listen error
|
||||||
gLog.Println(LvERROR, "echo server listen error:", err)
|
gLog.Println(LvERROR, "echo server listen error:", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer echoConn.Close()
|
defer echoConn.Close()
|
||||||
go func() {
|
go func() {
|
||||||
// close outside for breaking the ReadFromUDP
|
// close outside for breaking the ReadFromUDP
|
||||||
// wait 30s for echo testing
|
// wait 30s for echo testing
|
||||||
buf := make([]byte, 1600)
|
buf := make([]byte, 1600)
|
||||||
echoConn.SetReadDeadline(time.Now().Add(time.Second * 30))
|
echoConn.SetReadDeadline(time.Now().Add(time.Second * 30))
|
||||||
n, addr, err := echoConn.ReadFromUDP(buf)
|
n, addr, err := echoConn.ReadFromUDP(buf)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
echoConn.WriteToUDP(buf[0:n], addr)
|
echoConn.WriteToUDP(buf[0:n], addr)
|
||||||
gLog.Println(LvDEBUG, "echo server end")
|
gLog.Println(LvDEBUG, "echo server end")
|
||||||
}()
|
}()
|
||||||
// testing for public ip
|
// testing for public ip
|
||||||
for i := 0; i < 2; i++ {
|
for i := 0; i < 2; i++ {
|
||||||
if i == 1 {
|
if i == 1 {
|
||||||
// test upnp or nat-pmp
|
// test upnp or nat-pmp
|
||||||
gLog.Println(LvDEBUG, "upnp test start")
|
gLog.Println(LvDEBUG, "upnp test start")
|
||||||
nat, err := Discover()
|
nat, err := Discover()
|
||||||
if err != nil || nat == nil {
|
if err != nil || nat == nil {
|
||||||
gLog.Println(LvDEBUG, "could not perform UPNP discover:", err)
|
gLog.Println(LvDEBUG, "could not perform UPNP discover:", err)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
ext, err := nat.GetExternalAddress()
|
ext, err := nat.GetExternalAddress()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvDEBUG, "could not perform UPNP external address:", err)
|
gLog.Println(LvDEBUG, "could not perform UPNP external address:", err)
|
||||||
break
|
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
|
externalPort, err := nat.AddPortMapping("udp", echoPort, echoPort, "openp2p", 30) // 30 seconds fot upnp testing
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvDEBUG, "could not add udp UPNP port mapping", externalPort)
|
gLog.Println(LvDEBUG, "could not add udp UPNP port mapping", externalPort)
|
||||||
break
|
break
|
||||||
} else {
|
} else {
|
||||||
nat.AddPortMapping("tcp", echoPort, echoPort, "openp2p", 604800) // 7 days for tcp connection
|
nat.AddPortMapping("tcp", echoPort, echoPort, "openp2p", 604800) // 7 days for tcp connection
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gLog.Printf(LvDEBUG, "public ip test start %s:%d", publicIP, echoPort)
|
gLog.Printf(LvDEBUG, "public ip test start %s:%d", publicIP, echoPort)
|
||||||
conn, err := net.ListenUDP("udp", nil)
|
conn, err := net.ListenUDP("udp", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
dst, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", publicIP, echoPort))
|
dst, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", publicIP, echoPort))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
conn.WriteTo([]byte("echo"), dst)
|
conn.WriteTo([]byte("echo"), dst)
|
||||||
buf := make([]byte, 1600)
|
buf := make([]byte, 1600)
|
||||||
|
|
||||||
// wait for echo testing
|
// wait for echo testing
|
||||||
conn.SetReadDeadline(time.Now().Add(PublicIPEchoTimeout))
|
conn.SetReadDeadline(time.Now().Add(PublicIPEchoTimeout))
|
||||||
_, _, err = conn.ReadFromUDP(buf)
|
_, _, err = conn.ReadFromUDP(buf)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
if i == 1 {
|
if i == 1 {
|
||||||
gLog.Println(LvDEBUG, "UPNP or NAT-PMP:YES")
|
gLog.Println(LvDEBUG, "UPNP or NAT-PMP:YES")
|
||||||
hasUPNPorNATPMP = 1
|
hasUPNPorNATPMP = 1
|
||||||
} else {
|
} else {
|
||||||
gLog.Println(LvDEBUG, "public ip:YES")
|
gLog.Println(LvDEBUG, "public ip:YES")
|
||||||
hasPublicIP = 1
|
hasPublicIP = 1
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
242
core/openp2p.go
242
core/openp2p.go
@@ -1,121 +1,121 @@
|
|||||||
package openp2p
|
package openp2p
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
var GNetwork *P2PNetwork
|
var GNetwork *P2PNetwork
|
||||||
|
|
||||||
func Run() {
|
func Run() {
|
||||||
rand.Seed(time.Now().UnixNano())
|
rand.Seed(time.Now().UnixNano())
|
||||||
baseDir := filepath.Dir(os.Args[0])
|
baseDir := filepath.Dir(os.Args[0])
|
||||||
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, LvDEBUG, 1024*1024, LogFile|LogConsole)
|
||||||
if len(os.Args) > 1 {
|
if len(os.Args) > 1 {
|
||||||
switch os.Args[1] {
|
switch os.Args[1] {
|
||||||
case "version", "-v", "--version":
|
case "version", "-v", "--version":
|
||||||
fmt.Println(OpenP2PVersion)
|
fmt.Println(OpenP2PVersion)
|
||||||
return
|
return
|
||||||
case "install":
|
case "install":
|
||||||
install()
|
install()
|
||||||
return
|
return
|
||||||
case "uninstall":
|
case "uninstall":
|
||||||
uninstall()
|
uninstall()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
installByFilename()
|
installByFilename()
|
||||||
}
|
}
|
||||||
parseParams("", "")
|
parseParams("", "")
|
||||||
gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
|
gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
|
||||||
gLog.Println(LvINFO, "Contact: QQ group 16947733, Email openp2p.cn@gmail.com")
|
gLog.Println(LvINFO, "Contact: QQ group 16947733, Email openp2p.cn@gmail.com")
|
||||||
|
|
||||||
if gConf.daemonMode {
|
if gConf.daemonMode {
|
||||||
d := daemon{}
|
d := daemon{}
|
||||||
d.run()
|
d.run()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
gLog.Println(LvINFO, &gConf)
|
gLog.Println(LvINFO, &gConf)
|
||||||
setFirewall()
|
setFirewall()
|
||||||
err := setRLimit()
|
err := setRLimit()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvINFO, "setRLimit error:", err)
|
gLog.Println(LvINFO, "setRLimit error:", err)
|
||||||
}
|
}
|
||||||
GNetwork = P2PNetworkInstance()
|
GNetwork = P2PNetworkInstance()
|
||||||
if ok := GNetwork.Connect(30000); !ok {
|
if ok := GNetwork.Connect(30000); !ok {
|
||||||
gLog.Println(LvERROR, "P2PNetwork login error")
|
gLog.Println(LvERROR, "P2PNetwork login error")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// gLog.Println(LvINFO, "waiting for connection...")
|
// gLog.Println(LvINFO, "waiting for connection...")
|
||||||
forever := make(chan bool)
|
forever := make(chan bool)
|
||||||
<-forever
|
<-forever
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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, LvINFO, 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 && n > 0 {
|
if err == nil && n > 0 {
|
||||||
gConf.setToken(n)
|
gConf.setToken(n)
|
||||||
}
|
}
|
||||||
if n <= 0 && gConf.Network.Token == 0 { // not input token
|
if n <= 0 && gConf.Network.Token == 0 { // not input token
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// gLog.setLevel(LogLevel(logLevel))
|
// gLog.setLevel(LogLevel(logLevel))
|
||||||
gConf.setShareBandwidth(bw)
|
gConf.setShareBandwidth(bw)
|
||||||
gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
|
gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
|
||||||
gLog.Println(LvINFO, "Contact: QQ group 16947733, Email openp2p.cn@gmail.com")
|
gLog.Println(LvINFO, "Contact: QQ group 16947733, Email openp2p.cn@gmail.com")
|
||||||
gLog.Println(LvINFO, &gConf)
|
gLog.Println(LvINFO, &gConf)
|
||||||
|
|
||||||
GNetwork = P2PNetworkInstance()
|
GNetwork = P2PNetworkInstance()
|
||||||
if ok := GNetwork.Connect(30000); !ok {
|
if ok := GNetwork.Connect(30000); !ok {
|
||||||
gLog.Println(LvERROR, "P2PNetwork login error")
|
gLog.Println(LvERROR, "P2PNetwork login error")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// gLog.Println(LvINFO, "waiting for connection...")
|
// gLog.Println(LvINFO, "waiting for connection...")
|
||||||
return GNetwork
|
return GNetwork
|
||||||
}
|
}
|
||||||
|
|
||||||
func RunCmd(cmd string) {
|
func RunCmd(cmd string) {
|
||||||
rand.Seed(time.Now().UnixNano())
|
rand.Seed(time.Now().UnixNano())
|
||||||
baseDir := filepath.Dir(os.Args[0])
|
baseDir := filepath.Dir(os.Args[0])
|
||||||
os.Chdir(baseDir) // for system service
|
os.Chdir(baseDir) // for system service
|
||||||
gLog = NewLogger(baseDir, ProductName, LvINFO, 1024*1024, LogFile|LogConsole)
|
gLog = NewLogger(baseDir, ProductName, LvINFO, 1024*1024, LogFile|LogConsole)
|
||||||
|
|
||||||
parseParams("", cmd)
|
parseParams("", cmd)
|
||||||
setFirewall()
|
setFirewall()
|
||||||
err := setRLimit()
|
err := setRLimit()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvINFO, "setRLimit error:", err)
|
gLog.Println(LvINFO, "setRLimit error:", err)
|
||||||
}
|
}
|
||||||
GNetwork = P2PNetworkInstance()
|
GNetwork = P2PNetworkInstance()
|
||||||
if ok := GNetwork.Connect(30000); !ok {
|
if ok := GNetwork.Connect(30000); !ok {
|
||||||
gLog.Println(LvERROR, "P2PNetwork login error")
|
gLog.Println(LvERROR, "P2PNetwork login error")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
forever := make(chan bool)
|
forever := make(chan bool)
|
||||||
<-forever
|
<-forever
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetToken(baseDir string) string {
|
func GetToken(baseDir string) string {
|
||||||
os.Chdir(baseDir)
|
os.Chdir(baseDir)
|
||||||
gConf.load()
|
gConf.load()
|
||||||
return fmt.Sprintf("%d", gConf.Network.Token)
|
return fmt.Sprintf("%d", gConf.Network.Token)
|
||||||
}
|
}
|
||||||
|
|
||||||
func Stop() {
|
func Stop() {
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,20 @@
|
|||||||
package openp2p
|
package openp2p
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/openp2p-cn/wireguard-go/tun"
|
"github.com/openp2p-cn/wireguard-go/tun"
|
||||||
)
|
)
|
||||||
|
|
||||||
var AndroidSDWANConfig chan []byte
|
var AndroidSDWANConfig chan []byte
|
||||||
|
|
||||||
type optun struct {
|
type optun struct {
|
||||||
tunName string
|
tunName string
|
||||||
dev tun.Device
|
dev tun.Device
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *optun) Stop() error {
|
func (t *optun) Stop() error {
|
||||||
t.dev.Close()
|
t.dev.Close()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
func init() {
|
func init() {
|
||||||
AndroidSDWANConfig = make(chan []byte, 1)
|
AndroidSDWANConfig = make(chan []byte, 1)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,85 +1,85 @@
|
|||||||
// optun_android.go
|
// optun_android.go
|
||||||
//go:build android
|
//go:build android
|
||||||
// +build android
|
// +build android
|
||||||
|
|
||||||
package openp2p
|
package openp2p
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"net"
|
"net"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
tunIfaceName = "optun"
|
tunIfaceName = "optun"
|
||||||
PIHeaderSize = 0
|
PIHeaderSize = 0
|
||||||
)
|
)
|
||||||
|
|
||||||
var AndroidReadTun chan []byte // TODO: multi channel
|
var AndroidReadTun chan []byte // TODO: multi channel
|
||||||
var AndroidWriteTun chan []byte
|
var AndroidWriteTun chan []byte
|
||||||
|
|
||||||
func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
|
func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
|
func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
|
||||||
bufs[0] = <-AndroidReadTun
|
bufs[0] = <-AndroidReadTun
|
||||||
sizes[0] = len(bufs[0])
|
sizes[0] = len(bufs[0])
|
||||||
return 1, nil
|
return 1, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
|
func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
|
||||||
AndroidWriteTun <- bufs[0]
|
AndroidWriteTun <- bufs[0]
|
||||||
return len(bufs[0]), nil
|
return len(bufs[0]), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func AndroidRead(data []byte, len int) {
|
func AndroidRead(data []byte, len int) {
|
||||||
head := PacketHeader{}
|
head := PacketHeader{}
|
||||||
parseHeader(data, &head)
|
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)
|
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)
|
buf := make([]byte, len)
|
||||||
copy(buf, data)
|
copy(buf, data)
|
||||||
AndroidReadTun <- buf
|
AndroidReadTun <- buf
|
||||||
}
|
}
|
||||||
|
|
||||||
func AndroidWrite(buf []byte) int {
|
func AndroidWrite(buf []byte) int {
|
||||||
p := <-AndroidWriteTun
|
p := <-AndroidWriteTun
|
||||||
copy(buf, p)
|
copy(buf, p)
|
||||||
return len(p)
|
return len(p)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetAndroidSDWANConfig(buf []byte) int {
|
func GetAndroidSDWANConfig(buf []byte) int {
|
||||||
p := <-AndroidSDWANConfig
|
p := <-AndroidSDWANConfig
|
||||||
copy(buf, p)
|
copy(buf, p)
|
||||||
gLog.Printf(LvINFO, "AndroidSDWANConfig=%s", p)
|
gLog.Printf(LvINFO, "AndroidSDWANConfig=%s", p)
|
||||||
return len(p)
|
return len(p)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetAndroidNodeName() string {
|
func GetAndroidNodeName() string {
|
||||||
gLog.Printf(LvINFO, "GetAndroidNodeName=%s", gConf.Network.Node)
|
gLog.Printf(LvINFO, "GetAndroidNodeName=%s", gConf.Network.Node)
|
||||||
return gConf.Network.Node
|
return gConf.Network.Node
|
||||||
}
|
}
|
||||||
|
|
||||||
func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
|
func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
|
||||||
// TODO:
|
// TODO:
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func addRoute(dst, gw, ifname string) error {
|
func addRoute(dst, gw, ifname string) error {
|
||||||
// TODO:
|
// TODO:
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func delRoute(dst, gw string) error {
|
func delRoute(dst, gw string) error {
|
||||||
// TODO:
|
// TODO:
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func delRoutesByGateway(gateway string) error {
|
func delRoutesByGateway(gateway string) error {
|
||||||
// TODO:
|
// TODO:
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
AndroidReadTun = make(chan []byte, 1000)
|
AndroidReadTun = make(chan []byte, 1000)
|
||||||
AndroidWriteTun = make(chan []byte, 1000)
|
AndroidWriteTun = make(chan []byte, 1000)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,133 +1,133 @@
|
|||||||
//go:build !android
|
//go:build !android
|
||||||
// +build !android
|
// +build !android
|
||||||
|
|
||||||
// optun_linux.go
|
// optun_linux.go
|
||||||
package openp2p
|
package openp2p
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/openp2p-cn/wireguard-go/tun"
|
"github.com/openp2p-cn/wireguard-go/tun"
|
||||||
"github.com/vishvananda/netlink"
|
"github.com/vishvananda/netlink"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
tunIfaceName = "optun"
|
tunIfaceName = "optun"
|
||||||
PIHeaderSize = 0
|
PIHeaderSize = 0
|
||||||
)
|
)
|
||||||
|
|
||||||
var previousIP = ""
|
var previousIP = ""
|
||||||
|
|
||||||
func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
|
func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
|
||||||
var err error
|
var err error
|
||||||
t.tunName = tunIfaceName
|
t.tunName = tunIfaceName
|
||||||
t.dev, err = tun.CreateTUN(t.tunName, 1420)
|
t.dev, err = tun.CreateTUN(t.tunName, 1420)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
|
func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
|
||||||
return t.dev.Read(bufs, sizes, offset)
|
return t.dev.Read(bufs, sizes, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
|
func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
|
||||||
return t.dev.Write(bufs, offset)
|
return t.dev.Write(bufs, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
|
func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
|
||||||
ifce, err := netlink.LinkByName(ifname)
|
ifce, err := netlink.LinkByName(ifname)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
netlink.LinkSetMTU(ifce, 1375)
|
netlink.LinkSetMTU(ifce, 1375)
|
||||||
netlink.LinkSetTxQLen(ifce, 100)
|
netlink.LinkSetTxQLen(ifce, 100)
|
||||||
netlink.LinkSetUp(ifce)
|
netlink.LinkSetUp(ifce)
|
||||||
|
|
||||||
ln, err := netlink.ParseIPNet(localAddr)
|
ln, err := netlink.ParseIPNet(localAddr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
ln.Mask = net.CIDRMask(32, 32)
|
ln.Mask = net.CIDRMask(32, 32)
|
||||||
rn, err := netlink.ParseIPNet(remoteAddr)
|
rn, err := netlink.ParseIPNet(remoteAddr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
rn.Mask = net.CIDRMask(32, 32)
|
rn.Mask = net.CIDRMask(32, 32)
|
||||||
|
|
||||||
addr := &netlink.Addr{
|
addr := &netlink.Addr{
|
||||||
IPNet: ln,
|
IPNet: ln,
|
||||||
Peer: rn,
|
Peer: rn,
|
||||||
}
|
}
|
||||||
if previousIP != "" {
|
if previousIP != "" {
|
||||||
lnDel, err := netlink.ParseIPNet(previousIP)
|
lnDel, err := netlink.ParseIPNet(previousIP)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
lnDel.Mask = net.CIDRMask(32, 32)
|
lnDel.Mask = net.CIDRMask(32, 32)
|
||||||
|
|
||||||
addrDel := &netlink.Addr{
|
addrDel := &netlink.Addr{
|
||||||
IPNet: lnDel,
|
IPNet: lnDel,
|
||||||
Peer: rn,
|
Peer: rn,
|
||||||
}
|
}
|
||||||
netlink.AddrDel(ifce, addrDel)
|
netlink.AddrDel(ifce, addrDel)
|
||||||
}
|
}
|
||||||
previousIP = localAddr
|
previousIP = localAddr
|
||||||
return netlink.AddrAdd(ifce, addr)
|
return netlink.AddrAdd(ifce, addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
func addRoute(dst, gw, ifname string) error {
|
func addRoute(dst, gw, ifname string) error {
|
||||||
_, networkid, err := net.ParseCIDR(dst)
|
_, networkid, err := net.ParseCIDR(dst)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
ipGW := net.ParseIP(gw)
|
ipGW := net.ParseIP(gw)
|
||||||
if ipGW == nil {
|
if ipGW == nil {
|
||||||
return fmt.Errorf("parse gateway %s failed", gw)
|
return fmt.Errorf("parse gateway %s failed", gw)
|
||||||
}
|
}
|
||||||
route := &netlink.Route{
|
route := &netlink.Route{
|
||||||
Dst: networkid,
|
Dst: networkid,
|
||||||
Gw: ipGW,
|
Gw: ipGW,
|
||||||
}
|
}
|
||||||
return netlink.RouteAdd(route)
|
return netlink.RouteAdd(route)
|
||||||
}
|
}
|
||||||
|
|
||||||
func delRoute(dst, gw string) error {
|
func delRoute(dst, gw string) error {
|
||||||
_, networkid, err := net.ParseCIDR(dst)
|
_, networkid, err := net.ParseCIDR(dst)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
route := &netlink.Route{
|
route := &netlink.Route{
|
||||||
Dst: networkid,
|
Dst: networkid,
|
||||||
}
|
}
|
||||||
return netlink.RouteDel(route)
|
return netlink.RouteDel(route)
|
||||||
}
|
}
|
||||||
|
|
||||||
func delRoutesByGateway(gateway string) error {
|
func delRoutesByGateway(gateway string) error {
|
||||||
cmd := exec.Command("route", "-n")
|
cmd := exec.Command("route", "-n")
|
||||||
output, err := cmd.Output()
|
output, err := cmd.Output()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
lines := strings.Split(string(output), "\n")
|
lines := strings.Split(string(output), "\n")
|
||||||
for _, line := range lines {
|
for _, line := range lines {
|
||||||
if !strings.Contains(line, gateway) {
|
if !strings.Contains(line, gateway) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
fields := strings.Fields(line)
|
fields := strings.Fields(line)
|
||||||
if len(fields) >= 8 && fields[1] == "0.0.0.0" && fields[7] == gateway {
|
if len(fields) >= 8 && fields[1] == "0.0.0.0" && fields[7] == gateway {
|
||||||
delCmd := exec.Command("route", "del", "-net", fields[0], "gw", gateway)
|
delCmd := exec.Command("route", "del", "-net", fields[0], "gw", gateway)
|
||||||
err := delCmd.Run()
|
err := delCmd.Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fmt.Printf("Delete route ok: %s %s %s\n", fields[0], fields[1], gateway)
|
fmt.Printf("Delete route ok: %s %s %s\n", fields[0], fields[1], gateway)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,142 +1,142 @@
|
|||||||
package openp2p
|
package openp2p
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"net/netip"
|
"net/netip"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/openp2p-cn/wireguard-go/tun"
|
"github.com/openp2p-cn/wireguard-go/tun"
|
||||||
"golang.org/x/sys/windows"
|
"golang.org/x/sys/windows"
|
||||||
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
|
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
tunIfaceName = "optun"
|
tunIfaceName = "optun"
|
||||||
PIHeaderSize = 0
|
PIHeaderSize = 0
|
||||||
)
|
)
|
||||||
|
|
||||||
func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
|
func (t *optun) Start(localAddr string, detail *SDWANInfo) error {
|
||||||
// check wintun.dll
|
// check wintun.dll
|
||||||
tmpFile := filepath.Dir(os.Args[0]) + "/wintun.dll"
|
tmpFile := filepath.Dir(os.Args[0]) + "/wintun.dll"
|
||||||
fs, err := os.Stat(tmpFile)
|
fs, err := os.Stat(tmpFile)
|
||||||
if err != nil || fs.Size() == 0 {
|
if err != nil || fs.Size() == 0 {
|
||||||
url := fmt.Sprintf("https://openp2p.cn/download/v1/latest/wintun/%s/wintun.dll", runtime.GOARCH)
|
url := fmt.Sprintf("https://openp2p.cn/download/v1/latest/wintun/%s/wintun.dll", runtime.GOARCH)
|
||||||
err = downloadFile(url, "", tmpFile)
|
err = downloadFile(url, "", tmpFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.Remove(tmpFile)
|
os.Remove(tmpFile)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
t.tunName = tunIfaceName
|
t.tunName = tunIfaceName
|
||||||
|
|
||||||
uuid := &windows.GUID{
|
uuid := &windows.GUID{
|
||||||
Data1: 0xf411e821,
|
Data1: 0xf411e821,
|
||||||
Data2: 0xb310,
|
Data2: 0xb310,
|
||||||
Data3: 0x4567,
|
Data3: 0x4567,
|
||||||
Data4: [8]byte{0x80, 0x42, 0x83, 0x7e, 0xf4, 0x56, 0xce, 0x13},
|
Data4: [8]byte{0x80, 0x42, 0x83, 0x7e, 0xf4, 0x56, 0xce, 0x13},
|
||||||
}
|
}
|
||||||
t.dev, err = tun.CreateTUNWithRequestedGUID(t.tunName, uuid, 1420)
|
t.dev, err = tun.CreateTUNWithRequestedGUID(t.tunName, uuid, 1420)
|
||||||
if err != nil { // retry
|
if err != nil { // retry
|
||||||
t.dev, err = tun.CreateTUNWithRequestedGUID(t.tunName, uuid, 1420)
|
t.dev, err = tun.CreateTUNWithRequestedGUID(t.tunName, uuid, 1420)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
|
func (t *optun) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
|
||||||
return t.dev.Read(bufs, sizes, offset)
|
return t.dev.Read(bufs, sizes, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
|
func (t *optun) Write(bufs [][]byte, offset int) (int, error) {
|
||||||
return t.dev.Write(bufs, offset)
|
return t.dev.Write(bufs, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
|
func setTunAddr(ifname, localAddr, remoteAddr string, wintun interface{}) error {
|
||||||
nativeTunDevice := wintun.(*tun.NativeTun)
|
nativeTunDevice := wintun.(*tun.NativeTun)
|
||||||
link := winipcfg.LUID(nativeTunDevice.LUID())
|
link := winipcfg.LUID(nativeTunDevice.LUID())
|
||||||
ip, err := netip.ParsePrefix(localAddr)
|
ip, err := netip.ParsePrefix(localAddr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "ParsePrefix error:%s, luid:%d,localAddr:%s", err, nativeTunDevice.LUID(), localAddr)
|
gLog.Printf(LvERROR, "ParsePrefix error:%s, luid:%d,localAddr:%s", err, nativeTunDevice.LUID(), localAddr)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
err = link.SetIPAddresses([]netip.Prefix{ip})
|
err = link.SetIPAddresses([]netip.Prefix{ip})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "SetIPAddresses error:%s, netip.Prefix:%+v", err, []netip.Prefix{ip})
|
gLog.Printf(LvERROR, "SetIPAddresses error:%s, netip.Prefix:%+v", err, []netip.Prefix{ip})
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func addRoute(dst, gw, ifname string) error {
|
func addRoute(dst, gw, ifname string) error {
|
||||||
_, dstNet, err := net.ParseCIDR(dst)
|
_, dstNet, err := net.ParseCIDR(dst)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
i, err := net.InterfaceByName(ifname)
|
i, err := net.InterfaceByName(ifname)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
params := make([]string, 0)
|
params := make([]string, 0)
|
||||||
params = append(params, "add")
|
params = append(params, "add")
|
||||||
params = append(params, dstNet.IP.String())
|
params = append(params, dstNet.IP.String())
|
||||||
params = append(params, "mask")
|
params = append(params, "mask")
|
||||||
params = append(params, net.IP(dstNet.Mask).String())
|
params = append(params, net.IP(dstNet.Mask).String())
|
||||||
params = append(params, gw)
|
params = append(params, gw)
|
||||||
params = append(params, "if")
|
params = append(params, "if")
|
||||||
params = append(params, strconv.Itoa(i.Index))
|
params = append(params, strconv.Itoa(i.Index))
|
||||||
// gLogger.Println(LevelINFO, "windows add route params:", params)
|
// gLogger.Println(LevelINFO, "windows add route params:", params)
|
||||||
execCommand("route", true, params...)
|
execCommand("route", true, params...)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func delRoute(dst, gw string) error {
|
func delRoute(dst, gw string) error {
|
||||||
_, dstNet, err := net.ParseCIDR(dst)
|
_, dstNet, err := net.ParseCIDR(dst)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
params := make([]string, 0)
|
params := make([]string, 0)
|
||||||
params = append(params, "delete")
|
params = append(params, "delete")
|
||||||
params = append(params, dstNet.IP.String())
|
params = append(params, dstNet.IP.String())
|
||||||
params = append(params, "mask")
|
params = append(params, "mask")
|
||||||
params = append(params, net.IP(dstNet.Mask).String())
|
params = append(params, net.IP(dstNet.Mask).String())
|
||||||
params = append(params, gw)
|
params = append(params, gw)
|
||||||
// gLogger.Println(LevelINFO, "windows delete route params:", params)
|
// gLogger.Println(LevelINFO, "windows delete route params:", params)
|
||||||
execCommand("route", true, params...)
|
execCommand("route", true, params...)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func delRoutesByGateway(gateway string) error {
|
func delRoutesByGateway(gateway string) error {
|
||||||
cmd := exec.Command("route", "print", "-4")
|
cmd := exec.Command("route", "print", "-4")
|
||||||
output, err := cmd.Output()
|
output, err := cmd.Output()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
lines := strings.Split(string(output), "\n")
|
lines := strings.Split(string(output), "\n")
|
||||||
for _, line := range lines {
|
for _, line := range lines {
|
||||||
if !strings.Contains(line, gateway) {
|
if !strings.Contains(line, gateway) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
fields := strings.Fields(line)
|
fields := strings.Fields(line)
|
||||||
if len(fields) >= 5 {
|
if len(fields) >= 5 {
|
||||||
cmd := exec.Command("route", "delete", fields[0], "mask", fields[1], gateway)
|
cmd := exec.Command("route", "delete", fields[0], "mask", fields[1], gateway)
|
||||||
err := cmd.Run()
|
err := cmd.Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Delete route error:", err)
|
fmt.Println("Delete route error:", err)
|
||||||
}
|
}
|
||||||
fmt.Printf("Delete route ok: %s %s %s\n", fields[0], fields[1], gateway)
|
fmt.Printf("Delete route ok: %s %s %s\n", fields[0], fields[1], gateway)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ func (app *p2pApp) checkDirectTunnel() error {
|
|||||||
app.config.retryNum = 1
|
app.config.retryNum = 1
|
||||||
}
|
}
|
||||||
if app.config.retryNum > 0 { // first time not show reconnect log
|
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.PeerNode, app.id, app.config.retryNum)
|
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.retryNum++
|
||||||
app.config.retryTime = time.Now()
|
app.config.retryTime = time.Now()
|
||||||
@@ -149,7 +149,7 @@ func (app *p2pApp) checkDirectTunnel() error {
|
|||||||
app.config.errMsg = err.Error()
|
app.config.errMsg = err.Error()
|
||||||
if err == ErrPeerOffline && app.config.retryNum > 2 { // stop retry, waiting for online
|
if err == ErrPeerOffline && app.config.retryNum > 2 { // stop retry, waiting for online
|
||||||
app.config.retryNum = retryLimit
|
app.config.retryNum = retryLimit
|
||||||
gLog.Printf(LvINFO, " %s offline, it will auto reconnect when peer node online", app.config.PeerNode)
|
gLog.Printf(LvINFO, " %s offline, it will auto reconnect when peer node online", app.config.LogPeerNode())
|
||||||
}
|
}
|
||||||
if err == ErrBuildTunnelBusy {
|
if err == ErrBuildTunnelBusy {
|
||||||
app.config.retryNum--
|
app.config.retryNum--
|
||||||
@@ -174,7 +174,7 @@ func (app *p2pApp) buildDirectTunnel() error {
|
|||||||
pn := GNetwork
|
pn := GNetwork
|
||||||
initErr := pn.requestPeerInfo(&app.config)
|
initErr := pn.requestPeerInfo(&app.config)
|
||||||
if initErr != nil {
|
if initErr != nil {
|
||||||
gLog.Printf(LvERROR, "%s init error:%s", app.config.PeerNode, initErr)
|
gLog.Printf(LvERROR, "%s init error:%s", app.config.LogPeerNode(), initErr)
|
||||||
return initErr
|
return initErr
|
||||||
}
|
}
|
||||||
t, err = pn.addDirectTunnel(app.config, 0)
|
t, err = pn.addDirectTunnel(app.config, 0)
|
||||||
@@ -212,7 +212,7 @@ func (app *p2pApp) buildDirectTunnel() error {
|
|||||||
AppID: app.id,
|
AppID: app.id,
|
||||||
AppKey: app.key,
|
AppKey: app.key,
|
||||||
}
|
}
|
||||||
gLog.Printf(LvDEBUG, "sync appkey direct to %s", app.config.PeerNode)
|
gLog.Printf(LvDEBUG, "sync appkey direct to %s", app.config.LogPeerNode())
|
||||||
pn.push(app.config.PeerNode, MsgPushAPPKey, &syncKeyReq)
|
pn.push(app.config.PeerNode, MsgPushAPPKey, &syncKeyReq)
|
||||||
app.setDirectTunnel(t)
|
app.setDirectTunnel(t)
|
||||||
|
|
||||||
@@ -220,7 +220,7 @@ func (app *p2pApp) buildDirectTunnel() error {
|
|||||||
if app.config.SrcPort == 0 {
|
if app.config.SrcPort == 0 {
|
||||||
req := ServerSideSaveMemApp{From: gConf.Network.Node, Node: gConf.Network.Node, TunnelID: t.id, RelayTunnelID: 0, AppID: app.id}
|
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)
|
pn.push(app.config.PeerNode, MsgPushServerSideSaveMemApp, &req)
|
||||||
gLog.Printf(LvDEBUG, "push %s ServerSideSaveMemApp: %s", app.config.PeerNode, prettyJson(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)
|
gLog.Printf(LvDEBUG, "%s use tunnel %d", app.config.AppName, t.id)
|
||||||
return nil
|
return nil
|
||||||
@@ -244,7 +244,7 @@ func (app *p2pApp) checkRelayTunnel() error {
|
|||||||
app.retryRelayNum = 1
|
app.retryRelayNum = 1
|
||||||
}
|
}
|
||||||
if app.retryRelayNum > 0 { // first time not show reconnect log
|
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.PeerNode, app.id, app.retryRelayNum)
|
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.setRelayTunnel(nil) // reset relayTunnel
|
||||||
app.retryRelayNum++
|
app.retryRelayNum++
|
||||||
@@ -256,7 +256,7 @@ func (app *p2pApp) checkRelayTunnel() error {
|
|||||||
app.errMsg = err.Error()
|
app.errMsg = err.Error()
|
||||||
if err == ErrPeerOffline && app.retryRelayNum > 2 { // stop retry, waiting for online
|
if err == ErrPeerOffline && app.retryRelayNum > 2 { // stop retry, waiting for online
|
||||||
app.retryRelayNum = retryLimit
|
app.retryRelayNum = retryLimit
|
||||||
gLog.Printf(LvINFO, " %s offline, it will auto reconnect when peer node online", app.config.PeerNode)
|
gLog.Printf(LvINFO, " %s offline, it will auto reconnect when peer node online", app.config.LogPeerNode())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if app.Tunnel() != nil {
|
if app.Tunnel() != nil {
|
||||||
@@ -282,7 +282,7 @@ func (app *p2pApp) buildRelayTunnel() error {
|
|||||||
config := app.config
|
config := app.config
|
||||||
initErr := pn.requestPeerInfo(&config)
|
initErr := pn.requestPeerInfo(&config)
|
||||||
if initErr != nil {
|
if initErr != nil {
|
||||||
gLog.Printf(LvERROR, "%s init error:%s", config.PeerNode, initErr)
|
gLog.Printf(LvERROR, "%s init error:%s", config.LogPeerNode(), initErr)
|
||||||
return initErr
|
return initErr
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -318,7 +318,7 @@ func (app *p2pApp) buildRelayTunnel() error {
|
|||||||
AppID: app.id,
|
AppID: app.id,
|
||||||
AppKey: app.key,
|
AppKey: app.key,
|
||||||
}
|
}
|
||||||
gLog.Printf(LvDEBUG, "sync appkey relay to %s", config.PeerNode)
|
gLog.Printf(LvDEBUG, "sync appkey relay to %s", config.LogPeerNode())
|
||||||
pn.push(config.PeerNode, MsgPushAPPKey, &syncKeyReq)
|
pn.push(config.PeerNode, MsgPushAPPKey, &syncKeyReq)
|
||||||
app.setRelayTunnelID(rtid)
|
app.setRelayTunnelID(rtid)
|
||||||
app.setRelayTunnel(t)
|
app.setRelayTunnel(t)
|
||||||
@@ -330,7 +330,7 @@ func (app *p2pApp) buildRelayTunnel() error {
|
|||||||
if config.SrcPort == 0 {
|
if config.SrcPort == 0 {
|
||||||
req := ServerSideSaveMemApp{From: gConf.Network.Node, Node: relayNode, TunnelID: rtid, RelayTunnelID: t.id, AppID: app.id, RelayMode: relayMode}
|
req := ServerSideSaveMemApp{From: gConf.Network.Node, Node: relayNode, TunnelID: rtid, RelayTunnelID: t.id, AppID: app.id, RelayMode: relayMode}
|
||||||
pn.push(config.PeerNode, MsgPushServerSideSaveMemApp, &req)
|
pn.push(config.PeerNode, MsgPushServerSideSaveMemApp, &req)
|
||||||
gLog.Printf(LvDEBUG, "push %s relay ServerSideSaveMemApp: %s", config.PeerNode, prettyJson(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)
|
gLog.Printf(LvDEBUG, "%s use tunnel %d", app.config.AppName, t.id)
|
||||||
return nil
|
return nil
|
||||||
@@ -594,8 +594,8 @@ func (app *p2pApp) close() {
|
|||||||
func (app *p2pApp) relayHeartbeatLoop() {
|
func (app *p2pApp) relayHeartbeatLoop() {
|
||||||
app.wg.Add(1)
|
app.wg.Add(1)
|
||||||
defer app.wg.Done()
|
defer app.wg.Done()
|
||||||
gLog.Printf(LvDEBUG, "%s appid:%d relayHeartbeat to rtid:%d start", app.config.PeerNode, app.id, app.rtid)
|
gLog.Printf(LvDEBUG, "%s appid:%d relayHeartbeat to rtid:%d start", app.config.LogPeerNode(), app.id, app.rtid)
|
||||||
defer gLog.Printf(LvDEBUG, "%s appid:%d relayHeartbeat to rtid%d end", app.config.PeerNode, app.id, app.rtid)
|
defer gLog.Printf(LvDEBUG, "%s appid:%d relayHeartbeat to rtid%d end", app.config.LogPeerNode(), app.id, app.rtid)
|
||||||
|
|
||||||
for app.running {
|
for app.running {
|
||||||
if app.RelayTunnel() == nil || !app.RelayTunnel().isRuning() {
|
if app.RelayTunnel() == nil || !app.RelayTunnel().isRuning() {
|
||||||
@@ -606,11 +606,11 @@ func (app *p2pApp) relayHeartbeatLoop() {
|
|||||||
AppID: app.id}
|
AppID: app.id}
|
||||||
err := app.RelayTunnel().WriteMessage(app.rtid, MsgP2P, MsgRelayHeartbeat, &req)
|
err := app.RelayTunnel().WriteMessage(app.rtid, MsgP2P, MsgRelayHeartbeat, &req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "%s appid:%d rtid:%d write relay tunnel heartbeat error %s", app.config.PeerNode, app.id, app.rtid, err)
|
gLog.Printf(LvERROR, "%s appid:%d rtid:%d write relay tunnel heartbeat error %s", app.config.LogPeerNode(), app.id, app.rtid, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// TODO: debug relay heartbeat
|
// TODO: debug relay heartbeat
|
||||||
gLog.Printf(LvDEBUG, "%s appid:%d rtid:%d write relay tunnel heartbeat ok", app.config.PeerNode, app.id, app.rtid)
|
gLog.Printf(LvDEBUG, "%s appid:%d rtid:%d write relay tunnel heartbeat ok", app.config.LogPeerNode(), app.id, app.rtid)
|
||||||
time.Sleep(TunnelHeartbeatTime)
|
time.Sleep(TunnelHeartbeatTime)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1954
core/p2pnetwork.go
1954
core/p2pnetwork.go
File diff suppressed because it is too large
Load Diff
1612
core/p2ptunnel.go
1612
core/p2ptunnel.go
File diff suppressed because it is too large
Load Diff
@@ -10,7 +10,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
const OpenP2PVersion = "3.18.4"
|
const OpenP2PVersion = "3.19.0"
|
||||||
const ProductName string = "openp2p"
|
const ProductName string = "openp2p"
|
||||||
const LeastSupportVersion = "3.0.0"
|
const LeastSupportVersion = "3.0.0"
|
||||||
const SyncServerTimeVersion = "3.9.0"
|
const SyncServerTimeVersion = "3.9.0"
|
||||||
@@ -108,6 +108,7 @@ const (
|
|||||||
MsgPushReportGoroutine = 16
|
MsgPushReportGoroutine = 16
|
||||||
MsgPushReportMemApps = 17
|
MsgPushReportMemApps = 17
|
||||||
MsgPushServerSideSaveMemApp = 18
|
MsgPushServerSideSaveMemApp = 18
|
||||||
|
MsgPushCheckRemoteService = 19
|
||||||
)
|
)
|
||||||
|
|
||||||
// MsgP2P sub type message
|
// MsgP2P sub type message
|
||||||
@@ -143,6 +144,7 @@ const (
|
|||||||
MsgReportApps
|
MsgReportApps
|
||||||
MsgReportLog
|
MsgReportLog
|
||||||
MsgReportMemApps
|
MsgReportMemApps
|
||||||
|
MsgReportResponse
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -510,6 +512,11 @@ type ServerSideSaveMemApp struct {
|
|||||||
AppID uint64 `json:"appID,omitempty"`
|
AppID uint64 `json:"appID,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CheckRemoteService struct {
|
||||||
|
Host string `json:"host,omitempty"`
|
||||||
|
Port uint32 `json:"port,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
const rootCA = `-----BEGIN CERTIFICATE-----
|
const rootCA = `-----BEGIN CERTIFICATE-----
|
||||||
MIIDhTCCAm0CFHm0cd8dnGCbUW/OcS56jf0gvRk7MA0GCSqGSIb3DQEBCwUAMH4x
|
MIIDhTCCAm0CFHm0cd8dnGCbUW/OcS56jf0gvRk7MA0GCSqGSIb3DQEBCwUAMH4x
|
||||||
CzAJBgNVBAYTAkNOMQswCQYDVQQIDAJHRDETMBEGA1UECgwKb3BlbnAycC5jbjET
|
CzAJBgNVBAYTAkNOMQswCQYDVQQIDAJHRDETMBEGA1UECgwKb3BlbnAycC5jbjET
|
||||||
|
|||||||
584
core/sdwan.go
584
core/sdwan.go
@@ -1,292 +1,292 @@
|
|||||||
package openp2p
|
package openp2p
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
type PacketHeader struct {
|
type PacketHeader struct {
|
||||||
version int
|
version int
|
||||||
// src uint32
|
// src uint32
|
||||||
// prot uint8
|
// prot uint8
|
||||||
protocol byte
|
protocol byte
|
||||||
dst uint32
|
dst uint32
|
||||||
port uint16
|
port uint16
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseHeader(b []byte, h *PacketHeader) error {
|
func parseHeader(b []byte, h *PacketHeader) error {
|
||||||
if len(b) < 20 {
|
if len(b) < 20 {
|
||||||
return fmt.Errorf("small packet")
|
return fmt.Errorf("small packet")
|
||||||
}
|
}
|
||||||
h.version = int(b[0] >> 4)
|
h.version = int(b[0] >> 4)
|
||||||
h.protocol = byte(b[9])
|
h.protocol = byte(b[9])
|
||||||
if h.version == 4 {
|
if h.version == 4 {
|
||||||
h.dst = binary.BigEndian.Uint32(b[16:20])
|
h.dst = binary.BigEndian.Uint32(b[16:20])
|
||||||
} else if h.version != 6 {
|
} else if h.version != 6 {
|
||||||
return fmt.Errorf("unknown version in ip header:%d", h.version)
|
return fmt.Errorf("unknown version in ip header:%d", h.version)
|
||||||
}
|
}
|
||||||
if h.protocol == 6 || h.protocol == 17 { // TCP or UDP
|
if h.protocol == 6 || h.protocol == 17 { // TCP or UDP
|
||||||
h.port = binary.BigEndian.Uint16(b[22:24])
|
h.port = binary.BigEndian.Uint16(b[22:24])
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type sdwanNode struct {
|
type sdwanNode struct {
|
||||||
name string
|
name string
|
||||||
id uint64
|
id uint64
|
||||||
}
|
}
|
||||||
|
|
||||||
type p2pSDWAN struct {
|
type p2pSDWAN struct {
|
||||||
nodeName string
|
nodeName string
|
||||||
tun *optun
|
tun *optun
|
||||||
sysRoute sync.Map // ip:sdwanNode
|
sysRoute sync.Map // ip:sdwanNode
|
||||||
subnet *net.IPNet
|
subnet *net.IPNet
|
||||||
gateway net.IP
|
gateway net.IP
|
||||||
virtualIP *net.IPNet
|
virtualIP *net.IPNet
|
||||||
internalRoute *IPTree
|
internalRoute *IPTree
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *p2pSDWAN) init(name string) error {
|
func (s *p2pSDWAN) init(name string) error {
|
||||||
if gConf.getSDWAN().Gateway == "" {
|
if gConf.getSDWAN().Gateway == "" {
|
||||||
gLog.Println(LvDEBUG, "not in sdwan clear all ")
|
gLog.Println(LvDEBUG, "not in sdwan clear all ")
|
||||||
}
|
}
|
||||||
if s.internalRoute == nil {
|
if s.internalRoute == nil {
|
||||||
s.internalRoute = NewIPTree("")
|
s.internalRoute = NewIPTree("")
|
||||||
}
|
}
|
||||||
|
|
||||||
s.nodeName = name
|
s.nodeName = name
|
||||||
s.gateway, s.subnet, _ = net.ParseCIDR(gConf.getSDWAN().Gateway)
|
s.gateway, s.subnet, _ = net.ParseCIDR(gConf.getSDWAN().Gateway)
|
||||||
for _, node := range gConf.getDelNodes() {
|
for _, node := range gConf.getDelNodes() {
|
||||||
gLog.Println(LvDEBUG, "deal deleted node: ", node.Name)
|
gLog.Println(LvDEBUG, "deal deleted node: ", node.Name)
|
||||||
delRoute(node.IP, s.gateway.String())
|
delRoute(node.IP, s.gateway.String())
|
||||||
s.internalRoute.Del(node.IP, node.IP)
|
s.internalRoute.Del(node.IP, node.IP)
|
||||||
ipNum, _ := inetAtoN(node.IP)
|
ipNum, _ := inetAtoN(node.IP)
|
||||||
s.sysRoute.Delete(ipNum)
|
s.sysRoute.Delete(ipNum)
|
||||||
gConf.delete(AppConfig{SrcPort: 0, PeerNode: node.Name})
|
gConf.delete(AppConfig{SrcPort: 0, PeerNode: node.Name})
|
||||||
GNetwork.DeleteApp(AppConfig{SrcPort: 0, PeerNode: node.Name})
|
GNetwork.DeleteApp(AppConfig{SrcPort: 0, PeerNode: node.Name})
|
||||||
arr := strings.Split(node.Resource, ",")
|
arr := strings.Split(node.Resource, ",")
|
||||||
for _, r := range arr {
|
for _, r := range arr {
|
||||||
_, ipnet, err := net.ParseCIDR(r)
|
_, ipnet, err := net.ParseCIDR(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// fmt.Println("Error parsing CIDR:", err)
|
// fmt.Println("Error parsing CIDR:", err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if ipnet.Contains(net.ParseIP(gConf.Network.localIP)) { // local ip and resource in the same lan
|
if ipnet.Contains(net.ParseIP(gConf.Network.localIP)) { // local ip and resource in the same lan
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
minIP := ipnet.IP
|
minIP := ipnet.IP
|
||||||
maxIP := make(net.IP, len(minIP))
|
maxIP := make(net.IP, len(minIP))
|
||||||
copy(maxIP, minIP)
|
copy(maxIP, minIP)
|
||||||
for i := range minIP {
|
for i := range minIP {
|
||||||
maxIP[i] = minIP[i] | ^ipnet.Mask[i]
|
maxIP[i] = minIP[i] | ^ipnet.Mask[i]
|
||||||
}
|
}
|
||||||
s.internalRoute.Del(minIP.String(), maxIP.String())
|
s.internalRoute.Del(minIP.String(), maxIP.String())
|
||||||
delRoute(ipnet.String(), s.gateway.String())
|
delRoute(ipnet.String(), s.gateway.String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for _, node := range gConf.getAddNodes() {
|
for _, node := range gConf.getAddNodes() {
|
||||||
gLog.Println(LvDEBUG, "deal add node: ", node.Name)
|
gLog.Println(LvDEBUG, "deal add node: ", node.Name)
|
||||||
ipNet := &net.IPNet{
|
ipNet := &net.IPNet{
|
||||||
IP: net.ParseIP(node.IP),
|
IP: net.ParseIP(node.IP),
|
||||||
Mask: s.subnet.Mask,
|
Mask: s.subnet.Mask,
|
||||||
}
|
}
|
||||||
if node.Name == s.nodeName {
|
if node.Name == s.nodeName {
|
||||||
s.virtualIP = ipNet
|
s.virtualIP = ipNet
|
||||||
gLog.Println(LvINFO, "start tun ", ipNet.String())
|
gLog.Println(LvINFO, "start tun ", ipNet.String())
|
||||||
err := s.StartTun()
|
err := s.StartTun()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "start tun error:", err)
|
gLog.Println(LvERROR, "start tun error:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
gLog.Println(LvINFO, "start tun ok")
|
gLog.Println(LvINFO, "start tun ok")
|
||||||
allowTunForward()
|
allowTunForward()
|
||||||
addRoute(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("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
|
// addRoute("224.0.0.0/4", s.gateway.String(), s.tun.tunName) // for multicast
|
||||||
initSNATRule(s.subnet.String()) // for network resource
|
initSNATRule(s.subnet.String()) // for network resource
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
ip, err := inetAtoN(ipNet.String())
|
ip, err := inetAtoN(ipNet.String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
s.sysRoute.Store(ip, &sdwanNode{name: node.Name, id: NodeNameToID(node.Name)})
|
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)})
|
s.internalRoute.AddIntIP(ip, ip, &sdwanNode{name: node.Name, id: NodeNameToID(node.Name)})
|
||||||
}
|
}
|
||||||
for _, node := range gConf.getAddNodes() {
|
for _, node := range gConf.getAddNodes() {
|
||||||
if node.Name == s.nodeName { // not deal resource itself
|
if node.Name == s.nodeName { // not deal resource itself
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if len(node.Resource) > 0 {
|
if len(node.Resource) > 0 {
|
||||||
gLog.Printf(LvINFO, "deal add node: %s resource: %s", node.Name, node.Resource)
|
gLog.Printf(LvINFO, "deal add node: %s resource: %s", node.Name, node.Resource)
|
||||||
arr := strings.Split(node.Resource, ",")
|
arr := strings.Split(node.Resource, ",")
|
||||||
for _, r := range arr {
|
for _, r := range arr {
|
||||||
// add internal route
|
// add internal route
|
||||||
_, ipnet, err := net.ParseCIDR(r)
|
_, ipnet, err := net.ParseCIDR(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error parsing CIDR:", err)
|
fmt.Println("Error parsing CIDR:", err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if ipnet.Contains(net.ParseIP(gConf.Network.localIP)) { // local ip and resource in the same lan
|
if ipnet.Contains(net.ParseIP(gConf.Network.localIP)) { // local ip and resource in the same lan
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
minIP := ipnet.IP
|
minIP := ipnet.IP
|
||||||
maxIP := make(net.IP, len(minIP))
|
maxIP := make(net.IP, len(minIP))
|
||||||
copy(maxIP, minIP)
|
copy(maxIP, minIP)
|
||||||
for i := range minIP {
|
for i := range minIP {
|
||||||
maxIP[i] = minIP[i] | ^ipnet.Mask[i]
|
maxIP[i] = minIP[i] | ^ipnet.Mask[i]
|
||||||
}
|
}
|
||||||
s.internalRoute.Add(minIP.String(), maxIP.String(), &sdwanNode{name: node.Name, id: NodeNameToID(node.Name)})
|
s.internalRoute.Add(minIP.String(), maxIP.String(), &sdwanNode{name: node.Name, id: NodeNameToID(node.Name)})
|
||||||
// add sys route
|
// add sys route
|
||||||
addRoute(ipnet.String(), s.gateway.String(), s.tun.tunName)
|
addRoute(ipnet.String(), s.gateway.String(), s.tun.tunName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gConf.retryAllMemApp()
|
gConf.retryAllMemApp()
|
||||||
gLog.Printf(LvINFO, "sdwan init ok")
|
gLog.Printf(LvINFO, "sdwan init ok")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *p2pSDWAN) run() {
|
func (s *p2pSDWAN) run() {
|
||||||
s.sysRoute.Range(func(key, value interface{}) bool {
|
s.sysRoute.Range(func(key, value interface{}) bool {
|
||||||
node := value.(*sdwanNode)
|
node := value.(*sdwanNode)
|
||||||
GNetwork.ConnectNode(node.name)
|
GNetwork.ConnectNode(node.name)
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *p2pSDWAN) readNodeLoop() {
|
func (s *p2pSDWAN) readNodeLoop() {
|
||||||
gLog.Printf(LvDEBUG, "sdwan readNodeLoop start")
|
gLog.Printf(LvDEBUG, "sdwan readNodeLoop start")
|
||||||
defer gLog.Printf(LvDEBUG, "sdwan readNodeLoop end")
|
defer gLog.Printf(LvDEBUG, "sdwan readNodeLoop end")
|
||||||
writeBuff := make([][]byte, 1)
|
writeBuff := make([][]byte, 1)
|
||||||
for {
|
for {
|
||||||
nd := GNetwork.ReadNode(time.Second * 10) // TODO: read multi packet
|
nd := GNetwork.ReadNode(time.Second * 10) // TODO: read multi packet
|
||||||
if nd == nil {
|
if nd == nil {
|
||||||
gLog.Printf(LvDev, "waiting for node data")
|
gLog.Printf(LvDev, "waiting for node data")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
head := PacketHeader{}
|
head := PacketHeader{}
|
||||||
parseHeader(nd.Data, &head)
|
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))
|
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 {
|
if PIHeaderSize == 0 {
|
||||||
writeBuff[0] = nd.Data
|
writeBuff[0] = nd.Data
|
||||||
} else {
|
} else {
|
||||||
writeBuff[0] = make([]byte, PIHeaderSize+len(nd.Data))
|
writeBuff[0] = make([]byte, PIHeaderSize+len(nd.Data))
|
||||||
copy(writeBuff[0][PIHeaderSize:], nd.Data)
|
copy(writeBuff[0][PIHeaderSize:], nd.Data)
|
||||||
}
|
}
|
||||||
|
|
||||||
len, err := s.tun.Write(writeBuff, PIHeaderSize)
|
len, err := s.tun.Write(writeBuff, PIHeaderSize)
|
||||||
if err != nil {
|
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)
|
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 {
|
func isBroadcastOrMulticast(ipUint32 uint32, subnet *net.IPNet) bool {
|
||||||
// return ipUint32 == 0xffffffff || (byte(ipUint32) == 0xff) || (ipUint32>>28 == 0xe)
|
// 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
|
return ipUint32 == 0xffffffff || (ipUint32>>28 == 0xe) // 225.255.255.255/32, 224.0.0.0/4
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *p2pSDWAN) routeTunPacket(p []byte, head *PacketHeader) {
|
func (s *p2pSDWAN) routeTunPacket(p []byte, head *PacketHeader) {
|
||||||
var node *sdwanNode
|
var node *sdwanNode
|
||||||
// v, ok := s.routes.Load(ih.dst)
|
// v, ok := s.routes.Load(ih.dst)
|
||||||
v, ok := s.internalRoute.Load(head.dst)
|
v, ok := s.internalRoute.Load(head.dst)
|
||||||
if !ok || v == nil {
|
if !ok || v == nil {
|
||||||
if isBroadcastOrMulticast(head.dst, s.subnet) {
|
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())
|
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)
|
GNetwork.WriteBroadcast(p)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
} else {
|
} else {
|
||||||
node = v.(*sdwanNode)
|
node = v.(*sdwanNode)
|
||||||
}
|
}
|
||||||
|
|
||||||
err := GNetwork.WriteNode(node.id, p)
|
err := GNetwork.WriteNode(node.id, p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvDev, "write packet to %s fail: %s", node.name, err)
|
gLog.Printf(LvDev, "write packet to %s fail: %s", node.name, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *p2pSDWAN) readTunLoop() {
|
func (s *p2pSDWAN) readTunLoop() {
|
||||||
gLog.Printf(LvDEBUG, "sdwan readTunLoop start")
|
gLog.Printf(LvDEBUG, "sdwan readTunLoop start")
|
||||||
defer gLog.Printf(LvDEBUG, "sdwan readTunLoop end")
|
defer gLog.Printf(LvDEBUG, "sdwan readTunLoop end")
|
||||||
readBuff := make([][]byte, ReadTunBuffNum)
|
readBuff := make([][]byte, ReadTunBuffNum)
|
||||||
for i := 0; i < ReadTunBuffNum; i++ {
|
for i := 0; i < ReadTunBuffNum; i++ {
|
||||||
readBuff[i] = make([]byte, ReadTunBuffSize+PIHeaderSize)
|
readBuff[i] = make([]byte, ReadTunBuffSize+PIHeaderSize)
|
||||||
}
|
}
|
||||||
readBuffSize := make([]int, ReadTunBuffNum)
|
readBuffSize := make([]int, ReadTunBuffNum)
|
||||||
ih := PacketHeader{}
|
ih := PacketHeader{}
|
||||||
for {
|
for {
|
||||||
n, err := s.tun.Read(readBuff, readBuffSize, PIHeaderSize)
|
n, err := s.tun.Read(readBuff, readBuffSize, PIHeaderSize)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "read tun fail: ", err)
|
gLog.Printf(LvERROR, "read tun fail: ", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
for i := 0; i < n; i++ {
|
for i := 0; i < n; i++ {
|
||||||
if readBuffSize[i] > ReadTunBuffSize {
|
if readBuffSize[i] > ReadTunBuffSize {
|
||||||
gLog.Printf(LvERROR, "read tun overflow: len=", readBuffSize[i])
|
gLog.Printf(LvERROR, "read tun overflow: len=", readBuffSize[i])
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
parseHeader(readBuff[i][PIHeaderSize:readBuffSize[i]+PIHeaderSize], &ih)
|
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])
|
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)
|
s.routeTunPacket(readBuff[i][PIHeaderSize:readBuffSize[i]+PIHeaderSize], &ih)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *p2pSDWAN) StartTun() error {
|
func (s *p2pSDWAN) StartTun() error {
|
||||||
sdwan := gConf.getSDWAN()
|
sdwan := gConf.getSDWAN()
|
||||||
if s.tun == nil {
|
if s.tun == nil {
|
||||||
tun := &optun{}
|
tun := &optun{}
|
||||||
err := tun.Start(s.virtualIP.String(), &sdwan)
|
err := tun.Start(s.virtualIP.String(), &sdwan)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "open tun fail:", err)
|
gLog.Println(LvERROR, "open tun fail:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
s.tun = tun
|
s.tun = tun
|
||||||
go s.readTunLoop()
|
go s.readTunLoop()
|
||||||
go s.readNodeLoop() // multi-thread read will cause packets out of order, resulting in slower speeds
|
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)
|
err := setTunAddr(s.tun.tunName, s.virtualIP.String(), sdwan.Gateway, s.tun.dev)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "setTunAddr error:%s,%s,%s,%s", err, s.tun.tunName, s.virtualIP.String(), sdwan.Gateway)
|
gLog.Printf(LvERROR, "setTunAddr error:%s,%s,%s,%s", err, s.tun.tunName, s.virtualIP.String(), sdwan.Gateway)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleSDWAN(subType uint16, msg []byte) error {
|
func handleSDWAN(subType uint16, msg []byte) error {
|
||||||
gLog.Printf(LvDEBUG, "handle sdwan msg type:%d", subType)
|
gLog.Printf(LvDEBUG, "handle sdwan msg type:%d", subType)
|
||||||
var err error
|
var err error
|
||||||
switch subType {
|
switch subType {
|
||||||
case MsgSDWANInfoRsp:
|
case MsgSDWANInfoRsp:
|
||||||
rsp := SDWANInfo{}
|
rsp := SDWANInfo{}
|
||||||
if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
|
if err = json.Unmarshal(msg[openP2PHeaderSize:], &rsp); err != nil {
|
||||||
return ErrMsgFormat
|
return ErrMsgFormat
|
||||||
}
|
}
|
||||||
gLog.Println(LvINFO, "sdwan init:", prettyJson(rsp))
|
gLog.Println(LvINFO, "sdwan init:", prettyJson(rsp))
|
||||||
if runtime.GOOS == "android" {
|
if runtime.GOOS == "android" {
|
||||||
AndroidSDWANConfig <- msg[openP2PHeaderSize:]
|
AndroidSDWANConfig <- msg[openP2PHeaderSize:]
|
||||||
}
|
}
|
||||||
// GNetwork.sdwan.detail = &rsp
|
// GNetwork.sdwan.detail = &rsp
|
||||||
gConf.setSDWAN(rsp)
|
gConf.setSDWAN(rsp)
|
||||||
err = GNetwork.sdwan.init(gConf.Network.Node)
|
err = GNetwork.sdwan.init(gConf.Network.Node)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "sdwan init fail: ", err)
|
gLog.Println(LvERROR, "sdwan init fail: ", err)
|
||||||
if GNetwork.sdwan.tun != nil {
|
if GNetwork.sdwan.tun != nil {
|
||||||
GNetwork.sdwan.tun.Stop()
|
GNetwork.sdwan.tun.Stop()
|
||||||
GNetwork.sdwan.tun = nil
|
GNetwork.sdwan.tun = nil
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
go GNetwork.sdwan.run()
|
go GNetwork.sdwan.run()
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
478
core/update.go
478
core/update.go
@@ -1,239 +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"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func update(host string, port int) error {
|
func update(host string, port int) error {
|
||||||
gLog.Println(LvINFO, "update start")
|
gLog.Println(LvINFO, "update start")
|
||||||
defer gLog.Println(LvINFO, "update end")
|
defer gLog.Println(LvINFO, "update end")
|
||||||
caCertPool, err := x509.SystemCertPool()
|
caCertPool, err := x509.SystemCertPool()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "Failed to load system root CAs:", err)
|
gLog.Println(LvERROR, "Failed to load system root CAs:", err)
|
||||||
} else {
|
} else {
|
||||||
caCertPool = x509.NewCertPool()
|
caCertPool = x509.NewCertPool()
|
||||||
}
|
}
|
||||||
caCertPool.AppendCertsFromPEM([]byte(rootCA))
|
caCertPool.AppendCertsFromPEM([]byte(rootCA))
|
||||||
caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
|
caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
|
||||||
|
|
||||||
c := http.Client{
|
c := http.Client{
|
||||||
Transport: &http.Transport{
|
Transport: &http.Transport{
|
||||||
TLSClientConfig: &tls.Config{RootCAs: caCertPool,
|
TLSClientConfig: &tls.Config{RootCAs: caCertPool,
|
||||||
InsecureSkipVerify: false},
|
InsecureSkipVerify: false},
|
||||||
},
|
},
|
||||||
Timeout: time.Second * 30,
|
Timeout: time.Second * 30,
|
||||||
}
|
}
|
||||||
goos := runtime.GOOS
|
goos := runtime.GOOS
|
||||||
goarch := runtime.GOARCH
|
goarch := runtime.GOARCH
|
||||||
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)))
|
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)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "update:query update list failed:", err)
|
gLog.Println(LvERROR, "update:query update list failed:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer rsp.Body.Close()
|
defer rsp.Body.Close()
|
||||||
if rsp.StatusCode != http.StatusOK {
|
if rsp.StatusCode != http.StatusOK {
|
||||||
gLog.Println(LvERROR, "get update info error:", rsp.Status)
|
gLog.Println(LvERROR, "get update info error:", rsp.Status)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
rspBuf, err := ioutil.ReadAll(rsp.Body)
|
rspBuf, err := ioutil.ReadAll(rsp.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "update:read update list failed:", err)
|
gLog.Println(LvERROR, "update:read update list failed:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
updateInfo := UpdateInfo{}
|
updateInfo := UpdateInfo{}
|
||||||
if err = json.Unmarshal(rspBuf, &updateInfo); err != nil {
|
if err = json.Unmarshal(rspBuf, &updateInfo); err != nil {
|
||||||
gLog.Println(LvERROR, rspBuf, " update info decode error:", err)
|
gLog.Println(LvERROR, rspBuf, " update info decode error:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if updateInfo.Error != 0 {
|
if updateInfo.Error != 0 {
|
||||||
gLog.Println(LvERROR, "update error:", updateInfo.Error, updateInfo.ErrorDetail)
|
gLog.Println(LvERROR, "update error:", updateInfo.Error, updateInfo.ErrorDetail)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
err = updateFile(updateInfo.Url, "", "openp2p")
|
err = updateFile(updateInfo.Url, "", "openp2p")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "update: download failed:", err)
|
gLog.Println(LvERROR, "update: download failed:", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func downloadFile(url string, checksum string, dstFile string) error {
|
func downloadFile(url string, checksum string, dstFile string) error {
|
||||||
output, err := os.OpenFile(dstFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0776)
|
output, err := os.OpenFile(dstFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0776)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "OpenFile %s error:%s", dstFile, err)
|
gLog.Printf(LvERROR, "OpenFile %s error:%s", dstFile, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
caCertPool, err := x509.SystemCertPool()
|
caCertPool, err := x509.SystemCertPool()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Println(LvERROR, "Failed to load system root CAs:", err)
|
gLog.Println(LvERROR, "Failed to load system root CAs:", err)
|
||||||
} else {
|
} else {
|
||||||
caCertPool = x509.NewCertPool()
|
caCertPool = x509.NewCertPool()
|
||||||
}
|
}
|
||||||
caCertPool.AppendCertsFromPEM([]byte(rootCA))
|
caCertPool.AppendCertsFromPEM([]byte(rootCA))
|
||||||
caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
|
caCertPool.AppendCertsFromPEM([]byte(ISRGRootX1))
|
||||||
tr := &http.Transport{
|
tr := &http.Transport{
|
||||||
TLSClientConfig: &tls.Config{
|
TLSClientConfig: &tls.Config{
|
||||||
RootCAs: caCertPool,
|
RootCAs: caCertPool,
|
||||||
InsecureSkipVerify: false},
|
InsecureSkipVerify: false},
|
||||||
}
|
}
|
||||||
client := &http.Client{Transport: tr}
|
client := &http.Client{Transport: tr}
|
||||||
response, err := client.Get(url)
|
response, err := client.Get(url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "download url %s error:%s", url, err)
|
gLog.Printf(LvERROR, "download url %s error:%s", url, err)
|
||||||
output.Close()
|
output.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer response.Body.Close()
|
defer response.Body.Close()
|
||||||
n, err := io.Copy(output, response.Body)
|
n, err := io.Copy(output, response.Body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "io.Copy error:%s", err)
|
gLog.Printf(LvERROR, "io.Copy error:%s", err)
|
||||||
output.Close()
|
output.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
output.Sync()
|
output.Sync()
|
||||||
output.Close()
|
output.Close()
|
||||||
gLog.Println(LvINFO, "download ", url, " ok")
|
gLog.Println(LvINFO, "download ", url, " ok")
|
||||||
gLog.Printf(LvINFO, "size: %d bytes", n)
|
gLog.Printf(LvINFO, "size: %d bytes", n)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateFile(url string, checksum string, dst string) error {
|
func updateFile(url string, checksum string, dst string) error {
|
||||||
gLog.Println(LvINFO, "download ", url)
|
gLog.Println(LvINFO, "download ", url)
|
||||||
tmpFile := filepath.Dir(os.Args[0]) + "/openp2p.tmp"
|
tmpFile := filepath.Dir(os.Args[0]) + "/openp2p.tmp"
|
||||||
err := downloadFile(url, checksum, tmpFile)
|
err := downloadFile(url, checksum, tmpFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
backupFile := os.Args[0] + "0"
|
backupFile := os.Args[0] + "0"
|
||||||
err = os.Rename(os.Args[0], backupFile) // the old daemon process was using the 0 file, so it will prevent override it
|
err = os.Rename(os.Args[0], backupFile) // the old daemon process was using the 0 file, so it will prevent override it
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvINFO, " rename %s error:%s, retry 1", os.Args[0], err)
|
gLog.Printf(LvINFO, " rename %s error:%s, retry 1", os.Args[0], err)
|
||||||
backupFile = os.Args[0] + "1"
|
backupFile = os.Args[0] + "1"
|
||||||
err = os.Rename(os.Args[0], backupFile)
|
err = os.Rename(os.Args[0], backupFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvINFO, " rename %s error:%s", os.Args[0], err)
|
gLog.Printf(LvINFO, " rename %s error:%s", os.Args[0], err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// extract
|
// extract
|
||||||
gLog.Println(LvINFO, "extract files")
|
gLog.Println(LvINFO, "extract files")
|
||||||
err = extract(filepath.Dir(os.Args[0]), tmpFile)
|
err = extract(filepath.Dir(os.Args[0]), tmpFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
gLog.Printf(LvERROR, "extract error:%s. revert rename", err)
|
gLog.Printf(LvERROR, "extract error:%s. revert rename", err)
|
||||||
os.Rename(backupFile, os.Args[0])
|
os.Rename(backupFile, os.Args[0])
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
os.Remove(tmpFile)
|
os.Remove(tmpFile)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func extract(dst, src string) (err error) {
|
func extract(dst, src string) (err error) {
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
return unzip(dst, src)
|
return unzip(dst, src)
|
||||||
} else {
|
} else {
|
||||||
return extractTgz(dst, src)
|
return extractTgz(dst, src)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func unzip(dst, src string) (err error) {
|
func unzip(dst, src string) (err error) {
|
||||||
archive, err := zip.OpenReader(src)
|
archive, err := zip.OpenReader(src)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer archive.Close()
|
defer archive.Close()
|
||||||
|
|
||||||
for _, f := range archive.File {
|
for _, f := range archive.File {
|
||||||
filePath := filepath.Join(dst, f.Name)
|
filePath := filepath.Join(dst, f.Name)
|
||||||
fmt.Println("unzipping file ", filePath)
|
fmt.Println("unzipping file ", filePath)
|
||||||
if f.FileInfo().IsDir() {
|
if f.FileInfo().IsDir() {
|
||||||
fmt.Println("creating directory...")
|
fmt.Println("creating directory...")
|
||||||
os.MkdirAll(filePath, os.ModePerm)
|
os.MkdirAll(filePath, os.ModePerm)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
|
if err := os.MkdirAll(filepath.Dir(filePath), os.ModePerm); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
|
dstFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fileInArchive, err := f.Open()
|
fileInArchive, err := f.Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if _, err := io.Copy(dstFile, fileInArchive); err != nil {
|
if _, err := io.Copy(dstFile, fileInArchive); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
dstFile.Close()
|
dstFile.Close()
|
||||||
fileInArchive.Close()
|
fileInArchive.Close()
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func extractTgz(dst, src string) error {
|
func extractTgz(dst, src string) error {
|
||||||
gzipStream, err := os.Open(src)
|
gzipStream, err := os.Open(src)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
uncompressedStream, err := gzip.NewReader(gzipStream)
|
uncompressedStream, err := gzip.NewReader(gzipStream)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
tarReader := tar.NewReader(uncompressedStream)
|
tarReader := tar.NewReader(uncompressedStream)
|
||||||
for {
|
for {
|
||||||
header, err := tarReader.Next()
|
header, err := tarReader.Next()
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
switch header.Typeflag {
|
switch header.Typeflag {
|
||||||
case tar.TypeDir:
|
case tar.TypeDir:
|
||||||
if err := os.Mkdir(header.Name, 0755); err != nil {
|
if err := os.Mkdir(header.Name, 0755); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
case tar.TypeReg:
|
case tar.TypeReg:
|
||||||
filePath := filepath.Join(dst, header.Name)
|
filePath := filepath.Join(dst, header.Name)
|
||||||
outFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode))
|
outFile, err := os.OpenFile(filePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer outFile.Close()
|
defer outFile.Close()
|
||||||
if _, err := io.Copy(outFile, tarReader); err != nil {
|
if _, err := io.Copy(outFile, tarReader); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func cleanTempFiles() {
|
func cleanTempFiles() {
|
||||||
tmpFile := os.Args[0] + "0"
|
tmpFile := os.Args[0] + "0"
|
||||||
if _, err := os.Stat(tmpFile); err == nil {
|
if _, err := os.Stat(tmpFile); err == nil {
|
||||||
if err := os.Remove(tmpFile); err != nil {
|
if err := os.Remove(tmpFile); err != nil {
|
||||||
gLog.Printf(LvDEBUG, " remove %s error:%s", tmpFile, err)
|
gLog.Printf(LvDEBUG, " remove %s error:%s", tmpFile, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tmpFile = os.Args[0] + "1"
|
tmpFile = os.Args[0] + "1"
|
||||||
if _, err := os.Stat(tmpFile); err == nil {
|
if _, err := os.Stat(tmpFile); err == nil {
|
||||||
if err := os.Remove(tmpFile); err != nil {
|
if err := os.Remove(tmpFile); err != nil {
|
||||||
gLog.Printf(LvDEBUG, " remove %s error:%s", tmpFile, err)
|
gLog.Printf(LvDEBUG, " remove %s error:%s", tmpFile, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,18 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
// On Windows env
|
||||||
op "openp2p/core"
|
// cd lib
|
||||||
)
|
// go build -o openp2p.dll -buildmode=c-shared openp2p.go
|
||||||
import "C"
|
// caller example see example/dll
|
||||||
|
import (
|
||||||
func main() {
|
op "openp2p/core"
|
||||||
}
|
)
|
||||||
|
import "C"
|
||||||
//export RunCmd
|
|
||||||
func RunCmd(cmd *C.char) {
|
func main() {
|
||||||
op.RunCmd(C.GoString(cmd))
|
}
|
||||||
}
|
|
||||||
|
//export RunCmd
|
||||||
|
func RunCmd(cmd *C.char) {
|
||||||
|
op.RunCmd(C.GoString(cmd))
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user