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 7282 by michael, Sun Feb 7 18:04:26 2016 UTC vs.
Revision 8788 by michael, Wed Jan 16 18:47:38 2019 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-2019 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 31 | Line 31
31   #include "stdinc.h"
32   #include "ircd.h"
33   #include "list.h"
34 + #include "parse.h"
35   #include "conf.h"
36   #include "conf_class.h"
37   #include "conf_cluster.h"
38 + #include "conf_gecos.h"
39   #include "conf_pseudo.h"
40   #include "conf_resv.h"
41   #include "conf_service.h"
# Line 91 | Line 93 | static struct
93      port,
94      aftype,
95      ping_freq,
96 <    max_perip,
96 >    max_perip_local,
97 >    max_perip_global,
98      con_freq,
99      min_idle,
100      max_idle,
101      max_total,
99 –    max_global,
100 –    max_local,
101 –    max_ident,
102      max_sendq,
103      max_recvq,
104      max_channels,
# Line 155 | Line 155 | reset_block_state(void)
155   %token  CALLER_ID_WAIT
156   %token  CAN_FLOOD
157   %token  CHANNEL
158 – %token  CHECK_CACHE
158   %token  CIDR_BITLEN_IPV4
159   %token  CIDR_BITLEN_IPV6
160   %token  CLASS
# Line 164 | Line 163 | reset_block_state(void)
163   %token  CONNECTFREQ
164   %token  CYCLE_ON_HOST_CHANGE
165   %token  DEFAULT_FLOODCOUNT
166 + %token  DEFAULT_FLOODTIME
167   %token  DEFAULT_JOIN_FLOOD_COUNT
168   %token  DEFAULT_JOIN_FLOOD_TIME
169   %token  DEFAULT_MAX_CLIENTS
# Line 197 | Line 197 | reset_block_state(void)
197   %token  HOST
198   %token  HUB
199   %token  HUB_MASK
200 – %token  IGNORE_BOGUS_TS
200   %token  INVISIBLE_ON_CONNECT
201   %token  INVITE_CLIENT_COUNT
202   %token  INVITE_CLIENT_TIME
203   %token  INVITE_DELAY_CHANNEL
204 + %token  INVITE_EXPIRE_TIME
205   %token  IP
206   %token  IRCD_AUTH
207   %token  IRCD_FLAGS
# Line 217 | Line 217 | reset_block_state(void)
217   %token  KNOCK_CLIENT_TIME
218   %token  KNOCK_DELAY_CHANNEL
219   %token  LEAF_MASK
220 – %token  LIBGEOIP_DATABASE_OPTIONS
221 – %token  LIBGEOIP_IPV4_DATABASE_FILE
222 – %token  LIBGEOIP_IPV6_DATABASE_FILE
220   %token  LISTEN
221   %token  MASK
222   %token  MAX_ACCEPT
223   %token  MAX_BANS
224 + %token  MAX_BANS_LARGE
225   %token  MAX_CHANNELS
228 – %token  MAX_GLOBAL
229 – %token  MAX_IDENT
226   %token  MAX_IDLE
227 < %token  MAX_LOCAL
227 > %token  MAX_INVITES
228   %token  MAX_NICK_CHANGES
229   %token  MAX_NICK_LENGTH
230   %token  MAX_NICK_TIME
# Line 236 | Line 232 | reset_block_state(void)
232   %token  MAX_TARGETS
233   %token  MAX_TOPIC_LENGTH
234   %token  MAX_WATCH
239 – %token  MEMORY_CACHE
235   %token  MIN_IDLE
236   %token  MIN_NONWILDCARD
237   %token  MIN_NONWILDCARD_SIMPLE
243 – %token  MMAP_CACHE
238   %token  MODULE
239   %token  MODULES
240   %token  MOTD
# Line 254 | Line 248 | reset_block_state(void)
248   %token  NO_TILDE
249   %token  NUMBER
250   %token  NUMBER_PER_CIDR
251 < %token  NUMBER_PER_IP
251 > %token  NUMBER_PER_IP_GLOBAL
252 > %token  NUMBER_PER_IP_LOCAL
253   %token  OPER_ONLY_UMODES
254   %token  OPER_UMODES
255   %token  OPERATOR
# Line 292 | Line 287 | reset_block_state(void)
287   %token  SSL_DH_ELLIPTIC_CURVE
288   %token  SSL_DH_PARAM_FILE
289   %token  SSL_MESSAGE_DIGEST_ALGORITHM
295 – %token  STANDARD
290   %token  STATS_E_DISABLED
291   %token  STATS_I_OPER_ONLY
292   %token  STATS_K_OPER_ONLY
# Line 364 | Line 358 | reset_block_state(void)
358   %token  VHOST6
359   %token  WARN_NO_CONNECT_BLOCK
360   %token  WHOIS
361 + %token  WHOWAS_HISTORY_LENGTH
362   %token  XLINE
363   %token  XLINE_EXEMPT
364  
# Line 469 | Line 464 | serverinfo_item:        serverinfo_name
464                          serverinfo_ssl_certificate_file |
465                          serverinfo_ssl_cipher_list |
466                          serverinfo_ssl_message_digest_algorithm |
472 –                        serverinfo_libgeoip_database_options |
473 –                        serverinfo_libgeoip_ipv4_database_file |
474 –                        serverinfo_libgeoip_ipv6_database_file |
467                          error ';' ;
468  
469  
# Line 529 | Line 521 | serverinfo_ssl_dh_elliptic_curve: SSL_DH
521    }
522   };
523  
532 – serverinfo_libgeoip_database_options: LIBGEOIP_DATABASE_OPTIONS
533 – {
534 –  if (conf_parser_ctx.pass == 1)
535 –    ConfigServerInfo.libgeoip_database_options = 0;
536 – } '='  options_items ';';
537 –
538 – options_items: options_items ',' options_item | options_item;
539 – options_item: STANDARD
540 – {
541 – #ifdef HAVE_LIBGEOIP
542 –  if (conf_parser_ctx.pass == 1)
543 –    ConfigServerInfo.libgeoip_database_options |= GEOIP_STANDARD;
544 – #endif
545 – } | MEMORY_CACHE
546 – {
547 – #ifdef HAVE_LIBGEOIP
548 –  if (conf_parser_ctx.pass == 1)
549 –    ConfigServerInfo.libgeoip_database_options |= GEOIP_MEMORY_CACHE;
550 – #endif
551 – } | MMAP_CACHE
552 – {
553 – #ifdef HAVE_LIBGEOIP
554 –  if (conf_parser_ctx.pass == 1)
555 –    ConfigServerInfo.libgeoip_database_options |= GEOIP_MMAP_CACHE;
556 – #endif
557 – } | CHECK_CACHE
558 – {
559 – #ifdef HAVE_LIBGEOIP
560 –  if (conf_parser_ctx.pass == 1)
561 –    ConfigServerInfo.libgeoip_database_options |= GEOIP_CHECK_CACHE;
562 – #endif
563 – };
564 –
565 – serverinfo_libgeoip_ipv4_database_file:  LIBGEOIP_IPV4_DATABASE_FILE '=' QSTRING ';'
566 – {
567 –  if (conf_parser_ctx.pass == 2)
568 –  {
569 –    xfree(ConfigServerInfo.libgeoip_ipv4_database_file);
570 –    ConfigServerInfo.libgeoip_ipv4_database_file = xstrdup(yylval.string);
571 –
572 – #ifdef HAVE_LIBGEOIP
573 –    if (GeoIPv4_ctx)
574 –      GeoIP_delete(GeoIPv4_ctx);
575 –    GeoIPv4_ctx = GeoIP_open(yylval.string, ConfigServerInfo.libgeoip_database_options);
576 – #endif
577 –  }
578 – };
579 –
580 – serverinfo_libgeoip_ipv6_database_file:  LIBGEOIP_IPV6_DATABASE_FILE '=' QSTRING ';'
581 – {
582 –  if (conf_parser_ctx.pass == 2)
583 –  {
584 –    xfree(ConfigServerInfo.libgeoip_ipv6_database_file);
585 –    ConfigServerInfo.libgeoip_ipv6_database_file = xstrdup(yylval.string);
586 –
587 – #ifdef HAVE_LIBGEOIP
588 –    if (GeoIPv6_ctx)
589 –      GeoIP_delete(GeoIPv6_ctx);
590 –    GeoIPv6_ctx = GeoIP_open(yylval.string, ConfigServerInfo.libgeoip_database_options);
591 – #endif
592 –  }
593 – };
594 –
524   serverinfo_name: NAME '=' QSTRING ';'
525   {
526    /* This isn't rehashable */
527    if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
528    {
529 <    if (valid_servname(yylval.string))
529 >    if (server_valid_name(yylval.string) == true)
530        ConfigServerInfo.name = xstrdup(yylval.string);
531      else
532      {
# Line 1045 | Line 974 | oper_entry: OPERATOR
974    {
975      struct MaskItem *conf = NULL;
976      struct split_nuh_item nuh;
977 +    char *s = node->data;
978 +
979 +    if (EmptyString(s))
980 +      continue;
981  
982 <    nuh.nuhmask  = node->data;
982 >    nuh.nuhmask  = s;
983      nuh.nickptr  = NULL;
984      nuh.userptr  = block_state.user.buf;
985      nuh.hostptr  = block_state.host.buf;
# Line 1397 | Line 1330 | class_entry: CLASS
1330    if (!block_state.class.buf[0])
1331      break;
1332  
1333 <  if (!(class = class_find(block_state.class.buf, 0)))
1333 >  if (!(class = class_find(block_state.class.buf, false)))
1334      class = class_make();
1335  
1336    class->active = 1;
1337    xfree(class->name);
1338    class->name = xstrdup(block_state.class.buf);
1339    class->ping_freq = block_state.ping_freq.value;
1340 <  class->max_perip = block_state.max_perip.value;
1340 >  class->max_perip_local = block_state.max_perip_local.value;
1341 >  class->max_perip_global = block_state.max_perip_global.value;
1342    class->con_freq = block_state.con_freq.value;
1343    class->max_total = block_state.max_total.value;
1410 –  class->max_global = block_state.max_global.value;
1411 –  class->max_local = block_state.max_local.value;
1412 –  class->max_ident = block_state.max_ident.value;
1344    class->max_sendq = block_state.max_sendq.value;
1345    class->max_recvq = block_state.max_recvq.value;
1346    class->max_channels = block_state.max_channels.value;
# Line 1425 | Line 1356 | class_entry: CLASS
1356    class->min_idle = block_state.min_idle.value;
1357    class->max_idle = block_state.max_idle.value;
1358  
1359 <  rebuild_cidr_list(class);
1360 <
1359 >  int diff = (class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value ||
1360 >              class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value);
1361    class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1362    class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1363    class->number_per_cidr = block_state.number_per_cidr.value;
1364 +
1365 +  if (diff)
1366 +    class_ip_limit_rebuild(class);
1367   };
1368  
1369   class_items:    class_items class_item | class_item;
# Line 1438 | Line 1372 | class_item:     class_name |
1372                  class_cidr_bitlen_ipv6 |
1373                  class_ping_time |
1374                  class_number_per_cidr |
1375 <                class_number_per_ip |
1375 >                class_number_per_ip_local |
1376 >                class_number_per_ip_global |
1377                  class_connectfreq |
1378                  class_max_channels |
1379                  class_max_number |
1380 <                class_max_global |
1381 <                class_max_local |
1447 <                class_max_ident |
1448 <                class_sendq | class_recvq |
1380 >                class_sendq |
1381 >                class_recvq |
1382                  class_min_idle |
1383                  class_max_idle |
1384                  class_flags |
# Line 1463 | Line 1396 | class_ping_time: PING_TIME '=' timespec
1396      block_state.ping_freq.value = $3;
1397   };
1398  
1399 < class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1399 > class_number_per_ip_local: NUMBER_PER_IP_LOCAL '=' NUMBER ';'
1400 > {
1401 >  if (conf_parser_ctx.pass == 1)
1402 >    block_state.max_perip_local.value = $3;
1403 > };
1404 >
1405 > class_number_per_ip_global: NUMBER_PER_IP_GLOBAL '=' NUMBER ';'
1406   {
1407    if (conf_parser_ctx.pass == 1)
1408 <    block_state.max_perip.value = $3;
1408 >    block_state.max_perip_global.value = $3;
1409   };
1410  
1411   class_connectfreq: CONNECTFREQ '=' timespec ';'
# Line 1487 | Line 1426 | class_max_number: MAX_NUMBER '=' NUMBER
1426      block_state.max_total.value = $3;
1427   };
1428  
1490 – class_max_global: MAX_GLOBAL '=' NUMBER ';'
1491 – {
1492 –  if (conf_parser_ctx.pass == 1)
1493 –    block_state.max_global.value = $3;
1494 – };
1495 –
1496 – class_max_local: MAX_LOCAL '=' NUMBER ';'
1497 – {
1498 –  if (conf_parser_ctx.pass == 1)
1499 –    block_state.max_local.value = $3;
1500 – };
1501 –
1502 – class_max_ident: MAX_IDENT '=' NUMBER ';'
1503 – {
1504 –  if (conf_parser_ctx.pass == 1)
1505 –    block_state.max_ident.value = $3;
1506 – };
1507 –
1429   class_sendq: SENDQ '=' sizespec ';'
1430   {
1431    if (conf_parser_ctx.pass == 1)
# Line 1669 | Line 1590 | auth_entry: IRCD_AUTH
1590    {
1591      struct MaskItem *conf = NULL;
1592      struct split_nuh_item nuh;
1593 +    char *s = node->data;
1594 +
1595 +    if (EmptyString(s))
1596 +      continue;
1597  
1598 <    nuh.nuhmask  = node->data;
1598 >    nuh.nuhmask  = s;
1599      nuh.nickptr  = NULL;
1600      nuh.userptr  = block_state.user.buf;
1601      nuh.hostptr  = block_state.host.buf;
# Line 1871 | Line 1796 | service_name: NAME '=' QSTRING ';'
1796    if (conf_parser_ctx.pass != 2)
1797      break;
1798  
1799 <  if (valid_servname(yylval.string))
1799 >  if (server_valid_name(yylval.string) == true)
1800    {
1801      struct ServiceItem *service = service_make();
1802      service->name = xstrdup(yylval.string);
# Line 2415 | Line 2340 | gecos_entry: GECOS
2340      reset_block_state();
2341   } '{' gecos_items '}' ';'
2342   {
2418 –  struct MaskItem *conf = NULL;
2419 –
2343    if (conf_parser_ctx.pass != 2)
2344      break;
2345  
2346    if (!block_state.name.buf[0])
2347      break;
2348  
2349 <  conf = conf_make(CONF_XLINE);
2350 <  conf->name = xstrdup(block_state.name.buf);
2349 >  struct GecosItem *gecos = gecos_make();
2350 >  gecos->mask = xstrdup(block_state.name.buf);
2351  
2352    if (block_state.rpass.buf[0])
2353 <    conf->reason = xstrdup(block_state.rpass.buf);
2353 >    gecos->reason = xstrdup(block_state.rpass.buf);
2354    else
2355 <    conf->reason = xstrdup(CONF_NOREASON);
2355 >    gecos->reason = xstrdup(CONF_NOREASON);
2356   };
2357  
2358   gecos_items: gecos_items gecos_item | gecos_item;
# Line 2456 | Line 2379 | general_entry: GENERAL '{' general_items
2379   general_items:      general_items general_item | general_item;
2380   general_item:       general_away_count |
2381                      general_away_time |
2459 –                    general_ignore_bogus_ts |
2382                      general_failed_oper_notice |
2383                      general_anti_nick_flood |
2384                      general_max_nick_time |
2385                      general_max_nick_changes |
2386                      general_max_accept |
2387 +                    general_whowas_history_length |
2388                      general_anti_spam_exit_message_time |
2389                      general_ts_warn_delta |
2390                      general_ts_max_delta |
# Line 2485 | Line 2408 | general_item:       general_away_count |
2408                      general_caller_id_wait |
2409                      general_opers_bypass_callerid |
2410                      general_default_floodcount |
2411 +                    general_default_floodtime |
2412                      general_min_nonwildcard |
2413                      general_min_nonwildcard_simple |
2414                      general_throttle_count |
# Line 2517 | Line 2441 | general_max_watch: MAX_WATCH '=' NUMBER
2441    ConfigGeneral.max_watch = $3;
2442   };
2443  
2444 + general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
2445 + {
2446 +  ConfigGeneral.whowas_history_length = $3;
2447 + };
2448 +
2449   general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2450   {
2451    if (conf_parser_ctx.pass == 2)
# Line 2553 | Line 2482 | general_kill_chase_time_limit: KILL_CHAS
2482    ConfigGeneral.kill_chase_time_limit = $3;
2483   };
2484  
2556 – general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2557 – {
2558 –  ConfigGeneral.ignore_bogus_ts = yylval.number;
2559 – };
2560 –
2485   general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2486   {
2487    ConfigGeneral.failed_oper_notice = yylval.number;
# Line 2867 | Line 2791 | general_default_floodcount: DEFAULT_FLOO
2791    ConfigGeneral.default_floodcount = $3;
2792   };
2793  
2794 + general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2795 + {
2796 +  ConfigGeneral.default_floodtime = $3;
2797 + };
2798 +
2799  
2800   /***************************************************************************
2801   * channel {} section
# Line 2875 | Line 2804 | channel_entry: CHANNEL '{' channel_items
2804  
2805   channel_items:      channel_items channel_item | channel_item;
2806   channel_item:       channel_max_bans |
2807 +                    channel_max_bans_large |
2808                      channel_invite_client_count |
2809                      channel_invite_client_time |
2810                      channel_invite_delay_channel |
2811 +                    channel_invite_expire_time |
2812                      channel_knock_client_count |
2813                      channel_knock_client_time |
2814                      channel_knock_delay_channel |
2815                      channel_max_channels |
2816 +                    channel_max_invites |
2817                      channel_default_join_flood_count |
2818                      channel_default_join_flood_time |
2819                      channel_disable_fake_channels |
# Line 2907 | Line 2839 | channel_invite_delay_channel: INVITE_DEL
2839    ConfigChannel.invite_delay_channel = $3;
2840   };
2841  
2842 + channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2843 + {
2844 +  ConfigChannel.invite_expire_time = $3;
2845 + };
2846 +
2847   channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2848   {
2849    ConfigChannel.knock_client_count = $3;
# Line 2927 | Line 2864 | channel_max_channels: MAX_CHANNELS '=' N
2864    ConfigChannel.max_channels = $3;
2865   };
2866  
2867 + channel_max_invites: MAX_INVITES '=' NUMBER ';'
2868 + {
2869 +  ConfigChannel.max_invites = $3;
2870 + };
2871 +
2872   channel_max_bans: MAX_BANS '=' NUMBER ';'
2873   {
2874    ConfigChannel.max_bans = $3;
2875   };
2876  
2877 + channel_max_bans_large: MAX_BANS_LARGE '=' NUMBER ';'
2878 + {
2879 +  ConfigChannel.max_bans_large = $3;
2880 + };
2881 +
2882   channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
2883   {
2884    ConfigChannel.default_join_flood_count = yylval.number;

Comparing ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords):
Revision 7282 by michael, Sun Feb 7 18:04:26 2016 UTC vs.
Revision 8788 by michael, Wed Jan 16 18:47:38 2019 UTC

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

Diff Legend

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