Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
1cbfbb1b
Commit
1cbfbb1b
authored
Feb 07, 2021
by
vipwzw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
auto ci
parent
defa98e1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
12 deletions
+11
-12
nodeinfo.go
plugin/p2p/gossip/nodeinfo.go
+2
-1
p2p_test.go
plugin/p2p/gossip/p2p_test.go
+8
-9
p2pcli.go
plugin/p2p/gossip/p2pcli.go
+1
-2
No files found.
plugin/p2p/gossip/nodeinfo.go
View file @
1cbfbb1b
...
@@ -5,10 +5,11 @@
...
@@ -5,10 +5,11 @@
package
gossip
package
gossip
import
(
import
(
"google.golang.org/grpc/credentials"
"sync"
"sync"
"sync/atomic"
"sync/atomic"
"google.golang.org/grpc/credentials"
"github.com/33cn/chain33/p2p/utils"
"github.com/33cn/chain33/p2p/utils"
"github.com/33cn/chain33/queue"
"github.com/33cn/chain33/queue"
...
...
plugin/p2p/gossip/p2p_test.go
View file @
1cbfbb1b
...
@@ -265,7 +265,7 @@ func testPeer(t *testing.T, p2p *P2p, q queue.Queue) {
...
@@ -265,7 +265,7 @@ func testPeer(t *testing.T, p2p *P2p, q queue.Queue) {
_
,
err
=
p2pcli
.
SendVersion
(
peer
,
localP2P
.
node
.
nodeInfo
)
_
,
err
=
p2pcli
.
SendVersion
(
peer
,
localP2P
.
node
.
nodeInfo
)
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
t
.
Log
(
"nodeinfo"
,
localP2P
.
node
.
nodeInfo
)
t
.
Log
(
"nodeinfo"
,
localP2P
.
node
.
nodeInfo
)
t
.
Log
(
p2pcli
.
CheckPeerNatOk
(
"localhost:53802"
,
localP2P
.
node
.
nodeInfo
))
t
.
Log
(
p2pcli
.
CheckPeerNatOk
(
"localhost:53802"
,
localP2P
.
node
.
nodeInfo
))
t
.
Log
(
"checkself:"
,
p2pcli
.
CheckSelf
(
"loadhost:43803"
,
localP2P
.
node
.
nodeInfo
))
t
.
Log
(
"checkself:"
,
p2pcli
.
CheckSelf
(
"loadhost:43803"
,
localP2P
.
node
.
nodeInfo
))
_
,
err
=
p2pcli
.
GetAddr
(
peer
)
_
,
err
=
p2pcli
.
GetAddr
(
peer
)
...
@@ -557,20 +557,19 @@ RObdAoGBALP9HK7KuX7xl0cKBzOiXqnAyoMUfxvO30CsMI3DS0SrPc1p95OHswdu
...
@@ -557,20 +557,19 @@ RObdAoGBALP9HK7KuX7xl0cKBzOiXqnAyoMUfxvO30CsMI3DS0SrPc1p95OHswdu
return
return
}
}
var
node
Node
var
node
Node
node
.
nodeInfo
=
&
NodeInfo
{}
node
.
nodeInfo
=
&
NodeInfo
{}
servCreds
:=
credentials
.
NewServerTLSFromCert
(
&
certificate
)
servCreds
:=
credentials
.
NewServerTLSFromCert
(
&
certificate
)
cliCreds
:=
credentials
.
NewClientTLSFromCert
(
cp
,
""
)
cliCreds
:=
credentials
.
NewClientTLSFromCert
(
cp
,
""
)
node
.
listenPort
=
3331
node
.
listenPort
=
3331
node
.
nodeInfo
.
servCreds
=
servCreds
node
.
nodeInfo
.
servCreds
=
servCreds
newListener
(
"tcp"
,
&
node
)
newListener
(
"tcp"
,
&
node
)
netAddr
,
err
:=
NewNetAddressString
(
"localhost:3331"
)
netAddr
,
err
:=
NewNetAddressString
(
"localhost:3331"
)
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
conn
,
err
:=
grpc
.
Dial
(
netAddr
.
String
(),
grpc
.
WithTransportCredentials
(
cliCreds
))
conn
,
err
:=
grpc
.
Dial
(
netAddr
.
String
(),
grpc
.
WithTransportCredentials
(
cliCreds
))
assert
.
Nil
(
t
,
err
)
assert
.
Nil
(
t
,
err
)
assert
.
NotNil
(
t
,
conn
)
assert
.
NotNil
(
t
,
conn
)
conn
.
Close
()
conn
.
Close
()
conn
,
err
=
grpc
.
Dial
(
netAddr
.
String
())
conn
,
err
=
grpc
.
Dial
(
netAddr
.
String
())
...
...
plugin/p2p/gossip/p2pcli.go
View file @
1cbfbb1b
...
@@ -563,7 +563,6 @@ func (m *Cli) CheckPeerNatOk(addr string, info *NodeInfo) bool {
...
@@ -563,7 +563,6 @@ func (m *Cli) CheckPeerNatOk(addr string, info *NodeInfo) bool {
//连接自己的地址信息做测试
//连接自己的地址信息做测试
return
!
(
len
(
P2pComm
.
AddrRouteble
([]
string
{
addr
},
info
.
channelVersion
,
info
.
cliCreds
))
==
0
)
return
!
(
len
(
P2pComm
.
AddrRouteble
([]
string
{
addr
},
info
.
channelVersion
,
info
.
cliCreds
))
==
0
)
}
}
// CheckSelf check addrbook privPubKey
// CheckSelf check addrbook privPubKey
...
@@ -574,7 +573,7 @@ func (m *Cli) CheckSelf(addr string, nodeinfo *NodeInfo) bool {
...
@@ -574,7 +573,7 @@ func (m *Cli) CheckSelf(addr string, nodeinfo *NodeInfo) bool {
return
false
return
false
}
}
conn
,
err
:=
netaddr
.
DialTimeout
(
nodeinfo
.
channelVersion
,
nodeinfo
.
cliCreds
)
conn
,
err
:=
netaddr
.
DialTimeout
(
nodeinfo
.
channelVersion
,
nodeinfo
.
cliCreds
)
if
err
!=
nil
{
if
err
!=
nil
{
return
false
return
false
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment