fix: names and prints
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user