[ViewVC] Diff of: svn/ircd-hybrid/trunk/src/conf

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 7248 by michael, Thu Feb 4 17:21:58 2016 UTC vs.
Revision 7624 by michael, Thu Jun 23 12:44:09 2016 UTC

+#include "conf.h"
+#include "conf_class.h"
+#include "conf_cluster.h"
-+
+#include "conf_gecos.h"
+#include "conf_pseudo.h"
+#include "conf_resv.h"
+#include "conf_service.h"
+    max_total,
+    max_global,
+    max_local,
-–
+    max_ident,
+    max_sendq,
+    max_recvq,
+    max_channels,
+%token  CALLER_ID_WAIT
+%token  CAN_FLOOD
+%token  CHANNEL
-+
+%token  CHECK_CACHE
+%token  CIDR_BITLEN_IPV4
+%token  CIDR_BITLEN_IPV6
+%token  CLASS
+%token  KNOCK_CLIENT_TIME
+%token  KNOCK_DELAY_CHANNEL
+%token  LEAF_MASK
-+
+%token  LIBGEOIP_DATABASE_OPTIONS
-+
+%token  LIBGEOIP_IPV4_DATABASE_FILE
-+
+%token  LIBGEOIP_IPV6_DATABASE_FILE
+%token  LISTEN
+%token  MASK
+%token  MAX_ACCEPT
+%token  MAX_BANS
+%token  MAX_CHANNELS
+%token  MAX_GLOBAL
-–
+%token  MAX_IDENT
+%token  MAX_IDLE
+%token  MAX_LOCAL
+%token  MAX_NICK_CHANGES
+%token  MAX_TARGETS
+%token  MAX_TOPIC_LENGTH
+%token  MAX_WATCH
-+
+%token  MEMORY_CACHE
+%token  MIN_IDLE
+%token  MIN_NONWILDCARD
+%token  MIN_NONWILDCARD_SIMPLE
-+
+%token  MMAP_CACHE
+%token  MODULE
+%token  MODULES
+%token  MOTD
+%token  SSL_DH_ELLIPTIC_CURVE
+%token  SSL_DH_PARAM_FILE
+%token  SSL_MESSAGE_DIGEST_ALGORITHM
-+
+%token  STANDARD
+%token  STATS_E_DISABLED
+%token  STATS_I_OPER_ONLY
+%token  STATS_K_OPER_ONLY
+%token  VHOST6
+%token  WARN_NO_CONNECT_BLOCK
+%token  WHOIS
-+
+%token  WHOWAS_HISTORY_LENGTH
+%token  XLINE
+%token  XLINE_EXEMPT
+                        serverinfo_ssl_certificate_file |
+                        serverinfo_ssl_cipher_list |
+                        serverinfo_ssl_message_digest_algorithm |
-+
+                        serverinfo_libgeoip_database_options |
-+
+                        serverinfo_libgeoip_ipv4_database_file |
-+
+                        serverinfo_libgeoip_ipv6_database_file |
+                        error ';' ;
+};
-+
+serverinfo_libgeoip_database_options: LIBGEOIP_DATABASE_OPTIONS
-+
+{
-+
+  if (conf_parser_ctx.pass == 1)
-+
+    ConfigServerInfo.libgeoip_database_options = 0;
-+
+} '='  options_items ';';
-+
-+
+options_items: options_items ',' options_item | options_item;
-+
+options_item: STANDARD
-+
+{
-+
+#ifdef HAVE_LIBGEOIP
-+
+  if (conf_parser_ctx.pass == 1)
-+
+    ConfigServerInfo.libgeoip_database_options |= GEOIP_STANDARD;
-+
+#endif
-+
+} | MEMORY_CACHE
-+
+{
-+
+#ifdef HAVE_LIBGEOIP
-+
+  if (conf_parser_ctx.pass == 1)
-+
+    ConfigServerInfo.libgeoip_database_options |= GEOIP_MEMORY_CACHE;
-+
+#endif
-+
+} | MMAP_CACHE
-+
+{
-+
+#ifdef HAVE_LIBGEOIP
-+
+  if (conf_parser_ctx.pass == 1)
-+
+    ConfigServerInfo.libgeoip_database_options |= GEOIP_MMAP_CACHE;
-+
+#endif
-+
+} | CHECK_CACHE
-+
+{
-+
+#ifdef HAVE_LIBGEOIP
-+
+  if (conf_parser_ctx.pass == 1)
-+
+    ConfigServerInfo.libgeoip_database_options |= GEOIP_CHECK_CACHE;
-+
+#endif
-+
+};
-+
-+
+serverinfo_libgeoip_ipv4_database_file:  LIBGEOIP_IPV4_DATABASE_FILE '=' QSTRING ';'
-+
+{
-+
+  if (conf_parser_ctx.pass == 2)
-+
+  {
-+
+    xfree(ConfigServerInfo.libgeoip_ipv4_database_file);
-+
+    ConfigServerInfo.libgeoip_ipv4_database_file = xstrdup(yylval.string);
-+
-+
+#ifdef HAVE_LIBGEOIP
-+
+    if (GeoIPv4_ctx)
-+
+      GeoIP_delete(GeoIPv4_ctx);
-+
+    GeoIPv4_ctx = GeoIP_open(yylval.string, ConfigServerInfo.libgeoip_database_options);
-+
+#endif
-+
+  }
-+
+};
-+
-+
+serverinfo_libgeoip_ipv6_database_file:  LIBGEOIP_IPV6_DATABASE_FILE '=' QSTRING ';'
-+
+{
-+
+  if (conf_parser_ctx.pass == 2)
-+
+  {
-+
+    xfree(ConfigServerInfo.libgeoip_ipv6_database_file);
-+
+    ConfigServerInfo.libgeoip_ipv6_database_file = xstrdup(yylval.string);
-+
-+
+#ifdef HAVE_LIBGEOIP
-+
+    if (GeoIPv6_ctx)
-+
+      GeoIP_delete(GeoIPv6_ctx);
-+
+    GeoIPv6_ctx = GeoIP_open(yylval.string, ConfigServerInfo.libgeoip_database_options);
-+
+#endif
-+
+  }
-+
+};
-+
+serverinfo_name: NAME '=' QSTRING ';'
+  /* This isn't rehashable */
+    struct MaskItem *conf = NULL;
+    struct split_nuh_item nuh;
-+
+    char *s = node->data;
-<
+    nuh.nuhmask  = node->data;
->
+    if (EmptyString(s))
->
+      continue;
->
->
+    nuh.nuhmask  = s;
+    nuh.nickptr  = NULL;
+    nuh.userptr  = block_state.user.buf;
+    nuh.hostptr  = block_state.host.buf;
+  class->max_total = block_state.max_total.value;
+  class->max_global = block_state.max_global.value;
+  class->max_local = block_state.max_local.value;
-–
+  class->max_ident = block_state.max_ident.value;
+  class->max_sendq = block_state.max_sendq.value;
+  class->max_recvq = block_state.max_recvq.value;
+  class->max_channels = block_state.max_channels.value;
+                class_max_number |
+                class_max_global |
+                class_max_local |
-<
+                class_max_ident |
-<
+                class_sendq | class_recvq |
->
+                class_sendq |
->
+                class_recvq |
+                class_min_idle |
+                class_max_idle |
+                class_flags |
+    block_state.max_local.value = $3;
+};
-–
+class_max_ident: MAX_IDENT '=' NUMBER ';'
-–
+{
-–
+  if (conf_parser_ctx.pass == 1)
-–
+    block_state.max_ident.value = $3;
-–
+};
-–
+class_sendq: SENDQ '=' sizespec ';'
+  if (conf_parser_ctx.pass == 1)
+    struct MaskItem *conf = NULL;
+    struct split_nuh_item nuh;
-+
+    char *s = node->data;
-+
-+
+    if (EmptyString(s))
-+
+      continue;
-<
+    nuh.nuhmask  = node->data;
->
+    nuh.nuhmask  = s;
+    nuh.nickptr  = NULL;
+    nuh.userptr  = block_state.user.buf;
+    nuh.hostptr  = block_state.host.buf;
+  if (conf_parser_ctx.pass != 2)
+    break;
-<
+  create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
->
+  resv_make(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
+};
+resv_items:     resv_items resv_item | resv_item;
+    reset_block_state();
+} '{' gecos_items '}' ';'
-–
+  struct MaskItem *conf = NULL;
-–
+  if (conf_parser_ctx.pass != 2)
+    break;
+  if (!block_state.name.buf[0])
+    break;
-<
+  conf = conf_make(CONF_XLINE);
-<
+  conf->name = xstrdup(block_state.name.buf);
->
+  struct GecosItem *gecos = gecos_make();
->
+  gecos->mask = xstrdup(block_state.name.buf);
+  if (block_state.rpass.buf[0])
-<
+    conf->reason = xstrdup(block_state.rpass.buf);
->
+    gecos->reason = xstrdup(block_state.rpass.buf);
+  else
-<
+    conf->reason = xstrdup(CONF_NOREASON);
->
+    gecos->reason = xstrdup(CONF_NOREASON);
+};
+gecos_items: gecos_items gecos_item | gecos_item;
+                    general_max_nick_time |
+                    general_max_nick_changes |
+                    general_max_accept |
-+
+                    general_whowas_history_length |
+                    general_anti_spam_exit_message_time |
+                    general_ts_warn_delta |
+                    general_ts_max_delta |
+  ConfigGeneral.max_watch = $3;
+};
-+
+general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
-+
+{
-+
+  ConfigGeneral.whowas_history_length = $3;
-+
+};
-+
+general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
+  if (conf_parser_ctx.pass == 2)

Diff Legend

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

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents): Revision 7248 by michael, Thu Feb 4 17:21:58 2016 UTC vs. Revision 7624 by michael, Thu Jun 23 12:44:09 2016 UTC

Diff Legend

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 7248 by michael, Thu Feb 4 17:21:58 2016 UTC vs.
Revision 7624 by michael, Thu Jun 23 12:44:09 2016 UTC