Morph01/ClientServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: names and prints

Browse Source
This commit is contained in:
Xeon0X
2025-04-01 00:14:28 +02:00
parent 2459dca82e
commit 1837041996
3 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/clientserver/client/Client.java
View File

@@ -3,7 +3,6 @@ package clientserver.client;
import java.net.DatagramPacket; import java.net.DatagramPacket;
import java.net.DatagramSocket; import java.net.DatagramSocket;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.concurrent.Delayed;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class Client { public class Client {
@@ -32,50 +31,51 @@ public class Client {
try { try {
// 1 - Création du canal avec un port libre // 1 - Création du canal avec un port libre
DatagramSocket socketClient = new DatagramSocket(); DatagramSocket socketClient = new DatagramSocket();
InetAddress adresseServeur = InetAddress.getByName("localhost"); InetAddress serverAddress = InetAddress.getByName("localhost");
int portServeur = 6666; int serverPort = 6666;
// 2 - Envoyer un message au serveur // 2 - Envoyer un message au serveur
String message = "Hello Server"; String message = "Connection request";
byte[] envoyees = message.getBytes(); byte[] sendData = message.getBytes();
DatagramPacket paquetEnvoye = new DatagramPacket( DatagramPacket sendPacket = new DatagramPacket(
envoyees, sendData,
envoyees.length, sendData.length,
adresseServeur, serverAddress,
portServeur serverPort
); );
socketClient.send(paquetEnvoye); socketClient.send(sendPacket);
System.out.println("Message envoyé au serveur"); System.out.println("New connection request sent");
// 3 - Recevoir // 3 - Recevoir
byte[] recues = new byte[1024]; // tampon de réception byte[] receivedData = new byte[1024]; // tampon de réception
DatagramPacket paquetRecu = new DatagramPacket( DatagramPacket receivedPacket = new DatagramPacket(
recues, receivedData,
recues.length receivedData.length
); );
socketClient.receive(paquetRecu); socketClient.receive(receivedPacket);
String reponse = new String( String reponse = new String(
paquetRecu.getData(), receivedPacket.getData(),
0, 0,
paquetRecu.getLength() receivedPacket.getLength()
); );
if (reponse.startsWith("PORT:")) { if (reponse.startsWith("PORT:")) {
int newPort = Integer.parseInt(reponse.substring(5)); 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 // 4 - Communiquer sur le nouveau port
for (int i = 0; i < 5; i++) { for (int i = 0; i < 20; i++) {
String messagePort = "Message au nouveau port"; String messagePort = "Test";
byte[] envoyeesPort = messagePort.getBytes(); byte[] envoyeesPort = messagePort.getBytes();
DatagramPacket paquetPort = new DatagramPacket( DatagramPacket paquetPort = new DatagramPacket(
envoyeesPort, envoyeesPort,
envoyeesPort.length, envoyeesPort.length,
adresseServeur, serverAddress,
newPort newPort
); );
socketClient.send(paquetPort); socketClient.send(paquetPort);
System.out.println("Test sent");
TimeUnit.SECONDS.sleep(1); TimeUnit.SECONDS.sleep(1);
} }
} }

2
app/src/main/java/clientserver/server/ClientHandler.java
View File

@@ -38,7 +38,7 @@ public class ClientHandler implements Runnable {
// } // }
while (running && !socket.isClosed()) { while (running && !socket.isClosed()) {
DatagramPacket packet = Server.receivePacket(socket); DatagramPacket packet = Server.receivedPacket(socket);
if (packet == null) continue; if (packet == null) continue;
String message = new String( String message = new String(

17
app/src/main/java/clientserver/server/Server.java
View File

@@ -27,7 +27,7 @@ public class Server {
} }
} }
private DatagramSocket getNewSocket() { private DatagramSocket createNewSocket() {
try { try {
return new DatagramSocket(); // Reserve a random port return new DatagramSocket(); // Reserve a random port
} catch (Exception e) { } 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]; byte[] receivedData = new byte[1024];
DatagramPacket receivedPacket = new DatagramPacket( DatagramPacket receivedPacket = new DatagramPacket(
receivedData, receivedData,
@@ -77,7 +77,7 @@ public class Server {
} }
private void handleNewConnection() { private void handleNewConnection() {
DatagramPacket packet = receivePacket(mainServerSocket); DatagramPacket packet = receivedPacket(mainServerSocket);
if (packet == null) return; if (packet == null) return;
Client client = new Client(packet.getAddress(), packet.getPort()); Client client = new Client(packet.getAddress(), packet.getPort());
@@ -92,10 +92,17 @@ public class Server {
// Process the received message // Process the received message
String message = new String(packet.getData(), 0, packet.getLength()); 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 // Create a new socket for this client
DatagramSocket clientSocket = getNewSocket(); DatagramSocket clientSocket = createNewSocket();
if (clientSocket == null) return; if (clientSocket == null) return;
int newPort = clientSocket.getLocalPort(); int newPort = clientSocket.getLocalPort();