[NY] Simplified SERVCONF interface.

[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..9e120855ea5e788cd89f9f896d3dc02cdaaedc1f 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/netunit.h
+++ b/stglibs/srvconf.lib/include/stg/netunit.h
@@ -29,7 +29,6 @@
 
 #include "stg/blowfish.h"
 
 
 #include "stg/blowfish.h"
 

-#include <list>

 #include <string>
 
 #include <sys/types.h>
 #include <string>
 
 #include <sys/types.h>


@@ -49,7 +48,7 @@
 
 #define MAX_ERR_STR_LEN (64)
 
 
 #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
 {
 
 enum status
 {


@@ -78,21 +77,15 @@ confData
 class NETTRANSACT
 {
 public:
 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);
 
     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();
     int     Connect();
     int     Disconnect();

-    void    Reset();

 private:
     int     TxHeader();
     int     RxHeaderAnswer();
 private:
     int     TxHeader();
     int     RxHeaderAnswer();


@@ -107,16 +100,11 @@ private:
     int     TxData(char * data);
     int     RxDataAnswer();
 
     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;
     std::string server;

-    short unsigned  port;
+    uint16_t  port;

     std::string login;
     std::string password;
     int     outerSocket;
     std::string login;
     std::string password;
     int     outerSocket;

-    std::list<std::string>   answerList;

     RxCallback_t RxCallBack;
     void *  dataRxCallBack;
     std::string errorMsg;
     RxCallback_t RxCallBack;
     void *  dataRxCallBack;
     std::string errorMsg;