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 2525 by michael, Sat Nov 2 17:07:38 2013 UTC vs.
Revision 4596 by michael, Sat Aug 30 16:56:32 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"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "conf_pseudo.h"
32	>	#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
35		#include "client.h"
36		#include "event.h"
34	–	#include "hook.h"
37		#include "irc_string.h"
38		#include "s_bsd.h"
39		#include "ircd.h"
#	Line 42 | Line 44
44		#include "fdlist.h"
45		#include "log.h"
46		#include "send.h"
45	–	#include "s_gline.h"
47		#include "memory.h"
48	<	#include "mempool.h"
48	<	#include "irc_res.h"
48	>	#include "res.h"
49		#include "userhost.h"
50	<	#include "s_user.h"
50	>	#include "user.h"
51		#include "channel_mode.h"
52		#include "parse.h"
53	<	#include "s_misc.h"
53	>	#include "misc.h"
54		#include "conf_db.h"
55		#include "conf_class.h"
56		#include "motd.h"
57	+	#include "ipcache.h"
58
58	–	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 };
#	Line 65 | Line 65 | dlink_list oconf_items   = { NULL, NULL,
65		dlink_list uconf_items   = { NULL, NULL, 0 };
66		dlink_list xconf_items   = { NULL, NULL, 0 };
67		dlink_list nresv_items   = { NULL, NULL, 0 };
68	<	dlink_list cresv_items = { NULL, NULL, 0 };
68	>	dlink_list cresv_items   = { NULL, NULL, 0 };
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
75	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
76	–
75		/* internally defined functions */
76		static void read_conf(FILE *);
77		static void clear_out_old_conf(void);
78		static void expire_tklines(dlink_list *);
81	–	static void garbage_collect_ip_entries(void);
82	–	static int hash_ip(struct irc_ssaddr *);
79		static int verify_access(struct Client *);
80		static int attach_iline(struct Client *, struct MaskItem *);
85	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
81		static dlink_list *map_to_list(enum maskitem_type);
82		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
83
84
90	–	/* usually, with hash tables, you use a prime number...
91	–	* but in this case I am dealing with ip addresses,
92	–	* not ascii strings.
93	–	*/
94	–	#define IP_HASH_SIZE 0x1000
95	–
96	–	struct ip_entry
97	–	{
98	–	struct irc_ssaddr ip;
99	–	unsigned int count;
100	–	time_t last_attempt;
101	–	struct ip_entry *next;
102	–	};
103	–
104	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
105	–	static mp_pool_t *ip_entry_pool = NULL;
106	–	static int ip_entries_count = 0;
107	–
108	–
85		/* conf_dns_callback()
86		*
87		* inputs       - pointer to struct MaskItem
#	Line 117 | Line 93 | static int ip_entries_count = 0;
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
96	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98		struct MaskItem *conf = vptr;
99
100		conf->dns_pending = 0;
101
102	<	if (addr != NULL)
102	>	if (addr)
103		memcpy(&conf->addr, addr, sizeof(conf->addr));
104		else
105		conf->dns_failed = 1;
#	Line 141 | Line 117 | conf_dns_lookup(struct MaskItem *conf)
117		if (!conf->dns_pending)
118		{
119		conf->dns_pending = 1;
120	<	gethost_byname(conf_dns_callback, conf, conf->host);
120	>
121	>	if (conf->aftype == AF_INET)
122	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
123	>	else
124	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
125		}
126		}
127
128		struct MaskItem *
129		conf_make(enum maskitem_type type)
130		{
131	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
131	>	struct MaskItem *conf = MyCalloc(sizeof(*conf));
132		dlink_list *list = NULL;
133
134		conf->type   = type;
#	Line 166 | Line 146 | conf_free(struct MaskItem *conf)
146		dlink_node *ptr = NULL, *ptr_next = NULL;
147		dlink_list *list = NULL;
148
149	<	if (conf->node.next)
150	<	if ((list = map_to_list(conf->type)))
171	<	dlinkDelete(&conf->node, list);
149	>	if ((list = map_to_list(conf->type)))
150	>	dlinkFindDelete(list, conf);
151
152		MyFree(conf->name);
153
154		if (conf->dns_pending)
155		delete_resolver_queries(conf);
156	<	if (conf->passwd != NULL)
156	>	if (conf->passwd)
157		memset(conf->passwd, 0, strlen(conf->passwd));
158	<	if (conf->spasswd != NULL)
158	>	if (conf->spasswd)
159		memset(conf->spasswd, 0, strlen(conf->spasswd));
160
161		conf->class = NULL;
#	Line 196 | Line 175 | conf_free(struct MaskItem *conf)
175		DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
176		{
177		MyFree(ptr->data);
178	+	dlinkDelete(ptr, &conf->hub_list);
179		free_dlink_node(ptr);
180		}
181
182		DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
183		{
184		MyFree(ptr->data);
185	+	dlinkDelete(ptr, &conf->leaf_list);
186		free_dlink_node(ptr);
187		}
188
#	Line 209 | Line 190 | conf_free(struct MaskItem *conf)
190		{
191		struct exempt *exptr = ptr->data;
192
193	+	dlinkDelete(ptr, &conf->exempt_list);
194		MyFree(exptr->name);
195		MyFree(exptr->user);
196		MyFree(exptr->host);
#	Line 235 | Line 217 | int
217		check_client(struct Client *source_p)
218		{
219		int i;
220	<
220	>
221		if ((i = verify_access(source_p)))
222	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
222	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
223		source_p->name, source_p->sockhost);
224
225		switch (i)
#	Line 250 | Line 232 | check_client(struct Client *source_p)
232		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
233		get_client_name(source_p, SHOW_IP));
234		++ServerStats.is_ref;
235	<	exit_client(source_p, &me, "No more connections allowed on that IP");
235	>	exit_client(source_p, "No more connections allowed on that IP");
236		break;
237
238		case I_LINE_FULL:
#	Line 261 | Line 243 | check_client(struct Client *source_p)
243		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
244		get_client_name(source_p, SHOW_IP));
245		++ServerStats.is_ref;
246	<	exit_client(source_p, &me,
265	<	"No more connections allowed in your connection class");
246	>	exit_client(source_p, "No more connections allowed in your connection class");
247		break;
248
249		case NOT_AUTHORIZED:
#	Line 273 | Line 254 | check_client(struct Client *source_p)
254		"Unauthorized client connection from %s [%s] on [%s/%u].",
255		get_client_name(source_p, SHOW_IP),
256		source_p->sockhost,
257	<	source_p->localClient->listener->name,
258	<	source_p->localClient->listener->port);
257	>	source_p->connection->listener->name,
258	>	source_p->connection->listener->port);
259		ilog(LOG_TYPE_IRCD,
260		"Unauthorized client connection from %s on [%s/%u].",
261		get_client_name(source_p, SHOW_IP),
262	<	source_p->localClient->listener->name,
263	<	source_p->localClient->listener->port);
262	>	source_p->connection->listener->name,
263	>	source_p->connection->listener->port);
264
265	<	exit_client(source_p, &me, "You are not authorized to use this server");
265	>	exit_client(source_p, "You are not authorized to use this server");
266		break;
267
268		case BANNED_CLIENT:
269	<	exit_client(source_p, &me, "Banned");
269	>	exit_client(source_p, "Banned");
270		++ServerStats.is_ref;
271		break;
272
#	Line 307 | Line 288 | static int
288		verify_access(struct Client *client_p)
289		{
290		struct MaskItem *conf = NULL;
291	<	char non_ident[USERLEN + 1] = { '~', '\0' };
291	>	char non_ident[USERLEN + 1] = "~";
292
293		if (IsGotId(client_p))
294		{
295		conf = find_address_conf(client_p->host, client_p->username,
296	<	&client_p->localClient->ip,
297	<	client_p->localClient->aftype,
298	<	client_p->localClient->passwd);
296	>	&client_p->connection->ip,
297	>	client_p->connection->aftype,
298	>	client_p->connection->password);
299		}
300		else
301		{
302		strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
303		conf = find_address_conf(client_p->host,non_ident,
304	<	&client_p->localClient->ip,
305	<	client_p->localClient->aftype,
306	<	client_p->localClient->passwd);
304	>	&client_p->connection->ip,
305	>	client_p->connection->aftype,
306	>	client_p->connection->password);
307		}
308
309	<	if (conf != NULL)
309	>	if (conf)
310		{
311		if (IsConfClient(conf))
312		{
313		if (IsConfRedir(conf))
314		{
315	<	sendto_one(client_p, form_str(RPL_REDIR),
316	<	me.name, client_p->name,
317	<	conf->name ? conf->name : "",
337	<	conf->port);
315	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
316	>	conf->name ? conf->name : "",
317	>	conf->port);
318		return NOT_AUTHORIZED;
319		}
320
#	Line 344 | Line 324 | verify_access(struct Client *client_p)
324		/* Thanks for spoof idea amm */
325		if (IsConfDoSpoofIp(conf))
326		{
327	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
327	>	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
328		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
329		"%s spoofing: %s as %s",
330		client_p->name, client_p->host, conf->name);
#	Line 354 | Line 334 | verify_access(struct Client *client_p)
334
335		return attach_iline(client_p, conf);
336		}
337	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
337	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
338		{
339		if (IsConfGline(conf))
340	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
341	<	client_p->name);
362	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
363	<	me.name, client_p->name, conf->reason);
340	>	sendto_one_notice(client_p, &me, ":*** G-lined");
341	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342		return BANNED_CLIENT;
343		}
344		}
#	Line 378 | Line 356 | verify_access(struct Client *client_p)
356		static int
357		attach_iline(struct Client *client_p, struct MaskItem *conf)
358		{
359	<	struct ClassItem *class = NULL;
359	>	const struct ClassItem *class = conf->class;
360		struct ip_entry *ip_found;
361		int a_limit_reached = 0;
362		unsigned int local = 0, global = 0, ident = 0;
363
364	<	assert(conf->class);
387	<
388	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
364	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
365		ip_found->count++;
366	<	SetIpHash(client_p);
391	<
392	<	class = conf->class;
366	>	AddFlag(client_p, FLAGS_IPHASH);
367
368		count_user_host(client_p->username, client_p->host,
369		&global, &local, &ident);
#	Line 398 | Line 372 | attach_iline(struct Client *client_p, st
372		* setting a_limit_reached if any limit is reached.
373		* - Dianora
374		*/
375	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
375	>	if (class->max_total && class->ref_count >= class->max_total)
376		a_limit_reached = 1;
377	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
377	>	else if (class->max_perip && ip_found->count > class->max_perip)
378		a_limit_reached = 1;
379	<	else if (class->max_local != 0 && local >= class->max_local)
379	>	else if (class->max_local && local >= class->max_local)
380		a_limit_reached = 1;
381	<	else if (class->max_global != 0 && global >= class->max_global)
381	>	else if (class->max_global && global >= class->max_global)
382		a_limit_reached = 1;
383	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
383	>	else if (class->max_ident && ident >= class->max_ident &&
384		client_p->username[0] != '~')
385		a_limit_reached = 1;
386
#	Line 415 | Line 389 | attach_iline(struct Client *client_p, st
389		if (!IsConfExemptLimits(conf))
390		return TOO_MANY;   /* Already at maximum allowed */
391
392	<	sendto_one(client_p,
393	<	":%s NOTICE %s :*** Your connection class is full, "
420	<	"but you have exceed_limit = yes;", me.name, client_p->name);
392	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
393	>	"but you have exceed_limit = yes;");
394		}
395
396		return attach_conf(client_p, conf);
397		}
398
426	–	/* init_ip_hash_table()
427	–	*
428	–	* inputs               - NONE
429	–	* output               - NONE
430	–	* side effects         - allocate memory for ip_entry(s)
431	–	*                      - clear the ip hash table
432	–	*/
433	–	void
434	–	init_ip_hash_table(void)
435	–	{
436	–	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry), MP_CHUNK_SIZE_IP_ENTRY);
437	–	memset(ip_hash_table, 0, sizeof(ip_hash_table));
438	–	}
439	–
440	–	/* find_or_add_ip()
441	–	*
442	–	* inputs       - pointer to struct irc_ssaddr
443	–	* output       - pointer to a struct ip_entry
444	–	* side effects -
445	–	*
446	–	* If the ip # was not found, a new struct ip_entry is created, and the ip
447	–	* count set to 0.
448	–	*/
449	–	static struct ip_entry *
450	–	find_or_add_ip(struct irc_ssaddr *ip_in)
451	–	{
452	–	struct ip_entry *ptr, *newptr;
453	–	int hash_index = hash_ip(ip_in), res;
454	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
455	–	#ifdef IPV6
456	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
457	–	#endif
458	–
459	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
460	–	{
461	–	#ifdef IPV6
462	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
463	–	continue;
464	–	if (ip_in->ss.ss_family == AF_INET6)
465	–	{
466	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
467	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
468	–	}
469	–	else
470	–	#endif
471	–	{
472	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
473	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
474	–	}
475	–	if (res == 0)
476	–	{
477	–	/* Found entry already in hash, return it. */
478	–	return ptr;
479	–	}
480	–	}
481	–
482	–	if (ip_entries_count >= 2 * hard_fdlimit)
483	–	garbage_collect_ip_entries();
484	–
485	–	newptr = mp_pool_get(ip_entry_pool);
486	–	memset(newptr, 0, sizeof(*newptr));
487	–	ip_entries_count++;
488	–	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
489	–
490	–	newptr->next = ip_hash_table[hash_index];
491	–	ip_hash_table[hash_index] = newptr;
492	–
493	–	return newptr;
494	–	}
495	–
496	–	/* remove_one_ip()
497	–	*
498	–	* inputs        - unsigned long IP address value
499	–	* output        - NONE
500	–	* side effects  - The ip address given, is looked up in ip hash table
501	–	*                 and number of ip#'s for that ip decremented.
502	–	*                 If ip # count reaches 0 and has expired,
503	–	*                 the struct ip_entry is returned to the ip_entry_heap
504	–	*/
505	–	void
506	–	remove_one_ip(struct irc_ssaddr *ip_in)
507	–	{
508	–	struct ip_entry *ptr;
509	–	struct ip_entry *last_ptr = NULL;
510	–	int hash_index = hash_ip(ip_in), res;
511	–	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
512	–	#ifdef IPV6
513	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
514	–	#endif
515	–
516	–	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
517	–	{
518	–	#ifdef IPV6
519	–	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
520	–	continue;
521	–	if (ip_in->ss.ss_family == AF_INET6)
522	–	{
523	–	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
524	–	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
525	–	}
526	–	else
527	–	#endif
528	–	{
529	–	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
530	–	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
531	–	}
532	–	if (res)
533	–	continue;
534	–	if (ptr->count > 0)
535	–	ptr->count--;
536	–	if (ptr->count == 0 &&
537	–	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
538	–	{
539	–	if (last_ptr != NULL)
540	–	last_ptr->next = ptr->next;
541	–	else
542	–	ip_hash_table[hash_index] = ptr->next;
543	–
544	–	mp_pool_release(ptr);
545	–	ip_entries_count--;
546	–	return;
547	–	}
548	–	last_ptr = ptr;
549	–	}
550	–	}
551	–
552	–	/* hash_ip()
553	–	*
554	–	* input        - pointer to an irc_inaddr
555	–	* output       - integer value used as index into hash table
556	–	* side effects - hopefully, none
557	–	*/
558	–	static int
559	–	hash_ip(struct irc_ssaddr *addr)
560	–	{
561	–	if (addr->ss.ss_family == AF_INET)
562	–	{
563	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
564	–	int hash;
565	–	uint32_t ip;
566	–
567	–	ip   = ntohl(v4->sin_addr.s_addr);
568	–	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
569	–	return hash;
570	–	}
571	–	#ifdef IPV6
572	–	else
573	–	{
574	–	int hash;
575	–	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
576	–	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
577	–
578	–	hash  = ip[0] ^ ip[3];
579	–	hash ^= hash >> 16;
580	–	hash ^= hash >> 8;
581	–	hash  = hash & (IP_HASH_SIZE - 1);
582	–	return hash;
583	–	}
584	–	#else
585	–	return 0;
586	–	#endif
587	–	}
588	–
589	–	/* count_ip_hash()
590	–	*
591	–	* inputs        - pointer to counter of number of ips hashed
592	–	*               - pointer to memory used for ip hash
593	–	* output        - returned via pointers input
594	–	* side effects  - NONE
595	–	*
596	–	* number of hashed ip #'s is counted up, plus the amount of memory
597	–	* used in the hash.
598	–	*/
599	–	void
600	–	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
601	–	{
602	–	struct ip_entry *ptr;
603	–	int i;
604	–
605	–	*number_ips_stored = 0;
606	–	*mem_ips_stored    = 0;
607	–
608	–	for (i = 0; i < IP_HASH_SIZE; i++)
609	–	{
610	–	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
611	–	{
612	–	*number_ips_stored += 1;
613	–	*mem_ips_stored += sizeof(struct ip_entry);
614	–	}
615	–	}
616	–	}
617	–
618	–	/* garbage_collect_ip_entries()
619	–	*
620	–	* input        - NONE
621	–	* output       - NONE
622	–	* side effects - free up all ip entries with no connections
623	–	*/
624	–	static void
625	–	garbage_collect_ip_entries(void)
626	–	{
627	–	struct ip_entry *ptr;
628	–	struct ip_entry *last_ptr;
629	–	struct ip_entry *next_ptr;
630	–	int i;
631	–
632	–	for (i = 0; i < IP_HASH_SIZE; i++)
633	–	{
634	–	last_ptr = NULL;
635	–
636	–	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
637	–	{
638	–	next_ptr = ptr->next;
639	–
640	–	if (ptr->count == 0 &&
641	–	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
642	–	{
643	–	if (last_ptr != NULL)
644	–	last_ptr->next = ptr->next;
645	–	else
646	–	ip_hash_table[i] = ptr->next;
647	–	mp_pool_release(ptr);
648	–	ip_entries_count--;
649	–	}
650	–	else
651	–	last_ptr = ptr;
652	–	}
653	–	}
654	–	}
655	–
399		/* detach_conf()
400		*
401		* inputs       - pointer to client to detach
#	Line 664 | Line 407 | garbage_collect_ip_entries(void)
407		void
408		detach_conf(struct Client *client_p, enum maskitem_type type)
409		{
410	<	dlink_node *ptr = NULL, *next_ptr = NULL;
410	>	dlink_node *ptr = NULL, *ptr_next = NULL;
411
412	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
412	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->connection->confs.head)
413		{
414		struct MaskItem *conf = ptr->data;
415
#	Line 677 | Line 420 | detach_conf(struct Client *client_p, enu
420		if (!(conf->type & type))
421		continue;
422
423	<	dlinkDelete(ptr, &client_p->localClient->confs);
423	>	dlinkDelete(ptr, &client_p->connection->confs);
424		free_dlink_node(ptr);
425
426		if (conf->type == CONF_CLIENT)
427	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
427	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
428
429		if (--conf->class->ref_count == 0 && conf->class->active == 0)
430		{
#	Line 707 | Line 450 | detach_conf(struct Client *client_p, enu
450		int
451		attach_conf(struct Client *client_p, struct MaskItem *conf)
452		{
453	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
453	>	if (dlinkFind(&client_p->connection->confs, conf))
454		return 1;
455
456		if (conf->type == CONF_CLIENT)
457		if (cidr_limit_reached(IsConfExemptLimits(conf),
458	<	&client_p->localClient->ip, conf->class))
458	>	&client_p->connection->ip, conf->class))
459		return TOO_MANY;    /* Already at maximum allowed */
460
461		conf->class->ref_count++;
462		conf->ref_count++;
463
464	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
464	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
465
466		return 0;
467		}
#	Line 776 | Line 519 | find_conf_name(dlink_list *list, const c
519		DLINK_FOREACH(ptr, list->head)
520		{
521		conf = ptr->data;
522	<
522	>
523		if (conf->type == type)
524		{
525	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
526	<	!match(conf->name, name)))
784	<	return conf;
525	>	if (conf->name && !irccmp(conf->name, name))
526	>	return conf;
527		}
528		}
529
#	Line 894 | Line 636 | find_matching_name_conf(enum maskitem_ty
636		return conf;
637		}
638		break;
639	<
639	>
640		default:
641		break;
642		}
#	Line 931 | Line 673 | find_exact_name_conf(enum maskitem_type
673
674		if (EmptyString(conf->name))
675		continue;
676	<
676	>
677		if (irccmp(conf->name, name) == 0)
678		{
679		if ((user == NULL && (host == NULL)))
#	Line 968 | Line 710 | find_exact_name_conf(enum maskitem_type
710		return conf;
711		break;
712		case HM_IPV4:
713	<	if (who->localClient->aftype == AF_INET)
714	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
713	>	if (who->connection->aftype == AF_INET)
714	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
715		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
716		return conf;
717		break;
976	–	#ifdef IPV6
718		case HM_IPV6:
719	<	if (who->localClient->aftype == AF_INET6)
720	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
719	>	if (who->connection->aftype == AF_INET6)
720	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
721		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
722		return conf;
723		break;
983	–	#endif
724		default:
725		assert(0);
726		}
#	Line 997 | Line 737 | find_exact_name_conf(enum maskitem_type
737
738		if (EmptyString(conf->name))
739		continue;
740	<
740	>
741		if (name == NULL)
742		{
743		if (EmptyString(conf->host))
#	Line 1027 | Line 767 | find_exact_name_conf(enum maskitem_type
767		int
768		rehash(int sig)
769		{
770	<	if (sig != 0)
770	>	if (sig)
771		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
772	<	"Got signal SIGHUP, reloading ircd.conf file");
772	>	"Got signal SIGHUP, reloading configuration file(s)");
773
774		restart_resolver();
775
776		/* don't close listeners until we know we can go ahead with the rehash */
777
1038	–	/* Check to see if we magically got(or lost) IPv6 support */
1039	–	check_can_use_v6();
1040	–
778		read_conf_files(0);
779
1043	–	if (ServerInfo.description != NULL)
1044	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1045	–
780		load_conf_modules();
781	<
1048	<	rehashed_klines = 1;
781	>	check_conf_klines();
782
783		return 0;
784		}
#	Line 1068 | Line 801 | set_default_conf(void)
801		assert(class_default == class_get_list()->tail->data);
802
803		#ifdef HAVE_LIBCRYPTO
804	<	ServerInfo.rsa_private_key = NULL;
805	<	ServerInfo.rsa_private_key_file = NULL;
804	>	#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
805	>	{
806	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
807	>
808	>	if (key)
809	>	{
810	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
811	>	EC_KEY_free(key);
812	>	}
813	>	}
814	>
815	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
816		#endif
817
818	<	/* ServerInfo.name is not rehashable */
819	<	/* ServerInfo.name = ServerInfo.name; */
820	<	ServerInfo.description = NULL;
821	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
822	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
823	<
824	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
825	<	ServerInfo.specific_ipv4_vhost = 0;
826	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
827	<	ServerInfo.specific_ipv6_vhost = 0;
828	<
829	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
830	<	ServerInfo.max_nick_length = 9;
831	<	ServerInfo.max_topic_length = 80;
832	<
833	<	ServerInfo.hub = 0;
834	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
835	<	ServerInfo.dns_host.sin_port = 0;
836	<	AdminInfo.name = NULL;
837	<	AdminInfo.email = NULL;
838	<	AdminInfo.description = NULL;
818	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
819	>	ConfigServerInfo.rsa_private_key = NULL;
820	>	ConfigServerInfo.rsa_private_key_file = NULL;
821	>	#endif
822	>
823	>	/* ConfigServerInfo.name is not rehashable */
824	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
825	>	ConfigServerInfo.description = NULL;
826	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
827	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
828	>
829	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
830	>	ConfigServerInfo.specific_ipv4_vhost = 0;
831	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
832	>	ConfigServerInfo.specific_ipv6_vhost = 0;
833	>
834	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
835	>	ConfigServerInfo.max_nick_length = 9;
836	>	ConfigServerInfo.max_topic_length = 80;
837	>	ConfigServerInfo.hub = 0;
838	>
839	>	ConfigAdminInfo.name = NULL;
840	>	ConfigAdminInfo.email = NULL;
841	>	ConfigAdminInfo.description = NULL;
842
843		log_del_all();
844
845	<	ConfigLoggingEntry.use_logging = 1;
845	>	ConfigLog.use_logging = 1;
846
847		ConfigChannel.disable_fake_channels = 0;
848	<	ConfigChannel.knock_delay = 300;
848	>	ConfigChannel.invite_client_count = 10;
849	>	ConfigChannel.invite_client_time = 300;
850	>	ConfigChannel.knock_client_count = 1;
851	>	ConfigChannel.knock_client_time = 300;
852		ConfigChannel.knock_delay_channel = 60;
853	<	ConfigChannel.max_chans_per_user = 25;
1105	<	ConfigChannel.max_chans_per_oper = 50;
853	>	ConfigChannel.max_channels = 25;
854		ConfigChannel.max_bans = 25;
855		ConfigChannel.default_split_user_count = 0;
856		ConfigChannel.default_split_server_count = 0;
#	Line 1118 | Line 866 | set_default_conf(void)
866		ConfigServerHide.hide_server_ips = 0;
867		ConfigServerHide.disable_remote_commands = 0;
868
869	<
870	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
871	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
872	<	ConfigFileEntry.cycle_on_host_change = 1;
873	<	ConfigFileEntry.glines = 0;
874	<	ConfigFileEntry.gline_time = 12 * 3600;
875	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
876	<	ConfigFileEntry.gline_min_cidr = 16;
877	<	ConfigFileEntry.gline_min_cidr6 = 48;
878	<	ConfigFileEntry.invisible_on_connect = 1;
879	<	ConfigFileEntry.tkline_expire_notices = 1;
880	<	ConfigFileEntry.hide_spoof_ips = 1;
881	<	ConfigFileEntry.ignore_bogus_ts = 0;
882	<	ConfigFileEntry.disable_auth = 0;
883	<	ConfigFileEntry.kill_chase_time_limit = 90;
884	<	ConfigFileEntry.default_floodcount = 8;
885	<	ConfigFileEntry.failed_oper_notice = 1;
886	<	ConfigFileEntry.dots_in_ident = 0;
887	<	ConfigFileEntry.min_nonwildcard = 4;
888	<	ConfigFileEntry.min_nonwildcard_simple = 3;
889	<	ConfigFileEntry.max_accept = 20;
890	<	ConfigFileEntry.anti_nick_flood = 0;
891	<	ConfigFileEntry.max_nick_time = 20;
892	<	ConfigFileEntry.max_nick_changes = 5;
893	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
894	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
895	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
896	<	ConfigFileEntry.warn_no_nline = 1;
897	<	ConfigFileEntry.stats_o_oper_only = 0;
898	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
899	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
900	<	ConfigFileEntry.stats_P_oper_only = 0;
901	<	ConfigFileEntry.stats_u_oper_only = 0;
902	<	ConfigFileEntry.caller_id_wait = 60;
903	<	ConfigFileEntry.opers_bypass_callerid = 0;
904	<	ConfigFileEntry.pace_wait = 10;
905	<	ConfigFileEntry.pace_wait_simple = 1;
906	<	ConfigFileEntry.short_motd = 0;
907	<	ConfigFileEntry.ping_cookie = 0;
908	<	ConfigFileEntry.no_oper_flood = 0;
909	<	ConfigFileEntry.true_no_oper_flood = 0;
910	<	ConfigFileEntry.oper_pass_resv = 1;
911	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
912	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
913	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
914	<	UMODE_OPERWALL | UMODE_WALLOP;
915	<	ConfigFileEntry.use_egd = 0;
916	<	ConfigFileEntry.egdpool_path = NULL;
1169	<	ConfigFileEntry.throttle_time = 10;
869	>	ConfigGeneral.away_count = 2;
870	>	ConfigGeneral.away_time = 10;
871	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
872	>	ConfigGeneral.cycle_on_host_change = 1;
873	>	ConfigGeneral.glines = 0;
874	>	ConfigGeneral.gline_time = 12 * 3600;
875	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
876	>	ConfigGeneral.gline_min_cidr = 16;
877	>	ConfigGeneral.gline_min_cidr6 = 48;
878	>	ConfigGeneral.invisible_on_connect = 1;
879	>	ConfigGeneral.tkline_expire_notices = 1;
880	>	ConfigGeneral.hide_spoof_ips = 1;
881	>	ConfigGeneral.ignore_bogus_ts = 0;
882	>	ConfigGeneral.disable_auth = 0;
883	>	ConfigGeneral.kill_chase_time_limit = 90;
884	>	ConfigGeneral.default_floodcount = 8;
885	>	ConfigGeneral.failed_oper_notice = 1;
886	>	ConfigGeneral.dots_in_ident = 0;
887	>	ConfigGeneral.min_nonwildcard = 4;
888	>	ConfigGeneral.min_nonwildcard_simple = 3;
889	>	ConfigGeneral.max_accept = 20;
890	>	ConfigGeneral.anti_nick_flood = 0;
891	>	ConfigGeneral.max_nick_time = 20;
892	>	ConfigGeneral.max_nick_changes = 5;
893	>	ConfigGeneral.anti_spam_exit_message_time = 0;
894	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
895	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
896	>	ConfigGeneral.warn_no_connect_block = 1;
897	>	ConfigGeneral.stats_e_disabled = 0;
898	>	ConfigGeneral.stats_o_oper_only = 0;
899	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
900	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
901	>	ConfigGeneral.stats_P_oper_only = 0;
902	>	ConfigGeneral.stats_u_oper_only = 0;
903	>	ConfigGeneral.caller_id_wait = 60;
904	>	ConfigGeneral.opers_bypass_callerid = 0;
905	>	ConfigGeneral.pace_wait = 10;
906	>	ConfigGeneral.pace_wait_simple = 1;
907	>	ConfigGeneral.short_motd = 0;
908	>	ConfigGeneral.ping_cookie = 0;
909	>	ConfigGeneral.no_oper_flood = 0;
910	>	ConfigGeneral.true_no_oper_flood = 0;
911	>	ConfigGeneral.oper_pass_resv = 1;
912	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
913	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
914	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
915	>	ConfigGeneral.throttle_count = 1;
916	>	ConfigGeneral.throttle_time = 1;
917		}
918
919		static void
920		validate_conf(void)
921		{
922	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
923	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1177	<
1178	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1179	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
922	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
923	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
924
925	<	if (ServerInfo.network_name == NULL)
926	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
925	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
926	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
927
928	<	if (ServerInfo.network_desc == NULL)
929	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
928	>	if (ConfigServerInfo.network_name == NULL)
929	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
930
931	<	if (ConfigFileEntry.service_name == NULL)
932	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
931	>	if (ConfigServerInfo.network_desc == NULL)
932	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
933
934	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
934	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
935		}
936
937	<	/* read_conf()
937	>	/* read_conf()
938		*
939		* inputs       - file descriptor pointing to config file to use
940		* output       - None
#	Line 1201 | Line 945 | read_conf(FILE *file)
945		{
946		lineno = 0;
947
948	<	set_default_conf(); /* Set default values prior to conf parsing */
948	>	set_default_conf();  /* Set default values prior to conf parsing */
949		conf_parser_ctx.pass = 1;
950	<	yyparse();          /* pick up the classes first */
950	>	yyparse();  /* Pick up the classes first */
951
952		rewind(file);
953
954		conf_parser_ctx.pass = 2;
955	<	yyparse();          /* Load the values from the conf */
956	<	validate_conf();    /* Check to make sure some values are still okay. */
957	<	/* Some global values are also loaded here. */
958	<	class_delete_marked();      /* Make sure classes are valid */
955	>	yyparse();  /* Load the values from the conf */
956	>	validate_conf();  /* Check to make sure some values are still okay. */
957	>	/* Some global values are also loaded here. */
958	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
959		}
960
961		/* lookup_confhost()
#	Line 1224 | Line 968 | lookup_confhost(struct MaskItem *conf)
968		{
969		struct addrinfo hints, *res;
970
971	<	/* Do name lookup now on hostnames given and store the
971	>	/*
972	>	* Do name lookup now on hostnames given and store the
973		* ip numbers in conf structure.
974		*/
975		memset(&hints, 0, sizeof(hints));
#	Line 1241 | Line 986 | lookup_confhost(struct MaskItem *conf)
986		return;
987		}
988
989	<	assert(res != NULL);
989	>	assert(res);
990
991		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
992		conf->addr.ss_len = res->ai_addrlen;
#	Line 1260 | Line 1005 | lookup_confhost(struct MaskItem *conf)
1005		int
1006		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1007		{
1008	<	struct ip_entry *ip_found;
1008	>	struct ip_entry *ip_found = NULL;
1009		struct MaskItem *conf = find_dline_conf(addr, aftype);
1010
1011		/* DLINE exempt also gets you out of static limits/pacing... */
1012		if (conf && (conf->type == CONF_EXEMPT))
1013		return 0;
1014
1015	<	if (conf != NULL)
1015	>	if (conf)
1016		return BANNED_CLIENT;
1017
1018	<	ip_found = find_or_add_ip(addr);
1018	>	ip_found = ipcache_find_or_add_address(addr);
1019
1020	<	if ((CurrentTime - ip_found->last_attempt) <
1276	<	ConfigFileEntry.throttle_time)
1020	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1021		{
1022	<	ip_found->last_attempt = CurrentTime;
1023	<	return TOO_FAST;
1022	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1023	>	return TOO_FAST;
1024	>
1025	>	++ip_found->connection_count;
1026		}
1027	+	else
1028	+	ip_found->connection_count = 1;
1029
1030		ip_found->last_attempt = CurrentTime;
1031		return 0;
#	Line 1291 | Line 1039 | conf_connect_allowed(struct irc_ssaddr *
1039		*                This is an event started off in ircd.c
1040		*/
1041		void
1042	<	cleanup_tklines(void *notused)
1042	>	cleanup_tklines(void *unused)
1043		{
1044		hostmask_expire_temporary();
1045	<	expire_tklines(&xconf_items);
1045	>	expire_tklines(&xconf_items);
1046		expire_tklines(&nresv_items);
1047		expire_tklines(&cresv_items);
1048		}
#	Line 1308 | Line 1056 | cleanup_tklines(void *notused)
1056		static void
1057		expire_tklines(dlink_list *tklist)
1058		{
1059	<	dlink_node *ptr;
1060	<	dlink_node *next_ptr;
1313	<	struct MaskItem *conf;
1059	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1060	>	struct MaskItem *conf = NULL;
1061
1062	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1062	>	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1063		{
1064		conf = ptr->data;
1065
#	Line 1321 | Line 1068 | expire_tklines(dlink_list *tklist)
1068
1069		if (conf->type == CONF_XLINE)
1070		{
1071	<	if (ConfigFileEntry.tkline_expire_notices)
1071	>	if (ConfigGeneral.tkline_expire_notices)
1072		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1073		"Temporary X-line for [%s] expired", conf->name);
1074		conf_free(conf);
1075		}
1076		else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1077		{
1078	<	if (ConfigFileEntry.tkline_expire_notices)
1078	>	if (ConfigGeneral.tkline_expire_notices)
1079		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1080		"Temporary RESV for [%s] expired", conf->name);
1081		conf_free(conf);
#	Line 1352 | Line 1099 | static const struct oper_privs
1099		{ OPER_FLAG_DIE,            'D' },
1100		{ OPER_FLAG_GLINE,          'G' },
1101		{ OPER_FLAG_REHASH,         'H' },
1102	<	{ OPER_FLAG_K,              'K' },
1356	<	{ OPER_FLAG_OPERWALL,       'L' },
1102	>	{ OPER_FLAG_KLINE,          'K' },
1103		{ OPER_FLAG_KILL,           'N' },
1104		{ OPER_FLAG_KILL_REMOTE,    'O' },
1105		{ OPER_FLAG_CONNECT,        'P' },
#	Line 1361 | Line 1107 | static const struct oper_privs
1107		{ OPER_FLAG_SQUIT,          'R' },
1108		{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1109		{ OPER_FLAG_UNKLINE,        'U' },
1110	<	{ OPER_FLAG_X,              'X' },
1110	>	{ OPER_FLAG_XLINE,          'X' },
1111		{ 0, '\0' }
1112		};
1113
1114		char *
1115		oper_privs_as_string(const unsigned int port)
1116		{
1117	<	static char privs_out[16];
1117	>	static char privs_out[IRCD_BUFSIZE];
1118		char *privs_ptr = privs_out;
1373	–	const struct oper_privs *opriv = flag_list;
1119
1120	<	for (; opriv->flag; ++opriv)
1120	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1121		{
1122		if (port & opriv->flag)
1123		*privs_ptr++ = opriv->c;
#	Line 1386 | Line 1131 | oper_privs_as_string(const unsigned int
1131		}
1132
1133		/*
1134	<	* Input: A client to find the active oper{} name for.
1134	>	* Input: A client to find the active operator {} name for.
1135		* Output: The nick!user@host{oper} of the oper.
1136		*         "oper" is server name for remote opers
1137		* Side effects: None.
#	Line 1394 | Line 1139 | oper_privs_as_string(const unsigned int
1139		const char *
1140		get_oper_name(const struct Client *client_p)
1141		{
1142	<	dlink_node *cnode = NULL;
1142	>	const dlink_node *cnode = NULL;
1143		/* +5 for !,@,{,} and null */
1144		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1145
1146		if (MyConnect(client_p))
1147		{
1148	<	if ((cnode = client_p->localClient->confs.head))
1148	>	if ((cnode = client_p->connection->confs.head))
1149		{
1150	<	struct MaskItem *conf = cnode->data;
1150	>	const struct MaskItem *conf = cnode->data;
1151
1152		if (IsConfOperator(conf))
1153		{
#	Line 1412 | Line 1157 | get_oper_name(const struct Client *clien
1157		}
1158		}
1159
1160	<	/* Probably should assert here for now. If there is an oper out there
1161	<	* with no oper{} conf attached, it would be good for us to know...
1160	>	/*
1161	>	* Probably should assert here for now. If there is an oper out there
1162	>	* with no operator {} conf attached, it would be good for us to know...
1163		*/
1164	<	assert(0); /* Oper without oper conf! */
1164	>	assert(0);  /* Oper without oper conf! */
1165		}
1166
1167		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1432 | Line 1178 | get_oper_name(const struct Client *clien
1178		void
1179		read_conf_files(int cold)
1180		{
1181	<	const char *filename;
1182	<	char chanmodes[32];
1183	<	char chanlimit[32];
1181	>	const char *filename = NULL;
1182	>	char chanmodes[IRCD_BUFSIZE] = "";
1183	>	char chanlimit[IRCD_BUFSIZE] = "";
1184
1185		conf_parser_ctx.boot = cold;
1186	<	filename = ConfigFileEntry.configfile;
1186	>	filename = ConfigGeneral.configfile;
1187
1188		/* We need to know the initial filename for the yyerror() to report
1189		FIXME: The full path is in conffilenamebuf first time since we
1190	<	dont know anything else
1190	>	don't know anything else
1191
1192	<	- Gozem 2002-07-21
1192	>	- Gozem 2002-07-21
1193		*/
1194		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1195
#	Line 1472 | Line 1218 | read_conf_files(int cold)
1218
1219		log_reopen_all();
1220
1221	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1222	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1221	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1222	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1223
1224		snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1225		add_isupport("MAXLIST", chanmodes, -1);
1226	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1226	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1227		add_isupport("CHANTYPES", "#", -1);
1228
1229		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1230	<	ConfigChannel.max_chans_per_user);
1230	>	ConfigChannel.max_channels);
1231		add_isupport("CHANLIMIT", chanlimit, -1);
1232	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1233	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1234	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1232	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1233	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1234	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1235		add_isupport("CHANMODES", chanmodes, -1);
1236
1237		/*
#	Line 1505 | Line 1251 | static void
1251		clear_out_old_conf(void)
1252		{
1253		dlink_node *ptr = NULL, *next_ptr = NULL;
1508	–	struct MaskItem *conf;
1254		dlink_list *free_items [] = {
1255		&server_items,   &oconf_items,
1256		&uconf_items,   &xconf_items,
#	Line 1517 | Line 1262 | clear_out_old_conf(void)
1262		/* We only need to free anything allocated by yyparse() here.
1263		* Resetting structs, etc, is taken care of by set_default_conf().
1264		*/
1265	<
1265	>
1266		for (; *iterator != NULL; iterator++)
1267		{
1268		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1269		{
1270	<	conf = ptr->data;
1270	>	struct MaskItem *conf = ptr->data;
1271
1272	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1272	>	conf->active = 0;
1273	>	dlinkDelete(&conf->node, *iterator);
1274
1275		/* XXX This is less than pretty */
1276		if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
#	Line 1555 | Line 1301 | clear_out_old_conf(void)
1301		/* clean out module paths */
1302		mod_clear_paths();
1303
1304	<	/* clean out ServerInfo */
1305	<	MyFree(ServerInfo.description);
1306	<	ServerInfo.description = NULL;
1307	<	MyFree(ServerInfo.network_name);
1308	<	ServerInfo.network_name = NULL;
1309	<	MyFree(ServerInfo.network_desc);
1310	<	ServerInfo.network_desc = NULL;
1311	<	MyFree(ConfigFileEntry.egdpool_path);
1312	<	ConfigFileEntry.egdpool_path = NULL;
1304	>	pseudo_clear();
1305	>
1306	>	/* clean out ConfigServerInfo */
1307	>	MyFree(ConfigServerInfo.description);
1308	>	ConfigServerInfo.description = NULL;
1309	>	MyFree(ConfigServerInfo.network_name);
1310	>	ConfigServerInfo.network_name = NULL;
1311	>	MyFree(ConfigServerInfo.network_desc);
1312	>	ConfigServerInfo.network_desc = NULL;
1313		#ifdef HAVE_LIBCRYPTO
1314	<	if (ServerInfo.rsa_private_key != NULL)
1314	>	if (ConfigServerInfo.rsa_private_key)
1315		{
1316	<	RSA_free(ServerInfo.rsa_private_key);
1317	<	ServerInfo.rsa_private_key = NULL;
1316	>	RSA_free(ConfigServerInfo.rsa_private_key);
1317	>	ConfigServerInfo.rsa_private_key = NULL;
1318		}
1319
1320	<	MyFree(ServerInfo.rsa_private_key_file);
1321	<	ServerInfo.rsa_private_key_file = NULL;
1576	<
1577	<	if (ServerInfo.server_ctx)
1578	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1579	<	SSL_OP_NO_SSLv3|
1580	<	SSL_OP_NO_TLSv1);
1581	<	if (ServerInfo.client_ctx)
1582	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1583	<	SSL_OP_NO_SSLv3|
1584	<	SSL_OP_NO_TLSv1);
1320	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1321	>	ConfigServerInfo.rsa_private_key_file = NULL;
1322		#endif
1323
1324	<	/* clean out AdminInfo */
1325	<	MyFree(AdminInfo.name);
1326	<	AdminInfo.name = NULL;
1327	<	MyFree(AdminInfo.email);
1328	<	AdminInfo.email = NULL;
1329	<	MyFree(AdminInfo.description);
1330	<	AdminInfo.description = NULL;
1324	>	/* clean out ConfigAdminInfo */
1325	>	MyFree(ConfigAdminInfo.name);
1326	>	ConfigAdminInfo.name = NULL;
1327	>	MyFree(ConfigAdminInfo.email);
1328	>	ConfigAdminInfo.email = NULL;
1329	>	MyFree(ConfigAdminInfo.description);
1330	>	ConfigAdminInfo.description = NULL;
1331
1332		/* clean out listeners */
1333		close_listeners();
1597	–
1598	–	/* clean out general */
1599	–	MyFree(ConfigFileEntry.service_name);
1600	–	ConfigFileEntry.service_name = NULL;
1334		}
1335
1336		/* conf_add_class_to_conf()
1337		*
1338		* inputs       - pointer to config item
1339		* output       - NONE
1340	<	* side effects - Add a class pointer to a conf
1340	>	* side effects - Add a class pointer to a conf
1341		*/
1342		void
1343		conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1344		{
1345	<	if (class_name == NULL)
1345	>	if (class_name == NULL)
1346		{
1347		conf->class = class_default;
1348
#	Line 1676 | Line 1409 | conf_error_report(const char *msg)
1409
1410		/*
1411		* valid_tkline()
1412	<	*
1412	>	*
1413		* inputs       - pointer to ascii string to check
1414		*              - whether the specified time is in seconds or minutes
1415		* output       - -1 not enough parameters
#	Line 1701 | Line 1434 | valid_tkline(const char *data, const int
1434		}
1435
1436		/*
1437	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1437	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1438		* i.e. they specifically use 0, I am going to return 1 instead
1439		* as a return value of non-zero is used to flag it as a temporary kline
1440		*/
1441		if (result == 0)
1442		result = 1;
1443
1444	<	/*
1444	>	/*
1445		* If the incoming time is in seconds convert it to minutes for the purpose
1446		* of this calculation
1447		*/
1448		if (!minutes)
1449	<	result = result / 60;
1449	>	result = result / 60;
1450
1451		if (result > MAX_TDKLINE_TIME)
1452		result = MAX_TDKLINE_TIME;
#	Line 1734 | Line 1467 | valid_wild_card_simple(const char *data)
1467		{
1468		const unsigned char *p = (const unsigned char *)data;
1469		unsigned char tmpch = '\0';
1470	<	int nonwild = 0;
1470	>	unsigned int nonwild = 0;
1471
1472		while ((tmpch = *p++))
1473		{
1474	<	if (tmpch == '\\')
1474	>	if (tmpch == '\\' && *p)
1475		{
1476		++p;
1477	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1477	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1478		return 1;
1479		}
1480		else if (!IsMWildChar(tmpch))
1481		{
1482	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1482	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1483		return 1;
1484		}
1485		}
#	Line 1765 | Line 1498 | valid_wild_card_simple(const char *data)
1498		int
1499		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1500		{
1501	<	char tmpch;
1502	<	int nonwild = 0;
1501	>	unsigned char tmpch = '\0';
1502	>	unsigned int nonwild = 0;
1503		va_list args;
1504
1505		/*
#	Line 1785 | Line 1518 | valid_wild_card(struct Client *source_p,
1518
1519		while (count--)
1520		{
1521	<	const char *p = va_arg(args, const char *);
1521	>	const unsigned char *p = va_arg(args, const unsigned char *);
1522		if (p == NULL)
1523		continue;
1524
#	Line 1797 | Line 1530 | valid_wild_card(struct Client *source_p,
1530		* If we find enough non-wild characters, we can
1531		* break - no point in searching further.
1532		*/
1533	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1533	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1534	>	{
1535	>	va_end(args);
1536		return 1;
1537	+	}
1538		}
1539		}
1540		}
1541
1542		if (warn)
1543	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1544	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1543	>	sendto_one_notice(source_p, &me,
1544	>	":Please include at least %u non-wildcard characters with the mask",
1545	>	ConfigGeneral.min_nonwildcard);
1546	>	va_end(args);
1547		return 0;
1548		}
1549
#	Line 1819 | Line 1557 | valid_wild_card(struct Client *source_p,
1557		*              - parse_flags bit map of things to test
1558		*              - pointer to user or string to parse into
1559		*              - pointer to host or NULL to parse into if non NULL
1560	<	*              - pointer to optional tkline time or NULL
1560	>	*              - pointer to optional tkline time or NULL
1561		*              - pointer to target_server to parse into if non NULL
1562		*              - pointer to reason to parse into
1563		*
#	Line 1846 | Line 1584 | parse_aline(const char *cmd, struct Clie
1584		char **target_server, char **reason)
1585		{
1586		int found_tkline_time=0;
1587	<	static char def_reason[] = "No Reason";
1587	>	static char def_reason[] = CONF_NOREASON;
1588		static char user[USERLEN*4+1];
1589		static char host[HOSTLEN*4+1];
1590
#	Line 1864 | Line 1602 | parse_aline(const char *cmd, struct Clie
1602		*tkline_time = found_tkline_time;
1603		else
1604		{
1605	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1868	<	me.name, source_p->name, cmd);
1605	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1606		return -1;
1607		}
1608		}
1609
1610		if (parc == 0)
1611		{
1612	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1876	<	me.name, source_p->name, cmd);
1612	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1613		return -1;
1614		}
1615
#	Line 1887 | Line 1623 | parse_aline(const char *cmd, struct Clie
1623		*up_p = user;
1624		*h_p = host;
1625		}
1626	<
1626	>
1627		parc--;
1628		parv++;
1629
#	Line 1900 | Line 1636 | parse_aline(const char *cmd, struct Clie
1636
1637		if (target_server == NULL)
1638		{
1639	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1904	<	me.name, source_p->name, cmd);
1639	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1640		return -1;
1641		}
1642
1643		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1644		{
1645	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1911	<	me.name, source_p->name, "remoteban");
1645	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1646		return -1;
1647		}
1648
1649		if (parc == 0 || EmptyString(*parv))
1650		{
1651	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1918	<	me.name, source_p->name, cmd);
1651	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1652		return -1;
1653		}
1654
#	Line 1937 | Line 1670 | parse_aline(const char *cmd, struct Clie
1670		{
1671		if (strchr(user, '!') != NULL)
1672		{
1673	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1941	<	me.name, source_p->name);
1673	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1674		return -1;
1675		}
1676
#	Line 2009 | Line 1741 | find_user_host(struct Client *source_p,
1741		luser[1] = '\0';
1742		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1743		}
1744	<
1744	>
1745		return 1;
1746		}
1747		else
1748		{
1749		/* Try to find user@host mask from nick */
1750		/* Okay to use source_p as the first param, because source_p == client_p */
1751	<	if ((target_p =
1752	<	find_chasing(source_p, user_host_or_nick, NULL)) == NULL)
1753	<	return 0;
1751	>	if ((target_p =
1752	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1753	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1754
1755		if (IsExemptKline(target_p))
1756		{
1757		if (!IsServer(source_p))
1758	<	sendto_one(source_p,
2027	<	":%s NOTICE %s :%s is E-lined",
2028	<	me.name, source_p->name, target_p->name);
1758	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1759		return 0;
1760		}
1761
#	Line 2086 | Line 1816 | match_conf_password(const char *password
1816		else
1817		encr = password;
1818
1819	<	return !strcmp(encr, conf->passwd);
1819	>	return encr && !strcmp(encr, conf->passwd);
1820		}
1821
1822		/*
#	Line 2094 | Line 1824 | match_conf_password(const char *password
1824		*
1825		* inputs       - client sending the cluster
1826		*              - command name "KLINE" "XLINE" etc.
1827	<	*              - capab -- CAP_KLN etc. from s_serv.h
1827	>	*              - capab -- CAP_KLN etc. from server.h
1828		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1829		*              - pattern and args to send along
1830		* output       - none
#	Line 2106 | Line 1836 | cluster_a_line(struct Client *source_p,
1836		int capab, int cluster_type, const char *pattern, ...)
1837		{
1838		va_list args;
1839	<	char buffer[IRCD_BUFSIZE];
1839	>	char buffer[IRCD_BUFSIZE] = "";
1840		const dlink_node *ptr = NULL;
1841
1842		va_start(args, pattern);
#	Line 2167 | Line 1897 | split_nuh(struct split_nuh_item *const i
1897		{
1898		*p = '\0';
1899
1900	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1900	>	if (iptr->nickptr && *iptr->nuhmask)
1901		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1902
1903		if ((q = strchr(++p, '@')))
1904		{
1905		*q++ = '\0';
1906
1907	<	if (*p != '\0')
1907	>	if (*p)
1908		strlcpy(iptr->userptr, p, iptr->usersize);
1909
1910	<	if (*q != '\0')
1910	>	if (*q)
1911		strlcpy(iptr->hostptr, q, iptr->hostsize);
1912		}
1913		else
1914		{
1915	<	if (*p != '\0')
1915	>	if (*p)
1916		strlcpy(iptr->userptr, p, iptr->usersize);
1917		}
1918		}
#	Line 2194 | Line 1924 | split_nuh(struct split_nuh_item *const i
1924		/* if found a @ */
1925		*p++ = '\0';
1926
1927	<	if (*iptr->nuhmask != '\0')
1927	>	if (*iptr->nuhmask)
1928		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1929
1930	<	if (*p != '\0')
1930	>	if (*p)
1931		strlcpy(iptr->hostptr, p, iptr->hostsize);
1932		}
1933		else

Diff Legend

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