feature/separacao-gerenciadores #1

Merged
gustavo merged 31 commits from feature/separacao-gerenciadores into main 2026-09-30 18:34:54 -03:00
3 changed files with 7 additions and 2 deletions
Showing only changes of commit 0ec3129a22 - Show all commits

No files matched your search

@@ -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;
}
}
@@ -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;
+3 -1
View File
@@ -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());