diff options
Diffstat (limited to 'vdr-vdrmanager/vdrmanagerthread.cpp')
-rw-r--r-- | vdr-vdrmanager/vdrmanagerthread.cpp | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/vdr-vdrmanager/vdrmanagerthread.cpp b/vdr-vdrmanager/vdrmanagerthread.cpp index 977f3d1..51301e5 100644 --- a/vdr-vdrmanager/vdrmanagerthread.cpp +++ b/vdr-vdrmanager/vdrmanagerthread.cpp @@ -4,21 +4,17 @@ #include <string.h> #include <vdr/plugin.h> #include <vdr/thread.h> -#include <openssl/ssl.h> - #include "vdrmanagerthread.h" #include "select.h" #include "helpers.h" -cVdrManagerThread::cVdrManagerThread(int port, const char * password, bool forceCheckSvdrp, - bool useSSL, const char * pemFile) +cVdrManagerThread::cVdrManagerThread(int port, const char * password, bool forceCheckSvdrp, int compressionMode) { select = NULL; - this->port = port; - this->password = password; - this->forceCheckSvdrp = forceCheckSvdrp; - this->useSSL = useSSL; - this->pemFile = pemFile; + this -> port = port; + this -> password = password; + this -> forceCheckSvdrp = forceCheckSvdrp; + this -> compressionMode = compressionMode; } cVdrManagerThread::~cVdrManagerThread() @@ -28,11 +24,6 @@ cVdrManagerThread::~cVdrManagerThread() void cVdrManagerThread::Action(void) { - // initialize SSL - if (useSSL) { - InitSSL(); - } - // create listener socket if (!Init()) return; @@ -53,7 +44,7 @@ bool cVdrManagerThread::Init() // create server socket cVdrmanagerServerSocket * sock = new cVdrmanagerServerSocket(); - if (sock == NULL || !sock->Create(port, password, forceCheckSvdrp, useSSL, pemFile)) + if (sock == NULL || !sock->Create(port, password, forceCheckSvdrp, compressionMode)) return false; // register server socket @@ -71,12 +62,3 @@ void cVdrManagerThread::Cleanup() void cVdrManagerThread::Shutdown() { } - -bool cVdrManagerThread::InitSSL() { - - SSL_library_init(); - SSL_load_error_strings(); - ERR_load_BIO_strings(); - ERR_load_SSL_strings(); - -} |