Merge branch 'master' into full-month-stats

[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 35e54105a38d20a501abd06fcf4b0b85deeba2ac..15809c3c7fd9a6e9848b505691e230c64930f862 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@ -33,14 +33,13 @@
 #include <sys/socket.h>
 
 #include <string>
 #include <sys/socket.h>
 
 #include <string>

+#include <list>

 
 

+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/tariffs.h"
+#include "stg/logger.h"

 #include "parser.h"
 #include "parser.h"

-#include "../../../users.h"
-#include "../../../admins.h"
-#include "../../../tariffs.h"
-#include "stg_logger.h"
-
-using namespace std;

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


@@ -51,30 +50,30 @@ using namespace std;
 #define  ERR_LOGINS     "ERLS"
 
 //-----------------------------------------------------------------------------
 #define  ERR_LOGINS     "ERLS"
 
 //-----------------------------------------------------------------------------

-class CONFIGPROTO
-{
+class CONFIGPROTO {

 public:
     CONFIGPROTO();
     ~CONFIGPROTO();
 
     void            SetPort(uint16_t port);
 public:
     CONFIGPROTO();
     ~CONFIGPROTO();
 
     void            SetPort(uint16_t port);

-    //void            SetHostAllow(HOSTALLOW * ha);

     void            SetAdmins(ADMINS * a);
     void            SetUsers(USERS * u);
     void            SetTariffs(TARIFFS * t);
     void            SetAdmins(ADMINS * a);
     void            SetUsers(USERS * u);
     void            SetTariffs(TARIFFS * t);

-    void            SetStore(BASE_STORE * s);
+    void            SetStore(STORE * s);

     void            SetStgSettings(const SETTINGS * s);
     void            SetStgSettings(const SETTINGS * s);

-    //const string &  GetAdminLogin();
-    uint32_t        GetAdminIP() const;
+    uint32_t        GetAdminIP() const { return adminIP; }

     int             Prepare();
     int             Stop();
     int             Prepare();
     int             Stop();

-    const string &  GetStrError() const;
-    static void *   Run(void * a);
+    const std::string & GetStrError() const { return errorStr; }
+    void            Run();

 
 private:
 
 private:

+    CONFIGPROTO(const CONFIGPROTO & rvalue);
+    CONFIGPROTO & operator=(const CONFIGPROTO & rvalue);
+

     int             RecvHdr(int sock);
     int             RecvLogin(int sock);
     int             RecvHdr(int sock);
     int             RecvLogin(int sock);

-    int             SendLoginAnswer(int sock, int err);
+    int             SendLoginAnswer(int sock);

     int             SendHdrAnswer(int sock, int err);
     int             RecvLoginS(int sock);
     int             SendLoginSAnswer(int sock, int err);
     int             SendHdrAnswer(int sock, int err);
     int             RecvLoginS(int sock);
     int             SendLoginSAnswer(int sock, int err);


@@ -85,22 +84,18 @@ private:
 
     int             ParseCommand();
 
 
     int             ParseCommand();
 

-    list<string>    answerList;
-    list<string>    requestList;
-    uint32_t        adminIP;
-    string          adminLogin;
-    uint16_t        port;
-    pthread_t       thrReciveSendConf;
-    bool            nonstop;
-    int             state;
-    //HOSTALLOW *     hostAllow;
-    ADMIN           currAdmin;
-    STG_LOGGER &    WriteServLog;
-
-    int                 outerSocket;
-    int                 listenSocket;
-    struct sockaddr_in  outerAddr;
-    socklen_t           outerAddrLen;
+    std::list<std::string>      answerList;
+    std::list<std::string>      requestList;
+    uint32_t                    adminIP;
+    std::string                 adminLogin;
+    uint16_t                    port;
+    pthread_t                   thrReciveSendConf;
+    bool                        nonstop;
+    int                         state;
+    ADMIN *                     currAdmin;
+    STG_LOGGER &                WriteServLog;
+
+    int                         listenSocket;

 
     PARSER_GET_SERVER_INFO      parserGetServInfo;
 
 
     PARSER_GET_SERVER_INFO      parserGetServInfo;
 


@@ -123,21 +118,16 @@ private:
     PARSER_CHG_TARIFF           parserChgTariff;
 
     ADMINS *                    admins;
     PARSER_CHG_TARIFF           parserChgTariff;
 
     ADMINS *                    admins;

-    //USERS *                     users;
-    //TARIFFS *                   tariffs;
-    //BASE_STORE *                store;
-    //const SETTINGS *            settings;

 
     BASE_PARSER *               currParser;
 
     BASE_PARSER *               currParser;

-    vector<BASE_PARSER*>        dataParser;
+    vector<BASE_PARSER *>       dataParser;

 
     XML_Parser                  xmlParser;
 
 
     XML_Parser                  xmlParser;
 

-    string                      errorStr;
+    std::string                 errorStr;

 
     friend void ParseXMLStart(void *data, const char *el, const char **attr);
     friend void ParseXMLEnd(void *data, const char *el);
 };
 //-----------------------------------------------------------------------------
 #endif //CONFIGPROTO_H
 
     friend void ParseXMLStart(void *data, const char *el, const char **attr);
     friend void ParseXMLEnd(void *data, const char *el);
 };
 //-----------------------------------------------------------------------------
 #endif //CONFIGPROTO_H

-