Added forgotten 'break'.

[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 a597135a08b464bd15847e588d5537516c1fdb14..72a14f21e028238c558657b2e70c8932aa81e4fc 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -12,15 +12,14 @@
 #include <xmlrpc-c/registry.hpp>
 #include <xmlrpc-c/server_abyss.hpp>
 
 #include <xmlrpc-c/registry.hpp>
 #include <xmlrpc-c/server_abyss.hpp>
 

-#include "os_int.h"
-#include "plugin.h"
-#include "admin_conf.h"
-#include "module_settings.h"
+#include "stg/os_int.h"
+#include "stg/plugin.h"
+#include "stg/admin_conf.h"
+#include "stg/module_settings.h"
+#include "stg/logger.h"

 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 
 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 

-extern "C" PLUGIN * GetPlugin();
-

 class ADMINS;
 class TARIFFS;
 class USERS;
 class ADMINS;
 class TARIFFS;
 class USERS;


@@ -30,29 +29,32 @@ class RPC_CONFIG_SETTINGS
 {
 public:
                          RPC_CONFIG_SETTINGS();
 {
 public:
                          RPC_CONFIG_SETTINGS();

-    virtual              ~RPC_CONFIG_SETTINGS() {};
-    const std::string &  GetStrError() const { return errorStr; };
+    virtual              ~RPC_CONFIG_SETTINGS() {}
+    const std::string &  GetStrError() const { return errorStr; }

     int                  ParseSettings(const MODULE_SETTINGS & s);
     int                  ParseSettings(const MODULE_SETTINGS & s);

-    uint16_t             GetPort() const { return port; };
-    double               GetCookieTimeout() const { return cookieTimeout; };
+    uint16_t             GetPort() const { return port; }
+    double               GetCookieTimeout() const { return cookieTimeout; }
+

 private:
 private:

-    int     ParseIntInRange(const std::string & str,
-                            int min,
-                            int max,
-                            int * val);

     std::string  errorStr;
     std::string  errorStr;

-    int          port;
+    uint16_t     port;

     double       cookieTimeout;
 };
 
 struct ADMIN_INFO
 {
     double       cookieTimeout;
 };
 
 struct ADMIN_INFO
 {

+    ADMIN_INFO()
+        : admin(),
+          accessTime(0),
+          priviledges()
+    {}
+

     std::string admin;
     time_t      accessTime;
     PRIV        priviledges;
 };
 
     std::string admin;
     time_t      accessTime;
     PRIV        priviledges;
 };
 

-class RPC_CONFIG :public PLUGIN
+class RPC_CONFIG : public PLUGIN

 {
 public:
     RPC_CONFIG();
 {
 public:
     RPC_CONFIG();


@@ -62,7 +64,6 @@ public:
     void                SetTariffs(TARIFFS * t) { tariffs = t; }
     void                SetAdmins(ADMINS * a) { admins = a; }
     void                SetStore(STORE * s) { store = s; }
     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();
     void                SetStgSettings(const SETTINGS * s);
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();


@@ -73,9 +74,9 @@ public:
     bool                IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }
     bool                IsRunning() { return running && !stopped; }
 
     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; }
+    std::string         GetVersion() const { return RPC_CONFIG_VERSION; }
+    uint16_t            GetStartPosition() const { return 20; }
+    uint16_t            GetStopPosition() const { return 20; }

 
     bool                GetAdminInfo(const std::string & cookie,
                                      ADMIN_INFO * info);
 
     bool                GetAdminInfo(const std::string & cookie,
                                      ADMIN_INFO * info);


@@ -85,6 +86,9 @@ public:
     bool                LogoutAdmin(const std::string & cookie);
 
 private:
     bool                LogoutAdmin(const std::string & cookie);
 
 private:

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

     static void *           Run(void *);
     std::string             GetCookie() const;
     void                    InitiateRegistry();
     static void *           Run(void *);
     std::string             GetCookie() const;
     void                    InitiateRegistry();


@@ -96,6 +100,7 @@ private:
     TARIFFS *               tariffs;
     STORE *                 store;
     MODULE_SETTINGS         settings;
     TARIFFS *               tariffs;
     STORE *                 store;
     MODULE_SETTINGS         settings;

+    int                     fd;

     xmlrpc_c::registry      rpcRegistry;
     xmlrpc_c::serverAbyss * rpcServer;
     bool                    running;
     xmlrpc_c::registry      rpcRegistry;
     xmlrpc_c::serverAbyss * rpcServer;
     bool                    running;


@@ -105,6 +110,7 @@ private:
              ADMIN_INFO>    cookies;
     size_t                  dayFee;
     std::vector<std::string> dirNames;
              ADMIN_INFO>    cookies;
     size_t                  dayFee;
     std::vector<std::string> dirNames;

+    PLUGIN_LOGGER           logger;

 };
 
 #endif
 };
 
 #endif