Fixed compilation of srvconf lib.

diff --git a/stglibs/srvconf.lib/include/stg/netunit.h b/stglibs/srvconf.lib/include/stg/netunit.h
index cfc120f82a0085f69c65d47e3c765b8369e86caa..664eee633328978d5ff304129d03e6a32b3c1dfc 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/netunit.h
+++ b/stglibs/srvconf.lib/include/stg/netunit.h
@@ -104,7 +104,6 @@ private:
     int     RxLoginSAnswer();
 
     int     TxData(const char * text);
     int     RxLoginSAnswer();
 
     int     TxData(const char * text);

-    int     TxData(char * data);

     int     RxDataAnswer();
 
     std::string server;
     int     RxDataAnswer();
 
     std::string server;

diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp
index 936ebc6040f595de4cf85230b81f9cc5a220034e..df0af7f2c446512332ff4af3f353ea6b9429b831 100644 (file)
--- a/stglibs/srvconf.lib/netunit.cpp
+++ b/stglibs/srvconf.lib/netunit.cpp
@@ -262,13 +262,11 @@ 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);
 BLOWFISH_CTX ctx;
 InitContext(password.c_str(), PASSWD_LEN, &ctx);
 
 memset(loginZ, 0, ADM_LOGIN_LEN);
 BLOWFISH_CTX ctx;
 InitContext(password.c_str(), PASSWD_LEN, &ctx);

-EncryptString(loginZ, login.c_str(), std::min(login.length() + 1, ADM_LOGIN_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)
     {
     errorMsg = SEND_LOGIN_ERROR;
 if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0)
     {
     errorMsg = SEND_LOGIN_ERROR;


@@ -310,18 +308,11 @@ 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;
 InitContext(password.c_str(), PASSWD_LEN, &ctx);
 BLOWFISH_CTX ctx;
 InitContext(password.c_str(), PASSWD_LEN, &ctx);

-char buffer[text.length() + 9];
-EncryptString(buffer, text.c_str(), text.length() + 1, &ctx);
+size_t length = strlen(text);
+char buffer[length + 9];
+EncryptString(buffer, text, length, &ctx);

 if (send(outerSocket, buffer, sizeof(buffer), 0) <= 0)
     {
     errorMsg = SEND_DATA_ERROR;
 if (send(outerSocket, buffer, sizeof(buffer), 0) <= 0)
     {
     errorMsg = SEND_DATA_ERROR;


@@ -330,33 +321,6 @@ if (send(outerSocket, buffer, sizeof(buffer), 0) <= 0)
 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;
-InitContext(passwd, PASSWD_LEN, &ctx);
-
-for (int j = 0; j < l; j++)
-    {
-    strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN);
-    EncryptBlock(buffS, buff, &ctx);
-    send(outerSocket, buffS, ENC_MSG_LEN, 0);
-    }
-
-return 0;
-}
-//---------------------------------------------------------------------------

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