Merge branch 'master' into naffanya-dev

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

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 63ea22286189c98a8c69168099b054a7ef44968f..164823d8395d42d41f81f11a728dfdba5c34c958 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -18,18 +18,14 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

- /*
- $Revision: 1.6 $
- $Date: 2009/02/06 10:25:54 $
- $Author: faust $
- */
-
-//---------------------------------------------------------------------------
+#include "netunit.h"

 
 

-#include "stg/netunit.h"
+#include "stg/servconf_types.h"

 #include "stg/common.h"
 #include "stg/blowfish.h"
 
 #include "stg/common.h"
 #include "stg/blowfish.h"
 

+#include <algorithm> // std::min
+

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


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

+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+using namespace STG;
+
+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!"


@@ -60,16 +69,12 @@ NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p,
       port(p),
       login(l),
       password(pwd),
       port(p),
       login(l),
       password(pwd),

-      outerSocket(-1),
-      RxCallBack(NULL),
-      dataRxCallBack(NULL)
+      outerSocket(-1)

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

-int ret;
-

 outerSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (outerSocket < 0)
     {
 outerSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (outerSocket < 0)
     {


@@ -80,46 +85,42 @@ if (outerSocket < 0)
 struct sockaddr_in outerAddr;
 memset(&outerAddr, 0, sizeof(outerAddr));
 
 struct sockaddr_in outerAddr;
 memset(&outerAddr, 0, sizeof(outerAddr));
 

-struct hostent he;
-struct hostent * phe;
-
-unsigned long ip;
-ip = inet_addr(server.c_str());
+unsigned long ip = inet_addr(server.c_str());

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

-    phe = gethostbyname(server.c_str());
+    struct hostent * phe = gethostbyname(server.c_str());

     if (phe == NULL)
         {
         errorMsg = "DNS error.\nCan not reslove " + server;
         return st_dns_err;
         }
 
     if (phe == NULL)
         {
         errorMsg = "DNS error.\nCan not reslove " + server;
         return st_dns_err;
         }
 

+    struct hostent he;

     memcpy(&he, phe, sizeof(he));
     memcpy(&he, phe, sizeof(he));

-    ip = *((long*)he.h_addr_list[0]);
+    ip = *((long *)he.h_addr_list[0]);

     }
     }

+

 outerAddr.sin_family = AF_INET;
 outerAddr.sin_port = htons(port);
 outerAddr.sin_addr.s_addr = ip;
 
 outerAddr.sin_family = AF_INET;
 outerAddr.sin_port = htons(port);
 outerAddr.sin_addr.s_addr = ip;
 

-ret = connect(outerSocket, (struct sockaddr*)&outerAddr, sizeof(outerAddr));
-
-if (ret < 0)
+if (connect(outerSocket, (struct sockaddr *)&outerAddr, sizeof(outerAddr)) < 0)

     {
     errorMsg = CONNECT_FAILED;
     close(outerSocket);
     return st_conn_fail;
     }
     {
     errorMsg = CONNECT_FAILED;
     close(outerSocket);
     return st_conn_fail;
     }

+

 return st_ok;
 }
 //---------------------------------------------------------------------------
 return st_ok;
 }
 //---------------------------------------------------------------------------

-int NETTRANSACT::Disconnect()
+void NETTRANSACT::Disconnect()

 {
 close(outerSocket);
 {
 close(outerSocket);

-return 0;

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

-int NETTRANSACT::Transact(const char * data)
+int NETTRANSACT::Transact(const std::string & request, CALLBACK callback, void * data)

 {
 int ret;
 if ((ret = TxHeader()) != st_ok)
 {
 int ret;
 if ((ret = TxHeader()) != st_ok)


@@ -158,13 +159,13 @@ if ((ret = RxLoginSAnswer()) != st_ok)
     return ret;
     }
 
     return ret;
     }
 

-if ((ret = TxData(data)) != st_ok)
+if ((ret = TxData(request)) != st_ok)

     {
     Disconnect();
     return ret;
     }
 
     {
     Disconnect();
     return ret;
     }
 

-if ((ret = RxDataAnswer()) != st_ok)
+if ((ret = RxDataAnswer(callback, data)) != st_ok)

     {
     Disconnect();
     return ret;
     {
     Disconnect();
     return ret;


@@ -175,9 +176,7 @@ return st_ok;
 //---------------------------------------------------------------------------
 int NETTRANSACT::TxHeader()
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::TxHeader()
 {

-int ret;
-ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0);
-if (ret <= 0)
+if (send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0) <= 0)

     {
     errorMsg = SEND_HEADER_ERROR;
     return st_send_fail;
     {
     errorMsg = SEND_HEADER_ERROR;
     return st_send_fail;


@@ -188,11 +187,9 @@ return st_ok;
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxHeaderAnswer()
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxHeaderAnswer()
 {

-char buffer[sizeof(STG_HEADER)+1];
-int ret;
+char buffer[sizeof(STG_HEADER) + 1];

 
 

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

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


@@ -221,13 +218,10 @@ else
 int NETTRANSACT::TxLogin()
 {
 char loginZ[ADM_LOGIN_LEN];
 int NETTRANSACT::TxLogin()
 {
 char loginZ[ADM_LOGIN_LEN];

-int ret;
-

 memset(loginZ, 0, ADM_LOGIN_LEN);
 strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
 memset(loginZ, 0, ADM_LOGIN_LEN);
 strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);

-ret = send(outerSocket, loginZ, ADM_LOGIN_LEN, 0);

 
 

-if (ret <= 0)
+if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0)

     {
     errorMsg = SEND_LOGIN_ERROR;
     return st_send_fail;
     {
     errorMsg = SEND_LOGIN_ERROR;
     return st_send_fail;


@@ -238,11 +232,9 @@ return st_ok;
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxLoginAnswer()
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxLoginAnswer()
 {

-char buffer[sizeof(OK_LOGIN)+1];
-int ret;
+char buffer[sizeof(OK_LOGIN) + 1];

 
 

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

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


@@ -271,9 +263,6 @@ else
 int NETTRANSACT::TxLoginS()
 {
 char loginZ[ADM_LOGIN_LEN];
 int NETTRANSACT::TxLoginS()
 {
 char loginZ[ADM_LOGIN_LEN];

-char ct[ENC_MSG_LEN];
-int ret;
-

 memset(loginZ, 0, ADM_LOGIN_LEN);
 strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
 
 memset(loginZ, 0, ADM_LOGIN_LEN);
 strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
 


@@ -282,9 +271,9 @@ 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++)
     {

-    EncodeString(ct, loginZ + j*ENC_MSG_LEN, &ctx);
-    ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-    if (ret <= 0)
+    char ct[ENC_MSG_LEN];
+    EncodeString(ct, loginZ + j * ENC_MSG_LEN, &ctx);
+    if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0)

         {
         errorMsg = SEND_LOGIN_ERROR;
         return st_send_fail;
         {
         errorMsg = SEND_LOGIN_ERROR;
         return st_send_fail;


@@ -296,11 +285,9 @@ return st_ok;
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxLoginSAnswer()
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxLoginSAnswer()
 {

-char buffer[sizeof(OK_LOGINS)+1];
-int ret;
+char buffer[sizeof(OK_LOGINS) + 1];

 
 

-ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0);
-if (ret <= 0)
+if (recv(outerSocket, buffer, strlen(OK_LOGINS), 0) <= 0)

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


@@ -326,134 +313,75 @@ else
     }
 }
 //---------------------------------------------------------------------------
     }
 }
 //---------------------------------------------------------------------------

-int NETTRANSACT::TxData(const char * text)
+int NETTRANSACT::TxData(const std::string & text)

 {
 {

-char textZ[ENC_MSG_LEN];
-char ct[ENC_MSG_LEN];
-int ret;
-int j;
-
-int n = strlen(text) / ENC_MSG_LEN;
-int r = strlen(text) % ENC_MSG_LEN;
-

 BLOWFISH_CTX ctx;
 EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
 
 BLOWFISH_CTX ctx;
 EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
 

-for (j = 0; j < n; j++)
+size_t pos = 0;
+while (pos < text.size())

     {
     {

-    strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
+    char textZ[ENC_MSG_LEN];
+    if (text.size() - pos < ENC_MSG_LEN)
+        memset(textZ, 0, ENC_MSG_LEN);
+    strncpy(textZ, text.c_str() + pos, std::min(ENC_MSG_LEN, (int)(text.size() - pos)));
+    char ct[ENC_MSG_LEN];

     EncodeString(ct, textZ, &ctx);
     EncodeString(ct, textZ, &ctx);

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

         {
         errorMsg = SEND_DATA_ERROR;
         return st_send_fail;
         }
         {
         errorMsg = SEND_DATA_ERROR;
         return st_send_fail;
         }

-    }
-
-memset(textZ, 0, ENC_MSG_LEN);
-if (r)
-    strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
-
-EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-
-EncodeString(ct, textZ, &ctx);
-ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-if (ret <= 0)
-    {
-    errorMsg = SEND_DATA_ERROR;
-    return st_send_fail;
+    pos += ENC_MSG_LEN;

     }
 
 return st_ok;
 }
 //---------------------------------------------------------------------------
     }
 
 return st_ok;
 }
 //---------------------------------------------------------------------------

-int NETTRANSACT::TxData(char * data)
-{
-char buff[ENC_MSG_LEN];
-char buffS[ENC_MSG_LEN];
-char passwd[ADM_PASSWD_LEN];
-
-memset(passwd, 0, ADM_PASSWD_LEN);
-strncpy(passwd, password.c_str(), ADM_PASSWD_LEN);
-memset(buff, 0, ENC_MSG_LEN);
-
-int l = strlen(data)/ENC_MSG_LEN;
-if (strlen(data)%ENC_MSG_LEN)
-    l++;
-
-BLOWFISH_CTX ctx;
-EnDecodeInit(passwd, PASSWD_LEN, &ctx);
-
-for (int j = 0; j < l; j++)
-    {
-    strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);
-    EncodeString(buffS, buff, &ctx);
-    send(outerSocket, buffS, ENC_MSG_LEN, 0);
-    }
-
-return 0;
-}
-//---------------------------------------------------------------------------
-int NETTRANSACT::RxDataAnswer()
+int NETTRANSACT::RxDataAnswer(CALLBACK callback, void * data)

 {
 {

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

 BLOWFISH_CTX ctx;
 EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
 
 BLOWFISH_CTX 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;
-        DecodeString(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 (callback)
+            if (!callback(chunk, final, data))
+                return st_xml_parse_error;
+        chunk.clear();

         }
         }

+
+    if (final)
+        return st_ok;

     }
 }
     }
 }

-//---------------------------------------------------------------------------
-void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb)
-{
-RxCallBack = cb;
-dataRxCallBack = data;
-}
-//---------------------------------------------------------------------------
-const std::string & NETTRANSACT::GetError() const
-{
-return errorMsg;
-}
-//---------------------------------------------------------------------------
-void NETTRANSACT::Reset()
-{
-answerList.clear();
-}
-//---------------------------------------------------------------------------