Added stream encryption/decryption tests.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / configproto.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
index b8b01f024da3f1f0d8daf32ce7ea50231678ec13..4b93d675a00eba551d0d02836df58038d1a621b6 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@ -28,18 +28,15 @@
 #ifndef CONFIGPROTO_H
 #define CONFIGPROTO_H
 
 #ifndef CONFIGPROTO_H
 #define CONFIGPROTO_H
 

-#include <expat.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-

 #include <string>
 #include <list>
 #include <string>
 #include <list>

+#include <vector>
+
+#include "stg/module_settings.h"
+#include "stg/os_int.h"

 
 

-#include "stg/users.h"
-#include "stg/admins.h"
-#include "stg/tariffs.h"
-#include "stg/logger.h"
-#include "parser.h"
+#include <expat.h>
+#include <pthread.h>

 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"
 
 #define  STG_HEADER     "SG04"
 #define  OK_HEADER      "OKHD"


@@ -49,6 +46,15 @@
 #define  OK_LOGINS      "OKLS"
 #define  ERR_LOGINS     "ERLS"
 
 #define  OK_LOGINS      "OKLS"
 #define  ERR_LOGINS     "ERLS"
 

+class BASE_PARSER;
+class USERS;
+class ADMINS;
+class ADMIN;
+class TARIFFS;
+class PLUGIN_LOGGER;
+class STORE;
+class SETTINGS;
+

 //-----------------------------------------------------------------------------
 class CONFIGPROTO {
 public:
 //-----------------------------------------------------------------------------
 class CONFIGPROTO {
 public:


@@ -78,13 +84,12 @@ private:
     int             RecvLoginS(int sock);
     int             SendLoginSAnswer(int sock, int err);
     int             RecvData(int sock);
     int             RecvLoginS(int sock);
     int             SendLoginSAnswer(int sock, int err);
     int             RecvData(int sock);

-    int             SendDataAnswer(int sock);
-    void            SendError(const char * text);
+    int             SendDataAnswer(int sock, const std::string & answer);
+    int             SendError(int sock, const std::string & text);

     void            WriteLogAccessFailed(uint32_t ip);
 
     int             ParseCommand();
 
     void            WriteLogAccessFailed(uint32_t ip);
 
     int             ParseCommand();
 

-    std::list<std::string>      answerList;

     std::list<std::string>      requestList;
     uint32_t                    adminIP;
     std::string                 adminLogin;
     std::list<std::string>      requestList;
     uint32_t                    adminIP;
     std::string                 adminLogin;


@@ -98,26 +103,6 @@ private:
 
     int                         listenSocket;
 
 
     int                         listenSocket;
 

-    PARSER_GET_SERVER_INFO      parserGetServInfo;
-
-    PARSER_GET_USERS            parserGetUsers;
-    PARSER_GET_USER             parserGetUser;
-    PARSER_CHG_USER             parserChgUser;
-    PARSER_ADD_USER             parserAddUser;
-    PARSER_DEL_USER             parserDelUser;
-    PARSER_CHECK_USER           parserCheckUser;
-    PARSER_SEND_MESSAGE         parserSendMessage;
-
-    PARSER_GET_ADMINS           parserGetAdmins;
-    PARSER_ADD_ADMIN            parserAddAdmin;
-    PARSER_DEL_ADMIN            parserDelAdmin;
-    PARSER_CHG_ADMIN            parserChgAdmin;
-
-    PARSER_GET_TARIFFS          parserGetTariffs;
-    PARSER_ADD_TARIFF           parserAddTariff;
-    PARSER_DEL_TARIFF           parserDelTariff;
-    PARSER_CHG_TARIFF           parserChgTariff;
-

     ADMINS *                    admins;
 
     BASE_PARSER *               currParser;
     ADMINS *                    admins;
 
     BASE_PARSER *               currParser;