Merge branch 'master' into gossip-girl-2

1 files changed, 8 insertions, 28 deletions

diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUP.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUP.java
index 8c6db8f..501c76e 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUP.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/UDUP.java
@@ -23,30 +23,19 @@ import java.util.concurrent.atomic.AtomicBoolean;
  *  due to ValueContact design
  */
 
-// TODO set server port in global config - must be the same everywhere
-// TODO same with buffer size
-
-// TODO separate server like newapiimpl
-// TODO add timestamps as close to sending as possible
-
-// TODO wysylac tylko remotegossipgirl message
-// TODO update timestampow odpowiedni w tym remotegossipgirlmessage
-
-public class UDUP extends Module implements Runnable {
+public class UDUP extends Module {
     private UDUPClient client;
     private UDUPServer server;
-    private final AtomicBoolean running;
 
-    public UDUP(InetAddress serverAddr,
-                int serverPort,
+    public UDUP(int serverPort,
                 int timeout,
-                int bufferSize) {
+                int bufferSize,
+                UDUPServer server) {
         super(ModuleType.UDP);
-        this.running = new AtomicBoolean(false);
         try {
             this.client = new UDUPClient(this, serverPort, bufferSize);
-            this.server = new UDUPServer(this, serverAddr, serverPort, bufferSize);
-            this.running.getAndSet(true);
+            this.server = server;
+            this.server.setUDUP(this);
         } catch (SocketException e) {
             e.printStackTrace();
             this.client.close();
@@ -54,17 +43,8 @@ public class UDUP extends Module implements Runnable {
         }
     }
 
-    public void run() {
-        System.out.println("UDP server running");
-        while(this.running.get()) {
-            try {
-                this.server.acceptMessage();
-            } catch (IOException | InterruptedException e) {
-                e.printStackTrace();
-                this.running.getAndSet(false);
-                this.server.close();
-            }
-        }
+    public UDUPServer getServer() {
+        return this.server;
     }
 
     public void handleTyped(UDUPMessage event) throws InterruptedException {