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 1652 by michael, Tue Nov 13 20:28:53 2012 UTC vs.
Revision 5039 by michael, Sat Dec 13 16:08:37 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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"
28	–	#include "balloc.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"
35	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 43 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
46	–	#include "s_gline.h"
47		#include "memory.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
57	–	struct config_server_hide ConfigServerHide;
59
60		/* general conf items link list root, other than k lines etc. */
61	<	dlink_list service_items = { NULL, NULL, 0 };
62	<	dlink_list server_items  = { NULL, NULL, 0 };
63	<	dlink_list cluster_items = { NULL, NULL, 0 };
64	<	dlink_list oconf_items   = { NULL, NULL, 0 };
65	<	dlink_list uconf_items   = { NULL, NULL, 0 };
66	<	dlink_list xconf_items   = { NULL, NULL, 0 };
67	<	dlink_list rxconf_items  = { NULL, NULL, 0 };
68	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
68	<	dlink_list nresv_items   = { NULL, NULL, 0 };
69	<	dlink_list temporary_resv = { NULL, NULL, 0 };
61	>	dlink_list service_items;
62	>	dlink_list server_items;
63	>	dlink_list cluster_items;
64	>	dlink_list oconf_items;
65	>	dlink_list uconf_items;
66	>	dlink_list xconf_items;
67	>	dlink_list nresv_items;
68	>	dlink_list cresv_items;
69
70		extern unsigned int lineno;
71		extern char linebuf[];
72		extern char conffilebuf[IRCD_BUFSIZE];
73		extern int yyparse(); /* defined in y.tab.c */
74
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 BlockHeap *ip_entry_heap = NULL;
108	–	static int ip_entries_count = 0;
109	–
75
76		/* conf_dns_callback()
77		*
#	Line 119 | Line 84 | static int ip_entries_count = 0;
84		* if successful save hp in the conf item it was called with
85		*/
86		static void
87	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
87	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
88		{
89	<	struct MaskItem *conf = vptr;
89	>	struct MaskItem *const conf = vptr;
90
91		conf->dns_pending = 0;
92
93	<	if (addr != NULL)
93	>	if (addr)
94		memcpy(&conf->addr, addr, sizeof(conf->addr));
95		else
96		conf->dns_failed = 1;
#	Line 140 | Line 105 | conf_dns_callback(void *vptr, const stru
105		static void
106		conf_dns_lookup(struct MaskItem *conf)
107		{
108	<	if (!conf->dns_pending)
108	>	if (conf->dns_pending)
109	>	return;
110	>
111	>	conf->dns_pending = 1;
112	>
113	>	if (conf->aftype == AF_INET)
114	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
115	>	else
116	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
117	>	}
118	>
119	>	/* map_to_list()
120	>	*
121	>	* inputs       - ConfType conf
122	>	* output       - pointer to dlink_list to use
123	>	* side effects - none
124	>	*/
125	>	static dlink_list *
126	>	map_to_list(enum maskitem_type type)
127	>	{
128	>	switch (type)
129		{
130	<	conf->dns_pending = 1;
131	<	gethost_byname(conf_dns_callback, conf, conf->host);
130	>	case CONF_XLINE:
131	>	return &xconf_items;
132	>	break;
133	>	case CONF_ULINE:
134	>	return &uconf_items;
135	>	break;
136	>	case CONF_NRESV:
137	>	return &nresv_items;
138	>	break;
139	>	case CONF_CRESV:
140	>	return &cresv_items;
141	>	break;
142	>	case CONF_OPER:
143	>	return &oconf_items;
144	>	break;
145	>	case CONF_SERVER:
146	>	return &server_items;
147	>	break;
148	>	case CONF_SERVICE:
149	>	return &service_items;
150	>	break;
151	>	case CONF_CLUSTER:
152	>	return &cluster_items;
153	>	break;
154	>	default:
155	>	return NULL;
156		}
157		}
158
159		struct MaskItem *
160		conf_make(enum maskitem_type type)
161		{
162	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
162	>	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
163		dlink_list *list = NULL;
164
165		conf->type   = type;
#	Line 165 | Line 174 | conf_make(enum maskitem_type type)
174		void
175		conf_free(struct MaskItem *conf)
176		{
177	<	dlink_node *ptr = NULL, *ptr_next = NULL;
177	>	dlink_node *node = NULL, *node_next = NULL;
178		dlink_list *list = NULL;
179
180	<	if (conf->node.next)
181	<	if ((list = map_to_list(conf->type)))
173	<	dlinkDelete(&conf->node, list);
180	>	if ((list = map_to_list(conf->type)))
181	>	dlinkFindDelete(list, conf);
182
183		MyFree(conf->name);
184
185		if (conf->dns_pending)
186		delete_resolver_queries(conf);
187	<	if (conf->passwd != NULL)
187	>	if (conf->passwd)
188		memset(conf->passwd, 0, strlen(conf->passwd));
189	<	if (conf->spasswd != NULL)
189	>	if (conf->spasswd)
190		memset(conf->spasswd, 0, strlen(conf->spasswd));
191
192		conf->class = NULL;
#	Line 186 | Line 194 | conf_free(struct MaskItem *conf)
194		MyFree(conf->passwd);
195		MyFree(conf->spasswd);
196		MyFree(conf->reason);
197	+	MyFree(conf->certfp);
198		MyFree(conf->user);
199		MyFree(conf->host);
191	–	MyFree(conf->regexuser);
192	–	MyFree(conf->regexhost);
200		#ifdef HAVE_LIBCRYPTO
201		MyFree(conf->cipher_list);
202
203		if (conf->rsa_public_key)
204		RSA_free(conf->rsa_public_key);
205		#endif
206	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
200	<	{
201	<	MyFree(ptr->data);
202	<	free_dlink_node(ptr);
203	<	}
204	<
205	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
206	<	{
207	<	MyFree(ptr->data);
208	<	free_dlink_node(ptr);
209	<	}
210	<
211	<	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)
248	<	{
249	<	case CONF_XLINE:
250	<	DLINK_FOREACH(ptr, xconf_items.head)
251	<	{
252	<	conf = ptr->data;
253	<
254	<	sendto_one(source_p, form_str(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, form_str(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, form_str(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, form_str(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, form_str(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, form_str(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, form_str(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, form_str(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, form_str(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++ = '*';
387	<
388	<	*p = '\0';
389	<
390	<	/*
391	<	* Allow admins to see actual ips unless hide_server_ips is enabled
392	<	*/
393	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
394	<	sendto_one(source_p, form_str(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, form_str(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, form_str(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, form_str(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)
206	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
207		{
208	<	case TOO_MANY:
209	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
210	<	"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;
208	>	MyFree(node->data);
209	>	dlinkDelete(node, &conf->hub_list);
210	>	free_dlink_node(node);
211		}
212
213	<	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))
213	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
214		{
215	<	conf = find_address_conf(client_p->host, client_p->username,
216	<	&client_p->localClient->ip,
217	<	client_p->localClient->aftype,
529	<	client_p->localClient->passwd);
215	>	MyFree(node->data);
216	>	dlinkDelete(node, &conf->leaf_list);
217	>	free_dlink_node(node);
218		}
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);
219
220	<	if (conf != NULL)
220	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
221		{
222	<	if (IsConfClient(conf) && !rkconf)
549	<	{
550	<	if (IsConfRedir(conf))
551	<	{
552	<	sendto_one(client_p, form_str(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);
222	>	struct exempt *exptr = node->data;
223
224	<	/* Thanks for spoof idea amm */
225	<	if (IsConfDoSpoofIp(conf))
226	<	{
227	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
228	<	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	<	}
224	>	dlinkDelete(node, &conf->exempt_list);
225	>	MyFree(exptr->name);
226	>	MyFree(exptr->user);
227	>	MyFree(exptr->host);
228	>	MyFree(exptr);
229		}
230
231	<	return(NOT_AUTHORIZED);
231	>	MyFree(conf);
232		}
233
234		/* attach_iline()
235		*
236	<	* inputs       - client pointer
237	<	*              - conf pointer
238	<	* output       -
239	<	* side effects - do actual attach
236	>	* inputs       - client pointer
237	>	*              - conf pointer
238	>	* output       -
239	>	* side effects - do actual attach
240		*/
241		static int
242		attach_iline(struct Client *client_p, struct MaskItem *conf)
243		{
244	<	struct ClassItem *class = NULL;
244	>	const struct ClassItem *const class = conf->class;
245		struct ip_entry *ip_found;
246		int a_limit_reached = 0;
247		unsigned int local = 0, global = 0, ident = 0;
248
249	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
249	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
250		ip_found->count++;
251	<	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;
251	>	AddFlag(client_p, FLAGS_IPHASH);
252
253		count_user_host(client_p->username, client_p->host,
254		&global, &local, &ident);
#	Line 619 | Line 257 | attach_iline(struct Client *client_p, st
257		* setting a_limit_reached if any limit is reached.
258		* - Dianora
259		*/
260	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
260	>	if (class->max_total && class->ref_count >= class->max_total)
261		a_limit_reached = 1;
262	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
262	>	else if (class->max_perip && ip_found->count > class->max_perip)
263		a_limit_reached = 1;
264	<	else if (class->max_local != 0 && local >= class->max_local)
264	>	else if (class->max_local && local >= class->max_local)
265		a_limit_reached = 1;
266	<	else if (class->max_global != 0 && global >= class->max_global)
266	>	else if (class->max_global && global >= class->max_global)
267		a_limit_reached = 1;
268	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
268	>	else if (class->max_ident && ident >= class->max_ident &&
269		client_p->username[0] != '~')
270		a_limit_reached = 1;
271
#	Line 636 | Line 274 | attach_iline(struct Client *client_p, st
274		if (!IsConfExemptLimits(conf))
275		return TOO_MANY;   /* Already at maximum allowed */
276
277	<	sendto_one(client_p,
278	<	":%s NOTICE %s :*** Your connection class is full, "
641	<	"but you have exceed_limit = yes;", me.name, client_p->name);
277	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
278	>	"but you have exceed_limit = yes;");
279		}
280
281		return attach_conf(client_p, conf);
282		}
283
284	<	/* 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_heap = BlockHeapCreate("ip", 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 -
284	>	/* verify_access()
285		*
286	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
287	<	* count set to 0.
286	>	* inputs       - pointer to client to verify
287	>	* output       - 0 if success -'ve if not
288	>	* side effect  - find the first (best) I line to attach.
289		*/
290	<	static struct ip_entry *
291	<	find_or_add_ip(struct irc_ssaddr *ip_in)
290	>	static int
291	>	verify_access(struct Client *client_p)
292		{
293	<	struct ip_entry *ptr, *newptr;
294	<	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
293	>	struct MaskItem *conf = NULL;
294	>	char non_ident[USERLEN + 1] = "~";
295
296	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
296	>	if (IsGotId(client_p))
297		{
298	<	#ifdef IPV6
299	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
300	<	continue;
301	<	if (ip_in->ss.ss_family == AF_INET6)
302	<	{
303	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
304	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
305	<	}
306	<	else
307	<	#endif
308	<	{
309	<	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	<	}
298	>	conf = find_address_conf(client_p->host, client_p->username,
299	>	&client_p->connection->ip,
300	>	client_p->connection->aftype,
301	>	client_p->connection->password);
302	>	}
303	>	else
304	>	{
305	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
306	>	conf = find_address_conf(client_p->host, non_ident,
307	>	&client_p->connection->ip,
308	>	client_p->connection->aftype,
309	>	client_p->connection->password);
310		}
311
312	<	if (ip_entries_count >= 2 * hard_fdlimit)
313	<	garbage_collect_ip_entries();
314	<
315	<	newptr = BlockHeapAlloc(ip_entry_heap);
316	<	ip_entries_count++;
317	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
318	<
319	<	newptr->next = ip_hash_table[hash_index];
320	<	ip_hash_table[hash_index] = newptr;
312	>	if (conf)
313	>	{
314	>	if (IsConfClient(conf))
315	>	{
316	>	if (IsConfRedir(conf))
317	>	{
318	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
319	>	conf->name ? conf->name : "",
320	>	conf->port);
321	>	return NOT_AUTHORIZED;
322	>	}
323
324	<	return newptr;
325	<	}
324	>	/* Thanks for spoof idea amm */
325	>	if (IsConfDoSpoofIp(conf))
326	>	{
327	>	if (IsConfSpoofNotice(conf))
328	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
329	>	client_p->name, client_p->host, conf->name);
330
331	<	/* remove_one_ip()
332	<	*
719	<	* inputs        - unsigned long IP address value
720	<	* output        - NONE
721	<	* side effects  - The ip address given, is looked up in ip hash table
722	<	*                 and number of ip#'s for that ip decremented.
723	<	*                 If ip # count reaches 0 and has expired,
724	<	*                 the struct ip_entry is returned to the ip_entry_heap
725	<	*/
726	<	void
727	<	remove_one_ip(struct irc_ssaddr *ip_in)
728	<	{
729	<	struct ip_entry *ptr;
730	<	struct ip_entry *last_ptr = NULL;
731	<	int hash_index = hash_ip(ip_in), res;
732	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
733	<	#ifdef IPV6
734	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
735	<	#endif
331	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
332	>	}
333
334	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
738	<	{
739	<	#ifdef IPV6
740	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
741	<	continue;
742	<	if (ip_in->ss.ss_family == AF_INET6)
743	<	{
744	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
745	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
334	>	return attach_iline(client_p, conf);
335		}
336	<	else
748	<	#endif
336	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
337		{
338	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
339	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
752	<	}
753	<	if (res)
754	<	continue;
755	<	if (ptr->count > 0)
756	<	ptr->count--;
757	<	if (ptr->count == 0 &&
758	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
759	<	{
760	<	if (last_ptr != NULL)
761	<	last_ptr->next = ptr->next;
762	<	else
763	<	ip_hash_table[hash_index] = ptr->next;
338	>	if (IsConfGline(conf))
339	>	sendto_one_notice(client_p, &me, ":*** G-lined");
340
341	<	BlockHeapFree(ip_entry_heap, ptr);
342	<	ip_entries_count--;
767	<	return;
341	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342	>	return BANNED_CLIENT;
343		}
769	–	last_ptr = ptr;
344		}
771	–	}
345
346	<	/* hash_ip()
774	<	*
775	<	* input        - pointer to an irc_inaddr
776	<	* output       - integer value used as index into hash table
777	<	* side effects - hopefully, none
778	<	*/
779	<	static int
780	<	hash_ip(struct irc_ssaddr *addr)
781	<	{
782	<	if (addr->ss.ss_family == AF_INET)
783	<	{
784	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
785	<	int hash;
786	<	uint32_t ip;
787	<
788	<	ip   = ntohl(v4->sin_addr.s_addr);
789	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
790	<	return hash;
791	<	}
792	<	#ifdef IPV6
793	<	else
794	<	{
795	<	int hash;
796	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
797	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
798	<
799	<	hash  = ip[0] ^ ip[3];
800	<	hash ^= hash >> 16;
801	<	hash ^= hash >> 8;
802	<	hash  = hash & (IP_HASH_SIZE - 1);
803	<	return hash;
804	<	}
805	<	#else
806	<	return 0;
807	<	#endif
346	>	return NOT_AUTHORIZED;
347		}
348
349	<	/* count_ip_hash()
811	<	*
812	<	* inputs        - pointer to counter of number of ips hashed
813	<	*               - pointer to memory used for ip hash
814	<	* output        - returned via pointers input
815	<	* side effects  - NONE
349	>	/* check_client()
350		*
351	<	* number of hashed ip #'s is counted up, plus the amount of memory
352	<	* used in the hash.
351	>	* inputs       - pointer to client
352	>	* output       - 0 = Success
353	>	*                NOT_AUTHORIZED    (-1) = Access denied (no I line match)
354	>	*                IRCD_SOCKET_ERROR (-2) = Bad socket.
355	>	*                I_LINE_FULL       (-3) = I-line is full
356	>	*                TOO_MANY          (-4) = Too many connections from hostname
357	>	*                BANNED_CLIENT     (-5) = K-lined
358	>	* side effects - Ordinary client access check.
359	>	*                Look for conf lines which have the same
360	>	*                status as the flags passed.
361		*/
362	<	void
363	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
362	>	int
363	>	check_client(struct Client *source_p)
364		{
823	–	struct ip_entry *ptr;
365		int i;
366
367	<	*number_ips_stored = 0;
368	<	*mem_ips_stored    = 0;
367	>	if ((i = verify_access(source_p)))
368	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
369	>	source_p->name, source_p->sockhost);
370
371	<	for (i = 0; i < IP_HASH_SIZE; i++)
371	>	switch (i)
372		{
373	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
374	<	{
375	<	*number_ips_stored += 1;
376	<	*mem_ips_stored += sizeof(struct ip_entry);
377	<	}
378	<	}
379	<	}
373	>	case TOO_MANY:
374	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
375	>	"Too many on IP for %s (%s).",
376	>	get_client_name(source_p, SHOW_IP),
377	>	source_p->sockhost);
378	>	ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
379	>	get_client_name(source_p, SHOW_IP));
380	>	++ServerStats.is_ref;
381	>	exit_client(source_p, "No more connections allowed on that IP");
382	>	break;
383
384	<	/* garbage_collect_ip_entries()
385	<	*
386	<	* input        - NONE
387	<	* output       - NONE
388	<	* side effects - free up all ip entries with no connections
389	<	*/
390	<	static void
391	<	garbage_collect_ip_entries(void)
392	<	{
393	<	struct ip_entry *ptr;
849	<	struct ip_entry *last_ptr;
850	<	struct ip_entry *next_ptr;
851	<	int i;
384	>	case I_LINE_FULL:
385	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
386	>	"auth {} block is full for %s (%s).",
387	>	get_client_name(source_p, SHOW_IP),
388	>	source_p->sockhost);
389	>	ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
390	>	get_client_name(source_p, SHOW_IP));
391	>	++ServerStats.is_ref;
392	>	exit_client(source_p, "No more connections allowed in your connection class");
393	>	break;
394
395	<	for (i = 0; i < IP_HASH_SIZE; i++)
396	<	{
397	<	last_ptr = NULL;
395	>	case NOT_AUTHORIZED:
396	>	/* jdc - lists server name & port connections are on */
397	>	/*       a purely cosmetical change */
398	>	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
399	>	"Unauthorized client connection from %s [%s] on [%s/%u].",
400	>	get_client_name(source_p, SHOW_IP),
401	>	source_p->sockhost,
402	>	source_p->connection->listener->name,
403	>	source_p->connection->listener->port);
404	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
405	>	get_client_name(source_p, SHOW_IP),
406	>	source_p->connection->listener->name,
407	>	source_p->connection->listener->port);
408
409	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
410	<	{
411	<	next_ptr = ptr->next;
409	>	++ServerStats.is_ref;
410	>	exit_client(source_p, "You are not authorized to use this server");
411	>	break;
412
413	<	if (ptr->count == 0 &&
414	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
415	<	{
416	<	if (last_ptr != NULL)
417	<	last_ptr->next = ptr->next;
418	<	else
419	<	ip_hash_table[i] = ptr->next;
420	<	BlockHeapFree(ip_entry_heap, ptr);
869	<	ip_entries_count--;
870	<	}
871	<	else
872	<	last_ptr = ptr;
873	<	}
413	>	case BANNED_CLIENT:
414	>	++ServerStats.is_ref;
415	>	exit_client(source_p, "Banned");
416	>	break;
417	>
418	>	case 0:
419	>	default:
420	>	break;
421		}
422	+
423	+	return !(i < 0);
424		}
425
426		/* detach_conf()
#	Line 885 | Line 434 | garbage_collect_ip_entries(void)
434		void
435		detach_conf(struct Client *client_p, enum maskitem_type type)
436		{
437	<	dlink_node *ptr = NULL, *next_ptr = NULL;
437	>	dlink_node *node = NULL, *node_next = NULL;
438
439	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
439	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
440		{
441	<	struct MaskItem *conf = ptr->data;
441	>	struct MaskItem *conf = node->data;
442
443		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
444		assert(conf->ref_count > 0);
#	Line 898 | Line 447 | detach_conf(struct Client *client_p, enu
447		if (!(conf->type & type))
448		continue;
449
450	<	dlinkDelete(ptr, &client_p->localClient->confs);
451	<	free_dlink_node(ptr);
450	>	dlinkDelete(node, &client_p->connection->confs);
451	>	free_dlink_node(node);
452
453		if (conf->type == CONF_CLIENT)
454	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
454	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
455
456		if (--conf->class->ref_count == 0 && conf->class->active == 0)
457		{
#	Line 928 | Line 477 | detach_conf(struct Client *client_p, enu
477		int
478		attach_conf(struct Client *client_p, struct MaskItem *conf)
479		{
480	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
480	>	if (dlinkFind(&client_p->connection->confs, conf))
481		return 1;
482
483		if (conf->type == CONF_CLIENT)
484		if (cidr_limit_reached(IsConfExemptLimits(conf),
485	<	&client_p->localClient->ip, conf->class))
485	>	&client_p->connection->ip, conf->class))
486		return TOO_MANY;    /* Already at maximum allowed */
487
488		conf->class->ref_count++;
489		conf->ref_count++;
490
491	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
491	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
492
493		return 0;
494		}
#	Line 956 | Line 505 | int
505		attach_connect_block(struct Client *client_p, const char *name,
506		const char *host)
507		{
508	<	dlink_node *ptr;
960	<	struct MaskItem *conf = NULL;
508	>	dlink_node *node = NULL;
509
510	<	assert(client_p != NULL);
963	<	assert(host != NULL);
510	>	assert(host);
511
512	<	if (client_p == NULL || host == NULL)
966	<	return 0;
967	<
968	<	DLINK_FOREACH(ptr, server_items.head)
512	>	DLINK_FOREACH(node, server_items.head)
513		{
514	<	conf = ptr->data;
514	>	struct MaskItem *conf = node->data;
515
516		if (match(conf->name, name) || match(conf->host, host))
517		continue;
#	Line 991 | Line 535 | attach_connect_block(struct Client *clie
535		struct MaskItem *
536		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
537		{
538	<	dlink_node *ptr;
995	<	struct MaskItem* conf;
538	>	dlink_node *node = NULL;
539
540	<	DLINK_FOREACH(ptr, list->head)
540	>	DLINK_FOREACH(node, list->head)
541		{
542	<	conf = ptr->data;
543	<
542	>	struct MaskItem *conf = node->data;
543	>
544		if (conf->type == type)
545		{
546	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
547	<	!match(conf->name, name)))
1005	<	return conf;
546	>	if (conf->name && !irccmp(conf->name, name))
547	>	return conf;
548		}
549		}
550
551		return NULL;
552		}
553
1012	–	/* map_to_list()
1013	–	*
1014	–	* inputs       - ConfType conf
1015	–	* output       - pointer to dlink_list to use
1016	–	* side effects - none
1017	–	*/
1018	–	static dlink_list *
1019	–	map_to_list(enum maskitem_type type)
1020	–	{
1021	–	switch(type)
1022	–	{
1023	–	case CONF_RKLINE:
1024	–	return(&rkconf_items);
1025	–	break;
1026	–	case CONF_RXLINE:
1027	–	return(&rxconf_items);
1028	–	break;
1029	–	case CONF_XLINE:
1030	–	return(&xconf_items);
1031	–	break;
1032	–	case CONF_ULINE:
1033	–	return(&uconf_items);
1034	–	break;
1035	–	case CONF_NRESV:
1036	–	return(&nresv_items);
1037	–	break;
1038	–	case CONF_OPER:
1039	–	return(&oconf_items);
1040	–	break;
1041	–	case CONF_SERVER:
1042	–	return(&server_items);
1043	–	break;
1044	–	case CONF_SERVICE:
1045	–	return(&service_items);
1046	–	break;
1047	–	case CONF_CLUSTER:
1048	–	return(&cluster_items);
1049	–	break;
1050	–	default:
1051	–	return NULL;
1052	–	}
1053	–	}
1054	–
554		/* find_matching_name_conf()
555		*
556		* inputs       - type of link list to look in
#	Line 1066 | Line 565 | struct MaskItem *
565		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
566		const char *host, unsigned int flags)
567		{
568	<	dlink_node *ptr=NULL;
569	<	struct MaskItem *conf=NULL;
570	<	dlink_list *list_p = map_to_list(type);
568	>	dlink_node *node = NULL;
569	>	dlink_list *list = map_to_list(type);
570	>	struct MaskItem *conf = NULL;
571
572		switch (type)
573		{
1075	–	#ifdef HAVE_LIBPCRE
1076	–	case CONF_RXLINE:
1077	–	DLINK_FOREACH(ptr, list_p->head)
1078	–	{
1079	–	conf = ptr->data;
1080	–	assert(conf->regexpname);
1081	–
1082	–	if (!ircd_pcre_exec(conf->regexuser, name))
1083	–	return conf;
1084	–	}
1085	–	break;
1086	–	#endif
574		case CONF_SERVICE:
575	<	DLINK_FOREACH(ptr, list_p->head)
575	>	DLINK_FOREACH(node, list->head)
576		{
577	<	conf = ptr->data;
577	>	conf = node->data;
578
579		if (EmptyString(conf->name))
580		continue;
581	<	if ((name != NULL) && !irccmp(name, conf->name))
581	>	if (name && !irccmp(name, conf->name))
582		return conf;
583		}
584		break;
#	Line 1099 | Line 586 | find_matching_name_conf(enum maskitem_ty
586		case CONF_XLINE:
587		case CONF_ULINE:
588		case CONF_NRESV:
589	<	DLINK_FOREACH(ptr, list_p->head)
589	>	case CONF_CRESV:
590	>	DLINK_FOREACH(node, list->head)
591		{
592	<	conf = ptr->data;
592	>	conf = node->data;
593
594		if (EmptyString(conf->name))
595	<	continue;
596	<	if ((name != NULL) && match_esc(conf->name, name))
595	>	continue;
596	>	if (name && !match(conf->name, name))
597		{
598	<	if ((user == NULL && (host == NULL)))
599	<	return conf;
600	<	if ((conf->flags & flags) != flags)
598	>	if ((user == NULL && (host == NULL)))
599	>	return conf;
600	>	if ((conf->flags & flags) != flags)
601		continue;
602	<	if (EmptyString(conf->user) || EmptyString(conf->host))
603	<	return conf;
604	<	if (!match(conf->user, user) && !match(conf->host, host))
605	<	return conf;
602	>	if (EmptyString(conf->user) || EmptyString(conf->host))
603	>	return conf;
604	>	if (!match(conf->user, user) && !match(conf->host, host))
605	>	return conf;
606		}
607		}
608		break;
609
610		case CONF_SERVER:
611	<	DLINK_FOREACH(ptr, list_p->head)
611	>	DLINK_FOREACH(node, list->head)
612		{
613	<	conf = ptr->data;
613	>	conf = node->data;
614
615	<	if ((name != NULL) && !match(name, conf->name))
615	>	if (name && !match(name, conf->name))
616		return conf;
617	<	else if ((host != NULL) && !match(host, conf->host))
617	>	if (host && !match(host, conf->host))
618		return conf;
619		}
620		break;
621	<
621	>
622		default:
623		break;
624		}
#	Line 1150 | Line 638 | struct MaskItem *
638		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
639		const char *user, const char *host)
640		{
641	<	dlink_node *ptr = NULL;
642	<	struct MaskItem *conf;
643	<	dlink_list *list_p = map_to_list(type);
641	>	dlink_node *node = NULL;
642	>	dlink_list *list = map_to_list(type);
643	>	struct MaskItem *conf = NULL;
644
645		switch(type)
646		{
1159	–	case CONF_RXLINE:
647		case CONF_XLINE:
648		case CONF_ULINE:
649		case CONF_NRESV:
650	+	case CONF_CRESV:
651
652	<	DLINK_FOREACH(ptr, list_p->head)
652	>	DLINK_FOREACH(node, list->head)
653		{
654	<	conf = ptr->data;
654	>	conf = node->data;
655
656		if (EmptyString(conf->name))
657	<	continue;
658	<
657	>	continue;
658	>
659		if (irccmp(conf->name, name) == 0)
660		{
661	<	if ((user == NULL && (host == NULL)))
662	<	return (conf);
663	<	if (EmptyString(conf->user) || EmptyString(conf->host))
664	<	return (conf);
665	<	if (!match(conf->user, user) && !match(conf->host, host))
666	<	return (conf);
661	>	if ((user == NULL && (host == NULL)))
662	>	return conf;
663	>	if (EmptyString(conf->user) || EmptyString(conf->host))
664	>	return conf;
665	>	if (!match(conf->user, user) && !match(conf->host, host))
666	>	return conf;
667		}
668		}
669		break;
670
671		case CONF_OPER:
672	<	DLINK_FOREACH(ptr, list_p->head)
672	>	DLINK_FOREACH(node, list->head)
673		{
674	<	conf = ptr->data;
674	>	conf = node->data;
675
676		if (EmptyString(conf->name))
677		continue;
#	Line 1204 | Line 692 | find_exact_name_conf(enum maskitem_type
692		return conf;
693		break;
694		case HM_IPV4:
695	<	if (who->localClient->aftype == AF_INET)
696	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
695	>	if (who->connection->aftype == AF_INET)
696	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
697		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
698		return conf;
699		break;
1212	–	#ifdef IPV6
700		case HM_IPV6:
701	<	if (who->localClient->aftype == AF_INET6)
702	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
701	>	if (who->connection->aftype == AF_INET6)
702	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
703		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
704		return conf;
705		break;
1219	–	#endif
706		default:
707		assert(0);
708		}
#	Line 1227 | Line 713 | find_exact_name_conf(enum maskitem_type
713		break;
714
715		case CONF_SERVER:
716	<	DLINK_FOREACH(ptr, list_p->head)
716	>	DLINK_FOREACH(node, list->head)
717		{
718	<	conf = ptr->data;
718	>	conf = node->data;
719
720		if (EmptyString(conf->name))
721	<	continue;
722	<
721	>	continue;
722	>
723		if (name == NULL)
724		{
725	<	if (EmptyString(conf->host))
726	<	continue;
727	<	if (irccmp(conf->host, host) == 0)
728	<	return(conf);
725	>	if (EmptyString(conf->host))
726	>	continue;
727	>	if (irccmp(conf->host, host) == 0)
728	>	return conf;
729		}
730		else if (irccmp(conf->name, name) == 0)
731	<	{
1246	<	return (conf);
1247	<	}
731	>	return conf;
732		}
733	+
734		break;
735
736		default:
737		break;
738		}
1254	–	return(NULL);
1255	–	}
739
740	<	/* rehash()
1258	<	*
1259	<	* Actual REHASH service routine. Called with sig == 0 if it has been called
1260	<	* as a result of an operator issuing this command, else assume it has been
1261	<	* called as a result of the server receiving a HUP signal.
1262	<	*/
1263	<	int
1264	<	rehash(int sig)
1265	<	{
1266	<	if (sig != 0)
1267	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1268	<	"Got signal SIGHUP, reloading ircd.conf file");
1269	<
1270	<	restart_resolver();
1271	<
1272	<	/* don't close listeners until we know we can go ahead with the rehash */
1273	<
1274	<	/* Check to see if we magically got(or lost) IPv6 support */
1275	<	check_can_use_v6();
1276	<
1277	<	read_conf_files(0);
1278	<
1279	<	if (ServerInfo.description != NULL)
1280	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1281	<
1282	<	load_conf_modules();
1283	<
1284	<	rehashed_klines = 1;
1285	<	/* XXX */
1286	<	if (ConfigLoggingEntry.use_logging)
1287	<	log_close_all();
1288	<
1289	<	return(0);
740	>	return NULL;
741		}
742
743		/* set_default_conf()
#	Line 1307 | Line 758 | set_default_conf(void)
758		assert(class_default == class_get_list()->tail->data);
759
760		#ifdef HAVE_LIBCRYPTO
761	<	ServerInfo.rsa_private_key = NULL;
762	<	ServerInfo.rsa_private_key_file = NULL;
761	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
762	>	{
763	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
764	>
765	>	if (key)
766	>	{
767	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
768	>	EC_KEY_free(key);
769	>	}
770	>	}
771	>
772	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
773	>	#endif
774	>
775	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
776	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
777	>	ConfigServerInfo.rsa_private_key = NULL;
778	>	ConfigServerInfo.rsa_private_key_file = NULL;
779		#endif
780
781	<	/* ServerInfo.name is not rehashable */
782	<	/* ServerInfo.name = ServerInfo.name; */
783	<	ServerInfo.description = NULL;
784	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	<
787	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
788	<	ServerInfo.specific_ipv4_vhost = 0;
789	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
790	<	ServerInfo.specific_ipv6_vhost = 0;
791	<
792	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
793	<
794	<	ServerInfo.hub = 0;
795	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
796	<	ServerInfo.dns_host.sin_port = 0;
797	<	AdminInfo.name = NULL;
798	<	AdminInfo.email = NULL;
799	<	AdminInfo.description = NULL;
781	>	/* ConfigServerInfo.name is not rehashable */
782	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
783	>	ConfigServerInfo.description = NULL;
784	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786	>
787	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
788	>	ConfigServerInfo.specific_ipv4_vhost = 0;
789	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790	>	ConfigServerInfo.specific_ipv6_vhost = 0;
791	>
792	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
793	>	ConfigServerInfo.max_nick_length = 9;
794	>	ConfigServerInfo.max_topic_length = 80;
795	>	ConfigServerInfo.hub = 0;
796	>
797	>	ConfigAdminInfo.name = NULL;
798	>	ConfigAdminInfo.email = NULL;
799	>	ConfigAdminInfo.description = NULL;
800
801	<	log_close_all();
801	>	log_del_all();
802
803	<	ConfigLoggingEntry.use_logging = 1;
803	>	ConfigLog.use_logging = 1;
804
805		ConfigChannel.disable_fake_channels = 0;
806	<	ConfigChannel.restrict_channels = 0;
807	<	ConfigChannel.knock_delay = 300;
806	>	ConfigChannel.invite_client_count = 10;
807	>	ConfigChannel.invite_client_time = 300;
808	>	ConfigChannel.knock_client_count = 1;
809	>	ConfigChannel.knock_client_time = 300;
810		ConfigChannel.knock_delay_channel = 60;
811	<	ConfigChannel.max_chans_per_user = 25;
1343	<	ConfigChannel.max_chans_per_oper = 50;
1344	<	ConfigChannel.quiet_on_ban = 1;
811	>	ConfigChannel.max_channels = 25;
812		ConfigChannel.max_bans = 25;
813		ConfigChannel.default_split_user_count = 0;
814		ConfigChannel.default_split_server_count = 0;
#	Line 1352 | Line 819 | set_default_conf(void)
819		ConfigServerHide.links_delay = 300;
820		ConfigServerHide.hidden = 0;
821		ConfigServerHide.hide_servers = 0;
822	+	ConfigServerHide.hide_services = 0;
823		ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
824		ConfigServerHide.hide_server_ips = 0;
825	+	ConfigServerHide.disable_remote_commands = 0;
826
827	<
828	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
829	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
830	<	ConfigFileEntry.glines = 0;
831	<	ConfigFileEntry.gline_time = 12 * 3600;
832	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
833	<	ConfigFileEntry.gline_min_cidr = 16;
834	<	ConfigFileEntry.gline_min_cidr6 = 48;
835	<	ConfigFileEntry.invisible_on_connect = 1;
836	<	ConfigFileEntry.tkline_expire_notices = 1;
837	<	ConfigFileEntry.hide_spoof_ips = 1;
838	<	ConfigFileEntry.ignore_bogus_ts = 0;
839	<	ConfigFileEntry.disable_auth = 0;
840	<	ConfigFileEntry.disable_remote = 0;
841	<	ConfigFileEntry.kill_chase_time_limit = 90;
842	<	ConfigFileEntry.default_floodcount = 8;
843	<	ConfigFileEntry.failed_oper_notice = 1;
844	<	ConfigFileEntry.dots_in_ident = 0;
845	<	ConfigFileEntry.min_nonwildcard = 4;
846	<	ConfigFileEntry.min_nonwildcard_simple = 3;
847	<	ConfigFileEntry.max_accept = 20;
848	<	ConfigFileEntry.anti_nick_flood = 0;
849	<	ConfigFileEntry.max_nick_time = 20;
850	<	ConfigFileEntry.max_nick_changes = 5;
851	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
852	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
853	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
854	<	ConfigFileEntry.warn_no_nline = 1;
855	<	ConfigFileEntry.stats_o_oper_only = 0;
856	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
857	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
858	<	ConfigFileEntry.stats_P_oper_only = 0;
859	<	ConfigFileEntry.caller_id_wait = 60;
860	<	ConfigFileEntry.opers_bypass_callerid = 0;
861	<	ConfigFileEntry.pace_wait = 10;
862	<	ConfigFileEntry.pace_wait_simple = 1;
863	<	ConfigFileEntry.short_motd = 0;
864	<	ConfigFileEntry.ping_cookie = 0;
865	<	ConfigFileEntry.no_oper_flood = 0;
866	<	ConfigFileEntry.true_no_oper_flood = 0;
867	<	ConfigFileEntry.oper_pass_resv = 1;
868	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
869	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
870	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
871	<	UMODE_OPERWALL | UMODE_WALLOP;
872	<	ConfigFileEntry.use_egd = 0;
873	<	ConfigFileEntry.egdpool_path = NULL;
1405	<	ConfigFileEntry.throttle_time = 10;
827	>	ConfigGeneral.away_count = 2;
828	>	ConfigGeneral.away_time = 10;
829	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
830	>	ConfigGeneral.cycle_on_host_change = 1;
831	>	ConfigGeneral.glines = 0;
832	>	ConfigGeneral.gline_time = 12 * 3600;
833	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
834	>	ConfigGeneral.gline_min_cidr = 16;
835	>	ConfigGeneral.gline_min_cidr6 = 48;
836	>	ConfigGeneral.invisible_on_connect = 1;
837	>	ConfigGeneral.tkline_expire_notices = 1;
838	>	ConfigGeneral.ignore_bogus_ts = 0;
839	>	ConfigGeneral.disable_auth = 0;
840	>	ConfigGeneral.kill_chase_time_limit = 90;
841	>	ConfigGeneral.default_floodcount = 8;
842	>	ConfigGeneral.failed_oper_notice = 1;
843	>	ConfigGeneral.dots_in_ident = 0;
844	>	ConfigGeneral.min_nonwildcard = 4;
845	>	ConfigGeneral.min_nonwildcard_simple = 3;
846	>	ConfigGeneral.max_accept = 20;
847	>	ConfigGeneral.anti_nick_flood = 0;
848	>	ConfigGeneral.max_nick_time = 20;
849	>	ConfigGeneral.max_nick_changes = 5;
850	>	ConfigGeneral.anti_spam_exit_message_time = 0;
851	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
852	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
853	>	ConfigGeneral.warn_no_connect_block = 1;
854	>	ConfigGeneral.stats_e_disabled = 0;
855	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
856	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
857	>	ConfigGeneral.stats_o_oper_only = 1;
858	>	ConfigGeneral.stats_m_oper_only = 1;
859	>	ConfigGeneral.stats_P_oper_only = 0;
860	>	ConfigGeneral.stats_u_oper_only = 0;
861	>	ConfigGeneral.caller_id_wait = 60;
862	>	ConfigGeneral.opers_bypass_callerid = 0;
863	>	ConfigGeneral.pace_wait = 10;
864	>	ConfigGeneral.pace_wait_simple = 1;
865	>	ConfigGeneral.short_motd = 0;
866	>	ConfigGeneral.ping_cookie = 0;
867	>	ConfigGeneral.no_oper_flood = 0;
868	>	ConfigGeneral.oper_pass_resv = 1;
869	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
870	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
871	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
872	>	ConfigGeneral.throttle_count = 1;
873	>	ConfigGeneral.throttle_time = 1;
874		}
875
876		static void
877		validate_conf(void)
878		{
879	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
880	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
879	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
880	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
881
882	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
883	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
882	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
883	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
884
885	<	if (ServerInfo.network_name == NULL)
886	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
885	>	if (EmptyString(ConfigServerInfo.network_name))
886	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
887
888	<	if (ServerInfo.network_desc == NULL)
889	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
888	>	if (EmptyString(ConfigServerInfo.network_desc))
889	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
890
891	<	if (ConfigFileEntry.service_name == NULL)
1424	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1425	<
1426	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
891	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
892		}
893
894	<	/* read_conf()
894	>	/* read_conf()
895		*
896		* inputs       - file descriptor pointing to config file to use
897		* output       - None
#	Line 1437 | Line 902 | read_conf(FILE *file)
902		{
903		lineno = 0;
904
905	<	set_default_conf(); /* Set default values prior to conf parsing */
905	>	set_default_conf();  /* Set default values prior to conf parsing */
906		conf_parser_ctx.pass = 1;
907	<	yyparse();          /* pick up the classes first */
907	>	yyparse();  /* Pick up the classes first */
908
909		rewind(file);
910
911		conf_parser_ctx.pass = 2;
912	<	yyparse();          /* Load the values from the conf */
913	<	validate_conf();    /* Check to make sure some values are still okay. */
914	<	/* Some global values are also loaded here. */
915	<	class_delete_marked();      /* Make sure classes are valid */
912	>	yyparse();  /* Load the values from the conf */
913	>	validate_conf();  /* Check to make sure some values are still okay. */
914	>	/* Some global values are also loaded here. */
915	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
916	>	}
917	>
918	>	/* conf_rehash()
919	>	*
920	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
921	>	* as a result of an operator issuing this command, else assume it has been
922	>	* called as a result of the server receiving a HUP signal.
923	>	*/
924	>	int
925	>	conf_rehash(int sig)
926	>	{
927	>	if (sig)
928	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
929	>	"Got signal SIGHUP, reloading configuration file(s)");
930	>
931	>	restart_resolver();
932	>
933	>	/* don't close listeners until we know we can go ahead with the rehash */
934	>
935	>	read_conf_files(0);
936	>
937	>	load_conf_modules();
938	>	check_conf_klines();
939	>
940	>	return 0;
941		}
942
943		/* lookup_confhost()
#	Line 1460 | Line 950 | lookup_confhost(struct MaskItem *conf)
950		{
951		struct addrinfo hints, *res;
952
953	<	/* Do name lookup now on hostnames given and store the
953	>	/*
954	>	* Do name lookup now on hostnames given and store the
955		* ip numbers in conf structure.
956		*/
957		memset(&hints, 0, sizeof(hints));
#	Line 1477 | Line 968 | lookup_confhost(struct MaskItem *conf)
968		return;
969		}
970
971	<	assert(res != NULL);
971	>	assert(res);
972
973		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
974		conf->addr.ss_len = res->ai_addrlen;
#	Line 1496 | Line 987 | lookup_confhost(struct MaskItem *conf)
987		int
988		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
989		{
990	<	struct ip_entry *ip_found;
991	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
990	>	struct ip_entry *ip_found = NULL;
991	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
992
993		/* DLINE exempt also gets you out of static limits/pacing... */
994		if (conf && (conf->type == CONF_EXEMPT))
995		return 0;
996
997	<	if (conf != NULL)
997	>	if (conf)
998		return BANNED_CLIENT;
999
1000	<	ip_found = find_or_add_ip(addr);
1000	>	ip_found = ipcache_find_or_add_address(addr);
1001
1002	<	if ((CurrentTime - ip_found->last_attempt) <
1512	<	ConfigFileEntry.throttle_time)
1002	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1003		{
1004	<	ip_found->last_attempt = CurrentTime;
1005	<	return TOO_FAST;
1004	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1005	>	return TOO_FAST;
1006	>
1007	>	++ip_found->connection_count;
1008		}
1009	+	else
1010	+	ip_found->connection_count = 1;
1011
1012		ip_found->last_attempt = CurrentTime;
1013		return 0;
1014		}
1015
1522	–	static struct MaskItem *
1523	–	find_regexp_kline(const char *uhi[])
1524	–	{
1525	–	#ifdef HAVE_LIBPCRE
1526	–	const dlink_node *ptr = NULL;
1527	–
1528	–	DLINK_FOREACH(ptr, rkconf_items.head)
1529	–	{
1530	–	struct MaskItem *aptr = ptr->data;
1531	–
1532	–	assert(aptr->regexuser);
1533	–	assert(aptr->regexhost);
1534	–
1535	–	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1536	–	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1537	–	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1538	–	return aptr;
1539	–	}
1540	–	#endif
1541	–	return NULL;
1542	–	}
1543	–
1544	–	/* find_kill()
1545	–	*
1546	–	* inputs       - pointer to client structure
1547	–	* output       - pointer to struct MaskItem if found
1548	–	* side effects - See if this user is klined already,
1549	–	*                and if so, return struct MaskItem pointer
1550	–	*/
1551	–	struct MaskItem *
1552	–	find_kill(struct Client *client_p)
1553	–	{
1554	–	struct MaskItem *conf = NULL;
1555	–	const char *uhi[3];
1556	–
1557	–	uhi[0] = client_p->username;
1558	–	uhi[1] = client_p->host;
1559	–	uhi[2] = client_p->sockhost;
1560	–
1561	–	assert(client_p != NULL);
1562	–
1563	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1564	–	CONF_KLINE, client_p->localClient->aftype,
1565	–	client_p->username, NULL, 1);
1566	–	if (conf == NULL)
1567	–	conf = find_regexp_kline(uhi);
1568	–
1569	–	return conf;
1570	–	}
1571	–
1572	–	struct MaskItem *
1573	–	find_gline(struct Client *client_p)
1574	–	{
1575	–	struct MaskItem *conf;
1576	–
1577	–	assert(client_p != NULL);
1578	–
1579	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1580	–	CONF_GLINE, client_p->localClient->aftype,
1581	–	client_p->username, NULL, 1);
1582	–	return conf;
1583	–	}
1584	–
1585	–	/* cleanup_tklines()
1586	–	*
1587	–	* inputs       - NONE
1588	–	* output       - NONE
1589	–	* side effects - call function to expire temporary k/d lines
1590	–	*                This is an event started off in ircd.c
1591	–	*/
1592	–	void
1593	–	cleanup_tklines(void *notused)
1594	–	{
1595	–	hostmask_expire_temporary();
1596	–	expire_tklines(&xconf_items);
1597	–	expire_tklines(&nresv_items);
1598	–	expire_tklines(&resv_channel_list);
1599	–	}
1600	–
1016		/* expire_tklines()
1017		*
1018		* inputs       - tkline list pointer
#	Line 1605 | Line 1020 | cleanup_tklines(void *notused)
1020		* side effects - expire tklines
1021		*/
1022		static void
1023	<	expire_tklines(dlink_list *tklist)
1023	>	expire_tklines(dlink_list *list)
1024		{
1025	<	dlink_node *ptr;
1611	<	dlink_node *next_ptr;
1612	<	struct MaskItem *conf;
1025	>	dlink_node *node = NULL, *node_next = NULL;
1026
1027	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1027	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1028		{
1029	<	conf = ptr->data;
1029	>	struct MaskItem *conf = node->data;
1030
1031		if (!conf->until || conf->until > CurrentTime)
1032		continue;
1033
1034		if (conf->type == CONF_XLINE)
1035		{
1036	<	if (ConfigFileEntry.tkline_expire_notices)
1036	>	if (ConfigGeneral.tkline_expire_notices)
1037		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038		"Temporary X-line for [%s] expired", conf->name);
1039		conf_free(conf);
1040		}
1041	<	else if (conf->type == CONF_NRESV)
1041	>	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1042		{
1043	<	if (ConfigFileEntry.tkline_expire_notices)
1043	>	if (ConfigGeneral.tkline_expire_notices)
1044		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1045		"Temporary RESV for [%s] expired", conf->name);
1046		conf_free(conf);
1047		}
1635	–	else if (conf->type == CONF_CRESV)
1636	–	{
1637	–	if (ConfigFileEntry.tkline_expire_notices)
1638	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1639	–	"Temporary RESV for [%s] expired", conf->name);
1640	–	delete_channel_resv(conf);
1641	–	}
1048		}
1049		}
1050
1051	+	/* cleanup_tklines()
1052	+	*
1053	+	* inputs       - NONE
1054	+	* output       - NONE
1055	+	* side effects - call function to expire temporary k/d lines
1056	+	*                This is an event started off in ircd.c
1057	+	*/
1058	+	void
1059	+	cleanup_tklines(void *unused)
1060	+	{
1061	+	hostmask_expire_temporary();
1062	+	expire_tklines(&xconf_items);
1063	+	expire_tklines(&nresv_items);
1064	+	expire_tklines(&cresv_items);
1065	+	}
1066	+
1067		/* oper_privs_as_string()
1068		*
1069		* inputs        - pointer to client_p
#	Line 1653 | Line 1075 | static const struct oper_privs
1075		const unsigned int flag;
1076		const unsigned char c;
1077		} flag_list[] = {
1078	<	{ OPER_FLAG_ADMIN,       'A' },
1079	<	{ OPER_FLAG_REMOTEBAN,   'B' },
1080	<	{ OPER_FLAG_DIE,         'D' },
1081	<	{ OPER_FLAG_GLINE,       'G' },
1082	<	{ OPER_FLAG_REHASH,      'H' },
1083	<	{ OPER_FLAG_K,           'K' },
1084	<	{ OPER_FLAG_OPERWALL,    'L' },
1085	<	{ OPER_FLAG_N,           'N' },
1086	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1087	<	{ OPER_FLAG_REMOTE,      'R' },
1088	<	{ OPER_FLAG_OPER_SPY,    'S' },
1089	<	{ OPER_FLAG_UNKLINE,     'U' },
1090	<	{ OPER_FLAG_X,           'X' },
1078	>	{ OPER_FLAG_ADMIN,          'A' },
1079	>	{ OPER_FLAG_REMOTEBAN,      'B' },
1080	>	{ OPER_FLAG_DIE,            'D' },
1081	>	{ OPER_FLAG_GLINE,          'G' },
1082	>	{ OPER_FLAG_REHASH,         'H' },
1083	>	{ OPER_FLAG_KLINE,          'K' },
1084	>	{ OPER_FLAG_KILL,           'N' },
1085	>	{ OPER_FLAG_KILL_REMOTE,    'O' },
1086	>	{ OPER_FLAG_CONNECT,        'P' },
1087	>	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1088	>	{ OPER_FLAG_SQUIT,          'R' },
1089	>	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1090	>	{ OPER_FLAG_UNKLINE,        'U' },
1091	>	{ OPER_FLAG_XLINE,          'X' },
1092		{ 0, '\0' }
1093		};
1094
1095		char *
1096		oper_privs_as_string(const unsigned int port)
1097		{
1098	<	static char privs_out[16];
1098	>	static char privs_out[IRCD_BUFSIZE];
1099		char *privs_ptr = privs_out;
1677	–	const struct oper_privs *opriv = flag_list;
1100
1101	<	for (; opriv->flag; ++opriv)
1101	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1102		{
1103		if (port & opriv->flag)
1104		*privs_ptr++ = opriv->c;
#	Line 1690 | Line 1112 | oper_privs_as_string(const unsigned int
1112		}
1113
1114		/*
1115	<	* Input: A client to find the active oper{} name for.
1115	>	* Input: A client to find the active operator {} name for.
1116		* Output: The nick!user@host{oper} of the oper.
1117		*         "oper" is server name for remote opers
1118		* Side effects: None.
#	Line 1698 | Line 1120 | oper_privs_as_string(const unsigned int
1120		const char *
1121		get_oper_name(const struct Client *client_p)
1122		{
1701	–	dlink_node *cnode = NULL;
1123		/* +5 for !,@,{,} and null */
1124		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1125
1126	+	if (IsServer(client_p))
1127	+	return client_p->name;
1128	+
1129		if (MyConnect(client_p))
1130		{
1131	<	if ((cnode = client_p->localClient->confs.head))
1131	>	const dlink_node *const node = client_p->connection->confs.head;
1132	>
1133	>	if (node)
1134		{
1135	<	struct MaskItem *conf = cnode->data;
1135	>	const struct MaskItem *const conf = node->data;
1136
1137	<	if (IsConfOperator(conf))
1137	>	if (conf->type == CONF_OPER)
1138		{
1139	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1139	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1140		client_p->username, client_p->host, conf->name);
1141	<	return buffer;
1141	>	return buffer;
1142		}
1143		}
1144
1145	<	/* Probably should assert here for now. If there is an oper out there
1146	<	* with no oper{} conf attached, it would be good for us to know...
1145	>	/*
1146	>	* Probably should assert here for now. If there is an oper out there
1147	>	* with no operator {} conf attached, it would be good for us to know...
1148		*/
1149	<	assert(0); /* Oper without oper conf! */
1149	>	assert(0);  /* Oper without oper conf! */
1150		}
1151
1152		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1153	<	client_p->username, client_p->host, client_p->servptr->name);
1153	>	client_p->username, client_p->host, client_p->servptr->name);
1154		return buffer;
1155		}
1156
1730	–	/* read_conf_files()
1731	–	*
1732	–	* inputs       - cold start YES or NO
1733	–	* output       - none
1734	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1735	–	*/
1736	–	void
1737	–	read_conf_files(int cold)
1738	–	{
1739	–	const char *filename;
1740	–	char chanmodes[32];
1741	–	char chanlimit[32];
1742	–
1743	–	conf_parser_ctx.boot = cold;
1744	–	filename = ConfigFileEntry.configfile;
1745	–
1746	–	/* We need to know the initial filename for the yyerror() to report
1747	–	FIXME: The full path is in conffilenamebuf first time since we
1748	–	dont know anything else
1749	–
1750	–	- Gozem 2002-07-21
1751	–	*/
1752	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1753	–
1754	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1755	–	{
1756	–	if (cold)
1757	–	{
1758	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1759	–	filename, strerror(errno));
1760	–	exit(-1);
1761	–	}
1762	–	else
1763	–	{
1764	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1765	–	"Unable to read configuration file '%s': %s",
1766	–	filename, strerror(errno));
1767	–	return;
1768	–	}
1769	–	}
1770	–
1771	–	if (!cold)
1772	–	clear_out_old_conf();
1773	–
1774	–	read_conf(conf_parser_ctx.conf_file);
1775	–	fclose(conf_parser_ctx.conf_file);
1776	–
1777	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
1778	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d",
1779	–	ConfigChannel.max_bans);
1780	–	add_isupport("MAXLIST", chanmodes, -1);
1781	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1782	–
1783	–	add_isupport("CHANTYPES", "#", -1);
1784	–
1785	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1786	–	ConfigChannel.max_chans_per_user);
1787	–	add_isupport("CHANLIMIT", chanlimit, -1);
1788	–	snprintf(chanmodes, sizeof(chanmodes), "%s",
1789	–	"beI,k,l,imnprstORS");
1790	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1791	–
1792	–	add_isupport("EXCEPTS", "e", -1);
1793	–	add_isupport("INVEX", "I", -1);
1794	–	add_isupport("CHANMODES", chanmodes, -1);
1795	–
1796	–	/*
1797	–	* message_locale may have changed.  rebuild isupport since it relies
1798	–	* on strlen(form_str(RPL_ISUPPORT))
1799	–	*/
1800	–	rebuild_isupport_message_line();
1801	–	}
1802	–
1157		/* clear_out_old_conf()
1158		*
1159		* inputs       - none
#	Line 1809 | Line 1163 | read_conf_files(int cold)
1163		static void
1164		clear_out_old_conf(void)
1165		{
1166	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1813	<	struct MaskItem *conf;
1166	>	dlink_node *node = NULL, *node_next = NULL;
1167		dlink_list *free_items [] = {
1168		&server_items,   &oconf_items,
1169	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1170	<	&nresv_items, &cluster_items,  &service_items, NULL
1169	>	&uconf_items,   &xconf_items,
1170	>	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1171		};
1172
1173		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 1822 | Line 1175 | clear_out_old_conf(void)
1175		/* We only need to free anything allocated by yyparse() here.
1176		* Resetting structs, etc, is taken care of by set_default_conf().
1177		*/
1178	<
1179	<	for (; *iterator != NULL; iterator++)
1178	>
1179	>	for (; *iterator; iterator++)
1180		{
1181	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1181	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1182		{
1183	<	conf = ptr->data;
1183	>	struct MaskItem *conf = node->data;
1184
1185	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1185	>	conf->active = 0;
1186	>	dlinkDelete(&conf->node, *iterator);
1187
1188		/* XXX This is less than pretty */
1189		if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1190		{
1191		if (!conf->ref_count)
1192	<	conf_free(conf);
1192	>	conf_free(conf);
1193		}
1194	<	else if (conf->type == CONF_XLINE  ||
1841	<	conf->type == CONF_RXLINE ||
1842	<	conf->type == CONF_RKLINE)
1194	>	else if (conf->type == CONF_XLINE)
1195		{
1196		if (!conf->until)
1197		conf_free(conf);
#	Line 1849 | Line 1201 | clear_out_old_conf(void)
1201		}
1202		}
1203
1204	+	motd_clear();
1205	+
1206		/*
1207		* don't delete the class table, rather mark all entries
1208		* for deletion. The table is cleaned up by class_delete_marked. - avalon
#	Line 1860 | Line 1214 | clear_out_old_conf(void)
1214		/* clean out module paths */
1215		mod_clear_paths();
1216
1217	<	/* clean out ServerInfo */
1218	<	MyFree(ServerInfo.description);
1219	<	ServerInfo.description = NULL;
1220	<	MyFree(ServerInfo.network_name);
1221	<	ServerInfo.network_name = NULL;
1222	<	MyFree(ServerInfo.network_desc);
1223	<	ServerInfo.network_desc = NULL;
1224	<	MyFree(ConfigFileEntry.egdpool_path);
1225	<	ConfigFileEntry.egdpool_path = NULL;
1217	>	pseudo_clear();
1218	>
1219	>	/* clean out ConfigServerInfo */
1220	>	MyFree(ConfigServerInfo.description);
1221	>	ConfigServerInfo.description = NULL;
1222	>	MyFree(ConfigServerInfo.network_name);
1223	>	ConfigServerInfo.network_name = NULL;
1224	>	MyFree(ConfigServerInfo.network_desc);
1225	>	ConfigServerInfo.network_desc = NULL;
1226		#ifdef HAVE_LIBCRYPTO
1227	<	if (ServerInfo.rsa_private_key != NULL)
1227	>	if (ConfigServerInfo.rsa_private_key)
1228		{
1229	<	RSA_free(ServerInfo.rsa_private_key);
1230	<	ServerInfo.rsa_private_key = NULL;
1229	>	RSA_free(ConfigServerInfo.rsa_private_key);
1230	>	ConfigServerInfo.rsa_private_key = NULL;
1231		}
1232
1233	<	MyFree(ServerInfo.rsa_private_key_file);
1234	<	ServerInfo.rsa_private_key_file = NULL;
1881	<
1882	<	if (ServerInfo.server_ctx)
1883	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1884	<	SSL_OP_NO_SSLv3|
1885	<	SSL_OP_NO_TLSv1);
1886	<	if (ServerInfo.client_ctx)
1887	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1888	<	SSL_OP_NO_SSLv3|
1889	<	SSL_OP_NO_TLSv1);
1233	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1234	>	ConfigServerInfo.rsa_private_key_file = NULL;
1235		#endif
1236
1237	<	/* clean out old resvs from the conf */
1238	<	clear_conf_resv();
1239	<
1240	<	/* clean out AdminInfo */
1241	<	MyFree(AdminInfo.name);
1242	<	AdminInfo.name = NULL;
1243	<	MyFree(AdminInfo.email);
1899	<	AdminInfo.email = NULL;
1900	<	MyFree(AdminInfo.description);
1901	<	AdminInfo.description = NULL;
1237	>	/* clean out ConfigAdminInfo */
1238	>	MyFree(ConfigAdminInfo.name);
1239	>	ConfigAdminInfo.name = NULL;
1240	>	MyFree(ConfigAdminInfo.email);
1241	>	ConfigAdminInfo.email = NULL;
1242	>	MyFree(ConfigAdminInfo.description);
1243	>	ConfigAdminInfo.description = NULL;
1244
1245		/* clean out listeners */
1246		close_listeners();
1247	+	}
1248	+
1249	+	/* read_conf_files()
1250	+	*
1251	+	* inputs       - cold start YES or NO
1252	+	* output       - none
1253	+	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1254	+	*/
1255	+	void
1256	+	read_conf_files(int cold)
1257	+	{
1258	+	const char *filename = NULL;
1259	+	char chanmodes[IRCD_BUFSIZE] = "";
1260	+	char chanlimit[IRCD_BUFSIZE] = "";
1261
1262	<	/* clean out general */
1263	<	MyFree(ConfigFileEntry.service_name);
1908	<	ConfigFileEntry.service_name = NULL;
1262	>	conf_parser_ctx.boot = cold;
1263	>	filename = ConfigGeneral.configfile;
1264
1265	<	delete_isupport("INVEX");
1266	<	delete_isupport("EXCEPTS");
1265	>	/* We need to know the initial filename for the yyerror() to report
1266	>	FIXME: The full path is in conffilenamebuf first time since we
1267	>	don't know anything else
1268	>
1269	>	- Gozem 2002-07-21
1270	>	*/
1271	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1272	>
1273	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1274	>	{
1275	>	if (cold)
1276	>	{
1277	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1278	>	filename, strerror(errno));
1279	>	exit(-1);
1280	>	}
1281	>	else
1282	>	{
1283	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1284	>	"Unable to read configuration file '%s': %s",
1285	>	filename, strerror(errno));
1286	>	return;
1287	>	}
1288	>	}
1289	>
1290	>	if (!cold)
1291	>	clear_out_old_conf();
1292	>
1293	>	read_conf(conf_parser_ctx.conf_file);
1294	>	fclose(conf_parser_ctx.conf_file);
1295	>
1296	>	log_reopen_all();
1297	>
1298	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1299	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1300	>
1301	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1302	>	add_isupport("MAXLIST", chanmodes, -1);
1303	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1304	>	add_isupport("CHANTYPES", "#", -1);
1305	>
1306	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1307	>	ConfigChannel.max_channels);
1308	>	add_isupport("CHANLIMIT", chanlimit, -1);
1309	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1310	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1311	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1312	>	add_isupport("CHANMODES", chanmodes, -1);
1313	>
1314	>	/*
1315	>	* message_locale may have changed.  rebuild isupport since it relies
1316	>	* on strlen(form_str(RPL_ISUPPORT))
1317	>	*/
1318	>	rebuild_isupport_message_line();
1319		}
1320
1321		/* conf_add_class_to_conf()
1322		*
1323		* inputs       - pointer to config item
1324		* output       - NONE
1325	<	* side effects - Add a class pointer to a conf
1325	>	* side effects - Add a class pointer to a conf
1326		*/
1327		void
1328		conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1329		{
1330	<	struct ClassItem *class = NULL;
1924	<
1925	<	if (class_name == NULL)
1330	>	if (class_name == NULL)
1331		{
1332		conf->class = class_default;
1333
1334	<	if (conf->type == CONF_CLIENT)
1334	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1335		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1336	<	"Warning *** Defaulting to default class for %s@%s",
1337	<	conf->user, conf->host);
1336	>	"Warning *** Defaulting to default class for %s@%s",
1337	>	conf->user, conf->host);
1338		else
1339		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1340	<	"Warning *** Defaulting to default class for %s",
1341	<	conf->name);
1340	>	"Warning *** Defaulting to default class for %s",
1341	>	conf->name);
1342		}
1343		else
1344		conf->class = class_find(class_name, 1);
1345
1346		if (conf->class == NULL)
1347		{
1348	<	if (conf->type == CONF_CLIENT)
1348	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1349		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1350	<	"Warning *** Defaulting to default class for %s@%s",
1351	<	conf->user, conf->host);
1350	>	"Warning *** Defaulting to default class for %s@%s",
1351	>	conf->user, conf->host);
1352		else
1353		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1354	<	"Warning *** Defaulting to default class for %s",
1355	<	conf->name);
1354	>	"Warning *** Defaulting to default class for %s",
1355	>	conf->name);
1356		conf->class = class_default;
1357		}
1358		}
#	Line 1967 | Line 1372 | yyerror(const char *msg)
1372		return;
1373
1374		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1375	<	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
1375	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1376	>	"\"%s\", line %u: %s: %s",
1377	>	conffilebuf, lineno + 1, msg, newlinebuf);
1378	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1379	>	conffilebuf, lineno + 1, msg, newlinebuf);
1380	>	}
1381	>
1382	>	void
1383	>	conf_error_report(const char *msg)
1384	>	{
1385	>	char newlinebuf[IRCD_BUFSIZE];
1386	>
1387	>	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1388	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1389		"\"%s\", line %u: %s: %s",
1390		conffilebuf, lineno + 1, msg, newlinebuf);
1391		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1976 | Line 1394 | yyerror(const char *msg)
1394
1395		/*
1396		* valid_tkline()
1397	<	*
1397	>	*
1398		* inputs       - pointer to ascii string to check
1399		*              - whether the specified time is in seconds or minutes
1400		* output       - -1 not enough parameters
#	Line 1985 | Line 1403 | yyerror(const char *msg)
1403		* Originally written by Dianora (Diane, db@db.net)
1404		*/
1405		time_t
1406	<	valid_tkline(const char *p, int minutes)
1406	>	valid_tkline(const char *data, const int minutes)
1407		{
1408	+	const unsigned char *p = (const unsigned char *)data;
1409	+	unsigned char tmpch = '\0';
1410		time_t result = 0;
1411
1412	<	for (; *p; ++p)
1412	>	while ((tmpch = *p++))
1413		{
1414	<	if (!IsDigit(*p))
1414	>	if (!IsDigit(tmpch))
1415		return 0;
1416
1417		result *= 10;
1418	<	result += ((*p) & 0xF);
1418	>	result += (tmpch & 0xF);
1419		}
1420
1421		/*
1422	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1422	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1423		* i.e. they specifically use 0, I am going to return 1 instead
1424		* as a return value of non-zero is used to flag it as a temporary kline
1425		*/
1426		if (result == 0)
1427		result = 1;
1428
1429	<	/*
1429	>	/*
1430		* If the incoming time is in seconds convert it to minutes for the purpose
1431		* of this calculation
1432		*/
1433		if (!minutes)
1434	<	result = result / (time_t)60;
1434	>	result = result / 60;
1435
1436		if (result > MAX_TDKLINE_TIME)
1437		result = MAX_TDKLINE_TIME;
1438
1439	<	result = result * (time_t)60;  /* turn it into seconds */
1439	>	result = result * 60;  /* turn it into seconds */
1440
1441		return result;
1442		}
1443
1444	+	/* valid_wild_card_simple()
1445	+	*
1446	+	* inputs       - data to check for sufficient non-wildcard characters
1447	+	* outputs      - 1 if valid, else 0
1448	+	* side effects - none
1449	+	*/
1450	+	int
1451	+	valid_wild_card_simple(const char *data)
1452	+	{
1453	+	const unsigned char *p = (const unsigned char *)data;
1454	+	unsigned char tmpch = '\0';
1455	+	unsigned int nonwild = 0;
1456	+
1457	+	while ((tmpch = *p++))
1458	+	{
1459	+	if (tmpch == '\\' && *p)
1460	+	{
1461	+	++p;
1462	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1463	+	return 1;
1464	+	}
1465	+	else if (!IsMWildChar(tmpch))
1466	+	{
1467	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1468	+	return 1;
1469	+	}
1470	+	}
1471	+
1472	+	return 0;
1473	+	}
1474	+
1475		/* valid_wild_card()
1476		*
1477		* input        - pointer to client
#	Line 2032 | Line 1483 | valid_tkline(const char *p, int minutes)
1483		int
1484		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1485		{
1486	<	char *p;
1487	<	char tmpch;
2037	<	int nonwild = 0;
1486	>	unsigned char tmpch = '\0';
1487	>	unsigned int nonwild = 0;
1488		va_list args;
1489
1490		/*
#	Line 2053 | Line 1503 | valid_wild_card(struct Client *source_p,
1503
1504		while (count--)
1505		{
1506	<	p = va_arg(args, char *);
1506	>	const unsigned char *p = va_arg(args, const unsigned char *);
1507		if (p == NULL)
1508		continue;
1509
#	Line 2065 | Line 1515 | valid_wild_card(struct Client *source_p,
1515		* If we find enough non-wild characters, we can
1516		* break - no point in searching further.
1517		*/
1518	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1518	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1519	>	{
1520	>	va_end(args);
1521		return 1;
1522	+	}
1523		}
1524		}
1525		}
1526
1527		if (warn)
1528	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1529	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1528	>	sendto_one_notice(source_p, &me,
1529	>	":Please include at least %u non-wildcard characters with the mask",
1530	>	ConfigGeneral.min_nonwildcard);
1531	>	va_end(args);
1532	>	return 0;
1533	>	}
1534	>
1535	>	/* find_user_host()
1536	>	*
1537	>	* inputs       - pointer to client placing kline
1538	>	*              - pointer to user_host_or_nick
1539	>	*              - pointer to user buffer
1540	>	*              - pointer to host buffer
1541	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1542	>	* side effects -
1543	>	*/
1544	>	static int
1545	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1546	>	char *luser, char *lhost, unsigned int flags)
1547	>	{
1548	>	struct Client *target_p = NULL;
1549	>	char *hostp = NULL;
1550	>
1551	>	if (lhost == NULL)
1552	>	{
1553	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1554	>	return 1;
1555	>	}
1556	>
1557	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1558	>	{
1559	>	/* Explicit user@host mask given */
1560	>	if (hostp)                            /* I'm a little user@host */
1561	>	{
1562	>	*(hostp++) = '\0';                       /* short and squat */
1563	>
1564	>	if (*user_host_or_nick)
1565	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1566	>	else
1567	>	strcpy(luser, "*");
1568	>
1569	>	if (*hostp)
1570	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1571	>	else
1572	>	strcpy(lhost, "*");
1573	>	}
1574	>	else
1575	>	{
1576	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1577	>	luser[1] = '\0';
1578	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1579	>	}
1580	>
1581	>	return 1;
1582	>	}
1583	>	else
1584	>	{
1585	>	/* Try to find user@host mask from nick */
1586	>	/* Okay to use source_p as the first param, because source_p == client_p */
1587	>	if ((target_p =
1588	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1589	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1590	>
1591	>	if (IsExemptKline(target_p))
1592	>	{
1593	>	if (IsClient(source_p))
1594	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1595	>	return 0;
1596	>	}
1597	>
1598	>	/*
1599	>	* turn the "user" bit into "*user", blow away '~'
1600	>	* if found in original user name (non-idented)
1601	>	*/
1602	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1603	>
1604	>	if (target_p->username[0] == '~')
1605	>	luser[0] = '*';
1606	>
1607	>	if (!strcmp(target_p->sockhost, "0"))
1608	>	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1609	>	else
1610	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1611	>	return 1;
1612	>	}
1613	>
1614		return 0;
1615		}
1616
#	Line 2087 | Line 1624 | valid_wild_card(struct Client *source_p,
1624		*              - parse_flags bit map of things to test
1625		*              - pointer to user or string to parse into
1626		*              - pointer to host or NULL to parse into if non NULL
1627	<	*              - pointer to optional tkline time or NULL
1627	>	*              - pointer to optional tkline time or NULL
1628		*              - pointer to target_server to parse into if non NULL
1629		*              - pointer to reason to parse into
1630		*
#	Line 2109 | Line 1646 | valid_wild_card(struct Client *source_p,
1646		*/
1647		int
1648		parse_aline(const char *cmd, struct Client *source_p,
1649	<	int parc, char **parv,
1650	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1651	<	char **target_server, char **reason)
1649	>	int parc, char **parv,
1650	>	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1651	>	char **target_server, char **reason)
1652		{
1653		int found_tkline_time=0;
1654	<	static char def_reason[] = "No Reason";
1654	>	static char def_reason[] = CONF_NOREASON;
1655		static char user[USERLEN*4+1];
1656		static char host[HOSTLEN*4+1];
1657
#	Line 2123 | Line 1660 | parse_aline(const char *cmd, struct Clie
1660
1661		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1662
1663	<	if (found_tkline_time != 0)
1663	>	if (found_tkline_time)
1664		{
1665		parv++;
1666		parc--;
1667
1668	<	if (tkline_time != NULL)
1668	>	if (tkline_time)
1669		*tkline_time = found_tkline_time;
1670		else
1671		{
1672	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
2136	<	me.name, source_p->name, cmd);
1672	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1673		return -1;
1674		}
1675		}
1676
1677		if (parc == 0)
1678		{
1679	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
2144	<	me.name, source_p->name, cmd);
1679	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1680		return -1;
1681		}
1682
#	Line 2155 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		*up_p = user;
1691		*h_p = host;
1692		}
1693	<
1693	>
1694		parc--;
1695		parv++;
1696
1697	<	if (parc != 0)
1697	>	if (parc)
1698		{
1699		if (irccmp(*parv, "ON") == 0)
1700		{
#	Line 2168 | Line 1703 | parse_aline(const char *cmd, struct Clie
1703
1704		if (target_server == NULL)
1705		{
1706	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1707	<	me.name, source_p->name, cmd);
2173	<	return -1;
1706	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1707	>	return -1;
1708		}
1709
1710		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1711		{
1712	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
2179	<	me.name, source_p->name, "remoteban");
1712	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1713		return -1;
1714		}
1715
1716		if (parc == 0 || EmptyString(*parv))
1717		{
1718	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1719	<	me.name, source_p->name, cmd);
2187	<	return -1;
1718	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1719	>	return -1;
1720		}
1721
1722		*target_server = *parv;
#	Line 2196 | Line 1728 | parse_aline(const char *cmd, struct Clie
1728		/* Make sure target_server *is* NULL if no ON server found
1729		* caller probably NULL'd it first, but no harm to do it again -db
1730		*/
1731	<	if (target_server != NULL)
1732	<	*target_server = NULL;
1731	>	if (target_server)
1732	>	*target_server = NULL;
1733		}
1734		}
1735
1736	<	if (h_p != NULL)
1736	>	if (h_p)
1737		{
1738	<	if (strchr(user, '!') != NULL)
1738	>	if (strchr(user, '!'))
1739		{
1740	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
2209	<	me.name, source_p->name);
1740	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1741		return -1;
1742		}
1743
#	Line 2217 | Line 1748 | parse_aline(const char *cmd, struct Clie
1748		if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1749		return -1;
1750
1751	<	if (reason != NULL)
1751	>	if (reason)
1752		{
1753	<	if (parc != 0 && !EmptyString(*parv))
1753	>	if (parc && !EmptyString(*parv))
1754		{
1755		*reason = *parv;
1756	+
1757		if (!valid_comment(source_p, *reason, 1))
1758	<	return -1;
1758	>	return -1;
1759		}
1760		else
1761		*reason = def_reason;
#	Line 2232 | Line 1764 | parse_aline(const char *cmd, struct Clie
1764		return 1;
1765		}
1766
2235	–	/* find_user_host()
2236	–	*
2237	–	* inputs       - pointer to client placing kline
2238	–	*              - pointer to user_host_or_nick
2239	–	*              - pointer to user buffer
2240	–	*              - pointer to host buffer
2241	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
2242	–	* side effects -
2243	–	*/
2244	–	static int
2245	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
2246	–	char *luser, char *lhost, unsigned int flags)
2247	–	{
2248	–	struct Client *target_p = NULL;
2249	–	char *hostp = NULL;
2250	–
2251	–	if (lhost == NULL)
2252	–	{
2253	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
2254	–	return 1;
2255	–	}
2256	–
2257	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
2258	–	{
2259	–	/* Explicit user@host mask given */
2260	–
2261	–	if (hostp != NULL)                            /* I'm a little user@host */
2262	–	{
2263	–	*(hostp++) = '\0';                       /* short and squat */
2264	–	if (*user_host_or_nick)
2265	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2266	–	else
2267	–	strcpy(luser, "*");
2268	–	if (*hostp)
2269	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2270	–	else
2271	–	strcpy(lhost, "*");
2272	–	}
2273	–	else
2274	–	{
2275	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2276	–	luser[1] = '\0';
2277	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2278	–	}
2279	–
2280	–	return 1;
2281	–	}
2282	–	else
2283	–	{
2284	–	/* Try to find user@host mask from nick */
2285	–	/* Okay to use source_p as the first param, because source_p == client_p */
2286	–	if ((target_p =
2287	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2288	–	return 0;
2289	–
2290	–	if (IsExemptKline(target_p))
2291	–	{
2292	–	if (!IsServer(source_p))
2293	–	sendto_one(source_p,
2294	–	":%s NOTICE %s :%s is E-lined",
2295	–	me.name, source_p->name, target_p->name);
2296	–	return 0;
2297	–	}
2298	–
2299	–	/*
2300	–	* turn the "user" bit into "*user", blow away '~'
2301	–	* if found in original user name (non-idented)
2302	–	*/
2303	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2304	–
2305	–	if (target_p->username[0] == '~')
2306	–	luser[0] = '*';
2307	–
2308	–	if (target_p->sockhost[0] == '\0' ||
2309	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2310	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2311	–	else
2312	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2313	–	return 1;
2314	–	}
2315	–
2316	–	return 0;
2317	–	}
2318	–
1767		/* valid_comment()
1768		*
1769		* inputs       - pointer to client
#	Line 2353 | Line 1801 | match_conf_password(const char *password
1801		else
1802		encr = password;
1803
1804	<	return !strcmp(encr, conf->passwd);
1804	>	return encr && !strcmp(encr, conf->passwd);
1805		}
1806
1807		/*
#	Line 2361 | Line 1809 | match_conf_password(const char *password
1809		*
1810		* inputs       - client sending the cluster
1811		*              - command name "KLINE" "XLINE" etc.
1812	<	*              - capab -- CAP_KLN etc. from s_serv.h
1812	>	*              - capab -- CAP_KLN etc. from server.h
1813		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1814		*              - pattern and args to send along
1815		* output       - none
#	Line 2373 | Line 1821 | cluster_a_line(struct Client *source_p,
1821		int capab, int cluster_type, const char *pattern, ...)
1822		{
1823		va_list args;
1824	<	char buffer[IRCD_BUFSIZE];
1825	<	const dlink_node *ptr = NULL;
1824	>	char buffer[IRCD_BUFSIZE] = "";
1825	>	const dlink_node *node = NULL;
1826
1827		va_start(args, pattern);
1828		vsnprintf(buffer, sizeof(buffer), pattern, args);
1829		va_end(args);
1830
1831	<	DLINK_FOREACH(ptr, cluster_items.head)
1831	>	DLINK_FOREACH(node, cluster_items.head)
1832		{
1833	<	const struct MaskItem *conf = ptr->data;
1833	>	const struct MaskItem *conf = node->data;
1834
1835		if (conf->flags & cluster_type)
1836		sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1837	<	"%s %s %s", command, conf->name, buffer);
1837	>	"%s %s %s", command, conf->name, buffer);
1838		}
1839		}
1840
#	Line 2425 | Line 1873 | split_nuh(struct split_nuh_item *const i
1873
1874		if (iptr->nickptr)
1875		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1876	+
1877		if (iptr->userptr)
1878		strlcpy(iptr->userptr, "*", iptr->usersize);
1879	+
1880		if (iptr->hostptr)
1881		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1882
#	Line 2434 | Line 1884 | split_nuh(struct split_nuh_item *const i
1884		{
1885		*p = '\0';
1886
1887	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1887	>	if (iptr->nickptr && *iptr->nuhmask)
1888		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1889
1890	<	if ((q = strchr(++p, '@'))) {
1890	>	if ((q = strchr(++p, '@')))
1891	>	{
1892		*q++ = '\0';
1893
1894	<	if (*p != '\0')
1894	>	if (*p)
1895		strlcpy(iptr->userptr, p, iptr->usersize);
1896
1897	<	if (*q != '\0')
1897	>	if (*q)
1898		strlcpy(iptr->hostptr, q, iptr->hostsize);
1899		}
1900		else
1901		{
1902	<	if (*p != '\0')
1902	>	if (*p)
1903		strlcpy(iptr->userptr, p, iptr->usersize);
1904		}
1905		}
#	Line 2460 | Line 1911 | split_nuh(struct split_nuh_item *const i
1911		/* if found a @ */
1912		*p++ = '\0';
1913
1914	<	if (*iptr->nuhmask != '\0')
1914	>	if (*iptr->nuhmask)
1915		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1916
1917	<	if (*p != '\0')
1917	>	if (*p)
1918		strlcpy(iptr->hostptr, p, iptr->hostsize);
1919		}
1920		else

Diff Legend

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