Support Android 11 net.Interface

Fix netlink permission issue by using anet wrapper to get net interface and addresses.
pion · Jul 22, 2024 · da99fc1 · da99fc1
1 parent a1b0b8e
commit da99fc1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.12
 require (
 	github.com/pion/logging v0.2.2
 	github.com/stretchr/testify v1.8.4
+	github.com/wlynxg/anet v0.0.1
 	golang.org/x/net v0.14.0
 	golang.org/x/sys v0.11.0
 )
diff --git a/go.sum b/go.sum
@@ -12,6 +12,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/wlynxg/anet v0.0.1 h1:VbkEEgHxPSrRQSiyRd0pmrbcEQAEU2TTb8fb4DmSYoQ=
+github.com/wlynxg/anet v0.0.1/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

diff --git a/stdnet/net.go b/stdnet/net.go
@@ -10,6 +10,7 @@ import (
 	"net"
 
 	"github.com/pion/transport/v2"
+	"github.com/wlynxg/anet"
 )
 
 const (
@@ -38,15 +39,15 @@ var _ transport.Net = &Net{}
 func (n *Net) UpdateInterfaces() error {
 	ifs := []*transport.Interface{}
 
-	oifs, err := net.Interfaces()
+	oifs, err := anet.Interfaces()
 	if err != nil {
 		return err
 	}
 
-	for _, oif := range oifs {
-		ifc := transport.NewInterface(oif)
+	for i := range oifs {
+		ifc := transport.NewInterface(oifs[i])
 
-		addrs, err := oif.Addrs()
+		addrs, err := anet.InterfaceAddrsByInterface(&oifs[i])
 		if err != nil {
 			return err
 		}

diff --git a/stdnet/net_test.go b/stdnet/net_test.go
@@ -28,7 +28,7 @@ func TestStdNet(t *testing.T) {
 			return
 		}
 
-		log.Debugf("interfaces: %+v", interfaces)
+		log.Debugf("interfaces:  %+v", interfaces)
 		for _, ifc := range interfaces {
 			if ifc.Name == lo0String {
 				_, err := ifc.Addrs()