Skip to content
Snippets Groups Projects
Commit 49717f0a authored by deuce's avatar deuce
Browse files

On a recv() of zero bytes, check if the socket is still connected.

parent 7ad5d64a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 6 deletions
exec/load/binkp.js
+ 24
− 6
View file @ 49717f0a
......@@ -994,8 +994,14 @@ BinkP.prototype.recvFrame = function(timeout)
return undefined;
}
if (i.length != 1) {
if (timeout) {
log(LOG_WARNING, "Timed out receiving first byte of packet header: " + timeout);
if (!this.sock.is_connected) {
log(LOG_DEBUG, "Remote host closed socket");
this.sock.close();
this.sock = undefined;
return undefined;
}
else if (timeout) {
log(LOG_WARNING, "Timed out receiving first byte of packet header!");
this.sock.close();
this.sock = undefined;
return undefined;
......@@ -1011,8 +1017,14 @@ BinkP.prototype.recvFrame = function(timeout)
return undefined;
}
if (i.length != 1) {
if (timeout) {
log(LOG_WARNING, "Timed out receiving second byte of packet header: " + timeout);
if (!this.sock.is_connected) {
log(LOG_DEBUG, "Remote host closed socket");
this.sock.close();
this.sock = undefined;
return undefined;
}
else if (timeout) {
log(LOG_WARNING, "Timed out receiving second byte of packet header!");
this.sock.close();
this.sock = undefined;
return undefined;
......@@ -1037,8 +1049,14 @@ BinkP.prototype.recvFrame = function(timeout)
return undefined;
}
if (i.length == 0) {
if (timeout) {
log(LOG_ERROR, "Timed out receiving packet data: " + timeout);
if (!this.sock.is_connected) {
log(LOG_DEBUG, "Remote host closed socket");
this.sock.close();
this.sock = undefined;
return undefined;
}
else if (timeout) {
log(LOG_ERROR, "Timed out receiving packet data!");
this.sock.close();
this.sock = undefined;
return undefined;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment