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 5488 by michael, Sun Jan 25 17:40:40 2015 UTC vs.
Revision 5489 by michael, Sun Feb 8 14:52:23 2015 UTC

#	Line 173 | Line 173 | reset_block_state(void)
173		%token  CONNECTFREQ
174		%token  CYCLE_ON_HOST_CHANGE
175		%token  DEFAULT_FLOODCOUNT
176	+	%token  DEFAULT_JOIN_FLOOD_COUNT
177	+	%token  DEFAULT_JOIN_FLOOD_TIME
178	+	%token  DEFAULT_MAX_CLIENTS
179		%token  DEFAULT_SPLIT_SERVER_COUNT
180		%token  DEFAULT_SPLIT_USER_COUNT
181		%token  DENY
#	Line 219 | Line 222 | reset_block_state(void)
222		%token  IRCD_AUTH
223		%token  IRCD_FLAGS
224		%token  IRCD_SID
222	–	%token  JOIN_FLOOD_COUNT
223	–	%token  JOIN_FLOOD_TIME
225		%token  KILL
226		%token  KILL_CHASE_TIME_LIMIT
227		%token  KLINE
#	Line 466 | Line 467 | serverinfo_item:        serverinfo_name
467		serverinfo_description |
468		serverinfo_network_name |
469		serverinfo_network_desc |
470	<	serverinfo_max_clients |
470	>	serverinfo_default_max_clients |
471		serverinfo_max_nick_length |
472		serverinfo_max_topic_length |
473		serverinfo_ssl_dh_param_file |
#	Line 776 | Line 777 | serverinfo_vhost6: VHOST6 '=' QSTRING ';
777		}
778		};
779
780	<	serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
780	>	serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
781		{
782		if (conf_parser_ctx.pass != 2)
783		break;
#	Line 787 | Line 788 | serverinfo_max_clients: T_MAX_CLIENTS '=
788
789		snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
790		conf_error_report(buf);
791	<	ConfigServerInfo.max_clients = MAXCLIENTS_MIN;
791	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MIN;
792		}
793		else if ($3 > MAXCLIENTS_MAX)
794		{
#	Line 795 | Line 796 | serverinfo_max_clients: T_MAX_CLIENTS '=
796
797		snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
798		conf_error_report(buf);
799	<	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
799	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
800		}
801		else
802	<	ConfigServerInfo.max_clients = $3;
802	>	ConfigServerInfo.default_max_clients = $3;
803		};
804
805		serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
#	Line 2992 | Line 2993 | channel_item:       channel_max_bans |
2993		channel_default_split_server_count |
2994		channel_no_create_on_split |
2995		channel_no_join_on_split |
2996	<	channel_jflood_count |
2997	<	channel_jflood_time |
2996	>	channel_default_join_flood_count |
2997	>	channel_default_join_flood_time |
2998		channel_disable_fake_channels |
2999		error;
3000
#	Line 3057 | Line 3058 | channel_no_join_on_split: NO_JOIN_ON_SPL
3058		ConfigChannel.no_join_on_split = yylval.number;
3059		};
3060
3061	<	channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
3061	>	channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
3062		{
3063	<	GlobalSetOptions.joinfloodcount = yylval.number;
3063	>	ConfigChannel.default_join_flood_count = yylval.number;
3064		};
3065
3066	<	channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
3066	>	channel_default_join_flood_time: DEFAULT_JOIN_FLOOD_TIME '=' timespec ';'
3067		{
3068	<	GlobalSetOptions.joinfloodtime = $3;
3068	>	ConfigChannel.default_join_flood_time = $3;
3069		};
3070
3071		/***************************************************************************

Diff Legend

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