Merge branch 'stg-2.409' into stg-2.409-radius

[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 8525f8890adf7cae6fc1f36787281495f8d28c65..ce295818d482cdd01986bf944b3e8cd2b699fb0f 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -16,11 +16,10 @@
 #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"
 
-extern "C" PLUGIN * GetPlugin();
-
 class ADMINS;
 class TARIFFS;
 class USERS;
@@ -38,7 +37,7 @@ public:
 
 private:
     std::string  errorStr;
-    int          port;
+    uint16_t     port;
     double       cookieTimeout;
 };
 
@@ -55,7 +54,7 @@ struct ADMIN_INFO
     PRIV        priviledges;
 };
 
-class RPC_CONFIG :public PLUGIN
+class RPC_CONFIG : public PLUGIN
 {
 public:
     RPC_CONFIG();
@@ -71,11 +70,11 @@ public:
 
     int                 Start();
     int                 Stop();
-    int                 Reload() { return 0; }
+    int                 Reload(const MODULE_SETTINGS & /*ms*/) { return 0; }
     bool                IsRunning() { return running && !stopped; }
 
     const std::string & GetStrError() const { return errorStr; }
-    const std::string   GetVersion() const { return RPC_CONFIG_VERSION; }
+    std::string         GetVersion() const { return RPC_CONFIG_VERSION; }
     uint16_t            GetStartPosition() const { return 20; }
     uint16_t            GetStopPosition() const { return 20; }
 
@@ -111,6 +110,7 @@ private:
              ADMIN_INFO>    cookies;
     size_t                  dayFee;
     std::vector<std::string> dirNames;
+    PLUGIN_LOGGER           logger;
 };
 
 #endif