1 files changed, 23 insertions, 0 deletions

diff --git a/src/net.h b/src/net.h
index e4cfa69..112426e 100644
--- a/src/net.h
+++ b/src/net.h
@@ -127,6 +127,25 @@ static const int64        DISCONNECT_DRAIN_SECS    = 60;
 // 3966-4085 -- 120 blocks, 5890.50 BTF -- were mined in exactly this state.
 static const int64        BTF_NO_PEER_HEIGHT_MAX_SECS = 20 * 60;
 
+// How long a peer may leave this node waiting for the rest of a message it
+// announced in a header.
+//
+// ProcessMessages rewinds the header and breaks when the body has not all
+// arrived, which is correct for a message still in flight and unbounded for
+// one that never completes: the same header is re-read, the loop breaks
+// again, and that peer is never parsed again for the life of the process.
+// Satoshi left the note -- "need a mechanism to give up waiting for overlong
+// message size error" -- and this is it.
+//
+// It never self-corrects, because any byte that arrives refreshes nLastRecv,
+// so the inactivity timeout that would otherwise drop the peer never fires.
+// The socket stays healthy, select() keeps reporting it, and the node goes
+// silently deaf one peer at a time.
+//
+// A header may legitimately outrun its body by a round trip or two; two
+// minutes is far beyond that, and well inside BTF_RECV_TIMEOUT_SECS.
+static const int64        BTF_MSG_WAIT_MAX_SECS = 2 * 60;
+
 // Send a ping after this long with nothing to say, so a peer running the
 // inactivity check above does not mistake a quiet node for a dead one. Must
 // stay well under BTF_RECV_TIMEOUT_SECS.
@@ -651,6 +670,10 @@ public:
     string strBtfAddr;
     string strBtfMeeting;
 
+    // When this peer's message loop first rewound a header to wait for the
+    // rest of a message, or 0 when it is not waiting. See ProcessMessages.
+    int64 nMsgWaitSince;
+
     // Height this peer announced in its version message, or -1 if it sent a
     // version message that predates the field. Knowing how far along everyone
     // else is, is the only way a node can tell "in sync" from "not hearing".