Ticket. td->tariffConf.traffType value getting changed in the

[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..c65a5cbaff805ea9f96f36057e9f277ed63cca5b 100644 (file)
--- a/projects/stargazer/plugins/other/ping/ping.cpp
+++ b/projects/stargazer/plugins/other/ping/ping.cpp
@@ -1,70 +1,55 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
-
+#include <cstdio>
+#include <cassert>
+#include <csignal>
+#include <ctime>
+#include <algorithm>
+
+#include "stg/user.h"
+#include "stg/locker.h"
+#include "stg/user_property.h"
+#include "stg/plugin_creator.h"

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

-#include "../../../user.h"

 
 

-class PING_CREATOR
+namespace

 {
 {

-private:
-    PING * ping;
+PLUGIN_CREATOR<PING> pc;

 
 

-public:
-    PING_CREATOR()
-        : ping(new PING())
-        {
-        };
-    ~PING_CREATOR()
-        {
-        delete ping;
-        };
-
-    PING * GetPlugin()
-        {
-        return ping;
-        };
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-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 std::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;

 };
 };

+}
+
+extern "C" PLUGIN * GetPlugin();

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

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

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

-PING_SETTINGS::PING_SETTINGS()
-    : pingDelay(0),
-      errorStr()
-{
-}
-//-----------------------------------------------------------------------------

 int PING_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 PARAM_VALUE pv;
 int PING_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 PARAM_VALUE pv;

-vector<PARAM_VALUE>::const_iterator pvi;
+std::vector<PARAM_VALUE>::const_iterator pvi;

 
 pv.param = "PingDelay";
 
 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,25 +66,24 @@ 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)
-{
-if (str2x(str.c_str(), *val))
-    {
-    errorStr = "Incorrect value \'" + str + "\'.";
-    return -1;
-    }
-if (*val < min || *val > max)
-    {
-    errorStr = "Value \'" + str + "\' out of range.";
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------

 PING::PING()
 PING::PING()

+    : errorStr(),
+      pingSettings(),
+      settings(),
+      users(NULL),
+      usersList(),
+      thread(),
+      mutex(),
+      nonstop(false),
+      isRunning(false),
+      pinger(),
+      ChgCurrIPNotifierList(),
+      ChgIPNotifierList(),
+      onAddUserNotifier(*this),
+      onDelUserNotifier(*this),
+      logger(GetPluginLogger(GetStgLogger(), "ping"))

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

-isRunning = false;

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


@@ -107,16 +91,6 @@ PING::~PING()
 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------
 pthread_mutex_destroy(&mutex);
 }
 //-----------------------------------------------------------------------------

-const string PING::GetVersion() const
-{
-return "Pinger v.1.01";
-}
-//-----------------------------------------------------------------------------
-void PING::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;
-}
-//-----------------------------------------------------------------------------

 int PING::ParseSettings()
 {
 int ret = pingSettings.ParseSettings(settings);
 int PING::ParseSettings()
 {
 int ret = pingSettings.ParseSettings(settings);


@@ -125,22 +99,10 @@ if (ret)
 return ret;
 }
 //-----------------------------------------------------------------------------
 return ret;
 }
 //-----------------------------------------------------------------------------

-void PING::SetUsers(USERS * u)
-{
-users = u;
-}
-//-----------------------------------------------------------------------------
-const string & PING::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------

 int PING::Start()
 {
 GetUsers();
 
 int PING::Start()
 {
 GetUsers();
 

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

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


@@ -152,6 +114,7 @@ pinger.Start();
 if (pthread_create(&thread, NULL, Run, this))
     {
     errorStr = "Cannot start thread.";
 if (pthread_create(&thread, NULL, Run, this))
     {
     errorStr = "Cannot start thread.";

+    logger("Cannot create thread.");

     printfd(__FILE__, "Cannot start thread\n");
     return -1;
     }
     printfd(__FILE__, "Cannot start thread\n");
     return -1;
     }


@@ -161,7 +124,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int PING::Stop()
 {
 //-----------------------------------------------------------------------------
 int PING::Stop()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 if (!isRunning)
     return 0;
 
 if (!isRunning)
     return 0;


@@ -169,38 +132,29 @@ if (!isRunning)
 pinger.Stop();
 nonstop = false;
 //5 seconds to thread stops itself
 pinger.Stop();
 nonstop = false;
 //5 seconds to thread stops itself

+struct timespec ts = {0, 200000000};

 for (int i = 0; i < 25; i++)
     {
     if (!isRunning)
         break;
 
 for (int i = 0; i < 25; i++)
     {
     if (!isRunning)
         break;
 

-    usleep(200000);
-    }
-
-//after 5 seconds waiting thread still running. now kill it
-if (isRunning)
-    {
-    printfd(__FILE__, "kill PING thread.\n");
-    if (pthread_kill(thread, SIGINT))
-        {
-        errorStr = "Cannot kill PING thread.";
-        printfd(__FILE__, "Cannot kill PING thread.\n");
-        return -1;
-        }
-    printfd(__FILE__, "PING killed\n");
+    nanosleep(&ts, NULL);

     }
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
     }
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 

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

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

-    users_iter++;
+    ++users_iter;

     }
 
     }
 

+if (isRunning)
+    return -1;
+

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------


@@ -211,22 +165,26 @@ return isRunning;
 //-----------------------------------------------------------------------------
 void * PING::Run(void * d)
 {
 //-----------------------------------------------------------------------------
 void * PING::Run(void * d)
 {

-PING * ping = (PING*)d;
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
+PING * ping = static_cast<PING *>(d);

 ping->isRunning = true;
 ping->isRunning = true;

-list<user_iter>::iterator iter;
-uint32_t ip;
-time_t t;

 
 

+long delay = (10000000 * ping->pingSettings.GetPingDelay()) / 3 + 50000000;
+ 

 while (ping->nonstop)
     {
 while (ping->nonstop)
     {

-    iter = ping->usersList.begin();
+    std::list<USER_PTR>::iterator iter = ping->usersList.begin();

         {
         {

-        STG_LOCKER lock(&ping->mutex, __FILE__, __LINE__);
+        STG_LOCKER lock(&ping->mutex);

         while (iter != ping->usersList.end())
             {
         while (iter != ping->usersList.end())
             {

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

                 {
                 {

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

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


@@ -235,9 +193,10 @@ while (ping->nonstop)
                 }
             else
                 {
                 }
             else
                 {

-                ip = (*iter)->GetCurrIP();
+                uint32_t ip = (*iter)->GetCurrIP();

                 if (ip)
                     {
                 if (ip)
                     {

+                    time_t t;

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


@@ -245,60 +204,47 @@ while (ping->nonstop)
                         }
                     }
                 }
                         }
                     }
                 }

-            iter++;
+            ++iter;

             }
         }
             }
         }

+    struct timespec ts = {delay / 1000000000, delay % 1000000000};

     for (int i = 0; i < 100; i++)
         {
         if (ping->nonstop)
             {
     for (int i = 0; i < 100; i++)
         {
         if (ping->nonstop)
             {

-            usleep((10000*ping->pingSettings.GetPingDelay())/3 + 50000);
+            nanosleep(&ts, NULL);

             }
         }
     }
             }
         }
     }

+

 ping->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------
 ping->isRunning = false;
 return NULL;
 }
 //-----------------------------------------------------------------------------

-uint16_t PING::GetStartPosition() const
-{
-return 100;
-}
-//-----------------------------------------------------------------------------
-uint16_t PING::GetStopPosition() const
+void PING::SetUserNotifiers(USER_PTR u)

 {
 {

-return 100;
-}
-//-----------------------------------------------------------------------------
-void PING::SetUserNotifiers(user_iter 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;
+std::list<CHG_CURRIP_NOTIFIER_PING>::iterator currIPter;
+std::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 +256,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          ---


@@ -322,23 +268,19 @@ if (IPIter != ChgIPNotifierList.end())
 //-----------------------------------------------------------------------------
 void PING::GetUsers()
 {
 //-----------------------------------------------------------------------------
 void PING::GetUsers()
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 

-user_iter u;
+USER_PTR u;

 int h = users->OpenSearch();
 int h = users->OpenSearch();

-if (!h)
-    {
-    printfd(__FILE__, "users->OpenSearch() error\n");
-    return;
-    }
+assert(h && "USERS::OpenSearch is always correct");

 
 while (users->SearchNext(h, &u) == 0)
     {
     usersList.push_back(u);
     SetUserNotifiers(u);
 
 while (users->SearchNext(h, &u) == 0)
     {
     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,21 +295,21 @@ 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);

 
 SetUserNotifiers(u);
 usersList.push_back(u);
 }
 //-----------------------------------------------------------------------------
 
 SetUserNotifiers(u);
 usersList.push_back(u);
 }
 //-----------------------------------------------------------------------------

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

 {
 {

-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);

 
 UnSetUserNotifiers(u);
 
 
 UnSetUserNotifiers(u);
 

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

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


@@ -377,16 +319,16 @@ while (users_iter != usersList.end())
         usersList.erase(users_iter);
         break;
         }
         usersList.erase(users_iter);
         break;
         }

-    users_iter++;
+    ++users_iter;

     }
 }
 //-----------------------------------------------------------------------------
 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 +336,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);

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

-
-
-
-
-
-