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 9145 by michael, Sun Jan 12 09:55:27 2020 UTC vs.
Revision 9857 by michael, Fri Jan 1 04:43:22 2021 UTC

# Line 1 | Line 1
1   /*
2   *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (c) 2000-2020 ircd-hybrid development team
4 > *  Copyright (c) 2000-2021 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 143 | Line 143 | reset_block_state(void)
143   %token  AUTOCONN
144   %token  AWAY_COUNT
145   %token  AWAY_TIME
146 + %token  BOT
147   %token  BYTES KBYTES MBYTES
148   %token  CALLER_ID_WAIT
149   %token  CAN_FLOOD
# Line 150 | Line 151 | reset_block_state(void)
151   %token  CIDR_BITLEN_IPV4
152   %token  CIDR_BITLEN_IPV6
153   %token  CLASS
154 + %token  CLIENT
155   %token  CLOSE
156   %token  CONNECT
157   %token  CONNECTFREQ
# Line 159 | Line 161 | reset_block_state(void)
161   %token  DEFAULT_JOIN_FLOOD_COUNT
162   %token  DEFAULT_JOIN_FLOOD_TIME
163   %token  DEFAULT_MAX_CLIENTS
164 + %token  DEFER
165   %token  DENY
166   %token  DESCRIPTION
167   %token  DIE
# Line 169 | Line 172 | reset_block_state(void)
172   %token  DLINE_MIN_CIDR6
173   %token  DOTS_IN_IDENT
174   %token  EMAIL
175 + %token  ENABLE_EXTBANS
176   %token  ENCRYPTED
177   %token  EXCEED_LIMIT
178   %token  EXEMPT
# Line 218 | Line 222 | reset_block_state(void)
222   %token  MAX_CHANNELS
223   %token  MAX_IDLE
224   %token  MAX_INVITES
225 + %token  MAX_MONITOR
226   %token  MAX_NICK_CHANGES
227   %token  MAX_NICK_LENGTH
228   %token  MAX_NICK_TIME
229   %token  MAX_NUMBER
230   %token  MAX_TARGETS
231   %token  MAX_TOPIC_LENGTH
227 – %token  MAX_WATCH
232   %token  MIN_IDLE
233   %token  MIN_NONWILDCARD
234   %token  MIN_NONWILDCARD_SIMPLE
# Line 234 | Line 238 | reset_block_state(void)
238   %token  NAME
239   %token  NEED_IDENT
240   %token  NEED_PASSWORD
241 < %token  NETWORK_DESC
241 > %token  NETWORK_DESCRIPTION
242   %token  NETWORK_NAME
243   %token  NICK
244   %token  NO_OPER_FLOOD
245   %token  NO_TILDE
242 – %token  NUMBER
246   %token  NUMBER_PER_CIDR
247   %token  NUMBER_PER_IP_GLOBAL
248   %token  NUMBER_PER_IP_LOCAL
# Line 254 | Line 257 | reset_block_state(void)
257   %token  PING_COOKIE
258   %token  PING_TIME
259   %token  PORT
257 – %token  QSTRING
260   %token  RANDOM_IDLE
261   %token  REASON
262   %token  REDIRPORT
# Line 272 | Line 274 | reset_block_state(void)
274   %token  SERVERINFO
275   %token  SHORT_MOTD
276   %token  SPOOF
275 – %token  SPOOF_NOTICE
277   %token  SQUIT
278   %token  STATS_E_DISABLED
279   %token  STATS_I_OPER_ONLY
# Line 283 | Line 284 | reset_block_state(void)
284   %token  STATS_U_OPER_ONLY
285   %token  T_ALL
286   %token  T_BIND
286 – %token  T_BOTS
287   %token  T_CALLERID
288   %token  T_CCONN
289   %token  T_COMMAND
# Line 294 | Line 294 | reset_block_state(void)
294   %token  T_EXTERNAL
295   %token  T_FARCONNECT
296   %token  T_FILE
297 < %token  T_FULL
297 > %token  T_FLOOD
298   %token  T_GLOBOPS
299   %token  T_INVISIBLE
300   %token  T_IPV4
# Line 318 | Line 318 | reset_block_state(void)
318   %token  T_SKILL
319   %token  T_SOFTCALLERID
320   %token  T_SPY
321 – %token  T_SSL
321   %token  T_TARGET
322 + %token  T_TLS
323   %token  T_UMODES
324 – %token  T_UNAUTH
324   %token  T_UNDLINE
325   %token  T_UNLIMITED
326   %token  T_UNRESV
# Line 341 | Line 340 | reset_block_state(void)
340   %token  TLS_DH_PARAM_FILE
341   %token  TLS_MESSAGE_DIGEST_ALGORITHM
342   %token  TLS_SUPPORTED_GROUPS
344 – %token  TMASKED
343   %token  TS_MAX_DELTA
344   %token  TS_WARN_DELTA
345   %token  TWODOTS
# Line 357 | Line 355 | reset_block_state(void)
355   %token  XLINE
356   %token  XLINE_EXEMPT
357  
358 < %type  <string> QSTRING
359 < %type  <number> NUMBER
358 > %token  <string> QSTRING
359 > %token  <number> NUMBER
360   %type  <number> timespec
361   %type  <number> timespec_
362   %type  <number> sizespec
# Line 437 | Line 435 | modules_path: PATH '=' QSTRING ';'
435  
436  
437   /***************************************************************************
438 < * serverinfo {}  section
438 > * serverinfo {} section
439   ***************************************************************************/
440   serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
441  
# Line 446 | Line 444 | serverinfo_item:        serverinfo_name
444                          serverinfo_hub |
445                          serverinfo_description |
446                          serverinfo_network_name |
447 <                        serverinfo_network_desc |
447 >                        serverinfo_network_description |
448                          serverinfo_default_max_clients |
449                          serverinfo_max_nick_length |
450                          serverinfo_max_topic_length |
# Line 568 | Line 566 | serverinfo_network_name: NETWORK_NAME '=
566   {
567    if (conf_parser_ctx.pass == 2)
568    {
569 <    char *p;
569 >    char *p = strchr(yylval.string, ' ');
570  
571 <    if ((p = strchr(yylval.string, ' ')))
571 >    if (p)
572        *p = '\0';
573  
574      xfree(ConfigServerInfo.network_name);
# Line 578 | Line 576 | serverinfo_network_name: NETWORK_NAME '=
576    }
577   };
578  
579 < serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
579 > serverinfo_network_description: NETWORK_DESCRIPTION '=' QSTRING ';'
580   {
581    if (conf_parser_ctx.pass != 2)
582      break;
583  
584 <  xfree(ConfigServerInfo.network_desc);
585 <  ConfigServerInfo.network_desc = xstrdup(yylval.string);
584 >  xfree(ConfigServerInfo.network_description);
585 >  ConfigServerInfo.network_description = xstrdup(yylval.string);
586   };
587  
588   serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
# Line 599 | Line 597 | serverinfo_default_max_clients: DEFAULT_
597    }
598    else if ($3 > MAXCLIENTS_MAX)
599    {
600 <    char buf[IRCD_BUFSIZE] = "";
600 >    char buf[IRCD_BUFSIZE];
601  
602      snprintf(buf, sizeof(buf), "default_max_clients too high, setting to %d", MAXCLIENTS_MAX);
603      conf_error_report(buf);
# Line 622 | Line 620 | serverinfo_max_nick_length: MAX_NICK_LEN
620    }
621    else if ($3 > NICKLEN)
622    {
623 <    char buf[IRCD_BUFSIZE] = "";
623 >    char buf[IRCD_BUFSIZE];
624  
625      snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
626      conf_error_report(buf);
# Line 645 | Line 643 | serverinfo_max_topic_length: MAX_TOPIC_L
643    }
644    else if ($3 > TOPICLEN)
645    {
646 <    char buf[IRCD_BUFSIZE] = "";
646 >    char buf[IRCD_BUFSIZE];
647  
648      snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
649      conf_error_report(buf);
# Line 711 | Line 709 | motd_entry: MOTD
709      reset_block_state();
710   } '{' motd_items '}' ';'
711   {
712 <  dlink_node *node = NULL;
712 >  dlink_node *node;
713  
714    if (conf_parser_ctx.pass != 2)
715      break;
# Line 804 | Line 802 | pseudo_target: T_TARGET '=' QSTRING ';'
802   /***************************************************************************
803   * log {} section
804   ***************************************************************************/
805 < logging_entry:          T_LOG  '{' logging_items '}' ';' ;
805 > logging_entry:          T_LOG '{' logging_items '}' ';' ;
806   logging_items:          logging_items logging_item | logging_item ;
807  
808   logging_item:           logging_use_logging | logging_file_entry |
# Line 856 | Line 854 | logging_file_type: TYPE
854   {
855    if (conf_parser_ctx.pass == 2)
856      block_state.type.value = 0;
857 < } '='  logging_file_type_items ';' ;
857 > } '=' logging_file_type_items ';' ;
858  
859   logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
860   logging_file_type_item:  USER
# Line 906 | Line 904 | oper_entry: OPERATOR
904    block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
905   } '{' oper_items '}' ';'
906   {
907 <  dlink_node *node = NULL;
907 >  dlink_node *node;
908  
909    if (conf_parser_ctx.pass != 2)
910      break;
# Line 1020 | Line 1018 | oper_tls_connection_required: TLS_CONNEC
1018      break;
1019  
1020    if (yylval.number)
1021 <    block_state.flags.value |= CONF_FLAGS_SSL;
1021 >    block_state.flags.value |= CONF_FLAGS_TLS;
1022    else
1023 <    block_state.flags.value &= ~CONF_FLAGS_SSL;
1023 >    block_state.flags.value &= ~CONF_FLAGS_TLS;
1024   };
1025  
1026   oper_class: CLASS '=' QSTRING ';'
# Line 1035 | Line 1033 | oper_umodes: T_UMODES
1033   {
1034    if (conf_parser_ctx.pass == 2)
1035      block_state.modes.value = 0;
1036 < } '='  oper_umodes_items ';' ;
1036 > } '=' oper_umodes_items ';' ;
1037  
1038   oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1039 < oper_umodes_item:  T_BOTS
1039 > oper_umodes_item: BOT
1040   {
1041    if (conf_parser_ctx.pass == 2)
1042 <    block_state.modes.value |= UMODE_BOTS;
1042 >    block_state.modes.value |= UMODE_BOT;
1043   } | T_CCONN
1044   {
1045    if (conf_parser_ctx.pass == 2)
# Line 1054 | Line 1052 | oper_umodes_item:  T_BOTS
1052   {
1053    if (conf_parser_ctx.pass == 2)
1054      block_state.modes.value |= UMODE_DEBUG;
1055 < } | T_FULL
1055 > } | T_FLOOD
1056   {
1057    if (conf_parser_ctx.pass == 2)
1058 <    block_state.modes.value |= UMODE_FULL;
1058 >    block_state.modes.value |= UMODE_FLOOD;
1059   } | HIDDEN
1060   {
1061    if (conf_parser_ctx.pass == 2)
# Line 1082 | Line 1080 | oper_umodes_item:  T_BOTS
1080   {
1081    if (conf_parser_ctx.pass == 2)
1082      block_state.modes.value |= UMODE_REJ;
1085 – } | T_UNAUTH
1086 – {
1087 –  if (conf_parser_ctx.pass == 2)
1088 –    block_state.modes.value |= UMODE_UNAUTH;
1083   } | T_SPY
1084   {
1085    if (conf_parser_ctx.pass == 2)
# Line 1136 | Line 1130 | oper_flags: IRCD_FLAGS
1130   {
1131    if (conf_parser_ctx.pass == 2)
1132      block_state.port.value = 0;
1133 < } '='  oper_flags_items ';';
1133 > } '=' oper_flags_items ';';
1134  
1135   oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1136   oper_flags_item: KILL ':' REMOTE
# Line 1270 | Line 1264 | class_entry: CLASS
1264  
1265    block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1266    block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1273 –  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1267    block_state.max_sendq.value = DEFAULT_SENDQ;
1268    block_state.max_recvq.value = DEFAULT_RECVQ;
1269   } '{' class_items '}' ';'
# Line 1431 | Line 1424 | class_flags: IRCD_FLAGS
1424   {
1425    if (conf_parser_ctx.pass == 1)
1426      block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1427 < } '='  class_flags_items ';';
1427 > } '=' class_flags_items ';';
1428  
1429   class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1430   class_flags_item: RANDOM_IDLE
# Line 1457 | Line 1450 | listen_entry: LISTEN
1450   listen_flags: IRCD_FLAGS
1451   {
1452    block_state.flags.value = 0;
1453 < } '='  listen_flags_items ';';
1453 > } '=' listen_flags_items ';';
1454  
1455   listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1456 < listen_flags_item: T_SSL
1456 > listen_flags_item: T_TLS
1457   {
1458    if (conf_parser_ctx.pass == 2)
1459 <    block_state.flags.value |= LISTENER_SSL;
1459 >    block_state.flags.value |= LISTENER_TLS;
1460   } | HIDDEN
1461   {
1462    if (conf_parser_ctx.pass == 2)
# Line 1472 | Line 1465 | listen_flags_item: T_SSL
1465   {
1466    if (conf_parser_ctx.pass == 2)
1467     block_state.flags.value |= LISTENER_SERVER;
1468 + } | CLIENT
1469 + {
1470 +  if (conf_parser_ctx.pass == 2)
1471 +   block_state.flags.value |= LISTENER_CLIENT;
1472 + } | DEFER
1473 + {
1474 +  if (conf_parser_ctx.pass == 2)
1475 +   block_state.flags.value |= LISTENER_DEFER;
1476   };
1477  
1478   listen_items:   listen_items listen_item | listen_item;
# Line 1486 | Line 1487 | port_item: NUMBER
1487    if (conf_parser_ctx.pass == 2)
1488    {
1489   #ifndef HAVE_TLS
1490 <    if (block_state.flags.value & LISTENER_SSL)
1490 >    if (block_state.flags.value & LISTENER_TLS)
1491      {
1492        conf_error_report("TLS not available - port closed");
1493        break;
# Line 1499 | Line 1500 | port_item: NUMBER
1500    if (conf_parser_ctx.pass == 2)
1501    {
1502   #ifndef HAVE_TLS
1503 <    if (block_state.flags.value & LISTENER_SSL)
1503 >    if (block_state.flags.value & LISTENER_TLS)
1504      {
1505        conf_error_report("TLS not available - port closed");
1506        break;
# Line 1533 | Line 1534 | auth_entry: IRCD_AUTH
1534      reset_block_state();
1535   } '{' auth_items '}' ';'
1536   {
1537 <  dlink_node *node = NULL;
1537 >  dlink_node *node;
1538  
1539    if (conf_parser_ctx.pass != 2)
1540      break;
# Line 1567 | Line 1568 | auth_entry: IRCD_AUTH
1568        conf->name = xstrdup(block_state.name.buf);
1569  
1570      conf->flags = block_state.flags.value;
1571 <    conf->port  = block_state.port.value;
1571 >    conf->port = block_state.port.value;
1572  
1573      conf_add_class_to_conf(conf, block_state.class.buf);
1574      add_conf_by_address(CONF_CLIENT, conf);
# Line 1621 | Line 1622 | auth_flags: IRCD_FLAGS
1622   } '=' auth_flags_items ';';
1623  
1624   auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1625 < auth_flags_item: SPOOF_NOTICE
1625 < {
1626 <  if (conf_parser_ctx.pass == 2)
1627 <    block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1628 < } | EXCEED_LIMIT
1625 > auth_flags_item: EXCEED_LIMIT
1626   {
1627    if (conf_parser_ctx.pass == 2)
1628      block_state.flags.value |= CONF_FLAGS_NOLIMIT;
# Line 2123 | Line 2120 | connect_flags_item: AUTOCONN
2120   {
2121    if (conf_parser_ctx.pass == 2)
2122      block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2123 < } | T_SSL
2123 > } | T_TLS
2124   {
2125    if (conf_parser_ctx.pass == 2)
2126 <    block_state.flags.value |= CONF_FLAGS_SSL;
2126 >    block_state.flags.value |= CONF_FLAGS_TLS;
2127   };
2128  
2129   connect_encrypted: ENCRYPTED '=' TBOOL ';'
# Line 2382 | Line 2379 | general_item:       general_away_count |
2379                      general_kline_min_cidr |
2380                      general_kline_min_cidr6 |
2381                      general_stats_e_disabled |
2382 <                    general_max_watch |
2382 >                    general_max_monitor |
2383                      general_cycle_on_host_change |
2384                      error;
2385  
# Line 2397 | Line 2394 | general_away_time: AWAY_TIME '=' timespe
2394    ConfigGeneral.away_time = $3;
2395   };
2396  
2397 < general_max_watch: MAX_WATCH '=' NUMBER ';'
2397 > general_max_monitor: MAX_MONITOR '=' NUMBER ';'
2398   {
2399 <  ConfigGeneral.max_watch = $3;
2399 >  ConfigGeneral.max_monitor = $3;
2400   };
2401  
2402   general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
# Line 2514 | Line 2511 | general_stats_u_oper_only: STATS_U_OPER_
2511  
2512   general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2513   {
2514 <  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
2518 < } | STATS_K_OPER_ONLY '=' TMASKED ';'
2519 < {
2520 <  ConfigGeneral.stats_k_oper_only = 1;
2514 >  ConfigGeneral.stats_k_oper_only = yylval.number;
2515   };
2516  
2517   general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2518   {
2519 <  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
2526 < } | STATS_I_OPER_ONLY '=' TMASKED ';'
2527 < {
2528 <  ConfigGeneral.stats_i_oper_only = 1;
2519 >  ConfigGeneral.stats_i_oper_only = yylval.number;
2520   };
2521  
2522   general_pace_wait: PACE_WAIT '=' timespec ';'
# Line 2594 | Line 2585 | general_oper_umodes: OPER_UMODES
2585   } '=' umode_oitems ';' ;
2586  
2587   umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2588 < umode_oitem:     T_BOTS
2588 > umode_oitem: BOT
2589   {
2590 <  ConfigGeneral.oper_umodes |= UMODE_BOTS;
2590 >  ConfigGeneral.oper_umodes |= UMODE_BOT;
2591   } | T_CCONN
2592   {
2593    ConfigGeneral.oper_umodes |= UMODE_CCONN;
# Line 2606 | Line 2597 | umode_oitem:     T_BOTS
2597   } | T_DEBUG
2598   {
2599    ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2600 < } | T_FULL
2600 > } | T_FLOOD
2601   {
2602 <  ConfigGeneral.oper_umodes |= UMODE_FULL;
2602 >  ConfigGeneral.oper_umodes |= UMODE_FLOOD;
2603   } | HIDDEN
2604   {
2605    ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
# Line 2627 | Line 2618 | umode_oitem:     T_BOTS
2618   } | T_REJ
2619   {
2620    ConfigGeneral.oper_umodes |= UMODE_REJ;
2630 – } | T_UNAUTH
2631 – {
2632 –  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
2621   } | T_SPY
2622   {
2623    ConfigGeneral.oper_umodes |= UMODE_SPY;
# Line 2671 | Line 2659 | general_oper_only_umodes: OPER_ONLY_UMOD
2659   } '=' umode_items ';' ;
2660  
2661   umode_items:  umode_items ',' umode_item | umode_item;
2662 < umode_item:   T_BOTS
2662 > umode_item: BOT
2663   {
2664 <  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
2664 >  ConfigGeneral.oper_only_umodes |= UMODE_BOT;
2665   } | T_CCONN
2666   {
2667    ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
# Line 2683 | Line 2671 | umode_item:   T_BOTS
2671   } | T_DEBUG
2672   {
2673    ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2674 < } | T_FULL
2674 > } | T_FLOOD
2675   {
2676 <  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
2676 >  ConfigGeneral.oper_only_umodes |= UMODE_FLOOD;
2677   } | T_SKILL
2678   {
2679    ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
# Line 2698 | Line 2686 | umode_item:   T_BOTS
2686   } | T_REJ
2687   {
2688    ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2701 – } | T_UNAUTH
2702 – {
2703 –  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
2689   } | T_SPY
2690   {
2691    ConfigGeneral.oper_only_umodes |= UMODE_SPY;
# Line 2777 | Line 2762 | channel_item:       channel_max_bans |
2762                      channel_default_join_flood_count |
2763                      channel_default_join_flood_time |
2764                      channel_disable_fake_channels |
2765 +                    channel_enable_extbans |
2766                      error;
2767  
2768 + channel_enable_extbans: ENABLE_EXTBANS '=' TBOOL ';'
2769 + {
2770 +  ConfigChannel.enable_extbans = yylval.number;
2771 + };
2772 +
2773   channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2774   {
2775    ConfigChannel.disable_fake_channels = yylval.number;

Diff Legend

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