ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf.c

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 1645 by michael, Wed Nov 7 12:25:02 2012 UTC vs.
Revision 4343 by michael, Sat Aug 2 16:58:33 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
28	–	#include "balloc.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "server.h"
32		#include "resv.h"
33		#include "channel.h"
34		#include "client.h"
35		#include "event.h"
35	–	#include "hook.h"
36		#include "irc_string.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
#	Line 43 | Line 43
43		#include "fdlist.h"
44		#include "log.h"
45		#include "send.h"
46	–	#include "s_gline.h"
46		#include "memory.h"
47	<	#include "irc_res.h"
47	>	#include "res.h"
48		#include "userhost.h"
49	<	#include "s_user.h"
49	>	#include "user.h"
50		#include "channel_mode.h"
51		#include "parse.h"
52	<	#include "s_misc.h"
52	>	#include "misc.h"
53		#include "conf_db.h"
54		#include "conf_class.h"
55	+	#include "motd.h"
56	+	#include "ipcache.h"
57
57	–	struct config_server_hide ConfigServerHide;
58
59		/* general conf items link list root, other than k lines etc. */
60		dlink_list service_items = { NULL, NULL, 0 };
#	Line 63 | Line 63 | dlink_list cluster_items = { NULL, NULL,
63		dlink_list oconf_items   = { NULL, NULL, 0 };
64		dlink_list uconf_items   = { NULL, NULL, 0 };
65		dlink_list xconf_items   = { NULL, NULL, 0 };
66	–	dlink_list rxconf_items  = { NULL, NULL, 0 };
67	–	dlink_list rkconf_items  = { NULL, NULL, 0 };
66		dlink_list nresv_items   = { NULL, NULL, 0 };
67	<	dlink_list temporary_resv = { NULL, NULL, 0 };
67	>	dlink_list cresv_items   = { NULL, NULL, 0 };
68
69		extern unsigned int lineno;
70		extern char linebuf[];
71		extern char conffilebuf[IRCD_BUFSIZE];
72		extern int yyparse(); /* defined in y.tab.c */
73
76	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
77	–
74		/* internally defined functions */
75		static void read_conf(FILE *);
76		static void clear_out_old_conf(void);
77		static void expire_tklines(dlink_list *);
82	–	static void garbage_collect_ip_entries(void);
83	–	static int hash_ip(struct irc_ssaddr *);
78		static int verify_access(struct Client *);
79		static int attach_iline(struct Client *, struct MaskItem *);
86	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
80		static dlink_list *map_to_list(enum maskitem_type);
88	–	static struct MaskItem *find_regexp_kline(const char *[]);
81		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
82
83
92	–	/* usually, with hash tables, you use a prime number...
93	–	* but in this case I am dealing with ip addresses,
94	–	* not ascii strings.
95	–	*/
96	–	#define IP_HASH_SIZE 0x1000
97	–
98	–	struct ip_entry
99	–	{
100	–	struct irc_ssaddr ip;
101	–	unsigned int count;
102	–	time_t last_attempt;
103	–	struct ip_entry *next;
104	–	};
105	–
106	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
107	–	static BlockHeap *ip_entry_heap = NULL;
108	–	static int ip_entries_count = 0;
109	–
110	–
84		/* conf_dns_callback()
85		*
86		* inputs       - pointer to struct MaskItem
#	Line 125 | Line 98 | conf_dns_callback(void *vptr, const stru
98
99		conf->dns_pending = 0;
100
101	<	if (addr != NULL)
101	>	if (addr)
102		memcpy(&conf->addr, addr, sizeof(conf->addr));
103		else
104		conf->dns_failed = 1;
#	Line 150 | Line 123 | conf_dns_lookup(struct MaskItem *conf)
123		struct MaskItem *
124		conf_make(enum maskitem_type type)
125		{
126	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
126	>	struct MaskItem *conf = MyCalloc(sizeof(*conf));
127		dlink_list *list = NULL;
128
129		conf->type   = type;
#	Line 176 | Line 149 | conf_free(struct MaskItem *conf)
149
150		if (conf->dns_pending)
151		delete_resolver_queries(conf);
152	<	if (conf->passwd != NULL)
152	>	if (conf->passwd)
153		memset(conf->passwd, 0, strlen(conf->passwd));
154	<	if (conf->spasswd != NULL)
154	>	if (conf->spasswd)
155		memset(conf->spasswd, 0, strlen(conf->spasswd));
156
157		conf->class = NULL;
#	Line 186 | Line 159 | conf_free(struct MaskItem *conf)
159		MyFree(conf->passwd);
160		MyFree(conf->spasswd);
161		MyFree(conf->reason);
162	+	MyFree(conf->certfp);
163		MyFree(conf->user);
164		MyFree(conf->host);
191	–	MyFree(conf->regexuser);
192	–	MyFree(conf->regexhost);
165		#ifdef HAVE_LIBCRYPTO
166		MyFree(conf->cipher_list);
167
168		if (conf->rsa_public_key)
169		RSA_free(conf->rsa_public_key);
198	–
199	–	MyFree(conf->rsa_public_key_file);
170		#endif
171		DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
172		{
173		MyFree(ptr->data);
174	+	dlinkDelete(ptr, &conf->hub_list);
175		free_dlink_node(ptr);
176		}
177
178		DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
179		{
180		MyFree(ptr->data);
181	+	dlinkDelete(ptr, &conf->leaf_list);
182		free_dlink_node(ptr);
183		}
184
185	<	MyFree(conf);
214	<	}
215	<
216	<	static const struct shared_flags
217	<	{
218	<	const unsigned int type;
219	<	const unsigned char letter;
220	<	} flag_table[] = {
221	<	{ SHARED_KLINE,   'K' },
222	<	{ SHARED_UNKLINE, 'U' },
223	<	{ SHARED_XLINE,   'X' },
224	<	{ SHARED_UNXLINE, 'Y' },
225	<	{ SHARED_RESV,    'Q' },
226	<	{ SHARED_UNRESV,  'R' },
227	<	{ SHARED_LOCOPS,  'L' },
228	<	{ SHARED_DLINE,   'D' },
229	<	{ SHARED_UNDLINE, 'E' },
230	<	{ 0, '\0' }
231	<	};
232	<
233	<	/*
234	<	* inputs       - pointer to client requesting confitem report
235	<	*              - ConfType to report
236	<	* output       - none
237	<	* side effects -
238	<	*/
239	<	void
240	<	report_confitem_types(struct Client *source_p, enum maskitem_type type)
241	<	{
242	<	dlink_node *ptr = NULL, *dptr = NULL;
243	<	struct MaskItem *conf = NULL;
244	<	const struct ClassItem *class = NULL;
245	<	const struct shared_flags *shared = NULL;
246	<	char buf[12];
247	<	char *p = NULL;
248	<
249	<	switch (type)
185	>	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
186		{
187	<	case CONF_XLINE:
252	<	DLINK_FOREACH(ptr, xconf_items.head)
253	<	{
254	<	conf = ptr->data;
255	<
256	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
257	<	me.name, source_p->name,
258	<	conf->hold ? "x": "X", conf->count,
259	<	conf->name, conf->reason);
260	<	}
261	<	break;
262	<
263	<	#ifdef HAVE_LIBPCRE
264	<	case CONF_RXLINE:
265	<	DLINK_FOREACH(ptr, rxconf_items.head)
266	<	{
267	<	conf = ptr->data;
268	<
269	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
270	<	me.name, source_p->name,
271	<	"XR", conf->count,
272	<	conf->name, conf->reason);
273	<	}
274	<	break;
275	<
276	<	case CONF_RKLINE:
277	<	DLINK_FOREACH(ptr, rkconf_items.head)
278	<	{
279	<	conf = ptr->data;
280	<
281	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
282	<	source_p->name, "KR", conf->host, conf->user,
283	<	conf->reason);
284	<	}
285	<	break;
286	<	#endif
287	<
288	<	case CONF_ULINE:
289	<	shared = flag_table;
290	<	DLINK_FOREACH(ptr, uconf_items.head)
291	<	{
292	<	conf = ptr->data;
187	>	struct exempt *exptr = ptr->data;
188
189	<	p = buf;
190	<
191	<	*p++ = 'c';
192	<	for (; shared->type; ++shared)
193	<	if (shared->type & conf->flags)
299	<	*p++ = shared->letter;
300	<	else
301	<	*p++ = ToLower(shared->letter);
302	<
303	<	sendto_one(source_p, form_str(RPL_STATSULINE),
304	<	me.name, source_p->name, conf->name,
305	<	conf->user?conf->user: "*",
306	<	conf->host?conf->host: "*", buf);
307	<	}
308	<
309	<	shared = flag_table;
310	<	DLINK_FOREACH(ptr, cluster_items.head)
311	<	{
312	<	conf = ptr->data;
313	<
314	<	p = buf;
315	<
316	<	*p++ = 'C';
317	<	for (; shared->type; ++shared)
318	<	if (shared->type & conf->flags)
319	<	*p++ = shared->letter;
320	<	else
321	<	*p++ = ToLower(shared->letter);
322	<
323	<	sendto_one(source_p, form_str(RPL_STATSULINE),
324	<	me.name, source_p->name, conf->name,
325	<	"*", "*", buf);
326	<	}
327	<
328	<	break;
329	<
330	<	case CONF_OPER:
331	<	DLINK_FOREACH(ptr, oconf_items.head)
332	<	{
333	<	conf = ptr->data;
334	<
335	<	/* Don't allow non opers to see oper privs */
336	<	if (HasUMode(source_p, UMODE_OPER))
337	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
338	<	me.name, source_p->name, 'O', conf->user, conf->host,
339	<	conf->name, oper_privs_as_string(conf->port),
340	<	conf->class ? conf->class->name : "<default>");
341	<	else
342	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
343	<	me.name, source_p->name, 'O', conf->user, conf->host,
344	<	conf->name, "0",
345	<	conf->class ? conf->class->name : "<default>");
346	<	}
347	<	break;
348	<
349	<	case CONF_CLASS:
350	<	DLINK_FOREACH(ptr, class_get_list()->head)
351	<	{
352	<	class = ptr->data;
353	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
354	<	me.name, source_p->name, 'Y',
355	<	class->name, class->ping_freq,
356	<	class->con_freq,
357	<	class->max_total, class->max_sendq,
358	<	class->max_recvq,
359	<	class->ref_count,
360	<	class->number_per_cidr, class->cidr_bitlen_ipv4,
361	<	class->number_per_cidr, class->cidr_bitlen_ipv6,
362	<	class->active ? "active" : "disabled");
363	<	}
364	<	break;
365	<
366	<	case CONF_SERVICE:
367	<	DLINK_FOREACH(ptr, service_items.head)
368	<	{
369	<	conf = ptr->data;
370	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
371	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
372	<	}
373	<	break;
374	<
375	<	case CONF_SERVER:
376	<	DLINK_FOREACH(ptr, server_items.head)
377	<	{
378	<	p = buf;
379	<	conf = ptr->data;
380	<
381	<	buf[0] = '\0';
382	<
383	<	if (IsConfAllowAutoConn(conf))
384	<	*p++ = 'A';
385	<	if (IsConfSSL(conf))
386	<	*p++ = 'S';
387	<	if (buf[0] == '\0')
388	<	*p++ = '*';
389	<
390	<	*p = '\0';
391	<
392	<	/*
393	<	* Allow admins to see actual ips unless hide_server_ips is enabled
394	<	*/
395	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
396	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
397	<	me.name, source_p->name, 'C', conf->host,
398	<	buf, conf->name, conf->port,
399	<	conf->class ? conf->class->name : "<default>");
400	<	else
401	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
402	<	me.name, source_p->name, 'C',
403	<	"*@127.0.0.1", buf, conf->name, conf->port,
404	<	conf->class ? conf->class->name : "<default>");
405	<	}
406	<	break;
407	<
408	<	case CONF_HUB:
409	<	DLINK_FOREACH(ptr, server_items.head)
410	<	{
411	<	conf = ptr->data;
412	<
413	<	DLINK_FOREACH(dptr, conf->hub_list.head)
414	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
415	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
416	<	}
417	<
418	<	DLINK_FOREACH(ptr, server_items.head)
419	<	{
420	<	conf = ptr->data;
421	<
422	<	DLINK_FOREACH(dptr, conf->leaf_list.head)
423	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
424	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
425	<	}
426	<
427	<	break;
428	<
429	<	default:
430	<	break;
189	>	dlinkDelete(ptr, &conf->exempt_list);
190	>	MyFree(exptr->name);
191	>	MyFree(exptr->user);
192	>	MyFree(exptr->host);
193	>	MyFree(exptr);
194		}
195	+
196	+	MyFree(conf);
197		}
198
199		/* check_client()
#	Line 448 | Line 213 | int
213		check_client(struct Client *source_p)
214		{
215		int i;
216	<
216	>
217		if ((i = verify_access(source_p)))
218	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
218	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
219		source_p->name, source_p->sockhost);
220
221		switch (i)
#	Line 458 | Line 223 | check_client(struct Client *source_p)
223		case TOO_MANY:
224		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
225		"Too many on IP for %s (%s).",
226	<	get_client_name(source_p, SHOW_IP),
227	<	source_p->sockhost);
226	>	get_client_name(source_p, SHOW_IP),
227	>	source_p->sockhost);
228		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
229	<	get_client_name(source_p, SHOW_IP));
229	>	get_client_name(source_p, SHOW_IP));
230		++ServerStats.is_ref;
231	<	exit_client(source_p, &me, "No more connections allowed on that IP");
231	>	exit_client(source_p, "No more connections allowed on that IP");
232		break;
233
234		case I_LINE_FULL:
235		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
236		"auth{} block is full for %s (%s).",
237	<	get_client_name(source_p, SHOW_IP),
238	<	source_p->sockhost);
237	>	get_client_name(source_p, SHOW_IP),
238	>	source_p->sockhost);
239		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
240	<	get_client_name(source_p, SHOW_IP));
240	>	get_client_name(source_p, SHOW_IP));
241		++ServerStats.is_ref;
242	<	exit_client(source_p, &me,
478	<	"No more connections allowed in your connection class");
242	>	exit_client(source_p, "No more connections allowed in your connection class");
243		break;
244
245		case NOT_AUTHORIZED:
#	Line 483 | Line 247 | check_client(struct Client *source_p)
247		/* jdc - lists server name & port connections are on */
248		/*       a purely cosmetical change */
249		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
250	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
251	<	get_client_name(source_p, SHOW_IP),
252	<	source_p->sockhost,
253	<	source_p->localClient->listener->name,
254	<	source_p->localClient->listener->port);
250	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
251	>	get_client_name(source_p, SHOW_IP),
252	>	source_p->sockhost,
253	>	source_p->localClient->listener->name,
254	>	source_p->localClient->listener->port);
255		ilog(LOG_TYPE_IRCD,
256	<	"Unauthorized client connection from %s on [%s/%u].",
257	<	get_client_name(source_p, SHOW_IP),
258	<	source_p->localClient->listener->name,
259	<	source_p->localClient->listener->port);
256	>	"Unauthorized client connection from %s on [%s/%u].",
257	>	get_client_name(source_p, SHOW_IP),
258	>	source_p->localClient->listener->name,
259	>	source_p->localClient->listener->port);
260
261	<	exit_client(source_p, &me, "You are not authorized to use this server");
261	>	exit_client(source_p, "You are not authorized to use this server");
262		break;
263
264		case BANNED_CLIENT:
265	<	exit_client(source_p, &me, "Banned");
265	>	exit_client(source_p, "Banned");
266		++ServerStats.is_ref;
267		break;
268
#	Line 519 | Line 283 | check_client(struct Client *source_p)
283		static int
284		verify_access(struct Client *client_p)
285		{
286	<	struct MaskItem *conf = NULL, *rkconf = NULL;
287	<	char non_ident[USERLEN + 1] = { '~', '\0' };
524	<	const char *uhi[3];
286	>	struct MaskItem *conf = NULL;
287	>	char non_ident[USERLEN + 1] = "~";
288
289		if (IsGotId(client_p))
290		{
291		conf = find_address_conf(client_p->host, client_p->username,
292	<	&client_p->localClient->ip,
293	<	client_p->localClient->aftype,
292	>	&client_p->localClient->ip,
293	>	client_p->localClient->aftype,
294		client_p->localClient->passwd);
295		}
296		else
297		{
298	<	strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
298	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
299		conf = find_address_conf(client_p->host,non_ident,
300	<	&client_p->localClient->ip,
301	<	client_p->localClient->aftype,
302	<	client_p->localClient->passwd);
300	>	&client_p->localClient->ip,
301	>	client_p->localClient->aftype,
302	>	client_p->localClient->passwd);
303		}
304
305	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
543	<	uhi[1] = client_p->host;
544	<	uhi[2] = client_p->sockhost;
545	<
546	<	rkconf = find_regexp_kline(uhi);
547	<
548	<	if (conf != NULL)
305	>	if (conf)
306		{
307	<	if (IsConfClient(conf) && !rkconf)
307	>	if (IsConfClient(conf))
308		{
309		if (IsConfRedir(conf))
310		{
311	<	sendto_one(client_p, form_str(RPL_REDIR),
312	<	me.name, client_p->name,
313	<	conf->name ? conf->name : "",
314	<	conf->port);
558	<	return(NOT_AUTHORIZED);
311	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
312	>	conf->name ? conf->name : "",
313	>	conf->port);
314	>	return NOT_AUTHORIZED;
315		}
316
317		if (IsConfDoIdentd(conf))
318	<	SetNeedId(client_p);
318	>	SetNeedId(client_p);
319
320		/* Thanks for spoof idea amm */
321		if (IsConfDoSpoofIp(conf))
322		{
323	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
323	>	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
324		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
325		"%s spoofing: %s as %s",
326		client_p->name, client_p->host, conf->name);
327		strlcpy(client_p->host, conf->name, sizeof(client_p->host));
328	<	SetIPSpoof(client_p);
328	>	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
329		}
330
331	<	return(attach_iline(client_p, conf));
331	>	return attach_iline(client_p, conf);
332		}
333	<	else if (rkconf || IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
333	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
334		{
579	–	/* XXX */
580	–	conf = rkconf ? rkconf : conf;
335		if (IsConfGline(conf))
336	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
337	<	client_p->name);
338	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
585	<	me.name, client_p->name, conf->reason);
586	<	return(BANNED_CLIENT);
336	>	sendto_one_notice(client_p, &me, ":*** G-lined");
337	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
338	>	return BANNED_CLIENT;
339		}
340		}
341
342	<	return(NOT_AUTHORIZED);
342	>	return NOT_AUTHORIZED;
343		}
344
345		/* attach_iline()
#	Line 600 | Line 352 | verify_access(struct Client *client_p)
352		static int
353		attach_iline(struct Client *client_p, struct MaskItem *conf)
354		{
355	<	struct ClassItem *class = NULL;
355	>	const struct ClassItem *class = conf->class;
356		struct ip_entry *ip_found;
357		int a_limit_reached = 0;
358		unsigned int local = 0, global = 0, ident = 0;
359
360	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
360	>	ip_found = ipcache_find_or_add_address(&client_p->localClient->ip);
361		ip_found->count++;
362		SetIpHash(client_p);
363
612	–	if (conf->class == NULL)
613	–	return NOT_AUTHORIZED;  /* If class is missing, this is best */
614	–
615	–	class = conf->class;
616	–
364		count_user_host(client_p->username, client_p->host,
365		&global, &local, &ident);
366
#	Line 621 | Line 368 | attach_iline(struct Client *client_p, st
368		* setting a_limit_reached if any limit is reached.
369		* - Dianora
370		*/
371	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
371	>	if (class->max_total && class->ref_count >= class->max_total)
372		a_limit_reached = 1;
373	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
373	>	else if (class->max_perip && ip_found->count > class->max_perip)
374		a_limit_reached = 1;
375	<	else if (class->max_local != 0 && local >= class->max_local)
375	>	else if (class->max_local && local >= class->max_local)
376		a_limit_reached = 1;
377	<	else if (class->max_global != 0 && global >= class->max_global)
377	>	else if (class->max_global && global >= class->max_global)
378		a_limit_reached = 1;
379	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
379	>	else if (class->max_ident && ident >= class->max_ident &&
380		client_p->username[0] != '~')
381		a_limit_reached = 1;
382
#	Line 638 | Line 385 | attach_iline(struct Client *client_p, st
385		if (!IsConfExemptLimits(conf))
386		return TOO_MANY;   /* Already at maximum allowed */
387
388	<	sendto_one(client_p,
389	<	":%s NOTICE %s :*** Your connection class is full, "
643	<	"but you have exceed_limit = yes;", me.name, client_p->name);
388	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
389	>	"but you have exceed_limit = yes;");
390		}
391
392		return attach_conf(client_p, conf);
393		}
394
649	–	/* init_ip_hash_table()
650	–	*
651	–	* inputs               - NONE
652	–	* output               - NONE
653	–	* side effects         - allocate memory for ip_entry(s)
654	–	*                      - clear the ip hash table
655	–	*/
656	–	void
657	–	init_ip_hash_table(void)
658	–	{
659	–	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
660	–	2 * hard_fdlimit);
661	–	memset(ip_hash_table, 0, sizeof(ip_hash_table));
662	–	}
663	–
664	–	/* find_or_add_ip()
665	–	*
666	–	* inputs       - pointer to struct irc_ssaddr
667	–	* output       - pointer to a struct ip_entry
668	–	* side effects -
669	–	*
670	–	* If the ip # was not found, a new struct ip_entry is created, and the ip
671	–	* count set to 0.
672	–	*/
673	–	static struct ip_entry *
674	–	find_or_add_ip(struct irc_ssaddr *ip_in)
675	–	{
676	–	struct ip_entry *ptr, *newptr;
677	–	int hash_index = hash_ip(ip_in), res;
678	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
679	–	#ifdef IPV6
680	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
681	–	#endif
682	–
683	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
684	–	{
685	–	#ifdef IPV6
686	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
687	–	continue;
688	–	if (ip_in->ss.ss_family == AF_INET6)
689	–	{
690	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
691	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
692	–	}
693	–	else
694	–	#endif
695	–	{
696	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
697	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
698	–	}
699	–	if (res == 0)
700	–	{
701	–	/* Found entry already in hash, return it. */
702	–	return ptr;
703	–	}
704	–	}
705	–
706	–	if (ip_entries_count >= 2 * hard_fdlimit)
707	–	garbage_collect_ip_entries();
708	–
709	–	newptr = BlockHeapAlloc(ip_entry_heap);
710	–	ip_entries_count++;
711	–	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
712	–
713	–	newptr->next = ip_hash_table[hash_index];
714	–	ip_hash_table[hash_index] = newptr;
715	–
716	–	return newptr;
717	–	}
718	–
719	–	/* remove_one_ip()
720	–	*
721	–	* inputs        - unsigned long IP address value
722	–	* output        - NONE
723	–	* side effects  - The ip address given, is looked up in ip hash table
724	–	*                 and number of ip#'s for that ip decremented.
725	–	*                 If ip # count reaches 0 and has expired,
726	–	*                 the struct ip_entry is returned to the ip_entry_heap
727	–	*/
728	–	void
729	–	remove_one_ip(struct irc_ssaddr *ip_in)
730	–	{
731	–	struct ip_entry *ptr;
732	–	struct ip_entry *last_ptr = NULL;
733	–	int hash_index = hash_ip(ip_in), res;
734	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
735	–	#ifdef IPV6
736	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
737	–	#endif
738	–
739	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
740	–	{
741	–	#ifdef IPV6
742	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
743	–	continue;
744	–	if (ip_in->ss.ss_family == AF_INET6)
745	–	{
746	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
747	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
748	–	}
749	–	else
750	–	#endif
751	–	{
752	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
753	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
754	–	}
755	–	if (res)
756	–	continue;
757	–	if (ptr->count > 0)
758	–	ptr->count--;
759	–	if (ptr->count == 0 &&
760	–	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
761	–	{
762	–	if (last_ptr != NULL)
763	–	last_ptr->next = ptr->next;
764	–	else
765	–	ip_hash_table[hash_index] = ptr->next;
766	–
767	–	BlockHeapFree(ip_entry_heap, ptr);
768	–	ip_entries_count--;
769	–	return;
770	–	}
771	–	last_ptr = ptr;
772	–	}
773	–	}
774	–
775	–	/* hash_ip()
776	–	*
777	–	* input        - pointer to an irc_inaddr
778	–	* output       - integer value used as index into hash table
779	–	* side effects - hopefully, none
780	–	*/
781	–	static int
782	–	hash_ip(struct irc_ssaddr *addr)
783	–	{
784	–	if (addr->ss.ss_family == AF_INET)
785	–	{
786	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
787	–	int hash;
788	–	uint32_t ip;
789	–
790	–	ip   = ntohl(v4->sin_addr.s_addr);
791	–	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
792	–	return hash;
793	–	}
794	–	#ifdef IPV6
795	–	else
796	–	{
797	–	int hash;
798	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
799	–	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
800	–
801	–	hash  = ip[0] ^ ip[3];
802	–	hash ^= hash >> 16;
803	–	hash ^= hash >> 8;
804	–	hash  = hash & (IP_HASH_SIZE - 1);
805	–	return hash;
806	–	}
807	–	#else
808	–	return 0;
809	–	#endif
810	–	}
811	–
812	–	/* count_ip_hash()
813	–	*
814	–	* inputs        - pointer to counter of number of ips hashed
815	–	*               - pointer to memory used for ip hash
816	–	* output        - returned via pointers input
817	–	* side effects  - NONE
818	–	*
819	–	* number of hashed ip #'s is counted up, plus the amount of memory
820	–	* used in the hash.
821	–	*/
822	–	void
823	–	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
824	–	{
825	–	struct ip_entry *ptr;
826	–	int i;
827	–
828	–	*number_ips_stored = 0;
829	–	*mem_ips_stored    = 0;
830	–
831	–	for (i = 0; i < IP_HASH_SIZE; i++)
832	–	{
833	–	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
834	–	{
835	–	*number_ips_stored += 1;
836	–	*mem_ips_stored += sizeof(struct ip_entry);
837	–	}
838	–	}
839	–	}
840	–
841	–	/* garbage_collect_ip_entries()
842	–	*
843	–	* input        - NONE
844	–	* output       - NONE
845	–	* side effects - free up all ip entries with no connections
846	–	*/
847	–	static void
848	–	garbage_collect_ip_entries(void)
849	–	{
850	–	struct ip_entry *ptr;
851	–	struct ip_entry *last_ptr;
852	–	struct ip_entry *next_ptr;
853	–	int i;
854	–
855	–	for (i = 0; i < IP_HASH_SIZE; i++)
856	–	{
857	–	last_ptr = NULL;
858	–
859	–	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
860	–	{
861	–	next_ptr = ptr->next;
862	–
863	–	if (ptr->count == 0 &&
864	–	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
865	–	{
866	–	if (last_ptr != NULL)
867	–	last_ptr->next = ptr->next;
868	–	else
869	–	ip_hash_table[i] = ptr->next;
870	–	BlockHeapFree(ip_entry_heap, ptr);
871	–	ip_entries_count--;
872	–	}
873	–	else
874	–	last_ptr = ptr;
875	–	}
876	–	}
877	–	}
878	–
395		/* detach_conf()
396		*
397		* inputs       - pointer to client to detach
#	Line 887 | Line 403 | garbage_collect_ip_entries(void)
403		void
404		detach_conf(struct Client *client_p, enum maskitem_type type)
405		{
406	<	dlink_node *ptr = NULL, *next_ptr = NULL;
406	>	dlink_node *ptr = NULL, *ptr_next = NULL;
407
408	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
408	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
409		{
410		struct MaskItem *conf = ptr->data;
411
#	Line 930 | Line 446 | detach_conf(struct Client *client_p, enu
446		int
447		attach_conf(struct Client *client_p, struct MaskItem *conf)
448		{
449	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
449	>	if (dlinkFind(&client_p->localClient->confs, conf))
450		return 1;
451
452		if (conf->type == CONF_CLIENT)
#	Line 971 | Line 487 | attach_connect_block(struct Client *clie
487		{
488		conf = ptr->data;
489
490	<	if (match(conf->name, name) == 0 || match(conf->host, host) == 0)
490	>	if (match(conf->name, name) || match(conf->host, host))
491		continue;
492
493		attach_conf(client_p, conf);
#	Line 999 | Line 515 | find_conf_name(dlink_list *list, const c
515		DLINK_FOREACH(ptr, list->head)
516		{
517		conf = ptr->data;
518	<
518	>
519		if (conf->type == type)
520		{
521	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
522	<	match(conf->name, name)))
521	>	if (conf->name && (!irccmp(conf->name, name) ||
522	>	!match(conf->name, name)))
523		return conf;
524		}
525		}
#	Line 1022 | Line 538 | map_to_list(enum maskitem_type type)
538		{
539		switch(type)
540		{
1025	–	case CONF_RKLINE:
1026	–	return(&rkconf_items);
1027	–	break;
1028	–	case CONF_RXLINE:
1029	–	return(&rxconf_items);
1030	–	break;
541		case CONF_XLINE:
542		return(&xconf_items);
543		break;
#	Line 1037 | Line 547 | map_to_list(enum maskitem_type type)
547		case CONF_NRESV:
548		return(&nresv_items);
549		break;
550	+	case CONF_CRESV:
551	+	return(&cresv_items);
552		case CONF_OPER:
553		return(&oconf_items);
554		break;
#	Line 1074 | Line 586 | find_matching_name_conf(enum maskitem_ty
586
587		switch (type)
588		{
1077	–	#ifdef HAVE_LIBPCRE
1078	–	case CONF_RXLINE:
1079	–	DLINK_FOREACH(ptr, list_p->head)
1080	–	{
1081	–	conf = ptr->data;
1082	–	assert(conf->regexpname);
1083	–
1084	–	if (!ircd_pcre_exec(conf->regexuser, name))
1085	–	return conf;
1086	–	}
1087	–	break;
1088	–	#endif
589		case CONF_SERVICE:
590		DLINK_FOREACH(ptr, list_p->head)
591		{
#	Line 1101 | Line 601 | find_matching_name_conf(enum maskitem_ty
601		case CONF_XLINE:
602		case CONF_ULINE:
603		case CONF_NRESV:
604	+	case CONF_CRESV:
605		DLINK_FOREACH(ptr, list_p->head)
606		{
607		conf = ptr->data;
608
609		if (EmptyString(conf->name))
610	<	continue;
611	<	if ((name != NULL) && match_esc(conf->name, name))
610	>	continue;
611	>	if ((name != NULL) && !match(conf->name, name))
612		{
613	<	if ((user == NULL && (host == NULL)))
614	<	return conf;
615	<	if ((conf->flags & flags) != flags)
613	>	if ((user == NULL && (host == NULL)))
614	>	return conf;
615	>	if ((conf->flags & flags) != flags)
616		continue;
617	<	if (EmptyString(conf->user) || EmptyString(conf->host))
618	<	return conf;
619	<	if (match(conf->user, user) && match(conf->host, host))
620	<	return conf;
617	>	if (EmptyString(conf->user) || EmptyString(conf->host))
618	>	return conf;
619	>	if (!match(conf->user, user) && !match(conf->host, host))
620	>	return conf;
621		}
622		}
623		break;
#	Line 1126 | Line 627 | find_matching_name_conf(enum maskitem_ty
627		{
628		conf = ptr->data;
629
630	<	if ((name != NULL) && match(name, conf->name))
630	>	if ((name != NULL) && !match(name, conf->name))
631		return conf;
632	<	else if ((host != NULL) && match(host, conf->host))
632	>	else if ((host != NULL) && !match(host, conf->host))
633		return conf;
634		}
635		break;
636	<
636	>
637		default:
638		break;
639		}
#	Line 1158 | Line 659 | find_exact_name_conf(enum maskitem_type
659
660		switch(type)
661		{
1161	–	case CONF_RXLINE:
662		case CONF_XLINE:
663		case CONF_ULINE:
664		case CONF_NRESV:
665	+	case CONF_CRESV:
666
667		DLINK_FOREACH(ptr, list_p->head)
668		{
669		conf = ptr->data;
670
671		if (EmptyString(conf->name))
672	<	continue;
673	<
672	>	continue;
673	>
674		if (irccmp(conf->name, name) == 0)
675		{
676	<	if ((user == NULL && (host == NULL)))
677	<	return (conf);
678	<	if (EmptyString(conf->user) || EmptyString(conf->host))
679	<	return (conf);
680	<	if (match(conf->user, user) && match(conf->host, host))
681	<	return (conf);
676	>	if ((user == NULL && (host == NULL)))
677	>	return conf;
678	>	if (EmptyString(conf->user) || EmptyString(conf->host))
679	>	return conf;
680	>	if (!match(conf->user, user) && !match(conf->host, host))
681	>	return conf;
682		}
683		}
684		break;
#	Line 1196 | Line 697 | find_exact_name_conf(enum maskitem_type
697		return conf;
698		if (EmptyString(conf->user) || EmptyString(conf->host))
699		return NULL;
700	<	if (match(conf->user, who->username))
700	>	if (!match(conf->user, who->username))
701		{
702		switch (conf->htype)
703		{
704		case HM_HOST:
705	<	if (match(conf->host, who->host) || match(conf->host, who->sockhost))
705	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
706		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
707		return conf;
708		break;
#	Line 1234 | Line 735 | find_exact_name_conf(enum maskitem_type
735		conf = ptr->data;
736
737		if (EmptyString(conf->name))
738	<	continue;
739	<
738	>	continue;
739	>
740		if (name == NULL)
741		{
742	<	if (EmptyString(conf->host))
743	<	continue;
744	<	if (irccmp(conf->host, host) == 0)
745	<	return(conf);
742	>	if (EmptyString(conf->host))
743	>	continue;
744	>	if (irccmp(conf->host, host) == 0)
745	>	return conf;
746		}
747		else if (irccmp(conf->name, name) == 0)
748	<	{
1248	<	return (conf);
1249	<	}
748	>	return conf;
749		}
750	+
751		break;
752
753		default:
754		break;
755		}
756	<	return(NULL);
756	>
757	>	return NULL;
758		}
759
760		/* rehash()
#	Line 1265 | Line 766 | find_exact_name_conf(enum maskitem_type
766		int
767		rehash(int sig)
768		{
769	<	if (sig != 0)
769	>	if (sig)
770		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
771	<	"Got signal SIGHUP, reloading ircd.conf file");
771	>	"Got signal SIGHUP, reloading configuration file(s)");
772
773		restart_resolver();
774
#	Line 1278 | Line 779 | rehash(int sig)
779
780		read_conf_files(0);
781
782	<	if (ServerInfo.description != NULL)
783	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
782	>	if (ConfigServerInfo.description)
783	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
784
785		load_conf_modules();
786	+	check_conf_klines();
787
788	<	rehashed_klines = 1;
1287	<	/* XXX */
1288	<	if (ConfigLoggingEntry.use_logging)
1289	<	log_close_all();
1290	<
1291	<	return(0);
788	>	return 0;
789		}
790
791		/* set_default_conf()
#	Line 1309 | Line 806 | set_default_conf(void)
806		assert(class_default == class_get_list()->tail->data);
807
808		#ifdef HAVE_LIBCRYPTO
809	<	ServerInfo.rsa_private_key = NULL;
810	<	ServerInfo.rsa_private_key_file = NULL;
809	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
810	>	ConfigServerInfo.rsa_private_key = NULL;
811	>	ConfigServerInfo.rsa_private_key_file = NULL;
812		#endif
813
814	<	/* ServerInfo.name is not rehashable */
815	<	/* ServerInfo.name = ServerInfo.name; */
816	<	ServerInfo.description = NULL;
817	<	DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT);
818	<	DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT);
819	<
820	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
821	<	ServerInfo.specific_ipv4_vhost = 0;
822	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
823	<	ServerInfo.specific_ipv6_vhost = 0;
824	<
825	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
826	<
827	<	ServerInfo.hub = 0;
828	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
829	<	ServerInfo.dns_host.sin_port = 0;
830	<	AdminInfo.name = NULL;
831	<	AdminInfo.email = NULL;
832	<	AdminInfo.description = NULL;
814	>	/* ConfigServerInfo.name is not rehashable */
815	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
816	>	ConfigServerInfo.description = NULL;
817	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
818	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
819	>
820	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
821	>	ConfigServerInfo.specific_ipv4_vhost = 0;
822	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
823	>	ConfigServerInfo.specific_ipv6_vhost = 0;
824	>
825	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
826	>	ConfigServerInfo.max_nick_length = 9;
827	>	ConfigServerInfo.max_topic_length = 80;
828	>	ConfigServerInfo.hub = 0;
829	>
830	>	ConfigAdminInfo.name = NULL;
831	>	ConfigAdminInfo.email = NULL;
832	>	ConfigAdminInfo.description = NULL;
833
834	<	log_close_all();
834	>	log_del_all();
835
836	<	ConfigLoggingEntry.use_logging = 1;
836	>	ConfigLog.use_logging = 1;
837
838		ConfigChannel.disable_fake_channels = 0;
839	<	ConfigChannel.restrict_channels = 0;
840	<	ConfigChannel.knock_delay = 300;
839	>	ConfigChannel.invite_client_count = 10;
840	>	ConfigChannel.invite_client_time = 300;
841	>	ConfigChannel.knock_client_count = 1;
842	>	ConfigChannel.knock_client_time = 300;
843		ConfigChannel.knock_delay_channel = 60;
844	<	ConfigChannel.max_chans_per_user = 25;
1345	<	ConfigChannel.max_chans_per_oper = 50;
1346	<	ConfigChannel.quiet_on_ban = 1;
844	>	ConfigChannel.max_channels = 25;
845		ConfigChannel.max_bans = 25;
846		ConfigChannel.default_split_user_count = 0;
847		ConfigChannel.default_split_server_count = 0;
#	Line 1354 | Line 852 | set_default_conf(void)
852		ConfigServerHide.links_delay = 300;
853		ConfigServerHide.hidden = 0;
854		ConfigServerHide.hide_servers = 0;
855	<	DupString(ConfigServerHide.hidden_name, NETWORK_NAME_DEFAULT);
855	>	ConfigServerHide.hide_services = 0;
856	>	ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
857		ConfigServerHide.hide_server_ips = 0;
858	+	ConfigServerHide.disable_remote_commands = 0;
859
860	<
861	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
862	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
863	<	ConfigFileEntry.glines = 0;
864	<	ConfigFileEntry.gline_time = 12 * 3600;
865	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
866	<	ConfigFileEntry.gline_min_cidr = 16;
867	<	ConfigFileEntry.gline_min_cidr6 = 48;
868	<	ConfigFileEntry.invisible_on_connect = 1;
869	<	ConfigFileEntry.tkline_expire_notices = 1;
870	<	ConfigFileEntry.hide_spoof_ips = 1;
871	<	ConfigFileEntry.ignore_bogus_ts = 0;
872	<	ConfigFileEntry.disable_auth = 0;
873	<	ConfigFileEntry.disable_remote = 0;
874	<	ConfigFileEntry.kill_chase_time_limit = 90;
875	<	ConfigFileEntry.default_floodcount = 8;
876	<	ConfigFileEntry.failed_oper_notice = 1;
877	<	ConfigFileEntry.dots_in_ident = 0;
878	<	ConfigFileEntry.min_nonwildcard = 4;
879	<	ConfigFileEntry.min_nonwildcard_simple = 3;
880	<	ConfigFileEntry.max_accept = 20;
881	<	ConfigFileEntry.anti_nick_flood = 0;
882	<	ConfigFileEntry.max_nick_time = 20;
883	<	ConfigFileEntry.max_nick_changes = 5;
884	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
885	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
886	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
887	<	ConfigFileEntry.warn_no_nline = 1;
888	<	ConfigFileEntry.stats_o_oper_only = 0;
889	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
890	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
891	<	ConfigFileEntry.stats_P_oper_only = 0;
892	<	ConfigFileEntry.caller_id_wait = 60;
893	<	ConfigFileEntry.opers_bypass_callerid = 0;
894	<	ConfigFileEntry.pace_wait = 10;
895	<	ConfigFileEntry.pace_wait_simple = 1;
896	<	ConfigFileEntry.short_motd = 0;
897	<	ConfigFileEntry.ping_cookie = 0;
898	<	ConfigFileEntry.no_oper_flood = 0;
899	<	ConfigFileEntry.true_no_oper_flood = 0;
900	<	ConfigFileEntry.oper_pass_resv = 1;
901	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
902	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
903	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
904	<	UMODE_OPERWALL | UMODE_WALLOP;
905	<	ConfigFileEntry.use_egd = 0;
906	<	ConfigFileEntry.egdpool_path = NULL;
907	<	ConfigFileEntry.throttle_time = 10;
860	>	ConfigGeneral.away_count = 2;
861	>	ConfigGeneral.away_time = 10;
862	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
863	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
864	>	ConfigGeneral.cycle_on_host_change = 1;
865	>	ConfigGeneral.glines = 0;
866	>	ConfigGeneral.gline_time = 12 * 3600;
867	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
868	>	ConfigGeneral.gline_min_cidr = 16;
869	>	ConfigGeneral.gline_min_cidr6 = 48;
870	>	ConfigGeneral.invisible_on_connect = 1;
871	>	ConfigGeneral.tkline_expire_notices = 1;
872	>	ConfigGeneral.hide_spoof_ips = 1;
873	>	ConfigGeneral.ignore_bogus_ts = 0;
874	>	ConfigGeneral.disable_auth = 0;
875	>	ConfigGeneral.kill_chase_time_limit = 90;
876	>	ConfigGeneral.default_floodcount = 8;
877	>	ConfigGeneral.failed_oper_notice = 1;
878	>	ConfigGeneral.dots_in_ident = 0;
879	>	ConfigGeneral.min_nonwildcard = 4;
880	>	ConfigGeneral.min_nonwildcard_simple = 3;
881	>	ConfigGeneral.max_accept = 20;
882	>	ConfigGeneral.anti_nick_flood = 0;
883	>	ConfigGeneral.max_nick_time = 20;
884	>	ConfigGeneral.max_nick_changes = 5;
885	>	ConfigGeneral.anti_spam_exit_message_time = 0;
886	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
887	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
888	>	ConfigGeneral.warn_no_connect_block = 1;
889	>	ConfigGeneral.stats_e_disabled = 0;
890	>	ConfigGeneral.stats_o_oper_only = 0;
891	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
892	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
893	>	ConfigGeneral.stats_P_oper_only = 0;
894	>	ConfigGeneral.stats_u_oper_only = 0;
895	>	ConfigGeneral.caller_id_wait = 60;
896	>	ConfigGeneral.opers_bypass_callerid = 0;
897	>	ConfigGeneral.pace_wait = 10;
898	>	ConfigGeneral.pace_wait_simple = 1;
899	>	ConfigGeneral.short_motd = 0;
900	>	ConfigGeneral.ping_cookie = 0;
901	>	ConfigGeneral.no_oper_flood = 0;
902	>	ConfigGeneral.true_no_oper_flood = 0;
903	>	ConfigGeneral.oper_pass_resv = 1;
904	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
905	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
906	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
907	>	ConfigGeneral.throttle_count = 1;
908	>	ConfigGeneral.throttle_time = 1;
909		}
910
911		static void
912		validate_conf(void)
913		{
914	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
915	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
914	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
915	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
916
917	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
918	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
917	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
918	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
919
920	<	if (ServerInfo.network_name == NULL)
921	<	DupString(ServerInfo.network_name,NETWORK_NAME_DEFAULT);
920	>	if (ConfigServerInfo.network_name == NULL)
921	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
922
923	<	if (ServerInfo.network_desc == NULL)
924	<	DupString(ServerInfo.network_desc,NETWORK_DESC_DEFAULT);
923	>	if (ConfigServerInfo.network_desc == NULL)
924	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
925
926	<	if (ConfigFileEntry.service_name == NULL)
927	<	DupString(ConfigFileEntry.service_name, SERVICE_NAME_DEFAULT);
926	>	if (ConfigGeneral.service_name == NULL)
927	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
928
929	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
929	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
930		}
931
932	<	/* read_conf()
932	>	/* read_conf()
933		*
934		* inputs       - file descriptor pointing to config file to use
935		* output       - None
#	Line 1439 | Line 940 | read_conf(FILE *file)
940		{
941		lineno = 0;
942
943	<	set_default_conf(); /* Set default values prior to conf parsing */
943	>	set_default_conf();  /* Set default values prior to conf parsing */
944		conf_parser_ctx.pass = 1;
945	<	yyparse();          /* pick up the classes first */
945	>	yyparse();  /* Pick up the classes first */
946
947		rewind(file);
948
949		conf_parser_ctx.pass = 2;
950	<	yyparse();          /* Load the values from the conf */
951	<	validate_conf();    /* Check to make sure some values are still okay. */
952	<	/* Some global values are also loaded here. */
953	<	class_delete_marked();      /* Make sure classes are valid */
950	>	yyparse();  /* Load the values from the conf */
951	>	validate_conf();  /* Check to make sure some values are still okay. */
952	>	/* Some global values are also loaded here. */
953	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
954		}
955
956		/* lookup_confhost()
#	Line 1457 | Line 958 | read_conf(FILE *file)
958		* start DNS lookups of all hostnames in the conf
959		* line and convert an IP addresses in a.b.c.d number for to IP#s.
960		*/
961	<	static void
961	>	void
962		lookup_confhost(struct MaskItem *conf)
963		{
964		struct addrinfo hints, *res;
965
966	<	if (has_wildcards(conf->host))
967	<	{
1467	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1468	<	conf->host, conf->name);
1469	<	return;
1470	<	}
1471	<
1472	<	/* Do name lookup now on hostnames given and store the
966	>	/*
967	>	* Do name lookup now on hostnames given and store the
968		* ip numbers in conf structure.
969		*/
970		memset(&hints, 0, sizeof(hints));
#	Line 1486 | Line 981 | lookup_confhost(struct MaskItem *conf)
981		return;
982		}
983
984	<	assert(res != NULL);
984	>	assert(res);
985
986		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
987		conf->addr.ss_len = res->ai_addrlen;
#	Line 1505 | Line 1000 | lookup_confhost(struct MaskItem *conf)
1000		int
1001		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1002		{
1003	<	struct ip_entry *ip_found;
1003	>	struct ip_entry *ip_found = NULL;
1004		struct MaskItem *conf = find_dline_conf(addr, aftype);
1005
1006		/* DLINE exempt also gets you out of static limits/pacing... */
1007		if (conf && (conf->type == CONF_EXEMPT))
1008		return 0;
1009
1010	<	if (conf != NULL)
1010	>	if (conf)
1011		return BANNED_CLIENT;
1012
1013	<	ip_found = find_or_add_ip(addr);
1013	>	ip_found = ipcache_find_or_add_address(addr);
1014
1015	<	if ((CurrentTime - ip_found->last_attempt) <
1521	<	ConfigFileEntry.throttle_time)
1015	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1016		{
1017	<	ip_found->last_attempt = CurrentTime;
1018	<	return TOO_FAST;
1017	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1018	>	return TOO_FAST;
1019	>
1020	>	++ip_found->connection_count;
1021		}
1022	+	else
1023	+	ip_found->connection_count = 1;
1024
1025		ip_found->last_attempt = CurrentTime;
1026		return 0;
1027		}
1028
1531	–	static struct MaskItem *
1532	–	find_regexp_kline(const char *uhi[])
1533	–	{
1534	–	#ifdef HAVE_LIBPCRE
1535	–	const dlink_node *ptr = NULL;
1536	–
1537	–	DLINK_FOREACH(ptr, rkconf_items.head)
1538	–	{
1539	–	struct MaskItem *aptr = ptr->data;
1540	–
1541	–	assert(aptr->regexuser);
1542	–	assert(aptr->regexhost);
1543	–
1544	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1545	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1546	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1547	–	return aptr;
1548	–	}
1549	–	#endif
1550	–	return NULL;
1551	–	}
1552	–
1553	–	/* find_kill()
1554	–	*
1555	–	* inputs       - pointer to client structure
1556	–	* output       - pointer to struct MaskItem if found
1557	–	* side effects - See if this user is klined already,
1558	–	*                and if so, return struct MaskItem pointer
1559	–	*/
1560	–	struct MaskItem *
1561	–	find_kill(struct Client *client_p)
1562	–	{
1563	–	struct MaskItem *conf = NULL;
1564	–	const char *uhi[3];
1565	–
1566	–	uhi[0] = client_p->username;
1567	–	uhi[1] = client_p->host;
1568	–	uhi[2] = client_p->sockhost;
1569	–
1570	–	assert(client_p != NULL);
1571	–
1572	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1573	–	CONF_KLINE, client_p->localClient->aftype,
1574	–	client_p->username, NULL, 1);
1575	–	if (conf == NULL)
1576	–	conf = find_regexp_kline(uhi);
1577	–
1578	–	return conf;
1579	–	}
1580	–
1581	–	struct MaskItem *
1582	–	find_gline(struct Client *client_p)
1583	–	{
1584	–	struct MaskItem *conf;
1585	–
1586	–	assert(client_p != NULL);
1587	–
1588	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1589	–	CONF_GLINE, client_p->localClient->aftype,
1590	–	client_p->username, NULL, 1);
1591	–	return conf;
1592	–	}
1593	–
1029		/* cleanup_tklines()
1030		*
1031		* inputs       - NONE
#	Line 1602 | Line 1037 | void
1037		cleanup_tklines(void *notused)
1038		{
1039		hostmask_expire_temporary();
1040	<	expire_tklines(&xconf_items);
1040	>	expire_tklines(&xconf_items);
1041		expire_tklines(&nresv_items);
1042	<	expire_tklines(&resv_channel_list);
1042	>	expire_tklines(&cresv_items);
1043		}
1044
1045		/* expire_tklines()
#	Line 1616 | Line 1051 | cleanup_tklines(void *notused)
1051		static void
1052		expire_tklines(dlink_list *tklist)
1053		{
1054	<	dlink_node *ptr;
1055	<	dlink_node *next_ptr;
1621	<	struct MaskItem *conf;
1054	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1055	>	struct MaskItem *conf = NULL;
1056
1057	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1057	>	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1058		{
1059		conf = ptr->data;
1060
1061	<	if (!conf->hold || conf->hold > CurrentTime)
1061	>	if (!conf->until || conf->until > CurrentTime)
1062		continue;
1063
1064		if (conf->type == CONF_XLINE)
1065		{
1066	<	if (ConfigFileEntry.tkline_expire_notices)
1066	>	if (ConfigGeneral.tkline_expire_notices)
1067		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1068		"Temporary X-line for [%s] expired", conf->name);
1069		conf_free(conf);
1070		}
1071	<	else if (conf->type == CONF_NRESV)
1071	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1072		{
1073	<	if (ConfigFileEntry.tkline_expire_notices)
1073	>	if (ConfigGeneral.tkline_expire_notices)
1074		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1075		"Temporary RESV for [%s] expired", conf->name);
1076		conf_free(conf);
1077		}
1644	–	else if (conf->type == CONF_CRESV)
1645	–	{
1646	–	if (ConfigFileEntry.tkline_expire_notices)
1647	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1648	–	"Temporary RESV for [%s] expired", conf->name);
1649	–	delete_channel_resv(conf);
1650	–	}
1078		}
1079		}
1080
#	Line 1662 | Line 1089 | static const struct oper_privs
1089		const unsigned int flag;
1090		const unsigned char c;
1091		} flag_list[] = {
1092	<	{ OPER_FLAG_ADMIN,       'A' },
1093	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1094	<	{ OPER_FLAG_DIE,         'D' },
1095	<	{ OPER_FLAG_GLINE,       'G' },
1096	<	{ OPER_FLAG_REHASH,      'H' },
1097	<	{ OPER_FLAG_K,           'K' },
1098	<	{ OPER_FLAG_OPERWALL,    'L' },
1099	<	{ OPER_FLAG_N,           'N' },
1100	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1101	<	{ OPER_FLAG_REMOTE,      'R' },
1102	<	{ OPER_FLAG_OPER_SPY,    'S' },
1103	<	{ OPER_FLAG_UNKLINE,     'U' },
1104	<	{ OPER_FLAG_X,           'X' },
1092	>	{ OPER_FLAG_ADMIN,          'A' },
1093	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1094	>	{ OPER_FLAG_DIE,            'D' },
1095	>	{ OPER_FLAG_GLINE,          'G' },
1096	>	{ OPER_FLAG_REHASH,         'H' },
1097	>	{ OPER_FLAG_KLINE,          'K' },
1098	>	{ OPER_FLAG_KILL,           'N' },
1099	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1100	>	{ OPER_FLAG_CONNECT,        'P' },
1101	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1102	>	{ OPER_FLAG_SQUIT,          'R' },
1103	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1104	>	{ OPER_FLAG_UNKLINE,        'U' },
1105	>	{ OPER_FLAG_XLINE,          'X' },
1106		{ 0, '\0' }
1107		};
1108
1109		char *
1110		oper_privs_as_string(const unsigned int port)
1111		{
1112	<	static char privs_out[16];
1112	>	static char privs_out[IRCD_BUFSIZE];
1113		char *privs_ptr = privs_out;
1686	–	const struct oper_privs *opriv = flag_list;
1114
1115	<	for (; opriv->flag; ++opriv)
1115	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1116		{
1117		if (port & opriv->flag)
1118		*privs_ptr++ = opriv->c;
#	Line 1699 | Line 1126 | oper_privs_as_string(const unsigned int
1126		}
1127
1128		/*
1129	<	* Input: A client to find the active oper{} name for.
1129	>	* Input: A client to find the active operator {} name for.
1130		* Output: The nick!user@host{oper} of the oper.
1131		*         "oper" is server name for remote opers
1132		* Side effects: None.
#	Line 1707 | Line 1134 | oper_privs_as_string(const unsigned int
1134		const char *
1135		get_oper_name(const struct Client *client_p)
1136		{
1137	<	dlink_node *cnode = NULL;
1137	>	const dlink_node *cnode = NULL;
1138		/* +5 for !,@,{,} and null */
1139		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1140
#	Line 1715 | Line 1142 | get_oper_name(const struct Client *clien
1142		{
1143		if ((cnode = client_p->localClient->confs.head))
1144		{
1145	<	struct MaskItem *conf = cnode->data;
1145	>	const struct MaskItem *conf = cnode->data;
1146
1147		if (IsConfOperator(conf))
1148		{
1149	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1149	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1150		client_p->username, client_p->host, conf->name);
1151	<	return buffer;
1151	>	return buffer;
1152		}
1153		}
1154
1155	<	/* Probably should assert here for now. If there is an oper out there
1156	<	* with no oper{} conf attached, it would be good for us to know...
1155	>	/*
1156	>	* Probably should assert here for now. If there is an oper out there
1157	>	* with no operator {} conf attached, it would be good for us to know...
1158		*/
1159	<	assert(0); /* Oper without oper conf! */
1159	>	assert(0);  /* Oper without oper conf! */
1160		}
1161
1162		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1163	<	client_p->username, client_p->host, client_p->servptr->name);
1163	>	client_p->username, client_p->host, client_p->servptr->name);
1164		return buffer;
1165		}
1166
#	Line 1745 | Line 1173 | get_oper_name(const struct Client *clien
1173		void
1174		read_conf_files(int cold)
1175		{
1176	<	const char *filename;
1177	<	char chanmodes[32];
1178	<	char chanlimit[32];
1176	>	const char *filename = NULL;
1177	>	char chanmodes[IRCD_BUFSIZE] = "";
1178	>	char chanlimit[IRCD_BUFSIZE] = "";
1179
1180		conf_parser_ctx.boot = cold;
1181	<	filename = ConfigFileEntry.configfile;
1181	>	filename = ConfigGeneral.configfile;
1182
1183		/* We need to know the initial filename for the yyerror() to report
1184		FIXME: The full path is in conffilenamebuf first time since we
1185	<	dont know anything else
1185	>	don't know anything else
1186
1187	<	- Gozem 2002-07-21
1187	>	- Gozem 2002-07-21
1188		*/
1189		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1190
#	Line 1771 | Line 1199 | read_conf_files(int cold)
1199		else
1200		{
1201		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1202	<	"Unable to read configuration file '%s': %s",
1203	<	filename, strerror(errno));
1202	>	"Unable to read configuration file '%s': %s",
1203	>	filename, strerror(errno));
1204		return;
1205		}
1206		}
#	Line 1783 | Line 1211 | read_conf_files(int cold)
1211		read_conf(conf_parser_ctx.conf_file);
1212		fclose(conf_parser_ctx.conf_file);
1213
1214	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1215	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d",
1216	<	ConfigChannel.max_bans);
1217	<	add_isupport("MAXLIST", chanmodes, -1);
1790	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1214	>	log_reopen_all();
1215	>
1216	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1217	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1218
1219	+	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1220	+	add_isupport("MAXLIST", chanmodes, -1);
1221	+	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1222		add_isupport("CHANTYPES", "#", -1);
1223
1224		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1225	<	ConfigChannel.max_chans_per_user);
1225	>	ConfigChannel.max_channels);
1226		add_isupport("CHANLIMIT", chanlimit, -1);
1227	<	snprintf(chanmodes, sizeof(chanmodes), "%s",
1228	<	"beI,k,l,imnprstORS");
1229	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1800	<
1801	<	add_isupport("EXCEPTS", "e", -1);
1802	<	add_isupport("INVEX", "I", -1);
1227	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1228	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1229	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1230		add_isupport("CHANMODES", chanmodes, -1);
1231
1232		/*
#	Line 1822 | Line 1249 | clear_out_old_conf(void)
1249		struct MaskItem *conf;
1250		dlink_list *free_items [] = {
1251		&server_items,   &oconf_items,
1252	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1253	<	&nresv_items, &cluster_items,  &service_items, NULL
1252	>	&uconf_items,   &xconf_items,
1253	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1254		};
1255
1256		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 1831 | Line 1258 | clear_out_old_conf(void)
1258		/* We only need to free anything allocated by yyparse() here.
1259		* Resetting structs, etc, is taken care of by set_default_conf().
1260		*/
1261	<
1261	>
1262		for (; *iterator != NULL; iterator++)
1263		{
1264		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
#	Line 1844 | Line 1271 | clear_out_old_conf(void)
1271		if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1272		{
1273		if (!conf->ref_count)
1274	<	conf_free(conf);
1274	>	conf_free(conf);
1275		}
1276	<	else if (conf->type == CONF_XLINE  ||
1850	<	conf->type == CONF_RXLINE ||
1851	<	conf->type == CONF_RKLINE)
1276	>	else if (conf->type == CONF_XLINE)
1277		{
1278	<	if (!conf->hold)
1278	>	if (!conf->until)
1279		conf_free(conf);
1280		}
1281		else
#	Line 1858 | Line 1283 | clear_out_old_conf(void)
1283		}
1284		}
1285
1286	+	motd_clear();
1287	+
1288		/*
1289		* don't delete the class table, rather mark all entries
1290		* for deletion. The table is cleaned up by class_delete_marked. - avalon
#	Line 1869 | Line 1296 | clear_out_old_conf(void)
1296		/* clean out module paths */
1297		mod_clear_paths();
1298
1299	<	/* clean out ServerInfo */
1300	<	MyFree(ServerInfo.description);
1301	<	ServerInfo.description = NULL;
1302	<	MyFree(ServerInfo.network_name);
1303	<	ServerInfo.network_name = NULL;
1304	<	MyFree(ServerInfo.network_desc);
1305	<	ServerInfo.network_desc = NULL;
1879	<	MyFree(ConfigFileEntry.egdpool_path);
1880	<	ConfigFileEntry.egdpool_path = NULL;
1299	>	/* clean out ConfigServerInfo */
1300	>	MyFree(ConfigServerInfo.description);
1301	>	ConfigServerInfo.description = NULL;
1302	>	MyFree(ConfigServerInfo.network_name);
1303	>	ConfigServerInfo.network_name = NULL;
1304	>	MyFree(ConfigServerInfo.network_desc);
1305	>	ConfigServerInfo.network_desc = NULL;
1306		#ifdef HAVE_LIBCRYPTO
1307	<	if (ServerInfo.rsa_private_key != NULL)
1307	>	if (ConfigServerInfo.rsa_private_key)
1308		{
1309	<	RSA_free(ServerInfo.rsa_private_key);
1310	<	ServerInfo.rsa_private_key = NULL;
1309	>	RSA_free(ConfigServerInfo.rsa_private_key);
1310	>	ConfigServerInfo.rsa_private_key = NULL;
1311		}
1312
1313	<	MyFree(ServerInfo.rsa_private_key_file);
1314	<	ServerInfo.rsa_private_key_file = NULL;
1890	<
1891	<	if (ServerInfo.server_ctx)
1892	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1893	<	SSL_OP_NO_SSLv3|
1894	<	SSL_OP_NO_TLSv1);
1895	<	if (ServerInfo.client_ctx)
1896	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1897	<	SSL_OP_NO_SSLv3|
1898	<	SSL_OP_NO_TLSv1);
1313	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1314	>	ConfigServerInfo.rsa_private_key_file = NULL;
1315		#endif
1316
1317	<	/* clean out old resvs from the conf */
1318	<	clear_conf_resv();
1319	<
1320	<	/* clean out AdminInfo */
1321	<	MyFree(AdminInfo.name);
1322	<	AdminInfo.name = NULL;
1323	<	MyFree(AdminInfo.email);
1908	<	AdminInfo.email = NULL;
1909	<	MyFree(AdminInfo.description);
1910	<	AdminInfo.description = NULL;
1317	>	/* clean out ConfigAdminInfo */
1318	>	MyFree(ConfigAdminInfo.name);
1319	>	ConfigAdminInfo.name = NULL;
1320	>	MyFree(ConfigAdminInfo.email);
1321	>	ConfigAdminInfo.email = NULL;
1322	>	MyFree(ConfigAdminInfo.description);
1323	>	ConfigAdminInfo.description = NULL;
1324
1325		/* clean out listeners */
1326		close_listeners();
1327
1328		/* clean out general */
1329	<	MyFree(ConfigFileEntry.service_name);
1330	<	ConfigFileEntry.service_name = NULL;
1918	<
1919	<	delete_isupport("INVEX");
1920	<	delete_isupport("EXCEPTS");
1329	>	MyFree(ConfigGeneral.service_name);
1330	>	ConfigGeneral.service_name = NULL;
1331		}
1332
1333		/* conf_add_class_to_conf()
1334		*
1335		* inputs       - pointer to config item
1336		* output       - NONE
1337	<	* side effects - Add a class pointer to a conf
1337	>	* side effects - Add a class pointer to a conf
1338		*/
1339		void
1340		conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1341		{
1342	<	struct ClassItem *class = NULL;
1933	<
1934	<	if (class_name == NULL)
1342	>	if (class_name == NULL)
1343		{
1344		conf->class = class_default;
1345
1346		if (conf->type == CONF_CLIENT)
1347		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1348	<	"Warning *** Defaulting to default class for %s@%s",
1349	<	conf->user, conf->host);
1348	>	"Warning *** Defaulting to default class for %s@%s",
1349	>	conf->user, conf->host);
1350		else
1351		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1352	<	"Warning *** Defaulting to default class for %s",
1353	<	conf->name);
1352	>	"Warning *** Defaulting to default class for %s",
1353	>	conf->name);
1354		}
1355		else
1356		conf->class = class_find(class_name, 1);
#	Line 1951 | Line 1359 | conf_add_class_to_conf(struct MaskItem *
1359		{
1360		if (conf->type == CONF_CLIENT)
1361		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1362	<	"Warning *** Defaulting to default class for %s@%s",
1363	<	conf->user, conf->host);
1362	>	"Warning *** Defaulting to default class for %s@%s",
1363	>	conf->user, conf->host);
1364		else
1365		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1366	<	"Warning *** Defaulting to default class for %s",
1367	<	conf->name);
1366	>	"Warning *** Defaulting to default class for %s",
1367	>	conf->name);
1368		conf->class = class_default;
1369		}
1370		}
1371
1964	–	/* conf_add_server()
1965	–	*
1966	–	* inputs       - pointer to config item
1967	–	*              - pointer to link count already on this conf
1968	–	* output       - NONE
1969	–	* side effects - Add a connect block
1970	–	*/
1971	–	int
1972	–	conf_add_server(struct MaskItem *conf, const char *class_name)
1973	–	{
1974	–	conf_add_class_to_conf(conf, class_name);
1975	–
1976	–	if (EmptyString(conf->host) || EmptyString(conf->name))
1977	–	{
1978	–	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
1979	–	"Bad connect block");
1980	–	ilog(LOG_TYPE_IRCD, "Bad connect block");
1981	–	return -1;
1982	–	}
1983	–
1984	–	if (EmptyString(conf->passwd))
1985	–	{
1986	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1987	–	"Bad connect block, name %s",
1988	–	conf->name);
1989	–	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
1990	–	return -1;
1991	–	}
1992	–
1993	–	lookup_confhost(conf);
1994	–
1995	–	return 0;
1996	–	}
1997	–
1372		/* yyerror()
1373		*
1374		* inputs       - message from parser
#	Line 2010 | Line 1384 | yyerror(const char *msg)
1384		return;
1385
1386		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1387	<	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
1387	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1388	>	"\"%s\", line %u: %s: %s",
1389	>	conffilebuf, lineno + 1, msg, newlinebuf);
1390	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1391	>	conffilebuf, lineno + 1, msg, newlinebuf);
1392	>	}
1393	>
1394	>	void
1395	>	conf_error_report(const char *msg)
1396	>	{
1397	>	char newlinebuf[IRCD_BUFSIZE];
1398	>
1399	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1400	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1401		"\"%s\", line %u: %s: %s",
1402		conffilebuf, lineno + 1, msg, newlinebuf);
1403		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 2019 | Line 1406 | yyerror(const char *msg)
1406
1407		/*
1408		* valid_tkline()
1409	<	*
1409	>	*
1410		* inputs       - pointer to ascii string to check
1411		*              - whether the specified time is in seconds or minutes
1412		* output       - -1 not enough parameters
#	Line 2028 | Line 1415 | yyerror(const char *msg)
1415		* Originally written by Dianora (Diane, db@db.net)
1416		*/
1417		time_t
1418	<	valid_tkline(const char *p, int minutes)
1418	>	valid_tkline(const char *data, const int minutes)
1419		{
1420	+	const unsigned char *p = (const unsigned char *)data;
1421	+	unsigned char tmpch = '\0';
1422		time_t result = 0;
1423
1424	<	for (; *p; ++p)
1424	>	while ((tmpch = *p++))
1425		{
1426	<	if (!IsDigit(*p))
1426	>	if (!IsDigit(tmpch))
1427		return 0;
1428
1429		result *= 10;
1430	<	result += ((*p) & 0xF);
1430	>	result += (tmpch & 0xF);
1431		}
1432
1433		/*
1434	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1434	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1435		* i.e. they specifically use 0, I am going to return 1 instead
1436		* as a return value of non-zero is used to flag it as a temporary kline
1437		*/
1438		if (result == 0)
1439		result = 1;
1440
1441	<	/*
1441	>	/*
1442		* If the incoming time is in seconds convert it to minutes for the purpose
1443		* of this calculation
1444		*/
1445		if (!minutes)
1446	<	result = result / (time_t)60;
1446	>	result = result / 60;
1447
1448		if (result > MAX_TDKLINE_TIME)
1449		result = MAX_TDKLINE_TIME;
1450
1451	<	result = result * (time_t)60;  /* turn it into seconds */
1451	>	result = result * 60;  /* turn it into seconds */
1452
1453		return result;
1454		}
1455
1456	+	/* valid_wild_card_simple()
1457	+	*
1458	+	* inputs       - data to check for sufficient non-wildcard characters
1459	+	* outputs      - 1 if valid, else 0
1460	+	* side effects - none
1461	+	*/
1462	+	int
1463	+	valid_wild_card_simple(const char *data)
1464	+	{
1465	+	const unsigned char *p = (const unsigned char *)data;
1466	+	unsigned char tmpch = '\0';
1467	+	unsigned int nonwild = 0;
1468	+
1469	+	while ((tmpch = *p++))
1470	+	{
1471	+	if (tmpch == '\\' && *p)
1472	+	{
1473	+	++p;
1474	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1475	+	return 1;
1476	+	}
1477	+	else if (!IsMWildChar(tmpch))
1478	+	{
1479	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1480	+	return 1;
1481	+	}
1482	+	}
1483	+
1484	+	return 0;
1485	+	}
1486	+
1487		/* valid_wild_card()
1488		*
1489		* input        - pointer to client
#	Line 2075 | Line 1495 | valid_tkline(const char *p, int minutes)
1495		int
1496		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1497		{
1498	<	char *p;
1499	<	char tmpch;
2080	<	int nonwild = 0;
1498	>	unsigned char tmpch = '\0';
1499	>	unsigned int nonwild = 0;
1500		va_list args;
1501
1502		/*
#	Line 2096 | Line 1515 | valid_wild_card(struct Client *source_p,
1515
1516		while (count--)
1517		{
1518	<	p = va_arg(args, char *);
1518	>	const unsigned char *p = va_arg(args, const unsigned char *);
1519		if (p == NULL)
1520		continue;
1521
#	Line 2108 | Line 1527 | valid_wild_card(struct Client *source_p,
1527		* If we find enough non-wild characters, we can
1528		* break - no point in searching further.
1529		*/
1530	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1530	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1531	>	{
1532	>	va_end(args);
1533		return 1;
1534	+	}
1535		}
1536		}
1537		}
1538
1539		if (warn)
1540	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1541	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1540	>	sendto_one_notice(source_p, &me,
1541	>	":Please include at least %u non-wildcard characters with the mask",
1542	>	ConfigGeneral.min_nonwildcard);
1543	>	va_end(args);
1544		return 0;
1545		}
1546
#	Line 2130 | Line 1554 | valid_wild_card(struct Client *source_p,
1554		*              - parse_flags bit map of things to test
1555		*              - pointer to user or string to parse into
1556		*              - pointer to host or NULL to parse into if non NULL
1557	<	*              - pointer to optional tkline time or NULL
1557	>	*              - pointer to optional tkline time or NULL
1558		*              - pointer to target_server to parse into if non NULL
1559		*              - pointer to reason to parse into
1560		*
#	Line 2152 | Line 1576 | valid_wild_card(struct Client *source_p,
1576		*/
1577		int
1578		parse_aline(const char *cmd, struct Client *source_p,
1579	<	int parc, char **parv,
1580	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1581	<	char **target_server, char **reason)
1579	>	int parc, char **parv,
1580	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1581	>	char **target_server, char **reason)
1582		{
1583		int found_tkline_time=0;
1584	<	static char def_reason[] = "No Reason";
1584	>	static char def_reason[] = CONF_NOREASON;
1585		static char user[USERLEN*4+1];
1586		static char host[HOSTLEN*4+1];
1587
#	Line 2175 | Line 1599 | parse_aline(const char *cmd, struct Clie
1599		*tkline_time = found_tkline_time;
1600		else
1601		{
1602	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
2179	<	me.name, source_p->name, cmd);
1602	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1603		return -1;
1604		}
1605		}
1606
1607		if (parc == 0)
1608		{
1609	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
2187	<	me.name, source_p->name, cmd);
1609	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1610		return -1;
1611		}
1612
#	Line 2198 | Line 1620 | parse_aline(const char *cmd, struct Clie
1620		*up_p = user;
1621		*h_p = host;
1622		}
1623	<
1623	>
1624		parc--;
1625		parv++;
1626
#	Line 2211 | Line 1633 | parse_aline(const char *cmd, struct Clie
1633
1634		if (target_server == NULL)
1635		{
1636	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1637	<	me.name, source_p->name, cmd);
2216	<	return -1;
1636	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1637	>	return -1;
1638		}
1639
1640		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1641		{
1642	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
2222	<	me.name, source_p->name, "remoteban");
1642	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1643		return -1;
1644		}
1645
1646		if (parc == 0 || EmptyString(*parv))
1647		{
1648	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1649	<	me.name, source_p->name, cmd);
2230	<	return -1;
1648	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1649	>	return -1;
1650		}
1651
1652		*target_server = *parv;
#	Line 2240 | Line 1659 | parse_aline(const char *cmd, struct Clie
1659		* caller probably NULL'd it first, but no harm to do it again -db
1660		*/
1661		if (target_server != NULL)
1662	<	*target_server = NULL;
1662	>	*target_server = NULL;
1663		}
1664		}
1665
#	Line 2248 | Line 1667 | parse_aline(const char *cmd, struct Clie
1667		{
1668		if (strchr(user, '!') != NULL)
1669		{
1670	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
2252	<	me.name, source_p->name);
1670	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1671		return -1;
1672		}
1673
#	Line 2266 | Line 1684 | parse_aline(const char *cmd, struct Clie
1684		{
1685		*reason = *parv;
1686		if (!valid_comment(source_p, *reason, 1))
1687	<	return -1;
1687	>	return -1;
1688		}
1689		else
1690		*reason = def_reason;
#	Line 2305 | Line 1723 | find_user_host(struct Client *source_p,
1723		{
1724		*(hostp++) = '\0';                       /* short and squat */
1725		if (*user_host_or_nick)
1726	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1726	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1727		else
1728	<	strcpy(luser, "*");
1728	>	strcpy(luser, "*");
1729	>
1730		if (*hostp)
1731	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1731	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1732		else
1733	<	strcpy(lhost, "*");
1733	>	strcpy(lhost, "*");
1734		}
1735		else
1736		{
1737		luser[0] = '*';             /* no @ found, assume its *@somehost */
1738	<	luser[1] = '\0';
1738	>	luser[1] = '\0';
1739		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1740		}
1741	<
1741	>
1742		return 1;
1743		}
1744		else
1745		{
1746		/* Try to find user@host mask from nick */
1747		/* Okay to use source_p as the first param, because source_p == client_p */
1748	<	if ((target_p =
1749	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
1750	<	return 0;
1748	>	if ((target_p =
1749	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1750	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1751
1752		if (IsExemptKline(target_p))
1753		{
1754		if (!IsServer(source_p))
1755	<	sendto_one(source_p,
2337	<	":%s NOTICE %s :%s is E-lined",
2338	<	me.name, source_p->name, target_p->name);
1755	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1756		return 0;
1757		}
1758
#	Line 2396 | Line 1813 | match_conf_password(const char *password
1813		else
1814		encr = password;
1815
1816	<	return !strcmp(encr, conf->passwd);
1816	>	return encr && !strcmp(encr, conf->passwd);
1817		}
1818
1819		/*
#	Line 2404 | Line 1821 | match_conf_password(const char *password
1821		*
1822		* inputs       - client sending the cluster
1823		*              - command name "KLINE" "XLINE" etc.
1824	<	*              - capab -- CAP_KLN etc. from s_serv.h
1824	>	*              - capab -- CAP_KLN etc. from server.h
1825		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1826		*              - pattern and args to send along
1827		* output       - none
#	Line 2416 | Line 1833 | cluster_a_line(struct Client *source_p,
1833		int capab, int cluster_type, const char *pattern, ...)
1834		{
1835		va_list args;
1836	<	char buffer[IRCD_BUFSIZE];
1836	>	char buffer[IRCD_BUFSIZE] = "";
1837		const dlink_node *ptr = NULL;
1838
1839		va_start(args, pattern);
#	Line 2429 | Line 1846 | cluster_a_line(struct Client *source_p,
1846
1847		if (conf->flags & cluster_type)
1848		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1849	<	"%s %s %s", command, conf->name, buffer);
1849	>	"%s %s %s", command, conf->name, buffer);
1850		}
1851		}
1852
#	Line 2477 | Line 1894 | split_nuh(struct split_nuh_item *const i
1894		{
1895		*p = '\0';
1896
1897	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1897	>	if (iptr->nickptr && *iptr->nuhmask)
1898		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1899
1900	<	if ((q = strchr(++p, '@'))) {
1900	>	if ((q = strchr(++p, '@')))
1901	>	{
1902		*q++ = '\0';
1903
1904	<	if (*p != '\0')
1904	>	if (*p)
1905		strlcpy(iptr->userptr, p, iptr->usersize);
1906
1907	<	if (*q != '\0')
1907	>	if (*q)
1908		strlcpy(iptr->hostptr, q, iptr->hostsize);
1909		}
1910		else
1911		{
1912	<	if (*p != '\0')
1912	>	if (*p)
1913		strlcpy(iptr->userptr, p, iptr->usersize);
1914		}
1915		}
#	Line 2503 | Line 1921 | split_nuh(struct split_nuh_item *const i
1921		/* if found a @ */
1922		*p++ = '\0';
1923
1924	<	if (*iptr->nuhmask != '\0')
1924	>	if (*iptr->nuhmask)
1925		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1926
1927	<	if (*p != '\0')
1927	>	if (*p)
1928		strlcpy(iptr->hostptr, p, iptr->hostsize);
1929		}
1930		else

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)