|
|
@ -108,11 +108,14 @@ public class ProtocolP2PPacketTCP extends ProtocolP2PPacket {
|
|
|
|
Socket ss = (Socket)socket;
|
|
|
|
Socket ss = (Socket)socket;
|
|
|
|
byte[] packet = new byte[1024];
|
|
|
|
byte[] packet = new byte[1024];
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
System.err.println("Reading " + ss.getInputStream().read(packet) + " bytes");
|
|
|
|
if (-1 == ss.getInputStream().read(packet)) {
|
|
|
|
|
|
|
|
throw new IOException();
|
|
|
|
|
|
|
|
}
|
|
|
|
} catch (IOException e) {
|
|
|
|
} catch (IOException e) {
|
|
|
|
// Error: cannot read request, closing socket
|
|
|
|
// Error: cannot read request, closing socket
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
ss.close();
|
|
|
|
ss.close();
|
|
|
|
|
|
|
|
throw new SocketClosed();
|
|
|
|
} catch (IOException e2) {
|
|
|
|
} catch (IOException e2) {
|
|
|
|
System.err.println("Cannot close socket");
|
|
|
|
System.err.println("Cannot close socket");
|
|
|
|
throw new SocketClosed();
|
|
|
|
throw new SocketClosed();
|
|
|
@ -208,7 +211,20 @@ public class ProtocolP2PPacketTCP extends ProtocolP2PPacket {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// reception
|
|
|
|
// reception
|
|
|
|
byte[] packet = new byte[8192];
|
|
|
|
byte[] packet = new byte[8192];
|
|
|
|
requestSocket.getInputStream().read(packet);
|
|
|
|
try {
|
|
|
|
|
|
|
|
if (-1== requestSocket.getInputStream().read(packet)) {
|
|
|
|
|
|
|
|
throw new IOException();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (IOException e) {
|
|
|
|
|
|
|
|
// Error: cannot read request, closing socket
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
requestSocket.close();
|
|
|
|
|
|
|
|
throw new SocketClosed();
|
|
|
|
|
|
|
|
} catch (IOException e2) {
|
|
|
|
|
|
|
|
System.err.println("Cannot close socket");
|
|
|
|
|
|
|
|
throw new SocketClosed();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
// contruction
|
|
|
|
// contruction
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
ProtocolP2PPacketTCP p = new ProtocolP2PPacketTCP(packet);
|
|
|
|
ProtocolP2PPacketTCP p = new ProtocolP2PPacketTCP(packet);
|
|
|
|