refactor: server

app/build.gradle

@@ -46,7 +46,7 @@ task runServer(type: JavaExec) {
     group = 'application'
     mainClass = application.mainClass
     classpath = sourceSets.main.runtimeClasspath
-    args = ['server']
+    args = ['--server']
 }
 
 task runClient(type: JavaExec) {
@@ -54,5 +54,5 @@ task runClient(type: JavaExec) {
     group = 'application'
     mainClass = application.mainClass
     classpath = sourceSets.main.runtimeClasspath
-    args = ['client']
+    args = ['--client']
 }

app/src/main/java/clientserver/App.java

@@ -10,28 +10,48 @@ public class App {
     }
 
     public static void main(String[] args) {
-        if (args.length == 0) {
+        String mode = null;
-            System.out.println(
+
-                "Please use --args='client' or --args='server'."
+        // Parse arguments
-            );
+        for (String arg : args) {
+            switch (arg.toLowerCase()) {
+                case "--client":
+                    mode = "client";
+                    break;
+                case "--server":
+                    mode = "server";
+                    break;
+                default:
+                    System.out.println("Unknown argument: " + arg);
+                    printUsage();
+                    return;
+            }
+        }
+
+        // Check if mode is specified
+        if (mode == null) {
+            System.out.println("No mode specified.");
+            printUsage();
             return;
         }
 
-        String mode = args[0];
+        // Execute based on mode
-
+        switch (mode) {
-        switch (mode.toLowerCase()) {
             case "client":
-                // Run the client
                 System.out.println("Starting client...");
                 Client.main(new String[] {});
                 break;
             case "server":
-                // Run the server
                 System.out.println("Starting server...");
                 Server.run();
                 break;
-            default:
-                System.out.println("Unknown mode: " + mode);
         }
     }
+
+    private static void printUsage() {
+        System.out.println("Usage: ./gradlew run --args='option'");
+        System.out.println("Options:");
+        System.out.println("  --client         Run in client mode");
+        System.out.println("  --server         Run in server mode");
+    }
 }

app/src/main/java/clientserver/client/Client.java

@@ -9,12 +9,16 @@ public class Client {
     InetAddress clientAddress;
     int clientPort;
 
-    public InetAddress getClientAddress() {
+    public void setPort(int port) {
-        return clientAddress;
+        this.clientPort = port;
     }
 
-    public int getClientPort() {
+    public int getPort() {
-        return clientPort;
+        return this.clientPort;
+    }
+
+    public InetAddress getAddress() {
+        return this.clientAddress;
     }
 
     public Client(InetAddress address, int port) {

app/src/main/java/clientserver/server/Server.java

@@ -31,6 +31,17 @@ public class Server {
         return socket;
     }
 
+    private DatagramSocket getNewSocket() {
+        DatagramSocket socket = null;
+        try {
+            socket = new DatagramSocket(); // Reserve a random port
+        } catch (Exception e) {
+            System.err.println("Failed to bind server socket");
+            e.printStackTrace();
+        }
+        return socket;
+    }
+
     private DatagramPacket read(DatagramSocket socket) {
         byte[] receivedData = new byte[1024];
         DatagramPacket receivedPacket = new DatagramPacket(
@@ -50,42 +61,32 @@ public class Server {
         return new Client(packet.getAddress(), packet.getPort());
     }
 
-    // public void test(String[] args) {
+    private void attributeNewPort(Client client) {
-    //     while (mainServerPortListening) {
+        DatagramSocket newSocket = getNewSocket();
-    //         try {
+        int port = newSocket.getLocalPort();
-    //             DatagramSocket socket = new DatagramSocket(); // Reserve new port
+        String response = "PORT:" + port;
+        client.setPort(port);
 
-    //             String response = "PORT:" + socket.getLocalPort();
+        byte[] sendData;
-    //             System.out.println(response);
+        sendData = response.getBytes();
-    //             byte[] envoyees; // tampon d'émission
+        DatagramPacket packetToSend = new DatagramPacket(
-    //             envoyees = response.getBytes();
+            sendData,
-    //             DatagramPacket packetToSend = new DatagramPacket(
+            sendData.length,
-    //                 envoyees,
+            client.getAddress(),
-    //                 envoyees.length,
+            port
-    //                 clientAddress,
+        );
-    //                 clientPort
+        try {
-    //             );
+            this.mainServerSocket.send(packetToSend);
-    //             mainServerSocket.send(packetToSend);
+        } catch (IOException e) {
-    //             Thread thread = new Thread(() -> createThread(socket));
+            e.printStackTrace();
-    //             thread.start();
+        }
-    //         } catch (Exception e) {
+    }
-    //             System.err.println(e);
-    //         }
-    //     }
-
-    //     mainServerSocket.close();
-    // }
 
     public static void run() {
         System.out.println("Server started");
         Server server = new Server();
         DatagramPacket packet = server.read(server.mainServerSocket);
         Client client = server.getClient(packet);
-        System.out.println(
+        server.attributeNewPort(client);
-            "Client: " +
-            client.getClientAddress() +
-            ":" +
-            client.getClientPort()
-        );
     }
 }