From e7c89837756820abcb175231353912d529aae623 Mon Sep 17 00:00:00 2001
From: GustavoHMDS <gusttavoh2602@gmail.com>
Date: Mon, 28 Sep 2026 22:05:14 -0300
Subject: [PATCH] WIP TCP bug fix 2

---
 .../pitiupi/net/tcp/ConnectionFactory.java    | 24 +++++++++++++++----
 pitiupi/src/pitiupi/net/tcp/SocketTCP.java    |  1 +
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java b/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java
index e35bd32..cb6943a 100644
--- a/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java
+++ b/pitiupi/src/pitiupi/net/tcp/ConnectionFactory.java
@@ -64,9 +64,14 @@ public class ConnectionFactory {
             connection.send(handshake.toByteArray());
             System.out.println("Enviou handhsake");
             HandshakeMessage handshakeResponse = validateConnection(connection);
+            System.out.println("Recebeu resposta");
 
-            if (handshakeResponse == null) return null;
+            if (handshakeResponse == null) {
+                System.out.println("Conexao falhou");
+                return null;
+            }
 
+            System.out.println("Sucesso na conexao");
             connection.setTimeout(STANDARD_TIMEOUT);
 
             return connection;
@@ -101,7 +106,12 @@ public class ConnectionFactory {
 
             HandshakeMessage handshake = validateConnection(connection);
 
-            if (handshake == null) return null;
+            if (handshake == null) {
+                System.out.println("Conexao falhou");
+                return null;
+            }
+
+            connection.send(handshake.createResponse().toByteArray());
 
             connection.setSender(handshake.getSender());
             connection.setReceiver(handshake.getReceiver());
@@ -109,6 +119,7 @@ public class ConnectionFactory {
 
             connection.setTimeout(STANDARD_TIMEOUT);
 
+            System.out.println("Sucesso na conexao");
             return connection;
         }
         catch (IOException ex) {
@@ -149,8 +160,9 @@ public class ConnectionFactory {
             Object object = ois.readObject();
 
             if (object instanceof Message message) {
-                if (SysInfoMessage.parseSystemInfo(bytes) != null) {
-                    //TODO: Tratar erros
+                SysInfoMessage sysInfo = SysInfoMessage.parseSystemInfo(bytes);
+                if (sysInfo != null) {
+                    System.out.println(sysInfo.getMessage());
                     return null;
                 }
 
@@ -210,6 +222,7 @@ public class ConnectionFactory {
                     SysInfoType.CONNECTION_REJECTED,
                     "Invalid Sender: " + sender + "."
             );
+            System.out.println("Handshake invalido");
             return false;
         }
         if (receiver == null || receiver.isBlank()) {
@@ -218,8 +231,11 @@ 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 e35f72f..46982c4 100644
--- a/pitiupi/src/pitiupi/net/tcp/SocketTCP.java
+++ b/pitiupi/src/pitiupi/net/tcp/SocketTCP.java
@@ -135,6 +135,7 @@ 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);