* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
-#include "inspircd_util.h"
#include <unistd.h>
#include <fcntl.h>
#include <sys/errno.h>
#include "inspstring.h"
#include "helperfuncs.h"
#include "hashcomp.h"
+#include "typedefs.h"
+#include "cull_list.h"
+
+extern ServerConfig *Config;
extern int MODCOUNT;
extern std::vector<Module*> modules;
extern std::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<std::string> module_names;
-
-extern int boundPortCount;
-extern int portCount;
-
-extern int ports[MAXSOCKS];
-
-extern std::stringstream config_f;
-
-extern FILE *log_file;
-
-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 ServerConfig* Config;
extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern command_table cmdlist;
-extern file_cache MOTD;
-extern file_cache RULES;
-extern address_cache IP;
/* 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 permenant
- * items, and the other list holds temporary items (ones which will expire).
+ * (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
char host[MAXBUF];
char reason[MAXBUF];
- for (int i = 0; i < ConfValueEnum("badip",&config_f); i++)
+ for (int i = 0; i < Config->ConfValueEnum("badip",&Config->config_f); i++)
{
- ConfValue("badip","ipmask",i,ipmask,&config_f);
- ConfValue("badip","reason",i,reason,&config_f);
+ Config->ConfValue("badip","ipmask",i,ipmask,&Config->config_f);
+ Config->ConfValue("badip","reason",i,reason,&Config->config_f);
add_zline(0,"<Config>",reason,ipmask);
log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
}
- for (int i = 0; i < ConfValueEnum("badnick",&config_f); i++)
+ for (int i = 0; i < Config->ConfValueEnum("badnick",&Config->config_f); i++)
{
- ConfValue("badnick","nick",i,nick,&config_f);
- ConfValue("badnick","reason",i,reason,&config_f);
+ Config->ConfValue("badnick","nick",i,nick,&Config->config_f);
+ Config->ConfValue("badnick","reason",i,reason,&Config->config_f);
add_qline(0,"<Config>",reason,nick);
log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
}
- for (int i = 0; i < ConfValueEnum("badhost",&config_f); i++)
+ for (int i = 0; i < Config->ConfValueEnum("badhost",&Config->config_f); i++)
{
- ConfValue("badhost","host",i,host,&config_f);
- ConfValue("badhost","reason",i,reason,&config_f);
+ Config->ConfValue("badhost","host",i,host,&Config->config_f);
+ Config->ConfValue("badhost","reason",i,reason,&Config->config_f);
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++)
+ for (int i = 0; i < Config->ConfValueEnum("exception",&Config->config_f); i++)
{
- ConfValue("exception","host",i,host,&config_f);
- ConfValue("exception","reason",i,reason,&config_f);
+ Config->ConfValue("exception","host",i,host,&Config->config_f);
+ Config->ConfValue("exception","reason",i,reason,&Config->config_f);
add_eline(0,"<Config>",reason,host);
log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
}
char* matches_qline(const char* nick)
{
- if (qlines.empty())
+ if ((qlines.empty()) && (pqlines.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())
+ if ((glines.empty()) && (pglines.empty()))
return NULL;
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
if (match(host,i->hostmask))
char* matches_exception(const char* host)
{
- if (elines.empty())
+ if ((elines.empty()) && (pelines.empty()))
return NULL;
char host2[MAXBUF];
snprintf(host2,MAXBUF,"*@%s",host);
char* matches_zline(const char* ipaddr)
{
- if (zlines.empty())
+ if ((zlines.empty()) && (pzlines.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())
+ if ((klines.empty()) && (pklines.empty()))
return NULL;
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
if (match(host,i->hostmask))
// applies lines, removing clients and changing nicks etc as applicable
-void apply_lines()
+void apply_lines(const int What)
{
- bool go_again = true;
char reason[MAXBUF];
char host[MAXBUF];
- if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()))
+ if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
+ (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
return;
+
+ CullList* Goners = new CullList();
- while (go_again)
+ for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
{
- go_again = false;
- for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++)
+ if (u->second->fd > -1)
{
- if (!strcasecmp(u->second->server,ServerName))
+ snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host);
+ if (elines.size())
{
- snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host);
- if (elines.size())
- {
- // ignore people matching exempts
- if (matches_exception(host))
- continue;
- }
- if (glines.size() || pglines.size())
+ // ignore people matching exempts
+ if (matches_exception(host))
+ continue;
+ }
+ if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
+ {
+ char* check = matches_gline(host);
+ if (check)
{
- 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;
- }
+ snprintf(reason,MAXBUF,"G-Lined: %s",check);
+ Goners->AddItem(u->second,reason);
}
- if (klines.size() || pklines.size())
+ }
+ if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
+ {
+ char* check = matches_kline(host);
+ if (check)
{
- 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;
- }
+ snprintf(reason,MAXBUF,"K-Lined: %s",check);
+ Goners->AddItem(u->second,reason);
}
- if (qlines.size() || pqlines.size())
+ }
+ if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
+ {
+ char* check = matches_qline(u->second->nick);
+ if (check)
{
- 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;
- }
+ snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check);
+ Goners->AddItem(u->second,reason);
}
- if (zlines.size() || pzlines.size())
+ }
+ if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
+ {
+ char* check = matches_zline(u->second->ip);
+ if (check)
{
- 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;
- }
+ snprintf(reason,MAXBUF,"Z-Lined: %s",check);
+ Goners->AddItem(u->second,reason);
}
}
}
}
+
+ Goners->Apply();
+ delete Goners;
}
void stats_k(userrec* user)
projects / user / henk / code / inspircd.git / blobdiff