rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

No longer sending incorrect disconnect events in read() and 

removed redundant sending of disconnect event in close().
This commit is contained in:
crs 2004-02-08 16:51:45 +00:00
parent 848aee7a3a
commit 3bcdf139a7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/net/CTCPSocket.cpp
View File

@ -129,8 +129,9 @@ CTCPSocket::read(void* buffer, UInt32 n)
m_inputBuffer.pop(n); m_inputBuffer.pop(n);
// if no more data and we cannot read or write then send disconnected // if no more data and we cannot read or write then send disconnected
if (n > 0 && !m_readable && !m_writable) { if (n > 0 && m_inputBuffer.getSize() == 0 && !m_readable && !m_writable) {
sendSocketEvent(getDisconnectedEvent()); sendSocketEvent(getDisconnectedEvent());
m_connected = false;
} }
return n; return n;
@ -459,6 +460,7 @@ CTCPSocket::serviceConnected(ISocketMultiplexerJob* job,
sendStreamEvent(getOutputShutdownEvent()); sendStreamEvent(getOutputShutdownEvent());
if (!m_readable && m_inputBuffer.getSize() == 0) { if (!m_readable && m_inputBuffer.getSize() == 0) {
sendSocketEvent(getDisconnectedEvent()); sendSocketEvent(getDisconnectedEvent());
m_connected = false;
} }
needNewJob = true; needNewJob = true;
} }
@ -502,6 +504,7 @@ CTCPSocket::serviceConnected(ISocketMultiplexerJob* job,
sendStreamEvent(getInputShutdownEvent()); sendStreamEvent(getInputShutdownEvent());
if (!m_writable && m_inputBuffer.getSize() == 0) { if (!m_writable && m_inputBuffer.getSize() == 0) {
sendSocketEvent(getDisconnectedEvent()); sendSocketEvent(getDisconnectedEvent());
m_connected = false;
} }
m_readable = false; m_readable = false;
needNewJob = true; needNewJob = true;