From 81087d4ae038fe0d793ee56e14120cd216ea3a7f Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Wed, 8 Dec 2010 14:08:36 +0200 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?= =?utf8?q?=20=D0=BB=D0=B5=D0=B3=D0=BA=D0=B8=D0=B9=20=D1=80=D0=B5=D1=84?= =?utf8?q?=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BF=D0=BB?= =?utf8?q?=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=20=D0=BF=D0=B8=D0=BD=D0=B3=D0=B5?= =?utf8?q?=D1=80=D0=B0.=20=D0=98=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8?= =?utf8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BD=D0=BE=D1=82=D0=B8=D1=84?= =?utf8?q?=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80=D0=BE=D0=B2=20=D0=B2=D1=8B?= =?utf8?q?=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B0=20=D0=B2=20=D0=BA=D0=BE?= =?utf8?q?=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D1=8B,=20?= =?utf8?q?=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D0=B8=20=D0=B7?= =?utf8?q?=D0=B0=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=20?= =?utf8?q?=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=B8=20=D0=BA=D0=BE?= =?utf8?q?=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=BD=D1=8B=D0=B5=20=D1=81?= =?utf8?q?=D1=81=D1=8B=D0=BB=D0=BA=D0=B8,=20=D1=84=D1=83=D0=BD=D0=BA=D1=82?= =?utf8?q?=D0=BE=D1=80=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0=20=D0=B4?= =?utf8?q?=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=20=D1=81=D0=BE=D1=81?= =?utf8?q?=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B5=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../stargazer/plugins/other/ping/ping.cpp | 55 ++++---- projects/stargazer/plugins/other/ping/ping.h | 133 +++++++++--------- 2 files changed, 88 insertions(+), 100 deletions(-) diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp index 7fa5aec1..79d1f4f7 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -37,10 +37,13 @@ template class IS_CONTAINS_USER: public binary_function { public: - bool operator()(varType notifier, user_iter user) const + IS_CONTAINS_USER(const user_iter & u) : user(u) {} + bool operator()(varType notifier) const { return notifier.GetUser() == user; }; +private: + const user_iter & user; }; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -53,8 +56,7 @@ return pc.GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- PING_SETTINGS::PING_SETTINGS() - : pingDelay(0), - errorStr() + : pingDelay(0) { } //----------------------------------------------------------------------------- @@ -97,9 +99,13 @@ return 0; } //----------------------------------------------------------------------------- PING::PING() + : users(NULL), + nonstop(false), + isRunning(false), + onAddUserNotifier(*this), + onDelUserNotifier(*this) { pthread_mutex_init(&mutex, NULL); -isRunning = false; } //----------------------------------------------------------------------------- PING::~PING() @@ -139,8 +145,6 @@ int PING::Start() { GetUsers(); -onAddUserNotifier.SetPinger(this); -onDelUserNotifier.SetPinger(this); users->AddNotifierUserAdd(&onAddUserNotifier); users->AddNotifierUserDel(&onDelUserNotifier); @@ -272,15 +276,10 @@ 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); - -ChgIPNotifier.SetPinger(this); -ChgIPNotifier.SetUser(u); ChgIPNotifierList.push_front(ChgIPNotifier); u->AddCurrIPAfterNotifier(&(*ChgCurrIPNotifierList.begin())); @@ -290,15 +289,15 @@ u->property.ips.AddAfterNotifier(&(*ChgIPNotifierList.begin())); void PING::UnSetUserNotifiers(user_iter u) { // --- CurrIP --- -IS_CONTAINS_USER IsContainsUserCurrIP; -IS_CONTAINS_USER IsContainsUserIP; +IS_CONTAINS_USER IsContainsUserCurrIP(u); +IS_CONTAINS_USER IsContainsUserIP(u); -list::iterator currIPter; -list::iterator IPIter; +list::iterator currIPter; +list::iterator IPIter; currIPter = find_if(ChgCurrIPNotifierList.begin(), ChgCurrIPNotifierList.end(), - bind2nd(IsContainsUserCurrIP, u)); + IsContainsUserCurrIP); if (currIPter != ChgCurrIPNotifierList.end()) { @@ -310,7 +309,7 @@ if (currIPter != ChgCurrIPNotifierList.end()) // --- IP --- IPIter = find_if(ChgIPNotifierList.begin(), ChgIPNotifierList.end(), - bind2nd(IsContainsUserIP, u)); + IsContainsUserIP); if (IPIter != ChgIPNotifierList.end()) { @@ -383,10 +382,10 @@ while (users_iter != usersList.end()) //----------------------------------------------------------------------------- void CHG_CURRIP_NOTIFIER_PING::Notify(const uint32_t & oldIP, const uint32_t & newIP) { -ping->pinger.DelIP(oldIP); +ping.pinger.DelIP(oldIP); if (newIP) { - ping->pinger.AddIP(newIP); + ping.pinger.AddIP(newIP); } } //----------------------------------------------------------------------------- @@ -394,28 +393,22 @@ void CHG_IPS_NOTIFIER_PING::Notify(const USER_IPS & oldIPS, const USER_IPS & new { if (oldIPS.OnlyOneIP()) { - ping->pinger.DelIP(oldIPS[0].ip); + ping.pinger.DelIP(oldIPS[0].ip); } 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) { -ping->AddUser(user); +ping.AddUser(user); } //----------------------------------------------------------------------------- void DEL_USER_NONIFIER_PING::Notify(const user_iter & user) { -ping->DelUser(user); +ping.DelUser(user); } //----------------------------------------------------------------------------- - - - - - - diff --git a/projects/stargazer/plugins/other/ping/ping.h b/projects/stargazer/plugins/other/ping/ping.h index c94c17e8..9f6304d8 100644 --- a/projects/stargazer/plugins/other/ping/ping.h +++ b/projects/stargazer/plugins/other/ping/ping.h @@ -7,9 +7,10 @@ #ifndef PING_H #define PING_H -#include #include +#include + #include "os_int.h" #include "base_plugin.h" #include "notifer.h" @@ -26,67 +27,62 @@ class PING; class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE { public: - void Notify(const uint32_t & oldIP, const uint32_t & newIP); - void SetUser(user_iter u) { user = u; } - user_iter GetUser() {return user; } - void SetPinger(const PING * p) { ping = p; } + CHG_CURRIP_NOTIFIER_PING(const PING & p, user_iter u) : user(u), ping(p) {} + void Notify(const uint32_t & oldIP, const uint32_t & newIP); + user_iter GetUser() { return user; } private: - user_iter user; - const PING * ping; + user_iter user; + const PING & ping; }; //----------------------------------------------------------------------------- class CHG_IPS_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE { public: - void Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS); - void SetUser(user_iter u) { user = u; } - user_iter GetUser() {return user; } - void SetPinger(const PING * p) { ping = p; } + CHG_IPS_NOTIFIER_PING(const PING & p, user_iter u) : user(u), ping(p) {} + void Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS); + user_iter GetUser() { return user; } private: - user_iter user; - const PING * ping; + user_iter user; + const PING & ping; }; //----------------------------------------------------------------------------- class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE { public: - ADD_USER_NONIFIER_PING(){}; - virtual ~ADD_USER_NONIFIER_PING(){}; - - void SetPinger(PING * p) { ping = p; } + ADD_USER_NONIFIER_PING(PING & p) : ping(p) {} + virtual ~ADD_USER_NONIFIER_PING() {} void Notify(const user_iter & user); private: - PING * ping; + PING & ping; }; //----------------------------------------------------------------------------- class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE { public: - DEL_USER_NONIFIER_PING(){}; - virtual ~DEL_USER_NONIFIER_PING(){}; - - void SetPinger(PING * p) { ping = p; } + DEL_USER_NONIFIER_PING(PING & p) : ping(p) {} + virtual ~DEL_USER_NONIFIER_PING() {} void Notify(const user_iter & user); private: - PING * ping; + PING & ping; }; //----------------------------------------------------------------------------- class PING_SETTINGS { public: - PING_SETTINGS(); - virtual ~PING_SETTINGS(){}; - const string& GetStrError() const { return errorStr; } - int ParseSettings(const MODULE_SETTINGS & s); - int GetPingDelay(){ return pingDelay; }; + PING_SETTINGS(); + virtual ~PING_SETTINGS() {} + const string& GetStrError() const { return errorStr; } + int ParseSettings(const MODULE_SETTINGS & s); + int GetPingDelay() { return pingDelay; } private: - int ParseIntInRange(const string & str, int min, int max, int * val); - int pingDelay; - mutable string errorStr; + int ParseIntInRange(const string & str, int min, int max, int * val); + + int pingDelay; + mutable string errorStr; }; //----------------------------------------------------------------------------- class PING: public BASE_PLUGIN @@ -97,38 +93,39 @@ public: PING(); virtual ~PING(); - void SetUsers(USERS * u); - void SetTariffs(TARIFFS *){}; - void SetAdmins(ADMINS *){}; - void SetTraffcounter(TRAFFCOUNTER *){}; - void SetStore(BASE_STORE *){}; - void SetStgSettings(const SETTINGS *){}; - void SetSettings(const MODULE_SETTINGS & s); - int ParseSettings(); + void SetUsers(USERS * u); + void SetTariffs(TARIFFS *) {} + void SetAdmins(ADMINS *) {} + void SetTraffcounter(TRAFFCOUNTER *) {} + void SetStore(BASE_STORE *) {} + void SetStgSettings(const SETTINGS *) {} + void SetSettings(const MODULE_SETTINGS & s); + int ParseSettings(); - int Start(); - int Stop(); - int Reload() { return 0; }; - bool IsRunning(); + int Start(); + int Stop(); + int Reload() { return 0; } + bool IsRunning(); - const string & GetStrError() const; - const string GetVersion() const; - uint16_t GetStartPosition() const; - uint16_t GetStopPosition() const; + const string & GetStrError() const; + const string GetVersion() const; + uint16_t GetStartPosition() const; + uint16_t GetStopPosition() const; - void AddUser(user_iter u); - void DelUser(user_iter u); + void AddUser(user_iter u); + void DelUser(user_iter u); private: - void GetUsers(); - void SetUserNotifiers(user_iter u); - void UnSetUserNotifiers(user_iter u); - static void * Run(void * d); - mutable string errorStr; - PING_SETTINGS pingSettings; - MODULE_SETTINGS settings; - USERS * users; - list usersList; + void GetUsers(); + void SetUserNotifiers(user_iter u); + void UnSetUserNotifiers(user_iter u); + static void * Run(void * d); + + mutable string errorStr; + PING_SETTINGS pingSettings; + MODULE_SETTINGS settings; + USERS * users; + list usersList; /* ÍÙ ÄÏÌÖÎÙ ÐÅÒÅÐÒÏ×ÅÒÉÔØ ×ÏÚÍÏÖÎÏÓÔØ ÐÉÎÇÏ×ÁÎÉÑ ÀÚÅÒÁ ÐÒÉ ÉÚÍÅÎÅÎÉÉ @@ -136,20 +133,18 @@ private: - currIP - ips */ - pthread_t thread; - pthread_mutex_t mutex; - bool nonstop; - bool isRunning; - mutable STG_PINGER pinger; + pthread_t thread; + pthread_mutex_t mutex; + bool nonstop; + bool isRunning; + mutable STG_PINGER pinger; - list ChgCurrIPNotifierList; - list ChgIPNotifierList; + list ChgCurrIPNotifierList; + list ChgIPNotifierList; - ADD_USER_NONIFIER_PING onAddUserNotifier; - DEL_USER_NONIFIER_PING onDelUserNotifier; + ADD_USER_NONIFIER_PING onAddUserNotifier; + DEL_USER_NONIFIER_PING onDelUserNotifier; }; //----------------------------------------------------------------------------- #endif - - -- 2.44.2