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

fixed misused read and write #4313

Browse Source
This commit is contained in:
XinyuHou
2015-01-26 13:23:11 +00:00
parent 06253c965b
commit 10cddb97a8
9 changed files with 185 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/client/Client.cpp
View File

@@ -32,6 +32,7 @@
#include "mt/Thread.h"
#include "io/IStreamFilterFactory.h"
#include "io/CryptoStream.h"
#include "net/TCPSocket.h"
#include "net/IDataSocket.h"
#include "net/ISocketFactory.h"
#include "arch/Arch.h"
@@ -82,7 +83,8 @@ Client::Client(
m_crypto(crypto),
m_sendFileThread(NULL),
m_writeToDropDirThread(NULL),
m_enableDragDrop(enableDragDrop)
m_enableDragDrop(enableDragDrop),
m_socket(NULL)
{
assert(m_socketFactory != NULL);
assert(m_screen != NULL);
@@ -159,6 +161,7 @@ Client::connect()
// create the socket
bool useSecureSocket = ARCH->plugin().exists(s_networkSecurity);
IDataSocket* socket = m_socketFactory->create(useSecureSocket);
m_socket = dynamic_cast<TCPSocket*>(socket);
// filter socket messages, including a packetizing filter
m_stream = socket;
@@ -594,6 +597,8 @@ Client::handleConnected(const Event&, void*)
m_sentClipboard[id] = false;
m_timeClipboard[id] = 0;
}
m_socket->secureConnect();
}
void

3
src/lib/client/Client.h
View File

@@ -37,7 +37,7 @@ class IStreamFilterFactory;
class IEventQueue;
class CryptoStream;
class Thread;
class SecureSocket;
class TCPSocket;
//! Synergy client
/*!
@@ -236,4 +236,5 @@ private:
Thread* m_sendFileThread;
Thread* m_writeToDropDirThread;
bool m_enableDragDrop;
TCPSocket* m_socket;
};