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 2475 by michael, Fri Oct 11 19:40:43 2013 UTC vs.
Revision 4343 by michael, Sat Aug 2 16:58:33 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
31	>	#include "server.h"
32		#include "resv.h"
33		#include "channel.h"
34		#include "client.h"
35		#include "event.h"
34	–	#include "hook.h"
36		#include "irc_string.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
#	Line 42 | Line 43
43		#include "fdlist.h"
44		#include "log.h"
45		#include "send.h"
45	–	#include "s_gline.h"
46		#include "memory.h"
47	<	#include "mempool.h"
48	<	#include "irc_res.h"
47	>	#include "res.h"
48		#include "userhost.h"
49	<	#include "s_user.h"
49	>	#include "user.h"
50		#include "channel_mode.h"
51		#include "parse.h"
52	<	#include "s_misc.h"
52	>	#include "misc.h"
53		#include "conf_db.h"
54		#include "conf_class.h"
55		#include "motd.h"
56	+	#include "ipcache.h"
57
58	–	struct config_server_hide ConfigServerHide;
58
59		/* general conf items link list root, other than k lines etc. */
60		dlink_list service_items = { NULL, NULL, 0 };
#	Line 65 | Line 64 | dlink_list oconf_items   = { NULL, NULL,
64		dlink_list uconf_items   = { NULL, NULL, 0 };
65		dlink_list xconf_items   = { NULL, NULL, 0 };
66		dlink_list nresv_items   = { NULL, NULL, 0 };
67	<	dlink_list cresv_items = { NULL, NULL, 0 };
67	>	dlink_list cresv_items   = { NULL, NULL, 0 };
68
69		extern unsigned int lineno;
70		extern char linebuf[];
71		extern char conffilebuf[IRCD_BUFSIZE];
72		extern int yyparse(); /* defined in y.tab.c */
73
75	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
76	–
74		/* internally defined functions */
75		static void read_conf(FILE *);
76		static void clear_out_old_conf(void);
77		static void expire_tklines(dlink_list *);
81	–	static void garbage_collect_ip_entries(void);
82	–	static int hash_ip(struct irc_ssaddr *);
78		static int verify_access(struct Client *);
79		static int attach_iline(struct Client *, struct MaskItem *);
85	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
80		static dlink_list *map_to_list(enum maskitem_type);
81		static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
82
83
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	–
84		/* conf_dns_callback()
85		*
86		* inputs       - pointer to struct MaskItem
#	Line 123 | Line 98 | conf_dns_callback(void *vptr, const stru
98
99		conf->dns_pending = 0;
100
101	<	if (addr != NULL)
101	>	if (addr)
102		memcpy(&conf->addr, addr, sizeof(conf->addr));
103		else
104		conf->dns_failed = 1;
#	Line 148 | Line 123 | conf_dns_lookup(struct MaskItem *conf)
123		struct MaskItem *
124		conf_make(enum maskitem_type type)
125		{
126	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
126	>	struct MaskItem *conf = MyCalloc(sizeof(*conf));
127		dlink_list *list = NULL;
128
129		conf->type   = type;
#	Line 174 | Line 149 | conf_free(struct MaskItem *conf)
149
150		if (conf->dns_pending)
151		delete_resolver_queries(conf);
152	<	if (conf->passwd != NULL)
152	>	if (conf->passwd)
153		memset(conf->passwd, 0, strlen(conf->passwd));
154	<	if (conf->spasswd != NULL)
154	>	if (conf->spasswd)
155		memset(conf->spasswd, 0, strlen(conf->spasswd));
156
157		conf->class = NULL;
#	Line 196 | Line 171 | conf_free(struct MaskItem *conf)
171		DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
172		{
173		MyFree(ptr->data);
174	+	dlinkDelete(ptr, &conf->hub_list);
175		free_dlink_node(ptr);
176		}
177
178		DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
179		{
180		MyFree(ptr->data);
181	+	dlinkDelete(ptr, &conf->leaf_list);
182		free_dlink_node(ptr);
183		}
184
#	Line 209 | Line 186 | conf_free(struct MaskItem *conf)
186		{
187		struct exempt *exptr = ptr->data;
188
189	+	dlinkDelete(ptr, &conf->exempt_list);
190		MyFree(exptr->name);
191		MyFree(exptr->user);
192		MyFree(exptr->host);
#	Line 235 | Line 213 | int
213		check_client(struct Client *source_p)
214		{
215		int i;
216	<
216	>
217		if ((i = verify_access(source_p)))
218	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
218	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
219		source_p->name, source_p->sockhost);
220
221		switch (i)
#	Line 250 | Line 228 | check_client(struct Client *source_p)
228		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
229		get_client_name(source_p, SHOW_IP));
230		++ServerStats.is_ref;
231	<	exit_client(source_p, &me, "No more connections allowed on that IP");
231	>	exit_client(source_p, "No more connections allowed on that IP");
232		break;
233
234		case I_LINE_FULL:
#	Line 261 | Line 239 | check_client(struct Client *source_p)
239		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
240		get_client_name(source_p, SHOW_IP));
241		++ServerStats.is_ref;
242	<	exit_client(source_p, &me,
265	<	"No more connections allowed in your connection class");
242	>	exit_client(source_p, "No more connections allowed in your connection class");
243		break;
244
245		case NOT_AUTHORIZED:
#	Line 281 | Line 258 | check_client(struct Client *source_p)
258		source_p->localClient->listener->name,
259		source_p->localClient->listener->port);
260
261	<	exit_client(source_p, &me, "You are not authorized to use this server");
261	>	exit_client(source_p, "You are not authorized to use this server");
262		break;
263
264		case BANNED_CLIENT:
265	<	exit_client(source_p, &me, "Banned");
265	>	exit_client(source_p, "Banned");
266		++ServerStats.is_ref;
267		break;
268
#	Line 307 | Line 284 | static int
284		verify_access(struct Client *client_p)
285		{
286		struct MaskItem *conf = NULL;
287	<	char non_ident[USERLEN + 1] = { '~', '\0' };
287	>	char non_ident[USERLEN + 1] = "~";
288
289		if (IsGotId(client_p))
290		{
#	Line 325 | Line 302 | verify_access(struct Client *client_p)
302		client_p->localClient->passwd);
303		}
304
305	<	if (conf != NULL)
305	>	if (conf)
306		{
307		if (IsConfClient(conf))
308		{
309		if (IsConfRedir(conf))
310		{
311	<	sendto_one(client_p, form_str(RPL_REDIR),
312	<	me.name, client_p->name,
313	<	conf->name ? conf->name : "",
337	<	conf->port);
311	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
312	>	conf->name ? conf->name : "",
313	>	conf->port);
314		return NOT_AUTHORIZED;
315		}
316
#	Line 344 | Line 320 | verify_access(struct Client *client_p)
320		/* Thanks for spoof idea amm */
321		if (IsConfDoSpoofIp(conf))
322		{
323	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
323	>	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
324		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
325		"%s spoofing: %s as %s",
326		client_p->name, client_p->host, conf->name);
#	Line 354 | Line 330 | verify_access(struct Client *client_p)
330
331		return attach_iline(client_p, conf);
332		}
333	<	else if (IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
333	>	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
334		{
335		if (IsConfGline(conf))
336	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
337	<	client_p->name);
362	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
363	<	me.name, client_p->name, conf->reason);
336	>	sendto_one_notice(client_p, &me, ":*** G-lined");
337	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
338		return BANNED_CLIENT;
339		}
340		}
#	Line 378 | Line 352 | verify_access(struct Client *client_p)
352		static int
353		attach_iline(struct Client *client_p, struct MaskItem *conf)
354		{
355	<	struct ClassItem *class = NULL;
355	>	const struct ClassItem *class = conf->class;
356		struct ip_entry *ip_found;
357		int a_limit_reached = 0;
358		unsigned int local = 0, global = 0, ident = 0;
359
360	<	assert(conf->class);
387	<
388	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
360	>	ip_found = ipcache_find_or_add_address(&client_p->localClient->ip);
361		ip_found->count++;
362		SetIpHash(client_p);
363
392	–	class = conf->class;
393	–
364		count_user_host(client_p->username, client_p->host,
365		&global, &local, &ident);
366
#	Line 398 | Line 368 | attach_iline(struct Client *client_p, st
368		* setting a_limit_reached if any limit is reached.
369		* - Dianora
370		*/
371	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
371	>	if (class->max_total && class->ref_count >= class->max_total)
372		a_limit_reached = 1;
373	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
373	>	else if (class->max_perip && ip_found->count > class->max_perip)
374		a_limit_reached = 1;
375	<	else if (class->max_local != 0 && local >= class->max_local)
375	>	else if (class->max_local && local >= class->max_local)
376		a_limit_reached = 1;
377	<	else if (class->max_global != 0 && global >= class->max_global)
377	>	else if (class->max_global && global >= class->max_global)
378		a_limit_reached = 1;
379	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
379	>	else if (class->max_ident && ident >= class->max_ident &&
380		client_p->username[0] != '~')
381		a_limit_reached = 1;
382
#	Line 415 | Line 385 | attach_iline(struct Client *client_p, st
385		if (!IsConfExemptLimits(conf))
386		return TOO_MANY;   /* Already at maximum allowed */
387
388	<	sendto_one(client_p,
389	<	":%s NOTICE %s :*** Your connection class is full, "
420	<	"but you have exceed_limit = yes;", me.name, client_p->name);
388	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
389	>	"but you have exceed_limit = yes;");
390		}
391
392		return attach_conf(client_p, conf);
393		}
394
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	–
395		/* detach_conf()
396		*
397		* inputs       - pointer to client to detach
#	Line 664 | Line 403 | garbage_collect_ip_entries(void)
403		void
404		detach_conf(struct Client *client_p, enum maskitem_type type)
405		{
406	<	dlink_node *ptr = NULL, *next_ptr = NULL;
406	>	dlink_node *ptr = NULL, *ptr_next = NULL;
407
408	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
408	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
409		{
410		struct MaskItem *conf = ptr->data;
411
#	Line 707 | Line 446 | detach_conf(struct Client *client_p, enu
446		int
447		attach_conf(struct Client *client_p, struct MaskItem *conf)
448		{
449	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
449	>	if (dlinkFind(&client_p->localClient->confs, conf))
450		return 1;
451
452		if (conf->type == CONF_CLIENT)
#	Line 776 | Line 515 | find_conf_name(dlink_list *list, const c
515		DLINK_FOREACH(ptr, list->head)
516		{
517		conf = ptr->data;
518	<
518	>
519		if (conf->type == type)
520		{
521	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
521	>	if (conf->name && (!irccmp(conf->name, name) ||
522		!match(conf->name, name)))
523		return conf;
524		}
#	Line 894 | Line 633 | find_matching_name_conf(enum maskitem_ty
633		return conf;
634		}
635		break;
636	<
636	>
637		default:
638		break;
639		}
#	Line 931 | Line 670 | find_exact_name_conf(enum maskitem_type
670
671		if (EmptyString(conf->name))
672		continue;
673	<
673	>
674		if (irccmp(conf->name, name) == 0)
675		{
676		if ((user == NULL && (host == NULL)))
#	Line 997 | Line 736 | find_exact_name_conf(enum maskitem_type
736
737		if (EmptyString(conf->name))
738		continue;
739	<
739	>
740		if (name == NULL)
741		{
742		if (EmptyString(conf->host))
#	Line 1027 | Line 766 | find_exact_name_conf(enum maskitem_type
766		int
767		rehash(int sig)
768		{
769	<	if (sig != 0)
769	>	if (sig)
770		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
771	<	"Got signal SIGHUP, reloading ircd.conf file");
771	>	"Got signal SIGHUP, reloading configuration file(s)");
772
773		restart_resolver();
774
#	Line 1040 | Line 779 | rehash(int sig)
779
780		read_conf_files(0);
781
782	<	if (ServerInfo.description != NULL)
783	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
782	>	if (ConfigServerInfo.description)
783	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
784
785		load_conf_modules();
786	<
1048	<	rehashed_klines = 1;
786	>	check_conf_klines();
787
788		return 0;
789		}
#	Line 1068 | Line 806 | set_default_conf(void)
806		assert(class_default == class_get_list()->tail->data);
807
808		#ifdef HAVE_LIBCRYPTO
809	<	ServerInfo.rsa_private_key = NULL;
810	<	ServerInfo.rsa_private_key_file = NULL;
809	>	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
810	>	ConfigServerInfo.rsa_private_key = NULL;
811	>	ConfigServerInfo.rsa_private_key_file = NULL;
812		#endif
813
814	<	/* ServerInfo.name is not rehashable */
815	<	/* ServerInfo.name = ServerInfo.name; */
816	<	ServerInfo.description = NULL;
817	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
818	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
819	<
820	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
821	<	ServerInfo.specific_ipv4_vhost = 0;
822	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
823	<	ServerInfo.specific_ipv6_vhost = 0;
824	<
825	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
826	<	ServerInfo.max_nick_length = 9;
827	<	ServerInfo.max_topic_length = 80;
828	<
829	<	ServerInfo.hub = 0;
830	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
831	<	ServerInfo.dns_host.sin_port = 0;
832	<	AdminInfo.name = NULL;
1094	<	AdminInfo.email = NULL;
1095	<	AdminInfo.description = NULL;
814	>	/* ConfigServerInfo.name is not rehashable */
815	>	/* ConfigServerInfo.name = ConfigServerInfo.name; */
816	>	ConfigServerInfo.description = NULL;
817	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
818	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
819	>
820	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
821	>	ConfigServerInfo.specific_ipv4_vhost = 0;
822	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
823	>	ConfigServerInfo.specific_ipv6_vhost = 0;
824	>
825	>	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
826	>	ConfigServerInfo.max_nick_length = 9;
827	>	ConfigServerInfo.max_topic_length = 80;
828	>	ConfigServerInfo.hub = 0;
829	>
830	>	ConfigAdminInfo.name = NULL;
831	>	ConfigAdminInfo.email = NULL;
832	>	ConfigAdminInfo.description = NULL;
833
834		log_del_all();
835
836	<	ConfigLoggingEntry.use_logging = 1;
836	>	ConfigLog.use_logging = 1;
837
838		ConfigChannel.disable_fake_channels = 0;
839	<	ConfigChannel.knock_delay = 300;
839	>	ConfigChannel.invite_client_count = 10;
840	>	ConfigChannel.invite_client_time = 300;
841	>	ConfigChannel.knock_client_count = 1;
842	>	ConfigChannel.knock_client_time = 300;
843		ConfigChannel.knock_delay_channel = 60;
844	<	ConfigChannel.max_chans_per_user = 25;
1105	<	ConfigChannel.max_chans_per_oper = 50;
844	>	ConfigChannel.max_channels = 25;
845		ConfigChannel.max_bans = 25;
846		ConfigChannel.default_split_user_count = 0;
847		ConfigChannel.default_split_server_count = 0;
#	Line 1118 | Line 857 | set_default_conf(void)
857		ConfigServerHide.hide_server_ips = 0;
858		ConfigServerHide.disable_remote_commands = 0;
859
860	<
861	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
862	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
863	<	ConfigFileEntry.cycle_on_host_change = 1;
864	<	ConfigFileEntry.glines = 0;
865	<	ConfigFileEntry.gline_time = 12 * 3600;
866	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
867	<	ConfigFileEntry.gline_min_cidr = 16;
868	<	ConfigFileEntry.gline_min_cidr6 = 48;
869	<	ConfigFileEntry.invisible_on_connect = 1;
870	<	ConfigFileEntry.tkline_expire_notices = 1;
871	<	ConfigFileEntry.hide_spoof_ips = 1;
872	<	ConfigFileEntry.ignore_bogus_ts = 0;
873	<	ConfigFileEntry.disable_auth = 0;
874	<	ConfigFileEntry.kill_chase_time_limit = 90;
875	<	ConfigFileEntry.default_floodcount = 8;
876	<	ConfigFileEntry.failed_oper_notice = 1;
877	<	ConfigFileEntry.dots_in_ident = 0;
878	<	ConfigFileEntry.min_nonwildcard = 4;
879	<	ConfigFileEntry.min_nonwildcard_simple = 3;
880	<	ConfigFileEntry.max_accept = 20;
881	<	ConfigFileEntry.anti_nick_flood = 0;
882	<	ConfigFileEntry.max_nick_time = 20;
883	<	ConfigFileEntry.max_nick_changes = 5;
884	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
885	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
886	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
887	<	ConfigFileEntry.warn_no_nline = 1;
888	<	ConfigFileEntry.stats_o_oper_only = 0;
889	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
890	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
891	<	ConfigFileEntry.stats_P_oper_only = 0;
892	<	ConfigFileEntry.stats_u_oper_only = 0;
893	<	ConfigFileEntry.caller_id_wait = 60;
894	<	ConfigFileEntry.opers_bypass_callerid = 0;
895	<	ConfigFileEntry.pace_wait = 10;
896	<	ConfigFileEntry.pace_wait_simple = 1;
897	<	ConfigFileEntry.short_motd = 0;
898	<	ConfigFileEntry.ping_cookie = 0;
899	<	ConfigFileEntry.no_oper_flood = 0;
900	<	ConfigFileEntry.true_no_oper_flood = 0;
901	<	ConfigFileEntry.oper_pass_resv = 1;
902	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
903	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
904	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
905	<	UMODE_OPERWALL | UMODE_WALLOP;
906	<	ConfigFileEntry.use_egd = 0;
907	<	ConfigFileEntry.egdpool_path = NULL;
908	<	ConfigFileEntry.throttle_time = 10;
860	>	ConfigGeneral.away_count = 2;
861	>	ConfigGeneral.away_time = 10;
862	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
863	>	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
864	>	ConfigGeneral.cycle_on_host_change = 1;
865	>	ConfigGeneral.glines = 0;
866	>	ConfigGeneral.gline_time = 12 * 3600;
867	>	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
868	>	ConfigGeneral.gline_min_cidr = 16;
869	>	ConfigGeneral.gline_min_cidr6 = 48;
870	>	ConfigGeneral.invisible_on_connect = 1;
871	>	ConfigGeneral.tkline_expire_notices = 1;
872	>	ConfigGeneral.hide_spoof_ips = 1;
873	>	ConfigGeneral.ignore_bogus_ts = 0;
874	>	ConfigGeneral.disable_auth = 0;
875	>	ConfigGeneral.kill_chase_time_limit = 90;
876	>	ConfigGeneral.default_floodcount = 8;
877	>	ConfigGeneral.failed_oper_notice = 1;
878	>	ConfigGeneral.dots_in_ident = 0;
879	>	ConfigGeneral.min_nonwildcard = 4;
880	>	ConfigGeneral.min_nonwildcard_simple = 3;
881	>	ConfigGeneral.max_accept = 20;
882	>	ConfigGeneral.anti_nick_flood = 0;
883	>	ConfigGeneral.max_nick_time = 20;
884	>	ConfigGeneral.max_nick_changes = 5;
885	>	ConfigGeneral.anti_spam_exit_message_time = 0;
886	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
887	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
888	>	ConfigGeneral.warn_no_connect_block = 1;
889	>	ConfigGeneral.stats_e_disabled = 0;
890	>	ConfigGeneral.stats_o_oper_only = 0;
891	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
892	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
893	>	ConfigGeneral.stats_P_oper_only = 0;
894	>	ConfigGeneral.stats_u_oper_only = 0;
895	>	ConfigGeneral.caller_id_wait = 60;
896	>	ConfigGeneral.opers_bypass_callerid = 0;
897	>	ConfigGeneral.pace_wait = 10;
898	>	ConfigGeneral.pace_wait_simple = 1;
899	>	ConfigGeneral.short_motd = 0;
900	>	ConfigGeneral.ping_cookie = 0;
901	>	ConfigGeneral.no_oper_flood = 0;
902	>	ConfigGeneral.true_no_oper_flood = 0;
903	>	ConfigGeneral.oper_pass_resv = 1;
904	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
905	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
906	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
907	>	ConfigGeneral.throttle_count = 1;
908	>	ConfigGeneral.throttle_time = 1;
909		}
910
911		static void
912		validate_conf(void)
913		{
914	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
915	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
914	>	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
915	>	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
916
917	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
918	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
917	>	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
918	>	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
919
920	<	if (ServerInfo.network_name == NULL)
921	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
920	>	if (ConfigServerInfo.network_name == NULL)
921	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
922
923	<	if (ServerInfo.network_desc == NULL)
924	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
923	>	if (ConfigServerInfo.network_desc == NULL)
924	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
925
926	<	if (ConfigFileEntry.service_name == NULL)
927	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
926	>	if (ConfigGeneral.service_name == NULL)
927	>	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
928
929	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
929	>	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
930		}
931
932	<	/* read_conf()
932	>	/* read_conf()
933		*
934		* inputs       - file descriptor pointing to config file to use
935		* output       - None
#	Line 1201 | Line 940 | read_conf(FILE *file)
940		{
941		lineno = 0;
942
943	<	set_default_conf(); /* Set default values prior to conf parsing */
943	>	set_default_conf();  /* Set default values prior to conf parsing */
944		conf_parser_ctx.pass = 1;
945	<	yyparse();          /* pick up the classes first */
945	>	yyparse();  /* Pick up the classes first */
946
947		rewind(file);
948
949		conf_parser_ctx.pass = 2;
950	<	yyparse();          /* Load the values from the conf */
951	<	validate_conf();    /* Check to make sure some values are still okay. */
952	<	/* Some global values are also loaded here. */
953	<	class_delete_marked();      /* Make sure classes are valid */
950	>	yyparse();  /* Load the values from the conf */
951	>	validate_conf();  /* Check to make sure some values are still okay. */
952	>	/* Some global values are also loaded here. */
953	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
954		}
955
956		/* lookup_confhost()
#	Line 1224 | Line 963 | lookup_confhost(struct MaskItem *conf)
963		{
964		struct addrinfo hints, *res;
965
966	<	/* Do name lookup now on hostnames given and store the
966	>	/*
967	>	* Do name lookup now on hostnames given and store the
968		* ip numbers in conf structure.
969		*/
970		memset(&hints, 0, sizeof(hints));
#	Line 1241 | Line 981 | lookup_confhost(struct MaskItem *conf)
981		return;
982		}
983
984	<	assert(res != NULL);
984	>	assert(res);
985
986		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
987		conf->addr.ss_len = res->ai_addrlen;
#	Line 1260 | Line 1000 | lookup_confhost(struct MaskItem *conf)
1000		int
1001		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
1002		{
1003	<	struct ip_entry *ip_found;
1003	>	struct ip_entry *ip_found = NULL;
1004		struct MaskItem *conf = find_dline_conf(addr, aftype);
1005
1006		/* DLINE exempt also gets you out of static limits/pacing... */
1007		if (conf && (conf->type == CONF_EXEMPT))
1008		return 0;
1009
1010	<	if (conf != NULL)
1010	>	if (conf)
1011		return BANNED_CLIENT;
1012
1013	<	ip_found = find_or_add_ip(addr);
1013	>	ip_found = ipcache_find_or_add_address(addr);
1014
1015	<	if ((CurrentTime - ip_found->last_attempt) <
1276	<	ConfigFileEntry.throttle_time)
1015	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
1016		{
1017	<	ip_found->last_attempt = CurrentTime;
1018	<	return TOO_FAST;
1017	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
1018	>	return TOO_FAST;
1019	>
1020	>	++ip_found->connection_count;
1021		}
1022	+	else
1023	+	ip_found->connection_count = 1;
1024
1025		ip_found->last_attempt = CurrentTime;
1026		return 0;
1027		}
1028
1286	–	/* find_kill()
1287	–	*
1288	–	* inputs       - pointer to client structure
1289	–	* output       - pointer to struct MaskItem if found
1290	–	* side effects - See if this user is klined already,
1291	–	*                and if so, return struct MaskItem pointer
1292	–	*/
1293	–	struct MaskItem *
1294	–	find_kill(struct Client *client_p)
1295	–	{
1296	–	struct MaskItem *conf = NULL;
1297	–
1298	–	assert(client_p != NULL);
1299	–
1300	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1301	–	CONF_KLINE, client_p->localClient->aftype,
1302	–	client_p->username, NULL, 1);
1303	–	return conf;
1304	–	}
1305	–
1306	–	struct MaskItem *
1307	–	find_gline(struct Client *client_p)
1308	–	{
1309	–	struct MaskItem *conf;
1310	–
1311	–	assert(client_p != NULL);
1312	–
1313	–	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1314	–	CONF_GLINE, client_p->localClient->aftype,
1315	–	client_p->username, NULL, 1);
1316	–	return conf;
1317	–	}
1318	–
1029		/* cleanup_tklines()
1030		*
1031		* inputs       - NONE
#	Line 1327 | Line 1037 | void
1037		cleanup_tklines(void *notused)
1038		{
1039		hostmask_expire_temporary();
1040	<	expire_tklines(&xconf_items);
1040	>	expire_tklines(&xconf_items);
1041		expire_tklines(&nresv_items);
1042		expire_tklines(&cresv_items);
1043		}
#	Line 1341 | Line 1051 | cleanup_tklines(void *notused)
1051		static void
1052		expire_tklines(dlink_list *tklist)
1053		{
1054	<	dlink_node *ptr;
1055	<	dlink_node *next_ptr;
1346	<	struct MaskItem *conf;
1054	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1055	>	struct MaskItem *conf = NULL;
1056
1057	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1057	>	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1058		{
1059		conf = ptr->data;
1060
#	Line 1354 | Line 1063 | expire_tklines(dlink_list *tklist)
1063
1064		if (conf->type == CONF_XLINE)
1065		{
1066	<	if (ConfigFileEntry.tkline_expire_notices)
1066	>	if (ConfigGeneral.tkline_expire_notices)
1067		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1068		"Temporary X-line for [%s] expired", conf->name);
1069		conf_free(conf);
1070		}
1071		else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1072		{
1073	<	if (ConfigFileEntry.tkline_expire_notices)
1073	>	if (ConfigGeneral.tkline_expire_notices)
1074		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1075		"Temporary RESV for [%s] expired", conf->name);
1076		conf_free(conf);
#	Line 1385 | Line 1094 | static const struct oper_privs
1094		{ OPER_FLAG_DIE,            'D' },
1095		{ OPER_FLAG_GLINE,          'G' },
1096		{ OPER_FLAG_REHASH,         'H' },
1097	<	{ OPER_FLAG_K,              'K' },
1389	<	{ OPER_FLAG_OPERWALL,       'L' },
1097	>	{ OPER_FLAG_KLINE,          'K' },
1098		{ OPER_FLAG_KILL,           'N' },
1099		{ OPER_FLAG_KILL_REMOTE,    'O' },
1100		{ OPER_FLAG_CONNECT,        'P' },
#	Line 1394 | Line 1102 | static const struct oper_privs
1102		{ OPER_FLAG_SQUIT,          'R' },
1103		{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1104		{ OPER_FLAG_UNKLINE,        'U' },
1105	<	{ OPER_FLAG_X,              'X' },
1105	>	{ OPER_FLAG_XLINE,          'X' },
1106		{ 0, '\0' }
1107		};
1108
1109		char *
1110		oper_privs_as_string(const unsigned int port)
1111		{
1112	<	static char privs_out[16];
1112	>	static char privs_out[IRCD_BUFSIZE];
1113		char *privs_ptr = privs_out;
1406	–	const struct oper_privs *opriv = flag_list;
1114
1115	<	for (; opriv->flag; ++opriv)
1115	>	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1116		{
1117		if (port & opriv->flag)
1118		*privs_ptr++ = opriv->c;
#	Line 1419 | Line 1126 | oper_privs_as_string(const unsigned int
1126		}
1127
1128		/*
1129	<	* Input: A client to find the active oper{} name for.
1129	>	* Input: A client to find the active operator {} name for.
1130		* Output: The nick!user@host{oper} of the oper.
1131		*         "oper" is server name for remote opers
1132		* Side effects: None.
#	Line 1427 | Line 1134 | oper_privs_as_string(const unsigned int
1134		const char *
1135		get_oper_name(const struct Client *client_p)
1136		{
1137	<	dlink_node *cnode = NULL;
1137	>	const dlink_node *cnode = NULL;
1138		/* +5 for !,@,{,} and null */
1139		static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1140
#	Line 1435 | Line 1142 | get_oper_name(const struct Client *clien
1142		{
1143		if ((cnode = client_p->localClient->confs.head))
1144		{
1145	<	struct MaskItem *conf = cnode->data;
1145	>	const struct MaskItem *conf = cnode->data;
1146
1147		if (IsConfOperator(conf))
1148		{
#	Line 1445 | Line 1152 | get_oper_name(const struct Client *clien
1152		}
1153		}
1154
1155	<	/* Probably should assert here for now. If there is an oper out there
1156	<	* with no oper{} conf attached, it would be good for us to know...
1155	>	/*
1156	>	* Probably should assert here for now. If there is an oper out there
1157	>	* with no operator {} conf attached, it would be good for us to know...
1158		*/
1159	<	assert(0); /* Oper without oper conf! */
1159	>	assert(0);  /* Oper without oper conf! */
1160		}
1161
1162		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
#	Line 1465 | Line 1173 | get_oper_name(const struct Client *clien
1173		void
1174		read_conf_files(int cold)
1175		{
1176	<	const char *filename;
1177	<	char chanmodes[32];
1178	<	char chanlimit[32];
1176	>	const char *filename = NULL;
1177	>	char chanmodes[IRCD_BUFSIZE] = "";
1178	>	char chanlimit[IRCD_BUFSIZE] = "";
1179
1180		conf_parser_ctx.boot = cold;
1181	<	filename = ConfigFileEntry.configfile;
1181	>	filename = ConfigGeneral.configfile;
1182
1183		/* We need to know the initial filename for the yyerror() to report
1184		FIXME: The full path is in conffilenamebuf first time since we
1185	<	dont know anything else
1185	>	don't know anything else
1186
1187	<	- Gozem 2002-07-21
1187	>	- Gozem 2002-07-21
1188		*/
1189		strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1190
#	Line 1505 | Line 1213 | read_conf_files(int cold)
1213
1214		log_reopen_all();
1215
1216	<	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1217	<	add_isupport("NETWORK", ServerInfo.network_name, -1);
1216	>	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1217	>	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1218
1219		snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1220		add_isupport("MAXLIST", chanmodes, -1);
1221	<	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1221	>	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1222		add_isupport("CHANTYPES", "#", -1);
1223
1224		snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1225	<	ConfigChannel.max_chans_per_user);
1225	>	ConfigChannel.max_channels);
1226		add_isupport("CHANLIMIT", chanlimit, -1);
1227	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1228	<	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1229	<	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1227	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1228	>	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1229	>	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1230		add_isupport("CHANMODES", chanmodes, -1);
1231
1232		/*
#	Line 1550 | Line 1258 | clear_out_old_conf(void)
1258		/* We only need to free anything allocated by yyparse() here.
1259		* Resetting structs, etc, is taken care of by set_default_conf().
1260		*/
1261	<
1261	>
1262		for (; *iterator != NULL; iterator++)
1263		{
1264		DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
#	Line 1588 | Line 1296 | clear_out_old_conf(void)
1296		/* clean out module paths */
1297		mod_clear_paths();
1298
1299	<	/* clean out ServerInfo */
1300	<	MyFree(ServerInfo.description);
1301	<	ServerInfo.description = NULL;
1302	<	MyFree(ServerInfo.network_name);
1303	<	ServerInfo.network_name = NULL;
1304	<	MyFree(ServerInfo.network_desc);
1305	<	ServerInfo.network_desc = NULL;
1598	<	MyFree(ConfigFileEntry.egdpool_path);
1599	<	ConfigFileEntry.egdpool_path = NULL;
1299	>	/* clean out ConfigServerInfo */
1300	>	MyFree(ConfigServerInfo.description);
1301	>	ConfigServerInfo.description = NULL;
1302	>	MyFree(ConfigServerInfo.network_name);
1303	>	ConfigServerInfo.network_name = NULL;
1304	>	MyFree(ConfigServerInfo.network_desc);
1305	>	ConfigServerInfo.network_desc = NULL;
1306		#ifdef HAVE_LIBCRYPTO
1307	<	if (ServerInfo.rsa_private_key != NULL)
1307	>	if (ConfigServerInfo.rsa_private_key)
1308		{
1309	<	RSA_free(ServerInfo.rsa_private_key);
1310	<	ServerInfo.rsa_private_key = NULL;
1309	>	RSA_free(ConfigServerInfo.rsa_private_key);
1310	>	ConfigServerInfo.rsa_private_key = NULL;
1311		}
1312
1313	<	MyFree(ServerInfo.rsa_private_key_file);
1314	<	ServerInfo.rsa_private_key_file = NULL;
1609	<
1610	<	if (ServerInfo.server_ctx)
1611	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1612	<	SSL_OP_NO_SSLv3|
1613	<	SSL_OP_NO_TLSv1);
1614	<	if (ServerInfo.client_ctx)
1615	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1616	<	SSL_OP_NO_SSLv3|
1617	<	SSL_OP_NO_TLSv1);
1313	>	MyFree(ConfigServerInfo.rsa_private_key_file);
1314	>	ConfigServerInfo.rsa_private_key_file = NULL;
1315		#endif
1316
1317	<	/* clean out AdminInfo */
1318	<	MyFree(AdminInfo.name);
1319	<	AdminInfo.name = NULL;
1320	<	MyFree(AdminInfo.email);
1321	<	AdminInfo.email = NULL;
1322	<	MyFree(AdminInfo.description);
1323	<	AdminInfo.description = NULL;
1317	>	/* clean out ConfigAdminInfo */
1318	>	MyFree(ConfigAdminInfo.name);
1319	>	ConfigAdminInfo.name = NULL;
1320	>	MyFree(ConfigAdminInfo.email);
1321	>	ConfigAdminInfo.email = NULL;
1322	>	MyFree(ConfigAdminInfo.description);
1323	>	ConfigAdminInfo.description = NULL;
1324
1325		/* clean out listeners */
1326		close_listeners();
1327
1328		/* clean out general */
1329	<	MyFree(ConfigFileEntry.service_name);
1330	<	ConfigFileEntry.service_name = NULL;
1329	>	MyFree(ConfigGeneral.service_name);
1330	>	ConfigGeneral.service_name = NULL;
1331		}
1332
1333		/* conf_add_class_to_conf()
1334		*
1335		* inputs       - pointer to config item
1336		* output       - NONE
1337	<	* side effects - Add a class pointer to a conf
1337	>	* side effects - Add a class pointer to a conf
1338		*/
1339		void
1340		conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1341		{
1342	<	if (class_name == NULL)
1342	>	if (class_name == NULL)
1343		{
1344		conf->class = class_default;
1345
#	Line 1709 | Line 1406 | conf_error_report(const char *msg)
1406
1407		/*
1408		* valid_tkline()
1409	<	*
1409	>	*
1410		* inputs       - pointer to ascii string to check
1411		*              - whether the specified time is in seconds or minutes
1412		* output       - -1 not enough parameters
#	Line 1734 | Line 1431 | valid_tkline(const char *data, const int
1431		}
1432
1433		/*
1434	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1434	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1435		* i.e. they specifically use 0, I am going to return 1 instead
1436		* as a return value of non-zero is used to flag it as a temporary kline
1437		*/
1438		if (result == 0)
1439		result = 1;
1440
1441	<	/*
1441	>	/*
1442		* If the incoming time is in seconds convert it to minutes for the purpose
1443		* of this calculation
1444		*/
1445		if (!minutes)
1446	<	result = result / 60;
1446	>	result = result / 60;
1447
1448		if (result > MAX_TDKLINE_TIME)
1449		result = MAX_TDKLINE_TIME;
#	Line 1767 | Line 1464 | valid_wild_card_simple(const char *data)
1464		{
1465		const unsigned char *p = (const unsigned char *)data;
1466		unsigned char tmpch = '\0';
1467	<	int nonwild = 0;
1467	>	unsigned int nonwild = 0;
1468
1469		while ((tmpch = *p++))
1470		{
1471	<	if (tmpch == '\\')
1471	>	if (tmpch == '\\' && *p)
1472		{
1473		++p;
1474	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1474	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1475		return 1;
1476		}
1477		else if (!IsMWildChar(tmpch))
1478		{
1479	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard_simple)
1479	>	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1480		return 1;
1481		}
1482		}
#	Line 1798 | Line 1495 | valid_wild_card_simple(const char *data)
1495		int
1496		valid_wild_card(struct Client *source_p, int warn, int count, ...)
1497		{
1498	<	char tmpch;
1499	<	int nonwild = 0;
1498	>	unsigned char tmpch = '\0';
1499	>	unsigned int nonwild = 0;
1500		va_list args;
1501
1502		/*
#	Line 1818 | Line 1515 | valid_wild_card(struct Client *source_p,
1515
1516		while (count--)
1517		{
1518	<	const char *p = va_arg(args, const char *);
1518	>	const unsigned char *p = va_arg(args, const unsigned char *);
1519		if (p == NULL)
1520		continue;
1521
#	Line 1830 | Line 1527 | valid_wild_card(struct Client *source_p,
1527		* If we find enough non-wild characters, we can
1528		* break - no point in searching further.
1529		*/
1530	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1530	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1531	>	{
1532	>	va_end(args);
1533		return 1;
1534	+	}
1535		}
1536		}
1537		}
1538
1539		if (warn)
1540	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1541	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1540	>	sendto_one_notice(source_p, &me,
1541	>	":Please include at least %u non-wildcard characters with the mask",
1542	>	ConfigGeneral.min_nonwildcard);
1543	>	va_end(args);
1544		return 0;
1545		}
1546
#	Line 1852 | Line 1554 | valid_wild_card(struct Client *source_p,
1554		*              - parse_flags bit map of things to test
1555		*              - pointer to user or string to parse into
1556		*              - pointer to host or NULL to parse into if non NULL
1557	<	*              - pointer to optional tkline time or NULL
1557	>	*              - pointer to optional tkline time or NULL
1558		*              - pointer to target_server to parse into if non NULL
1559		*              - pointer to reason to parse into
1560		*
#	Line 1879 | Line 1581 | parse_aline(const char *cmd, struct Clie
1581		char **target_server, char **reason)
1582		{
1583		int found_tkline_time=0;
1584	<	static char def_reason[] = "No Reason";
1584	>	static char def_reason[] = CONF_NOREASON;
1585		static char user[USERLEN*4+1];
1586		static char host[HOSTLEN*4+1];
1587
#	Line 1897 | Line 1599 | parse_aline(const char *cmd, struct Clie
1599		*tkline_time = found_tkline_time;
1600		else
1601		{
1602	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1901	<	me.name, source_p->name, cmd);
1602	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1603		return -1;
1604		}
1605		}
1606
1607		if (parc == 0)
1608		{
1609	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1909	<	me.name, source_p->name, cmd);
1609	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1610		return -1;
1611		}
1612
#	Line 1920 | Line 1620 | parse_aline(const char *cmd, struct Clie
1620		*up_p = user;
1621		*h_p = host;
1622		}
1623	<
1623	>
1624		parc--;
1625		parv++;
1626
#	Line 1933 | Line 1633 | parse_aline(const char *cmd, struct Clie
1633
1634		if (target_server == NULL)
1635		{
1636	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
1937	<	me.name, source_p->name, cmd);
1636	>	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1637		return -1;
1638		}
1639
1640		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1641		{
1642	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1944	<	me.name, source_p->name, "remoteban");
1642	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1643		return -1;
1644		}
1645
1646		if (parc == 0 || EmptyString(*parv))
1647		{
1648	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1951	<	me.name, source_p->name, cmd);
1648	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1649		return -1;
1650		}
1651
#	Line 1970 | Line 1667 | parse_aline(const char *cmd, struct Clie
1667		{
1668		if (strchr(user, '!') != NULL)
1669		{
1670	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
1974	<	me.name, source_p->name);
1670	>	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1671		return -1;
1672		}
1673
#	Line 2042 | Line 1738 | find_user_host(struct Client *source_p,
1738		luser[1] = '\0';
1739		strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1740		}
1741	<
1741	>
1742		return 1;
1743		}
1744		else
1745		{
1746		/* Try to find user@host mask from nick */
1747		/* Okay to use source_p as the first param, because source_p == client_p */
1748	<	if ((target_p =
1749	<	find_chasing(source_p, user_host_or_nick, NULL)) == NULL)
1750	<	return 0;
1748	>	if ((target_p =
1749	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1750	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1751
1752		if (IsExemptKline(target_p))
1753		{
1754		if (!IsServer(source_p))
1755	<	sendto_one(source_p,
2060	<	":%s NOTICE %s :%s is E-lined",
2061	<	me.name, source_p->name, target_p->name);
1755	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1756		return 0;
1757		}
1758
#	Line 2119 | Line 1813 | match_conf_password(const char *password
1813		else
1814		encr = password;
1815
1816	<	return !strcmp(encr, conf->passwd);
1816	>	return encr && !strcmp(encr, conf->passwd);
1817		}
1818
1819		/*
#	Line 2127 | Line 1821 | match_conf_password(const char *password
1821		*
1822		* inputs       - client sending the cluster
1823		*              - command name "KLINE" "XLINE" etc.
1824	<	*              - capab -- CAP_KLN etc. from s_serv.h
1824	>	*              - capab -- CAP_KLN etc. from server.h
1825		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1826		*              - pattern and args to send along
1827		* output       - none
#	Line 2139 | Line 1833 | cluster_a_line(struct Client *source_p,
1833		int capab, int cluster_type, const char *pattern, ...)
1834		{
1835		va_list args;
1836	<	char buffer[IRCD_BUFSIZE];
1836	>	char buffer[IRCD_BUFSIZE] = "";
1837		const dlink_node *ptr = NULL;
1838
1839		va_start(args, pattern);
#	Line 2200 | Line 1894 | split_nuh(struct split_nuh_item *const i
1894		{
1895		*p = '\0';
1896
1897	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1897	>	if (iptr->nickptr && *iptr->nuhmask)
1898		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1899
1900	<	if ((q = strchr(++p, '@'))) {
1900	>	if ((q = strchr(++p, '@')))
1901	>	{
1902		*q++ = '\0';
1903
1904	<	if (*p != '\0')
1904	>	if (*p)
1905		strlcpy(iptr->userptr, p, iptr->usersize);
1906
1907	<	if (*q != '\0')
1907	>	if (*q)
1908		strlcpy(iptr->hostptr, q, iptr->hostsize);
1909		}
1910		else
1911		{
1912	<	if (*p != '\0')
1912	>	if (*p)
1913		strlcpy(iptr->userptr, p, iptr->usersize);
1914		}
1915		}
#	Line 2226 | Line 1921 | split_nuh(struct split_nuh_item *const i
1921		/* if found a @ */
1922		*p++ = '\0';
1923
1924	<	if (*iptr->nuhmask != '\0')
1924	>	if (*iptr->nuhmask)
1925		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1926
1927	<	if (*p != '\0')
1927	>	if (*p)
1928		strlcpy(iptr->hostptr, p, iptr->hostsize);
1929		}
1930		else

Diff Legend

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