From e78d5e444c7f6a839a6a74fe6eb0f974766cc492 Mon Sep 17 00:00:00 2001
From: Metatheria <farina@etud.insa-toulouse.fr>
Date: Mon, 11 Jan 2021 18:12:34 +0100
Subject: [PATCH] WIP1

---
 src/chat/NetworkClient.java | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/chat/NetworkClient.java b/src/chat/NetworkClient.java
index 0c9df04..86273b0 100644
--- a/src/chat/NetworkClient.java
+++ b/src/chat/NetworkClient.java
@@ -78,6 +78,9 @@ class ReceiveThread extends Thread {
 				try
 				{
 					link = servSocket.accept();
+					ReceiveThread next = new ReceiveThread(port+1, displayArea, known_users, knownUsersPanel);
+					next.start();
+					
 					connected = true;
 	
 			        while(!exit)
@@ -119,7 +122,7 @@ class ReceiveThread extends Thread {
 	    }
 	    catch(IOException e)
 	    {
-	    	System.out.println("nik2 !");
+	    	e.printStackTrace();
 	    }
 	}
 }
@@ -174,7 +177,7 @@ class ConnectionListenerThread extends Thread {
 					response += ";";
 					for(Socket s:dest_sockets)
 					{
-						response += s.getInetAddress() + " ";
+						response += s.getInetAddress().getHostAddress() + " ";
 					}
 					System.out.println("Response :" + response);
 					responseBytes = response.getBytes();
@@ -188,9 +191,6 @@ class ConnectionListenerThread extends Thread {
 					}
 					if(accepted)
 					{
-						ReceiveThread next = new ReceiveThread(1237, displayArea, known_users, knownUsersPanel);
-						next.start();
-						
 						known_users.add(new User(username));
 						
 						Collections.sort(known_users);
@@ -204,10 +204,6 @@ class ConnectionListenerThread extends Thread {
 			            	knownUsersPanel.append(" " + a.getName() + "  \n");
 			            }
 					}	
-					else
-					{
-						System.out.println("Username already taken");
-					}
 				}
 				catch(SocketTimeoutException e) {}
 	    	}
@@ -304,7 +300,7 @@ public class NetworkClient {
                 	}
             		for(String a:addressList)
                 	{
-                		dest_sockets.add(new Socket(a, 1237));
+                		dest_sockets.add(new Socket(a, 1237+(known_users.size())));
                 	}
 					Collections.sort(known_users);
             		connected = true;
@@ -331,9 +327,7 @@ public class NetworkClient {
       
       if(connected)
       {
-    	  user.setName(username);
-          known_users.add(new User(username));
-          ReceiveThread t2 = new ReceiveThread(1237, chatText, known_users, knownUsersPanel);
+          ReceiveThread t2 = new ReceiveThread(1237+(known_users.size()), chatText, known_users, knownUsersPanel);
           ConnectionListenerThread t3 = new ConnectionListenerThread(known_users, dest_sockets, chatText, knownUsersPanel);
           
           t2.start();
@@ -341,10 +335,13 @@ public class NetworkClient {
           
           try
           {
-        	  dest_sockets.add(new Socket("25.67.234.235", 1237));
+        	  dest_sockets.add(new Socket("25.67.234.235", 1237+(known_users.size())));
           }
           catch(IOException e){}
           
+          user.setName(username);
+          known_users.add(new User(username));
+          
           chatText.append(username + " has joined the chat.\n");
           chatText.setCaretPosition(chatText.getDocument().getLength());