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 1832 by michael, Fri Apr 19 19:16:09 2013 UTC vs.
Revision 6367 by michael, Wed Aug 19 10:25:00 2015 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-2015 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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
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"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
34	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 42 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
45	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "mempool.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54		#include "conf_db.h"
55		#include "conf_class.h"
56	+	#include "motd.h"
57	+	#include "ipcache.h"
58	+	#include "isupport.h"
59
60	<	struct config_server_hide ConfigServerHide;
60	>
61	>	struct config_channel_entry ConfigChannel;
62	>	struct config_serverhide_entry ConfigServerHide;
63	>	struct config_general_entry ConfigGeneral;
64	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	>	struct config_serverinfo_entry ConfigServerInfo;
66	>	struct config_admin_entry ConfigAdminInfo;
67	>	struct conf_parser_context conf_parser_ctx;
68
69		/* general conf items link list root, other than k lines etc. */
70	<	dlink_list service_items = { NULL, NULL, 0 };
71	<	dlink_list server_items  = { NULL, NULL, 0 };
72	<	dlink_list cluster_items = { NULL, NULL, 0 };
73	<	dlink_list oconf_items   = { NULL, NULL, 0 };
74	<	dlink_list uconf_items   = { NULL, NULL, 0 };
75	<	dlink_list xconf_items   = { NULL, NULL, 0 };
76	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
77	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
68	<	dlink_list nresv_items   = { NULL, NULL, 0 };
69	<	dlink_list temporary_resv = { NULL, NULL, 0 };
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list oconf_items;
74	>	dlink_list uconf_items;
75	>	dlink_list xconf_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
82		extern int yyparse(); /* defined in y.tab.c */
83
76	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
77	–
78	–	/* internally defined functions */
79	–	static void read_conf(FILE *);
80	–	static void clear_out_old_conf(void);
81	–	static void expire_tklines(dlink_list *);
82	–	static void garbage_collect_ip_entries(void);
83	–	static int hash_ip(struct irc_ssaddr *);
84	–	static int verify_access(struct Client *);
85	–	static int attach_iline(struct Client *, struct MaskItem *);
86	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
87	–	static dlink_list *map_to_list(enum maskitem_type);
88	–	static struct MaskItem *find_regexp_kline(const char *[]);
89	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
90	–
91	–
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 mp_pool_t *ip_entry_pool = NULL;
108	–	static int ip_entries_count = 0;
109	–
84
85		/* conf_dns_callback()
86		*
#	Line 119 | Line 93 | static int ip_entries_count = 0;
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98	<	struct MaskItem *conf = vptr;
98	>	struct MaskItem *const conf = vptr;
99
100		conf->dns_pending = 0;
101
102	<	if (addr != NULL)
102	>	if (addr)
103		memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105		conf->dns_failed = 1;
#	Line 140 | Line 114 | conf_dns_callback(void *vptr, const stru
114		static void
115		conf_dns_lookup(struct MaskItem *conf)
116		{
117	<	if (!conf->dns_pending)
117	>	if (conf->dns_pending)
118	>	return;
119	>
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126	>	}
127	>
128	>	/* map_to_list()
129	>	*
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133	>	*/
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136	>	{
137	>	switch (type)
138		{
139	<	conf->dns_pending = 1;
140	<	gethost_byname(conf_dns_callback, conf, conf->host);
139	>	case CONF_XLINE:
140	>	return &xconf_items;
141	>	break;
142	>	case CONF_ULINE:
143	>	return &uconf_items;
144	>	break;
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147	>	break;
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150	>	break;
151	>	case CONF_OPER:
152	>	return &oconf_items;
153	>	break;
154	>	case CONF_SERVER:
155	>	return &server_items;
156	>	break;
157	>	case CONF_SERVICE:
158	>	return &service_items;
159	>	break;
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162	>	break;
163	>	default:
164	>	return NULL;
165		}
166		}
167
168		struct MaskItem *
169		conf_make(enum maskitem_type type)
170		{
171	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
171	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
172		dlink_list *list = NULL;
173
174		conf->type   = type;
#	Line 165 | Line 183 | conf_make(enum maskitem_type type)
183		void
184		conf_free(struct MaskItem *conf)
185		{
186	<	dlink_node *ptr = NULL, *ptr_next = NULL;
186	>	dlink_node *node = NULL, *node_next = NULL;
187		dlink_list *list = NULL;
188
189	<	if (conf->node.next)
190	<	if ((list = map_to_list(conf->type)))
173	<	dlinkDelete(&conf->node, list);
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192		MyFree(conf->name);
193
194		if (conf->dns_pending)
195		delete_resolver_queries(conf);
196	<	if (conf->passwd != NULL)
196	>	if (conf->passwd)
197		memset(conf->passwd, 0, strlen(conf->passwd));
198	<	if (conf->spasswd != NULL)
198	>	if (conf->spasswd)
199		memset(conf->spasswd, 0, strlen(conf->spasswd));
200
201		conf->class = NULL;
#	Line 186 | Line 203 | conf_free(struct MaskItem *conf)
203		MyFree(conf->passwd);
204		MyFree(conf->spasswd);
205		MyFree(conf->reason);
206	+	MyFree(conf->certfp);
207	+	MyFree(conf->whois);
208		MyFree(conf->user);
209		MyFree(conf->host);
191	–	MyFree(conf->regexuser);
192	–	MyFree(conf->regexhost);
210		#ifdef HAVE_LIBCRYPTO
211		MyFree(conf->cipher_list);
212
213		if (conf->rsa_public_key)
214		RSA_free(conf->rsa_public_key);
215		#endif
216	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
216	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217		{
218	<	MyFree(ptr->data);
219	<	free_dlink_node(ptr);
218	>	MyFree(node->data);
219	>	dlinkDelete(node, &conf->hub_list);
220	>	free_dlink_node(node);
221		}
222
223	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
223	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224		{
225	<	MyFree(ptr->data);
226	<	free_dlink_node(ptr);
225	>	MyFree(node->data);
226	>	dlinkDelete(node, &conf->leaf_list);
227	>	free_dlink_node(node);
228		}
229
230	<	MyFree(conf);
212	<	}
213	<
214	<	static const struct shared_flags
215	<	{
216	<	const unsigned int type;
217	<	const unsigned char letter;
218	<	} flag_table[] = {
219	<	{ SHARED_KLINE,   'K' },
220	<	{ SHARED_UNKLINE, 'U' },
221	<	{ SHARED_XLINE,   'X' },
222	<	{ SHARED_UNXLINE, 'Y' },
223	<	{ SHARED_RESV,    'Q' },
224	<	{ SHARED_UNRESV,  'R' },
225	<	{ SHARED_LOCOPS,  'L' },
226	<	{ SHARED_DLINE,   'D' },
227	<	{ SHARED_UNDLINE, 'E' },
228	<	{ 0, '\0' }
229	<	};
230	<
231	<	/*
232	<	* inputs       - pointer to client requesting confitem report
233	<	*              - ConfType to report
234	<	* output       - none
235	<	* side effects -
236	<	*/
237	<	void
238	<	report_confitem_types(struct Client *source_p, enum maskitem_type type)
239	<	{
240	<	dlink_node *ptr = NULL, *dptr = NULL;
241	<	struct MaskItem *conf = NULL;
242	<	const struct ClassItem *class = NULL;
243	<	const struct shared_flags *shared = NULL;
244	<	char buf[12];
245	<	char *p = NULL;
246	<
247	<	switch (type)
230	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
231		{
232	<	case CONF_XLINE:
250	<	DLINK_FOREACH(ptr, xconf_items.head)
251	<	{
252	<	conf = ptr->data;
253	<
254	<	sendto_one(source_p, RPL_STATSXLINE,
255	<	me.name, source_p->name,
256	<	conf->until ? "x": "X", conf->count,
257	<	conf->name, conf->reason);
258	<	}
259	<	break;
260	<
261	<	#ifdef HAVE_LIBPCRE
262	<	case CONF_RXLINE:
263	<	DLINK_FOREACH(ptr, rxconf_items.head)
264	<	{
265	<	conf = ptr->data;
266	<
267	<	sendto_one(source_p, RPL_STATSXLINE,
268	<	me.name, source_p->name,
269	<	"XR", conf->count,
270	<	conf->name, conf->reason);
271	<	}
272	<	break;
273	<
274	<	case CONF_RKLINE:
275	<	DLINK_FOREACH(ptr, rkconf_items.head)
276	<	{
277	<	conf = ptr->data;
278	<
279	<	sendto_one(source_p, RPL_STATSKLINE, me.name,
280	<	source_p->name, "KR", conf->host, conf->user,
281	<	conf->reason);
282	<	}
283	<	break;
284	<	#endif
285	<
286	<	case CONF_ULINE:
287	<	shared = flag_table;
288	<	DLINK_FOREACH(ptr, uconf_items.head)
289	<	{
290	<	conf = ptr->data;
291	<
292	<	p = buf;
293	<
294	<	*p++ = 'c';
295	<	for (; shared->type; ++shared)
296	<	if (shared->type & conf->flags)
297	<	*p++ = shared->letter;
298	<	else
299	<	*p++ = ToLower(shared->letter);
300	<
301	<	sendto_one(source_p, RPL_STATSULINE,
302	<	me.name, source_p->name, conf->name,
303	<	conf->user?conf->user: "*",
304	<	conf->host?conf->host: "*", buf);
305	<	}
306	<
307	<	shared = flag_table;
308	<	DLINK_FOREACH(ptr, cluster_items.head)
309	<	{
310	<	conf = ptr->data;
311	<
312	<	p = buf;
313	<
314	<	*p++ = 'C';
315	<	for (; shared->type; ++shared)
316	<	if (shared->type & conf->flags)
317	<	*p++ = shared->letter;
318	<	else
319	<	*p++ = ToLower(shared->letter);
320	<
321	<	sendto_one(source_p, RPL_STATSULINE,
322	<	me.name, source_p->name, conf->name,
323	<	"*", "*", buf);
324	<	}
325	<
326	<	break;
327	<
328	<	case CONF_OPER:
329	<	DLINK_FOREACH(ptr, oconf_items.head)
330	<	{
331	<	conf = ptr->data;
332	<
333	<	/* Don't allow non opers to see oper privs */
334	<	if (HasUMode(source_p, UMODE_OPER))
335	<	sendto_one(source_p, RPL_STATSOLINE,
336	<	me.name, source_p->name, 'O', conf->user, conf->host,
337	<	conf->name, oper_privs_as_string(conf->port),
338	<	conf->class ? conf->class->name : "<default>");
339	<	else
340	<	sendto_one(source_p, RPL_STATSOLINE,
341	<	me.name, source_p->name, 'O', conf->user, conf->host,
342	<	conf->name, "0",
343	<	conf->class ? conf->class->name : "<default>");
344	<	}
345	<	break;
346	<
347	<	case CONF_CLASS:
348	<	DLINK_FOREACH(ptr, class_get_list()->head)
349	<	{
350	<	class = ptr->data;
351	<	sendto_one(source_p, RPL_STATSYLINE,
352	<	me.name, source_p->name, 'Y',
353	<	class->name, class->ping_freq,
354	<	class->con_freq,
355	<	class->max_total, class->max_sendq,
356	<	class->max_recvq,
357	<	class->ref_count,
358	<	class->number_per_cidr, class->cidr_bitlen_ipv4,
359	<	class->number_per_cidr, class->cidr_bitlen_ipv6,
360	<	class->active ? "active" : "disabled");
361	<	}
362	<	break;
363	<
364	<	case CONF_SERVICE:
365	<	DLINK_FOREACH(ptr, service_items.head)
366	<	{
367	<	conf = ptr->data;
368	<	sendto_one(source_p, RPL_STATSSERVICE,
369	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
370	<	}
371	<	break;
372	<
373	<	case CONF_SERVER:
374	<	DLINK_FOREACH(ptr, server_items.head)
375	<	{
376	<	p = buf;
377	<	conf = ptr->data;
378	<
379	<	buf[0] = '\0';
380	<
381	<	if (IsConfAllowAutoConn(conf))
382	<	*p++ = 'A';
383	<	if (IsConfSSL(conf))
384	<	*p++ = 'S';
385	<	if (buf[0] == '\0')
386	<	*p++ = '*';
232	>	struct exempt *exptr = node->data;
233
234	<	*p = '\0';
235	<
236	<	/*
237	<	* Allow admins to see actual ips unless hide_server_ips is enabled
238	<	*/
393	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
394	<	sendto_one(source_p, RPL_STATSCLINE,
395	<	me.name, source_p->name, 'C', conf->host,
396	<	buf, conf->name, conf->port,
397	<	conf->class ? conf->class->name : "<default>");
398	<	else
399	<	sendto_one(source_p, RPL_STATSCLINE,
400	<	me.name, source_p->name, 'C',
401	<	"*@127.0.0.1", buf, conf->name, conf->port,
402	<	conf->class ? conf->class->name : "<default>");
403	<	}
404	<	break;
405	<
406	<	case CONF_HUB:
407	<	DLINK_FOREACH(ptr, server_items.head)
408	<	{
409	<	conf = ptr->data;
410	<
411	<	DLINK_FOREACH(dptr, conf->hub_list.head)
412	<	sendto_one(source_p, RPL_STATSHLINE, me.name,
413	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
414	<	}
415	<
416	<	DLINK_FOREACH(ptr, server_items.head)
417	<	{
418	<	conf = ptr->data;
419	<
420	<	DLINK_FOREACH(dptr, conf->leaf_list.head)
421	<	sendto_one(source_p, RPL_STATSLLINE, me.name,
422	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
423	<	}
424	<
425	<	break;
426	<
427	<	default:
428	<	break;
429	<	}
430	<	}
431	<
432	<	/* check_client()
433	<	*
434	<	* inputs       - pointer to client
435	<	* output       - 0 = Success
436	<	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
437	<	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
438	<	*                I_LINE_FULL       (-3) = I-line is full
439	<	*                TOO_MANY          (-4) = Too many connections from hostname
440	<	*                BANNED_CLIENT     (-5) = K-lined
441	<	* side effects - Ordinary client access check.
442	<	*                Look for conf lines which have the same
443	<	*                status as the flags passed.
444	<	*/
445	<	int
446	<	check_client(struct Client *source_p)
447	<	{
448	<	int i;
449	<
450	<	if ((i = verify_access(source_p)))
451	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
452	<	source_p->name, source_p->sockhost);
453	<
454	<	switch (i)
455	<	{
456	<	case TOO_MANY:
457	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
458	<	"Too many on IP for %s (%s).",
459	<	get_client_name(source_p, SHOW_IP),
460	<	source_p->sockhost);
461	<	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
462	<	get_client_name(source_p, SHOW_IP));
463	<	++ServerStats.is_ref;
464	<	exit_client(source_p, &me, "No more connections allowed on that IP");
465	<	break;
466	<
467	<	case I_LINE_FULL:
468	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
469	<	"auth{} block is full for %s (%s).",
470	<	get_client_name(source_p, SHOW_IP),
471	<	source_p->sockhost);
472	<	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
473	<	get_client_name(source_p, SHOW_IP));
474	<	++ServerStats.is_ref;
475	<	exit_client(source_p, &me,
476	<	"No more connections allowed in your connection class");
477	<	break;
478	<
479	<	case NOT_AUTHORIZED:
480	<	++ServerStats.is_ref;
481	<	/* jdc - lists server name & port connections are on */
482	<	/*       a purely cosmetical change */
483	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
484	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
485	<	get_client_name(source_p, SHOW_IP),
486	<	source_p->sockhost,
487	<	source_p->localClient->listener->name,
488	<	source_p->localClient->listener->port);
489	<	ilog(LOG_TYPE_IRCD,
490	<	"Unauthorized client connection from %s on [%s/%u].",
491	<	get_client_name(source_p, SHOW_IP),
492	<	source_p->localClient->listener->name,
493	<	source_p->localClient->listener->port);
494	<
495	<	exit_client(source_p, &me, "You are not authorized to use this server");
496	<	break;
497	<
498	<	case BANNED_CLIENT:
499	<	exit_client(source_p, &me, "Banned");
500	<	++ServerStats.is_ref;
501	<	break;
502	<
503	<	case 0:
504	<	default:
505	<	break;
506	<	}
507	<
508	<	return (i < 0 ? 0 : 1);
509	<	}
510	<
511	<	/* verify_access()
512	<	*
513	<	* inputs       - pointer to client to verify
514	<	* output       - 0 if success -'ve if not
515	<	* side effect  - find the first (best) I line to attach.
516	<	*/
517	<	static int
518	<	verify_access(struct Client *client_p)
519	<	{
520	<	struct MaskItem *conf = NULL, *rkconf = NULL;
521	<	char non_ident[USERLEN + 1] = { '~', '\0' };
522	<	const char *uhi[3];
523	<
524	<	if (IsGotId(client_p))
525	<	{
526	<	conf = find_address_conf(client_p->host, client_p->username,
527	<	&client_p->localClient->ip,
528	<	client_p->localClient->aftype,
529	<	client_p->localClient->passwd);
530	<	}
531	<	else
532	<	{
533	<	strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
534	<	conf = find_address_conf(client_p->host,non_ident,
535	<	&client_p->localClient->ip,
536	<	client_p->localClient->aftype,
537	<	client_p->localClient->passwd);
538	<	}
539	<
540	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
541	<	uhi[1] = client_p->host;
542	<	uhi[2] = client_p->sockhost;
543	<
544	<	rkconf = find_regexp_kline(uhi);
545	<
546	<	if (conf != NULL)
547	<	{
548	<	if (IsConfClient(conf) && !rkconf)
549	<	{
550	<	if (IsConfRedir(conf))
551	<	{
552	<	sendto_one(client_p, RPL_REDIR,
553	<	me.name, client_p->name,
554	<	conf->name ? conf->name : "",
555	<	conf->port);
556	<	return(NOT_AUTHORIZED);
557	<	}
558	<
559	<	if (IsConfDoIdentd(conf))
560	<	SetNeedId(client_p);
561	<
562	<	/* Thanks for spoof idea amm */
563	<	if (IsConfDoSpoofIp(conf))
564	<	{
565	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
566	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
567	<	"%s spoofing: %s as %s",
568	<	client_p->name, client_p->host, conf->name);
569	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
570	<	SetIPSpoof(client_p);
571	<	}
572	<
573	<	return(attach_iline(client_p, conf));
574	<	}
575	<	else if (rkconf || IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
576	<	{
577	<	/* XXX */
578	<	conf = rkconf ? rkconf : conf;
579	<	if (IsConfGline(conf))
580	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
581	<	client_p->name);
582	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
583	<	me.name, client_p->name, conf->reason);
584	<	return(BANNED_CLIENT);
585	<	}
234	>	dlinkDelete(node, &conf->exempt_list);
235	>	MyFree(exptr->name);
236	>	MyFree(exptr->user);
237	>	MyFree(exptr->host);
238	>	MyFree(exptr);
239		}
240
241	<	return(NOT_AUTHORIZED);
241	>	MyFree(conf);
242		}
243
244		/* attach_iline()
245		*
246	<	* inputs       - client pointer
247	<	*              - conf pointer
248	<	* output       -
249	<	* side effects - do actual attach
246	>	* inputs       - client pointer
247	>	*              - conf pointer
248	>	* output       -
249	>	* side effects - do actual attach
250		*/
251		static int
252		attach_iline(struct Client *client_p, struct MaskItem *conf)
253		{
254	<	struct ClassItem *class = NULL;
254	>	const struct ClassItem *const class = conf->class;
255		struct ip_entry *ip_found;
256		int a_limit_reached = 0;
257		unsigned int local = 0, global = 0, ident = 0;
258
259	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
259	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260		ip_found->count++;
261	<	SetIpHash(client_p);
609	<
610	<	if (conf->class == NULL)
611	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
612	<
613	<	class = conf->class;
261	>	AddFlag(client_p, FLAGS_IPHASH);
262
263		count_user_host(client_p->username, client_p->host,
264		&global, &local, &ident);
#	Line 619 | Line 267 | attach_iline(struct Client *client_p, st
267		* setting a_limit_reached if any limit is reached.
268		* - Dianora
269		*/
270	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
270	>	if (class->max_total && class->ref_count >= class->max_total)
271		a_limit_reached = 1;
272	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
272	>	else if (class->max_perip && ip_found->count > class->max_perip)
273		a_limit_reached = 1;
274	<	else if (class->max_local != 0 && local >= class->max_local)
274	>	else if (class->max_local && local >= class->max_local)
275		a_limit_reached = 1;
276	<	else if (class->max_global != 0 && global >= class->max_global)
276	>	else if (class->max_global && global >= class->max_global)
277		a_limit_reached = 1;
278	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
278	>	else if (class->max_ident && ident >= class->max_ident &&
279		client_p->username[0] != '~')
280		a_limit_reached = 1;
281
#	Line 636 | Line 284 | attach_iline(struct Client *client_p, st
284		if (!IsConfExemptLimits(conf))
285		return TOO_MANY;   /* Already at maximum allowed */
286
287	<	sendto_one(client_p,
288	<	":%s NOTICE %s :*** Your connection class is full, "
641	<	"but you have exceed_limit = yes;", me.name, client_p->name);
287	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
288	>	"but you have exceed_limit = yes;");
289		}
290
291		return attach_conf(client_p, conf);
292		}
293
294	<	/* init_ip_hash_table()
648	<	*
649	<	* inputs               - NONE
650	<	* output               - NONE
651	<	* side effects         - allocate memory for ip_entry(s)
652	<	*                      - clear the ip hash table
653	<	*/
654	<	void
655	<	init_ip_hash_table(void)
656	<	{
657	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry),
658	<	2 * hard_fdlimit);
659	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
660	<	}
661	<
662	<	/* find_or_add_ip()
663	<	*
664	<	* inputs       - pointer to struct irc_ssaddr
665	<	* output       - pointer to a struct ip_entry
666	<	* side effects -
294	>	/* verify_access()
295		*
296	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
297	<	* count set to 0.
296	>	* inputs       - pointer to client to verify
297	>	* output       - 0 if success -'ve if not
298	>	* side effect  - find the first (best) I line to attach.
299		*/
300	<	static struct ip_entry *
301	<	find_or_add_ip(struct irc_ssaddr *ip_in)
300	>	static int
301	>	verify_access(struct Client *client_p)
302		{
303	<	struct ip_entry *ptr, *newptr;
675	<	int hash_index = hash_ip(ip_in), res;
676	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
677	<	#ifdef IPV6
678	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
679	<	#endif
303	>	struct MaskItem *conf = NULL;
304
305	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
305	>	if (HasFlag(client_p, FLAGS_GOTID))
306		{
307	<	#ifdef IPV6
308	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
309	<	continue;
310	<	if (ip_in->ss.ss_family == AF_INET6)
687	<	{
688	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
689	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
690	<	}
691	<	else
692	<	#endif
693	<	{
694	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
695	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
696	<	}
697	<	if (res == 0)
698	<	{
699	<	/* Found entry already in hash, return it. */
700	<	return ptr;
701	<	}
307	>	conf = find_address_conf(client_p->host, client_p->username,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311		}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315
316	<	if (ip_entries_count >= 2 * hard_fdlimit)
317	<	garbage_collect_ip_entries();
318	<
319	<	newptr = mp_pool_get(ip_entry_pool);
320	<	memset(newptr, 0, sizeof(*newptr));
321	<	ip_entries_count++;
710	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
711	<
712	<	newptr->next = ip_hash_table[hash_index];
713	<	ip_hash_table[hash_index] = newptr;
316	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	>	conf = find_address_conf(client_p->host, non_ident,
318	>	&client_p->connection->ip,
319	>	client_p->connection->aftype,
320	>	client_p->connection->password);
321	>	}
322
323	<	return newptr;
324	<	}
323	>	if (!conf)
324	>	return NOT_AUTHORIZED;
325
326	<	/* remove_one_ip()
719	<	*
720	<	* inputs        - unsigned long IP address value
721	<	* output        - NONE
722	<	* side effects  - The ip address given, is looked up in ip hash table
723	<	*                 and number of ip#'s for that ip decremented.
724	<	*                 If ip # count reaches 0 and has expired,
725	<	*                 the struct ip_entry is returned to the ip_entry_heap
726	<	*/
727	<	void
728	<	remove_one_ip(struct irc_ssaddr *ip_in)
729	<	{
730	<	struct ip_entry *ptr;
731	<	struct ip_entry *last_ptr = NULL;
732	<	int hash_index = hash_ip(ip_in), res;
733	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
734	<	#ifdef IPV6
735	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
736	<	#endif
326	>	assert(IsConfClient(conf) || IsConfKill(conf));
327
328	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
328	>	if (IsConfClient(conf))
329		{
330	<	#ifdef IPV6
741	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
742	<	continue;
743	<	if (ip_in->ss.ss_family == AF_INET6)
744	<	{
745	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
746	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
747	<	}
748	<	else
749	<	#endif
330	>	if (IsConfRedir(conf))
331		{
332	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
333	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
332	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	>	conf->name ? conf->name : "",
334	>	conf->port);
335	>	return NOT_AUTHORIZED;
336		}
337	<	if (res)
338	<	continue;
756	<	if (ptr->count > 0)
757	<	ptr->count--;
758	<	if (ptr->count == 0 &&
759	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
337	>
338	>	if (IsConfDoSpoofIp(conf))
339		{
340	<	if (last_ptr != NULL)
341	<	last_ptr->next = ptr->next;
342	<	else
764	<	ip_hash_table[hash_index] = ptr->next;
340	>	if (IsConfSpoofNotice(conf))
341	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	>	client_p->name, client_p->host, conf->name);
343
344	<	mp_pool_release(ptr);
767	<	ip_entries_count--;
768	<	return;
344	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345		}
770	–	last_ptr = ptr;
771	–	}
772	–	}
773	–
774	–	/* hash_ip()
775	–	*
776	–	* input        - pointer to an irc_inaddr
777	–	* output       - integer value used as index into hash table
778	–	* side effects - hopefully, none
779	–	*/
780	–	static int
781	–	hash_ip(struct irc_ssaddr *addr)
782	–	{
783	–	if (addr->ss.ss_family == AF_INET)
784	–	{
785	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
786	–	int hash;
787	–	uint32_t ip;
346
347	<	ip   = ntohl(v4->sin_addr.s_addr);
790	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
791	<	return hash;
792	<	}
793	<	#ifdef IPV6
794	<	else
795	<	{
796	<	int hash;
797	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
798	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
799	<
800	<	hash  = ip[0] ^ ip[3];
801	<	hash ^= hash >> 16;
802	<	hash ^= hash >> 8;
803	<	hash  = hash & (IP_HASH_SIZE - 1);
804	<	return hash;
347	>	return attach_iline(client_p, conf);
348		}
349	<	#else
350	<	return 0;
351	<	#endif
349	>
350	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	>	return BANNED_CLIENT;
352		}
353
354	<	/* count_ip_hash()
812	<	*
813	<	* inputs        - pointer to counter of number of ips hashed
814	<	*               - pointer to memory used for ip hash
815	<	* output        - returned via pointers input
816	<	* side effects  - NONE
354	>	/* check_client()
355		*
356	<	* number of hashed ip #'s is counted up, plus the amount of memory
357	<	* used in the hash.
356	>	* inputs       - pointer to client
357	>	* output       - 0 = Success
358	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
359	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
360	>	*                I_LINE_FULL       (-3) = I-line is full
361	>	*                TOO_MANY          (-4) = Too many connections from hostname
362	>	*                BANNED_CLIENT     (-5) = K-lined
363	>	* side effects - Ordinary client access check.
364	>	*                Look for conf lines which have the same
365	>	*                status as the flags passed.
366		*/
367	<	void
368	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
367	>	int
368	>	check_client(struct Client *source_p)
369		{
824	–	struct ip_entry *ptr;
370		int i;
371
372	<	*number_ips_stored = 0;
373	<	*mem_ips_stored    = 0;
372	>	if ((i = verify_access(source_p)))
373	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
374	>	source_p->name, source_p->sockhost);
375
376	<	for (i = 0; i < IP_HASH_SIZE; i++)
376	>	switch (i)
377		{
378	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
379	<	{
380	<	*number_ips_stored += 1;
381	<	*mem_ips_stored += sizeof(struct ip_entry);
382	<	}
383	<	}
384	<	}
378	>	case TOO_MANY:
379	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
380	>	"Too many on IP for %s (%s).",
381	>	get_client_name(source_p, SHOW_IP),
382	>	source_p->sockhost);
383	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
384	>	get_client_name(source_p, SHOW_IP));
385	>	++ServerStats.is_ref;
386	>	exit_client(source_p, "No more connections allowed on that IP");
387	>	break;
388
389	<	/* garbage_collect_ip_entries()
390	<	*
391	<	* input        - NONE
392	<	* output       - NONE
393	<	* side effects - free up all ip entries with no connections
394	<	*/
395	<	static void
396	<	garbage_collect_ip_entries(void)
397	<	{
398	<	struct ip_entry *ptr;
850	<	struct ip_entry *last_ptr;
851	<	struct ip_entry *next_ptr;
852	<	int i;
389	>	case I_LINE_FULL:
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	>	"auth {} block is full for %s (%s).",
392	>	get_client_name(source_p, SHOW_IP),
393	>	source_p->sockhost);
394	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
395	>	get_client_name(source_p, SHOW_IP));
396	>	++ServerStats.is_ref;
397	>	exit_client(source_p, "No more connections allowed in your connection class");
398	>	break;
399
400	<	for (i = 0; i < IP_HASH_SIZE; i++)
401	<	{
402	<	last_ptr = NULL;
400	>	case NOT_AUTHORIZED:
401	>	/* jdc - lists server name & port connections are on */
402	>	/*       a purely cosmetical change */
403	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
404	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->sockhost,
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410	>	get_client_name(source_p, SHOW_IP),
411	>	source_p->connection->listener->name,
412	>	source_p->connection->listener->port);
413
414	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
415	<	{
416	<	next_ptr = ptr->next;
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "You are not authorized to use this server");
416	>	break;
417
418	<	if (ptr->count == 0 &&
419	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
420	<	{
421	<	if (last_ptr != NULL)
422	<	last_ptr->next = ptr->next;
423	<	else
424	<	ip_hash_table[i] = ptr->next;
425	<	mp_pool_release(ptr);
870	<	ip_entries_count--;
871	<	}
872	<	else
873	<	last_ptr = ptr;
874	<	}
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422	>
423	>	case 0:
424	>	default:
425	>	break;
426		}
427	+
428	+	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 886 | Line 439 | garbage_collect_ip_entries(void)
439		void
440		detach_conf(struct Client *client_p, enum maskitem_type type)
441		{
442	<	dlink_node *ptr = NULL, *next_ptr = NULL;
442	>	dlink_node *node = NULL, *node_next = NULL;
443
444	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
444	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
445		{
446	<	struct MaskItem *conf = ptr->data;
446	>	struct MaskItem *conf = node->data;
447
448		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
449		assert(conf->ref_count > 0);
#	Line 899 | Line 452 | detach_conf(struct Client *client_p, enu
452		if (!(conf->type & type))
453		continue;
454
455	<	dlinkDelete(ptr, &client_p->localClient->confs);
456	<	free_dlink_node(ptr);
455	>	dlinkDelete(node, &client_p->connection->confs);
456	>	free_dlink_node(node);
457
458		if (conf->type == CONF_CLIENT)
459	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
459	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
460
461		if (--conf->class->ref_count == 0 && conf->class->active == 0)
462		{
#	Line 929 | Line 482 | detach_conf(struct Client *client_p, enu
482		int
483		attach_conf(struct Client *client_p, struct MaskItem *conf)
484		{
485	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
485	>	if (dlinkFind(&client_p->connection->confs, conf))
486		return 1;
487
488		if (conf->type == CONF_CLIENT)
489		if (cidr_limit_reached(IsConfExemptLimits(conf),
490	<	&client_p->localClient->ip, conf->class))
490	>	&client_p->connection->ip, conf->class))
491		return TOO_MANY;    /* Already at maximum allowed */
492
493		conf->class->ref_count++;
494		conf->ref_count++;
495
496	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
496	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
497
498		return 0;
499		}
#	Line 957 | Line 510 | int
510		attach_connect_block(struct Client *client_p, const char *name,
511		const char *host)
512		{
513	<	dlink_node *ptr;
961	<	struct MaskItem *conf = NULL;
513	>	dlink_node *node = NULL;
514
515	<	assert(client_p != NULL);
964	<	assert(host != NULL);
515	>	assert(host);
516
517	<	if (client_p == NULL || host == NULL)
967	<	return 0;
968	<
969	<	DLINK_FOREACH(ptr, server_items.head)
517	>	DLINK_FOREACH(node, server_items.head)
518		{
519	<	conf = ptr->data;
519	>	struct MaskItem *conf = node->data;
520
521		if (match(conf->name, name) || match(conf->host, host))
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
#	Line 992 | Line 540 | attach_connect_block(struct Client *clie
540		struct MaskItem *
541		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
542		{
543	<	dlink_node *ptr;
996	<	struct MaskItem* conf;
543	>	dlink_node *node = NULL;
544
545	<	DLINK_FOREACH(ptr, list->head)
545	>	DLINK_FOREACH(node, list->head)
546		{
547	<	conf = ptr->data;
548	<
547	>	struct MaskItem *conf = node->data;
548	>
549		if (conf->type == type)
550		{
551	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
552	<	!match(conf->name, name)))
1006	<	return conf;
551	>	if (conf->name && !irccmp(conf->name, name))
552	>	return conf;
553		}
554		}
555
556		return NULL;
557		}
558
1013	–	/* map_to_list()
1014	–	*
1015	–	* inputs       - ConfType conf
1016	–	* output       - pointer to dlink_list to use
1017	–	* side effects - none
1018	–	*/
1019	–	static dlink_list *
1020	–	map_to_list(enum maskitem_type type)
1021	–	{
1022	–	switch(type)
1023	–	{
1024	–	case CONF_RKLINE:
1025	–	return(&rkconf_items);
1026	–	break;
1027	–	case CONF_RXLINE:
1028	–	return(&rxconf_items);
1029	–	break;
1030	–	case CONF_XLINE:
1031	–	return(&xconf_items);
1032	–	break;
1033	–	case CONF_ULINE:
1034	–	return(&uconf_items);
1035	–	break;
1036	–	case CONF_NRESV:
1037	–	return(&nresv_items);
1038	–	break;
1039	–	case CONF_CRESV:
1040	–	return(&resv_channel_list);
1041	–	case CONF_OPER:
1042	–	return(&oconf_items);
1043	–	break;
1044	–	case CONF_SERVER:
1045	–	return(&server_items);
1046	–	break;
1047	–	case CONF_SERVICE:
1048	–	return(&service_items);
1049	–	break;
1050	–	case CONF_CLUSTER:
1051	–	return(&cluster_items);
1052	–	break;
1053	–	default:
1054	–	return NULL;
1055	–	}
1056	–	}
1057	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
#	Line 1069 | Line 570 | struct MaskItem *
570		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
571		const char *host, unsigned int flags)
572		{
573	<	dlink_node *ptr=NULL;
574	<	struct MaskItem *conf=NULL;
575	<	dlink_list *list_p = map_to_list(type);
573	>	dlink_node *node = NULL;
574	>	dlink_list *list = map_to_list(type);
575	>	struct MaskItem *conf = NULL;
576
577		switch (type)
578		{
1078	–	#ifdef HAVE_LIBPCRE
1079	–	case CONF_RXLINE:
1080	–	DLINK_FOREACH(ptr, list_p->head)
1081	–	{
1082	–	conf = ptr->data;
1083	–	assert(conf->regexuser);
1084	–
1085	–	if (!ircd_pcre_exec(conf->regexuser, name))
1086	–	return conf;
1087	–	}
1088	–	break;
1089	–	#endif
579		case CONF_SERVICE:
580	<	DLINK_FOREACH(ptr, list_p->head)
580	>	DLINK_FOREACH(node, list->head)
581		{
582	<	conf = ptr->data;
582	>	conf = node->data;
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
#	Line 1103 | Line 592 | find_matching_name_conf(enum maskitem_ty
592		case CONF_ULINE:
593		case CONF_NRESV:
594		case CONF_CRESV:
595	<	DLINK_FOREACH(ptr, list_p->head)
595	>	DLINK_FOREACH(node, list->head)
596		{
597	<	conf = ptr->data;
597	>	conf = node->data;
598
599		if (EmptyString(conf->name))
600	<	continue;
601	<	if ((name != NULL) && !match(conf->name, name))
600	>	continue;
601	>	if (name && !match(conf->name, name))
602		{
603	<	if ((user == NULL && (host == NULL)))
604	<	return conf;
605	<	if ((conf->flags & flags) != flags)
603	>	if ((user == NULL && (host == NULL)))
604	>	return conf;
605	>	if ((conf->flags & flags) != flags)
606		continue;
607	<	if (EmptyString(conf->user) || EmptyString(conf->host))
608	<	return conf;
609	<	if (!match(conf->user, user) && !match(conf->host, host))
610	<	return conf;
607	>	if (EmptyString(conf->user) || EmptyString(conf->host))
608	>	return conf;
609	>	if (!match(conf->user, user) && !match(conf->host, host))
610	>	return conf;
611		}
612		}
613		break;
614
615		case CONF_SERVER:
616	<	DLINK_FOREACH(ptr, list_p->head)
616	>	DLINK_FOREACH(node, list->head)
617		{
618	<	conf = ptr->data;
618	>	conf = node->data;
619
620	<	if ((name != NULL) && !match(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && !match(host, conf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
626	<
626	>
627		default:
628		break;
629		}
#	Line 1154 | Line 643 | struct MaskItem *
643		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
644		const char *user, const char *host)
645		{
646	<	dlink_node *ptr = NULL;
647	<	struct MaskItem *conf;
648	<	dlink_list *list_p = map_to_list(type);
646	>	dlink_node *node = NULL;
647	>	dlink_list *list = map_to_list(type);
648	>	struct MaskItem *conf = NULL;
649
650		switch(type)
651		{
1163	–	case CONF_RXLINE:
652		case CONF_XLINE:
653		case CONF_ULINE:
654		case CONF_NRESV:
655		case CONF_CRESV:
656
657	<	DLINK_FOREACH(ptr, list_p->head)
657	>	DLINK_FOREACH(node, list->head)
658		{
659	<	conf = ptr->data;
659	>	conf = node->data;
660
661		if (EmptyString(conf->name))
662	<	continue;
663	<
662	>	continue;
663	>
664		if (irccmp(conf->name, name) == 0)
665		{
666	<	if ((user == NULL && (host == NULL)))
667	<	return (conf);
668	<	if (EmptyString(conf->user) || EmptyString(conf->host))
669	<	return (conf);
670	<	if (!match(conf->user, user) && !match(conf->host, host))
671	<	return (conf);
666	>	if ((user == NULL && (host == NULL)))
667	>	return conf;
668	>	if (EmptyString(conf->user) || EmptyString(conf->host))
669	>	return conf;
670	>	if (!match(conf->user, user) && !match(conf->host, host))
671	>	return conf;
672		}
673		}
674		break;
675
676		case CONF_OPER:
677	<	DLINK_FOREACH(ptr, list_p->head)
677	>	DLINK_FOREACH(node, list->head)
678		{
679	<	conf = ptr->data;
679	>	conf = node->data;
680
681		if (EmptyString(conf->name))
682		continue;
#	Line 1209 | Line 697 | find_exact_name_conf(enum maskitem_type
697		return conf;
698		break;
699		case HM_IPV4:
700	<	if (who->localClient->aftype == AF_INET)
701	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
700	>	if (who->connection->aftype == AF_INET)
701	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
702		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
703		return conf;
704		break;
1217	–	#ifdef IPV6
705		case HM_IPV6:
706	<	if (who->localClient->aftype == AF_INET6)
707	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
706	>	if (who->connection->aftype == AF_INET6)
707	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
708		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
709		return conf;
710		break;
1224	–	#endif
711		default:
712		assert(0);
713		}
#	Line 1232 | Line 718 | find_exact_name_conf(enum maskitem_type
718		break;
719
720		case CONF_SERVER:
721	<	DLINK_FOREACH(ptr, list_p->head)
721	>	DLINK_FOREACH(node, list->head)
722		{
723	<	conf = ptr->data;
723	>	conf = node->data;
724
725		if (EmptyString(conf->name))
726	<	continue;
727	<
726	>	continue;
727	>
728		if (name == NULL)
729		{
730	<	if (EmptyString(conf->host))
731	<	continue;
732	<	if (irccmp(conf->host, host) == 0)
733	<	return(conf);
730	>	if (EmptyString(conf->host))
731	>	continue;
732	>	if (irccmp(conf->host, host) == 0)
733	>	return conf;
734		}
735		else if (irccmp(conf->name, name) == 0)
736	<	{
1251	<	return (conf);
1252	<	}
736	>	return conf;
737		}
738	+
739		break;
740
741		default:
742		break;
743		}
1259	–	return(NULL);
1260	–	}
744
745	<	/* rehash()
1263	<	*
1264	<	* Actual REHASH service routine. Called with sig == 0 if it has been called
1265	<	* as a result of an operator issuing this command, else assume it has been
1266	<	* called as a result of the server receiving a HUP signal.
1267	<	*/
1268	<	int
1269	<	rehash(int sig)
1270	<	{
1271	<	if (sig != 0)
1272	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1273	<	"Got signal SIGHUP, reloading ircd.conf file");
1274	<
1275	<	restart_resolver();
1276	<
1277	<	/* don't close listeners until we know we can go ahead with the rehash */
1278	<
1279	<	/* Check to see if we magically got(or lost) IPv6 support */
1280	<	check_can_use_v6();
1281	<
1282	<	read_conf_files(0);
1283	<
1284	<	if (ServerInfo.description != NULL)
1285	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1286	<
1287	<	load_conf_modules();
1288	<
1289	<	rehashed_klines = 1;
1290	<
1291	<	return 0;
745	>	return NULL;
746		}
747
748		/* set_default_conf()
#	Line 1309 | Line 763 | set_default_conf(void)
763		assert(class_default == class_get_list()->tail->data);
764
765		#ifdef HAVE_LIBCRYPTO
766	<	ServerInfo.rsa_private_key = NULL;
767	<	ServerInfo.rsa_private_key_file = NULL;
766	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	>	{
768	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	>
770	>	if (key)
771	>	{
772	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	>	EC_KEY_free(key);
774	>	}
775	>	}
776	>
777	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778	>	#endif
779	>
780	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782	>	ConfigServerInfo.rsa_private_key = NULL;
783	>	ConfigServerInfo.rsa_private_key_file = NULL;
784		#endif
785
786	<	/* ServerInfo.name is not rehashable */
787	<	/* ServerInfo.name = ServerInfo.name; */
788	<	ServerInfo.description = NULL;
789	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
790	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
791	<
792	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
793	<	ServerInfo.specific_ipv4_vhost = 0;
794	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
795	<	ServerInfo.specific_ipv6_vhost = 0;
796	<
797	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
798	<	ServerInfo.max_nick_length = 9;
799	<	ServerInfo.max_topic_length = 80;
800	<
801	<	ServerInfo.hub = 0;
802	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
803	<	ServerInfo.dns_host.sin_port = 0;
804	<	AdminInfo.name = NULL;
1335	<	AdminInfo.email = NULL;
1336	<	AdminInfo.description = NULL;
786	>	/* ConfigServerInfo.name is not rehashable */
787	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
788	>	ConfigServerInfo.description = NULL;
789	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
790	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
791	>
792	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
793	>	ConfigServerInfo.specific_ipv4_vhost = 0;
794	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
795	>	ConfigServerInfo.specific_ipv6_vhost = 0;
796	>
797	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
798	>	ConfigServerInfo.max_nick_length = 9;
799	>	ConfigServerInfo.max_topic_length = 80;
800	>	ConfigServerInfo.hub = 0;
801	>
802	>	ConfigAdminInfo.name = NULL;
803	>	ConfigAdminInfo.email = NULL;
804	>	ConfigAdminInfo.description = NULL;
805
806		log_del_all();
807
808	<	ConfigLoggingEntry.use_logging = 1;
808	>	ConfigLog.use_logging = 1;
809
810		ConfigChannel.disable_fake_channels = 0;
811	<	ConfigChannel.restrict_channels = 0;
812	<	ConfigChannel.knock_delay = 300;
811	>	ConfigChannel.invite_client_count = 10;
812	>	ConfigChannel.invite_client_time = 300;
813	>	ConfigChannel.knock_client_count = 1;
814	>	ConfigChannel.knock_client_time = 300;
815		ConfigChannel.knock_delay_channel = 60;
816	<	ConfigChannel.max_chans_per_user = 25;
1347	<	ConfigChannel.max_chans_per_oper = 50;
1348	<	ConfigChannel.quiet_on_ban = 1;
816	>	ConfigChannel.max_channels = 25;
817		ConfigChannel.max_bans = 25;
818	+	ConfigChannel.default_join_flood_count = 18;
819	+	ConfigChannel.default_join_flood_time = 6;
820		ConfigChannel.default_split_user_count = 0;
821		ConfigChannel.default_split_server_count = 0;
822		ConfigChannel.no_join_on_split = 0;
#	Line 1356 | Line 826 | set_default_conf(void)
826		ConfigServerHide.links_delay = 300;
827		ConfigServerHide.hidden = 0;
828		ConfigServerHide.hide_servers = 0;
829	+	ConfigServerHide.hide_services = 0;
830		ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
831		ConfigServerHide.hide_server_ips = 0;
832	+	ConfigServerHide.disable_remote_commands = 0;
833
834	<
835	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
836	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
837	<	ConfigFileEntry.glines = 0;
838	<	ConfigFileEntry.gline_time = 12 * 3600;
839	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
840	<	ConfigFileEntry.gline_min_cidr = 16;
841	<	ConfigFileEntry.gline_min_cidr6 = 48;
842	<	ConfigFileEntry.invisible_on_connect = 1;
843	<	ConfigFileEntry.tkline_expire_notices = 1;
844	<	ConfigFileEntry.hide_spoof_ips = 1;
845	<	ConfigFileEntry.ignore_bogus_ts = 0;
846	<	ConfigFileEntry.disable_auth = 0;
847	<	ConfigFileEntry.disable_remote = 0;
848	<	ConfigFileEntry.kill_chase_time_limit = 90;
849	<	ConfigFileEntry.default_floodcount = 8;
850	<	ConfigFileEntry.failed_oper_notice = 1;
851	<	ConfigFileEntry.dots_in_ident = 0;
852	<	ConfigFileEntry.min_nonwildcard = 4;
853	<	ConfigFileEntry.min_nonwildcard_simple = 3;
854	<	ConfigFileEntry.max_accept = 20;
855	<	ConfigFileEntry.anti_nick_flood = 0;
856	<	ConfigFileEntry.max_nick_time = 20;
857	<	ConfigFileEntry.max_nick_changes = 5;
858	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
859	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
860	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
861	<	ConfigFileEntry.warn_no_nline = 1;
862	<	ConfigFileEntry.stats_o_oper_only = 0;
863	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
864	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
865	<	ConfigFileEntry.stats_P_oper_only = 0;
866	<	ConfigFileEntry.caller_id_wait = 60;
867	<	ConfigFileEntry.opers_bypass_callerid = 0;
868	<	ConfigFileEntry.pace_wait = 10;
869	<	ConfigFileEntry.pace_wait_simple = 1;
870	<	ConfigFileEntry.short_motd = 0;
871	<	ConfigFileEntry.ping_cookie = 0;
872	<	ConfigFileEntry.no_oper_flood = 0;
873	<	ConfigFileEntry.true_no_oper_flood = 0;
874	<	ConfigFileEntry.oper_pass_resv = 1;
875	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
876	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
877	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
878	<	UMODE_OPERWALL | UMODE_WALLOP;
879	<	ConfigFileEntry.use_egd = 0;
880	<	ConfigFileEntry.egdpool_path = NULL;
881	<	ConfigFileEntry.throttle_time = 10;
834	>	ConfigGeneral.away_count = 2;
835	>	ConfigGeneral.away_time = 10;
836	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
837	>	ConfigGeneral.cycle_on_host_change = 1;
838	>	ConfigGeneral.dline_min_cidr = 16;
839	>	ConfigGeneral.dline_min_cidr6 = 48;
840	>	ConfigGeneral.kline_min_cidr = 16;
841	>	ConfigGeneral.kline_min_cidr6 = 48;
842	>	ConfigGeneral.invisible_on_connect = 1;
843	>	ConfigGeneral.tkline_expire_notices = 1;
844	>	ConfigGeneral.ignore_bogus_ts = 0;
845	>	ConfigGeneral.disable_auth = 0;
846	>	ConfigGeneral.kill_chase_time_limit = 90;
847	>	ConfigGeneral.default_floodcount = 8;
848	>	ConfigGeneral.failed_oper_notice = 1;
849	>	ConfigGeneral.dots_in_ident = 0;
850	>	ConfigGeneral.min_nonwildcard = 4;
851	>	ConfigGeneral.min_nonwildcard_simple = 3;
852	>	ConfigGeneral.max_accept = 20;
853	>	ConfigGeneral.anti_nick_flood = 0;
854	>	ConfigGeneral.max_nick_time = 20;
855	>	ConfigGeneral.max_nick_changes = 5;
856	>	ConfigGeneral.anti_spam_exit_message_time = 0;
857	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
858	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
859	>	ConfigGeneral.warn_no_connect_block = 1;
860	>	ConfigGeneral.stats_e_disabled = 0;
861	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
862	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
863	>	ConfigGeneral.stats_o_oper_only = 1;
864	>	ConfigGeneral.stats_m_oper_only = 1;
865	>	ConfigGeneral.stats_P_oper_only = 0;
866	>	ConfigGeneral.stats_u_oper_only = 0;
867	>	ConfigGeneral.caller_id_wait = 60;
868	>	ConfigGeneral.opers_bypass_callerid = 0;
869	>	ConfigGeneral.pace_wait = 10;
870	>	ConfigGeneral.pace_wait_simple = 1;
871	>	ConfigGeneral.short_motd = 0;
872	>	ConfigGeneral.ping_cookie = 0;
873	>	ConfigGeneral.no_oper_flood = 0;
874	>	ConfigGeneral.oper_pass_resv = 1;
875	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
876	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
877	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
878	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
879	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
880	>	ConfigGeneral.throttle_count = 1;
881	>	ConfigGeneral.throttle_time = 1;
882		}
883
884		static void
885		validate_conf(void)
886		{
887	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
888	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1417	<
1418	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1419	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
887	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
888	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
889
890	<	if (ServerInfo.network_name == NULL)
891	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
890	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
891	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
892
893	<	if (ServerInfo.network_desc == NULL)
894	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
893	>	if (EmptyString(ConfigServerInfo.network_name))
894	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
895
896	<	if (ConfigFileEntry.service_name == NULL)
897	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
896	>	if (EmptyString(ConfigServerInfo.network_desc))
897	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
898
899	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
899	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
900		}
901
902	<	/* read_conf()
902	>	/* read_conf()
903		*
904		* inputs       - file descriptor pointing to config file to use
905		* output       - None
#	Line 1441 | Line 910 | read_conf(FILE *file)
910		{
911		lineno = 0;
912
913	<	set_default_conf(); /* Set default values prior to conf parsing */
913	>	set_default_conf();  /* Set default values prior to conf parsing */
914		conf_parser_ctx.pass = 1;
915	<	yyparse();          /* pick up the classes first */
915	>	yyparse();  /* Pick up the classes first */
916
917		rewind(file);
918
919		conf_parser_ctx.pass = 2;
920	<	yyparse();          /* Load the values from the conf */
921	<	validate_conf();    /* Check to make sure some values are still okay. */
922	<	/* Some global values are also loaded here. */
923	<	class_delete_marked();      /* Make sure classes are valid */
920	>	yyparse();  /* Load the values from the conf */
921	>	validate_conf();  /* Check to make sure some values are still okay. */
922	>	/* Some global values are also loaded here. */
923	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
924	>	}
925	>
926	>	/* conf_rehash()
927	>	*
928	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
929	>	* as a result of an operator issuing this command, else assume it has been
930	>	* called as a result of the server receiving a HUP signal.
931	>	*/
932	>	void
933	>	conf_rehash(int sig)
934	>	{
935	>	if (sig)
936	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
937	>	"Got signal SIGHUP, reloading configuration file(s)");
938	>
939	>	restart_resolver();
940	>
941	>	/* don't close listeners until we know we can go ahead with the rehash */
942	>
943	>	read_conf_files(0);
944	>
945	>	load_conf_modules();
946	>	check_conf_klines();
947		}
948
949		/* lookup_confhost()
#	Line 1464 | Line 956 | lookup_confhost(struct MaskItem *conf)
956		{
957		struct addrinfo hints, *res;
958
959	<	/* Do name lookup now on hostnames given and store the
959	>	/*
960	>	* Do name lookup now on hostnames given and store the
961		* ip numbers in conf structure.
962		*/
963		memset(&hints, 0, sizeof(hints));
#	Line 1481 | Line 974 | lookup_confhost(struct MaskItem *conf)
974		return;
975		}
976
977	<	assert(res != NULL);
977	>	assert(res);
978
979		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
980		conf->addr.ss_len = res->ai_addrlen;
#	Line 1500 | Line 993 | lookup_confhost(struct MaskItem *conf)
993		int
994		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
995		{
996	<	struct ip_entry *ip_found;
997	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
996	>	struct ip_entry *ip_found = NULL;
997	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
998
999		/* DLINE exempt also gets you out of static limits/pacing... */
1000		if (conf && (conf->type == CONF_EXEMPT))
1001		return 0;
1002
1003	<	if (conf != NULL)
1003	>	if (conf)
1004		return BANNED_CLIENT;
1005
1006	<	ip_found = find_or_add_ip(addr);
1006	>	ip_found = ipcache_find_or_add_address(addr);
1007
1008	<	if ((CurrentTime - ip_found->last_attempt) <
1516	<	ConfigFileEntry.throttle_time)
1008	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1009		{
1010	<	ip_found->last_attempt = CurrentTime;
1011	<	return TOO_FAST;
1010	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1011	>	return TOO_FAST;
1012	>
1013	>	++ip_found->connection_count;
1014		}
1015	+	else
1016	+	ip_found->connection_count = 1;
1017
1018		ip_found->last_attempt = CurrentTime;
1019		return 0;
1020		}
1021
1022	<	static struct MaskItem *
1527	<	find_regexp_kline(const char *uhi[])
1528	<	{
1529	<	#ifdef HAVE_LIBPCRE
1530	<	const dlink_node *ptr = NULL;
1531	<
1532	<	DLINK_FOREACH(ptr, rkconf_items.head)
1533	<	{
1534	<	struct MaskItem *aptr = ptr->data;
1535	<
1536	<	assert(aptr->regexuser);
1537	<	assert(aptr->regexhost);
1538	<
1539	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1540	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1541	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1542	<	return aptr;
1543	<	}
1544	<	#endif
1545	<	return NULL;
1546	<	}
1547	<
1548	<	/* find_kill()
1022	>	/* expire_tklines()
1023		*
1024	<	* inputs       - pointer to client structure
1025	<	* output       - pointer to struct MaskItem if found
1026	<	* side effects - See if this user is klined already,
1553	<	*                and if so, return struct MaskItem pointer
1024	>	* inputs       - tkline list pointer
1025	>	* output       - NONE
1026	>	* side effects - expire tklines
1027		*/
1028	<	struct MaskItem *
1029	<	find_kill(struct Client *client_p)
1028	>	static void
1029	>	expire_tklines(dlink_list *list)
1030		{
1031	<	struct MaskItem *conf = NULL;
1559	<	const char *uhi[3];
1560	<
1561	<	uhi[0] = client_p->username;
1562	<	uhi[1] = client_p->host;
1563	<	uhi[2] = client_p->sockhost;
1564	<
1565	<	assert(client_p != NULL);
1566	<
1567	<	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1568	<	CONF_KLINE, client_p->localClient->aftype,
1569	<	client_p->username, NULL, 1);
1570	<	if (conf == NULL)
1571	<	conf = find_regexp_kline(uhi);
1572	<
1573	<	return conf;
1574	<	}
1031	>	dlink_node *node = NULL, *node_next = NULL;
1032
1033	<	struct MaskItem *
1034	<	find_gline(struct Client *client_p)
1035	<	{
1579	<	struct MaskItem *conf;
1033	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1034	>	{
1035	>	struct MaskItem *conf = node->data;
1036
1037	<	assert(client_p != NULL);
1037	>	if (!conf->until || conf->until > CurrentTime)
1038	>	continue;
1039
1040	<	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1041	<	CONF_GLINE, client_p->localClient->aftype,
1042	<	client_p->username, NULL, 1);
1043	<	return conf;
1040	>	if (ConfigGeneral.tkline_expire_notices)
1041	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1042	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1043	>	conf_free(conf);
1044	>	}
1045		}
1046
1047		/* cleanup_tklines()
#	Line 1594 | Line 1052 | find_gline(struct Client *client_p)
1052		*                This is an event started off in ircd.c
1053		*/
1054		void
1055	<	cleanup_tklines(void *notused)
1055	>	cleanup_tklines(void *unused)
1056		{
1057		hostmask_expire_temporary();
1058	<	expire_tklines(&xconf_items);
1058	>	expire_tklines(&xconf_items);
1059		expire_tklines(&nresv_items);
1060	<	expire_tklines(&resv_channel_list);
1603	<	}
1604	<
1605	<	/* expire_tklines()
1606	<	*
1607	<	* inputs       - tkline list pointer
1608	<	* output       - NONE
1609	<	* side effects - expire tklines
1610	<	*/
1611	<	static void
1612	<	expire_tklines(dlink_list *tklist)
1613	<	{
1614	<	dlink_node *ptr;
1615	<	dlink_node *next_ptr;
1616	<	struct MaskItem *conf;
1617	<
1618	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1619	<	{
1620	<	conf = ptr->data;
1621	<
1622	<	if (!conf->until || conf->until > CurrentTime)
1623	<	continue;
1624	<
1625	<	if (conf->type == CONF_XLINE)
1626	<	{
1627	<	if (ConfigFileEntry.tkline_expire_notices)
1628	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1629	<	"Temporary X-line for [%s] expired", conf->name);
1630	<	conf_free(conf);
1631	<	}
1632	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1633	<	{
1634	<	if (ConfigFileEntry.tkline_expire_notices)
1635	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1636	<	"Temporary RESV for [%s] expired", conf->name);
1637	<	conf_free(conf);
1638	<	}
1639	<	}
1060	>	expire_tklines(&cresv_items);
1061		}
1062
1063		/* oper_privs_as_string()
#	Line 1650 | Line 1071 | static const struct oper_privs
1071		const unsigned int flag;
1072		const unsigned char c;
1073		} flag_list[] = {
1074	<	{ OPER_FLAG_ADMIN,       'A' },
1075	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1076	<	{ OPER_FLAG_DIE,         'D' },
1077	<	{ OPER_FLAG_GLINE,       'G' },
1078	<	{ OPER_FLAG_REHASH,      'H' },
1079	<	{ OPER_FLAG_K,           'K' },
1080	<	{ OPER_FLAG_OPERWALL,    'L' },
1081	<	{ OPER_FLAG_N,           'N' },
1082	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1083	<	{ OPER_FLAG_REMOTE,      'R' },
1084	<	{ OPER_FLAG_OPER_SPY,    'S' },
1085	<	{ OPER_FLAG_UNKLINE,     'U' },
1086	<	{ OPER_FLAG_X,           'X' },
1074	>	{ OPER_FLAG_ADMIN,          'A' },
1075	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1076	>	{ OPER_FLAG_DIE,            'D' },
1077	>	{ OPER_FLAG_REHASH,         'H' },
1078	>	{ OPER_FLAG_KLINE,          'K' },
1079	>	{ OPER_FLAG_KILL,           'N' },
1080	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1081	>	{ OPER_FLAG_CONNECT,        'P' },
1082	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1083	>	{ OPER_FLAG_SQUIT,          'R' },
1084	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1085	>	{ OPER_FLAG_UNKLINE,        'U' },
1086	>	{ OPER_FLAG_XLINE,          'X' },
1087		{ 0, '\0' }
1088		};
1089
1090	<	char *
1090	>	const char *
1091		oper_privs_as_string(const unsigned int port)
1092		{
1093	<	static char privs_out[16];
1093	>	static char privs_out[IRCD_BUFSIZE];
1094		char *privs_ptr = privs_out;
1674	–	const struct oper_privs *opriv = flag_list;
1095
1096	<	for (; opriv->flag; ++opriv)
1096	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1097		{
1098		if (port & opriv->flag)
1099		*privs_ptr++ = opriv->c;
#	Line 1687 | Line 1107 | oper_privs_as_string(const unsigned int
1107		}
1108
1109		/*
1110	<	* Input: A client to find the active oper{} name for.
1110	>	* Input: A client to find the active operator {} name for.
1111		* Output: The nick!user@host{oper} of the oper.
1112		*         "oper" is server name for remote opers
1113		* Side effects: None.
#	Line 1695 | Line 1115 | oper_privs_as_string(const unsigned int
1115		const char *
1116		get_oper_name(const struct Client *client_p)
1117		{
1118	<	dlink_node *cnode = NULL;
1119	<	/* +5 for !,@,{,} and null */
1120	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1118	>	static char buffer[IRCD_BUFSIZE];
1119	>
1120	>	if (IsServer(client_p))
1121	>	return client_p->name;
1122
1123		if (MyConnect(client_p))
1124		{
1125	<	if ((cnode = client_p->localClient->confs.head))
1125	>	const dlink_node *const node = client_p->connection->confs.head;
1126	>
1127	>	if (node)
1128		{
1129	<	struct MaskItem *conf = cnode->data;
1129	>	const struct MaskItem *const conf = node->data;
1130
1131	<	if (IsConfOperator(conf))
1131	>	if (conf->type == CONF_OPER)
1132		{
1133	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1133	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1134		client_p->username, client_p->host, conf->name);
1135	<	return buffer;
1135	>	return buffer;
1136		}
1137		}
1138
1139	<	/* Probably should assert here for now. If there is an oper out there
1140	<	* with no oper{} conf attached, it would be good for us to know...
1139	>	/*
1140	>	* Probably should assert here for now. If there is an oper out there
1141	>	* with no operator {} conf attached, it would be good for us to know...
1142		*/
1143	<	assert(0); /* Oper without oper conf! */
1143	>	assert(0);  /* Oper without oper conf! */
1144		}
1145
1146		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1147	<	client_p->username, client_p->host, client_p->servptr->name);
1147	>	client_p->username, client_p->host, client_p->servptr->name);
1148		return buffer;
1149		}
1150
1151	+	/* clear_out_old_conf()
1152	+	*
1153	+	* inputs       - none
1154	+	* output       - none
1155	+	* side effects - Clear out the old configuration
1156	+	*/
1157	+	static void
1158	+	clear_out_old_conf(void)
1159	+	{
1160	+	dlink_node *node = NULL, *node_next = NULL;
1161	+	dlink_list *free_items [] = {
1162	+	&server_items,   &oconf_items,
1163	+	&uconf_items,   &xconf_items,
1164	+	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1165	+	};
1166	+
1167	+	dlink_list ** iterator = free_items; /* C is dumb */
1168	+
1169	+	/* We only need to free anything allocated by yyparse() here.
1170	+	* Resetting structs, etc, is taken care of by set_default_conf().
1171	+	*/
1172	+
1173	+	for (; *iterator; iterator++)
1174	+	{
1175	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1176	+	{
1177	+	struct MaskItem *conf = node->data;
1178	+
1179	+	conf->active = 0;
1180	+
1181	+	if (!IsConfDatabase(conf))
1182	+	{
1183	+	dlinkDelete(&conf->node, *iterator);
1184	+
1185	+	if (!conf->ref_count)
1186	+	conf_free(conf);
1187	+	}
1188	+	}
1189	+	}
1190	+
1191	+	motd_clear();
1192	+
1193	+	/*
1194	+	* Don't delete the class table, rather mark all entries for deletion.
1195	+	* The table is cleaned up by class_delete_marked. - avalon
1196	+	*/
1197	+	class_mark_for_deletion();
1198	+
1199	+	clear_out_address_conf();
1200	+
1201	+	/* Clean out module paths */
1202	+	mod_clear_paths();
1203	+
1204	+	pseudo_clear();
1205	+
1206	+	/* Clean out ConfigServerInfo */
1207	+	MyFree(ConfigServerInfo.description);
1208	+	ConfigServerInfo.description = NULL;
1209	+	MyFree(ConfigServerInfo.network_name);
1210	+	ConfigServerInfo.network_name = NULL;
1211	+	MyFree(ConfigServerInfo.network_desc);
1212	+	ConfigServerInfo.network_desc = NULL;
1213	+	#ifdef HAVE_LIBCRYPTO
1214	+	if (ConfigServerInfo.rsa_private_key)
1215	+	{
1216	+	RSA_free(ConfigServerInfo.rsa_private_key);
1217	+	ConfigServerInfo.rsa_private_key = NULL;
1218	+	}
1219	+
1220	+	MyFree(ConfigServerInfo.rsa_private_key_file);
1221	+	ConfigServerInfo.rsa_private_key_file = NULL;
1222	+	#endif
1223	+
1224	+	/* Clean out ConfigAdminInfo */
1225	+	MyFree(ConfigAdminInfo.name);
1226	+	ConfigAdminInfo.name = NULL;
1227	+	MyFree(ConfigAdminInfo.email);
1228	+	ConfigAdminInfo.email = NULL;
1229	+	MyFree(ConfigAdminInfo.description);
1230	+	ConfigAdminInfo.description = NULL;
1231	+
1232	+	/* Clean out listeners */
1233	+	listener_close_marked();
1234	+	}
1235	+
1236		/* read_conf_files()
1237		*
1238		* inputs       - cold start YES or NO
#	Line 1733 | Line 1242 | get_oper_name(const struct Client *clien
1242		void
1243		read_conf_files(int cold)
1244		{
1245	<	const char *filename;
1246	<	char chanmodes[32];
1247	<	char chanlimit[32];
1245	>	const char *filename = NULL;
1246	>	char chanmodes[IRCD_BUFSIZE] = "";
1247	>	char chanlimit[IRCD_BUFSIZE] = "";
1248
1249		conf_parser_ctx.boot = cold;
1250	<	filename = ConfigFileEntry.configfile;
1250	>	filename = ConfigGeneral.configfile;
1251
1252		/* We need to know the initial filename for the yyerror() to report
1253		FIXME: The full path is in conffilenamebuf first time since we
1254	<	dont know anything else
1254	>	don't know anything else
1255
1256	<	- Gozem 2002-07-21
1256	>	- Gozem 2002-07-21
1257		*/
1258		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1259
#	Line 1758 | Line 1267 | read_conf_files(int cold)
1267		}
1268		else
1269		{
1270	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1271	<	"Unable to read configuration file '%s': %s",
1272	<	filename, strerror(errno));
1270	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1271	>	"Unable to read configuration file '%s': %s",
1272	>	filename, strerror(errno));
1273		return;
1274		}
1275		}
#	Line 1773 | Line 1282 | read_conf_files(int cold)
1282
1283		log_reopen_all();
1284
1285	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1286	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1285	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1286	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1287
1288		snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1289	<	add_isupport("MAXLIST", chanmodes, -1);
1290	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1291	<	add_isupport("CHANTYPES", "#", -1);
1289	>	isupport_add("MAXLIST", chanmodes, -1);
1290	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1291	>	isupport_add("CHANTYPES", "#", -1);
1292
1293		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1294	<	ConfigChannel.max_chans_per_user);
1295	<	add_isupport("CHANLIMIT", chanlimit, -1);
1296	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1297	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1298	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1299	<	add_isupport("EXCEPTS", "e", -1);
1791	<	add_isupport("INVEX", "I", -1);
1792	<	add_isupport("CHANMODES", chanmodes, -1);
1294	>	ConfigChannel.max_channels);
1295	>	isupport_add("CHANLIMIT", chanlimit, -1);
1296	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1297	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1298	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1299	>	isupport_add("CHANMODES", chanmodes, -1);
1300
1301		/*
1302		* message_locale may have changed.  rebuild isupport since it relies
1303		* on strlen(form_str(RPL_ISUPPORT))
1304		*/
1305	<	rebuild_isupport_message_line();
1799	<	}
1800	<
1801	<	/* clear_out_old_conf()
1802	<	*
1803	<	* inputs       - none
1804	<	* output       - none
1805	<	* side effects - Clear out the old configuration
1806	<	*/
1807	<	static void
1808	<	clear_out_old_conf(void)
1809	<	{
1810	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1811	<	struct MaskItem *conf;
1812	<	dlink_list *free_items [] = {
1813	<	&server_items,   &oconf_items,
1814	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1815	<	&nresv_items, &cluster_items,  &service_items, &resv_channel_list, NULL
1816	<	};
1817	<
1818	<	dlink_list ** iterator = free_items; /* C is dumb */
1819	<
1820	<	/* We only need to free anything allocated by yyparse() here.
1821	<	* Resetting structs, etc, is taken care of by set_default_conf().
1822	<	*/
1823	<
1824	<	for (; *iterator != NULL; iterator++)
1825	<	{
1826	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1827	<	{
1828	<	conf = ptr->data;
1829	<
1830	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1831	<
1832	<	/* XXX This is less than pretty */
1833	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1834	<	{
1835	<	if (!conf->ref_count)
1836	<	conf_free(conf);
1837	<	}
1838	<	else if (conf->type == CONF_XLINE  ||
1839	<	conf->type == CONF_RXLINE ||
1840	<	conf->type == CONF_RKLINE)
1841	<	{
1842	<	if (!conf->until)
1843	<	conf_free(conf);
1844	<	}
1845	<	else
1846	<	conf_free(conf);
1847	<	}
1848	<	}
1849	<
1850	<	/*
1851	<	* don't delete the class table, rather mark all entries
1852	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1853	<	*/
1854	<	class_mark_for_deletion();
1855	<
1856	<	clear_out_address_conf();
1857	<
1858	<	/* clean out module paths */
1859	<	mod_clear_paths();
1860	<
1861	<	/* clean out ServerInfo */
1862	<	MyFree(ServerInfo.description);
1863	<	ServerInfo.description = NULL;
1864	<	MyFree(ServerInfo.network_name);
1865	<	ServerInfo.network_name = NULL;
1866	<	MyFree(ServerInfo.network_desc);
1867	<	ServerInfo.network_desc = NULL;
1868	<	MyFree(ConfigFileEntry.egdpool_path);
1869	<	ConfigFileEntry.egdpool_path = NULL;
1870	<	#ifdef HAVE_LIBCRYPTO
1871	<	if (ServerInfo.rsa_private_key != NULL)
1872	<	{
1873	<	RSA_free(ServerInfo.rsa_private_key);
1874	<	ServerInfo.rsa_private_key = NULL;
1875	<	}
1876	<
1877	<	MyFree(ServerInfo.rsa_private_key_file);
1878	<	ServerInfo.rsa_private_key_file = NULL;
1879	<
1880	<	if (ServerInfo.server_ctx)
1881	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1882	<	SSL_OP_NO_SSLv3|
1883	<	SSL_OP_NO_TLSv1);
1884	<	if (ServerInfo.client_ctx)
1885	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1886	<	SSL_OP_NO_SSLv3|
1887	<	SSL_OP_NO_TLSv1);
1888	<	#endif
1889	<
1890	<	/* clean out AdminInfo */
1891	<	MyFree(AdminInfo.name);
1892	<	AdminInfo.name = NULL;
1893	<	MyFree(AdminInfo.email);
1894	<	AdminInfo.email = NULL;
1895	<	MyFree(AdminInfo.description);
1896	<	AdminInfo.description = NULL;
1897	<
1898	<	/* clean out listeners */
1899	<	close_listeners();
1900	<
1901	<	/* clean out general */
1902	<	MyFree(ConfigFileEntry.service_name);
1903	<	ConfigFileEntry.service_name = NULL;
1904	<
1905	<	delete_isupport("INVEX");
1906	<	delete_isupport("EXCEPTS");
1305	>	isupport_rebuild();
1306		}
1307
1308		/* conf_add_class_to_conf()
1309		*
1310		* inputs       - pointer to config item
1311		* output       - NONE
1312	<	* side effects - Add a class pointer to a conf
1312	>	* side effects - Add a class pointer to a conf
1313		*/
1314		void
1315	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1315	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1316		{
1317	<	if (class_name == NULL)
1317	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1318		{
1319		conf->class = class_default;
1320
1321	<	if (conf->type == CONF_CLIENT)
1322	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1323	<	"Warning *** Defaulting to default class for %s@%s",
1324	<	conf->user, conf->host);
1926	<	else
1927	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1928	<	"Warning *** Defaulting to default class for %s",
1929	<	conf->name);
1930	<	}
1931	<	else
1932	<	conf->class = class_find(class_name, 1);
1933	<
1934	<	if (conf->class == NULL)
1935	<	{
1936	<	if (conf->type == CONF_CLIENT)
1937	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1938	<	"Warning *** Defaulting to default class for %s@%s",
1939	<	conf->user, conf->host);
1321	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1322	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1323	>	"Warning *** Defaulting to default class for %s@%s",
1324	>	conf->user, conf->host);
1325		else
1326	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1327	<	"Warning *** Defaulting to default class for %s",
1328	<	conf->name);
1944	<	conf->class = class_default;
1326	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1327	>	"Warning *** Defaulting to default class for %s",
1328	>	conf->name);
1329		}
1330		}
1331
#	Line 1960 | Line 1344 | yyerror(const char *msg)
1344		return;
1345
1346		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1347	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1347	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1348		"\"%s\", line %u: %s: %s",
1349		conffilebuf, lineno + 1, msg, newlinebuf);
1350		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1973 | Line 1357 | conf_error_report(const char *msg)
1357		char newlinebuf[IRCD_BUFSIZE];
1358
1359		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1360	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1360	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1361		"\"%s\", line %u: %s: %s",
1362		conffilebuf, lineno + 1, msg, newlinebuf);
1363		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1982 | Line 1366 | conf_error_report(const char *msg)
1366
1367		/*
1368		* valid_tkline()
1369	<	*
1369	>	*
1370		* inputs       - pointer to ascii string to check
1371		*              - whether the specified time is in seconds or minutes
1372		* output       - -1 not enough parameters
#	Line 1991 | Line 1375 | conf_error_report(const char *msg)
1375		* Originally written by Dianora (Diane, db@db.net)
1376		*/
1377		time_t
1378	<	valid_tkline(const char *p, int minutes)
1378	>	valid_tkline(const char *data, const int minutes)
1379		{
1380	+	const unsigned char *p = (const unsigned char *)data;
1381	+	unsigned char tmpch = '\0';
1382		time_t result = 0;
1383
1384	<	for (; *p; ++p)
1384	>	while ((tmpch = *p++))
1385		{
1386	<	if (!IsDigit(*p))
1386	>	if (!IsDigit(tmpch))
1387		return 0;
1388
1389		result *= 10;
1390	<	result += ((*p) & 0xF);
1390	>	result += (tmpch & 0xF);
1391		}
1392
1393		/*
1394	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1395	<	* i.e. they specifically use 0, I am going to return 1 instead
1396	<	* as a return value of non-zero is used to flag it as a temporary kline
1394	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1395	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1396	>	* value of non-zero is used to flag it as a temporary kline
1397		*/
1398		if (result == 0)
1399		result = 1;
1400
1401	<	/*
1401	>	/*
1402		* If the incoming time is in seconds convert it to minutes for the purpose
1403		* of this calculation
1404		*/
1405		if (!minutes)
1406	<	result = result / (time_t)60;
1406	>	result = result / 60;
1407
1408		if (result > MAX_TDKLINE_TIME)
1409		result = MAX_TDKLINE_TIME;
1410
1411	<	result = result * (time_t)60;  /* turn it into seconds */
1411	>	result = result * 60;  /* Turn it into seconds */
1412
1413		return result;
1414		}
1415
1416	+	/* valid_wild_card_simple()
1417	+	*
1418	+	* inputs       - data to check for sufficient non-wildcard characters
1419	+	* outputs      - 1 if valid, else 0
1420	+	* side effects - none
1421	+	*/
1422	+	int
1423	+	valid_wild_card_simple(const char *data)
1424	+	{
1425	+	const unsigned char *p = (const unsigned char *)data;
1426	+	unsigned char tmpch = '\0';
1427	+	unsigned int nonwild = 0, wild = 0;
1428	+
1429	+	while ((tmpch = *p++))
1430	+	{
1431	+	if (tmpch == '\\' && *p)
1432	+	{
1433	+	++p;
1434	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1435	+	return 1;
1436	+	}
1437	+	else if (!IsMWildChar(tmpch))
1438	+	{
1439	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1440	+	return 1;
1441	+	}
1442	+	else
1443	+	++wild;
1444	+	}
1445	+
1446	+	return !wild;
1447	+	}
1448	+
1449		/* valid_wild_card()
1450		*
1451		* input        - pointer to client
#	Line 2036 | Line 1455 | valid_tkline(const char *p, int minutes)
1455		* side effects - NOTICE is given to source_p if warn is 1
1456		*/
1457		int
1458	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1458	>	valid_wild_card(struct Client *source_p, int count, ...)
1459		{
1460	<	char *p;
1461	<	char tmpch;
2043	<	int nonwild = 0;
1460	>	unsigned char tmpch = '\0';
1461	>	unsigned int nonwild = 0;
1462		va_list args;
1463
1464		/*
#	Line 2059 | Line 1477 | valid_wild_card(struct Client *source_p,
1477
1478		while (count--)
1479		{
1480	<	p = va_arg(args, char *);
1480	>	const unsigned char *p = va_arg(args, const unsigned char *);
1481		if (p == NULL)
1482		continue;
1483
#	Line 2071 | Line 1489 | valid_wild_card(struct Client *source_p,
1489		* If we find enough non-wild characters, we can
1490		* break - no point in searching further.
1491		*/
1492	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1492	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1493	>	{
1494	>	va_end(args);
1495		return 1;
1496	+	}
1497		}
1498		}
1499		}
1500
1501	<	if (warn)
1502	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1503	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1501	>	if (IsClient(source_p))
1502	>	sendto_one_notice(source_p, &me,
1503	>	":Please include at least %u non-wildcard characters with the mask",
1504	>	ConfigGeneral.min_nonwildcard);
1505	>	va_end(args);
1506	>	return 0;
1507	>	}
1508	>
1509	>	/* find_user_host()
1510	>	*
1511	>	* inputs       - pointer to client placing kline
1512	>	*              - pointer to user_host_or_nick
1513	>	*              - pointer to user buffer
1514	>	*              - pointer to host buffer
1515	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1516	>	* side effects -
1517	>	*/
1518	>	static int
1519	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1520	>	char *luser, char *lhost)
1521	>	{
1522	>	struct Client *target_p = NULL;
1523	>	char *hostp = NULL;
1524	>
1525	>	if (lhost == NULL)
1526	>	{
1527	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1528	>	return 1;
1529	>	}
1530	>
1531	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1532	>	{
1533	>	/* Explicit user@host mask given */
1534	>	if (hostp)                            /* I'm a little user@host */
1535	>	{
1536	>	*(hostp++) = '\0';                       /* short and squat */
1537	>
1538	>	if (*user_host_or_nick)
1539	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1540	>	else
1541	>	strcpy(luser, "*");
1542	>
1543	>	if (*hostp)
1544	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1545	>	else
1546	>	strcpy(lhost, "*");
1547	>	}
1548	>	else
1549	>	{
1550	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1551	>	luser[1] = '\0';
1552	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1553	>	}
1554	>
1555	>	return 1;
1556	>	}
1557	>	else
1558	>	{
1559	>	/* Try to find user@host mask from nick */
1560	>	/* Okay to use source_p as the first param, because source_p == client_p */
1561	>	if ((target_p =
1562	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1563	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1564	>
1565	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1566	>	{
1567	>	if (IsClient(source_p))
1568	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1569	>	return 0;
1570	>	}
1571	>
1572	>	/*
1573	>	* Turn the "user" bit into "*user", blow away '~'
1574	>	* if found in original user name (non-idented)
1575	>	*/
1576	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1577	>
1578	>	if (target_p->username[0] == '~')
1579	>	luser[0] = '*';
1580	>
1581	>	if (!strcmp(target_p->sockhost, "0"))
1582	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1583	>	else
1584	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1585	>	return 1;
1586	>	}
1587	>
1588		return 0;
1589		}
1590
#	Line 2093 | Line 1598 | valid_wild_card(struct Client *source_p,
1598		*              - parse_flags bit map of things to test
1599		*              - pointer to user or string to parse into
1600		*              - pointer to host or NULL to parse into if non NULL
1601	<	*              - pointer to optional tkline time or NULL
1601	>	*              - pointer to optional tkline time or NULL
1602		*              - pointer to target_server to parse into if non NULL
1603		*              - pointer to reason to parse into
1604		*
1605	<	* output       - 1 if valid, -1 if not valid
1605	>	* output       - 1 if valid, 0 if not valid
1606		* side effects - A generalised k/d/x etc. line parser,
1607		*               "ALINE [time] user@host|string [ON] target :reason"
1608		*                will parse returning a parsed user, host if
#	Line 2115 | Line 1620 | valid_wild_card(struct Client *source_p,
1620		*/
1621		int
1622		parse_aline(const char *cmd, struct Client *source_p,
1623	<	int parc, char **parv,
1624	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1625	<	char **target_server, char **reason)
1623	>	int parc, char **parv,
1624	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1625	>	char **target_server, char **reason)
1626		{
1627		int found_tkline_time=0;
1628	<	static char def_reason[] = "No Reason";
1628	>	static char default_reason[] = CONF_NOREASON;
1629		static char user[USERLEN*4+1];
1630		static char host[HOSTLEN*4+1];
1631
#	Line 2129 | Line 1634 | parse_aline(const char *cmd, struct Clie
1634
1635		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1636
1637	<	if (found_tkline_time != 0)
1637	>	if (found_tkline_time)
1638		{
1639		parv++;
1640		parc--;
1641
1642	<	if (tkline_time != NULL)
1642	>	if (tkline_time)
1643		*tkline_time = found_tkline_time;
1644		else
1645		{
1646	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1647	<	me.name, source_p->name, cmd);
2143	<	return -1;
1646	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1647	>	return 0;
1648		}
1649		}
1650
1651		if (parc == 0)
1652		{
1653	<	sendto_one(source_p, ERR_NEEDMOREPARAMS,
1654	<	me.name, source_p->name, cmd);
2151	<	return -1;
1653	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1654	>	return 0;
1655		}
1656
1657		if (h_p == NULL)
1658		*up_p = *parv;
1659		else
1660		{
1661	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1662	<	return -1;
1661	>	if (find_user_host(source_p, *parv, user, host) == 0)
1662	>	return 0;
1663
1664		*up_p = user;
1665		*h_p = host;
1666		}
1667	<
1667	>
1668		parc--;
1669		parv++;
1670
1671	<	if (parc != 0)
1671	>	if (parc)
1672		{
1673		if (irccmp(*parv, "ON") == 0)
1674		{
1675		parc--;
1676		parv++;
1677
2175	–	if (target_server == NULL)
2176	–	{
2177	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
2178	–	me.name, source_p->name, cmd);
2179	–	return -1;
2180	–	}
2181	–
1678		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1679		{
1680	<	sendto_one(source_p, ERR_NOPRIVS,
1681	<	me.name, source_p->name, "remoteban");
2186	<	return -1;
1680	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1681	>	return 0;
1682		}
1683
1684		if (parc == 0 || EmptyString(*parv))
1685		{
1686	<	sendto_one(source_p, ERR_NEEDMOREPARAMS,
1687	<	me.name, source_p->name, cmd);
2193	<	return -1;
1686	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1687	>	return 0;
1688		}
1689
1690		*target_server = *parv;
#	Line 2202 | Line 1696 | parse_aline(const char *cmd, struct Clie
1696		/* Make sure target_server *is* NULL if no ON server found
1697		* caller probably NULL'd it first, but no harm to do it again -db
1698		*/
1699	<	if (target_server != NULL)
1700	<	*target_server = NULL;
1699	>	if (target_server)
1700	>	*target_server = NULL;
1701		}
1702		}
1703
1704	<	if (h_p != NULL)
1704	>	if (h_p)
1705		{
1706	<	if (strchr(user, '!') != NULL)
1706	>	if (strchr(user, '!'))
1707		{
1708	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1709	<	me.name, source_p->name);
2216	<	return -1;
1708	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1709	>	return 0;
1710		}
1711
1712	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1713	<	return -1;
1712	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1713	>	return 0;
1714		}
1715		else
1716	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1717	<	return -1;
1716	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1717	>	return 0;
1718
1719	<	if (reason != NULL)
1719	>	if (reason)
1720		{
1721	<	if (parc != 0 && !EmptyString(*parv))
2229	<	{
1721	>	if (parc && !EmptyString(*parv))
1722		*reason = *parv;
2231	–	if (!valid_comment(source_p, *reason, 1))
2232	–	return -1;
2233	–	}
1723		else
1724	<	*reason = def_reason;
1724	>	*reason = default_reason;
1725		}
1726
1727		return 1;
1728		}
1729
2241	–	/* find_user_host()
2242	–	*
2243	–	* inputs       - pointer to client placing kline
2244	–	*              - pointer to user_host_or_nick
2245	–	*              - pointer to user buffer
2246	–	*              - pointer to host buffer
2247	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
2248	–	* side effects -
2249	–	*/
2250	–	static int
2251	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
2252	–	char *luser, char *lhost, unsigned int flags)
2253	–	{
2254	–	struct Client *target_p = NULL;
2255	–	char *hostp = NULL;
2256	–
2257	–	if (lhost == NULL)
2258	–	{
2259	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
2260	–	return 1;
2261	–	}
2262	–
2263	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
2264	–	{
2265	–	/* Explicit user@host mask given */
2266	–
2267	–	if (hostp != NULL)                            /* I'm a little user@host */
2268	–	{
2269	–	*(hostp++) = '\0';                       /* short and squat */
2270	–	if (*user_host_or_nick)
2271	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2272	–	else
2273	–	strcpy(luser, "*");
2274	–	if (*hostp)
2275	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2276	–	else
2277	–	strcpy(lhost, "*");
2278	–	}
2279	–	else
2280	–	{
2281	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2282	–	luser[1] = '\0';
2283	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2284	–	}
2285	–
2286	–	return 1;
2287	–	}
2288	–	else
2289	–	{
2290	–	/* Try to find user@host mask from nick */
2291	–	/* Okay to use source_p as the first param, because source_p == client_p */
2292	–	if ((target_p =
2293	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2294	–	return 0;
2295	–
2296	–	if (IsExemptKline(target_p))
2297	–	{
2298	–	if (!IsServer(source_p))
2299	–	sendto_one(source_p,
2300	–	":%s NOTICE %s :%s is E-lined",
2301	–	me.name, source_p->name, target_p->name);
2302	–	return 0;
2303	–	}
2304	–
2305	–	/*
2306	–	* turn the "user" bit into "*user", blow away '~'
2307	–	* if found in original user name (non-idented)
2308	–	*/
2309	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2310	–
2311	–	if (target_p->username[0] == '~')
2312	–	luser[0] = '*';
2313	–
2314	–	if (target_p->sockhost[0] == '\0' ||
2315	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2316	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2317	–	else
2318	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2319	–	return 1;
2320	–	}
2321	–
2322	–	return 0;
2323	–	}
2324	–
2325	–	/* valid_comment()
2326	–	*
2327	–	* inputs       - pointer to client
2328	–	*              - pointer to comment
2329	–	* output       - 0 if no valid comment,
2330	–	*              - 1 if valid
2331	–	* side effects - truncates reason where necessary
2332	–	*/
2333	–	int
2334	–	valid_comment(struct Client *source_p, char *comment, int warn)
2335	–	{
2336	–	if (strlen(comment) > REASONLEN)
2337	–	comment[REASONLEN-1] = '\0';
2338	–
2339	–	return 1;
2340	–	}
2341	–
1730		/* match_conf_password()
1731		*
1732		* inputs       - pointer to given password
#	Line 2359 | Line 1747 | match_conf_password(const char *password
1747		else
1748		encr = password;
1749
1750	<	return !strcmp(encr, conf->passwd);
1750	>	return encr && !strcmp(encr, conf->passwd);
1751		}
1752
1753		/*
#	Line 2367 | Line 1755 | match_conf_password(const char *password
1755		*
1756		* inputs       - client sending the cluster
1757		*              - command name "KLINE" "XLINE" etc.
1758	<	*              - capab -- CAP_KLN etc. from s_serv.h
1758	>	*              - capab -- CAPAB_KLN etc. from server.h
1759		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1760		*              - pattern and args to send along
1761		* output       - none
#	Line 2375 | Line 1763 | match_conf_password(const char *password
1763		*                along to all servers that match capab and cluster type
1764		*/
1765		void
1766	<	cluster_a_line(struct Client *source_p, const char *command,
1767	<	int capab, int cluster_type, const char *pattern, ...)
1766	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1767	>	unsigned int cluster_type, const char *pattern, ...)
1768		{
1769		va_list args;
1770	<	char buffer[IRCD_BUFSIZE];
1771	<	const dlink_node *ptr = NULL;
1770	>	char buffer[IRCD_BUFSIZE] = "";
1771	>	const dlink_node *node = NULL;
1772
1773		va_start(args, pattern);
1774		vsnprintf(buffer, sizeof(buffer), pattern, args);
1775		va_end(args);
1776
1777	<	DLINK_FOREACH(ptr, cluster_items.head)
1777	>	DLINK_FOREACH(node, cluster_items.head)
1778		{
1779	<	const struct MaskItem *conf = ptr->data;
1779	>	const struct MaskItem *conf = node->data;
1780
1781		if (conf->flags & cluster_type)
1782	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1783	<	"%s %s %s", command, conf->name, buffer);
1782	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1783	>	"%s %s %s", command, conf->name, buffer);
1784		}
1785		}
1786
#	Line 2431 | Line 1819 | split_nuh(struct split_nuh_item *const i
1819
1820		if (iptr->nickptr)
1821		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1822	+
1823		if (iptr->userptr)
1824		strlcpy(iptr->userptr, "*", iptr->usersize);
1825	+
1826		if (iptr->hostptr)
1827		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1828
#	Line 2440 | Line 1830 | split_nuh(struct split_nuh_item *const i
1830		{
1831		*p = '\0';
1832
1833	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1833	>	if (iptr->nickptr && *iptr->nuhmask)
1834		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1835
1836	<	if ((q = strchr(++p, '@'))) {
1836	>	if ((q = strchr(++p, '@')))
1837	>	{
1838		*q++ = '\0';
1839
1840	<	if (*p != '\0')
1840	>	if (*p)
1841		strlcpy(iptr->userptr, p, iptr->usersize);
1842
1843	<	if (*q != '\0')
1843	>	if (*q)
1844		strlcpy(iptr->hostptr, q, iptr->hostsize);
1845		}
1846		else
1847		{
1848	<	if (*p != '\0')
1848	>	if (*p)
1849		strlcpy(iptr->userptr, p, iptr->usersize);
1850		}
1851		}
#	Line 2466 | Line 1857 | split_nuh(struct split_nuh_item *const i
1857		/* if found a @ */
1858		*p++ = '\0';
1859
1860	<	if (*iptr->nuhmask != '\0')
1860	>	if (*iptr->nuhmask)
1861		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1862
1863	<	if (*p != '\0')
1863	>	if (*p)
1864		strlcpy(iptr->hostptr, p, iptr->hostsize);
1865		}
1866		else
1867		{
1868	<	/* no @ found */
1868	>	/* No @ found */
1869		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1870		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1871		else

Diff Legend

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