]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/xline.cpp
Fix #380 on BSD make.
[user/henk/code/inspircd.git] / src / xline.cpp
index 87b1d3e5ea0107fb5e90e658d17825e2f5da3eac..66d24f439a6b12b600033a17bf40ef3b72ba6efd 100644 (file)
@@ -1 +1,782 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd.h"\r#include "users.h"\r#include "modules.h"\r#include "wildcard.h"\r#include "xline.h"\r\r/* Version two, now with optimized expiry!\r *\r * Because the old way was horrendously slow, the new way of expiring xlines is very\r * very efficient. I have improved the efficiency of the algorithm in two ways:\r *\r * (1) There are now two lists of items for each linetype. One list holds temporary\r *     items, and the other list holds permanent items (ones which will expire).\r *     Items which are on the permanent list are NEVER checked at all by the\r *     expire_lines() function.\r * (2) The temporary xline lists are always kept in strict numerical order, keyed by\r *     current time + duration. This means that the line which is due to expire the\r *     soonest is always pointed at by vector::begin(), so a simple while loop can\r *     very efficiently, very quickly and above all SAFELY pick off the first few\r *     items in the vector which need zapping.\r *\r *     -- Brain\r */\r\rbool InitXLine(ServerConfig* conf, const char* tag)\r{\r        return true;\r}\r\rbool DoneZLine(ServerConfig* conf, const char* tag)\r{\r  conf->GetInstance()->XLines->apply_lines(APPLY_ZLINES|APPLY_PERM_ONLY);\r        return true;\r}\r\rbool DoneQLine(ServerConfig* conf, const char* tag)\r{\r  conf->GetInstance()->XLines->apply_lines(APPLY_QLINES|APPLY_PERM_ONLY);\r        return true;\r}\r\rbool DoneKLine(ServerConfig* conf, const char* tag)\r{\r  conf->GetInstance()->XLines->apply_lines(APPLY_KLINES|APPLY_PERM_ONLY);\r        return true;\r}\r\rbool DoneELine(ServerConfig* conf, const char* tag)\r{\r  /* Yes, this is supposed to do nothing, we dont 'apply' these */\r       return true;\r}\r\rbool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)\r{\r     const char* reason = values[0].GetString();\r    const char* ipmask = values[1].GetString();\r\r   conf->GetInstance()->XLines->add_zline(0,"<Config>",reason,ipmask);\r    return true;\r}\r\rbool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)\r{\r     const char* reason = values[0].GetString();\r    const char* nick = values[1].GetString();\r\r     conf->GetInstance()->XLines->add_qline(0,"<Config>",reason,nick);\r      return true;\r}\r\rbool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)\r{\r     const char* reason = values[0].GetString();\r    const char* host = values[1].GetString();\r\r     conf->GetInstance()->XLines->add_kline(0,"<Config>",reason,host);\r      return true;\r}\r\rbool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)\r{\r     const char* reason = values[0].GetString();\r    const char* host = values[1].GetString();\r\r     conf->GetInstance()->XLines->add_eline(0,"<Config>",reason,host);\r      return true;\r}\r\rIdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)\r{\r    IdentHostPair n = std::make_pair<std::string,std::string>("*","*");\r    std::string::size_type x = ident_and_host.find('@');\r   if (x != std::string::npos)\r    {\r              n.second = ident_and_host.substr(x + 1,ident_and_host.length());\r               n.first = ident_and_host.substr(0, x);\r         if (!n.first.length())\r                 n.first.assign("*");\r           if (!n.second.length())\r                        n.second.assign("*");\r  }\r      else\r   {\r              n.second = ident_and_host;\r     }\r\r     return n;\r}\r\r// adds a g:line\r\rbool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask)\r{\r       IdentHostPair ih = IdentSplit(hostmask);\r\r      if (del_gline(hostmask, true))\r         return false;\r\r GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());\r\r       if (duration)\r  {\r              glines.push_back(item);\r                sort(glines.begin(), glines.end(),XLineManager::GSortComparison);\r      }\r      else\r   {\r              pglines.push_back(item);\r       }\r\r     return true;\r}\r\r// adds an e:line (exception to bans)\r\rbool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask)\r{\r     IdentHostPair ih = IdentSplit(hostmask);\r\r      if (del_eline(hostmask, true))\r         return false;\r\r ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());\r\r       if (duration)\r  {\r              elines.push_back(item);\r                sort(elines.begin(), elines.end(),XLineManager::ESortComparison);\r      }\r      else\r   {\r              pelines.push_back(item);\r       }\r      return true;\r}\r\r// adds a q:line\r\rbool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname)\r{\r  if (del_qline(nickname, true))\r         return false;\r\r QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname);\r\r  if (duration)\r  {\r              qlines.push_back(item);\r                sort(qlines.begin(), qlines.end(),XLineManager::QSortComparison);\r      }\r      else\r   {\r              pqlines.push_back(item);\r       }\r      return true;\r}\r\r// adds a z:line\r\rbool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr)\r{\r    if (strchr(ipaddr,'@'))\r        {\r              while (*ipaddr != '@')\r                 ipaddr++;\r              ipaddr++;\r      }\r\r     if (del_zline(ipaddr, true))\r           return false;\r\r ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr);\r\r    if (duration)\r  {\r              zlines.push_back(item);\r                sort(zlines.begin(), zlines.end(),XLineManager::ZSortComparison);\r      }\r      else\r   {\r              pzlines.push_back(item);\r       }\r      return true;\r}\r\r// adds a k:line\r\rbool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask)\r{\r  IdentHostPair ih = IdentSplit(hostmask);\r\r      if (del_kline(hostmask, true))\r         return false;\r\r KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());\r\r       if (duration)\r  {\r              klines.push_back(item);\r                sort(klines.begin(), klines.end(),XLineManager::KSortComparison);\r      }\r      else\r   {\r              pklines.push_back(item);\r       }\r      return true;\r}\r\r// deletes a g:line, returns true if the line existed and was removed\r\rbool XLineManager::del_gline(const char* hostmask, bool simulate)\r{\r     IdentHostPair ih = IdentSplit(hostmask);\r       for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)\r {\r              if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))\r            {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             glines.erase(i);\r                       }\r                      return true;\r           }\r      }\r      for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)\r       {\r              if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))\r            {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             pglines.erase(i);\r                      }\r                      return true;\r           }\r      }\r      return false;\r}\r\r// deletes a e:line, returns true if the line existed and was removed\r\rbool XLineManager::del_eline(const char* hostmask, bool simulate)\r{\r    IdentHostPair ih = IdentSplit(hostmask);\r       for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)\r {\r              if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))\r            {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             elines.erase(i);\r                       }\r                      return true;\r           }\r      }\r      for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)\r       {\r              if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))\r            {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             pelines.erase(i);\r                      }\r                      return true;\r           }\r      }\r      return false;\r}\r\r// deletes a q:line, returns true if the line existed and was removed\r\rbool XLineManager::del_qline(const char* nickname, bool simulate)\r{\r    for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)\r {\r              if (!strcasecmp(nickname,(*i)->nick))\r          {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             qlines.erase(i);\r                       }\r                      return true;\r           }\r      }\r      for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)\r       {\r              if (!strcasecmp(nickname,(*i)->nick))\r          {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             pqlines.erase(i);\r                      }\r                      return true;\r           }\r      }\r      return false;\r}\r\r// deletes a z:line, returns true if the line existed and was removed\r\rbool XLineManager::del_zline(const char* ipaddr, bool simulate)\r{\r      for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)\r {\r              if (!strcasecmp(ipaddr,(*i)->ipaddr))\r          {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             zlines.erase(i);\r                       }\r                      return true;\r           }\r      }\r      for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)\r       {\r              if (!strcasecmp(ipaddr,(*i)->ipaddr))\r          {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             pzlines.erase(i);\r                      }\r                      return true;\r           }\r      }\r      return false;\r}\r\r// deletes a k:line, returns true if the line existed and was removed\r\rbool XLineManager::del_kline(const char* hostmask, bool simulate)\r{\r    IdentHostPair ih = IdentSplit(hostmask);\r       for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)\r {\r              if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))\r            {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             klines.erase(i);\r                       }\r                      return true;\r           }\r      }\r      for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)\r       {\r              if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))\r            {\r                      if (!simulate)\r                 {\r                              delete *i;\r                             pklines.erase(i);\r                      }\r                      return true;\r           }\r      }\r      return false;\r}\r\r// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match\r\rQLine* XLineManager::matches_qline(const char* nick, bool permonly)\r{\r       if ((qlines.empty()) && (pqlines.empty()))\r             return NULL;\r   if (!permonly)\r {\r              for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)\r                 if (match(nick,(*i)->nick))\r                            return (*i);\r   }\r      for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)\r               if (match(nick,(*i)->nick))\r                    return (*i);\r   return NULL;\r}\r\r// returns a pointer to the reason if a host matches a gline, NULL if it didnt match\r\rGLine* XLineManager::matches_gline(userrec* user, bool permonly)\r{\r       if ((glines.empty()) && (pglines.empty()))\r             return NULL;\r   if (!permonly)\r {\r              for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)\r         {\r                      if ((match(user->ident,(*i)->identmask)))\r                      {\r                              if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))\r                             {\r                                      return (*i);\r                           }\r                      }\r              }\r      }\r      for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)\r       {\r              if ((match(user->ident,(*i)->identmask)))\r              {\r                      if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))\r                     {\r                              return (*i);\r                   }\r              }\r      }\r      return NULL;\r}\r\rELine* XLineManager::matches_exception(userrec* user, bool permonly)\r{\r if ((elines.empty()) && (pelines.empty()))\r             return NULL;\r   char host2[MAXBUF];\r    snprintf(host2,MAXBUF,"*@%s",user->host);\r      if (!permonly)\r {\r              for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)\r         {\r                      if ((match(user->ident,(*i)->identmask)))\r                      {\r                              if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))\r                             {\r                                      return (*i);\r                           }\r                      }\r              }\r      }\r      for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)\r       {\r              if ((match(user->ident,(*i)->identmask)))\r              {\r                      if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))\r                     {\r                              return (*i);\r                   }\r              }\r      }\r      return NULL;\r}\r\r\rvoid XLineManager::gline_set_creation_time(const char* host, time_t create_time)\r{\r    for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)\r {\r              if (!strcasecmp(host,(*i)->hostmask))\r          {\r                      (*i)->set_time = create_time;\r                  (*i)->expiry = create_time + (*i)->duration;\r                   return;\r                }\r      }\r      for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)\r       {\r              if (!strcasecmp(host,(*i)->hostmask))\r          {\r                      (*i)->set_time = create_time;\r                  return;\r                }\r      }\r      return ;\r}\r\rvoid XLineManager::eline_set_creation_time(const char* host, time_t create_time)\r{\r for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)\r {\r              if (!strcasecmp(host,(*i)->hostmask))\r          {\r                      (*i)->set_time = create_time;\r                  (*i)->expiry = create_time + (*i)->duration;\r                   return;\r                }\r      }\r      for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)\r       {\r              if (!strcasecmp(host,(*i)->hostmask))\r          {\r                      (*i)->set_time = create_time;\r                  return;\r                }\r      }\r      return;\r}\r\rvoid XLineManager::qline_set_creation_time(const char* nick, time_t create_time)\r{\r  for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)\r {\r              if (!strcasecmp(nick,(*i)->nick))\r              {\r                      (*i)->set_time = create_time;\r                  (*i)->expiry = create_time + (*i)->duration;\r                   return;\r                }\r      }\r      for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)\r       {\r              if (!strcasecmp(nick,(*i)->nick))\r              {\r                      (*i)->set_time = create_time;\r                  return;\r                }\r      }\r      return;\r}\r\rvoid XLineManager::zline_set_creation_time(const char* ip, time_t create_time)\r{\r    for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)\r {\r              if (!strcasecmp(ip,(*i)->ipaddr))\r              {\r                      (*i)->set_time = create_time;\r                  (*i)->expiry = create_time + (*i)->duration;\r                   return;\r                }\r      }\r      for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)\r       {\r              if (!strcasecmp(ip,(*i)->ipaddr))\r              {\r                      (*i)->set_time = create_time;\r                  return;\r                }\r      }\r      return;\r}\r\r// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match\r\rZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly)\r{\r        if ((zlines.empty()) && (pzlines.empty()))\r             return NULL;\r   if (!permonly)\r {\r              for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)\r                 if (match(ipaddr,(*i)->ipaddr, true))\r                          return (*i);\r   }\r      for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)\r               if (match(ipaddr,(*i)->ipaddr, true))\r                  return (*i);\r   return NULL;\r}\r\r// returns a pointer to the reason if a host matches a kline, NULL if it didnt match\r\rKLine* XLineManager::matches_kline(userrec* user, bool permonly)\r{\r       if ((klines.empty()) && (pklines.empty()))\r             return NULL;\r   if (!permonly)\r {\r              for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)\r         {\r                      if ((match(user->ident,(*i)->identmask)))\r                      {\r                              if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))\r                             {\r                                      return (*i);\r                           }\r                      }\r              }\r      }\r      for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)\r       {\r              if ((match(user->ident,(*i)->identmask)))\r              {\r                      if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))\r                     {\r                              return (*i);\r                   }\r              }\r      }\r      return NULL;\r}\r\rbool XLineManager::GSortComparison ( const GLine* one, const GLine* two )\r{\r    return (one->expiry) < (two->expiry);\r}\r\rbool XLineManager::ESortComparison ( const ELine* one, const ELine* two )\r{\r   return (one->expiry) < (two->expiry);\r}\r\rbool XLineManager::ZSortComparison ( const ZLine* one, const ZLine* two )\r{\r   return (one->expiry) < (two->expiry);\r}\r\rbool XLineManager::KSortComparison ( const KLine* one, const KLine* two )\r{\r   return (one->expiry) < (two->expiry);\r}\r\rbool XLineManager::QSortComparison ( const QLine* one, const QLine* two )\r{\r   return (one->expiry) < (two->expiry);\r}\r\r// removes lines that have expired\r\rvoid XLineManager::expire_lines()\r{\r       time_t current = ServerInstance->Time();\r\r      /* Because we now store all our XLines in sorted order using ((*i)->duration + (*i)->set_time) as a key, this\r   * means that to expire the XLines we just need to do a while, picking off the top few until there are\r  * none left at the head of the queue that are after the current time.\r  */\r\r   while ((glines.size()) && (current > (*glines.begin())->expiry))\r       {\r              std::vector<GLine*>::iterator i = glines.begin();\r              ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);\r          glines.erase(i);\r       }\r\r     while ((elines.size()) && (current > (*elines.begin())->expiry))\r       {\r              std::vector<ELine*>::iterator i = elines.begin();\r              ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);\r          elines.erase(i);\r       }\r\r     while ((zlines.size()) && (current > (*zlines.begin())->expiry))\r       {\r              std::vector<ZLine*>::iterator i = zlines.begin();\r              ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",(*i)->ipaddr,(*i)->source,(*i)->duration);\r               zlines.erase(i);\r       }\r\r     while ((klines.size()) && (current > (*klines.begin())->expiry))\r       {\r              std::vector<KLine*>::iterator i = klines.begin();\r              ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration);\r          klines.erase(i);\r       }\r\r     while ((qlines.size()) && (current > (*qlines.begin())->expiry))\r       {\r              std::vector<QLine*>::iterator i = qlines.begin();\r              ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration);\r         qlines.erase(i);\r       }\r\r}\r\r// applies lines, removing clients and changing nicks etc as applicable\r\rvoid XLineManager::apply_lines(const int What)\r{\r        if (!What)\r             return;\r\r       if (What & APPLY_PERM_ONLY)\r    {\r              char reason[MAXBUF];\r\r          if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))\r                  return;\r\r               XLine* check = NULL;\r           for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)\r            {\r                      userrec* u = (userrec*)(*u2);\r\r                 if (elines.size() || pelines.size())\r                           if (matches_exception(u))\r                                      continue;\r\r                     if ((What & APPLY_GLINES) && pglines.size())\r                   {\r                              if ((check = matches_gline(u,true)))\r                           {\r                                      snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);\r                                   if (*ServerInstance->Config->MoronBanner)\r                                              u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);\r                                       if (ServerInstance->Config->HideBans)\r                                          ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);\r                                     else\r                                           ServerInstance->GlobalCulls.AddItem(u, reason);\r                                }\r                      }\r\r                     if ((What & APPLY_KLINES) && pklines.size())\r                   {\r                              if ((check = matches_kline(u,true)))\r                           {\r                                      snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);\r                                   if (*ServerInstance->Config->MoronBanner)\r                                              u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);\r                                       if (ServerInstance->Config->HideBans)\r                                          ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);\r                                     else\r                                           ServerInstance->GlobalCulls.AddItem(u, reason);\r                                }\r                      }\r\r                     if ((What & APPLY_QLINES) && pqlines.size())\r                   {\r                              if ((check = matches_qline(u->nick,true)))\r                             {\r                                      snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);\r                                   if (*ServerInstance->Config->MoronBanner)\r                                              u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);\r                                       if (ServerInstance->Config->HideBans)\r                                          ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);\r                                     else\r                                           ServerInstance->GlobalCulls.AddItem(u, reason);\r                                }\r                      }\r\r                     if ((What & APPLY_ZLINES) && pzlines.size())\r                   {\r                              if ((check = matches_zline(u->GetIPString(),true)))\r                            {\r                                      snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);\r                                   if (*ServerInstance->Config->MoronBanner)\r                                              u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);\r                                       if (ServerInstance->Config->HideBans)\r                                          ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);\r                                     else\r                                           ServerInstance->GlobalCulls.AddItem(u, reason);\r                                }\r                      }\r              }\r      }\r      else\r   {\r              char reason[MAXBUF];\r\r          if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&\r            (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))\r                      return;\r\r               XLine* check = NULL;\r           for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)\r            {\r                      userrec* u = (userrec*)(*u2);\r\r                 if (elines.size() || pelines.size())\r                   {\r                              // ignore people matching exempts\r                              if (matches_exception(u))\r                                      continue;\r                      }\r                      if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))\r                        {\r                              if ((check = matches_gline(u)))\r                                {\r                                      snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);\r                                   if (*ServerInstance->Config->MoronBanner)\r                                              u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);\r                                       if (ServerInstance->Config->HideBans)\r                                          ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason);\r                                     else\r                                           ServerInstance->GlobalCulls.AddItem(u, reason);\r                                }\r                      }\r                      if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))\r                        {\r                              if ((check = matches_kline(u)))\r                                {\r                                      snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);\r                                   if (*ServerInstance->Config->MoronBanner)\r                                              u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);\r                                       if (ServerInstance->Config->HideBans)\r                                          ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason);\r                                     else\r                                           ServerInstance->GlobalCulls.AddItem(u, reason);\r                                }\r                      }\r                      if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))\r                        {\r                              if ((check = matches_qline(u->nick)))\r                          {\r                                      snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);\r                                   if (*ServerInstance->Config->MoronBanner)\r                                              u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);\r                                       if (ServerInstance->Config->HideBans)\r                                          ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason);\r                                     else\r                                           ServerInstance->GlobalCulls.AddItem(u, reason);\r                                }\r                      }\r                      if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))\r                        {\r                              if ((check = matches_zline(u->GetIPString())))\r                         {\r                                      snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason);\r                                  if (*ServerInstance->Config->MoronBanner)\r                                              u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);\r                                       if (ServerInstance->Config->HideBans)\r                                          ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason);\r                                     else\r                                           ServerInstance->GlobalCulls.AddItem(u, reason);\r                                }\r                      }\r              }\r      }\r}\r\rvoid XLineManager::stats_k(userrec* user, string_list &results)\r{\r std::string sn = ServerInstance->Config->ServerName;\r   for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)\r         results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r       for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)\r               results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r}\r\rvoid XLineManager::stats_g(userrec* user, string_list &results)\r{\r  std::string sn = ServerInstance->Config->ServerName;\r   for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)\r         results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r       for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)\r               results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r}\r\rvoid XLineManager::stats_q(userrec* user, string_list &results)\r{\r  std::string sn = ServerInstance->Config->ServerName;\r   for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)\r         results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r       for (std::vector<QLine*>::iterator i = pqlines.begin(); i != pqlines.end(); i++)\r               results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r}\r\rvoid XLineManager::stats_z(userrec* user, string_list &results)\r{\r  std::string sn = ServerInstance->Config->ServerName;\r   for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)\r         results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r     for (std::vector<ZLine*>::iterator i = pzlines.begin(); i != pzlines.end(); i++)\r               results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r}\r\rvoid XLineManager::stats_e(userrec* user, string_list &results)\r{\r        std::string sn = ServerInstance->Config->ServerName;\r   for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)\r         results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r       for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)\r               results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason);\r}\r\rXLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)\r{\r}\r
\ No newline at end of file
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+#include "xline.h"
+#include "bancache.h"
+
+/** An XLineFactory specialized to generate GLine* pointers
+ */
+class GLineFactory : public XLineFactory
+{
+ public:
+       GLineFactory() : XLineFactory("G") { }
+
+       /** Generate a GLine
+        */
+       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+       {
+               IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+               return new GLine(set_time, duration, source, reason, ih.first, ih.second);
+       }
+};
+
+/** An XLineFactory specialized to generate ELine* pointers
+ */
+class ELineFactory : public XLineFactory
+{
+ public:
+       ELineFactory() : XLineFactory("E") { }
+
+       /** Generate an ELine
+        */
+       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+       {
+               IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+               return new ELine(set_time, duration, source, reason, ih.first, ih.second);
+       }
+};
+
+/** An XLineFactory specialized to generate KLine* pointers
+ */
+class KLineFactory : public XLineFactory
+{
+ public:
+        KLineFactory() : XLineFactory("K") { }
+
+       /** Generate a KLine
+        */
+        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        {
+                IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
+                return new KLine(set_time, duration, source, reason, ih.first, ih.second);
+        }
+};
+
+/** An XLineFactory specialized to generate QLine* pointers
+ */
+class QLineFactory : public XLineFactory
+{
+ public:
+        QLineFactory() : XLineFactory("Q") { }
+
+       /** Generate a QLine
+        */
+        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        {
+                return new QLine(set_time, duration, source, reason, xline_specific_mask);
+        }
+};
+
+/** An XLineFactory specialized to generate ZLine* pointers
+ */
+class ZLineFactory : public XLineFactory
+{
+ public:
+        ZLineFactory() : XLineFactory("Z") { }
+
+       /** Generate a ZLine
+        */
+        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        {
+                return new ZLine(set_time, duration, source, reason, xline_specific_mask);
+        }
+};
+
+
+/*
+ * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
+ * efficient as we can this time so we can close this file and never ever touch it again ..
+ *
+ * Background:
+ *  Version 1 stored all line types in one list (one for g, one for z, etc). This was fine,
+ *  but both version 1 and 2 suck at applying lines efficiently. That is, every time a new line
+ *  was added, it iterated every existing line for every existing user. Ow. Expiry was also
+ *  expensive, as the lists were NOT sorted.
+ *
+ *  Version 2 moved permanent lines into a seperate list from non-permanent to help optimize
+ *  matching speed, but matched in the same way.
+ *  Expiry was also sped up by sorting the list by expiry (meaning just remove the items at the
+ *  head of the list that are outdated.)
+ *
+ * This was fine and good, but it looked less than ideal in code, and matching was still slower
+ * than it could have been, something which we address here.
+ *
+ * VERSION 3:
+ *  All lines are (as in v1) stored together -- no seperation of perm and non-perm. They are stored in
+ *  a map of maps (first map is line type, second map is for quick lookup on add/delete/etc).
+ *
+ *  Expiry is *no longer* performed on a timer, and no longer uses a sorted list of any variety. This
+ *  is now done by only checking for expiry when a line is accessed, meaning that expiry is no longer
+ *  a resource intensive problem.
+ *
+ *  Application no longer tries to apply every single line on every single user - instead, now only lines
+ *  added since the previous application are applied. This keeps S2S ADDLINE during burst nice and fast,
+ *  while at the same time not slowing things the fuck down when we try adding a ban with lots of preexisting
+ *  bans. :)
+ */
+
+bool XLine::Matches(User *u)
+{
+       return false;
+}
+
+/*
+ * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly.
+ */
+void XLineManager::CheckELines()
+{
+       ContainerIter n = lookup_lines.find("E");
+
+       if (n == lookup_lines.end())
+               return;
+
+       XLineLookup& ELines = n->second;
+
+       if (ELines.empty())
+               return;
+
+       for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+       {
+               User* u = (User*)(*u2);
+
+               /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */
+               LookupIter safei;
+
+               for (LookupIter i = ELines.begin(); i != ELines.end(); )
+               {
+                       safei = i;
+                       safei++;
+
+                       XLine *e = i->second;
+                       u->exempt = e->Matches(u);
+
+                       i = safei;
+               }
+       }
+}
+
+
+XLineLookup* XLineManager::GetAll(const std::string &type)
+{
+       ContainerIter n = lookup_lines.find(type);
+
+       if (n == lookup_lines.end())
+               return NULL;
+
+       LookupIter safei;
+       const time_t current = ServerInstance->Time();
+
+       /* Expire any dead ones, before sending */
+       for (LookupIter x = n->second.begin(); x != n->second.end(); )
+       {
+               safei = x;
+               safei++;
+               if (x->second->duration && current > x->second->expiry)
+               {
+                       ExpireLine(n, x);
+               }
+               x = safei;
+       }
+
+       return &(n->second);
+}
+
+void XLineManager::DelAll(const std::string &type)
+{
+       ContainerIter n = lookup_lines.find(type);
+
+       if (n == lookup_lines.end())
+               return;
+
+       LookupIter x;
+
+       /* Delete all of a given type (this should probably use DelLine, but oh well) */
+       while ((x = n->second.begin()) != n->second.end())
+       {
+               ExpireLine(n, x);
+       }
+}
+
+std::vector<std::string> XLineManager::GetAllTypes()
+{
+       std::vector<std::string> items;
+       for (ContainerIter x = lookup_lines.begin(); x != lookup_lines.end(); ++x)
+               items.push_back(x->first);
+       return items;
+}
+
+IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
+{
+       IdentHostPair n = std::make_pair<std::string,std::string>("*","*");
+       std::string::size_type x = ident_and_host.find('@');
+       if (x != std::string::npos)
+       {
+               n.second = ident_and_host.substr(x + 1,ident_and_host.length());
+               n.first = ident_and_host.substr(0, x);
+               if (!n.first.length())
+                       n.first.assign("*");
+               if (!n.second.length())
+                       n.second.assign("*");
+       }
+       else
+       {
+               n.first.clear();
+               n.second = ident_and_host;
+       }
+
+       return n;
+}
+
+// adds a line
+
+bool XLineManager::AddLine(XLine* line, User* user)
+{
+       if (line->duration && ServerInstance->Time() > line->expiry)
+               return false; // Don't apply expired XLines.
+
+       /* Don't apply duplicate xlines */
+       ContainerIter x = lookup_lines.find(line->type);
+       if (x != lookup_lines.end())
+       {
+               LookupIter i = x->second.find(line->Displayable());
+               if (i != x->second.end())
+               {
+                       // XLine propagation bug was here, if the line to be added already exists and
+                       // it's expired then expire it and add the new one instead of returning false
+                       if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry))
+                               return false;
+
+                       ExpireLine(x, i);
+               }
+       }
+
+       /*ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
+       XLineFactory* xlf = GetFactory(line->type);
+       if (!xlf)
+               return false;
+
+       ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
+
+       if (xlf->AutoApplyToUserList(line))
+               pending_lines.push_back(line);
+
+       lookup_lines[line->type][line->Displayable()] = line;
+       line->OnAdd();
+
+       FOREACH_MOD(I_OnAddLine,OnAddLine(user, line));
+
+       return true;
+}
+
+// deletes a line, returns true if the line existed and was removed
+
+bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate)
+{
+       ContainerIter x = lookup_lines.find(type);
+
+       if (x == lookup_lines.end())
+               return false;
+
+       LookupIter y = x->second.find(hostmask);
+
+       if (y == x->second.end())
+               return false;
+
+       if (simulate)
+               return true;
+
+       ServerInstance->BanCache->RemoveEntries(y->second->type, true);
+
+       FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second));
+
+       y->second->Unset();
+
+       std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second);
+       if (pptr != pending_lines.end())
+               pending_lines.erase(pptr);
+
+       delete y->second;
+       x->second.erase(y);
+
+       return true;
+}
+
+
+void ELine::Unset()
+{
+       /* remove exempt from everyone and force recheck after deleting eline */
+       for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+       {
+               User* u = (User*)(*u2);
+               u->exempt = false;
+       }
+
+       ServerInstance->XLines->CheckELines();
+}
+
+// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
+
+XLine* XLineManager::MatchesLine(const std::string &type, User* user)
+{
+       ContainerIter x = lookup_lines.find(type);
+
+       if (x == lookup_lines.end())
+               return NULL;
+
+       const time_t current = ServerInstance->Time();
+
+       LookupIter safei;
+
+       for (LookupIter i = x->second.begin(); i != x->second.end(); )
+       {
+               safei = i;
+               safei++;
+
+               if (i->second->duration && current > i->second->expiry)
+               {
+                       /* Expire the line, proceed to next one */
+                       ExpireLine(x, i);
+                       i = safei;
+                       continue;
+               }
+
+               if (i->second->Matches(user))
+               {
+                       return i->second;
+               }
+
+               i = safei;
+       }
+       return NULL;
+}
+
+XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern)
+{
+       ContainerIter x = lookup_lines.find(type);
+
+       if (x == lookup_lines.end())
+               return NULL;
+
+       const time_t current = ServerInstance->Time();
+
+        LookupIter safei;
+
+       for (LookupIter i = x->second.begin(); i != x->second.end(); )
+       {
+               safei = i;
+               safei++;
+
+               if (i->second->Matches(pattern))
+               {
+                       if (i->second->duration && current > i->second->expiry)
+                       {
+                               /* Expire the line, return nothing */
+                               ExpireLine(x, i);
+                               /* See above */
+                               i = safei;
+                               continue;
+                       }
+                       else
+                               return i->second;
+               }
+
+               i = safei;
+       }
+       return NULL;
+}
+
+// removes lines that have expired
+void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
+{
+       FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
+
+       item->second->DisplayExpiry();
+       item->second->Unset();
+
+       /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
+        * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
+        * -- Brain
+        */
+       std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
+       if (pptr != pending_lines.end())
+               pending_lines.erase(pptr);
+
+       delete item->second;
+       container->second.erase(item);
+}
+
+
+// applies lines, removing clients and changing nicks etc as applicable
+void XLineManager::ApplyLines()
+{
+       LocalUserList::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin();
+       while (u2 != ServerInstance->Users->local_users.rend())
+       {
+               User* u = *u2++;
+
+               // Don't ban people who are exempt.
+               if (u->exempt)
+                       continue;
+
+               for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
+               {
+                       XLine *x = *i;
+                       if (x->Matches(u))
+                               x->Apply(u);
+               }
+       }
+
+       pending_lines.clear();
+}
+
+void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
+{
+       ContainerIter n = lookup_lines.find(type);
+
+       time_t current = ServerInstance->Time();
+
+       LookupIter safei;
+
+       if (n != lookup_lines.end())
+       {
+               XLineLookup& list = n->second;
+               for (LookupIter i = list.begin(); i != list.end(); )
+               {
+                       safei = i;
+                       safei++;
+
+                       if (i->second->duration && current > i->second->expiry)
+                       {
+                               ExpireLine(n, i);
+                       }
+                       else
+                               results.push_back(ServerInstance->Config->ServerName+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
+                                       ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+i->second->source+" :"+i->second->reason);
+                       i = safei;
+               }
+       }
+}
+
+
+XLineManager::XLineManager()
+{
+       GLineFactory* GFact;
+       ELineFactory* EFact;
+       KLineFactory* KFact;
+       QLineFactory* QFact;
+       ZLineFactory* ZFact;
+
+
+       GFact = new GLineFactory;
+       EFact = new ELineFactory;
+       KFact = new KLineFactory;
+       QFact = new QLineFactory;
+       ZFact = new ZLineFactory;
+
+       RegisterFactory(GFact);
+       RegisterFactory(EFact);
+       RegisterFactory(KFact);
+       RegisterFactory(QFact);
+       RegisterFactory(ZFact);
+}
+
+XLineManager::~XLineManager()
+{
+       const char gekqz[] = "GEKQZ";
+       for(unsigned int i=0; i < sizeof(gekqz); i++)
+       {
+               XLineFactory* xlf = GetFactory(std::string(1, gekqz[i]));
+               delete xlf;
+       }
+
+       // Delete all existing XLines
+       for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
+       {
+               for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
+               {
+                       delete j->second;
+               }
+       }
+}
+
+void XLine::Apply(User* u)
+{
+}
+
+bool XLine::IsBurstable()
+{
+       return true;
+}
+
+void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
+{
+       char sreason[MAXBUF];
+       snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason.c_str());
+       if (!ServerInstance->Config->MoronBanner.empty())
+               u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner.c_str());
+
+       if (ServerInstance->Config->HideBans)
+               ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
+       else
+               ServerInstance->Users->QuitUser(u, sreason);
+
+
+       if (bancache)
+       {
+               ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
+               if (this->duration > 0)
+                       ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration);
+               else
+                       ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
+       }
+}
+
+bool KLine::Matches(User *u)
+{
+       if (u->exempt)
+               return false;
+
+       if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
+       {
+               if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
+               {
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+void KLine::Apply(User* u)
+{
+       DefaultApply(u, "K", (this->identmask ==  "*") ? true : false);
+}
+
+bool GLine::Matches(User *u)
+{
+       if (u->exempt)
+               return false;
+
+       if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
+       {
+               if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
+               {
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+void GLine::Apply(User* u)
+{
+       DefaultApply(u, "G", (this->identmask == "*") ? true : false);
+}
+
+bool ELine::Matches(User *u)
+{
+       if (u->exempt)
+               return false;
+
+       if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
+       {
+               if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+                   InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
+               {
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+bool ZLine::Matches(User *u)
+{
+       if (u->exempt)
+               return false;
+
+       if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr))
+               return true;
+       else
+               return false;
+}
+
+void ZLine::Apply(User* u)
+{
+       DefaultApply(u, "Z", true);
+}
+
+
+bool QLine::Matches(User *u)
+{
+       if (InspIRCd::Match(u->nick, this->nick))
+               return true;
+
+       return false;
+}
+
+void QLine::Apply(User* u)
+{
+       /* Force to uuid on apply of qline, no need to disconnect any more :) */
+       u->ForceNickChange(u->uuid.c_str());
+}
+
+
+bool ZLine::Matches(const std::string &str)
+{
+       if (InspIRCd::MatchCIDR(str, this->ipaddr))
+               return true;
+       else
+               return false;
+}
+
+bool QLine::Matches(const std::string &str)
+{
+       if (InspIRCd::Match(str, this->nick))
+               return true;
+
+       return false;
+}
+
+bool ELine::Matches(const std::string &str)
+{
+       return (InspIRCd::MatchCIDR(str, matchtext));
+}
+
+bool KLine::Matches(const std::string &str)
+{
+       return (InspIRCd::MatchCIDR(str.c_str(), matchtext));
+}
+
+bool GLine::Matches(const std::string &str)
+{
+       return (InspIRCd::MatchCIDR(str, matchtext));
+}
+
+void ELine::OnAdd()
+{
+       /* When adding one eline, only check the one eline */
+       for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+       {
+               User* u = (User*)(*u2);
+               if (this->Matches(u))
+                       u->exempt = true;
+       }
+}
+
+void ELine::DisplayExpiry()
+{
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
+
+void QLine::DisplayExpiry()
+{
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",
+               nick.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
+
+void ZLine::DisplayExpiry()
+{
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",
+               ipaddr.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
+
+void KLine::DisplayExpiry()
+{
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
+
+void GLine::DisplayExpiry()
+{
+       ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",
+               identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+}
+
+const char* ELine::Displayable()
+{
+       return matchtext.c_str();
+}
+
+const char* KLine::Displayable()
+{
+       return matchtext.c_str();
+}
+
+const char* GLine::Displayable()
+{
+       return matchtext.c_str();
+}
+
+const char* ZLine::Displayable()
+{
+       return ipaddr.c_str();
+}
+
+const char* QLine::Displayable()
+{
+       return nick.c_str();
+}
+
+bool KLine::IsBurstable()
+{
+       return false;
+}
+
+bool XLineManager::RegisterFactory(XLineFactory* xlf)
+{
+       XLineFactMap::iterator n = line_factory.find(xlf->GetType());
+
+       if (n != line_factory.end())
+               return false;
+
+       line_factory[xlf->GetType()] = xlf;
+
+       return true;
+}
+
+bool XLineManager::UnregisterFactory(XLineFactory* xlf)
+{
+       XLineFactMap::iterator n = line_factory.find(xlf->GetType());
+
+       if (n == line_factory.end())
+               return false;
+
+       line_factory.erase(n);
+
+       return true;
+}
+
+XLineFactory* XLineManager::GetFactory(const std::string &type)
+{
+       XLineFactMap::iterator n = line_factory.find(type);
+
+       if (n == line_factory.end())
+               return NULL;
+
+       return n->second;
+}