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 7624 by michael, Thu Jun 23 12:44:09 2016 UTC vs.
Revision 8279 by michael, Tue Feb 20 19:30:13 2018 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-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 164 | Line 164 | reset_block_state(void)
164   %token  CONNECTFREQ
165   %token  CYCLE_ON_HOST_CHANGE
166   %token  DEFAULT_FLOODCOUNT
167 + %token  DEFAULT_FLOODTIME
168   %token  DEFAULT_JOIN_FLOOD_COUNT
169   %token  DEFAULT_JOIN_FLOOD_TIME
170   %token  DEFAULT_MAX_CLIENTS
# Line 202 | Line 203 | reset_block_state(void)
203   %token  INVITE_CLIENT_COUNT
204   %token  INVITE_CLIENT_TIME
205   %token  INVITE_DELAY_CHANNEL
206 + %token  INVITE_EXPIRE_TIME
207   %token  IP
208   %token  IRCD_AUTH
209   %token  IRCD_FLAGS
# Line 224 | Line 226 | reset_block_state(void)
226   %token  MASK
227   %token  MAX_ACCEPT
228   %token  MAX_BANS
229 + %token  MAX_BANS_LARGE
230   %token  MAX_CHANNELS
231   %token  MAX_GLOBAL
232   %token  MAX_IDLE
233 + %token  MAX_INVITES
234   %token  MAX_LOCAL
235   %token  MAX_NICK_CHANGES
236   %token  MAX_NICK_LENGTH
# Line 2485 | Line 2489 | general_item:       general_away_count |
2489                      general_caller_id_wait |
2490                      general_opers_bypass_callerid |
2491                      general_default_floodcount |
2492 +                    general_default_floodtime |
2493                      general_min_nonwildcard |
2494                      general_min_nonwildcard_simple |
2495                      general_throttle_count |
# Line 2872 | Line 2877 | general_default_floodcount: DEFAULT_FLOO
2877    ConfigGeneral.default_floodcount = $3;
2878   };
2879  
2880 + general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2881 + {
2882 +  ConfigGeneral.default_floodtime = $3;
2883 + };
2884 +
2885  
2886   /***************************************************************************
2887   * channel {} section
# Line 2880 | Line 2890 | channel_entry: CHANNEL '{' channel_items
2890  
2891   channel_items:      channel_items channel_item | channel_item;
2892   channel_item:       channel_max_bans |
2893 +                    channel_max_bans_large |
2894                      channel_invite_client_count |
2895                      channel_invite_client_time |
2896                      channel_invite_delay_channel |
2897 +                    channel_invite_expire_time |
2898                      channel_knock_client_count |
2899                      channel_knock_client_time |
2900                      channel_knock_delay_channel |
2901                      channel_max_channels |
2902 +                    channel_max_invites |
2903                      channel_default_join_flood_count |
2904                      channel_default_join_flood_time |
2905                      channel_disable_fake_channels |
# Line 2912 | Line 2925 | channel_invite_delay_channel: INVITE_DEL
2925    ConfigChannel.invite_delay_channel = $3;
2926   };
2927  
2928 + channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2929 + {
2930 +  ConfigChannel.invite_expire_time = $3;
2931 + };
2932 +
2933   channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2934   {
2935    ConfigChannel.knock_client_count = $3;
# Line 2932 | Line 2950 | channel_max_channels: MAX_CHANNELS '=' N
2950    ConfigChannel.max_channels = $3;
2951   };
2952  
2953 + channel_max_invites: MAX_INVITES '=' NUMBER ';'
2954 + {
2955 +  ConfigChannel.max_invites = $3;
2956 + };
2957 +
2958   channel_max_bans: MAX_BANS '=' NUMBER ';'
2959   {
2960    ConfigChannel.max_bans = $3;
2961   };
2962  
2963 + channel_max_bans_large: MAX_BANS_LARGE '=' NUMBER ';'
2964 + {
2965 +  ConfigChannel.max_bans_large = $3;
2966 + };
2967 +
2968   channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
2969   {
2970    ConfigChannel.default_join_flood_count = yylval.number;

Comparing ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords):
Revision 7624 by michael, Thu Jun 23 12:44:09 2016 UTC vs.
Revision 8279 by michael, Tue Feb 20 19:30:13 2018 UTC

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

Diff Legend

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