RCL-56 interfaces addresses fix

Author: Vadym Vikulin

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        goversion: ["1.20", "1.21"]
+        goversion: ["1.21", "1.22"]
 
     name: Build & Test (Linux, Go ${{ matrix.goversion }})
     needs: [lint]
@@ -81,7 +81,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        goversion: ["1.21"]
+        goversion: ["1.22"]
 
     name: Build & Test (Windows, Go ${{ matrix.goversion }})
     needs: [lint]
@@ -105,7 +105,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        goversion: ["1.21"]
+        goversion: ["1.22"]
 
     name: Build & Test (macOS, Go ${{ matrix.goversion }})
     needs: [lint]

contrib/mobile/mobile_test.go

@@ -2,9 +2,9 @@ package mobile
 
 import "testing"
 
-func TestStartYggdrasil(t *testing.T) {
+func TestStartMesh(t *testing.T) {
 	mesh := &Mesh{}
-	if err := mesh.StartAutoconfigure(); err != nil {
+	if err := mesh.StartAutoconfigure(14); err != nil {
 		t.Fatalf("Failed to start RiV-mesh: %s", err)
 	}
 	t.Log("Address:", mesh.GetAddressString())

go.mod

@@ -25,7 +25,7 @@ require gerace.dev/zipfs v0.2.0
 require (
 	github.com/slonm/tableprinter v0.0.0-20230107100804-643098716018
 	github.com/vorot93/golang-signals v0.0.0-20170221070717-d9e83421ce45
-	github.com/wlynxg/anet v0.0.2
+	github.com/wlynxg/anet v0.0.3
 	golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15
 	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224
 )

go.sum

@@ -77,8 +77,8 @@ github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvV
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
 github.com/vorot93/golang-signals v0.0.0-20170221070717-d9e83421ce45 h1:hB/hkjwf3BQnZE6Wk3SBwMJz0NqnGdwXoNzHVSYb0N0=
 github.com/vorot93/golang-signals v0.0.0-20170221070717-d9e83421ce45/go.mod h1:dfjQkJsG5auteUbnfLIcU72Y/z8tj7DuW9fik8f2Zn0=
-github.com/wlynxg/anet v0.0.2 h1:kH9s2huwMsED3eQknbL7gQBoW2Gsh5FCD/ceucpaIbk=
-github.com/wlynxg/anet v0.0.2/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
+github.com/wlynxg/anet v0.0.3 h1:PvR53psxFXstc12jelG6f1Lv4MWqE0tI76/hHGjh9rg=
+github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

src/core/link_tcp.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/wlynxg/anet"
+
 	"github.com/Arceliar/phony"
 )
 
@@ -142,15 +144,28 @@ func (l *linkTCP) dialerFor(dst *net.TCPAddr, sintf string) (*net.Dialer, error)
 		Control:   l.tcpContext,
 	}
 	if sintf != "" {
-		dialer.Control = l.getControl(sintf)
-		ief, err := net.InterfaceByName(sintf)
+		i, err := anet.Interfaces()
 		if err != nil {
-			return nil, fmt.Errorf("interface %q not found", sintf)
+			return nil, fmt.Errorf("interfaces error: %w", err)
+		}
+		var ief net.Interface
+		found := false
+		for _, ie := range i {
+			if ie.Name == sintf {
+				ief = ie
+				found = true
+				break
+			}
+		}
+		if !found {
+			return nil, fmt.Errorf("interface %s not found", sintf)
 		}
+		dialer.Control = l.getControl(sintf)
+
 		if ief.Flags&net.FlagUp == 0 {
 			return nil, fmt.Errorf("interface %q is not up", sintf)
 		}
-		addrs, err := ief.Addrs()
+		addrs, err := anet.InterfaceAddrsByInterface(&ief)
 		if err != nil {
 			return nil, fmt.Errorf("interface %q addresses not available: %w", sintf, err)
 		}

src/defaults/defaults.go

@@ -15,7 +15,7 @@ import (
 type MulticastInterfaceConfig = config.MulticastInterfaceConfig
 type NetworkDomainConfig = config.NetworkDomainConfig
 
-var defaultConfig = "" // LDFLAGS='-X github.com/yggdrasil-network/yggdrasil-go/src/defaults.defaultConfig=/path/to/config
+var defaultConfig = "" // LDFLAGS='-X github.com/RiV-chain/RiV-mesh/src/defaults.defaultConfig=/path/to/config
 
 type defaultParameters struct {
 	//Default Http address

src/multicast/multicast.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"net"
 	"net/url"
+	"strconv"
 	"time"
 
 	"github.com/wlynxg/anet"
@@ -30,8 +31,8 @@ type Multicast struct {
 	log         *log.Logger
 	sock        *ipv6.PacketConn
 	_isOpen     bool
-	_listeners  map[string]*listenerInfo
-	_interfaces map[string]*interfaceInfo
+	_listeners  map[int]*listenerInfo
+	_interfaces map[int]*interfaceInfo
 	_timer      *time.Timer
 	config      struct {
 		_groupAddr  GroupAddress
@@ -62,8 +63,8 @@ func New(core *core.Core, log *log.Logger, opts ...SetupOption) (*Multicast, err
 	m := &Multicast{
 		core:        core,
 		log:         log,
-		_listeners:  make(map[string]*listenerInfo),
-		_interfaces: make(map[string]*interfaceInfo),
+		_listeners:  make(map[int]*listenerInfo),
+		_interfaces: make(map[int]*interfaceInfo),
 	}
 	m.SetOsVersion()
 	m.config._interfaces = map[MulticastInterface]struct{}{}
@@ -79,6 +80,7 @@ func New(core *core.Core, log *log.Logger, opts ...SetupOption) (*Multicast, err
 }
 
 func (m *Multicast) _start() error {
+	m.log.Infoln("Starting multicasting")
 	if m._isOpen {
 		return fmt.Errorf("multicast module is already started")
 	}
@@ -89,10 +91,11 @@ func (m *Multicast) _start() error {
 	if !anyEnabled {
 		return nil
 	}
-	m.log.Debugln("Starting multicast module")
-	defer m.log.Debugln("Started multicast module")
+	m.log.Infoln("Starting multicast module")
+	defer m.log.Infoln("Started multicast module")
 	addr, err := net.ResolveUDPAddr("udp", string(m.config._groupAddr))
 	if err != nil {
+		m.log.Infoln("ResolveTCPAddr failed on", string(m.config._groupAddr), "due to error:", err)
 		return err
 	}
 	listenString := fmt.Sprintf("[::]:%v", addr.Port)
@@ -101,11 +104,13 @@ func (m *Multicast) _start() error {
 	}
 	conn, err := lc.ListenPacket(context.Background(), "udp6", listenString)
 	if err != nil {
+		m.log.Infoln("ListenPacket failed on", listenString, "due to error:", err)
 		return err
 	}
 	m.sock = ipv6.NewPacketConn(conn)
 	if err = m.sock.SetControlMessage(ipv6.FlagDst, true); err != nil { // nolint:staticcheck
 		// Windows can't set this flag, so we need to handle it in other ways
+		m.log.Infoln("SetControlMessage failed due to error:", err)
 	}
 
 	m._isOpen = true
@@ -149,7 +154,7 @@ func (m *Multicast) _updateInterfaces() {
 	for name, info := range interfaces {
 		addrs, err := anet.InterfaceAddrsByInterface(&info.iface)
 		if err != nil {
-			m.log.Warnf("Failed up get addresses for interface %s: %s", name, err)
+			m.log.Warnf("Failed up get addresses for interface %s: %s", info.iface.Name, err)
 			delete(interfaces, name)
 			continue
 		}
@@ -170,8 +175,8 @@ func (m *Multicast) Interfaces() map[string]net.Interface {
 }
 
 // getAllowedInterfaces returns the currently known/enabled multicast interfaces.
-func (m *Multicast) _getAllowedInterfaces() map[string]*interfaceInfo {
-	interfaces := make(map[string]*interfaceInfo)
+func (m *Multicast) _getAllowedInterfaces() map[int]*interfaceInfo {
+	interfaces := make(map[int]*interfaceInfo)
 	// Ask the system for network interfaces
 	allifaces, err := anet.Interfaces()
 	if err != nil {
@@ -198,7 +203,7 @@ func (m *Multicast) _getAllowedInterfaces() map[string]*interfaceInfo {
 			if !ifcfg.Regex.MatchString(iface.Name) {
 				continue
 			}
-			interfaces[iface.Name] = &interfaceInfo{
+			interfaces[iface.Index] = &interfaceInfo{
 				iface:  iface,
 				beacon: ifcfg.Beacon,
 				listen: ifcfg.Listen,
@@ -252,6 +257,7 @@ func (m *Multicast) _announce() {
 		found := false
 		listenaddr, err := net.ResolveTCPAddr("tcp6", info.listener.Listener.Addr().String())
 		if err != nil {
+			m.log.Infoln("ResolveTCPAddr on", info.listener.Listener.Addr().String(), "due to error:", err)
 			stop()
 			continue
 		}
@@ -297,24 +303,24 @@ func (m *Multicast) _announce() {
 			}
 			// Try and see if we already have a TCP listener for this interface
 			var linfo *listenerInfo
-			if nfo, ok := m._listeners[iface.Name]; !ok || nfo.listener.Listener == nil {
+			if nfo, ok := m._listeners[iface.Index]; !ok || nfo.listener.Listener == nil {
 				// No listener was found - let's create one
 				urlString := fmt.Sprintf("tls://[%s]:%d", addrIP, info.port)
 				u, err := url.Parse(urlString)
 				if err != nil {
 					panic(err)
 				}
 				if li, err := m.core.Listen(u, iface.Name); err == nil {
-					m.log.Debugln("Started multicasting on", iface.Name)
+					m.log.Infoln("Started multicasting on", iface.Name)
 					// Store the listener so that we can stop it later if needed
 					linfo = &listenerInfo{listener: li, time: time.Now(), port: info.port}
-					m._listeners[iface.Name] = linfo
+					m._listeners[iface.Index] = linfo
 				} else {
-					m.log.Warnln("Not multicasting on", iface.Name, "due to error:", err)
+					m.log.Infoln("Not multicasting on", iface.Name, "due to error:", err)
 				}
 			} else {
 				// An existing listener was found
-				linfo = m._listeners[iface.Name]
+				linfo = m._listeners[iface.Index]
 			}
 			// Make sure nothing above failed for some reason
 			if linfo == nil {
@@ -334,6 +340,8 @@ func (m *Multicast) _announce() {
 				binary.BigEndian.PutUint16(pbs, uint16(a.Port))
 				msg = append(msg, pbs...)
 				_, _ = m.sock.WriteTo(msg, nil, destAddr)
+			} else {
+				m.log.Infoln("ResolveTCPAddr failed on", iface.Name, "due to error:", err)
 			}
 			if linfo.interval.Seconds() < 15 {
 				linfo.interval += time.Second
@@ -389,26 +397,41 @@ func (m *Multicast) listen() {
 		anAddr := net.TCPAddr{IP: ip, Port: int(port)}
 		addr, err := net.ResolveTCPAddr("tcp6", anAddr.String())
 		if err != nil {
+			m.log.Infoln("ResolveTCPAddr failed on", anAddr.String())
 			continue
 		}
 		from := fromAddr.(*net.UDPAddr)
 		if !from.IP.Equal(addr.IP) {
 			continue
 		}
-		var interfaces map[string]*interfaceInfo
+		var interfaces map[int]*interfaceInfo
 		phony.Block(m, func() {
 			interfaces = m._interfaces
 		})
-		if info, ok := interfaces[from.Zone]; ok && info.listen {
+		zone, err := strconv.Atoi(from.Zone)
+		if err != nil {
+			continue
+		}
+		if info, ok := interfaces[zone]; ok && info.listen {
 			addr.Zone = ""
 			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)
+				m.log.Infoln("Call from multicast failed, parse error:", addr.String(), err)
 			}
-			if err := m.core.CallPeer(u, from.Zone); err != nil {
-				m.log.Debugln("Call from multicast failed:", err)
+			if err := m.core.CallPeer(u, info.iface.Name); err != nil {
+				m.log.Infoln("Call from multicast failed:", err)
 			}
+		} else {
+			m.log.Infoln("Multicat: ", ok, from.String(), m.createKeyValuePairs(interfaces))
 		}
 	}
 }
+
+func (m *Multicast) createKeyValuePairs(map_ map[int]*interfaceInfo) string {
+	b := new(bytes.Buffer)
+	for key, value := range map_ {
+		fmt.Fprintf(b, "%d=\"%s\"\n", key, value.iface.Name)
+	}
+	return b.String()
+}

src/multicast/multicast_darwin_cgo.go

@@ -13,7 +13,7 @@ void StartAWDLBrowsing() {
 		serviceBrowser = [[NSNetServiceBrowser alloc] init];
 		serviceBrowser.includesPeerToPeer = YES;
 	}
-	[serviceBrowser searchForServicesOfType:@"_yggdrasil._tcp" inDomain:@""];
+	[serviceBrowser searchForServicesOfType:@"_mesh._tcp" inDomain:@""];
 }
 void StopAWDLBrowsing() {
 	if (serviceBrowser == nil) {
@@ -39,8 +39,8 @@ func (m *Multicast) _multicastStarted() {
 		return
 	}
 	C.StopAWDLBrowsing()
-	for intf := range m._interfaces {
-		if intf == "awdl0" {
+	for _, info := range m._interfaces {
+		if info.iface.Name == "awdl0" {
 			C.StartAWDLBrowsing()
 			break
 		}