* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
* ---------------------------------------------------
*/
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.h"
+using namespace std;
+
#include "inspircd_config.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
-#include <time.h>
+#include "inspircd.h"
#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
#include <map>
#include <sstream>
#include <vector>
-#include <errno.h>
#include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
-#include "connection.h"
#include "users.h"
-#include "servers.h"
#include "ctables.h"
#include "globals.h"
#include "modules.h"
#include "message.h"
#include "commands.h"
#include "xline.h"
+#include "inspstring.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
+#include "typedefs.h"
+#include "cull_list.h"
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
-
-using namespace std;
+extern ServerConfig *Config;
extern int MODCOUNT;
-extern vector<Module*> modules;
-extern vector<ircd_module*> factory;
-
-extern int LogLevel;
-extern char ServerName[MAXBUF];
-extern char Network[MAXBUF];
-extern char ServerDesc[MAXBUF];
-extern char AdminName[MAXBUF];
-extern char AdminEmail[MAXBUF];
-extern char AdminNick[MAXBUF];
-extern char diepass[MAXBUF];
-extern char restartpass[MAXBUF];
-extern char motd[MAXBUF];
-extern char rules[MAXBUF];
-extern char list[MAXBUF];
-extern char PrefixQuit[MAXBUF];
-extern char DieValue[MAXBUF];
-
-extern int debugging;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
-extern int DieDelay;
-extern time_t startup_time;
-extern int NetBufferSize;
-extern time_t nb_start;
-
-extern std::vector<int> fd_reap;
-extern std::vector<std::string> module_names;
-
-extern int boundPortCount;
-extern int portCount;
-extern int UDPportCount;
-extern int ports[MAXSOCKS];
-extern int defaultRoute;
-
-extern std::vector<long> auth_cookies;
-extern std::stringstream config_f;
-
-extern serverrec* me[32];
-
-extern FILE *log_file;
-
-namespace nspace
-{
- template<> struct nspace::hash<in_addr>
- {
- size_t operator()(const struct in_addr &a) const
- {
- size_t q;
- memcpy(&q,&a,sizeof(size_t));
- return q;
- }
- };
-
- template<> struct nspace::hash<string>
- {
- size_t operator()(const string &s) const
- {
- char a[MAXBUF];
- static struct hash<const char *> strhash;
- strcpy(a,s.c_str());
- strlower(a);
- return strhash(a);
- }
- };
-}
-
-
-struct StrHashComp
-{
-
- bool operator()(const string& s1, const string& s2) const
- {
- char a[MAXBUF],b[MAXBUF];
- strcpy(a,s1.c_str());
- strcpy(b,s2.c_str());
- return (strcasecmp(a,b) == 0);
- }
-
-};
-
-struct InAddr_HashComp
-{
-
- bool operator()(const in_addr &s1, const in_addr &s2) const
- {
- size_t q;
- size_t p;
-
- memcpy(&q,&s1,sizeof(size_t));
- memcpy(&p,&s2,sizeof(size_t));
-
- return (q == p);
- }
-
-};
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
+extern ServerConfig* Config;
+extern user_hash clientlist;
+extern std::vector<userrec*> local_users;
+/* Version two, now with optimized expiry!
+ *
+ * Because the old way was horrendously slow, the new way of expiring xlines is very
+ * 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
+ * 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
+ * soonest is always pointed at by vector::begin(), so a simple while loop can
+ * very efficiently, very quickly and above all SAFELY pick off the first few
+ * items in the vector which need zapping.
+ *
+ * -- Brain
+ */
-typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
-typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
-typedef std::deque<command_t> command_table;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern user_hash whowas;
-extern command_table cmdlist;
-extern file_cache MOTD;
-extern file_cache RULES;
-extern address_cache IP;
+extern time_t TIME;
+/* Lists for temporary lines with an expiry time */
std::vector<KLine> klines;
std::vector<GLine> glines;
std::vector<ZLine> zlines;
std::vector<QLine> qlines;
+std::vector<ELine> elines;
+
+/* Seperate lists for perm XLines that isnt checked by expiry functions */
+
+std::vector<KLine> pklines;
+std::vector<GLine> pglines;
+std::vector<ZLine> pzlines;
+std::vector<QLine> pqlines;
+std::vector<ELine> pelines;
+
+
+bool GSortComparison ( const GLine one, const GLine two );
+bool ZSortComparison ( const ZLine one, const ZLine two );
+bool ESortComparison ( const ELine one, const ELine two );
+bool QSortComparison ( const QLine one, const QLine two );
+bool KSortComparison ( const KLine one, const KLine two );
// Reads the default bans from the config file.
// only a very small number of bans are defined
// this way these days, such as qlines against
// services nicks, etc.
-void read_xline_defaults()
+bool InitXLine(const char* tag)
{
- char ipmask[MAXBUF];
- char nick[MAXBUF];
- char host[MAXBUF];
- char reason[MAXBUF];
+ return true;
+}
- for (int i = 0; i < ConfValueEnum("badip",&config_f); i++)
- {
- ConfValue("badip","ipmask",i,ipmask,&config_f);
- ConfValue("badip","reason",i,reason,&config_f);
- add_zline(0,"<Config>",reason,ipmask);
- log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
- }
+bool DoneXLine(const char* tag)
+{
+ apply_lines(APPLY_ALL);
+ return true;
+}
+
+bool DoZLine(const char* tag, char** entries, void** values, int* types)
+{
+ char* reason = (char*)values[0];
+ char* ipmask = (char*)values[1];
+
+ add_zline(0,"<Config>",reason,ipmask);
+ log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
+ return true;
+}
+
+bool DoQLine(const char* tag, char** entries, void** values, int* types)
+{
+ char* reason = (char*)values[0];
+ char* nick = (char*)values[1];
+
+ add_qline(0,"<Config>",reason,nick);
+ log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
+ return true;
+}
+
+bool DoKLine(const char* tag, char** entries, void** values, int* types)
+{
+ char* reason = (char*)values[0];
+ char* host = (char*)values[1];
+
+ add_kline(0,"<Config>",reason,host);
+ log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
+ return true;
+}
+
+bool DoELine(const char* tag, char** entries, void** values, int* types)
+{
+ char* reason = (char*)values[0];
+ char* host = (char*)values[1];
+
+ add_eline(0,"<Config>",reason,host);
+ log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
+ return true;
+}
+
+// adds a g:line
+
+bool add_gline(long duration, const char* source,const char* reason,const char* hostmask)
+{
+ bool ret = del_gline(hostmask);
+
+ GLine item;
+ item.duration = duration;
+ strlcpy(item.hostmask,hostmask,199);
+ strlcpy(item.reason,reason,MAXBUF);
+ strlcpy(item.source,source,255);
+ item.n_matches = 0;
+ item.set_time = TIME;
- for (int i = 0; i < ConfValueEnum("badnick",&config_f); i++)
+ if (duration)
{
- ConfValue("badnick","nick",i,nick,&config_f);
- ConfValue("badnick","reason",i,reason,&config_f);
- add_qline(0,"<Config>",reason,nick);
- log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
+ glines.push_back(item);
+ sort(glines.begin(), glines.end(),GSortComparison);
}
-
- for (int i = 0; i < ConfValueEnum("badhost",&config_f); i++)
+ else
{
- ConfValue("badhost","host",i,host,&config_f);
- ConfValue("badhost","reason",i,reason,&config_f);
- add_kline(0,"<Config>",reason,host);
- log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
+ pglines.push_back(item);
}
+
+ return !ret;
}
-// adds a g:line
+// adds an e:line (exception to bans)
-void add_gline(long duration, char* source, char* reason, char* hostmask)
+bool add_eline(long duration, const char* source, const char* reason, const char* hostmask)
{
- del_gline(hostmask);
- GLine item;
+ bool ret = del_eline(hostmask);
+ ELine item;
item.duration = duration;
- strncpy(item.hostmask,hostmask,MAXBUF);
- strncpy(item.reason,reason,MAXBUF);
- strncpy(item.source,source,MAXBUF);
+ strlcpy(item.hostmask,hostmask,199);
+ strlcpy(item.reason,reason,MAXBUF);
+ strlcpy(item.source,source,255);
item.n_matches = 0;
- item.set_time = time(NULL);
- glines.push_back(item);
+ item.set_time = TIME;
+ if (duration)
+ {
+ elines.push_back(item);
+ sort(elines.begin(), elines.end(),ESortComparison);
+ }
+ else
+ {
+ pelines.push_back(item);
+ }
+ return !ret;
}
// adds a q:line
-void add_qline(long duration, char* source, char* reason, char* nickname)
+bool add_qline(long duration, const char* source, const char* reason, const char* nickname)
{
- del_qline(nickname);
+ bool ret = del_qline(nickname);
QLine item;
item.duration = duration;
- strncpy(item.nick,nickname,MAXBUF);
- strncpy(item.reason,reason,MAXBUF);
- strncpy(item.source,source,MAXBUF);
+ strlcpy(item.nick,nickname,63);
+ strlcpy(item.reason,reason,MAXBUF);
+ strlcpy(item.source,source,255);
item.n_matches = 0;
item.is_global = false;
- item.set_time = time(NULL);
- qlines.push_back(item);
+ item.set_time = TIME;
+ if (duration)
+ {
+ qlines.push_back(item);
+ sort(qlines.begin(), qlines.end(),QSortComparison);
+ }
+ else
+ {
+ pqlines.push_back(item);
+ }
+ return !ret;
}
// adds a z:line
-void add_zline(long duration, char* source, char* reason, char* ipaddr)
+bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
{
- del_zline(ipaddr);
+ bool ret = del_zline(ipaddr);
ZLine item;
item.duration = duration;
- strncpy(item.ipaddr,ipaddr,MAXBUF);
- strncpy(item.reason,reason,MAXBUF);
- strncpy(item.source,source,MAXBUF);
+ if (strchr(ipaddr,'@'))
+ {
+ while (*ipaddr != '@')
+ ipaddr++;
+ ipaddr++;
+ }
+ strlcpy(item.ipaddr,ipaddr,39);
+ strlcpy(item.reason,reason,MAXBUF);
+ strlcpy(item.source,source,255);
item.n_matches = 0;
item.is_global = false;
- item.set_time = time(NULL);
- zlines.push_back(item);
+ item.set_time = TIME;
+ if (duration)
+ {
+ zlines.push_back(item);
+ sort(zlines.begin(), zlines.end(),ZSortComparison);
+ }
+ else
+ {
+ pzlines.push_back(item);
+ }
+ return !ret;
}
// adds a k:line
-void add_kline(long duration, char* source, char* reason, char* hostmask)
+bool add_kline(long duration, const char* source, const char* reason, const char* hostmask)
{
- del_kline(hostmask);
+ bool ret = del_kline(hostmask);
KLine item;
item.duration = duration;
- strncpy(item.hostmask,hostmask,MAXBUF);
- strncpy(item.reason,reason,MAXBUF);
- strncpy(item.source,source,MAXBUF);
+ strlcpy(item.hostmask,hostmask,200);
+ strlcpy(item.reason,reason,MAXBUF);
+ strlcpy(item.source,source,255);
item.n_matches = 0;
- item.set_time = time(NULL);
- klines.push_back(item);
+ item.set_time = TIME;
+ if (duration)
+ {
+ klines.push_back(item);
+ sort(klines.begin(), klines.end(),KSortComparison);
+ }
+ else
+ {
+ pklines.push_back(item);
+ }
+ return !ret;
}
// 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++)
{
return true;
}
}
+ for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
+ {
+ if (!strcasecmp(hostmask,i->hostmask))
+ {
+ pglines.erase(i);
+ return true;
+ }
+ }
return false;
}
-// deletes a q:line, returns true if the line existed and was removed
+// deletes a e:line, returns true if the line existed and was removed
-bool del_qline(char* nickname)
+bool del_eline(const char* hostmask)
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
{
- if (!strcasecmp(nickname,i->nick))
+ if (!strcasecmp(hostmask,i->hostmask))
{
- qlines.erase(i);
+ elines.erase(i);
+ return true;
+ }
+ }
+ for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
+ {
+ if (!strcasecmp(hostmask,i->hostmask))
+ {
+ pelines.erase(i);
return true;
}
}
return false;
}
-bool qline_make_global(char* nickname)
+// deletes a q:line, returns true if the line existed and was removed
+
+bool del_qline(const char* nickname)
{
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
if (!strcasecmp(nickname,i->nick))
{
- i->is_global = true;
+ qlines.erase(i);
+ return true;
+ }
+ }
+ for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
+ {
+ if (!strcasecmp(nickname,i->nick))
+ {
+ pqlines.erase(i);
return true;
}
}
return false;
}
-bool zline_make_global(char* ipaddr)
+bool qline_make_global(const char* nickname)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
- if (!strcasecmp(ipaddr,i->ipaddr))
+ if (!strcasecmp(nickname,i->nick))
{
i->is_global = true;
return true;
return false;
}
-void sync_xlines(serverrec* serv, char* tcp_host)
+bool zline_make_global(const char* ipaddr)
{
- char data[MAXBUF];
-
- // for zlines and qlines, we should first check if theyre global...
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
- if (i->is_global)
- {
- snprintf(data,MAXBUF,"} %s %s %ld %ld :%s",i->ipaddr,i->source,i->set_time,i->duration,i->reason);
- serv->SendPacket(data,tcp_host);
- }
- }
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
- if (i->is_global)
+ if (!strcasecmp(ipaddr,i->ipaddr))
{
- snprintf(data,MAXBUF,"{ %s %s %ld %ld :%s",i->nick,i->source,i->set_time,i->duration,i->reason);
- serv->SendPacket(data,tcp_host);
+ i->is_global = true;
+ return true;
}
}
- // 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);
- serv->SendPacket(data,tcp_host);
- }
+ return false;
}
-
// 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++)
{
return true;
}
}
+ for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
+ {
+ if (!strcasecmp(ipaddr,i->ipaddr))
+ {
+ pzlines.erase(i);
+ return true;
+ }
+ }
return false;
}
// 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++)
{
return true;
}
}
+ for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
+ {
+ if (!strcasecmp(hostmask,i->hostmask))
+ {
+ pklines.erase(i);
+ return true;
+ }
+ }
return false;
}
char* matches_qline(const char* nick)
{
+ if ((qlines.empty()) && (pqlines.empty()))
+ return NULL;
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- {
if (match(nick,i->nick))
- {
return i->reason;
- }
- }
+ for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
+ if (match(nick,i->nick))
+ return i->reason;
return NULL;
}
char* matches_gline(const char* host)
{
+ if ((glines.empty()) && (pglines.empty()))
+ return NULL;
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- {
if (match(host,i->hostmask))
- {
return i->reason;
- }
- }
+ for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
+ if (match(host,i->hostmask))
+ return i->reason;
+ return NULL;
+}
+
+char* matches_exception(const char* host)
+{
+ if ((elines.empty()) && (pelines.empty()))
+ return NULL;
+ char host2[MAXBUF];
+ snprintf(host2,MAXBUF,"*@%s",host);
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ if ((match(host,i->hostmask)) || (match(host2,i->hostmask)))
+ return i->reason;
+ for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
+ if ((match(host,i->hostmask)) || (match(host2,i->hostmask)))
+ return i->reason;
return NULL;
}
+
void gline_set_creation_time(char* host, time_t create_time)
{
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
return;
}
}
+ for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
+ {
+ if (!strcasecmp(host,i->hostmask))
+ {
+ i->set_time = create_time;
+ return;
+ }
+ }
return ;
}
+void eline_set_creation_time(char* host, time_t create_time)
+{
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ if (!strcasecmp(host,i->hostmask))
+ {
+ i->set_time = create_time;
+ return;
+ }
+ }
+ for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
+ {
+ if (!strcasecmp(host,i->hostmask))
+ {
+ i->set_time = create_time;
+ return;
+ }
+ }
+ return;
+}
+
void qline_set_creation_time(char* nick, time_t create_time)
{
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
return;
}
}
- return ;
+ for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
+ {
+ if (!strcasecmp(nick,i->nick))
+ {
+ i->set_time = create_time;
+ return;
+ }
+ }
+ return;
}
void zline_set_creation_time(char* ip, time_t create_time)
return;
}
}
- return ;
+ for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
+ {
+ if (!strcasecmp(ip,i->ipaddr))
+ {
+ i->set_time = create_time;
+ return;
+ }
+ }
+ return;
}
// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
char* matches_zline(const char* ipaddr)
{
+ if ((zlines.empty()) && (pzlines.empty()))
+ return NULL;
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- {
if (match(ipaddr,i->ipaddr))
- {
return i->reason;
- }
- }
+ for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
+ if (match(ipaddr,i->ipaddr))
+ return i->reason;
return NULL;
}
char* matches_kline(const char* host)
{
+ if ((klines.empty()) && (pklines.empty()))
+ return NULL;
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
- {
if (match(host,i->hostmask))
- {
return i->reason;
- }
- }
+ for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
+ if (match(host,i->hostmask))
+ return i->reason;
return NULL;
}
+bool GSortComparison ( const GLine one, const GLine two )
+{
+ return (one.duration + one.set_time) < (two.duration + two.set_time);
+}
+
+bool ESortComparison ( const ELine one, const ELine two )
+{
+ return (one.duration + one.set_time) < (two.duration + two.set_time);
+}
+
+bool ZSortComparison ( const ZLine one, const ZLine two )
+{
+ return (one.duration + one.set_time) < (two.duration + two.set_time);
+}
+
+bool KSortComparison ( const KLine one, const KLine two )
+{
+ return (one.duration + one.set_time) < (two.duration + two.set_time);
+}
+
+bool QSortComparison ( const QLine one, const QLine two )
+{
+ return (one.duration + one.set_time) < (two.duration + two.set_time);
+}
+
// removes lines that have expired
void expire_lines()
{
- bool go_again = true;
- time_t current = time(NULL);
-
- // 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.
- while (go_again)
+ time_t current = TIME;
+
+ /* Because we now store all our XLines in sorted order using (i->duration + i->set_time) as a key, this
+ * means that to expire the XLines we just need to do a while, picking off the top few until there are
+ * none left at the head of the queue that are after the current time.
+ */
+
+ while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time)))
{
- go_again = false;
+ std::vector<GLine>::iterator i = glines.begin();
+ WriteOpers("*** Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+ glines.erase(i);
+ }
+
+ while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time)))
+ {
+ std::vector<ELine>::iterator i = elines.begin();
+ WriteOpers("*** Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+ elines.erase(i);
+ }
+
+ while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time)))
+ {
+ std::vector<ZLine>::iterator i = zlines.begin();
+ WriteOpers("*** Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
+ zlines.erase(i);
+ }
+
+ while ((klines.size()) && (current > (klines.begin()->duration + klines.begin()->set_time)))
+ {
+ std::vector<KLine>::iterator i = klines.begin();
+ WriteOpers("*** Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+ klines.erase(i);
+ }
+
+ while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time)))
+ {
+ std::vector<QLine>::iterator i = qlines.begin();
+ WriteOpers("*** Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
+ qlines.erase(i);
+ }
+
+}
+
+// applies lines, removing clients and changing nicks etc as applicable
+
+void apply_lines(const int What)
+{
+ char reason[MAXBUF];
+ char host[MAXBUF];
+
+ if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
+ (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
+ return;
- for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
+ CullList* Goners = new CullList();
+ char* check = NULL;
+ for (std::vector<userrec*>::const_iterator u2 = local_users.begin(); u2 != local_users.end(); u2++)
+ {
+ userrec* u = (userrec*)(*u2);
+ u->MakeHost(host);
+ if (elines.size() || pelines.size())
{
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
- {
- WriteOpers("Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
- klines.erase(i);
- go_again = true;
- break;
- }
+ // ignore people matching exempts
+ if (matches_exception(host))
+ continue;
}
-
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
+ if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
{
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
+ if ((check = matches_gline(host)))
{
- WriteOpers("Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
- glines.erase(i);
- go_again = true;
- break;
+ snprintf(reason,MAXBUF,"G-Lined: %s",check);
+ Goners->AddItem(u,reason);
}
}
-
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
{
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
+ if ((check = matches_kline(host)))
{
- WriteOpers("Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
- zlines.erase(i);
- go_again = true;
- break;
+ snprintf(reason,MAXBUF,"K-Lined: %s",check);
+ Goners->AddItem(u,reason);
}
}
-
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
{
- if ((current > (i->duration + i->set_time)) && (i->duration > 0))
+ if ((check = matches_qline(u->nick)))
{
- WriteOpers("Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
- qlines.erase(i);
- go_again = true;
- break;
+ snprintf(reason,MAXBUF,"Q-Lined: %s",check);
+ Goners->AddItem(u,reason);
}
}
- }
-}
-
-// applies lines, removing clients and changing nicks etc as applicable
-
-void apply_lines()
-{
- bool go_again = true;
- char reason[MAXBUF];
- char host[MAXBUF];
-
- if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()))
- return;
-
- while (go_again)
- {
- go_again = false;
- for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
{
- if (!strcasecmp(u->second->server,ServerName))
+ if ((check = matches_zline((char*)inet_ntoa(u->ip4))))
{
- snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host);
- if (glines.size())
- {
- char* check = matches_gline(host);
- if (check)
- {
- WriteOpers("*** User %s matches G-Line: %s",u->second->nick,check);
- snprintf(reason,MAXBUF,"G-Lined: %s",check);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
- if (klines.size())
- {
- char* check = matches_kline(host);
- if (check)
- {
- WriteOpers("*** User %s matches K-Line: %s",u->second->nick,check);
- snprintf(reason,MAXBUF,"K-Lined: %s",check);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
- if (qlines.size())
- {
- char* check = matches_qline(u->second->nick);
- 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);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
- if (zlines.size())
- {
- char* check = matches_zline(u->second->ip);
- if (check)
- {
- snprintf(reason,MAXBUF,"Z-Lined: %s",check);
- WriteOpers("*** User %s matches Z-Line: %s",u->second->nick,u->second->host,check);
- kill_link(u->second,reason);
- go_again = true;
- break;
- }
- }
+ snprintf(reason,MAXBUF,"Z-Lined: %s",check);
+ Goners->AddItem(u,reason);
}
}
}
+
+ Goners->Apply();
+ delete Goners;
}
void stats_k(userrec* user)
{
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);
- }
+ WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,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);
}
void stats_g(userrec* user)
{
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);
- }
+ WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,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);
}
void stats_q(userrec* user)
{
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);
- }
+ WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,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);
}
void stats_z(userrec* user)
{
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);
- }
+ WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,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);
}
-
-
+void stats_e(userrec* user)
+{
+ 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);
+ 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);
+}
projects / user / henk / code / inspircd.git / blobdiff