A few anti-flood features

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

diff --git a/src/xline.cpp b/src/xline.cpp
index da03c06549adcb2388f0cef130ad4c08504868ec..92f5ac3a42067f8309cff510fac4043aff7338fb 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -392,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);
                }
        }
@@ -400,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);
        }
 }
@@ -663,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->second->registered == 7 ? u->second->nick:"<unknown>",check);
                                                snprintf(reason,MAXBUF,"G-Lined: %s",check);
                                                kill_link(u->second,reason);
                                                go_again = true;
@@ -675,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->second->registered == 7 ? u->second->nick:"<unknown>",check);
                                                snprintf(reason,MAXBUF,"K-Lined: %s",check);
                                                kill_link(u->second,reason);
                                                go_again = true;
@@ -688,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->second->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
                                                kill_link(u->second,reason);
                                                go_again = true;
                                                break;
@@ -700,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->second->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
                                                kill_link(u->second,reason);
                                                go_again = true;
                                                break;