[update] 端口连通性检查

.gitignore

@@ -1 +1,2 @@
 .idea
+dist

natter/natter.go

@@ -38,7 +38,7 @@ func Start(ctx context.Context, forwardAddr *net.TCPAddr) (err error) {
 				return
 			default:
 				forward.KeepAlive()
-				if !TestPort(rAddr.Port) {
+				if !TestPort(rAddr) {
 					logger.Error("公网端口不可达")
 					forward.StopForward()
 					err = Start(ctx, forwardAddr)

natter/portTest.go

@@ -81,12 +81,24 @@ func testTransmission(port int) bool {
 	return bodyStr == "1"
 }
 
-func TestPort(port int) bool {
+func localTestAddr(rAddr *net.TCPAddr) bool {
+	conn, err := net.DialTimeout("tcp4", rAddr.String(), time.Second*3)
+	if err != nil {
+		return false
+	}
+	c(conn)
+	return true
+}
+
+func TestPort(rAddr *net.TCPAddr) bool {
 	for i := 0; i < 3; i++ {
-		if testIfConfigCo(port) {
+		if testIfConfigCo(rAddr.Port) {
+			return true
+		}
+		if testTransmission(rAddr.Port) {
 			return true
 		}
-		if testTransmission(port) {
+		if localTestAddr(rAddr) {
 			return true
 		}
 		time.Sleep(1 * time.Second)