Allow to set traversal methods order #3758
Conversation
soffokl
requested review from
Snawoot,
Waldz,
mdomasevicius,
tadaskay,
tomasmik,
vkuznecovas and
zolia
as code owners
| // FlagTraversalOrder order of NAT traversal methods to be used for providing service. | ||
| FlagTraversal = cli.StringFlag{ | ||
| Name: "traversal", | ||
| Usage: "Comma separated order of NAT traversal methods to be used for providing service", |
There was a problem hiding this comment.
Would it be useful to provide possible values here?
There was a problem hiding this comment.
we are including all values as default. Here is how it looks in help:
--traversal value Comma separated order of NAT traversal methods to be used for providing service (default: "holepunching,upnp,manual")
p2p/listener.go
Outdated
| // acquiring extra ports for nat pinger if provider is behind nat, port mapping failed | ||
| // and no manual port forwarding is enabled. | ||
| func (m *listener) prepareLocalPorts(id, outboundIP string, tracer *trace.Tracer) (string, []int, []func(), error) { | ||
| func (m *listener) prepareLocalPorts(id string, tracer *trace.Tracer) (string, []int, []func(), nat.StartPorts, error) { |
There was a problem hiding this comment.
At some point the returns values here should be remade. Adding one more return here is just more confusion.
There was a problem hiding this comment.
It could be wrapped into struct with meaningful names attached
There was a problem hiding this comment.
I'm going to change it with the next couple of PRs. So merging like this now.
p2p/nat/hole_punching.go
Outdated
| } | ||
|
|
||
| return &natHolePunchingPort{ | ||
| pool: port.NewFixedRangePool(*udpPortRange), |
There was a problem hiding this comment.
Wont this panic when ParseRange returns error and nil for udpPortRange?
There was a problem hiding this comment.
Yep, faced it with tests too, changed.
soffokl
force-pushed
the
traversal-order
branch
from
097d4d3 to
4246469
Compare
Codecov Report
@@ Coverage Diff @@
## master #3758 +/- ##
==========================================
- Coverage 43.61% 43.47% -0.14%
==========================================
Files 325 325
Lines 16689 16669 -20
==========================================
- Hits 7279 7247 -32
- Misses 8655 8674 +19
+ Partials 755 748 -7
Continue to review full report at Codecov.
|
#3588