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

#5617 Remove plugin infra from Client

This commit is contained in:
Andrew Nelless 2016-09-27 12:25:40 +01:00
parent 27ccddbea4
commit 5774f5a291
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@
#include "client/Client.h" #include "client/Client.h"
#include "../plugin/ns/SecureSocket.h"
#include "client/ServerProxy.h" #include "client/ServerProxy.h"
#include "synergy/Screen.h" #include "synergy/Screen.h"
#include "synergy/FileChunk.h" #include "synergy/FileChunk.h"
@ -33,6 +32,7 @@
#include "net/TCPSocket.h" #include "net/TCPSocket.h"
#include "net/IDataSocket.h" #include "net/IDataSocket.h"
#include "net/ISocketFactory.h" #include "net/ISocketFactory.h"
#include "net/SecureSocket.h"
#include "arch/Arch.h" #include "arch/Arch.h"
#include "base/Log.h" #include "base/Log.h"
#include "base/IEventQueue.h" #include "base/IEventQueue.h"
@ -99,13 +99,6 @@ Client::Client(
new TMethodEventJob<Client>(this, new TMethodEventJob<Client>(this,
&Client::handleFileRecieveCompleted)); &Client::handleFileRecieveCompleted));
} }
if (m_args.m_enableCrypto) {
m_useSecureNetwork = ARCH->plugin().exists(s_pluginNames[kSecureSocket]);
if (m_useSecureNetwork == false) {
LOG((CLOG_NOTE "crypto disabled because of ns plugin not available"));
}
}
} }
Client::~Client() Client::~Client()
@ -593,13 +586,6 @@ Client::cleanupStream()
{ {
delete m_stream; delete m_stream;
m_stream = NULL; m_stream = NULL;
// PacketStreamFilter doen't adopt secure socket, because
// we need to tell the dynamic lib that allocated this object
// to do the deletion.
if (m_useSecureNetwork) {
ARCH->plugin().invoke(s_pluginNames[kSecureSocket], "deleteSocket", NULL);
}
} }
void void