SagerNet/sing-tun
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-tun.git synced 2025-04-05 12:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add more messages to darwin route error

Browse source
This commit is contained in:
世界 2022-10-09 21:21:26 +08:00
parent 9a556307f6
commit 1ede22e6eb
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tun_darwin.go
View file

@ -135,7 +135,7 @@ func configure(tunFd int, ifIndex int, name string, options Options) error {
copy(ctlInfo.Name[:], utunControlName) copy(ctlInfo.Name[:], utunControlName)
err := unix.IoctlCtlInfo(tunFd, ctlInfo) err := unix.IoctlCtlInfo(tunFd, ctlInfo)
if err != nil { if err != nil {
return err return os.NewSyscallError("IoctlCtlInfo", err)
} }
err = unix.Connect(tunFd, &unix.SockaddrCtl{ err = unix.Connect(tunFd, &unix.SockaddrCtl{
@ -143,12 +143,12 @@ func configure(tunFd int, ifIndex int, name string, options Options) error {
Unit: uint32(ifIndex) + 1, Unit: uint32(ifIndex) + 1,
}) })
if err != nil { if err != nil {
return err return os.NewSyscallError("Connect", err)
} }
err = unix.SetNonblock(tunFd, true) err = unix.SetNonblock(tunFd, true)
if err != nil { if err != nil {
return err return os.NewSyscallError("SetNonblock", err)
} }
err = useSocket(unix.AF_INET, unix.SOCK_DGRAM, 0, func(socketFd int) error { err = useSocket(unix.AF_INET, unix.SOCK_DGRAM, 0, func(socketFd int) error {
@ -158,7 +158,7 @@ func configure(tunFd int, ifIndex int, name string, options Options) error {
return unix.IoctlSetIfreqMTU(socketFd, &ifr) return unix.IoctlSetIfreqMTU(socketFd, &ifr)
}) })
if err != nil { if err != nil {
return err return os.NewSyscallError("IoctlSetIfreqMTU", err)
} }
if len(options.Inet4Address) > 0 { if len(options.Inet4Address) > 0 {
for _, address := range options.Inet4Address { for _, address := range options.Inet4Address {
@ -253,7 +253,7 @@ func configure(tunFd int, ifIndex int, name string, options Options) error {
} { } {
err = addRoute(subnet, options.Inet4Address[0].Addr()) err = addRoute(subnet, options.Inet4Address[0].Addr())
if err != nil { if err != nil {
return err return E.Cause(err, "add ipv4 route "+subnet.String())
} }
} }
} }
@ -261,7 +261,7 @@ func configure(tunFd int, ifIndex int, name string, options Options) error {
subnet := netip.PrefixFrom(netip.AddrFrom16([16]byte{32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 3) subnet := netip.PrefixFrom(netip.AddrFrom16([16]byte{32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 3)
err = addRoute(subnet, options.Inet6Address[0].Addr()) err = addRoute(subnet, options.Inet6Address[0].Addr())
if err != nil { if err != nil {
return err return E.Cause(err, "add ipv6 route "+subnet.String())
} }
} }
} }