Explorar el Código

fixed unreacheable code plus depricated code

Bart Reedijk hace 10 años
padre
commit
8c8930a1ed

+ 12 - 11
Proftaak Remote Healthcare/Server/Client.cs

@@ -27,7 +27,7 @@ namespace Server
         public Client(TcpClient socket)
         {
             client = socket;
-            
+
             sslStream = new SslStream(client.GetStream());
             try
             {
@@ -39,24 +39,24 @@ namespace Server
                 Console.WriteLine(e.StackTrace);
                 Stop();
             }
-            
+
             _global = AppGlobal.Instance;
             iduser = -1;
             Console.WriteLine("New client connected");
-            _workerThread = new Thread(recieve);
+            _workerThread = new Thread(receive);
             _workerThread.Start();
         }
 
-        public void recieve()
+        public void receive()
         {
             while (!(client.Client.Poll(0, SelectMode.SelectRead) && client.Client.Available == 0))
             {
                 byte[] bytesFrom = new byte[(int)client.ReceiveBufferSize];
-		try
-		{
-		    sslStream.Read(bytesFrom, 0, (int)client.ReceiveBufferSize);
-                } 
-		catch (Exception e)
+                try
+                {
+                    sslStream.Read(bytesFrom, 0, (int)client.ReceiveBufferSize);
+                }
+                catch (Exception e)
                 {
                     Console.WriteLine("Exception occured while trying to get data from client. Disconnecting...");
                     Console.WriteLine(e.StackTrace);
@@ -85,7 +85,7 @@ namespace Server
                                     else
                                     {
                                         sendString("0|1|0|");   //Patient
-                                    }  
+                                    }
                                 }
                                 else
                                 {
@@ -151,7 +151,8 @@ namespace Server
                                     if (!(activePatients.Count > 0))
                                     {
                                         strToSend += "-1";
-                                    } else
+                                    }
+                                    else
                                     {
                                         foreach (string patient in _global.GetActivePatients())
                                         {

+ 12 - 1
Proftaak Remote Healthcare/Server/Program.cs

@@ -13,7 +13,14 @@ namespace Server
     {
         public static List<Client> Clients { get; private set; } = new List<Client>();
 
+        TcpListener serverSocket;
+
         static void Main(string[] args)
+        {
+            new Program();
+        }
+
+        Program()
         {
             Console.WriteLine("Server gestart");
 
@@ -22,7 +29,7 @@ namespace Server
             // zorg dat de certificaat bestaat
             lib.SSLCrypto.CreateSelfSignedCert();
 
-            TcpListener serverSocket = new TcpListener(1288);
+            serverSocket = new TcpListener(IPAddress.Any, 1288);
             serverSocket.Start();
 
             while (true)
@@ -31,6 +38,10 @@ namespace Server
                 Clients.Add(new Client(serverSocket.AcceptTcpClient()));
             }
 
+        }
+
+        ~Program()
+        {
             serverSocket.Stop();
             Console.WriteLine("Server afsluiten");
         }