black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-22 08:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse source
This commit is contained in:
世界 2022-07-16 21:49:54 +08:00
parent fe5618c35d
commit afc2f509a4
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
5 changed files with 3 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/dialer/auto_linux.go
View file

@ -1,23 +0,0 @@
package dialer
import (
"syscall"
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing/common/control"
E "github.com/sagernet/sing/common/exceptions"
)
func BindToInterface(router adapter.Router) control.Func {
return func(network, address string, conn syscall.RawConn) error {
interfaceName := router.AutoDetectInterfaceName()
if interfaceName == "" {
return nil
}
var innerErr error
err := conn.Control(func(fd uintptr) {
innerErr = syscall.BindToDevice(int(fd), interfaceName)
})
return E.Errors(innerErr, err)
}
}

12
common/dialer/auto_other.go
View file

@ -1,12 +0,0 @@
//go:build !linux && !windows
package dialer
import (
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing/common/control"
)
func BindToInterface(router adapter.Router) control.Func {
return nil
}

68
common/dialer/auto_windows.go
View file

@ -1,68 +0,0 @@
package dialer
import (
"encoding/binary"
"net"
"net/netip"
"syscall"
"unsafe"
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing/common/control"
E "github.com/sagernet/sing/common/exceptions"
"golang.org/x/sys/windows"
)
const (
IP_UNICAST_IF = 31
IPV6_UNICAST_IF = 31
)
func bind4(handle windows.Handle, ifaceIdx int) error {
var bytes [4]byte
binary.BigEndian.PutUint32(bytes[:], uint32(ifaceIdx))
idx := *(*uint32)(unsafe.Pointer(&bytes[0]))
return windows.SetsockoptInt(handle, windows.IPPROTO_IP, IP_UNICAST_IF, int(idx))
}
func bind6(handle windows.Handle, ifaceIdx int) error {
return windows.SetsockoptInt(handle, windows.IPPROTO_IPV6, IPV6_UNICAST_IF, int(ifaceIdx))
}
func BindToInterface(router adapter.Router) control.Func {
return func(network, address string, conn syscall.RawConn) error {
interfaceName := router.AutoDetectInterfaceName()
if interfaceName == "" {
return nil
}
ipStr, _, err := net.SplitHostPort(address)
if err == nil {
if ip, err := netip.ParseAddr(ipStr); err == nil && !ip.IsGlobalUnicast() {
return err
}
}
var innerErr error
err = conn.Control(func(fd uintptr) {
handle := windows.Handle(fd)
// handle ip empty, e.g. net.Listen("udp", ":0")
if ipStr == "" {
innerErr = bind4(handle, router.AutoDetectInterfaceIndex())
if innerErr != nil {
return
}
// try bind ipv6, if failed, ignore. it's a workaround for windows disable interface ipv6
bind6(handle, router.AutoDetectInterfaceIndex())
return
}
switch network {
case "tcp4", "udp4", "ip4":
innerErr = bind4(handle, router.AutoDetectInterfaceIndex())
case "tcp6", "udp6":
innerErr = bind6(handle, router.AutoDetectInterfaceIndex())
}
})
return E.Errors(innerErr, err)
}
}

1
common/sniff/stun_test.go
View file

@ -12,6 +12,7 @@ import (
)
func TestSniffSTUN(t *testing.T) {
t.Parallel()
packet, err := hex.DecodeString("000100002112a44224b1a025d0c180c484341306")
require.NoError(t, err)
metadata, err := sniff.STUNMessage(context.Background(), packet)

8
docs/configuration/inbound/redirect.md
View file

@ -8,13 +8,11 @@
{
"type": "redirect",
"tag": "redirect-in",
"listen": "::",
"listen_port": 5353,
"sniff": false,
"sniff_override_destination": false,
"domain_strategy": "prefer_ipv6",
"udp_timeout": 300
"domain_strategy": "prefer_ipv6"
}
]
}
@ -55,7 +53,3 @@ One of `prefer_ipv4` `prefer_ipv6` `ipv4_only` `ipv6_only`.
If set, the requested domain name will be resolved to IP before routing.
If `sniff_override_destination` is in effect, its value will be taken as a fallback.
#### udp_timeout
UDP NAT expiration time in seconds, default is 300 (5 minutes).