Syntactic fixes.

[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 6ee10c82c0170eea7fc535356f6bb3eb084ec2c0..e0412fb07501cdc2d2e70da2b269100f41a49ee3 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -19,18 +19,11 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-/*
- $Revision: 1.16 $
- $Date: 2010/09/10 06:43:59 $
- $Author: faust $
-*/
-

 #ifndef RSCRIPT_H
 #define RSCRIPT_H
 
 #include <pthread.h>
 
 #ifndef RSCRIPT_H
 #define RSCRIPT_H
 
 #include <pthread.h>
 

-#include <cstring>

 #include <string>
 #include <list>
 #include <map>
 #include <string>
 #include <list>
 #include <map>


@@ -38,16 +31,14 @@
 #include <utility>
 
 #include "stg/plugin.h"
 #include <utility>
 
 #include "stg/plugin.h"

-#include "stg/store.h"

 #include "stg/module_settings.h"
 #include "stg/os_int.h"
 #include "stg/notifer.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/user.h"

-#include "stg/users.h"

 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"
 #include "stg/logger.h"
 #include "stg/blowfish.h"
 #include "stg/rs_packets.h"
 #include "stg/logger.h"

+

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


@@ -56,90 +47,118 @@ extern "C" PLUGIN * GetPlugin();
 
 #define MAX_SHORT_PCKT  (3)
 
 
 #define MAX_SHORT_PCKT  (3)
 

-class REMOTE_SCRIPT;

 class SETTINGS;
 class SETTINGS;

+class USERS;
+
+namespace RS
+{
+
+class REMOTE_SCRIPT;
+class UpdateRouter;
+class DisconnectUser;
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-class RS_ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {

 public:
 public:

-    RS_ADD_USER_NONIFIER(REMOTE_SCRIPT & r)
+    ADD_USER_NONIFIER(REMOTE_SCRIPT & r)

         : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
         : NOTIFIER_BASE<USER_PTR>(), rs(r) {}

-    virtual ~RS_ADD_USER_NONIFIER() {}
+    virtual ~ADD_USER_NONIFIER() {}

     void Notify(const USER_PTR & user);
 
 private:
     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);
+    ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rhs);
+    ADD_USER_NONIFIER & operator=(const ADD_USER_NONIFIER);

 
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
 
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------

-class RS_DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {

 public:
 public:

-    RS_DEL_USER_NONIFIER(REMOTE_SCRIPT & r)
+    DEL_USER_NONIFIER(REMOTE_SCRIPT & r)

         : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
         : NOTIFIER_BASE<USER_PTR>(), rs(r) {}

-    virtual ~RS_DEL_USER_NONIFIER() {}
+    virtual ~DEL_USER_NONIFIER() {}

     void Notify(const USER_PTR & user);
 
 private:
     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);
+    DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rhs);
+    DEL_USER_NONIFIER & operator=(const DEL_USER_NONIFIER);

 
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
 
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------

-template <typename T>
-class RS_CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<T> {
+class IP_NOTIFIER: public PROPERTY_NOTIFIER_BASE<uint32_t> {

 public:
 public:

-    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; }
+    IP_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u)
+        : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(u), rs(r) { user->AddCurrIPAfterNotifier(this); }
+    IP_NOTIFIER(const IP_NOTIFIER & rhs)
+        : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(rhs.user), rs(rhs.rs) { user->AddCurrIPAfterNotifier(this); }
+    ~IP_NOTIFIER() { user->DelCurrIPAfterNotifier(this); }
+
+    IP_NOTIFIER & operator=(const IP_NOTIFIER & rhs)
+    {
+        user->DelCurrIPAfterNotifier(this);
+        user = rhs.user;
+        user->AddCurrIPAfterNotifier(this);
+        return *this;
+    }
+
+    void Notify(const uint32_t & oldValue, const uint32_t & newValue);
+    USER_PTR GetUser() const { return user; }

 
 private:
 
 private:

-    RS_CHG_AFTER_NOTIFIER<T> & operator=(const RS_CHG_AFTER_NOTIFIER<T> & rvalue);

 
     USER_PTR user;
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------
 
     USER_PTR user;
     REMOTE_SCRIPT & rs;
 };
 //-----------------------------------------------------------------------------

-struct RS_USER {
-    RS_USER()
-        : lastSentTime(0),
-          user(NULL),
-          routers(),
-          shortPacketsCount(0)
-    {}
-    RS_USER(const std::vector<uint32_t> & r, USER_PTR it)
-        : lastSentTime(0),
-          user(it),
+class CONNECTED_NOTIFIER: public PROPERTY_NOTIFIER_BASE<bool> {
+public:
+    CONNECTED_NOTIFIER(REMOTE_SCRIPT & r, USER_PTR u)
+        : PROPERTY_NOTIFIER_BASE<bool>(), user(u), rs(r) { user->AddConnectedAfterNotifier(this); }
+    CONNECTED_NOTIFIER(const CONNECTED_NOTIFIER & rhs)
+        : PROPERTY_NOTIFIER_BASE<bool>(), user(rhs.user), rs(rhs.rs) { user->AddConnectedAfterNotifier(this); }
+    ~CONNECTED_NOTIFIER() { user->DelConnectedAfterNotifier(this); }
+
+    CONNECTED_NOTIFIER & operator=(const CONNECTED_NOTIFIER & rhs)
+    {
+        user->DelConnectedAfterNotifier(this);
+        user = rhs.user;
+        user->AddConnectedAfterNotifier(this);
+        return *this;
+    }
+
+    void Notify(const bool & oldValue, const bool & newValue);
+    USER_PTR GetUser() const { return user; }
+
+private:
+
+    USER_PTR user;
+    REMOTE_SCRIPT & rs;
+};
+//-----------------------------------------------------------------------------
+struct USER {
+    USER(const std::vector<uint32_t> & r, USER_PTR it)
+        : user(it),

           routers(r),
           routers(r),

-          shortPacketsCount(0)
-    {}
-    RS_USER(const RS_USER & rvalue)
-        : lastSentTime(rvalue.lastSentTime),
-          user(rvalue.user),
-          routers(rvalue.routers),
-          shortPacketsCount(rvalue.shortPacketsCount)
+          shortPacketsCount(0),
+          ip(user->GetCurrIP())

     {}
 
     {}
 

-    RS_USER & operator=(const RS_USER & rvalue);
-

     time_t lastSentTime;
     USER_PTR user;
     std::vector<uint32_t> routers;
     int shortPacketsCount;
     time_t lastSentTime;
     USER_PTR user;
     std::vector<uint32_t> routers;
     int shortPacketsCount;

+    uint32_t ip;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class RS_SETTINGS {
+class SETTINGS {

 public:
 public:

-                        RS_SETTINGS();
-    virtual             ~RS_SETTINGS() {}
+                        SETTINGS();
+    virtual             ~SETTINGS() {}

     const std::string & GetStrError() const { return errorStr; }
     int                 ParseSettings(const MODULE_SETTINGS & s);
     int                 GetSendPeriod() const { return sendPeriod; }
     const std::string & GetStrError() const { return errorStr; }
     int                 ParseSettings(const MODULE_SETTINGS & s);
     int                 GetSendPeriod() const { return sendPeriod; }

-    int                 GetPort() const { return port; }
+    uint16_t            GetPort() const { return port; }

     const std::vector<NET_ROUTER> & GetSubnetsMap() const { return netRouters; }
     const std::vector<std::string> & GetUserParams() const { return userParams; }
     const std::string & GetPassword() const { return password; }
     const std::vector<NET_ROUTER> & GetSubnetsMap() const { return netRouters; }
     const std::vector<std::string> & GetUserParams() const { return userParams; }
     const std::string & GetPassword() const { return password; }


@@ -148,11 +167,11 @@ public:
 private:
     int                 sendPeriod;
     uint16_t            port;
 private:
     int                 sendPeriod;
     uint16_t            port;

-    string              errorStr;
+    std::string         errorStr;

     std::vector<NET_ROUTER> netRouters;
     std::vector<NET_ROUTER> netRouters;

-    std::vector<string> userParams;
-    string              password;
-    string              subnetFile;
+    std::vector<std::string> userParams;
+    std::string         password;
+    std::string         subnetFile;

 };
 //-----------------------------------------------------------------------------
 class REMOTE_SCRIPT : public PLUGIN {
 };
 //-----------------------------------------------------------------------------
 class REMOTE_SCRIPT : public PLUGIN {


@@ -170,45 +189,46 @@ public:
     bool                IsRunning() { return isRunning; }
 
     const std::string & GetStrError() const { return errorStr; }
     bool                IsRunning() { return isRunning; }
 
     const std::string & GetStrError() const { return errorStr; }

-    const std::string   GetVersion() const { return "Remote script v 0.3"; }
+    std::string         GetVersion() const { return "Remote script v 0.3"; }

     uint16_t            GetStartPosition() const { return 10; }
     uint16_t            GetStopPosition() const { return 10; }
 
     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); }
+    void                DelUser(USER_PTR u) { UnSetUserNotifiers(u); }
+    void                AddUser(USER_PTR u) { SetUserNotifiers(u); }

 
 

-    void                ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP);
+    void                AddRSU(USER_PTR user);
+    void                DelRSU(USER_PTR user);

 
 private:
 
 private:

-    REMOTE_SCRIPT(const REMOTE_SCRIPT & rvalue);
-    REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rvalue);
+    REMOTE_SCRIPT(const REMOTE_SCRIPT & rhs);
+    REMOTE_SCRIPT & operator=(const REMOTE_SCRIPT & rhs);

 
     static void *       Run(void *);
     bool                PrepareNet();
     bool                FinalizeNet();
 
 
     static void *       Run(void *);
     bool                PrepareNet();
     bool                FinalizeNet();
 

-    bool                Send(uint32_t ip, RS_USER & rsu, bool forceDisconnect = false) const;
-    bool                SendDirect(uint32_t ip, RS_USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const;
-    bool                PreparePacket(char * buf, size_t bufSize, uint32_t ip, RS_USER &rsu, bool forceDisconnect = false) const;
+    bool                Send(USER & rsu, bool forceDisconnect = false) const;
+    bool                SendDirect(USER & rsu, uint32_t routerIP, bool forceDisconnect = false) const;
+    bool                PreparePacket(char * buf, size_t bufSize, USER &rsu, bool forceDisconnect = false) const;

     void                PeriodicSend();
 
     std::vector<uint32_t> IP2Routers(uint32_t ip);
     bool                GetUsers();
     void                PeriodicSend();
 
     std::vector<uint32_t> IP2Routers(uint32_t ip);
     bool                GetUsers();

-    std::string         GetUserParam(USER_PTR u, const std::string & paramName) const;

 
 

-    void                SetUserNotifier(USER_PTR u);
-    void                UnSetUserNotifier(USER_PTR u);
+    void                SetUserNotifiers(USER_PTR u);
+    void                UnSetUserNotifiers(USER_PTR u);

 
 

-    void                InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const;
-    void                Encrypt(BLOWFISH_CTX * ctx, char * dst, const char * src, size_t len8) const;
+    void                InitEncrypt(BLOWFISH_CTX * ctx, const std::string & password) const;
+    void                Encrypt(BLOWFISH_CTX * ctx, void * dst, const void * src, size_t len8) const;

 
     mutable BLOWFISH_CTX ctx;
 
 
     mutable BLOWFISH_CTX ctx;
 

-    std::list<RS_CHG_AFTER_NOTIFIER<uint32_t> > afterChgIPNotifierList;
-    std::map<uint32_t, RS_USER> authorizedUsers;
+    std::list<IP_NOTIFIER> ipNotifierList;
+    std::list<CONNECTED_NOTIFIER> connNotifierList;
+    std::map<uint32_t, USER> authorizedUsers;

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

-    RS_SETTINGS         rsSettings;
+    SETTINGS         rsSettings;

     MODULE_SETTINGS     settings;
     int                 sendPeriod;
     int                 halfPeriod;
     MODULE_SETTINGS     settings;
     int                 sendPeriod;
     int                 halfPeriod;


@@ -225,35 +245,38 @@ private:
 
     int                 sock;
 
 
     int                 sock;
 

-    RS_ADD_USER_NONIFIER onAddUserNotifier;
-    RS_DEL_USER_NONIFIER onDelUserNotifier;
+    ADD_USER_NONIFIER onAddUserNotifier;
+    DEL_USER_NONIFIER onDelUserNotifier;

 
     PLUGIN_LOGGER       logger;
 
 
     PLUGIN_LOGGER       logger;
 

-    friend class UpdateRouter;
-    friend class DisconnectUser;
+    friend class RS::UpdateRouter;
+    friend class RS::DisconnectUser;
+    friend class RS::CONNECTED_NOTIFIER;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-class DisconnectUser : public std::unary_function<std::pair<const uint32_t, RS_USER> &, void> {
+class DisconnectUser : public std::unary_function<std::pair<const uint32_t, USER> &, void> {

     public:
         DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
     public:
         DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}

-        void operator()(std::pair<const uint32_t, RS_USER> & p)
+        void operator()(std::pair<const uint32_t, USER> & p)

         {
         {

-            rscript.Send(p.first, p.second, true);
+            rscript.Send(p.second, true);

         }
     private:
         REMOTE_SCRIPT & rscript;
 };
 //-----------------------------------------------------------------------------
         }
     private:
         REMOTE_SCRIPT & rscript;
 };
 //-----------------------------------------------------------------------------

-inline void RS_ADD_USER_NONIFIER::Notify(const USER_PTR & user)
+inline void ADD_USER_NONIFIER::Notify(const USER_PTR & user)

 {
 rs.AddUser(user);
 }
 //-----------------------------------------------------------------------------
 {
 rs.AddUser(user);
 }
 //-----------------------------------------------------------------------------

-inline void RS_DEL_USER_NONIFIER::Notify(const USER_PTR & user)
+inline void DEL_USER_NONIFIER::Notify(const USER_PTR & user)

 {
 rs.DelUser(user);
 }
 //-----------------------------------------------------------------------------
 
 {
 rs.DelUser(user);
 }
 //-----------------------------------------------------------------------------
 

+} // namespace RS
+

 #endif
 #endif