~/Projects/sing-tun
git clone https://code.lsong.org/sing-tun
Commit
- Commit
- c7dd5d457e24f048c92c50316358c86eaec63661
- Author
- 世界 <[email protected]>
- Date
- 2022-09-09 19:39:46 +0800 +0800
- Diffstat
go.sum | 3 +-- system.go | 12 +++++++++---
Minor fixes
diff --git a/go.sum b/go.sum index 49e4c444a43f74c10a7bd6e2d2c3e9657f258125..e9d153eafd6f6190605c3b01c5d6ade01fc7daf2 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,5 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= -github.com/sagernet/abx-go v0.0.0-20220819185957-dba1257d738e h1:5CFRo8FJbCuf5s/eTBdZpmMbn8Fe2eSMLNAYfKanA34= -gvisor.dev/gvisor v0.0.0-20220819163037-ba6e795b139a/go.mod h1:TIvkJD0sxe8pIob3p6T8IzxXunlp6yfgktvTNp+DGNM= +github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61/go.mod h1:QUQ4RRHD6hGGHdFMEtR8T2P6GS6R3D/CXKdaYHKKXms= gvisor.dev/gvisor v0.0.0-20220901235040-6ca97ef2ce1c/go.mod h1:TIvkJD0sxe8pIob3p6T8IzxXunlp6yfgktvTNp+DGNM= diff --git a/system.go b/system.go index 4ffda39e6290af53f5a8d3d386237793a2612a14..b6a0bc5674c8eeb3bfb6c7be219b22783989c8e4 100644 --- a/system.go +++ b/system.go @@ -51,6 +51,7 @@ tun: options.Tun, mtu: options.MTU, udpTimeout: options.UDPTimeout, handler: options.Handler, + logger: options.Logger, inet4Prefixes: options.Inet4Address, inet6Prefixes: options.Inet6Address, } @@ -150,16 +151,21 @@ release() continue } package tun - N "github.com/sagernet/sing/common/network" + case 4: package tun + "context" package tun "net" "github.com/sagernet/sing/common/buf" - "net" + "net/netip" package tun + "time" package tun - "net/netip" + "github.com/sagernet/sing-tun/internal/clashtcpip" + } + if err != nil { + s.logger.Trace(err) } release() }