* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
// this way these days, such as qlines against
// services nicks, etc.
-void read_xline_defaults()
+bool InitXLine(const char* tag)
{
- char ipmask[MAXBUF];
- char nick[MAXBUF];
- char host[MAXBUF];
- char reason[MAXBUF];
+ return true;
+}
- for (int i = 0; i < Config->ConfValueEnum("badip",&Config->config_f); i++)
- {
- Config->ConfValue("badip","ipmask",i,ipmask,&Config->config_f);
- Config->ConfValue("badip","reason",i,reason,&Config->config_f);
- add_zline(0,"<Config>",reason,ipmask);
- log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
- }
-
- for (int i = 0; i < Config->ConfValueEnum("badnick",&Config->config_f); i++)
- {
- Config->ConfValue("badnick","nick",i,nick,&Config->config_f);
- Config->ConfValue("badnick","reason",i,reason,&Config->config_f);
- add_qline(0,"<Config>",reason,nick);
- log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
- }
-
- for (int i = 0; i < Config->ConfValueEnum("badhost",&Config->config_f); i++)
- {
- Config->ConfValue("badhost","host",i,host,&Config->config_f);
- Config->ConfValue("badhost","reason",i,reason,&Config->config_f);
- add_kline(0,"<Config>",reason,host);
- log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
- }
- for (int i = 0; i < Config->ConfValueEnum("exception",&Config->config_f); i++)
- {
- Config->ConfValue("exception","host",i,host,&Config->config_f);
- Config->ConfValue("exception","reason",i,reason,&Config->config_f);
- add_eline(0,"<Config>",reason,host);
- log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
- }
+bool DoneXLine(const char* tag)
+{
+ apply_lines(APPLY_ALL);
+ return true;
+}
+
+bool DoZLine(const char* tag, char** entries, void** values, int* types)
+{
+ char* reason = (char*)values[0];
+ char* ipmask = (char*)values[1];
+ add_zline(0,"<Config>",reason,ipmask);
+ log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
+ return true;
+}
+
+bool DoQLine(const char* tag, char** entries, void** values, int* types)
+{
+ char* reason = (char*)values[0];
+ char* nick = (char*)values[1];
+ add_qline(0,"<Config>",reason,nick);
+ log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
+ return true;
+}
+
+bool DoKLine(const char* tag, char** entries, void** values, int* types)
+{
+ char* reason = (char*)values[0];
+ char* host = (char*)values[1];
+ add_kline(0,"<Config>",reason,host);
+ log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
+ return true;
+}
+
+bool DoELine(const char* tag, char** entries, void** values, int* types)
+{
+ char* reason = (char*)values[0];
+ char* host = (char*)values[1];
+ add_eline(0,"<Config>",reason,host);
+ log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
+ return true;
}
// adds a g:line
-void add_gline(long duration, const char* source,const char* reason,const char* hostmask)
+bool add_gline(long duration, const char* source,const char* reason,const char* hostmask)
{
- del_gline(hostmask);
+ bool ret = del_gline(hostmask);
GLine item;
item.duration = duration;
strlcpy(item.hostmask,hostmask,199);
{
pglines.push_back(item);
}
+ return !ret;
}
// adds an e:line (exception to bans)
-void add_eline(long duration, const char* source, const char* reason, const char* hostmask)
+bool add_eline(long duration, const char* source, const char* reason, const char* hostmask)
{
- del_eline(hostmask);
+ bool ret = del_eline(hostmask);
ELine item;
item.duration = duration;
strlcpy(item.hostmask,hostmask,199);
{
pelines.push_back(item);
}
+ return !ret;
}
// adds a q:line
-void add_qline(long duration, const char* source, const char* reason, const char* nickname)
+bool add_qline(long duration, const char* source, const char* reason, const char* nickname)
{
- del_qline(nickname);
+ bool ret = del_qline(nickname);
QLine item;
item.duration = duration;
strlcpy(item.nick,nickname,63);
{
pqlines.push_back(item);
}
+ return !ret;
}
// adds a z:line
-void add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
+bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
{
- del_zline(ipaddr);
+ bool ret = del_zline(ipaddr);
ZLine item;
item.duration = duration;
if (strchr(ipaddr,'@'))
{
pzlines.push_back(item);
}
+ return !ret;
}
// adds a k:line
-void add_kline(long duration, const char* source, const char* reason, const char* hostmask)
+bool add_kline(long duration, const char* source, const char* reason, const char* hostmask)
{
- del_kline(hostmask);
+ bool ret = del_kline(hostmask);
KLine item;
item.duration = duration;
strlcpy(item.hostmask,hostmask,200);
{
pklines.push_back(item);
}
+ return !ret;
}
// deletes a g:line, returns true if the line existed and was removed
{
userrec* u = (userrec*)(*u2);
u->MakeHost(host);
- if (elines.size())
+ if (elines.size() || pelines.size())
{
// ignore people matching exempts
if (matches_exception(host))
}
if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
{
- if (check = matches_gline(host))
+ if ((check = matches_gline(host)))
{
snprintf(reason,MAXBUF,"G-Lined: %s",check);
Goners->AddItem(u,reason);
}
if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
{
- if (check = matches_kline(host))
+ if ((check = matches_kline(host)))
{
snprintf(reason,MAXBUF,"K-Lined: %s",check);
Goners->AddItem(u,reason);
}
if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
{
- if (check = matches_qline(u->nick))
+ if ((check = matches_qline(u->nick)))
{
- snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check);
+ snprintf(reason,MAXBUF,"Q-Lined: %s",check);
Goners->AddItem(u,reason);
}
}
if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
{
- if (check = matches_zline(u->ip))
+ if ((check = matches_zline((char*)inet_ntoa(u->ip4))))
{
snprintf(reason,MAXBUF,"Z-Lined: %s",check);
Goners->AddItem(u,reason);
void stats_k(userrec* user)
{
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
- WriteServ(user->fd,"216 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
- WriteServ(user->fd,"216 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
}
void stats_g(userrec* user)
{
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
}
void stats_q(userrec* user)
{
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- WriteServ(user->fd,"217 %s :%s %d %d %s %s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- WriteServ(user->fd,"217 %s :%s %d %d %s %s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
}
void stats_z(userrec* user)
{
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
}
void stats_e(userrec* user)
{
for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
- WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+ WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
}
projects / user / henk / code / inspircd.git / blobdiff