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

Merge branch 'master' of github.com:debauchee/barrier

This commit is contained in:
walker0643 2018-02-01 17:13:57 -05:00
parent b3298ad799 eb025871c4
commit dea4359cce
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/net/SecureSocket.cpp
View File

@ -859,5 +859,9 @@ SecureSocket::showSecureConnectInfo()
void void
SecureSocket::handleTCPConnected(const Event& event, void*) SecureSocket::handleTCPConnected(const Event& event, void*)
{ {
if (getSocket() == nullptr) {
LOG((CLOG_DEBUG "disregarding stale connect event"));
return;
}
secureConnect(); secureConnect();
} }

6
src/lib/net/TCPSocket.cpp
View File

@ -51,6 +51,8 @@ TCPSocket::TCPSocket(IEventQueue* events, SocketMultiplexer* socketMultiplexer)
throw XSocketCreate(e.what()); throw XSocketCreate(e.what());
} }
LOG((CLOG_DEBUG "Opening new socket: %08X", m_socket));
init(); init();
} }
@ -64,6 +66,8 @@ TCPSocket::TCPSocket(IEventQueue* events, SocketMultiplexer* socketMultiplexer,
{ {
assert(m_socket != NULL); assert(m_socket != NULL);
LOG((CLOG_DEBUG "Opening new socket: %08X", m_socket));
// socket starts in connected state // socket starts in connected state
init(); init();
onConnected(); onConnected();
@ -97,6 +101,8 @@ TCPSocket::bind(const NetworkAddress& addr)
void void
TCPSocket::close() TCPSocket::close()
{ {
LOG((CLOG_DEBUG "Closing socket: %08X", m_socket));
// remove ourself from the multiplexer // remove ourself from the multiplexer
setJob(NULL); setJob(NULL);