git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stg-2.409' into stg-2.409-radius
[stg.git]
/
projects
/
stargazer
/
plugins
/
other
/
ping
/
ping.h
diff --git
a/projects/stargazer/plugins/other/ping/ping.h
b/projects/stargazer/plugins/other/ping/ping.h
index 34bbbc52c5bd407b2e8a7990baa02c3697a0fb40..8b58e7eee2e038c62f02a5f3151a06ab2494232f 100644
(file)
--- a/
projects/stargazer/plugins/other/ping/ping.h
+++ b/
projects/stargazer/plugins/other/ping/ping.h
@@
-30,15
+30,12
@@
class SETTINGS;
class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<uint32_t> {
public:
CHG_CURRIP_NOTIFIER_PING(const PING & p, USER_PTR u)
class CHG_CURRIP_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<uint32_t> {
public:
CHG_CURRIP_NOTIFIER_PING(const PING & p, USER_PTR u)
- : PROPERTY_NOTIFIER_BASE<uint32_t>(), user(u), ping(p) {}
- CHG_CURRIP_NOTIFIER_PING(const CHG_CURRIP_NOTIFIER_PING & rvalue)
- : PROPERTY_NOTIFIER_BASE<uint32_t>(),
- user(rvalue.user), ping(rvalue.ping) {}
+ : user(u), ping(p) {}
void Notify(const uint32_t & oldIP, const uint32_t & newIP);
USER_PTR GetUser() const { return user; }
private:
void Notify(const uint32_t & oldIP, const uint32_t & newIP);
USER_PTR GetUser() const { return user; }
private:
- CHG_CURRIP_NOTIFIER_PING & operator=(const CHG_CURRIP_NOTIFIER_PING &
rvalue
);
+ CHG_CURRIP_NOTIFIER_PING & operator=(const CHG_CURRIP_NOTIFIER_PING &);
USER_PTR user;
const PING & ping;
USER_PTR user;
const PING & ping;
@@
-47,15
+44,12
@@
private:
class CHG_IPS_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<USER_IPS> {
public:
CHG_IPS_NOTIFIER_PING(const PING & p, USER_PTR u)
class CHG_IPS_NOTIFIER_PING: public PROPERTY_NOTIFIER_BASE<USER_IPS> {
public:
CHG_IPS_NOTIFIER_PING(const PING & p, USER_PTR u)
- : PROPERTY_NOTIFIER_BASE<USER_IPS>(), user(u), ping(p) {}
- CHG_IPS_NOTIFIER_PING(const CHG_IPS_NOTIFIER_PING & rvalue)
- : PROPERTY_NOTIFIER_BASE<USER_IPS>(),
- user(rvalue.user), ping(rvalue.ping) {}
+ : user(u), ping(p) {}
void Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS);
USER_PTR GetUser() const { return user; }
private:
void Notify(const USER_IPS & oldIPS, const USER_IPS & newIPS);
USER_PTR GetUser() const { return user; }
private:
- CHG_IPS_NOTIFIER_PING & operator=(const CHG_IPS_NOTIFIER_PING &
rvalue
);
+ CHG_IPS_NOTIFIER_PING & operator=(const CHG_IPS_NOTIFIER_PING &);
USER_PTR user;
const PING & ping;
USER_PTR user;
const PING & ping;
@@
-63,34
+57,31
@@
private:
//-----------------------------------------------------------------------------
class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
public:
//-----------------------------------------------------------------------------
class ADD_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
public:
- explicit ADD_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE<USER_PTR>(), ping(p) {}
- virtual ~ADD_USER_NONIFIER_PING() {}
+ explicit ADD_USER_NONIFIER_PING(PING & p) : ping(p) {}
void Notify(const USER_PTR & user);
private:
void Notify(const USER_PTR & user);
private:
- ADD_USER_NONIFIER_PING(const ADD_USER_NONIFIER_PING &
rvalue
);
- ADD_USER_NONIFIER_PING & operator=(const ADD_USER_NONIFIER_PING &
rvalue
);
+ ADD_USER_NONIFIER_PING(const ADD_USER_NONIFIER_PING &);
+ ADD_USER_NONIFIER_PING & operator=(const ADD_USER_NONIFIER_PING &);
PING & ping;
};
//-----------------------------------------------------------------------------
class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
public:
PING & ping;
};
//-----------------------------------------------------------------------------
class DEL_USER_NONIFIER_PING: public NOTIFIER_BASE<USER_PTR> {
public:
- explicit DEL_USER_NONIFIER_PING(PING & p) : NOTIFIER_BASE<USER_PTR>(), ping(p) {}
- virtual ~DEL_USER_NONIFIER_PING() {}
+ explicit DEL_USER_NONIFIER_PING(PING & p) : ping(p) {}
void Notify(const USER_PTR & user);
private:
void Notify(const USER_PTR & user);
private:
- DEL_USER_NONIFIER_PING(const DEL_USER_NONIFIER_PING &
rvalue
);
- DEL_USER_NONIFIER_PING & operator=(const DEL_USER_NONIFIER_PING &
rvalue
);
+ DEL_USER_NONIFIER_PING(const DEL_USER_NONIFIER_PING &);
+ DEL_USER_NONIFIER_PING & operator=(const DEL_USER_NONIFIER_PING &);
PING & ping;
};
//-----------------------------------------------------------------------------
class PING_SETTINGS {
public:
PING & ping;
};
//-----------------------------------------------------------------------------
class PING_SETTINGS {
public:
- PING_SETTINGS() : pingDelay(0), errorStr() {}
- virtual ~PING_SETTINGS() {}
+ PING_SETTINGS() : pingDelay(0) {}
const std::string & GetStrError() const { return errorStr; }
int ParseSettings(const MODULE_SETTINGS & s);
int GetPingDelay() const { return pingDelay; }
const std::string & GetStrError() const { return errorStr; }
int ParseSettings(const MODULE_SETTINGS & s);
int GetPingDelay() const { return pingDelay; }