+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
+
+#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
#include "inspircd_util.h"
-#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 <string>
#ifdef GCC3
#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"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
-
-using namespace std;
+#include "inspstring.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
extern int MODCOUNT;
-extern vector<Module*> modules;
-extern vector<ircd_module*> factory;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
extern int LogLevel;
extern char ServerName[MAXBUF];
extern int NetBufferSize;
extern time_t nb_start;
-extern std::vector<int> fd_reap;
extern std::vector<std::string> module_names;
-extern char bannerBuffer[MAXBUF];
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);
- }
-
-};
-
-
-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 nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
+typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
+typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
+typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
typedef std::deque<command_t> command_table;
extern user_hash clientlist;
extern chan_hash chanlist;
-extern user_hash whowas;
+extern whowas_hash whowas;
extern command_table cmdlist;
extern file_cache MOTD;
extern file_cache RULES;
extern address_cache IP;
+extern time_t TIME;
std::vector<KLine> klines;
std::vector<GLine> glines;
std::vector<ZLine> zlines;
std::vector<QLine> qlines;
+std::vector<ELine> elines;
// Reads the default bans from the config file.
// only a very small number of bans are defined
add_kline(0,"<Config>",reason,host);
log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
}
+ for (int i = 0; i < ConfValueEnum("exception",&config_f); i++)
+ {
+ ConfValue("exception","host",i,host,&config_f);
+ ConfValue("exception","reason",i,reason,&config_f);
+ add_eline(0,"<Config>",reason,host);
+ log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
+ }
}
// adds a g:line
-void add_gline(long duration, char* source, char* reason, char* hostmask)
+void add_gline(long duration, const char* source,const char* reason,const char* hostmask)
{
del_gline(hostmask);
GLine item;
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);
+ item.set_time = TIME;
glines.push_back(item);
}
+// adds an e:line (exception to bans)
+
+void add_eline(long duration, const char* source, const char* reason, const char* hostmask)
+{
+ del_eline(hostmask);
+ ELine 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;
+ elines.push_back(item);
+}
+
// adds a q:line
-void add_qline(long duration, char* source, char* reason, char* nickname)
+void add_qline(long duration, const char* source, const char* reason, const char* nickname)
{
del_qline(nickname);
QLine item;
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.set_time = time(NULL);
+ item.is_global = false;
+ item.set_time = TIME;
qlines.push_back(item);
}
// adds a z:line
-void add_zline(long duration, char* source, char* reason, char* ipaddr)
+void add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
{
del_zline(ipaddr);
ZLine item;
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.set_time = time(NULL);
+ item.is_global = false;
+ item.set_time = TIME;
zlines.push_back(item);
}
// adds a k:line
-void add_kline(long duration, char* source, char* reason, char* hostmask)
+void add_kline(long duration, const char* source, const char* reason, const char* hostmask)
{
del_kline(hostmask);
KLine item;
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);
+ item.set_time = TIME;
klines.push_back(item);
}
// 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 false;
}
+// deletes a e:line, returns true if the line existed and was removed
+
+bool del_eline(const char* hostmask)
+{
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ if (!strcasecmp(hostmask,i->hostmask))
+ {
+ elines.erase(i);
+ return true;
+ }
+ }
+ return false;
+}
+
// deletes a q:line, returns true if the line existed and was removed
-bool del_qline(char* nickname)
+bool del_qline(const char* nickname)
{
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
return false;
}
+bool qline_make_global(const char* nickname)
+{
+ for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ {
+ if (!strcasecmp(nickname,i->nick))
+ {
+ i->is_global = true;
+ return true;
+ }
+ }
+ return false;
+}
+
+bool zline_make_global(const char* ipaddr)
+{
+ for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ {
+ if (!strcasecmp(ipaddr,i->ipaddr))
+ {
+ i->is_global = true;
+ return true;
+ }
+ }
+ 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++)
{
// 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++)
{
char* matches_qline(const char* nick)
{
+ if (qlines.empty())
+ return NULL;
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
if (match(nick,i->nick))
char* matches_gline(const char* host)
{
+ if (glines.empty())
+ return NULL;
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
if (match(host,i->hostmask))
return NULL;
}
+char* matches_exception(const char* host)
+{
+ if (elines.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;
+ }
+ }
+ 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++)
char* matches_zline(const char* ipaddr)
{
+ if (zlines.empty())
+ return NULL;
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
if (match(ipaddr,i->ipaddr))
char* matches_kline(const char* host)
{
+ if (klines.empty())
+ return NULL;
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
{
if (match(host,i->hostmask))
void expire_lines()
{
bool go_again = true;
- time_t current = time(NULL);
+ time_t current = TIME;
// 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.
+ //
+ // 30/11/2005-- I can imagine that if we get a large number of *lines, this would perform dog slow.
+ // While we try and think of a better solution, for now I've simply split the loops up, instead of
+ // one huge while () -- this means if we remove a g-line, we only need to re-check glines, not z/g/.
+ // lines too, hopefully a little faster, even if it looks a little messier ;) --w00t
+
while (go_again)
{
go_again = false;
break;
}
}
+ }
+
+ go_again = true;
+
+ while (go_again)
+ {
+ go_again = false;
+
+ for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ if ((current > (i->duration + i->set_time)) && (i->duration > 0))
+ {
+ WriteOpers("Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+ elines.erase(i);
+ go_again = true;
+ break;
+ }
+ }
+ }
+
+ go_again = true;
+
+ while (go_again)
+ {
+ go_again = false;
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
break;
}
}
+ }
+
+ go_again = true;
+
+ while (go_again)
+ {
+ go_again = false;
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
break;
}
}
+ }
+
+ go_again = true;
+
+
+ while (go_again)
+ {
+ go_again = false;
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
char reason[MAXBUF];
char host[MAXBUF];
+ if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()))
+ return;
+
while (go_again)
{
go_again = false;
if (!strcasecmp(u->second->server,ServerName))
{
snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host);
- char* check = matches_gline(host);
- if (check)
+ if (elines.size())
{
- 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;
+ // ignore people matching exempts
+ if (matches_exception(host))
+ continue;
}
- }
- }
-
- for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (!strcasecmp(u->second->server,ServerName))
- {
- snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host);
- char* check = matches_kline(host);
- if (check)
+ if (glines.size())
{
- 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;
+ char* check = matches_gline(host);
+ if (check)
+ {
+ WriteOpers("*** User %s matches G-Line: %s",u->second->registered == 7 ? u->second->nick:"<unknown>",check);
+ snprintf(reason,MAXBUF,"G-Lined: %s",check);
+ kill_link(u->second,reason);
+ go_again = true;
+ break;
+ }
}
- }
- }
-
- for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (!strcasecmp(u->second->server,ServerName))
- {
- char* check = matches_qline(u->second->nick);
- if (check)
+ if (klines.size())
{
- snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check);
- WriteOpers("*** Q-Lined nickname %s from %s: %s",u->second->nick,u->second->host,check);
- WriteServ(u->second->fd,"432 %s %s :Invalid nickname: %s",u->second->nick,u->second->nick,check);
- kill_link(u->second,reason);
- go_again = true;
- break;
+ char* check = matches_kline(host);
+ if (check)
+ {
+ WriteOpers("*** User %s matches K-Line: %s",u->second->registered == 7 ? u->second->nick:"<unknown>",check);
+ snprintf(reason,MAXBUF,"K-Lined: %s",check);
+ kill_link(u->second,reason);
+ go_again = true;
+ break;
+ }
}
- }
- }
-
- for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (!strcasecmp(u->second->server,ServerName))
- {
- char* check = matches_zline(u->second->ip);
- if (check)
+ 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->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
+ kill_link(u->second,reason);
+ go_again = true;
+ break;
+ }
+ }
+ if (zlines.size())
{
- WriteOpers("*** User %s matches Z-Line: %s",u->second->nick,u->second->host,check);
- WriteServ(u->second->fd,"432 %s %s :Invalid nickname: %s",u->second->nick,u->second->nick,check);
- go_again = true;
- break;
+ 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->registered == 7 ? u->second->nick:"<unknown>",u->second->host,check);
+ kill_link(u->second,reason);
+ go_again = true;
+ break;
+ }
}
}
}
-
}
}
}
}
-
-
+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);
+ }
+}
projects / user / henk / code / inspircd.git / blobdiff