Fixed compilation with linux-3.5.1 and higher.

[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 649970e913964c7d1cc508dd0449495af49cbb98..6ee10c82c0170eea7fc535356f6bb3eb084ec2c0 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -47,6 +47,7 @@
 #include "stg/users.h"
 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"
+#include "stg/logger.h"
 #include "nrmap_parser.h"
 
 extern "C" PLUGIN * GetPlugin();
@@ -60,44 +61,75 @@ class SETTINGS;
 //-----------------------------------------------------------------------------
 class RS_ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:
-    RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {}
+    RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r)
+        : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
     virtual ~RS_ADD_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);
 
 private:
+    RS_ADD_USER_NONIFIER(const RS_ADD_USER_NONIFIER & rvalue);
+    RS_ADD_USER_NONIFIER & operator=(const RS_ADD_USER_NONIFIER);
+
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
 class RS_DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:
-    RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r) : rs(r) {}
+    RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r)
+        : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
     virtual ~RS_DEL_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);
 
 private:
+    RS_DEL_USER_NONIFIER(const RS_DEL_USER_NONIFIER & rvalue);
+    RS_DEL_USER_NONIFIER & operator=(const RS_DEL_USER_NONIFIER);
+
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
-template <typename varParamType>
-class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
+template <typename T>
+class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<T> {
 public:
-    RS_CHG_AFTER_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u) : user(u), rs(r) {}
-    void Notify(const varParamType & oldValue, const varParamType & newValue);
-    USER_PTR GetUser() {return user; }
+    RS_CHG_AFTER_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u)
+        : PROPERTY_NOTIFIER_BASE<T>(), user(u), rs(r) {}
+    RS_CHG_AFTER_NOTIFIER(const RS_CHG_AFTER_NOTIFIER<T> & rvalue)
+        : PROPERTY_NOTIFIER_BASE<T>(), user(rvalue.user), rs(rvalue.rs) {}
+    void Notify(const T & oldValue, const T & newValue);
+    USER_PTR GetUser() { return user; }
 
 private:
+    RS_CHG_AFTER_NOTIFIER<T> & operator=(const RS_CHG_AFTER_NOTIFIER<T> & rvalue);
+
     USER_PTR user;
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
 struct RS_USER {
-RS_USER();
-RS_USER(const std::vector<uint32_t> & r, USER_PTR it);
-
-time_t lastSentTime;
-USER_PTR user;
-std::vector<uint32_t> routers;
-int shortPacketsCount;
+    RS_USER()
+        : lastSentTime(0),
+          user(NULL),
+          routers(),
+          shortPacketsCount(0)
+    {}
+    RS_USER(const std::vector<uint32_t> & r, USER_PTR it)
+        : lastSentTime(0),
+          user(it),
+          routers(r),
+          shortPacketsCount(0)
+    {}
+    RS_USER(const RS_USER & rvalue)
+        : lastSentTime(rvalue.lastSentTime),
+          user(rvalue.user),
+          routers(rvalue.routers),
+          shortPacketsCount(rvalue.shortPacketsCount)
+    {}
+
+    RS_USER & operator=(const RS_USER & rvalue);
+
+    time_t lastSentTime;
+    USER_PTR user;
+    std::vector<uint32_t> routers;
+    int shortPacketsCount;
 };
 //-----------------------------------------------------------------------------
 class RS_SETTINGS {
@@ -139,8 +171,8 @@ public:
 
     const std::string & GetStrError() const { return errorStr; }
     const std::string   GetVersion() const { return "Remote script v 0.3"; }
-    uint16_t            GetStartPosition() const { return 20; }
-    uint16_t            GetStopPosition() const { return 20; }
+    uint16_t            GetStartPosition() const { return 10; }
+    uint16_t            GetStopPosition() const { return 10; }
 
     void                DelUser(USER_PTR u) { UnSetUserNotifier(u); }
     void                AddUser(USER_PTR u) { SetUserNotifier(u); }
@@ -148,6 +180,9 @@ public:
     void                ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP);
 
 private:
+    REMOTE_SCRIPT(const REMOTE_SCRIPT & rvalue);
+    REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rvalue);
+
     static void *       Run(void *);
     bool                PrepareNet();
     bool                FinalizeNet();
@@ -193,6 +228,8 @@ private:
     RS_ADD_USER_NONIFIER onAddUserNotifier;
     RS_DEL_USER_NONIFIER onDelUserNotifier;
 
+    PLUGIN_LOGGER       logger;
+
     friend class UpdateRouter;
     friend class DisconnectUser;
 };
@@ -210,13 +247,11 @@ class DisconnectUser : public std::unary_function<std::pair<const uint32_t, RS_U
 //-----------------------------------------------------------------------------
 inline void RS_ADD_USER_NONIFIER::Notify(const USER_PTR & user)
 {
-printfd(__FILE__, "ADD_USER_NONIFIER\n");
 rs.AddUser(user);
 }
 //-----------------------------------------------------------------------------
 inline void RS_DEL_USER_NONIFIER::Notify(const USER_PTR & user)
 {
-printfd(__FILE__, "DEL_USER_NONIFIER\n");
 rs.DelUser(user);
 }
 //-----------------------------------------------------------------------------