*
*******************************************************************/
-#include <unistd.h> // cloase, usleep
+#include <unistd.h> // close
#include <cerrno>
#include <csignal>
//-----------------------------------------------------------------------------
int CONFIGPROTO::Prepare()
{
-list<string> ansList; //óÀÄÁ ÂÕÄÅÔ ÐÏÍÅÝÅÎ ÏÔ×ÅÔ ÄÌÑ ÍÅÎÅÄÖÅÒÁ ËÌÉÅÎÔÏ×
int res;
struct sockaddr_in listenAddr;
if (listenSocket < 0)
{
errorStr = "Create NET_CONFIGURATOR socket failed.";
+ logger("Cannot create a socket: %s", strerror(errno));
return -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;
}
if (res == -1)
{
errorStr = "Bind admin socket failed";
+ logger("Cannot bind the socket: %s", strerror(errno));
return -1;
}
if (res == -1)
{
errorStr = "Listen admin socket failed";
+ logger("Cannot listen the socket: %s", strerror(errno));
return -1;
}
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)
close(outerSocket);
continue;
}
-
if (RecvLogin(outerSocket) < 0)
{
close(outerSocket);
continue;
}
-
if (state == confLoginCipher)
{
if (SendLoginAnswer(outerSocket) < 0)
close(outerSocket);
continue;
}
-
if (state == confData)
{
if (SendLoginSAnswer(outerSocket, ans_ok) < 0)
{
WriteLogAccessFailed(adminIP);
}
+ printfd(__FILE__, "Successfull connection from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str());
close(outerSocket);
}
}
{
char buf[sizeof(STG_HEADER)];
memset(buf, 0, sizeof(STG_HEADER));
-int ret;
-size_t stgHdrLen = sizeof(STG_HEADER);
-for (size_t i = 0; i < stgHdrLen; i++)
+size_t stgHdrLen = sizeof(STG_HEADER) - 1; // Without 0-char
+size_t pos = 0;
+while (pos < stgHdrLen)
{
- ret = recv(sock, &buf[i], 1, 0);
+ if (!WaitPackets(sock))
+ {
+ state = confHdr;
+ SendError("Bad request");
+ return -1;
+ }
+ ssize_t ret = recv(sock, &buf[pos], static_cast<int>(stgHdrLen) - static_cast<int>(pos), 0);
if (ret <= 0)
{
+ if (ret < 0)
+ logger("recv error: %s", strerror(errno));
state = confHdr;
return -1;
}
+ pos += ret;
}
if (0 == strncmp(buf, STG_HEADER, strlen(STG_HEADER)))
//-----------------------------------------------------------------------------
int CONFIGPROTO::SendHdrAnswer(int sock, int err)
{
-int ret;
-
if (err)
{
- ret = send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0);
- if (ret < 0)
+ 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;
}
}
else
{
- ret = send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0);
- if (ret < 0)
+ 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;
}
}
int CONFIGPROTO::RecvLogin(int sock)
{
char login[ADM_LOGIN_LEN + 1];
-int ret;
memset(login, 0, ADM_LOGIN_LEN + 1);
-ret = recv(sock, login, ADM_LOGIN_LEN, 0);
+size_t pos = 0;
+while (pos < ADM_LOGIN_LEN) {
+ if (!WaitPackets(sock))
+ {
+ state = confHdr;
+ return ENODATA;
+ }
-if (ret < 0)
- {
- // Error in network
- state = confHdr;
- return ENODATA;
- }
+ ssize_t ret = recv(sock, &login[pos], ADM_LOGIN_LEN - static_cast<int>(pos), 0);
-if (ret < ADM_LOGIN_LEN)
- {
- // Error in protocol
- state = confHdr;
- return ENODATA;
- }
+ if (ret <= 0)
+ {
+ // Error in network
+ logger("recv error: %s", strerror(errno));
+ state = confHdr;
+ return ENODATA;
+ }
-if (admins->FindAdmin(login, &currAdmin))
+ pos += ret;
+}
+
+if (admins->Find(login, &currAdmin))
{
// Admin not found
state = confHdr;
return ENODATA;
}
+
currAdmin->SetIP(adminIP);
adminLogin = login;
state = confLoginCipher;
//-----------------------------------------------------------------------------
int CONFIGPROTO::SendLoginAnswer(int sock)
{
-int ret;
-
-ret = send(sock, OK_LOGIN, sizeof(OK_LOGIN) - 1, 0);
-if (ret < 0)
+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;
int CONFIGPROTO::RecvLoginS(int sock)
{
char loginS[ADM_LOGIN_LEN + 1];
-char login[ADM_LOGIN_LEN + 1];
-BLOWFISH_CTX ctx;
memset(loginS, 0, ADM_LOGIN_LEN + 1);
-int total = 0;
-
-while (total < ADM_LOGIN_LEN)
+size_t pos = 0;
+while (pos < ADM_LOGIN_LEN)
{
- int ret = recv(sock, &loginS[total], ADM_LOGIN_LEN - total, 0);
+ if (!WaitPackets(sock))
+ {
+ state = confHdr;
+ return ENODATA;
+ }
+
+ ssize_t ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - static_cast<int>(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;
}
- total += ret;
+ pos += ret;
}
if (currAdmin->GetLogin().empty())
return ENODATA;
}
+BLOWFISH_CTX ctx;
EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
-for (int i = 0; i < ADM_LOGIN_LEN / 8; i++)
+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);
}
}
state = confData;
+adminPassword = currAdmin->GetPassword();
return 0;
}
//-----------------------------------------------------------------------------
{
if (err)
{
- int ret = send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0);
- if (ret < 0)
+ 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;
}
}
else
{
- int ret = send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0);
- if (ret < 0)
+ 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;
}
}
//-----------------------------------------------------------------------------
int CONFIGPROTO::RecvData(int sock)
{
-char bufferS[8];
-char buffer[9];
-
-buffer[8] = 0;
-
requestList.clear();
BLOWFISH_CTX ctx;
while (1)
{
- int total = 0;
bool done = false;
- while (total < 8)
+ char bufferS[8];
+ size_t pos = 0;
+ while (pos < sizeof(bufferS))
{
- int ret = recv(sock, &bufferS[total], 8 - total, 0);
+ if (!WaitPackets(sock))
+ {
+ done = true;
+ break;
+ }
+
+ ssize_t ret = recv(sock, &bufferS[pos], sizeof(bufferS) - static_cast<int>(pos), 0);
if (ret < 0)
{
// Network error
+ logger("recv error: %s", strerror(errno));
+ printfd(__FILE__, "recv error: '%s'\n", strerror(errno));
return -1;
}
break;
}
- total += ret;
+ pos += ret;
}
+ char buffer[8];
+ buffer[7] = 0;
+
DecodeString(buffer, bufferS, &ctx);
- requestList.push_back(std::string(buffer, total));
+ requestList.push_back(std::string(buffer, pos));
- if (done || memchr(buffer, 0, total) != NULL)
+ if (done || memchr(buffer, 0, pos) != NULL)
{
- // ëÏÎÅà ÐÏÓÙÌËÉ
+ // End of data
if (ParseCommand())
{
SendError("Bad command");
return SendDataAnswer(sock);
}
}
-return 0;
+//return 0;
}
//-----------------------------------------------------------------------------
int CONFIGPROTO::SendDataAnswer(int sock)
{
-list<string>::iterator li;
+std::list<std::string>::iterator li;
li = answerList.begin();
BLOWFISH_CTX ctx;
int n = 0;
int k = 0;
-EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
+EnDecodeInit(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx);
while (li != answerList.end())
{
if (n % 8 == 0)
{
EncodeString(buffS, buff, &ctx);
- int ret = send(sock, buffS, 8, 0);
+ int ret = static_cast<int>(send(sock, buffS, 8, 0));
if (ret < 0)
{
return -1;
answerList.clear();
-return send(sock, buffS, 8, 0);
+return static_cast<int>(send(sock, buffS, 8, 0));
}
//-----------------------------------------------------------------------------
void CONFIGPROTO::SendError(const char * text)
//-----------------------------------------------------------------------------
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());
}
//-----------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff