cmd/geth, p2p: add support for custom discovery UDP port (#24979)
This adds a new flag to set the discovery port to be different from the TCP listener port. Co-authored-by: Felix Lange <fjl@twurst.com>
This commit is contained in:
parent
1438e7c324
commit
9a5c1000c7
@ -119,6 +119,7 @@ var (
|
||||
utils.CachePreimagesFlag,
|
||||
utils.FDLimitFlag,
|
||||
utils.ListenPortFlag,
|
||||
utils.DiscoveryPortFlag,
|
||||
utils.MaxPeersFlag,
|
||||
utils.MaxPendingPeersFlag,
|
||||
utils.MiningEnabledFlag,
|
||||
|
@ -835,6 +835,12 @@ var (
|
||||
Usage: "Sets DNS discovery entry points (use \"\" to disable DNS)",
|
||||
Category: flags.NetworkingCategory,
|
||||
}
|
||||
DiscoveryPortFlag = &cli.IntFlag{
|
||||
Name: "discovery.port",
|
||||
Usage: "Use a custom UDP port for P2P discovery",
|
||||
Value: 30303,
|
||||
Category: flags.NetworkingCategory,
|
||||
}
|
||||
|
||||
// Console
|
||||
JSpathFlag = &flags.DirectoryFlag{
|
||||
@ -1116,12 +1122,15 @@ func setBootstrapNodesV5(ctx *cli.Context, cfg *p2p.Config) {
|
||||
}
|
||||
}
|
||||
|
||||
// setListenAddress creates a TCP listening address string from set command
|
||||
// line flags.
|
||||
// setListenAddress creates TCP/UDP listening address strings from set command
|
||||
// line flags
|
||||
func setListenAddress(ctx *cli.Context, cfg *p2p.Config) {
|
||||
if ctx.IsSet(ListenPortFlag.Name) {
|
||||
cfg.ListenAddr = fmt.Sprintf(":%d", ctx.Int(ListenPortFlag.Name))
|
||||
}
|
||||
if ctx.IsSet(DiscoveryPortFlag.Name) {
|
||||
cfg.DiscAddr = fmt.Sprintf(":%d", ctx.Int(DiscoveryPortFlag.Name))
|
||||
}
|
||||
}
|
||||
|
||||
// setNAT creates a port mapper from command line flags.
|
||||
|
@ -136,6 +136,10 @@ type Config struct {
|
||||
// the server is started.
|
||||
ListenAddr string
|
||||
|
||||
// If DiscAddr is set to a non-nil value, the server will use ListenAddr
|
||||
// for TCP and DiscAddr for the UDP discovery protocol.
|
||||
DiscAddr string
|
||||
|
||||
// If set to a non-nil value, the given NAT port mapper
|
||||
// is used to make the listening port available to the
|
||||
// Internet.
|
||||
@ -549,7 +553,15 @@ func (srv *Server) setupDiscovery() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
addr, err := net.ResolveUDPAddr("udp", srv.ListenAddr)
|
||||
listenAddr := srv.ListenAddr
|
||||
|
||||
// Use an alternate listening address for UDP if
|
||||
// a custom discovery address is configured.
|
||||
if srv.DiscAddr != "" {
|
||||
listenAddr = srv.DiscAddr
|
||||
}
|
||||
|
||||
addr, err := net.ResolveUDPAddr("udp", listenAddr)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user