refactor: better client structure
This commit is contained in:
@@ -38,6 +38,10 @@ public class Client {
|
|||||||
return this.serverPort;
|
return this.serverPort;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setServerPort(int port) {
|
||||||
|
this.serverPort = port;
|
||||||
|
}
|
||||||
|
|
||||||
public String getPseudo() {
|
public String getPseudo() {
|
||||||
return this.pseudo;
|
return this.pseudo;
|
||||||
}
|
}
|
||||||
@@ -68,11 +72,11 @@ public class Client {
|
|||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("Enter the port of the server :");
|
System.out.println("Enter the port of the server :");
|
||||||
client.serverPort = scan.nextInt();
|
client.setServerPort(scan.nextInt());
|
||||||
scan.close();
|
scan.close();
|
||||||
|
|
||||||
if (socketClient != null && client.serverAddress != null) {
|
if (socketClient != null && client.serverAddress != null) {
|
||||||
Server.sendMessage(socketClient, client.getPseudo(), client.serverAddress, client.serverPort);
|
Server.sendMessage(socketClient, client.getPseudo(), client.serverAddress, client.getServerPort());
|
||||||
System.out.println("New connection request sent");
|
System.out.println("New connection request sent");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,16 +114,9 @@ public class Client {
|
|||||||
// connexion avec le server
|
// connexion avec le server
|
||||||
Client client = createAndConfigureClient(socketClient);
|
Client client = createAndConfigureClient(socketClient);
|
||||||
|
|
||||||
// 3 - Recevoir
|
// // 3 - Recevoir
|
||||||
byte[] receivedData = new byte[1024]; // tampon de réception
|
DatagramPacket receivedPacket = Server.receivedPacket(socketClient);
|
||||||
DatagramPacket receivedPacket = new DatagramPacket(
|
String reponse = Server.packetToMessage(receivedPacket);
|
||||||
receivedData,
|
|
||||||
receivedData.length);
|
|
||||||
socketClient.receive(receivedPacket);
|
|
||||||
String reponse = new String(
|
|
||||||
receivedPacket.getData(),
|
|
||||||
0,
|
|
||||||
receivedPacket.getLength());
|
|
||||||
|
|
||||||
if (reponse.startsWith("PORT:")) {
|
if (reponse.startsWith("PORT:")) {
|
||||||
int newClientHandlerPort = Integer.parseInt(reponse.substring(5));
|
int newClientHandlerPort = Integer.parseInt(reponse.substring(5));
|
||||||
|
|||||||
@@ -56,6 +56,13 @@ public class Server {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String packetToMessage(DatagramPacket packet) {
|
||||||
|
return new String(
|
||||||
|
packet.getData(),
|
||||||
|
0,
|
||||||
|
packet.getLength());
|
||||||
|
}
|
||||||
|
|
||||||
public static void sendMessage(
|
public static void sendMessage(
|
||||||
DatagramSocket socket,
|
DatagramSocket socket,
|
||||||
String message,
|
String message,
|
||||||
|
|||||||
Reference in New Issue
Block a user