Code rework v2

Author: GodFuper

ice-adapter/src/main/java/com/faforever/iceadapter/ice/peer/Peer.java

@@ -38,7 +38,7 @@ public class Peer {
     private final boolean localOffer; // Do we offer or are we waiting for a remote offer
     private final int preferredPort;
     private final int lobbyPort;
-    private Integer localPort;
+
     private boolean allowHost = true;
     private boolean allowReflexive = true;
     private boolean allowRelay = true;
@@ -51,7 +51,7 @@ public class Peer {
 
     public volatile boolean closing = false;
 
-    private DatagramSocket faSocket;
+    private volatile DatagramSocket faSocket;
 
     private volatile KeepAliveStrategy keepAliveStrategy;
     private volatile Agent agent;
@@ -70,6 +70,10 @@ public class Peer {
     // Future handle for the FA listener task so we can cancel it cleanly
     private volatile CompletableFuture<Void> faListenerFuture;
 
+    public Integer getLocalPort() {
+        return faSocket != null ? faSocket.getLocalPort() : 0;
+    }
+
     public void initModules(IceAsync iceAsync) {
         for (PeerModule module : PeerModule.getSortedModules()) {
             modules.putIfAbsent(module, module.createModule(new Pair<>(this, iceAsync)));

ice-adapter/src/main/java/com/faforever/iceadapter/ice/peer/modules/FASocketModule.java

@@ -4,7 +4,6 @@
 import com.faforever.iceadapter.ice.peer.Peer;
 import com.faforever.iceadapter.util.DatagramSocketUtils;
 import com.faforever.iceadapter.util.LockUtil;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -18,8 +17,6 @@ public class FASocketModule implements ModuleBase {
     private static final String LOCK_MODULE = "FASocketModule";
 
     private final Peer peer;
-    @Getter
-    private DatagramSocket socket;
 
     @Override
     public void start() {
@@ -39,7 +36,6 @@ private DatagramSocket initForwarding(int port, Integer localPort) {
             }
             DatagramSocket socket = new DatagramSocket(port);
             DatagramSocketUtils.resizeBuffer(socket);
-            peer.setLocalPort(socket.getLocalPort());
             log.debug("Now forwarding data to peer {} on port {}", peer.getPeerIdentifier(), peer.getLocalPort());
             return socket;
         } catch (SocketException e) {
@@ -52,18 +48,21 @@ private void checkSocket() {
         if (peer.isClosing()) {
             return;
         }
+        DatagramSocket socket = peer.getFaSocket();
         if (socket == null || socket.isClosed()) {
             log.error("Socket {} is null or closed", peer.getPeerIdentifier());
             try {
                 log.warn("Trying to connect to FA for {}", peer.getPeerIdentifier());
                 socket = initForwarding(peer.getPreferredPort(), peer.getLocalPort());
+                peer.setFaSocket(socket);
             } catch (Exception e) {
                 log.error("Could not connect to FA for {}", peer.getPeerIdentifier(), e);
             }
         }
     }
 
     private void stopSocket() {
+        DatagramSocket socket = peer.getFaSocket();
         if (peer.isClosing() && socket != null && !socket.isClosed()) {
             socket.close();
             socket = null;

ice-adapter/src/main/java/com/faforever/iceadapter/ice/peer/modules/FaToPeerModule.java

@@ -2,7 +2,6 @@
 
 import com.faforever.iceadapter.ice.ModuleBase;
 import com.faforever.iceadapter.ice.peer.Peer;
-import com.faforever.iceadapter.ice.peer.PeerModule;
 import com.faforever.iceadapter.util.LockUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -11,7 +10,6 @@
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.SocketException;
-import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -58,13 +56,14 @@ private void stopListeners() {
      * This method get's invoked by the thread listening for data from FA
      */
     private void faListener() {
-        Optional<FASocketModule> socketModule = peer.getModule(PeerModule.FA_SOCKET_MODULE, FASocketModule.class);
-        DatagramSocket socket = socketModule.map(FASocketModule::getSocket).orElse(null);
+
         isRunning = true;
         while (!peer.isClosing()) {
+            DatagramSocket socket = peer.getFaSocket();
             if (socket != null) {
                 receiveCatch(socket);
             } else {
+                log.error("Socket is null. Receive from FA skipped");
                 break;
             }
         }

ice-adapter/src/main/java/com/faforever/iceadapter/ice/peer/modules/PeerToFaModule.java

@@ -3,7 +3,6 @@
 import com.faforever.iceadapter.ice.ModuleBase;
 import com.faforever.iceadapter.ice.PeerEventListener;
 import com.faforever.iceadapter.ice.peer.Peer;
-import com.faforever.iceadapter.ice.peer.PeerModule;
 import com.faforever.iceadapter.util.LockUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +12,6 @@
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.Optional;
 
 import static com.faforever.iceadapter.ice.peer.modules.FaToPeerModule.COMMAND_FA;
 
@@ -55,15 +53,17 @@ public void onIceDataReceived(Peer peer, byte[] data, int offset, int length) {
         }
 
         if (data[0] == COMMAND_FA) {
-            getSocketAndTrySend(data, offset, length);
+            getSocketAndTrySend(data, 1, length - 1);
         }
     }
 
     private void getSocketAndTrySend(byte[] data, int offset, int length) {
-        Optional<FASocketModule> socketModule = peer.getModule(PeerModule.FA_SOCKET_MODULE, FASocketModule.class);
-        socketModule.map(FASocketModule::getSocket).ifPresent(socket -> {
-            lockAndSend(socket, data, offset, length);
-        });
+        DatagramSocket socket = peer.getFaSocket();
+        if (socket == null) {
+            log.error("Socket is null. Send to FA skipped");
+            return;
+        }
+        lockAndSend(socket, data, offset, length);
     }
 
     private void lockAndSend(DatagramSocket socket, byte[] data, int offset, int length) {

ice-adapter/src/main/java/com/faforever/iceadapter/services/impl/ConnectServiceCommon.java

@@ -12,7 +12,10 @@
 import com.faforever.iceadapter.util.LockUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.ice4j.ice.*;
+import org.ice4j.ice.Agent;
+import org.ice4j.ice.Component;
+import org.ice4j.ice.IceMediaStream;
+import org.ice4j.ice.KeepAliveStrategy;
 import org.ice4j.ice.harvest.StunCandidateHarvester;
 import org.ice4j.ice.harvest.TurnCandidateHarvester;
 import org.ice4j.security.LongTermCredential;
@@ -76,7 +79,6 @@ protected void createAgent(Peer peer) {
         Agent agent = new Agent();
         agent.setControlling(peer.isLocalOffer());
 
-        agent.setNominationStrategy(NominationStrategy.NOMINATE_FIRST_HOST_OR_REFLEXIVE_VALID);
         peer.setAgent(agent);
         peer.setMediaStream(agent.createMediaStream(FAF_MEDIA_STREAM));
     }