X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8615c87c7f1face2c894307c3574e9b325541803..f384309c9c663a4b381d2e1a8545693514835395:/stglibs/srvconf.lib/netunit.cpp?ds=sidebyside diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index bcfc113e..aabb7780 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -25,15 +25,33 @@ */ //--------------------------------------------------------------------------- + +#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 +#include +#include -#include "netunit.h" -#include "common.h" +using namespace STG; + +namespace +{ + +const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048; + +} //--------------------------------------------------------------------------- @@ -51,38 +69,17 @@ #define RECV_HEADER_ANSWER_ERROR "Recv header answer error!" //--------------------------------------------------------------------------- -NETTRANSACT::NETTRANSACT() - : port(0), +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), outerSocket(-1), RxCallBack(NULL), dataRxCallBack(NULL) { } -//----------------------------------------------------------------------------- -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() { @@ -212,6 +209,7 @@ 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; } @@ -261,6 +259,7 @@ 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; } @@ -294,11 +293,11 @@ memset(loginZ, 0, ADM_LOGIN_LEN); strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN); BLOWFISH_CTX ctx; -EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx); +EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); for (int j = 0; j < ADM_LOGIN_LEN / ENC_MSG_LEN; j++) { - Encrypt(ct, loginZ + j*ENC_MSG_LEN, &ctx); + EncodeString(ct, loginZ + j*ENC_MSG_LEN, &ctx); ret = send(outerSocket, ct, ENC_MSG_LEN, 0); if (ret <= 0) { @@ -318,6 +317,7 @@ 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; } @@ -352,12 +352,12 @@ int n = strlen(text) / ENC_MSG_LEN; int r = strlen(text) % ENC_MSG_LEN; BLOWFISH_CTX ctx; -EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx); +EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); for (j = 0; j < n; j++) { strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN); - Encrypt(ct, textZ, &ctx); + EncodeString(ct, textZ, &ctx); ret = send(outerSocket, ct, ENC_MSG_LEN, 0); if (ret <= 0) { @@ -370,9 +370,9 @@ memset(textZ, 0, ENC_MSG_LEN); if (r) strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN); -EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx); +EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); -Encrypt(ct, textZ, &ctx); +EncodeString(ct, textZ, &ctx); ret = send(outerSocket, ct, ENC_MSG_LEN, 0); if (ret <= 0) { @@ -398,12 +398,12 @@ if (strlen(data)%ENC_MSG_LEN) l++; BLOWFISH_CTX ctx; -EnDecryptInit(passwd, PASSWD_LEN, &ctx); +EnDecodeInit(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); + EncodeString(buffS, buff, &ctx); send(outerSocket, buffS, ENC_MSG_LEN, 0); } @@ -412,68 +412,52 @@ return 0; //--------------------------------------------------------------------------- int NETTRANSACT::RxDataAnswer() { -int n = 0; -int ret; -char bufferS[ENC_MSG_LEN]; -char buffer[ENC_MSG_LEN + 1]; - BLOWFISH_CTX ctx; -EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx); +EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); -while (1) +std::string chunk; +while (true) { - ret = recv(outerSocket, &bufferS[n++], 1, 0); - if (ret <= 0) + char bufferS[ENC_MSG_LEN]; + size_t toRead = ENC_MSG_LEN; + while (toRead > 0) { - close(outerSocket); - errorMsg = RECV_DATA_ANSWER_ERROR; - return st_recv_fail; + 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; } - if (n == ENC_MSG_LEN) - { - n = 0; - Decrypt(buffer, bufferS, &ctx); - buffer[ENC_MSG_LEN] = 0; + char buffer[ENC_MSG_LEN]; + DecodeString(buffer, bufferS, &ctx); - answerList.push_back(buffer); + 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; - 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 (pos > 0) + chunk.append(&buffer[0], &buffer[pos]); + + if (chunk.length() > MAX_XML_CHUNK_LENGTH || final) + { + if (RxCallBack != NULL) + if (!RxCallBack(dataRxCallBack, chunk, final)) + return st_xml_parse_error; + chunk.clear(); } + + 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; @@ -485,8 +469,3 @@ const std::string & NETTRANSACT::GetError() const return errorMsg; } //--------------------------------------------------------------------------- -void NETTRANSACT::Reset() -{ -answerList.clear(); -} -//---------------------------------------------------------------------------