Fix compilation issues

[stg.git] / projects / stargazer / plugins / other / ping / ping.cpp

diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp
index 7fa5aec1178a117eac73e3d0c4bb66ce9a2902db..3067e87ec480060dc79b4f211ce85aba32a722cc 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.cpp
+++ b/projects/stargazer/plugins/other/ping/ping.cpp
@@ -2,8 +2,13 @@
 #include <unistd.h>
 #include <signal.h>
 
 #include <unistd.h>
 #include <signal.h>
 

+#include <algorithm>
+

 #include "ping.h"
 #include "ping.h"

-#include "../../../user.h"
+#include "user.h"
+#include "stg_locker.h"
+#include "../../../settings.h"
+#include "../../../user_property.h"

 
 class PING_CREATOR
 {
 
 class PING_CREATOR
 {


@@ -34,18 +39,21 @@ PING_CREATOR pc;
 //-----------------------------------------------------------------------------
 // ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
 template <typename varType>
 //-----------------------------------------------------------------------------
 // ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
 template <typename varType>

-class IS_CONTAINS_USER: public binary_function<varType, user_iter, bool>
+class IS_CONTAINS_USER: public binary_function<varType, USER_PTR, bool>

 {
 public:
 {
 public:

-    bool operator()(varType notifier, user_iter user) const
+    IS_CONTAINS_USER(const USER_PTR & u) : user(u) {}
+    bool operator()(varType notifier) const

         {
         return notifier.GetUser() == user;
         };
         {
         return notifier.GetUser() == user;
         };

+private:
+    const USER_PTR & user;

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

-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()

 {
 return pc.GetPlugin();
 }
 {
 return pc.GetPlugin();
 }


@@ -53,8 +61,7 @@ return pc.GetPlugin();
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 PING_SETTINGS::PING_SETTINGS()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 PING_SETTINGS::PING_SETTINGS()

-    : pingDelay(0),
-      errorStr()
+    : pingDelay(0)

 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------


@@ -64,7 +71,7 @@ PARAM_VALUE pv;
 vector<PARAM_VALUE>::const_iterator pvi;
 
 pv.param = "PingDelay";
 vector<PARAM_VALUE>::const_iterator pvi;
 
 pv.param = "PingDelay";

-pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);

 if (pvi == s.moduleParams.end())
     {
     errorStr = "Parameter \'PingDelay\' not found.";
 if (pvi == s.moduleParams.end())
     {
     errorStr = "Parameter \'PingDelay\' not found.";


@@ -81,7 +88,7 @@ if (ParseIntInRange(pvi->value[0], 5, 3600, &pingDelay))
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

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

 {
 if (str2x(str.c_str(), *val))
     {
 {
 if (str2x(str.c_str(), *val))
     {


@@ -97,9 +104,13 @@ return 0;
 }
 //-----------------------------------------------------------------------------
 PING::PING()
 }
 //-----------------------------------------------------------------------------
 PING::PING()

+    : users(NULL),
+      nonstop(false),
+      isRunning(false),
+      onAddUserNotifier(*this),
+      onDelUserNotifier(*this)

 {
 pthread_mutex_init(&mutex, NULL);
 {
 pthread_mutex_init(&mutex, NULL);

-isRunning = false;

 }
 //-----------------------------------------------------------------------------
 PING::~PING()
 }
 //-----------------------------------------------------------------------------
 PING::~PING()


@@ -107,7 +118,7 @@ PING::~PING()
 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------
 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------

-const string PING::GetVersion() const
+const std::string PING::GetVersion() const

 {
 return "Pinger v.1.01";
 }
 {
 return "Pinger v.1.01";
 }


@@ -130,7 +141,7 @@ void PING::SetUsers(USERS * u)
 users = u;
 }
 //-----------------------------------------------------------------------------
 users = u;
 }
 //-----------------------------------------------------------------------------

-const string & PING::GetStrError() const
+const std::string & PING::GetStrError() const

 {
 return errorStr;
 }
 {
 return errorStr;
 }


@@ -139,8 +150,6 @@ int PING::Start()
 {
 GetUsers();
 
 {
 GetUsers();
 

-onAddUserNotifier.SetPinger(this);
-onDelUserNotifier.SetPinger(this);

 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 


@@ -193,7 +202,7 @@ if (isRunning)
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 

-list<user_iter>::iterator users_iter;
+list<USER_PTR>::iterator users_iter;

 users_iter = usersList.begin();
 while (users_iter != usersList.end())
     {
 users_iter = usersList.begin();
 while (users_iter != usersList.end())
     {


@@ -213,7 +222,7 @@ void * PING::Run(void * d)
 {
 PING * ping = (PING*)d;
 ping->isRunning = true;
 {
 PING * ping = (PING*)d;
 ping->isRunning = true;

-list<user_iter>::iterator iter;
+list<USER_PTR>::iterator iter;

 uint32_t ip;
 time_t t;
 
 uint32_t ip;
 time_t t;
 


@@ -224,9 +233,9 @@ while (ping->nonstop)
         STG_LOCKER lock(&ping->mutex, __FILE__, __LINE__);
         while (iter != ping->usersList.end())
             {
         STG_LOCKER lock(&ping->mutex, __FILE__, __LINE__);
         while (iter != ping->usersList.end())
             {

-            if ((*iter)->property.ips.ConstData().OnlyOneIP())
+            if ((*iter)->GetProperty().ips.ConstData().OnlyOneIP())

                 {
                 {

-                ip = (*iter)->property.ips.ConstData()[0].ip;
+                ip = (*iter)->GetProperty().ips.ConstData()[0].ip;

                 if (ping->pinger.GetIPTime(ip, &t) == 0)
                     {
                     if (t)
                 if (ping->pinger.GetIPTime(ip, &t) == 0)
                     {
                     if (t)


@@ -270,35 +279,30 @@ uint16_t PING::GetStopPosition() const
 return 100;
 }
 //-----------------------------------------------------------------------------
 return 100;
 }
 //-----------------------------------------------------------------------------

-void PING::SetUserNotifiers(user_iter u)
+void PING::SetUserNotifiers(USER_PTR u)

 {
 {

-CHG_CURRIP_NOTIFIER_PING    ChgCurrIPNotifier;
-CHG_IPS_NOTIFIER_PING       ChgIPNotifier;
+CHG_CURRIP_NOTIFIER_PING ChgCurrIPNotifier(*this, u);
+CHG_IPS_NOTIFIER_PING ChgIPNotifier(*this, u);

 
 

-ChgCurrIPNotifier.SetPinger(this);
-ChgCurrIPNotifier.SetUser(u);

 ChgCurrIPNotifierList.push_front(ChgCurrIPNotifier);
 ChgCurrIPNotifierList.push_front(ChgCurrIPNotifier);

-
-ChgIPNotifier.SetPinger(this);
-ChgIPNotifier.SetUser(u);

 ChgIPNotifierList.push_front(ChgIPNotifier);
 
 u->AddCurrIPAfterNotifier(&(*ChgCurrIPNotifierList.begin()));
 ChgIPNotifierList.push_front(ChgIPNotifier);
 
 u->AddCurrIPAfterNotifier(&(*ChgCurrIPNotifierList.begin()));

-u->property.ips.AddAfterNotifier(&(*ChgIPNotifierList.begin()));
+u->GetProperty().ips.AddAfterNotifier(&(*ChgIPNotifierList.begin()));

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void PING::UnSetUserNotifiers(user_iter u)
+void PING::UnSetUserNotifiers(USER_PTR u)

 {
 // ---          CurrIP              ---
 {
 // ---          CurrIP              ---

-IS_CONTAINS_USER<CHG_CURRIP_NOTIFIER_PING>   IsContainsUserCurrIP;
-IS_CONTAINS_USER<CHG_IPS_NOTIFIER_PING>      IsContainsUserIP;
+IS_CONTAINS_USER<CHG_CURRIP_NOTIFIER_PING> IsContainsUserCurrIP(u);
+IS_CONTAINS_USER<CHG_IPS_NOTIFIER_PING> IsContainsUserIP(u);

 
 

-list<CHG_CURRIP_NOTIFIER_PING>::iterator     currIPter;
-list<CHG_IPS_NOTIFIER_PING>::iterator        IPIter;
+list<CHG_CURRIP_NOTIFIER_PING>::iterator currIPter;
+list<CHG_IPS_NOTIFIER_PING>::iterator IPIter;

 
 currIPter = find_if(ChgCurrIPNotifierList.begin(),
                     ChgCurrIPNotifierList.end(),
 
 currIPter = find_if(ChgCurrIPNotifierList.begin(),
                     ChgCurrIPNotifierList.end(),

-                    bind2nd(IsContainsUserCurrIP, u));
+                    IsContainsUserCurrIP);

 
 if (currIPter != ChgCurrIPNotifierList.end())
     {
 
 if (currIPter != ChgCurrIPNotifierList.end())
     {


@@ -310,11 +314,11 @@ if (currIPter != ChgCurrIPNotifierList.end())
 // ---          IP              ---
 IPIter = find_if(ChgIPNotifierList.begin(),
                  ChgIPNotifierList.end(),
 // ---          IP              ---
 IPIter = find_if(ChgIPNotifierList.begin(),
                  ChgIPNotifierList.end(),

-                 bind2nd(IsContainsUserIP, u));
+                 IsContainsUserIP);

 
 if (IPIter != ChgIPNotifierList.end())
     {
 
 if (IPIter != ChgIPNotifierList.end())
     {

-    IPIter->GetUser()->property.ips.DelAfterNotifier(&(*IPIter));
+    IPIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*IPIter));

     ChgIPNotifierList.erase(IPIter);
     }
 // ---          IP end          ---
     ChgIPNotifierList.erase(IPIter);
     }
 // ---          IP end          ---


@@ -324,7 +328,7 @@ void PING::GetUsers()
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-user_iter u;
+USER_PTR u;

 int h = users->OpenSearch();
 if (!h)
     {
 int h = users->OpenSearch();
 if (!h)
     {


@@ -336,9 +340,9 @@ while (users->SearchNext(h, &u) == 0)
     {
     usersList.push_back(u);
     SetUserNotifiers(u);
     {
     usersList.push_back(u);
     SetUserNotifiers(u);

-    if (u->property.ips.ConstData().OnlyOneIP())
+    if (u->GetProperty().ips.ConstData().OnlyOneIP())

         {
         {

-        pinger.AddIP(u->property.ips.ConstData()[0].ip);
+        pinger.AddIP(u->GetProperty().ips.ConstData()[0].ip);

         }
     else
         {
         }
     else
         {


@@ -353,7 +357,7 @@ while (users->SearchNext(h, &u) == 0)
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------

-void PING::AddUser(user_iter u)
+void PING::AddUser(USER_PTR u)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 


@@ -361,13 +365,13 @@ SetUserNotifiers(u);
 usersList.push_back(u);
 }
 //-----------------------------------------------------------------------------
 usersList.push_back(u);
 }
 //-----------------------------------------------------------------------------

-void PING::DelUser(user_iter u)
+void PING::DelUser(USER_PTR u)

 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 UnSetUserNotifiers(u);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
 UnSetUserNotifiers(u);
 

-list<user_iter>::iterator users_iter;
+list<USER_PTR>::iterator users_iter;

 users_iter = usersList.begin();
 
 while (users_iter != usersList.end())
 users_iter = usersList.begin();
 
 while (users_iter != usersList.end())


@@ -383,10 +387,10 @@ while (users_iter != usersList.end())
 //-----------------------------------------------------------------------------
 void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & newIP)
 {
 //-----------------------------------------------------------------------------
 void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & newIP)
 {

-ping->pinger.DelIP(oldIP);
+ping.pinger.DelIP(oldIP);

 if (newIP)
     {
 if (newIP)
     {

-    ping->pinger.AddIP(newIP);
+    ping.pinger.AddIP(newIP);

     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------


@@ -394,28 +398,22 @@ void CHG_IPS_NOTIFIER_PING::Notify(const USER_IPS & oldIPS, const USER_IPS & new
 {
 if (oldIPS.OnlyOneIP())
     {
 {
 if (oldIPS.OnlyOneIP())
     {

-    ping->pinger.DelIP(oldIPS[0].ip);
+    ping.pinger.DelIP(oldIPS[0].ip);

     }
 
 if (newIPS.OnlyOneIP())
     {
     }
 
 if (newIPS.OnlyOneIP())
     {

-    ping->pinger.AddIP(newIPS[0].ip);
+    ping.pinger.AddIP(newIPS[0].ip);

     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void ADD_USER_NONIFIER_PING::Notify(const user_iter & user)
+void ADD_USER_NONIFIER_PING::Notify(const USER_PTR & user)

 {
 {

-ping->AddUser(user);
+ping.AddUser(user);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void DEL_USER_NONIFIER_PING::Notify(const user_iter & user)
+void DEL_USER_NONIFIER_PING::Notify(const USER_PTR & user)

 {
 {

-ping->DelUser(user);
+ping.DelUser(user);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-
-
-
-
-
-