Added a wrapper for correct oid comparsion

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / rpcconfig.h

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index 75db5580eecda2b6200d13990b010462ab19caed..1213f7d310223ec9a024a9ca8a2c0d957d13e1f2 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -6,26 +6,25 @@
 #include <ctime>
 #include <string>
 #include <map>
+#include <vector>
 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 #include <xmlrpc-c/server_abyss.hpp>
 
-#include "os_int.h"
-#include "base_plugin.h"
-#include "base_store.h"
-#include "base_settings.h"
-#include "admin_conf.h"
-#include "../../../admin.h"
-#include "../../../admins.h"
-#include "../../../users.h"
-#include "../../../tariffs.h"
-#include "../../../traffcounter.h"
-#include "../../../settings.h"
+#include "stg/os_int.h"
+#include "stg/plugin.h"
+#include "stg/admin_conf.h"
+#include "stg/module_settings.h"
 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 
-extern "C" BASE_PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();
+
+class ADMINS;
+class TARIFFS;
+class USERS;
+class STORE;
 
 class RPC_CONFIG_SETTINGS
 {
@@ -37,10 +36,6 @@ public:
     uint16_t             GetPort() const { return port; };
     double               GetCookieTimeout() const { return cookieTimeout; };
 private:
-    int     ParseIntInRange(const std::string & str,
-                            int min,
-                            int max,
-                            int * val);
     std::string  errorStr;
     int          port;
     double       cookieTimeout;
@@ -53,30 +48,30 @@ struct ADMIN_INFO
     PRIV        priviledges;
 };
 
-class RPC_CONFIG :public BASE_PLUGIN
+class RPC_CONFIG :public PLUGIN
 {
 public:
     RPC_CONFIG();
     virtual ~RPC_CONFIG();
 
-    void                SetUsers(USERS * u) { users = u; };
-    void                SetTariffs(TARIFFS * t) { tariffs = t; };
-    void                SetAdmins(ADMINS * a) { admins = a; };
-    void                SetStore(BASE_STORE * s) { store = s; };
-    void                SetTraffcounter(TRAFFCOUNTER *) {};
-    void                SetStgSettings(const SETTINGS * s) { stgSettings = s; };
-    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; };
+    void                SetUsers(USERS * u) { users = u; }
+    void                SetTariffs(TARIFFS * t) { tariffs = t; }
+    void                SetAdmins(ADMINS * a) { admins = a; }
+    void                SetStore(STORE * s) { store = s; }
+    void                SetTraffcounter(TRAFFCOUNTER *) {}
+    void                SetStgSettings(const SETTINGS * s);
+    void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
 
     int                 Start();
     int                 Stop();
-    int                 Reload() { return 0; };
-    bool                IsRunning() { return running && !stopped; };
+    int                 Reload() { return 0; }
+    bool                IsRunning() { return running && !stopped; }
 
-    const string      & GetStrError() const { return errorStr; };
-    const string        GetVersion() const { return RPC_CONFIG_VERSION; };
-    uint16_t            GetStartPosition() const { return 220; };
-    uint16_t            GetStopPosition() const { return 220; };
+    const std::string & GetStrError() const { return errorStr; }
+    const std::string   GetVersion() const { return RPC_CONFIG_VERSION; }
+    uint16_t            GetStartPosition() const { return 220; }
+    uint16_t            GetStopPosition() const { return 220; }
 
     bool                GetAdminInfo(const std::string & cookie,
                                      ADMIN_INFO * info);
@@ -86,14 +81,17 @@ public:
     bool                LogoutAdmin(const std::string & cookie);
 
 private:
-    mutable string          errorStr;
+    static void *           Run(void *);
+    std::string             GetCookie() const;
+    void                    InitiateRegistry();
+
+    mutable std::string     errorStr;
     RPC_CONFIG_SETTINGS     rpcConfigSettings;
     USERS *                 users;
     ADMINS *                admins;
     TARIFFS *               tariffs;
-    BASE_STORE *            store;
+    STORE *                 store;
     MODULE_SETTINGS         settings;
-    const SETTINGS *        stgSettings;
     xmlrpc_c::registry      rpcRegistry;
     xmlrpc_c::serverAbyss * rpcServer;
     bool                    running;
@@ -101,10 +99,8 @@ private:
     pthread_t               tid;
     std::map<std::string,
              ADMIN_INFO>    cookies;
-
-    static void *           Run(void *);
-    std::string             GetCookie() const;
-    void                    InitiateRegistry();
+    size_t                  dayFee;
+    std::vector<std::string> dirNames;
 };
 
 #endif