From 0fb3bc4e2666ec2c08a5bada70699a7b851ec42c Mon Sep 17 00:00:00 2001 From: TenderIronh Date: Wed, 15 Jun 2022 23:20:13 +0800 Subject: [PATCH] request peer info token wrong --- p2pnetwork.go | 1 + p2ptunnel.go | 2 +- protocol.go | 4 ++-- upnp.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/p2pnetwork.go b/p2pnetwork.go index 94ccf69..915a551 100644 --- a/p2pnetwork.go +++ b/p2pnetwork.go @@ -136,6 +136,7 @@ func (pn *P2PNetwork) runAll() { } config.nextRetryTime = time.Now().Add(time.Second * time.Duration(increase)) // exponential increase retry time. 1.3^x config.connectTime = time.Now() + config.peerToken = pn.config.Token gConf.mtx.Unlock() // AddApp will take a period of time err := pn.AddApp(*config) gConf.mtx.Lock() diff --git a/p2ptunnel.go b/p2ptunnel.go index 40b196b..e5dcdd8 100644 --- a/p2ptunnel.go +++ b/p2ptunnel.go @@ -33,7 +33,7 @@ type P2PTunnel struct { func (t *P2PTunnel) requestPeerInfo() error { // request peer info - t.pn.write(MsgQuery, MsgQueryPeerInfoReq, &QueryPeerInfoReq{t.pn.config.Token, t.config.PeerNode}) + t.pn.write(MsgQuery, MsgQueryPeerInfoReq, &QueryPeerInfoReq{t.config.peerToken, t.config.PeerNode}) head, body := t.pn.read("", MsgQuery, MsgQueryPeerInfoRsp, time.Second*10) if head == nil { return ErrPeerOffline diff --git a/protocol.go b/protocol.go index d08e65c..19e28bc 100644 --- a/protocol.go +++ b/protocol.go @@ -10,7 +10,7 @@ import ( "time" ) -const OpenP2PVersion = "3.1.0" +const OpenP2PVersion = "3.2.0" const ProducnName string = "openp2p" const LeastSupportVersion = "3.0.0" @@ -148,7 +148,7 @@ const ( PublicIPEchoTimeout = time.Second * 1 NatTestTimeout = time.Second * 10 ClientAPITimeout = time.Second * 10 - MaxDirectTry = 5 + MaxDirectTry = 3 ) // NATNone has public ip diff --git a/upnp.go b/upnp.go index 9b7a0f1..d46335e 100644 --- a/upnp.go +++ b/upnp.go @@ -64,7 +64,7 @@ func Discover() (nat NAT, err error) { var n int _, _, err = socket.ReadFromUDP(answerBytes) if err != nil { - gLog.Println(LvERROR, "UPNP discover error:", err) + gLog.Println(LvDEBUG, "UPNP discover error:", err) return }