X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/113c3cef204f3380a266483ec9120f673640c673..29e9a2de0b45893850bbf56ee38e7fd235a6df15:/stglibs/srvconf.lib/netunit.cpp?ds=sidebyside diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index 73f0f485..61dc5c69 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -25,31 +25,15 @@ */ //--------------------------------------------------------------------------- - -#include "netunit.h" - -#include "stg/servconf_types.h" -#include "stg/common.h" -#include "stg/blowfish.h" - -#include -#include -#include - #include #include #include -#include -#include -#include - -namespace -{ - -const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048; +#include +#include -} +#include "stg/netunit.h" +#include "stg/common.h" //--------------------------------------------------------------------------- @@ -67,12 +51,8 @@ const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048; #define RECV_HEADER_ANSWER_ERROR "Recv header answer error!" //--------------------------------------------------------------------------- -NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p, - const std::string & l, const std::string & pwd) - : server(s), - port(p), - login(l), - password(pwd), +NETTRANSACT::NETTRANSACT() + : port(0), outerSocket(-1), RxCallBack(NULL), dataRxCallBack(NULL) @@ -207,7 +187,6 @@ int ret; ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0); if (ret <= 0) { - printf("Receive header answer error: '%s'\n", strerror(errno)); errorMsg = RECV_HEADER_ANSWER_ERROR; return st_recv_fail; } @@ -257,7 +236,6 @@ int ret; ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0); if (ret <= 0) { - printf("Receive login answer error: '%s'\n", strerror(errno)); errorMsg = RECV_LOGIN_ANSWER_ERROR; return st_recv_fail; } @@ -284,26 +262,16 @@ 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); - 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) { - EncodeString(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; } //--------------------------------------------------------------------------- @@ -315,7 +283,6 @@ int ret; ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0); if (ret <= 0) { - printf("Receive secret login answer error: '%s'\n", strerror(errno)); errorMsg = RECV_LOGIN_ANSWER_ERROR; return st_recv_fail; } @@ -341,121 +308,84 @@ 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++) - { - 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) - { - 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); - -EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); - -EncodeString(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; } - 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; -EnDecodeInit(passwd, PASSWD_LEN, &ctx); - -for (int j = 0; j < l; j++) - { - strncpy(buff, &data[j*ENC_MSG_LEN], ENC_MSG_LEN); - EncodeString(buffS, buff, &ctx); - send(outerSocket, buffS, ENC_MSG_LEN, 0); - } - -return 0; -} -//--------------------------------------------------------------------------- int NETTRANSACT::RxDataAnswer() { +int n = 0; +int ret; +char bufferS[ENC_MSG_LEN]; +char buffer[ENC_MSG_LEN + 1]; + BLOWFISH_CTX ctx; -EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); +InitContext(password.c_str(), PASSWD_LEN, &ctx); -std::string chunk; -while (true) +while (1) { - char bufferS[ENC_MSG_LEN]; - size_t toRead = ENC_MSG_LEN; - while (toRead > 0) + ret = recv(outerSocket, &bufferS[n++], 1, 0); + if (ret <= 0) { - int ret = recv(outerSocket, &bufferS[ENC_MSG_LEN - toRead], toRead, 0); - if (ret <= 0) - { - printf("Receive data error: '%s'\n", strerror(errno)); - close(outerSocket); - errorMsg = RECV_DATA_ANSWER_ERROR; - return st_recv_fail; - } - toRead -= ret; + close(outerSocket); + errorMsg = RECV_DATA_ANSWER_ERROR; + return st_recv_fail; } - char buffer[ENC_MSG_LEN]; - DecodeString(buffer, bufferS, &ctx); - - bool final = false; - size_t pos = 0; - for (; pos < ENC_MSG_LEN && buffer[pos] != 0; pos++); - if (pos < ENC_MSG_LEN && buffer[pos] == 0) - final = true; + if (n == ENC_MSG_LEN) + { + n = 0; + DecryptBlock(buffer, bufferS, &ctx); + buffer[ENC_MSG_LEN] = 0; - if (pos > 0) - chunk.append(&buffer[0], &buffer[pos]); + answerList.push_back(buffer); - if (chunk.length() > MAX_XML_CHUNK_LENGTH || final) - { - if (RxCallBack != NULL) - if (!RxCallBack(dataRxCallBack, chunk, final)) - return st_xml_parse_error; - chunk.clear(); + for (int j = 0; j < ENC_MSG_LEN; j++) + { + if (buffer[j] == 0) + { + if (RxCallBack) + if (st_ok != RxCallBack(dataRxCallBack, &answerList)) + { + return st_xml_parse_error; + } + return st_ok; + } + } } - - if (final) - return st_ok; } } //--------------------------------------------------------------------------- +void NETTRANSACT::SetLogin(const char * l) +{ +login = l; +} +//--------------------------------------------------------------------------- +void NETTRANSACT::SetPassword(const char * p) +{ +password = p; +} +//--------------------------------------------------------------------------- +void NETTRANSACT::SetServer(const char * serverName) +{ +server = serverName; +} +//--------------------------------------------------------------------------- +void NETTRANSACT::SetServerPort(short unsigned p) +{ +port = p; +} +//--------------------------------------------------------------------------- void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb) { RxCallBack = cb; @@ -467,3 +397,8 @@ const std::string & NETTRANSACT::GetError() const return errorMsg; } //--------------------------------------------------------------------------- +void NETTRANSACT::Reset() +{ +answerList.clear(); +} +//---------------------------------------------------------------------------