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 5025 by michael, Fri Dec 12 15:18:43 2014 UTC vs.
Revision 8593 by michael, Sun Oct 21 18:11:04 2018 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2018 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 27 | Line 27
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30	+	#include "parse.h"
31		#include "conf.h"
32	+	#include "conf_cluster.h"
33	+	#include "conf_gecos.h"
34		#include "conf_pseudo.h"
35	+	#include "conf_resv.h"
36	+	#include "conf_service.h"
37	+	#include "conf_shared.h"
38		#include "server.h"
33	–	#include "resv.h"
39		#include "channel.h"
40		#include "client.h"
41		#include "event.h"
#	Line 46 | Line 51
51		#include "send.h"
52		#include "memory.h"
53		#include "res.h"
49	–	#include "userhost.h"
54		#include "user.h"
55		#include "channel_mode.h"
52	–	#include "parse.h"
56		#include "misc.h"
57		#include "conf_db.h"
58		#include "conf_class.h"
59		#include "motd.h"
60		#include "ipcache.h"
61	+	#include "isupport.h"
62	+	#include "whowas.h"
63
64
65	+	struct config_channel_entry ConfigChannel;
66	+	struct config_serverhide_entry ConfigServerHide;
67	+	struct config_general_entry ConfigGeneral;
68	+	struct config_log_entry ConfigLog = { .use_logging = 1 };
69	+	struct config_serverinfo_entry ConfigServerInfo;
70	+	struct config_admin_entry ConfigAdminInfo;
71	+	struct conf_parser_context conf_parser_ctx;
72	+
73		/* general conf items link list root, other than k lines etc. */
74	<	dlink_list service_items;
75	<	dlink_list server_items;
63	<	dlink_list cluster_items;
64	<	dlink_list oconf_items;
65	<	dlink_list uconf_items;
66	<	dlink_list xconf_items;
67	<	dlink_list nresv_items;
68	<	dlink_list cresv_items;
74	>	dlink_list connect_items;
75	>	dlink_list operator_items;
76
77		extern unsigned int lineno;
78		extern char linebuf[];
#	Line 127 | Line 134 | map_to_list(enum maskitem_type type)
134		{
135		switch (type)
136		{
130	–	case CONF_XLINE:
131	–	return &xconf_items;
132	–	break;
133	–	case CONF_ULINE:
134	–	return &uconf_items;
135	–	break;
136	–	case CONF_NRESV:
137	–	return &nresv_items;
138	–	break;
139	–	case CONF_CRESV:
140	–	return &cresv_items;
141	–	break;
137		case CONF_OPER:
138	<	return &oconf_items;
138	>	return &operator_items;
139		break;
140		case CONF_SERVER:
141	<	return &server_items;
147	<	break;
148	<	case CONF_SERVICE:
149	<	return &service_items;
150	<	break;
151	<	case CONF_CLUSTER:
152	<	return &cluster_items;
141	>	return &connect_items;
142		break;
143		default:
144		return NULL;
#	Line 159 | Line 148 | map_to_list(enum maskitem_type type)
148		struct MaskItem *
149		conf_make(enum maskitem_type type)
150		{
151	<	struct MaskItem *const conf = MyCalloc(sizeof(*conf));
151	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
152		dlink_list *list = NULL;
153
154		conf->type   = type;
#	Line 180 | Line 169 | conf_free(struct MaskItem *conf)
169		if ((list = map_to_list(conf->type)))
170		dlinkFindDelete(list, conf);
171
172	<	MyFree(conf->name);
172	>	xfree(conf->name);
173
174		if (conf->dns_pending)
175		delete_resolver_queries(conf);
#	Line 191 | Line 180 | conf_free(struct MaskItem *conf)
180
181		conf->class = NULL;
182
183	<	MyFree(conf->passwd);
184	<	MyFree(conf->spasswd);
185	<	MyFree(conf->reason);
186	<	MyFree(conf->certfp);
187	<	MyFree(conf->user);
188	<	MyFree(conf->host);
189	<	#ifdef HAVE_LIBCRYPTO
190	<	MyFree(conf->cipher_list);
191	<
203	<	if (conf->rsa_public_key)
204	<	RSA_free(conf->rsa_public_key);
205	<	#endif
183	>	xfree(conf->passwd);
184	>	xfree(conf->spasswd);
185	>	xfree(conf->reason);
186	>	xfree(conf->certfp);
187	>	xfree(conf->whois);
188	>	xfree(conf->user);
189	>	xfree(conf->host);
190	>	xfree(conf->cipher_list);
191	>
192		DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
193		{
194	<	MyFree(node->data);
194	>	xfree(node->data);
195		dlinkDelete(node, &conf->hub_list);
196		free_dlink_node(node);
197		}
198
199		DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
200		{
201	<	MyFree(node->data);
201	>	xfree(node->data);
202		dlinkDelete(node, &conf->leaf_list);
203		free_dlink_node(node);
204		}
205
206	<	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
221	<	{
222	<	struct exempt *exptr = node->data;
223	<
224	<	dlinkDelete(node, &conf->exempt_list);
225	<	MyFree(exptr->name);
226	<	MyFree(exptr->user);
227	<	MyFree(exptr->host);
228	<	MyFree(exptr);
229	<	}
230	<
231	<	MyFree(conf);
206	>	xfree(conf);
207		}
208
209		/* attach_iline()
#	Line 242 | Line 217 | static int
217		attach_iline(struct Client *client_p, struct MaskItem *conf)
218		{
219		const struct ClassItem *const class = conf->class;
245	–	struct ip_entry *ip_found;
220		int a_limit_reached = 0;
247	–	unsigned int local = 0, global = 0, ident = 0;
221
222	<	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
223	<	ip_found->count++;
222	>	struct ip_entry *ipcache = ipcache_record_find_or_add(&client_p->ip);
223	>	++ipcache->count_local;
224		AddFlag(client_p, FLAGS_IPHASH);
225
253	–	count_user_host(client_p->username, client_p->host,
254	–	&global, &local, &ident);
255	–
256	–	/* XXX blah. go down checking the various silly limits
257	–	* setting a_limit_reached if any limit is reached.
258	–	* - Dianora
259	–	*/
226		if (class->max_total && class->ref_count >= class->max_total)
227		a_limit_reached = 1;
228	<	else if (class->max_perip && ip_found->count > class->max_perip)
228	>	else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
229		a_limit_reached = 1;
230	<	else if (class->max_local && local >= class->max_local)
231	<	a_limit_reached = 1;
266	<	else if (class->max_global && global >= class->max_global)
267	<	a_limit_reached = 1;
268	<	else if (class->max_ident && ident >= class->max_ident &&
269	<	client_p->username[0] != '~')
230	>	else if (class->max_perip_global &&
231	>	(ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
232		a_limit_reached = 1;
233
234		if (a_limit_reached)
#	Line 278 | Line 240 | attach_iline(struct Client *client_p, st
240		"but you have exceed_limit = yes;");
241		}
242
243	<	return attach_conf(client_p, conf);
243	>	return conf_attach(client_p, conf);
244		}
245
246		/* verify_access()
#	Line 291 | Line 253 | static int
253		verify_access(struct Client *client_p)
254		{
255		struct MaskItem *conf = NULL;
294	–	char non_ident[USERLEN + 1] = "~";
256
257	<	if (IsGotId(client_p))
257	>	if (HasFlag(client_p, FLAGS_GOTID))
258		{
259		conf = find_address_conf(client_p->host, client_p->username,
260	<	&client_p->connection->ip,
261	<	client_p->connection->aftype,
260	>	&client_p->ip,
261	>	client_p->ip.ss.ss_family,
262		client_p->connection->password);
263		}
264		else
265		{
266	+	char non_ident[USERLEN + 1] = "~";
267	+
268		strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
269		conf = find_address_conf(client_p->host, non_ident,
270	<	&client_p->connection->ip,
271	<	client_p->connection->aftype,
270	>	&client_p->ip,
271	>	client_p->ip.ss.ss_family,
272		client_p->connection->password);
273		}
274
275	<	if (conf)
276	<	{
314	<	if (IsConfClient(conf))
315	<	{
316	<	if (IsConfRedir(conf))
317	<	{
318	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
319	<	conf->name ? conf->name : "",
320	<	conf->port);
321	<	return NOT_AUTHORIZED;
322	<	}
275	>	if (!conf)
276	>	return NOT_AUTHORIZED;
277
278	<	/* Thanks for spoof idea amm */
325	<	if (IsConfDoSpoofIp(conf))
326	<	{
327	<	if (IsConfSpoofNotice(conf))
328	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
329	<	client_p->name, client_p->host, conf->name);
330	<
331	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
332	<	}
278	>	assert(IsConfClient(conf) || IsConfKill(conf));
279
280	<	return attach_iline(client_p, conf);
280	>	if (IsConfClient(conf))
281	>	{
282	>	if (IsConfRedir(conf))
283	>	{
284	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
285	>	conf->name ? conf->name : "",
286	>	conf->port);
287	>	return NOT_AUTHORIZED;
288		}
289	<	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
289	>
290	>	if (IsConfDoSpoofIp(conf))
291		{
292	<	if (IsConfGline(conf))
293	<	sendto_one_notice(client_p, &me, ":*** G-lined");
292	>	if (IsConfSpoofNotice(conf))
293	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
294	>	client_p->name, client_p->host, conf->name);
295
296	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
342	<	return BANNED_CLIENT;
296	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
297		}
298	+
299	+	return attach_iline(client_p, conf);
300		}
301
302	<	return NOT_AUTHORIZED;
302	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
303	>	return BANNED_CLIENT;
304		}
305
306		/* check_client()
#	Line 373 | Line 330 | check_client(struct Client *source_p)
330		case TOO_MANY:
331		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
332		"Too many on IP for %s (%s).",
333	<	get_client_name(source_p, SHOW_IP),
333	>	client_get_name(source_p, SHOW_IP),
334		source_p->sockhost);
335		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
336	<	get_client_name(source_p, SHOW_IP));
336	>	client_get_name(source_p, SHOW_IP));
337		++ServerStats.is_ref;
338		exit_client(source_p, "No more connections allowed on that IP");
339		break;
#	Line 384 | Line 341 | check_client(struct Client *source_p)
341		case I_LINE_FULL:
342		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
343		"auth {} block is full for %s (%s).",
344	<	get_client_name(source_p, SHOW_IP),
344	>	client_get_name(source_p, SHOW_IP),
345		source_p->sockhost);
346		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
347	<	get_client_name(source_p, SHOW_IP));
347	>	client_get_name(source_p, SHOW_IP));
348		++ServerStats.is_ref;
349		exit_client(source_p, "No more connections allowed in your connection class");
350		break;
#	Line 396 | Line 353 | check_client(struct Client *source_p)
353		/* jdc - lists server name & port connections are on */
354		/*       a purely cosmetical change */
355		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
356	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
357	<	get_client_name(source_p, SHOW_IP),
401	<	source_p->sockhost,
356	>	"Unauthorized client connection from %s on [%s/%u].",
357	>	client_get_name(source_p, SHOW_IP),
358		source_p->connection->listener->name,
359		source_p->connection->listener->port);
360		ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
361	<	get_client_name(source_p, SHOW_IP),
361	>	client_get_name(source_p, SHOW_IP),
362		source_p->connection->listener->name,
363		source_p->connection->listener->port);
364
#	Line 423 | Line 379 | check_client(struct Client *source_p)
379		return !(i < 0);
380		}
381
382	<	/* detach_conf()
383	<	*
384	<	* inputs       - pointer to client to detach
385	<	*              - type of conf to detach
430	<	* output       - 0 for success, -1 for failure
431	<	* side effects - Disassociate configuration from the client.
432	<	*                Also removes a class from the list if marked for deleting.
382	>	/*! \brief Disassociate configuration from the client. Also removes a class
383	>	*         from the list if marked for deleting.
384	>	* \param client_p Client to operate on
385	>	* \param type     Type of conf to detach
386		*/
387		void
388	<	detach_conf(struct Client *client_p, enum maskitem_type type)
388	>	conf_detach(struct Client *client_p, enum maskitem_type type)
389		{
390	<	dlink_node *node = NULL, *node_next = NULL;
390	>	dlink_node *node, *node_next;
391
392		DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
393		{
#	Line 451 | Line 404 | detach_conf(struct Client *client_p, enu
404		free_dlink_node(node);
405
406		if (conf->type == CONF_CLIENT)
407	<	remove_from_cidr_check(&client_p->connection->ip, conf->class);
407	>	remove_from_cidr_check(&client_p->ip, conf->class);
408
409		if (--conf->class->ref_count == 0 && conf->class->active == 0)
410		{
#	Line 464 | Line 417 | detach_conf(struct Client *client_p, enu
417		}
418		}
419
420	<	/* attach_conf()
421	<	*
422	<	* inputs       - client pointer
423	<	*              - conf pointer
424	<	* output       -
472	<	* side effects - Associate a specific configuration entry to a *local*
473	<	*                client (this is the one which used in accepting the
474	<	*                connection). Note, that this automatically changes the
475	<	*                attachment if there was an old one...
420	>	/*! \brief Associate a specific configuration entry to a *local* client (this
421	>	*         is the one which used in accepting the connection). Note, that this
422	>	*         automatically changes the attachment if there was an old one.
423	>	* \param client_p Client to attach the conf to
424	>	* \param conf Configuration record to attach
425		*/
426		int
427	<	attach_conf(struct Client *client_p, struct MaskItem *conf)
427	>	conf_attach(struct Client *client_p, struct MaskItem *conf)
428		{
429		if (dlinkFind(&client_p->connection->confs, conf))
430		return 1;
431
432		if (conf->type == CONF_CLIENT)
433		if (cidr_limit_reached(IsConfExemptLimits(conf),
434	<	&client_p->connection->ip, conf->class))
434	>	&client_p->ip, conf->class))
435		return TOO_MANY;    /* Already at maximum allowed */
436
437		conf->class->ref_count++;
#	Line 493 | Line 442 | attach_conf(struct Client *client_p, str
442		return 0;
443		}
444
496	–	/* attach_connect_block()
497	–	*
498	–	* inputs       - pointer to server to attach
499	–	*              - name of server
500	–	*              - hostname of server
501	–	* output       - true (1) if both are found, otherwise return false (0)
502	–	* side effects - find connect block and attach them to connecting client
503	–	*/
504	–	int
505	–	attach_connect_block(struct Client *client_p, const char *name,
506	–	const char *host)
507	–	{
508	–	dlink_node *node = NULL;
509	–
510	–	assert(host);
511	–
512	–	DLINK_FOREACH(node, server_items.head)
513	–	{
514	–	struct MaskItem *conf = node->data;
515	–
516	–	if (match(conf->name, name) || match(conf->host, host))
517	–	continue;
518	–
519	–	attach_conf(client_p, conf);
520	–	return -1;
521	–	}
522	–
523	–	return 0;
524	–	}
525	–
445		/* find_conf_name()
446		*
447		* inputs       - pointer to conf link list to search
#	Line 551 | Line 470 | find_conf_name(dlink_list *list, const c
470		return NULL;
471		}
472
473	<	/* find_matching_name_conf()
474	<	*
475	<	* inputs       - type of link list to look in
557	<	*              - pointer to name string to find
558	<	*              - pointer to user
559	<	*              - pointer to host
560	<	*              - optional flags to match on as well
561	<	* output       - NULL or pointer to found struct MaskItem
562	<	* side effects - looks for a match on name field
473	>	/*! \brief Find a connect {} conf that has a name that matches \a name.
474	>	* \param name Name to match
475	>	* \param compare Pointer to function to be used for string matching
476		*/
477		struct MaskItem *
478	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
566	<	const char *host, unsigned int flags)
478	>	connect_find(const char *name, int (*compare)(const char *, const char *))
479		{
480	<	dlink_node *node = NULL;
569	<	dlink_list *list = map_to_list(type);
570	<	struct MaskItem *conf = NULL;
480	>	dlink_node *node;
481
482	<	switch (type)
482	>	DLINK_FOREACH(node, connect_items.head)
483		{
484	<	case CONF_SERVICE:
575	<	DLINK_FOREACH(node, list->head)
576	<	{
577	<	conf = node->data;
578	<
579	<	if (EmptyString(conf->name))
580	<	continue;
581	<	if (name && !irccmp(name, conf->name))
582	<	return conf;
583	<	}
584	<	break;
585	<
586	<	case CONF_XLINE:
587	<	case CONF_ULINE:
588	<	case CONF_NRESV:
589	<	case CONF_CRESV:
590	<	DLINK_FOREACH(node, list->head)
591	<	{
592	<	conf = node->data;
593	<
594	<	if (EmptyString(conf->name))
595	<	continue;
596	<	if (name && !match(conf->name, name))
597	<	{
598	<	if ((user == NULL && (host == NULL)))
599	<	return conf;
600	<	if ((conf->flags & flags) != flags)
601	<	continue;
602	<	if (EmptyString(conf->user) || EmptyString(conf->host))
603	<	return conf;
604	<	if (!match(conf->user, user) && !match(conf->host, host))
605	<	return conf;
606	<	}
607	<	}
608	<	break;
609	<
610	<	case CONF_SERVER:
611	<	DLINK_FOREACH(node, list->head)
612	<	{
613	<	conf = node->data;
614	<
615	<	if (name && !match(name, conf->name))
616	<	return conf;
617	<	if (host && !match(host, conf->host))
618	<	return conf;
619	<	}
620	<	break;
484	>	struct MaskItem *conf = node->data;
485
486	<	default:
487	<	break;
486	>	if (!compare(name, conf->name))
487	>	return conf;
488		}
489	+
490		return NULL;
491		}
492
#	Line 635 | Line 500 | find_matching_name_conf(enum maskitem_ty
500		* side effects - looks for an exact match on name field
501		*/
502		struct MaskItem *
503	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
639	<	const char *user, const char *host)
503	>	operator_find(const struct Client *who, const char *name)
504		{
505		dlink_node *node = NULL;
642	–	dlink_list *list = map_to_list(type);
643	–	struct MaskItem *conf = NULL;
506
507	<	switch(type)
507	>	DLINK_FOREACH(node, operator_items.head)
508		{
509	<	case CONF_XLINE:
648	<	case CONF_ULINE:
649	<	case CONF_NRESV:
650	<	case CONF_CRESV:
651	<
652	<	DLINK_FOREACH(node, list->head)
653	<	{
654	<	conf = node->data;
655	<
656	<	if (EmptyString(conf->name))
657	<	continue;
658	<
659	<	if (irccmp(conf->name, name) == 0)
660	<	{
661	<	if ((user == NULL && (host == NULL)))
662	<	return conf;
663	<	if (EmptyString(conf->user) || EmptyString(conf->host))
664	<	return conf;
665	<	if (!match(conf->user, user) && !match(conf->host, host))
666	<	return conf;
667	<	}
668	<	}
669	<	break;
509	>	struct MaskItem *conf = node->data;
510
511	<	case CONF_OPER:
672	<	DLINK_FOREACH(node, list->head)
511	>	if (!irccmp(conf->name, name))
512		{
513	<	conf = node->data;
514	<
676	<	if (EmptyString(conf->name))
677	<	continue;
513	>	if (!who)
514	>	return conf;
515
516	<	if (!irccmp(conf->name, name))
516	>	if (!match(conf->user, who->username))
517		{
518	<	if (!who)
682	<	return conf;
683	<	if (EmptyString(conf->user) || EmptyString(conf->host))
684	<	return NULL;
685	<	if (!match(conf->user, who->username))
518	>	switch (conf->htype)
519		{
520	<	switch (conf->htype)
521	<	{
522	<	case HM_HOST:
523	<	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
520	>	case HM_HOST:
521	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
522	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
523	>	return conf;
524	>	break;
525	>	case HM_IPV4:
526	>	if (who->ip.ss.ss_family == AF_INET)
527	>	if (match_ipv4(&who->ip, &conf->addr, conf->bits))
528		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
529		return conf;
530	<	break;
531	<	case HM_IPV4:
532	<	if (who->connection->aftype == AF_INET)
533	<	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
534	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
535	<	return conf;
536	<	break;
537	<	case HM_IPV6:
538	<	if (who->connection->aftype == AF_INET6)
702	<	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
703	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
704	<	return conf;
705	<	break;
706	<	default:
707	<	assert(0);
708	<	}
530	>	break;
531	>	case HM_IPV6:
532	>	if (who->ip.ss.ss_family == AF_INET6)
533	>	if (match_ipv6(&who->ip, &conf->addr, conf->bits))
534	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
535	>	return conf;
536	>	break;
537	>	default:
538	>	assert(0);
539		}
540		}
541		}
712	–
713	–	break;
714	–
715	–	case CONF_SERVER:
716	–	DLINK_FOREACH(node, list->head)
717	–	{
718	–	conf = node->data;
719	–
720	–	if (EmptyString(conf->name))
721	–	continue;
722	–
723	–	if (name == NULL)
724	–	{
725	–	if (EmptyString(conf->host))
726	–	continue;
727	–	if (irccmp(conf->host, host) == 0)
728	–	return conf;
729	–	}
730	–	else if (irccmp(conf->name, name) == 0)
731	–	return conf;
732	–	}
733	–
734	–	break;
735	–
736	–	default:
737	–	break;
542		}
543
544		return NULL;
#	Line 757 | Line 561 | set_default_conf(void)
561		*/
562		assert(class_default == class_get_list()->tail->data);
563
760	–	#ifdef HAVE_LIBCRYPTO
761	–	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
762	–	{
763	–	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
764	–
765	–	if (key)
766	–	{
767	–	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
768	–	EC_KEY_free(key);
769	–	}
770	–	}
771	–
772	–	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
773	–	#endif
774	–
775	–	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
776	–	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
777	–	ConfigServerInfo.rsa_private_key = NULL;
778	–	ConfigServerInfo.rsa_private_key_file = NULL;
779	–	#endif
780	–
781	–	/* ConfigServerInfo.name is not rehashable */
782	–	/* ConfigServerInfo.name = ConfigServerInfo.name; */
783	–	ConfigServerInfo.description = NULL;
564		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
565		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
566
#	Line 789 | Line 569 | set_default_conf(void)
569		memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
570		ConfigServerInfo.specific_ipv6_vhost = 0;
571
572	<	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
572	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
573		ConfigServerInfo.max_nick_length = 9;
574		ConfigServerInfo.max_topic_length = 80;
575		ConfigServerInfo.hub = 0;
576
577	<	ConfigAdminInfo.name = NULL;
798	<	ConfigAdminInfo.email = NULL;
799	<	ConfigAdminInfo.description = NULL;
800	<
801	<	log_del_all();
577	>	log_iterate(log_free);
578
579		ConfigLog.use_logging = 1;
580
581		ConfigChannel.disable_fake_channels = 0;
582		ConfigChannel.invite_client_count = 10;
583		ConfigChannel.invite_client_time = 300;
584	+	ConfigChannel.invite_delay_channel = 5;
585	+	ConfigChannel.invite_expire_time = 1800;
586		ConfigChannel.knock_client_count = 1;
587		ConfigChannel.knock_client_time = 300;
588		ConfigChannel.knock_delay_channel = 60;
589		ConfigChannel.max_channels = 25;
590	<	ConfigChannel.max_bans = 25;
591	<	ConfigChannel.default_split_user_count = 0;
592	<	ConfigChannel.default_split_server_count = 0;
593	<	ConfigChannel.no_join_on_split = 0;
594	<	ConfigChannel.no_create_on_split = 0;
590	>	ConfigChannel.max_invites = 20;
591	>	ConfigChannel.max_bans = 100;
592	>	ConfigChannel.max_bans_large = 500;
593	>	ConfigChannel.default_join_flood_count = 18;
594	>	ConfigChannel.default_join_flood_time = 6;
595
596		ConfigServerHide.flatten_links = 0;
597	<	ConfigServerHide.links_delay = 300;
597	>	ConfigServerHide.flatten_links_delay = 300;
598		ConfigServerHide.hidden = 0;
599		ConfigServerHide.hide_servers = 0;
600		ConfigServerHide.hide_services = 0;
#	Line 826 | Line 604 | set_default_conf(void)
604
605		ConfigGeneral.away_count = 2;
606		ConfigGeneral.away_time = 10;
607	<	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
607	>	ConfigGeneral.max_watch = 50;
608	>	ConfigGeneral.whowas_history_length = 15000;
609		ConfigGeneral.cycle_on_host_change = 1;
610	<	ConfigGeneral.glines = 0;
611	<	ConfigGeneral.gline_time = 12 * 3600;
612	<	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
613	<	ConfigGeneral.gline_min_cidr = 16;
835	<	ConfigGeneral.gline_min_cidr6 = 48;
610	>	ConfigGeneral.dline_min_cidr = 16;
611	>	ConfigGeneral.dline_min_cidr6 = 48;
612	>	ConfigGeneral.kline_min_cidr = 16;
613	>	ConfigGeneral.kline_min_cidr6 = 48;
614		ConfigGeneral.invisible_on_connect = 1;
615		ConfigGeneral.tkline_expire_notices = 1;
616		ConfigGeneral.ignore_bogus_ts = 0;
617		ConfigGeneral.disable_auth = 0;
618		ConfigGeneral.kill_chase_time_limit = 90;
619		ConfigGeneral.default_floodcount = 8;
620	+	ConfigGeneral.default_floodtime = 1;
621		ConfigGeneral.failed_oper_notice = 1;
622		ConfigGeneral.dots_in_ident = 0;
623		ConfigGeneral.min_nonwildcard = 4;
624		ConfigGeneral.min_nonwildcard_simple = 3;
625	<	ConfigGeneral.max_accept = 20;
625	>	ConfigGeneral.max_accept = 50;
626		ConfigGeneral.anti_nick_flood = 0;
627		ConfigGeneral.max_nick_time = 20;
628		ConfigGeneral.max_nick_changes = 5;
629		ConfigGeneral.anti_spam_exit_message_time = 0;
630	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
631	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
630	>	ConfigGeneral.ts_warn_delta = 30;
631	>	ConfigGeneral.ts_max_delta = 600;
632		ConfigGeneral.warn_no_connect_block = 1;
633		ConfigGeneral.stats_e_disabled = 0;
634		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
#	Line 859 | Line 638 | set_default_conf(void)
638		ConfigGeneral.stats_P_oper_only = 0;
639		ConfigGeneral.stats_u_oper_only = 0;
640		ConfigGeneral.caller_id_wait = 60;
641	<	ConfigGeneral.opers_bypass_callerid = 0;
641	>	ConfigGeneral.opers_bypass_callerid = 1;
642		ConfigGeneral.pace_wait = 10;
643		ConfigGeneral.pace_wait_simple = 1;
644		ConfigGeneral.short_motd = 0;
645		ConfigGeneral.ping_cookie = 0;
646		ConfigGeneral.no_oper_flood = 0;
868	–	ConfigGeneral.oper_pass_resv = 1;
647		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
648	<	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
648	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
649	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
650	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
651		ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
652		ConfigGeneral.throttle_count = 1;
653		ConfigGeneral.throttle_time = 1;
#	Line 876 | Line 656 | set_default_conf(void)
656		static void
657		validate_conf(void)
658		{
659	<	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
880	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
881	<
882	<	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
883	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
884	<
885	<	if (ConfigServerInfo.network_name == NULL)
659	>	if (EmptyString(ConfigServerInfo.network_name))
660		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
661
662	<	if (ConfigServerInfo.network_desc == NULL)
662	>	if (EmptyString(ConfigServerInfo.network_desc))
663		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
890	–
891	–	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
664		}
665
666		/* read_conf()
#	Line 900 | Line 672 | validate_conf(void)
672		static void
673		read_conf(FILE *file)
674		{
675	<	lineno = 0;
675	>	lineno = 1;
676
677		set_default_conf();  /* Set default values prior to conf parsing */
678		conf_parser_ctx.pass = 1;
#	Line 912 | Line 684 | read_conf(FILE *file)
684		yyparse();  /* Load the values from the conf */
685		validate_conf();  /* Check to make sure some values are still okay. */
686		/* Some global values are also loaded here. */
687	+	whowas_trim();  /* Attempt to trim whowas list if necessary */
688		class_delete_marked();  /* Delete unused classes that are marked for deletion */
689		}
690
#	Line 921 | Line 694 | read_conf(FILE *file)
694		* as a result of an operator issuing this command, else assume it has been
695		* called as a result of the server receiving a HUP signal.
696		*/
697	<	int
697	>	void
698		conf_rehash(int sig)
699		{
700		if (sig)
701	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
701	>	{
702	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
703		"Got signal SIGHUP, reloading configuration file(s)");
704	+	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
705	+	}
706
707		restart_resolver();
708
#	Line 936 | Line 712 | conf_rehash(int sig)
712
713		load_conf_modules();
714		check_conf_klines();
939	–
940	–	return 0;
715		}
716
717		/* lookup_confhost()
#	Line 988 | Line 762 | int
762		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
763		{
764		struct ip_entry *ip_found = NULL;
765	<	struct MaskItem *const conf = find_dline_conf(addr, aftype);
992	<
993	<	/* DLINE exempt also gets you out of static limits/pacing... */
994	<	if (conf && (conf->type == CONF_EXEMPT))
995	<	return 0;
765	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
766
767		if (conf)
768	+	{
769	+	/* DLINE exempt also gets you out of static limits/pacing... */
770	+	if (conf->type == CONF_EXEMPT)
771	+	return 0;
772		return BANNED_CLIENT;
773	+	}
774
775	<	ip_found = ipcache_find_or_add_address(addr);
775	>	ip_found = ipcache_record_find_or_add(addr);
776
777		if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
778		{
#	Line 1013 | Line 788 | conf_connect_allowed(struct irc_ssaddr *
788		return 0;
789		}
790
1016	–	/* expire_tklines()
1017	–	*
1018	–	* inputs       - tkline list pointer
1019	–	* output       - NONE
1020	–	* side effects - expire tklines
1021	–	*/
1022	–	static void
1023	–	expire_tklines(dlink_list *list)
1024	–	{
1025	–	dlink_node *node = NULL, *node_next = NULL;
1026	–
1027	–	DLINK_FOREACH_SAFE(node, node_next, list->head)
1028	–	{
1029	–	struct MaskItem *conf = node->data;
1030	–
1031	–	if (!conf->until || conf->until > CurrentTime)
1032	–	continue;
1033	–
1034	–	if (conf->type == CONF_XLINE)
1035	–	{
1036	–	if (ConfigGeneral.tkline_expire_notices)
1037	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1038	–	"Temporary X-line for [%s] expired", conf->name);
1039	–	conf_free(conf);
1040	–	}
1041	–	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1042	–	{
1043	–	if (ConfigGeneral.tkline_expire_notices)
1044	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1045	–	"Temporary RESV for [%s] expired", conf->name);
1046	–	conf_free(conf);
1047	–	}
1048	–	}
1049	–	}
1050	–
791		/* cleanup_tklines()
792		*
793		* inputs       - NONE
#	Line 1059 | Line 799 | void
799		cleanup_tklines(void *unused)
800		{
801		hostmask_expire_temporary();
802	<	expire_tklines(&xconf_items);
803	<	expire_tklines(&nresv_items);
1064	<	expire_tklines(&cresv_items);
802	>	gecos_expire();
803	>	resv_expire();
804		}
805
806		/* oper_privs_as_string()
#	Line 1070 | Line 809 | cleanup_tklines(void *unused)
809		* output        - pointer to static string showing oper privs
810		* side effects  - return as string, the oper privs as derived from port
811		*/
812	<	static const struct oper_privs
812	>	static const struct oper_flags
813		{
814		const unsigned int flag;
815		const unsigned char c;
816	<	} flag_list[] = {
816	>	} flag_table[] = {
817		{ OPER_FLAG_ADMIN,          'A' },
818	<	{ OPER_FLAG_REMOTEBAN,      'B' },
819	<	{ OPER_FLAG_DIE,            'D' },
820	<	{ OPER_FLAG_GLINE,          'G' },
821	<	{ OPER_FLAG_REHASH,         'H' },
818	>	{ OPER_FLAG_CLOSE,          'B' },
819	>	{ OPER_FLAG_CONNECT,        'C' },
820	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
821	>	{ OPER_FLAG_DIE,            'E' },
822	>	{ OPER_FLAG_DLINE,          'F' },
823	>	{ OPER_FLAG_GLOBOPS,        'G' },
824	>	{ OPER_FLAG_JOIN_RESV,      'H' },
825	>	{ OPER_FLAG_KILL,           'I' },
826	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
827		{ OPER_FLAG_KLINE,          'K' },
828	<	{ OPER_FLAG_KILL,           'N' },
829	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
830	<	{ OPER_FLAG_CONNECT,        'P' },
831	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
832	<	{ OPER_FLAG_SQUIT,          'R' },
833	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
834	<	{ OPER_FLAG_UNKLINE,        'U' },
835	<	{ OPER_FLAG_XLINE,          'X' },
828	>	{ OPER_FLAG_LOCOPS,         'L' },
829	>	{ OPER_FLAG_MODULE,         'M' },
830	>	{ OPER_FLAG_NICK_RESV,      'N' },
831	>	{ OPER_FLAG_OPME,           'O' },
832	>	{ OPER_FLAG_REHASH,         'P' },
833	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
834	>	{ OPER_FLAG_RESTART,        'R' },
835	>	{ OPER_FLAG_RESV,           'S' },
836	>	{ OPER_FLAG_SET,            'T' },
837	>	{ OPER_FLAG_SQUIT,          'U' },
838	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
839	>	{ OPER_FLAG_UNDLINE,        'W' },
840	>	{ OPER_FLAG_UNKLINE,        'X' },
841	>	{ OPER_FLAG_UNRESV,         'Y' },
842	>	{ OPER_FLAG_UNXLINE,        'Z' },
843	>	{ OPER_FLAG_WALLOPS,        'a' },
844	>	{ OPER_FLAG_XLINE,          'b' },
845		{ 0, '\0' }
846		};
847
848	<	char *
849	<	oper_privs_as_string(const unsigned int port)
848	>	const char *
849	>	oper_privs_as_string(const unsigned int flags)
850		{
851	<	static char privs_out[IRCD_BUFSIZE];
852	<	char *privs_ptr = privs_out;
851	>	static char buf[sizeof(flag_table) / sizeof(flag_table[0])];
852	>	char *p = buf;
853
854	<	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
855	<	{
856	<	if (port & opriv->flag)
1104	<	*privs_ptr++ = opriv->c;
1105	<	else
1106	<	*privs_ptr++ = ToLower(opriv->c);
1107	<	}
854	>	for (const struct oper_flags *tab = flag_table; tab->flag; ++tab)
855	>	if (flags & tab->flag)
856	>	*p++ = tab->c;
857
858	<	*privs_ptr = '\0';
858	>	if (p == buf)
859	>	*p++ = '0';
860
861	<	return privs_out;
861	>	*p = '\0';
862	>
863	>	return buf;
864		}
865
866		/*
#	Line 1120 | Line 872 | oper_privs_as_string(const unsigned int
872		const char *
873		get_oper_name(const struct Client *client_p)
874		{
875	<	/* +5 for !,@,{,} and null */
1124	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
875	>	static char buffer[IRCD_BUFSIZE];
876
877		if (IsServer(client_p))
878		return client_p->name;
#	Line 1165 | Line 916 | clear_out_old_conf(void)
916		{
917		dlink_node *node = NULL, *node_next = NULL;
918		dlink_list *free_items [] = {
919	<	&server_items,   &oconf_items,
1169	<	&uconf_items,   &xconf_items,
1170	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
919	>	&connect_items, &operator_items, NULL
920		};
921
922		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 1185 | Line 934 | clear_out_old_conf(void)
934		conf->active = 0;
935		dlinkDelete(&conf->node, *iterator);
936
937	<	/* XXX This is less than pretty */
1189	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1190	<	{
1191	<	if (!conf->ref_count)
1192	<	conf_free(conf);
1193	<	}
1194	<	else if (conf->type == CONF_XLINE)
1195	<	{
1196	<	if (!conf->until)
1197	<	conf_free(conf);
1198	<	}
1199	<	else
937	>	if (!conf->ref_count)
938		conf_free(conf);
939		}
940		}
941
1204	–	motd_clear();
1205	–
942		/*
943	<	* don't delete the class table, rather mark all entries
944	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
943	>	* Don't delete the class table, rather mark all entries for deletion.
944	>	* The table is cleaned up by class_delete_marked. - avalon
945		*/
946		class_mark_for_deletion();
947
948		clear_out_address_conf();
949
950	<	/* clean out module paths */
951	<	mod_clear_paths();
950	>	modules_conf_clear();  /* Clear modules {} items */
951	>
952	>	motd_clear();  /* Clear motd {} items and re-cache default motd */
953	>
954	>	cluster_clear();  /* Clear cluster {} items */
955	>
956	>	gecos_clear();  /* Clear gecos {} items */
957	>
958	>	resv_clear();  /* Clear resv {} items */
959	>
960	>	service_clear();  /* Clear service {} items */
961	>
962	>	shared_clear();  /* Clear shared {} items */
963
964	<	pseudo_clear();
964	>	pseudo_clear();  /* Clear pseudo {} items */
965
966	<	/* clean out ConfigServerInfo */
967	<	MyFree(ConfigServerInfo.description);
966	>	/* Clean out ConfigServerInfo */
967	>	xfree(ConfigServerInfo.description);
968		ConfigServerInfo.description = NULL;
969	<	MyFree(ConfigServerInfo.network_name);
969	>	xfree(ConfigServerInfo.network_name);
970		ConfigServerInfo.network_name = NULL;
971	<	MyFree(ConfigServerInfo.network_desc);
971	>	xfree(ConfigServerInfo.network_desc);
972		ConfigServerInfo.network_desc = NULL;
973	<	#ifdef HAVE_LIBCRYPTO
1227	<	if (ConfigServerInfo.rsa_private_key)
1228	<	{
1229	<	RSA_free(ConfigServerInfo.rsa_private_key);
1230	<	ConfigServerInfo.rsa_private_key = NULL;
1231	<	}
1232	<
1233	<	MyFree(ConfigServerInfo.rsa_private_key_file);
973	>	xfree(ConfigServerInfo.rsa_private_key_file);
974		ConfigServerInfo.rsa_private_key_file = NULL;
975	<	#endif
975	>	xfree(ConfigServerInfo.ssl_certificate_file);
976	>	ConfigServerInfo.ssl_certificate_file = NULL;
977	>	xfree(ConfigServerInfo.ssl_dh_param_file);
978	>	ConfigServerInfo.ssl_dh_param_file = NULL;
979	>	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
980	>	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
981	>	xfree(ConfigServerInfo.ssl_cipher_list);
982	>	ConfigServerInfo.ssl_cipher_list = NULL;
983	>	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
984	>	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
985
986	<	/* clean out ConfigAdminInfo */
987	<	MyFree(ConfigAdminInfo.name);
986	>	/* Clean out ConfigAdminInfo */
987	>	xfree(ConfigAdminInfo.name);
988		ConfigAdminInfo.name = NULL;
989	<	MyFree(ConfigAdminInfo.email);
989	>	xfree(ConfigAdminInfo.email);
990		ConfigAdminInfo.email = NULL;
991	<	MyFree(ConfigAdminInfo.description);
991	>	xfree(ConfigAdminInfo.description);
992		ConfigAdminInfo.description = NULL;
993
994	<	/* clean out listeners */
995	<	close_listeners();
994	>	/* Clean out ConfigServerHide */
995	>	xfree(ConfigServerHide.flatten_links_file);
996	>	ConfigServerHide.flatten_links_file = NULL;
997	>	xfree(ConfigServerHide.hidden_name);
998	>	ConfigServerHide.hidden_name = NULL;
999	>
1000	>	/* Clean out listeners */
1001	>	listener_close_marked();
1002	>	}
1003	>
1004	>	static void
1005	>	conf_handle_tls(int cold)
1006	>	{
1007	>	if (!tls_new_cred())
1008	>	{
1009	>	if (cold)
1010	>	{
1011	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1012	>	exit(EXIT_FAILURE);
1013	>	}
1014	>	else
1015	>	{
1016	>	/* Failed to load new settings/certs, old ones remain active */
1017	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1018	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1019	>	}
1020	>	}
1021		}
1022
1023		/* read_conf_files()
#	Line 1276 | Line 1050 | read_conf_files(int cold)
1050		{
1051		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1052		filename, strerror(errno));
1053	<	exit(-1);
1053	>	exit(EXIT_FAILURE);
1054		}
1055		else
1056		{
1057	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1057	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1058		"Unable to read configuration file '%s': %s",
1059		filename, strerror(errno));
1060		return;
#	Line 1293 | Line 1067 | read_conf_files(int cold)
1067		read_conf(conf_parser_ctx.conf_file);
1068		fclose(conf_parser_ctx.conf_file);
1069
1070	<	log_reopen_all();
1070	>	log_iterate(log_reopen);
1071	>	conf_handle_tls(cold);
1072
1073	<	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1074	<	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1073	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1074	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1075
1076	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1077	<	add_isupport("MAXLIST", chanmodes, -1);
1078	<	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1079	<	add_isupport("CHANTYPES", "#", -1);
1076	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1077	>	isupport_add("MAXLIST", chanmodes, -1);
1078	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1079	>	isupport_add("CHANTYPES", "#", -1);
1080
1081	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1081	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1082		ConfigChannel.max_channels);
1083	<	add_isupport("CHANLIMIT", chanlimit, -1);
1084	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1085	<	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1086	<	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1087	<	add_isupport("CHANMODES", chanmodes, -1);
1313	<
1314	<	/*
1315	<	* message_locale may have changed.  rebuild isupport since it relies
1316	<	* on strlen(form_str(RPL_ISUPPORT))
1317	<	*/
1318	<	rebuild_isupport_message_line();
1083	>	isupport_add("CHANLIMIT", chanlimit, -1);
1084	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstuCLMNORST");
1085	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1086	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1087	>	isupport_add("CHANMODES", chanmodes, -1);
1088		}
1089
1090		/* conf_add_class_to_conf()
#	Line 1325 | Line 1094 | read_conf_files(int cold)
1094		* side effects - Add a class pointer to a conf
1095		*/
1096		void
1097	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1097	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1098		{
1099	<	if (class_name == NULL)
1099	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1100		{
1101		conf->class = class_default;
1102
1103		if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1104	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1104	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1105		"Warning *** Defaulting to default class for %s@%s",
1106		conf->user, conf->host);
1107		else
1108	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1108	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1109		"Warning *** Defaulting to default class for %s",
1110		conf->name);
1111		}
1343	–	else
1344	–	conf->class = class_find(class_name, 1);
1345	–
1346	–	if (conf->class == NULL)
1347	–	{
1348	–	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1349	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1350	–	"Warning *** Defaulting to default class for %s@%s",
1351	–	conf->user, conf->host);
1352	–	else
1353	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1354	–	"Warning *** Defaulting to default class for %s",
1355	–	conf->name);
1356	–	conf->class = class_default;
1357	–	}
1112		}
1113
1114		/* yyerror()
#	Line 1366 | Line 1120 | conf_add_class_to_conf(struct MaskItem *
1120		void
1121		yyerror(const char *msg)
1122		{
1369	–	char newlinebuf[IRCD_BUFSIZE];
1370	–
1123		if (conf_parser_ctx.pass != 1)
1124		return;
1125
1126	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1127	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1126	>	const char *p = stripws(linebuf);
1127	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1128		"\"%s\", line %u: %s: %s",
1129	<	conffilebuf, lineno + 1, msg, newlinebuf);
1129	>	conffilebuf, lineno, msg, p);
1130		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1131	<	conffilebuf, lineno + 1, msg, newlinebuf);
1131	>	conffilebuf, lineno, msg, p);
1132		}
1133
1134		void
1135		conf_error_report(const char *msg)
1136		{
1137	<	char newlinebuf[IRCD_BUFSIZE];
1138	<
1387	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1388	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1137	>	const char *p = stripws(linebuf);
1138	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1139		"\"%s\", line %u: %s: %s",
1140	<	conffilebuf, lineno + 1, msg, newlinebuf);
1140	>	conffilebuf, lineno, msg, p);
1141		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1142	<	conffilebuf, lineno + 1, msg, newlinebuf);
1142	>	conffilebuf, lineno, msg, p);
1143		}
1144
1145		/*
#	Line 1402 | Line 1152 | conf_error_report(const char *msg)
1152		* side effects - none
1153		* Originally written by Dianora (Diane, db@db.net)
1154		*/
1155	<	time_t
1155	>	uintmax_t
1156		valid_tkline(const char *data, const int minutes)
1157		{
1158		const unsigned char *p = (const unsigned char *)data;
1159		unsigned char tmpch = '\0';
1160	<	time_t result = 0;
1160	>	uintmax_t result = 0;
1161
1162		while ((tmpch = *p++))
1163		{
#	Line 1420 | Line 1170 | valid_tkline(const char *data, const int
1170
1171		/*
1172		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1173	<	* i.e. they specifically use 0, I am going to return 1 instead
1174	<	* as a return value of non-zero is used to flag it as a temporary kline
1173	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1174	>	* value of non-zero is used to flag it as a temporary kline
1175		*/
1176		if (result == 0)
1177		result = 1;
#	Line 1430 | Line 1180 | valid_tkline(const char *data, const int
1180		* If the incoming time is in seconds convert it to minutes for the purpose
1181		* of this calculation
1182		*/
1183	<	if (!minutes)
1183	>	if (minutes == 0)
1184		result = result / 60;
1185
1186		if (result > MAX_TDKLINE_TIME)
1187		result = MAX_TDKLINE_TIME;
1188
1189	<	result = result * 60;  /* turn it into seconds */
1189	>	result = result * 60;  /* Turn it into seconds */
1190
1191		return result;
1192		}
#	Line 1452 | Line 1202 | valid_wild_card_simple(const char *data)
1202		{
1203		const unsigned char *p = (const unsigned char *)data;
1204		unsigned char tmpch = '\0';
1205	<	unsigned int nonwild = 0;
1205	>	unsigned int nonwild = 0, wild = 0;
1206
1207		while ((tmpch = *p++))
1208		{
#	Line 1467 | Line 1217 | valid_wild_card_simple(const char *data)
1217		if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1218		return 1;
1219		}
1220	+	else
1221	+	++wild;
1222		}
1223
1224	<	return 0;
1224	>	return !wild;
1225		}
1226
1227		/* valid_wild_card()
#	Line 1481 | Line 1233 | valid_wild_card_simple(const char *data)
1233		* side effects - NOTICE is given to source_p if warn is 1
1234		*/
1235		int
1236	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1236	>	valid_wild_card(int count, ...)
1237		{
1238		unsigned char tmpch = '\0';
1239		unsigned int nonwild = 0;
#	Line 1524 | Line 1276 | valid_wild_card(struct Client *source_p,
1276		}
1277		}
1278
1527	–	if (warn)
1528	–	sendto_one_notice(source_p, &me,
1529	–	":Please include at least %u non-wildcard characters with the mask",
1530	–	ConfigGeneral.min_nonwildcard);
1279		va_end(args);
1280		return 0;
1281		}
#	Line 1543 | Line 1291 | valid_wild_card(struct Client *source_p,
1291		*/
1292		static int
1293		find_user_host(struct Client *source_p, char *user_host_or_nick,
1294	<	char *luser, char *lhost, unsigned int flags)
1294	>	char *luser, char *lhost)
1295		{
1296		struct Client *target_p = NULL;
1297		char *hostp = NULL;
#	Line 1588 | Line 1336 | find_user_host(struct Client *source_p,
1336		find_chasing(source_p, user_host_or_nick)) == NULL)
1337		return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1338
1339	<	if (IsExemptKline(target_p))
1339	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1340		{
1341		if (IsClient(source_p))
1342		sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
#	Line 1596 | Line 1344 | find_user_host(struct Client *source_p,
1344		}
1345
1346		/*
1347	<	* turn the "user" bit into "*user", blow away '~'
1347	>	* Turn the "user" bit into "*user", blow away '~'
1348		* if found in original user name (non-idented)
1349		*/
1350		strlcpy(luser, target_p->username, USERLEN*4 + 1);
#	Line 1604 | Line 1352 | find_user_host(struct Client *source_p,
1352		if (target_p->username[0] == '~')
1353		luser[0] = '*';
1354
1355	<	if (!strcmp(target_p->sockhost, "0"))
1608	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1609	<	else
1610	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1355	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1356		return 1;
1357		}
1358
#	Line 1628 | Line 1373 | find_user_host(struct Client *source_p,
1373		*              - pointer to target_server to parse into if non NULL
1374		*              - pointer to reason to parse into
1375		*
1376	<	* output       - 1 if valid, -1 if not valid
1376	>	* output       - 1 if valid, 0 if not valid
1377		* side effects - A generalised k/d/x etc. line parser,
1378		*               "ALINE [time] user@host|string [ON] target :reason"
1379		*                will parse returning a parsed user, host if
#	Line 1647 | Line 1392 | find_user_host(struct Client *source_p,
1392		int
1393		parse_aline(const char *cmd, struct Client *source_p,
1394		int parc, char **parv,
1395	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1395	>	char **up_p, char **h_p, uintmax_t *tkline_time,
1396		char **target_server, char **reason)
1397		{
1398	<	int found_tkline_time=0;
1399	<	static char def_reason[] = CONF_NOREASON;
1398	>	uintmax_t found_tkline_time=0;
1399	>	static char default_reason[] = CONF_NOREASON;
1400		static char user[USERLEN*4+1];
1401		static char host[HOSTLEN*4+1];
1402
#	Line 1670 | Line 1415 | parse_aline(const char *cmd, struct Clie
1415		else
1416		{
1417		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1418	<	return -1;
1418	>	return 0;
1419		}
1420		}
1421
1422		if (parc == 0)
1423		{
1424		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1425	<	return -1;
1425	>	return 0;
1426		}
1427
1428		if (h_p == NULL)
1429		*up_p = *parv;
1430		else
1431		{
1432	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1433	<	return -1;
1432	>	if (find_user_host(source_p, *parv, user, host) == 0)
1433	>	return 0;
1434
1435		*up_p = user;
1436		*h_p = host;
#	Line 1701 | Line 1446 | parse_aline(const char *cmd, struct Clie
1446		parc--;
1447		parv++;
1448
1704	–	if (target_server == NULL)
1705	–	{
1706	–	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1707	–	return -1;
1708	–	}
1709	–
1449		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1450		{
1451		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1452	<	return -1;
1452	>	return 0;
1453		}
1454
1455		if (parc == 0 || EmptyString(*parv))
1456		{
1457		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1458	<	return -1;
1458	>	return 0;
1459		}
1460
1461		*target_server = *parv;
#	Line 1733 | Line 1472 | parse_aline(const char *cmd, struct Clie
1472		}
1473		}
1474
1736	–	if (h_p)
1737	–	{
1738	–	if (strchr(user, '!'))
1739	–	{
1740	–	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1741	–	return -1;
1742	–	}
1743	–
1744	–	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1745	–	return -1;
1746	–	}
1747	–	else
1748	–	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1749	–	return -1;
1750	–
1475		if (reason)
1476		{
1477		if (parc && !EmptyString(*parv))
1754	–	{
1478		*reason = *parv;
1756	–
1757	–	if (!valid_comment(source_p, *reason, 1))
1758	–	return -1;
1759	–	}
1479		else
1480	<	*reason = def_reason;
1480	>	*reason = default_reason;
1481		}
1482
1483		return 1;
1484		}
1485
1767	–	/* valid_comment()
1768	–	*
1769	–	* inputs       - pointer to client
1770	–	*              - pointer to comment
1771	–	* output       - 0 if no valid comment,
1772	–	*              - 1 if valid
1773	–	* side effects - truncates reason where necessary
1774	–	*/
1775	–	int
1776	–	valid_comment(struct Client *source_p, char *comment, int warn)
1777	–	{
1778	–	if (strlen(comment) > REASONLEN)
1779	–	comment[REASONLEN-1] = '\0';
1780	–
1781	–	return 1;
1782	–	}
1783	–
1486		/* match_conf_password()
1487		*
1488		* inputs       - pointer to given password
#	Line 1805 | Line 1507 | match_conf_password(const char *password
1507		}
1508
1509		/*
1808	–	* cluster_a_line
1809	–	*
1810	–	* inputs       - client sending the cluster
1811	–	*              - command name "KLINE" "XLINE" etc.
1812	–	*              - capab -- CAP_KLN etc. from server.h
1813	–	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1814	–	*              - pattern and args to send along
1815	–	* output       - none
1816	–	* side effects - Take source_p send the pattern with args given
1817	–	*                along to all servers that match capab and cluster type
1818	–	*/
1819	–	void
1820	–	cluster_a_line(struct Client *source_p, const char *command,
1821	–	int capab, int cluster_type, const char *pattern, ...)
1822	–	{
1823	–	va_list args;
1824	–	char buffer[IRCD_BUFSIZE] = "";
1825	–	const dlink_node *node = NULL;
1826	–
1827	–	va_start(args, pattern);
1828	–	vsnprintf(buffer, sizeof(buffer), pattern, args);
1829	–	va_end(args);
1830	–
1831	–	DLINK_FOREACH(node, cluster_items.head)
1832	–	{
1833	–	const struct MaskItem *conf = node->data;
1834	–
1835	–	if (conf->flags & cluster_type)
1836	–	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1837	–	"%s %s %s", command, conf->name, buffer);
1838	–	}
1839	–	}
1840	–
1841	–	/*
1510		* split_nuh
1511		*
1512		* inputs       - pointer to original mask (modified in place)
#	Line 1919 | Line 1587 | split_nuh(struct split_nuh_item *const i
1587		}
1588		else
1589		{
1590	<	/* no @ found */
1590	>	/* No @ found */
1591		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1592		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1593		else

Comparing ircd-hybrid/trunk/src/conf.c (property svn:keywords):
Revision 5025 by michael, Fri Dec 12 15:18:43 2014 UTC vs.
Revision 8593 by michael, Sun Oct 21 18:11:04 2018 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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