1 files changed, 13 insertions, 10 deletions
diff --git a/vdr-vdrmanager/sock.h b/vdr-vdrmanager/sock.h
index 94da4b2..25a7b83 100644
--- a/vdr-vdrmanager/sock.h
+++ b/vdr-vdrmanager/sock.h
@@ -5,10 +5,10 @@
 #ifndef _VDRMON_SOCK
 #define _VDRMON_SOCK
 
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <string>
-#include <openssl/ssl.h>
 
 using namespace std;
 
@@ -18,7 +18,7 @@ protected:
   int sock;
   const char * password;
   bool forceCheckSvdrp;
-  bool useSSL;
+  int compressionMode;
 protected:
   cVdrmanagerSocket();
   bool IsPasswordSet();
@@ -28,7 +28,6 @@ public:
   int GetSocket();
   bool MakeDontBlock();
   const char * GetPassword();
-  void LogSSLError();
 };
 
 class cVdrmanagerClientSocket : public cVdrmanagerSocket
@@ -36,12 +35,18 @@ class cVdrmanagerClientSocket : public cVdrmanagerSocket
 private:
   string readbuf;
   string writebuf;
+  char * sendbuf;
+  size_t sendsize;
+  size_t sendoffset;
   bool disconnected;
+  bool initDisconnect;
   int client;
   bool login;
-  SSL * sslContext;
+  bool compression;
+  bool initCompression;
+  int compressionMode;
 public:
-  cVdrmanagerClientSocket(const char * password);
+  cVdrmanagerClientSocket(const char * password, int compressionMode);
   virtual ~cVdrmanagerClientSocket();
   bool Attach(int fd);
   bool IsLineComplete();
@@ -55,19 +60,17 @@ public:
   bool WritePending();
   bool IsLoggedIn();
   void SetLoggedIn();
-  bool InitSSL(SSL_CTX * sslContext);
+  void ActivateCompression();
+  void Compress();
 };
 
 class cVdrmanagerServerSocket : public cVdrmanagerSocket
 {
-private:
-  SSL_CTX * sslContext;
 public:
   cVdrmanagerServerSocket();
   virtual ~cVdrmanagerServerSocket();
-  bool Create(int port, const char * password, bool forceCheckSvdrp, bool useSSL, const char * pemFile);
+  bool Create(int port, const char * password, bool forceCheckSvdrp, int compressionMode);
   cVdrmanagerClientSocket * Accept();
-  bool InitSSL(const char * pemFile);
 };
 
 #endif