Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[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 c464e95ee5c3b76481d0e50e37dfe9cc2f66f2cc..2119bc675214c22aae0eb2f1c3589f659e592c81 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@ -38,8 +38,6 @@ class SETTINGS;
 class ADMINS;
 class TARIFFS;
 class USERS;
-class SERVICES;
-class CORPORATIONS;
 class STORE;
 class PLUGIN_LOGGER;
 
@@ -55,20 +53,18 @@ public:
     CONFIGPROTO(PLUGIN_LOGGER & l);
     ~CONFIGPROTO();
 
-    void SetPort(uint16_t port) { m_port = port; }
-    void SetBindAddress(const std::string & address) { m_bindAddress = address; }
-    void SetSettings(const SETTINGS * settings) { m_settings = settings; }
-    void SetAdmins(ADMINS * admins) { m_admins = admins; }
-    void SetTariffs(TARIFFS * tariffs) { m_tariffs = tariffs; }
-    void SetUsers(USERS * users) { m_users = users; }
-    void SetStore(STORE * store) { m_store = store; }
-    void SetServices(SERVICES * services) { m_services = services; }
-    void SetCorporations(CORPORATIONS * corporations) { m_corporations = corporations; }
-
-    int Prepare();
-    int Stop();
+    void            SetPort(uint16_t port) { m_port = port; }
+    void            SetBindAddress(const std::string & address) { m_bindAddress = address; }
+    void            SetSettings(const SETTINGS * settings) { m_settings = settings; }
+    void            SetAdmins(ADMINS * admins) { m_admins = admins; }
+    void            SetTariffs(TARIFFS * tariffs) { m_tariffs = tariffs; }
+    void            SetUsers(USERS * users) { m_users = users; }
+    void            SetStore(STORE * store) { m_store = store; }
+
+    int             Prepare();
+    int             Stop();
     const std::string & GetStrError() const { return m_errorStr; }
-    void Run();
+    void            Run();
 
 private:
     CONFIGPROTO(const CONFIGPROTO & rvalue);
@@ -78,8 +74,6 @@ private:
     ADMINS *         m_admins;
     TARIFFS *        m_tariffs;
     USERS *          m_users;
-    SERVICES *       m_services;
-    CORPORATIONS *   m_corporations;
     STORE *          m_store;
 
     uint16_t         m_port;
@@ -103,6 +97,8 @@ private:
     void CleanupConns();
     void HandleEvents(const fd_set & fds);
     void AcceptConnection();
+
+    //void WriteLogAccessFailed(uint32_t ip);
 };
 
 #endif //CONFIGPROTO_H