summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/modules/dns.h10
-rw-r--r--include/timers.h15
-rw-r--r--modules/botserv/bs_kick.cpp5
-rw-r--r--modules/botserv/bs_set.cpp7
-rw-r--r--modules/chanserv/chanserv.cpp6
-rw-r--r--modules/chanserv/cs_ban.cpp8
-rw-r--r--modules/dns.cpp13
-rw-r--r--modules/httpd.cpp8
-rw-r--r--modules/nickserv/nickserv.cpp18
-rw-r--r--modules/operserv/os_defcon.cpp4
-rw-r--r--modules/proxyscan.cpp3
-rw-r--r--modules/sasl.cpp6
-rw-r--r--src/main.cpp10
-rw-r--r--src/timers.cpp15
-rw-r--r--src/uplink.cpp5
15 files changed, 89 insertions, 44 deletions
diff --git a/include/modules/dns.h b/include/modules/dns.h
index 801b5b2f0..898afe511 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -146,8 +146,14 @@ namespace DNS
/* Creator of this request */
Module *creator;
- Request(Manager *mgr, Module *c, const Anope::string &addr, QueryType qt, bool cache = false) : Timer(0), Question(addr, qt), manager(mgr),
- use_cache(cache), creator(c) { }
+ Request(Manager *mgr, Module *c, const Anope::string &addr, QueryType qt, bool cache = false)
+ : Timer(0)
+ , Question(addr, qt)
+ , manager(mgr)
+ , use_cache(cache)
+ , creator(c)
+ {
+ }
virtual ~Request()
{
diff --git a/include/timers.h b/include/timers.h
index 456666535..19e5290e9 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -20,10 +20,6 @@ private:
*/
Module *owner;
- /** The time this was created
- */
- time_t settime;
-
/** The triggering time
*/
time_t trigger;
@@ -39,18 +35,16 @@ private:
public:
/** Constructor, initializes the triggering time
* @param time_from_now The number of seconds from now to trigger the timer
- * @param now The time now
* @param repeating Repeat this timer every time_from_now if this is true
*/
- Timer(long time_from_now, time_t now = Anope::CurTime, bool repeating = false);
+ Timer(long time_from_now, bool repeating = false);
/** Constructor, initializes the triggering time
* @param creator The creator of the timer
* @param time_from_now The number of seconds from now to trigger the timer
- * @param now The time now
* @param repeating Repeat this timer every time_from_now if this is true
*/
- Timer(Module *creator, long time_from_now, time_t now = Anope::CurTime, bool repeating = false);
+ Timer(Module *creator, long time_from_now, bool repeating = false);
/** Destructor, removes the timer from the list
*/
@@ -81,11 +75,6 @@ public:
*/
long GetSecs() const;
- /** Returns the time this timer was created
- * @return The time this timer was created
- */
- time_t GetSetTime() const;
-
/** Returns the owner of this timer, if any
* @return The owner of the timer
*/
diff --git a/modules/botserv/bs_kick.cpp b/modules/botserv/bs_kick.cpp
index f6012d07f..737db21be 100644
--- a/modules/botserv/bs_kick.cpp
+++ b/modules/botserv/bs_kick.cpp
@@ -1005,7 +1005,10 @@ class BanDataPurger final
: public Timer
{
public:
- BanDataPurger(Module *o) : Timer(o, 300, Anope::CurTime, true) { }
+ BanDataPurger(Module *o)
+ : Timer(o, 300, true)
+ {
+ }
void Tick(time_t) override
{
diff --git a/modules/botserv/bs_set.cpp b/modules/botserv/bs_set.cpp
index 636313785..6929c96fb 100644
--- a/modules/botserv/bs_set.cpp
+++ b/modules/botserv/bs_set.cpp
@@ -76,7 +76,12 @@ public:
Anope::string mask;
public:
- UnbanTimer(Module *creator, const Anope::string &ch, const Anope::string &bmask, time_t t) : Timer(creator, t), chname(ch), mask(bmask) { }
+ UnbanTimer(Module *creator, const Anope::string &ch, const Anope::string &bmask, time_t t)
+ : Timer(creator, t)
+ , chname(ch)
+ , mask(bmask)
+ {
+ }
void Tick(time_t) override
{
diff --git a/modules/chanserv/chanserv.cpp b/modules/chanserv/chanserv.cpp
index c47f2d77f..783c47261 100644
--- a/modules/chanserv/chanserv.cpp
+++ b/modules/chanserv/chanserv.cpp
@@ -51,7 +51,11 @@ public:
/** Constructor
* @param chan The channel
*/
- ChanServTimer(Reference<BotInfo> &cs, ExtensibleItem<bool> &i, Module *m, Channel *chan) : Timer(m, Config->GetModule(m)->Get<time_t>("inhabit", "15s")), ChanServ(cs), inhabit(i), c(chan)
+ ChanServTimer(Reference<BotInfo> &cs, ExtensibleItem<bool> &i, Module *m, Channel *chan)
+ : Timer(m, Config->GetModule(m)->Get<time_t>("inhabit", "15s"))
+ , ChanServ(cs)
+ , inhabit(i)
+ , c(chan)
{
if (!ChanServ || !c)
return;
diff --git a/modules/chanserv/cs_ban.cpp b/modules/chanserv/cs_ban.cpp
index ff019e602..da54cd4f1 100644
--- a/modules/chanserv/cs_ban.cpp
+++ b/modules/chanserv/cs_ban.cpp
@@ -22,7 +22,13 @@ private:
Anope::string mode;
public:
- TempBan(time_t seconds, Channel *c, const Anope::string &banmask, const Anope::string &mod) : Timer(me, seconds), channel(c->name), mask(banmask), mode(mod) { }
+ TempBan(time_t seconds, Channel *c, const Anope::string &banmask, const Anope::string &mod)
+ : Timer(me, seconds)
+ , channel(c->name)
+ , mask(banmask)
+ , mode(mod)
+ {
+ }
void Tick(time_t ctime) override
{
diff --git a/modules/dns.cpp b/modules/dns.cpp
index a75ca6820..3a2b2fb9a 100644
--- a/modules/dns.cpp
+++ b/modules/dns.cpp
@@ -477,8 +477,11 @@ public:
int length = 0;
public:
- Client(Manager *m, TCPSocket *l, int fd, const sockaddrs &addr) : Socket(fd, l->GetFamily()), ClientSocket(l, addr), Timer(5),
- manager(m)
+ Client(Manager *m, TCPSocket *l, int fd, const sockaddrs &addr)
+ : Socket(fd, l->GetFamily())
+ , ClientSocket(l, addr)
+ , Timer(5)
+ , manager(m)
{
Log(LOG_DEBUG_2) << "Resolver: New client from " << addr.addr();
}
@@ -670,7 +673,11 @@ class MyManager final
public:
std::map<unsigned short, Request *> requests;
- MyManager(Module *creator) : Manager(creator), Timer(300, Anope::CurTime, true), serial(Anope::CurTime), cur_id(rand())
+ MyManager(Module *creator)
+ : Manager(creator)
+ , Timer(300, true)
+ , serial(Anope::CurTime)
+ , cur_id(rand())
{
}
diff --git a/modules/httpd.cpp b/modules/httpd.cpp
index c80507621..f561283d7 100644
--- a/modules/httpd.cpp
+++ b/modules/httpd.cpp
@@ -292,7 +292,13 @@ class MyHTTPProvider final
std::list<Reference<MyHTTPClient> > clients;
public:
- MyHTTPProvider(Module *c, const Anope::string &n, const Anope::string &i, const unsigned short p, const int t, bool s) : Socket(-1, i.find(':') == Anope::string::npos ? AF_INET : AF_INET6), HTTPProvider(c, n, i, p, s), Timer(c, 10, Anope::CurTime, true), timeout(t) { }
+ MyHTTPProvider(Module *c, const Anope::string &n, const Anope::string &i, const unsigned short p, const int t, bool s)
+ : Socket(-1, i.find(':') == Anope::string::npos ? AF_INET : AF_INET6)
+ , HTTPProvider(c, n, i, p, s)
+ , Timer(c, 10, true)
+ , timeout(t)
+ {
+ }
void Tick(time_t) override
{
diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp
index 0f4313c0e..08fd286a0 100644
--- a/modules/nickserv/nickserv.cpp
+++ b/modules/nickserv/nickserv.cpp
@@ -25,7 +25,12 @@ class NickServCollide final
Reference<NickAlias> na;
public:
- NickServCollide(Module *me, NickServService *nss, User *user, NickAlias *nick, time_t delay) : Timer(me, delay), service(nss), u(user), ts(user->timestamp), na(nick)
+ NickServCollide(Module *me, NickServService *nss, User *user, NickAlias *nick, time_t delay)
+ : Timer(me, delay)
+ , service(nss)
+ , u(user)
+ , ts(user->timestamp)
+ , na(nick)
{
collides.insert(this);
}
@@ -65,7 +70,10 @@ class NickServHeld final
Reference<NickAlias> na;
Anope::string nick;
public:
- NickServHeld(Module *me, NickAlias *n, long l) : Timer(me, l), na(n), nick(na->nick)
+ NickServHeld(Module *me, NickAlias *n, long l)
+ : Timer(me, l)
+ , na(n)
+ , nick(na->nick)
{
n->Extend<bool>("HELD");
}
@@ -89,8 +97,10 @@ class NickServRelease final
Anope::string nick;
public:
- NickServRelease(Module *me, NickAlias *na, time_t delay) : User(na->nick, Config->GetModule("nickserv")->Get<const Anope::string>("enforceruser", "user"),
- Config->GetModule("nickserv")->Get<const Anope::string>("enforcerhost", Me->GetName()), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL), Timer(me, delay), nick(na->nick)
+ NickServRelease(Module *me, NickAlias *na, time_t delay)
+ : User(na->nick, Config->GetModule("nickserv")->Get<const Anope::string>("enforceruser", "user"), Config->GetModule("nickserv")->Get<const Anope::string>("enforcerhost", Me->GetName()), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL)
+ , Timer(me, delay)
+ , nick(na->nick)
{
/* Erase the current release timer and use the new one */
Anope::map<NickServRelease *>::iterator nit = NickServReleases.find(this->nick);
diff --git a/modules/operserv/os_defcon.cpp b/modules/operserv/os_defcon.cpp
index 5664f5ffb..3f5395d48 100644
--- a/modules/operserv/os_defcon.cpp
+++ b/modules/operserv/os_defcon.cpp
@@ -111,7 +111,9 @@ class DefConTimeout final
int level;
public:
- DefConTimeout(Module *mod, int newlevel) : Timer(mod, DConfig.timeout), level(newlevel)
+ DefConTimeout(Module *mod, int newlevel)
+ : Timer(mod, DConfig.timeout)
+ , level(newlevel)
{
timeout = this;
}
diff --git a/modules/proxyscan.cpp b/modules/proxyscan.cpp
index b92de0dea..4634b9f95 100644
--- a/modules/proxyscan.cpp
+++ b/modules/proxyscan.cpp
@@ -211,7 +211,8 @@ class ModuleProxyScan final
: public Timer
{
public:
- ConnectionTimeout(Module *c, long timeout) : Timer(c, timeout, Anope::CurTime, true)
+ ConnectionTimeout(Module *c, long timeout)
+ : Timer(c, timeout, true)
{
}
diff --git a/modules/sasl.cpp b/modules/sasl.cpp
index 298ad0e75..adf044a0b 100644
--- a/modules/sasl.cpp
+++ b/modules/sasl.cpp
@@ -181,7 +181,11 @@ class SASLService final
std::map<Anope::string, SASL::Session *> sessions;
public:
- SASLService(Module *o) : SASL::Service(o), Timer(o, 60, Anope::CurTime, true) { }
+ SASLService(Module *o)
+ : SASL::Service(o)
+ , Timer(o, 60, true)
+ {
+ }
~SASLService() override
{
diff --git a/src/main.cpp b/src/main.cpp
index 2f1f2ca91..83ddfa13f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -45,7 +45,10 @@ class UpdateTimer final
: public Timer
{
public:
- UpdateTimer(time_t timeout) : Timer(timeout, Anope::CurTime, true) { }
+ UpdateTimer(time_t timeout)
+ : Timer(timeout, true)
+ {
+ }
void Tick(time_t) override
{
@@ -57,7 +60,10 @@ class ExpireTimer final
: public Timer
{
public:
- ExpireTimer(time_t timeout) : Timer(timeout, Anope::CurTime, true) { }
+ ExpireTimer(time_t timeout)
+ : Timer(timeout, true)
+ {
+ }
void Tick(time_t) override
{
diff --git a/src/timers.cpp b/src/timers.cpp
index 0d3f3b205..74641e40f 100644
--- a/src/timers.cpp
+++ b/src/timers.cpp
@@ -11,24 +11,22 @@
std::multimap<time_t, Timer *> TimerManager::Timers;
-Timer::Timer(long time_from_now, time_t now, bool repeating)
+Timer::Timer(long time_from_now, bool repeating)
{
owner = NULL;
- trigger = now + time_from_now;
+ trigger = Anope::CurTime + time_from_now;
secs = time_from_now;
repeat = repeating;
- settime = now;
TimerManager::AddTimer(this);
}
-Timer::Timer(Module *creator, long time_from_now, time_t now, bool repeating)
+Timer::Timer(Module *creator, long time_from_now, bool repeating)
{
owner = creator;
- trigger = now + time_from_now;
+ trigger = Anope::CurTime + time_from_now;
secs = time_from_now;
repeat = repeating;
- settime = now;
TimerManager::AddTimer(this);
}
@@ -55,11 +53,6 @@ bool Timer::GetRepeat() const
return repeat;
}
-time_t Timer::GetSetTime() const
-{
- return settime;
-}
-
void Timer::SetSecs(time_t t)
{
TimerManager::DelTimer(this);
diff --git a/src/uplink.cpp b/src/uplink.cpp
index 087e5a476..60e278dce 100644
--- a/src/uplink.cpp
+++ b/src/uplink.cpp
@@ -21,7 +21,10 @@ class ReconnectTimer final
: public Timer
{
public:
- ReconnectTimer(int wait) : Timer(wait) { }
+ ReconnectTimer(int wait)
+ : Timer(wait)
+ {
+ }
void Tick(time_t) override
{
generated by cgit (git 2.34.1) at 2025-06-16 23:49:48 +0000