ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/conf_parser.y
(Generate patch)

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 3762 by michael, Sun Jun 1 19:35:16 2014 UTC vs.
Revision 3860 by michael, Thu Jun 5 19:55:07 2014 UTC

# Line 206 | Line 206 | reset_block_state(void)
206   %token  HUB_MASK
207   %token  IGNORE_BOGUS_TS
208   %token  INVISIBLE_ON_CONNECT
209 < %token  INVITE_DELAY
210 < %token  INVITE_DELAY_CHANNEL
209 > %token  INVITE_CLIENT_COUNT
210 > %token  INVITE_CLIENT_TIME
211   %token  IP
212   %token  IRCD_AUTH
213   %token  IRCD_FLAGS
# Line 218 | Line 218 | reset_block_state(void)
218   %token  KILL_CHASE_TIME_LIMIT
219   %token  KLINE
220   %token  KLINE_EXEMPT
221 < %token  KNOCK_DELAY
221 > %token  KNOCK_CLIENT_COUNT
222 > %token  KNOCK_CLIENT_TIME
223   %token  KNOCK_DELAY_CHANNEL
224   %token  LEAF_MASK
225   %token  LINKS_DELAY
# Line 2917 | Line 2918 | channel_entry: CHANNEL
2918  
2919   channel_items:      channel_items channel_item | channel_item;
2920   channel_item:       channel_max_bans |
2921 <                    channel_invite_delay |
2922 <                    channel_invite_delay_channel |
2923 <                    channel_knock_delay |
2921 >                    channel_invite_client_count |
2922 >                    channel_invite_client_time |
2923 >                    channel_knock_client_count |
2924 >                    channel_knock_client_time |
2925                      channel_knock_delay_channel |
2926                      channel_max_chans_per_user |
2927                      channel_max_chans_per_oper |
# Line 2937 | Line 2939 | channel_disable_fake_channels: DISABLE_F
2939    ConfigChannel.disable_fake_channels = yylval.number;
2940   };
2941  
2942 < channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2942 >
2943 > channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
2944   {
2945 <  ConfigChannel.knock_delay = $3;
2945 >  ConfigChannel.invite_client_count = $3;
2946   };
2947  
2948 < channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
2948 > channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
2949   {
2950 <  ConfigChannel.knock_delay_channel = $3;
2950 >  ConfigChannel.invite_client_time = $3;
2951 > };
2952 >
2953 > channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2954 > {
2955 >  ConfigChannel.knock_client_count = $3;
2956   };
2957  
2958 < channel_invite_delay: INVITE_DELAY '=' timespec ';'
2958 > channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
2959   {
2960 <  ConfigChannel.invite_delay = $3;
2960 >  ConfigChannel.knock_client_time = $3;
2961   };
2962  
2963 < channel_invite_delay_channel: INVITE_DELAY_CHANNEL '=' timespec ';'
2963 > channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
2964   {
2965 <  ConfigChannel.invite_delay_channel = $3;
2965 >  ConfigChannel.knock_delay_channel = $3;
2966   };
2967  
2968   channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'

Diff Legend

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