p2p/nat: add stun protocol #31064
Merged
p2p/nat: add stun protocol #31064
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. upgrade to github.com/pion/stun/v2 2. check the server addr
cmd/utils/flags.go
Outdated
| @@ -760,7 +760,7 @@ var ( | |||
| } | |||
| NATFlag = &cli.StringFlag{ | |||
| Name: "nat", | |||
| Usage: "NAT port mapping mechanism (any|none|upnp|pmp|pmp:<IP>|extip:<IP>)", | |||
| Usage: "NAT port mapping mechanism (any|none|upnp|pmp|pmp:<IP>|extip:<IP>|stun:default|stun:<IP:PORT>)", | |||
There was a problem hiding this comment.
We can omit the default, e.g. stun|stun:<IP:PORT>
p2p/nat/nat.go
Outdated
| @@ -59,13 +59,16 @@ type Interface interface { | |||
| // "upnp" uses the Universal Plug and Play protocol | |||
| // "pmp" uses NAT-PMP with an auto-detected gateway address | |||
| // "pmp:192.168.0.1" uses NAT-PMP with the given gateway address | |||
| // "stun:default" uses stun protocol with default stun server | |||
There was a problem hiding this comment.
We can use "stun" to represent using stun protocol with default server
p2p/nat/nat_stun.go
Outdated
| @@ -0,0 +1,94 @@ | |||
| // Copyright 2024 The go-ethereum Authors | |||
p2p/nat/nat_stun.go
Outdated
| return fmt.Sprintf("STUN(%s)", s.server) | ||
| } | ||
|
|
||
| func (stun) SupportsMapping() bool { |
There was a problem hiding this comment.
This function is not needed
p2p/nat/nat_stun.go
Outdated
| responseError = event.Error | ||
| return | ||
| } | ||
| if err := mappedAddr.GetFrom(event.Message); err != nil { |
There was a problem hiding this comment.
Suggested change
| if err := mappedAddr.GetFrom(event.Message); err != nil { | |
| responseError = mappedAddr.GetFrom(event.Message) |
Also removes concurrency, since the requests will usually be quick.
|
I have pushed my changes:
|
| @@ -0,0 +1,24 @@ | |||
| package nat | |||
There was a problem hiding this comment.
I have added the license
rjl493456442
previously approved these changes
Jan 24, 2025
fjl
approved these changes
Jan 24, 2025
tokeyg
pushed a commit
to tokeyg/go-ethereum
that referenced
this pull request
Feb 6, 2025
This implements a basic mechanism to query the node's external IP using a STUN server. There is a built-in list of public STUN servers for convenience. The new detection mechanism must be selected explicitly using `--nat=stun` and is not enabled by default in Geth. Fixes ethereum#30881 --------- Co-authored-by: Felix Lange <fjl@twurst.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@fjl here is the new pr to replace the old one, which Allow edits by maintainers. I rebase the branch from the master.
fixes #30881