c06ba17916
When the user specifies an IP address as the interface (e.g.
interface=10.1.1.1), GOST resolved it to its hosting interface and
called SO_BINDTODEVICE on it — breaking outbound connectivity for
IP aliases on loopback or dummy interfaces (go-gost/gost#785).
The initial fix (caa82f2) only skipped SO_BINDTODEVICE for loopback
interfaces, missing non-loopback dummy interfaces like ip-aliases.
This change adds an isIP return value to ParseInterfaceAddr so callers
can distinguish 'user specified an IP' (intent: source IP binding for
policy routing — skip SO_BINDTODEVICE) from 'user specified an
interface name' (intent: force traffic through that NIC — keep
SO_BINDTODEVICE). The dialOnce method now only calls bindDevice when
bindToDevice is true AND the input was an interface name (!isIP).
The loopback-specific guard in bindDevice is reverted — superseded by
the broader isIP-based fix that covers all interface types.
213 lines
4.7 KiB
Go
213 lines
4.7 KiB
Go
package net
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"net/netip"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// ParseInterfaceAddr resolves ifceName to a network interface name and its addresses.
|
|
// If ifceName is an IP address, it finds the corresponding interface and returns
|
|
// a single address with port 0. If ifceName is an interface name, it returns all
|
|
// addresses assigned to that interface. The network parameter determines the address
|
|
// type (TCPAddr for "tcp"/"tcp4"/"tcp6", UDPAddr for "udp"/"udp4"/"udp6", IPAddr
|
|
// otherwise).
|
|
//
|
|
// isIP reports whether ifceName was parsed as an IP address (true) rather than an
|
|
// interface name (false). When isIP is true, callers should skip SO_BINDTODEVICE —
|
|
// the user's intent is source IP binding for policy routing, not device binding.
|
|
func ParseInterfaceAddr(ifceName, network string) (ifce string, addr []net.Addr, isIP bool, err error) {
|
|
if ifceName == "" {
|
|
addr = append(addr, nil)
|
|
return
|
|
}
|
|
|
|
ip := net.ParseIP(ifceName)
|
|
if ip == nil {
|
|
var ife *net.Interface
|
|
ife, err = net.InterfaceByName(ifceName)
|
|
if err != nil {
|
|
return
|
|
}
|
|
var addrs []net.Addr
|
|
addrs, err = ife.Addrs()
|
|
if err != nil {
|
|
return
|
|
}
|
|
if len(addrs) == 0 {
|
|
err = fmt.Errorf("addr not found for interface %s", ifceName)
|
|
return
|
|
}
|
|
ifce = ifceName
|
|
for _, addr_ := range addrs {
|
|
if ipNet, ok := addr_.(*net.IPNet); ok {
|
|
addr = append(addr, ipToAddr(ipNet.IP, network))
|
|
}
|
|
}
|
|
} else {
|
|
// ifceName is an IP address — skip SO_BINDTODEVICE, use LocalAddr only
|
|
isIP = true
|
|
ifce, err = findInterfaceByIP(ip)
|
|
if err != nil {
|
|
return
|
|
}
|
|
addr = []net.Addr{ipToAddr(ip, network)}
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func ipToAddr(ip net.IP, network string) (addr net.Addr) {
|
|
port := 0
|
|
switch network {
|
|
case "tcp", "tcp4", "tcp6":
|
|
addr = &net.TCPAddr{IP: ip, Port: port}
|
|
return
|
|
case "udp", "udp4", "udp6":
|
|
addr = &net.UDPAddr{IP: ip, Port: port}
|
|
return
|
|
default:
|
|
addr = &net.IPAddr{IP: ip}
|
|
return
|
|
}
|
|
}
|
|
|
|
func findInterfaceByIP(ip net.IP) (string, error) {
|
|
ifces, err := net.Interfaces()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
for _, ifce := range ifces {
|
|
addrs, _ := ifce.Addrs()
|
|
if len(addrs) == 0 {
|
|
continue
|
|
}
|
|
for _, addr := range addrs {
|
|
ipAddr, _ := addr.(*net.IPNet)
|
|
if ipAddr == nil {
|
|
continue
|
|
}
|
|
// logger.Default().Infof("%s-%s", ipAddr, ip)
|
|
if ipAddr.IP.Equal(ip) {
|
|
return ifce.Name, nil
|
|
}
|
|
}
|
|
}
|
|
return "", nil
|
|
}
|
|
|
|
// AddrPortRange is the network address with port range supported.
|
|
// e.g. 192.168.1.1:0-65535
|
|
type AddrPortRange string
|
|
|
|
// Addrs expands the port range into individual "host:port" strings.
|
|
func (p AddrPortRange) Addrs() (addrs []string) {
|
|
// ignore url scheme, e.g. http://, tls://, tcp://.
|
|
if strings.Contains(string(p), "://") {
|
|
return nil
|
|
}
|
|
|
|
h, sp, err := net.SplitHostPort(string(p))
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
|
|
pr := PortRange{}
|
|
pr.Parse(sp)
|
|
|
|
for i := pr.Min; i <= pr.Max; i++ {
|
|
addrs = append(addrs, net.JoinHostPort(h, strconv.Itoa(i)))
|
|
}
|
|
return addrs
|
|
}
|
|
|
|
// Port range is a range of port list.
|
|
type PortRange struct {
|
|
Min int
|
|
Max int
|
|
}
|
|
|
|
// Parse parses the s to PortRange.
|
|
// The s can be a single port number and will be converted to port range port-port.
|
|
func (pr *PortRange) Parse(s string) error {
|
|
minmax := strings.Split(s, "-")
|
|
switch len(minmax) {
|
|
case 1:
|
|
port, err := strconv.Atoi(s)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if port < 0 || port > 65535 {
|
|
return fmt.Errorf("invalid port: %s", s)
|
|
}
|
|
|
|
pr.Min, pr.Max = port, port
|
|
return nil
|
|
|
|
case 2:
|
|
min, err := strconv.Atoi(minmax[0])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
max, err := strconv.Atoi(minmax[1])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
pr.Min, pr.Max = min, max
|
|
return nil
|
|
|
|
default:
|
|
return fmt.Errorf("invalid port range: %s", s)
|
|
}
|
|
}
|
|
|
|
// Contains reports whether port falls within the range.
|
|
func (pr *PortRange) Contains(port int) bool {
|
|
return port >= pr.Min && port <= pr.Max
|
|
}
|
|
|
|
// IPRange represents a range of IP addresses.
|
|
type IPRange struct {
|
|
Min netip.Addr
|
|
Max netip.Addr
|
|
}
|
|
|
|
// Parse parses s as a single IP or IP range "min-max" into r.
|
|
func (r *IPRange) Parse(s string) error {
|
|
minmax := strings.Split(s, "-")
|
|
switch len(minmax) {
|
|
case 1:
|
|
addr, err := netip.ParseAddr(strings.TrimSpace(s))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
r.Min, r.Max = addr, addr
|
|
return nil
|
|
|
|
case 2:
|
|
min, err := netip.ParseAddr(strings.TrimSpace(minmax[0]))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
max, err := netip.ParseAddr(strings.TrimSpace(minmax[1]))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
r.Min, r.Max = min, max
|
|
return nil
|
|
|
|
default:
|
|
return fmt.Errorf("invalid ip range: %s", s)
|
|
}
|
|
}
|
|
|
|
// Contains reports whether addr falls within the IP range.
|
|
func (r *IPRange) Contains(addr netip.Addr) bool {
|
|
return !(addr.Less(r.Min) || r.Max.Less(addr))
|
|
}
|