В библиотеке поддержки протокола конфигуратора в модуле netunit

проведена чистка кода, убраны неиспользуемые переменные,
    проинициализированы члены классов в конструкторах через списки
    инициализации

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 68eea74821286954564bcd62fc712317f770aeaf..ec796f7f1506a40885b041d74d5e86146675c268 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -51,13 +51,20 @@
 
 //---------------------------------------------------------------------------
 NETTRANSACT::NETTRANSACT()
 
 //---------------------------------------------------------------------------
 NETTRANSACT::NETTRANSACT()

+    : port(0),
+      outerSocket(-1),
+      RxCallBack(NULL),
+      dataRxCallBack(NULL)

 {
 {

-RxCallBack = NULL;
+    memset(server, 0, SERVER_NAME_LEN);
+    memset(login, 0, ADM_LOGIN_LEN);
+    memset(password, 0, ADM_PASSWD_LEN);
+    memset(errorMsg, 0, MAX_ERR_STR_LEN);

 }
 //-----------------------------------------------------------------------------
 void NETTRANSACT::EnDecryptInit(const char * passwd, int, BLOWFISH_CTX *ctx)
 {
 }
 //-----------------------------------------------------------------------------
 void NETTRANSACT::EnDecryptInit(const char * passwd, int, BLOWFISH_CTX *ctx)
 {

-unsigned char * keyL = NULL;//[PASSWD_LEN];  // ��� ������
+unsigned char * keyL = NULL; // ��� ������

 
 keyL = new unsigned char[PASSWD_LEN];
 
 
 keyL = new unsigned char[PASSWD_LEN];
 


@@ -72,28 +79,12 @@ delete[] keyL;
 //-----------------------------------------------------------------------------
 void NETTRANSACT::Encrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
 {
 //-----------------------------------------------------------------------------
 void NETTRANSACT::Encrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
 {

-/*unsigned char ss[8];
-
-memcpy(ss, s, 8);
-
-Blowfish_Encrypt(ctx, (uint32_t *)ss, (uint32_t *)(ss + 4));
-
-memcpy(d, ss, 8);*/

 EncodeString(d, s, ctx);
 EncodeString(d, s, ctx);

-

 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::Decrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
 {
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::Decrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
 {

-/*unsigned char ss[8];
-
-memcpy(ss, s, 8);
-
-Blowfish_Decrypt(ctx, (uint32_t *)ss, (uint32_t *)(ss + 4));
-
-memcpy(d, ss, 8);*/

 DecodeString(d, s, ctx);
 DecodeString(d, s, ctx);

-

 }
 //---------------------------------------------------------------------------
 int NETTRANSACT::Connect()
 }
 //---------------------------------------------------------------------------
 int NETTRANSACT::Connect()


@@ -107,8 +98,8 @@ if (outerSocket < 0)
     return st_conn_fail;
     }
 
     return st_conn_fail;
     }
 

+struct sockaddr_in outerAddr;

 memset(&outerAddr, 0, sizeof(outerAddr));
 memset(&outerAddr, 0, sizeof(outerAddr));

-memset(&localAddr, 0, sizeof(localAddr));

 
 struct hostent he;
 struct hostent * phe;
 
 struct hostent he;
 struct hostent * phe;


@@ -219,12 +210,11 @@ return st_ok;
 int NETTRANSACT::RxHeaderAnswer()
 {
 char buffer[sizeof(STG_HEADER)+1];
 int NETTRANSACT::RxHeaderAnswer()
 {
 char buffer[sizeof(STG_HEADER)+1];

-int ret;//, we;
+int ret;

 
 ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
 if (ret <= 0)
     {
 
 ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
 if (ret <= 0)
     {

-    //we = WSAGetLastError();

     strcpy(errorMsg, RECV_HEADER_ANSWER_ERROR);
     return st_recv_fail;
     }
     strcpy(errorMsg, RECV_HEADER_ANSWER_ERROR);
     return st_recv_fail;
     }


@@ -504,4 +494,3 @@ void NETTRANSACT::Reset()
 answerList.clear();
 }
 //---------------------------------------------------------------------------
 answerList.clear();
 }
 //---------------------------------------------------------------------------

-

diff --git a/stglibs/srvconf.lib/netunit.h b/stglibs/srvconf.lib/netunit.h
index 72d3b721f7caf5bc0c21897bd80c7d587c272fea..f5161503d5f11722d092a57d8375d5e6aef75271 100644 (file)
--- a/stglibs/srvconf.lib/netunit.h
+++ b/stglibs/srvconf.lib/netunit.h
@@ -111,16 +111,11 @@ 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];
     short unsigned  port;
     char    login[ADM_LOGIN_LEN];
     char    password[ADM_PASSWD_LEN];
     int     outerSocket;
     char    server[SERVER_NAME_LEN];
     short unsigned  port;
     char    login[ADM_LOGIN_LEN];
     char    password[ADM_PASSWD_LEN];
     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;