X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a8f0f5a52af09cc0c0bcd08d64a1166b7502a424..3f023a72d0eedd982ba16401fbdff63dc5dddd4d:/stglibs/srvconf.lib/netunit.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 164823d8..f6fcf500 100644
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -53,6 +53,7 @@ const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048;
 #define RECV_DATA_ANSWER_ERROR      "Recv data answer error!"
 #define UNKNOWN_ERROR               "Unknown error!"
 #define CONNECT_FAILED              "Connect failed!"
+#define BIND_FAILED                 "Bind failed!"
 #define INCORRECT_LOGIN             "Incorrect login!"
 #define INCORRECT_HEADER            "Incorrect header!"
 #define SEND_LOGIN_ERROR            "Send login error!"
@@ -67,6 +68,20 @@ NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p,
                          const std::string & l, const std::string & pwd)
     : server(s),
       port(p),
+      localPort(0),
+      login(l),
+      password(pwd),
+      outerSocket(-1)
+{
+}
+//---------------------------------------------------------------------------
+NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p,
+                         const std::string & la, uint16_t lp,
+                         const std::string & l, const std::string & pwd)
+    : server(s),
+      port(p),
+      localAddress(la),
+      localPort(lp),
       login(l),
       password(pwd),
       outerSocket(-1)
@@ -82,6 +97,41 @@ if (outerSocket < 0)
     return st_conn_fail;
     }
 
+if (!localAddress.empty())
+    {
+    if (localPort == 0)
+        localPort = port;
+
+    unsigned long ip = inet_addr(localAddress.c_str());
+
+    if (ip == INADDR_NONE)
+        {
+        struct hostent * phe = gethostbyname(localAddress.c_str());
+        if (phe == NULL)
+            {
+            errorMsg = "DNS error.\nCan not reslove " + localAddress;
+            return st_dns_err;
+            }
+
+        struct hostent he;
+        memcpy(&he, phe, sizeof(he));
+        ip = *((long *)he.h_addr_list[0]);
+        }
+
+    struct sockaddr_in localAddr;
+    memset(&localAddr, 0, sizeof(localAddr));
+    localAddr.sin_family = AF_INET;
+    localAddr.sin_port = htons(localPort);
+    localAddr.sin_addr.s_addr = ip;
+
+    if (bind(outerSocket, (struct sockaddr *)&localAddr, sizeof(localAddr)) < 0)
+        {
+        errorMsg = BIND_FAILED;
+        close(outerSocket);
+        return st_conn_fail;
+        }
+    }
+
 struct sockaddr_in outerAddr;
 memset(&outerAddr, 0, sizeof(outerAddr));
 
@@ -264,22 +314,14 @@ int NETTRANSACT::TxLoginS()
 {
 char loginZ[ADM_LOGIN_LEN];
 memset(loginZ, 0, ADM_LOGIN_LEN);
-strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);
-
 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(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;
 }
 //---------------------------------------------------------------------------
@@ -316,32 +358,21 @@ else
 int NETTRANSACT::TxData(const std::string & text)
 {
 BLOWFISH_CTX ctx;
-EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
-
-size_t pos = 0;
-while (pos < text.size())
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
+char buffer[text.length() + 9];
+EncryptString(buffer, text.c_str(), text.length() + 1, &ctx);
+if (send(outerSocket, buffer, sizeof(buffer), 0) <= 0)
     {
-    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);
-    if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0)
-        {
-        errorMsg = SEND_DATA_ERROR;
-        return st_send_fail;
-        }
-    pos += ENC_MSG_LEN;
+    errorMsg = SEND_DATA_ERROR;
+    return st_send_fail;
     }
-
 return st_ok;
 }
 //---------------------------------------------------------------------------
 int NETTRANSACT::RxDataAnswer(CALLBACK callback, void * data)
 {
 BLOWFISH_CTX ctx;
-EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx);
+InitContext(password.c_str(), PASSWD_LEN, &ctx);
 
 std::string chunk;
 while (true)
@@ -362,7 +393,7 @@ while (true)
         }
 
     char buffer[ENC_MSG_LEN];
-    DecodeString(buffer, bufferS, &ctx);
+    DecryptBlock(buffer, bufferS, &ctx);
 
     bool final = false;
     size_t pos = 0;