pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-06 21:43:13 +02:00
Code Activity

Added Anope::CurTime to keep us from calling time() everywhere

Browse Source
This commit is contained in:
Adam
2010-09-10 20:31:31 -04:00
parent 9eb7562bee
commit f00e76d30a
64 changed files with 224 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actions.cpp
+2 -4
View File
@@ -21,15 +21,13 @@
*/
bool bad_password(User *u)
{
time_t now = time(NULL);
if (!u || !Config->BadPassLimit)
return false;
if (Config->BadPassTimeout > 0 && u->invalid_pw_time > 0 && u->invalid_pw_time < now - Config->BadPassTimeout)
if (Config->BadPassTimeout > 0 && u->invalid_pw_time > 0 && u->invalid_pw_time < Anope::CurTime - Config->BadPassTimeout)
u->invalid_pw_count = 0;
++u->invalid_pw_count;
u->invalid_pw_time = now;
u->invalid_pw_time = Anope::CurTime;
if (u->invalid_pw_count >= Config->BadPassLimit)
{
kill_user("", u->nick, "Too many invalid passwords");
src/bots.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ BotInfo::BotInfo(const Anope::string &nnick, const Anope::string &nuser, const A
this->server = Me;
this->chancount = 0;
this->lastmsg = this->created = time(NULL);
this->lastmsg = this->created = Anope::CurTime;
this->SetFlag(BI_CORE);
if (!Config->s_ChanServ.empty() && nnick.equals_ci(Config->s_ChanServ))
src/botserv.cpp
+8 -13
View File
@@ -266,15 +266,13 @@ void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf)
/* Flood kicker */
if (ci->botflags.HasFlag(BS_KICK_FLOOD))
{
time_t now = time(NULL);
UserData *ud = get_user_data(ci->c, u);
if (!ud)
return;
if (now - ud->last_start > ci->floodsecs)
if (Anope::CurTime - ud->last_start > ci->floodsecs)
{
ud->last_start = time(NULL);
ud->last_start = Anope::CurTime;
ud->lines = 0;
}
@@ -390,10 +388,9 @@ static BanData *get_ban_data(Channel *c, User *u)
return NULL;
Anope::string mask = u->GetIdent() + "@" + u->GetDisplayedHost();
time_t now = time(NULL);
for (std::list<BanData *>::iterator it = c->bd.begin(), it_end = c->bd.end(); it != it_end; ++it)
{
if (now - (*it)->last_use > Config->BSKeepData)
if (Anope::CurTime - (*it)->last_use > Config->BSKeepData)
{
delete *it;
c->bd.erase(it);
@@ -401,7 +398,7 @@ static BanData *get_ban_data(Channel *c, User *u)
}
if ((*it)->mask.equals_ci(mask))
{
(*it)->last_use = now;
(*it)->last_use = Anope::CurTime;
return *it;
}
}
@@ -409,7 +406,7 @@ static BanData *get_ban_data(Channel *c, User *u)
/* If we fall here it is that we haven't found the record */
BanData *bd = new BanData();
bd->mask = mask;
bd->last_use = now;
bd->last_use = Anope::CurTime;
for (int x = 0; x < TTB_SIZE; ++x)
bd->ttb[x] = 0;
@@ -435,15 +432,13 @@ static UserData *get_user_data(Channel *c, User *u)
if (uc->user == u)
{
time_t now = time(NULL);
/* Checks whether data is obsolete */
if (now - uc->ud.last_use > Config->BSKeepData)
if (Anope::CurTime - uc->ud.last_use > Config->BSKeepData)
{
/* We should not free and realloc, but reset to 0
instead. */
uc->ud.Clear();
uc->ud.last_use = now;
uc->ud.last_use = Anope::CurTime;
}
return &uc->ud;
@@ -590,7 +585,7 @@ void bot_raw_mode(User *requester, ChannelInfo *ci, const Anope::string &mode, c
if (!u || !ci->c->FindUser(u))
return;
snprintf(buf, BUFSIZE - 1, "%ld", static_cast<long>(time(NULL)));
snprintf(buf, BUFSIZE - 1, "%ld", static_cast<long>(Anope::CurTime));
if (ModeManager::FindUserModeByName(UMODE_PROTECTED) && u->IsProtected() && mode[0] == '-' && requester != u)
{
src/channels.cpp
+5 -6
View File
@@ -172,7 +172,7 @@ void Channel::JoinUser(User *user)
if (this->FindUser(this->ci->bi) && this->ci->botflags.HasFlag(BS_GREET) && user->Account() && !user->Account()->greet.empty() && check_access(user, this->ci, CA_GREET) && user->server->IsSynced())
{
ircdproto->SendPrivmsg(this->ci->bi, this->name, "[%s] %s", user->Account()->display.c_str(), user->Account()->greet.c_str());
this->ci->bi->lastmsg = time(NULL);
this->ci->bi->lastmsg = Anope::CurTime;
}
}
@@ -1114,7 +1114,6 @@ User *nc_on_chan(Channel *c, const NickCore *nc)
void do_join(const Anope::string &source, int ac, const char **av)
{
User *user;
time_t ctime = time(NULL);
user = finduser(source);
if (!user)
@@ -1146,7 +1145,7 @@ void do_join(const Anope::string &source, int ac, const char **av)
/* Channel doesn't exist, create it */
if (!chan)
chan = new Channel(av[0], ctime);
chan = new Channel(av[0], Anope::CurTime);
/* Join came with a TS */
if (ac == 2)
@@ -1292,12 +1291,12 @@ void do_cmode(const Anope::string &source, int ac, const char **av)
return;
}
if (source.find('.') != Anope::string::npos && Anope::string(av[1]).find_first_of("bovahq") == Anope::string::npos)
if (source.find('.') != Anope::string::npos && Anope::string(av[1]).find_first_of("bovahq") == Anope::string::npos) // XXX
{
if (time(NULL) != c->server_modetime)
if (Anope::CurTime != c->server_modetime)
{
c->server_modecount = 0;
c->server_modetime = time(NULL);
c->server_modetime = Anope::CurTime;
}
++c->server_modecount;
}
src/chanserv.cpp
+8 -11
View File
@@ -244,7 +244,6 @@ void cs_init()
void check_modes(Channel *c)
{
time_t t = time(NULL);
ChannelInfo *ci;
ChannelMode *cm;
std::map<char, ChannelMode *>::iterator it, it_end;
@@ -268,10 +267,10 @@ void check_modes(Channel *c)
return;
}
if (c->chanserv_modetime != t)
if (c->chanserv_modetime != Anope::CurTime)
{
c->chanserv_modecount = 0;
c->chanserv_modetime = t;
c->chanserv_modetime = Anope::CurTime;
}
c->chanserv_modecount++;
@@ -462,7 +461,7 @@ void restore_topic(const Anope::string &chan)
*/
ci->last_topic.clear();
ci->last_topic_setter = whosends(ci)->nick;
ci->last_topic_time = time(NULL);
ci->last_topic_time = Anope::CurTime;
return;
}
if (!ci->last_topic.empty())
@@ -522,7 +521,7 @@ int check_topiclock(Channel *c, time_t topic_time)
/* Because older timestamps are rejected */
/* Some how the topic_time from do_topic is 0 set it to current + 1 */
if (!topic_time)
c->topic_time = time(NULL) + 1;
c->topic_time = Anope::CurTime + 1;
else
c->topic_time = topic_time + 1;
}
@@ -532,7 +531,7 @@ int check_topiclock(Channel *c, time_t topic_time)
if (!ci->last_topic.empty())
c->topic_time = ci->last_topic_time;
else
c->topic_time = time(NULL) + 1;
c->topic_time = Anope::CurTime + 1;
}
if (ircd->join2set && whosends(ci) == ChanServ)
@@ -557,14 +556,12 @@ void expire_chans()
if (!Config->CSExpire)
return;
time_t now = time(NULL);
for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; )
{
ChannelInfo *ci = it->second;
++it;
if (!ci->c && now - ci->last_used >= Config->CSExpire && !ci->HasFlag(CI_FORBIDDEN) && !ci->HasFlag(CI_NO_EXPIRE) && !ci->HasFlag(CI_SUSPENDED))
if (!ci->c && Anope::CurTime - ci->last_used >= Config->CSExpire && !ci->HasFlag(CI_FORBIDDEN) && !ci->HasFlag(CI_NO_EXPIRE) && !ci->HasFlag(CI_SUSPENDED))
{
EventReturn MOD_RESULT;
FOREACH_RESULT(I_OnPreChanExpire, OnPreChanExpire(ci));
@@ -678,7 +675,7 @@ int check_access(User *user, ChannelInfo *ci, int what)
/* Resetting the last used time */
if (level > 0)
ci->last_used = time(NULL);
ci->last_used = Anope::CurTime;
/* Superadmin always wins. Always. */
if (user->isSuperAdmin)
@@ -794,7 +791,7 @@ void update_cs_lastseen(User *user, ChannelInfo *ci)
if (IsFounder(user, ci) || user->IsIdentified() || (user->IsRecognized() && !ci->HasFlag(CI_SECURE)))
if ((access = ci->GetAccess(user->Account())))
access->last_seen = time(NULL);
access->last_seen = Anope::CurTime;
}
/*************************************************************************/
src/dns.cpp
+3 -4
View File
@@ -192,7 +192,7 @@ inline DNSRecord::DNSRecord()
{
this->type = DNS_QUERY_NONE;
this->record_class = this->ttl = this->rdlength = 0;
this->created = time(NULL);
this->created = Anope::CurTime;
}
DNSSocket::DNSSocket(const Anope::string &nTargetHost, int nPort) : ClientSocket(nTargetHost, nPort, "", false, SOCK_DGRAM)
@@ -471,7 +471,7 @@ bool DNSSocket::ProcessWrite()
return cont;
}
DNSManager::DNSManager() : Timer(3600, time(NULL), true)
DNSManager::DNSManager() : Timer(3600, Anope::CurTime, true)
{
this->sock = NULL;
@@ -502,11 +502,10 @@ bool DNSManager::CheckCache(DNSRequest *request)
{
std::multimap<Anope::string, DNSRecord *>::iterator it_end = this->cache.upper_bound(request->address);
time_t now = time(NULL);
for (; it != it_end; ++it)
{
DNSRecord *rec = it->second;
if (rec->created + rec->ttl >= now)
if (rec->created + rec->ttl >= Anope::CurTime)
{
request->OnLookupComplete(rec);
}
src/init.cpp
+2 -2
View File
@@ -22,7 +22,7 @@ extern void moduleAddIRCDMsgs();
void introduce_user(const Anope::string &user)
{
/* Watch out for infinite loops... */
time_t now = time(NULL);
time_t now = Anope::CurTime;
static time_t lasttime = now - 4;
if (lasttime >= now - 3)
throw FatalException("introduce_user loop detected");
@@ -427,7 +427,7 @@ void Init(int ac, char **av)
/* Announce ourselves to the logfile. */
Log() << "Anope " << Anope::Version() << " (ircd protocol: " << ircd->name << ") starting up" << (debug || readonly ? " (options:" : "") << (debug ? " debug" : "") << (readonly ? " readonly" : "") << (debug || readonly ? ")" : "");
start_time = time(NULL);
start_time = Anope::CurTime;
/* Set signal handlers. Catch certain signals to let us do things or
* panic as necessary, and ignore all others.
src/logger.cpp
+8 -10
View File
@@ -76,7 +76,7 @@ static Anope::string GetTimeStamp()
return tbuf;
}
static Anope::string GetLogDate(time_t t = time(NULL))
static Anope::string GetLogDate(time_t t = Anope::CurTime)
{
char timestamp[32];
@@ -88,7 +88,7 @@ static Anope::string GetLogDate(time_t t = time(NULL))
return timestamp;
}
static inline Anope::string CreateLogName(const Anope::string &file, time_t t = time(NULL))
static inline Anope::string CreateLogName(const Anope::string &file, time_t t = Anope::CurTime)
{
return "logs/" + file + "." + GetLogDate(t);
}
@@ -301,7 +301,7 @@ bool LogInfo::HasType(LogType type)
void LogInfo::ProcessMessage(const Log *l)
{
static time_t lastwarn = time(NULL);
static time_t lastwarn = Anope::CurTime;
if (!l)
throw CoreException("Bad values passed to LogInfo::ProcessMessages");
@@ -354,7 +354,7 @@ void LogInfo::ProcessMessage(const Log *l)
if (this->LogAge)
{
Anope::string oldlog = CreateLogName(target, time(NULL) - 86400 * this->LogAge);
Anope::string oldlog = CreateLogName(target, Anope::CurTime - 86400 * this->LogAge);
if (IsFile(oldlog))
{
DeleteFile(oldlog.c_str());
@@ -364,10 +364,9 @@ void LogInfo::ProcessMessage(const Log *l)
}
if (!log || !log->stream.is_open())
{
time_t now = time(NULL);
if (log && lastwarn + 300 > now)
if (log && lastwarn + 300 > Anope::CurTime)
{
lastwarn = now;
lastwarn = Anope::CurTime;
Log() << "Unable to open logfile " << log->GetName();
}
delete log;
@@ -382,10 +381,9 @@ void LogInfo::ProcessMessage(const Log *l)
if (!log->stream.is_open())
{
time_t now = time(NULL);
if (lastwarn + 300 > now)
if (lastwarn + 300 > Anope::CurTime)
{
lastwarn = now;
lastwarn = Anope::CurTime;
Log() << "Unable to open logfile " << log->GetName();
delete log;
log = NULL;
src/mail.cpp
+7 -11
View File
@@ -35,17 +35,15 @@ bool Mail(User *u, NickRequest *nr, const Anope::string &service, const Anope::s
if (!u || !nr || subject.empty() || service.empty() || message.empty())
return false;
time_t t = time(NULL);
if (!Config->UseMail)
notice_lang(service, u, MAIL_DISABLED);
else if (t - u->lastmail < Config->MailDelay)
notice_lang(service, u, MAIL_DELAYED, Config->MailDelay - t - u->lastmail);
else if (Anope::CurTime - u->lastmail < Config->MailDelay)
notice_lang(service, u, MAIL_DELAYED, Config->MailDelay - Anope::CurTime - u->lastmail);
else if (nr->email.empty())
notice_lang(service, u, MAIL_INVALID, nr->nick.c_str());
else
{
u->lastmail = nr->lastmail = t;
u->lastmail = nr->lastmail = Anope::CurTime;
threadEngine.Start(new MailThread(nr->nick, nr->email, subject, message));
return true;
}
@@ -58,17 +56,15 @@ bool Mail(User *u, NickCore *nc, const Anope::string &service, const Anope::stri
if (!u || !nc || subject.empty() || service.empty() || message.empty())
return false;
time_t t = time(NULL);
if (!Config->UseMail)
notice_lang(service, u, MAIL_DISABLED);
else if (t - u->lastmail < Config->MailDelay)
notice_lang(service, u, MAIL_DELAYED, Config->MailDelay - t - u->lastmail);
else if (Anope::CurTime - u->lastmail < Config->MailDelay)
notice_lang(service, u, MAIL_DELAYED, Config->MailDelay - Anope::CurTime - u->lastmail);
else if (nc->email.empty())
notice_lang(service, u, MAIL_INVALID, nc->display.c_str());
else
{
u->lastmail = nc->lastmail = t;
u->lastmail = nc->lastmail = Anope::CurTime;
threadEngine.Start(new MailThread(nc->display, nc->email, subject, message));
return true;
}
@@ -81,7 +77,7 @@ bool Mail(NickCore *nc, const Anope::string &subject, const Anope::string &messa
if (!Config->UseMail || !nc || nc->email.empty() || subject.empty() || message.empty())
return false;
nc->lastmail = time(NULL);
nc->lastmail = Anope::CurTime;
threadEngine.Start(new MailThread(nc->display, nc->email, subject, message));
return true;
src/main.cpp
+6 -8
View File
@@ -435,17 +435,15 @@ int main(int ac, char **av, char **envp)
started = true;
/* Set up timers */
time_t last_check = time(NULL);
ExpireTimer expireTimer(Config->ExpireTimeout, last_check);
UpdateTimer updateTimer(Config->UpdateTimeout, last_check);
time_t last_check = Anope::CurTime;
ExpireTimer expireTimer(Config->ExpireTimeout, Anope::CurTime);
UpdateTimer updateTimer(Config->UpdateTimeout, Anope::CurTime);
/*** Main loop. ***/
while (!quitting)
{
while (!quitting && UplinkSock)
{
time_t t = time(NULL);
Log(LOG_DEBUG_2) << "Top of main loop";
if (!readonly && (save_data || shutting_down))
@@ -464,10 +462,10 @@ int main(int ac, char **av, char **envp)
break;
}
if (t - last_check >= Config->TimeoutCheck)
if (Anope::CurTime - last_check >= Config->TimeoutCheck)
{
TimerManager::TickTimers(t);
last_check = t;
TimerManager::TickTimers(Anope::CurTime);
last_check = Anope::CurTime;
}
/* Process any modes that need to be (un)set */
src/memoserv.cpp
+4 -5
View File
@@ -170,7 +170,6 @@ void memo_send(User *u, const Anope::string &name, const Anope::string &text, in
{
bool ischan, isforbid;
MemoInfo *mi;
time_t now = time(NULL);
Anope::string source = u->Account()->display;
int is_servoper = u->Account() && u->Account()->IsServicesOper();
@@ -199,9 +198,9 @@ void memo_send(User *u, const Anope::string &name, const Anope::string &text, in
notice_lang(Config->s_MemoServ, u, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name.c_str());
}
}
else if (z != 2 && Config->MSSendDelay > 0 && u && u->lastmemosend + Config->MSSendDelay > now)
else if (z != 2 && Config->MSSendDelay > 0 && u && u->lastmemosend + Config->MSSendDelay > Anope::CurTime)
{
u->lastmemosend = now;
u->lastmemosend = Anope::CurTime;
if (!z)
notice_lang(Config->s_MemoServ, u, MEMO_SEND_PLEASE_WAIT, Config->MSSendDelay);
@@ -220,7 +219,7 @@ void memo_send(User *u, const Anope::string &name, const Anope::string &text, in
}
else
{
u->lastmemosend = now;
u->lastmemosend = Anope::CurTime;
Memo *m = new Memo();
mi->memos.push_back(m);
m->sender = source;
@@ -235,7 +234,7 @@ void memo_send(User *u, const Anope::string &name, const Anope::string &text, in
}
else
m->number = 1;
m->time = time(NULL);
m->time = Anope::CurTime;
m->text = text;
m->SetFlag(MF_UNREAD);
/* Set notify sent flag - DrStein */
src/messages.cpp
+3 -3
View File
@@ -223,7 +223,7 @@ int m_stats(const Anope::string &source, int ac, const char **av)
if (u && is_oper(u))
{
ircdproto->SendNumeric(Config->ServerName, 211, source, "Server SendBuf SentBytes SentMsgs RecvBuf RecvBytes RecvMsgs ConnTime");
ircdproto->SendNumeric(Config->ServerName, 211, source, "%s %d %d %d %d %d %d %ld", uplink_server->host.c_str(), UplinkSock->WriteBufferLen(), TotalWritten, -1, UplinkSock->ReadBufferLen(), TotalRead, -1, time(NULL) - start_time);
ircdproto->SendNumeric(Config->ServerName, 211, source, "%s %d %d %d %d %d %d %ld", uplink_server->host.c_str(), UplinkSock->WriteBufferLen(), TotalWritten, -1, UplinkSock->ReadBufferLen(), TotalRead, -1, Anope::CurTime - start_time);
}
ircdproto->SendNumeric(Config->ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
@@ -253,7 +253,7 @@ int m_stats(const Anope::string &source, int ac, const char **av)
case 'u':
{
int uptime = time(NULL) - start_time;
time_t uptime = Anope::CurTime - start_time;
ircdproto->SendNumeric(Config->ServerName, 242, source, ":Services up %d day%s, %02d:%02d:%02d", uptime / 86400, uptime / 86400 == 1 ? "" : "s", (uptime / 3600) % 24, (uptime / 60) % 60, uptime % 60);
ircdproto->SendNumeric(Config->ServerName, 250, source, ":Current users: %d (%d ops); maximum %d", usercnt, opcnt, maxusercnt);
ircdproto->SendNumeric(Config->ServerName, 219, source, "%c :End of /STATS report.", *av[0] ? *av[0] : '*');
@@ -288,7 +288,7 @@ int m_whois(const Anope::string &source, const Anope::string &who)
ircdproto->SendNumeric(Config->ServerName, 311, source, "%s %s %s * :%s", bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str());
ircdproto->SendNumeric(Config->ServerName, 307, source, "%s :is a registered nick", bi->nick.c_str());
ircdproto->SendNumeric(Config->ServerName, 312, source, "%s %s :%s", bi->nick.c_str(), Config->ServerName.c_str(), Config->ServerDesc.c_str());
ircdproto->SendNumeric(Config->ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", bi->nick.c_str(), time(NULL) - bi->lastmsg, start_time);
ircdproto->SendNumeric(Config->ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", bi->nick.c_str(), Anope::CurTime - bi->lastmsg, start_time);
ircdproto->SendNumeric(Config->ServerName, 318, source, "%s :End of /WHOIS list.", who.c_str());
}
else if (!ircd->svshold && (u = finduser(who)) && u->server == Me)
src/misc.cpp
+2 -4
View File
@@ -354,17 +354,15 @@ Anope::string duration(const NickCore *nc, time_t seconds)
*/
Anope::string expire_left(const NickCore *nc, time_t expires)
{
time_t now = time(NULL);
char buf[256];
if (!expires)
strlcpy(buf, getstring(nc, NO_EXPIRE), sizeof(buf));
else if (expires <= now)
else if (expires <= Anope::CurTime)
strlcpy(buf, getstring(nc, EXPIRES_SOON), sizeof(buf));
else
{
time_t diff = expires - now + 59;
time_t diff = expires - Anope::CurTime + 59;
if (diff >= 86400)
{
src/module.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ Module::Module(const Anope::string &mname, const Anope::string &creator)
if (FindModule(this->name))
throw CoreException("Module already exists!");
this->created = time(NULL);
this->created = Anope::CurTime;
this->SetVersion(Anope::Version());
src/nickserv.cpp
+4 -8
View File
@@ -197,7 +197,7 @@ int validate_user(User *u)
if (!na->nc->HasFlag(NI_SECURE) && u->IsRecognized())
{
na->last_seen = time(NULL);
na->last_seen = Anope::CurTime;
Anope::string last_usermask = u->GetIdent() + "@" + u->GetDisplayedHost();
na->last_usermask = last_usermask;
na->last_realname = u->realname;
@@ -245,8 +245,6 @@ int validate_user(User *u)
void expire_nicks()
{
time_t now = time(NULL);
for (nickalias_map::const_iterator it = NickAliasList.begin(), it_end = NickAliasList.end(); it != it_end; )
{
NickAlias *na = it->second;
@@ -256,11 +254,11 @@ void expire_nicks()
if (u && (na->nc->HasFlag(NI_SECURE) ? u->IsIdentified() : u->IsRecognized()))
{
Log(LOG_DEBUG_2) << "NickServ: updating last seen time for " << na->nick;
na->last_seen = now;
na->last_seen = Anope::CurTime;
continue;
}
if (Config->NSExpire && now - na->last_seen >= Config->NSExpire && !na->HasFlag(NS_FORBIDDEN) && !na->HasFlag(NS_NO_EXPIRE) && !na->nc->HasFlag(NI_SUSPENDED))
if (Config->NSExpire && Anope::CurTime - na->last_seen >= Config->NSExpire && !na->HasFlag(NS_FORBIDDEN) && !na->HasFlag(NS_NO_EXPIRE) && !na->nc->HasFlag(NI_SUSPENDED))
{
EventReturn MOD_RESULT;
FOREACH_RESULT(I_OnPreNickExpire, OnPreNickExpire(na));
@@ -275,14 +273,12 @@ void expire_nicks()
void expire_requests()
{
time_t now = time(NULL);
for (nickrequest_map::const_iterator it = NickRequestList.begin(), it_end = NickRequestList.end(); it != it_end; )
{
NickRequest *nr = it->second;
++it;
if (Config->NSRExpire && now - nr->requested >= Config->NSRExpire)
if (Config->NSRExpire && Anope::CurTime - nr->requested >= Config->NSRExpire)
{
Log() << "Request for nick " << nr->nick << " expiring";
delete nr;
src/operserv.cpp
+2 -4
View File
@@ -144,7 +144,7 @@ XLine::XLine(const Anope::string &mask, const Anope::string &reason) : Mask(mask
{
}
XLine::XLine(const Anope::string &mask, const Anope::string &by, const time_t expires, const Anope::string &reason) : Mask(mask), By(by), Created(time(NULL)), Expires(expires), Reason(reason)
XLine::XLine(const Anope::string &mask, const Anope::string &by, const time_t expires, const Anope::string &reason) : Mask(mask), By(by), Created(Anope::CurTime), Expires(expires), Reason(reason)
{
}
@@ -405,13 +405,11 @@ XLine *XLineManager::HasEntry(const Anope::string &mask)
*/
XLine *XLineManager::Check(User *u)
{
const time_t now = time(NULL);
for (unsigned i = this->XLines.size(); i > 0; --i)
{
XLine *x = this->XLines[i - 1];
if (x->Expires && x->Expires < now)
if (x->Expires && x->Expires < Anope::CurTime)
{
OnExpire(x);
delete x;
src/process.cpp
+4 -6
View File
@@ -60,21 +60,20 @@ void add_ignore(const Anope::string &nick, time_t delta)
for (; ign != ign_end; ++ign)
if (mask.equals_ci((*ign)->mask))
break;
time_t now = time(NULL);
/* Found one.. */
if (ign != ign_end)
{
if (!delta)
(*ign)->time = 0;
else if ((*ign)->time < now + delta)
(*ign)->time = now + delta;
else if ((*ign)->time < Anope::CurTime + delta)
(*ign)->time = Anope::CurTime + delta;
}
/* Create new entry.. */
else
{
IgnoreData *newign = new IgnoreData();
newign->mask = mask;
newign->time = delta ? now + delta : 0;
newign->time = delta ? Anope::CurTime + delta : 0;
ignore.push_front(newign);
Log(LOG_DEBUG) << "Added new ignore entry for " << mask;
}
@@ -133,9 +132,8 @@ IgnoreData *get_ignore(const Anope::string &nick)
if (Anope::Match(tmp, (*ign)->mask))
break;
}
time_t now = time(NULL);
/* Check whether the entry has timed out */
if (ign != ign_end && (*ign)->time && (*ign)->time <= now)
if (ign != ign_end && (*ign)->time && (*ign)->time <= Anope::CurTime)
{
Log(LOG_DEBUG) << "Expiring ignore entry " << (*ign)->mask;
delete *ign;
src/protocol.cpp
+1 -1
View File
@@ -234,7 +234,7 @@ void IRCDProto::SendSquit(const Anope::string &servname, const Anope::string &me
void IRCDProto::SendChangeBotNick(const BotInfo *bi, const Anope::string &newnick)
{
send_cmd(ircd->ts6 ? bi->GetUID() : bi->nick, "NICK %s %ld", newnick.c_str(), static_cast<long>(time(NULL)));
send_cmd(ircd->ts6 ? bi->GetUID() : bi->nick, "NICK %s %ld", newnick.c_str(), static_cast<long>(Anope::CurTime));
}
void IRCDProto::SendForceNickChange(const User *u, const Anope::string &newnick, time_t when)
src/regchannel.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ ChannelInfo::ChannelInfo(const Anope::string &chname)
this->bantype = Config->CSDefBantype;
this->memos.memomax = Config->MSMaxMemos;
this->last_used = this->time_registered = time(NULL);
this->last_used = this->time_registered = Anope::CurTime;
this->ttb = new int16[2 * TTB_SIZE];
for (int i = 0; i < TTB_SIZE; ++i)
@@ -578,7 +578,7 @@ bool ChannelInfo::CheckKick(User *user)
if ((autokick->HasFlag(AK_ISNICK) && autokick->nc == nc) || (!autokick->HasFlag(AK_ISNICK) && match_usermask(autokick->mask, user)))
{
Log(LOG_DEBUG_2) << user->nick << " matched akick " << (autokick->HasFlag(AK_ISNICK) ? autokick->nc->display : autokick->mask);
autokick->last_used = time(NULL);
autokick->last_used = Anope::CurTime;
if (autokick->HasFlag(AK_ISNICK))
get_idealban(this, user, mask);
else
src/servers.cpp
+1 -3
View File
@@ -86,8 +86,6 @@ Server::~Server()
if (Capab.HasFlag(CAPAB_NOQUIT) || Capab.HasFlag(CAPAB_QS))
{
time_t t = time(NULL);
for (user_map::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; )
{
User *u = it->second;
@@ -98,7 +96,7 @@ Server::~Server()
NickAlias *na = findnick(u->nick);
if (na && !na->HasFlag(NS_FORBIDDEN) && (!na->nc->HasFlag(NI_SUSPENDED)) && (u->IsRecognized() || u->IsIdentified()))
{
na->last_seen = t;
na->last_seen = Anope::CurTime;
na->last_quit = this->QReason;
}
src/sessions.cpp
+3 -5
View File
@@ -145,7 +145,7 @@ void add_session(const Anope::string &nick, const Anope::string &host, const Ano
if (Config->MaxSessionKill && session->hits >= Config->MaxSessionKill && SGLine)
{
Anope::string akillmask = "*@" + host;
XLine *x = new XLine(akillmask, Config->s_OperServ, time(NULL) + Config->SessionAutoKillExpiry, "Session limit exceeded");
XLine *x = new XLine(akillmask, Config->s_OperServ, Anope::CurTime + Config->SessionAutoKillExpiry, "Session limit exceeded");
SGLine->AddXLine(x);
ircdproto->SendGlobops(OperServ, "Added a temporary AKILL for \2%s\2 due to excessive connections", akillmask.c_str());
}
@@ -215,14 +215,12 @@ void del_session(const Anope::string &host)
void expire_exceptions()
{
time_t now = time(NULL);
for (std::vector<Exception *>::iterator it = exceptions.begin(), it_end = exceptions.end(); it != it_end; )
{
Exception *e = *it;
std::vector<Exception *>::iterator curr_it = it++;
if (!e->expires || e->expires > now)
if (!e->expires || e->expires > Anope::CurTime)
continue;
if (Config->WallExceptionExpire)
ircdproto->SendGlobops(OperServ, "Session limit exception for %s has expired.", e->mask.c_str());
@@ -290,7 +288,7 @@ int exception_add(User *u, const Anope::string &mask, int limit, const Anope::st
exception->mask = mask;
exception->limit = limit;
exception->reason = reason;
exception->time = time(NULL);
exception->time = Anope::CurTime;
exception->who = who;
exception->expires = expires;
src/sockets.cpp
+11
View File
@@ -109,6 +109,12 @@ bool sockaddrs::operator==(const sockaddrs &other) const
return false;
}
/** The equivalent of inet_pton
* @param type AF_INET or AF_INET6
* @param address The address to place in the sockaddr structures
* @param pport An option port to include in the sockaddr structures
* @throws A socket exception if given invalid IPs
*/
void sockaddrs::pton(int type, const Anope::string &address, int pport)
{
switch (type)
@@ -132,6 +138,11 @@ void sockaddrs::pton(int type, const Anope::string &address, int pport)
throw CoreException("Invalid socket type");
}
/** The equivalent of inet_ntop
* @param type AF_INET or AF_INET6
* @param address The in_addr or in_addr6 structure
* @throws A socket exception if given an invalid structure
*/
void sockaddrs::ntop(int type, const void *src)
{
switch (type)
src/users.cpp
+8 -9
View File
@@ -38,7 +38,7 @@ User::User(const Anope::string &snick, const Anope::string &sident, const Anope:
nc = NULL;
invalid_pw_count = invalid_pw_time = lastmemosend = lastnickreg = lastmail = 0;
OnAccess = false;
timestamp = my_signon = time(NULL);
timestamp = my_signon = Anope::CurTime;
this->nick = snick;
this->ident = sident;
@@ -57,7 +57,7 @@ User::User(const Anope::string &snick, const Anope::string &sident, const Anope:
if (usercnt > maxusercnt)
{
maxusercnt = usercnt;
maxusertime = time(NULL);
maxusertime = Anope::CurTime;
Log(this, "maxusers") << "connected - new maximum user count: " << maxusercnt;
}
}
@@ -315,7 +315,7 @@ void User::Collide(NickAlias *na)
} while (finduser(guestnick));
notice_lang(Config->s_NickServ, this, FORCENICKCHANGE_CHANGING, guestnick.c_str());
ircdproto->SendForceNickChange(this, guestnick, time(NULL));
ircdproto->SendForceNickChange(this, guestnick, Anope::CurTime);
}
else
kill_user(Config->s_NickServ, this->nick, "Services nickname-enforcer kill");
@@ -665,7 +665,6 @@ User *do_nick(const Anope::string &source, const Anope::string &nick, const Anop
user->server = serv;
user->realname = realname;
user->timestamp = ts;
user->my_signon = time(NULL);
if (!vhost2.empty())
user->SetCloakedHost(vhost2);
user->SetVIdent(username);
@@ -726,11 +725,11 @@ User *do_nick(const Anope::string &source, const Anope::string &nick, const Anop
else
{
/* Update this only if nicks aren't the same */
user->my_signon = time(NULL);
user->my_signon = Anope::CurTime;
NickAlias *old_na = findnick(user->nick);
if (old_na && (old_na->nc == user->Account() || user->IsRecognized()))
old_na->last_seen = time(NULL);
old_na->last_seen = Anope::CurTime;
Anope::string oldnick = user->nick;
user->SetNewNick(nick);
@@ -750,7 +749,7 @@ User *do_nick(const Anope::string &source, const Anope::string &nick, const Anop
}
else
{
na->last_seen = time(NULL);
na->last_seen = Anope::CurTime;
user->UpdateHost();
do_on_id(user);
ircdproto->SetAutoIdentificationToken(user);
@@ -807,7 +806,7 @@ void do_quit(const Anope::string &source, int ac, const char **av)
NickAlias *na = findnick(user->nick);
if (na && !na->HasFlag(NS_FORBIDDEN) && !na->nc->HasFlag(NI_SUSPENDED) && (user->IsRecognized() || user->IsIdentified(true)))
{
na->last_seen = time(NULL);
na->last_seen = Anope::CurTime;
na->last_quit = *av[0] ? av[0] : "";
}
FOREACH_MOD(I_OnUserQuit, OnUserQuit(user, *av[0] ? av[0] : ""));
@@ -835,7 +834,7 @@ void do_kill(const Anope::string &nick, const Anope::string &msg)
NickAlias *na = findnick(user->nick);
if (na && !na->HasFlag(NS_FORBIDDEN) && !na->nc->HasFlag(NI_SUSPENDED) && (user->IsRecognized() || user->IsIdentified(true)))
{
na->last_seen = time(NULL);
na->last_seen = Anope::CurTime;
na->last_quit = msg;
}
delete user;