Explicit shell specification removed

[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..87ef9470ded316ede1a676a85e63791c79c7eb58 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -12,10 +12,10 @@
 #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"

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


@@ -30,16 +30,13 @@ 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;
     int          port;
     double       cookieTimeout;
     std::string  errorStr;
     int          port;
     double       cookieTimeout;


@@ -47,6 +44,12 @@ private:
 
 struct ADMIN_INFO
 {
 
 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;


@@ -62,7 +65,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();


@@ -85,6 +87,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 +101,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;