From fa4ee046b1636c5fd7a8b3511f5c9a0d17a89347 Mon Sep 17 00:00:00 2001 From: GustavoHMDS Date: Tue, 29 Sep 2026 01:13:42 -0300 Subject: [PATCH] WIP BugFix 3 --- pitiupi/plugins/pitiupi.chat.jar | Bin 13212 -> 0 bytes pitiupi/plugins/pitiupi.screenCast.jar | Bin 18071 -> 0 bytes .../pitiupi/net/tcp/ConnectionFactory.java | 25 ++++-------------- pitiupi/src/pitiupi/net/tcp/SocketTCP.java | 16 +++++------ pitiupi/src/pitiupi/net/udp/SocketUDP.java | 1 - 5 files changed, 11 insertions(+), 31 deletions(-) delete mode 120000 pitiupi/plugins/pitiupi.chat.jar delete mode 120000 pitiupi/plugins/pitiupi.screenCast.jar diff --git a/pitiupi/plugins/pitiupi.chat.jar b/pitiupi/plugins/pitiupi.chat.jar deleted file mode 120000 index 743d428bcc5c1e18587cab29dc9096ff3a16ea3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13212 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 Yi5(KyEGcC_1Q%6Jn^5a|u8Z&f2hm5SivR!s diff --git a/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java b/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java index cb6943a..33488fd 100644 --- a/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java +++ b/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java @@ -62,16 +62,10 @@ public class ConnectionFactory { HandshakeMessage handshake = new HandshakeMessage(isPrivate, sender, receiver); connection.send(handshake.toByteArray()); - System.out.println("Enviou handhsake"); HandshakeMessage handshakeResponse = validateConnection(connection); - System.out.println("Recebeu resposta"); - if (handshakeResponse == null) { - System.out.println("Conexao falhou"); - return null; - } + if (handshakeResponse == null) return null; - System.out.println("Sucesso na conexao"); connection.setTimeout(STANDARD_TIMEOUT); return connection; @@ -106,10 +100,8 @@ public class ConnectionFactory { HandshakeMessage handshake = validateConnection(connection); - if (handshake == null) { - System.out.println("Conexao falhou"); - return null; - } + if (handshake == null) return null; + connection.send(handshake.createResponse().toByteArray()); @@ -119,7 +111,6 @@ public class ConnectionFactory { connection.setTimeout(STANDARD_TIMEOUT); - System.out.println("Sucesso na conexao"); return connection; } catch (IOException ex) { @@ -161,13 +152,10 @@ public class ConnectionFactory { if (object instanceof Message message) { SysInfoMessage sysInfo = SysInfoMessage.parseSystemInfo(bytes); - if (sysInfo != null) { - System.out.println(sysInfo.getMessage()); - return null; - } + if (sysInfo != null) return null; + if (message instanceof HandshakeMessage handshake) { - System.out.println("Recebeu handshake"); return (validateHandshake(handshake, connection)) ? handshake : null; } } @@ -222,7 +210,6 @@ public class ConnectionFactory { SysInfoType.CONNECTION_REJECTED, "Invalid Sender: " + sender + "." ); - System.out.println("Handshake invalido"); return false; } if (receiver == null || receiver.isBlank()) { @@ -231,11 +218,9 @@ public class ConnectionFactory { SysInfoType.CONNECTION_REJECTED, "Invalid Receiver: " + receiver + "." ); - System.out.println("Handshake invalido"); return false; } - System.out.println("Handshake valido"); return true; } } diff --git a/pitiupi/src/pitiupi/net/tcp/SocketTCP.java b/pitiupi/src/pitiupi/net/tcp/SocketTCP.java index 46982c4..abf36c2 100644 --- a/pitiupi/src/pitiupi/net/tcp/SocketTCP.java +++ b/pitiupi/src/pitiupi/net/tcp/SocketTCP.java @@ -135,7 +135,6 @@ public class SocketTCP extends Thread { connection = connectionManager.getPublicConnection(destinationAddress); if (connection != null && !connection.isClosed()) return connection; - System.out.println("Trying to Establish TCP connection."); connection = establishOutgoingConnection(destinationAddress, senderId, receiverId, false); @@ -195,7 +194,7 @@ public class SocketTCP extends Thread { saveConnection(connection); connectionExecutor.submit(() -> { - startReceiver(connection, false); + startReceiver(connection); }); return connection; @@ -212,12 +211,11 @@ 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; saveConnection(connection); - startReceiver(connection, true); + startReceiver(connection); }); } @@ -248,10 +246,9 @@ public class SocketTCP extends Thread { * estabelecimento da conexão.

* * @param connection conexão cujo fluxo de entrada será processado. - * @param notify indica se o plugin destinatário deve ser notificado sobre - * o recebimento de uma nova conexão privada. */ - private void startReceiver(TcpConnection connection, boolean notify) { + private void startReceiver(TcpConnection connection) { + if (!connection.isPrivate()) { publicConnectionReceiver(connection); return; @@ -264,9 +261,8 @@ public class SocketTCP extends Thread { Plugin receiver = findConnectionReceiver(connection); if (receiver instanceof PrivateConnectionPlugin plugin) { - if (notify) { - plugin.receivePrivateConnection(connection); - } + plugin.receivePrivateConnection(connection); + privateConnectionReceiver(connection, plugin); } } diff --git a/pitiupi/src/pitiupi/net/udp/SocketUDP.java b/pitiupi/src/pitiupi/net/udp/SocketUDP.java index 0d07b29..b4c6651 100644 --- a/pitiupi/src/pitiupi/net/udp/SocketUDP.java +++ b/pitiupi/src/pitiupi/net/udp/SocketUDP.java @@ -144,7 +144,6 @@ public class SocketUDP extends Thread { } throw ex; } - System.out.println("Message! it is from: " + msgPacket.getSocketAddress()); HeartbeatMessage heartbeat = tryParseHeartbeat(msgPacket.getData()); if (heartbeat != null) {