Merge branch 'naffanya-dev'

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

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 8d5591934ecbc1afa02a503264d7c96b5eb6b491..aaba3df6afc4aedbd2d7aafb3b74331472ba1017 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -25,15 +25,17 @@
  */
 
 //---------------------------------------------------------------------------
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <unistd.h>
+
+#include "stg/netunit.h"
+#include "stg/common.h"
 
 #include <cstdio>
+#include <cerrno>
 #include <cstring>
 
-#include "netunit.h"
-#include "common.h"
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <unistd.h>
 
 //---------------------------------------------------------------------------
 
@@ -57,8 +59,6 @@ NETTRANSACT::NETTRANSACT()
       RxCallBack(NULL),
       dataRxCallBack(NULL)
 {
-    memset(login, 0, ADM_LOGIN_LEN);
-    memset(password, 0, ADM_PASSWD_LEN);
 }
 //-----------------------------------------------------------------------------
 void NETTRANSACT::EnDecryptInit(const char * passwd, int, BLOWFISH_CTX *ctx)
@@ -214,6 +214,7 @@ int ret;
 ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
 if (ret <= 0)
     {
+    printf("Receive header answer error: '%s'\n", strerror(errno));
     errorMsg = RECV_HEADER_ANSWER_ERROR;
     return st_recv_fail;
     }
@@ -243,7 +244,7 @@ char loginZ[ADM_LOGIN_LEN];
 int ret;
 
 memset(loginZ, 0, ADM_LOGIN_LEN);
-strncpy(loginZ, login, ADM_LOGIN_LEN);
+strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
 ret = send(outerSocket, loginZ, ADM_LOGIN_LEN, 0);
 
 if (ret <= 0)
@@ -263,6 +264,7 @@ int ret;
 ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0);
 if (ret <= 0)
     {
+    printf("Receive login answer error: '%s'\n", strerror(errno));
     errorMsg = RECV_LOGIN_ANSWER_ERROR;
     return st_recv_fail;
     }
@@ -293,10 +295,10 @@ char ct[ENC_MSG_LEN];
 int ret;
 
 memset(loginZ, 0, ADM_LOGIN_LEN);
-strncpy(loginZ, login, ADM_LOGIN_LEN);
+strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
 
 BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx);
 
 for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++)
     {
@@ -320,6 +322,7 @@ int ret;
 ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
 if (ret <= 0)
     {
+    printf("Receive secret login answer error: '%s'\n", strerror(errno));
     errorMsg = RECV_LOGIN_ANSWER_ERROR;
     return st_recv_fail;
     }
@@ -354,7 +357,7 @@ int n = strlen(text) / ENC_MSG_LEN;
 int r = strlen(text) % ENC_MSG_LEN;
 
 BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx);
 
 for (j = 0; j < n; j++)
     {
@@ -372,7 +375,7 @@ memset(textZ, 0, ENC_MSG_LEN);
 if (r)
     strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
 
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx);
 
 Encrypt(ct, textZ, &ctx);
 ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
@@ -392,7 +395,7 @@ char buffS[ENC_MSG_LEN];
 char passwd[ADM_PASSWD_LEN];
 
 memset(passwd, 0, ADM_PASSWD_LEN);
-strncpy(passwd, password, ADM_PASSWD_LEN);
+strncpy(passwd, password.c_str(), ADM_PASSWD_LEN);
 memset(buff, 0, ENC_MSG_LEN);
 
 int l = strlen(data)/ENC_MSG_LEN;
@@ -420,13 +423,14 @@ char bufferS[ENC_MSG_LEN];
 char buffer[ENC_MSG_LEN + 1];
 
 BLOWFISH_CTX ctx;
-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx);
 
 while (1)
     {
     ret = recv(outerSocket, &bufferS[n++], 1, 0);
     if (ret <= 0)
         {
+        printf("Receive data error: '%s'\n", strerror(errno));
         close(outerSocket);
         errorMsg = RECV_DATA_ANSWER_ERROR;
         return st_recv_fail;
@@ -434,22 +438,22 @@ while (1)
 
     if (n == ENC_MSG_LEN)
         {
-
         n = 0;
         Decrypt(buffer, bufferS, &ctx);
         buffer[ENC_MSG_LEN] = 0;
 
+        printf("%s", buffer);
+
         answerList.push_back(buffer);
 
         for (int j = 0; j < ENC_MSG_LEN; j++)
             {
             if (buffer[j] == 0)
                 {
+                printf("\n");
                 if (RxCallBack)
                     if (st_ok != RxCallBack(dataRxCallBack, &answerList))
-                        {
                         return st_xml_parse_error;
-                        }
                 return st_ok;
                 }
             }
@@ -459,12 +463,12 @@ while (1)
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetLogin(const char * l)
 {
-strncpy(login, l, ADM_LOGIN_LEN);
+login = l;
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetPassword(const char * p)
 {
-strncpy(password, p, ADM_PASSWD_LEN);
+password = p;
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetServer(const char * serverName)