Merge branch 'master' of github.com:debauchee/barrier
This commit is contained in:
commit
dea4359cce
|
@ -859,5 +859,9 @@ SecureSocket::showSecureConnectInfo()
|
|||
void
|
||||
SecureSocket::handleTCPConnected(const Event& event, void*)
|
||||
{
|
||||
if (getSocket() == nullptr) {
|
||||
LOG((CLOG_DEBUG "disregarding stale connect event"));
|
||||
return;
|
||||
}
|
||||
secureConnect();
|
||||
}
|
||||
|
|
|
@ -51,6 +51,8 @@ TCPSocket::TCPSocket(IEventQueue* events, SocketMultiplexer* socketMultiplexer)
|
|||
throw XSocketCreate(e.what());
|
||||
}
|
||||
|
||||
LOG((CLOG_DEBUG "Opening new socket: %08X", m_socket));
|
||||
|
||||
init();
|
||||
}
|
||||
|
||||
|
@ -64,6 +66,8 @@ TCPSocket::TCPSocket(IEventQueue* events, SocketMultiplexer* socketMultiplexer,
|
|||
{
|
||||
assert(m_socket != NULL);
|
||||
|
||||
LOG((CLOG_DEBUG "Opening new socket: %08X", m_socket));
|
||||
|
||||
// socket starts in connected state
|
||||
init();
|
||||
onConnected();
|
||||
|
@ -97,6 +101,8 @@ TCPSocket::bind(const NetworkAddress& addr)
|
|||
void
|
||||
TCPSocket::close()
|
||||
{
|
||||
LOG((CLOG_DEBUG "Closing socket: %08X", m_socket));
|
||||
|
||||
// remove ourself from the multiplexer
|
||||
setJob(NULL);
|
||||
|
||||
|
|
Loading…
Reference in New Issue