From c231510f8b813eb73750f266dd18e836bc02d9cc Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 27 Mar 2014 17:02:52 -0700
Subject: More TCP-related fixes and tweaks to ping timing, resynchronize, and
 startup.

---
 node/TcpSocket.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'node/TcpSocket.cpp')

diff --git a/node/TcpSocket.cpp b/node/TcpSocket.cpp
index b56775d8..5d475c93 100644
--- a/node/TcpSocket.cpp
+++ b/node/TcpSocket.cpp
@@ -73,7 +73,7 @@ bool TcpSocket::send(const InetAddress &to,const void *msg,unsigned int msglen)
 
 	Mutex::Lock _l(_writeLock);
 
-	bool outputWasEnqueued = (_outptr != 0);
+	bool writeInProgress = ((_outptr != 0)||(_connecting));
 
 	// Ensure that _outbuf is large enough
 	unsigned int newptr = _outptr + 5 + msglen;
@@ -102,7 +102,7 @@ bool TcpSocket::send(const InetAddress &to,const void *msg,unsigned int msglen)
 	for(unsigned int i=0;i<msglen;++i)
 		_outbuf[_outptr++] = ((const unsigned char *)msg)[i];
 
-	if (!outputWasEnqueued) {
+	if (!writeInProgress) {
 		// If no output was enqueued before this, try to send() it and then
 		// start a queued write if any remains after that.
 
-- 
cgit v1.2.3