Same again

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 24a1fccd08e19053c7314f3b68ccb330a8ee36fa..746ad6388668de8e708559801290060427a5cc2f 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -52,40 +52,40 @@ bool DoneXLine(ServerConfig* conf, const char* tag)
        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);
@@ -435,6 +435,7 @@ void XLineManager::gline_set_creation_time(const char* host, time_t create_time)
                if (!strcasecmp(host,(*i)->hostmask))
                {
                        (*i)->set_time = create_time;
+                       (*i)->expiry = create_time + (*i)->duration;
                        return;
                }
        }
@@ -456,6 +457,7 @@ void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
                if (!strcasecmp(host,(*i)->hostmask))
                {
                        (*i)->set_time = create_time;
+                       (*i)->expiry = create_time + (*i)->duration;
                        return;
                }
        }
@@ -477,6 +479,7 @@ void XLineManager::qline_set_creation_time(const char* nick, time_t create_time)
                if (!strcasecmp(nick,(*i)->nick))
                {
                        (*i)->set_time = create_time;
+                       (*i)->expiry = create_time + (*i)->duration;
                        return;
                }
        }
@@ -498,6 +501,7 @@ void XLineManager::zline_set_creation_time(const char* ip, time_t create_time)
                if (!strcasecmp(ip,(*i)->ipaddr))
                {
                        (*i)->set_time = create_time;
+                       (*i)->expiry = create_time + (*i)->duration;
                        return;
                }
        }
@@ -595,14 +599,14 @@ void XLineManager::expire_lines()
        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())->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);
        }
 
@@ -616,7 +620,7 @@ void XLineManager::expire_lines()
        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);
        }