* very efficient. I have improved the efficiency of the algorithm in two ways:
*
* (1) There are now two lists of items for each linetype. One list holds temporary
* very efficient. I have improved the efficiency of the algorithm in two ways:
*
* (1) There are now two lists of items for each linetype. One list holds temporary
- * items, and the other list holds permenant items (ones which will expire).
- * Items which are on the permenant list are NEVER checked at all by the
+ * items, and the other list holds permanent items (ones which will expire).
+ * Items which are on the permanent list are NEVER checked at all by the
* expire_lines() function.
* (2) The temporary xline lists are always kept in strict numerical order, keyed by
* current time + duration. This means that the line which is due to expire the
* expire_lines() function.
* (2) The temporary xline lists are always kept in strict numerical order, keyed by
* current time + duration. This means that the line which is due to expire the
-/* 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);
return true;
}
add_zline(0,"<Config>",reason,ipmask);
log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
return true;
}
-/* 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);*/
-
bool DoQLine(const char* tag, char** entries, void** values, int* types)
{
char* reason = (char*)values[0];
char* nick = (char*)values[1];
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;
}
add_qline(0,"<Config>",reason,nick);
log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
return true;
}
-/* 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);*/
bool DoKLine(const char* tag, char** entries, void** values, int* types)
{
char* reason = (char*)values[0];
char* host = (char*)values[1];
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;
}
add_kline(0,"<Config>",reason,host);
log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
return true;
}
-/* 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);*/
bool DoELine(const char* tag, char** entries, void** values, int* types)
{
char* reason = (char*)values[0];
char* host = (char*)values[1];
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;
add_eline(0,"<Config>",reason,host);
log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
return true;
bool add_gline(long duration, const char* source,const char* reason,const char* hostmask)
{
bool ret = del_gline(hostmask);
bool add_gline(long duration, const char* source,const char* reason,const char* hostmask)
{
bool ret = del_gline(hostmask);
GLine item;
item.duration = duration;
strlcpy(item.hostmask,hostmask,199);
GLine item;
item.duration = duration;
strlcpy(item.hostmask,hostmask,199);
bool 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)
{
- bool ret = del_eline(hostmask);
- ELine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,199);
- strlcpy(item.reason,reason,MAXBUF);
- strlcpy(item.source,source,255);
- item.n_matches = 0;
- item.set_time = TIME;
+ bool ret = del_eline(hostmask);
+ ELine item;
+ item.duration = duration;
+ strlcpy(item.hostmask,hostmask,199);
+ strlcpy(item.reason,reason,MAXBUF);
+ strlcpy(item.source,source,255);
+ item.n_matches = 0;
+ item.set_time = TIME;
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- {
- if (!strcasecmp(hostmask,i->hostmask))
- {
- elines.erase(i);
- return true;
- }
- }
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ if (!strcasecmp(hostmask,i->hostmask))
+ {
+ elines.erase(i);
+ return true;
+ }
+ }
for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
{
if (!strcasecmp(hostmask,i->hostmask))
for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
{
if (!strcasecmp(hostmask,i->hostmask))
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
if (match(host,i->hostmask))
return i->reason;
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
if (match(host,i->hostmask))
return i->reason;
char host2[MAXBUF];
snprintf(host2,MAXBUF,"*@%s",host);
char host2[MAXBUF];
snprintf(host2,MAXBUF,"*@%s",host);
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- if ((match(host,i->hostmask)) || (match(host2,i->hostmask)))
- return i->reason;
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ if ((match(host,i->hostmask)) || (match(host2,i->hostmask)))
+ return i->reason;
for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
if ((match(host,i->hostmask)) || (match(host2,i->hostmask)))
return i->reason;
for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
if ((match(host,i->hostmask)) || (match(host2,i->hostmask)))
return i->reason;
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
if (match(ipaddr,i->ipaddr))
return i->reason;
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
if (match(ipaddr,i->ipaddr))
return i->reason;
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
if (match(host,i->hostmask))
return i->reason;
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
if (match(host,i->hostmask))
return i->reason;
while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time)))
{
std::vector<GLine>::iterator i = glines.begin();
while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time)))
{
std::vector<GLine>::iterator i = glines.begin();
- WriteOpers("Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+ WriteOpers("*** Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
glines.erase(i);
}
while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time)))
{
std::vector<ELine>::iterator i = elines.begin();
glines.erase(i);
}
while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time)))
{
std::vector<ELine>::iterator i = elines.begin();
- WriteOpers("Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+ WriteOpers("*** Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
elines.erase(i);
}
while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time)))
{
std::vector<ZLine>::iterator i = zlines.begin();
elines.erase(i);
}
while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time)))
{
std::vector<ZLine>::iterator i = zlines.begin();
- WriteOpers("Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
+ WriteOpers("*** 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)))
{
std::vector<KLine>::iterator i = klines.begin();
zlines.erase(i);
}
while ((klines.size()) && (current > (klines.begin()->duration + klines.begin()->set_time)))
{
std::vector<KLine>::iterator i = klines.begin();
- WriteOpers("Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+ WriteOpers("*** Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
klines.erase(i);
}
while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time)))
{
std::vector<QLine>::iterator i = qlines.begin();
klines.erase(i);
}
while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time)))
{
std::vector<QLine>::iterator i = qlines.begin();
- WriteOpers("Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
+ WriteOpers("*** Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
- 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);
+ 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);
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);
}
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);
}