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
d1a92e1f
Commit
d1a92e1f
authored
8 years ago
by
Jeromy Johnson
Browse files
Options
Download
Plain Diff
Merge pull request #63 from ipfs/fix/bad-laddr-guessing
fix consumption of observed remote addrs
parents
30761438
51c5f6a0
master
2018-Q4-OKR
docs-improvements
feat/backoff-listing
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
wip/js-interop
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
v3.4.3
v3.4.2
v3.4.1
v3.4.0
v3.3.7
v3.3.6
v3.3.4
v3.3.3
v3.3.2
v3.3.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
p2p/protocol/identify/id.go
+34
-1
p2p/protocol/identify/id.go
p2p/protocol/identify/id_test.go
+15
-0
p2p/protocol/identify/id_test.go
with
49 additions
and
1 deletion
+49
-1
p2p/protocol/identify/id.go
View file @
d1a92e1f
...
...
@@ -190,7 +190,11 @@ func (ids *IDService) consumeMessage(mes *pb.Identify, c inet.Conn) {
lmaddrs
=
append
(
lmaddrs
,
maddr
)
}
lmaddrs
=
append
(
lmaddrs
,
c
.
RemoteMultiaddr
())
// if the address reported by the connection roughly matches their annoucned
// listener addresses, its likely to be an external NAT address
if
HasConsistentTransport
(
c
.
RemoteMultiaddr
(),
lmaddrs
)
{
lmaddrs
=
append
(
lmaddrs
,
c
.
RemoteMultiaddr
())
}
// update our peerstore with the addresses. here, we SET the addresses, clearing old ones.
// We are receiving from the peer itself. this is current address ground truth.
...
...
@@ -214,6 +218,35 @@ func (ids *IDService) consumeMessage(mes *pb.Identify, c inet.Conn) {
ids
.
Host
.
Peerstore
()
.
Put
(
p
,
"AgentVersion"
,
av
)
}
// HasConsistentTransport returns true if the address 'a' shares a
// protocol set with any address in the green set. This is used
// to check if a given address might be one of the addresses a peer is
// listening on.
func
HasConsistentTransport
(
a
ma
.
Multiaddr
,
green
[]
ma
.
Multiaddr
)
bool
{
protosMatch
:=
func
(
a
,
b
[]
ma
.
Protocol
)
bool
{
if
len
(
a
)
!=
len
(
b
)
{
return
false
}
for
i
,
p
:=
range
a
{
if
b
[
i
]
.
Code
!=
p
.
Code
{
return
false
}
}
return
true
}
protos
:=
a
.
Protocols
()
for
_
,
ga
:=
range
green
{
if
protosMatch
(
protos
,
ga
.
Protocols
())
{
return
true
}
}
return
false
}
// IdentifyWait returns a channel which will be closed once
// "ProtocolIdentify" (handshake3) finishes on given conn.
// This happens async so the connection can start to be used
...
...
This diff is collapsed.
Click to expand it.
p2p/protocol/identify/id_test.go
View file @
d1a92e1f
...
...
@@ -111,3 +111,18 @@ func TestIDServiceNoWait(t *testing.T) {
subtestIDService
(
t
,
0
)
}
}
func
TestProtoMatching
(
t
*
testing
.
T
)
{
tcp1
,
_
:=
ma
.
NewMultiaddr
(
"/ip4/1.2.3.4/tcp/1234"
)
tcp2
,
_
:=
ma
.
NewMultiaddr
(
"/ip4/1.2.3.4/tcp/2345"
)
tcp3
,
_
:=
ma
.
NewMultiaddr
(
"/ip4/1.2.3.4/tcp/4567"
)
utp
,
_
:=
ma
.
NewMultiaddr
(
"/ip4/1.2.3.4/udp/1234/utp"
)
if
!
identify
.
HasConsistentTransport
(
tcp1
,
[]
ma
.
Multiaddr
{
tcp2
,
tcp3
,
utp
})
{
t
.
Fatal
(
"expected match"
)
}
if
identify
.
HasConsistentTransport
(
utp
,
[]
ma
.
Multiaddr
{
tcp2
,
tcp3
})
{
t
.
Fatal
(
"expected mismatch"
)
}
}
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