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 8c5aa3c59a5a4b900eb17fd2ea32a4acb43bc043..15809c3c7fd9a6e9848b505691e230c64930f862 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@ -38,7 +38,7 @@
 #include "stg/users.h"
 #include "stg/admins.h"
 #include "stg/tariffs.h"
 #include "stg/users.h"
 #include "stg/admins.h"
 #include "stg/tariffs.h"

-#include "stg/stg_logger.h"
+#include "stg/logger.h"

 #include "parser.h"
 
 #define  STG_HEADER     "SG04"
 #include "parser.h"
 
 #define  STG_HEADER     "SG04"


@@ -61,16 +61,19 @@ public:
     void            SetTariffs(TARIFFS * t);
     void            SetStore(STORE * s);
     void            SetStgSettings(const SETTINGS * s);
     void            SetTariffs(TARIFFS * t);
     void            SetStore(STORE * s);
     void            SetStgSettings(const SETTINGS * s);

-    uint32_t        GetAdminIP() const;
+    uint32_t        GetAdminIP() const { return adminIP; }

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

-    const std::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);