From 52b6850af3324e26b4cc0c50bd08a94bdcdbda1c Mon Sep 17 00:00:00 2001
From: Metatheria <farina@etud.insa-toulouse.fr>
Date: Tue, 12 Jan 2021 19:12:25 +0100
Subject: [PATCH] bugfixes TCP (5)

---
 src/chat/NetworkClient.java | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/chat/NetworkClient.java b/src/chat/NetworkClient.java
index 1b6cf5a..86c151d 100644
--- a/src/chat/NetworkClient.java
+++ b/src/chat/NetworkClient.java
@@ -165,6 +165,25 @@ class ConnectionListenerThread extends Thread {
 					InetAddress clientAddress= request.getAddress();
 					System.out.println("Received a request from " + username + "@" + clientAddress.getHostAddress());
 					
+					response = "";
+					for(User u:known_users)
+					{
+						response += u.getName() + " ";
+					}
+					response = response.trim();
+					response += ";";
+					for(Socket s:dest_sockets)
+					{
+						response += s.getInetAddress().getHostAddress() + " ";
+					}
+					response = response.trim();
+					response += ";" + (portNumber+1);
+					
+					System.out.println("Response :" + response);
+					responseBytes = response.getBytes();
+					responsePacket = new DatagramPacket(responseBytes, responseBytes.length, clientAddress, 1337);
+					responseSocket.send(responsePacket);
+					
 					accepted = true;
 					for(User a:known_users)
 					{
@@ -190,25 +209,6 @@ class ConnectionListenerThread extends Thread {
 			            }
 			            portNumber++;
 					}
-					response = "";
-					for(User u:known_users)
-					{
-						response += u.getName() + " ";
-					}
-					response = response.trim();
-					response += ";";
-					for(Socket s:dest_sockets)
-					{
-						response += s.getInetAddress().getHostAddress() + " ";
-					}
-					response = response.trim();
-					response += ";" + portNumber;
-					
-					System.out.println("Response :" + response);
-					responseBytes = response.getBytes();
-					responsePacket = new DatagramPacket(responseBytes, responseBytes.length, clientAddress, 1337);
-					responseSocket.send(responsePacket);
-					
 				}
 				catch(SocketTimeoutException e) {}
 	    	}
@@ -355,7 +355,7 @@ public class NetworkClient {
       if(connected)
       {
           
-          (new ConnectionListenerThread(user, known_users, dest_sockets, chatText, knownUsersPanel, portNumber)).start();
+          (new ConnectionListenerThread(user, known_users, dest_sockets, chatText, knownUsersPanel, 1234)).start();
           
           try
           {