X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5ec330c9443a3ad42258159e11013c116d9c4978..3f023a72d0eedd982ba16401fbdff63dc5dddd4d:/stglibs/srvconf.lib/netunit.cpp diff --git a/stglibs/srvconf.lib/netunit.cpp b/stglibs/srvconf.lib/netunit.cpp index b7aa4f73..f6fcf500 100644 --- a/stglibs/srvconf.lib/netunit.cpp +++ b/stglibs/srvconf.lib/netunit.cpp @@ -18,20 +18,14 @@ * Author : Boris Mikhailenko */ - /* - $Revision: 1.6 $ - $Date: 2009/02/06 10:25:54 $ - $Author: faust $ - */ - -//--------------------------------------------------------------------------- - #include "netunit.h" #include "stg/servconf_types.h" #include "stg/common.h" #include "stg/blowfish.h" +#include // std::min + #include #include #include @@ -59,6 +53,7 @@ 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!" @@ -73,6 +68,20 @@ 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) @@ -88,6 +97,41 @@ 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)); @@ -126,7 +170,7 @@ void NETTRANSACT::Disconnect() close(outerSocket); } //--------------------------------------------------------------------------- -int NETTRANSACT::Transact(const char * request, CALLBACK callback, void * data) +int NETTRANSACT::Transact(const std::string & request, CALLBACK callback, void * data) { int ret; if ((ret = TxHeader()) != st_ok) @@ -270,22 +314,14 @@ int NETTRANSACT::TxLoginS() { char loginZ[ADM_LOGIN_LEN]; 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) { - 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; - } + errorMsg = SEND_LOGIN_ERROR; + return st_send_fail; } - return st_ok; } //--------------------------------------------------------------------------- @@ -319,76 +355,24 @@ else } } //--------------------------------------------------------------------------- -int NETTRANSACT::TxData(const char * text) +int NETTRANSACT::TxData(const std::string & text) { -int n = strlen(text) / ENC_MSG_LEN; -int r = strlen(text) % ENC_MSG_LEN; - BLOWFISH_CTX ctx; -EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); - -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); - EncodeString(ct, textZ, &ctx); - if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0) - { - errorMsg = SEND_DATA_ERROR; - return st_send_fail; - } - } - -memset(textZ, 0, ENC_MSG_LEN); - -if (r) - strncpy(textZ, text + n * ENC_MSG_LEN, ENC_MSG_LEN); - -EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); - -EncodeString(ct, textZ, &ctx); -if (send(outerSocket, ct, ENC_MSG_LEN, 0) <= 0) +InitContext(password.c_str(), PASSWD_LEN, &ctx); +char buffer[text.length() + 9]; +EncryptString(buffer, text.c_str(), 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 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) - 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); - char buffS[ENC_MSG_LEN]; - EncodeString(buffS, buff, &ctx); - send(outerSocket, buffS, ENC_MSG_LEN, 0); - } - -return 0; -} -//--------------------------------------------------------------------------- int NETTRANSACT::RxDataAnswer(CALLBACK callback, void * data) { BLOWFISH_CTX ctx; -EnDecodeInit(password.c_str(), PASSWD_LEN, &ctx); +InitContext(password.c_str(), PASSWD_LEN, &ctx); std::string chunk; while (true) @@ -409,7 +393,7 @@ while (true) } char buffer[ENC_MSG_LEN]; - DecodeString(buffer, bufferS, &ctx); + DecryptBlock(buffer, bufferS, &ctx); bool final = false; size_t pos = 0;