doc

README-ZH.md

@@ -1,7 +1,8 @@
 # [English](/README.md)|中文  
 网站: [openp2p.cn](https://openp2p.cn)
 ## OpenP2P是什么
-它是一个开源、免费、轻量级的P2P共享网络。任何设备接入OpenP2P，随时随地访问它们。相比BT网络用来共享文件，OpenP2P网络用来共享带宽。
+它是一个开源、免费、轻量级的P2P共享网络。你的设备将组成一个私有P2P网络，里面的设备可以直接访问其它成员，或者通过其它成员转发数据间接访问。如果私有网络无法完成通信，将会到公有P2P网络寻找共享节点协助通信。
+相比BT网络用来共享文件，OpenP2P网络用来共享带宽。
 我们的目标是：充分利用带宽，利用共享节点转发数据，建设一个远程连接的通用基础设施。
 
 ## 为什么选择OpenP2P

README.md

@@ -1,7 +1,8 @@
 # English|[中文](/README-ZH.md)  
 Website: [openp2p.cn](https://openp2p.cn)
 ## What is OpenP2P
-It is an open source, free, and lightweight P2P sharing network. As long as any device joins in, you can access them anywhere. Compared with the BT network used to share files, the OpenP2P network is used to share bandwidth.
+It is an open source, free, and lightweight P2P sharing network. Your devices will form a private P2P network, in which devices can directly access other members, or indirectly access through other members forwarding data.
+If the private network cannot complete the communication, it will go to the public P2P network to find a shared node to assist in the communication. Compared with the BT network used to share files, the OpenP2P network is used to share bandwidth.
 Our goal is to make full use of bandwidth, use shared nodes to relay data, and build a common infrastructure for remote connections.
 ## Why OpenP2P
 ### 1. Free
@@ -36,35 +37,35 @@ Here's an example of remote work: connecting to an office Windows computer at ho
 ### 1.Register
 Go to <https://console.openp2p.cn> register a new user
 
-   ![image](/doc/images/register.png)
+   ![image](/doc/images/register_en.png)
 ### 2.Install
 Download on local and remote computers and double-click to run, one-click installation
 
-   ![image](/doc/images/install.png)
+   ![image](/doc/images/install_en.png)
 
    By default, Windows will block programs that have not been signed by the Microsoft's certificate, and you can select "Run anyway".
 
-   ![image](/doc/images/win10warn.png)
+   ![image](/doc/images/win10warn_en.png)
 
-   ![image](/doc/images/stillrun.png)
+   ![image](/doc/images/stillrun_en.png)
 ### 3.New P2PApp
 
-![image](/doc/images/devices.png)
+![image](/doc/images/devices_en.png)
 
-![image](/doc/images/newapp.png)
+![image](/doc/images/newapp_en.png)
 
-![image](/doc/images/newappedit.png)
+![image](/doc/images/newappedit_en.png)
 
 ### 4.Use P2PApp
 You can see the P2P application you just created on the "MyHomePC" device, just connect to the "local listening port" shown in the figure below.
 
-![image](/doc/images/p2pappok.png)
+![image](/doc/images/p2pappok_en.png)
 
 On MyHomePC, press Win+R and enter MSTSC to open the remote desktop, input `127.0.0.1:23389 /admin`
 
-   ![image](/doc/images/mstscconnect.png)
+   ![image](/doc/images/mstscconnect_en.png)
 
-   ![image](/doc/images/afterconnect.png)
+   ![image](/doc/images/afterconnect_en.png)
 
 
 ## Usage

USAGE-ZH.md

@@ -14,7 +14,7 @@
 >* -d: daemon模式。发现worker进程意外退出就会自动启动新的worker进程
 >* -node: 独一无二的节点名字，唯一标识
 >* -token: 在<console.openp2p.cn>“我的”里面找到
->* -sharebandwidth: 作为共享节点时提供带宽，默认10mbps. 如果是光纤大带宽，设置越大效果越好. -1表示不共享，该节点只在私有的P2P网络使用。不加入共享的P2P网络，这样也意味着无法使用别人的共享节点
+>* -sharebandwidth: 作为共享节点时提供带宽，默认10mbps. 如果是光纤大带宽，设置越大效果越好. 0表示不共享，该节点只在私有的P2P网络使用。不加入共享的P2P网络，这样也意味着无法使用别人的共享节点
 >* -loglevel: 需要查看更多调试日志，设置0；默认是1
 
 ## 连接
@@ -39,7 +39,7 @@
   "network": {
     "Node": "hhd1207-222",
     "Token": "TOKEN",
-    "ShareBandwidth": -1,
+    "ShareBandwidth": 0,
     "ServerHost": "api.openp2p.cn",
     "ServerPort": 27183,
     "UDPPort1": 27182,

USAGE.md

@@ -16,7 +16,7 @@ Or
 >* -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
 >* -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. -1 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
 
 ## Connect
@@ -41,7 +41,7 @@ Configuration example
   "network": {
     "Node": "hhd1207-222",
     "Token": "TOKEN",
-    "ShareBandwidth": -1,
+    "ShareBandwidth": 0,
     "ServerHost": "api.openp2p.cn",
     "ServerPort": 27183,
     "UDPPort1": 27182,

common.go

@@ -7,8 +7,10 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
+	"math/rand"
 	"net"
 	"net/http"
+	"os"
 	"os/exec"
 	"time"
 )
@@ -148,3 +150,11 @@ func execOutput(name string, args ...string) string {
 	cmdGetOsName.Run()
 	return cmdOut.String()
 }
+
+func defaultNodeName() string {
+	name, _ := os.Hostname()
+	for len(name) < 8 {
+		name = fmt.Sprintf("%s%d", name, rand.Int()%10)
+	}
+	return name
+}

config.go

@@ -119,7 +119,6 @@ type NetworkConfig struct {
 	User           string
 	localIP        string
 	ipv6           string
-	hostName       string
 	mac            string
 	os             string
 	publicIP       string
@@ -143,7 +142,7 @@ func parseParams() {
 	srcPort := flag.Int("srcport", 0, "source port ")
 	protocol := flag.String("protocol", "tcp", "tcp or udp")
 	appName := flag.String("appname", "", "app name")
-	flag.Bool("noshare", false, "deprecated. uses -sharebandwidth -1") // Deprecated, rm later
+	flag.Bool("noshare", false, "deprecated. uses -sharebandwidth 0") // Deprecated, rm later
 	shareBandwidth := flag.Int("sharebandwidth", 10, "N mbps share bandwidth limit, private node no limit")
 	flag.Bool("f", false, "deprecated. config file") // Deprecated, rm later
 	daemonMode := flag.Bool("d", false, "daemonMode")
@@ -184,6 +183,10 @@ func parseParams() {
 		gConf.Network.ServerHost = *serverHost
 	}
 	if gConf.Network.Node == "" {
+		if *node == "" { // config and param's node both empty
+			hostname := defaultNodeName()
+			node = &hostname
+		}
 		gConf.Network.Node = *node
 	}
 	if *token != 0 {

daemon.go

@@ -106,9 +106,9 @@ func (d *daemon) Control(ctrlComm string, exeAbsPath string, args []string) erro
 
 // examples:
 // listen:
-// ./openp2p install -node hhd1207-222 -token YOUR-TOKEN -sharebandwidth -1
+// ./openp2p install -node hhd1207-222 -token YOUR-TOKEN -sharebandwidth 0
 // listen and build p2papp:
-// ./openp2p install -node hhd1207-222 -token YOUR-TOKEN -sharebandwidth -1 -peernode hhdhome-n1 -dstip 127.0.0.1 -dstport 50022 -protocol tcp -srcport 22
+// ./openp2p install -node hhd1207-222 -token YOUR-TOKEN -sharebandwidth 0 -peernode hhdhome-n1 -dstip 127.0.0.1 -dstport 50022 -protocol tcp -srcport 22
 func install() {
 	gLog.Println(LevelINFO, "install start")
 	defer gLog.Println(LevelINFO, "install end")
@@ -127,16 +127,16 @@ func install() {
 	srcPort := installFlag.Int("srcport", 0, "source port ")
 	protocol := installFlag.String("protocol", "tcp", "tcp or udp")
 	appName := flag.String("appname", "", "app name")
-	installFlag.Bool("noshare", false, "deprecated. uses -sharebandwidth -1")
+	installFlag.Bool("noshare", false, "deprecated. uses -sharebandwidth 0")
 	shareBandwidth := installFlag.Int("sharebandwidth", 10, "N mbps share bandwidth limit, private node no limit")
 	logLevel := installFlag.Int("loglevel", 1, "0:debug 1:info 2:warn 3:error")
 	installFlag.Parse(os.Args[2:])
 	if *node != "" && len(*node) < 8 {
-		gLog.Println(LevelERROR, "node name too short, it must >=8 charaters")
+		gLog.Println(LevelERROR, ErrNodeTooShort)
 		os.Exit(9)
 	}
 	if *node == "" { // if node name not set. use os.Hostname
-		hostname, _ := os.Hostname()
+		hostname := defaultNodeName()
 		node = &hostname
 	}
 	gConf.load() // load old config. otherwise will clear all apps

errorcode.go

@@ -8,6 +8,9 @@ import (
 var (
 	// ErrorS2S string = "s2s is not supported"
 	// ErrorHandshake string = "handshake error"
-	ErrorS2S       = errors.New("s2s is not supported")
-	ErrorHandshake = errors.New("handshake error")
+	ErrorS2S        = errors.New("s2s is not supported")
+	ErrorHandshake  = errors.New("handshake error")
+	ErrorNewUser    = errors.New("new user")
+	ErrorLogin      = errors.New("user or password not correct")
+	ErrNodeTooShort = errors.New("node name too short, it must >=8 charaters")
 )

p2pnetwork.go

@@ -10,7 +10,6 @@ import (
 	"math/rand"
 	"net"
 	"net/url"
-	"os"
 	"strings"
 	"sync"
 	"time"
@@ -361,11 +360,6 @@ func (pn *P2PNetwork) init() error {
 	gLog.Println(LevelINFO, "init start")
 	var err error
 	for {
-		pn.config.hostName, err = os.Hostname()
-		if err != nil {
-			break
-		}
-
 		// detect nat type
 		pn.config.publicIP, pn.config.natType, err = getNATType(pn.config.ServerHost, pn.config.UDPPort1, pn.config.UDPPort2)
 		// TODO rm test s2s

protocol.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-const OpenP2PVersion = "1.0.0"
+const OpenP2PVersion = "1.1.0"
 const ProducnName string = "openp2p"
 
 type openP2PHeader struct {