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 443d28087f39a5deb02d854db77919354320f259..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);
        }
 
@@ -235,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;
@@ -250,7 +252,7 @@ void add_gline(long duration, char* source, char* reason, char* hostmask)
 
 // 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;
@@ -265,7 +267,7 @@ void add_eline(long duration, char* source, char* reason, char* hostmask)
 
 // 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;
@@ -281,7 +283,7 @@ void add_qline(long duration, char* source, char* reason, char* nickname)
 
 // 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;
@@ -297,7 +299,7 @@ void add_zline(long duration, char* source, char* reason, char* ipaddr)
 
 // 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;
@@ -312,7 +314,7 @@ void add_kline(long duration, char* source, char* reason, char* hostmask)
 
 // 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++)
        {
@@ -327,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++)
         {
@@ -342,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++)
        {
@@ -355,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++)
        {
@@ -368,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++)
        {
@@ -390,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);
                }
        }
@@ -398,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);
        }
 }
@@ -413,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++)
        {
@@ -428,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++)
        {
@@ -661,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;
@@ -673,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;
@@ -686,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;
@@ -698,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;