backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-11 22:36:05 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into jerry-sandbox

Browse Source
This commit is contained in:
Jerry (Xinyu Hou)
2015-05-22 11:28:39 -07:00
parent a81b88c730 86ad2bf080
commit c1d859e35a
6 changed files with 144 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,26 +142,34 @@ ClientListener::handleClientConnecting(const Event&, void*)
{
// accept client connection
IDataSocket* socket = m_listen->accept();
synergy::IStream* stream = socket;
if (stream == NULL) {
if (socket == NULL) {
return;
}
LOG((CLOG_NOTE "accepted client connection"));
if (m_useSecureNetwork) {
LOG((CLOG_DEBUG2 "attempting sercure Connection"));
while(!socket->isReady()) {
if(socket->isFatal()) {
m_listen->deleteSocket(socket);
return;
}
LOG((CLOG_DEBUG2 "retrying sercure Connection"));
ARCH->sleep(.5f);
}
}
LOG((CLOG_DEBUG2 "sercure Connection established:%d"));
synergy::IStream* stream = socket;
// filter socket messages, including a packetizing filter
bool adopt = !m_useSecureNetwork;
stream = new PacketStreamFilter(m_events, stream, adopt);
assert(m_server != NULL);
if (m_useSecureNetwork) {
while(!socket->isReady()) {
ARCH->sleep(.5f);
}
}
// create proxy for unknown client
ClientProxyUnknown* client = new ClientProxyUnknown(stream, 30.0, m_server, m_events);
m_newClients.insert(client);