Simplified NETTRANSACT.

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

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 4c3cc92ed8bf7626b1f25e40b46e2d1c161317ab..b7aa4f731863a66f0be76749a31a999cbe2096b9 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -26,7 +26,9 @@
 
 //---------------------------------------------------------------------------
 
-#include "stg/netunit.h"
+#include "netunit.h"
+
+#include "stg/servconf_types.h"
 #include "stg/common.h"
 #include "stg/blowfish.h"
 
@@ -38,6 +40,12 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+using namespace STG;
+
 namespace
 {
 
@@ -67,16 +75,12 @@ NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p,
       port(p),
       login(l),
       password(pwd),
-      outerSocket(-1),
-      RxCallBack(NULL),
-      dataRxCallBack(NULL)
+      outerSocket(-1)
 {
 }
 //---------------------------------------------------------------------------
 int NETTRANSACT::Connect()
 {
-int ret;
-
 outerSocket = socket(PF_INET, SOCK_STREAM, 0);
 if (outerSocket < 0)
     {
@@ -87,46 +91,42 @@ if (outerSocket < 0)
 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)
     {
-    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;
         }
 
+    struct hostent 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;
 
-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;
     }
+
 return st_ok;
 }
 //---------------------------------------------------------------------------
-int NETTRANSACT::Disconnect()
+void NETTRANSACT::Disconnect()
 {
 close(outerSocket);
-return 0;
 }
 //---------------------------------------------------------------------------
-int NETTRANSACT::Transact(const char * data)
+int NETTRANSACT::Transact(const char * request, CALLBACK callback, void * data)
 {
 int ret;
 if ((ret = TxHeader()) != st_ok)
@@ -165,13 +165,13 @@ if ((ret = RxLoginSAnswer()) != st_ok)
     return ret;
     }
 
-if ((ret = TxData(data)) != st_ok)
+if ((ret = TxData(request)) != st_ok)
     {
     Disconnect();
     return ret;
     }
 
-if ((ret = RxDataAnswer()) != st_ok)
+if ((ret = RxDataAnswer(callback, data)) != st_ok)
     {
     Disconnect();
     return ret;
@@ -182,9 +182,7 @@ return st_ok;
 //---------------------------------------------------------------------------
 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;
@@ -195,11 +193,9 @@ return st_ok;
 //---------------------------------------------------------------------------
 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;
@@ -228,13 +224,10 @@ else
 int NETTRANSACT::TxLogin()
 {
 char loginZ[ADM_LOGIN_LEN];
-int ret;
-
 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;
@@ -245,11 +238,9 @@ return st_ok;
 //---------------------------------------------------------------------------
 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;
@@ -278,9 +269,6 @@ else
 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);
 
@@ -289,9 +277,9 @@ EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
 
 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;
@@ -303,11 +291,9 @@ return st_ok;
 //---------------------------------------------------------------------------
 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;
@@ -335,23 +321,20 @@ else
 //---------------------------------------------------------------------------
 int NETTRANSACT::TxData(const char * 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);
 
-for (j = 0; j < n; j++)
+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);
+    strncpy(textZ, text + j * ENC_MSG_LEN, ENC_MSG_LEN);
     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;
@@ -359,14 +342,14 @@ for (j = 0; j < n; j++)
     }
 
 memset(textZ, 0, ENC_MSG_LEN);
+
 if (r)
-    strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
+    strncpy(textZ, text + n * 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)
+if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0)
     {
     errorMsg = SEND_DATA_ERROR;
     return st_send_fail;
@@ -377,16 +360,15 @@ 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);
+
+char buff[ENC_MSG_LEN];
 memset(buff, 0, ENC_MSG_LEN);
 
-int l = strlen(data)/ENC_MSG_LEN;
-if (strlen(data)%ENC_MSG_LEN)
+int l = strlen(data) / ENC_MSG_LEN;
+if (strlen(data) % ENC_MSG_LEN)
     l++;
 
 BLOWFISH_CTX ctx;
@@ -394,7 +376,8 @@ EnDecodeInit(passwd, PASSWD_LEN, &ctx);
 
 for (int j = 0; j < l; j++)
     {
-    strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);
+    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);
     }
@@ -402,7 +385,7 @@ for (int j = 0; j < l; j++)
 return 0;
 }
 //---------------------------------------------------------------------------
-int NETTRANSACT::RxDataAnswer()
+int NETTRANSACT::RxDataAnswer(CALLBACK callback, void * data)
 {
 BLOWFISH_CTX ctx;
 EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
@@ -430,7 +413,7 @@ while (true)
 
     bool final = false;
     size_t pos = 0;
-    for (; pos < ENC_MSG_LEN && buffer[pos] != 0; pos++);
+    for (; pos < ENC_MSG_LEN && buffer[pos] != 0; pos++) ;
     if (pos < ENC_MSG_LEN && buffer[pos] == 0)
         final = true;
 
@@ -439,8 +422,8 @@ while (true)
 
     if (chunk.length() > MAX_XML_CHUNK_LENGTH || final)
         {
-        if (RxCallBack != NULL)
-            if (!RxCallBack(dataRxCallBack, chunk, final))
+        if (callback)
+            if (!callback(chunk, final, data))
                 return st_xml_parse_error;
         chunk.clear();
         }
@@ -449,15 +432,3 @@ while (true)
         return st_ok;
     }
 }
-//---------------------------------------------------------------------------
-void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb)
-{
-RxCallBack = cb;
-dataRxCallBack = data;
-}
-//---------------------------------------------------------------------------
-const std::string & NETTRANSACT::GetError() const
-{
-return errorMsg;
-}
-//---------------------------------------------------------------------------