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

Conflicts: 

src/lib/plugin/ns/SecureSocket.cpp
This commit is contained in:
Jerry (Xinyu Hou) 2016-08-24 17:59:53 +01:00 committed by Andrew Nelless
parent 07902d623c
commit e0819b86cd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/plugin/ns/SecureSocket.cpp
View File

@ -128,16 +128,16 @@ void
SecureSocket::secureConnect() SecureSocket::secureConnect()
{ {
setJob(new TSocketMultiplexerMethodJob<SecureSocket>( setJob(new TSocketMultiplexerMethodJob<SecureSocket>(
this, &SecureSocket::serviceConnect, this, &SecureSocket::serviceConnect,
getSocket(), isReadable(), isWritable())); getSocket(), isReadable(), isWritable()));
} }
void void
SecureSocket::secureAccept() SecureSocket::secureAccept()
{ {
setJob(new TSocketMultiplexerMethodJob<SecureSocket>( setJob(new TSocketMultiplexerMethodJob<SecureSocket>(
this, &SecureSocket::serviceAccept, this, &SecureSocket::serviceAccept,
getSocket(), isReadable(), isWritable())); getSocket(), isReadable(), isWritable()));
} }
TCPSocket::EJobResult TCPSocket::EJobResult

8
src/lib/plugin/ns/SecureSocket.h
View File

@ -46,15 +46,15 @@ public:
ISocketMultiplexerJob* ISocketMultiplexerJob*
newJob(); newJob();
void secureConnect();
void secureAccept();
EJobResult doRead();
EJobResult doWrite();
bool isFatal() const { return m_fatal; } bool isFatal() const { return m_fatal; }
void isFatal(bool b) { m_fatal = b; } void isFatal(bool b) { m_fatal = b; }
bool isSecureReady(); bool isSecureReady();
void secureConnect();
void secureAccept();
int secureRead(void* buffer, int size, int& read); int secureRead(void* buffer, int size, int& read);
int secureWrite(const void* buffer, int size, int& wrote); int secureWrite(const void* buffer, int size, int& wrote);
EJobResult doRead();
EJobResult doWrite();
void initSsl(bool server); void initSsl(bool server);
bool loadCertificates(String& CertFile); bool loadCertificates(String& CertFile);