GetPlugin should be extern "C".

[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 6ca2b3da41de956ebe9442c726c2b9e17b2f6e53..afcb688172bf59864082e3757ae15ed0441544ad 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp
@@ -14,27 +14,29 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
  *    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 $
-*
-*******************************************************************/
+/*
+ *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
+ */

 
 #include "configproto.h"
 
 
 #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 "stg/blowfish.h"
 
 #include <cerrno>
 #include <csignal>
 #include <cstdio> // snprintf

+#include <cstring> // strerror

 
 #include <unistd.h> // close
 
 #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
 
 #ifndef ENODATA
 // FreeBSD 4.* - suxx


@@ -58,7 +60,6 @@ enum
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::Prepare()
 {
 //-----------------------------------------------------------------------------
 int CONFIGPROTO::Prepare()
 {

-std::list<std::string> ansList; //óÀÄÁ ÂÕÄÅÔ ÐÏÍÅÝÅÎ ÏÔ×ÅÔ ÄÌÑ ÍÅÎÅÄÖÅÒÁ ËÌÉÅÎÔÏ×

 int res;
 struct sockaddr_in listenAddr;
 
 int res;
 struct sockaddr_in listenAddr;
 


@@ -249,7 +250,7 @@ while (pos < stgHdrLen)
     if (!WaitPackets(sock))
         {
         state = confHdr;
     if (!WaitPackets(sock))
         {
         state = confHdr;

-        SendError("Bad request");
+        SendError(sock, "Bad request");

         return -1;
         }
     ssize_t ret = recv(sock, &buf[pos], static_cast<int>(stgHdrLen) - static_cast<int>(pos), 0);
         return -1;
         }
     ssize_t ret = recv(sock, &buf[pos], static_cast<int>(stgHdrLen) - static_cast<int>(pos), 0);


@@ -270,7 +271,7 @@ if (0 == strncmp(buf, STG_HEADER, strlen(STG_HEADER)))
     }
 else
     {
     }
 else
     {

-    SendError("Bad request");
+    SendError(sock, "Bad request");

     }
 
 state = confHdr;
     }
 
 state = confHdr;


@@ -384,11 +385,11 @@ if (currAdmin->GetLogin().empty())
     }
 
 BLOWFISH_CTX ctx;
     }
 
 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++)
 
 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())
     {
 
 if (currAdmin == admins->GetNoAdmin())
     {


@@ -434,7 +435,7 @@ int CONFIGPROTO::RecvData(int sock)
 requestList.clear();
 BLOWFISH_CTX ctx;
 
 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)
     {
 
 while (1)
     {


@@ -470,73 +471,47 @@ while (1)
     char buffer[8];
     buffer[7] = 0;
 
     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())
     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, currParser->GetAnswer());

         }
     }
 //return 0;
 }
 //-----------------------------------------------------------------------------
         }
     }
 //return 0;
 }
 //-----------------------------------------------------------------------------

-int CONFIGPROTO::SendDataAnswer(int sock)
+int CONFIGPROTO::SendDataAnswer(int sock, const std::string & answer)

 {
 {

-std::list<std::string>::iterator li;
-li = answerList.begin();
+if (answer.empty())
+    return 0;

 
 BLOWFISH_CTX ctx;
 
 BLOWFISH_CTX ctx;

+InitContext(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx);

 
 

-char buff[8];
-char buffS[8];
-int n = 0;
-int k = 0;
-
-EnDecodeInit(adminPassword.c_str(), ADM_PASSWD_LEN, &ctx);
-
-while (li != answerList.end())
+std::string::size_type pos = 0;
+std::string::size_type length = answer.length();
+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);
-            if (send(sock, buffS, 8, 0) < 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, 0) < 0)
+        return -1;
+    pos += chunkLength;

     }
 
     }
 

-if (answerList.empty()) {
-    return 0;
-}
-
-buff[n % 8] = 0;
-EncodeString(buffS, buff, &ctx);
-
-answerList.clear();
-
-return static_cast<int>(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)
 }
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)