crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added timeout to Peer sendMessage() - same timeout as for awaiting incoming responses

Browse Source
This commit is contained in:
catbref 2021-01-17 15:32:39 +00:00
parent 83f4e2f5bf
commit c17eea3ed9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/qortal/network/Peer.java
View File

@ -475,6 +475,8 @@ public class Peer {
ByteBuffer outputBuffer = ByteBuffer.wrap(message.toBytes()); ByteBuffer outputBuffer = ByteBuffer.wrap(message.toBytes());
synchronized (this.socketChannel) { synchronized (this.socketChannel) {
final long sendStart = System.currentTimeMillis();
while (outputBuffer.hasRemaining()) { while (outputBuffer.hasRemaining()) {
int bytesWritten = this.socketChannel.write(outputBuffer); int bytesWritten = this.socketChannel.write(outputBuffer);
@ -484,7 +486,7 @@ public class Peer {
message.getId(), message.getId(),
this)); this));
if (bytesWritten == 0) if (bytesWritten == 0) {
// Underlying socket's internal buffer probably full, // Underlying socket's internal buffer probably full,
// so wait a short while for bytes to actually be transmitted over the wire // so wait a short while for bytes to actually be transmitted over the wire
@ -496,6 +498,11 @@ public class Peer {
* and connection loss. * and connection loss.
*/ */
Thread.sleep(1L); //NOSONAR squid:S2276 Thread.sleep(1L); //NOSONAR squid:S2276
if (System.currentTimeMillis() - sendStart > RESPONSE_TIMEOUT)
// We've taken too long to send this message
return false;
}
} }
} }
} catch (MessageException e) { } catch (MessageException e) {