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

Fix tcp keepalive

Browse source
This commit is contained in:
世界 2022-07-25 23:34:12 +08:00
parent d35c334b46
commit 3b0c717db3
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gvisor.go
View file

@ -2,6 +2,7 @@ package tun
import ( import (
"context" "context"
"time"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/bufio" "github.com/sagernet/sing/common/bufio"
@ -90,6 +91,10 @@ func (t *GVisorTun) Start() error {
} }
r.Complete(false) r.Complete(false)
endpoint.SocketOptions().SetKeepAlive(true) endpoint.SocketOptions().SetKeepAlive(true)
keepAliveIdle := tcpip.KeepaliveIdleOption(15 * time.Second)
endpoint.SetSockOpt(&keepAliveIdle)
keepAliveInterval := tcpip.KeepaliveIntervalOption(15 * time.Second)
endpoint.SetSockOpt(&keepAliveInterval)
tcpConn := gonet.NewTCPConn(&wq, endpoint) tcpConn := gonet.NewTCPConn(&wq, endpoint)
lAddr := tcpConn.RemoteAddr() lAddr := tcpConn.RemoteAddr()
rAddr := tcpConn.LocalAddr() rAddr := tcpConn.LocalAddr()
@ -101,7 +106,10 @@ func (t *GVisorTun) Start() error {
var metadata M.Metadata var metadata M.Metadata
metadata.Source = M.SocksaddrFromNet(lAddr) metadata.Source = M.SocksaddrFromNet(lAddr)
metadata.Destination = M.SocksaddrFromNet(rAddr) metadata.Destination = M.SocksaddrFromNet(rAddr)
t.handler.NewConnection(t.ctx, tcpConn, metadata) hErr := t.handler.NewConnection(t.ctx, tcpConn, metadata)
if hErr != nil {
endpoint.Abort()
}
}() }()
}) })
ipStack.SetTransportProtocolHandler(tcp.ProtocolNumber, func(id stack.TransportEndpointID, buffer *stack.PacketBuffer) bool { ipStack.SetTransportProtocolHandler(tcp.ProtocolNumber, func(id stack.TransportEndpointID, buffer *stack.PacketBuffer) bool {
@ -117,14 +125,17 @@ func (t *GVisorTun) Start() error {
lAddr := udpConn.RemoteAddr() lAddr := udpConn.RemoteAddr()
rAddr := udpConn.LocalAddr() rAddr := udpConn.LocalAddr()
if lAddr == nil || rAddr == nil { if lAddr == nil || rAddr == nil {
udpConn.Close() endpoint.Abort()
return return
} }
go func() { go func() {
var metadata M.Metadata var metadata M.Metadata
metadata.Source = M.SocksaddrFromNet(lAddr) metadata.Source = M.SocksaddrFromNet(lAddr)
metadata.Destination = M.SocksaddrFromNet(rAddr) metadata.Destination = M.SocksaddrFromNet(rAddr)
t.handler.NewPacketConnection(t.ctx, bufio.NewPacketConn(&bufio.UnbindPacketConn{ExtendedConn: bufio.NewExtendedConn(udpConn), Addr: M.SocksaddrFromNet(rAddr)}), metadata) hErr := t.handler.NewPacketConnection(t.ctx, bufio.NewPacketConn(&bufio.UnbindPacketConn{ExtendedConn: bufio.NewExtendedConn(udpConn), Addr: M.SocksaddrFromNet(rAddr)}), metadata)
if hErr != nil {
endpoint.Abort()
}
}() }()
}) })
ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, udpForwarder.HandlePacket) ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, udpForwarder.HandlePacket)