Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / stglibs / srvconf.lib / include / stg / netunit.h

diff --git a/stglibs/srvconf.lib/include/stg/netunit.h b/stglibs/srvconf.lib/include/stg/netunit.h
index d40b4c6ac2585f08db94036605b59dc0f250edea..664eee633328978d5ff304129d03e6a32b3c1dfc 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/netunit.h
+++ b/stglibs/srvconf.lib/include/stg/netunit.h
@@ -27,14 +27,14 @@
 #ifndef NetUnitH
 #define NetUnitH
 
 #ifndef NetUnitH
 #define NetUnitH
 

-#include "stg/blowfish.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>

 
 #include <list>
 #include <string>
 
 
 #include <list>
 #include <string>
 

-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#include "stg/blowfish.h"

 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"


@@ -104,13 +104,8 @@ private:
     int     RxLoginSAnswer();
 
     int     TxData(const char * text);
     int     RxLoginSAnswer();
 
     int     TxData(const char * text);

-    int     TxData(char * data);

     int     RxDataAnswer();
 
     int     RxDataAnswer();
 

-    void Encrypt(char * d, const char * s, BLOWFISH_CTX *ctx);
-    void EnDecryptInit(const char * passwd, int passwdLen, BLOWFISH_CTX *ctx);
-    void Decrypt(char * d, const char * s, BLOWFISH_CTX *ctx);
-

     std::string server;
     short unsigned  port;
     std::string login;
     std::string server;
     short unsigned  port;
     std::string login;