Add 'no such server' on remote stats to invalid name

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

diff --git a/src/xline.cpp b/src/xline.cpp
index 4cc4c4238a256a9ab98bcecaabc4ccafa1f3740d..7970f977efcf1745ff3f9ed96f4db8c1b2564396 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -36,6 +36,7 @@ using namespace std;
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "typedefs.h"
+#include "configreader.h"
 #include "cull_list.h"
 
 extern ServerConfig *Config;
@@ -53,8 +54,8 @@ extern std::vector<userrec*> local_users;
  * very efficient. I have improved the efficiency of the algorithm in two ways:
  *
  * (1) There are now two lists of items for each linetype. One list holds temporary
- *     items, and the other list holds permenant items (ones which will expire).
- *     Items which are on the permenant list are NEVER checked at all by the
+ *     items, and the other list holds permanent items (ones which will expire).
+ *     Items which are on the permanent list are NEVER checked at all by the
  *     expire_lines() function.
  * (2) The temporary xline lists are always kept in strict numerical order, keyed by 
  *     current time + duration. This means that the line which is due to expire the
@@ -702,7 +703,7 @@ void apply_lines(const int What)
                }
                if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
                {
-                       if ((check = matches_zline((char*)inet_ntoa(u->ip4))))
+                       if ((check = matches_zline(u->GetIPString())))
                        {
                                snprintf(reason,MAXBUF,"Z-Lined: %s",check);
                                Goners->AddItem(u,reason);
@@ -714,42 +715,47 @@ void apply_lines(const int What)
        DELETE(Goners);
 }
 
-void stats_k(userrec* user)
+void stats_k(userrec* user, string_list &results)
 {
+       std::string sn = Config->ServerName;
        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);
+               results.push_back(sn+" 216 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(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);
+               results.push_back(sn+" 216 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
 }
 
-void stats_g(userrec* user)
+void stats_g(userrec* user, string_list &results)
 {
+       std::string sn = Config->ServerName;
        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);
+               results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(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);
+               results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
 }
 
-void stats_q(userrec* user)
+void stats_q(userrec* user, string_list &results)
 {
+       std::string sn = Config->ServerName;
        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);
+               results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(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);
+               results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
 }
 
-void stats_z(userrec* user)
+void stats_z(userrec* user, string_list &results)
 {
+       std::string sn = Config->ServerName;
        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);
+               results.push_back(sn+" 223 "+user->nick+" :"+i->ipaddr+" "+ConvToStr(i->set_time)+" "+ConvToStr(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);
+               results.push_back(sn+" 223 "+user->nick+" :"+i->ipaddr+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
 }
 
-void stats_e(userrec* user)
+void stats_e(userrec* user, string_list &results)
 {
+       std::string sn = Config->ServerName;
        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);
+               results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(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);
+               results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason);
 }