Removal of ancient TRUE/FALSE #defines (C-ish stuff)

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 56e7495bb1aaa59bda99c5301f30ec51a50bb9d9..d23f3b108e564403acc9a624ceb9b00519d7c720 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
@@ -712,40 +720,40 @@ void apply_lines(const int What)
 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);
 }