From ae910eda15af17a6262c02c3911a1af6e1c88623 Mon Sep 17 00:00:00 2001 From: Miguel Reboiro-Jato Date: Thu, 21 Sep 2023 12:44:04 +0200 Subject: [PATCH] Cleans the code Code has been reviewed and cleaned. --- .../uvigo/esei/dai/sockets/example1/HelloWorldClient.java | 4 +++- .../uvigo/esei/dai/sockets/example1/HelloWorldServer.java | 3 ++- .../esei/dai/sockets/example2/HelloWorldReceiver.java | 8 +++++--- .../uvigo/esei/dai/sockets/example2/HelloWorldSender.java | 8 +++++--- .../es/uvigo/esei/dai/sockets/example3/EchoClient.java | 3 ++- .../es/uvigo/esei/dai/sockets/example3/EchoReceiver.java | 5 +++-- .../es/uvigo/esei/dai/sockets/example3/EchoSender.java | 6 ++++-- .../es/uvigo/esei/dai/sockets/example3/EchoServer.java | 3 ++- .../uvigo/esei/dai/sockets/example4/MessageReceiver.java | 7 ++++--- .../es/uvigo/esei/dai/sockets/example4/MessageSender.java | 8 ++++---- 10 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example1/HelloWorldClient.java b/src/main/java/es/uvigo/esei/dai/sockets/example1/HelloWorldClient.java index 567888e..7434b21 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example1/HelloWorldClient.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example1/HelloWorldClient.java @@ -28,7 +28,7 @@ import java.net.UnknownHostException; public class HelloWorldClient { public static void main(String[] args) { - try (Socket socket = new Socket("localhost", 12345)) { + try (Socket socket = new Socket("localhost", 50000)) { System.out.println("Local port: " + socket.getLocalPort()); final InputStream input = socket.getInputStream(); @@ -41,9 +41,11 @@ public class HelloWorldClient { // El InputStream se cerrará cuando se cierre el Socket } catch (final UnknownHostException e) { System.out.println("Unknown host: localhost"); + e.printStackTrace(); } catch (final IOException e) { System.out.print("Connection error: "); System.out.println(e.getMessage()); + e.printStackTrace(); } } } diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example1/HelloWorldServer.java b/src/main/java/es/uvigo/esei/dai/sockets/example1/HelloWorldServer.java index 98653f9..1fe9843 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example1/HelloWorldServer.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example1/HelloWorldServer.java @@ -28,7 +28,7 @@ import java.net.Socket; public class HelloWorldServer { public static void main(String[] args) { - try (ServerSocket serverSocket = new ServerSocket(12345)) { + try (ServerSocket serverSocket = new ServerSocket(50000)) { while (true) { System.out.println("Antes de accept"); @@ -43,6 +43,7 @@ public class HelloWorldServer { } } catch (final IOException e) { System.err.println("Server socket could not be created"); + e.printStackTrace(); } } } diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example2/HelloWorldReceiver.java b/src/main/java/es/uvigo/esei/dai/sockets/example2/HelloWorldReceiver.java index b190739..cf93822 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example2/HelloWorldReceiver.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example2/HelloWorldReceiver.java @@ -27,19 +27,21 @@ import java.net.DatagramSocket; public class HelloWorldReceiver { public static void main(String[] args) { - try (DatagramSocket socket = new DatagramSocket(1234)) { + try (DatagramSocket socket = new DatagramSocket(60000)) { final byte[] buffer = new byte[128]; final DatagramPacket packet = new DatagramPacket(buffer, buffer.length); + System.out.println("Antes de recibir"); socket.receive(packet); final String message = new String(packet.getData(), 0, packet.getLength()); System.out.println("Mensaje recibido: " + message); - } catch (final IOException ioe) { + } catch (final IOException e) { System.out.print("Connection error: "); - System.out.println(ioe.getMessage()); + System.out.println(e.getMessage()); + e.printStackTrace(); } } } diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example2/HelloWorldSender.java b/src/main/java/es/uvigo/esei/dai/sockets/example2/HelloWorldSender.java index ec2dc5a..4816f97 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example2/HelloWorldSender.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example2/HelloWorldSender.java @@ -32,15 +32,17 @@ public class HelloWorldSender { final String message = "Hello World"; final DatagramPacket packet = new DatagramPacket( - message.getBytes(), message.length(), InetAddress.getLocalHost(), 1234 + message.getBytes(), message.length(), InetAddress.getLocalHost(), 60000 ); + System.out.println("Antes de enviar"); socket.send(packet); System.out.println("Mensaje enviado"); - } catch (final IOException ioe) { + } catch (final IOException e) { System.out.print("Error de conexión: "); - System.out.println(ioe.getMessage()); + System.out.println(e.getMessage()); + e.printStackTrace(); } } } diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoClient.java b/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoClient.java index 834ba44..51838e8 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoClient.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoClient.java @@ -34,7 +34,7 @@ public class EchoClient { // final Console console = System.console(); final BufferedReader console = new BufferedReader(new InputStreamReader(System.in)); - try (Socket socket = new Socket("localhost", 1234)) { + try (Socket socket = new Socket("localhost", 50000)) { final DataInputStream input = new DataInputStream(socket.getInputStream()); final DataOutputStream output = new DataOutputStream(socket.getOutputStream()); @@ -49,6 +49,7 @@ public class EchoClient { } } catch (final UnknownHostException e) { System.out.println("Unknown host: localhost"); + e.printStackTrace(); } catch (final IOException e) { System.out.println("Connection error: " + e.getMessage()); e.printStackTrace(); diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoReceiver.java b/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoReceiver.java index 7b46ba8..ec0cfdd 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoReceiver.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoReceiver.java @@ -29,7 +29,7 @@ public class EchoReceiver { private static final int PACKET_LENGTH = 1024; public static void main(String[] args) { - try (DatagramSocket receiverSocket = new DatagramSocket(1234)) { + try (DatagramSocket receiverSocket = new DatagramSocket(60000)) { while (true) { final DatagramPacket packet = new DatagramPacket(new byte[PACKET_LENGTH], PACKET_LENGTH); @@ -44,7 +44,8 @@ public class EchoReceiver { receiverSocket.send(packet); } } catch (final IOException e) { - System.err.println("Server socket could not be created"); + System.out.println("Server socket could not be created"); + e.printStackTrace(); } } } diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoSender.java b/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoSender.java index 8018b55..f7bb508 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoSender.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoSender.java @@ -35,13 +35,13 @@ public class EchoSender { // final Console console = System.console(); final BufferedReader console = new BufferedReader(new InputStreamReader(System.in)); - try (DatagramSocket socket = new DatagramSocket(new InetSocketAddress(InetAddress.getLocalHost(), 4444))) { + try (DatagramSocket socket = new DatagramSocket(new InetSocketAddress(InetAddress.getLocalHost(), 55555))) { String line; while ((line = console.readLine()) != null) { System.out.println("INPUT: " + line); final byte[] lineData = line.getBytes(); - final DatagramPacket packet = new DatagramPacket(lineData, lineData.length, InetAddress.getLocalHost(), 1234); + final DatagramPacket packet = new DatagramPacket(lineData, lineData.length, InetAddress.getLocalHost(), 60000); // El paquete se envía socket.send(packet); @@ -53,8 +53,10 @@ public class EchoSender { } } catch (final UnknownHostException e) { System.out.println("Unknown host: localhost"); + e.printStackTrace(); } catch (final IOException e) { System.out.println("Connection error: " + e.getMessage()); + e.printStackTrace(); } } } diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoServer.java b/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoServer.java index 1491718..b5a675d 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoServer.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example3/EchoServer.java @@ -29,7 +29,7 @@ import java.net.Socket; public class EchoServer { public static void main(String[] args) { - try (ServerSocket serverSocket = new ServerSocket(1234)) { + try (ServerSocket serverSocket = new ServerSocket(50000)) { while (true) { try (Socket clientSocket = serverSocket.accept()) { final DataInputStream input = new DataInputStream(clientSocket.getInputStream()); @@ -44,6 +44,7 @@ public class EchoServer { } } catch (final IOException e) { System.err.println("Server socket could not be created"); + e.printStackTrace(); } } } diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example4/MessageReceiver.java b/src/main/java/es/uvigo/esei/dai/sockets/example4/MessageReceiver.java index 1e96d4f..068bb67 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example4/MessageReceiver.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example4/MessageReceiver.java @@ -29,7 +29,7 @@ import java.net.DatagramSocket; public class MessageReceiver { public static void main(String[] args) { - try (DatagramSocket socket = new DatagramSocket(1234)) { + try (DatagramSocket socket = new DatagramSocket(60000)) { final byte[] buffer = new byte[1500]; while (true) { @@ -49,9 +49,10 @@ public class MessageReceiver { e.printStackTrace(); } } - } catch (final IOException ioe) { + } catch (final IOException e) { System.out.println("Connection error: "); - System.out.println(ioe.getMessage()); + System.out.println(e.getMessage()); + e.printStackTrace(); } } } diff --git a/src/main/java/es/uvigo/esei/dai/sockets/example4/MessageSender.java b/src/main/java/es/uvigo/esei/dai/sockets/example4/MessageSender.java index 114c606..52b7703 100644 --- a/src/main/java/es/uvigo/esei/dai/sockets/example4/MessageSender.java +++ b/src/main/java/es/uvigo/esei/dai/sockets/example4/MessageSender.java @@ -32,7 +32,7 @@ import java.util.Date; public class MessageSender { public static void main(String[] args) { try (DatagramSocket socket = new DatagramSocket()) { - final ByteArrayOutputStream output = new ByteArrayOutputStream(1500); + final ByteArrayOutputStream output = new ByteArrayOutputStream(60000); final ObjectOutputStream dataOutput = new ObjectOutputStream(output); final Message message = new Message("Time", "Current time: " + new Date()); @@ -45,10 +45,10 @@ public class MessageSender { ); socket.send(packet); - } catch (final IOException ioe) { - ioe.printStackTrace(); + } catch (final IOException e) { System.out.print("Connection error: "); - System.out.println(ioe.getMessage()); + System.out.println(e.getMessage()); + e.printStackTrace(); } } } -- 2.18.1