code/server/Server/PongServer.cs

@@ -84,7 +84,7 @@ public class PongServer
         UdpClient clientSocket = new UdpClient(clientEndPoint);
 
         room.playerHost = new KeyValuePair<Player,UdpClient>(data.Data,clientSocket);
-        room.NbPlayer++;
+        room.nbPlayer++;
 
         
 
@@ -96,7 +96,7 @@ public class PongServer
 
         
 
-        // Send port message to client
+        // Send connection message to client
         byte[] connectionData = Encoding.ASCII.GetBytes(nextPort.ToString());
         serverSocket.Send(connectionData, connectionData.Length, remoteEndPoint);
 
@@ -114,17 +114,14 @@ public class PongServer
         UdpClient clientSocket = new UdpClient(clientEndPoint);
 
         room.playerJoin = new KeyValuePair<Player, UdpClient>(data.Data, clientSocket);
-        room.NbPlayer++;
-
+        room.nbPlayer++;
 
+        room.PropertyChanged += room.OnReadyChanged;
 
         Console.WriteLine("New connection Client from " + remoteEndPoint.ToString());
 
-        // Send port message to client
-        byte[] connectionData = Encoding.ASCII.GetBytes(nextPort.ToString());
-        serverSocket.Send(connectionData, connectionData.Length, remoteEndPoint);
-
-        room.PropertyChanged += room.OnReadyChanged;
+        room.Port = nextPort;
+        nextPort++;
 
 
     }

code/server/Server/Room.cs

@@ -31,22 +31,20 @@ namespace Server
         public int Port { get; set; }
 
 
-        public int NbPlayer
-        {
-            get
+        public int nbPlayer = 0;
+
+        public bool maxPlayer
         {
-                return nbPlayer;
-            }
+            get { return nbPlayer >= 2; }
             set
             {
-                nbPlayer = value;
-                if (value >= 2)
+                if (nbPlayer >= 2)
                 {
-                    NotifyPropertyChanged("nbPlayer");
+                    maxPlayer = true;
+                    NotifyPropertyChanged("Ready");
                 }
             }
         }
-        private int nbPlayer;
 
         
         protected void NotifyPropertyChanged(string propertyName)
@@ -64,6 +62,10 @@ namespace Server
             {
                 byte[] receivedData = clientSocket1.Receive(ref remoteEndPoint);
 
+                string receivedMessage = Encoding.ASCII.GetString(receivedData);
+                Console.WriteLine("Received from " + remoteEndPoint.ToString() + ": " + receivedMessage);
+
+
                 clientSocket2.Send(receivedData, receivedData.Length, remoteEndPoint);
 
             }
@@ -73,13 +75,12 @@ namespace Server
         {
 
             Room nbPlayer = sender as Room;
-            int maxPlayer = nbPlayer.nbPlayer;
-
-            //IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Any, Port);
-            //UdpClient serverSocket = new UdpClient(serverEndPoint);
+            bool maxPlayer = nbPlayer.maxPlayer;
 
+            IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Any, Port);
+            UdpClient serverSocket = new UdpClient(serverEndPoint);
 
-            if (maxPlayer == 2)
+            if (maxPlayer)
             {
 
                 Thread receiveThread1 = new Thread(() => ReceiveMessages(playerHost.Value, playerJoin.Value));