X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/daeeee5daf8488c1abd98d5a361356be873e4ac0..4243cf76394d6e657a1a8b67645d3d655efd1b07:/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp index 9ec72a1c..15403e8b 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp @@ -14,26 +14,29 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/******************************************************************* -* -* DESCRIPTION: æÁÊÌ Ó ÏÓÎÏ×ÎÙÍÉ ÆÕÎËÃÉÑÍÉ ÄÌÑ ÓÅÔÅ×ÏÇÏ ÏÂÍÅÎÁ ÄÁÎÎÙÍÉ -* Ó ÍÅÎÅÄÖÅÒÏÍ ËÌÉÅÎÔÏ×. ðÒÉÅÍ, ÐÅÒÅÄÁÞÁ É ÛÉÆÒÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ. -* -* AUTHOR: Boris Mikhailenko -* -* $Revision: 1.24 $ -* $Date: 2010/10/04 20:24:54 $ -* -*******************************************************************/ - -#include // cloase, usleep +/* + * Author : Boris Mikhailenko + */ + +#include "configproto.h" + +#include "parser.h" + +#include "stg/admins.h" +#include "stg/logger.h" +#include "stg/common.h" +#include "stg/blowfish.h" #include #include #include // snprintf +#include // strerror -#include "stg/blowfish.h" -#include "configproto.h" +#include // close +#include +#include +#include +#include #ifndef ENODATA // FreeBSD 4.* - suxx @@ -57,7 +60,6 @@ enum //----------------------------------------------------------------------------- int CONFIGPROTO::Prepare() { -list ansList; //óÀÄÁ ÂÕÄÅÔ ÐÏÍÅÝÅÎ ÏÔ×ÅÔ ÄÌÑ ÍÅÎÅÄÖÅÒÁ ËÌÉÅÎÔÏ× int res; struct sockaddr_in listenAddr; @@ -74,6 +76,7 @@ listenSocket = socket(PF_INET, SOCK_STREAM, 0); if (listenSocket < 0) { errorStr = "Create NET_CONFIGURATOR socket failed."; + logger("Cannot create a socket: %s", strerror(errno)); return -1; } @@ -85,7 +88,8 @@ int lng = 1; if (0 != setsockopt(listenSocket, SOL_SOCKET, SO_REUSEADDR, &lng, 4)) { - errorStr = "Setsockopt failed. " + string(strerror(errno)); + errorStr = "Setsockopt failed. " + std::string(strerror(errno)); + logger("setsockopt error: %s", strerror(errno)); return -1; } @@ -94,6 +98,7 @@ res = bind(listenSocket, (struct sockaddr*)&listenAddr, sizeof(listenAddr)); if (res == -1) { errorStr = "Bind admin socket failed"; + logger("Cannot bind the socket: %s", strerror(errno)); return -1; } @@ -101,6 +106,7 @@ res = listen(listenSocket, 0); if (res == -1) { errorStr = "Listen admin socket failed"; + logger("Cannot listen the socket: %s", strerror(errno)); return -1; } @@ -143,20 +149,17 @@ while (nonstop) &outerAddrLen); if (!nonstop) - { break; - } - if (outerSocket == -1) + if (outerSocket < 0) { + logger("accept error: %s", strerror(errno)); printfd(__FILE__, "accept failed\n"); continue; } adminIP = *(unsigned int*)&(outerAddr.sin_addr); - printfd(__FILE__, "Connection accepted from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str()); - if (state == confHdr) { if (RecvHdr(outerSocket) < 0) @@ -231,6 +234,7 @@ while (nonstop) { WriteLogAccessFailed(adminIP); } + printfd(__FILE__, "Successfull connection from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str()); close(outerSocket); } } @@ -246,12 +250,14 @@ while (pos < stgHdrLen) if (!WaitPackets(sock)) { state = confHdr; - SendError("Bad request"); + SendError(sock, "Bad request"); return -1; } - int ret = recv(sock, &buf[pos], stgHdrLen - pos, 0); - if (ret < 0) + ssize_t ret = recv(sock, &buf[pos], static_cast(stgHdrLen) - static_cast(pos), 0); + if (ret <= 0) { + if (ret < 0) + logger("recv error: %s", strerror(errno)); state = confHdr; return -1; } @@ -265,7 +271,7 @@ if (0 == strncmp(buf, STG_HEADER, strlen(STG_HEADER))) } else { - SendError("Bad request"); + SendError(sock, "Bad request"); } state = confHdr; @@ -278,7 +284,7 @@ if (err) { if (send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0) < 0) { - WriteServLog("send ERR_HEADER error in SendHdrAnswer."); + logger("send error: %s", strerror(errno)); return -1; } } @@ -286,7 +292,7 @@ else { if (send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0) < 0) { - WriteServLog("send OK_HEADER error in SendHdrAnswer."); + logger("send error: %s", strerror(errno)); return -1; } } @@ -308,11 +314,12 @@ while (pos < ADM_LOGIN_LEN) { return ENODATA; } - int ret = recv(sock, &login[pos], ADM_LOGIN_LEN - pos, 0); + ssize_t ret = recv(sock, &login[pos], ADM_LOGIN_LEN - static_cast(pos), 0); - if (ret < 0) + if (ret <= 0) { // Error in network + logger("recv error: %s", strerror(errno)); state = confHdr; return ENODATA; } @@ -337,7 +344,7 @@ int CONFIGPROTO::SendLoginAnswer(int sock) { if (send(sock, OK_LOGIN, sizeof(OK_LOGIN) - 1, 0) < 0) { - WriteServLog("Send OK_LOGIN error in SendLoginAnswer."); + logger("Send OK_LOGIN error in SendLoginAnswer."); return -1; } return 0; @@ -357,12 +364,13 @@ while (pos < ADM_LOGIN_LEN) return ENODATA; } - int ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - pos, 0); + ssize_t ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - static_cast(pos), 0); - if (ret < 0) + if (ret <= 0) { // Network error printfd(__FILE__, "recv error: '%s'\n", strerror(errno)); + logger("recv error: %s", strerror(errno)); state = confHdr; return ENODATA; } @@ -381,9 +389,7 @@ EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); char login[ADM_LOGIN_LEN + 1]; for (size_t i = 0; i < ADM_LOGIN_LEN / 8; i++) - { DecodeString(login + i * 8, loginS + i * 8, &ctx); - } if (currAdmin == admins->GetNoAdmin()) { @@ -399,6 +405,7 @@ if (strncmp(currAdmin->GetLogin().c_str(), login, ADM_LOGIN_LEN) != 0) } state = confData; +adminPassword = currAdmin->GetPassword(); return 0; } //----------------------------------------------------------------------------- @@ -408,7 +415,7 @@ if (err) { if (send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0) < 0) { - WriteServLog("send ERR_LOGIN error in SendLoginAnswer."); + logger("send error: %s", strerror(errno)); return -1; } } @@ -416,7 +423,7 @@ else { if (send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0) < 0) { - WriteServLog("send OK_LOGINS error in SendLoginSAnswer."); + logger("send error: %s", strerror(errno)); return -1; } } @@ -443,10 +450,11 @@ while (1) break; } - int ret = recv(sock, &bufferS[pos], sizeof(bufferS) - pos, 0); + ssize_t ret = recv(sock, &bufferS[pos], sizeof(bufferS) - static_cast(pos), 0); if (ret < 0) { // Network error + logger("recv error: %s", strerror(errno)); printfd(__FILE__, "recv error: '%s'\n", strerror(errno)); return -1; } @@ -461,7 +469,7 @@ while (1) } char buffer[8]; - buffer[8] = 0; + buffer[7] = 0; DecodeString(buffer, bufferS, &ctx); requestList.push_back(std::string(buffer, pos)); @@ -470,73 +478,44 @@ while (1) { // End of data if (ParseCommand()) - { - SendError("Bad command"); - } - return SendDataAnswer(sock); + return SendError(sock, "Bad command"); + else + return SendDataAnswer(sock, currParser->GetAnswer()); } } -return 0; +//return 0; } //----------------------------------------------------------------------------- -int CONFIGPROTO::SendDataAnswer(int sock) +int CONFIGPROTO::SendDataAnswer(int sock, const std::string & answer) { -list::iterator li; -li = answerList.begin(); +if (answer.empty()) + return 0; BLOWFISH_CTX ctx; +EnDecodeInit(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx); -char buff[8]; -char buffS[8]; -int n = 0; -int k = 0; - -EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); - -while (li != answerList.end()) +std::string::size_type pos = 0; +std::string::size_type length = answer.length(); +while (pos < length) { - while ((*li).c_str()[k]) - { - buff[n % 8] = (*li).c_str()[k]; - n++; - k++; - - if (n % 8 == 0) - { - EncodeString(buffS, buff, &ctx); - int ret = send(sock, buffS, 8, 0); - if (ret < 0) - { - return -1; - } - } - } - k = 0;// new node - ++li; + char buffer[1024]; + std::string::size_type chunkLength = std::min(length - pos, sizeof(buffer)); + EncodeFullString(buffer, answer.c_str() + pos, chunkLength, ctx); + if (send(sock, buffer, chunkLength, 0) < 0) + return -1; + pos += chunkLength; } -if (answerList.empty()) { - return 0; -} - -buff[n % 8] = 0; -EncodeString(buffS, buff, &ctx); - -answerList.clear(); - -return send(sock, buffS, 8, 0); +return 1; } //----------------------------------------------------------------------------- -void CONFIGPROTO::SendError(const char * text) +int CONFIGPROTO::SendError(int sock, const std::string & text) { -char s[255]; -answerList.clear(); -snprintf(s, 255, "", text); -answerList.push_back(s); +return SendDataAnswer(sock, ""); } //----------------------------------------------------------------------------- void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip) { -WriteServLog("Admin's connect failed. IP %s", inet_ntostring(ip).c_str()); +logger("Admin's connection failed. IP %s", inet_ntostring(ip).c_str()); } //-----------------------------------------------------------------------------