From 0ec3129a220067e2e595adf5bbf82e7e6e8c6c57 Mon Sep 17 00:00:00 2001 From: GustavoHMDS Date: Mon, 28 Sep 2026 21:43:17 -0300 Subject: [PATCH] WIP TCP bug fix --- pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java | 4 +++- pitiupi/src/pitiupi/net/tcp/SocketTCP.java | 1 + pitiupi/src/pitiupi/net/udp/SocketUDP.java | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java b/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java index 8982c12..e35bd32 100644 --- a/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java +++ b/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java @@ -62,6 +62,7 @@ public class ConnectionFactory { HandshakeMessage handshake = new HandshakeMessage(isPrivate, sender, receiver); connection.send(handshake.toByteArray()); + System.out.println("Enviou handhsake"); HandshakeMessage handshakeResponse = validateConnection(connection); if (handshakeResponse == null) return null; @@ -148,12 +149,13 @@ public class ConnectionFactory { Object object = ois.readObject(); if (object instanceof Message message) { - if (SysInfoMessage.parseSystemInfo(message) != null) { + if (SysInfoMessage.parseSystemInfo(bytes) != null) { //TODO: Tratar erros return null; } if (message instanceof HandshakeMessage handshake) { + System.out.println("Recebeu handshake"); return (validateHandshake(handshake, connection)) ? handshake : null; } } diff --git a/pitiupi/src/pitiupi/net/tcp/SocketTCP.java b/pitiupi/src/pitiupi/net/tcp/SocketTCP.java index 074c36c..e35f72f 100644 --- a/pitiupi/src/pitiupi/net/tcp/SocketTCP.java +++ b/pitiupi/src/pitiupi/net/tcp/SocketTCP.java @@ -211,6 +211,7 @@ public class SocketTCP extends Thread { */ private void acceptIncomingConnection(Socket socket) { connectionExecutor.submit(() -> { + System.out.println("Accepted TCP connection."); TcpConnection connection = ConnectionFactory.receiveConnection(socket); if (connection == null) return; diff --git a/pitiupi/src/pitiupi/net/udp/SocketUDP.java b/pitiupi/src/pitiupi/net/udp/SocketUDP.java index a4a42f2..0d07b29 100644 --- a/pitiupi/src/pitiupi/net/udp/SocketUDP.java +++ b/pitiupi/src/pitiupi/net/udp/SocketUDP.java @@ -75,7 +75,7 @@ public class SocketUDP extends Thread { * @throws IOException caso ocorra um erro durante o envio. */ public void sendMulticast(Message msg) throws IOException { - send(msg, this.address); + send(msg, address); } /** @@ -144,6 +144,8 @@ public class SocketUDP extends Thread { } throw ex; } + System.out.println("Message! it is from: " + msgPacket.getSocketAddress()); + HeartbeatMessage heartbeat = tryParseHeartbeat(msgPacket.getData()); if (heartbeat != null) { main.getHeartbeatManager().receiveHeartbeat(heartbeat, msgPacket.getAddress());