merge: integrate origin/pr936-broken-pipe into sync branch

Author: MaurUppi

control/udp_endpoint_pool.go

@@ -8,7 +8,9 @@ package control
 import (
 	"context"
 	"fmt"
+	"io"
 	"net/netip"
+	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -18,6 +20,7 @@ import (
 	"github.com/daeuniverse/dae/component/outbound/dialer"
 	"github.com/daeuniverse/outbound/netproxy"
 	"github.com/daeuniverse/outbound/pool"
+	"github.com/sirupsen/logrus"
 )
 
 var UdpRoutingResultCacheTtl = 300 * time.Millisecond
@@ -53,12 +56,35 @@ type UdpEndpoint struct {
 	dead atomic.Bool
 }
 
+// isUdpEndpointNormalClose reports whether err represents a normal (non-error) endpoint
+// teardown: peer EOF, NatTimeout expiry ("use of closed network connection"), or an explicit
+// local close triggered by Reset(0) cleanup.
+func isUdpEndpointNormalClose(err error) bool {
+	if err == nil {
+		return true
+	}
+	if err == io.EOF {
+		return true
+	}
+	// "use of closed network connection" is returned when Reset(0) fires ue.Close() just
+	// before ReadFrom returns; this is the expected cleanup path, not an error.
+	if strings.Contains(err.Error(), "use of closed network connection") {
+		return true
+	}
+	return false
+}
+
 func (ue *UdpEndpoint) start() {
 	buf := pool.GetFullCap(consts.EthernetMtu)
 	defer pool.Put(buf)
 	for {
 		n, from, err := ue.conn.ReadFrom(buf[:])
 		if err != nil {
+			if !isUdpEndpointNormalClose(err) {
+				logrus.WithError(err).Warnln("UdpEndpoint read loop exited")
+			} else {
+				logrus.WithError(err).Debugln("UdpEndpoint read loop exited")
+			}
 			// Mark this endpoint as dead so GetOrCreate won't reuse it.
 			// Also set expiration to past for immediate janitor cleanup.
 			ue.dead.Store(true)