ipn/wg: re-enable bepass tricks on warp

Author: ignoramous

intra/ipn/wg/wgconn.go

@@ -395,23 +395,21 @@ func (s *StdNetBind) Send(buf [][]byte, peer conn.Endpoint) (err error) {
 			return syscall.EAFNOSUPPORT
 		}
 
-		if experimentalWg {
-			// overwrite the 3 reserved bytes on non-random packets
-			if overwriteReserved {
-				if len(data) > 3 && isWgMsgType(data[0]) {
-					// from: github.com/bepass-org/warp-plus/blob/19ac233cc6/wireguard/device/peer.go#L138
-					copy(data[1:4], s.reserved)
-					overwritten = true
-				}
-				if !flooded && !overwritten {
-					if len(data) == device.MessageInitiationSize {
-						go s.flood(uc, dst, fkHandshake) // probably a handshake
-						flooded = true
-					} else if len(data) == device.MessageKeepaliveSize {
-						go s.flood(uc, dst, fkKeepalive) // probably a keepalive
-						flooded = true
-					}
-				}
+		// overwrite the 3 reserved bytes on non-random packets
+		if overwriteReserved {
+			if len(data) > 3 && isWgMsgType(data[0]) {
+				// from: github.com/bepass-org/warp-plus/blob/19ac233cc6/wireguard/device/peer.go#L138
+				copy(data[1:4], s.reserved)
+				overwritten = true
+			}
+		}
+		if !flooded && !overwritten && (experimentalWg || overwriteReserved) {
+			if len(data) == device.MessageInitiationSize {
+				go s.flood(uc, dst, fkHandshake) // probably a handshake
+				flooded = true
+			} else if len(data) == device.MessageKeepaliveSize {
+				go s.flood(uc, dst, fkKeepalive) // probably a keepalive
+				flooded = true
 			}
 		}
 

intra/ipn/wgproxy.go

@@ -431,7 +431,7 @@ func wgIfConfigOf(id string, txtptr *string) (ifaddrs []netip.Prefix, allowedadd
 		case "endpoint": // may exist more than once
 			// TODO: endpoint could be v4 or v6 or a hostname
 			n := 0
-			if isRPN(id) && settings.ExperimentalWireGuard.Load() {
+			if isRPN(id) {
 				v4, v6, err := warp.Endpoints()
 				if err == nil {
 					warpipcsv := v4.String() + "," + v6.String()