Merge branch 'dev' of https://github.com/SagerNet/sing-tun into meta

go.mod

@@ -5,8 +5,7 @@ go 1.18
 require (
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/go-ole/go-ole v1.3.0
-	github.com/metacubex/gvisor v0.0.0-20231206145044-b6960a648d8b
-	github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61
+	github.com/metacubex/gvisor v0.0.0-20231209122014-3e43224c7bbc
 	github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97
 	github.com/sagernet/sing v0.2.19-0.20231207034108-445cd4f41e3f
 	github.com/scjalliance/comshim v0.0.0-20230315213746-5e51f40bd3b9
@@ -18,5 +17,5 @@ require (
 require (
 	github.com/google/btree v1.1.2 // indirect
 	github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
-	golang.org/x/time v0.4.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 )

go.sum

@@ -4,13 +4,10 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/metacubex/gvisor v0.0.0-20231206145044-b6960a648d8b h1:xJHepHYyQ7NOpUkEcz9wC3TnMRFjFQ3KVVqtHC/6G5s=
-github.com/metacubex/gvisor v0.0.0-20231206145044-b6960a648d8b/go.mod h1:rhBU9tD5ktoGPBtXUquhWuGJ4u+8ZZzBMi2cAdv9q8Y=
-github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61 h1:5+m7c6AkmAylhauulqN/c5dnh8/KssrE9c93TQrXldA=
-github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61/go.mod h1:QUQ4RRHD6hGGHdFMEtR8T2P6GS6R3D/CXKdaYHKKXms=
+github.com/metacubex/gvisor v0.0.0-20231209122014-3e43224c7bbc h1:+yTZ6q2EeQCAJNpKNEu5j32Pm23ShD38ElIa635wTrk=
+github.com/metacubex/gvisor v0.0.0-20231209122014-3e43224c7bbc/go.mod h1:rhBU9tD5ktoGPBtXUquhWuGJ4u+8ZZzBMi2cAdv9q8Y=
 github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 h1:iL5gZI3uFp0X6EslacyapiRz7LLSJyr4RajF/BhMVyE=
 github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
-github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY=
 github.com/sagernet/sing v0.2.19-0.20231207034108-445cd4f41e3f h1:hYkBnmJjVphGc4b02b4jN46ojh05vACYZI3ciD/V3pA=
 github.com/sagernet/sing v0.2.19-0.20231207034108-445cd4f41e3f/go.mod h1:Ce5LNojQOgOiWhiD8pPD6E9H7e2KgtOe3Zxx4Ou5u80=
 github.com/scjalliance/comshim v0.0.0-20230315213746-5e51f40bd3b9 h1:rc/CcqLH3lh8n+csdOuDfP+NuykE0U6AeYSJJHKDgSg=
@@ -22,9 +19,8 @@ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/W
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
-golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=

stack.go

@@ -19,10 +19,7 @@ type Stack interface {
 type StackOptions struct {
 	Context                context.Context
 	Tun                    Tun
-	Name                   string
-	MTU                    uint32
-	Inet4Address           []netip.Prefix
-	Inet6Address           []netip.Prefix
+	TunOptions             Options
 	EndpointIndependentNat bool
 	UDPTimeout             int64
 	Handler                Handler
@@ -31,13 +28,21 @@ type StackOptions struct {
 	InterfaceFinder        control.InterfaceFinder
 }
 
+func (o *StackOptions) BufferSize() uint32 {
+	if o.TunOptions.GSO {
+		return o.TunOptions.GSOMaxSize
+	} else {
+		return o.TunOptions.MTU
+	}
+}
+
 func NewStack(
 	stack string,
 	options StackOptions,
 ) (Stack, error) {
 	switch stack {
 	case "":
-		if WithGVisor {
+		if WithGVisor && !options.TunOptions.GSO {
 			return NewMixed(options)
 		} else {
 			return NewSystem(options)
@@ -48,8 +53,6 @@ func NewStack(
 		return NewMixed(options)
 	case "system":
 		return NewSystem(options)
-	case "lwip":
-		return NewLWIP(options)
 	default:
 		return nil, E.New("unknown stack: ", stack)
 	}

stack_gvisor.go

@@ -32,10 +32,9 @@ const defaultNIC tcpip.NICID = 1
 type GVisor struct {
 	ctx                    context.Context
 	tun                    GVisorTun
-	tunMtu                 uint32
 	endpointIndependentNat bool
 	udpTimeout             int64
-	broadcastAddr netip.Addr
+	broadcastAddr          netip.Addr
 	handler                Handler
 	logger                 logger.Logger
 	stack                  *stack.Stack
@@ -58,10 +57,9 @@ func NewGVisor(
 	gStack := &GVisor{
 		ctx:                    options.Context,
 		tun:                    gTun,
-		tunMtu:                 options.MTU,
 		endpointIndependentNat: options.EndpointIndependentNat,
 		udpTimeout:             options.UDPTimeout,
-		broadcastAddr: BroadcastAddr(options.Inet4Address),
+		broadcastAddr:          BroadcastAddr(options.TunOptions.Inet4Address),
 		handler:                options.Handler,
 		logger:                 options.Logger,
 	}
@@ -73,7 +71,7 @@ func (t *GVisor) Start() error {
 	if err != nil {
 		return err
 	}
-	linkEndpoint = &LinkEndpointFilter{linkEndpoint, t.broadcastAddr, t.tun.CreateVectorisedWriter()}
+	linkEndpoint = &LinkEndpointFilter{linkEndpoint, t.broadcastAddr, bufio.NewVectorisedWriter(t.tun)}
 	ipStack, err := newGVisorStack(linkEndpoint)
 	if err != nil {
 		return err

stack_mixed.go

@@ -39,7 +39,7 @@ func NewMixed(
 	}
 	return &Mixed{
 		System:                 system.(*System),
-		writer:                 options.Tun.CreateVectorisedWriter(),
+		writer:                 bufio.NewVectorisedWriter(options.Tun),
 		endpointIndependentNat: options.EndpointIndependentNat,
 	}, nil
 }
@@ -96,21 +96,23 @@ func (m *Mixed) tunLoop() {
 		m.wintunLoop(winTun)
 		return
 	}
-	packetBuffer := make([]byte, m.mtu+PacketOffset)
+	frontHeadroom := m.tun.FrontHeadroom()
+	packetBuffer := make([]byte, m.bufferSize+frontHeadroom)
 	for {
-		n, err := m.tun.Read(packetBuffer)
+		n, err := m.tun.Read(packetBuffer[frontHeadroom:])
 		if err != nil {
 			return
 		}
 		if n < clashtcpip.IPv4PacketMinLength {
 			continue
 		}
-		packet := packetBuffer[PacketOffset:n]
+		rawPacket := packetBuffer[:frontHeadroom+n]
+		packet := packetBuffer[frontHeadroom : frontHeadroom+n]
 		switch ipVersion := packet[0] >> 4; ipVersion {
 		case 4:
-			err = m.processIPv4(packet)
+			err = m.processIPv4(rawPacket, packet)
 		case 6:
-			err = m.processIPv6(packet)
+			err = m.processIPv6(rawPacket, packet)
 		default:
 			err = E.New("ip: unknown version: ", ipVersion)
 		}
@@ -132,9 +134,9 @@ func (m *Mixed) wintunLoop(winTun WinTun) {
 		}
 		switch ipVersion := packet[0] >> 4; ipVersion {
 		case 4:
-			err = m.processIPv4(packet)
+			err = m.processIPv4(packet, packet)
 		case 6:
-			err = m.processIPv6(packet)
+			err = m.processIPv6(packet, packet)
 		default:
 			err = E.New("ip: unknown version: ", ipVersion)
 		}
@@ -145,14 +147,14 @@ func (m *Mixed) wintunLoop(winTun WinTun) {
 	}
 }
 
-func (m *Mixed) processIPv4(packet clashtcpip.IPv4Packet) error {
+func (m *Mixed) processIPv4(rawPacket []byte, packet clashtcpip.IPv4Packet) error {
 	destination := packet.DestinationIP()
 	if destination == m.broadcastAddr || !destination.IsGlobalUnicast() {
 		return common.Error(m.tun.Write(packet))
 	}
 	switch packet.Protocol() {
 	case clashtcpip.TCP:
-		return m.processIPv4TCP(packet, packet.Payload())
+		return m.processIPv4TCP(rawPacket, packet, packet.Payload())
 	case clashtcpip.UDP:
 		pkt := stack.NewPacketBuffer(stack.PacketBufferOptions{
 			Payload: buffer.MakeWithData(packet),
@@ -161,19 +163,19 @@ func (m *Mixed) processIPv4(packet clashtcpip.IPv4Packet) error {
 		pkt.DecRef()
 		return nil
 	case clashtcpip.ICMP:
-		return m.processIPv4ICMP(packet, packet.Payload())
+		return m.processIPv4ICMP(rawPacket, packet, packet.Payload())
 	default:
 		return common.Error(m.tun.Write(packet))
 	}
 }
 
-func (m *Mixed) processIPv6(packet clashtcpip.IPv6Packet) error {
+func (m *Mixed) processIPv6(rawPacket []byte, packet clashtcpip.IPv6Packet) error {
 	if !packet.DestinationIP().IsGlobalUnicast() {
 		return common.Error(m.tun.Write(packet))
 	}
 	switch packet.Protocol() {
 	case clashtcpip.TCP:
-		return m.processIPv6TCP(packet, packet.Payload())
+		return m.processIPv6TCP(rawPacket, packet, packet.Payload())
 	case clashtcpip.UDP:
 		pkt := stack.NewPacketBuffer(stack.PacketBufferOptions{
 			Payload: buffer.MakeWithData(packet),
@@ -182,7 +184,7 @@ func (m *Mixed) processIPv6(packet clashtcpip.IPv6Packet) error {
 		pkt.DecRef()
 		return nil
 	case clashtcpip.ICMPv6:
-		return m.processIPv6ICMP(packet, packet.Payload())
+		return m.processIPv6ICMP(rawPacket, packet, packet.Payload())
 	default:
 		return common.Error(m.tun.Write(packet))
 	}