Fix sdp strings and use (now configurable) port allocator config more aligned with vanilla client

Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>

Author: Kas-tle

gradle.properties

@@ -1,2 +1,2 @@
 # Only update version on publishing to Maven Central
-version=1.6.0
+version=1.6.1

transport-nethernet/src/main/java/dev/kastle/netty/channel/nethernet/NetherNetClientChannel.java

@@ -51,8 +51,6 @@ public class NetherNetClientChannel extends NetherNetChannel {
 
     private volatile ScheduledFuture<?> handshakeTimeoutTask;
 
-    private volatile String localUfrag;
-
     private int retryCount = 0;
 
     /**
@@ -204,6 +202,7 @@ private void resetAndRetryHandshake() {
 
     private void initWebRTC(List<NetherNetSignaling.IceServerInfo> iceServers) {
         RTCConfiguration rtcConfig = new RTCConfiguration();
+        rtcConfig.portAllocatorConfig = this.config.getOption(NetherChannelOption.NETHER_PORT_ALLOCATOR_CONFIG);
         rtcConfig.bundlePolicy = RTCBundlePolicy.MAX_BUNDLE;
 
         if (iceServers != null) {
@@ -219,24 +218,10 @@ private void initWebRTC(List<NetherNetSignaling.IceServerInfo> iceServers) {
         peerConnection = factory.createPeerConnection(rtcConfig, new PeerConnectionObserver() {
             @Override
             public void onIceCandidate(RTCIceCandidate candidate) {
-                // Wait until we have the ufrag (usually available immediately after createOffer)
-                if (localUfrag == null) {
-                    log.warn("Generated ICE candidate before local ufrag was available. Skipping.");
-                    return;
-                }
-                
-                String sdp = candidate.sdp.trim();
-                
-                // Format: <StandardSDP> ufrag <LocalUfrag> network-id <LocalNetworkID> network-cost 0
-                StringBuilder sb = new StringBuilder(sdp)
-                    .append(" ufrag ").append(localUfrag)
-                    .append(" network-id ").append(signaling.getLocalNetworkId())
-                    .append(" network-cost 0");
-
                 try {
                     signaling.sendSignal(
                         targetNetworkId, 
-                        NetherNetConstants.buildSignalCandidateAdd(connectionId, sb.toString())
+                        NetherNetConstants.buildSignalCandidateAdd(connectionId, candidate.sdp)
                     );
                 } catch (Exception e) {
                     log.error("Failed to send ICE candidate", e);
@@ -261,29 +246,12 @@ public void onConnectionChange(RTCPeerConnectionState state) {
         setupDataChannels();
     }
 
-    private String extractUfrag(String sdp) {
-        if (sdp == null) return "";
-        for (String line : sdp.split("\\r?\\n")) {
-            line = line.trim();
-            if (line.startsWith("a=ice-ufrag:")) {
-                return line.substring("a=ice-ufrag:".length()).trim();
-            }
-            // Some implementations might omit 'a='
-            if (line.startsWith("ice-ufrag:")) {
-                return line.substring("ice-ufrag:".length()).trim();
-            }
-        }
-        log.warn("Could not find ice-ufrag in local SDP!");
-        return "";
-    }
-
     private void createAndSendOffer() {
         if (peerConnection == null) return;
         peerConnection.createOffer(new RTCOfferOptions(), new CreateSessionDescriptionObserver() {
             @Override
             public void onSuccess(RTCSessionDescription description) {
                 if (peerConnection == null) return;
-                NetherNetClientChannel.this.localUfrag = extractUfrag(description.sdp);
                 peerConnection.setLocalDescription(description, new SetSessionDescriptionObserver() {
                     @Override
                     public void onSuccess() {

transport-nethernet/src/main/java/dev/kastle/netty/channel/nethernet/NetherNetServerChannel.java

@@ -77,6 +77,7 @@ protected void doBind(SocketAddress localAddress) throws Exception {
 
     public void acceptConnection(long connectionId, String offerSdp, String remoteNetworkId) {
         RTCConfiguration rtcConfig = new RTCConfiguration();
+        rtcConfig.portAllocatorConfig = this.config.getOption(NetherChannelOption.NETHER_PORT_ALLOCATOR_CONFIG);
         rtcConfig.bundlePolicy = RTCBundlePolicy.MAX_BUNDLE;
 
         // Inject ICE servers if the signaling implementation supports it

transport-nethernet/src/main/java/dev/kastle/netty/channel/nethernet/config/DefaultNetherChannelConfig.java

@@ -1,5 +1,6 @@
 package dev.kastle.netty.channel.nethernet.config;
 
+import dev.kastle.webrtc.PortAllocatorConfig;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.DefaultChannelConfig;
@@ -10,25 +11,56 @@
 public class DefaultNetherChannelConfig extends DefaultChannelConfig {
     private final Map<ChannelOption<?>, Object> options = new ConcurrentHashMap<>();
 
+    private volatile PortAllocatorConfig portAllocatorConfig = new PortAllocatorConfig()
+        .setDisableTcp(true)
+        .setEnableIpv6(true)
+        .setEnableIpv6OnWifi(true)
+        .setEnableAnyAddressPorts(true)
+        .setDisableAdapterEnumeration(false)
+        .setEnableSharedSocket(true)
+        .setEnableAnyAddressPorts(true)
+        .setDisableCostlyNetworks(true)
+        .setDisableLinkLocalNetworks(true);
+
     public DefaultNetherChannelConfig(Channel channel) {
         super(channel);
     }
 
+    @Override
+    public Map<ChannelOption<?>, Object> getOptions() {
+        return this.getOptions(
+                super.getOptions(), 
+                NetherChannelOption.NETHER_PORT_ALLOCATOR_CONFIG
+        );
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public <T> T getOption(ChannelOption<T> option) {
-        if (options.containsKey(option)) {
+
+        if (option == NetherChannelOption.NETHER_PORT_ALLOCATOR_CONFIG) {
+            return (T) this.portAllocatorConfig;
+        } else if (options.containsKey(option)) {
             return (T) options.get(option);
         }
+
         return super.getOption(option);
     }
 
     @Override
     public <T> boolean setOption(ChannelOption<T> option, T value) {
-        if (super.setOption(option, value)) {
+        if (option == NetherChannelOption.NETHER_PORT_ALLOCATOR_CONFIG) {
+            this.setPortAllocatorConfig((PortAllocatorConfig) value);
+            return true;
+        } else if (super.setOption(option, value)) {
+            return true;
+        } else {
+            options.put(option, value);
             return true;
         }
-        options.put(option, value);
-        return true;
+    }
+
+    void setPortAllocatorConfig(PortAllocatorConfig portAllocatorConfig) {
+        this.portAllocatorConfig = portAllocatorConfig;
     }
 }

transport-nethernet/src/main/java/dev/kastle/netty/channel/nethernet/config/NetherChannelOption.java

@@ -1,9 +1,16 @@
 package dev.kastle.netty.channel.nethernet.config;
 
+import dev.kastle.webrtc.PortAllocatorConfig;
 import io.netty.channel.ChannelOption;
 
 public class NetherChannelOption<T> extends ChannelOption<T> {
 
+    /**
+     * The PortAllocatorConfig used for WebRTC connections.
+     */
+    public static final ChannelOption<PortAllocatorConfig> NETHER_PORT_ALLOCATOR_CONFIG =
+            valueOf(NetherChannelOption.class, "NETHER_PORT_ALLOCATOR_CONFIG");
+
     /**
      * The timeout in seconds for completing the WebRTC handshake on the client before retrying.
      */

transport-nethernet/src/main/java/dev/kastle/netty/channel/nethernet/signaling/NetherNetXboxSignaling.java

@@ -231,6 +231,7 @@ private void handleNotFound(JsonObject json, String rawText) {
     }
 
     private void handleSignal(JsonObject json) {
+        log.trace("Received Signal: {}", json.toString());
         String sender = json.has("From") ? json.get("From").getAsString() : "0";
         if (!json.has("Message")) {
             log.warn("Received SIGNAL (1) without Message payload.");