Fix trailing whitespaces.

[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 bc6aa92f772f4375453c2f669100a318572f1bc7..4fb0ac735db5271c7c53d6880906aa3ea6ac6f6a 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.h
+++ b/projects/stargazer/plugins/other/rscript/rscript.h
@@ -22,14 +22,6 @@
 #ifndef RSCRIPT_H
 #define RSCRIPT_H
 
 #ifndef RSCRIPT_H
 #define RSCRIPT_H
 

-#include <pthread.h>
-
-#include <string>
-#include <list>
-#include <map>
-#include <functional>
-#include <utility>
-

 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 #include "stg/os_int.h"
 #include "stg/plugin.h"
 #include "stg/module_settings.h"
 #include "stg/os_int.h"


@@ -41,6 +33,14 @@
 
 #include "nrmap_parser.h"
 
 
 #include "nrmap_parser.h"
 

+#include <string>
+#include <list>
+#include <map>
+#include <functional>
+#include <utility>
+
+#include <pthread.h>
+

 extern "C" PLUGIN * GetPlugin();
 
 #define RS_DEBUG (1)
 extern "C" PLUGIN * GetPlugin();
 
 #define RS_DEBUG (1)


@@ -60,7 +60,7 @@ class DisconnectUser;
 //-----------------------------------------------------------------------------
 class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:
 //-----------------------------------------------------------------------------
 class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:

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

         : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
     virtual ~ADD_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);
         : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
     virtual ~ADD_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);


@@ -74,7 +74,7 @@ private:
 //-----------------------------------------------------------------------------
 class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:
 //-----------------------------------------------------------------------------
 class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
 public:

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

         : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
     virtual ~DEL_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);
         : NOTIFIER_BASE<USER_PTR>(), rs(r) {}
     virtual ~DEL_USER_NONIFIER() {}
     void Notify(const USER_PTR & user);


@@ -138,8 +138,10 @@ private:
 //-----------------------------------------------------------------------------
 struct USER {
     USER(const std::vector<uint32_t> & r, USER_PTR it)
 //-----------------------------------------------------------------------------
 struct USER {
     USER(const std::vector<uint32_t> & r, USER_PTR it)

-        : user(it),
+        : lastSentTime(0),
+          user(it),

           routers(r),
           routers(r),

+          shortPacketsCount(0),

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


@@ -184,7 +186,7 @@ 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; }


@@ -256,7 +258,7 @@ private:
 //-----------------------------------------------------------------------------
 class DisconnectUser : public std::unary_function<std::pair<const uint32_t, USER> &, void> {
     public:
 //-----------------------------------------------------------------------------
 class DisconnectUser : public std::unary_function<std::pair<const uint32_t, USER> &, void> {
     public:

-        DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}
+        explicit DisconnectUser(REMOTE_SCRIPT & rs) : rscript(rs) {}

         void operator()(std::pair<const uint32_t, USER> & p)
         {
             rscript.Send(p.second, true);
         void operator()(std::pair<const uint32_t, USER> & p)
         {
             rscript.Send(p.second, true);