Merge pull request #1405 from apernet/fix-tun

[TUN] Fix goroutine leak & broken DNS

Author: tobyxdd

app/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f
 	github.com/apernet/hysteria/core/v2 v2.0.0-00010101000000-000000000000
 	github.com/apernet/hysteria/extras/v2 v2.0.0-00010101000000-000000000000
-	github.com/apernet/sing-tun v0.2.6-0.20240323130332-b9f6511036ad
+	github.com/apernet/sing-tun v0.2.6-0.20250726070404-c99085f9af13
 	github.com/caddyserver/certmagic v0.17.2
 	github.com/libdns/cloudflare v0.1.1
 	github.com/libdns/duckdns v0.2.0

app/go.sum

@@ -44,8 +44,8 @@ github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f h1:uVh0qpEslrWjg
 github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f/go.mod h1:xkkq9D4ygcldQQhKS/w9CadiCKwCngU7K9E3DaKahpM=
 github.com/apernet/quic-go v0.52.1-0.20250607183305-9320c9d14431 h1:9/jM7e+kVALd7Jfu1c27dcEpT/Fd/Gzq2OsQjKjakKI=
 github.com/apernet/quic-go v0.52.1-0.20250607183305-9320c9d14431/go.mod h1:I/47OIGG5H/IfAm+nz2c6hm6b/NkEhpvptAoiPcY7jQ=
-github.com/apernet/sing-tun v0.2.6-0.20240323130332-b9f6511036ad h1:QzQ2sKpc9o42HNRR8ukM5uMC/RzR2HgZd/Nvaqol2C0=
-github.com/apernet/sing-tun v0.2.6-0.20240323130332-b9f6511036ad/go.mod h1:S5IydyLSN/QAfvY+r2GoomPJ6hidtXWm/Ad18sJVssk=
+github.com/apernet/sing-tun v0.2.6-0.20250726070404-c99085f9af13 h1:gzets97c/u5iMj1zjanMBVkIYOdaVw+RXPzTT1xQoyM=
+github.com/apernet/sing-tun v0.2.6-0.20250726070404-c99085f9af13/go.mod h1:S5IydyLSN/QAfvY+r2GoomPJ6hidtXWm/Ad18sJVssk=
 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 h1:4NNbNM2Iq/k57qEu7WfL67UrbPq1uFWxW4qODCohi+0=
 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6/go.mod h1:J29hk+f9lJrblVIfiJOtTFk+OblBawmib4uz/VdKzlg=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=

app/internal/tun/server.go

@@ -123,11 +123,7 @@ func (t *tunHandler) NewConnection(ctx context.Context, conn net.Conn, m metadat
 	defer rc.Close()
 
 	// start forwarding
-	copyErrChan := make(chan error, 3)
-	go func() {
-		<-ctx.Done()
-		copyErrChan <- ctx.Err()
-	}()
+	copyErrChan := make(chan error, 2)
 	go func() {
 		_, copyErr := io.Copy(rc, conn)
 		copyErrChan <- copyErr
@@ -136,7 +132,11 @@ func (t *tunHandler) NewConnection(ctx context.Context, conn net.Conn, m metadat
 		_, copyErr := io.Copy(conn, rc)
 		copyErrChan <- copyErr
 	}()
-	closeErr = <-copyErrChan
+	select {
+	case <-ctx.Done():
+		closeErr = ctx.Err()
+	case closeErr = <-copyErrChan:
+	}
 	return nil
 }
 
@@ -160,11 +160,7 @@ func (t *tunHandler) NewPacketConnection(ctx context.Context, conn network.Packe
 	defer rc.Close()
 
 	// start forwarding
-	copyErrChan := make(chan error, 3)
-	go func() {
-		<-ctx.Done()
-		copyErrChan <- ctx.Err()
-	}()
+	copyErrChan := make(chan error, 2)
 	// local <- remote
 	go func() {
 		for {
@@ -205,7 +201,11 @@ func (t *tunHandler) NewPacketConnection(ctx context.Context, conn network.Packe
 			}
 		}
 	}()
-	closeErr = <-copyErrChan
+	select {
+	case <-ctx.Done():
+		closeErr = ctx.Err()
+	case closeErr = <-copyErrChan:
+	}
 	return nil
 }