Move udpnat to new library

SagerNet · Nov 27, 2024 · e39d1b7 · e39d1b7
1 parent c44912a
commit e39d1b7
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 1,925 deletions.
diff --git a/common/canceler/packet.go b/common/canceler/packet.go
@@ -24,7 +24,7 @@ type TimerPacketConn struct {
 func NewPacketConn(ctx context.Context, conn N.PacketConn, timeout time.Duration) (context.Context, N.PacketConn) {
 	if timeoutConn, isTimeoutConn := common.Cast[PacketConn](conn); isTimeoutConn {
 		oldTimeout := timeoutConn.Timeout()
-		if timeout >= oldTimeout {
+		if oldTimeout > 0 && timeout >= oldTimeout {
 			return ctx, conn
 		}
 		if timeoutConn.SetTimeout(timeout) {

diff --git a/common/udpnat/conn_wait.go b/common/udpnat/conn_wait.go
diff --git a/common/udpnat/service.go b/common/udpnat/service.go