Produce debug output only if SMUX_DEBUG is defined

[stg.git] / projects / stargazer / plugins / other / rscript / rscript.h

diff --git a/projects/stargazer/plugins/other/rscript/rscript.h b/projects/stargazer/plugins/other/rscript/rscript.h
index 7748144e1102a5edc4f4b4773de33ff092c3a5f4..649970e913964c7d1cc508dd0449495af49cbb98 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -37,16 +37,16 @@
 #include <functional>
 #include <utility>
 
 #include <functional>
 #include <utility>
 

-#include "plugin.h"
-#include "store.h"
-#include "module_settings.h"
-#include "os_int.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "user.h"
-#include "users.h"
-#include "blowfish.h"
-#include "rs_packets.h"
+#include "stg/plugin.h"
+#include "stg/store.h"
+#include "stg/module_settings.h"
+#include "stg/os_int.h"
+#include "stg/notifer.h"
+#include "stg/user_ips.h"
+#include "stg/user.h"
+#include "stg/users.h"
+#include "stg/blowfish.h"
+#include "stg/rs_packets.h"

 #include "nrmap_parser.h"
 
 extern "C" PLUGIN * GetPlugin();
 #include "nrmap_parser.h"
 
 extern "C" PLUGIN * GetPlugin();


@@ -105,7 +105,7 @@ public:
                         RS_SETTINGS();
     virtual             ~RS_SETTINGS() {}
     const std::string & GetStrError() const { return errorStr; }
                         RS_SETTINGS();
     virtual             ~RS_SETTINGS() {}
     const std::string & GetStrError() const { return errorStr; }

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

     int                 GetSendPeriod() const { return sendPeriod; }
     int                 GetPort() const { return port; }
     const std::vector<NET_ROUTER> & GetSubnetsMap() const { return netRouters; }
     int                 GetSendPeriod() const { return sendPeriod; }
     int                 GetPort() const { return port; }
     const std::vector<NET_ROUTER> & GetSubnetsMap() const { return netRouters; }


@@ -114,7 +114,6 @@ public:
     const std::string & GetMapFileName() const { return subnetFile; }
 
 private:
     const std::string & GetMapFileName() const { return subnetFile; }
 
 private:

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

     int                 sendPeriod;
     uint16_t            port;
     string              errorStr;
     int                 sendPeriod;
     uint16_t            port;
     string              errorStr;


@@ -130,11 +129,6 @@ public:
     virtual             ~REMOTE_SCRIPT();
 
     void                SetUsers(USERS * u) { users = u; }
     virtual             ~REMOTE_SCRIPT();
 
     void                SetUsers(USERS * u) { users = u; }

-    void                SetTariffs(TARIFFS *) {}
-    void                SetAdmins(ADMINS *) {}
-    void                SetTraffcounter(TRAFFCOUNTER *) {}
-    void                SetStore(STORE *) {}
-    void                SetStgSettings(const SETTINGS *) {}

     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
 
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();