Merge pull request #62 from RiV-chain/RCL-56

RCL-56 IPv6 multicasting fix for Android 11 and above

Author: Vadym Vikulin

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.19
 #      - uses: actions/checkout@v3
@@ -34,31 +34,31 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: go
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
 
   build-linux:
     strategy:
       fail-fast: false
       matrix:
-        goversion: ["1.18", "1.19"]
+        goversion: ["1.21", "1.22"]
 
     name: Build & Test (Linux, Go ${{ matrix.goversion }})
     needs: [lint]
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install webkit2gtk-4.0
         uses: awalsh128/cache-apt-pkgs-action@latest
@@ -67,7 +67,7 @@ jobs:
           version: 1.0
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.goversion }}
 
@@ -81,17 +81,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        goversion: ["1.19"]
+        goversion: ["1.22"]
 
     name: Build & Test (Windows, Go ${{ matrix.goversion }})
     needs: [lint]
 
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.goversion }}
 
@@ -105,17 +105,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        goversion: ["1.19"]
+        goversion: ["1.22"]
 
     name: Build & Test (macOS, Go ${{ matrix.goversion }})
     needs: [lint]
 
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.goversion }}
 

.github/workflows/pkg.yml

@@ -3,135 +3,36 @@ name: Packages
 on:
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  build-packages-debian:
-    strategy:
-      fail-fast: false
-      matrix:
-        pkgarch: ["amd64", "i386", "mips", "mipsel", "armhf", "armel", "arm64"]
 
-    name: Package (Debian, ${{ matrix.pkgarch }})
+  build-libs-android:
 
+    name: Build libs (Android)
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-
-      - name: Build package
-        env:
-          PKGARCH: ${{ matrix.pkgarch }}
-        run: sh contrib/deb/generate.sh
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: Debian package (${{ matrix.pkgarch }})
-          path: "*.deb"
-          if-no-files-found: error
-
-  build-packages-macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        pkgarch: ["amd64", "arm64"]
-
-    name: Package (macOS, ${{ matrix.pkgarch }})
-
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-
-      - name: Build package
-        env:
-          PKGARCH: ${{ matrix.pkgarch }}
-        run: sh contrib/macos/create-pkg.sh
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: macOS package (${{ matrix.pkgarch }})
-          path: "*.pkg"
-          if-no-files-found: error
-
-  build-packages-windows:
-    strategy:
-      fail-fast: false
-      matrix:
-        pkgarch: ["x64", "x86", "arm", "arm64"]
 
-    name: Package (Windows, ${{ matrix.pkgarch }})
-
-    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-
-      - name: Build package
-        run: sh contrib/msi/build-msi.sh ${{ matrix.pkgarch }}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: Windows package (${{ matrix.pkgarch }})
-          path: "*.msi"
-          if-no-files-found: error
-
-  build-packages-router:
-    strategy:
-      fail-fast: false
-      matrix:
-        pkgarch: ["edgerouter-x", "edgerouter-lite", "vyos-amd64", "vyos-i386"]
-
-    name: Package (Router, ${{ matrix.pkgarch }})
-
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          path: yggdrasil
-
-      - uses: actions/checkout@v3
-        with:
-          repository: neilalexander/vyatta-yggdrasil
-          path: vyatta-yggdrasil
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.19
-
-      - name: Build package
-        env:
-          BUILDDIR_YGG: /home/runner/work/yggdrasil-go/yggdrasil-go/yggdrasil
-        run: cd /home/runner/work/yggdrasil-go/yggdrasil-go/vyatta-yggdrasil && ./build-${{ matrix.pkgarch }}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: Router package (${{ matrix.pkgarch }})
-          path: "/home/runner/work/yggdrasil-go/yggdrasil-go/vyatta-yggdrasil/*.deb"
-          if-no-files-found: error
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: 🐼 Setup go1.22+
+      uses: actions/setup-go@v5
+      with:
+        go-version: '>=1.22'
+
+    - name: Run build command
+      run: |
+        go install golang.org/x/mobile/cmd/gomobile@latest
+        gomobile init
+        ./contrib/mobile/build -a
+
+    - name: Upload .aar files
+      uses: actions/upload-artifact@v4
+      with:
+        name: aar-files
+        path: '**/*.aar'
+
+    - name: Upload .jar files
+      uses: actions/upload-artifact@v4
+      with:
+        name: jar-files
+        path: '**/*.jar'

contrib/mobile/build

@@ -7,7 +7,6 @@ set -ef
 PKGSRC=${PKGSRC:-github.com/RiV-chain/RiV-mesh/src/version}
 PKGNAME=${PKGNAME:-$(sh contrib/semver/name.sh)}
 PKGVER=${PKGVER:-$(sh contrib/semver/version.sh --bare)}
-
 LDFLAGS="-X $PKGSRC.buildName=$PKGNAME -X $PKGSRC.buildVersion=$PKGVER"
 ARGS="-v"
 
@@ -46,7 +45,7 @@ if [ $ANDROID ]; then
   echo "Building aar for Android"
   go get golang.org/x/mobile/bind
   gomobile bind \
-    -target android -tags mobile -o mesh.aar \
+    -androidapi 21 -target android -tags mobile -o mesh.aar \
     -ldflags="$LDFLAGS $STRIP" -gcflags="$GCFLAGS" \
     ./contrib/mobile ./src/config;
 fi

contrib/mobile/mobile.go

@@ -35,13 +35,13 @@ type Mesh struct {
 }
 
 // StartAutoconfigure starts a node with a randomly generated config
-func (m *Mesh) StartAutoconfigure() error {
-	return m.StartJSON([]byte("{}"))
+func (m *Mesh) StartAutoconfigure(osVersion int) error {
+	return m.StartJSON([]byte("{}"), osVersion)
 }
 
 // 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) error {
+func (m *Mesh) StartJSON(configjson []byte, osVersion int) error {
 	logger := log.New(m.log, "", 0)
 	logger.EnableLevel("error")
 	logger.EnableLevel("warn")
@@ -80,6 +80,7 @@ func (m *Mesh) StartJSON(configjson []byte) error {
 		if err != nil {
 			panic(err)
 		}
+		m.core.OsVersion = uint(osVersion)
 	}
 
 	// Setup the multicast module.

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,6 +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
 	golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15
 	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224
 )

go.sum

@@ -77,6 +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/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/core.go

@@ -44,6 +44,7 @@ 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) {

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