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

#4740 Passed IDataSocket directly

This commit is contained in:
Xinyu Hou 2016-09-12 11:11:55 -04:00 committed by Andrew Nelless
parent 61c0bd1910
commit 07f7baf335
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/server/ClientListener.cpp
View File

@ -137,35 +137,34 @@ void
ClientListener::handleClientConnecting(const Event&, void*) ClientListener::handleClientConnecting(const Event&, void*)
{ {
// accept client connection // accept client connection
synergy::IStream* stream = m_listen->accept(); IDataSocket* socket = m_listen->accept();
if (stream == NULL) { if (socket == NULL) {
return; return;
} }
m_events->adoptHandler(m_events->forClientListener().accepted(), m_events->adoptHandler(m_events->forClientListener().accepted(),
stream->getEventTarget(), socket->getEventTarget(),
new TMethodEventJob<ClientListener>(this, new TMethodEventJob<ClientListener>(this,
&ClientListener::handleClientAccepted, stream)); &ClientListener::handleClientAccepted, socket));
// When using non SSL, server accepts clients immediately, while SSL // When using non SSL, server accepts clients immediately, while SSL
// has to call secure accept which may require retry // has to call secure accept which may require retry
if (!m_useSecureNetwork) { if (!m_useSecureNetwork) {
m_events->addEvent(Event(m_events->forClientListener().accepted(), m_events->addEvent(Event(m_events->forClientListener().accepted(),
stream->getEventTarget())); socket->getEventTarget()));
} }
} }
void void
ClientListener::handleClientAccepted(const Event&, void* vstream) ClientListener::handleClientAccepted(const Event&, void* vsocket)
{ {
LOG((CLOG_NOTE "accepted client connection")); LOG((CLOG_NOTE "accepted client connection"));
synergy::IStream* stream = reinterpret_cast<synergy::IStream*>(vstream); IDataSocket* socket = reinterpret_cast<IDataSocket*>(vsocket);
IDataSocket* socket = dynamic_cast<IDataSocket*>(stream);
// filter socket messages, including a packetizing filter // filter socket messages, including a packetizing filter
stream = new PacketStreamFilter(m_events, socket); synergy::IStream* stream = new PacketStreamFilter(m_events, socket);
assert(m_server != NULL); assert(m_server != NULL);
// create proxy for unknown client // create proxy for unknown client