From: Maxim Mamontov Date: Sun, 20 Oct 2013 13:25:27 +0000 (+0300) Subject: Removed dead code. X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/a8f0f5a52af09cc0c0bcd08d64a1166b7502a424?hp=5ec330c9443a3ad42258159e11013c116d9c4978 Removed dead code. --- diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index b7aa4f73..164823d8 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -18,20 +18,14 @@ * Author : Boris Mikhailenko */ - /* - $Revision: 1.6 $ - $Date: 2009/02/06 10:25:54 $ - $Author: faust $ - */ - -//--------------------------------------------------------------------------- - #include "netunit.h" #include "stg/servconf_types.h" #include "stg/common.h" #include "stg/blowfish.h" +#include // std::min + #include #include #include @@ -126,7 +120,7 @@ void NETTRANSACT::Disconnect() close(outerSocket); } //--------------------------------------------------------------------------- -int NETTRANSACT::Transact(const char * request, CALLBACK callback, void * data) +int NETTRANSACT::Transact(const std::string & request, CALLBACK callback, void * data) { int ret; if ((ret = TxHeader()) != st_ok) @@ -319,72 +313,31 @@ else } } //--------------------------------------------------------------------------- -int NETTRANSACT::TxData(const char * text) +int NETTRANSACT::TxData(const std::string & text) { -int n = strlen(text) / ENC_MSG_LEN; -int r = strlen(text) % ENC_MSG_LEN; - 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++) +size_t pos = 0; +while (pos < text.size()) { - strncpy(textZ, text + j * ENC_MSG_LEN, ENC_MSG_LEN); + 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; } - } - -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) - { - errorMsg = SEND_DATA_ERROR; - return st_send_fail; + pos += ENC_MSG_LEN; } 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(CALLBACK callback, void * data) { BLOWFISH_CTX ctx; diff --git a/stglibs/srvconf.lib/netunit.h b/stglibs/srvconf.lib/netunit.h index dc705803..f87fb3a8 100644 --- a/stglibs/srvconf.lib/netunit.h +++ b/stglibs/srvconf.lib/netunit.h @@ -18,12 +18,6 @@ * Author : Boris Mikhailenko */ - /* - $Revision: 1.6 $ - $Date: 2010/02/11 12:32:53 $ - $Author: faust $ - */ - #ifndef NetUnitH #define NetUnitH @@ -31,7 +25,6 @@ #include -//--------------------------------------------------------------------------- class NETTRANSACT { public: @@ -39,24 +32,23 @@ public: NETTRANSACT(const std::string & server, uint16_t port, const std::string & login, const std::string & password); - int Transact(const char * request, CALLBACK f, void * data); + int Transact(const std::string & request, CALLBACK f, void * data); const std::string & GetError() const { return errorMsg; } - int Connect(); - void Disconnect(); + int Connect(); + void Disconnect(); private: - int TxHeader(); - int RxHeaderAnswer(); + int TxHeader(); + int RxHeaderAnswer(); - int TxLogin(); - int RxLoginAnswer(); + int TxLogin(); + int RxLoginAnswer(); - int TxLoginS(); - int RxLoginSAnswer(); + int TxLoginS(); + int RxLoginSAnswer(); - int TxData(const char * text); - int TxData(char * data); - int RxDataAnswer(CALLBACK f, void * data); + int TxData(const std::string & text); + int RxDataAnswer(CALLBACK f, void * data); std::string server; uint16_t port; @@ -65,5 +57,5 @@ private: int outerSocket; std::string errorMsg; }; -//--------------------------------------------------------------------------- + #endif diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index 16878f18..430de3c1 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -350,7 +350,7 @@ if ((ret = nt.Connect()) != st_ok) errorMsg = nt.GetError(); return ret; } -if ((ret = nt.Transact(request.c_str(), ParserRecv, this)) != st_ok) +if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok) { errorMsg = nt.GetError(); return ret; @@ -370,7 +370,7 @@ if ((ret = nt.Connect()) != st_ok) return ret; } std::string response; -if ((ret = nt.Transact(request.c_str(), SimpleRecv, &response)) != st_ok) +if ((ret = nt.Transact(request, SimpleRecv, &response)) != st_ok) { errorMsg = nt.GetError(); callback(false, errorMsg, "", data);