ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf_parser.y

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 7668 by michael, Wed Jul 20 17:09:49 2016 UTC vs.
Revision 9234 by michael, Fri Jan 31 17:38:34 2020 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 2000-2016 ircd-hybrid development team
4	>	*  Copyright (c) 2000-2020 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 31 | Line 31
31		#include "stdinc.h"
32		#include "ircd.h"
33		#include "list.h"
34	+	#include "parse.h"
35		#include "conf.h"
36		#include "conf_class.h"
37		#include "conf_cluster.h"
#	Line 90 | Line 91 | static struct
91		size,
92		type,
93		port,
94	+	timeout,
95		aftype,
96		ping_freq,
97	<	max_perip,
97	>	max_perip_local,
98	>	max_perip_global,
99		con_freq,
100		min_idle,
101		max_idle,
102		max_total,
100	–	max_global,
101	–	max_local,
103		max_sendq,
104		max_recvq,
105		max_channels,
#	Line 110 | Line 111 | static struct
111		static void
112		reset_block_state(void)
113		{
114	<	dlink_node *node = NULL, *node_next = NULL;
114	>	dlink_node *node, *node_next;
115	>	dlink_list *tab[] = { &block_state.mask.list,
116	>	&block_state.leaf.list, &block_state.hub.list, NULL };
117
118	<	DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
118	>	for (dlink_list **list = tab; *list; ++list)
119		{
120	<	xfree(node->data);
121	<	dlinkDelete(node, &block_state.mask.list);
122	<	free_dlink_node(node);
123	<	}
124	<
125	<	DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
123	<	{
124	<	xfree(node->data);
125	<	dlinkDelete(node, &block_state.leaf.list);
126	<	free_dlink_node(node);
127	<	}
128	<
129	<	DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
130	<	{
131	<	xfree(node->data);
132	<	dlinkDelete(node, &block_state.hub.list);
133	<	free_dlink_node(node);
120	>	DLINK_FOREACH_SAFE(node, node_next, (*list)->head)
121	>	{
122	>	xfree(node->data);
123	>	dlinkDelete(node, *list);
124	>	free_dlink_node(node);
125	>	}
126		}
127
128		memset(&block_state, 0, sizeof(block_state));
#	Line 155 | Line 147 | reset_block_state(void)
147		%token  CALLER_ID_WAIT
148		%token  CAN_FLOOD
149		%token  CHANNEL
158	–	%token  CHECK_CACHE
150		%token  CIDR_BITLEN_IPV4
151		%token  CIDR_BITLEN_IPV6
152		%token  CLASS
#	Line 164 | Line 155 | reset_block_state(void)
155		%token  CONNECTFREQ
156		%token  CYCLE_ON_HOST_CHANGE
157		%token  DEFAULT_FLOODCOUNT
158	+	%token  DEFAULT_FLOODTIME
159		%token  DEFAULT_JOIN_FLOOD_COUNT
160		%token  DEFAULT_JOIN_FLOOD_TIME
161		%token  DEFAULT_MAX_CLIENTS
#	Line 177 | Line 169 | reset_block_state(void)
169		%token  DLINE_MIN_CIDR6
170		%token  DOTS_IN_IDENT
171		%token  EMAIL
172	+	%token  ENABLE_EXTBANS
173		%token  ENCRYPTED
174		%token  EXCEED_LIMIT
175		%token  EXEMPT
176	+	%token  EXPIRATION
177		%token  FAILED_OPER_NOTICE
178		%token  FLATTEN_LINKS
179		%token  FLATTEN_LINKS_DELAY
#	Line 197 | Line 191 | reset_block_state(void)
191		%token  HOST
192		%token  HUB
193		%token  HUB_MASK
200	–	%token  IGNORE_BOGUS_TS
194		%token  INVISIBLE_ON_CONNECT
195		%token  INVITE_CLIENT_COUNT
196		%token  INVITE_CLIENT_TIME
197		%token  INVITE_DELAY_CHANNEL
198	+	%token  INVITE_EXPIRE_TIME
199		%token  IP
200		%token  IRCD_AUTH
201		%token  IRCD_FLAGS
#	Line 217 | Line 211 | reset_block_state(void)
211		%token  KNOCK_CLIENT_TIME
212		%token  KNOCK_DELAY_CHANNEL
213		%token  LEAF_MASK
220	–	%token  LIBGEOIP_DATABASE_OPTIONS
221	–	%token  LIBGEOIP_IPV4_DATABASE_FILE
222	–	%token  LIBGEOIP_IPV6_DATABASE_FILE
214		%token  LISTEN
215		%token  MASK
216		%token  MAX_ACCEPT
217		%token  MAX_BANS
218	+	%token  MAX_BANS_LARGE
219		%token  MAX_CHANNELS
228	–	%token  MAX_GLOBAL
220		%token  MAX_IDLE
221	<	%token  MAX_LOCAL
221	>	%token  MAX_INVITES
222		%token  MAX_NICK_CHANGES
223		%token  MAX_NICK_LENGTH
224		%token  MAX_NICK_TIME
#	Line 235 | Line 226 | reset_block_state(void)
226		%token  MAX_TARGETS
227		%token  MAX_TOPIC_LENGTH
228		%token  MAX_WATCH
238	–	%token  MEMORY_CACHE
229		%token  MIN_IDLE
230		%token  MIN_NONWILDCARD
231		%token  MIN_NONWILDCARD_SIMPLE
242	–	%token  MMAP_CACHE
232		%token  MODULE
233		%token  MODULES
234		%token  MOTD
#	Line 253 | Line 242 | reset_block_state(void)
242		%token  NO_TILDE
243		%token  NUMBER
244		%token  NUMBER_PER_CIDR
245	<	%token  NUMBER_PER_IP
245	>	%token  NUMBER_PER_IP_GLOBAL
246	>	%token  NUMBER_PER_IP_LOCAL
247		%token  OPER_ONLY_UMODES
248		%token  OPER_UMODES
249		%token  OPERATOR
#	Line 285 | Line 275 | reset_block_state(void)
275		%token  SPOOF
276		%token  SPOOF_NOTICE
277		%token  SQUIT
288	–	%token  SSL_CERTIFICATE_FILE
289	–	%token  SSL_CERTIFICATE_FINGERPRINT
290	–	%token  SSL_CONNECTION_REQUIRED
291	–	%token  SSL_DH_ELLIPTIC_CURVE
292	–	%token  SSL_DH_PARAM_FILE
293	–	%token  SSL_MESSAGE_DIGEST_ALGORITHM
294	–	%token  STANDARD
278		%token  STATS_E_DISABLED
279		%token  STATS_I_OPER_ONLY
280		%token  STATS_K_OPER_ONLY
#	Line 300 | Line 283 | reset_block_state(void)
283		%token  STATS_P_OPER_ONLY
284		%token  STATS_U_OPER_ONLY
285		%token  T_ALL
286	+	%token  T_BIND
287		%token  T_BOTS
288		%token  T_CALLERID
289		%token  T_CCONN
#	Line 335 | Line 319 | reset_block_state(void)
319		%token  T_SKILL
320		%token  T_SOFTCALLERID
321		%token  T_SPY
338	–	%token  T_SSL
339	–	%token  T_SSL_CIPHER_LIST
322		%token  T_TARGET
323	+	%token  T_TLS
324		%token  T_UMODES
325		%token  T_UNAUTH
326		%token  T_UNDLINE
#	Line 350 | Line 333 | reset_block_state(void)
333		%token  TBOOL
334		%token  THROTTLE_COUNT
335		%token  THROTTLE_TIME
336	<	%token  TKLINE_EXPIRE_NOTICES
336	>	%token  TIMEOUT
337	>	%token  TLS_CERTIFICATE_FILE
338	>	%token  TLS_CERTIFICATE_FINGERPRINT
339	>	%token  TLS_CIPHER_LIST
340	>	%token  TLS_CIPHER_SUITES
341	>	%token  TLS_CONNECTION_REQUIRED
342	>	%token  TLS_DH_PARAM_FILE
343	>	%token  TLS_MESSAGE_DIGEST_ALGORITHM
344	>	%token  TLS_SUPPORTED_GROUPS
345		%token  TMASKED
346		%token  TS_MAX_DELTA
347		%token  TS_WARN_DELTA
#	Line 447 | Line 438 | modules_path: PATH '=' QSTRING ';'
438
439
440		/***************************************************************************
441	<	* serverinfo {}  section
441	>	* serverinfo {} section
442		***************************************************************************/
443		serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
444
445		serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
446		serverinfo_item:        serverinfo_name |
456	–	serverinfo_vhost |
447		serverinfo_hub |
448		serverinfo_description |
449		serverinfo_network_name |
#	Line 461 | Line 451 | serverinfo_item:        serverinfo_name
451		serverinfo_default_max_clients |
452		serverinfo_max_nick_length |
453		serverinfo_max_topic_length |
454	<	serverinfo_ssl_dh_param_file |
455	<	serverinfo_ssl_dh_elliptic_curve |
454	>	serverinfo_tls_dh_param_file |
455	>	serverinfo_tls_supported_groups |
456		serverinfo_rsa_private_key_file |
467	–	serverinfo_vhost6 |
457		serverinfo_sid |
458	<	serverinfo_ssl_certificate_file |
459	<	serverinfo_ssl_cipher_list |
460	<	serverinfo_ssl_message_digest_algorithm |
461	<	serverinfo_libgeoip_database_options |
473	<	serverinfo_libgeoip_ipv4_database_file |
474	<	serverinfo_libgeoip_ipv6_database_file |
458	>	serverinfo_tls_certificate_file |
459	>	serverinfo_tls_cipher_list |
460	>	serverinfo_tls_cipher_suites |
461	>	serverinfo_tls_message_digest_algorithm |
462		error ';' ;
463
464
465	<	serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
465	>	serverinfo_tls_certificate_file: TLS_CERTIFICATE_FILE '=' QSTRING ';'
466		{
467		if (conf_parser_ctx.pass == 2)
468		{
469	<	xfree(ConfigServerInfo.ssl_certificate_file);
470	<	ConfigServerInfo.ssl_certificate_file = xstrdup(yylval.string);
469	>	xfree(ConfigServerInfo.tls_certificate_file);
470	>	ConfigServerInfo.tls_certificate_file = xstrdup(yylval.string);
471		}
472		};
473
#	Line 493 | Line 480 | serverinfo_rsa_private_key_file: RSA_PRI
480		}
481		};
482
483	<	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
483	>	serverinfo_tls_dh_param_file: TLS_DH_PARAM_FILE '=' QSTRING ';'
484		{
485		if (conf_parser_ctx.pass == 2)
486		{
487	<	xfree(ConfigServerInfo.ssl_dh_param_file);
488	<	ConfigServerInfo.ssl_dh_param_file = xstrdup(yylval.string);
487	>	xfree(ConfigServerInfo.tls_dh_param_file);
488	>	ConfigServerInfo.tls_dh_param_file = xstrdup(yylval.string);
489		}
490		};
491
492	<	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
492	>	serverinfo_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
493		{
494		if (conf_parser_ctx.pass == 2)
495		{
496	<	xfree(ConfigServerInfo.ssl_cipher_list);
497	<	ConfigServerInfo.ssl_cipher_list = xstrdup(yylval.string);
496	>	xfree(ConfigServerInfo.tls_cipher_list);
497	>	ConfigServerInfo.tls_cipher_list = xstrdup(yylval.string);
498		}
499		};
500
501	<	serverinfo_ssl_message_digest_algorithm: SSL_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
515	<	{
516	<	if (conf_parser_ctx.pass == 2)
517	<	{
518	<	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
519	<	ConfigServerInfo.ssl_message_digest_algorithm = xstrdup(yylval.string);
520	<	}
521	<	}
522	<
523	<	serverinfo_ssl_dh_elliptic_curve: SSL_DH_ELLIPTIC_CURVE '=' QSTRING ';'
501	>	serverinfo_tls_cipher_suites: TLS_CIPHER_SUITES '=' QSTRING ';'
502		{
503		if (conf_parser_ctx.pass == 2)
504		{
505	<	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
506	<	ConfigServerInfo.ssl_dh_elliptic_curve = xstrdup(yylval.string);
505	>	xfree(ConfigServerInfo.tls_cipher_suites);
506	>	ConfigServerInfo.tls_cipher_suites = xstrdup(yylval.string);
507		}
508		};
509
510	<	serverinfo_libgeoip_database_options: LIBGEOIP_DATABASE_OPTIONS
533	<	{
534	<	if (conf_parser_ctx.pass == 1)
535	<	ConfigServerInfo.libgeoip_database_options = 0;
536	<	} '='  options_items ';';
537	<
538	<	options_items: options_items ',' options_item | options_item;
539	<	options_item: STANDARD
540	<	{
541	<	#ifdef HAVE_LIBGEOIP
542	<	if (conf_parser_ctx.pass == 1)
543	<	ConfigServerInfo.libgeoip_database_options |= GEOIP_STANDARD;
544	<	#endif
545	<	} | MEMORY_CACHE
546	<	{
547	<	#ifdef HAVE_LIBGEOIP
548	<	if (conf_parser_ctx.pass == 1)
549	<	ConfigServerInfo.libgeoip_database_options |= GEOIP_MEMORY_CACHE;
550	<	#endif
551	<	} | MMAP_CACHE
552	<	{
553	<	#ifdef HAVE_LIBGEOIP
554	<	if (conf_parser_ctx.pass == 1)
555	<	ConfigServerInfo.libgeoip_database_options |= GEOIP_MMAP_CACHE;
556	<	#endif
557	<	} | CHECK_CACHE
558	<	{
559	<	#ifdef HAVE_LIBGEOIP
560	<	if (conf_parser_ctx.pass == 1)
561	<	ConfigServerInfo.libgeoip_database_options |= GEOIP_CHECK_CACHE;
562	<	#endif
563	<	};
564	<
565	<	serverinfo_libgeoip_ipv4_database_file:  LIBGEOIP_IPV4_DATABASE_FILE '=' QSTRING ';'
510	>	serverinfo_tls_message_digest_algorithm: TLS_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
511		{
512		if (conf_parser_ctx.pass == 2)
513		{
514	<	xfree(ConfigServerInfo.libgeoip_ipv4_database_file);
515	<	ConfigServerInfo.libgeoip_ipv4_database_file = xstrdup(yylval.string);
571	<
572	<	#ifdef HAVE_LIBGEOIP
573	<	if (GeoIPv4_ctx)
574	<	GeoIP_delete(GeoIPv4_ctx);
575	<	GeoIPv4_ctx = GeoIP_open(yylval.string, ConfigServerInfo.libgeoip_database_options);
576	<	#endif
514	>	xfree(ConfigServerInfo.tls_message_digest_algorithm);
515	>	ConfigServerInfo.tls_message_digest_algorithm = xstrdup(yylval.string);
516		}
517	<	};
517	>	}
518
519	<	serverinfo_libgeoip_ipv6_database_file:  LIBGEOIP_IPV6_DATABASE_FILE '=' QSTRING ';'
519	>	serverinfo_tls_supported_groups: TLS_SUPPORTED_GROUPS '=' QSTRING ';'
520		{
521		if (conf_parser_ctx.pass == 2)
522		{
523	<	xfree(ConfigServerInfo.libgeoip_ipv6_database_file);
524	<	ConfigServerInfo.libgeoip_ipv6_database_file = xstrdup(yylval.string);
586	<
587	<	#ifdef HAVE_LIBGEOIP
588	<	if (GeoIPv6_ctx)
589	<	GeoIP_delete(GeoIPv6_ctx);
590	<	GeoIPv6_ctx = GeoIP_open(yylval.string, ConfigServerInfo.libgeoip_database_options);
591	<	#endif
523	>	xfree(ConfigServerInfo.tls_supported_groups);
524	>	ConfigServerInfo.tls_supported_groups = xstrdup(yylval.string);
525		}
526		};
527
528		serverinfo_name: NAME '=' QSTRING ';'
529		{
530		/* This isn't rehashable */
531	<	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
531	>	if (conf_parser_ctx.pass == 2 && ConfigServerInfo.name == NULL)
532		{
533	<	if (valid_servname(yylval.string))
533	>	if (server_valid_name(yylval.string) == true)
534		ConfigServerInfo.name = xstrdup(yylval.string);
535		else
536		{
#	Line 610 | Line 543 | serverinfo_name: NAME '=' QSTRING ';'
543		serverinfo_sid: IRCD_SID '=' QSTRING ';'
544		{
545		/* This isn't rehashable */
546	<	if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
546	>	if (conf_parser_ctx.pass == 2 && ConfigServerInfo.sid == NULL)
547		{
548		if (valid_sid(yylval.string))
549		ConfigServerInfo.sid = xstrdup(yylval.string);
#	Line 636 | Line 569 | serverinfo_network_name: NETWORK_NAME '=
569		{
570		if (conf_parser_ctx.pass == 2)
571		{
572	<	char *p;
572	>	char *p = strchr(yylval.string, ' ');
573
574	<	if ((p = strchr(yylval.string, ' ')))
574	>	if (p)
575		*p = '\0';
576
577		xfree(ConfigServerInfo.network_name);
#	Line 655 | Line 588 | serverinfo_network_desc: NETWORK_DESC '=
588		ConfigServerInfo.network_desc = xstrdup(yylval.string);
589		};
590
658	–	serverinfo_vhost: VHOST '=' QSTRING ';'
659	–	{
660	–	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
661	–	{
662	–	struct addrinfo hints, *res;
663	–
664	–	memset(&hints, 0, sizeof(hints));
665	–
666	–	hints.ai_family   = AF_UNSPEC;
667	–	hints.ai_socktype = SOCK_STREAM;
668	–	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
669	–
670	–	if (getaddrinfo(yylval.string, NULL, &hints, &res))
671	–	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
672	–	else
673	–	{
674	–	assert(res);
675	–
676	–	memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
677	–	ConfigServerInfo.ip.ss.ss_family = res->ai_family;
678	–	ConfigServerInfo.ip.ss_len = res->ai_addrlen;
679	–	freeaddrinfo(res);
680	–
681	–	ConfigServerInfo.specific_ipv4_vhost = 1;
682	–	}
683	–	}
684	–	};
685	–
686	–	serverinfo_vhost6: VHOST6 '=' QSTRING ';'
687	–	{
688	–	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
689	–	{
690	–	struct addrinfo hints, *res;
691	–
692	–	memset(&hints, 0, sizeof(hints));
693	–
694	–	hints.ai_family   = AF_UNSPEC;
695	–	hints.ai_socktype = SOCK_STREAM;
696	–	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
697	–
698	–	if (getaddrinfo(yylval.string, NULL, &hints, &res))
699	–	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
700	–	else
701	–	{
702	–	assert(res);
703	–
704	–	memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
705	–	ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
706	–	ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
707	–	freeaddrinfo(res);
708	–
709	–	ConfigServerInfo.specific_ipv6_vhost = 1;
710	–	}
711	–	}
712	–	};
713	–
591		serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
592		{
593		if (conf_parser_ctx.pass != 2)
594		break;
595
596	<	if ($3 < MAXCLIENTS_MIN)
596	>	if ($3 < 1)
597		{
598	<	char buf[IRCD_BUFSIZE] = "";
599	<
723	<	snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
724	<	conf_error_report(buf);
725	<	ConfigServerInfo.default_max_clients = MAXCLIENTS_MIN;
598	>	conf_error_report("default_max_clients too low, setting to 1");
599	>	ConfigServerInfo.default_max_clients = 1;
600		}
601		else if ($3 > MAXCLIENTS_MAX)
602		{
603	<	char buf[IRCD_BUFSIZE] = "";
603	>	char buf[IRCD_BUFSIZE];
604
605	<	snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
605	>	snprintf(buf, sizeof(buf), "default_max_clients too high, setting to %d", MAXCLIENTS_MAX);
606		conf_error_report(buf);
607	+
608		ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
609		}
610		else
#	Line 748 | Line 623 | serverinfo_max_nick_length: MAX_NICK_LEN
623		}
624		else if ($3 > NICKLEN)
625		{
626	<	char buf[IRCD_BUFSIZE] = "";
626	>	char buf[IRCD_BUFSIZE];
627
628		snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
629		conf_error_report(buf);
630	+
631		ConfigServerInfo.max_nick_length = NICKLEN;
632		}
633		else
#	Line 770 | Line 646 | serverinfo_max_topic_length: MAX_TOPIC_L
646		}
647		else if ($3 > TOPICLEN)
648		{
649	<	char buf[IRCD_BUFSIZE] = "";
649	>	char buf[IRCD_BUFSIZE];
650
651		snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
652		conf_error_report(buf);
653	+
654		ConfigServerInfo.max_topic_length = TOPICLEN;
655		}
656		else
#	Line 790 | Line 667 | serverinfo_hub: HUB '=' TBOOL ';'
667		/***************************************************************************
668		* admin {} section
669		***************************************************************************/
670	<	admin_entry: ADMIN  '{' admin_items '}' ';' ;
670	>	admin_entry: ADMIN '{' admin_items '}' ';' ;
671
672		admin_items: admin_items admin_item | admin_item;
673		admin_item:  admin_name |
#	Line 835 | Line 712 | motd_entry: MOTD
712		reset_block_state();
713		} '{' motd_items '}' ';'
714		{
715	<	dlink_node *node = NULL;
715	>	dlink_node *node;
716
717		if (conf_parser_ctx.pass != 2)
718		break;
#	Line 928 | Line 805 | pseudo_target: T_TARGET '=' QSTRING ';'
805		/***************************************************************************
806		* log {} section
807		***************************************************************************/
808	<	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
808	>	logging_entry:          T_LOG '{' logging_items '}' ';' ;
809		logging_items:          logging_items logging_item | logging_item ;
810
811		logging_item:           logging_use_logging | logging_file_entry |
#	Line 980 | Line 857 | logging_file_type: TYPE
857		{
858		if (conf_parser_ctx.pass == 2)
859		block_state.type.value = 0;
860	<	} '='  logging_file_type_items ';' ;
860	>	} '=' logging_file_type_items ';' ;
861
862		logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
863		logging_file_type_item:  USER
#	Line 1030 | Line 907 | oper_entry: OPERATOR
907		block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
908		} '{' oper_items '}' ';'
909		{
910	<	dlink_node *node = NULL;
910	>	dlink_node *node;
911
912		if (conf_parser_ctx.pass != 2)
913		break;
#	Line 1043 | Line 920 | oper_entry: OPERATOR
920
921		DLINK_FOREACH(node, block_state.mask.list.head)
922		{
1046	–	struct MaskItem *conf = NULL;
923		struct split_nuh_item nuh;
924		char *s = node->data;
925
#	Line 1054 | Line 930 | oper_entry: OPERATOR
930		nuh.nickptr  = NULL;
931		nuh.userptr  = block_state.user.buf;
932		nuh.hostptr  = block_state.host.buf;
933	+
934		nuh.nicksize = 0;
935		nuh.usersize = sizeof(block_state.user.buf);
936		nuh.hostsize = sizeof(block_state.host.buf);
937	+
938		split_nuh(&nuh);
939
940	<	conf         = conf_make(CONF_OPER);
941	<	conf->name   = xstrdup(block_state.name.buf);
942	<	conf->user   = xstrdup(block_state.user.buf);
943	<	conf->host   = xstrdup(block_state.host.buf);
940	>	struct MaskItem *conf = conf_make(CONF_OPER);
941	>	conf->addr = xcalloc(sizeof(*conf->addr));
942	>	conf->name = xstrdup(block_state.name.buf);
943	>	conf->user = xstrdup(block_state.user.buf);
944	>	conf->host = xstrdup(block_state.host.buf);
945
946		if (block_state.cert.buf[0])
947		conf->certfp = xstrdup(block_state.cert.buf);
#	Line 1076 | Line 955 | oper_entry: OPERATOR
955		conf->flags = block_state.flags.value;
956		conf->modes = block_state.modes.value;
957		conf->port  = block_state.port.value;
958	<	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
958	>	conf->htype = parse_netmask(conf->host, conf->addr, &conf->bits);
959
960		conf_add_class_to_conf(conf, block_state.class.buf);
961		}
#	Line 1090 | Line 969 | oper_item:      oper_name |
969		oper_umodes |
970		oper_class |
971		oper_encrypted |
972	<	oper_ssl_certificate_fingerprint |
973	<	oper_ssl_connection_required |
972	>	oper_tls_certificate_fingerprint |
973	>	oper_tls_connection_required |
974		oper_flags |
975		error ';' ;
976
#	Line 1130 | Line 1009 | oper_encrypted: ENCRYPTED '=' TBOOL ';'
1009		block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1010		};
1011
1012	<	oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1012	>	oper_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1013		{
1014		if (conf_parser_ctx.pass == 2)
1015		strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1016		};
1017
1018	<	oper_ssl_connection_required: SSL_CONNECTION_REQUIRED '=' TBOOL ';'
1018	>	oper_tls_connection_required: TLS_CONNECTION_REQUIRED '=' TBOOL ';'
1019		{
1020		if (conf_parser_ctx.pass != 2)
1021		break;
1022
1023		if (yylval.number)
1024	<	block_state.flags.value |= CONF_FLAGS_SSL;
1024	>	block_state.flags.value |= CONF_FLAGS_TLS;
1025		else
1026	<	block_state.flags.value &= ~CONF_FLAGS_SSL;
1026	>	block_state.flags.value &= ~CONF_FLAGS_TLS;
1027		};
1028
1029		oper_class: CLASS '=' QSTRING ';'
#	Line 1157 | Line 1036 | oper_umodes: T_UMODES
1036		{
1037		if (conf_parser_ctx.pass == 2)
1038		block_state.modes.value = 0;
1039	<	} '='  oper_umodes_items ';' ;
1039	>	} '=' oper_umodes_items ';' ;
1040
1041		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1042		oper_umodes_item:  T_BOTS
#	Line 1248 | Line 1127 | oper_umodes_item:  T_BOTS
1127		{
1128		if (conf_parser_ctx.pass == 2)
1129		block_state.modes.value |= UMODE_FARCONNECT;
1130	+	} | EXPIRATION
1131	+	{
1132	+	if (conf_parser_ctx.pass == 2)
1133	+	block_state.modes.value |= UMODE_EXPIRATION;
1134		};
1135
1136		oper_flags: IRCD_FLAGS
1137		{
1138		if (conf_parser_ctx.pass == 2)
1139		block_state.port.value = 0;
1140	<	} '='  oper_flags_items ';';
1140	>	} '=' oper_flags_items ';';
1141
1142		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1143		oper_flags_item: KILL ':' REMOTE
#	Line 1393 | Line 1276 | class_entry: CLASS
1276		block_state.max_recvq.value = DEFAULT_RECVQ;
1277		} '{' class_items '}' ';'
1278		{
1396	–	struct ClassItem *class = NULL;
1397	–
1279		if (conf_parser_ctx.pass != 1)
1280		break;
1281
1282		if (!block_state.class.buf[0])
1283		break;
1284
1285	<	if (!(class = class_find(block_state.class.buf, 0)))
1285	>	struct ClassItem *class = class_find(block_state.class.buf, false);
1286	>	if (class == NULL)
1287		class = class_make();
1288
1289	<	class->active = 1;
1289	>	class->active = true;
1290		xfree(class->name);
1291		class->name = xstrdup(block_state.class.buf);
1292		class->ping_freq = block_state.ping_freq.value;
1293	<	class->max_perip = block_state.max_perip.value;
1293	>	class->max_perip_local = block_state.max_perip_local.value;
1294	>	class->max_perip_global = block_state.max_perip_global.value;
1295		class->con_freq = block_state.con_freq.value;
1296		class->max_total = block_state.max_total.value;
1414	–	class->max_global = block_state.max_global.value;
1415	–	class->max_local = block_state.max_local.value;
1297		class->max_sendq = block_state.max_sendq.value;
1298		class->max_recvq = block_state.max_recvq.value;
1299		class->max_channels = block_state.max_channels.value;
#	Line 1428 | Line 1309 | class_entry: CLASS
1309		class->min_idle = block_state.min_idle.value;
1310		class->max_idle = block_state.max_idle.value;
1311
1312	<	rebuild_cidr_list(class);
1313	<
1312	>	bool diff = (class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value ||
1313	>	class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value);
1314		class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1315		class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1316		class->number_per_cidr = block_state.number_per_cidr.value;
1317	+
1318	+	if (diff)
1319	+	class_ip_limit_rebuild(class);
1320		};
1321
1322		class_items:    class_items class_item | class_item;
#	Line 1441 | Line 1325 | class_item:     class_name |
1325		class_cidr_bitlen_ipv6 |
1326		class_ping_time |
1327		class_number_per_cidr |
1328	<	class_number_per_ip |
1328	>	class_number_per_ip_local |
1329	>	class_number_per_ip_global |
1330		class_connectfreq |
1331		class_max_channels |
1332		class_max_number |
1448	–	class_max_global |
1449	–	class_max_local |
1333		class_sendq |
1334		class_recvq |
1335		class_min_idle |
#	Line 1466 | Line 1349 | class_ping_time: PING_TIME '=' timespec
1349		block_state.ping_freq.value = $3;
1350		};
1351
1352	<	class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1352	>	class_number_per_ip_local: NUMBER_PER_IP_LOCAL '=' NUMBER ';'
1353		{
1354		if (conf_parser_ctx.pass == 1)
1355	<	block_state.max_perip.value = $3;
1355	>	block_state.max_perip_local.value = $3;
1356	>	};
1357	>
1358	>	class_number_per_ip_global: NUMBER_PER_IP_GLOBAL '=' NUMBER ';'
1359	>	{
1360	>	if (conf_parser_ctx.pass == 1)
1361	>	block_state.max_perip_global.value = $3;
1362		};
1363
1364		class_connectfreq: CONNECTFREQ '=' timespec ';'
#	Line 1490 | Line 1379 | class_max_number: MAX_NUMBER '=' NUMBER
1379		block_state.max_total.value = $3;
1380		};
1381
1493	–	class_max_global: MAX_GLOBAL '=' NUMBER ';'
1494	–	{
1495	–	if (conf_parser_ctx.pass == 1)
1496	–	block_state.max_global.value = $3;
1497	–	};
1498	–
1499	–	class_max_local: MAX_LOCAL '=' NUMBER ';'
1500	–	{
1501	–	if (conf_parser_ctx.pass == 1)
1502	–	block_state.max_local.value = $3;
1503	–	};
1504	–
1382		class_sendq: SENDQ '=' sizespec ';'
1383		{
1384		if (conf_parser_ctx.pass == 1)
#	Line 1555 | Line 1432 | class_flags: IRCD_FLAGS
1432		{
1433		if (conf_parser_ctx.pass == 1)
1434		block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1435	<	} '='  class_flags_items ';';
1435	>	} '=' class_flags_items ';';
1436
1437		class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1438		class_flags_item: RANDOM_IDLE
#	Line 1581 | Line 1458 | listen_entry: LISTEN
1458		listen_flags: IRCD_FLAGS
1459		{
1460		block_state.flags.value = 0;
1461	<	} '='  listen_flags_items ';';
1461	>	} '=' listen_flags_items ';';
1462
1463		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1464	<	listen_flags_item: T_SSL
1464	>	listen_flags_item: T_TLS
1465		{
1466		if (conf_parser_ctx.pass == 2)
1467	<	block_state.flags.value |= LISTENER_SSL;
1467	>	block_state.flags.value |= LISTENER_TLS;
1468		} | HIDDEN
1469		{
1470		if (conf_parser_ctx.pass == 2)
#	Line 1610 | Line 1487 | port_item: NUMBER
1487		if (conf_parser_ctx.pass == 2)
1488		{
1489		#ifndef HAVE_TLS
1490	<	if (block_state.flags.value & LISTENER_SSL)
1490	>	if (block_state.flags.value & LISTENER_TLS)
1491		{
1492		conf_error_report("TLS not available - port closed");
1493		break;
#	Line 1623 | Line 1500 | port_item: NUMBER
1500		if (conf_parser_ctx.pass == 2)
1501		{
1502		#ifndef HAVE_TLS
1503	<	if (block_state.flags.value & LISTENER_SSL)
1503	>	if (block_state.flags.value & LISTENER_TLS)
1504		{
1505		conf_error_report("TLS not available - port closed");
1506		break;
#	Line 1657 | Line 1534 | auth_entry: IRCD_AUTH
1534		reset_block_state();
1535		} '{' auth_items '}' ';'
1536		{
1537	<	dlink_node *node = NULL;
1537	>	dlink_node *node;
1538
1539		if (conf_parser_ctx.pass != 2)
1540		break;
1541
1542		DLINK_FOREACH(node, block_state.mask.list.head)
1543		{
1667	–	struct MaskItem *conf = NULL;
1544		struct split_nuh_item nuh;
1545		char *s = node->data;
1546
#	Line 1675 | Line 1551 | auth_entry: IRCD_AUTH
1551		nuh.nickptr  = NULL;
1552		nuh.userptr  = block_state.user.buf;
1553		nuh.hostptr  = block_state.host.buf;
1554	+
1555		nuh.nicksize = 0;
1556		nuh.usersize = sizeof(block_state.user.buf);
1557		nuh.hostsize = sizeof(block_state.host.buf);
1558	+
1559		split_nuh(&nuh);
1560
1561	<	conf        = conf_make(CONF_CLIENT);
1562	<	conf->user  = xstrdup(block_state.user.buf);
1563	<	conf->host  = xstrdup(block_state.host.buf);
1561	>	struct MaskItem *conf = conf_make(CONF_CLIENT);
1562	>	conf->user = xstrdup(block_state.user.buf);
1563	>	conf->host = xstrdup(block_state.host.buf);
1564
1565		if (block_state.rpass.buf[0])
1566		conf->passwd = xstrdup(block_state.rpass.buf);
#	Line 1690 | Line 1568 | auth_entry: IRCD_AUTH
1568		conf->name = xstrdup(block_state.name.buf);
1569
1570		conf->flags = block_state.flags.value;
1571	<	conf->port  = block_state.port.value;
1571	>	conf->port = block_state.port.value;
1572
1573		conf_add_class_to_conf(conf, block_state.class.buf);
1574		add_conf_by_address(CONF_CLIENT, conf);
#	Line 1741 | Line 1619 | auth_flags: IRCD_FLAGS
1619		{
1620		if (conf_parser_ctx.pass == 2)
1621		block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1622	<	} '='  auth_flags_items ';';
1622	>	} '=' auth_flags_items ';';
1623
1624		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1625		auth_flags_item: SPOOF_NOTICE
#	Line 1872 | Line 1750 | service_name: NAME '=' QSTRING ';'
1750		if (conf_parser_ctx.pass != 2)
1751		break;
1752
1753	<	if (valid_servname(yylval.string))
1753	>	if (server_valid_name(yylval.string) == true)
1754		{
1755		struct ServiceItem *service = service_make();
1756		service->name = xstrdup(yylval.string);
#	Line 2077 | Line 1955 | connect_entry: CONNECT
1955		reset_block_state();
1956		block_state.aftype.value = AF_INET;
1957		block_state.port.value = PORTNUM;
1958	+	block_state.timeout.value = CONNECTTIMEOUT;
1959		} '{' connect_items '}' ';'
1960		{
2082	–	struct MaskItem *conf = NULL;
1961		struct addrinfo hints, *res;
1962
1963		if (conf_parser_ctx.pass != 2)
#	Line 2093 | Line 1971 | connect_entry: CONNECT
1971		!block_state.spass.buf[0])
1972		break;
1973
1974	+	if (server_valid_name(block_state.name.buf) == false)
1975	+	break;
1976	+
1977		if (has_wildcards(block_state.name.buf) ||
1978		has_wildcards(block_state.host.buf))
1979		break;
1980
1981	<	conf = conf_make(CONF_SERVER);
1981	>	struct MaskItem *conf = conf_make(CONF_SERVER);
1982	>	conf->addr = xcalloc(sizeof(*conf->addr));
1983		conf->port = block_state.port.value;
1984	+	conf->timeout = block_state.timeout.value;
1985		conf->flags = block_state.flags.value;
1986		conf->aftype = block_state.aftype.value;
1987		conf->host = xstrdup(block_state.host.buf);
#	Line 2124 | Line 2007 | connect_entry: CONNECT
2007		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2008
2009		if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2010	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2010	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server bind(%s)", block_state.bind.buf);
2011		else
2012		{
2013		assert(res);
2014
2015	<	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2016	<	conf->bind.ss.ss_family = res->ai_family;
2017	<	conf->bind.ss_len = res->ai_addrlen;
2015	>	conf->bind = xcalloc(sizeof(*conf->bind));
2016	>
2017	>	memcpy(conf->bind, res->ai_addr, res->ai_addrlen);
2018	>	conf->bind->ss_len = res->ai_addrlen;
2019		freeaddrinfo(res);
2020		}
2021		}
2022
2023		conf_add_class_to_conf(conf, block_state.class.buf);
2024	<	lookup_confhost(conf);
2024	>	conf_dns_lookup(conf);
2025		};
2026
2027		connect_items:  connect_items connect_item | connect_item;
2028		connect_item:   connect_name |
2029		connect_host |
2030	<	connect_vhost |
2030	>	connect_timeout |
2031	>	connect_bind |
2032		connect_send_password |
2033		connect_accept_password |
2034	<	connect_ssl_certificate_fingerprint |
2034	>	connect_tls_certificate_fingerprint |
2035		connect_aftype |
2036		connect_port |
2037	<	connect_ssl_cipher_list |
2037	>	connect_tls_cipher_list |
2038		connect_flags |
2039		connect_hub_mask |
2040		connect_leaf_mask |
#	Line 2169 | Line 2054 | connect_host: HOST '=' QSTRING ';'
2054		strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2055		};
2056
2057	<	connect_vhost: VHOST '=' QSTRING ';'
2057	>	connect_timeout: TIMEOUT '=' timespec ';'
2058	>	{
2059	>	if (conf_parser_ctx.pass == 2)
2060	>	block_state.timeout.value = $3;
2061	>	};
2062	>
2063	>	connect_bind: T_BIND '=' QSTRING ';'
2064		{
2065		if (conf_parser_ctx.pass == 2)
2066		strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
#	Line 2180 | Line 2071 | connect_send_password: SEND_PASSWORD '='
2071		if (conf_parser_ctx.pass != 2)
2072		break;
2073
2074	<	if ($3[0] == ':')
2074	>	if (*yylval.string == ':')
2075		conf_error_report("Server passwords cannot begin with a colon");
2076	<	else if (strchr($3, ' '))
2076	>	else if (strchr(yylval.string, ' '))
2077		conf_error_report("Server passwords cannot contain spaces");
2078		else
2079		strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
#	Line 2193 | Line 2084 | connect_accept_password: ACCEPT_PASSWORD
2084		if (conf_parser_ctx.pass != 2)
2085		break;
2086
2087	<	if ($3[0] == ':')
2087	>	if (*yylval.string == ':')
2088		conf_error_report("Server passwords cannot begin with a colon");
2089	<	else if (strchr($3, ' '))
2089	>	else if (strchr(yylval.string, ' '))
2090		conf_error_report("Server passwords cannot contain spaces");
2091		else
2092		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2093		};
2094
2095	<	connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2095	>	connect_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2096		{
2097		if (conf_parser_ctx.pass == 2)
2098		strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
#	Line 2226 | Line 2117 | connect_aftype: AFTYPE '=' T_IPV4 ';'
2117		connect_flags: IRCD_FLAGS
2118		{
2119		block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2120	<	} '='  connect_flags_items ';';
2120	>	} '=' connect_flags_items ';';
2121
2122		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2123		connect_flags_item: AUTOCONN
2124		{
2125		if (conf_parser_ctx.pass == 2)
2126		block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2127	<	} | T_SSL
2127	>	} | T_TLS
2128		{
2129		if (conf_parser_ctx.pass == 2)
2130	<	block_state.flags.value |= CONF_FLAGS_SSL;
2130	>	block_state.flags.value |= CONF_FLAGS_TLS;
2131		};
2132
2133		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2268 | Line 2159 | connect_class: CLASS '=' QSTRING ';'
2159		strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2160		};
2161
2162	<	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2162	>	connect_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
2163		{
2164		#ifdef HAVE_TLS
2165		if (conf_parser_ctx.pass == 2)
2166		strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2167		#else
2168		if (conf_parser_ctx.pass == 2)
2169	<	conf_error_report("Ignoring connect::ciphers -- no TLS support");
2169	>	conf_error_report("Ignoring connect::tls_cipher_list -- no TLS support");
2170		#endif
2171		};
2172
#	Line 2289 | Line 2180 | kill_entry: KILL
2180		reset_block_state();
2181		} '{' kill_items '}' ';'
2182		{
2292	–	struct MaskItem *conf = NULL;
2293	–
2183		if (conf_parser_ctx.pass != 2)
2184		break;
2185
#	Line 2298 | Line 2187 | kill_entry: KILL
2187		!block_state.host.buf[0])
2188		break;
2189
2190	<	conf = conf_make(CONF_KLINE);
2190	>	struct MaskItem *conf = conf_make(CONF_KLINE);
2191		conf->user = xstrdup(block_state.user.buf);
2192		conf->host = xstrdup(block_state.host.buf);
2193
#	Line 2348 | Line 2237 | deny_entry: DENY
2237		reset_block_state();
2238		} '{' deny_items '}' ';'
2239		{
2351	–	struct MaskItem *conf = NULL;
2352	–
2240		if (conf_parser_ctx.pass != 2)
2241		break;
2242
#	Line 2358 | Line 2245 | deny_entry: DENY
2245
2246		if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2247		{
2248	<	conf = conf_make(CONF_DLINE);
2248	>	struct MaskItem *conf = conf_make(CONF_DLINE);
2249		conf->host = xstrdup(block_state.addr.buf);
2250
2251		if (block_state.rpass.buf[0])
#	Line 2455 | Line 2342 | general_entry: GENERAL '{' general_items
2342		general_items:      general_items general_item | general_item;
2343		general_item:       general_away_count |
2344		general_away_time |
2458	–	general_ignore_bogus_ts |
2345		general_failed_oper_notice |
2346		general_anti_nick_flood |
2347		general_max_nick_time |
#	Line 2485 | Line 2371 | general_item:       general_away_count |
2371		general_caller_id_wait |
2372		general_opers_bypass_callerid |
2373		general_default_floodcount |
2374	+	general_default_floodtime |
2375		general_min_nonwildcard |
2376		general_min_nonwildcard_simple |
2377		general_throttle_count |
2378		general_throttle_time |
2379		general_ping_cookie |
2380		general_disable_auth |
2494	–	general_tkline_expire_notices |
2381		general_dline_min_cidr |
2382		general_dline_min_cidr6 |
2383		general_kline_min_cidr |
#	Line 2524 | Line 2410 | general_whowas_history_length: WHOWAS_HI
2410
2411		general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2412		{
2413	<	if (conf_parser_ctx.pass == 2)
2528	<	ConfigGeneral.cycle_on_host_change = yylval.number;
2413	>	ConfigGeneral.cycle_on_host_change = yylval.number;
2414		};
2415
2416		general_dline_min_cidr: DLINE_MIN_CIDR '=' NUMBER ';'
#	Line 2548 | Line 2433 | general_kline_min_cidr6: KLINE_MIN_CIDR6
2433		ConfigGeneral.kline_min_cidr6 = $3;
2434		};
2435
2551	–	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2552	–	{
2553	–	ConfigGeneral.tkline_expire_notices = yylval.number;
2554	–	};
2555	–
2436		general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2437		{
2438		ConfigGeneral.kill_chase_time_limit = $3;
2439		};
2440
2561	–	general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2562	–	{
2563	–	ConfigGeneral.ignore_bogus_ts = yylval.number;
2564	–	};
2565	–
2441		general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2442		{
2443		ConfigGeneral.failed_oper_notice = yylval.number;
#	Line 2600 | Line 2475 | general_ts_warn_delta: TS_WARN_DELTA '='
2475
2476		general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2477		{
2478	<	if (conf_parser_ctx.pass == 2)
2604	<	ConfigGeneral.ts_max_delta = $3;
2478	>	ConfigGeneral.ts_max_delta = $3;
2479		};
2480
2481		general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
#	Line 2718 | Line 2592 | general_throttle_time: THROTTLE_TIME '='
2592		general_oper_umodes: OPER_UMODES
2593		{
2594		ConfigGeneral.oper_umodes = 0;
2595	<	} '='  umode_oitems ';' ;
2595	>	} '=' umode_oitems ';' ;
2596
2597		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2598		umode_oitem:     T_BOTS
#	Line 2787 | Line 2661 | umode_oitem:     T_BOTS
2661		} | T_FARCONNECT
2662		{
2663		ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2664	+	} | EXPIRATION
2665	+	{
2666	+	ConfigGeneral.oper_umodes |= UMODE_EXPIRATION;
2667		};
2668
2669		general_oper_only_umodes: OPER_ONLY_UMODES
2670		{
2671		ConfigGeneral.oper_only_umodes = 0;
2672	<	} '='  umode_items ';' ;
2672	>	} '=' umode_items ';' ;
2673
2674		umode_items:  umode_items ',' umode_item | umode_item;
2675		umode_item:   T_BOTS
#	Line 2855 | Line 2732 | umode_item:   T_BOTS
2732		} | T_FARCONNECT
2733		{
2734		ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2735	+	} | EXPIRATION
2736	+	{
2737	+	ConfigGeneral.oper_only_umodes |= UMODE_EXPIRATION;
2738		};
2739
2740		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
#	Line 2872 | Line 2752 | general_default_floodcount: DEFAULT_FLOO
2752		ConfigGeneral.default_floodcount = $3;
2753		};
2754
2755	+	general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2756	+	{
2757	+	ConfigGeneral.default_floodtime = $3;
2758	+	};
2759	+
2760
2761		/***************************************************************************
2762		* channel {} section
#	Line 2880 | Line 2765 | channel_entry: CHANNEL '{' channel_items
2765
2766		channel_items:      channel_items channel_item | channel_item;
2767		channel_item:       channel_max_bans |
2768	+	channel_max_bans_large |
2769		channel_invite_client_count |
2770		channel_invite_client_time |
2771		channel_invite_delay_channel |
2772	+	channel_invite_expire_time |
2773		channel_knock_client_count |
2774		channel_knock_client_time |
2775		channel_knock_delay_channel |
2776		channel_max_channels |
2777	+	channel_max_invites |
2778		channel_default_join_flood_count |
2779		channel_default_join_flood_time |
2780		channel_disable_fake_channels |
2781	+	channel_enable_extbans |
2782		error;
2783
2784	+	channel_enable_extbans: ENABLE_EXTBANS '=' TBOOL ';'
2785	+	{
2786	+	ConfigChannel.enable_extbans = yylval.number;
2787	+	};
2788	+
2789		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2790		{
2791		ConfigChannel.disable_fake_channels = yylval.number;
#	Line 2912 | Line 2806 | channel_invite_delay_channel: INVITE_DEL
2806		ConfigChannel.invite_delay_channel = $3;
2807		};
2808
2809	+	channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2810	+	{
2811	+	ConfigChannel.invite_expire_time = $3;
2812	+	};
2813	+
2814		channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2815		{
2816		ConfigChannel.knock_client_count = $3;
#	Line 2932 | Line 2831 | channel_max_channels: MAX_CHANNELS '=' N
2831		ConfigChannel.max_channels = $3;
2832		};
2833
2834	+	channel_max_invites: MAX_INVITES '=' NUMBER ';'
2835	+	{
2836	+	ConfigChannel.max_invites = $3;
2837	+	};
2838	+
2839		channel_max_bans: MAX_BANS '=' NUMBER ';'
2840		{
2841		ConfigChannel.max_bans = $3;
2842		};
2843
2844	+	channel_max_bans_large: MAX_BANS_LARGE '=' NUMBER ';'
2845	+	{
2846	+	ConfigChannel.max_bans_large = $3;
2847	+	};
2848	+
2849		channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
2850		{
2851		ConfigChannel.default_join_flood_count = yylval.number;

Diff Legend

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