X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/4e95741287ce4385f16eaf9d621cedd4dccbcfe3..29e9a2de0b45893850bbf56ee38e7fd235a6df15:/stglibs/srvconf.lib/netunit.cpp diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index 3461fb47..61dc5c69 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -18,34 +18,22 @@ * Author : Boris Mikhailenko */ -#include "netunit.h" - -#include "stg/servconf_types.h" -#include "stg/common.h" -#include "stg/blowfish.h" - -#include // std::min - -#include -#include -#include + /* + $Revision: 1.6 $ + $Date: 2009/02/06 10:25:54 $ + $Author: faust $ + */ +//--------------------------------------------------------------------------- #include #include #include -#include -#include -#include - -using namespace STG; - -namespace -{ - -const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048; +#include +#include -} +#include "stg/netunit.h" +#include "stg/common.h" //--------------------------------------------------------------------------- @@ -53,7 +41,6 @@ const std::string::size_type MAX_XML_CHUNK_LENGTH = 2048; #define RECV_DATA_ANSWER_ERROR "Recv data answer error!" #define UNKNOWN_ERROR "Unknown error!" #define CONNECT_FAILED "Connect failed!" -#define BIND_FAILED "Bind failed!" #define INCORRECT_LOGIN "Incorrect login!" #define INCORRECT_HEADER "Incorrect header!" #define SEND_LOGIN_ERROR "Send login error!" @@ -64,32 +51,18 @@ 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), - localPort(0), - login(l), - password(pwd), - outerSocket(-1) -{ -} -//--------------------------------------------------------------------------- -NETTRANSACT::NETTRANSACT(const std::string & s, uint16_t p, - const std::string & la, uint16_t lp, - const std::string & l, const std::string & pwd) - : server(s), - port(p), - localAddress(la), - localPort(lp), - login(l), - password(pwd), - outerSocket(-1) +NETTRANSACT::NETTRANSACT() + : port(0), + outerSocket(-1), + RxCallBack(NULL), + dataRxCallBack(NULL) { } //--------------------------------------------------------------------------- int NETTRANSACT::Connect() { +int ret; + outerSocket = socket(PF_INET, SOCK_STREAM, 0); if (outerSocket < 0) { @@ -97,80 +70,49 @@ if (outerSocket < 0) return st_conn_fail; } -if (!localAddress.empty()) - { - if (localPort == 0) - localPort = port; - - unsigned long ip = inet_addr(localAddress.c_str()); - - if (ip == INADDR_NONE) - { - struct hostent * phe = gethostbyname(localAddress.c_str()); - if (phe == NULL) - { - errorMsg = "DNS error.\nCan not reslove " + localAddress; - return st_dns_err; - } - - struct hostent he; - memcpy(&he, phe, sizeof(he)); - ip = *((long *)he.h_addr_list[0]); - } - - struct sockaddr_in localAddr; - memset(&localAddr, 0, sizeof(localAddr)); - localAddr.sin_family = AF_INET; - localAddr.sin_port = htons(localPort); - localAddr.sin_addr.s_addr = ip; - - if (bind(outerSocket, (struct sockaddr *)&localAddr, sizeof(localAddr)) < 0) - { - errorMsg = BIND_FAILED; - close(outerSocket); - return st_conn_fail; - } - } - struct sockaddr_in outerAddr; memset(&outerAddr, 0, sizeof(outerAddr)); -unsigned long ip = inet_addr(server.c_str()); +struct hostent he; +struct hostent * phe; + +unsigned long ip; +ip = inet_addr(server.c_str()); if (ip == INADDR_NONE) { - struct hostent * phe = gethostbyname(server.c_str()); + 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; -if (connect(outerSocket, (struct sockaddr *)&outerAddr, sizeof(outerAddr)) < 0) +ret = connect(outerSocket, (struct sockaddr*)&outerAddr, sizeof(outerAddr)); + +if (ret < 0) { errorMsg = CONNECT_FAILED; close(outerSocket); return st_conn_fail; } - return st_ok; } //--------------------------------------------------------------------------- -void NETTRANSACT::Disconnect() +int NETTRANSACT::Disconnect() { close(outerSocket); +return 0; } //--------------------------------------------------------------------------- -int NETTRANSACT::Transact(const std::string & request, CALLBACK callback, void * data) +int NETTRANSACT::Transact(const char * data) { int ret; if ((ret = TxHeader()) != st_ok) @@ -209,13 +151,13 @@ if ((ret = RxLoginSAnswer()) != st_ok) return ret; } -if ((ret = TxData(request)) != st_ok) +if ((ret = TxData(data)) != st_ok) { Disconnect(); return ret; } -if ((ret = RxDataAnswer(callback, data)) != st_ok) +if ((ret = RxDataAnswer()) != st_ok) { Disconnect(); return ret; @@ -226,7 +168,9 @@ return st_ok; //--------------------------------------------------------------------------- int NETTRANSACT::TxHeader() { -if (send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0) <= 0) +int ret; +ret = send(outerSocket, STG_HEADER, strlen(STG_HEADER), 0); +if (ret <= 0) { errorMsg = SEND_HEADER_ERROR; return st_send_fail; @@ -237,11 +181,12 @@ return st_ok; //--------------------------------------------------------------------------- int NETTRANSACT::RxHeaderAnswer() { -char buffer[sizeof(STG_HEADER) + 1]; +char buffer[sizeof(STG_HEADER)+1]; +int ret; -if (recv(outerSocket, buffer, strlen(OK_HEADER), 0) <= 0) +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; } @@ -268,10 +213,13 @@ 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 (send(outerSocket, loginZ, ADM_LOGIN_LEN, 0) <= 0) +if (ret <= 0) { errorMsg = SEND_LOGIN_ERROR; return st_send_fail; @@ -282,11 +230,12 @@ return st_ok; //--------------------------------------------------------------------------- int NETTRANSACT::RxLoginAnswer() { -char buffer[sizeof(OK_LOGIN) + 1]; +char buffer[sizeof(OK_LOGIN)+1]; +int ret; -if (recv(outerSocket, buffer, strlen(OK_LOGIN), 0) <= 0) +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; } @@ -313,10 +262,11 @@ else int NETTRANSACT::TxLoginS() { char loginZ[ADM_LOGIN_LEN]; + memset(loginZ, 0, ADM_LOGIN_LEN); BLOWFISH_CTX ctx; InitContext(password.c_str(), PASSWD_LEN, &ctx); -EncryptString(loginZ, login.c_str(), std::min(login.length(), ADM_LOGIN_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) { errorMsg = SEND_LOGIN_ERROR; @@ -327,11 +277,12 @@ return st_ok; //--------------------------------------------------------------------------- int NETTRANSACT::RxLoginSAnswer() { -char buffer[sizeof(OK_LOGINS) + 1]; +char buffer[sizeof(OK_LOGINS)+1]; +int ret; -if (recv(outerSocket, buffer, strlen(OK_LOGINS), 0) <= 0) +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; } @@ -355,13 +306,15 @@ else } } //--------------------------------------------------------------------------- -int NETTRANSACT::TxData(const std::string & text) +int NETTRANSACT::TxData(const char * text) { BLOWFISH_CTX ctx; InitContext(password.c_str(), PASSWD_LEN, &ctx); -char buffer[text.length()]; -EncryptString(buffer, text.c_str(), text.length(), &ctx); -if (send(outerSocket, buffer, text.length(), 0) <= 0) +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; @@ -369,50 +322,83 @@ if (send(outerSocket, buffer, text.length(), 0) <= 0) return st_ok; } //--------------------------------------------------------------------------- -int NETTRANSACT::RxDataAnswer(CALLBACK callback, void * data) +int NETTRANSACT::RxDataAnswer() { +int n = 0; +int ret; +char bufferS[ENC_MSG_LEN]; +char buffer[ENC_MSG_LEN + 1]; + BLOWFISH_CTX 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]; - DecryptBlock(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 (callback) - if (!callback(chunk, final, data)) - 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; +dataRxCallBack = data; +} +//--------------------------------------------------------------------------- +const std::string & NETTRANSACT::GetError() const +{ +return errorMsg; +} +//--------------------------------------------------------------------------- +void NETTRANSACT::Reset() +{ +answerList.clear(); +} +//---------------------------------------------------------------------------