Added specialization for std::string of Value2OS

[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 479a135703f24edbdaff610732da870e5393e299..f494ee404e739aaedc4c293592ebb065bd2a91a0 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -129,113 +129,101 @@ 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;
@@ -244,12 +232,10 @@ while (cp->nonstop)
         }
     else
         {
-        cp->WriteLogAccessFailed(cp->adminIP);
+        WriteLogAccessFailed(adminIP);
         }
     close(outerSocket);
     }
-
-return NULL;
 }
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvHdr(int sock)
@@ -257,8 +243,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);
+for (size_t i = 0; i < stgHdrLen; i++)
     {
     ret = recv(sock, &buf[i], 1, 0);
     if (ret <= 0)
@@ -288,7 +274,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.");
@@ -297,7 +283,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.");
@@ -310,7 +296,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);
@@ -320,7 +306,6 @@ ret = recv(sock, login, ADM_LOGIN_LEN, 0);
 if (ret < 0)
     {
     // Error in network
-    close(sock);
     state = confHdr;
     return ENODATA;
     }
@@ -328,7 +313,6 @@ if (ret < 0)
 if (ret < ADM_LOGIN_LEN)
     {
     // Error in protocol
-    close(sock);
     state = confHdr;
     return ENODATA;
     }
@@ -336,7 +320,6 @@ if (ret < ADM_LOGIN_LEN)
 if (admins->FindAdmin(login, &currAdmin))
     {
     // Admin not found
-    close(sock);
     state = confHdr;
     return ENODATA;
     }
@@ -346,11 +329,11 @@ 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.");
@@ -363,7 +346,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);
 
@@ -371,13 +353,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;
         }
@@ -385,7 +366,7 @@ while (total < ADM_LOGIN_LEN)
     total += ret;
     }
 
-if (currAdmin->GetLogin() == "")
+if (currAdmin->GetLogin().empty())
     {
     state = confHdr;
     return ENODATA;
@@ -393,9 +374,9 @@ if (currAdmin->GetLogin() == "")
 
 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())
@@ -417,11 +398,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.");
@@ -430,7 +409,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.");
@@ -442,7 +421,6 @@ return 0;
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::RecvData(int sock)
 {
-int ret;
 char bufferS[8];
 char buffer[9];
 
@@ -459,21 +437,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;
@@ -506,7 +480,6 @@ char buff[8];
 char buffS[8];
 int n = 0;
 int k = 0;
-int ret = 0;
 
 EnDecodeInit(currAdmin->GetPassword().c_str(), ADM_PASSWD_LEN, &ctx);
 
@@ -514,14 +487,14 @@ 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;
@@ -536,7 +509,7 @@ if (answerList.empty()) {
     return 0;
 }
 
-buff[n%8] = 0;
+buff[n % 8] = 0;
 EncodeString(buffS, buff, &ctx);
 
 answerList.clear();