flavien/Projet_JAVA_P2P_STRI2A
3
2
Fork 0
Code Issues 11 Pull Requests Releases 13 Activity

Fix #54

Browse Source
This commit is contained in:
Louis Royer 2020-04-02 00:19:41 +02:00
parent 654758c14b
commit 00170748f4
2 changed files with 103 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/protocolP2P/HashRequest.java
View File

@ -64,7 +64,7 @@ public class HashRequest extends Payload {
filename = BytesArrayTools.readString(packet, FILENAME_POSITION, filenameSize);
/* Read algo list */
int size = getPayloadSize(packet);
int size = getPayloadSize(packet) - filenameSize - (FILENAME_POSITION - PAYLOAD_START_POSITION);
String[] algoListStr = BytesArrayTools.readStringArray(packet, FILENAME_POSITION + filenameSize, size, "\n");
int i = 0;
algoList = new HashAlgorithm[algoListStr.length];

55
src/protocolP2P/ProtocolP2PPacketTCP.java
View File

@ -28,6 +28,7 @@ import protocolP2P.SizeResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.net.Socket;
import java.util.Arrays;
/** Representation of packet.
* @author Louis Royer
@ -113,20 +114,15 @@ public class ProtocolP2PPacketTCP < T extends Payload > extends ProtocolP2PPacke
throw new InternalError();
}
Socket ss = (Socket)socket;
byte[] packet = new byte[1024];
byte[] packetHeader = new byte[Payload.PAYLOAD_START_POSITION];
try {
if (-1 == ss.getInputStream().read(packet)) {
if (-1 == ss.getInputStream().read(packetHeader, 0, Payload.PAYLOAD_START_POSITION)) {
throw new IOException();
}
} catch (IOException e) {
// Error: cannot read request, closing socket
try {
ss.close();
throw new SocketClosed();
} catch (IOException e2) {
System.err.println("Cannot close socket");
throw new SocketClosed();
}
int payloadSize = Payload.getPayloadSize(packetHeader);
byte[] packet = Arrays.copyOf(packetHeader, Payload.PAYLOAD_START_POSITION + payloadSize);
if (-1 == ss.getInputStream().read(packet, Payload.PAYLOAD_START_POSITION, payloadSize)) {
throw new IOException();
}
// contruction
boolean protocolError = false;
@ -175,6 +171,16 @@ public class ProtocolP2PPacketTCP < T extends Payload > extends ProtocolP2PPacke
if (protocolError) {
throw new ProtocolError();
}
} catch (IOException e) {
// Error: cannot read request, closing socket
try {
ss.close();
throw new SocketClosed();
} catch (IOException e2) {
System.err.println("Cannot close socket");
throw new SocketClosed();
}
}
}
/** Send a Response to a Request (typically used from server).
@ -221,20 +227,15 @@ public class ProtocolP2PPacketTCP < T extends Payload > extends ProtocolP2PPacke
throw new InternalError();
}
// reception
byte[] packet = new byte[8192];
byte[] packetHeader = new byte[Payload.PAYLOAD_START_POSITION];
try {
if (-1== requestSocket.getInputStream().read(packet)) {
if (-1 == requestSocket.getInputStream().read(packetHeader, 0, Payload.PAYLOAD_START_POSITION)) {
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();
}
int payloadSize = Payload.getPayloadSize(packetHeader);
byte[] packet = Arrays.copyOf(packetHeader, Payload.PAYLOAD_START_POSITION + payloadSize);
if (-1 == requestSocket.getInputStream().read(packet, Payload.PAYLOAD_START_POSITION, payloadSize)) {
throw new IOException();
}
// contruction
try {
@ -276,6 +277,16 @@ public class ProtocolP2PPacketTCP < T extends Payload > extends ProtocolP2PPacke
(new ProtocolP2PPacketTCP<Payload>(new Payload(RequestResponseCode.INTERNAL_ERROR))).send(requestSocket);
throw e;
}
} 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();
}
}
}
/** Private constructor with packet as byte[] parameter (typically used when receiving Packet response).