Ticket 37. The object tariff definition moved into the if(newTariff)

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

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 8d5591934ecbc1afa02a503264d7c96b5eb6b491..61dc5c69a16cca574c04e0de59009564632dd59d 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -32,8 +32,8 @@
 #include <cstdio>
 #include <cstring>
 
 #include <cstdio>
 #include <cstring>
 

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

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


@@ -57,33 +57,6 @@ NETTRANSACT::NETTRANSACT()
       RxCallBack(NULL),
       dataRxCallBack(NULL)
 {
       RxCallBack(NULL),
       dataRxCallBack(NULL)
 {

-    memset(login, 0, ADM_LOGIN_LEN);
-    memset(password, 0, ADM_PASSWD_LEN);
-}
-//-----------------------------------------------------------------------------
-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()


@@ -243,7 +216,7 @@ char loginZ[ADM_LOGIN_LEN];
 int ret;
 
 memset(loginZ, 0, ADM_LOGIN_LEN);
 int ret;
 
 memset(loginZ, 0, ADM_LOGIN_LEN);

-strncpy(loginZ, login, ADM_LOGIN_LEN);
+strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN);

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


@@ -289,26 +262,16 @@ 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);
 
 memset(loginZ, 0, ADM_LOGIN_LEN);

-strncpy(loginZ, login, ADM_LOGIN_LEN);
-

 BLOWFISH_CTX ctx;
 BLOWFISH_CTX ctx;

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

     {
     {

-    Encrypt(ct, loginZ + j*ENC_MSG_LEN, &ctx);
-    ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-    if (ret <= 0)
-        {
-        errorMsg = SEND_LOGIN_ERROR;
-        return st_send_fail;
-        }
+    errorMsg = SEND_LOGIN_ERROR;
+    return st_send_fail;

     }
     }

-

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


@@ -345,73 +308,20 @@ else
 //---------------------------------------------------------------------------
 int NETTRANSACT::TxData(const char * text)
 {
 //---------------------------------------------------------------------------
 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;
 BLOWFISH_CTX ctx;

-EnDecryptInit(password, PASSWD_LEN, &ctx);
-
-for (j = 0; j < n; j++)
-    {
-    strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN);
-    Encrypt(ct, textZ, &ctx);
-    ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-    if (ret <= 0)
-        {
-        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);
-
-EnDecryptInit(password, PASSWD_LEN, &ctx);
-
-Encrypt(ct, textZ, &ctx);
-ret = send(outerSocket, ct, ENC_MSG_LEN, 0);
-if (ret <= 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 buff[ENC_MSG_LEN];
-char buffS[ENC_MSG_LEN];
-char passwd[ADM_PASSWD_LEN];
-
-memset(passwd, 0, ADM_PASSWD_LEN);
-strncpy(passwd, password, 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;
-EnDecryptInit(passwd, PASSWD_LEN, &ctx);
-
-for (int j = 0; j < l; j++)
-    {
-    strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);
-    Encrypt(buffS, buff, &ctx);
-    send(outerSocket, buffS, ENC_MSG_LEN, 0);
-    }
-
-return 0;
-}
-//---------------------------------------------------------------------------

 int NETTRANSACT::RxDataAnswer()
 {
 int n = 0;
 int NETTRANSACT::RxDataAnswer()
 {
 int n = 0;


@@ -420,7 +330,7 @@ char bufferS[ENC_MSG_LEN];
 char buffer[ENC_MSG_LEN + 1];
 
 BLOWFISH_CTX ctx;
 char buffer[ENC_MSG_LEN + 1];
 
 BLOWFISH_CTX ctx;

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

 
 while (1)
     {
 
 while (1)
     {


@@ -434,9 +344,8 @@ while (1)
 
     if (n == ENC_MSG_LEN)
         {
 
     if (n == ENC_MSG_LEN)
         {

-

         n = 0;
         n = 0;

-        Decrypt(buffer, bufferS, &ctx);
+        DecryptBlock(buffer, bufferS, &ctx);

         buffer[ENC_MSG_LEN] = 0;
 
         answerList.push_back(buffer);
         buffer[ENC_MSG_LEN] = 0;
 
         answerList.push_back(buffer);


@@ -459,12 +368,12 @@ while (1)
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetLogin(const char * l)
 {
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetLogin(const char * l)
 {

-strncpy(login, l, ADM_LOGIN_LEN);
+login = l;

 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetPassword(const char * p)
 {
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetPassword(const char * p)
 {

-strncpy(password, p, ADM_PASSWD_LEN);
+password = p;

 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetServer(const char * serverName)
 }
 //---------------------------------------------------------------------------
 void NETTRANSACT::SetServer(const char * serverName)