Merge pull request #66 from RiV-chain/RIVM-143

vikulin · web-flow · commit c1023119398a · 2024-08-26T08:21:47.000Z
RIVM-143 Upgrade anet library to remove Android version parameter in native code
diff --git a/contrib/mobile/mobile.go b/contrib/mobile/mobile.go
@@ -35,13 +35,13 @@ type Mesh struct {
 }
 
 // StartAutoconfigure starts a node with a randomly generated config
-func (m *Mesh) StartAutoconfigure(osVersion int) error {
-	return m.StartJSON([]byte("{}"), osVersion)
+func (m *Mesh) StartAutoconfigure() error {
+	return m.StartJSON([]byte("{}"))
 }
 
 // StartJSON starts a node with the given JSON config. You can get JSON config
 // (rather than HJSON) by using the GenerateConfigJSON() function
-func (m *Mesh) StartJSON(configjson []byte, osVersion int) error {
+func (m *Mesh) StartJSON(configjson []byte) error {
 	logger := log.New(m.log, "", 0)
 	logger.EnableLevel("error")
 	logger.EnableLevel("warn")
@@ -80,7 +80,6 @@ func (m *Mesh) StartJSON(configjson []byte, osVersion int) error {
 		if err != nil {
 			panic(err)
 		}
-		m.core.OsVersion = uint(osVersion)
 	}
 
 	// Setup the multicast module.
diff --git a/contrib/mobile/mobile_test.go b/contrib/mobile/mobile_test.go
@@ -4,7 +4,7 @@ import "testing"
 
 func TestStartMesh(t *testing.T) {
 	mesh := &Mesh{}
-	if err := mesh.StartAutoconfigure(14); err != nil {
+	if err := mesh.StartAutoconfigure(); err != nil {
 		t.Fatalf("Failed to start RiV-mesh: %s", err)
 	}
 	t.Log("Address:", mesh.GetAddressString())
diff --git a/go.mod b/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.3
+	github.com/wlynxg/anet v0.0.4
 	golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15
 	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224
 )
diff --git a/go.sum b/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.3 h1:PvR53psxFXstc12jelG6f1Lv4MWqE0tI76/hHGjh9rg=
-github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
+github.com/wlynxg/anet v0.0.4 h1:0de1OFQxnNqAu+x2FAKKCVIrnfGKQbs7FQz++tB0+Uw=
+github.com/wlynxg/anet v0.0.4/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=
diff --git a/src/core/core.go b/src/core/core.go
@@ -44,7 +44,6 @@ type Core struct {
 		_allowedPublicKeys map[[32]byte]struct{}      // configurable after startup
 		networkdomain      NetworkDomain              // immutable after startup
 	}
-	OsVersion uint
 }
 
 func New(secret ed25519.PrivateKey, logger Logger, opts ...SetupOption) (*Core, error) {
diff --git a/src/multicast/multicast.go b/src/multicast/multicast.go
@@ -66,7 +66,6 @@ func New(core *core.Core, log *log.Logger, opts ...SetupOption) (*Multicast, err
 		_listeners:  make(map[int]*listenerInfo),
 		_interfaces: make(map[int]*interfaceInfo),
 	}
-	m.SetOsVersion()
 	m.config._interfaces = map[MulticastInterface]struct{}{}
 	m.config._groupAddr = GroupAddress("[ff02::114]:9001")
 	for _, opt := range opts {
@@ -180,8 +179,7 @@ func (m *Multicast) _getAllowedInterfaces() map[int]*interfaceInfo {
 	// Ask the system for network interfaces
 	allifaces, err := anet.Interfaces()
 	if err != nil {
-		// Don't panic, since this may be from e.g. too many open files (from too much connection spam)
-		// TODO? log something
+		m.log.Debugf("Failed to get interfaces: %s", err)
 		return nil
 	}
 	// Work out which interfaces to announce on
diff --git a/src/multicast/multicast_android.go b/src/multicast/multicast_android.go
@@ -8,14 +8,9 @@ import (
 	"os"
 	"syscall"
 
-	"github.com/wlynxg/anet"
 	"golang.org/x/sys/unix"
 )
 
-func (m *Multicast) SetOsVersion() {
-	anet.SetAndroidVersion(m.core.OsVersion)
-}
-
 func (m *Multicast) _multicastStarted() {
 
 }
diff --git a/src/multicast/multicast_darwin.go b/src/multicast/multicast_darwin.go
@@ -10,10 +10,6 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func (m *Multicast) SetOsVersion() {
-
-}
-
 func (m *Multicast) _multicastStarted() {
 
 }
diff --git a/src/multicast/multicast_darwin_cgo.go b/src/multicast/multicast_darwin_cgo.go
@@ -30,10 +30,6 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func (m *Multicast) SetOsVersion() {
-
-}
-
 func (m *Multicast) _multicastStarted() {
 	if !m._isOpen {
 		return
diff --git a/src/multicast/multicast_other.go b/src/multicast/multicast_other.go
@@ -5,10 +5,6 @@ package multicast
 
 import "syscall"
 
-func (m *Multicast) SetOsVersion() {
-
-}
-
 func (m *Multicast) _multicastStarted() {
 
 }
diff --git a/src/multicast/multicast_unix.go b/src/multicast/multicast_unix.go
@@ -12,10 +12,6 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func (m *Multicast) SetOsVersion() {
-
-}
-
 func (m *Multicast) _multicastStarted() {
 
 }
diff --git a/src/multicast/multicast_windows.go b/src/multicast/multicast_windows.go
@@ -9,10 +9,6 @@ import (
 	"golang.org/x/sys/windows"
 )
 
-func (m *Multicast) SetOsVersion() {
-
-}
-
 func (m *Multicast) _multicastStarted() {
 
 }

Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,13 @@ type Mesh struct {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// StartAutoconfigure starts a node with a randomly generated config`
`38`		`-func (m *Mesh) StartAutoconfigure(osVersion int) error {`
`39`		`- return m.StartJSON([]byte("{}"), osVersion)`
	`38`	`+func (m *Mesh) StartAutoconfigure() error {`
	`39`	`+ return m.StartJSON([]byte("{}"))`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// StartJSON starts a node with the given JSON config. You can get JSON config`
`43`	`43`	`// (rather than HJSON) by using the GenerateConfigJSON() function`
`44`		`-func (m *Mesh) StartJSON(configjson []byte, osVersion int) error {`
	`44`	`+func (m *Mesh) StartJSON(configjson []byte) error {`
`45`	`45`	`logger := log.New(m.log, "", 0)`
`46`	`46`	`logger.EnableLevel("error")`
`47`	`47`	`logger.EnableLevel("warn")`
`@@ -80,7 +80,6 @@ func (m *Mesh) StartJSON(configjson []byte, osVersion int) error {`
`80`	`80`	`if err != nil {`
`81`	`81`	`panic(err)`
`82`	`82`	`}`
`83`		`- m.core.OsVersion = uint(osVersion)`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`// Setup the multicast module.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import "testing"`
`4`	`4`
`5`	`5`	`func TestStartMesh(t *testing.T) {`
`6`	`6`	`mesh := &Mesh{}`
`7`		`- if err := mesh.StartAutoconfigure(14); err != nil {`
	`7`	`+ if err := mesh.StartAutoconfigure(); err != nil {`
`8`	`8`	`t.Fatalf("Failed to start RiV-mesh: %s", err)`
`9`	`9`	`}`
`10`	`10`	`t.Log("Address:", mesh.GetAddressString())`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ require gerace.dev/zipfs v0.2.0`
`25`	`25`	`require (`
`26`	`26`	`github.com/slonm/tableprinter v0.0.0-20230107100804-643098716018`
`27`	`27`	`github.com/vorot93/golang-signals v0.0.0-20170221070717-d9e83421ce45`
`28`		`- github.com/wlynxg/anet v0.0.3`
	`28`	`+ github.com/wlynxg/anet v0.0.4`
`29`	`29`	`golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15`
`30`	`30`	`golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224`
`31`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ type Core struct {`
`44`	`44`	`_allowedPublicKeys map[[32]byte]struct{} // configurable after startup`
`45`	`45`	`networkdomain NetworkDomain // immutable after startup`
`46`	`46`	`}`
`47`		`- OsVersion uint`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`func New(secret ed25519.PrivateKey, logger Logger, opts ...SetupOption) (*Core, error) {`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,9 @@ import (`
`8`	`8`	`"os"`
`9`	`9`	`"syscall"`
`10`	`10`
`11`		`- "github.com/wlynxg/anet"`
`12`	`11`	`"golang.org/x/sys/unix"`
`13`	`12`	`)`
`14`	`13`
`15`		`-func (m *Multicast) SetOsVersion() {`
`16`		`- anet.SetAndroidVersion(m.core.OsVersion)`
`17`		`-}`
`18`		`-`
`19`	`14`	`func (m *Multicast) _multicastStarted() {`
`20`	`15`
`21`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,6 @@ import (`
`10`	`10`	`"golang.org/x/sys/unix"`
`11`	`11`	`)`
`12`	`12`
`13`		`-func (m *Multicast) SetOsVersion() {`
`14`		`-`
`15`		`-}`
`16`		`-`
`17`	`13`	`func (m *Multicast) _multicastStarted() {`
`18`	`14`
`19`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,6 @@ package multicast`
`5`	`5`
`6`	`6`	`import "syscall"`
`7`	`7`
`8`		`-func (m *Multicast) SetOsVersion() {`
`9`		`-`
`10`		`-}`
`11`		`-`
`12`	`8`	`func (m *Multicast) _multicastStarted() {`
`13`	`9`
`14`	`10`	`}`