cmd, mobile, node, p2p: surface the discovery V5 bootnodes

1 files changed, 13 insertions, 5 deletions

diff --git a/p2p/server.go b/p2p/server.go
index 1e571abf1..7381127dc 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -73,16 +73,26 @@ type Config struct {
 	// or not. Disabling is usually useful for protocol debugging (manual topology).
 	Discovery bool
 
+	// DiscoveryV5 specifies whether the the new topic-discovery based V5 discovery
+	// protocol should be started or not.
 	DiscoveryV5 bool
 
+	// Listener address for the V5 discovery protocol UDP traffic.
+	DiscoveryV5Addr string
+
 	// Name sets the node name of this server.
 	// Use common.MakeName to create a name that follows existing conventions.
 	Name string
 
-	// Bootstrap nodes are used to establish connectivity
+	// BootstrapNodes are used to establish connectivity
 	// with the rest of the network.
 	BootstrapNodes []*discover.Node
 
+	// BootstrapNodesV5 are used to establish connectivity
+	// with the rest of the network using the V5 discovery
+	// protocol.
+	BootstrapNodesV5 []*discv5.Node
+
 	// Static nodes are used as pre-configured connections which are always
 	// maintained and re-connected on disconnects.
 	StaticNodes []*discover.Node
@@ -108,8 +118,6 @@ type Config struct {
 	// the server is started.
 	ListenAddr string
 
-	ListenAddrV5 string
-
 	// If set to a non-nil value, the given NAT port mapper
 	// is used to make the listening port available to the
 	// Internet.
@@ -359,11 +367,11 @@ func (srv *Server) Start() (err error) {
 	}
 
 	if srv.DiscoveryV5 {
-		ntab, err := discv5.ListenUDP(srv.PrivateKey, srv.ListenAddrV5, srv.NAT, "") //srv.NodeDatabase)
+		ntab, err := discv5.ListenUDP(srv.PrivateKey, srv.DiscoveryV5Addr, srv.NAT, "") //srv.NodeDatabase)
 		if err != nil {
 			return err
 		}
-		if err := ntab.SetFallbackNodes(discv5.BootNodes); err != nil {
+		if err := ntab.SetFallbackNodes(srv.BootstrapNodesV5); err != nil {
 			return err
 		}
 		srv.DiscV5 = ntab