From 18370419969b29164b20f065059d7b8640972738 Mon Sep 17 00:00:00 2001
From: Xeon0X <xeon0x.gaming@gmail.com>
Date: Tue, 1 Apr 2025 00:14:28 +0200
Subject: [PATCH] fix: names and prints

---
 .../main/java/clientserver/client/Client.java | 46 +++++++++----------
 .../clientserver/server/ClientHandler.java    |  2 +-
 .../main/java/clientserver/server/Server.java | 17 +++++--
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/clientserver/client/Client.java b/app/src/main/java/clientserver/client/Client.java
index c8cce17..05f65d2 100644
--- a/app/src/main/java/clientserver/client/Client.java
+++ b/app/src/main/java/clientserver/client/Client.java
@@ -3,7 +3,6 @@ package clientserver.client;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
-import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
 public class Client {
@@ -32,50 +31,51 @@ public class Client {
         try {
             // 1 - Création du canal avec un port libre
             DatagramSocket socketClient = new DatagramSocket();
-            InetAddress adresseServeur = InetAddress.getByName("localhost");
-            int portServeur = 6666;
+            InetAddress serverAddress = InetAddress.getByName("localhost");
+            int serverPort = 6666;
 
             // 2 - Envoyer un message au serveur
-            String message = "Hello Server";
-            byte[] envoyees = message.getBytes();
-            DatagramPacket paquetEnvoye = new DatagramPacket(
-                envoyees,
-                envoyees.length,
-                adresseServeur,
-                portServeur
+            String message = "Connection request";
+            byte[] sendData = message.getBytes();
+            DatagramPacket sendPacket = new DatagramPacket(
+                sendData,
+                sendData.length,
+                serverAddress,
+                serverPort
             );
-            socketClient.send(paquetEnvoye);
-            System.out.println("Message envoyé au serveur");
+            socketClient.send(sendPacket);
+            System.out.println("New connection request sent");
 
             // 3 - Recevoir
-            byte[] recues = new byte[1024]; // tampon de réception
-            DatagramPacket paquetRecu = new DatagramPacket(
-                recues,
-                recues.length
+            byte[] receivedData = new byte[1024]; // tampon de réception
+            DatagramPacket receivedPacket = new DatagramPacket(
+                receivedData,
+                receivedData.length
             );
-            socketClient.receive(paquetRecu);
+            socketClient.receive(receivedPacket);
             String reponse = new String(
-                paquetRecu.getData(),
+                receivedPacket.getData(),
                 0,
-                paquetRecu.getLength()
+                receivedPacket.getLength()
             );
 
             if (reponse.startsWith("PORT:")) {
                 int newPort = Integer.parseInt(reponse.substring(5));
 
-                System.out.println("Connexion au nouveau port: " + newPort);
+                System.out.println("Connected on port:" + newPort);
 
                 // 4 - Communiquer sur le nouveau port
-                for (int i = 0; i < 5; i++) {
-                    String messagePort = "Message au nouveau port";
+                for (int i = 0; i < 20; i++) {
+                    String messagePort = "Test";
                     byte[] envoyeesPort = messagePort.getBytes();
                     DatagramPacket paquetPort = new DatagramPacket(
                         envoyeesPort,
                         envoyeesPort.length,
-                        adresseServeur,
+                        serverAddress,
                         newPort
                     );
                     socketClient.send(paquetPort);
+                    System.out.println("Test sent");
                     TimeUnit.SECONDS.sleep(1);
                 }
             }
diff --git a/app/src/main/java/clientserver/server/ClientHandler.java b/app/src/main/java/clientserver/server/ClientHandler.java
index 1d4eca6..7d959a1 100644
--- a/app/src/main/java/clientserver/server/ClientHandler.java
+++ b/app/src/main/java/clientserver/server/ClientHandler.java
@@ -38,7 +38,7 @@ public class ClientHandler implements Runnable {
         // }
 
         while (running && !socket.isClosed()) {
-            DatagramPacket packet = Server.receivePacket(socket);
+            DatagramPacket packet = Server.receivedPacket(socket);
             if (packet == null) continue;
 
             String message = new String(
diff --git a/app/src/main/java/clientserver/server/Server.java b/app/src/main/java/clientserver/server/Server.java
index 171426d..ef2f21d 100644
--- a/app/src/main/java/clientserver/server/Server.java
+++ b/app/src/main/java/clientserver/server/Server.java
@@ -27,7 +27,7 @@ public class Server {
         }
     }
 
-    private DatagramSocket getNewSocket() {
+    private DatagramSocket createNewSocket() {
         try {
             return new DatagramSocket(); // Reserve a random port
         } catch (Exception e) {
@@ -37,7 +37,7 @@ public class Server {
         }
     }
 
-    public static DatagramPacket receivePacket(DatagramSocket socket) {
+    public static DatagramPacket receivedPacket(DatagramSocket socket) {
         byte[] receivedData = new byte[1024];
         DatagramPacket receivedPacket = new DatagramPacket(
             receivedData,
@@ -77,7 +77,7 @@ public class Server {
     }
 
     private void handleNewConnection() {
-        DatagramPacket packet = receivePacket(mainServerSocket);
+        DatagramPacket packet = receivedPacket(mainServerSocket);
         if (packet == null) return;
 
         Client client = new Client(packet.getAddress(), packet.getPort());
@@ -92,10 +92,17 @@ public class Server {
 
         // Process the received message
         String message = new String(packet.getData(), 0, packet.getLength());
-        System.out.println("Received message: " + message);
+        System.out.println(
+            "Received message from " +
+            client.getAddress() +
+            ":" +
+            client.getPort() +
+            ": " +
+            message
+        );
 
         // Create a new socket for this client
-        DatagramSocket clientSocket = getNewSocket();
+        DatagramSocket clientSocket = createNewSocket();
         if (clientSocket == null) return;
 
         int newPort = clientSocket.getLocalPort();