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 8861 by michael, Fri Feb 15 21:30:36 2019 UTC vs.
Revision 9857 by michael, Fri Jan 1 04:43:22 2021 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 2000-2019 ircd-hybrid development team
4	>	*  Copyright (c) 2000-2021 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 91 | Line 91 | static struct
91		size,
92		type,
93		port,
94	+	timeout,
95		aftype,
96		ping_freq,
97		max_perip_local,
#	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 151 | Line 143 | reset_block_state(void)
143		%token  AUTOCONN
144		%token  AWAY_COUNT
145		%token  AWAY_TIME
146	+	%token  BOT
147		%token  BYTES KBYTES MBYTES
148		%token  CALLER_ID_WAIT
149		%token  CAN_FLOOD
#	Line 158 | Line 151 | reset_block_state(void)
151		%token  CIDR_BITLEN_IPV4
152		%token  CIDR_BITLEN_IPV6
153		%token  CLASS
154	+	%token  CLIENT
155		%token  CLOSE
156		%token  CONNECT
157		%token  CONNECTFREQ
#	Line 167 | Line 161 | reset_block_state(void)
161		%token  DEFAULT_JOIN_FLOOD_COUNT
162		%token  DEFAULT_JOIN_FLOOD_TIME
163		%token  DEFAULT_MAX_CLIENTS
164	+	%token  DEFER
165		%token  DENY
166		%token  DESCRIPTION
167		%token  DIE
#	Line 177 | Line 172 | reset_block_state(void)
172		%token  DLINE_MIN_CIDR6
173		%token  DOTS_IN_IDENT
174		%token  EMAIL
175	+	%token  ENABLE_EXTBANS
176		%token  ENCRYPTED
177		%token  EXCEED_LIMIT
178		%token  EXEMPT
179	+	%token  EXPIRATION
180		%token  FAILED_OPER_NOTICE
181		%token  FLATTEN_LINKS
182		%token  FLATTEN_LINKS_DELAY
#	Line 225 | Line 222 | reset_block_state(void)
222		%token  MAX_CHANNELS
223		%token  MAX_IDLE
224		%token  MAX_INVITES
225	+	%token  MAX_MONITOR
226		%token  MAX_NICK_CHANGES
227		%token  MAX_NICK_LENGTH
228		%token  MAX_NICK_TIME
229		%token  MAX_NUMBER
230		%token  MAX_TARGETS
231		%token  MAX_TOPIC_LENGTH
234	–	%token  MAX_WATCH
232		%token  MIN_IDLE
233		%token  MIN_NONWILDCARD
234		%token  MIN_NONWILDCARD_SIMPLE
#	Line 241 | Line 238 | reset_block_state(void)
238		%token  NAME
239		%token  NEED_IDENT
240		%token  NEED_PASSWORD
241	<	%token  NETWORK_DESC
241	>	%token  NETWORK_DESCRIPTION
242		%token  NETWORK_NAME
243		%token  NICK
244		%token  NO_OPER_FLOOD
245		%token  NO_TILDE
249	–	%token  NUMBER
246		%token  NUMBER_PER_CIDR
247		%token  NUMBER_PER_IP_GLOBAL
248		%token  NUMBER_PER_IP_LOCAL
#	Line 261 | Line 257 | reset_block_state(void)
257		%token  PING_COOKIE
258		%token  PING_TIME
259		%token  PORT
264	–	%token  QSTRING
260		%token  RANDOM_IDLE
261		%token  REASON
262		%token  REDIRPORT
#	Line 279 | Line 274 | reset_block_state(void)
274		%token  SERVERINFO
275		%token  SHORT_MOTD
276		%token  SPOOF
282	–	%token  SPOOF_NOTICE
277		%token  SQUIT
284	–	%token  SSL_CERTIFICATE_FILE
285	–	%token  SSL_CERTIFICATE_FINGERPRINT
286	–	%token  SSL_CONNECTION_REQUIRED
287	–	%token  SSL_DH_ELLIPTIC_CURVE
288	–	%token  SSL_DH_PARAM_FILE
289	–	%token  SSL_MESSAGE_DIGEST_ALGORITHM
278		%token  STATS_E_DISABLED
279		%token  STATS_I_OPER_ONLY
280		%token  STATS_K_OPER_ONLY
#	Line 295 | 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_BOTS
286	>	%token  T_BIND
287		%token  T_CALLERID
288		%token  T_CCONN
289		%token  T_COMMAND
#	Line 306 | Line 294 | reset_block_state(void)
294		%token  T_EXTERNAL
295		%token  T_FARCONNECT
296		%token  T_FILE
297	<	%token  T_FULL
297	>	%token  T_FLOOD
298		%token  T_GLOBOPS
299		%token  T_INVISIBLE
300		%token  T_IPV4
#	Line 330 | Line 318 | reset_block_state(void)
318		%token  T_SKILL
319		%token  T_SOFTCALLERID
320		%token  T_SPY
333	–	%token  T_SSL
334	–	%token  T_SSL_CIPHER_LIST
321		%token  T_TARGET
322	+	%token  T_TLS
323		%token  T_UMODES
337	–	%token  T_UNAUTH
324		%token  T_UNDLINE
325		%token  T_UNLIMITED
326		%token  T_UNRESV
#	Line 345 | Line 331 | reset_block_state(void)
331		%token  TBOOL
332		%token  THROTTLE_COUNT
333		%token  THROTTLE_TIME
334	<	%token  TKLINE_EXPIRE_NOTICES
335	<	%token  TMASKED
334	>	%token  TIMEOUT
335	>	%token  TLS_CERTIFICATE_FILE
336	>	%token  TLS_CERTIFICATE_FINGERPRINT
337	>	%token  TLS_CIPHER_LIST
338	>	%token  TLS_CIPHER_SUITES
339	>	%token  TLS_CONNECTION_REQUIRED
340	>	%token  TLS_DH_PARAM_FILE
341	>	%token  TLS_MESSAGE_DIGEST_ALGORITHM
342	>	%token  TLS_SUPPORTED_GROUPS
343		%token  TS_MAX_DELTA
344		%token  TS_WARN_DELTA
345		%token  TWODOTS
#	Line 362 | Line 355 | reset_block_state(void)
355		%token  XLINE
356		%token  XLINE_EXEMPT
357
358	<	%type  <string> QSTRING
359	<	%type  <number> NUMBER
358	>	%token  <string> QSTRING
359	>	%token  <number> NUMBER
360		%type  <number> timespec
361		%type  <number> timespec_
362		%type  <number> sizespec
#	Line 442 | Line 435 | modules_path: PATH '=' QSTRING ';'
435
436
437		/***************************************************************************
438	<	* serverinfo {}  section
438	>	* serverinfo {} section
439		***************************************************************************/
440		serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
441
442		serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
443		serverinfo_item:        serverinfo_name |
451	–	serverinfo_vhost |
444		serverinfo_hub |
445		serverinfo_description |
446		serverinfo_network_name |
447	<	serverinfo_network_desc |
447	>	serverinfo_network_description |
448		serverinfo_default_max_clients |
449		serverinfo_max_nick_length |
450		serverinfo_max_topic_length |
451	<	serverinfo_ssl_dh_param_file |
452	<	serverinfo_ssl_dh_elliptic_curve |
451	>	serverinfo_tls_dh_param_file |
452	>	serverinfo_tls_supported_groups |
453		serverinfo_rsa_private_key_file |
462	–	serverinfo_vhost6 |
454		serverinfo_sid |
455	<	serverinfo_ssl_certificate_file |
456	<	serverinfo_ssl_cipher_list |
457	<	serverinfo_ssl_message_digest_algorithm |
455	>	serverinfo_tls_certificate_file |
456	>	serverinfo_tls_cipher_list |
457	>	serverinfo_tls_cipher_suites |
458	>	serverinfo_tls_message_digest_algorithm |
459		error ';' ;
460
461
462	<	serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
462	>	serverinfo_tls_certificate_file: TLS_CERTIFICATE_FILE '=' QSTRING ';'
463		{
464		if (conf_parser_ctx.pass == 2)
465		{
466	<	xfree(ConfigServerInfo.ssl_certificate_file);
467	<	ConfigServerInfo.ssl_certificate_file = xstrdup(yylval.string);
466	>	xfree(ConfigServerInfo.tls_certificate_file);
467	>	ConfigServerInfo.tls_certificate_file = xstrdup(yylval.string);
468		}
469		};
470
#	Line 485 | Line 477 | serverinfo_rsa_private_key_file: RSA_PRI
477		}
478		};
479
480	<	serverinfo_ssl_dh_param_file: SSL_DH_PARAM_FILE '=' QSTRING ';'
480	>	serverinfo_tls_dh_param_file: TLS_DH_PARAM_FILE '=' QSTRING ';'
481		{
482		if (conf_parser_ctx.pass == 2)
483		{
484	<	xfree(ConfigServerInfo.ssl_dh_param_file);
485	<	ConfigServerInfo.ssl_dh_param_file = xstrdup(yylval.string);
484	>	xfree(ConfigServerInfo.tls_dh_param_file);
485	>	ConfigServerInfo.tls_dh_param_file = xstrdup(yylval.string);
486		}
487		};
488
489	<	serverinfo_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
489	>	serverinfo_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
490		{
491		if (conf_parser_ctx.pass == 2)
492		{
493	<	xfree(ConfigServerInfo.ssl_cipher_list);
494	<	ConfigServerInfo.ssl_cipher_list = xstrdup(yylval.string);
493	>	xfree(ConfigServerInfo.tls_cipher_list);
494	>	ConfigServerInfo.tls_cipher_list = xstrdup(yylval.string);
495		}
496		};
497
498	<	serverinfo_ssl_message_digest_algorithm: SSL_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
498	>	serverinfo_tls_cipher_suites: TLS_CIPHER_SUITES '=' QSTRING ';'
499		{
500		if (conf_parser_ctx.pass == 2)
501		{
502	<	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
503	<	ConfigServerInfo.ssl_message_digest_algorithm = xstrdup(yylval.string);
502	>	xfree(ConfigServerInfo.tls_cipher_suites);
503	>	ConfigServerInfo.tls_cipher_suites = xstrdup(yylval.string);
504	>	}
505	>	};
506	>
507	>	serverinfo_tls_message_digest_algorithm: TLS_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
508	>	{
509	>	if (conf_parser_ctx.pass == 2)
510	>	{
511	>	xfree(ConfigServerInfo.tls_message_digest_algorithm);
512	>	ConfigServerInfo.tls_message_digest_algorithm = xstrdup(yylval.string);
513		}
514		}
515
516	<	serverinfo_ssl_dh_elliptic_curve: SSL_DH_ELLIPTIC_CURVE '=' QSTRING ';'
516	>	serverinfo_tls_supported_groups: TLS_SUPPORTED_GROUPS '=' QSTRING ';'
517		{
518		if (conf_parser_ctx.pass == 2)
519		{
520	<	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
521	<	ConfigServerInfo.ssl_dh_elliptic_curve = xstrdup(yylval.string);
520	>	xfree(ConfigServerInfo.tls_supported_groups);
521	>	ConfigServerInfo.tls_supported_groups = xstrdup(yylval.string);
522		}
523		};
524
#	Line 565 | Line 566 | serverinfo_network_name: NETWORK_NAME '=
566		{
567		if (conf_parser_ctx.pass == 2)
568		{
569	<	char *p;
569	>	char *p = strchr(yylval.string, ' ');
570
571	<	if ((p = strchr(yylval.string, ' ')))
571	>	if (p)
572		*p = '\0';
573
574		xfree(ConfigServerInfo.network_name);
#	Line 575 | Line 576 | serverinfo_network_name: NETWORK_NAME '=
576		}
577		};
578
579	<	serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
579	>	serverinfo_network_description: NETWORK_DESCRIPTION '=' QSTRING ';'
580		{
581		if (conf_parser_ctx.pass != 2)
582		break;
583
584	<	xfree(ConfigServerInfo.network_desc);
585	<	ConfigServerInfo.network_desc = xstrdup(yylval.string);
585	<	};
586	<
587	<	serverinfo_vhost: VHOST '=' QSTRING ';'
588	<	{
589	<	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
590	<	{
591	<	struct addrinfo hints, *res;
592	<
593	<	memset(&hints, 0, sizeof(hints));
594	<
595	<	hints.ai_family   = AF_UNSPEC;
596	<	hints.ai_socktype = SOCK_STREAM;
597	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
598	<
599	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
600	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
601	<	else
602	<	{
603	<	assert(res);
604	<
605	<	memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
606	<	ConfigServerInfo.ip.ss.ss_family = res->ai_family;
607	<	ConfigServerInfo.ip.ss_len = res->ai_addrlen;
608	<	freeaddrinfo(res);
609	<
610	<	ConfigServerInfo.specific_ipv4_vhost = 1;
611	<	}
612	<	}
613	<	};
614	<
615	<	serverinfo_vhost6: VHOST6 '=' QSTRING ';'
616	<	{
617	<	if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
618	<	{
619	<	struct addrinfo hints, *res;
620	<
621	<	memset(&hints, 0, sizeof(hints));
622	<
623	<	hints.ai_family   = AF_UNSPEC;
624	<	hints.ai_socktype = SOCK_STREAM;
625	<	hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
626	<
627	<	if (getaddrinfo(yylval.string, NULL, &hints, &res))
628	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
629	<	else
630	<	{
631	<	assert(res);
632	<
633	<	memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
634	<	ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
635	<	ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
636	<	freeaddrinfo(res);
637	<
638	<	ConfigServerInfo.specific_ipv6_vhost = 1;
639	<	}
640	<	}
584	>	xfree(ConfigServerInfo.network_description);
585	>	ConfigServerInfo.network_description = xstrdup(yylval.string);
586		};
587
588		serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
#	Line 652 | Line 597 | serverinfo_default_max_clients: DEFAULT_
597		}
598		else if ($3 > MAXCLIENTS_MAX)
599		{
600	<	char buf[IRCD_BUFSIZE] = "";
600	>	char buf[IRCD_BUFSIZE];
601
602		snprintf(buf, sizeof(buf), "default_max_clients too high, setting to %d", MAXCLIENTS_MAX);
603		conf_error_report(buf);
#	Line 675 | Line 620 | serverinfo_max_nick_length: MAX_NICK_LEN
620		}
621		else if ($3 > NICKLEN)
622		{
623	<	char buf[IRCD_BUFSIZE] = "";
623	>	char buf[IRCD_BUFSIZE];
624
625		snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
626		conf_error_report(buf);
#	Line 698 | Line 643 | serverinfo_max_topic_length: MAX_TOPIC_L
643		}
644		else if ($3 > TOPICLEN)
645		{
646	<	char buf[IRCD_BUFSIZE] = "";
646	>	char buf[IRCD_BUFSIZE];
647
648		snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
649		conf_error_report(buf);
#	Line 764 | Line 709 | motd_entry: MOTD
709		reset_block_state();
710		} '{' motd_items '}' ';'
711		{
712	<	dlink_node *node = NULL;
712	>	dlink_node *node;
713
714		if (conf_parser_ctx.pass != 2)
715		break;
#	Line 857 | Line 802 | pseudo_target: T_TARGET '=' QSTRING ';'
802		/***************************************************************************
803		* log {} section
804		***************************************************************************/
805	<	logging_entry:          T_LOG  '{' logging_items '}' ';' ;
805	>	logging_entry:          T_LOG '{' logging_items '}' ';' ;
806		logging_items:          logging_items logging_item | logging_item ;
807
808		logging_item:           logging_use_logging | logging_file_entry |
#	Line 909 | Line 854 | logging_file_type: TYPE
854		{
855		if (conf_parser_ctx.pass == 2)
856		block_state.type.value = 0;
857	<	} '='  logging_file_type_items ';' ;
857	>	} '=' logging_file_type_items ';' ;
858
859		logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
860		logging_file_type_item:  USER
#	Line 959 | Line 904 | oper_entry: OPERATOR
904		block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
905		} '{' oper_items '}' ';'
906		{
907	<	dlink_node *node = NULL;
907	>	dlink_node *node;
908
909		if (conf_parser_ctx.pass != 2)
910		break;
#	Line 990 | Line 935 | oper_entry: OPERATOR
935		split_nuh(&nuh);
936
937		struct MaskItem *conf = conf_make(CONF_OPER);
938	+	conf->addr = xcalloc(sizeof(*conf->addr));
939		conf->name = xstrdup(block_state.name.buf);
940		conf->user = xstrdup(block_state.user.buf);
941		conf->host = xstrdup(block_state.host.buf);
#	Line 1006 | Line 952 | oper_entry: OPERATOR
952		conf->flags = block_state.flags.value;
953		conf->modes = block_state.modes.value;
954		conf->port  = block_state.port.value;
955	<	conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
955	>	conf->htype = parse_netmask(conf->host, conf->addr, &conf->bits);
956
957		conf_add_class_to_conf(conf, block_state.class.buf);
958		}
#	Line 1020 | Line 966 | oper_item:      oper_name |
966		oper_umodes |
967		oper_class |
968		oper_encrypted |
969	<	oper_ssl_certificate_fingerprint |
970	<	oper_ssl_connection_required |
969	>	oper_tls_certificate_fingerprint |
970	>	oper_tls_connection_required |
971		oper_flags |
972		error ';' ;
973
#	Line 1060 | Line 1006 | oper_encrypted: ENCRYPTED '=' TBOOL ';'
1006		block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1007		};
1008
1009	<	oper_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1009	>	oper_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1010		{
1011		if (conf_parser_ctx.pass == 2)
1012		strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1013		};
1014
1015	<	oper_ssl_connection_required: SSL_CONNECTION_REQUIRED '=' TBOOL ';'
1015	>	oper_tls_connection_required: TLS_CONNECTION_REQUIRED '=' TBOOL ';'
1016		{
1017		if (conf_parser_ctx.pass != 2)
1018		break;
1019
1020		if (yylval.number)
1021	<	block_state.flags.value |= CONF_FLAGS_SSL;
1021	>	block_state.flags.value |= CONF_FLAGS_TLS;
1022		else
1023	<	block_state.flags.value &= ~CONF_FLAGS_SSL;
1023	>	block_state.flags.value &= ~CONF_FLAGS_TLS;
1024		};
1025
1026		oper_class: CLASS '=' QSTRING ';'
#	Line 1087 | Line 1033 | oper_umodes: T_UMODES
1033		{
1034		if (conf_parser_ctx.pass == 2)
1035		block_state.modes.value = 0;
1036	<	} '='  oper_umodes_items ';' ;
1036	>	} '=' oper_umodes_items ';' ;
1037
1038		oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1039	<	oper_umodes_item:  T_BOTS
1039	>	oper_umodes_item: BOT
1040		{
1041		if (conf_parser_ctx.pass == 2)
1042	<	block_state.modes.value |= UMODE_BOTS;
1042	>	block_state.modes.value |= UMODE_BOT;
1043		} | T_CCONN
1044		{
1045		if (conf_parser_ctx.pass == 2)
#	Line 1106 | Line 1052 | oper_umodes_item:  T_BOTS
1052		{
1053		if (conf_parser_ctx.pass == 2)
1054		block_state.modes.value |= UMODE_DEBUG;
1055	<	} | T_FULL
1055	>	} | T_FLOOD
1056		{
1057		if (conf_parser_ctx.pass == 2)
1058	<	block_state.modes.value |= UMODE_FULL;
1058	>	block_state.modes.value |= UMODE_FLOOD;
1059		} | HIDDEN
1060		{
1061		if (conf_parser_ctx.pass == 2)
#	Line 1134 | Line 1080 | oper_umodes_item:  T_BOTS
1080		{
1081		if (conf_parser_ctx.pass == 2)
1082		block_state.modes.value |= UMODE_REJ;
1137	–	} | T_UNAUTH
1138	–	{
1139	–	if (conf_parser_ctx.pass == 2)
1140	–	block_state.modes.value |= UMODE_UNAUTH;
1083		} | T_SPY
1084		{
1085		if (conf_parser_ctx.pass == 2)
#	Line 1178 | Line 1120 | oper_umodes_item:  T_BOTS
1120		{
1121		if (conf_parser_ctx.pass == 2)
1122		block_state.modes.value |= UMODE_FARCONNECT;
1123	+	} | EXPIRATION
1124	+	{
1125	+	if (conf_parser_ctx.pass == 2)
1126	+	block_state.modes.value |= UMODE_EXPIRATION;
1127		};
1128
1129		oper_flags: IRCD_FLAGS
1130		{
1131		if (conf_parser_ctx.pass == 2)
1132		block_state.port.value = 0;
1133	<	} '='  oper_flags_items ';';
1133	>	} '=' oper_flags_items ';';
1134
1135		oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1136		oper_flags_item: KILL ':' REMOTE
#	Line 1318 | Line 1264 | class_entry: CLASS
1264
1265		block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1266		block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1321	–	block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1267		block_state.max_sendq.value = DEFAULT_SENDQ;
1268		block_state.max_recvq.value = DEFAULT_RECVQ;
1269		} '{' class_items '}' ';'
#	Line 1479 | Line 1424 | class_flags: IRCD_FLAGS
1424		{
1425		if (conf_parser_ctx.pass == 1)
1426		block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1427	<	} '='  class_flags_items ';';
1427	>	} '=' class_flags_items ';';
1428
1429		class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1430		class_flags_item: RANDOM_IDLE
#	Line 1505 | Line 1450 | listen_entry: LISTEN
1450		listen_flags: IRCD_FLAGS
1451		{
1452		block_state.flags.value = 0;
1453	<	} '='  listen_flags_items ';';
1453	>	} '=' listen_flags_items ';';
1454
1455		listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1456	<	listen_flags_item: T_SSL
1456	>	listen_flags_item: T_TLS
1457		{
1458		if (conf_parser_ctx.pass == 2)
1459	<	block_state.flags.value |= LISTENER_SSL;
1459	>	block_state.flags.value |= LISTENER_TLS;
1460		} | HIDDEN
1461		{
1462		if (conf_parser_ctx.pass == 2)
#	Line 1520 | Line 1465 | listen_flags_item: T_SSL
1465		{
1466		if (conf_parser_ctx.pass == 2)
1467		block_state.flags.value |= LISTENER_SERVER;
1468	+	} | CLIENT
1469	+	{
1470	+	if (conf_parser_ctx.pass == 2)
1471	+	block_state.flags.value |= LISTENER_CLIENT;
1472	+	} | DEFER
1473	+	{
1474	+	if (conf_parser_ctx.pass == 2)
1475	+	block_state.flags.value |= LISTENER_DEFER;
1476		};
1477
1478		listen_items:   listen_items listen_item | listen_item;
#	Line 1534 | 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 1547 | 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 1581 | 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;
#	Line 1615 | 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 1669 | Line 1622 | auth_flags: IRCD_FLAGS
1622		} '=' auth_flags_items ';';
1623
1624		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1625	<	auth_flags_item: SPOOF_NOTICE
1673	<	{
1674	<	if (conf_parser_ctx.pass == 2)
1675	<	block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1676	<	} | EXCEED_LIMIT
1625	>	auth_flags_item: EXCEED_LIMIT
1626		{
1627		if (conf_parser_ctx.pass == 2)
1628		block_state.flags.value |= CONF_FLAGS_NOLIMIT;
#	Line 2002 | Line 1951 | connect_entry: CONNECT
1951		reset_block_state();
1952		block_state.aftype.value = AF_INET;
1953		block_state.port.value = PORTNUM;
1954	+	block_state.timeout.value = CONNECTTIMEOUT;
1955		} '{' connect_items '}' ';'
1956		{
1957		struct addrinfo hints, *res;
#	Line 2025 | Line 1975 | connect_entry: CONNECT
1975		break;
1976
1977		struct MaskItem *conf = conf_make(CONF_SERVER);
1978	+	conf->addr = xcalloc(sizeof(*conf->addr));
1979		conf->port = block_state.port.value;
1980	+	conf->timeout = block_state.timeout.value;
1981		conf->flags = block_state.flags.value;
1982		conf->aftype = block_state.aftype.value;
1983		conf->host = xstrdup(block_state.host.buf);
#	Line 2051 | Line 2003 | connect_entry: CONNECT
2003		hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2004
2005		if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2006	<	ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
2006	>	ilog(LOG_TYPE_IRCD, "Invalid netmask for server bind(%s)", block_state.bind.buf);
2007		else
2008		{
2009		assert(res);
2010
2011	<	memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
2012	<	conf->bind.ss.ss_family = res->ai_family;
2013	<	conf->bind.ss_len = res->ai_addrlen;
2011	>	conf->bind = xcalloc(sizeof(*conf->bind));
2012	>
2013	>	memcpy(conf->bind, res->ai_addr, res->ai_addrlen);
2014	>	conf->bind->ss_len = res->ai_addrlen;
2015		freeaddrinfo(res);
2016		}
2017		}
2018
2019		conf_add_class_to_conf(conf, block_state.class.buf);
2020	<	lookup_confhost(conf);
2020	>	conf_dns_lookup(conf);
2021		};
2022
2023		connect_items:  connect_items connect_item | connect_item;
2024		connect_item:   connect_name |
2025		connect_host |
2026	<	connect_vhost |
2026	>	connect_timeout |
2027	>	connect_bind |
2028		connect_send_password |
2029		connect_accept_password |
2030	<	connect_ssl_certificate_fingerprint |
2030	>	connect_tls_certificate_fingerprint |
2031		connect_aftype |
2032		connect_port |
2033	<	connect_ssl_cipher_list |
2033	>	connect_tls_cipher_list |
2034		connect_flags |
2035		connect_hub_mask |
2036		connect_leaf_mask |
#	Line 2096 | Line 2050 | connect_host: HOST '=' QSTRING ';'
2050		strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2051		};
2052
2053	<	connect_vhost: VHOST '=' QSTRING ';'
2053	>	connect_timeout: TIMEOUT '=' timespec ';'
2054	>	{
2055	>	if (conf_parser_ctx.pass == 2)
2056	>	block_state.timeout.value = $3;
2057	>	};
2058	>
2059	>	connect_bind: T_BIND '=' QSTRING ';'
2060		{
2061		if (conf_parser_ctx.pass == 2)
2062		strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
#	Line 2128 | Line 2088 | connect_accept_password: ACCEPT_PASSWORD
2088		strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2089		};
2090
2091	<	connect_ssl_certificate_fingerprint: SSL_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2091	>	connect_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2092		{
2093		if (conf_parser_ctx.pass == 2)
2094		strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
#	Line 2160 | Line 2120 | connect_flags_item: AUTOCONN
2120		{
2121		if (conf_parser_ctx.pass == 2)
2122		block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2123	<	} | T_SSL
2123	>	} | T_TLS
2124		{
2125		if (conf_parser_ctx.pass == 2)
2126	<	block_state.flags.value |= CONF_FLAGS_SSL;
2126	>	block_state.flags.value |= CONF_FLAGS_TLS;
2127		};
2128
2129		connect_encrypted: ENCRYPTED '=' TBOOL ';'
#	Line 2195 | Line 2155 | connect_class: CLASS '=' QSTRING ';'
2155		strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2156		};
2157
2158	<	connect_ssl_cipher_list: T_SSL_CIPHER_LIST '=' QSTRING ';'
2158	>	connect_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
2159		{
2160		#ifdef HAVE_TLS
2161		if (conf_parser_ctx.pass == 2)
2162		strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2163		#else
2164		if (conf_parser_ctx.pass == 2)
2165	<	conf_error_report("Ignoring connect::ciphers -- no TLS support");
2165	>	conf_error_report("Ignoring connect::tls_cipher_list -- no TLS support");
2166		#endif
2167		};
2168
#	Line 2414 | Line 2374 | general_item:       general_away_count |
2374		general_throttle_time |
2375		general_ping_cookie |
2376		general_disable_auth |
2417	–	general_tkline_expire_notices |
2377		general_dline_min_cidr |
2378		general_dline_min_cidr6 |
2379		general_kline_min_cidr |
2380		general_kline_min_cidr6 |
2381		general_stats_e_disabled |
2382	<	general_max_watch |
2382	>	general_max_monitor |
2383		general_cycle_on_host_change |
2384		error;
2385
#	Line 2435 | Line 2394 | general_away_time: AWAY_TIME '=' timespe
2394		ConfigGeneral.away_time = $3;
2395		};
2396
2397	<	general_max_watch: MAX_WATCH '=' NUMBER ';'
2397	>	general_max_monitor: MAX_MONITOR '=' NUMBER ';'
2398		{
2399	<	ConfigGeneral.max_watch = $3;
2399	>	ConfigGeneral.max_monitor = $3;
2400		};
2401
2402		general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
#	Line 2470 | Line 2429 | general_kline_min_cidr6: KLINE_MIN_CIDR6
2429		ConfigGeneral.kline_min_cidr6 = $3;
2430		};
2431
2473	–	general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2474	–	{
2475	–	ConfigGeneral.tkline_expire_notices = yylval.number;
2476	–	};
2477	–
2432		general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2433		{
2434		ConfigGeneral.kill_chase_time_limit = $3;
#	Line 2557 | Line 2511 | general_stats_u_oper_only: STATS_U_OPER_
2511
2512		general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2513		{
2514	<	ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
2561	<	} | STATS_K_OPER_ONLY '=' TMASKED ';'
2562	<	{
2563	<	ConfigGeneral.stats_k_oper_only = 1;
2514	>	ConfigGeneral.stats_k_oper_only = yylval.number;
2515		};
2516
2517		general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2518		{
2519	<	ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
2569	<	} | STATS_I_OPER_ONLY '=' TMASKED ';'
2570	<	{
2571	<	ConfigGeneral.stats_i_oper_only = 1;
2519	>	ConfigGeneral.stats_i_oper_only = yylval.number;
2520		};
2521
2522		general_pace_wait: PACE_WAIT '=' timespec ';'
#	Line 2637 | Line 2585 | general_oper_umodes: OPER_UMODES
2585		} '=' umode_oitems ';' ;
2586
2587		umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2588	<	umode_oitem:     T_BOTS
2588	>	umode_oitem: BOT
2589		{
2590	<	ConfigGeneral.oper_umodes |= UMODE_BOTS;
2590	>	ConfigGeneral.oper_umodes |= UMODE_BOT;
2591		} | T_CCONN
2592		{
2593		ConfigGeneral.oper_umodes |= UMODE_CCONN;
#	Line 2649 | Line 2597 | umode_oitem:     T_BOTS
2597		} | T_DEBUG
2598		{
2599		ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2600	<	} | T_FULL
2600	>	} | T_FLOOD
2601		{
2602	<	ConfigGeneral.oper_umodes |= UMODE_FULL;
2602	>	ConfigGeneral.oper_umodes |= UMODE_FLOOD;
2603		} | HIDDEN
2604		{
2605		ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
#	Line 2670 | Line 2618 | umode_oitem:     T_BOTS
2618		} | T_REJ
2619		{
2620		ConfigGeneral.oper_umodes |= UMODE_REJ;
2673	–	} | T_UNAUTH
2674	–	{
2675	–	ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
2621		} | T_SPY
2622		{
2623		ConfigGeneral.oper_umodes |= UMODE_SPY;
#	Line 2703 | Line 2648 | umode_oitem:     T_BOTS
2648		} | T_FARCONNECT
2649		{
2650		ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2651	+	} | EXPIRATION
2652	+	{
2653	+	ConfigGeneral.oper_umodes |= UMODE_EXPIRATION;
2654		};
2655
2656		general_oper_only_umodes: OPER_ONLY_UMODES
#	Line 2711 | Line 2659 | general_oper_only_umodes: OPER_ONLY_UMOD
2659		} '=' umode_items ';' ;
2660
2661		umode_items:  umode_items ',' umode_item | umode_item;
2662	<	umode_item:   T_BOTS
2662	>	umode_item: BOT
2663		{
2664	<	ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
2664	>	ConfigGeneral.oper_only_umodes |= UMODE_BOT;
2665		} | T_CCONN
2666		{
2667		ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
#	Line 2723 | Line 2671 | umode_item:   T_BOTS
2671		} | T_DEBUG
2672		{
2673		ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2674	<	} | T_FULL
2674	>	} | T_FLOOD
2675		{
2676	<	ConfigGeneral.oper_only_umodes |= UMODE_FULL;
2676	>	ConfigGeneral.oper_only_umodes |= UMODE_FLOOD;
2677		} | T_SKILL
2678		{
2679		ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
#	Line 2738 | Line 2686 | umode_item:   T_BOTS
2686		} | T_REJ
2687		{
2688		ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2741	–	} | T_UNAUTH
2742	–	{
2743	–	ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
2689		} | T_SPY
2690		{
2691		ConfigGeneral.oper_only_umodes |= UMODE_SPY;
#	Line 2771 | Line 2716 | umode_item:   T_BOTS
2716		} | T_FARCONNECT
2717		{
2718		ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2719	+	} | EXPIRATION
2720	+	{
2721	+	ConfigGeneral.oper_only_umodes |= UMODE_EXPIRATION;
2722		};
2723
2724		general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
#	Line 2814 | Line 2762 | channel_item:       channel_max_bans |
2762		channel_default_join_flood_count |
2763		channel_default_join_flood_time |
2764		channel_disable_fake_channels |
2765	+	channel_enable_extbans |
2766		error;
2767
2768	+	channel_enable_extbans: ENABLE_EXTBANS '=' TBOOL ';'
2769	+	{
2770	+	ConfigChannel.enable_extbans = yylval.number;
2771	+	};
2772	+
2773		channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2774		{
2775		ConfigChannel.disable_fake_channels = yylval.number;

Diff Legend

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