X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/7c36dd290e65ef4ad773543ce2641e1c83c28600..02f215c550418f180d0d1b2694c99a7a8d4dc4b2:/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp index 8d2ce153..16a1cefa 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp @@ -26,11 +26,14 @@ * *******************************************************************/ +#include // cloase, usleep + #include #include +#include // snprintf +#include "stg/blowfish.h" #include "configproto.h" -#include "blowfish.h" #ifndef ENODATA // FreeBSD 4.* - suxx @@ -126,113 +129,98 @@ close(sock); return 0; } //----------------------------------------------------------------------------- -// æÕÎËÃÉÑ ÏÂÝÅÎÉÑ Ó ËÏÎÆÉÇÕÒÁÔÏÒÏÍ -void * CONFIGPROTO::Run(void * a) +void CONFIGPROTO::Run() { -/* - * Function Name:ReciveSendConf - * Parameters: void * a ÕËÁÚÁÔÅÌØ ÎÁ ÜËÚÅÍÐÌÑÒ ËÌÁÓÓÁ CONFIGPROTO - * Description: üÔÁ ÆÕÎËÃÉÑ ÏÂÅÓÐÅÞÉ×ÁÅÔ ÓÅÔÅ×ÏÅ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÅ - * Ó íÅÎÅÄÖÅÒÏÍ ëÌÉÅÎÔÏ×. ÷ ÅÅ ÚÁÄÁÞÉ ×ÈÏÄÉÔ: ÐÒÉÅÍ ÚÁÐÒÏÓÏ× ÐÏ TCP/IP - * ÉÈ ÒÁÓÛÉÆÒÏ×ËÁ, ÐÅÒÅÄÁÞÁ ÐÒÉÎÑÔÙÈ ÄÁÎÎÙÈ ÁÎÁÌÉÚÁÔÏÒÕ É ÏÔÐÒÁ×ËÁ ÏÔ×ÅÔÁ ÎÁÚÁÄ. - * Returns: ×ÏÚ×ÒÁÝÁÅÔ NULL - */ - -CONFIGPROTO * cp = (CONFIGPROTO*)a; -cp->state = confHdr; +state = confHdr; -while (cp->nonstop) +while (nonstop) { - cp->state = confHdr; + state = confHdr; struct sockaddr_in outerAddr; socklen_t outerAddrLen(sizeof(outerAddr)); - int outerSocket = accept(cp->listenSocket, + int outerSocket = accept(listenSocket, (struct sockaddr*)(&outerAddr), &outerAddrLen); - if (!cp->nonstop) + if (!nonstop) { - continue; + break; } if (outerSocket == -1) { printfd(__FILE__, "accept failed\n"); - usleep(100000); continue; } - cp->adminIP = *(unsigned int*)&(outerAddr.sin_addr); + adminIP = *(unsigned int*)&(outerAddr.sin_addr); printfd(__FILE__, "Connection accepted from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str()); - if (cp->state == confHdr) + if (state == confHdr) { - if (cp->RecvHdr(outerSocket) < 0) + if (RecvHdr(outerSocket) < 0) { close(outerSocket); continue; } - if (cp->state == confLogin) + if (state == confLogin) { - if (cp->SendHdrAnswer(outerSocket, ans_ok) < 0) + if (SendHdrAnswer(outerSocket, ans_ok) < 0) { close(outerSocket); continue; } - - if (cp->RecvLogin(outerSocket) < 0) + if (RecvLogin(outerSocket) < 0) { close(outerSocket); continue; } - - if (cp->state == confLoginCipher) + if (state == confLoginCipher) { - if (cp->SendLoginAnswer(outerSocket, ans_ok) < 0) + if (SendLoginAnswer(outerSocket) < 0) { close(outerSocket); continue; } - if (cp->RecvLoginS(outerSocket) < 0) + if (RecvLoginS(outerSocket) < 0) { close(outerSocket); continue; } - - if (cp->state == confData) + if (state == confData) { - if (cp->SendLoginSAnswer(outerSocket, ans_ok) < 0) + if (SendLoginSAnswer(outerSocket, ans_ok) < 0) { close(outerSocket); continue; } - if (cp->RecvData(outerSocket) < 0) + if (RecvData(outerSocket) < 0) { close(outerSocket); continue; } - cp->state = confHdr; + state = confHdr; } else { - if (cp->SendLoginSAnswer(outerSocket, ans_err) < 0) + if (SendLoginSAnswer(outerSocket, ans_err) < 0) { close(outerSocket); continue; } - cp->WriteLogAccessFailed(cp->adminIP); + WriteLogAccessFailed(adminIP); } } else { - cp->WriteLogAccessFailed(cp->adminIP); + WriteLogAccessFailed(adminIP); } } else { - cp->WriteLogAccessFailed(cp->adminIP); - if (cp->SendHdrAnswer(outerSocket, ans_err) < 0) + WriteLogAccessFailed(adminIP); + if (SendHdrAnswer(outerSocket, ans_err) < 0) { close(outerSocket); continue; @@ -241,12 +229,10 @@ while (cp->nonstop) } else { - cp->WriteLogAccessFailed(cp->adminIP); + WriteLogAccessFailed(adminIP); } close(outerSocket); } - -return NULL; } //----------------------------------------------------------------------------- int CONFIGPROTO::RecvHdr(int sock) @@ -254,8 +240,8 @@ int CONFIGPROTO::RecvHdr(int sock) char buf[sizeof(STG_HEADER)]; memset(buf, 0, sizeof(STG_HEADER)); int ret; -int stgHdrLen = strlen(STG_HEADER); -for (int i = 0; i < stgHdrLen; i++) +size_t stgHdrLen = sizeof(STG_HEADER) - 1; // Without 0-char +for (size_t i = 0; i < stgHdrLen; i++) { ret = recv(sock, &buf[i], 1, 0); if (ret <= 0) @@ -285,7 +271,7 @@ int ret; if (err) { - ret = send(sock, ERR_HEADER, sizeof(ERR_HEADER)-1, 0); + ret = send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0); if (ret < 0) { WriteServLog("send ERR_HEADER error in SendHdrAnswer."); @@ -294,7 +280,7 @@ if (err) } else { - ret = send(sock, OK_HEADER, sizeof(OK_HEADER)-1, 0); + ret = send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0); if (ret < 0) { WriteServLog("send OK_HEADER error in SendHdrAnswer."); @@ -307,7 +293,7 @@ return 0; //----------------------------------------------------------------------------- int CONFIGPROTO::RecvLogin(int sock) { -char login[ADM_LOGIN_LEN+1]; +char login[ADM_LOGIN_LEN + 1]; int ret; memset(login, 0, ADM_LOGIN_LEN + 1); @@ -317,7 +303,6 @@ ret = recv(sock, login, ADM_LOGIN_LEN, 0); if (ret < 0) { // Error in network - close(sock); state = confHdr; return ENODATA; } @@ -325,29 +310,27 @@ if (ret < 0) if (ret < ADM_LOGIN_LEN) { // Error in protocol - close(sock); state = confHdr; return ENODATA; } -if (admins->FindAdmin(login, &currAdmin)) +if (admins->Find(login, &currAdmin)) { // Admin not found - close(sock); state = confHdr; return ENODATA; } -currAdmin.SetAdminIP(adminIP); +currAdmin->SetIP(adminIP); adminLogin = login; state = confLoginCipher; return 0; } //----------------------------------------------------------------------------- -int CONFIGPROTO::SendLoginAnswer(int sock, int) +int CONFIGPROTO::SendLoginAnswer(int sock) { int ret; -ret = send(sock, OK_LOGIN, sizeof(OK_LOGIN)-1, 0); +ret = send(sock, OK_LOGIN, sizeof(OK_LOGIN) - 1, 0); if (ret < 0) { WriteServLog("Send OK_LOGIN error in SendLoginAnswer."); @@ -360,7 +343,6 @@ int CONFIGPROTO::RecvLoginS(int sock) { char loginS[ADM_LOGIN_LEN + 1]; char login[ADM_LOGIN_LEN + 1]; -int ret; BLOWFISH_CTX ctx; memset(loginS, 0, ADM_LOGIN_LEN + 1); @@ -368,13 +350,12 @@ int total = 0; while (total < ADM_LOGIN_LEN) { - ret = recv(sock, &loginS[total], ADM_LOGIN_LEN - total, 0); + int ret = recv(sock, &loginS[total], ADM_LOGIN_LEN - total, 0); if (ret < 0) { // Network error printfd(__FILE__, "recv error: '%s'\n", strerror(errno)); - close(sock); state = confHdr; return ENODATA; } @@ -382,17 +363,17 @@ while (total < ADM_LOGIN_LEN) total += ret; } -if (currAdmin.GetLogin() == "") +if (currAdmin->GetLogin().empty()) { state = confHdr; return ENODATA; } -EnDecodeInit(currAdmin.GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); +EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); -for (int i = 0; i < ADM_LOGIN_LEN/8; i++) +for (int i = 0; i < ADM_LOGIN_LEN / 8; i++) { - DecodeString(login + i*8, loginS + i*8, &ctx); + DecodeString(login + i * 8, loginS + i * 8, &ctx); } if (currAdmin == admins->GetNoAdmin()) @@ -402,7 +383,7 @@ if (currAdmin == admins->GetNoAdmin()) return 0; } -if (strncmp(currAdmin.GetLogin().c_str(), login, ADM_LOGIN_LEN) != 0) +if (strncmp(currAdmin->GetLogin().c_str(), login, ADM_LOGIN_LEN) != 0) { state = confHdr; return ENODATA; @@ -414,11 +395,9 @@ return 0; //----------------------------------------------------------------------------- int CONFIGPROTO::SendLoginSAnswer(int sock, int err) { -int ret; - if (err) { - ret = send(sock, ERR_LOGINS, sizeof(ERR_LOGINS)-1, 0); + int ret = send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0); if (ret < 0) { WriteServLog("send ERR_LOGIN error in SendLoginAnswer."); @@ -427,7 +406,7 @@ if (err) } else { - ret = send(sock, OK_LOGINS, sizeof(OK_LOGINS)-1, 0); + int ret = send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0); if (ret < 0) { WriteServLog("send OK_LOGINS error in SendLoginSAnswer."); @@ -439,7 +418,6 @@ return 0; //----------------------------------------------------------------------------- int CONFIGPROTO::RecvData(int sock) { -int ret; char bufferS[8]; char buffer[9]; @@ -448,7 +426,7 @@ buffer[8] = 0; requestList.clear(); BLOWFISH_CTX ctx; -EnDecodeInit(currAdmin.GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); +EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); while (1) { @@ -456,21 +434,17 @@ while (1) bool done = false; while (total < 8) { - ret = recv(sock, &bufferS[total], 8 - total, 0); + int ret = recv(sock, &bufferS[total], 8 - total, 0); if (ret < 0) { // Network error - close(sock); - return 0; + return -1; } - if (ret < 8) + if (ret == 0) { - if (memchr(buffer, 0, ret) != NULL) - { - done = true; - break; - } + done = true; + break; } total += ret; @@ -503,22 +477,21 @@ char buff[8]; char buffS[8]; int n = 0; int k = 0; -int ret = 0; -EnDecodeInit(currAdmin.GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); +EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx); while (li != answerList.end()) { while ((*li).c_str()[k]) { - buff[n%8] = (*li).c_str()[k]; + buff[n % 8] = (*li).c_str()[k]; n++; k++; - if (n%8 == 0) + if (n % 8 == 0) { EncodeString(buffS, buff, &ctx); - ret = send(sock, buffS, 8, 0); + int ret = send(sock, buffS, 8, 0); if (ret < 0) { return -1; @@ -526,14 +499,14 @@ while (li != answerList.end()) } } k = 0;// new node - li++; + ++li; } if (answerList.empty()) { return 0; } -buff[n%8] = 0; +buff[n % 8] = 0; EncodeString(buffS, buff, &ctx); answerList.clear(); @@ -545,7 +518,7 @@ void CONFIGPROTO::SendError(const char * text) { char s[255]; answerList.clear(); -sprintf(s, "", text); +snprintf(s, 255, "", text); answerList.push_back(s); } //-----------------------------------------------------------------------------