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 7924 by michael, Sat Dec 31 13:57:08 2016 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-2017 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 227 | Line 229 | reset_block_state(void)
229   %token  MAX_CHANNELS
230   %token  MAX_GLOBAL
231   %token  MAX_IDLE
232 + %token  MAX_INVITES
233   %token  MAX_LOCAL
234   %token  MAX_NICK_CHANGES
235   %token  MAX_NICK_LENGTH
# Line 2485 | Line 2488 | general_item:       general_away_count |
2488                      general_caller_id_wait |
2489                      general_opers_bypass_callerid |
2490                      general_default_floodcount |
2491 +                    general_default_floodtime |
2492                      general_min_nonwildcard |
2493                      general_min_nonwildcard_simple |
2494                      general_throttle_count |
# Line 2872 | Line 2876 | general_default_floodcount: DEFAULT_FLOO
2876    ConfigGeneral.default_floodcount = $3;
2877   };
2878  
2879 + general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2880 + {
2881 +  ConfigGeneral.default_floodtime = $3;
2882 + };
2883 +
2884  
2885   /***************************************************************************
2886   * channel {} section
# Line 2883 | Line 2892 | channel_item:       channel_max_bans |
2892                      channel_invite_client_count |
2893                      channel_invite_client_time |
2894                      channel_invite_delay_channel |
2895 +                    channel_invite_expire_time |
2896                      channel_knock_client_count |
2897                      channel_knock_client_time |
2898                      channel_knock_delay_channel |
2899                      channel_max_channels |
2900 +                    channel_max_invites |
2901                      channel_default_join_flood_count |
2902                      channel_default_join_flood_time |
2903                      channel_disable_fake_channels |
# Line 2912 | Line 2923 | channel_invite_delay_channel: INVITE_DEL
2923    ConfigChannel.invite_delay_channel = $3;
2924   };
2925  
2926 + channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2927 + {
2928 +  ConfigChannel.invite_expire_time = $3;
2929 + };
2930 +
2931   channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2932   {
2933    ConfigChannel.knock_client_count = $3;
# Line 2932 | Line 2948 | channel_max_channels: MAX_CHANNELS '=' N
2948    ConfigChannel.max_channels = $3;
2949   };
2950  
2951 + channel_max_invites: MAX_INVITES '=' NUMBER ';'
2952 + {
2953 +  ConfigChannel.max_invites = $3;
2954 + };
2955 +
2956   channel_max_bans: MAX_BANS '=' NUMBER ';'
2957   {
2958    ConfigChannel.max_bans = $3;

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 7924 by michael, Sat Dec 31 13:57:08 2016 UTC

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

Diff Legend

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