Merge branch 'feature_server_social'

[WeStealzYourDataz.git] / src / uk / ac / ntu / n0521366 / wsyd / server / ServerSocial.java

diff --git a/src/uk/ac/ntu/n0521366/wsyd/server/ServerSocial.java b/src/uk/ac/ntu/n0521366/wsyd/server/ServerSocial.java
index caa65b4..45c5412 100644 (file)
--- a/src/uk/ac/ntu/n0521366/wsyd/server/ServerSocial.java
+++ b/src/uk/ac/ntu/n0521366/wsyd/server/ServerSocial.java
@@ -68,7 +68,11 @@ import uk.ac.ntu.n0521366.wsyd.libs.net.NetworkMessageEvent;
 import uk.ac.ntu.n0521366.wsyd.libs.net.NetworkServerUDPMulticast;
 import uk.ac.ntu.n0521366.wsyd.libs.net.WSYD_SocketAddress;
 import uk.ac.ntu.n0521366.wsyd.libs.net.NetworkMessageEventListener;
+import uk.ac.ntu.n0521366.wsyd.libs.net.NetworkServerTCP;
 import uk.ac.ntu.n0521366.wsyd.libs.net.NetworkServerUDP;
+import uk.ac.ntu.n0521366.wsyd.libs.net.NetworkSocketClosing;
+import uk.ac.ntu.n0521366.wsyd.libs.net.NetworkStream;
+import uk.ac.ntu.n0521366.wsyd.libs.net.NetworkStreamManager;
 import uk.ac.ntu.n0521366.wsyd.libs.net.ServiceAddressMap;
 import uk.ac.ntu.n0521366.wsyd.libs.net.ServiceAddressMap.LastSeenHost;
 
@@ -149,18 +153,30 @@ public final class ServerSocial implements NetworkMessageEventListener, Connecti
     WSYD_SocketAddress _udpControlServiceSA;
     
     NetworkServerUDP _udpControlService;
+    
+    WSYD_SocketAddress _tcpListeningServiceSA;
+    
+    NetworkServerTCP _tcpListeningService;
+    
+    NetworkStreamManager _tcpStreamManager;
    
 
     /**
+     * 
      * Default constructor.
      */
     public ServerSocial() {
         String[] className = this.getClass().getName().split("\\.");
         LOGGER = Logger.getLogger(className[className.length - 1]);
         LOGGER.setLevel(Level.ALL);
+        if (LOGGER.getParent() != null) {
+            LOGGER.getParent().setLevel(Level.ALL);
+            System.out.println("Parent Logger level " + LOGGER.getParent().getLevel().toString());
+        }
         _serviceToAddressMap = new ServiceAddressMap(_title, LOGGER);
         readMembers(_membersFile);
         _membersOnline = new ArrayList<>();
+        _tcpStreamManager = new NetworkStreamManager();
     }
     
     /**
@@ -252,14 +268,7 @@ public final class ServerSocial implements NetworkMessageEventListener, Connecti
             if (loopCount-- == 0)
                 ServerSocial.exitRequested = true;
         }
-        /*try
-        {
-            _multicastServer.serverClose();
-        }
-        catch (SocketException e)
-        {
-            //TODO: Do something
-        }*/
+
         _servicesAnnounce.stop();
         _multicastService.cancel(true);
         _udpControlService.cancel(true);