control: Refactor interface finder

SagerNet · Nov 10, 2024 · 4e02229 · 4e02229
1 parent 0998999
commit 4e02229
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 42 deletions.
diff --git a/common/cond.go b/common/cond.go
@@ -362,24 +362,3 @@ func Close(closers ...any) error {
 	}
 	return retErr
 }
-
-// Deprecated: wtf is this?
-type Starter interface {
-	Start() error
-}
-
-// Deprecated: wtf is this?
-func Start(starters ...any) error {
-	for _, rawStarter := range starters {
-		if rawStarter == nil {
-			continue
-		}
-		if starter, isStarter := rawStarter.(Starter); isStarter {
-			err := starter.Start()
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
diff --git a/common/control/bind_darwin.go b/common/control/bind_darwin.go
@@ -9,15 +9,15 @@ import (
 
 func bindToInterface(conn syscall.RawConn, network string, address string, finder InterfaceFinder, interfaceName string, interfaceIndex int, preferInterfaceName bool) error {
 	return Raw(conn, func(fd uintptr) error {
-		var err error
 		if interfaceIndex == -1 {
 			if finder == nil {
 				return os.ErrInvalid
 			}
-			interfaceIndex, err = finder.InterfaceIndexByName(interfaceName)
+			iif, err := finder.ByName(interfaceName)
 			if err != nil {
 				return err
 			}
+			interfaceIndex = iif.Index
 		}
 		switch network {
 		case "tcp6", "udp6":

diff --git a/common/control/bind_finder.go b/common/control/bind_finder.go
@@ -8,9 +8,9 @@ import (
 type InterfaceFinder interface {
 	Update() error
 	Interfaces() []Interface
-	InterfaceIndexByName(name string) (int, error)
-	InterfaceNameByIndex(index int) (string, error)
-	InterfaceByAddr(addr netip.Addr) (*Interface, error)
+	ByName(name string) (*Interface, error)
+	ByIndex(index int) (*Interface, error)
+	ByAddr(addr netip.Addr) (*Interface, error)
 }
 
 type Interface struct {

diff --git a/common/control/bind_finder_default.go b/common/control/bind_finder_default.go
@@ -3,6 +3,7 @@ package control
 import (
 	"net"
 	"net/netip"
+	"os"
 	_ "unsafe"
 
 	"github.com/sagernet/sing/common"
@@ -52,35 +53,45 @@ func (f *DefaultInterfaceFinder) Interfaces() []Interface {
 	return f.interfaces
 }
 
-func (f *DefaultInterfaceFinder) InterfaceIndexByName(name string) (int, error) {
+func (f *DefaultInterfaceFinder) ByName(name string) (*Interface, error) {
 	for _, netInterface := range f.interfaces {
 		if netInterface.Name == name {
-			return netInterface.Index, nil
+			return &netInterface, nil
 		}
 	}
-	netInterface, err := net.InterfaceByName(name)
+	_, err := net.InterfaceByName(name)
 	if err != nil {
-		return 0, err
+		return nil, err
 	}
 	f.Update()
-	return netInterface.Index, nil
+	for _, netInterface := range f.interfaces {
+		if netInterface.Name == name {
+			return &netInterface, nil
+		}
+	}
+	return nil, os.ErrInvalid
 }
 
-func (f *DefaultInterfaceFinder) InterfaceNameByIndex(index int) (string, error) {
+func (f *DefaultInterfaceFinder) ByIndex(index int) (*Interface, error) {
 	for _, netInterface := range f.interfaces {
 		if netInterface.Index == index {
-			return netInterface.Name, nil
+			return &netInterface, nil
 		}
 	}
-	netInterface, err := net.InterfaceByIndex(index)
+	_, err := net.InterfaceByIndex(index)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	f.Update()
-	return netInterface.Name, nil
+	for _, netInterface := range f.interfaces {
+		if netInterface.Index == index {
+			return &netInterface, nil
+		}
+	}
+	return nil, os.ErrInvalid
 }
 
-func (f *DefaultInterfaceFinder) InterfaceByAddr(addr netip.Addr) (*Interface, error) {
+func (f *DefaultInterfaceFinder) ByAddr(addr netip.Addr) (*Interface, error) {
 	for _, netInterface := range f.interfaces {
 		for _, prefix := range netInterface.Addresses {
 			if prefix.Contains(addr) {

diff --git a/common/control/bind_linux.go b/common/control/bind_linux.go
@@ -19,11 +19,11 @@ func bindToInterface(conn syscall.RawConn, network string, address string, finde
 				if interfaceName == "" {
 					return os.ErrInvalid
 				}
-				var err error
-				interfaceIndex, err = finder.InterfaceIndexByName(interfaceName)
+				iif, err := finder.ByName(interfaceName)
 				if err != nil {
 					return err
 				}
+				interfaceIndex = iif.Index
 			}
 			err := unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_BINDTOIFINDEX, interfaceIndex)
 			if err == nil {

diff --git a/common/control/bind_windows.go b/common/control/bind_windows.go
@@ -11,19 +11,19 @@ import (
 
 func bindToInterface(conn syscall.RawConn, network string, address string, finder InterfaceFinder, interfaceName string, interfaceIndex int, preferInterfaceName bool) error {
 	return Raw(conn, func(fd uintptr) error {
-		var err error
 		if interfaceIndex == -1 {
 			if finder == nil {
 				return os.ErrInvalid
 			}
-			interfaceIndex, err = finder.InterfaceIndexByName(interfaceName)
+			iif, err := finder.ByName(interfaceName)
 			if err != nil {
 				return err
 			}
+			interfaceIndex = iif.Index
 		}
 		handle := syscall.Handle(fd)
 		if M.ParseSocksaddr(address).AddrString() == "" {
-			err = bind4(handle, interfaceIndex)
+			err := bind4(handle, interfaceIndex)
 			if err != nil {
 				return err
 			}