Область видимості outerSocket, outerAddr і outerAddrLen звужено до

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

diff --git a/stglibs/srvconf.lib/netunit.h b/stglibs/srvconf.lib/netunit.h
index 72d3b721f7caf5bc0c21897bd80c7d587c272fea..91218b186284a02eec340ee444e0e64fcb34b16e 100644 (file)
--- a/stglibs/srvconf.lib/netunit.h
+++ b/stglibs/srvconf.lib/netunit.h
@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

+

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


@@ -80,7 +81,7 @@ class NETTRANSACT
 public:
     NETTRANSACT();
     int     Transact(const char * data);
 public:
     NETTRANSACT();
     int     Transact(const char * data);

-    char   *GetError();
+    const std::string & GetError() const;

 
     void    SetRxCallback(void * data, RxCallback_t);
 
 
     void    SetRxCallback(void * data, RxCallback_t);
 


@@ -111,20 +112,15 @@ private:
     void EnDecryptInit(const char * passwd, int passwdLen, BLOWFISH_CTX *ctx);
     void Decrypt(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);
 

-    //unsigned ip;
-    char    server[SERVER_NAME_LEN];
+    std::string server;

     short unsigned  port;
     short unsigned  port;

-    char    login[ADM_LOGIN_LEN];
-    char    password[ADM_PASSWD_LEN];
+    std::string login;
+    std::string password;

     int     outerSocket;
     int     outerSocket;

-    int     localSocket;
-    struct  sockaddr_in outerAddr;
-    struct  sockaddr_in localAddr;
-    int     error;

     std::list<std::string>   answerList;
     RxCallback_t RxCallBack;
     void *  dataRxCallBack;
     std::list<std::string>   answerList;
     RxCallback_t RxCallBack;
     void *  dataRxCallBack;

-    char    errorMsg[MAX_ERR_STR_LEN];
+    std::string errorMsg;

 };
 //---------------------------------------------------------------------------
 #endif
 };
 //---------------------------------------------------------------------------
 #endif