Allow setting priority on listeners and multicast interfaces

cmd/yggdrasil/main.go

@@ -335,10 +335,11 @@ func run(args yggArgs, ctx context.Context) {
 		options := []multicast.SetupOption{}
 		for _, intf := range cfg.MulticastInterfaces {
 			options = append(options, multicast.MulticastInterface{
-				Regex:  regexp.MustCompile(intf.Regex),
-				Beacon: intf.Beacon,
-				Listen: intf.Listen,
-				Port:   intf.Port,
+				Regex:    regexp.MustCompile(intf.Regex),
+				Beacon:   intf.Beacon,
+				Listen:   intf.Listen,
+				Port:     intf.Port,
+				Priority: intf.Priority,
 			})
 		}
 		if n.multicast, err = multicast.New(n.core, logger, options...); err != nil {

contrib/mobile/mobile.go

@@ -83,10 +83,11 @@ func (m *Yggdrasil) StartJSON(configjson []byte) error {
 		options := []multicast.SetupOption{}
 		for _, intf := range m.config.MulticastInterfaces {
 			options = append(options, multicast.MulticastInterface{
-				Regex:  regexp.MustCompile(intf.Regex),
-				Beacon: intf.Beacon,
-				Listen: intf.Listen,
-				Port:   intf.Port,
+				Regex:    regexp.MustCompile(intf.Regex),
+				Beacon:   intf.Beacon,
+				Listen:   intf.Listen,
+				Port:     intf.Port,
+				Priority: intf.Priority,
 			})
 		}
 		m.multicast, err = multicast.New(m.core, logger, options...)

src/config/config.go

@@ -40,10 +40,11 @@ type NodeConfig struct {
 }
 
 type MulticastInterfaceConfig struct {
-	Regex  string
-	Beacon bool
-	Listen bool
-	Port   uint16
+	Regex    string
+	Beacon   bool
+	Listen   bool
+	Port     uint16
+	Priority uint8
 }
 
 // NewSigningKeys replaces the signing keypair in the NodeConfig with a new

src/core/link.go

@@ -362,3 +362,12 @@ func (c *linkConn) Write(p []byte) (n int, err error) {
 	atomic.AddUint64(&c.tx, uint64(n))
 	return
 }
+
+func linkOptionsForListener(u *url.URL) (l linkOptions) {
+	if p := u.Query().Get("priority"); p != "" {
+		if pi, err := strconv.ParseUint(p, 10, 8); err == nil {
+			l.priority = uint8(pi)
+		}
+	}
+	return
+}

src/core/link_tcp.go

@@ -85,7 +85,7 @@ func (l *linkTCP) listen(url *url.URL, sintf string) (*Listener, error) {
 			addr := conn.RemoteAddr().(*net.TCPAddr)
 			name := fmt.Sprintf("tls://%s", addr)
 			info := linkInfoFor("tcp", sintf, strings.SplitN(addr.IP.String(), "%", 2)[0])
-			if err = l.handler(name, info, conn, linkOptions{}, true); err != nil {
+			if err = l.handler(name, info, conn, linkOptionsForListener(url), true); err != nil {
 				l.core.log.Errorln("Failed to create inbound link:", err)
 			}
 		}

src/core/link_tls.go

@@ -108,7 +108,7 @@ func (l *linkTLS) listen(url *url.URL, sintf string) (*Listener, error) {
 			addr := conn.RemoteAddr().(*net.TCPAddr)
 			name := fmt.Sprintf("tls://%s", addr)
 			info := linkInfoFor("tls", sintf, strings.SplitN(addr.IP.String(), "%", 2)[0])
-			if err = l.handler(name, info, conn, linkOptions{}, true); err != nil {
+			if err = l.handler(name, info, conn, linkOptionsForListener(url), true); err != nil {
 				l.core.log.Errorln("Failed to create inbound link:", err)
 			}
 		}

src/core/link_unix.go

@@ -75,7 +75,7 @@ func (l *linkUNIX) listen(url *url.URL, _ string) (*Listener, error) {
 				break
 			}
 			info := linkInfoFor("unix", "", url.String())
-			if err = l.handler(url.String(), info, conn, linkOptions{}, true); err != nil {
+			if err = l.handler(url.String(), info, conn, linkOptionsForListener(url), true); err != nil {
 				l.core.log.Errorln("Failed to create inbound link:", err)
 			}
 		}

src/multicast/multicast.go

@@ -37,11 +37,12 @@ type Multicast struct {
 }
 
 type interfaceInfo struct {
-	iface  net.Interface
-	addrs  []net.Addr
-	beacon bool
-	listen bool
-	port   uint16
+	iface    net.Interface
+	addrs    []net.Addr
+	beacon   bool
+	listen   bool
+	port     uint16
+	priority uint8
 }
 
 type listenerInfo struct {
@@ -190,10 +191,11 @@ func (m *Multicast) _getAllowedInterfaces() map[string]*interfaceInfo {
 				continue
 			}
 			interfaces[iface.Name] = &interfaceInfo{
-				iface:  iface,
-				beacon: ifcfg.Beacon,
-				listen: ifcfg.Listen,
-				port:   ifcfg.Port,
+				iface:    iface,
+				beacon:   ifcfg.Beacon,
+				listen:   ifcfg.Listen,
+				port:     ifcfg.Port,
+				priority: ifcfg.Priority,
 			}
 			break
 		}
@@ -383,7 +385,7 @@ func (m *Multicast) listen() {
 		})
 		if info, ok := interfaces[from.Zone]; ok && info.listen {
 			addr.Zone = ""
-			pin := fmt.Sprintf("/?key=%s", hex.EncodeToString(key))
+			pin := fmt.Sprintf("/?key=%s&priority=%d", hex.EncodeToString(key), info.priority)
 			u, err := url.Parse("tls://" + addr.String() + pin)
 			if err != nil {
 				m.log.Debugln("Call from multicast failed, parse error:", addr.String(), err)

src/multicast/options.go

@@ -16,10 +16,11 @@ type SetupOption interface {
 }
 
 type MulticastInterface struct {
-	Regex  *regexp.Regexp
-	Beacon bool
-	Listen bool
-	Port   uint16
+	Regex    *regexp.Regexp
+	Beacon   bool
+	Listen   bool
+	Port     uint16
+	Priority uint8
 }
 
 type GroupAddress string