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

[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 e0118638a8d5ac21f0c5966c4ba79fcf7f2f22aa..0de1ea2e201a8702bd386aca651bf008da72cb84 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -140,6 +140,7 @@ struct USER {
     USER(const std::vector<uint32_t> & r, USER_PTR it)
         : user(it),
           routers(r),
     USER(const std::vector<uint32_t> & r, USER_PTR it)
         : user(it),
           routers(r),

+          shortPacketsCount(0),

           ip(user->GetCurrIP())
     {}
 
           ip(user->GetCurrIP())
     {}
 


@@ -157,7 +158,7 @@ public:
     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; }


@@ -166,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 {


@@ -184,18 +185,17 @@ public:
 
     int                 Start();
     int                 Stop();
 
     int                 Start();
     int                 Stop();

-    int                 Reload();
+    int                 Reload(const MODULE_SETTINGS & ms);

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


@@ -214,13 +214,12 @@ private:
 
     std::vector<uint32_t> IP2Routers(uint32_t ip);
     bool                GetUsers();
 
     std::vector<uint32_t> IP2Routers(uint32_t ip);
     bool                GetUsers();

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

 
     void                SetUserNotifiers(USER_PTR u);
     void                UnSetUserNotifiers(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;