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 {
 
 privatevolatileScheduledFuture<?> handshakeTimeoutTask;
 
-privatevolatileStringlocalUfrag;
-
 privateintretryCount = 0;
 
 /**
@@ -204,6 +202,7 @@ private void resetAndRetryHandshake() {
 
 privatevoidinitWebRTC(List<NetherNetSignaling.IceServerInfo> iceServers) {
 RTCConfigurationrtcConfig = newRTCConfiguration();
+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, newPeerConnectionObserver() {
 @Override
 publicvoidonIceCandidate(RTCIceCandidatecandidate) {
-// 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;
- }
-
-Stringsdp = candidate.sdp.trim();
-
-// Format: <StandardSDP> ufrag <LocalUfrag> network-id <LocalNetworkID> network-cost 0
-StringBuildersb = newStringBuilder(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 (Exceptione) {
 log.error("Failed to send ICE candidate", e);
@@ -261,29 +246,12 @@ public void onConnectionChange(RTCPeerConnectionState state) {
 setupDataChannels();
  }
 
-privateStringextractUfrag(Stringsdp) {
-if (sdp == null) return"";
-for (Stringline : sdp.split("\\r?\\n")) {
-line = line.trim();
-if (line.startsWith("a=ice-ufrag:")) {
-returnline.substring("a=ice-ufrag:".length()).trim();
- }
-// Some implementations might omit 'a='
-if (line.startsWith("ice-ufrag:")) {
-returnline.substring("ice-ufrag:".length()).trim();
- }
- }
-log.warn("Could not find ice-ufrag in local SDP!");
-return"";
- }
-
 privatevoidcreateAndSendOffer() {
 if (peerConnection == null) return;
 peerConnection.createOffer(newRTCOfferOptions(), newCreateSessionDescriptionObserver() {
 @Override
 publicvoidonSuccess(RTCSessionDescriptiondescription) {
 if (peerConnection == null) return;
-NetherNetClientChannel.this.localUfrag = extractUfrag(description.sdp);
 peerConnection.setLocalDescription(description, newSetSessionDescriptionObserver() {
 @Override
 publicvoidonSuccess() {

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

@@ -77,6 +77,7 @@ protected void doBind(SocketAddress localAddress) throws Exception {
 
 publicvoidacceptConnection(longconnectionId, StringofferSdp, StringremoteNetworkId) {
 RTCConfigurationrtcConfig = newRTCConfiguration();
+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 @@
 packagedev.kastle.netty.channel.nethernet.config;
 
+importdev.kastle.webrtc.PortAllocatorConfig;
 importio.netty.channel.Channel;
 importio.netty.channel.ChannelOption;
 importio.netty.channel.DefaultChannelConfig;
@@ -10,25 +11,56 @@
 publicclassDefaultNetherChannelConfigextendsDefaultChannelConfig {
 privatefinalMap<ChannelOption<?>, Object> options = newConcurrentHashMap<>();
 
+privatevolatilePortAllocatorConfigportAllocatorConfig = newPortAllocatorConfig()
+ .setDisableTcp(true)
+ .setEnableIpv6(true)
+ .setEnableIpv6OnWifi(true)
+ .setEnableAnyAddressPorts(true)
+ .setDisableAdapterEnumeration(false)
+ .setEnableSharedSocket(true)
+ .setEnableAnyAddressPorts(true)
+ .setDisableCostlyNetworks(true)
+ .setDisableLinkLocalNetworks(true);
+
 publicDefaultNetherChannelConfig(Channelchannel) {
 super(channel);
  }
 
+@Override
+publicMap<ChannelOption<?>, Object> getOptions() {
+returnthis.getOptions(
+super.getOptions(), 
+NetherChannelOption.NETHER_PORT_ALLOCATOR_CONFIG
+ );
+ }
+
 @SuppressWarnings("unchecked")
 @Override
 public <T> TgetOption(ChannelOption<T> option) {
-if (options.containsKey(option)) {
+
+if (option == NetherChannelOption.NETHER_PORT_ALLOCATOR_CONFIG) {
+return (T) this.portAllocatorConfig;
+ } elseif (options.containsKey(option)) {
 return (T) options.get(option);
  }
+
 returnsuper.getOption(option);
  }
 
 @Override
 public <T> booleansetOption(ChannelOption<T> option, Tvalue) {
-if (super.setOption(option, value)) {
+if (option == NetherChannelOption.NETHER_PORT_ALLOCATOR_CONFIG) {
+this.setPortAllocatorConfig((PortAllocatorConfig) value);
+returntrue;
+ } elseif (super.setOption(option, value)) {
+returntrue;
+ } else {
+options.put(option, value);
 returntrue;
  }
-options.put(option, value);
-returntrue;
+ }
+
+voidsetPortAllocatorConfig(PortAllocatorConfigportAllocatorConfig) {
+this.portAllocatorConfig = portAllocatorConfig;
  }
 }

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

@@ -1,9 +1,16 @@
 packagedev.kastle.netty.channel.nethernet.config;
 
+importdev.kastle.webrtc.PortAllocatorConfig;
 importio.netty.channel.ChannelOption;
 
 publicclassNetherChannelOption<T> extendsChannelOption<T> {
 
+/**
+ * The PortAllocatorConfig used for WebRTC connections.
+ */
+publicstaticfinalChannelOption<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) {
  }
 
 privatevoidhandleSignal(JsonObjectjson) {
+log.trace("Received Signal: {}", json.toString());
 Stringsender = json.has("From") ? json.get("From").getAsString() : "0";
 if (!json.has("Message")) {
 log.warn("Received SIGNAL (1) without Message payload.");