[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 aaba3df6afc4aedbd2d7aafb3b74331472ba1017..4c3cc92ed8bf7626b1f25e40b46e2d1c161317ab 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -28,6 +28,7 @@
 
 #include "stg/netunit.h"
 #include "stg/common.h"
 
 #include "stg/netunit.h"
 #include "stg/common.h"

+#include "stg/blowfish.h"

 
 #include <cstdio>
 #include <cerrno>
 
 #include <cstdio>
 #include <cerrno>


@@ -37,6 +38,13 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
 #include <arpa/inet.h>
 #include <unistd.h>
 

+namespace
+{
+
+const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048;
+
+}
+

 //---------------------------------------------------------------------------
 
 #define SEND_DATA_ERROR             "Send data error!"
 //---------------------------------------------------------------------------
 
 #define SEND_DATA_ERROR             "Send data error!"


@@ -53,38 +61,17 @@
 #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)
 {
 }

-//-----------------------------------------------------------------------------
-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()
 {


@@ -298,11 +285,11 @@ memset(loginZ, 0, ADM_LOGIN_LEN);
 strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
 
 BLOWFISH_CTX ctx;
 strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
 
 BLOWFISH_CTX ctx;

-EnDecryptInit(password.c_str(), 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)
         {


@@ -357,12 +344,12 @@ 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.c_str(), 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)
         {


@@ -375,9 +362,9 @@ 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.c_str(), 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)
     {


@@ -403,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);
     }
 


@@ -417,70 +404,52 @@ 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.c_str(), 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)

         {
         {

-        printf("Receive data error: '%s'\n", strerror(errno));
-        close(outerSocket);
-        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)
-        {
-        n = 0;
-        Decrypt(buffer, bufferS, &ctx);
-        buffer[ENC_MSG_LEN] = 0;
+    char buffer[ENC_MSG_LEN];
+    DecodeString(buffer, bufferS, &ctx);

 
 

-        printf("%s", buffer);
+    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)
-                {
-                printf("\n");
-                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)
-{
-login = l;
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetPassword(const char * p)
-{
-password = p;
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetServer(const char * serverName)
-{
-server = serverName;
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetServerPort(short unsigned p)
-{
-port = p;
-}
-//---------------------------------------------------------------------------

 void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb)
 {
 RxCallBack = cb;
 void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb)
 {
 RxCallBack = cb;


@@ -492,8 +461,3 @@ const std::string & NETTRANSACT::GetError() const
 return errorMsg;
 }
 //---------------------------------------------------------------------------
 return errorMsg;
 }
 //---------------------------------------------------------------------------

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