[NY] Removed more garbage.

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

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index ec796f7f1506a40885b041d74d5e86146675c268..4c3cc92ed8bf7626b1f25e40b46e2d1c161317ab 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -25,14 +25,25 @@
  */
 
 //---------------------------------------------------------------------------
  */
 
 //---------------------------------------------------------------------------

-#include <stdio.h>
-#include <string.h>
+
+#include "stg/netunit.h"
+#include "stg/common.h"
+#include "stg/blowfish.h"
+
+#include <cstdio>
+#include <cerrno>
+#include <cstring>
+

 #include <netdb.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 

-#include "netunit.h"
-#include "common.h"
+namespace
+{
+
+const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048;
+
+}

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -50,41 +61,16 @@
 #define RECV_HEADER_ANSWER_ERROR    "Recv header answer error!"
 
 //---------------------------------------------------------------------------
 #define RECV_HEADER_ANSWER_ERROR    "Recv header answer error!"
 
 //---------------------------------------------------------------------------

-NETTRANSACT::NETTRANSACT()
-    : port(0),
+NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p,
+                         const std::string & l, const std::string & pwd)
+    : server(s),
+      port(p),
+      login(l),
+      password(pwd),

       outerSocket(-1),
       RxCallBack(NULL),
       dataRxCallBack(NULL)
 {
       outerSocket(-1),
       RxCallBack(NULL),
       dataRxCallBack(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)
-{
-unsigned char * keyL = NULL; // ��� ������
-
-keyL = new unsigned char[PASSWD_LEN];
-
-memset(keyL, 0, PASSWD_LEN);
-
-strncpy((char *)keyL, passwd, PASSWD_LEN);
-
-Blowfish_Init(ctx, keyL, PASSWD_LEN);
-
-delete[] keyL;
-}
-//-----------------------------------------------------------------------------
-void NETTRANSACT::Encrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
-{
-EncodeString(d, s, ctx);
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::Decrypt(char * d, const char * s, BLOWFISH_CTX *ctx)
-{
-DecodeString(d, s, ctx);

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


@@ -94,7 +80,7 @@ int ret;
 outerSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (outerSocket < 0)
     {
 outerSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (outerSocket < 0)
     {

-    strcpy(errorMsg, CREATE_SOCKET_ERROR);
+    errorMsg = CREATE_SOCKET_ERROR;

     return st_conn_fail;
     }
 
     return st_conn_fail;
     }
 


@@ -105,14 +91,14 @@ struct hostent he;
 struct hostent * phe;
 
 unsigned long ip;
 struct hostent * phe;
 
 unsigned long ip;

-ip = inet_addr(server);
+ip = inet_addr(server.c_str());

 
 if (ip == INADDR_NONE)
     {
 
 if (ip == INADDR_NONE)
     {

-    phe = gethostbyname(server);
+    phe = gethostbyname(server.c_str());

     if (phe == NULL)
         {
     if (phe == NULL)
         {

-        sprintf(errorMsg, "DNS error.\nCan not reslove %s", server);
+        errorMsg = "DNS error.\nCan not reslove " + server;

         return st_dns_err;
         }
 
         return st_dns_err;
         }
 


@@ -127,7 +113,7 @@ ret = connect(outerSocket, (struct sockaddr*)&outerAddr, sizeof(outerAddr));
 
 if (ret < 0)
     {
 
 if (ret < 0)
     {

-    strcpy(errorMsg, CONNECT_FAILED);
+    errorMsg = CONNECT_FAILED;

     close(outerSocket);
     return st_conn_fail;
     }
     close(outerSocket);
     return st_conn_fail;
     }


@@ -200,7 +186,7 @@ int ret;
 ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0);
 if (ret <= 0)
     {
 ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0);
 if (ret <= 0)
     {

-    strcpy(errorMsg, SEND_HEADER_ERROR);
+    errorMsg = SEND_HEADER_ERROR;

     return st_send_fail;
     }
 
     return st_send_fail;
     }
 


@@ -215,7 +201,8 @@ int ret;
 ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
 if (ret <= 0)
     {
 ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0);
 if (ret <= 0)
     {

-    strcpy(errorMsg, RECV_HEADER_ANSWER_ERROR);
+    printf("Receive header answer error: '%s'\n", strerror(errno));
+    errorMsg = RECV_HEADER_ANSWER_ERROR;

     return st_recv_fail;
     }
 
     return st_recv_fail;
     }
 


@@ -227,12 +214,12 @@ else
     {
     if (strncmp(ERR_HEADER, buffer, strlen(ERR_HEADER)) == 0)
         {
     {
     if (strncmp(ERR_HEADER, buffer, strlen(ERR_HEADER)) == 0)
         {

-        strcpy(errorMsg, INCORRECT_HEADER);
+        errorMsg = INCORRECT_HEADER;

         return st_header_err;
         }
     else
         {
         return st_header_err;
         }
     else
         {

-        strcpy(errorMsg, UNKNOWN_ERROR);
+        errorMsg = UNKNOWN_ERROR;

         return st_unknown_err;
         }
     }
         return st_unknown_err;
         }
     }


@@ -244,12 +231,12 @@ char loginZ[ADM_LOGIN_LEN];
 int ret;
 
 memset(loginZ, 0, 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)
     {
 ret = send(outerSocket, loginZ, ADM_LOGIN_LEN, 0);
 
 if (ret <= 0)
     {

-    strcpy(errorMsg, SEND_LOGIN_ERROR);
+    errorMsg = SEND_LOGIN_ERROR;

     return st_send_fail;
     }
 
     return st_send_fail;
     }
 


@@ -259,12 +246,13 @@ return st_ok;
 int NETTRANSACT::RxLoginAnswer()
 {
 char buffer[sizeof(OK_LOGIN)+1];
 int NETTRANSACT::RxLoginAnswer()
 {
 char buffer[sizeof(OK_LOGIN)+1];

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

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

-    strcpy(errorMsg, RECV_LOGIN_ANSWER_ERROR);
+    printf("Receive login answer error: '%s'\n", strerror(errno));
+    errorMsg = RECV_LOGIN_ANSWER_ERROR;

     return st_recv_fail;
     }
 
     return st_recv_fail;
     }
 


@@ -276,12 +264,12 @@ else
     {
     if (strncmp(ERR_LOGIN, buffer, strlen(ERR_LOGIN)) == 0)
         {
     {
     if (strncmp(ERR_LOGIN, buffer, strlen(ERR_LOGIN)) == 0)
         {

-        strcpy(errorMsg, INCORRECT_LOGIN);
+        errorMsg = INCORRECT_LOGIN;

         return st_login_err;
         }
     else
         {
         return st_login_err;
         }
     else
         {

-        strcpy(errorMsg, UNKNOWN_ERROR);
+        errorMsg = UNKNOWN_ERROR;

         return st_unknown_err;
         }
     }
         return st_unknown_err;
         }
     }


@@ -294,18 +282,18 @@ char ct[ENC_MSG_LEN];
 int ret;
 
 memset(loginZ, 0, 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);

 
 BLOWFISH_CTX ctx;
 
 BLOWFISH_CTX ctx;

-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);

 
 for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++)
     {
 
 for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++)
     {

-    Encrypt(ct, loginZ + j*ENC_MSG_LEN, &ctx);
+    EncodeString(ct, loginZ + j*ENC_MSG_LEN, &ctx);

     ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
     if (ret <= 0)
         {
     ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
     if (ret <= 0)
         {

-        strcpy(errorMsg, SEND_LOGIN_ERROR);
+        errorMsg = SEND_LOGIN_ERROR;

         return st_send_fail;
         }
     }
         return st_send_fail;
         }
     }


@@ -321,7 +309,8 @@ int ret;
 ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
 if (ret <= 0)
     {
 ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
 if (ret <= 0)
     {

-    strcpy(errorMsg, RECV_LOGIN_ANSWER_ERROR);
+    printf("Receive secret login answer error: '%s'\n", strerror(errno));
+    errorMsg = RECV_LOGIN_ANSWER_ERROR;

     return st_recv_fail;
     }
 
     return st_recv_fail;
     }
 


@@ -333,12 +322,12 @@ else
     {
     if (strncmp(ERR_LOGINS, buffer, strlen(ERR_LOGINS)) == 0)
         {
     {
     if (strncmp(ERR_LOGINS, buffer, strlen(ERR_LOGINS)) == 0)
         {

-        strcpy(errorMsg, INCORRECT_LOGIN);
+        errorMsg = INCORRECT_LOGIN;

         return st_logins_err;
         }
     else
         {
         return st_logins_err;
         }
     else
         {

-        strcpy(errorMsg, UNKNOWN_ERROR);
+        errorMsg = UNKNOWN_ERROR;

         return st_unknown_err;
         }
     }
         return st_unknown_err;
         }
     }


@@ -355,16 +344,16 @@ int n = strlen(text) / ENC_MSG_LEN;
 int r = strlen(text) % ENC_MSG_LEN;
 
 BLOWFISH_CTX ctx;
 int r = strlen(text) % ENC_MSG_LEN;
 
 BLOWFISH_CTX ctx;

-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);

 
 for (j = 0; j < n; j++)
     {
     strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
 
 for (j = 0; j < n; j++)
     {
     strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);

-    Encrypt(ct, textZ, &ctx);
+    EncodeString(ct, textZ, &ctx);

     ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
     if (ret <= 0)
         {
     ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
     if (ret <= 0)
         {

-        strcpy(errorMsg, SEND_DATA_ERROR);
+        errorMsg = SEND_DATA_ERROR;

         return st_send_fail;
         }
     }
         return st_send_fail;
         }
     }


@@ -373,13 +362,13 @@ memset(textZ, 0, ENC_MSG_LEN);
 if (r)
     strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
 
 if (r)
     strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
 

-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);

 
 

-Encrypt(ct, textZ, &ctx);
+EncodeString(ct, textZ, &ctx);

 ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
 if (ret <= 0)
     {
 ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
 if (ret <= 0)
     {

-    strcpy(errorMsg, SEND_DATA_ERROR);
+    errorMsg = SEND_DATA_ERROR;

     return st_send_fail;
     }
 
     return st_send_fail;
     }
 


@@ -393,7 +382,7 @@ char buffS[ENC_MSG_LEN];
 char passwd[ADM_PASSWD_LEN];
 
 memset(passwd, 0, ADM_PASSWD_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;
 memset(buff, 0, ENC_MSG_LEN);
 
 int l = strlen(data)/ENC_MSG_LEN;


@@ -401,12 +390,12 @@ if (strlen(data)%ENC_MSG_LEN)
     l++;
 
 BLOWFISH_CTX ctx;
     l++;
 
 BLOWFISH_CTX ctx;

-EnDecryptInit(passwd, PASSWD_LEN, &ctx);
+EnDecodeInit(passwd, PASSWD_LEN, &ctx);

 
 for (int j = 0; j < l; j++)
     {
     strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);
 
 for (int j = 0; j < l; j++)
     {
     strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);

-    Encrypt(buffS, buff, &ctx);
+    EncodeString(buffS, buff, &ctx);

     send(outerSocket, buffS, ENC_MSG_LEN, 0);
     }
 
     send(outerSocket, buffS, ENC_MSG_LEN, 0);
     }
 


@@ -415,82 +404,60 @@ return 0;
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxDataAnswer()
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxDataAnswer()
 {

-int n = 0;
-int ret;
-char bufferS[ENC_MSG_LEN];
-char buffer[ENC_MSG_LEN + 1];
-

 BLOWFISH_CTX ctx;
 BLOWFISH_CTX ctx;

-EnDecryptInit(password, PASSWD_LEN, &ctx);
+EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);

 
 

-while (1)
+std::string chunk;
+while (true)

     {
     {

-    ret = recv(outerSocket, &bufferS[n++], 1, 0);
-    if (ret <= 0)
+    char bufferS[ENC_MSG_LEN];
+    size_t toRead = ENC_MSG_LEN;
+    while (toRead > 0)

         {
         {

-        close(outerSocket);
-        strcpy(errorMsg, RECV_DATA_ANSWER_ERROR);
-        return st_recv_fail;
+        int ret = recv(outerSocket, &bufferS[ENC_MSG_LEN - toRead], toRead, 0);
+        if (ret <= 0)
+            {
+            printf("Receive data error: '%s'\n", strerror(errno));
+            close(outerSocket);
+            errorMsg = RECV_DATA_ANSWER_ERROR;
+            return st_recv_fail;
+            }
+        toRead -= ret;

         }
 
         }
 

-    if (n == ENC_MSG_LEN)
-        {
+    char buffer[ENC_MSG_LEN];
+    DecodeString(buffer, bufferS, &ctx);

 
 

-        n = 0;
-        Decrypt(buffer, bufferS, &ctx);
-        buffer[ENC_MSG_LEN] = 0;
+    bool final = false;
+    size_t pos = 0;
+    for (; pos < ENC_MSG_LEN && buffer[pos] != 0; pos++);
+    if (pos < ENC_MSG_LEN && buffer[pos] == 0)
+        final = true;

 
 

-        answerList.push_back(buffer);
+    if (pos > 0)
+        chunk.append(&buffer[0], &buffer[pos]);

 
 

-        for (int j = 0; j < ENC_MSG_LEN; j++)
-            {
-            if (buffer[j] == 0)
-                {
-                if (RxCallBack)
-                    if (st_ok != RxCallBack(dataRxCallBack, &answerList))
-                        {
-                        return st_xml_parse_error;
-                        }
-                return st_ok;
-                }
-            }
+    if (chunk.length() > MAX_XML_CHUNK_LENGTH || final)
+        {
+        if (RxCallBack != NULL)
+            if (!RxCallBack(dataRxCallBack, chunk, final))
+                return st_xml_parse_error;
+        chunk.clear();

         }
         }

+
+    if (final)
+        return st_ok;

     }
 }
 //---------------------------------------------------------------------------
     }
 }
 //---------------------------------------------------------------------------

-void NETTRANSACT::SetLogin(const char * l)
-{
-strncpy(login, l, ADM_LOGIN_LEN);
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetPassword(const char * p)
-{
-strncpy(password, p, ADM_PASSWD_LEN);
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetServer(const char * serverName)
-{
-strncpy(server, serverName, SERVER_NAME_LEN);
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetServerPort(short unsigned p)
-{
-port = p;
-}
-//---------------------------------------------------------------------------

 void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb)
 {
 RxCallBack = cb;
 dataRxCallBack = data;
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb)
 {
 RxCallBack = cb;
 dataRxCallBack = data;
 }
 //---------------------------------------------------------------------------

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

 {
 return errorMsg;
 }
 //---------------------------------------------------------------------------
 {
 return errorMsg;
 }
 //---------------------------------------------------------------------------

-void NETTRANSACT::Reset()
-{
-answerList.clear();
-}
-//---------------------------------------------------------------------------