support android

core/install.go

@@ -17,7 +17,7 @@ import (
 // ./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(LvINFO, "openp2p start. version: ", OpenP2PVersion)
-	gLog.Println(LvINFO, "Contact: QQ: 477503927, Email: [email protected]")
+	gLog.Println(LvINFO, "Contact: QQ: 16947733, Email: [email protected]")
 	gLog.Println(LvINFO, "install start")
 	defer gLog.Println(LvINFO, "install end")
 	// auto uninstall

core/nat.go

@@ -51,6 +51,8 @@ func natTCP(serverHost string, serverPort int, localPort int) (publicIP string,
 
 }
 func natTest(serverHost string, serverPort int, localPort int) (publicIP string, publicPort int, err error) {
+	gLog.Println(LvDEBUG, "natTest start")
+	defer gLog.Println(LvDEBUG, "natTest end")
 	conn, err := net.ListenPacket("udp", fmt.Sprintf(":%d", localPort))
 	if err != nil {
 		gLog.Println(LvERROR, "natTest listen udp error:", err)
@@ -113,6 +115,7 @@ func publicIPTest(publicIP string, echoPort int) (hasPublicIP int, hasUPNPorNATP
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
+		gLog.Println(LvDEBUG, "echo server start")
 		var err error
 		echoConn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: echoPort})
 		if err != nil {
@@ -129,6 +132,7 @@ func publicIPTest(publicIP string, echoPort int) (hasPublicIP int, hasUPNPorNATP
 			return
 		}
 		echoConn.WriteToUDP(buf[0:n], addr)
+		gLog.Println(LvDEBUG, "echo server end")
 	}()
 	wg.Wait() // wait echo udp
 	defer echoConn.Close()
@@ -136,6 +140,7 @@ func publicIPTest(publicIP string, echoPort int) (hasPublicIP int, hasUPNPorNATP
 	for i := 0; i < 2; i++ {
 		if i == 1 {
 			// test upnp or nat-pmp
+			gLog.Println(LvDEBUG, "upnp test start")
 			nat, err := Discover()
 			if err != nil || nat == nil {
 				gLog.Println(LvDEBUG, "could not perform UPNP discover:", err)

core/openp2p.go

@@ -43,7 +43,7 @@ func Run() {
 	}
 	parseParams("")
 	gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
-	gLog.Println(LvINFO, "Contact: QQ: 477503927, Email: [email protected]")
+	gLog.Println(LvINFO, "Contact: QQ group 16947733, Email [email protected]")
 
 	if gConf.daemonMode {
 		d := daemon{}
@@ -67,18 +67,21 @@ var network *P2PNetwork
 
 // for Android app
 // gomobile not support uint64 exported to java
-func RunAsModule(baseDir string, token string, bw int) *P2PNetwork {
+func RunAsModule(baseDir string, token string, bw int, logLevel int) *P2PNetwork {
 	rand.Seed(time.Now().UnixNano())
 	os.Chdir(baseDir) // for system service
 	gLog = NewLogger(baseDir, ProducnName, LvDEBUG, 1024*1024, LogFileAndConsole)
-	// TODO: install sub command, deamon process
+
 	parseParams("")
 
-	n, _ := strconv.ParseUint(token, 10, 64)
-	gConf.setToken(n)
-	gConf.setShareBandwidth(0)
+	n, err := strconv.ParseUint(token, 10, 64)
+	if err == nil {
+		gConf.setToken(n)
+	}
+	gLog.setLevel(LogLevel(logLevel))
+	gConf.setShareBandwidth(bw)
 	gLog.Println(LvINFO, "openp2p start. version: ", OpenP2PVersion)
-	gLog.Println(LvINFO, "Contact: QQ: 477503927, Email: [email protected]")
+	gLog.Println(LvINFO, "Contact: QQ group 16947733, Email [email protected]")
 	gLog.Println(LvINFO, &gConf)
 
 	network = P2PNetworkInstance(&gConf.Network)

core/p2pnetwork.go

@@ -64,6 +64,7 @@ func P2PNetworkInstance(config *NetworkConfig) *P2PNetwork {
 }
 
 func (pn *P2PNetwork) run() {
+	go pn.readLoop()
 	go pn.autorunApp()
 	heartbeatTimer := time.NewTicker(NetworkHeartbeatTime)
 	for pn.running {
@@ -487,7 +488,6 @@ func (pn *P2PNetwork) init() error {
 			err = errors.New("get local ip failed")
 			break
 		}
-		go pn.readLoop()
 
 		pn.config.mac = getmac(pn.config.localIP)
 		pn.config.os = getOsName()