WaitPackets moved to common.lib

[stg.git] / 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 bc586d2db71868d6844a27782d84d8591992d936..16a1cefa7816fa8ec86eaa6fc0a74e54deb95d08 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -26,12 +26,14 @@
 *
 *******************************************************************/
 
 *
 *******************************************************************/
 

+#include <unistd.h> // cloase, usleep
+

 #include <cerrno>
 #include <csignal>
 #include <cstdio> // snprintf
 
 #include <cerrno>
 #include <csignal>
 #include <cstdio> // snprintf
 

+#include "stg/blowfish.h"

 #include "configproto.h"
 #include "configproto.h"

-#include "blowfish.h"

 
 #ifndef ENODATA
 // FreeBSD 4.* - suxx
 
 #ifndef ENODATA
 // FreeBSD 4.* - suxx


@@ -127,113 +129,98 @@ close(sock);
 return 0;
 }
 //-----------------------------------------------------------------------------
 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));
     struct sockaddr_in outerAddr;
     socklen_t outerAddrLen(sizeof(outerAddr));

-    int outerSocket = accept(cp->listenSocket,
+    int outerSocket = accept(listenSocket,

                              (struct sockaddr*)(&outerAddr),
                              &outerAddrLen);
 
                              (struct sockaddr*)(&outerAddr),
                              &outerAddrLen);
 

-    if (!cp->nonstop)
+    if (!nonstop)

         {
         {

-        continue;
+        break;

         }
 
     if (outerSocket == -1)
         {
         printfd(__FILE__, "accept failed\n");
         }
 
     if (outerSocket == -1)
         {
         printfd(__FILE__, "accept failed\n");

-        usleep(100000);

         continue;
         }
 
         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());
 
 
     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;
             }
             {
             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;
                 }
                 {
                 close(outerSocket);
                 continue;
                 }

-
-            if (cp->RecvLogin(outerSocket) < 0)
+            if (RecvLogin(outerSocket) < 0)

                 {
                 close(outerSocket);
                 continue;
                 }
                 {
                 close(outerSocket);
                 continue;
                 }

-
-            if (cp->state == confLoginCipher)
+            if (state == confLoginCipher)

                 {
                 {

-                if (cp->SendLoginAnswer(outerSocket, ans_ok) < 0)
+                if (SendLoginAnswer(outerSocket) < 0)

                     {
                     close(outerSocket);
                     continue;
                     }
                     {
                     close(outerSocket);
                     continue;
                     }

-                if (cp->RecvLoginS(outerSocket) < 0)
+                if (RecvLoginS(outerSocket) < 0)

                     {
                     close(outerSocket);
                     continue;
                     }
                     {
                     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;
                         }
                         {
                         close(outerSocket);
                         continue;
                         }

-                    if (cp->RecvData(outerSocket) < 0)
+                    if (RecvData(outerSocket) < 0)

                         {
                         close(outerSocket);
                         continue;
                         }
                         {
                         close(outerSocket);
                         continue;
                         }

-                    cp->state = confHdr;
+                    state = confHdr;

                     }
                 else
                     {
                     }
                 else
                     {

-                    if (cp->SendLoginSAnswer(outerSocket, ans_err) < 0)
+                    if (SendLoginSAnswer(outerSocket, ans_err) < 0)

                         {
                         close(outerSocket);
                         continue;
                         }
                         {
                         close(outerSocket);
                         continue;
                         }

-                    cp->WriteLogAccessFailed(cp->adminIP);
+                    WriteLogAccessFailed(adminIP);

                     }
                 }
             else
                 {
                     }
                 }
             else
                 {

-                cp->WriteLogAccessFailed(cp->adminIP);
+                WriteLogAccessFailed(adminIP);

                 }
             }
         else
             {
                 }
             }
         else
             {

-            cp->WriteLogAccessFailed(cp->adminIP);
-            if (cp->SendHdrAnswer(outerSocket, ans_err) < 0)
+            WriteLogAccessFailed(adminIP);
+            if (SendHdrAnswer(outerSocket, ans_err) < 0)

                 {
                 close(outerSocket);
                 continue;
                 {
                 close(outerSocket);
                 continue;


@@ -242,12 +229,10 @@ while (cp->nonstop)
         }
     else
         {
         }
     else
         {

-        cp->WriteLogAccessFailed(cp->adminIP);
+        WriteLogAccessFailed(adminIP);

         }
     close(outerSocket);
     }
         }
     close(outerSocket);
     }

-
-return NULL;

 }
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvHdr(int sock)
 }
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvHdr(int sock)


@@ -255,8 +240,8 @@ int CONFIGPROTO::RecvHdr(int sock)
 char buf[sizeof(STG_HEADER)];
 memset(buf, 0, sizeof(STG_HEADER));
 int ret;
 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)
     {
     ret = recv(sock, &buf[i], 1, 0);
     if (ret <= 0)


@@ -286,7 +271,7 @@ int ret;
 
 if (err)
     {
 
 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.");
     if (ret < 0)
         {
         WriteServLog("send ERR_HEADER error in SendHdrAnswer.");


@@ -295,7 +280,7 @@ if (err)
     }
 else
     {
     }
 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.");
     if (ret < 0)
         {
         WriteServLog("send OK_HEADER error in SendHdrAnswer.");


@@ -308,7 +293,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvLogin(int sock)
 {
 //-----------------------------------------------------------------------------
 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);
 int ret;
 
 memset(login, 0, ADM_LOGIN_LEN + 1);


@@ -318,7 +303,6 @@ ret = recv(sock, login, ADM_LOGIN_LEN, 0);
 if (ret < 0)
     {
     // Error in network
 if (ret < 0)
     {
     // Error in network

-    close(sock);

     state = confHdr;
     return ENODATA;
     }
     state = confHdr;
     return ENODATA;
     }


@@ -326,15 +310,13 @@ if (ret < 0)
 if (ret < ADM_LOGIN_LEN)
     {
     // Error in protocol
 if (ret < ADM_LOGIN_LEN)
     {
     // Error in protocol

-    close(sock);

     state = confHdr;
     return ENODATA;
     }
 
     state = confHdr;
     return ENODATA;
     }
 

-if (admins->FindAdmin(login, &currAdmin))
+if (admins->Find(login, &currAdmin))

     {
     // Admin not found
     {
     // Admin not found

-    close(sock);

     state = confHdr;
     return ENODATA;
     }
     state = confHdr;
     return ENODATA;
     }


@@ -344,11 +326,11 @@ state = confLoginCipher;
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int CONFIGPROTO::SendLoginAnswer(int sock, int)
+int CONFIGPROTO::SendLoginAnswer(int sock)

 {
 int ret;
 
 {
 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.");
 if (ret < 0)
     {
     WriteServLog("Send OK_LOGIN error in SendLoginAnswer.");


@@ -361,7 +343,6 @@ int CONFIGPROTO::RecvLoginS(int sock)
 {
 char loginS[ADM_LOGIN_LEN + 1];
 char login[ADM_LOGIN_LEN + 1];
 {
 char loginS[ADM_LOGIN_LEN + 1];
 char login[ADM_LOGIN_LEN + 1];

-int ret;

 BLOWFISH_CTX ctx;
 memset(loginS, 0, ADM_LOGIN_LEN + 1);
 
 BLOWFISH_CTX ctx;
 memset(loginS, 0, ADM_LOGIN_LEN + 1);
 


@@ -369,13 +350,12 @@ int total = 0;
 
 while (total < ADM_LOGIN_LEN)
     {
 
 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));
 
     if (ret < 0)
         {
         // Network error
         printfd(__FILE__, "recv error: '%s'\n", strerror(errno));

-        close(sock);

         state = confHdr;
         return ENODATA;
         }
         state = confHdr;
         return ENODATA;
         }


@@ -383,7 +363,7 @@ while (total < ADM_LOGIN_LEN)
     total += ret;
     }
 
     total += ret;
     }
 

-if (currAdmin->GetLogin() == "")
+if (currAdmin->GetLogin().empty())

     {
     state = confHdr;
     return ENODATA;
     {
     state = confHdr;
     return ENODATA;


@@ -391,9 +371,9 @@ if (currAdmin->GetLogin() == "")
 
 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())
     }
 
 if (currAdmin == admins->GetNoAdmin())


@@ -415,11 +395,9 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::SendLoginSAnswer(int sock, int err)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::SendLoginSAnswer(int sock, int err)
 {

-int ret;
-

 if (err)
     {
 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.");
     if (ret < 0)
         {
         WriteServLog("send ERR_LOGIN error in SendLoginAnswer.");


@@ -428,7 +406,7 @@ if (err)
     }
 else
     {
     }
 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.");
     if (ret < 0)
         {
         WriteServLog("send OK_LOGINS error in SendLoginSAnswer.");


@@ -440,7 +418,6 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {

-int ret;

 char bufferS[8];
 char buffer[9];
 
 char bufferS[8];
 char buffer[9];
 


@@ -457,21 +434,17 @@ while (1)
     bool done = false;
     while (total < 8)
         {
     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
         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;
             }
 
         total += ret;


@@ -504,7 +477,6 @@ char buff[8];
 char buffS[8];
 int n = 0;
 int k = 0;
 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);
 


@@ -512,14 +484,14 @@ while (li != answerList.end())
     {
     while ((*li).c_str()[k])
         {
     {
     while ((*li).c_str()[k])
         {

-        buff[n%8] = (*li).c_str()[k];
+        buff[n % 8] = (*li).c_str()[k];

         n++;
         k++;
 
         n++;
         k++;
 

-        if (n%8 == 0)
+        if (n % 8 == 0)

             {
             EncodeString(buffS, buff, &ctx);
             {
             EncodeString(buffS, buff, &ctx);

-            ret = send(sock, buffS, 8, 0);
+            int ret = send(sock, buffS, 8, 0);

             if (ret < 0)
                 {
                 return -1;
             if (ret < 0)
                 {
                 return -1;


@@ -527,14 +499,14 @@ while (li != answerList.end())
             }
         }
     k = 0;// new node
             }
         }
     k = 0;// new node

-    li++;
+    ++li;

     }
 
 if (answerList.empty()) {
     return 0;
 }
 
     }
 
 if (answerList.empty()) {
     return 0;
 }
 

-buff[n%8] = 0;
+buff[n % 8] = 0;

 EncodeString(buffS, buff, &ctx);
 
 answerList.clear();
 EncodeString(buffS, buff, &ctx);
 
 answerList.clear();