Forward port the removal of -nolimit (doesn't seem to be in the current command line...

[user/henk/code/inspircd.git] / src / xline.cpp

diff --git a/src/xline.cpp b/src/xline.cpp
index df522de4c27a577274900a002d54aacc9903cec2..abd09a0ab76ceb530f78b87f9d11928ea08dce3c 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -107,43 +107,51 @@ bool KSortComparison ( const KLine one, const KLine two );
 // 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
@@ -614,35 +622,35 @@ void expire_lines()
        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();
-               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();
-               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();
-               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();
-               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);
                qlines.erase(i);
        }