🪛 Mitigate infinite loop in UDP NAT

database64128 · database64128 · commit 8af7e1cbe325 · 2022-04-15T19:43:38.000+08:00
diff --git a/service/nat.go b/service/nat.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"crypto/cipher"
+	"errors"
 	"math/rand"
 	"net"
 	"sync"
@@ -106,6 +107,9 @@ func (c *natconn) timedCopy(ses *session, sm metrics.ShadowsocksMetrics) {
 						return nil
 					}
 				}
+				if errors.Is(err, net.ErrClosed) { //FIXME: locate the bug and remove this mitigation.
+					expired = true
+				}
 				return onet.NewConnectionError("ERR_READ", "Failed to read from target", err)
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package service`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"crypto/cipher"`
	`5`	`+ "errors"`
`5`	`6`	`"math/rand"`
`6`	`7`	`"net"`
`7`	`8`	`"sync"`
`@@ -106,6 +107,9 @@ func (c natconn) timedCopy(ses session, sm metrics.ShadowsocksMetrics) {`
`106`	`107`	`return nil`
`107`	`108`	`}`
`108`	`109`	`}`
	`110`	`+ if errors.Is(err, net.ErrClosed) { //FIXME: locate the bug and remove this mitigation.`
	`111`	`+ expired = true`
	`112`	`+ }`
`109`	`113`	`return onet.NewConnectionError("ERR_READ", "Failed to read from target", err)`
`110`	`114`	`}`
`111`	`115`