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
a3bf1687
Unverified
Commit
a3bf1687
authored
8 years ago
by
Jakub Sztandera
Browse files
Options
Download
Email Patches
Plain Diff
Retry NAT punching without duration on mapping failure
Some hardware doesn't support UPnP with durations.
parent
632eeab6
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
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
p2p/nat/nat.go
+35
-8
p2p/nat/nat.go
with
35 additions
and
8 deletions
+35
-8
p2p/nat/nat.go
View file @
a3bf1687
...
...
@@ -155,12 +155,13 @@ type Mapping interface {
type
mapping
struct
{
sync
.
Mutex
// guards all fields
nat
*
NAT
proto
string
intport
int
extport
int
intaddr
ma
.
Multiaddr
proc
goprocess
.
Process
nat
*
NAT
proto
string
intport
int
extport
int
permanent
bool
intaddr
ma
.
Multiaddr
proc
goprocess
.
Process
cached
ma
.
Multiaddr
cacheTime
time
.
Time
...
...
@@ -197,6 +198,18 @@ func (m *mapping) setExternalPort(p int) {
m
.
extport
=
p
}
func
(
m
*
mapping
)
setPermanent
(
p
bool
)
{
m
.
Lock
()
defer
m
.
Unlock
()
m
.
permanent
=
p
}
func
(
m
*
mapping
)
isPermanent
()
bool
{
m
.
Lock
()
defer
m
.
Unlock
()
return
m
.
permanent
}
func
(
m
*
mapping
)
InternalAddr
()
ma
.
Multiaddr
{
m
.
Lock
()
defer
m
.
Unlock
()
...
...
@@ -333,13 +346,26 @@ func (nat *NAT) NewMapping(maddr ma.Multiaddr) (Mapping, error) {
func
(
nat
*
NAT
)
establishMapping
(
m
*
mapping
)
{
oldport
:=
m
.
ExternalPort
()
if
oldport
!=
0
&&
m
.
isPermanent
()
{
// mapping was already established and it is permanent
return
}
log
.
Debugf
(
"Attempting port map: %s/%d"
,
m
.
Protocol
(),
m
.
InternalPort
())
newport
,
err
:=
nat
.
nat
.
AddPortMapping
(
m
.
Protocol
(),
m
.
InternalPort
(),
"http"
,
MappingDuration
)
permanent
:=
false
newport
,
err
:=
nat
.
nat
.
AddPortMapping
(
m
.
Protocol
(),
m
.
InternalPort
(),
"libp2p"
,
MappingDuration
)
if
err
!=
nil
{
// Some hardware does not support mappings with timeout, so try that
newport
,
err
=
nat
.
nat
.
AddPortMapping
(
m
.
Protocol
(),
m
.
InternalPort
(),
"libp2p"
,
0
)
permanent
=
(
err
==
nil
)
}
failure
:=
func
()
{
m
.
setExternalPort
(
0
)
// clear mapping
// TODO: log.Event
log
.
Debu
gf
(
"failed to establish port mapping: %s"
,
err
)
log
.
Warnin
gf
(
"failed to establish port mapping: %s"
,
err
)
nat
.
Notifier
.
notifyAll
(
func
(
n
Notifiee
)
{
n
.
MappingFailed
(
nat
,
m
,
oldport
,
err
)
})
...
...
@@ -353,6 +379,7 @@ func (nat *NAT) establishMapping(m *mapping) {
return
}
m
.
setPermanent
(
permanent
)
m
.
setExternalPort
(
newport
)
ext
,
err
:=
m
.
ExternalAddr
()
if
err
!=
nil
{
...
...
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