[NY] Removed garbage.

[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 e288df86595e272e4aabcc6b597fe70b60459e5c..9e120855ea5e788cd89f9f896d3dc02cdaaedc1f 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/netunit.h
+++ b/stglibs/srvconf.lib/include/stg/netunit.h
@@ -27,14 +27,13 @@
 #ifndef NetUnitH
 #define NetUnitH
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#include "stg/blowfish.h"
 
-#include <list>
 #include <string>
 
-#include "stg/blowfish.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
@@ -49,7 +48,7 @@
 
 #define MAX_ERR_STR_LEN (64)
 
-typedef int(*RxCallback_t)(void *, std::list<std::string> *);
+typedef bool (* RxCallback_t)(void *, const std::string &, bool);
 
 enum status
 {
@@ -78,21 +77,15 @@ confData
 class NETTRANSACT
 {
 public:
-    NETTRANSACT();
+    NETTRANSACT(const std::string & server, uint16_t port,
+                const std::string & login, const std::string & password);
     int     Transact(const char * data);
     const std::string & GetError() const;
 
     void    SetRxCallback(void * data, RxCallback_t);
 
-    void    SetServer(const char * serverName);
-    void    SetServerPort(short unsigned p);
-
-    void    SetLogin(const char * l);
-    void    SetPassword(const char * p);
-    ////////////////////////////////////////////
     int     Connect();
     int     Disconnect();
-    void    Reset();
 private:
     int     TxHeader();
     int     RxHeaderAnswer();
@@ -107,16 +100,11 @@ private:
     int     TxData(char * data);
     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;
+    uint16_t  port;
     std::string login;
     std::string password;
     int     outerSocket;
-    std::list<std::string>   answerList;
     RxCallback_t RxCallBack;
     void *  dataRxCallBack;
     std::string errorMsg;