return true;
}
-bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
{
- char* reason = (char*)values[0];
- char* ipmask = (char*)values[1];
+ const char* reason = values[0].GetString();
+ const char* ipmask = values[1].GetString();
conf->GetInstance()->XLines->add_zline(0,"<Config>",reason,ipmask);
conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
return true;
}
-bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
{
- char* reason = (char*)values[0];
- char* nick = (char*)values[1];
+ const char* reason = values[0].GetString();
+ const char* nick = values[1].GetString();
conf->GetInstance()->XLines->add_qline(0,"<Config>",reason,nick);
conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
return true;
}
-bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
{
- char* reason = (char*)values[0];
- char* host = (char*)values[1];
+ const char* reason = values[0].GetString();
+ const char* host = values[1].GetString();
conf->GetInstance()->XLines->add_kline(0,"<Config>",reason,host);
conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
return true;
}
-bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
+bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
{
- char* reason = (char*)values[0];
- char* host = (char*)values[1];
+ const char* reason = values[0].GetString();
+ const char* host = values[1].GetString();
conf->GetInstance()->XLines->add_eline(0,"<Config>",reason,host);
conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-char* XLineManager::matches_qline(const char* nick)
+QLine* XLineManager::matches_qline(const char* nick)
{
if ((qlines.empty()) && (pqlines.empty()))
return NULL;
for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
if (match(nick,(*i)->nick))
- return (*i)->reason;
+ return (*i);
for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
if (match(nick,(*i)->nick))
- return (*i)->reason;
+ return (*i);
return NULL;
}
// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
-char* XLineManager::matches_gline(userrec* user)
+GLine* XLineManager::matches_gline(userrec* user)
{
if ((glines.empty()) && (pglines.empty()))
return NULL;
{
if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
{
- return (*i)->reason;
+ return (*i);
}
}
}
{
if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
{
- return (*i)->reason;
+ return (*i);
}
}
}
return NULL;
}
-char* XLineManager::matches_exception(userrec* user)
+ELine* XLineManager::matches_exception(userrec* user)
{
if ((elines.empty()) && (pelines.empty()))
return NULL;
{
if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
{
- return (*i)->reason;
+ return (*i);
}
}
}
{
if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
{
- return (*i)->reason;
+ return (*i);
}
}
}
if (!strcasecmp(host,(*i)->hostmask))
{
(*i)->set_time = create_time;
+ (*i)->expiry = create_time + (*i)->duration;
return;
}
}
if (!strcasecmp(host,(*i)->hostmask))
{
(*i)->set_time = create_time;
+ (*i)->expiry = create_time + (*i)->duration;
return;
}
}
if (!strcasecmp(nick,(*i)->nick))
{
(*i)->set_time = create_time;
+ (*i)->expiry = create_time + (*i)->duration;
return;
}
}
if (!strcasecmp(ip,(*i)->ipaddr))
{
(*i)->set_time = create_time;
+ (*i)->expiry = create_time + (*i)->duration;
return;
}
}
// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
-char* XLineManager::matches_zline(const char* ipaddr)
+ZLine* XLineManager::matches_zline(const char* ipaddr)
{
if ((zlines.empty()) && (pzlines.empty()))
return NULL;
for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
if (match(ipaddr,(*i)->ipaddr, true))
- return (*i)->reason;
+ return (*i);
for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
if (match(ipaddr,(*i)->ipaddr, true))
- return (*i)->reason;
+ return (*i);
return NULL;
}
// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
-char* XLineManager::matches_kline(userrec* user)
+KLine* XLineManager::matches_kline(userrec* user)
{
if ((klines.empty()) && (pklines.empty()))
return NULL;
{
if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
{
- return (*i)->reason;
+ return (*i);
}
}
}
{
if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
{
- return (*i)->reason;
+ return (*i);
}
}
}
bool XLineManager::GSortComparison ( const GLine* one, const GLine* two )
{
- return (one->duration + one->set_time) < (two->duration + two->set_time);
+ return (one->expiry) < (two->expiry);
}
bool XLineManager::ESortComparison ( const ELine* one, const ELine* two )
{
- return (one->duration + one->set_time) < (two->duration + two->set_time);
+ return (one->expiry) < (two->expiry);
}
bool XLineManager::ZSortComparison ( const ZLine* one, const ZLine* two )
{
- return (one->duration + one->set_time) < (two->duration + two->set_time);
+ return (one->expiry) < (two->expiry);
}
bool XLineManager::KSortComparison ( const KLine* one, const KLine* two )
{
- return (one->duration + one->set_time) < (two->duration + two->set_time);
+ return (one->expiry) < (two->expiry);
}
bool XLineManager::QSortComparison ( const QLine* one, const QLine* two )
{
- return (one->duration + one->set_time) < (two->duration + two->set_time);
+ return (one->expiry) < (two->expiry);
}
// removes lines that have expired
* none left at the head of the queue that are after the current time.
*/
- while ((glines.size()) && (current > ((*glines.begin())->duration + (*glines.begin())->set_time)))
+ while ((glines.size()) && (current > (*glines.begin())->expiry))
{
std::vector<GLine*>::iterator i = glines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s (set by %s %d seconds ago)",(*i)->hostmask,(*i)->source,(*i)->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
glines.erase(i);
}
- while ((elines.size()) && (current > ((*elines.begin())->duration + (*elines.begin())->set_time)))
+ while ((elines.size()) && (current > (*elines.begin())->expiry))
{
std::vector<ELine*>::iterator i = elines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s (set by %s %d seconds ago)",(*i)->hostmask,(*i)->source,(*i)->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
elines.erase(i);
}
- while ((zlines.size()) && (current > ((*zlines.begin())->duration + (*zlines.begin())->set_time)))
+ while ((zlines.size()) && (current > (*zlines.begin())->expiry))
{
std::vector<ZLine*>::iterator i = zlines.begin();
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",(*i)->ipaddr,(*i)->source,(*i)->duration);
zlines.erase(i);
}
- while ((klines.size()) && (current > ((*klines.begin())->duration + (*klines.begin())->set_time)))
+ while ((klines.size()) && (current > (*klines.begin())->expiry))
{
std::vector<KLine*>::iterator i = klines.begin();
- ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s (set by %s %d seconds ago)",(*i)->hostmask,(*i)->source,(*i)->duration);
+ ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);
klines.erase(i);
}
- while ((qlines.size()) && (current > ((*qlines.begin())->duration + (*qlines.begin())->set_time)))
+ while ((qlines.size()) && (current > (*qlines.begin())->expiry))
{
std::vector<QLine*>::iterator i = qlines.begin();
ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration);
return;
CullList* Goners = new CullList(ServerInstance);
- char* check = NULL;
+ XLine* check = NULL;
for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
userrec* u = (userrec*)(*u2);
{
if ((check = matches_gline(u)))
{
- snprintf(reason,MAXBUF,"G-Lined: %s",check);
+ snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
Goners->AddItem(u,reason);
}
}
{
if ((check = matches_kline(u)))
{
- snprintf(reason,MAXBUF,"K-Lined: %s",check);
+ snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
Goners->AddItem(u,reason);
}
}
{
if ((check = matches_qline(u->nick)))
{
- snprintf(reason,MAXBUF,"Q-Lined: %s",check);
+ snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
Goners->AddItem(u,reason);
}
}
{
if ((check = matches_zline(u->GetIPString())))
{
- snprintf(reason,MAXBUF,"Z-Lined: %s",check);
+ snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
Goners->AddItem(u,reason);
}
}
projects / user / henk / code / inspircd.git / blobdiff