Made xline notices neater when notifying of unknown connections

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

diff --git a/src/xline.cpp b/src/xline.cpp
index ce6257a663decff4bd14c9409871747d53cc751f..35ebc50f38b1384f051a6e0ca93ee4b462c8eec3 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -145,6 +145,8 @@ struct StrHashComp
                char a[MAXBUF],b[MAXBUF];
                strlcpy(a,s1.c_str(),MAXBUF);
                strlcpy(b,s2.c_str(),MAXBUF);
+                strlower(a);
+                strlower(b);
                return (strcasecmp(a,b) == 0);
        }
 
@@ -181,6 +183,7 @@ extern file_cache MOTD;
 extern file_cache RULES;
 extern address_cache IP;
 
+extern time_t TIME;
 
 std::vector<KLine> klines;
 std::vector<GLine> glines;
@@ -234,7 +237,7 @@ void read_xline_defaults()
 
 // adds a g:line
 
-void add_gline(long duration, char* source, char* reason, char* hostmask)
+void add_gline(long duration, const char* source,const char* reason,const char* hostmask)
 {
        del_gline(hostmask);
        GLine item;
@@ -243,13 +246,13 @@ void add_gline(long duration, char* source, char* reason, char* hostmask)
        strlcpy(item.reason,reason,MAXBUF);
        strlcpy(item.source,source,MAXBUF);
        item.n_matches = 0;
-       item.set_time = time(NULL);
+       item.set_time = TIME;
        glines.push_back(item);
 }
 
 // adds an e:line (exception to bans)
 
-void add_eline(long duration, char* source, char* reason, char* hostmask)
+void add_eline(long duration, const char* source, const char* reason, const char* hostmask)
 {
         del_eline(hostmask);
         ELine item;
@@ -258,13 +261,13 @@ void add_eline(long duration, char* source, char* reason, char* hostmask)
         strlcpy(item.reason,reason,MAXBUF);
         strlcpy(item.source,source,MAXBUF);
         item.n_matches = 0;
-        item.set_time = time(NULL);
+        item.set_time = TIME;
         elines.push_back(item);
 }
 
 // adds a q:line
 
-void add_qline(long duration, char* source, char* reason, char* nickname)
+void add_qline(long duration, const char* source, const char* reason, const char* nickname)
 {
        del_qline(nickname);
        QLine item;
@@ -274,13 +277,13 @@ void add_qline(long duration, char* source, char* reason, char* nickname)
        strlcpy(item.source,source,MAXBUF);
        item.n_matches = 0;
        item.is_global = false;
-       item.set_time = time(NULL);
+       item.set_time = TIME;
        qlines.push_back(item);
 }
 
 // adds a z:line
 
-void add_zline(long duration, char* source, char* reason, char* ipaddr)
+void add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
 {
        del_zline(ipaddr);
        ZLine item;
@@ -290,13 +293,13 @@ void add_zline(long duration, char* source, char* reason, char* ipaddr)
        strlcpy(item.source,source,MAXBUF);
        item.n_matches = 0;
        item.is_global = false;
-       item.set_time = time(NULL);
+       item.set_time = TIME;
        zlines.push_back(item);
 }
 
 // adds a k:line
 
-void add_kline(long duration, char* source, char* reason, char* hostmask)
+void add_kline(long duration, const char* source, const char* reason, const char* hostmask)
 {
        del_kline(hostmask);
        KLine item;
@@ -305,13 +308,13 @@ void add_kline(long duration, char* source, char* reason, char* hostmask)
        strlcpy(item.reason,reason,MAXBUF);
        strlcpy(item.source,source,MAXBUF);
        item.n_matches = 0;
-       item.set_time = time(NULL);
+       item.set_time = TIME;
        klines.push_back(item);
 }
 
 // deletes a g:line, returns true if the line existed and was removed
 
-bool del_gline(char* hostmask)
+bool del_gline(const char* hostmask)
 {
        for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
        {
@@ -326,7 +329,7 @@ bool del_gline(char* hostmask)
 
 // deletes a e:line, returns true if the line existed and was removed
 
-bool del_eline(char* hostmask)
+bool del_eline(const char* hostmask)
 {
         for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
         {
@@ -341,7 +344,7 @@ bool del_eline(char* hostmask)
 
 // deletes a q:line, returns true if the line existed and was removed
 
-bool del_qline(char* nickname)
+bool del_qline(const char* nickname)
 {
        for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
        {
@@ -354,7 +357,7 @@ bool del_qline(char* nickname)
        return false;
 }
 
-bool qline_make_global(char* nickname)
+bool qline_make_global(const char* nickname)
 {
        for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
        {
@@ -367,7 +370,7 @@ bool qline_make_global(char* nickname)
        return false;
 }
 
-bool zline_make_global(char* ipaddr)
+bool zline_make_global(const char* ipaddr)
 {
        for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
        {
@@ -389,7 +392,7 @@ void sync_xlines(serverrec* serv, char* tcp_host)
        {
                if (i->is_global)
                {
-                       snprintf(data,MAXBUF,"} %s %s %ld %ld :%s",i->ipaddr,i->source,i->set_time,i->duration,i->reason);
+                       snprintf(data,MAXBUF,"} %s %s %lu %lu :%s",i->ipaddr,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
                        serv->SendPacket(data,tcp_host);
                }
        }
@@ -397,14 +400,14 @@ void sync_xlines(serverrec* serv, char* tcp_host)
        {
                if (i->is_global)
                {
-                       snprintf(data,MAXBUF,"{ %s %s %ld %ld :%s",i->nick,i->source,i->set_time,i->duration,i->reason);
+                       snprintf(data,MAXBUF,"{ %s %s %lu %lu :%s",i->nick,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
                        serv->SendPacket(data,tcp_host);
                }
        }
        // glines are always global, so no need to check
        for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
        {
-               snprintf(data,MAXBUF,"# %s %s %ld %ld :%s",i->hostmask,i->source,i->set_time,i->duration,i->reason);
+               snprintf(data,MAXBUF,"# %s %s %lu %lu :%s",i->hostmask,i->source,(unsigned long)i->set_time,(unsigned long)i->duration,i->reason);
                serv->SendPacket(data,tcp_host);
        }
 }
@@ -412,7 +415,7 @@ void sync_xlines(serverrec* serv, char* tcp_host)
 
 // deletes a z:line, returns true if the line existed and was removed
 
-bool del_zline(char* ipaddr)
+bool del_zline(const char* ipaddr)
 {
        for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
        {
@@ -427,7 +430,7 @@ bool del_zline(char* ipaddr)
 
 // deletes a k:line, returns true if the line existed and was removed
 
-bool del_kline(char* hostmask)
+bool del_kline(const char* hostmask)
 {
        for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
        {
@@ -444,6 +447,8 @@ bool del_kline(char* hostmask)
 
 char* matches_qline(const char* nick)
 {
+       if (qlines.empty())
+               return NULL;
        for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
        {
                if (match(nick,i->nick))
@@ -458,6 +463,8 @@ char* matches_qline(const char* nick)
 
 char* matches_gline(const char* host)
 {
+        if (glines.empty())
+                return NULL;
        for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
        {
                if (match(host,i->hostmask))
@@ -470,6 +477,8 @@ char* matches_gline(const char* host)
 
 char* matches_exception(const char* host)
 {
+        if (elines.empty())
+                return NULL;
        char host2[MAXBUF];
        snprintf(host2,MAXBUF,"*@%s",host);
         for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
@@ -526,6 +535,8 @@ void zline_set_creation_time(char* ip, time_t create_time)
 
 char* matches_zline(const char* ipaddr)
 {
+        if (zlines.empty())
+                return NULL;
        for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
        {
                if (match(ipaddr,i->ipaddr))
@@ -540,6 +551,8 @@ char* matches_zline(const char* ipaddr)
 
 char* matches_kline(const char* host)
 {
+        if (klines.empty())
+                return NULL;
        for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
        {
                if (match(host,i->hostmask))
@@ -555,7 +568,7 @@ char* matches_kline(const char* host)
 void expire_lines()
 {
        bool go_again = true;
-       time_t current = time(NULL);
+       time_t current = TIME;
        
        // because we mess up an iterator when we remove from the vector, we must bail from
        // the loop early if we delete an item, therefore this outer while loop is required.
@@ -650,7 +663,7 @@ void apply_lines()
                                        char* check = matches_gline(host);
                                        if (check)
                                        {
-                                               WriteOpers("*** User %s matches G-Line: %s",u->second->nick,check);
+                                               WriteOpers("*** User %s matches G-Line: %s",u->registered == 7 ? u->second->nick:"<unknown>",check);
                                                snprintf(reason,MAXBUF,"G-Lined: %s",check);
                                                kill_link(u->second,reason);
                                                go_again = true;
@@ -662,7 +675,7 @@ void apply_lines()
                                        char* check = matches_kline(host);
                                        if (check)
                                        {
-                                               WriteOpers("*** User %s matches K-Line: %s",u->second->nick,check);
+                                               WriteOpers("*** User %s matches K-Line: %s",u->registered == 7 ? u->second->nick:"<unknown>",check);
                                                snprintf(reason,MAXBUF,"K-Lined: %s",check);
                                                kill_link(u->second,reason);
                                                go_again = true;
@@ -675,7 +688,7 @@ void apply_lines()
                                        if (check)
                                        {
                                                snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check);
-                                               WriteOpers("*** Q-Lined nickname %s from %s: %s",u->second->nick,u->second->host,check);
+                                               WriteOpers("*** Q-Lined nickname %s from %s: %s",u->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
                                                kill_link(u->second,reason);
                                                go_again = true;
                                                break;
@@ -687,7 +700,7 @@ void apply_lines()
                                        if (check)
                                        {
                                                snprintf(reason,MAXBUF,"Z-Lined: %s",check);
-                                               WriteOpers("*** User %s matches Z-Line: %s",u->second->nick,u->second->host,check);
+                                               WriteOpers("*** User %s matches Z-Line: %s",u->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
                                                kill_link(u->second,reason);
                                                go_again = true;
                                                break;