mirror of
https://github.com/XTLS/Xray-core.git
synced 2026-09-17 06:50:27 +00:00
Tunnel inbound: SO_REUSEPORT fix and IPv6 support for the OpenBSD transparent proxy (#6624)
Completes https://github.com/XTLS/Xray-core/pull/6546
This commit is contained in:
@@ -12,12 +12,29 @@ import (
|
||||
)
|
||||
|
||||
func FakeUDP(addr *net.UDPAddr, mark int) (net.PacketConn, error) {
|
||||
ip4 := addr.IP.To4()
|
||||
if ip4 == nil {
|
||||
return nil, &net.OpError{Op: "fake", Err: fmt.Errorf("IPv6 is not supported by the OpenBSD transparent UDP patch")}
|
||||
domain := unix.AF_INET6
|
||||
var sockaddr unix.Sockaddr
|
||||
if ip4 := addr.IP.To4(); ip4 != nil {
|
||||
domain = unix.AF_INET
|
||||
sa := &unix.SockaddrInet4{Port: addr.Port}
|
||||
copy(sa.Addr[:], ip4)
|
||||
sockaddr = sa
|
||||
} else if ip6 := addr.IP.To16(); ip6 != nil {
|
||||
sa := &unix.SockaddrInet6{Port: addr.Port}
|
||||
copy(sa.Addr[:], ip6)
|
||||
if addr.Zone != "" {
|
||||
iface, err := net.InterfaceByName(addr.Zone)
|
||||
if err != nil {
|
||||
return nil, &net.OpError{Op: "fake", Err: fmt.Errorf("resolve zone %s: %w", addr.Zone, err)}
|
||||
}
|
||||
sa.ZoneId = uint32(iface.Index)
|
||||
}
|
||||
sockaddr = sa
|
||||
} else {
|
||||
return nil, &net.OpError{Op: "fake", Err: fmt.Errorf("unsupported address %v", addr.IP)}
|
||||
}
|
||||
|
||||
fd, err := unix.Socket(unix.AF_INET, unix.SOCK_DGRAM, 0)
|
||||
fd, err := unix.Socket(domain, unix.SOCK_DGRAM, 0)
|
||||
if err != nil {
|
||||
return nil, &net.OpError{Op: "fake", Err: fmt.Errorf("socket open: %w", err)}
|
||||
}
|
||||
@@ -35,9 +52,12 @@ func FakeUDP(addr *net.UDPAddr, mark int) (net.PacketConn, error) {
|
||||
if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEADDR, 1); err != nil {
|
||||
return nil, &net.OpError{Op: "fake", Err: fmt.Errorf("set socket option SO_REUSEADDR: %w", err)}
|
||||
}
|
||||
// Several client sessions can be answered from the same original
|
||||
// destination at the same time, so the address has to be shareable.
|
||||
if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEPORT, 1); err != nil {
|
||||
return nil, &net.OpError{Op: "fake", Err: fmt.Errorf("set socket option SO_REUSEPORT: %w", err)}
|
||||
}
|
||||
|
||||
sockaddr := &unix.SockaddrInet4{Port: addr.Port}
|
||||
copy(sockaddr.Addr[:], ip4)
|
||||
if err = unix.Bind(fd, sockaddr); err != nil {
|
||||
return nil, &net.OpError{Op: "fake", Err: fmt.Errorf("bind %s: %w", addr.String(), err)}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user