X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/e9cb0683c0b33d8458c1d9b2558bbeb5d101e680..fc06430b05b154e0e859c6a436c1ffd74576a189:/stglibs/srvconf.lib/netunit.cpp diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index aaba3df6..9955d2e5 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -26,8 +26,11 @@ //--------------------------------------------------------------------------- -#include "stg/netunit.h" +#include "netunit.h" + +#include "stg/servconf_types.h" #include "stg/common.h" +#include "stg/blowfish.h" #include #include @@ -37,6 +40,19 @@ #include #include +#include +#include +#include + +using namespace STG; + +namespace +{ + +const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048; + +} + //--------------------------------------------------------------------------- #define SEND_DATA_ERROR "Send data error!" @@ -53,43 +69,20 @@ #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() { -int ret; - outerSocket = socket(PF_INET, SOCK_STREAM, 0); if (outerSocket < 0) { @@ -100,36 +93,33 @@ if (outerSocket < 0) struct sockaddr_in outerAddr; memset(&outerAddr, 0, sizeof(outerAddr)); -struct hostent he; -struct hostent * phe; - -unsigned long ip; -ip = inet_addr(server.c_str()); +unsigned long ip = inet_addr(server.c_str()); if (ip == INADDR_NONE) { - phe = gethostbyname(server.c_str()); + struct hostent * phe = gethostbyname(server.c_str()); if (phe == NULL) { errorMsg = "DNS error.\nCan not reslove " + server; return st_dns_err; } + struct hostent he; memcpy(&he, phe, sizeof(he)); - ip = *((long*)he.h_addr_list[0]); + ip = *((long *)he.h_addr_list[0]); } + outerAddr.sin_family = AF_INET; outerAddr.sin_port = htons(port); outerAddr.sin_addr.s_addr = ip; -ret = connect(outerSocket, (struct sockaddr*)&outerAddr, sizeof(outerAddr)); - -if (ret < 0) +if (connect(outerSocket, (struct sockaddr *)&outerAddr, sizeof(outerAddr)) < 0) { errorMsg = CONNECT_FAILED; close(outerSocket); return st_conn_fail; } + return st_ok; } //--------------------------------------------------------------------------- @@ -195,9 +185,7 @@ return st_ok; //--------------------------------------------------------------------------- int NETTRANSACT::TxHeader() { -int ret; -ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0); -if (ret <= 0) +if (send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0) <= 0) { errorMsg = SEND_HEADER_ERROR; return st_send_fail; @@ -208,11 +196,9 @@ return st_ok; //--------------------------------------------------------------------------- int NETTRANSACT::RxHeaderAnswer() { -char buffer[sizeof(STG_HEADER)+1]; -int ret; +char buffer[sizeof(STG_HEADER) + 1]; -ret = recv(outerSocket, buffer, strlen(OK_HEADER), 0); -if (ret <= 0) +if (recv(outerSocket, buffer, strlen(OK_HEADER), 0) <= 0) { printf("Receive header answer error: '%s'\n", strerror(errno)); errorMsg = RECV_HEADER_ANSWER_ERROR; @@ -241,13 +227,10 @@ else int NETTRANSACT::TxLogin() { char loginZ[ADM_LOGIN_LEN]; -int ret; - memset(loginZ, 0, ADM_LOGIN_LEN); strncpy(loginZ, login.c_str(), ADM_LOGIN_LEN); -ret = send(outerSocket, loginZ, ADM_LOGIN_LEN, 0); -if (ret <= 0) +if (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0) { errorMsg = SEND_LOGIN_ERROR; return st_send_fail; @@ -258,11 +241,9 @@ return st_ok; //--------------------------------------------------------------------------- int NETTRANSACT::RxLoginAnswer() { -char buffer[sizeof(OK_LOGIN)+1]; -int ret; +char buffer[sizeof(OK_LOGIN) + 1]; -ret = recv(outerSocket, buffer, strlen(OK_LOGIN), 0); -if (ret <= 0) +if (recv(outerSocket, buffer, strlen(OK_LOGIN), 0) <= 0) { printf("Receive login answer error: '%s'\n", strerror(errno)); errorMsg = RECV_LOGIN_ANSWER_ERROR; @@ -291,20 +272,17 @@ 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; -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); - ret = send(outerSocket, ct, ENC_MSG_LEN, 0); - if (ret <= 0) + char ct[ENC_MSG_LEN]; + EncodeString(ct, loginZ + j * ENC_MSG_LEN, &ctx); + if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0) { errorMsg = SEND_LOGIN_ERROR; return st_send_fail; @@ -316,11 +294,9 @@ return st_ok; //--------------------------------------------------------------------------- int NETTRANSACT::RxLoginSAnswer() { -char buffer[sizeof(OK_LOGINS)+1]; -int ret; +char buffer[sizeof(OK_LOGINS) + 1]; -ret = recv(outerSocket, buffer, strlen(OK_LOGINS), 0); -if (ret <= 0) +if (recv(outerSocket, buffer, strlen(OK_LOGINS), 0) <= 0) { printf("Receive secret login answer error: '%s'\n", strerror(errno)); errorMsg = RECV_LOGIN_ANSWER_ERROR; @@ -348,23 +324,20 @@ 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; -EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx); +EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); -for (j = 0; j < n; j++) +char textZ[ENC_MSG_LEN]; +char ct[ENC_MSG_LEN]; + +for (int j = 0; j < n; j++) { - strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN); - Encrypt(ct, textZ, &ctx); - ret = send(outerSocket, ct, ENC_MSG_LEN, 0); - if (ret <= 0) + strncpy(textZ, text + j * ENC_MSG_LEN, ENC_MSG_LEN); + EncodeString(ct, textZ, &ctx); + if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0) { errorMsg = SEND_DATA_ERROR; return st_send_fail; @@ -372,14 +345,14 @@ for (j = 0; j < n; j++) } memset(textZ, 0, ENC_MSG_LEN); + if (r) - strncpy(textZ, text + j*ENC_MSG_LEN, ENC_MSG_LEN); + strncpy(textZ, text + n * ENC_MSG_LEN, ENC_MSG_LEN); -EnDecryptInit(password.c_str(), PASSWD_LEN, &ctx); +EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); -Encrypt(ct, textZ, &ctx); -ret = send(outerSocket, ct, ENC_MSG_LEN, 0); -if (ret <= 0) +EncodeString(ct, textZ, &ctx); +if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0) { errorMsg = SEND_DATA_ERROR; return st_send_fail; @@ -390,25 +363,25 @@ 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); + +char buff[ENC_MSG_LEN]; memset(buff, 0, ENC_MSG_LEN); -int l = strlen(data)/ENC_MSG_LEN; -if (strlen(data)%ENC_MSG_LEN) +int l = strlen(data) / ENC_MSG_LEN; +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); + 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); } @@ -417,83 +390,54 @@ 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) { - printf("Receive data error: '%s'\n", strerror(errno)); - 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); - printf("%s", 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; - 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) - { - printf("\n"); - 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) -{ -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; dataRxCallBack = data; } -//--------------------------------------------------------------------------- -const std::string & NETTRANSACT::GetError() const -{ -return errorMsg; -} -//--------------------------------------------------------------------------- -void NETTRANSACT::Reset() -{ -answerList.clear(); -} -//---------------------------------------------------------------------------