Merge remote-tracking branch 'origin/stg-2.409' into ticket37

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

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 9955d2e5e3e16cb9304fd341d6df352f5a9a5535..61dc5c69a16cca574c04e0de59009564632dd59d 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -25,33 +25,15 @@
  */
 
 //---------------------------------------------------------------------------
  */
 
 //---------------------------------------------------------------------------

-
-#include "netunit.h"
-
-#include "stg/servconf_types.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 <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;
+#include <cstdio>
+#include <cstring>

 
 

-}
+#include "stg/netunit.h"
+#include "stg/common.h"

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


@@ -69,12 +51,8 @@ const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048;
 #define RECV_HEADER_ANSWER_ERROR    "Recv header answer error!"
 
 //---------------------------------------------------------------------------
 #define RECV_HEADER_ANSWER_ERROR    "Recv header answer error!"
 
 //---------------------------------------------------------------------------

-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),
+NETTRANSACT::NETTRANSACT()
+    : port(0),

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


@@ -83,6 +61,8 @@ NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p,
 //---------------------------------------------------------------------------
 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)
     {


@@ -93,33 +73,36 @@ if (outerSocket < 0)
 struct sockaddr_in outerAddr;
 memset(&outerAddr, 0, sizeof(outerAddr));
 
 struct sockaddr_in outerAddr;
 memset(&outerAddr, 0, sizeof(outerAddr));
 

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

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

-    struct hostent * phe = gethostbyname(server.c_str());
+    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;
 

-if (connect(outerSocket, (struct sockaddr *)&outerAddr, sizeof(outerAddr)) < 0)
+ret = connect(outerSocket, (struct sockaddr*)&outerAddr, sizeof(outerAddr));
+
+if (ret < 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;
 }
 //---------------------------------------------------------------------------


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

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

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


@@ -196,11 +181,12 @@ return st_ok;
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxHeaderAnswer()
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxHeaderAnswer()
 {

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

 
 

-if (recv(outerSocket, buffer, strlen(OK_HEADER), 0) <= 0)
+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;
     }
     errorMsg = RECV_HEADER_ANSWER_ERROR;
     return st_recv_fail;
     }


@@ -227,10 +213,13 @@ 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 (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0)
+if (ret <= 0)

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


@@ -241,11 +230,12 @@ return st_ok;
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxLoginAnswer()
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxLoginAnswer()
 {

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

 
 

-if (recv(outerSocket, buffer, strlen(OK_LOGIN), 0) <= 0)
+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;
     }
     errorMsg = RECV_LOGIN_ANSWER_ERROR;
     return st_recv_fail;
     }


@@ -272,33 +262,27 @@ else
 int NETTRANSACT::TxLoginS()
 {
 char loginZ[ADM_LOGIN_LEN];
 int NETTRANSACT::TxLoginS()
 {
 char loginZ[ADM_LOGIN_LEN];

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

 
 

+memset(loginZ, 0, ADM_LOGIN_LEN);

 BLOWFISH_CTX ctx;
 BLOWFISH_CTX ctx;

-EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-
-for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++)
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
+EncryptString(loginZ, login.c_str(), std::min<int>(login.length() + 1, ADM_LOGIN_LEN), &ctx);
+if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 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;

     }
     }

-

 return st_ok;
 }
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxLoginSAnswer()
 {
 return st_ok;
 }
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxLoginSAnswer()
 {

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

 
 

-if (recv(outerSocket, buffer, strlen(OK_LOGINS), 0) <= 0)
+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;
     }
     errorMsg = RECV_LOGIN_ANSWER_ERROR;
     return st_recv_fail;
     }


@@ -324,120 +308,97 @@ else
 //---------------------------------------------------------------------------
 int NETTRANSACT::TxData(const char * text)
 {
 //---------------------------------------------------------------------------
 int NETTRANSACT::TxData(const char * text)
 {

-int n = strlen(text) / ENC_MSG_LEN;
-int r = strlen(text) % ENC_MSG_LEN;
-

 BLOWFISH_CTX ctx;
 BLOWFISH_CTX ctx;

-EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-
-char textZ[ENC_MSG_LEN];
-char ct[ENC_MSG_LEN];
-
-for (int j = 0; j < n; j++)
-    {
-    strncpy(textZ, text + j * ENC_MSG_LEN, ENC_MSG_LEN);
-    EncodeString(ct, textZ, &ctx);
-    if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0)
-        {
-        errorMsg = SEND_DATA_ERROR;
-        return st_send_fail;
-        }
-    }
-
-memset(textZ, 0, ENC_MSG_LEN);
-
-if (r)
-    strncpy(textZ, text + n * ENC_MSG_LEN, ENC_MSG_LEN);
-
-EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-
-EncodeString(ct, textZ, &ctx);
-if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0)
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
+size_t length = strlen(text);
+char buffer[length + 9];
+memset(buffer, 0, sizeof(buffer));
+EncryptString(buffer, text, length + 1, &ctx);
+if (send(outerSocket, buffer, sizeof(buffer), 0) <= 0)

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

-

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

-int NETTRANSACT::TxData(char * data)
-{
-char passwd[ADM_PASSWD_LEN];
-memset(passwd, 0, ADM_PASSWD_LEN);
-strncpy(passwd, password.c_str(), ADM_PASSWD_LEN);
-
-char buff[ENC_MSG_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);
-    char buffS[ENC_MSG_LEN];
-    EncodeString(buffS, buff, &ctx);
-    send(outerSocket, buffS, ENC_MSG_LEN, 0);
-    }
-
-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;

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

 
 

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

     {
     {

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

         {
         {

-        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;
+        close(outerSocket);
+        errorMsg = RECV_DATA_ANSWER_ERROR;
+        return st_recv_fail;

         }
 
         }
 

-    char buffer[ENC_MSG_LEN];
-    DecodeString(buffer, bufferS, &ctx);
-
-    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;
+    if (n == ENC_MSG_LEN)
+        {
+        n = 0;
+        DecryptBlock(buffer, bufferS, &ctx);
+        buffer[ENC_MSG_LEN] = 0;

 
 

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

 
 

-    if (chunk.length() > MAX_XML_CHUNK_LENGTH || final)
-        {
-        if (RxCallBack != NULL)
-            if (!RxCallBack(dataRxCallBack, chunk, final))
-                return st_xml_parse_error;
-        chunk.clear();
+        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 (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;
 dataRxCallBack = data;
 }
 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();
+}
+//---------------------------------------------------------------------------