X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/edef49fcbea8ea23fefa24f9f8de903d87b7f927..359e4b28458d352dc55ac39db7e4b5bb308eb361:/stglibs/srvconf.lib/netunit.cpp diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index 68eea748..68d64678 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -25,14 +25,30 @@ */ //--------------------------------------------------------------------------- -#include -#include + +#include "stg/netunit.h" +#include "stg/servconf_types.h" +#include "stg/common.h" +#include "stg/blowfish.h" + +#include +#include +#include + #include #include #include -#include "netunit.h" -#include "common.h" +#include +#include +#include + +namespace +{ + +const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048; + +} //--------------------------------------------------------------------------- @@ -50,50 +66,16 @@ #define RECV_HEADER_ANSWER_ERROR "Recv header answer error!" //--------------------------------------------------------------------------- -NETTRANSACT::NETTRANSACT() -{ -RxCallBack = NULL; -} -//----------------------------------------------------------------------------- -void NETTRANSACT::EnDecryptInit(const char * passwd, int, BLOWFISH_CTX *ctx) -{ -unsigned char * keyL = NULL;//[PASSWD_LEN]; // ��� ������ - -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) -{ -/*unsigned char ss[8]; - -memcpy(ss, s, 8); - -Blowfish_Encrypt(ctx, (uint32_t *)ss, (uint32_t *)(ss + 4)); - -memcpy(d, ss, 8);*/ -EncodeString(d, s, ctx); - -} -//--------------------------------------------------------------------------- -void NETTRANSACT::Decrypt(char * d, const char * s, BLOWFISH_CTX *ctx) +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) { -/*unsigned char ss[8]; - -memcpy(ss, s, 8); - -Blowfish_Decrypt(ctx, (uint32_t *)ss, (uint32_t *)(ss + 4)); - -memcpy(d, ss, 8);*/ -DecodeString(d, s, ctx); - } //--------------------------------------------------------------------------- int NETTRANSACT::Connect() @@ -103,25 +85,25 @@ int ret; outerSocket = socket(PF_INET, SOCK_STREAM, 0); if (outerSocket < 0) { - strcpy(errorMsg, CREATE_SOCKET_ERROR); + errorMsg = CREATE_SOCKET_ERROR; return st_conn_fail; } +struct sockaddr_in outerAddr; memset(&outerAddr, 0, sizeof(outerAddr)); -memset(&localAddr, 0, sizeof(localAddr)); struct hostent he; struct hostent * phe; unsigned long ip; -ip = inet_addr(server); +ip = inet_addr(server.c_str()); if (ip == INADDR_NONE) { - phe = gethostbyname(server); + phe = gethostbyname(server.c_str()); if (phe == NULL) { - sprintf(errorMsg, "DNS error.\nCan not reslove %s", server); + errorMsg = "DNS error.\nCan not reslove " + server; return st_dns_err; } @@ -136,7 +118,7 @@ ret = connect(outerSocket, (struct sockaddr*)&outerAddr, sizeof(outerAddr)); if (ret < 0) { - strcpy(errorMsg, CONNECT_FAILED); + errorMsg = CONNECT_FAILED; close(outerSocket); return st_conn_fail; } @@ -209,7 +191,7 @@ int ret; ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0); if (ret <= 0) { - strcpy(errorMsg, SEND_HEADER_ERROR); + errorMsg = SEND_HEADER_ERROR; return st_send_fail; } @@ -219,13 +201,13 @@ return st_ok; int NETTRANSACT::RxHeaderAnswer() { char buffer[sizeof(STG_HEADER)+1]; -int ret;//, we; +int ret; ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0); if (ret <= 0) { - //we = WSAGetLastError(); - strcpy(errorMsg, RECV_HEADER_ANSWER_ERROR); + printf("Receive header answer error: '%s'\n", strerror(errno)); + errorMsg = RECV_HEADER_ANSWER_ERROR; return st_recv_fail; } @@ -237,12 +219,12 @@ else { if (strncmp(ERR_HEADER, buffer, strlen(ERR_HEADER)) == 0) { - strcpy(errorMsg, INCORRECT_HEADER); + errorMsg = INCORRECT_HEADER; return st_header_err; } else { - strcpy(errorMsg, UNKNOWN_ERROR); + errorMsg = UNKNOWN_ERROR; return st_unknown_err; } } @@ -254,12 +236,12 @@ char loginZ[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) { - strcpy(errorMsg, SEND_LOGIN_ERROR); + errorMsg = SEND_LOGIN_ERROR; return st_send_fail; } @@ -269,12 +251,13 @@ return st_ok; int NETTRANSACT::RxLoginAnswer() { char buffer[sizeof(OK_LOGIN)+1]; -int ret;//, we; +int ret; ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0); if (ret <= 0) { - strcpy(errorMsg, RECV_LOGIN_ANSWER_ERROR); + printf("Receive login answer error: '%s'\n", strerror(errno)); + errorMsg = RECV_LOGIN_ANSWER_ERROR; return st_recv_fail; } @@ -286,12 +269,12 @@ else { if (strncmp(ERR_LOGIN, buffer, strlen(ERR_LOGIN)) == 0) { - strcpy(errorMsg, INCORRECT_LOGIN); + errorMsg = INCORRECT_LOGIN; return st_login_err; } else { - strcpy(errorMsg, UNKNOWN_ERROR); + errorMsg = UNKNOWN_ERROR; return st_unknown_err; } } @@ -304,18 +287,18 @@ char ct[ENC_MSG_LEN]; int ret; memset(loginZ, 0, ADM_LOGIN_LEN); -strncpy(loginZ, login, ADM_LOGIN_LEN); +strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN); BLOWFISH_CTX ctx; -EnDecryptInit(password, 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) { - strcpy(errorMsg, SEND_LOGIN_ERROR); + errorMsg = SEND_LOGIN_ERROR; return st_send_fail; } } @@ -331,7 +314,8 @@ int ret; ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0); if (ret <= 0) { - strcpy(errorMsg, RECV_LOGIN_ANSWER_ERROR); + printf("Receive secret login answer error: '%s'\n", strerror(errno)); + errorMsg = RECV_LOGIN_ANSWER_ERROR; return st_recv_fail; } @@ -343,12 +327,12 @@ else { if (strncmp(ERR_LOGINS, buffer, strlen(ERR_LOGINS)) == 0) { - strcpy(errorMsg, INCORRECT_LOGIN); + errorMsg = INCORRECT_LOGIN; return st_logins_err; } else { - strcpy(errorMsg, UNKNOWN_ERROR); + errorMsg = UNKNOWN_ERROR; return st_unknown_err; } } @@ -365,16 +349,16 @@ int n = strlen(text) / ENC_MSG_LEN; int r = strlen(text) % ENC_MSG_LEN; BLOWFISH_CTX ctx; -EnDecryptInit(password, 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) { - strcpy(errorMsg, SEND_DATA_ERROR); + errorMsg = SEND_DATA_ERROR; return st_send_fail; } } @@ -383,13 +367,13 @@ memset(textZ, 0, ENC_MSG_LEN); if (r) strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN); -EnDecryptInit(password, 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) { - strcpy(errorMsg, SEND_DATA_ERROR); + errorMsg = SEND_DATA_ERROR; return st_send_fail; } @@ -403,7 +387,7 @@ char buffS[ENC_MSG_LEN]; char passwd[ADM_PASSWD_LEN]; memset(passwd, 0, ADM_PASSWD_LEN); -strncpy(passwd, password, ADM_PASSWD_LEN); +strncpy(passwd, password.c_str(), ADM_PASSWD_LEN); memset(buff, 0, ENC_MSG_LEN); int l = strlen(data)/ENC_MSG_LEN; @@ -411,12 +395,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); } @@ -425,83 +409,60 @@ 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, 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); - strcpy(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) - { + char buffer[ENC_MSG_LEN]; + DecodeString(buffer, bufferS, &ctx); - n = 0; - Decrypt(buffer, bufferS, &ctx); - buffer[ENC_MSG_LEN] = 0; + 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; - answerList.push_back(buffer); + if (pos > 0) + chunk.append(&buffer[0], &buffer[pos]); - 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 (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) -{ -strncpy(login, l, ADM_LOGIN_LEN); -} -//--------------------------------------------------------------------------- -void NETTRANSACT::SetPassword(const char * p) -{ -strncpy(password, p, ADM_PASSWD_LEN); -} -//--------------------------------------------------------------------------- -void NETTRANSACT::SetServer(const char * serverName) -{ -strncpy(server, serverName, SERVER_NAME_LEN); -} -//--------------------------------------------------------------------------- -void NETTRANSACT::SetServerPort(short unsigned p) -{ -port = p; -} -//--------------------------------------------------------------------------- void NETTRANSACT::SetRxCallback(void * data, RxCallback_t cb) { RxCallBack = cb; dataRxCallBack = data; } //--------------------------------------------------------------------------- -char * NETTRANSACT::GetError() +const std::string & NETTRANSACT::GetError() const { return errorMsg; } //--------------------------------------------------------------------------- -void NETTRANSACT::Reset() -{ -answerList.clear(); -} -//--------------------------------------------------------------------------- -