diff --git a/pitiupi.testSocket/out/GUI/SocketTestMenu.class b/pitiupi.testSocket/out/GUI/SocketTestMenu.class deleted file mode 100644 index 19be548..0000000 Binary files a/pitiupi.testSocket/out/GUI/SocketTestMenu.class and /dev/null differ diff --git a/pitiupi.testSocket/out/GUI/SocketTestWindow.class b/pitiupi.testSocket/out/GUI/SocketTestWindow.class deleted file mode 100644 index 475d4ad..0000000 Binary files a/pitiupi.testSocket/out/GUI/SocketTestWindow.class and /dev/null differ diff --git a/pitiupi.testSocket/out/net/TestMessage.class b/pitiupi.testSocket/out/net/TestMessage.class deleted file mode 100644 index d472376..0000000 Binary files a/pitiupi.testSocket/out/net/TestMessage.class and /dev/null differ diff --git a/pitiupi.testSocket/out/plugin/SocketTest.class b/pitiupi.testSocket/out/plugin/SocketTest.class deleted file mode 100644 index a984f73..0000000 Binary files a/pitiupi.testSocket/out/plugin/SocketTest.class and /dev/null differ diff --git a/pitiupi/src/pitiupi/GUI/MainWindow.java b/pitiupi/src/pitiupi/GUI/MainWindow.java index cc72db4..a9becd2 100644 --- a/pitiupi/src/pitiupi/GUI/MainWindow.java +++ b/pitiupi/src/pitiupi/GUI/MainWindow.java @@ -146,7 +146,7 @@ public class MainWindow extends javax.swing.JFrame { return this.socketUDP; } - public SocketTCP getSocketTCP() { + public SocketTCP getSocketTCP() { return this.socketTCP; } diff --git a/pitiupi/src/pitiupi/net/tcp/SocketTCP.java b/pitiupi/src/pitiupi/net/tcp/SocketTCP.java index 920dffa..326d23d 100644 --- a/pitiupi/src/pitiupi/net/tcp/SocketTCP.java +++ b/pitiupi/src/pitiupi/net/tcp/SocketTCP.java @@ -75,17 +75,17 @@ public class SocketTCP extends Thread { * do envio. Falhas durante o estabelecimento ou envio são registradas na * saída padrão e não são propagadas ao chamador.

* - * @param msg mensagem serializada em bytes que será enviada. + * @param msg mensagem que será enviada. * @param destinationAddress endereço IP do peer que receberá a mensagem. */ - public void send(byte[] msg, InetAddress destinationAddress) { + public void send(Message msg, InetAddress destinationAddress) { try { TcpConnection connection = getPublicConnection(destinationAddress, main.getIdentifier(), main.getIdentifier()); if (connection == null) { System.out.println("Could not establish TCP connection."); return; } - connection.send(msg); + connection.send(msg.toByteArray()); } catch (Exception ex) { System.out.println("Could not send TCP message."); System.out.println(ex.toString()); @@ -391,7 +391,7 @@ public class SocketTCP extends Thread { SysInfoMessage sysMessage = SysInfoMessage.parseSystemInfo(message); if (sysMessage == null) { - privatePlugin.receiveBytes(message); + privatePlugin.receiveBytes(connection, message); continue; } diff --git a/pitiupi/src/pitiupi/plugin/PrivateConnectionPlugin.java b/pitiupi/src/pitiupi/plugin/PrivateConnectionPlugin.java index 0ddd738..7da4368 100644 --- a/pitiupi/src/pitiupi/plugin/PrivateConnectionPlugin.java +++ b/pitiupi/src/pitiupi/plugin/PrivateConnectionPlugin.java @@ -4,6 +4,6 @@ import pitiupi.net.tcp.TcpConnection; public interface PrivateConnectionPlugin extends Plugin { public void receivePrivateConnection(TcpConnection connection); - public void receiveBytes(byte[] bytes); + public void receiveBytes(TcpConnection connection, byte[] bytes); public void onSocketClosed(TcpConnection connection); }