More TCP-related fixes and tweaks to ping timing, resynchronize, and startup.
This commit is contained in:
parent
2ac56fd120
commit
c231510f8b
5 changed files with 60 additions and 43 deletions
|
@ -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.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue