* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/*******************************************************************
-*
-* DESCRIPTION: æÁÊÌ Ó ÏÓÎÏ×ÎÙÍÉ ÆÕÎËÃÉÑÍÉ ÄÌÑ ÓÅÔÅ×ÏÇÏ ÏÂÍÅÎÁ ÄÁÎÎÙÍÉ
-* Ó ÍÅÎÅÄÖÅÒÏÍ ËÌÉÅÎÔÏ×. ðÒÉÅÍ, ÐÅÒÅÄÁÞÁ É ÛÉÆÒÏ×ÁÎÉÅ ÓÏÏÂÝÅÎÉÊ.
-*
-* AUTHOR: Boris Mikhailenko <stg34@stargazer.dp.ua>
-*
-* $Revision: 1.24 $
-* $Date: 2010/10/04 20:24:54 $
-*
-*******************************************************************/
-
-#include <unistd.h> // cloase, usleep
+/*
+ * Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
+ */
+
+#include "configproto.h"
+
+#include "parser.h"
+
+#include "stg/admins.h"
+#include "stg/logger.h"
+#include "stg/common.h"
+#include "stg/blowfish.h"
#include <cerrno>
#include <csignal>
-#include <cstdio> // snprintf
+#include <cstring> // strerror
-#include "stg/blowfish.h"
-#include "configproto.h"
+#include <unistd.h> // close
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#ifndef ENODATA
// FreeBSD 4.* - suxx
//-----------------------------------------------------------------------------
int CONFIGPROTO::Prepare()
{
-list<string> ansList; //óÀÄÁ ÂÕÄÅÔ ÐÏÍÅÝÅÎ ÏÔ×ÅÔ ÄÌÑ ÍÅÎÅÄÖÅÒÁ ËÌÉÅÎÔÏ×
-int res;
-struct sockaddr_in listenAddr;
-
sigset_t sigmask, oldmask;
sigemptyset(&sigmask);
sigaddset(&sigmask, SIGINT);
if (listenSocket < 0)
{
- errorStr = "Create NET_CONFIGURATOR socket failed.";
+ errorStr = "Create socket failed.";
+ logger("Cannot create a socket: %s", strerror(errno));
return -1;
}
+struct sockaddr_in listenAddr;
listenAddr.sin_family = PF_INET;
listenAddr.sin_port = htons(port);
listenAddr.sin_addr.s_addr = inet_addr("0.0.0.0");
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;
}
-res = bind(listenSocket, (struct sockaddr*)&listenAddr, sizeof(listenAddr));
-
-if (res == -1)
+if (bind(listenSocket, (struct sockaddr*)&listenAddr, sizeof(listenAddr)) == -1)
{
errorStr = "Bind admin socket failed";
+ logger("Cannot bind the socket: %s", strerror(errno));
return -1;
}
-res = listen(listenSocket, 0);
-if (res == -1)
+if (listen(listenSocket, 0) == -1)
{
errorStr = "Listen admin socket failed";
+ logger("Cannot listen the socket: %s", strerror(errno));
return -1;
}
int CONFIGPROTO::Stop()
{
nonstop = false;
+shutdown(listenSocket, SHUT_RDWR);
close(listenSocket);
//TODO: Idiotism
-int sock;
struct sockaddr_in addr;
-socklen_t addrLen;
addr.sin_family = PF_INET;
addr.sin_port = htons(port);
addr.sin_addr.s_addr = inet_addr("127.0.0.1");
-addrLen = sizeof(addr);
-sock = socket(PF_INET, SOCK_STREAM, 0);
+socklen_t addrLen = sizeof(addr);
+int sock = socket(PF_INET, SOCK_STREAM, 0);
connect(sock, (sockaddr*)&addr, addrLen);
+shutdown(sock, SHUT_RDWR);
close(sock);
//Idiotism end
return 0;
//-----------------------------------------------------------------------------
void CONFIGPROTO::Run()
{
-state = confHdr;
-
while (nonstop)
{
state = confHdr;
&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)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
{
if (SendHdrAnswer(outerSocket, ans_ok) < 0)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
if (RecvLogin(outerSocket) < 0)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
{
if (SendLoginAnswer(outerSocket) < 0)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
if (RecvLoginS(outerSocket) < 0)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
{
if (SendLoginSAnswer(outerSocket, ans_ok) < 0)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
if (RecvData(outerSocket) < 0)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
{
if (SendLoginSAnswer(outerSocket, ans_err) < 0)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
WriteLogAccessFailed(adminIP);
if (SendHdrAnswer(outerSocket, ans_err) < 0)
{
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
continue;
}
{
WriteLogAccessFailed(adminIP);
}
+ printfd(__FILE__, "Successfull connection from %s\n", inet_ntostring(outerAddr.sin_addr.s_addr).c_str());
+ shutdown(outerSocket, SHUT_RDWR);
close(outerSocket);
}
}
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<int>(stgHdrLen) - static_cast<int>(pos), 0);
+ if (ret <= 0)
{
+ if (ret < 0)
+ logger("recv error: %s", strerror(errno));
state = confHdr;
return -1;
}
}
else
{
- SendError("Bad request");
+ SendError(sock, "Bad request");
}
state = confHdr;
{
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;
}
}
{
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;
}
}
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<int>(pos), 0);
- if (ret < 0)
+ if (ret <= 0)
{
// Error in network
+ logger("recv error: %s", strerror(errno));
state = confHdr;
return ENODATA;
}
{
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;
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<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;
}
}
BLOWFISH_CTX ctx;
-EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
+InitContext(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);
- }
+ DecryptBlock(login + i * 8, loginS + i * 8, &ctx);
if (currAdmin == admins->GetNoAdmin())
{
}
state = confData;
+adminPassword = currAdmin->GetPassword();
return 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;
}
}
{
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;
}
}
requestList.clear();
BLOWFISH_CTX ctx;
-EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
+InitContext(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
while (1)
{
break;
}
- int ret = recv(sock, &bufferS[pos], sizeof(bufferS) - pos, 0);
+ 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;
}
char buffer[8];
buffer[7] = 0;
- DecodeString(buffer, bufferS, &ctx);
+ DecryptBlock(buffer, bufferS, &ctx);
requestList.push_back(std::string(buffer, pos));
if (done || memchr(buffer, 0, pos) != NULL)
{
// End of data
if (ParseCommand())
- {
- SendError("Bad command");
- }
- return SendDataAnswer(sock);
+ return SendError(sock, "Bad command");
+ else
+ return SendDataAnswer(sock, GetDataAnswer());
}
}
-return 0;
+//return 0;
}
//-----------------------------------------------------------------------------
-int CONFIGPROTO::SendDataAnswer(int sock)
+int CONFIGPROTO::SendDataAnswer(int sock, const std::string & answer)
{
-list<string>::iterator li;
-li = answerList.begin();
+if (answer.empty())
+ return 0;
BLOWFISH_CTX ctx;
+InitContext(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() + 1;
+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));
+ EncryptString(buffer, answer.c_str() + pos, chunkLength, &ctx);
+ if (send(sock, buffer, (chunkLength & ~7) < chunkLength ? chunkLength + 8 : chunkLength, 0) < 0) // Need to send data adjusted to the 8-byte boundary.
+ 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, "<Error value=\"%s\"/>", text);
-answerList.push_back(s);
+return SendDataAnswer(sock, "<Error value=\"" + 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