Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
go-libp2p
Commits
aafaf386
Commit
aafaf386
authored
8 years ago
by
jbenet
Browse files
Options
Download
Email Patches
Plain Diff
identify: handle case where local peer.ID is empty
parent
17d39398
master
2018-Q4-OKR
docs-improvements
feat/p2p-multiaddr
feat/pnet/working3
feat/protobuf
feat/relay-integrate
feat/udp
feat/update/go-reuseport
feature/standardize-readme
fix/473
fix/no-custom-field
fix/reset-ping-stream
fix/revert-correct-external-addr
gx/update-jccl6u
gx/update-nza0mn
jenkinsfile
kevina/fix-go-vet
multistream-ping
punching
revert-276-update-go-detect-race
v6.0.23
v6.0.22
v6.0.21
v6.0.20
v6.0.19
v6.0.18
v6.0.17
v6.0.16
v6.0.15
v6.0.14
v6.0.13
v6.0.12
v6.0.11
v6.0.10
v6.0.9
v6.0.8
v6.0.7
v6.0.6
v6.0.5
v6.0.4
v6.0.3
v6.0.2
v6.0.1
v6.0.0
v5.0.21
v5.0.20
v5.0.19
v5.0.18
v5.0.17
v5.0.16
v5.0.15
v5.0.14
v5.0.13
v5.0.12
v5.0.11
v5.0.10
v5.0.9
v5.0.8
v5.0.7
v5.0.6
v5.0.5
v5.0.4
v5.0.3
v5.0.2
v5.0.1
v5.0.0
v4.5.5
v4.5.4
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.5
v4.4.4
v4.4.3
v4.4.2
v4.4.1
v4.4.0
v4.3.12
v4.3.11
v4.3.10
v4.3.9
v4.3.8
v4.3.7
v4.3.6
v4.3.5
v4.3.4
v4.3.3
v4.3.2
v4.3.1
v4.3.0
v4.2.0
v4.1.0
v4.0.4
v4.0.3
v4.0.2
v4.0.1
v4.0.0
v3.6.0
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
p2p/protocol/identify/id.go
+15
-1
p2p/protocol/identify/id.go
with
15 additions
and
1 deletion
+15
-1
p2p/protocol/identify/id.go
View file @
aafaf386
...
...
@@ -166,6 +166,7 @@ func (ids *IDService) populateMessage(mes *pb.Identify, c inet.Conn) {
}
log
.
Debugf
(
"%s sent listen addrs to %s: %s"
,
c
.
LocalPeer
(),
c
.
RemotePeer
(),
laddrs
)
// set our public key
ownKey
:=
ids
.
Host
.
Peerstore
()
.
PubKey
(
ids
.
Host
.
ID
())
if
ownKey
==
nil
{
log
.
Errorf
(
"did not have own public key in Peerstore"
)
...
...
@@ -258,8 +259,21 @@ func (ids *IDService) consumeReceivedPubKey(c inet.Conn, kb []byte) {
log
.
Debugf
(
"%s cannot get peer.ID from key of remote peer: %s, %s"
,
lp
,
rp
,
err
)
return
}
if
np
!=
rp
{
log
.
Errorf
(
"%s received key for remote peer %s mismatch: %s"
,
lp
,
rp
,
np
)
// if the newKey's peer.ID does not match known peer.ID...
if
rp
==
""
&&
np
!=
""
{
// if local peerid is empty, then use the new, sent key.
err
:=
ids
.
Host
.
Peerstore
()
.
AddPubKey
(
rp
,
newKey
)
if
err
!=
nil
{
log
.
Debugf
(
"%s could not add key for %s to peerstore: %s"
,
lp
,
rp
,
err
)
}
}
else
{
// we have a local peer.ID and it does not match the sent key... error.
log
.
Errorf
(
"%s received key for remote peer %s mismatch: %s"
,
lp
,
rp
,
np
)
}
return
}
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help