From d1206830dd995f09d6f2666ceb39044b37043466 Mon Sep 17 00:00:00 2001
From: vpozdyayev <vpozdyayev@yandex-team.com>
Date: Wed, 31 Jul 2024 05:54:37 +0300
Subject: [PATCH 001/104] Bring macros back into C/C++ builders
 dafe804937a0edc8bc18e9de2e9818f886960352

---
 build/conf/compilers/gnu_compiler.conf  | 60 ++------------------
 build/conf/compilers/msvc_compiler.conf |  3 -
 build/conf/settings.conf                |  2 -
 build/ymake.core.conf                   | 73 ++++++++-----------------
 4 files changed, 29 insertions(+), 109 deletions(-)

diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 9781f752f604..659c8936e901 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -204,31 +204,8 @@ _C_CPP_KV_STYLE_NEW=${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
 _C_CPP_KV_STYLE_P=p CC
 _C_CPP_KV_STYLE_PC=pc green
 
-_CPP_ARGS=\
-    $CLANG_STATIC_ANALYZER_OPTIONS && \
-    $CLANG_TIDY_ARGS \
-    $YNDEXER_ARGS \
-    $RETRY_ARGS \
-    $CXX_COMPILER_OLD \
-    $C_FLAGS_PLATFORM \
-    $GCC_COMPILE_FLAGS \
-    $CXXFLAGS \
-    $CL_MACRO_INFO \
-    $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
-    $_COMPILER_TIME_TRACE_FLAGS \
-    $EXTRA_OUTPUT \
-    $SRCFLAGS \
-    $_LANG_CFLAGS_VALUE \
-    ${input:SRC} \
-    $TOOLCHAIN_ENV \
-    $YNDEXER_OUTPUT \
-    && $_COMPILER_TIME_TRACE_POSTPROCESS \
-    $_C_CPP_KV_STYLE
-
-_CPP_ARGS_NEW_CMD_0=\
-    $CLANG_STATIC_ANALYZER_OPTIONS_NEW
-
-_CPP_ARGS_NEW_CMD_1_1=\
+_CPP_ARGS_NEW=\
+    $CLANG_STATIC_ANALYZER_OPTIONS_NEW && \
     $CLANG_TIDY_ARGS \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
@@ -239,36 +216,14 @@ _CPP_ARGS_NEW_CMD_1_1=\
     $CL_MACRO_INFO \
     $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
     $_COMPILER_TIME_TRACE_FLAGS \
-    $EXTRA_OUTPUT
-_CPP_ARGS_NEW_CMD_1_2=\
-    $SRCFLAGS \
-    $_LANG_CFLAGS_VALUE_NEW \
-    ${input:SRC} \
-    $TOOLCHAIN_ENV \
-    $YNDEXER_OUTPUT
-_CPP_ARGS_NEW_CMD_2=\
-    $_COMPILER_TIME_TRACE_POSTPROCESS \
-    $_C_CPP_KV_STYLE_NEW \
-    $SCU_NAME_KV_NEW
-
-_C_ARGS=\
-    $CLANG_TIDY_ARGS \
-    $YNDEXER_ARGS \
-    $RETRY_ARGS \
-    $C_COMPILER_OLD \
-    $C_FLAGS_PLATFORM \
-    $GCC_COMPILE_FLAGS \
-    $CFLAGS \
-    $CL_MACRO_INFO \
-    $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
-    $_COMPILER_TIME_TRACE_FLAGS \
-    $CONLYFLAGS \
     $EXTRA_OUTPUT \
     $SRCFLAGS \
+    $_LANG_CFLAGS_VALUE_NEW \
     ${input:SRC} \
     $TOOLCHAIN_ENV \
     $YNDEXER_OUTPUT \
-    $_C_CPP_KV_STYLE
+    && $_COMPILER_TIME_TRACE_POSTPROCESS \
+    $_C_CPP_KV_STYLE_NEW
 
 _C_ARGS_NEW=\
     $CLANG_TIDY_ARGS \
@@ -313,10 +268,7 @@ _SRC_C_NODEPS_CMD=\
 
 _FORCE_CPP_FLAGS=-x c++
 
-_SRC_CPP_CMD=$_CPP_ARGS
-_SRC_CPP_CMD_NEW=       $_CPP_ARGS_NEW_CMD_0                                           && $_CPP_ARGS_NEW_CMD_1_1                   $_CPP_ARGS_NEW_CMD_1_2 && $_CPP_ARGS_NEW_CMD_2
-_SRC_CPP_CMD_NEW_FORCED=$_CPP_ARGS_NEW_CMD_0 $CLANG_STATIC_ANALYZER_OPTIONS_NEW_FORCED && $_CPP_ARGS_NEW_CMD_1_1 $_FORCE_CPP_FLAGS $_CPP_ARGS_NEW_CMD_1_2 && $_CPP_ARGS_NEW_CMD_2
-_SRC_C_CMD=$_C_ARGS
+_SRC_CPP_CMD_NEW=$_CPP_ARGS_NEW
 _SRC_C_CMD_NEW=$_C_ARGS_NEW
 _SRC_M_CMD=$SRC_c($SRC $SRCFLAGS)
 _SRC_MASM_CMD=$_EMPTY_CMD
diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf
index 0f3f0484e0b3..9550b9effb54 100644
--- a/build/conf/compilers/msvc_compiler.conf
+++ b/build/conf/compilers/msvc_compiler.conf
@@ -92,10 +92,7 @@ _C_CPP_KV_STYLE_P=p CC
 _C_CPP_KV_STYLE_PC=pc yellow
 
 _SRC_C_NODEPS_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo${OUTFILE} ${SRC} ${EXTRA_C_FLAGS} ${pre=/I :INC} ${CFLAGS} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
-_SRC_CPP_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER_OLD} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} ${SRCFLAGS} ${_LANG_CFLAGS_VALUE} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
 _SRC_CPP_CMD_NEW=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} ${SRCFLAGS} ${_LANG_CFLAGS_VALUE_NEW} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
-_SRC_CPP_CMD_NEW_FORCED=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} $_FORCE_CPP_FLAGS ${SRCFLAGS} ${_LANG_CFLAGS_VALUE_NEW} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
-_SRC_C_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER_OLD} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
 _SRC_C_CMD_NEW=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
 _SRC_M_CMD=$_EMPTY_CMD
 _SRC_MASM_CMD=${cwd:ARCADIA_BUILD_ROOT} ${TOOLCHAIN_ENV} ${ML_WRAPPER} ${MASM_COMPILER_OLD} ${MASMFLAGS} ${SRCFLAGS} $_MASM_IO ${hide;kv:"p AS"} ${hide;kv:"pc yellow"}
diff --git a/build/conf/settings.conf b/build/conf/settings.conf
index 6b34cbdc44b3..a35a68a0cb0a 100644
--- a/build/conf/settings.conf
+++ b/build/conf/settings.conf
@@ -41,11 +41,9 @@ _FOLDABLE_VARS=\
     _COMPILER_TIME_TRACE_FLAGS \
     _COMPILER_TIME_TRACE_GRANULARITY \
     _COMPILER_TIME_TRACE_POSTPROCESS \
-    _CPP_ARGS \
     _CROSS_SUFFIX \
     _CXX_DEFINES \
     _CXX_FLAGS \
-    _C_ARGS \
     _C_CPP_KV_STYLE \
     _C_FLAGS \
     _C_FOPTIONS \
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index bdb2f6ec92e1..8b864929bfe2 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -47,6 +47,9 @@ FALSE=no
 MODULE_PREFIX=
 MODULE_SUFFIX=
 
+# do not keep it undefined, since we directly subsitute it in LLVM_COMPILE_CXX etc.
+WINDOWS=no
+
 # tag:src-processing tag:internal
 ### @usage: _SRC(Ext Src Flags) # internal
 ###
@@ -187,13 +190,6 @@ CLANG_CSA_ROOT=${CLANG_CSA16_RESOURCE_GLOBAL}
 CLANG_CSA_BIN=${CLANG_CSA16_RESOURCE_GLOBAL}/bin/clang
 when ($CLANG_SA_ENABLE == "yes" && $_CLANG_SA_CONFIG && $CLANG_CSA_ROOT) {
     PEERDIR+=build/platform/clang/clang-static-analyzer
-    CLANG_STATIC_ANALYZER_OPTIONS=$YMAKE_PYTHON3 ${input:"build/scripts/clang_static_analyzer.py"} \
-                                  "--testing-src" ${input:SRC} \
-                                  "--clang-bin" $CLANG_CSA_BIN \
-                                  "--source-root" $(SOURCE_ROOT) \
-                                  "--config-file" ${input:_CLANG_SA_CONFIG} \
-                                  "--plugins-begin" "dummy_param" $_CLANG_SA_UNWRAP_PLUGINS($CLANG_SA_PLUGINS) "--plugins-end" \
-                                  $GCC_COMPILE_FLAGS $CXXFLAGS $SRCFLAGS
     CLANG_STATIC_ANALYZER_OPTIONS_NEW=$YMAKE_PYTHON3 ${input:"build/scripts/clang_static_analyzer.py"} \
                                       "--testing-src" ${input:SRC} \
                                       "--clang-bin" $CLANG_CSA_BIN \
@@ -201,12 +197,9 @@ when ($CLANG_SA_ENABLE == "yes" && $_CLANG_SA_CONFIG && $CLANG_CSA_ROOT) {
                                       "--config-file" ${input:_CLANG_SA_CONFIG} \
                                       "--plugins-begin" "dummy_param" $CLANG_SA_PLUGINS "--plugins-end" \
                                       $GCC_COMPILE_FLAGS $CXXFLAGS $SRCFLAGS
-    CLANG_STATIC_ANALYZER_OPTIONS_NEW_FORCED=$_FORCE_CPP_FLAGS
 }
 otherwise {
-    CLANG_STATIC_ANALYZER_OPTIONS=
     CLANG_STATIC_ANALYZER_OPTIONS_NEW=
-    CLANG_STATIC_ANALYZER_OPTIONS_NEW_FORCED=
 }
 
 FAIL_MODULE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/fail_module_cmd.py"} $TARGET ${hide;kv:"p ER"} ${hide;kv:"pc red"}
@@ -3207,7 +3200,7 @@ _SRC_CPP_TOOLCHAIN_INFO_PEER=
 
 # tag:src-processing
 macro _SRC("cpp", SRC, SRCFLAGS...) {
-    .CMD=$_SRC_CPP_CMD_NEW
+    .CMD=$_SRC_cpp_new($SRC $SRCFLAGS)
     .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS)
     .STRUCT_CMD=yes
@@ -3215,7 +3208,7 @@ macro _SRC("cpp", SRC, SRCFLAGS...) {
 
 # tag:src-processing
 macro _SRC("cxx", SRC, SRCFLAGS...) {
-    .CMD=$_SRC_CPP_CMD_NEW
+    .CMD=$_SRC_cpp_new($SRC $SRCFLAGS)
     .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS)
     .STRUCT_CMD=yes
@@ -3223,7 +3216,7 @@ macro _SRC("cxx", SRC, SRCFLAGS...) {
 
 # tag:src-processing
 macro _SRC("cc", SRC, SRCFLAGS...) {
-    .CMD=$_SRC_CPP_CMD_NEW
+    .CMD=$_SRC_cpp_new($SRC $SRCFLAGS)
     .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS)
     .STRUCT_CMD=yes
@@ -3231,7 +3224,7 @@ macro _SRC("cc", SRC, SRCFLAGS...) {
 
 # tag:src-processing
 macro _SRC("auxcpp", SRC, SRCFLAGS...) {
-    .CMD=$_SRC_CPP_CMD_NEW_FORCED
+    .CMD=$_SRC_cpp_new($SRC $_FORCE_CPP_FLAGS $SRCFLAGS)
     .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($_FORCE_CPP_FLAGS $SRCFLAGS)
     .STRUCT_CMD=yes
@@ -3239,7 +3232,7 @@ macro _SRC("auxcpp", SRC, SRCFLAGS...) {
 
 # tag:src-processing
 macro _SRC("C", SRC, SRCFLAGS...) {
-    .CMD=$_SRC_CPP_CMD_NEW
+    .CMD=$_SRC_cpp_new($SRC $SRCFLAGS)
     .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS)
     .STRUCT_CMD=yes
@@ -3247,7 +3240,7 @@ macro _SRC("C", SRC, SRCFLAGS...) {
 
 # tag:src-processing
 macro _SRC("c", SRC, SRCFLAGS...) {
-    .CMD=$_SRC_C_CMD_NEW
+    .CMD=$_SRC_c_new($SRC $SRCFLAGS)
     .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS $USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL)
     .STRUCT_CMD=yes
@@ -3373,12 +3366,11 @@ macro _SRC_PYSRC(SRC, SRCFLAGS...) {
 
 # tag:src-processing
 macro _SRC_c_nodeps(SRC, OUTFILE, INC...) {
+     # this macro is used by link commands; TODO switch to the new engine after those
      .CMD=$_SRC_C_NODEPS_CMD
 }
 
-# Custom flags for generated cpp-files. To support another generator:
-# - insert additional file extension before .cpp into generated cpp-file name
-# - update _LANG_CFLAGS_FILTER variable. Don't forget to add ' SKIP ' after flag list
+# Custom flags for generated cpp-files
 #
 # ragel5 and ragel6 generated terrible code which makes use of goto's in switch statements.
 # This triggers -Werror-implicit-fallthrough due to `unannotated fall-through between switch labels`.
@@ -3390,44 +3382,23 @@ macro _SRC_c_nodeps(SRC, OUTFILE, INC...) {
 # generated sources
 ## tag:src-processing
 when ($CLANG == "yes") {
-    _LANG_CFLAGS_FILTER=\
-        ${pre=-Wno-implicit-fallthrough -fno-profile-instr-generate -fno-coverage-mapping SKIP ;ext=.rl5:SRC} \
-        ${pre=-Wno-implicit-fallthrough -fno-profile-instr-generate -fno-coverage-mapping SKIP ;ext=.rl6:SRC} \
-        ${pre=-Wno-implicit-fallthrough -fno-profile-instr-generate -fno-coverage-mapping SKIP ;ext=.pyx:SRC}
     _LANG_CFLAGS_RL=-Wno-implicit-fallthrough -fno-profile-instr-generate -fno-coverage-mapping
     _LANG_CFLAGS_SWG=-Wno-deprecated-declarations -fno-profile-instr-generate -fno-coverage-mapping
     _LANG_CFLAGS_LEX=-Wno-unused-variable -fno-profile-instr-generate -fno-coverage-mapping
     _LANG_CFLAGS_BISON=-Wno-unused-but-set-variable -Wno-deprecated-copy -fno-profile-instr-generate -fno-coverage-mapping
 }
 otherwise {
-    _LANG_CFLAGS_FILTER=\
-        ${pre=-Wno-implicit-fallthrough SKIP ;ext=.rl5:SRC} \
-        ${pre=-Wno-implicit-fallthrough SKIP ;ext=.rl6:SRC} \
-        ${pre=-Wno-implicit-fallthrough SKIP ;ext=.pyx:SRC}
     _LANG_CFLAGS_RL=-Wno-implicit-fallthrough
     _LANG_CFLAGS_SWG=-Wno-deprecated-declarations
     _LANG_CFLAGS_LEX=-Wno-unused-variable
     _LANG_CFLAGS_BISON=-Wno-unused-but-set-variable -Wno-deprecated-copy
 }
 
-# tag:src-processing
-# Magic macro for removing file name from result (file name is passed as unused SKIP parameter)
-macro _FILTER_EXTS(SKIP="", FLAGS...) {
-    .CMD=$FLAGS
-}
-
-# tag:src-processing
-macro _LANG_CFLAGS(SRC) {
-    .CMD=$_FILTER_EXTS($_LANG_CFLAGS_FILTER)
-}
-
 # tag:src-processing
 # ymake bug workaround: variables followed a macros call in .CMD are not substituted and are placed in result as is
 # Pack macro call into a variable and use it in _SRC_CPP_CMD instead of macro call
-_LANG_CFLAGS_VALUE=
 _LANG_CFLAGS_VALUE_NEW=
 when ($CLANG == "yes" || $CLANG_CL == "yes" || $GCC == "yes") {
-    _LANG_CFLAGS_VALUE=$_LANG_CFLAGS(${noext:SRC})
     _LANG_CFLAGS_VALUE_NEW=\
         ${pre=$_LANG_CFLAGS_BISON;clear;ext=.y;noext;input:SRC} \
         ${pre=$_LANG_CFLAGS_BISON;clear;ext=.ypp;noext;input:SRC} \
@@ -3441,26 +3412,24 @@ when ($CLANG == "yes" || $CLANG_CL == "yes" || $GCC == "yes") {
 # Allows to add single compilation unit name to the node's 'kv' section.
 # This is used by the coverage machinery to instrument only the necessary sources
 # when --coverage-prefix-filter <rootrelpath> is specified. For more info see DEVTOOLSSUPPORT-16891
-SCU_NAME_KV=
 SCU_NAME_KV_NEW=
 SCU_NAME_KV_NEW_BODY=scu_name ${input:SRC}
 when ($CLANG_COVERAGE && $CLANG_COVERAGE != "no" && $USE_SCU_VALUE == "yes") {
-    SCU_NAME_KV=${hide;kv:"scu_name $KV_VAL"}
     SCU_NAME_KV_NEW=${hide;kv:SCU_NAME_KV_NEW_BODY}
 }
 
-macro _ADD_SCU_NAME(KV_VAL) {
-    .CMD=$SCU_NAME_KV
+macro _ADD_SCU_NAME_NEW(KV_VAL) {
+    .CMD=$SCU_NAME_KV_NEW
 }
 
 # tag:src-processing
-macro _SRC_cpp(SRC, COMPILE_OUT_SUFFIX="", SRCFLAGS...) {
-    .CMD=$_SRC_CPP_CMD $_ADD_SCU_NAME(${input:SRC})
+macro _SRC_cpp_new(SRC, COMPILE_OUT_SUFFIX="", SRCFLAGS...) {
+    .CMD=$_SRC_CPP_CMD_NEW && $_ADD_SCU_NAME_NEW(${input:SRC})
 }
 
 # tag:src-processing
-macro _SRC_c(SRC, COMPILE_OUT_SUFFIX="", SRCFLAGS...) {
-    .CMD=$_SRC_C_CMD $_ADD_SCU_NAME(${input:SRC})
+macro _SRC_c_new(SRC, COMPILE_OUT_SUFFIX="", SRCFLAGS...) {
+    .CMD=$_SRC_C_CMD_NEW $_ADD_SCU_NAME_NEW(${input:SRC})
 }
 
 # tag:src-processing
@@ -3607,13 +3576,15 @@ macro SRCS(FILES...) {
 
 # tag:c-specific
 macro _SRC_C_CUSTOM_FLAGS(SRC, COMPILE_OUT_SUFFIX, CUSTOM_FLAGS...) {
-    .CMD=$_SRC_c($SRC COMPILE_OUT_SUFFIX ${COMPILE_OUT_SUFFIX} ${CUSTOM_FLAGS})
+    .CMD=$_SRC_c_new($SRC COMPILE_OUT_SUFFIX ${COMPILE_OUT_SUFFIX} ${CUSTOM_FLAGS})
     .SEM=target_sources_custom $COMPILE_OUT_SUFFIX SRCS ${input:SRC} ${hide;output;suf=${COMPILE_OUT_SUFFIX}.o:SRC} CUSTOM_FLAGS $CUSTOM_FLAGS $USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL && target_macroses-ITEM && target_macroses-macro target_sources_custom && target_macroses-args $COMPILE_OUT_SUFFIX SRCS ${input:SRC} ${hide;output;suf=${COMPILE_OUT_SUFFIX}.o:SRC} CUSTOM_FLAGS $CUSTOM_FLAGS $USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL
+    .STRUCT_CMD=yes
 }
 
 macro _SRC_CPP_CUSTOM_FLAGS(SRC, COMPILE_OUT_SUFFIX, CUSTOM_FLAGS...) {
-    .CMD=$_SRC_cpp($SRC COMPILE_OUT_SUFFIX ${COMPILE_OUT_SUFFIX} ${CUSTOM_FLAGS})
+    .CMD=$_SRC_cpp_new($SRC COMPILE_OUT_SUFFIX ${COMPILE_OUT_SUFFIX} ${CUSTOM_FLAGS})
     .SEM=target_sources_custom $COMPILE_OUT_SUFFIX SRCS ${input:SRC} ${hide;output;suf=${COMPILE_OUT_SUFFIX}.o:SRC} CUSTOM_FLAGS $CUSTOM_FLAGS && target_macroses-ITEM && target_macroses-macro target_sources_custom && target_macroses-args $COMPILE_OUT_SUFFIX SRCS ${input:SRC} ${hide;output;suf=${COMPILE_OUT_SUFFIX}.o:SRC} CUSTOM_FLAGS $CUSTOM_FLAGS
+    .STRUCT_CMD=yes
 }
 
 
@@ -4776,6 +4747,7 @@ macro CLANG_EMIT_AST_CXX(Input, Output, Opts...) {
 macro LLVM_COMPILE_CXX(Input, Output, Opts...) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS ${CLANG_BC_ROOT}/bin/clang++ ${pre=-I:_C__INCLUDE} $BC_CXXFLAGS $C_FLAGS_PLATFORM -Wno-unknown-warning-option $LLVM_OPTS ${NO_LTO_CFLAGS} -emit-llvm -c ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p BC"} ${hide;kv:"pc light-green"}
     .SEM=llvm_compile_cxx ${input:Input} ${noauto;output:Output} ${"${CLANGPLUSPLUS}"} -Wno-unknown-warning-option $LLVM_OPTS ${NO_LTO_CFLAGS} -emit-llvm ${Opts} && target_macroses-ITEM && target_macroses-macro llvm_compile_cxx && target_macroses-args ${input:Input} ${noauto;output:Output} ${"${CLANGPLUSPLUS}"} -Wno-unknown-warning-option $LLVM_OPTS ${NO_LTO_CFLAGS} -emit-llvm ${Opts}
+    .STRUCT_CMD=yes
     when ($CLANG_BC_ROOT == "") {
       _OK = no
     }
@@ -4790,6 +4762,7 @@ macro LLVM_COMPILE_CXX(Input, Output, Opts...) {
 macro LLVM_COMPILE_C(Input, Output, Opts...) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS ${CLANG_BC_ROOT}/bin/clang ${pre=-I:_C__INCLUDE} $BC_CFLAGS $C_FLAGS_PLATFORM $LLVM_OPTS ${NO_LTO_CFLAGS} -emit-llvm -c ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p BC"} ${hide;kv:"pc light-green"}
     .SEM=llvm_compile_c ${input:Input} ${noauto;output:Output} ${"${CLANGC}"} -Wno-unknown-warning-option $LLVM_OPTS ${NO_LTO_CFLAGS} -emit-llvm ${Opts} && target_macroses-ITEM && target_macroses-macro llvm_compile_c && target_macroses-args ${input:Input} ${noauto;output:Output} ${"${CLANGC}"} -Wno-unknown-warning-option $LLVM_OPTS ${NO_LTO_CFLAGS} -emit-llvm ${Opts}
+    .STRUCT_CMD=yes
     when ($CLANG_BC_ROOT == "") {
       _OK = no
     }

From 27b7ec6ec161019a7cb8f731166e892c60e863e1 Mon Sep 17 00:00:00 2001
From: robot-contrib <robot-contrib@yandex-team.com>
Date: Wed, 31 Jul 2024 10:39:31 +0300
Subject: [PATCH 002/104] Update contrib/libs/backtrace to 2024-07-16
 0ba06a4df3a5667d31b5de82f51cb0d3979f14ac

---
 contrib/libs/backtrace/dwarf.c    | 63 +++++++++++++++++--------------
 contrib/libs/backtrace/elf.c      | 31 ++++++++++-----
 contrib/libs/backtrace/internal.h | 36 +++++++++++++++++-
 contrib/libs/backtrace/macho.c    | 25 +++++++-----
 contrib/libs/backtrace/ya.make    |  4 +-
 5 files changed, 109 insertions(+), 50 deletions(-)

diff --git a/contrib/libs/backtrace/dwarf.c b/contrib/libs/backtrace/dwarf.c
index 54bff64b0d7f..9115836bf7d5 100644
--- a/contrib/libs/backtrace/dwarf.c
+++ b/contrib/libs/backtrace/dwarf.c
@@ -722,8 +722,8 @@ struct dwarf_data
   struct dwarf_data *next;
   /* The data for .gnu_debugaltlink.  */
   struct dwarf_data *altlink;
-  /* The base address for this file.  */
-  uintptr_t base_address;
+  /* The base address mapping for this file.  */
+  struct libbacktrace_base_address base_address;
   /* A sorted list of address ranges.  */
   struct unit_addrs *addrs;
   /* Number of address ranges in list.  */
@@ -1944,8 +1944,9 @@ update_pcrange (const struct attr* attr, const struct attr_val* val,
 static int
 add_low_high_range (struct backtrace_state *state,
 		    const struct dwarf_sections *dwarf_sections,
-		    uintptr_t base_address, int is_bigendian,
-		    struct unit *u, const struct pcrange *pcrange,
+		    struct libbacktrace_base_address base_address,
+		    int is_bigendian, struct unit *u,
+		    const struct pcrange *pcrange,
 		    int (*add_range) (struct backtrace_state *state,
 				      void *rdata, uintptr_t lowpc,
 				      uintptr_t highpc,
@@ -1980,8 +1981,8 @@ add_low_high_range (struct backtrace_state *state,
 
   /* Add in the base address of the module when recording PC values,
      so that we can look up the PC directly.  */
-  lowpc += base_address;
-  highpc += base_address;
+  lowpc = libbacktrace_add_base (lowpc, base_address);
+  highpc = libbacktrace_add_base (highpc, base_address);
 
   return add_range (state, rdata, lowpc, highpc, error_callback, data, vec);
 }
@@ -1993,7 +1994,7 @@ static int
 add_ranges_from_ranges (
     struct backtrace_state *state,
     const struct dwarf_sections *dwarf_sections,
-    uintptr_t base_address, int is_bigendian,
+    struct libbacktrace_base_address base_address, int is_bigendian,
     struct unit *u, uintptr_t base,
     const struct pcrange *pcrange,
     int (*add_range) (struct backtrace_state *state, void *rdata,
@@ -2039,10 +2040,11 @@ add_ranges_from_ranges (
 	base = (uintptr_t) high;
       else
 	{
-	  if (!add_range (state, rdata,
-			  (uintptr_t) low + base + base_address,
-			  (uintptr_t) high + base + base_address,
-			  error_callback, data, vec))
+	  uintptr_t rl, rh;
+
+	  rl = libbacktrace_add_base ((uintptr_t) low + base, base_address);
+	  rh = libbacktrace_add_base ((uintptr_t) high + base, base_address);
+	  if (!add_range (state, rdata, rl, rh, error_callback, data, vec))
 	    return 0;
 	}
     }
@@ -2060,7 +2062,7 @@ static int
 add_ranges_from_rnglists (
     struct backtrace_state *state,
     const struct dwarf_sections *dwarf_sections,
-    uintptr_t base_address, int is_bigendian,
+    struct libbacktrace_base_address base_address, int is_bigendian,
     struct unit *u, uintptr_t base,
     const struct pcrange *pcrange,
     int (*add_range) (struct backtrace_state *state, void *rdata,
@@ -2143,9 +2145,10 @@ add_ranges_from_rnglists (
 				     u->addrsize, is_bigendian, index,
 				     error_callback, data, &high))
 	      return 0;
-	    if (!add_range (state, rdata, low + base_address,
-			    high + base_address, error_callback, data,
-			    vec))
+	    if (!add_range (state, rdata,
+			    libbacktrace_add_base (low, base_address),
+			    libbacktrace_add_base (high, base_address),
+			    error_callback, data, vec))
 	      return 0;
 	  }
 	  break;
@@ -2162,7 +2165,7 @@ add_ranges_from_rnglists (
 				     error_callback, data, &low))
 	      return 0;
 	    length = read_uleb128 (&rnglists_buf);
-	    low += base_address;
+	    low = libbacktrace_add_base (low, base_address);
 	    if (!add_range (state, rdata, low, low + length,
 			    error_callback, data, vec))
 	      return 0;
@@ -2176,8 +2179,9 @@ add_ranges_from_rnglists (
 
 	    low = read_uleb128 (&rnglists_buf);
 	    high = read_uleb128 (&rnglists_buf);
-	    if (!add_range (state, rdata, low + base + base_address,
-			    high + base + base_address,
+	    if (!add_range (state, rdata,
+			    libbacktrace_add_base (low + base, base_address),
+			    libbacktrace_add_base (high + base, base_address),
 			    error_callback, data, vec))
 	      return 0;
 	  }
@@ -2194,9 +2198,10 @@ add_ranges_from_rnglists (
 
 	    low = (uintptr_t) read_address (&rnglists_buf, u->addrsize);
 	    high = (uintptr_t) read_address (&rnglists_buf, u->addrsize);
-	    if (!add_range (state, rdata, low + base_address,
-			    high + base_address, error_callback, data,
-			    vec))
+	    if (!add_range (state, rdata,
+			    libbacktrace_add_base (low, base_address),
+			    libbacktrace_add_base (high, base_address),
+			    error_callback, data, vec))
 	      return 0;
 	  }
 	  break;
@@ -2208,7 +2213,7 @@ add_ranges_from_rnglists (
 
 	    low = (uintptr_t) read_address (&rnglists_buf, u->addrsize);
 	    length = (uintptr_t) read_uleb128 (&rnglists_buf);
-	    low += base_address;
+	    low = libbacktrace_add_base (low, base_address);
 	    if (!add_range (state, rdata, low, low + length,
 			    error_callback, data, vec))
 	      return 0;
@@ -2236,7 +2241,7 @@ add_ranges_from_rnglists (
 static int
 add_ranges (struct backtrace_state *state,
 	    const struct dwarf_sections *dwarf_sections,
-	    uintptr_t base_address, int is_bigendian,
+	    struct libbacktrace_base_address base_address, int is_bigendian,
 	    struct unit *u, uintptr_t base, const struct pcrange *pcrange,
 	    int (*add_range) (struct backtrace_state *state, void *rdata,
 			      uintptr_t lowpc, uintptr_t highpc,
@@ -2272,7 +2277,8 @@ add_ranges (struct backtrace_state *state,
    read, 0 if there is some error.  */
 
 static int
-find_address_ranges (struct backtrace_state *state, uintptr_t base_address,
+find_address_ranges (struct backtrace_state *state,
+		     struct libbacktrace_base_address base_address,
 		     struct dwarf_buf *unit_buf,
 		     const struct dwarf_sections *dwarf_sections,
 		     int is_bigendian, struct dwarf_data *altlink,
@@ -2427,7 +2433,8 @@ find_address_ranges (struct backtrace_state *state, uintptr_t base_address,
    on success, 0 on failure.  */
 
 static int
-build_address_map (struct backtrace_state *state, uintptr_t base_address,
+build_address_map (struct backtrace_state *state,
+		   struct libbacktrace_base_address base_address,
 		   const struct dwarf_sections *dwarf_sections,
 		   int is_bigendian, struct dwarf_data *altlink,
 		   backtrace_error_callback error_callback, void *data,
@@ -2646,7 +2653,7 @@ add_line (struct backtrace_state *state, struct dwarf_data *ddata,
 
   /* Add in the base address here, so that we can look up the PC
      directly.  */
-  ln->pc = pc + ddata->base_address;
+  ln->pc = libbacktrace_add_base (pc, ddata->base_address);
 
   ln->filename = filename;
   ln->lineno = lineno;
@@ -4285,7 +4292,7 @@ dwarf_fileline (struct backtrace_state *state, uintptr_t pc,
 
 static struct dwarf_data *
 build_dwarf_data (struct backtrace_state *state,
-		  uintptr_t base_address,
+		  struct libbacktrace_base_address base_address,
 		  const struct dwarf_sections *dwarf_sections,
 		  int is_bigendian,
 		  struct dwarf_data *altlink,
@@ -4343,7 +4350,7 @@ build_dwarf_data (struct backtrace_state *state,
 
 int
 backtrace_dwarf_add (struct backtrace_state *state,
-		     uintptr_t base_address,
+		     struct libbacktrace_base_address base_address,
 		     const struct dwarf_sections *dwarf_sections,
 		     int is_bigendian,
 		     struct dwarf_data *fileline_altlink,
diff --git a/contrib/libs/backtrace/elf.c b/contrib/libs/backtrace/elf.c
index 81fcf4e00085..575e13daf500 100644
--- a/contrib/libs/backtrace/elf.c
+++ b/contrib/libs/backtrace/elf.c
@@ -633,7 +633,7 @@ elf_symbol_search (const void *vkey, const void *ventry)
 
 static int
 elf_initialize_syminfo (struct backtrace_state *state,
-			uintptr_t base_address,
+			struct libbacktrace_base_address base_address,
 			const unsigned char *symtab_data, size_t symtab_size,
 			const unsigned char *strtab, size_t strtab_size,
 			backtrace_error_callback error_callback,
@@ -699,7 +699,8 @@ elf_initialize_syminfo (struct backtrace_state *state,
 	  = *(const b_elf_addr *) (opd->data + (sym->st_value - opd->addr));
       else
 	elf_symbols[j].address = sym->st_value;
-      elf_symbols[j].address += base_address;
+      elf_symbols[j].address =
+	libbacktrace_add_base (elf_symbols[j].address, base_address);
       elf_symbols[j].size = sym->st_size;
       ++j;
     }
@@ -6499,7 +6500,8 @@ backtrace_uncompress_lzma (struct backtrace_state *state,
 static int
 elf_add (struct backtrace_state *state, const char *filename, int descriptor,
 	 const unsigned char *memory, size_t memory_size,
-	 uintptr_t base_address, struct elf_ppc64_opd_data *caller_opd,
+	 struct libbacktrace_base_address base_address,
+	 struct elf_ppc64_opd_data *caller_opd,
 	 backtrace_error_callback error_callback, void *data,
 	 fileline *fileline_fn, int *found_sym, int *found_dwarf,
 	 struct dwarf_data **fileline_entry, int exe, int debuginfo,
@@ -7349,6 +7351,7 @@ phdr_callback (struct dl_phdr_info *info, size_t size ATTRIBUTE_UNUSED,
   const char *filename;
   int descriptor;
   int does_not_exist;
+  struct libbacktrace_base_address base_address;
   fileline elf_fileline_fn;
   int found_dwarf;
 
@@ -7378,7 +7381,8 @@ phdr_callback (struct dl_phdr_info *info, size_t size ATTRIBUTE_UNUSED,
 	return 0;
     }
 
-  if (elf_add (pd->state, filename, descriptor, NULL, 0, info->dlpi_addr, NULL,
+  base_address.m = info->dlpi_addr;
+  if (elf_add (pd->state, filename, descriptor, NULL, 0, base_address, NULL,
 	       pd->error_callback, pd->data, &elf_fileline_fn, pd->found_sym,
 	       &found_dwarf, NULL, 0, 0, NULL, 0))
     {
@@ -7407,11 +7411,20 @@ backtrace_initialize (struct backtrace_state *state, const char *filename,
   fileline elf_fileline_fn = elf_nodebug;
   struct phdr_data pd;
 
-  ret = elf_add (state, filename, descriptor, NULL, 0, 0, NULL, error_callback,
-		 data, &elf_fileline_fn, &found_sym, &found_dwarf, NULL, 1, 0,
-		 NULL, 0);
-  if (!ret)
-    return 0;
+  /* When using fdpic we must use dl_iterate_phdr for all modules, including
+     the main executable, so that we can get the right base address
+     mapping.  */
+  if (!libbacktrace_using_fdpic ())
+    {
+      struct libbacktrace_base_address zero_base_address;
+
+      memset (&zero_base_address, 0, sizeof zero_base_address);
+      ret = elf_add (state, filename, descriptor, NULL, 0, zero_base_address,
+		     NULL, error_callback, data, &elf_fileline_fn, &found_sym,
+		     &found_dwarf, NULL, 1, 0, NULL, 0);
+      if (!ret)
+	return 0;
+    }
 
   pd.state = state;
   pd.error_callback = error_callback;
diff --git a/contrib/libs/backtrace/internal.h b/contrib/libs/backtrace/internal.h
index 4fa0af8cb6c9..422115a2250a 100644
--- a/contrib/libs/backtrace/internal.h
+++ b/contrib/libs/backtrace/internal.h
@@ -323,10 +323,44 @@ struct dwarf_sections
 
 struct dwarf_data;
 
+/* The load address mapping.  */
+
+#if defined(__FDPIC__) && defined(HAVE_DL_ITERATE_PHDR) && (defined(HAVE_LINK_H) || defined(HAVE_SYS_LINK_H))
+
+#ifdef HAVE_LINK_H
+ #include <link.h>
+#endif
+#ifdef HAVE_SYS_LINK_H
+ #error #include <sys/link.h>
+#endif
+
+#define libbacktrace_using_fdpic() (1)
+
+struct libbacktrace_base_address
+{
+  struct elf32_fdpic_loadaddr m;
+};
+
+#define libbacktrace_add_base(pc, base) \
+  ((uintptr_t) (__RELOC_POINTER ((pc), (base).m)))
+
+#else /* not _FDPIC__ */
+
+#define libbacktrace_using_fdpic() (0)
+
+struct libbacktrace_base_address
+{
+  uintptr_t m;
+};
+
+#define libbacktrace_add_base(pc, base) ((pc) + (base).m)
+
+#endif /* not _FDPIC__ */
+
 /* Add file/line information for a DWARF module.  */
 
 extern int backtrace_dwarf_add (struct backtrace_state *state,
-				uintptr_t base_address,
+				struct libbacktrace_base_address base_address,
 				const struct dwarf_sections *dwarf_sections,
 				int is_bigendian,
 				struct dwarf_data *fileline_altlink,
diff --git a/contrib/libs/backtrace/macho.c b/contrib/libs/backtrace/macho.c
index 8f768f14a579..fc4c9591dfa3 100644
--- a/contrib/libs/backtrace/macho.c
+++ b/contrib/libs/backtrace/macho.c
@@ -315,8 +315,9 @@ static const char * const dwarf_section_names[DEBUG_MAX] =
 /* Forward declaration.  */
 
 static int macho_add (struct backtrace_state *, const char *, int, off_t,
-		      const unsigned char *, uintptr_t, int,
-		      backtrace_error_callback, void *, fileline *, int *);
+		      const unsigned char *, struct libbacktrace_base_address,
+		      int, backtrace_error_callback, void *, fileline *,
+		      int *);
 
 /* A dummy callback function used when we can't find any debug info.  */
 
@@ -511,7 +512,7 @@ macho_defined_symbol (uint8_t type)
 
 static int
 macho_add_symtab (struct backtrace_state *state, int descriptor,
-		  uintptr_t base_address, int is_64,
+		  struct libbacktrace_base_address base_address, int is_64,
 		  off_t symoff, unsigned int nsyms, off_t stroff,
 		  unsigned int strsize,
 		  backtrace_error_callback error_callback, void *data)
@@ -626,7 +627,7 @@ macho_add_symtab (struct backtrace_state *state, int descriptor,
       if (name[0] == '_')
 	++name;
       macho_symbols[j].name = name;
-      macho_symbols[j].address = value + base_address;
+      macho_symbols[j].address = libbacktrace_add_base (value, base_address);
       ++j;
     }
 
@@ -758,7 +759,8 @@ macho_syminfo (struct backtrace_state *state, uintptr_t addr,
 static int
 macho_add_fat (struct backtrace_state *state, const char *filename,
 	       int descriptor, int swapped, off_t offset,
-	       const unsigned char *match_uuid, uintptr_t base_address,
+	       const unsigned char *match_uuid,
+	       struct libbacktrace_base_address base_address,
 	       int skip_symtab, uint32_t nfat_arch, int is_64,
 	       backtrace_error_callback error_callback, void *data,
 	       fileline *fileline_fn, int *found_sym)
@@ -860,7 +862,8 @@ macho_add_fat (struct backtrace_state *state, const char *filename,
 
 static int
 macho_add_dsym (struct backtrace_state *state, const char *filename,
-		uintptr_t base_address, const unsigned char *uuid,
+		struct libbacktrace_base_address base_address,
+		const unsigned char *uuid,
 		backtrace_error_callback error_callback, void *data,
 		fileline* fileline_fn)
 {
@@ -978,7 +981,7 @@ macho_add_dsym (struct backtrace_state *state, const char *filename,
 static int
 macho_add (struct backtrace_state *state, const char *filename, int descriptor,
 	   off_t offset, const unsigned char *match_uuid,
-	   uintptr_t base_address, int skip_symtab,
+	   struct libbacktrace_base_address base_address, int skip_symtab,
 	   backtrace_error_callback error_callback, void *data,
 	   fileline *fileline_fn, int *found_sym)
 {
@@ -1240,7 +1243,7 @@ backtrace_initialize (struct backtrace_state *state, const char *filename,
   c = _dyld_image_count ();
   for (i = 0; i < c; ++i)
     {
-      uintptr_t base_address;
+      struct libbacktrace_base_address base_address;
       const char *name;
       int d;
       fileline mff;
@@ -1264,7 +1267,7 @@ backtrace_initialize (struct backtrace_state *state, const char *filename,
 	    continue;
 	}
 
-      base_address = _dyld_get_image_vmaddr_slide (i);
+      base_address.m = _dyld_get_image_vmaddr_slide (i);
 
       mff = macho_nodebug;
       if (!macho_add (state, name, d, 0, NULL, base_address, 0,
@@ -1319,10 +1322,12 @@ backtrace_initialize (struct backtrace_state *state, const char *filename,
 		      void *data, fileline *fileline_fn)
 {
   fileline macho_fileline_fn;
+  struct libbacktrace_base_address zero_base_address;
   int found_sym;
 
   macho_fileline_fn = macho_nodebug;
-  if (!macho_add (state, filename, descriptor, 0, NULL, 0, 0,
+  memset (&zero_base_address, 0, sizeof zero_base_address);
+  if (!macho_add (state, filename, descriptor, 0, NULL, zero_base_address, 0,
 		  error_callback, data, &macho_fileline_fn, &found_sym))
     return 0;
 
diff --git a/contrib/libs/backtrace/ya.make b/contrib/libs/backtrace/ya.make
index 65e49d05d91a..202f54991f27 100644
--- a/contrib/libs/backtrace/ya.make
+++ b/contrib/libs/backtrace/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(2024-07-12)
+VERSION(2024-07-16)
 
-ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/febbb9bff98b39ee596aa15d1f58e4bba442cd6a.tar.gz)
+ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/1dd5c408fe6f5d9bccf870ec4e0e4bcabeb0664e.tar.gz)
 
 ADDINCL(
     contrib/libs/backtrace

From c4fb2cdf41179910a4e9632de119ab3c94b741bc Mon Sep 17 00:00:00 2001
From: pavook <pavook@yandex-team.com>
Date: Wed, 31 Jul 2024 12:03:17 +0300
Subject: [PATCH 003/104] Fix TEnumerator::TIterator
 082782faf0e6e05d3aa1c56e096d33ea69282f57

---
 library/cpp/iterator/enumerate.h         | 22 +++++++++++++++-------
 library/cpp/iterator/ut/functools_ut.cpp | 14 +++++++++++++-
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/library/cpp/iterator/enumerate.h b/library/cpp/iterator/enumerate.h
index 2c83fb41bfc1..6ebc12a0e7d9 100644
--- a/library/cpp/iterator/enumerate.h
+++ b/library/cpp/iterator/enumerate.h
@@ -27,23 +27,30 @@ namespace NPrivate {
         struct TIterator {
             using difference_type = std::ptrdiff_t;
             using value_type = TValue;
-            using pointer = TValue*;
-            using reference = TValue&;
+            using pointer = void;
+            using reference = value_type;
             using iterator_category = std::input_iterator_tag;
 
-            TValue operator*() {
+            reference operator*() const {
                 return {Index_, *Iterator_};
             }
-            TValue operator*() const {
-                return {Index_, *Iterator_};
-            }
-            void operator++() {
+
+            TIterator& operator++() {
                 ++Index_;
                 ++Iterator_;
+                return *this;
+            }
+
+            TIterator operator++(int) {
+                TIterator result = *this;
+                ++(*this);
+                return result;
             }
+
             bool operator!=(const TSentinel& other) const {
                 return Iterator_ != other.Iterator_;
             }
+
             bool operator==(const TSentinel& other) const {
                 return Iterator_ == other.Iterator_;
             }
@@ -51,6 +58,7 @@ namespace NPrivate {
             std::size_t Index_;
             TIteratorState Iterator_;
         };
+
     public:
         using iterator = TIterator;
         using const_iterator = TIterator;
diff --git a/library/cpp/iterator/ut/functools_ut.cpp b/library/cpp/iterator/ut/functools_ut.cpp
index 2dee9a55c858..b11a715e0c4c 100644
--- a/library/cpp/iterator/ut/functools_ut.cpp
+++ b/library/cpp/iterator/ut/functools_ut.cpp
@@ -99,7 +99,7 @@ using namespace NFuncTools;
 
     struct TTestSentinel {};
     struct TTestIterator {
-        int operator*() {
+        int operator*() const {
             return X;
         }
         void operator++() {
@@ -139,6 +139,18 @@ using namespace NFuncTools;
             EXPECT_EQ(j, v.size());
         }
 
+        // Test correctness of iterator traits.
+        auto enumerated = Enumerate(a);
+        static_assert(std::ranges::input_range<decltype(enumerated)>);
+        static_assert(
+            std::is_same_v<decltype(enumerated.begin())::pointer,
+            std::iterator_traits<decltype(enumerated.begin())>::pointer>);
+
+        // Post-increment test.
+        auto it = enumerated.begin();
+        EXPECT_EQ(*(it++), (std::tuple{0, 1}));
+        EXPECT_EQ(*it, (std::tuple{1, 2}));
+
         TVector<size_t> d = {0, 0, 0};
         FOR_DISPATCH_2(i, x, Enumerate(d)) {
             x = i;

From 5872c8e0780708f1138757609dbf2b70abe28742 Mon Sep 17 00:00:00 2001
From: don-dron <don-dron@yandex-team.com>
Date: Wed, 31 Jul 2024 12:32:54 +0300
Subject: [PATCH 004/104] Revert "YT-21931: Track memory for ahead blocks in
 write sessions"

This reverts commit f34c547ac0041f6745654e8da71c886bc2ae5ebc, reversing
changes made to 8c124ed0587173703d24131bf1565c0e85973b2a.
890663587fbe5faa158f70ac86dbd66fe028ab9e
---
 yt/yt/core/misc/memory_usage_tracker.cpp | 7 +------
 yt/yt/core/misc/memory_usage_tracker.h   | 3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/yt/yt/core/misc/memory_usage_tracker.cpp b/yt/yt/core/misc/memory_usage_tracker.cpp
index 269632e4fed4..3f24adc4a864 100644
--- a/yt/yt/core/misc/memory_usage_tracker.cpp
+++ b/yt/yt/core/misc/memory_usage_tracker.cpp
@@ -233,16 +233,11 @@ TError TMemoryUsageTrackerGuard::SetSizeImpl(i64 size, auto acquirer)
     return {};
 }
 
-void TMemoryUsageTrackerGuard::IncreaseSize(i64 sizeDelta)
+void TMemoryUsageTrackerGuard::IncrementSize(i64 sizeDelta)
 {
     SetSize(Size_ + sizeDelta);
 }
 
-void TMemoryUsageTrackerGuard::DecreaseSize(i64 sizeDelta)
-{
-    SetSize(Size_ - sizeDelta);
-}
-
 TMemoryUsageTrackerGuard TMemoryUsageTrackerGuard::TransferMemory(i64 size)
 {
     YT_VERIFY(Size_ >= size);
diff --git a/yt/yt/core/misc/memory_usage_tracker.h b/yt/yt/core/misc/memory_usage_tracker.h
index bcd132e8ed18..4b3887fa1748 100644
--- a/yt/yt/core/misc/memory_usage_tracker.h
+++ b/yt/yt/core/misc/memory_usage_tracker.h
@@ -93,8 +93,7 @@ class TMemoryUsageTrackerGuard
     i64 GetSize() const;
     void SetSize(i64 size);
     TError TrySetSize(i64 size);
-    void IncreaseSize(i64 sizeDelta);
-    void DecreaseSize(i64 sizeDelta);
+    void IncrementSize(i64 sizeDelta);
     TMemoryUsageTrackerGuard TransferMemory(i64 size);
 
 private:

From 7b23cf9228055d185180136fdcf09b453a836a10 Mon Sep 17 00:00:00 2001
From: c0nsumer <c0nsumer@yandex-team.com>
Date: Wed, 31 Jul 2024 15:27:38 +0300
Subject: [PATCH 005/104] language level supported
 0b536fcac54655bfac44b1b3d83a57fe9113d264

---
 build/export_generators/ide-gradle/build.gradle.kts.jinja | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/export_generators/ide-gradle/build.gradle.kts.jinja b/build/export_generators/ide-gradle/build.gradle.kts.jinja
index 44a6cb36f0fe..b0c2714a5b67 100644
--- a/build/export_generators/ide-gradle/build.gradle.kts.jinja
+++ b/build/export_generators/ide-gradle/build.gradle.kts.jinja
@@ -43,6 +43,12 @@ plugins {
 {%      endif -%}
 {%- endif %}
 }
+{# language level #}
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of("{{ target.required_jdk }}")
+    }
+}
 {%- if target.with_kotlinc_plugin_allopen %}
 
 allOpen {

From b10c66202fbddb06bcfc4530a397b3ffaa602bc7 Mon Sep 17 00:00:00 2001
From: mpereskokova <mpereskokova@yandex-team.com>
Date: Wed, 31 Jul 2024 15:55:38 +0300
Subject: [PATCH 006/104] Codestyle de2dd0433939b04a62a85e2c51428e3ac28f51d1

---
 yt/yt/client/api/query_tracker_client.h                     | 6 +++---
 yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yt/yt/client/api/query_tracker_client.h b/yt/yt/client/api/query_tracker_client.h
index cc3f3966f4de..f4b8d48c4c0b 100644
--- a/yt/yt/client/api/query_tracker_client.h
+++ b/yt/yt/client/api/query_tracker_client.h
@@ -42,7 +42,7 @@ struct TStartQueryOptions
     bool Draft = false;
     NYTree::IMapNodePtr Annotations;
     std::vector<TQueryFilePtr> Files;
-    std::optional<TString> AccessControlObject; // COMPAT
+    std::optional<TString> AccessControlObject; // COMPAT(mpereskokova)
     std::optional<std::vector<TString>> AccessControlObjects;
 };
 
@@ -103,7 +103,7 @@ struct TQuery
     std::optional<TInstant> FinishTime;
     NYson::TYsonString Settings;
     std::optional<TString> User;
-    std::optional<TString> AccessControlObject; // COMPAT
+    std::optional<TString> AccessControlObject; // COMPAT(mpereskokova)
     std::optional<NYson::TYsonString> AccessControlObjects;
     std::optional<NQueryTrackerClient::EQueryState> State;
     std::optional<i64> ResultCount;
@@ -139,7 +139,7 @@ struct TAlterQueryOptions
     , public TQueryTrackerOptions
 {
     NYTree::IMapNodePtr Annotations;
-    std::optional<TString> AccessControlObject; // COMPAT
+    std::optional<TString> AccessControlObject; // COMPAT(mpereskokova)
     std::optional<std::vector<TString>> AccessControlObjects;
 };
 
diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
index beaa41a627a9..39ef2f681b18 100644
--- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
+++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
@@ -3204,7 +3204,7 @@ message TReqStartQuery
     optional bool draft = 5;
     optional bytes annotations = 6; // YSON
     repeated TQueryFile files = 7;
-    optional string access_control_object = 8; // COMPAT
+    optional string access_control_object = 8; // COMPAT(mpereskokova)
     optional TAccessControlObjects access_control_objects = 9;
 }
 
@@ -3279,7 +3279,7 @@ message TQuery
     optional uint64 finish_time = 6; // TInstant
     optional bytes settings = 7; // YSON
     optional string user = 8;
-    optional string access_control_object = 9; // COMPAT
+    optional string access_control_object = 9; // COMPAT(mpereskokova)
     optional EQueryState state = 10;
     optional int64 result_count = 11;
     optional bytes progress = 12; // YSON
@@ -3340,7 +3340,7 @@ message TReqAlterQuery
     required string query_tracker_stage = 1;
     required NYT.NProto.TGuid query_id = 2;
     optional bytes annotations = 3; // YSON
-    optional string access_control_object = 4; // COMPAT
+    optional string access_control_object = 4; // COMPAT(mpereskokova)
     optional TAccessControlObjects access_control_objects = 5;
 }
 

From f81030974a4660e301c110a5085c53dae44f7279 Mon Sep 17 00:00:00 2001
From: dgolear <dgolear@yandex-team.com>
Date: Wed, 31 Jul 2024 16:00:23 +0300
Subject: [PATCH 007/104] Style

Style
a1b273d0e7946f2c3459730344e403b3191cc7ae
---
 yt/yt/client/ypath/rich.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yt/yt/client/ypath/rich.h b/yt/yt/client/ypath/rich.h
index 1659532208be..60a63c3ce676 100644
--- a/yt/yt/client/ypath/rich.h
+++ b/yt/yt/client/ypath/rich.h
@@ -172,7 +172,7 @@ class TRichYPath
     NYTree::IAttributeDictionaryPtr Attributes_;
 };
 
-bool operator== (const TRichYPath& lhs, const TRichYPath& rhs);
+bool operator==(const TRichYPath& lhs, const TRichYPath& rhs);
 
 ////////////////////////////////////////////////////////////////////////////////
 

From d20a7253e7c98c39d8a0c23745bbe7ab0484fd14 Mon Sep 17 00:00:00 2001
From: osidorkin <osidorkin@yandex-team.com>
Date: Wed, 31 Jul 2024 19:17:10 +0300
Subject: [PATCH 008/104] YT-20327: More logging of ClockClusterTag in
 timestamp providers 7a6f61d1aa10edd839c19bc67e48c5f59cd44e32

---
 .../transaction_client/timestamp_provider_base.cpp       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/yt/yt/client/transaction_client/timestamp_provider_base.cpp b/yt/yt/client/transaction_client/timestamp_provider_base.cpp
index 3971b897a16a..c5e82465620f 100644
--- a/yt/yt/client/transaction_client/timestamp_provider_base.cpp
+++ b/yt/yt/client/transaction_client/timestamp_provider_base.cpp
@@ -25,7 +25,9 @@ TFuture<TTimestamp> TTimestampProviderBase::GenerateTimestamps(int count, TCellT
 {
     VERIFY_THREAD_AFFINITY_ANY();
 
-    YT_LOG_DEBUG("Generating fresh timestamps (Count: %v)", count);
+    YT_LOG_DEBUG("Generating fresh timestamps (Count: %v, ClockClusterTag: %v)",
+        count,
+        clockClusterTag);
 
     return DoGenerateTimestamps(count, clockClusterTag).Apply(BIND(
         &TTimestampProviderBase::OnGenerateTimestamps,
@@ -76,9 +78,10 @@ TFuture<TTimestamp> TTimestampProviderBase::OnGenerateTimestamps(
     auto firstTimestamp = timestampOrError.Value();
     auto lastTimestamp = firstTimestamp + count - 1;
 
-    YT_LOG_DEBUG("Fresh timestamps generated (Timestamps: %v-%v)",
+    YT_LOG_DEBUG("Fresh timestamps generated (Timestamps: %v-%v, ClockClusterTag: %v)",
         firstTimestamp,
-        lastTimestamp);
+        lastTimestamp,
+        clockClusterTag);
 
     auto& latestTimestamp = GetLatestTimestampReferenceByTag(clockClusterTag);
     auto latestTimestampValue = latestTimestamp.load(std::memory_order::relaxed);

From faec437d163d8015fd5e0da74381c190fa45c298 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Wed, 31 Jul 2024 19:34:56 +0300
Subject: [PATCH 009/104] Intermediate changes

---
 contrib/python/importlib-resources/ya.make | 3 +++
 contrib/tools/m4/ya.make                   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/contrib/python/importlib-resources/ya.make b/contrib/python/importlib-resources/ya.make
index 21d607abef03..c7ba0d70fcbe 100644
--- a/contrib/python/importlib-resources/ya.make
+++ b/contrib/python/importlib-resources/ya.make
@@ -2,6 +2,9 @@ PY23_LIBRARY()
 
 LICENSE(Apache-2.0)
 
+# The code is not taken from upstream. An analogue of version 1.0.2 has been implemented. See CONTRIB-1203
+VERSION(1.0.2)
+
 PY_SRCS(
     TOP_LEVEL
     importlib_resources/__init__.py
diff --git a/contrib/tools/m4/ya.make b/contrib/tools/m4/ya.make
index 00546536a6d3..cf8d1d977e47 100644
--- a/contrib/tools/m4/ya.make
+++ b/contrib/tools/m4/ya.make
@@ -2,6 +2,10 @@ PROGRAM()
 
 LICENSE(GPL-3.0-or-later)
 
+VERSION(1.4.17)
+
+ORIGINAL_SOURCE(https://github.com/tar-mirror/gnu-m4/archive/refs/tags/v1.4.17.tar.gz)
+
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
 NO_RUNTIME()

From e1e639fc5c85ba4df83040ddb4ac8dc620ae208b Mon Sep 17 00:00:00 2001
From: akozhikhov <akozhikhov@yandex-team.com>
Date: Wed, 31 Jul 2024 19:35:18 +0300
Subject: [PATCH 010/104] YT-22276: In fair throttler consider bucket guarantee
 in GetEstimatedOverdraftDuration 3d94c6e0a109be012841ea1ce18c627c14f574d8

---
 yt/yt/core/concurrency/fair_throttler.cpp | 20 ++++++++++++++------
 yt/yt/core/concurrency/fair_throttler.h   |  1 +
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/yt/yt/core/concurrency/fair_throttler.cpp b/yt/yt/core/concurrency/fair_throttler.cpp
index 235784fa8ea7..12e78b5ad47b 100644
--- a/yt/yt/core/concurrency/fair_throttler.cpp
+++ b/yt/yt/core/concurrency/fair_throttler.cpp
@@ -471,7 +471,7 @@ class TBucketThrottler
             return TDuration::Zero();
         }
 
-        auto limit = LastLimit_.load();
+        auto limit = EstimatedLimit_.load();
         auto distributionPeriod = DistributionPeriod_.load();
         if (limit == 0) {
             return distributionPeriod;
@@ -548,9 +548,12 @@ class TBucketThrottler
         return quota;
     }
 
-    i64 Refill(i64 quota)
+    i64 Refill(i64 quota, i64 guaranteedQuota)
     {
-        LastLimit_ = quota;
+        // This value is used to compute estimated overdraft duration.
+        // The limit is exceeded with |guaranteedQuota| because in case of an iteration with low demand
+        // the bucket gets low quota however it is eligible for greater quota that is at least |guaranteedQuota|.
+        EstimatedLimit_ = std::max(quota, guaranteedQuota);
 
         if (Quota_.Value->load() < 0) {
             auto remainingQuota = Quota_.Increment(quota);
@@ -586,7 +589,7 @@ class TBucketThrottler
     NProfiling::TEventTimer WaitTime_;
 
     TLeakyCounter Quota_;
-    std::atomic<i64> LastLimit_ = 0;
+    std::atomic<i64> EstimatedLimit_ = 0;
     std::atomic<i64> QueueSize_ = 0;
     std::atomic<i64> Usage_ = 0;
 
@@ -750,6 +753,8 @@ void TFairThrottler::DoUpdateLeader()
 
     auto tickLimit = i64(Config_->TotalLimit * Config_->DistributionPeriod.SecondsFloat());
     auto tickIncome = ComputeFairDistribution(tickLimit, weights, demands, limits);
+    auto infiniteDemands = std::vector<i64>(weights.size(), tickLimit);
+    auto guaranteedQuotas = ComputeFairDistribution(tickLimit, weights, infiniteDemands, limits);
 
     // Distribute remaining quota according to weights and limits.
     auto freeQuota = tickLimit - std::accumulate(tickIncome.begin(), tickIncome.end(), i64(0));
@@ -768,6 +773,7 @@ void TFairThrottler::DoUpdateLeader()
 
     i64 leakedQuota = 0;
     int i = 0;
+    // TODO(akozhikhov): Shall we be concerned with the elements order on the second pass over buckets hash table?
     for (const auto& [name, bucket] : Buckets_) {
         auto state = states[i];
         auto newLimit = tickIncome[i] + freeIncome[i];
@@ -776,7 +782,7 @@ void TFairThrottler::DoUpdateLeader()
         bucketQuota[name] = state.Quota;
         bucketIncome[name] = newLimit;
 
-        leakedQuota += bucket.Throttler->Refill(newLimit);
+        leakedQuota += bucket.Throttler->Refill(newLimit, guaranteedQuotas[i]);
 
         ++i;
     }
@@ -786,6 +792,8 @@ void TFairThrottler::DoUpdateLeader()
 
         state->InFlow += tickIncome[i] + freeIncome[i];
 
+        state->GuaranteedQuota = guaranteedQuotas[i];
+
         leakedQuota += state->OutFlow.exchange(0);
 
         ++i;
@@ -845,7 +853,7 @@ void TFairThrottler::DoUpdateFollower()
         bucketDemands[name] = demand;
 
         auto in = ipc->InFlow.exchange(0);
-        auto out = bucket.Throttler->Refill(in);
+        auto out = bucket.Throttler->Refill(in, ipc->GuaranteedQuota);
         ipc->OutFlow += out;
 
         bucketIncome[name] = in;
diff --git a/yt/yt/core/concurrency/fair_throttler.h b/yt/yt/core/concurrency/fair_throttler.h
index 10e2ab23682a..ecf32ae14bcd 100644
--- a/yt/yt/core/concurrency/fair_throttler.h
+++ b/yt/yt/core/concurrency/fair_throttler.h
@@ -63,6 +63,7 @@ struct IIPCBucket
         std::atomic<i64> Demand;
         std::atomic<i64> InFlow;
         std::atomic<i64> OutFlow;
+        std::atomic<i64> GuaranteedQuota;
     };
 
     virtual TBucket* State() = 0;

From f3da1e8b8d13a3a52b3eab6f28ed798fa83b4215 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Wed, 31 Jul 2024 23:33:21 +0300
Subject: [PATCH 011/104] Intermediate changes

---
 library/python/fs/__init__.py | 67 +++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/library/python/fs/__init__.py b/library/python/fs/__init__.py
index 6b6a011e7fe5..0beaf6665a63 100644
--- a/library/python/fs/__init__.py
+++ b/library/python/fs/__init__.py
@@ -196,32 +196,6 @@ def hardlink(src, lnk):
         os.link(src, lnk)
 
 
-@errorfix_win
-def hardlink_or_copy(src, lnk):
-    def should_fallback_to_copy(exc):
-        if WindowsError is not None and isinstance(exc, WindowsError) and exc.winerror == 1142:  # too many hardlinks
-            return True
-        # cross-device hardlink or too many hardlinks, or some known WSL error
-        if isinstance(exc, OSError) and exc.errno in (
-            errno.EXDEV,
-            errno.EMLINK,
-            errno.EINVAL,
-            errno.EACCES,
-            errno.EPERM,
-        ):
-            return True
-        return False
-
-    try:
-        hardlink(src, lnk)
-    except Exception as e:
-        logger.debug('Failed to hardlink %s to %s with error %s, will copy it', src, lnk, repr(e))
-        if should_fallback_to_copy(e):
-            copy2(src, lnk, follow_symlinks=False)
-        else:
-            raise
-
-
 # Atomic file/directory symlink (Unix only)
 # Dst must not exist
 # Throws OSError
@@ -247,24 +221,57 @@ def copy2(src, lnk, follow_symlinks=True):
     symlink(os.readlink(src), lnk)
 
 
+def copy2_safe(src, lnk, follow_symlinks=True):
+    try:
+        copy2(src, lnk, follow_symlinks)
+    except shutil.SameFileError:
+        pass
+
+
+@errorfix_win
+def hardlink_or_copy(src, lnk, copy_function=copy2):
+    def should_fallback_to_copy(exc):
+        if WindowsError is not None and isinstance(exc, WindowsError) and exc.winerror == 1142:  # too many hardlinks
+            return True
+        # cross-device hardlink or too many hardlinks, or some known WSL error
+        if isinstance(exc, OSError) and exc.errno in (
+            errno.EXDEV,
+            errno.EMLINK,
+            errno.EINVAL,
+            errno.EACCES,
+            errno.EPERM,
+        ):
+            return True
+        return False
+
+    try:
+        hardlink(src, lnk)
+    except Exception as e:
+        logger.debug('Failed to hardlink %s to %s with error %s, will copy it', src, lnk, repr(e))
+        if should_fallback_to_copy(e):
+            copy_function(src, lnk, follow_symlinks=False)
+        else:
+            raise
+
+
 # Recursively hardlink directory
 # Uses plain hardlink for files
 # Dst must not exist
 # Non-atomic
 # Throws OSError
 @errorfix_win
-def hardlink_tree(src, dst):
+def hardlink_tree(src, dst, hardlink_function=hardlink, mkdir_function=os.mkdir):
     if not os.path.exists(src):
         raise CustomFsError(errno.ENOENT, filename=src)
     if os.path.isfile(src):
-        hardlink(src, dst)
+        hardlink_function(src, dst)
         return
     for dirpath, _, filenames in walk_relative(src):
         src_dirpath = os.path.join(src, dirpath) if dirpath != '.' else src
         dst_dirpath = os.path.join(dst, dirpath) if dirpath != '.' else dst
-        os.mkdir(dst_dirpath)
+        mkdir_function(dst_dirpath)
         for filename in filenames:
-            hardlink(os.path.join(src_dirpath, filename), os.path.join(dst_dirpath, filename))
+            hardlink_function(os.path.join(src_dirpath, filename), os.path.join(dst_dirpath, filename))
 
 
 # File copy

From df1d068c88515d34d4c2055643790c619e545352 Mon Sep 17 00:00:00 2001
From: orlovorlov <orlovorlov@yandex-team.com>
Date: Wed, 31 Jul 2024 23:34:11 +0300
Subject: [PATCH 012/104] YT-22157 Interface part of HLL in columnar statistics
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Выделил в отдельный PR, чтобы над кодом в YT и в YQL можно было работать независимо.
4fb122ecc4a54b38b09d854d93ae23fd3f76677e
---
 yt/cpp/mapreduce/interface/common.h      | 3 +++
 yt/cpp/mapreduce/interface/serialize.cpp | 1 +
 2 files changed, 4 insertions(+)

diff --git a/yt/cpp/mapreduce/interface/common.h b/yt/cpp/mapreduce/interface/common.h
index 49e01bad5577..10988225dd34 100644
--- a/yt/cpp/mapreduce/interface/common.h
+++ b/yt/cpp/mapreduce/interface/common.h
@@ -1193,6 +1193,9 @@ struct TTableColumnarStatistics
     /// Total data weight for all chunks for each of requested columns.
     THashMap<TString, i64> ColumnDataWeight;
 
+    /// Estimated number of unique elements for each column.
+    THashMap<TString, ui64> ColumnEstimatedUniqueCounts;
+
     /// Total weight of all old chunks that don't keep columnar statistics.
     i64 LegacyChunksDataWeight = 0;
 
diff --git a/yt/cpp/mapreduce/interface/serialize.cpp b/yt/cpp/mapreduce/interface/serialize.cpp
index 9be114b45e6c..b195bf04d6e7 100644
--- a/yt/cpp/mapreduce/interface/serialize.cpp
+++ b/yt/cpp/mapreduce/interface/serialize.cpp
@@ -509,6 +509,7 @@ void Deserialize(TTableColumnarStatistics& statistics, const TNode& node)
 {
     const auto& nodeMap = node.AsMap();
     DESERIALIZE_ITEM("column_data_weights", statistics.ColumnDataWeight);
+    DESERIALIZE_ITEM("column_estimated_unique_counts", statistics.ColumnEstimatedUniqueCounts);
     DESERIALIZE_ITEM("legacy_chunks_data_weight", statistics.LegacyChunksDataWeight);
     DESERIALIZE_ITEM("timestamp_total_weight", statistics.TimestampTotalWeight);
 }

From 47f4373399712aeee5f71e1fe7363de5d56a631d Mon Sep 17 00:00:00 2001
From: swarmer <swarmer@yandex-team.com>
Date: Thu, 1 Aug 2024 02:38:51 +0300
Subject: [PATCH 013/104] check lifetime of the TBlob no-copy-view
 9d78e3f3c3b02b6a9467bda8b2af46826fa30868

---
 util/memory/blob.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/memory/blob.h b/util/memory/blob.h
index 20c02a68dfb1..008ac104fb8a 100644
--- a/util/memory/blob.h
+++ b/util/memory/blob.h
@@ -198,7 +198,7 @@ class TBlob {
     static TBlob Copy(const void* data, size_t length);
 
     /// Creates a blob which doesn't own data. No refcounter, no memory allocation, no data copy.
-    static TBlob NoCopy(const void* data, size_t length);
+    static TBlob NoCopy(const void* data Y_LIFETIME_BOUND, size_t length);
 
     /// Creates a blob with a single-threaded (non atomic) refcounter. It maps the file on the path as data.
     static TBlob FromFileSingleThreaded(const TString& path, EMappingMode);

From fc4a5bce8457dd4aa05f857e0fc36183245a7fff Mon Sep 17 00:00:00 2001
From: robot-ratatosk <robot-ratatosk@yandex-team.com>
Date: Thu, 1 Aug 2024 08:49:15 +0300
Subject: [PATCH 014/104] New version of the tld SKIP_CHECK SKIP_REVIEW
 26412132206953d6c6817a1bd3b39409273c5e1b

---
 library/cpp/tld/tlds-alpha-by-domain.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/cpp/tld/tlds-alpha-by-domain.txt b/library/cpp/tld/tlds-alpha-by-domain.txt
index b20e2da24db2..7da2d2b35b30 100644
--- a/library/cpp/tld/tlds-alpha-by-domain.txt
+++ b/library/cpp/tld/tlds-alpha-by-domain.txt
@@ -1,4 +1,4 @@
-# Version 2024072500, Last Updated Thu Jul 25 07:07:01 2024 UTC
+# Version 2024073100, Last Updated Wed Jul 31 07:07:01 2024 UTC
 AAA
 AARP
 ABB

From 226ad6e44ddaecc763a95f179974da04b9c9fa83 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Thu, 1 Aug 2024 09:58:13 +0300
Subject: [PATCH 015/104] Intermediate changes

---
 contrib/libs/backtrace/README.md                     | 12 +++++++++++-
 contrib/libs/backtrace/ya.make                       |  4 ++--
 .../python/pytest-lazy-fixtures/.dist-info/METADATA  | 10 +++-------
 contrib/python/pytest-lazy-fixtures/README.md        |  8 ++------
 .../pytest_lazy_fixtures/loader.py                   |  2 +-
 .../pytest_lazy_fixtures/plugin.py                   |  8 +-------
 contrib/python/pytest-lazy-fixtures/ya.make          |  2 +-
 7 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/contrib/libs/backtrace/README.md b/contrib/libs/backtrace/README.md
index c82834d174d5..d1807842cce4 100644
--- a/contrib/libs/backtrace/README.md
+++ b/contrib/libs/backtrace/README.md
@@ -10,8 +10,18 @@ The libbacktrace library may be linked into a program or library and
 used to produce symbolic backtraces.
 Sample uses would be to print a detailed backtrace when an error
 occurs or to gather detailed profiling information.
+
 In general the functions provided by this library are async-signal-safe,
 meaning that they may be safely called from a signal handler.
+That said, on systems that use `dl_iterate_phdr`, such as GNU/Linux,
+gitthe first call to a libbacktrace function will call `dl_iterate_phdr`,
+which is not in general async-signal-safe.  Therefore, programs
+that call libbacktrace from a signal handler should ensure that they
+make an initial call from outside of a signal handler.
+Similar considerations apply when arranging to call libbacktrace
+from within malloc; `dl_iterate_phdr` can also call malloc,
+so make an initial call to a libbacktrace function outside of
+malloc before trying to call libbacktrace functions within malloc.
 
 The libbacktrace library is provided under a BSD license.
 See the source files for the exact license text.
@@ -25,7 +35,7 @@ will work.
 See the source file backtrace-supported.h.in for the macros that it
 defines.
 
-As of October 2020, libbacktrace supports ELF, PE/COFF, Mach-O, and
+As of July 2024, libbacktrace supports ELF, PE/COFF, Mach-O, and
 XCOFF executables with DWARF debugging information.
 In other words, it supports GNU/Linux, *BSD, macOS, Windows, and AIX.
 The library is written to make it straightforward to add support for
diff --git a/contrib/libs/backtrace/ya.make b/contrib/libs/backtrace/ya.make
index 202f54991f27..d8d066df2c78 100644
--- a/contrib/libs/backtrace/ya.make
+++ b/contrib/libs/backtrace/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(2024-07-16)
+VERSION(2024-07-18)
 
-ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/1dd5c408fe6f5d9bccf870ec4e0e4bcabeb0664e.tar.gz)
+ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/8e32931a4fe98b9bc955cb97b4702123b204f139.tar.gz)
 
 ADDINCL(
     contrib/libs/backtrace
diff --git a/contrib/python/pytest-lazy-fixtures/.dist-info/METADATA b/contrib/python/pytest-lazy-fixtures/.dist-info/METADATA
index 260a9b18ccfa..e03b9014b7d4 100644
--- a/contrib/python/pytest-lazy-fixtures/.dist-info/METADATA
+++ b/contrib/python/pytest-lazy-fixtures/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-lazy-fixtures
-Version: 1.0.7
+Version: 1.1.0
 Summary: Allows you to use fixtures in @pytest.mark.parametrize.
 Home-page: https://github.com/dev-petrov/pytest-lazy-fixtures
 License: MIT
@@ -43,7 +43,7 @@ pip install pytest-lazy-fixtures
 
 ## Usage
 
-To use your fixtures inside `@pytest.mark.parametrize` you can use `lf` (`lazy_fixture`) or `pytest.lazy_fixtures`.
+To use your fixtures inside `@pytest.mark.parametrize` you can use `lf` (`lazy_fixture`).
 
 ```python
 import pytest
@@ -54,10 +54,6 @@ def one():
     return 1
 
 @pytest.mark.parametrize('arg1,arg2', [('val1', lf('one'))])
-def test_func(arg1, arg2):
-    assert arg2 == 1
-
-@pytest.mark.parametrize('arg1,arg2', [('val1', pytest.lazy_fixtures('one'))])
 def test_func(arg1, arg2):
     assert arg2 == 1
 ```
@@ -96,7 +92,7 @@ def test_func(arg1, arg2):
     assert arg2 == 1
 ```
 
-And there is some useful wrapper called `lfc` (`lazy_fixture_callable`) or `pytest.lazy_fixtures_callable`.
+And there is some useful wrapper called `lfc` (`lazy_fixture_callable`).
 It can work with any callable and your fixtures, e.g.
 
 ```python
diff --git a/contrib/python/pytest-lazy-fixtures/README.md b/contrib/python/pytest-lazy-fixtures/README.md
index 6c13ec033a7d..ba6ff870da3b 100644
--- a/contrib/python/pytest-lazy-fixtures/README.md
+++ b/contrib/python/pytest-lazy-fixtures/README.md
@@ -22,7 +22,7 @@ pip install pytest-lazy-fixtures
 
 ## Usage
 
-To use your fixtures inside `@pytest.mark.parametrize` you can use `lf` (`lazy_fixture`) or `pytest.lazy_fixtures`.
+To use your fixtures inside `@pytest.mark.parametrize` you can use `lf` (`lazy_fixture`).
 
 ```python
 import pytest
@@ -33,10 +33,6 @@ def one():
     return 1
 
 @pytest.mark.parametrize('arg1,arg2', [('val1', lf('one'))])
-def test_func(arg1, arg2):
-    assert arg2 == 1
-
-@pytest.mark.parametrize('arg1,arg2', [('val1', pytest.lazy_fixtures('one'))])
 def test_func(arg1, arg2):
     assert arg2 == 1
 ```
@@ -75,7 +71,7 @@ def test_func(arg1, arg2):
     assert arg2 == 1
 ```
 
-And there is some useful wrapper called `lfc` (`lazy_fixture_callable`) or `pytest.lazy_fixtures_callable`.
+And there is some useful wrapper called `lfc` (`lazy_fixture_callable`).
 It can work with any callable and your fixtures, e.g.
 
 ```python
diff --git a/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/loader.py b/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/loader.py
index 3c675c2aaf1e..d2d39ff4f802 100644
--- a/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/loader.py
+++ b/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/loader.py
@@ -14,7 +14,7 @@ def load_lazy_fixtures(value, request: pytest.FixtureRequest):
         return value.load_fixture(request)
     # we need to check exact type
     if type(value) is dict:  # noqa: E721
-        return {key: load_lazy_fixtures(value, request) for key, value in value.items()}
+        return {load_lazy_fixtures(key, request): load_lazy_fixtures(value, request) for key, value in value.items()}
     # we need to check exact type
     elif type(value) in {list, tuple, set}:
         return type(value)([load_lazy_fixtures(value, request) for value in value])
diff --git a/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/plugin.py b/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/plugin.py
index de7d75a4f79b..f3475e199c83 100644
--- a/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/plugin.py
+++ b/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/plugin.py
@@ -1,16 +1,10 @@
 import pytest
 
-from .lazy_fixture import LazyFixtureWrapper, lf
-from .lazy_fixture_callable import lfc
+from .lazy_fixture import LazyFixtureWrapper
 from .loader import load_lazy_fixtures
 from .normalizer import normalize_metafunc_calls
 
 
-def pytest_configure():
-    pytest.lazy_fixtures = lf
-    pytest.lazy_fixtures_callable = lfc
-
-
 @pytest.hookimpl(tryfirst=True)
 def pytest_fixture_setup(fixturedef, request):
     val = getattr(request, "param", None)
diff --git a/contrib/python/pytest-lazy-fixtures/ya.make b/contrib/python/pytest-lazy-fixtures/ya.make
index b672f39330f6..47d86e8e0216 100644
--- a/contrib/python/pytest-lazy-fixtures/ya.make
+++ b/contrib/python/pytest-lazy-fixtures/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(1.0.7)
+VERSION(1.1.0)
 
 LICENSE(MIT)
 

From 3ac0db172a3dd434aa6f776d71efd11de9f46bba Mon Sep 17 00:00:00 2001
From: barykinni <barykinni@yandex-team.com>
Date: Thu, 1 Aug 2024 11:45:50 +0300
Subject: [PATCH 016/104] CHYT-1167: add request method to http client
 746dc5319b081f1c1c324129e799a0f17605b084

---
 yt/yt/core/http/client.cpp      | 22 +++++++++++-----------
 yt/yt/core/http/client.h        |  8 ++++++++
 yt/yt/core/http/mock/client.cpp |  6 ++++++
 yt/yt/core/http/mock/client.h   |  3 +++
 yt/yt/core/http/stream.cpp      |  2 +-
 yt/yt/core/https/client.cpp     |  9 +++++++++
 6 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/yt/yt/core/http/client.cpp b/yt/yt/core/http/client.cpp
index 6214168bd15a..dc7bf3077df7 100644
--- a/yt/yt/core/http/client.cpp
+++ b/yt/yt/core/http/client.cpp
@@ -94,6 +94,17 @@ class TClient
         return StartRequest(EMethod::Put, url, headers);
     }
 
+    TFuture<IResponsePtr> Request(
+        EMethod method,
+        const TString& url,
+        const std::optional<TSharedRef>& body,
+        const THeadersPtr& headers) override
+    {
+        return WrapError(url, BIND([=, this, this_ = MakeStrong(this)] {
+            return DoRequest(method, url, body, headers);
+        }));
+    }
+
 private:
     const TClientConfigPtr Config_;
     const IDialerPtr Dialer_;
@@ -294,17 +305,6 @@ class TClient
 
         return IResponsePtr(response);
     }
-
-    TFuture<IResponsePtr> Request(
-        EMethod method,
-        const TString& url,
-        const std::optional<TSharedRef>& body,
-        const THeadersPtr& headers)
-    {
-        return WrapError(url, BIND([=, this, this_ = MakeStrong(this)] {
-            return DoRequest(method, url, body, headers);
-        }));
-    }
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/http/client.h b/yt/yt/core/http/client.h
index 0f6ba0239fc6..a75df31142e2 100644
--- a/yt/yt/core/http/client.h
+++ b/yt/yt/core/http/client.h
@@ -2,6 +2,8 @@
 
 #include "public.h"
 
+#include "yt/yt/core/http/http.h"
+
 #include <yt/yt/core/concurrency/public.h>
 
 #include <yt/yt/core/net/public.h>
@@ -63,6 +65,12 @@ struct IClient
     virtual TFuture<IActiveRequestPtr> StartPut(
         const TString& url,
         const THeadersPtr& headers = nullptr) = 0;
+
+    virtual TFuture<IResponsePtr> Request(
+        EMethod method,
+        const TString& url,
+        const std::optional<TSharedRef>& body,
+        const THeadersPtr& headers) = 0;
 };
 
 DEFINE_REFCOUNTED_TYPE(IClient)
diff --git a/yt/yt/core/http/mock/client.cpp b/yt/yt/core/http/mock/client.cpp
index bec6691be0a0..69f0b345c0c1 100644
--- a/yt/yt/core/http/mock/client.cpp
+++ b/yt/yt/core/http/mock/client.cpp
@@ -110,6 +110,12 @@ TFuture<IActiveRequestPtr> TMockClient::StartPut(const TString& /*url*/, const T
     YT_UNIMPLEMENTED();
 }
 
+TFuture<IResponsePtr> TMockClient::Request(EMethod method, const TString& url, const std::optional<TSharedRef>& body, const THeadersPtr& headers)
+{
+    auto mockResponse = Request(method, url, ToString(body), DumpHeadersSafe(headers));
+    return MakeFuture<IResponsePtr>(New<TMockResponseStream>(mockResponse));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace NYT::NHttp
diff --git a/yt/yt/core/http/mock/client.h b/yt/yt/core/http/mock/client.h
index ea93320e2c5b..61a01e999966 100644
--- a/yt/yt/core/http/mock/client.h
+++ b/yt/yt/core/http/mock/client.h
@@ -32,11 +32,14 @@ class TMockClient
     TFuture<IActiveRequestPtr> StartPatch(const TString& url, const THeadersPtr& headers) override;
     TFuture<IActiveRequestPtr> StartPut(const TString& url, const THeadersPtr& headers) override;
 
+    TFuture<IResponsePtr> Request(EMethod method, const TString& url, const std::optional<TSharedRef>& body, const THeadersPtr& headers) override;
+
     MOCK_METHOD(TMockResponse, Get, (const TString& url, const TMockHeaders& headers));
     MOCK_METHOD(TMockResponse, Post, (const TString& url, const TString& body, const TMockHeaders& headers));
     MOCK_METHOD(TMockResponse, Patch, (const TString& url, const TString& body, const TMockHeaders& headers));
     MOCK_METHOD(TMockResponse, Put, (const TString& url, const TString& body, const TMockHeaders& headers));
     MOCK_METHOD(TMockResponse, Delete, (const TString& url, const TMockHeaders& headers));
+    MOCK_METHOD(TMockResponse, Request, (EMethod method, const TString& url, const std::optional<TString>& body, const TMockHeaders& headers));
 };
 
 DECLARE_REFCOUNTED_CLASS(TMockClient)
diff --git a/yt/yt/core/http/stream.cpp b/yt/yt/core/http/stream.cpp
index 2811da6eae15..db16ffdf53aa 100644
--- a/yt/yt/core/http/stream.cpp
+++ b/yt/yt/core/http/stream.cpp
@@ -682,7 +682,7 @@ TSharedRef THttpOutput::GetHeadersPart(std::optional<size_t> contentLength)
 
     if (contentLength) {
         if (MessageType_ == EMessageType::Response ||
-            (MessageType_ == EMessageType::Request && methodNeedsContentLength)) {
+            (MessageType_ == EMessageType::Request && (*contentLength > 0 || methodNeedsContentLength))) {
             messageHeaders << "Content-Length: " << *contentLength << "\r\n";
         }
     } else {
diff --git a/yt/yt/core/https/client.cpp b/yt/yt/core/https/client.cpp
index 95ac66b8561e..7d5fbc70e57d 100644
--- a/yt/yt/core/https/client.cpp
+++ b/yt/yt/core/https/client.cpp
@@ -89,6 +89,15 @@ class TClient
         return Underlying_->StartPut(url, headers);
     }
 
+    TFuture<IResponsePtr> Request(
+        EMethod method,
+        const TString& url,
+        const std::optional<TSharedRef>& body,
+        const THeadersPtr& headers) override
+    {
+        return Underlying_->Request(method, url, body, headers);
+    }
+
 private:
     const IClientPtr Underlying_;
 };

From ce1f1f126308cd11092ee1f8e855d9e97b22318e Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Thu, 1 Aug 2024 12:35:19 +0300
Subject: [PATCH 017/104] Intermediate changes

---
 util/string/strip_ut.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/util/string/strip_ut.cpp b/util/string/strip_ut.cpp
index 283ab66fdfa2..032bbe9b4fb2 100644
--- a/util/string/strip_ut.cpp
+++ b/util/string/strip_ut.cpp
@@ -22,8 +22,12 @@ Y_UNIT_TEST_SUITE(TStripStringTest) {
         {"\n \t\r", "", "", ""},
         {"", "", "", ""},
         {"abc", "abc", "abc", "abc"},
+        {"  abc  ", "abc  ", "  abc", "abc"},
         {"a c", "a c", "a c", "a c"},
         {"  long string to avoid SSO            \n", "long string to avoid SSO            \n", "  long string to avoid SSO", "long string to avoid SSO"},
+        {"  набор не-ascii букв  ", "набор не-ascii букв  ", "  набор не-ascii букв", "набор не-ascii букв"},
+        // Russian "х" ends with \x85, whis is a space character in some encodings.
+        {"последней буквой идет х ", "последней буквой идет х ", "последней буквой идет х", "последней буквой идет х"},
     };
 
     Y_UNIT_TEST(TestStrip) {
@@ -32,20 +36,23 @@ Y_UNIT_TEST_SUITE(TStripStringTest) {
 
             TString s;
             Strip(inputStr, s);
-            UNIT_ASSERT_EQUAL(s, test.StripRes);
+            UNIT_ASSERT_VALUES_EQUAL(s, test.StripRes);
 
-            UNIT_ASSERT_EQUAL(StripString(inputStr), test.StripRes);
-            UNIT_ASSERT_EQUAL(StripStringLeft(inputStr), test.StripLeftRes);
-            UNIT_ASSERT_EQUAL(StripStringRight(inputStr), test.StripRightRes);
+            UNIT_ASSERT_VALUES_EQUAL(StripString(inputStr), test.StripRes);
+            UNIT_ASSERT_VALUES_EQUAL(StripStringLeft(inputStr), test.StripLeftRes);
+            UNIT_ASSERT_VALUES_EQUAL(StripStringRight(inputStr), test.StripRightRes);
 
             TStringBuf inputStrBuf(test.Str);
-            UNIT_ASSERT_EQUAL(StripString(inputStrBuf), test.StripRes);
-            UNIT_ASSERT_EQUAL(StripStringLeft(inputStrBuf), test.StripLeftRes);
-            UNIT_ASSERT_EQUAL(StripStringRight(inputStrBuf), test.StripRightRes);
+            UNIT_ASSERT_VALUES_EQUAL(StripString(inputStrBuf), test.StripRes);
+            UNIT_ASSERT_VALUES_EQUAL(StripStringLeft(inputStrBuf), test.StripLeftRes);
+            UNIT_ASSERT_VALUES_EQUAL(StripStringRight(inputStrBuf), test.StripRightRes);
         };
     }
 
     Y_UNIT_TEST(TestStripInPlace) {
+        // On Darwin default locale is set to a value which interprets certain cyrillic utf-8 sequences as spaces.
+        // Which we do not use ::isspace and only strip ASCII spaces, we want to ensure that this will not change in the future.
+        std::setlocale(LC_ALL, "");
         for (const auto& test : StripTests) {
             TString str(test.Str);
             Y_ASSERT(str.IsDetached() || str.empty()); // prerequisite of the test; check that we don't try to modify shared COW-string in-place by accident

From 90a087da62ad42fbbe97fdbcd8dd47fe96c37892 Mon Sep 17 00:00:00 2001
From: robot-brewer <robot-brewer@yandex-team.com>
Date: Thu, 1 Aug 2024 12:43:28 +0300
Subject: [PATCH 018/104] Release java-grpc #1

https://github.com/yandex/toolchain-registry/releases/tag/java-grpc-v1
c1b07468a830993d69392aabc78201b2c1fe58e6
---
 build/mapping.conf.json                   |  2 ++
 build/platform/java/grpc/resources.json   | 16 ++++++++--------
 build/platform/java/grpc/ya.make.prebuilt |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index e67b484a8d4e..c6e062b6be24 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -611,6 +611,7 @@
         "6406437536": "https://devtools-registry.s3.yandex.net/6406437536",
         "6447316775": "https://devtools-registry.s3.yandex.net/6447316775",
         "6133419349": "https://devtools-registry.s3.yandex.net/6133419349",
+        "6785543406": "https://devtools-registry.s3.yandex.net/6785543406",
         "1277521710": "https://devtools-registry.s3.yandex.net/1277521710",
         "1812152858": "https://devtools-registry.s3.yandex.net/1812152858",
         "289381370": "https://devtools-registry.s3.yandex.net/289381370",
@@ -1341,6 +1342,7 @@
         "6406437536": "gdb-14-linux-x86_64-9d91f66a1caff272af94e2fc97e690a18d910204",
         "6447316775": "gdb-14-linux-x86_64-9db71d8b25a56ee316036c53fd941934a95831a3",
         "6133419349": "gdb-14-linux-x86_64-b1fa9be28bbf4ee845d6a39a049c7b60018a3695",
+        "6785543406": "grpc-java-linux-x86_64-231a5a5d0bf5248caf1a9539ef29dd2b20a9d05d",
         "1277521710": "infra/kernel/tools/atop/build/atop-static.tar.gz",
         "1812152858": "junk/zubchick/buf/buf for linux",
         "289381370": "none-none-none-jsr305-3.0.2-sources.jar",
diff --git a/build/platform/java/grpc/resources.json b/build/platform/java/grpc/resources.json
index ca60d5634d9c..e02259df4a49 100644
--- a/build/platform/java/grpc/resources.json
+++ b/build/platform/java/grpc/resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin-arm64": {
-            "uri": "sbr:6538659252"
+            "uri": "sbr:6785522906"
         },
         "darwin-x86_64": {
-            "uri": "sbr:6538635125"
-        },
-        "linux-x86_64": {
-            "uri": "sbr:6538599922"
+            "uri": "sbr:6785581427"
         },
         "linux-aarch64": {
-            "uri": "sbr:6538555418"
+            "uri": "sbr:6785818439"
+        },
+        "linux-x86_64": {
+            "uri": "sbr:6785543406"
         },
         "win32-x86_64": {
-            "uri": "sbr:6538717281"
+            "uri": "sbr:6785822552"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build/platform/java/grpc/ya.make.prebuilt b/build/platform/java/grpc/ya.make.prebuilt
index 27a05320f993..7de87dd46cc8 100644
--- a/build/platform/java/grpc/ya.make.prebuilt
+++ b/build/platform/java/grpc/ya.make.prebuilt
@@ -4,6 +4,6 @@ ENABLE(PREBUILT)
 PREBUILT_PROGRAM()
     IF (SANDBOX_RESOURCE_URI != "")
         DECLARE_EXTERNAL_RESOURCE(GRPC_JAVA ${SANDBOX_RESOURCE_URI})
-        PRIMARY_OUTPUT(${GRPC_JAVA_RESOURCE_GLOBAL}/grpc_java${MODULE_SUFFIX})
+        PRIMARY_OUTPUT(${GRPC_JAVA_RESOURCE_GLOBAL}/bin/grpc_java${MODULE_SUFFIX})
     ENDIF()
 END()

From e43e1b272d0b7bc3a0eeb2ec4d487188f839ff10 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Thu, 1 Aug 2024 16:52:56 +0300
Subject: [PATCH 019/104] Intermediate changes

---
 .../future/ut_gtest/coroutine_traits_ut.cpp   | 189 ++++++++++++++++++
 library/cpp/threading/future/ut_gtest/ya.make |  11 +
 library/cpp/threading/future/ya.make          |   1 +
 3 files changed, 201 insertions(+)
 create mode 100644 library/cpp/threading/future/ut_gtest/coroutine_traits_ut.cpp
 create mode 100644 library/cpp/threading/future/ut_gtest/ya.make

diff --git a/library/cpp/threading/future/ut_gtest/coroutine_traits_ut.cpp b/library/cpp/threading/future/ut_gtest/coroutine_traits_ut.cpp
new file mode 100644
index 000000000000..a98e455c583e
--- /dev/null
+++ b/library/cpp/threading/future/ut_gtest/coroutine_traits_ut.cpp
@@ -0,0 +1,189 @@
+#include <library/cpp/testing/gtest/gtest.h>
+#include <library/cpp/testing/gtest_extensions/gtest_extensions.h>
+#include <library/cpp/threading/future/future.h>
+#include <library/cpp/threading/future/core/coroutine_traits.h>
+
+#include <util/generic/vector.h>
+#include <util/generic/scope.h>
+#include <util/system/platform.h>
+
+
+TEST(TestFutureTraits, Simple) {
+    TVector<TString> result;
+
+    auto coroutine1 = [&result]() -> NThreading::TFuture<size_t> {
+        result.push_back("coroutine1");
+        co_return 1;
+    };
+
+    NThreading::TPromise<size_t> coroutine2SuspendPromise = NThreading::NewPromise<size_t>();
+    auto coroutine2 = [&result, coroutine2SuspendFuture = coroutine2SuspendPromise.GetFuture()]() -> NThreading::TFuture<size_t> {
+        result.push_back("coroutine2");
+
+        result.push_back("pre_coroutine2_suspend_future");
+        size_t futureResult = co_await coroutine2SuspendFuture;
+        result.push_back("post_coroutine2_suspend_future");
+
+        co_return 2 + futureResult;
+    };
+
+    auto coroutineAll = [&]() -> NThreading::TFuture<size_t> {
+        Y_DEFER {
+            result.push_back("coroutine_all_destroy");
+        };
+
+        result.push_back("pre_coroutine1");
+        size_t coroutine1Res = co_await coroutine1();
+        result.push_back("post_coroutine1");
+
+        result.push_back("pre_coroutine2");
+        size_t coroutine2Res = co_await coroutine2();
+        result.push_back("post_coroutine2");
+
+        co_return coroutine1Res + coroutine2Res;
+    };
+
+    NThreading::TFuture<size_t> coroutineAllFuture = coroutineAll();
+    EXPECT_FALSE(coroutineAllFuture.HasValue());
+    EXPECT_FALSE(coroutineAllFuture.HasException());
+    EXPECT_THAT(
+        result,
+        ::testing::ContainerEq(
+            TVector<TString>({
+                "pre_coroutine1",
+                "coroutine1",
+                "post_coroutine1",
+
+                "pre_coroutine2",
+                "coroutine2",
+                "pre_coroutine2_suspend_future"
+            })
+        )
+    );
+
+    coroutine2SuspendPromise.SetValue(3u);
+    EXPECT_TRUE(coroutineAllFuture.HasValue());
+    EXPECT_EQ(coroutineAllFuture.GetValue(), 6u);
+    EXPECT_THAT(
+        result,
+        ::testing::ContainerEq(
+            TVector<TString>({
+                "pre_coroutine1",
+                "coroutine1",
+                "post_coroutine1",
+
+                "pre_coroutine2",
+                "coroutine2",
+                "pre_coroutine2_suspend_future",
+                "post_coroutine2_suspend_future",
+                "post_coroutine2",
+
+                "coroutine_all_destroy"
+            })
+        )
+    );
+}
+
+TEST(TestFutureTraits, Exception) {
+    TVector<TString> result;
+
+    auto coroutine1 = [&result]() -> NThreading::TFuture<size_t> {
+        result.push_back("coroutine1");
+        co_return 1;
+    };
+
+    auto coroutine2 = [&result]() -> NThreading::TFuture<size_t> {
+        result.push_back("coroutine2");
+        ythrow yexception() << "coroutine2 exception";
+    };
+
+    auto coroutineAll = [&]() -> NThreading::TFuture<size_t> {
+        Y_DEFER {
+            result.push_back("coroutine_all_destroy");
+        };
+
+        result.push_back("pre_coroutine1");
+        size_t coroutine1Res = co_await coroutine1();
+        result.push_back("post_coroutine1");
+
+        result.push_back("pre_coroutine2");
+        size_t coroutine2Res = co_await coroutine2();
+        result.push_back("post_coroutine2");
+
+        co_return coroutine1Res + coroutine2Res;
+    };
+
+    EXPECT_THROW_MESSAGE_HAS_SUBSTR(
+        coroutineAll().GetValueSync(),
+        yexception,
+        "coroutine2 exception"
+    );
+    EXPECT_THAT(
+        result,
+        ::testing::ContainerEq(
+            TVector<TString>({
+                "pre_coroutine1",
+                "coroutine1",
+                "post_coroutine1",
+
+                "pre_coroutine2",
+                "coroutine2",
+
+                "coroutine_all_destroy"
+            })
+        )
+    );
+}
+
+TEST(TestFutureTraits, CrashOnExceptionInCoroutineHandlerResume) {
+    EXPECT_DEATH(
+        {
+            struct TBadPromise;
+            struct TBadCoroutine : std::coroutine_handle<TBadPromise> {
+                using promise_type = TBadPromise;
+            };
+
+            struct TBadPromise {
+                TBadCoroutine get_return_object() {
+                    return {TBadCoroutine::from_promise(*this)};
+                }
+
+                std::suspend_never initial_suspend() noexcept {
+                    return {};
+                }
+                std::suspend_never final_suspend() noexcept {
+                    return {};
+                }
+                void return_void() {
+                }
+                void unhandled_exception() {
+                    throw;
+                }
+            };
+
+            auto badCoroutine = []() -> TBadCoroutine {
+                ythrow yexception() << "bad coroutine exception";
+            };
+            // Sanity check
+            EXPECT_THROW_MESSAGE_HAS_SUBSTR(
+                badCoroutine(),
+                yexception,
+                "bad coroutine exception"
+            );
+
+            NThreading::TPromise<void> promise = NThreading::NewPromise<void>();
+            auto badCoroutineWithFutureAwait = [future = promise.GetFuture()]() -> TBadCoroutine {
+                co_await future;
+                ythrow yexception() << "bad coroutine with future await exception";
+            };
+
+            badCoroutineWithFutureAwait();
+            promise.SetValue();
+        },
+#if defined(_win_)
+        ".*"
+#else
+        "bad coroutine with future await exception"
+#endif
+    );
+}
diff --git a/library/cpp/threading/future/ut_gtest/ya.make b/library/cpp/threading/future/ut_gtest/ya.make
new file mode 100644
index 000000000000..84f7ebe2e0e1
--- /dev/null
+++ b/library/cpp/threading/future/ut_gtest/ya.make
@@ -0,0 +1,11 @@
+GTEST()
+
+PEERDIR(
+    library/cpp/threading/future
+)
+
+SRCS(
+    coroutine_traits_ut.cpp
+)
+
+END()
diff --git a/library/cpp/threading/future/ya.make b/library/cpp/threading/future/ya.make
index 1d98569906c9..77ee8b3c5391 100644
--- a/library/cpp/threading/future/ya.make
+++ b/library/cpp/threading/future/ya.make
@@ -19,4 +19,5 @@ RECURSE(
     mt_ut
     perf
     ut
+    ut_gtest
 )

From cae5d68c4cae12cdcdba67084970d51e72b4fb89 Mon Sep 17 00:00:00 2001
From: sabdenovch <sabdenovch@yandex-team.com>
Date: Thu, 1 Aug 2024 16:52:57 +0300
Subject: [PATCH 020/104] YT-21050: Unique secondary index
 ba40304e0daf8a897f051cb7bef04e8358a7fc72

---
 yt/yt/client/tablet_client/public.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/yt/yt/client/tablet_client/public.h b/yt/yt/client/tablet_client/public.h
index 332a877a6de1..c0fe8449a505 100644
--- a/yt/yt/client/tablet_client/public.h
+++ b/yt/yt/client/tablet_client/public.h
@@ -92,6 +92,7 @@ YT_DEFINE_ERROR_ENUM(
     ((TableSchemaIncompatible)                (1738))
     ((BundleIsBanned)                         (1739))
     ((TabletServantIsNotActive)               (1740))
+    ((UniqueIndexConflict)                    (1741))
 );
 
 DEFINE_ENUM(EInMemoryMode,
@@ -222,6 +223,7 @@ DEFINE_ENUM(ETabletServiceFeatures,
 DEFINE_ENUM(ESecondaryIndexKind,
     ((FullSync)                 (0))
     ((Unfolding)                (1))
+    ((Unique)                   (2))
 );
 
 DEFINE_ENUM(ERowMergerType,

From 6a72de53917646d5eb6bb156ab672ec2de853947 Mon Sep 17 00:00:00 2001
From: artemagafonov <artemagafonov@yandex-team.com>
Date: Thu, 1 Aug 2024 17:59:03 +0300
Subject: [PATCH 021/104] YT-22323: Improve logging of tcp connections
 a95f8b7bcb0c36cba182953b7244b4ec4c723dd1

---
 yt/yt/core/bus/tcp/connection.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/yt/yt/core/bus/tcp/connection.cpp b/yt/yt/core/bus/tcp/connection.cpp
index 5a26424aad33..e6241815b4f0 100644
--- a/yt/yt/core/bus/tcp/connection.cpp
+++ b/yt/yt/core/bus/tcp/connection.cpp
@@ -214,7 +214,9 @@ void TTcpConnection::Start()
     }
 
     if (!Poller_->TryRegister(this)) {
-        Abort(TError(NBus::EErrorCode::TransportError, "Cannot register connection pollable"));
+        auto error = TError(NBus::EErrorCode::TransportError, "Cannot register connection pollable");
+        Abort(error);
+        YT_LOG_WARNING(error << *EndpointAttributes_, "Connection aborted");
         return;
     }
 
@@ -223,8 +225,9 @@ void TTcpConnection::Start()
     try {
         InitBuffers();
     } catch (const std::exception& ex) {
-        Abort(TError(NBus::EErrorCode::TransportError, "I/O buffers allocation error")
-            << ex);
+        auto error = TError(NBus::EErrorCode::TransportError, "I/O buffers allocation error") << ex;
+        Abort(error);
+        YT_LOG_WARNING(error << *EndpointAttributes_, "Connection aborted");
         return;
     }
 

From 5b40c9f2b99b0d27c33d6dba1a064821e0134b5d Mon Sep 17 00:00:00 2001
From: melkov <melkov@yandex-team.com>
Date: Thu, 1 Aug 2024 21:25:27 +0300
Subject: [PATCH 022/104] YT-22414: Prepare to use TRange constructor directly
 instead of MakeRange

* Also the same for TMutableRange.
* Add TRange, TMutableRange constructor from std::span.
46da1787e68a922bb65181c63a226a3797edae0b
---
 library/cpp/yt/memory/range.h        | 48 ++++++++++++++++++++++++++--
 library/cpp/yt/memory/ref-inl.h      |  2 +-
 library/cpp/yt/memory/shared_range.h |  2 +-
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/library/cpp/yt/memory/range.h b/library/cpp/yt/memory/range.h
index 7a9c0bcd7902..232de3baa1e1 100644
--- a/library/cpp/yt/memory/range.h
+++ b/library/cpp/yt/memory/range.h
@@ -4,10 +4,11 @@
 
 #include <library/cpp/yt/misc/hash.h>
 
-#include <vector>
 #include <array>
-#include <optional>
 #include <initializer_list>
+#include <optional>
+#include <span>
+#include <vector>
 
 // For size_t.
 #include <stddef.h>
@@ -91,6 +92,12 @@ class TRange
         , Length_(elements.size())
     { }
 
+    //! Constructs a TRange from an std::span.
+    TRange(const std::span<T>& elements)
+        : Data_(elements.data())
+        , Length_(elements.size())
+    { }
+
     //! Constructs a TRange from a C array.
     template <size_t N>
     TRange(const T (&elements)[N])
@@ -118,6 +125,19 @@ class TRange
         , Length_(element ? 1 : 0)
     { }
 
+    //! Constructs a TRange from RepeatedField.
+    TRange(const google::protobuf::RepeatedField<T>& elements)
+        : Data_(elements.data())
+        , Length_(elements.size())
+    { }
+
+    //! Constructs a TRange from RepeatedPtrField.
+    template<class TPointed>
+    TRange(const google::protobuf::RepeatedPtrField<TPointed>& elements)
+        : Data_(elements.data())
+        , Length_(elements.size())
+    { }
+
     const_iterator Begin() const
     {
         return Data_;
@@ -228,6 +248,10 @@ typename TRange<T>::const_iterator end(TRange<T> ref)
     return ref.End();
 }
 
+// Deduction guide for the constructor from RepeatedPtrField.
+template<class TPointed>
+TRange(const google::protobuf::RepeatedPtrField<TPointed>& elements) -> TRange<const TPointed*>;
+
 ////////////////////////////////////////////////////////////////////////////////
 
 //! Constructs a TRange from a pointer and length.
@@ -348,6 +372,11 @@ class TMutableRange
         : TRange<T>(elements)
     { }
 
+    //! Constructs a TMutableRange from an std::span.
+    TMutableRange(std::span<T>& elements)
+        : TRange<T>(elements)
+    { }
+
     //! Constructs a TMutableRange from std::array.
     template <size_t N>
     TMutableRange(std::array<T, N>& elements)
@@ -366,6 +395,17 @@ class TMutableRange
         : TRange<T>(elements)
     { }
 
+    //! Constructs a TMutableRange from RepeatedField.
+    TMutableRange(google::protobuf::RepeatedField<T>& elements)
+        : TRange<T>(elements)
+    { }
+
+    //! Constructs a TMutableRange from RepeatedPtrField.
+    template<class TPointed>
+    TMutableRange(google::protobuf::RepeatedPtrField<TPointed>& elements)
+        : TRange<T>(elements)
+    { }
+
     using TRange<T>::Begin;
     using TRange<T>::End;
     using TRange<T>::Front;
@@ -439,6 +479,10 @@ typename TMutableRange<T>::iterator end(TMutableRange<T> ref)
     return ref.End();
 }
 
+// Deduction guide for the constructor from RepeatedPtrField.
+template<class TPointed>
+TMutableRange(google::protobuf::RepeatedPtrField<TPointed>& elements) -> TMutableRange<TPointed*>;
+
 ////////////////////////////////////////////////////////////////////////////////
 
 //! Constructs a TMutableRange from a pointer and length.
diff --git a/library/cpp/yt/memory/ref-inl.h b/library/cpp/yt/memory/ref-inl.h
index 14b21903c057..c5756963823d 100644
--- a/library/cpp/yt/memory/ref-inl.h
+++ b/library/cpp/yt/memory/ref-inl.h
@@ -256,7 +256,7 @@ size_t GetByteSize(TRange<T> parts)
 template <class T>
 size_t GetByteSize(const std::vector<T>& parts)
 {
-    return GetByteSize(MakeRange(parts));
+    return GetByteSize(TRange(parts));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/library/cpp/yt/memory/shared_range.h b/library/cpp/yt/memory/shared_range.h
index de5fc354eaa4..113378670a17 100644
--- a/library/cpp/yt/memory/shared_range.h
+++ b/library/cpp/yt/memory/shared_range.h
@@ -191,7 +191,7 @@ TSharedRange<T> DoMakeSharedRange(TContainer&& elements, THolders&&... holders)
     holder->Holders = std::tuple<THolders...>(std::forward<THolders>(holders)...);
     holder->Elements = std::forward<TContainer>(elements);
 
-    auto range = MakeRange<T>(holder->Elements);
+    auto range = TRange<T>(holder->Elements);
 
     return TSharedRange<T>(range, std::move(holder));
 }

From 89dc8db979bd4749dfbd3220ce69d0fbbcbf708d Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Fri, 2 Aug 2024 00:00:50 +0300
Subject: [PATCH 023/104] Intermediate changes

---
 yt/python/yt/yson/__init__.py    | 2 +-
 yt/yt/library/program/config.cpp | 2 +-
 yt/yt/library/program/config.h   | 8 ++++----
 yt/yt/library/program/public.h   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/yt/python/yt/yson/__init__.py b/yt/python/yt/yson/__init__.py
index e9a303b4f89e..d3eb9d5dca50 100644
--- a/yt/python/yt/yson/__init__.py
+++ b/yt/python/yt/yson/__init__.py
@@ -54,7 +54,7 @@
         print("Warning! Failed to import YSON bindings: " + message, file=_sys.stderr)
 
 try:
-    from yt_yson_bindings import upload_parquet, dump_parquet # noqa
+    from yt_yson_bindings import upload_parquet, dump_parquet, dump_orc, upload_orc # noqa
     HAS_PARQUET = True
 except ImportError as error:
     message = str(error)
diff --git a/yt/yt/library/program/config.cpp b/yt/yt/library/program/config.cpp
index b44abdd6e9ac..0544c7f8af19 100644
--- a/yt/yt/library/program/config.cpp
+++ b/yt/yt/library/program/config.cpp
@@ -8,7 +8,7 @@ using namespace NYTree;
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void THeapSizeLimit::Register(TRegistrar registrar)
+void THeapSizeLimitConfig::Register(TRegistrar registrar)
 {
     registrar.Parameter("container_memory_ratio", &TThis::ContainerMemoryRatio)
         .Optional();
diff --git a/yt/yt/library/program/config.h b/yt/yt/library/program/config.h
index 96f70cc33993..c91f6bac1e7c 100644
--- a/yt/yt/library/program/config.h
+++ b/yt/yt/library/program/config.h
@@ -35,7 +35,7 @@ namespace NYT {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-class THeapSizeLimit
+class THeapSizeLimitConfig
     : public virtual NYTree::TYsonStruct
 {
 public:
@@ -50,12 +50,12 @@ class THeapSizeLimit
     TDuration DumpMemoryProfileTimeout;
     TString DumpMemoryProfilePath;
 
-    REGISTER_YSON_STRUCT(THeapSizeLimit);
+    REGISTER_YSON_STRUCT(THeapSizeLimitConfig);
 
     static void Register(TRegistrar registrar);
 };
 
-DEFINE_REFCOUNTED_TYPE(THeapSizeLimit)
+DEFINE_REFCOUNTED_TYPE(THeapSizeLimitConfig)
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -79,7 +79,7 @@ class TTCMallocConfig
     //! size <= 256 KiB will be under GWP-ASAN.
     std::optional<i64> GuardedSamplingRate;
 
-    THeapSizeLimitPtr HeapSizeLimit;
+    THeapSizeLimitConfigPtr HeapSizeLimit;
 
     REGISTER_YSON_STRUCT(TTCMallocConfig);
 
diff --git a/yt/yt/library/program/public.h b/yt/yt/library/program/public.h
index b10575778e48..8b2a2321d786 100644
--- a/yt/yt/library/program/public.h
+++ b/yt/yt/library/program/public.h
@@ -13,7 +13,7 @@ DECLARE_REFCOUNTED_CLASS(TStockpileConfig)
 DECLARE_REFCOUNTED_CLASS(TSingletonsConfig)
 DECLARE_REFCOUNTED_CLASS(TSingletonsDynamicConfig)
 DECLARE_REFCOUNTED_CLASS(TDiagnosticDumpConfig)
-DECLARE_REFCOUNTED_CLASS(THeapSizeLimit)
+DECLARE_REFCOUNTED_CLASS(THeapSizeLimitConfig)
 DECLARE_REFCOUNTED_CLASS(THeapProfilerConfig)
 
 ////////////////////////////////////////////////////////////////////////////////

From a4aec9c1ab95d9444fd86497ba56f3c8c61454d6 Mon Sep 17 00:00:00 2001
From: robot-ratatosk <robot-ratatosk@yandex-team.com>
Date: Fri, 2 Aug 2024 07:11:15 +0300
Subject: [PATCH 024/104] New version of the tld SKIP_CHECK SKIP_REVIEW
 d16503c5573e00368ec69f5e18842f6ee36ad057

---
 library/cpp/tld/tlds-alpha-by-domain.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/cpp/tld/tlds-alpha-by-domain.txt b/library/cpp/tld/tlds-alpha-by-domain.txt
index 7da2d2b35b30..267f7f13c18d 100644
--- a/library/cpp/tld/tlds-alpha-by-domain.txt
+++ b/library/cpp/tld/tlds-alpha-by-domain.txt
@@ -1,4 +1,4 @@
-# Version 2024073100, Last Updated Wed Jul 31 07:07:01 2024 UTC
+# Version 2024080100, Last Updated Thu Aug  1 07:07:01 2024 UTC
 AAA
 AARP
 ABB

From 361db6f916e56c2f127232d0260fcc910f2527b9 Mon Sep 17 00:00:00 2001
From: snermolaev <snermolaev@yandex-team.com>
Date: Fri, 2 Aug 2024 08:32:19 +0300
Subject: [PATCH 025/104] Skip GLOBAL keyword in SRCS for DESC_PROTO
 dad88cdc3a4e9354a746ba0649987e9e2fcb038b

---
 build/conf/proto.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index d68ec651d390..89870fbe19b6 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -810,6 +810,7 @@ multimodule PROTO_LIBRARY {
         .EXTS=.desc
         .NODE_TYPE=Library
         .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
+        .ALIASES=SRCS=_SRCS_NO_GLOBAL
 
         SET(PEERDIR_TAGS DESC_PROTO)
         ENABLE(DESC_PROTO)

From 7d4535be64fde4963aa2ddd389134facac293e87 Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Fri, 2 Aug 2024 09:47:14 +0300
Subject: [PATCH 026/104] contrib/tools/bison: Replace patch with environment
 variable 59fef9fd4f33196d66de3ac1fba18aba86a7f327

---
 build/conf/bison_lex.conf            | 4 +++-
 contrib/tools/bison/lib/config-win.h | 1 +
 contrib/tools/bison/src/getargs.c    | 8 --------
 contrib/tools/bison/src/getargs.h    | 2 --
 contrib/tools/bison/src/output.c     | 3 ---
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/build/conf/bison_lex.conf b/build/conf/bison_lex.conf
index 5e3a5418f67d..f8bee6b89abe 100644
--- a/build/conf/bison_lex.conf
+++ b/build/conf/bison_lex.conf
@@ -3,6 +3,8 @@
 # This specilizes _SRC() macro, so should be imported after generic version definition
 # Thus uses _ADD_HIDDEN_INPUTS() macro from ymake.core.conf
 
+M4_PATH=contrib/tools/m4
+
 LEX_FLAGS=
 BISON_FLAGS=-v
 
@@ -133,7 +135,7 @@ macro USE_OLD_FLEX() {
 
 macro _SRC("y", SRC, SRCFLAGS...) {
     .PEERDIR=build/induced/by_bison
-    .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
+    .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:"M4=${tool:M4_PATH}"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
     .SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"' && target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && platform_vars-BISON_FLAGS ${quo:BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
 }
 
diff --git a/contrib/tools/bison/lib/config-win.h b/contrib/tools/bison/lib/config-win.h
index 4e3fc4ebfa95..a3a4ad1adec4 100644
--- a/contrib/tools/bison/lib/config-win.h
+++ b/contrib/tools/bison/lib/config-win.h
@@ -1701,6 +1701,7 @@ char *strsignal (int signum);
 /* Define as a macro for copying va_list variables. */
 #define va_copy gl_va_copy
 
+#define M4 "/var/empty/gnum4-1.4.19/bin/m4"
 #define M4_GNU_OPTION "--gnu"
 #define PACKAGE_COPYRIGHT_YEAR 2013
 #define _GL_ATTRIBUTE_MALLOC 
diff --git a/contrib/tools/bison/src/getargs.c b/contrib/tools/bison/src/getargs.c
index 51d66be3f531..417e163c2aaf 100644
--- a/contrib/tools/bison/src/getargs.c
+++ b/contrib/tools/bison/src/getargs.c
@@ -65,8 +65,6 @@ const char *skeleton = NULL;
 int language_prio = default_prio;
 struct bison_language const *language = &valid_languages[0];
 
-const char* m4_path = NULL;
-
 /** Decode an option's key.
  *
  *  \param opt      option being decoded.
@@ -496,7 +494,6 @@ enum
   LOCATIONS_OPTION = CHAR_MAX + 1,
   PRINT_LOCALEDIR_OPTION,
   PRINT_DATADIR_OPTION,
-  M4_PATH,
   REPORT_FILE_OPTION
 };
 
@@ -525,7 +522,6 @@ static struct option const long_options[] =
 
   /* Hidden. */
   { "trace",         optional_argument,   0,     'T' },
-  { "m4",            required_argument,   0,     M4_PATH },
 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },
@@ -734,10 +730,6 @@ getargs (int argc, char *argv[])
         spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
         break;
 
-      case M4_PATH:
-        m4_path = xstrdup (AS_FILE_NAME (optarg));
-        break;
-
       default:
         usage (EXIT_FAILURE);
       }
diff --git a/contrib/tools/bison/src/getargs.h b/contrib/tools/bison/src/getargs.h
index b488091393a8..c5adb8487ab5 100644
--- a/contrib/tools/bison/src/getargs.h
+++ b/contrib/tools/bison/src/getargs.h
@@ -42,8 +42,6 @@ extern bool token_table_flag;           /* for -k */
 extern location yacc_loc;               /* for -y */
 extern bool update_flag;                /* for -u */
 
-extern const char* m4_path;
-
 /* GLR_PARSER is true if the input file says to use the GLR
    (Generalized LR) parser, and to output some additional information
    used by the GLR algorithm.  */
diff --git a/contrib/tools/bison/src/output.c b/contrib/tools/bison/src/output.c
index ae0dc5834f9e..10a6d38a7ad5 100644
--- a/contrib/tools/bison/src/output.c
+++ b/contrib/tools/bison/src/output.c
@@ -48,9 +48,6 @@
 
 #include <contrib/tools/bison/arcadia_root.h>
 
-#undef M4
-#define M4 (m4_path)
-
 #define STR(a) XSTR(a)
 #define XSTR(a) #a
 

From 5a45964796c9ec3473a077d84d58554fa74d6582 Mon Sep 17 00:00:00 2001
From: robot-contrib <robot-contrib@yandex-team.com>
Date: Fri, 2 Aug 2024 10:25:55 +0300
Subject: [PATCH 027/104] Update contrib/libs/backtrace to 2024-07-18
 6556f8d7260c8d1b632c0bb680c61c73c9616cb9

---
 contrib/libs/backtrace/elf.c      | 14 ++++----
 contrib/libs/backtrace/internal.h |  5 +++
 contrib/libs/backtrace/print.c    | 55 ++++++++++++++++++++++---------
 contrib/libs/backtrace/ya.make    |  2 +-
 4 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/contrib/libs/backtrace/elf.c b/contrib/libs/backtrace/elf.c
index 575e13daf500..380cafe91a86 100644
--- a/contrib/libs/backtrace/elf.c
+++ b/contrib/libs/backtrace/elf.c
@@ -4848,25 +4848,25 @@ elf_zstd_decompress (const unsigned char *pin, size_t sin,
 		  {
 		  case 8:
 		    *pout++ = *plit++;
-		    /* FALLTHROUGH */
+		    ATTRIBUTE_FALLTHROUGH;
 		  case 7:
 		    *pout++ = *plit++;
-		    /* FALLTHROUGH */
+		    ATTRIBUTE_FALLTHROUGH;
 		  case 6:
 		    *pout++ = *plit++;
-		    /* FALLTHROUGH */
+		    ATTRIBUTE_FALLTHROUGH;
 		  case 5:
 		    *pout++ = *plit++;
-		    /* FALLTHROUGH */
+		    ATTRIBUTE_FALLTHROUGH;
 		  case 4:
 		    *pout++ = *plit++;
-		    /* FALLTHROUGH */
+		    ATTRIBUTE_FALLTHROUGH;
 		  case 3:
 		    *pout++ = *plit++;
-		    /* FALLTHROUGH */
+		    ATTRIBUTE_FALLTHROUGH;
 		  case 2:
 		    *pout++ = *plit++;
-		    /* FALLTHROUGH */
+		    ATTRIBUTE_FALLTHROUGH;
 		  case 1:
 		    *pout++ = *plit++;
 		    break;
diff --git a/contrib/libs/backtrace/internal.h b/contrib/libs/backtrace/internal.h
index 422115a2250a..6164c01a5802 100644
--- a/contrib/libs/backtrace/internal.h
+++ b/contrib/libs/backtrace/internal.h
@@ -56,6 +56,11 @@ POSSIBILITY OF SUCH DAMAGE.  */
 # endif
 #endif
 
+#ifdef __has_attribute
+# if __has_attribute(fallthrough)
+#  define ATTRIBUTE_FALLTHROUGH __attribute__ ((fallthrough))
+# endif
+#endif
 #ifndef ATTRIBUTE_FALLTHROUGH
 # if (GCC_VERSION >= 7000)
 #  define ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__))
diff --git a/contrib/libs/backtrace/print.c b/contrib/libs/backtrace/print.c
index 3e61f02ebbc2..d4637af9a4fd 100644
--- a/contrib/libs/backtrace/print.c
+++ b/contrib/libs/backtrace/print.c
@@ -47,6 +47,39 @@ struct print_data
   FILE *f;
 };
 
+/* Print errors to stderr.  */
+
+static void
+error_callback (void *data, const char *msg, int errnum)
+{
+  struct print_data *pdata = (struct print_data *) data;
+
+  if (pdata->state->filename != NULL)
+    fprintf (stderr, "%s: ", pdata->state->filename);
+  fprintf (stderr, "libbacktrace: %s", msg);
+  if (errnum > 0)
+    fprintf (stderr, ": %s", strerror (errnum));
+  fputc ('\n', stderr);
+}
+
+/* Print one level of a backtrace if we couldn't get a file or function name.
+   Use syminfo to try to get a symbol name.  */
+
+static void print_syminfo_callback (void *data, uintptr_t pc,
+				    const char *symname, uintptr_t symval,
+				    uintptr_t symsize ATTRIBUTE_UNUSED)
+{
+  struct print_data *pdata = (struct print_data *) data;
+
+  if (symname == NULL)
+    fprintf (pdata->f, "0x%lx ???\n\t???:0\n", (unsigned long) pc);
+  else
+    fprintf (pdata->f, "0x%lx ???\n\t%s+0x%lx:0\n",
+	     (unsigned long) pc,
+	     symname,
+	     (unsigned long) (pc - symval));
+}
+
 /* Print one level of a backtrace.  */
 
 static int
@@ -55,6 +88,13 @@ print_callback (void *data, uintptr_t pc, const char *filename, int lineno,
 {
   struct print_data *pdata = (struct print_data *) data;
 
+  if (function == NULL && filename == NULL)
+    {
+      backtrace_syminfo (pdata->state, pc, print_syminfo_callback,
+			 error_callback, data);
+      return 0;
+    }
+
   fprintf (pdata->f, "0x%lx %s\n\t%s:%d\n",
 	   (unsigned long) pc,
 	   function == NULL ? "???" : function,
@@ -63,21 +103,6 @@ print_callback (void *data, uintptr_t pc, const char *filename, int lineno,
   return 0;
 }
 
-/* Print errors to stderr.  */
-
-static void
-error_callback (void *data, const char *msg, int errnum)
-{
-  struct print_data *pdata = (struct print_data *) data;
-
-  if (pdata->state->filename != NULL)
-    fprintf (stderr, "%s: ", pdata->state->filename);
-  fprintf (stderr, "libbacktrace: %s", msg);
-  if (errnum > 0)
-    fprintf (stderr, ": %s", strerror (errnum));
-  fputc ('\n', stderr);
-}
-
 /* Print a backtrace.  */
 
 void __attribute__((noinline))
diff --git a/contrib/libs/backtrace/ya.make b/contrib/libs/backtrace/ya.make
index d8d066df2c78..10bc0fe17be0 100644
--- a/contrib/libs/backtrace/ya.make
+++ b/contrib/libs/backtrace/ya.make
@@ -8,7 +8,7 @@ LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
 VERSION(2024-07-18)
 
-ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/8e32931a4fe98b9bc955cb97b4702123b204f139.tar.gz)
+ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/7e2b7da3d6568d2e4e78658f22e701746a48d7e1.tar.gz)
 
 ADDINCL(
     contrib/libs/backtrace

From 92b85f69f24f17bdfe07ce6b79a1c89a6be6570b Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Fri, 2 Aug 2024 11:46:37 +0300
Subject: [PATCH 028/104] Intermediate changes

---
 .../threading/future/core/coroutine_traits.h  | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/library/cpp/threading/future/core/coroutine_traits.h b/library/cpp/threading/future/core/coroutine_traits.h
index 5871e22a35da..f032190fb1ba 100644
--- a/library/cpp/threading/future/core/coroutine_traits.h
+++ b/library/cpp/threading/future/core/coroutine_traits.h
@@ -51,42 +51,46 @@ struct std::coroutine_traits<NThreading::TFuture<T>, Args...> {
     };
 };
 
-template<typename T>
-struct TFutureAwaitable {
-    NThreading::TFuture<T> Future;
+namespace NThreading {
 
-    TFutureAwaitable(NThreading::TFuture<T> future)
-        : Future{future}
-    {
-    }
+    template<typename T>
+    struct TFutureAwaitable {
+        NThreading::TFuture<T> Future;
 
-    bool await_ready() const noexcept {
-        return Future.HasValue() || Future.HasException();
-    }
+        TFutureAwaitable(NThreading::TFuture<T> future) noexcept
+            : Future{std::move(future)}
+        {
+        }
 
-    void await_suspend(auto h) noexcept {
-        /*
-         * This library assumes that resume never throws an exception.
-         * This assumption is made due to the fact that the users of these library in most cases do not need to write their own coroutine handlers,
-         * and all coroutine handlers provided by the library do not throw exception from resume.
-         *
-         * WARNING: do not change subscribe to apply or something other here, creating an extra future state degrades performance.
-         */
-        Future.NoexceptSubscribe(
-            [h](auto) mutable noexcept {
-                h();
-            }
-        );
-    }
+        bool await_ready() const noexcept {
+            return Future.IsReady();
+        }
 
-    decltype(auto) await_resume() {
-        return Future.GetValue();
-    }
-};
+        void await_suspend(auto h) noexcept {
+            /*
+             * This library assumes that resume never throws an exception.
+             * This assumption is made due to the fact that the users of these library in most cases do not need to write their own coroutine handlers,
+             * and all coroutine handlers provided by the library do not throw exception from resume.
+             *
+             * WARNING: do not change subscribe to apply or something other here, creating an extra future state degrades performance.
+             */
+            Future.NoexceptSubscribe(
+                [h](auto) mutable noexcept {
+                    h();
+                }
+            );
+        }
+
+        decltype(auto) await_resume() {
+            return Future.GetValue();
+        }
+    };
+
+} // namespace NThreading
 
 template<typename T>
 auto operator co_await(const NThreading::TFuture<T>& future) {
-    return TFutureAwaitable{future};
+    return NThreading::TFutureAwaitable{future};
 }
 
 namespace NThreading {

From 99d0a5c88a19f2a5310c8bfe5ed63ef53e8ce00b Mon Sep 17 00:00:00 2001
From: pavook <pavook@yandex-team.com>
Date: Fri, 2 Aug 2024 11:46:39 +0300
Subject: [PATCH 029/104] Fix TStringBuilderStream
 e88898a7dd45bf17aa4fc54bf91639a0fdabbca7

---
 yt/yt/core/yson/string_builder_stream.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yt/yt/core/yson/string_builder_stream.h b/yt/yt/core/yson/string_builder_stream.h
index b1e0aa4b1449..ae87bdd2b31d 100644
--- a/yt/yt/core/yson/string_builder_stream.h
+++ b/yt/yt/core/yson/string_builder_stream.h
@@ -12,10 +12,10 @@ class TStringBuilderStream final
     : public IOutputStream
 {
 public:
-    TStringBuilderStream(TStringBuilderBase* builder) noexcept;
+    explicit TStringBuilderStream(TStringBuilderBase* builder) noexcept;
 
 private:
-    TStringBuilderBase* Builder_;
+    TStringBuilderBase* const Builder_;
 
     void DoWrite(const void* data, size_t size) final;
 };

From 23b7c61b3876a421a9f239646c2f67c70877d21e Mon Sep 17 00:00:00 2001
From: babenko <babenko@yandex-team.com>
Date: Fri, 2 Aug 2024 12:04:49 +0300
Subject: [PATCH 030/104] Refactor and unify exit codes
 ec1d0c473e709e8aad76b4e190a75ad4125a9ce2

---
 .../cpp/yt/memory/chunked_memory_pool-inl.h   |  6 +++++
 library/cpp/yt/memory/ya.make                 |  1 +
 library/cpp/yt/system/exit.cpp                | 14 +++++++++++
 library/cpp/yt/system/exit.h                  | 22 ++++++++++++++++
 library/cpp/yt/system/ya.make                 |  1 +
 yt/yt/core/compression/zstd.cpp               | 14 +++++++++--
 yt/yt/core/concurrency/execution_stack.cpp    |  4 ++-
 yt/yt/core/logging/log_writer_detail.cpp      |  4 +--
 yt/yt/core/misc/crash_handler.cpp             |  4 ++-
 yt/yt/core/misc/fs.cpp                        |  3 ++-
 yt/yt/core/misc/shutdown.cpp                  |  4 ++-
 .../oom/tcmalloc_memory_limit_handler.cpp     | 10 +++++---
 yt/yt/library/process/process.cpp             |  4 +--
 yt/yt/library/program/program.cpp             | 25 ++++++-------------
 yt/yt/library/program/program.h               | 11 --------
 15 files changed, 85 insertions(+), 42 deletions(-)
 create mode 100644 library/cpp/yt/system/exit.cpp
 create mode 100644 library/cpp/yt/system/exit.h

diff --git a/library/cpp/yt/memory/chunked_memory_pool-inl.h b/library/cpp/yt/memory/chunked_memory_pool-inl.h
index 58a0cefcc2ff..25022041607a 100644
--- a/library/cpp/yt/memory/chunked_memory_pool-inl.h
+++ b/library/cpp/yt/memory/chunked_memory_pool-inl.h
@@ -6,6 +6,8 @@
 
 #include "serialize.h"
 
+#include <library/cpp/yt/system/exit.h>
+
 #include <library/cpp/yt/malloc/malloc.h>
 
 #include <util/system/align.h>
@@ -30,6 +32,10 @@ TDerived* TAllocationHolder::Allocate(size_t size, TRefCountedTypeCookie cookie)
     auto requestedSize = sizeof(TDerived) + size;
     auto* ptr = ::malloc(requestedSize);
 
+    if (!ptr) {
+        AbortProcess(ToUnderlying(EProcessExitCode::OutOfMemory));
+    }
+
 #ifndef _win_
     auto allocatedSize = ::malloc_usable_size(ptr);
     if (allocatedSize) {
diff --git a/library/cpp/yt/memory/ya.make b/library/cpp/yt/memory/ya.make
index 7a5a2f88eae8..9dc437272915 100644
--- a/library/cpp/yt/memory/ya.make
+++ b/library/cpp/yt/memory/ya.make
@@ -21,6 +21,7 @@ PEERDIR(
     library/cpp/yt/assert
     library/cpp/yt/misc
     library/cpp/yt/malloc
+    library/cpp/yt/system
 )
 
 CHECK_DEPENDENT_DIRS(
diff --git a/library/cpp/yt/system/exit.cpp b/library/cpp/yt/system/exit.cpp
new file mode 100644
index 000000000000..b17f6c5ad73b
--- /dev/null
+++ b/library/cpp/yt/system/exit.cpp
@@ -0,0 +1,14 @@
+#include "exit.h"
+
+namespace NYT {
+
+////////////////////////////////////////////////////////////////////////////////
+
+void AbortProcess(int exitCode)
+{
+    _exit(exitCode);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+} // namespace NYT
diff --git a/library/cpp/yt/system/exit.h b/library/cpp/yt/system/exit.h
new file mode 100644
index 000000000000..6c009fff901b
--- /dev/null
+++ b/library/cpp/yt/system/exit.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <library/cpp/yt/misc/enum.h>
+
+namespace NYT {
+
+////////////////////////////////////////////////////////////////////////////////
+
+DEFINE_ENUM(EProcessExitCode,
+    ((OK)                  (0))
+    ((ArgumentsError)      (1))
+    ((GenericError)        (2))
+    ((IOError)             (3))
+    ((OutOfMemory)         (9))
+);
+
+//! Invokes _exit to abort the process immediately without calling any cleanup code.
+[[noreturn]] void AbortProcess(int exitCode);
+
+////////////////////////////////////////////////////////////////////////////////
+
+} // namespace NYT
diff --git a/library/cpp/yt/system/ya.make b/library/cpp/yt/system/ya.make
index 22aab5151e7b..de4516d928e1 100644
--- a/library/cpp/yt/system/ya.make
+++ b/library/cpp/yt/system/ya.make
@@ -3,6 +3,7 @@ LIBRARY()
 INCLUDE(${ARCADIA_ROOT}/library/cpp/yt/ya_cpp.make.inc)
 
 SRCS(
+    exit.cpp
     thread_id.cpp
 )
 
diff --git a/yt/yt/core/compression/zstd.cpp b/yt/yt/core/compression/zstd.cpp
index c8c067e76382..2054e0306b13 100644
--- a/yt/yt/core/compression/zstd.cpp
+++ b/yt/yt/core/compression/zstd.cpp
@@ -6,6 +6,8 @@
 #include <yt/yt/core/misc/blob.h>
 #include <yt/yt/core/misc/finally.h>
 
+#include <library/cpp/yt/system/exit.h>
+
 #include <library/cpp/yt/memory/chunked_memory_pool.h>
 
 #include <contrib/libs/zstd/lib/zstd_errors.h>
@@ -29,8 +31,16 @@ struct TZstdCompressBufferTag
 
 void VerifyError(size_t result)
 {
-    YT_LOG_FATAL_IF(ZSTD_isError(result),
-        "Zstd compression failed (Error: %v)",
+    if (!ZSTD_isError(result)) {
+        return;
+    }
+
+    if (result == ZSTD_error_memory_allocation) {
+        YT_LOG_ERROR("Zstd compression failed with memory allocation error; terminating");
+        AbortProcess(ToUnderlying(EProcessExitCode::OutOfMemory));
+    }
+
+    YT_LOG_FATAL("Zstd compression failed (Error: %v)",
         ZSTD_getErrorName(result));
 }
 
diff --git a/yt/yt/core/concurrency/execution_stack.cpp b/yt/yt/core/concurrency/execution_stack.cpp
index f2a66f04764f..4fd488de08d5 100644
--- a/yt/yt/core/concurrency/execution_stack.cpp
+++ b/yt/yt/core/concurrency/execution_stack.cpp
@@ -18,6 +18,8 @@
 
 #include <library/cpp/yt/misc/tls.h>
 
+#include <library/cpp/yt/system/exit.h>
+
 #include <util/system/sanitizers.h>
 
 namespace NYT::NConcurrency {
@@ -88,7 +90,7 @@ TExecutionStack::TExecutionStack(size_t size)
     auto checkOom = [] {
         if (LastSystemError() == ENOMEM) {
             fprintf(stderr, "Out-of-memory condition detected while allocating execution stack; terminating\n");
-            _exit(9);
+            AbortProcess(ToUnderlying(EProcessExitCode::OutOfMemory));
         }
     };
 
diff --git a/yt/yt/core/logging/log_writer_detail.cpp b/yt/yt/core/logging/log_writer_detail.cpp
index aff1c6fc1dcc..2247d15936f8 100644
--- a/yt/yt/core/logging/log_writer_detail.cpp
+++ b/yt/yt/core/logging/log_writer_detail.cpp
@@ -3,6 +3,7 @@
 #include "log.h"
 #include "formatter.h"
 
+#include <library/cpp/yt/system/exit.h>
 #include <library/cpp/yt/system/handle_eintr.h>
 
 namespace NYT::NLogging {
@@ -153,8 +154,7 @@ void TStreamLogWriterBase::OnException(const std::exception& ex)
         /*lpNumberOfBytesWritten*/ nullptr,
         /*lpOverlapped*/ nullptr);
 #endif
-    _exit(100);
-    YT_ABORT();
+    AbortProcess(ToUnderlying(EProcessExitCode::IOError));
 }
 
 void TStreamLogWriterBase::ResetCurrentSegment(i64 size)
diff --git a/yt/yt/core/misc/crash_handler.cpp b/yt/yt/core/misc/crash_handler.cpp
index 90c1e11ec92b..0dcfd4375466 100644
--- a/yt/yt/core/misc/crash_handler.cpp
+++ b/yt/yt/core/misc/crash_handler.cpp
@@ -10,6 +10,8 @@
 
 #include <yt/yt/library/undumpable/undumpable.h>
 
+#include <library/cpp/yt/system/exit.h>
+
 #include <library/cpp/yt/assert/assert.h>
 
 #include <library/cpp/yt/string/raw_formatter.h>
@@ -463,7 +465,7 @@ void DumpSigcontext(void* uc)
 void CrashTimeoutHandler(int /*signal*/)
 {
     WriteToStderr("*** Process hung during crash ***\n");
-    _exit(1);
+    AbortProcess(ToUnderlying(EProcessExitCode::GenericError));
 }
 
 void DumpUndumpableBlocksInfo()
diff --git a/yt/yt/core/misc/fs.cpp b/yt/yt/core/misc/fs.cpp
index 8092aaa85097..d0e925032a05 100644
--- a/yt/yt/core/misc/fs.cpp
+++ b/yt/yt/core/misc/fs.cpp
@@ -8,6 +8,7 @@
 #include <yt/yt/core/actions/invoker_util.h>
 
 #include <library/cpp/yt/system/handle_eintr.h>
+#include <library/cpp/yt/system/exit.h>
 
 #include <util/folder/dirut.h>
 #include <util/folder/iterator.h>
@@ -826,7 +827,7 @@ void WrapIOErrors(std::function<void()> func)
         switch (status) {
             case ENOMEM:
                 fprintf(stderr, "Out-of-memory condition detected during I/O operation; terminating\n");
-                _exit(9);
+                AbortProcess(ToUnderlying(EProcessExitCode::OutOfMemory));
                 break;
 
             case EIO:
diff --git a/yt/yt/core/misc/shutdown.cpp b/yt/yt/core/misc/shutdown.cpp
index 412db68119e2..bb8f2adcc6de 100644
--- a/yt/yt/core/misc/shutdown.cpp
+++ b/yt/yt/core/misc/shutdown.cpp
@@ -13,6 +13,8 @@
 
 #include <library/cpp/yt/misc/tls.h>
 
+#include <library/cpp/yt/system/exit.h>
+
 #include <util/generic/algorithm.h>
 
 #include <util/system/env.h>
@@ -106,7 +108,7 @@ class TShutdownManager
                     YT_ABORT();
                 } else {
                     ::fprintf(stderr, "*** Shutdown hung, exiting\n");
-                    ::_exit(options.HungExitCode);
+                    AbortProcess(options.HungExitCode);
                 }
             }
         });
diff --git a/yt/yt/library/oom/tcmalloc_memory_limit_handler.cpp b/yt/yt/library/oom/tcmalloc_memory_limit_handler.cpp
index ef63f60b83b7..b135c2b43831 100644
--- a/yt/yt/library/oom/tcmalloc_memory_limit_handler.cpp
+++ b/yt/yt/library/oom/tcmalloc_memory_limit_handler.cpp
@@ -13,6 +13,8 @@
 
 #include <library/cpp/yt/memory/atomic_intrusive_ptr.h>
 
+#include <library/cpp/yt/system/exit.h>
+
 #include <util/datetime/base.h>
 #include <util/stream/file.h>
 #include <util/stream/output.h>
@@ -49,7 +51,7 @@ void CollectAndDumpMemoryProfile(const TString& memoryProfilePath)
 void MemoryProfileTimeoutHandler(int /*signal*/)
 {
     WriteToStderr("*** Process hung during dumping heap profile ***\n");
-    ::_exit(1);
+    AbortProcess(ToUnderlying(EProcessExitCode::GenericError));
 }
 
 void SetupMemoryProfileTimeout(int timeout)
@@ -125,16 +127,16 @@ class TTCMallocLimitHandler
             CollectAndDumpMemoryProfile(heapDumpPath);
 
             Cerr << "TTCMallocLimitHandler: Heap profile written" << Endl;
-            ::_exit(0);
+            AbortProcess(ToUnderlying(EProcessExitCode::OK));
         }
 
         if (childPid < 0) {
             Cerr << "TTCMallocLimitHandler: Fork failed: " << LastSystemErrorText() << Endl;
-            ::_exit(1);
+            AbortProcess(ToUnderlying(EProcessExitCode::GenericError));
         }
 
         ExecWaitForChild(childPid);
-        ::_exit(0);
+        AbortProcess(ToUnderlying(EProcessExitCode::OK));
     }
 
     TString GetHeapDumpPath() const
diff --git a/yt/yt/library/process/process.cpp b/yt/yt/library/process/process.cpp
index 5dbd21d5beb5..e786ae626560 100644
--- a/yt/yt/library/process/process.cpp
+++ b/yt/yt/library/process/process.cpp
@@ -15,13 +15,13 @@
 #include <yt/yt/core/actions/invoker_util.h>
 
 #include <library/cpp/yt/system/handle_eintr.h>
+#include <library/cpp/yt/system/exit.h>
 
 #include <util/folder/dirut.h>
 
 #include <util/generic/guid.h>
 
 #include <util/string/ascii.h>
-
 #include <util/string/util.h>
 
 #include <util/system/env.h>
@@ -657,7 +657,7 @@ class TSimpleProcess::TProcessSpawnState
                 YT_VERIFY(Pipe_);
                 ssize_t size = HandleEintr(::write, Pipe_->GetWriteFD(), &data, sizeof(data));
                 YT_VERIFY(size == sizeof(data));
-                _exit(1);
+                AbortProcess(ToUnderlying(EProcessExitCode::GenericError));
             }
         }
         YT_ABORT();
diff --git a/yt/yt/library/program/program.cpp b/yt/yt/library/program/program.cpp
index 318d998b3a96..78a3b95c4552 100644
--- a/yt/yt/library/program/program.cpp
+++ b/yt/yt/library/program/program.cpp
@@ -25,6 +25,8 @@
 #include <library/cpp/yt/mlock/mlock.h>
 #include <library/cpp/yt/stockpile/stockpile.h>
 
+#include <library/cpp/yt/system/exit.h>
+
 #include <tcmalloc/malloc_extension.h>
 
 #include <absl/debugging/stacktrace.h>
@@ -74,7 +76,7 @@ class TProgram::TOptsParseResult
     {
         Owner_->OnError(CurrentExceptionMessage());
         Cerr << Endl << "Try running '" << Owner_->Argv0_ << " --help' for more information." << Endl;
-        Owner_->Exit(EProgramExitCode::OptionsError);
+        Owner_->Exit(ToUnderlying(EProcessExitCode::ArgumentsError));
     }
 
 private:
@@ -137,35 +139,24 @@ int TProgram::Run(int argc, const char** argv)
     if (!CrashOnError_) {
         try {
             run();
-            Exit(EProgramExitCode::OK);
+            Exit(ToUnderlying(EProcessExitCode::OK));
         } catch (...) {
             OnError(CurrentExceptionMessage());
-            Exit(EProgramExitCode::ProgramError);
+            Exit(ToUnderlying(EProcessExitCode::GenericError));
         }
     } else {
         run();
-        Exit(EProgramExitCode::OK);
+        Exit(ToUnderlying(EProcessExitCode::OK));
     }
 
     // Cannot reach this due to #Exit calls above.
     YT_ABORT();
 }
 
-void TProgram::Abort(EProgramExitCode code) noexcept
-{
-    Abort(static_cast<int>(code));
-}
-
 void TProgram::Abort(int code) noexcept
 {
     NLogging::TLogManager::Get()->Shutdown();
-
-    ::_exit(code);
-}
-
-void TProgram::Exit(EProgramExitCode code) noexcept
-{
-    Exit(static_cast<int>(code));
+    AbortProcess(code);
 }
 
 void TProgram::Exit(int code) noexcept
@@ -329,7 +320,7 @@ void ExitZero(int /*unused*/)
     // TODO(babenko): replace with pure "exit" some day.
     // Currently this causes some RPC requests to master to be replied with "Promise abandoned" error,
     // which is not retriable.
-    _exit(0);
+    AbortProcess(ToUnderlying(EProcessExitCode::OK));
 }
 
 } // namespace
diff --git a/yt/yt/library/program/program.h b/yt/yt/library/program/program.h
index f1f236cfabc4..bb27c0d99463 100644
--- a/yt/yt/library/program/program.h
+++ b/yt/yt/library/program/program.h
@@ -12,12 +12,6 @@ namespace NYT {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-DEFINE_ENUM(EProgramExitCode,
-    ((OK)(0))
-    ((OptionsError)(1))
-    ((ProgramError)(2))
-);
-
 class TProgram
 {
 public:
@@ -41,8 +35,6 @@ class TProgram
      *  Aborts via |_exit| call.
      */
     [[noreturn]]
-    static void Abort(EProgramExitCode code) noexcept;
-    [[noreturn]]
     static void Abort(int code) noexcept;
 
 protected:
@@ -75,9 +67,6 @@ class TProgram
     [[noreturn]]
     virtual void PrintVersionAndExit();
 
-    [[noreturn]]
-    void Exit(EProgramExitCode code) noexcept;
-
     [[noreturn]]
     void Exit(int code) noexcept;
 

From 2610922a0ebe85795934f2695e09392bc900260a Mon Sep 17 00:00:00 2001
From: pavook <pavook@yandex-team.com>
Date: Fri, 2 Aug 2024 17:25:27 +0300
Subject: [PATCH 031/104] Naming in statistics
 8aee091f23875842b0e87bd9f39aa5032397f6fb

---
 yt/yt/core/misc/statistics-inl.h | 28 ++++++++++++++--------------
 yt/yt/core/misc/statistics.cpp   |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/yt/yt/core/misc/statistics-inl.h b/yt/yt/core/misc/statistics-inl.h
index 2ca1778addc6..f8f3a1af90bf 100644
--- a/yt/yt/core/misc/statistics-inl.h
+++ b/yt/yt/core/misc/statistics-inl.h
@@ -38,22 +38,22 @@ std::pair<EStatisticPathConflictType, typename TSummaryMap::iterator> IsCompatib
     TSummaryMap& existingStatistics,
     const NYPath::TYPath& path)
 {
-    auto hint = existingStatistics.lower_bound(path);
-    if (hint != existingStatistics.end()) {
-        if (hint->first == path) {
-            return {EStatisticPathConflictType::Exists, hint};
+    auto it = existingStatistics.lower_bound(path);
+    if (it != existingStatistics.end()) {
+        if (it->first == path) {
+            return {EStatisticPathConflictType::Exists, it};
         }
-        if (NYPath::HasPrefix(hint->first, path)) {
-            return {EStatisticPathConflictType::IsPrefix, hint};
+        if (NYPath::HasPrefix(it->first, path)) {
+            return {EStatisticPathConflictType::IsPrefix, it};
         }
     }
-    if (hint != existingStatistics.begin()) {
-        auto prev = std::prev(hint);
+    if (it != existingStatistics.begin()) {
+        auto prev = std::prev(it);
         if (NYPath::HasPrefix(path, prev->first)) {
             return {EStatisticPathConflictType::HasPrefix, prev};
         }
     }
-    return {EStatisticPathConflictType::None, hint};
+    return {EStatisticPathConflictType::None, it};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -65,12 +65,12 @@ std::pair<typename TSummaryMap::iterator, bool> CheckedEmplaceStatistic(
     const NYPath::TYPath& path,
     Ts&&... args)
 {
-    auto [conflictType, hint] = IsCompatibleStatistic(existingStatistics, path);
+    auto [conflictType, hintIt] = IsCompatibleStatistic(existingStatistics, path);
     if (conflictType == EStatisticPathConflictType::Exists) {
-        return {hint, false};
+        return {hintIt, false};
     }
     if (conflictType != EStatisticPathConflictType::None) {
-        auto prefixPath = hint->first;
+        auto prefixPath = hintIt->first;
         auto conflictPath = path;
 
         if (conflictType == EStatisticPathConflictType::IsPrefix) {
@@ -81,8 +81,8 @@ std::pair<typename TSummaryMap::iterator, bool> CheckedEmplaceStatistic(
             << TErrorAttribute("prefix_path", prefixPath)
             << TErrorAttribute("contained_in_path", conflictPath);
     }
-    auto emplacedIterator = existingStatistics.emplace_hint(hint, path, std::forward<Ts>(args)...);
-    return {emplacedIterator, true};
+    auto emplacedIt = existingStatistics.emplace_hint(hintIt, path, std::forward<Ts>(args)...);
+    return {emplacedIt, true};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/core/misc/statistics.cpp b/yt/yt/core/misc/statistics.cpp
index 29e078513470..476433b57b59 100644
--- a/yt/yt/core/misc/statistics.cpp
+++ b/yt/yt/core/misc/statistics.cpp
@@ -93,8 +93,8 @@ bool TSummary::operator ==(const TSummary& other) const
 
 TSummary& TStatistics::GetSummary(const NYPath::TYPath& path)
 {
-    auto [iterator, _] = CheckedEmplaceStatistic(Data_, path, TSummary());
-    return iterator->second;
+    auto [it, _] = CheckedEmplaceStatistic(Data_, path, TSummary());
+    return it->second;
 }
 
 void TStatistics::AddSample(const NYPath::TYPath& path, i64 sample)

From 9fc72f6c2ac91a3cc867ee7b76e6222b0fda72f0 Mon Sep 17 00:00:00 2001
From: melkov <melkov@yandex-team.com>
Date: Fri, 2 Aug 2024 23:39:10 +0300
Subject: [PATCH 032/104] YT-22414: Use TRange constructor directly instead of
 MakeRange

* Use TMutableRange instead of MakeMutableRange.

No functionality changes expected; [nodiff:caesar]
21be7d7457955cef67f2d8ca9aa00abd30dd58f1
---
 yt/yt/client/api/rpc_proxy/client_impl.cpp    |  2 +-
 .../client/api/rpc_proxy/transaction_impl.cpp |  4 +-
 .../client/arrow/arrow_row_stream_encoder.cpp |  4 +-
 yt/yt/client/table_client/key.cpp             |  2 +-
 yt/yt/client/table_client/key_bound.cpp       |  4 +-
 .../table_client/unittests/columnar_ut.cpp    | 70 +++++++++----------
 .../table_client/unittests/helpers/helpers.h  |  4 +-
 yt/yt/client/table_client/unversioned_row.cpp |  2 +-
 yt/yt/client/table_client/value_consumer.cpp  |  2 +-
 yt/yt/client/table_client/wire_protocol.cpp   |  2 +-
 .../farm_fingerprint_stability_ut.cpp         |  2 +-
 .../new_fair_share_thread_pool.cpp            |  2 +-
 yt/yt/core/logging/unittests/logging_ut.cpp   |  4 +-
 .../misc/bit_packed_unsigned_vector-inl.h     |  2 +-
 yt/yt/core/misc/crash_handler.cpp             |  4 +-
 .../bit_packed_integer_vector_ut.cpp          |  2 +-
 yt/yt/core/rpc/client.cpp                     |  2 +-
 .../backtrace_introspector/introspect.cpp     |  2 +-
 yt/yt/library/formats/arrow_writer.cpp        |  4 +-
 yt/yt/library/oom/oom.cpp                     |  2 +-
 20 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/yt/yt/client/api/rpc_proxy/client_impl.cpp b/yt/yt/client/api/rpc_proxy/client_impl.cpp
index f40496f065cf..a854a959fcc6 100644
--- a/yt/yt/client/api/rpc_proxy/client_impl.cpp
+++ b/yt/yt/client/api/rpc_proxy/client_impl.cpp
@@ -343,7 +343,7 @@ TFuture<void> TClient::ReshardTable(
     for (const auto& pivotKey : pivotKeys) {
         keys.push_back(pivotKey);
     }
-    writer->WriteRowset(MakeRange(keys));
+    writer->WriteRowset(TRange(keys));
     req->Attachments() = writer->Finish();
 
     ToProto(req->mutable_mutating_options(), options);
diff --git a/yt/yt/client/api/rpc_proxy/transaction_impl.cpp b/yt/yt/client/api/rpc_proxy/transaction_impl.cpp
index 3aef87b49cc5..a5ed64fa5ce4 100644
--- a/yt/yt/client/api/rpc_proxy/transaction_impl.cpp
+++ b/yt/yt/client/api/rpc_proxy/transaction_impl.cpp
@@ -441,7 +441,7 @@ void TTransaction::ModifyRows(
 
     req->Attachments() = SerializeRowset(
         nameTable,
-        MakeRange(rows),
+        TRange(rows),
         req->mutable_rowset_descriptor());
 
     TFuture<void> future;
@@ -571,7 +571,7 @@ TFuture<TPushQueueProducerResult> TTransaction::PushQueueProducer(
 
     req->Attachments() = SerializeRowset(
         nameTable,
-        MakeRange(rows),
+        TRange(rows),
         req->mutable_rowset_descriptor());
 
     return req->Invoke().Apply(BIND([] (const TApiServiceProxy::TRspPushQueueProducerPtr& rsp) {
diff --git a/yt/yt/client/arrow/arrow_row_stream_encoder.cpp b/yt/yt/client/arrow/arrow_row_stream_encoder.cpp
index 5413729fdc16..23a06a45b71d 100644
--- a/yt/yt/client/arrow/arrow_row_stream_encoder.cpp
+++ b/yt/yt/client/arrow/arrow_row_stream_encoder.cpp
@@ -189,7 +189,7 @@ struct TRecordBatchSerializationContext final
 template <class T>
 TMutableRange<T> GetTypedValues(TMutableRef ref)
 {
-    return MakeMutableRange(
+    return TMutableRange(
         reinterpret_cast<T*>(ref.Begin()),
         reinterpret_cast<T*>(ref.End()));
 }
@@ -1089,7 +1089,7 @@ class TArrowRowStreamBlockEncoder
         auto [recordBatchOffset, bodySize, bodyWriter] = SerializeRecordBatch(
             &flatbufBuilder,
             typedColumn.Column->ValueCount,
-            MakeRange({typedColumn}));
+            TRange({typedColumn}));
 
         auto dictionaryBatchOffset = org::apache::arrow::flatbuf::CreateDictionaryBatch(
             flatbufBuilder,
diff --git a/yt/yt/client/table_client/key.cpp b/yt/yt/client/table_client/key.cpp
index 984dc7d5921f..7ba78aa88ed0 100644
--- a/yt/yt/client/table_client/key.cpp
+++ b/yt/yt/client/table_client/key.cpp
@@ -138,7 +138,7 @@ void Serialize(const TKey& key, IYsonConsumer* consumer)
 {
     if (key) {
         BuildYsonFluently(consumer)
-            .DoListFor(MakeRange(key.Begin(), key.End()), [&] (TFluentList fluent, const TUnversionedValue& value) {
+            .DoListFor(TRange(key.Begin(), key.End()), [&] (TFluentList fluent, const TUnversionedValue& value) {
                 fluent
                     .Item()
                     .Value(value);
diff --git a/yt/yt/client/table_client/key_bound.cpp b/yt/yt/client/table_client/key_bound.cpp
index 3274df5ce2f3..e02b894afd97 100644
--- a/yt/yt/client/table_client/key_bound.cpp
+++ b/yt/yt/client/table_client/key_bound.cpp
@@ -421,7 +421,7 @@ TKeyBound KeyBoundFromLegacyRow(TUnversionedRow row, bool isUpper, int keyLength
 
     auto [prefixLength, isInclusive] = GetBoundPrefixAndInclusiveness(row, isUpper, keyLength);
     YT_VERIFY(prefixLength <= static_cast<int>(row.GetCount()));
-    row = rowBuffer->CaptureRow(MakeRange(row.Begin(), prefixLength));
+    row = rowBuffer->CaptureRow(TRange(row.Begin(), prefixLength));
 
     return TKeyBound::FromRow(
         row,
@@ -480,7 +480,7 @@ TKeyBound ShortenKeyBound(TKeyBound keyBound, int length, const TRowBufferPtr& r
     // If we do perform shortening, resulting key bound is going to be inclusive despite the original inclusiveness.
 
     auto result = TKeyBound::FromRowUnchecked(
-        rowBuffer->CaptureRow(MakeRange(keyBound.Prefix.Begin(), length)),
+        rowBuffer->CaptureRow(TRange(keyBound.Prefix.Begin(), length)),
         /* isInclusive */ true,
         keyBound.IsUpper);
 
diff --git a/yt/yt/client/table_client/unittests/columnar_ut.cpp b/yt/yt/client/table_client/unittests/columnar_ut.cpp
index 35e25ecd99e0..e095d4f63fc8 100644
--- a/yt/yt/client/table_client/unittests/columnar_ut.cpp
+++ b/yt/yt/client/table_client/unittests/columnar_ut.cpp
@@ -24,7 +24,7 @@ TEST(TBuildValidityBitmapFromDictionaryIndexesWithZeroNullTest, LessThanByte)
     std::array<ui32, 6> indexes{0, 0, 1, 3, 4, 0};
     ui8 result;
     BuildValidityBitmapFromDictionaryIndexesWithZeroNull(
-        MakeRange(indexes),
+        TRange(indexes),
         TMutableRef(&result, 1));
     EXPECT_EQ(0x1c, result);
 }
@@ -37,7 +37,7 @@ TEST(TBuildValidityBitmapFromDictionaryIndexesWithZeroNullTest, TenBytes)
     }
     std::array<ui8, indexes.size() / 8> result;
     BuildValidityBitmapFromDictionaryIndexesWithZeroNull(
-        MakeRange(indexes),
+        TRange(indexes),
         TMutableRef(&result, result.size()));
     for (int i = 0; i < std::ssize(result); ++i) {
         EXPECT_EQ(0xaa, result[i]);
@@ -52,7 +52,7 @@ TEST(TBuildValidityBitmapFromDictionaryIndexesWithZeroNullTest, ManyBits)
     }
     std::array<ui8, indexes.size() / 8 + 1> result;
     BuildValidityBitmapFromDictionaryIndexesWithZeroNull(
-        MakeRange(indexes),
+        TRange(indexes),
         TMutableRef(&result, result.size()));
     for (int i = 0; i < std::ssize(result) - 1; ++i) {
         EXPECT_EQ(0xaa, result[i]);
@@ -74,8 +74,8 @@ TEST(TBuildDictionaryIndexesFromDictionaryIndexesWithZeroNullTest, NonEmpty)
     std::array<ui32, 6> indexes{0, 1, 2, 3, 4, 5};
     std::array<ui32, indexes.size()> result;
     BuildDictionaryIndexesFromDictionaryIndexesWithZeroNull(
-        MakeRange(indexes),
-        MakeMutableRange(result));
+        TRange(indexes),
+        TMutableRange(result));
     for (int i = 1; i < std::ssize(result); ++i) {
         EXPECT_EQ(indexes[i] - 1, result[i]);
     }
@@ -91,7 +91,7 @@ TEST(TCountNullsInDictionaryIndexesWithZeroNullTest, Empty)
 TEST(TCountNullsInDictionaryIndexesWithZeroNullTest, NonEmpty)
 {
     std::array<ui32, 6> indexes{0, 1, 2, 0, 4, 5};
-    EXPECT_EQ(2, CountNullsInDictionaryIndexesWithZeroNull(MakeRange(indexes)));
+    EXPECT_EQ(2, CountNullsInDictionaryIndexesWithZeroNull(TRange(indexes)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -217,7 +217,7 @@ TEST(TTranslateRleIndexTest, CheckAll)
 {
     std::array<ui64, 8> rleIndexes{0, 1, 3, 10, 11, 15, 20, 21};
     for (ui64 i = 0; i < rleIndexes[rleIndexes.size() - 1] + 10; ++i) {
-        auto j = TranslateRleIndex(MakeRange(rleIndexes), i);
+        auto j = TranslateRleIndex(TRange(rleIndexes), i);
         EXPECT_LE(rleIndexes[j], i);
         if (j < std::ssize(rleIndexes) - 1) {
             EXPECT_LT(i, rleIndexes[j + 1]);
@@ -291,7 +291,7 @@ TEST_F(TDecodeStringsTest, Single)
 {
     std::vector<ui32> result;
     for (int index = 0; index <= std::ssize(Offsets); ++index) {
-        result.push_back(DecodeStringOffset(MakeRange(Offsets), AvgLength, index));
+        result.push_back(DecodeStringOffset(TRange(Offsets), AvgLength, index));
     }
     EXPECT_EQ(Expected, result);
 }
@@ -301,10 +301,10 @@ TEST_F(TDecodeStringsTest, Multiple)
     for (int i = 0; i <= std::ssize(Offsets); ++i) {
         for (int j = i; j <= std::ssize(Offsets); ++j) {
             std::vector<ui32> result(j - i + 1);
-            DecodeStringOffsets(MakeRange(Offsets), AvgLength, i, j, MakeMutableRange(result));
+            DecodeStringOffsets(TRange(Offsets), AvgLength, i, j, TMutableRange(result));
             std::vector<ui32> expected;
             for (int k = i; k <= j; ++k) {
-                expected.push_back(Expected[k] - DecodeStringOffset(MakeRange(Offsets), AvgLength, i));
+                expected.push_back(Expected[k] - DecodeStringOffset(TRange(Offsets), AvgLength, i));
             }
             EXPECT_EQ(expected, result);
         }
@@ -317,11 +317,11 @@ TEST_F(TDecodeStringsTest, PointersAndLengths)
     std::vector<const char*> strings(Offsets.size());
     std::vector<i32> lengths(Offsets.size());
     DecodeStringPointersAndLengths(
-        MakeRange(Offsets),
+        TRange(Offsets),
         AvgLength,
         TRef(chars.data(), chars.size()),
-        MakeMutableRange(strings),
-        MakeMutableRange(lengths));
+        TMutableRange(strings),
+        TMutableRange(lengths));
     for (int i = 0; i < std::ssize(Offsets); ++i) {
         EXPECT_EQ(Expected[i], strings[i] - chars.data());
         EXPECT_EQ(static_cast<ssize_t>(Expected[i + 1] - Expected[i]), lengths[i]);
@@ -354,8 +354,8 @@ TEST_P(TDecodeNullsFromRleDictionaryIndexesWithZeroNullTest, ValidityBitmap)
     auto [startIndex, endIndex] = GetParam();
     std::vector<ui8> bitmap(GetBitmapByteSize(endIndex - startIndex));
     BuildValidityBitmapFromRleDictionaryIndexesWithZeroNull(
-        MakeRange(DictionaryIndexes),
-        MakeRange(RleIndexes),
+        TRange(DictionaryIndexes),
+        TRange(RleIndexes),
         startIndex,
         endIndex,
         TMutableRef(bitmap.data(), bitmap.size()));
@@ -370,11 +370,11 @@ TEST_P(TDecodeNullsFromRleDictionaryIndexesWithZeroNullTest, NullBytemap)
     auto [startIndex, endIndex] = GetParam();
     std::vector<ui8> bytemap(endIndex - startIndex);
     BuildNullBytemapFromRleDictionaryIndexesWithZeroNull(
-        MakeRange(DictionaryIndexes),
-        MakeRange(RleIndexes),
+        TRange(DictionaryIndexes),
+        TRange(RleIndexes),
         startIndex,
         endIndex,
-        MakeMutableRange(bytemap));
+        TMutableRange(bytemap));
     for (int i = startIndex; i < endIndex; ++i) {
         EXPECT_TRUE(bytemap[i - startIndex] == 0 || bytemap[i - startIndex] == 1);
         EXPECT_EQ(Expected[i], bytemap[i - startIndex] == 0)
@@ -413,11 +413,11 @@ TEST_P(TBuildDictionaryIndexesFromRleDictionaryIndexesWithZeroNullTest, CheckAll
     auto [startIndex, endIndex] = GetParam();
     std::vector<ui32> result(endIndex - startIndex);
     BuildDictionaryIndexesFromRleDictionaryIndexesWithZeroNull(
-        MakeRange(DictionaryIndexes),
-        MakeRange(RleIndexes),
+        TRange(DictionaryIndexes),
+        TRange(RleIndexes),
         startIndex,
         endIndex,
-        MakeMutableRange(result));
+        TMutableRange(result));
     for (int i = startIndex; i < endIndex; ++i) {
         EXPECT_EQ(Expected[i], result[i - startIndex])
             << "i = " << i;
@@ -449,10 +449,10 @@ TEST_P(TBuildIotaDictionaryIndexesFromRleIndexesTest, CheckAll)
     auto [startIndex, endIndex, expected] = GetParam();
     std::vector<ui32> result(endIndex - startIndex);
     BuildIotaDictionaryIndexesFromRleIndexes(
-        MakeRange(RleIndexes),
+        TRange(RleIndexes),
         startIndex,
         endIndex,
-        MakeMutableRange(result));
+        TMutableRange(result));
     EXPECT_EQ(expected, result);
 }
 
@@ -476,7 +476,7 @@ class TCountNullsInDictionaryIndexesWithZeroNullTest
 TEST_P(TCountNullsInDictionaryIndexesWithZeroNullTest, CheckAll)
 {
     const auto& [indexes, expected] = GetParam();
-    EXPECT_EQ(expected, CountNullsInDictionaryIndexesWithZeroNull(MakeRange(indexes)));
+    EXPECT_EQ(expected, CountNullsInDictionaryIndexesWithZeroNull(TRange(indexes)));
 }
 
 INSTANTIATE_TEST_SUITE_P(
@@ -502,7 +502,7 @@ class TCountOnesInRleBitmapTest
 TEST_P(TCountOnesInRleBitmapTest, CheckAll)
 {
     auto [startIndex, endIndex, expected] = GetParam();
-    EXPECT_EQ(expected, CountOnesInRleBitmap(TRef(&Bitmap, 1), MakeRange(RleIndexes), startIndex, endIndex));
+    EXPECT_EQ(expected, CountOnesInRleBitmap(TRef(&Bitmap, 1), TRange(RleIndexes), startIndex, endIndex));
 }
 
 INSTANTIATE_TEST_SUITE_P(
@@ -543,7 +543,7 @@ TEST_P(TDecodeNullsFromRleNullBitmapTest, ValidityBitmap)
     std::vector<ui8> bitmap(GetBitmapByteSize(endIndex - startIndex));
     BuildValidityBitmapFromRleNullBitmap(
         TRef(&Bitmap, 1),
-        MakeRange(RleIndexes),
+        TRange(RleIndexes),
         startIndex,
         endIndex,
         TMutableRef(bitmap.data(), bitmap.size()));
@@ -559,10 +559,10 @@ TEST_P(TDecodeNullsFromRleNullBitmapTest, NullBytemap)
     std::vector<ui8> bytemap(endIndex - startIndex);
     BuildNullBytemapFromRleNullBitmap(
         TRef(&Bitmap, 1),
-        MakeRange(RleIndexes),
+        TRange(RleIndexes),
         startIndex,
         endIndex,
-        MakeMutableRange(bytemap));
+        TMutableRange(bytemap));
     for (int i = startIndex; i < endIndex; ++i) {
         EXPECT_TRUE(bytemap[i - startIndex] == 0 || bytemap[i - startIndex] == 1);
         EXPECT_EQ(Expected[i], bytemap[i - startIndex] == 0)
@@ -614,7 +614,7 @@ TEST_P(TDecodeBytemapFromBitmapTest, CheckAll)
         TRef(Bitmap.data(), Bitmap.size()),
         startIndex,
         endIndex,
-        MakeMutableRange(bytemap));
+        TMutableRange(bytemap));
     for (int i = startIndex; i < endIndex; ++i) {
         EXPECT_TRUE(bytemap[i - startIndex] == 0 || bytemap[i - startIndex] == 1);
         EXPECT_EQ(Expected[i], bytemap[i - startIndex])
@@ -661,7 +661,7 @@ class TCountTotalStringLengthInRleDictionaryIndexesWithZeroNullTest
 
         for (int i = 0; i < std::ssize(Offsets); ++i) {
             auto [startOffset, endOffset] = DecodeStringRange(
-                MakeRange(Offsets),
+                TRange(Offsets),
                 AvgLength,
                 i);
             Lengths.push_back(endOffset - startOffset);
@@ -681,18 +681,18 @@ TEST_P(TCountTotalStringLengthInRleDictionaryIndexesWithZeroNullTest, CheckAll)
     auto [startIndex, endIndex] = GetParam();
 
     auto actual = CountTotalStringLengthInRleDictionaryIndexesWithZeroNull(
-        MakeRange(DictionaryIndexes),
-        MakeRange(RleIndexes),
-        MakeRange(Lengths),
+        TRange(DictionaryIndexes),
+        TRange(RleIndexes),
+        TRange(Lengths),
         startIndex,
         endIndex);
 
     i64 expected = 0;
     for (int i = startIndex; i < endIndex; ++i) {
-        int j = TranslateRleIndex(MakeRange(RleIndexes), i);
+        int j = TranslateRleIndex(TRange(RleIndexes), i);
         auto k = DictionaryIndexes[j];
         if (k != 0) {
-            auto [startOffset, endOffset] = DecodeStringRange(MakeRange(Offsets), AvgLength, k - 1);
+            auto [startOffset, endOffset] = DecodeStringRange(TRange(Offsets), AvgLength, k - 1);
             expected += (endOffset - startOffset);
         }
     }
diff --git a/yt/yt/client/table_client/unittests/helpers/helpers.h b/yt/yt/client/table_client/unittests/helpers/helpers.h
index ef17b4cae35d..8b917a16e624 100644
--- a/yt/yt/client/table_client/unittests/helpers/helpers.h
+++ b/yt/yt/client/table_client/unittests/helpers/helpers.h
@@ -69,7 +69,7 @@ void CheckSchemalessResult(
         ASSERT_LE(std::ssize(actual), options.MaxRowsPerRead);
 
         CheckSchemalessResult(
-            MakeRange(expected).Slice(offset, std::min(expected.size(), offset + actual.size())),
+            TRange(expected).Slice(offset, std::min(expected.size(), offset + actual.size())),
             actual,
             keyColumnCount);
         offset += actual.size();
@@ -91,7 +91,7 @@ void AppendVector(std::vector<T>* data, const std::vector<T> toAppend)
 template <class T>
 TRange<T> GetTypedData(const NTableClient::IUnversionedColumnarRowBatch::TValueBuffer& buffer)
 {
-    return MakeRange(
+    return TRange(
         reinterpret_cast<const T*>(buffer.Data.Begin()),
         reinterpret_cast<const T*>(buffer.Data.End()));
 }
diff --git a/yt/yt/client/table_client/unversioned_row.cpp b/yt/yt/client/table_client/unversioned_row.cpp
index 24603024a999..e3303daaf4a8 100644
--- a/yt/yt/client/table_client/unversioned_row.cpp
+++ b/yt/yt/client/table_client/unversioned_row.cpp
@@ -1633,7 +1633,7 @@ std::pair<TSharedRange<TUnversionedRow>, i64> CaptureRowsImpl(
 
     return {
         MakeSharedRange(
-            MakeRange(capturedRows, rows.Size()),
+            TRange(capturedRows, rows.Size()),
             std::move(buffer.ReleaseHolder())),
         bufferSize
     };
diff --git a/yt/yt/client/table_client/value_consumer.cpp b/yt/yt/client/table_client/value_consumer.cpp
index 630f849f97c2..b6865a4c68c0 100644
--- a/yt/yt/client/table_client/value_consumer.cpp
+++ b/yt/yt/client/table_client/value_consumer.cpp
@@ -373,7 +373,7 @@ void TWritingValueConsumer::OnMyValue(const TUnversionedValue& value)
 
 void TWritingValueConsumer::OnEndRow()
 {
-    auto row = RowBuffer_->CaptureRow(MakeRange(Values_), false);
+    auto row = RowBuffer_->CaptureRow(TRange(Values_), false);
     Values_.clear();
     Rows_.push_back(row);
 
diff --git a/yt/yt/client/table_client/wire_protocol.cpp b/yt/yt/client/table_client/wire_protocol.cpp
index 1fab79620ad2..6bb5446eca2c 100644
--- a/yt/yt/client/table_client/wire_protocol.cpp
+++ b/yt/yt/client/table_client/wire_protocol.cpp
@@ -392,7 +392,7 @@ class TWireProtocolWriter
                 return lhs.Id < rhs.Id;
             });
 
-        return MakeRange(PooledValues_);
+        return TRange(PooledValues_);
     }
 
     void UnsafeWriteNullBitmap(TUnversionedValueRange values)
diff --git a/yt/yt/client/unittests/farm_fingerprint_stability_ut.cpp b/yt/yt/client/unittests/farm_fingerprint_stability_ut.cpp
index 37f42a529ccd..421e8985ff40 100644
--- a/yt/yt/client/unittests/farm_fingerprint_stability_ut.cpp
+++ b/yt/yt/client/unittests/farm_fingerprint_stability_ut.cpp
@@ -21,7 +21,7 @@ TEST_P(TFarmHashTest, TFarmHashUnversionedValueTest)
     const auto& params = GetParam();
 
     std::array<TUnversionedValue, 2> values{std::get<0>(params), std::get<1>(params)};
-    auto valueRange = MakeRange(values);
+    auto valueRange = TRange(values);
 
     auto expected1 = std::get<2>(params);
     auto expected2 = std::get<3>(params);
diff --git a/yt/yt/core/concurrency/new_fair_share_thread_pool.cpp b/yt/yt/core/concurrency/new_fair_share_thread_pool.cpp
index 3f97d7252542..d27a14605994 100644
--- a/yt/yt/core/concurrency/new_fair_share_thread_pool.cpp
+++ b/yt/yt/core/concurrency/new_fair_share_thread_pool.cpp
@@ -1117,7 +1117,7 @@ class TTwoLevelFairShareQueue
         }
 
         // Schedule other actions.
-        for (int threadIndex : MakeRange(threadIds.data(), requestCount)) {
+        for (int threadIndex : TRange(threadIds.data(), requestCount)) {
             if (threadRequests[threadIndex]) {
                 if (otherActionCount > 0) {
                     ServeBeginExecute(&ThreadStates_[threadIndex], currentInstant, std::move(OtherActions_[--otherActionCount]));
diff --git a/yt/yt/core/logging/unittests/logging_ut.cpp b/yt/yt/core/logging/unittests/logging_ut.cpp
index 2d14f8235d0d..5461c865b7cc 100644
--- a/yt/yt/core/logging/unittests/logging_ut.cpp
+++ b/yt/yt/core/logging/unittests/logging_ut.cpp
@@ -1204,7 +1204,7 @@ class TLongMessagesTest
     void LogLongMessages()
     {
         for (int i = 0; i < N; ++i) {
-            YT_LOG_INFO("%v", MakeRange(Chunks_.data(), Chunks_.data() + i));
+            YT_LOG_INFO("%v", TRange(Chunks_.data(), Chunks_.data() + i));
         }
     }
 
@@ -1215,7 +1215,7 @@ class TLongMessagesTest
         auto lines = ReadPlainTextEvents(fileName);
         EXPECT_EQ(N, std::ssize(lines));
         for (int i = 0; i < N; ++i) {
-            auto expected = Format("%v", MakeRange(Chunks_.data(), Chunks_.data() + i));
+            auto expected = Format("%v", TRange(Chunks_.data(), Chunks_.data() + i));
             auto actual = lines[i];
             EXPECT_NE(TString::npos, actual.find(expected));
         }
diff --git a/yt/yt/core/misc/bit_packed_unsigned_vector-inl.h b/yt/yt/core/misc/bit_packed_unsigned_vector-inl.h
index 83df7d6708a2..d1abbbbd0a2a 100644
--- a/yt/yt/core/misc/bit_packed_unsigned_vector-inl.h
+++ b/yt/yt/core/misc/bit_packed_unsigned_vector-inl.h
@@ -154,7 +154,7 @@ inline size_t TBitPackedUnsignedVectorReader<T, Scan>::GetByteSize() const
 template <class T, bool Scan>
 TRange<T> TBitPackedUnsignedVectorReader<T, Scan>::GetData() const
 {
-    return MakeRange(Values_, Values_ + Size_);
+    return TRange(Values_, Values_ + Size_);
 }
 
 template <class T, bool Scan>
diff --git a/yt/yt/core/misc/crash_handler.cpp b/yt/yt/core/misc/crash_handler.cpp
index 0dcfd4375466..af00c5122778 100644
--- a/yt/yt/core/misc/crash_handler.cpp
+++ b/yt/yt/core/misc/crash_handler.cpp
@@ -85,7 +85,7 @@ Y_NO_INLINE TStackTrace GetStackTrace(TStackTraceBuffer* buffer)
 #endif
     return NBacktrace::GetBacktrace(
         &cursor,
-        MakeMutableRange(*buffer),
+        TMutableRange(*buffer),
         /*framesToSkip*/ 2);
 }
 
@@ -518,7 +518,7 @@ void CrashSignalHandler(int /*signal*/, siginfo_t* si, void* uc)
     {
         std::array<const void*, 1> frames{NDetail::GetPC(uc)};
         NBacktrace::SymbolizeBacktrace(
-            MakeRange(frames),
+            TRange(frames),
             [] (TStringBuf info) {
                 info.SkipPrefix(" 1. ");
                 WriteToStderr(info);
diff --git a/yt/yt/core/misc/unittests/bit_packed_integer_vector_ut.cpp b/yt/yt/core/misc/unittests/bit_packed_integer_vector_ut.cpp
index eaa209a13baf..ba53a942b41c 100644
--- a/yt/yt/core/misc/unittests/bit_packed_integer_vector_ut.cpp
+++ b/yt/yt/core/misc/unittests/bit_packed_integer_vector_ut.cpp
@@ -21,7 +21,7 @@ size_t Compress(const std::vector<T> &data, std::vector<ui64> *buffer)
     // NB: initialize with zeros!
     buffer->resize(size, 0);
 
-    return BitPackUnsignedVector(MakeRange(data), maxValue, buffer->data());
+    return BitPackUnsignedVector(TRange(data), maxValue, buffer->data());
 }
 
 template <class T, class TReader>
diff --git a/yt/yt/core/rpc/client.cpp b/yt/yt/core/rpc/client.cpp
index acd67934f352..2dbc67f888a1 100644
--- a/yt/yt/core/rpc/client.cpp
+++ b/yt/yt/core/rpc/client.cpp
@@ -619,7 +619,7 @@ void TClientResponse::Deserialize(TSharedRefArray responseMessage)
         THROW_ERROR_EXCEPTION(NRpc::EErrorCode::ProtocolError, "Error deserializing response body");
     }
 
-    auto compressedAttachments = MakeRange(ResponseMessage_.Begin() + 2, ResponseMessage_.End());
+    auto compressedAttachments = TRange(ResponseMessage_.Begin() + 2, ResponseMessage_.End());
     auto memoryUsageTracker = ClientContext_->GetMemoryUsageTracker();
 
     if (attachmentCodecId == NCompression::ECodec::None) {
diff --git a/yt/yt/library/backtrace_introspector/introspect.cpp b/yt/yt/library/backtrace_introspector/introspect.cpp
index 1f6084549ee0..cfbd24a24617 100644
--- a/yt/yt/library/backtrace_introspector/introspect.cpp
+++ b/yt/yt/library/backtrace_introspector/introspect.cpp
@@ -162,7 +162,7 @@ void FormatBacktrace(TStringBuilder* builder, const std::vector<const void*>& ba
     if (!backtrace.empty()) {
         builder->AppendString("Backtrace:\n");
         SymbolizeBacktrace(
-            MakeRange(backtrace),
+            TRange(backtrace),
             [&] (TStringBuf str) {
                 builder->AppendFormat("  %v", str);
             });
diff --git a/yt/yt/library/formats/arrow_writer.cpp b/yt/yt/library/formats/arrow_writer.cpp
index 511964738f35..e540c155335d 100644
--- a/yt/yt/library/formats/arrow_writer.cpp
+++ b/yt/yt/library/formats/arrow_writer.cpp
@@ -275,7 +275,7 @@ struct TRecordBatchSerializationContext final
 template <class T>
 TMutableRange<T> GetTypedValues(TMutableRef ref)
 {
-    return MakeMutableRange(
+    return TMutableRange(
         reinterpret_cast<T*>(ref.Begin()),
         reinterpret_cast<T*>(ref.End()));
 }
@@ -1355,7 +1355,7 @@ class TArrowWriter
         auto [recordBatchOffset, bodySize, bodyWriter] = SerializeRecordBatch(
             &flatbufBuilder,
             typedColumn.Column->ValueCount,
-            MakeRange({typedColumn}));
+            TRange({typedColumn}));
 
         auto dictionaryBatchOffset = org::apache::arrow::flatbuf::CreateDictionaryBatch(
             flatbufBuilder,
diff --git a/yt/yt/library/oom/oom.cpp b/yt/yt/library/oom/oom.cpp
index 10b3e64e7b4f..cea6b6a2c2b4 100644
--- a/yt/yt/library/oom/oom.cpp
+++ b/yt/yt/library/oom/oom.cpp
@@ -109,7 +109,7 @@ void OomWatchdog(TOomWatchdogOptions options)
                 rssFile,
                 rssShmem,
                 MakeFormattableView(
-                    MakeRange(TCMallocStats),
+                    TRange(TCMallocStats),
                     [&] (auto* builder, auto metric) {
                         auto value = tcmalloc::MallocExtension::GetNumericProperty(metric);
                         builder->AppendFormat("%v: %v", metric, value);

From 8744db6c4910e07c48a536a49886d2601c4fe6c6 Mon Sep 17 00:00:00 2001
From: ignat <ignat@yandex-team.com>
Date: Sat, 3 Aug 2024 07:55:33 +0300
Subject: [PATCH 033/104] YT-22431: better support for protobuf string interop
 in apache orc 97f3f0e3c10d73bf0dba054c53176afd21749eb7

---
 contrib/libs/apache/orc/c++/include/orc/Common.hh      | 4 ++++
 contrib/libs/apache/orc/c++/src/Statistics.hh          | 2 --
 contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/libs/apache/orc/c++/include/orc/Common.hh b/contrib/libs/apache/orc/c++/include/orc/Common.hh
index 9da67a3f1990..b3db848b5240 100644
--- a/contrib/libs/apache/orc/c++/include/orc/Common.hh
+++ b/contrib/libs/apache/orc/c++/include/orc/Common.hh
@@ -23,8 +23,12 @@
 #include "orc/Type.hh"
 #include "orc/Vector.hh"
 
+#include <google/protobuf/message.h>
+
 #include <string>
 
+using TProtoStringType = decltype(std::declval<::google::protobuf::MessageLite>().GetTypeName());
+
 namespace orc {
 
   class FileVersion {
diff --git a/contrib/libs/apache/orc/c++/src/Statistics.hh b/contrib/libs/apache/orc/c++/src/Statistics.hh
index 053b6c7fd857..eb14011c410b 100644
--- a/contrib/libs/apache/orc/c++/src/Statistics.hh
+++ b/contrib/libs/apache/orc/c++/src/Statistics.hh
@@ -27,8 +27,6 @@
 #include "Timezone.hh"
 #include "TypeImpl.hh"
 
-#include <util/generic/string.h>
-
 namespace orc {
 
   /**
diff --git a/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc b/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc
index 54968545b9ef..78b699f3f2e3 100644
--- a/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc
+++ b/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc
@@ -26,8 +26,6 @@
 #include <sstream>
 #include <type_traits>
 
-#include <util/generic/string.h>
-
 namespace orc {
 
   PredicateLeaf::PredicateLeaf(Operator op, PredicateDataType type, const std::string& colName,

From ad701999eb5b93914c402b833230cf5f25958d46 Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Sun, 4 Aug 2024 11:38:26 +0300
Subject: [PATCH 034/104] Update contrib/tools/bison to 3.5.4

3.4.2 build is broken in NixOS, hence 3.3.x is updated to 3.5.y.
61a027adbe6cc0b27392bf3980c328640fd0ba69
---
 build/sysincl/misc-win.yml                    |    2 +
 contrib/tools/bison/AUTHORS                   |    2 +-
 contrib/tools/bison/NEWS                      |  429 +++-
 contrib/tools/bison/README                    |  117 +-
 contrib/tools/bison/README-alpha              |    2 +-
 .../tools/bison/data/{README => README.md}    |    5 +-
 contrib/tools/bison/data/skeletons/bison.m4   |   69 +-
 .../tools/bison/data/skeletons/c++-skel.m4    |    2 +-
 contrib/tools/bison/data/skeletons/c++.m4     |   44 +-
 contrib/tools/bison/data/skeletons/c-like.m4  |    2 +-
 contrib/tools/bison/data/skeletons/c-skel.m4  |    2 +-
 contrib/tools/bison/data/skeletons/c.m4       |  204 +-
 contrib/tools/bison/data/skeletons/glr.cc     |   35 +-
 contrib/tools/bison/data/skeletons/lalr1.cc   |  341 ++-
 .../tools/bison/data/skeletons/location.cc    |   78 +-
 contrib/tools/bison/data/skeletons/stack.hh   |   51 +-
 contrib/tools/bison/data/skeletons/variant.hh |   42 +-
 contrib/tools/bison/data/skeletons/yacc.c     |  457 ++--
 contrib/tools/bison/lib/allocator.h           |    2 +-
 contrib/tools/bison/lib/areadlink.c           |    2 +-
 contrib/tools/bison/lib/areadlink.h           |    2 +-
 contrib/tools/bison/lib/arg-nonnull.h         |    2 +-
 contrib/tools/bison/lib/argmatch.c            |   24 +-
 contrib/tools/bison/lib/argmatch.h            |  250 +-
 contrib/tools/bison/lib/asnprintf.c           |    2 +-
 contrib/tools/bison/lib/asprintf.c            |   39 +
 contrib/tools/bison/lib/assure.h              |   37 +
 contrib/tools/bison/lib/basename-lgpl.c       |    2 +-
 contrib/tools/bison/lib/basename.c            |    2 +-
 contrib/tools/bison/lib/binary-io.c           |   18 +-
 contrib/tools/bison/lib/binary-io.h           |   16 +-
 contrib/tools/bison/lib/bitrotate.h           |   12 +-
 contrib/tools/bison/lib/bitset.c              |   16 +-
 contrib/tools/bison/lib/bitset.h              |   13 +-
 contrib/tools/bison/lib/bitset/array.c        |    4 +-
 contrib/tools/bison/lib/bitset/array.h        |    4 +-
 contrib/tools/bison/lib/bitset/base.h         |    6 +-
 contrib/tools/bison/lib/bitset/list.c         |    7 +-
 contrib/tools/bison/lib/bitset/list.h         |    4 +-
 contrib/tools/bison/lib/bitset/stats.c        |   12 +-
 contrib/tools/bison/lib/bitset/stats.h        |    4 +-
 contrib/tools/bison/lib/bitset/table.c        |   81 +-
 contrib/tools/bison/lib/bitset/table.h        |    4 +-
 contrib/tools/bison/lib/bitset/vector.c       |   40 +-
 contrib/tools/bison/lib/bitset/vector.h       |    4 +-
 contrib/tools/bison/lib/bitsetv.c             |   15 +-
 contrib/tools/bison/lib/bitsetv.h             |    6 +-
 contrib/tools/bison/lib/c-ctype.h             |    2 +-
 contrib/tools/bison/lib/c-strcase.h           |    2 +-
 contrib/tools/bison/lib/c-strcasecmp.c        |    2 +-
 contrib/tools/bison/lib/c-strcaseeq.h         |    2 +-
 contrib/tools/bison/lib/c-strncasecmp.c       |    2 +-
 contrib/tools/bison/lib/careadlinkat.c        |    4 +-
 contrib/tools/bison/lib/careadlinkat.h        |    6 +-
 contrib/tools/bison/lib/cloexec.c             |    2 +-
 contrib/tools/bison/lib/cloexec.h             |    2 +-
 contrib/tools/bison/lib/close-stream.c        |    2 +-
 contrib/tools/bison/lib/close.c               |    2 +-
 contrib/tools/bison/lib/closeout.c            |    2 +-
 contrib/tools/bison/lib/closeout.h            |    2 +-
 contrib/tools/bison/lib/concat-filename.c     |    2 +-
 contrib/tools/bison/lib/concat-filename.h     |    2 +-
 contrib/tools/bison/lib/config-linux.h        |  213 +-
 contrib/tools/bison/lib/config-win.h          |    7 +-
 contrib/tools/bison/lib/configmake-linux.h    |   55 +-
 contrib/tools/bison/lib/configmake-win.h      |    3 +-
 contrib/tools/bison/lib/diffseq.h             |  529 ++++
 contrib/tools/bison/lib/dirname-lgpl.c        |    2 +-
 contrib/tools/bison/lib/dirname.c             |    2 +-
 contrib/tools/bison/lib/dirname.h             |    2 +-
 contrib/tools/bison/lib/dosname.h             |    2 +-
 contrib/tools/bison/lib/dup-safer-flag.c      |    2 +-
 contrib/tools/bison/lib/dup-safer.c           |    2 +-
 contrib/tools/bison/lib/dup2.c                |    2 +-
 contrib/tools/bison/lib/error.c               |    4 +-
 contrib/tools/bison/lib/error.h               |    2 +-
 contrib/tools/bison/lib/exitfail.c            |    2 +-
 contrib/tools/bison/lib/exitfail.h            |    2 +-
 contrib/tools/bison/lib/fatal-signal.c        |   27 +-
 contrib/tools/bison/lib/fatal-signal.h        |   13 +-
 contrib/tools/bison/lib/fcntl.c               |    3 +-
 contrib/tools/bison/lib/fd-hook.c             |    2 +-
 contrib/tools/bison/lib/fd-hook.h             |    2 +-
 contrib/tools/bison/lib/fd-safer-flag.c       |    2 +-
 contrib/tools/bison/lib/fd-safer.c            |    2 +-
 contrib/tools/bison/lib/filename.h            |    2 +-
 contrib/tools/bison/lib/float+.h              |    2 +-
 contrib/tools/bison/lib/fopen-safer.c         |    2 +-
 contrib/tools/bison/lib/fpending.c            |    2 +-
 contrib/tools/bison/lib/fpending.h            |    2 +-
 contrib/tools/bison/lib/fpucw.h               |    8 +-
 contrib/tools/bison/lib/fseterr.c             |    2 +-
 contrib/tools/bison/lib/fseterr.h             |    2 +-
 contrib/tools/bison/lib/fstrcmp.c             |  263 ++
 contrib/tools/bison/lib/fstrcmp.h             |   54 +
 contrib/tools/bison/lib/get-errno.c           |    2 +-
 contrib/tools/bison/lib/get-errno.h           |    2 +-
 contrib/tools/bison/lib/getdtablesize.c       |    2 +-
 contrib/tools/bison/lib/gethrxtime.c          |    2 +-
 contrib/tools/bison/lib/gethrxtime.h          |    2 +-
 contrib/tools/bison/lib/getopt.c              |    2 +-
 contrib/tools/bison/lib/getopt1.c             |    2 +-
 contrib/tools/bison/lib/getopt_int.h          |    2 +-
 contrib/tools/bison/lib/getprogname.c         |   13 +-
 contrib/tools/bison/lib/getprogname.h         |    2 +-
 contrib/tools/bison/lib/gettext.h             |    2 +-
 contrib/tools/bison/lib/gl_array_list.c       |    7 +-
 contrib/tools/bison/lib/gl_array_list.h       |    2 +-
 contrib/tools/bison/lib/gl_list.h             |  134 +-
 contrib/tools/bison/lib/gl_xlist.h            |    2 +-
 contrib/tools/bison/lib/glthread/lock.c       |  749 ++++++
 contrib/tools/bison/lib/glthread/lock.h       |  789 ++++++
 contrib/tools/bison/lib/glthread/threadlib.c  |   73 +
 contrib/tools/bison/lib/glthread/tls.c        |   41 +
 contrib/tools/bison/lib/glthread/tls.h        |  228 ++
 contrib/tools/bison/lib/hard-locale.c         |   48 +-
 contrib/tools/bison/lib/hard-locale.h         |    7 +-
 contrib/tools/bison/lib/hash.c                |    2 +-
 contrib/tools/bison/lib/hash.h                |    5 +-
 contrib/tools/bison/lib/intprops.h            |  584 +++++
 contrib/tools/bison/lib/isnand-nolibm.h       |    2 +-
 contrib/tools/bison/lib/isnanl-nolibm.h       |    2 +-
 contrib/tools/bison/lib/localcharset.c        |  273 ++-
 contrib/tools/bison/lib/localcharset.h        |   31 +-
 contrib/tools/bison/lib/mbchar.c              |   37 +
 contrib/tools/bison/lib/mbchar.h              |  360 +++
 contrib/tools/bison/lib/mbfile.c              |    3 +
 contrib/tools/bison/lib/mbfile.h              |  252 ++
 contrib/tools/bison/lib/mbrtowc.c             |  377 +--
 contrib/tools/bison/lib/mbswidth.c            |    2 +-
 contrib/tools/bison/lib/mbswidth.h            |    2 +-
 contrib/tools/bison/lib/minmax.h              |    2 +-
 contrib/tools/bison/lib/msvc-inval.c          |    2 +-
 contrib/tools/bison/lib/msvc-inval.h          |    6 +-
 contrib/tools/bison/lib/msvc-nothrow.c        |    2 +-
 contrib/tools/bison/lib/msvc-nothrow.h        |    2 +-
 contrib/tools/bison/lib/obstack.c             |    2 +-
 contrib/tools/bison/lib/obstack.h             |    2 +-
 contrib/tools/bison/lib/obstack_printf.c      |    2 +-
 contrib/tools/bison/lib/open.c                |   37 +-
 contrib/tools/bison/lib/path-join.c           |    2 +-
 contrib/tools/bison/lib/path-join.h           |    2 +-
 contrib/tools/bison/lib/pipe-safer.c          |    2 +-
 contrib/tools/bison/lib/pipe2-safer.c         |    2 +-
 contrib/tools/bison/lib/pipe2.c               |    4 +-
 .../bison/lib/platform/win64/sys/ioctl.h      |    0
 .../tools/bison/lib/platform/win64/sys/stat.h |    6 +-
 .../tools/bison/lib/platform/win64/termios.h  |    0
 contrib/tools/bison/lib/printf-args.c         |    6 +-
 contrib/tools/bison/lib/printf-args.h         |   14 +-
 contrib/tools/bison/lib/printf-frexp.c        |    2 +-
 contrib/tools/bison/lib/printf-frexp.h        |    2 +-
 contrib/tools/bison/lib/printf-frexpl.c       |    2 +-
 contrib/tools/bison/lib/printf-frexpl.h       |    2 +-
 contrib/tools/bison/lib/printf-parse.c        |   26 +-
 contrib/tools/bison/lib/printf-parse.h        |    2 +-
 contrib/tools/bison/lib/progname.c            |    2 +-
 contrib/tools/bison/lib/progname.h            |    2 +-
 contrib/tools/bison/lib/quote.h               |    2 +-
 contrib/tools/bison/lib/quotearg.c            |    2 +-
 contrib/tools/bison/lib/quotearg.h            |    4 +-
 contrib/tools/bison/lib/raise.c               |    2 +-
 contrib/tools/bison/lib/relocatable.h         |    2 +-
 contrib/tools/bison/lib/setlocale_null.c      |  413 ++++
 contrib/tools/bison/lib/setlocale_null.h      |   82 +
 contrib/tools/bison/lib/sig-handler.h         |    2 +-
 contrib/tools/bison/lib/sigaction.c           |    2 +-
 contrib/tools/bison/lib/sigprocmask.c         |    2 +-
 contrib/tools/bison/lib/spawn-pipe.c          |    2 +-
 contrib/tools/bison/lib/spawn-pipe.h          |    2 +-
 contrib/tools/bison/lib/stdio-impl.h          |   15 +-
 contrib/tools/bison/lib/stdio-safer.h         |    2 +-
 contrib/tools/bison/lib/stpcpy.c              |    2 +-
 contrib/tools/bison/lib/streq.h               |    2 +-
 contrib/tools/bison/lib/stripslash.c          |    2 +-
 contrib/tools/bison/lib/strndup.c             |    2 +-
 contrib/tools/bison/lib/strverscmp.c          |   37 +-
 contrib/tools/bison/lib/textstyle.h           |  466 ++++
 contrib/tools/bison/lib/timespec.h            |    2 +-
 contrib/tools/bison/lib/timevar.c             |    4 +-
 contrib/tools/bison/lib/timevar.def           |    2 +-
 contrib/tools/bison/lib/timevar.h             |    4 +-
 contrib/tools/bison/lib/unistd-safer.h        |    2 +-
 contrib/tools/bison/lib/unitypes.h            |   15 +-
 contrib/tools/bison/lib/uniwidth.h            |    2 +-
 contrib/tools/bison/lib/uniwidth/cjk.h        |    2 +-
 contrib/tools/bison/lib/uniwidth/width.c      |    2 +-
 contrib/tools/bison/lib/unlocked-io.h         |    2 +-
 contrib/tools/bison/lib/vasnprintf.c          |   29 +-
 contrib/tools/bison/lib/vasnprintf.h          |    8 +-
 contrib/tools/bison/lib/vasprintf.c           |   50 +
 contrib/tools/bison/lib/verify.h              |  122 +-
 contrib/tools/bison/lib/w32spawn.h            |    2 +-
 contrib/tools/bison/lib/wait-process.c        |   14 +-
 contrib/tools/bison/lib/wait-process.h        |    2 +-
 contrib/tools/bison/lib/waitpid.c             |    2 +-
 contrib/tools/bison/lib/wcwidth.c             |    2 +-
 contrib/tools/bison/lib/windows-initguard.h   |   35 +
 contrib/tools/bison/lib/windows-mutex.c       |   95 +
 contrib/tools/bison/lib/windows-mutex.h       |   51 +
 contrib/tools/bison/lib/windows-once.c        |   62 +
 contrib/tools/bison/lib/windows-once.h        |   47 +
 contrib/tools/bison/lib/windows-recmutex.c    |  127 +
 contrib/tools/bison/lib/windows-recmutex.h    |   57 +
 contrib/tools/bison/lib/windows-rwlock.c      |  373 +++
 contrib/tools/bison/lib/windows-rwlock.h      |   68 +
 contrib/tools/bison/lib/windows-tls.c         |  339 +++
 contrib/tools/bison/lib/windows-tls.h         |   42 +
 contrib/tools/bison/lib/xalloc-die.c          |    2 +-
 contrib/tools/bison/lib/xalloc-oversized.h    |    2 +-
 contrib/tools/bison/lib/xalloc.h              |    4 +-
 contrib/tools/bison/lib/xconcat-filename.c    |    2 +-
 contrib/tools/bison/lib/xhash.c               |   38 +
 contrib/tools/bison/lib/xmalloc.c             |    8 +-
 contrib/tools/bison/lib/xmemdup0.c            |    5 +-
 contrib/tools/bison/lib/xmemdup0.h            |    2 +-
 contrib/tools/bison/lib/xreadlink.c           |    2 +-
 contrib/tools/bison/lib/xreadlink.h           |    2 +-
 contrib/tools/bison/lib/xsize.h               |    2 +-
 contrib/tools/bison/lib/xstrndup.c            |    2 +-
 contrib/tools/bison/lib/xstrndup.h            |    2 +-
 contrib/tools/bison/lib/xtime.h               |   39 +-
 contrib/tools/bison/lib/ya.make               |   16 +
 contrib/tools/bison/src/AnnotationList.c      |    4 +-
 contrib/tools/bison/src/AnnotationList.h      |    4 +-
 contrib/tools/bison/src/InadequacyList.c      |   11 +-
 contrib/tools/bison/src/InadequacyList.h      |    7 +-
 contrib/tools/bison/src/Sbitset.c             |    2 +-
 contrib/tools/bison/src/Sbitset.h             |    2 +-
 contrib/tools/bison/src/assoc.c               |    6 +-
 contrib/tools/bison/src/assoc.h               |    2 +-
 contrib/tools/bison/src/closure.c             |   25 +-
 contrib/tools/bison/src/closure.h             |   23 +-
 contrib/tools/bison/src/complain.c            |  346 ++-
 contrib/tools/bison/src/complain.h            |   61 +-
 contrib/tools/bison/src/conflicts.c           |   73 +-
 contrib/tools/bison/src/conflicts.h           |    2 +-
 contrib/tools/bison/src/derives.c             |   27 +-
 contrib/tools/bison/src/derives.h             |    2 +-
 contrib/tools/bison/src/files.c               |   41 +-
 contrib/tools/bison/src/files.h               |   10 +-
 contrib/tools/bison/src/fixits.c              |   34 +-
 contrib/tools/bison/src/fixits.h              |    2 +-
 contrib/tools/bison/src/flex-scanner.h        |    2 +-
 contrib/tools/bison/src/getargs.c             |  524 ++--
 contrib/tools/bison/src/getargs.h             |   15 +-
 contrib/tools/bison/src/gram.c                |  133 +-
 contrib/tools/bison/src/gram.h                |   53 +-
 contrib/tools/bison/src/graphviz.c            |   10 +-
 contrib/tools/bison/src/graphviz.h            |    2 +-
 contrib/tools/bison/src/ielr.c                |  104 +-
 contrib/tools/bison/src/ielr.h                |    2 +-
 contrib/tools/bison/src/lalr.c                |  371 ++-
 contrib/tools/bison/src/lalr.h                |   11 +-
 contrib/tools/bison/src/location.c            |  535 +++-
 contrib/tools/bison/src/location.h            |   60 +-
 contrib/tools/bison/src/{LR0.c => lr0.c}      |  179 +-
 contrib/tools/bison/src/{LR0.h => lr0.h}      |    4 +-
 contrib/tools/bison/src/main.c                |   33 +-
 contrib/tools/bison/src/muscle-tab.c          |   39 +-
 contrib/tools/bison/src/muscle-tab.h          |    7 +-
 contrib/tools/bison/src/named-ref.c           |    2 +-
 contrib/tools/bison/src/named-ref.h           |    2 +-
 contrib/tools/bison/src/nullable.c            |    2 +-
 contrib/tools/bison/src/nullable.h            |    2 +-
 contrib/tools/bison/src/output.c              |  104 +-
 contrib/tools/bison/src/output.h              |    5 +-
 contrib/tools/bison/src/parse-gram.c          | 2170 ++++++++---------
 contrib/tools/bison/src/parse-gram.h          |  149 +-
 .../src/{print_graph.c => print-graph.c}      |   20 +-
 .../src/{print_graph.h => print-graph.h}      |    2 +-
 contrib/tools/bison/src/print-xml.c           |   59 +-
 contrib/tools/bison/src/print-xml.h           |    6 +-
 contrib/tools/bison/src/print.c               |  137 +-
 contrib/tools/bison/src/print.h               |    2 +-
 contrib/tools/bison/src/reader.c              |  173 +-
 contrib/tools/bison/src/reader.h              |   12 +-
 contrib/tools/bison/src/reduce.c              |   67 +-
 contrib/tools/bison/src/reduce.h              |    6 +-
 contrib/tools/bison/src/relation.c            |  121 +-
 contrib/tools/bison/src/relation.h            |   19 +-
 contrib/tools/bison/src/scan-code.c           |  303 ++-
 contrib/tools/bison/src/scan-code.h           |    2 +-
 contrib/tools/bison/src/scan-gram.c           | 1759 ++++++-------
 contrib/tools/bison/src/scan-gram.h           |   17 +-
 contrib/tools/bison/src/scan-skel.h           |    2 +-
 contrib/tools/bison/src/state.c               |  144 +-
 contrib/tools/bison/src/state.h               |   35 +-
 contrib/tools/bison/src/symlist.c             |   33 +-
 contrib/tools/bison/src/symlist.h             |   23 +-
 contrib/tools/bison/src/symtab.c              |  349 ++-
 contrib/tools/bison/src/symtab.h              |   34 +-
 contrib/tools/bison/src/system.h              |   36 +-
 contrib/tools/bison/src/tables.c              |   88 +-
 contrib/tools/bison/src/tables.h              |    6 +-
 contrib/tools/bison/src/uniqstr.c             |   12 +-
 contrib/tools/bison/src/uniqstr.h             |    2 +-
 contrib/tools/bison/ya.make                   |   11 +-
 298 files changed, 13873 insertions(+), 5499 deletions(-)
 rename contrib/tools/bison/data/{README => README.md} (98%)
 create mode 100644 contrib/tools/bison/lib/asprintf.c
 create mode 100644 contrib/tools/bison/lib/assure.h
 create mode 100644 contrib/tools/bison/lib/diffseq.h
 create mode 100644 contrib/tools/bison/lib/fstrcmp.c
 create mode 100644 contrib/tools/bison/lib/fstrcmp.h
 create mode 100644 contrib/tools/bison/lib/glthread/lock.c
 create mode 100644 contrib/tools/bison/lib/glthread/lock.h
 create mode 100644 contrib/tools/bison/lib/glthread/threadlib.c
 create mode 100644 contrib/tools/bison/lib/glthread/tls.c
 create mode 100644 contrib/tools/bison/lib/glthread/tls.h
 create mode 100644 contrib/tools/bison/lib/intprops.h
 create mode 100644 contrib/tools/bison/lib/mbchar.c
 create mode 100644 contrib/tools/bison/lib/mbchar.h
 create mode 100644 contrib/tools/bison/lib/mbfile.c
 create mode 100644 contrib/tools/bison/lib/mbfile.h
 create mode 100644 contrib/tools/bison/lib/platform/win64/sys/ioctl.h
 create mode 100644 contrib/tools/bison/lib/platform/win64/termios.h
 create mode 100644 contrib/tools/bison/lib/setlocale_null.c
 create mode 100644 contrib/tools/bison/lib/setlocale_null.h
 create mode 100644 contrib/tools/bison/lib/textstyle.h
 create mode 100644 contrib/tools/bison/lib/vasprintf.c
 create mode 100644 contrib/tools/bison/lib/windows-initguard.h
 create mode 100644 contrib/tools/bison/lib/windows-mutex.c
 create mode 100644 contrib/tools/bison/lib/windows-mutex.h
 create mode 100644 contrib/tools/bison/lib/windows-once.c
 create mode 100644 contrib/tools/bison/lib/windows-once.h
 create mode 100644 contrib/tools/bison/lib/windows-recmutex.c
 create mode 100644 contrib/tools/bison/lib/windows-recmutex.h
 create mode 100644 contrib/tools/bison/lib/windows-rwlock.c
 create mode 100644 contrib/tools/bison/lib/windows-rwlock.h
 create mode 100644 contrib/tools/bison/lib/windows-tls.c
 create mode 100644 contrib/tools/bison/lib/windows-tls.h
 create mode 100644 contrib/tools/bison/lib/xhash.c
 rename contrib/tools/bison/src/{LR0.c => lr0.c} (70%)
 rename contrib/tools/bison/src/{LR0.h => lr0.h} (96%)
 rename contrib/tools/bison/src/{print_graph.c => print-graph.c} (93%)
 rename contrib/tools/bison/src/{print_graph.h => print-graph.h} (93%)

diff --git a/build/sysincl/misc-win.yml b/build/sysincl/misc-win.yml
index cef2a54d5037..4410b37521f4 100644
--- a/build/sysincl/misc-win.yml
+++ b/build/sysincl/misc-win.yml
@@ -86,8 +86,10 @@
   - sched.h:       contrib/tools/bison/lib/platform/win64/sched.h
   - signal.h:      contrib/tools/bison/lib/platform/win64/signal.h
   - spawn.h:       contrib/tools/bison/lib/platform/win64/spawn.h
+  - sys/ioctl.h:   contrib/tools/bison/lib/platform/win64/sys/ioctl.h
   - sys/stat.h:    contrib/tools/bison/lib/platform/win64/sys/stat.h
   - sys/wait.h:    contrib/tools/bison/lib/platform/win64/sys/wait.h
+  - termios.h:     contrib/tools/bison/lib/platform/win64/termios.h
   - unistd.h:      contrib/tools/bison/lib/platform/win64/unistd.h
 
 - source_filter: "^contrib/tools/m4/"
diff --git a/contrib/tools/bison/AUTHORS b/contrib/tools/bison/AUTHORS
index 63946aa31758..e624c51bc716 100644
--- a/contrib/tools/bison/AUTHORS
+++ b/contrib/tools/bison/AUTHORS
@@ -24,7 +24,7 @@ and nasty bugs.
 
 -----
 
-Copyright (C) 1998-2015, 2018-2019 Free Software Foundation, Inc.
+Copyright (C) 1998-2015, 2018-2020 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/contrib/tools/bison/NEWS b/contrib/tools/bison/NEWS
index 30e31ff58455..75c8abdcb7cc 100644
--- a/contrib/tools/bison/NEWS
+++ b/contrib/tools/bison/NEWS
@@ -1,5 +1,422 @@
 GNU Bison NEWS
 
+* Noteworthy changes in release 3.5.4 (2020-04-05) [stable]
+
+** WARNING: Future backward-incompatibilities!
+
+  TL;DR: replace "#define YYERROR_VERBOSE 1" by "%define parse.error verbose".
+
+  Bison 3.6 will no longer support the YYERROR_VERBOSE macro; the parsers
+  that still depend on it will produce Yacc-like error messages (just
+  "syntax error").  It was superseded by the "%error-verbose" directive in
+  Bison 1.875 (2003-01-01).  Bison 2.6 (2012-07-19) clearly announced that
+  support for YYERROR_VERBOSE would be removed.  Note that since Bison 3.0
+  (2013-07-25), "%error-verbose" is deprecated in favor of "%define
+  parse.error verbose".
+
+** Bug fixes
+
+  Fix portability issues of the package itself on old compilers.
+
+  Fix api.token.raw support in Java.
+
+* Noteworthy changes in release 3.5.3 (2020-03-08) [stable]
+
+** Bug fixes
+
+  Error messages could quote lines containing zero-width characters (such as
+  \005) with incorrect styling.  Fixes for similar issues with unexpectedly
+  short lines (e.g., the file was changed between parsing and diagnosing).
+
+  Several unlikely crashes found by fuzzing have been fixed.
+
+* Noteworthy changes in release 3.5.2 (2020-02-13) [stable]
+
+** Bug fixes
+
+  Portability issues and minor cosmetic issues.
+
+  The lalr1.cc skeleton properly rejects unsupported values for parse.lac
+  (as yacc.c does).
+
+* Noteworthy changes in release 3.5.1 (2020-01-19) [stable]
+
+** Bug fixes
+
+  Portability fixes.
+
+  Fix compiler warnings.
+
+* Noteworthy changes in release 3.5 (2019-12-11) [stable]
+
+** Backward incompatible changes
+
+  Lone carriage-return characters (aka \r or ^M) in the grammar files are no
+  longer treated as end-of-lines.  This changes the diagnostics, and in
+  particular their locations.
+
+  In C++, line numbers and columns are now represented as 'int' not
+  'unsigned', so that integer overflow on positions is easily checkable via
+  'gcc -fsanitize=undefined' and the like.  This affects the API for
+  positions.  The default position and location classes now expose
+  'counter_type' (int), used to define line and column numbers.
+
+** Deprecated features
+
+  The YYPRINT macro, which works only with yacc.c and only for tokens, was
+  obsoleted long ago by %printer, introduced in Bison 1.50 (November 2002).
+  It is deprecated and its support will be removed eventually.
+
+** New features
+
+*** Lookahead correction in C++
+
+  Contributed by Adrian Vogelsgesang.
+
+  The C++ deterministic skeleton (lalr1.cc) now supports LAC, via the
+  %define variable parse.lac.
+
+*** Variable api.token.raw: Optimized token numbers (all skeletons)
+
+  In the generated parsers, tokens have two numbers: the "external" token
+  number as returned by yylex (which starts at 257), and the "internal"
+  symbol number (which starts at 3).  Each time yylex is called, a table
+  lookup maps the external token number to the internal symbol number.
+
+  When the %define variable api.token.raw is set, tokens are assigned their
+  internal number, which saves one table lookup per token, and also saves
+  the generation of the mapping table.
+
+  The gain is typically moderate, but in extreme cases (very simple user
+  actions), a 10% improvement can be observed.
+
+*** Generated parsers use better types for states
+
+  Stacks now use the best integral type for state numbers, instead of always
+  using 15 bits.  As a result "small" parsers now have a smaller memory
+  footprint (they use 8 bits), and there is support for large automata (16
+  bits), and extra large (using int, i.e., typically 31 bits).
+
+*** Generated parsers prefer signed integer types
+
+  Bison skeletons now prefer signed to unsigned integer types when either
+  will do, as the signed types are less error-prone and allow for better
+  checking with 'gcc -fsanitize=undefined'.  Also, the types chosen are now
+  portable to unusual machines where char, short and int are all the same
+  width.  On non-GNU platforms this may entail including <limits.h> and (if
+  available) <stdint.h> to define integer types and constants.
+
+*** A skeleton for the D programming language
+
+  For the last few releases, Bison has shipped a stealth experimental
+  skeleton: lalr1.d.  It was first contributed by Oliver Mangold, based on
+  Paolo Bonzini's lalr1.java, and was cleaned and improved thanks to
+  H. S. Teoh.
+
+  However, because nobody has committed to improving, testing, and
+  documenting this skeleton, it is not clear that it will be supported in
+  the future.
+
+  The lalr1.d skeleton *is functional*, and works well, as demonstrated in
+  examples/d/calc.d.  Please try it, enjoy it, and... commit to support it.
+
+*** Debug traces in Java
+
+  The Java backend no longer emits code and data for parser tracing if the
+  %define variable parse.trace is not defined.
+
+** Diagnostics
+
+*** New diagnostic: -Wdangling-alias
+
+  String literals, which allow for better error messages, are (too)
+  liberally accepted by Bison, which might result in silent errors.  For
+  instance
+
+    %type <exVal> cond "condition"
+
+  does not define "condition" as a string alias to 'cond' (nonterminal
+  symbols do not have string aliases).  It is rather equivalent to
+
+    %nterm <exVal> cond
+    %token <exVal> "condition"
+
+  i.e., it gives the type 'exVal' to the "condition" token, which was
+  clearly not the intention.
+
+  Also, because string aliases need not be defined, typos such as "baz"
+  instead of "bar" will be not reported.
+
+  The option -Wdangling-alias catches these situations.  On
+
+    %token BAR "bar"
+    %type <ival> foo "foo"
+    %%
+    foo: "baz" {}
+
+  bison -Wdangling-alias reports
+
+    warning: string literal not attached to a symbol
+          | %type <ival> foo "foo"
+          |                  ^~~~~
+    warning: string literal not attached to a symbol
+          | foo: "baz" {}
+          |      ^~~~~
+
+   The -Wall option does not (yet?) include -Wdangling-alias.
+
+*** Better POSIX Yacc compatibility diagnostics
+
+  POSIX Yacc restricts %type to nonterminals.  This is now diagnosed by
+  -Wyacc.
+
+    %token TOKEN1
+    %type  <ival> TOKEN1 TOKEN2 't'
+    %token TOKEN2
+    %%
+    expr:
+
+  gives with -Wyacc
+
+    input.y:2.15-20: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
+        2 | %type  <ival> TOKEN1 TOKEN2 't'
+          |               ^~~~~~
+    input.y:2.29-31: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
+        2 | %type  <ival> TOKEN1 TOKEN2 't'
+          |                             ^~~
+    input.y:2.22-27: warning: POSIX yacc reserves %type to nonterminals [-Wyacc]
+        2 | %type  <ival> TOKEN1 TOKEN2 't'
+          |                      ^~~~~~
+
+*** Diagnostics with insertion
+
+  The diagnostics now display the suggestion below the underlined source.
+  Replacement for undeclared symbols are now also suggested.
+
+    $ cat /tmp/foo.y
+    %%
+    list: lis '.' |
+
+    $ bison -Wall foo.y
+    foo.y:2.7-9: error: symbol 'lis' is used, but is not defined as a token and has no rules; did you mean 'list'?
+        2 | list: lis '.' |
+          |       ^~~
+          |       list
+    foo.y:2.16: warning: empty rule without %empty [-Wempty-rule]
+        2 | list: lis '.' |
+          |                ^
+          |                %empty
+    foo.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
+
+*** Diagnostics about long lines
+
+  Quoted sources may now be truncated to fit the screen.  For instance, on a
+  30-column wide terminal:
+
+    $ cat foo.y
+    %token FOO                       FOO                         FOO
+    %%
+    exp: FOO
+    $ bison foo.y
+    foo.y:1.34-36: warning: symbol FOO redeclared [-Wother]
+        1 | …         FOO                  …
+          |           ^~~
+    foo.y:1.8-10:      previous declaration
+        1 | %token FOO                     …
+          |        ^~~
+    foo.y:1.62-64: warning: symbol FOO redeclared [-Wother]
+        1 | …         FOO
+          |           ^~~
+    foo.y:1.8-10:      previous declaration
+        1 | %token FOO                     …
+          |        ^~~
+
+** Changes
+
+*** Debugging glr.c and glr.cc
+
+  The glr.c skeleton always had asserts to check its own behavior (not the
+  user's).  These assertions are now under the control of the parse.assert
+  %define variable (disabled by default).
+
+*** Clean up
+
+  Several new compiler warnings in the generated output have been avoided.
+  Some unused features are no longer emitted.  Cleaner generated code in
+  general.
+
+** Bug Fixes
+
+  Portability issues in the test suite.
+
+  In theory, parsers using %nonassoc could crash when reporting verbose
+  error messages. This unlikely bug has been fixed.
+
+  In Java, %define api.prefix was ignored.  It now behaves as expected.
+
+* Noteworthy changes in release 3.4.2 (2019-09-12) [stable]
+
+** Bug fixes
+
+  In some cases, when warnings are disabled, bison could emit tons of white
+  spaces as diagnostics.
+
+  When running out of memory, bison could crash (found by fuzzing).
+
+  When defining twice the EOF token, bison would crash.
+
+  New warnings from recent compilers have been addressed in the generated
+  parsers (yacc.c, glr.c, glr.cc).
+
+  When lone carriage-return characters appeared in the input file,
+  diagnostics could hang forever.
+
+* Noteworthy changes in release 3.4.1 (2019-05-22) [stable]
+
+** Bug fixes
+
+  Portability fixes.
+
+* Noteworthy changes in release 3.4 (2019-05-19) [stable]
+
+** Deprecated features
+
+  The %pure-parser directive is deprecated in favor of '%define api.pure'
+  since Bison 2.3b (2008-05-27), but no warning was issued; there is one
+  now.  Note that since Bison 2.7 you are strongly encouraged to use
+  '%define api.pure full' instead of '%define api.pure'.
+
+** New features
+
+*** Colored diagnostics
+
+  As an experimental feature, diagnostics are now colored, controlled by the
+  new options --color and --style.
+
+  To use them, install the libtextstyle library before configuring Bison.
+  It is available from
+
+    https://alpha.gnu.org/gnu/gettext/
+
+  for instance
+
+    https://alpha.gnu.org/gnu/gettext/libtextstyle-0.8.tar.gz
+
+  The option --color supports the following arguments:
+    - always, yes: Enable colors.
+    - never, no: Disable colors.
+    - auto, tty (default): Enable colors if the output device is a tty.
+
+  To customize the styles, create a CSS file similar to
+
+    /* bison-bw.css */
+    .warning   { }
+    .error     { font-weight: 800; text-decoration: underline; }
+    .note      { }
+
+  then invoke bison with --style=bison-bw.css, or set the BISON_STYLE
+  environment variable to "bison-bw.css".
+
+*** Disabling output
+
+  When given -fsyntax-only, the diagnostics are reported, but no output is
+  generated.
+
+  The name of this option is somewhat misleading as bison does more than
+  just checking the syntax: every stage is run (including checking for
+  conflicts for instance), except the generation of the output files.
+
+*** Include the generated header (yacc.c)
+
+  Before, when --defines is used, bison generated a header, and pasted an
+  exact copy of it into the generated parser implementation file.  If the
+  header name is not "y.tab.h", it is now #included instead of being
+  duplicated.
+
+  To use an '#include' even if the header name is "y.tab.h" (which is what
+  happens with --yacc, or when using the Autotools' ylwrap), define
+  api.header.include to the exact argument to pass to #include.  For
+  instance:
+
+    %define api.header.include {"parse.h"}
+
+  or
+
+    %define api.header.include {<parser/parse.h>}
+
+*** api.location.type is now supported in C (yacc.c, glr.c)
+
+  The %define variable api.location.type defines the name of the type to use
+  for locations.  When defined, Bison no longer defines YYLTYPE.
+
+  This can be used in programs with several parsers to factor their
+  definition of locations: let one of them generate them, and the others
+  just use them.
+
+** Changes
+
+*** Graphviz output
+
+  In conformance with the recommendations of the Graphviz team, if %require
+  "3.4" (or better) is specified, the option --graph generates a *.gv file
+  by default, instead of *.dot.
+
+*** Diagnostics overhaul
+
+  Column numbers were wrong with multibyte characters, which would also
+  result in skewed diagnostics with carets.  Beside, because we were
+  indenting the quoted source with a single space, lines with tab characters
+  were incorrectly underlined.
+
+  To address these issues, and to be clearer, Bison now issues diagnostics
+  as GCC9 does.  For instance it used to display (there's a tab before the
+  opening brace):
+
+    foo.y:3.37-38: error: $2 of ‘expr’ has no declared type
+     expr: expr '+' "number"        { $$ = $1 + $2; }
+                                         ^~
+  It now reports
+
+    foo.y:3.37-38: error: $2 of ‘expr’ has no declared type
+        3 | expr: expr '+' "number" { $$ = $1 + $2; }
+          |                                     ^~
+
+  Other constructs now also have better locations, resulting in more precise
+  diagnostics.
+
+*** Fix-it hints for %empty
+
+  Running Bison with -Wempty-rules and --update will remove incorrect %empty
+  annotations, and add the missing ones.
+
+*** Generated reports
+
+  The format of the reports (parse.output) was improved for readability.
+
+*** Better support for --no-line.
+
+  When --no-line is used, the generated files are now cleaner: no lines are
+  generated instead of empty lines.  Together with using api.header.include,
+  that should help people saving the generated files into version control
+  systems get smaller diffs.
+
+** Documentation
+
+  A new example in C shows an simple infix calculator with a hand-written
+  scanner (examples/c/calc).
+
+  A new example in C shows a reentrant parser (capable of recursive calls)
+  built with Flex and Bison (examples/c/reccalc).
+
+  There is a new section about the history of Yaccs and Bison.
+
+** Bug fixes
+
+  A few obscure bugs were fixed, including the second oldest (known) bug in
+  Bison: it was there when Bison was entered in the RCS version control
+  system, in December 1987.  See the NEWS of Bison 3.3 for the previous
+  oldest bug.
+
 * Noteworthy changes in release 3.3.2 (2019-02-03) [stable]
 
 ** Bug fixes
@@ -737,10 +1154,10 @@ GNU Bison NEWS
 
   bison used to report:
 
-    /tmp/foo.yy:2.10-11: error: %printer redeclaration for FOO
+    foo.yy:2.10-11: error: %printer redeclaration for FOO
      %printer {} "foo"
               ^^
-    /tmp/foo.yy:3.10-11:     previous declaration
+    foo.yy:3.10-11:     previous declaration
      %printer {} FOO
               ^^
 
@@ -3441,7 +3858,7 @@ Output file does not redefine const for C++.
 
 -----
 
-Copyright (C) 1995-2015, 2018-2019 Free Software Foundation, Inc.
+Copyright (C) 1995-2015, 2018-2020 Free Software Foundation, Inc.
 
 This file is part of Bison, the GNU Parser Generator.
 
@@ -3482,12 +3899,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  LocalWords:  redeclaration sval fcaret reentrant XSLT xsl Wmaybe yyvsp Tedi
  LocalWords:  pragmas noreturn untyped Rozenman unexpanded Wojciech Polak
  LocalWords:  Alexandre MERCHANTABILITY yytype emplace ptr automove lvalues
- LocalWords:  nonterminal yy args Pragma dereference yyformat rhs docdir
+ LocalWords:  nonterminal yy args Pragma dereference yyformat rhs docdir bw
  LocalWords:  Redeclarations rpcalc Autoconf YFLAGS Makefiles PROG DECL num
  LocalWords:  Heimbigner AST src ast Makefile srcdir MinGW xxlex XXSTYPE
  LocalWords:  XXLTYPE strictfp IDEs ffixit fdiagnostics parseable fixits
  LocalWords:  Wdeprecated yytext Variadic variadic yyrhs yyphrs RCS README
- LocalWords:  noexcept constexpr ispell american deprecations
+ LocalWords:  noexcept constexpr ispell american deprecations backend Teoh
+ LocalWords:  YYPRINT Mangold Bonzini's Wdangling exVal baz checkable gcc
+ LocalWords:  fsanitize Vogelsgesang lis redeclared stdint automata
 
 Local Variables:
 ispell-dictionary: "american"
diff --git a/contrib/tools/bison/README b/contrib/tools/bison/README
index 7fa1bfe949a6..f5748c3c2568 100644
--- a/contrib/tools/bison/README
+++ b/contrib/tools/bison/README
@@ -1,15 +1,67 @@
-This package contains the GNU Bison parser generator.
+GNU Bison is a general-purpose parser generator that converts an annotated
+context-free grammar into a deterministic LR or generalized LR (GLR) parser
+employing LALR(1) parser tables.  Bison can also generate IELR(1) or
+canonical LR(1) parser tables.  Once you are proficient with Bison, you can
+use it to develop a wide range of language parsers, from those used in
+simple desk calculators to complex programming languages.
 
-* Installation
-** Build
+Bison is upward compatible with Yacc: all properly-written Yacc grammars
+work with Bison with no change.  Anyone familiar with Yacc should be able to
+use Bison with little trouble.  You need to be fluent in C, C++ or Java
+programming in order to use Bison.
+
+Bison and the parsers it generates are portable, they do not require any
+specific compilers.
+
+GNU Bison's home page is https://gnu.org/software/bison/.
+
+# Installation
+## Build from git
+Here are basic installation instructions for a repository checkout:
+
+    $ git submodule update --init
+    $ ./bootstrap
+
+then proceed with the usual `configure && make` steps.
+
+The file README-hacking.md is about building, modifying and checking Bison.
+
+## Build from tarball
 See the file INSTALL for generic compilation and installation instructions.
 
-Bison requires GNU m4 1.4.6 or later.  See:
+Bison requires GNU m4 1.4.6 or later.  See
+https://ftp.gnu.org/gnu/m4/m4-1.4.6.tar.gz.
+
+## Running a non installed bison
+Once you ran `make`, you might want to toy with this fresh bison before
+installing it.  In that case, do not use `src/bison`: it would use the
+*installed* files (skeletons, etc.), not the local ones.  Use `tests/bison`.
+
+## Colored diagnostics
+As an experimental feature, diagnostics are now colored, controlled by the
+`--color` and `--style` options.
+
+To use them, install the libtextstyle library before configuring Bison.  It
+is available from https://alpha.gnu.org/gnu/gettext/, for instance
+https://alpha.gnu.org/pub/gnu/gettext/libtextstyle-0.20.5.tar.gz.
+
+The option --color supports the following arguments:
+- always, yes: Enable colors.
+- never, no: Disable colors.
+- auto, tty (default): Enable colors if the output device is a tty.
 
-      https://ftp.gnu.org/gnu/m4/m4-1.4.6.tar.gz
+To customize the styles, create a CSS file, say `bison-bw.css`, similar to
 
-** Relocatability
-If you pass '--enable-relocatable' to 'configure', Bison is relocatable.
+    /* bison-bw.css */
+    .warning   { }
+    .error     { font-weight: 800; text-decoration: underline; }
+    .note      { }
+
+then invoke bison with `--style=bison-bw.css`, or set the `BISON_STYLE`
+environment variable to `bison-bw.css`.
+
+## Relocatability
+If you pass `--enable-relocatable` to `configure`, Bison is relocatable.
 
 A relocatable program can be moved or copied to a different location on the
 file system.  It can also be used through mount points for network sharing.
@@ -18,7 +70,7 @@ invoke them through the symlink.
 
 See "Enabling Relocatability" in the documentation.
 
-** Internationalization
+## Internationalization
 Bison supports two catalogs: one for Bison itself (i.e., for the
 maintainer-side parser generation), and one for the generated parsers (i.e.,
 for the user-side parser execution).  The requirements between both differ:
@@ -28,49 +80,46 @@ generated parsers could have been localized.  See
 http://lists.gnu.org/archive/html/bug-bison/2009-08/msg00006.html for more
 details.
 
-* Questions
+# Questions
 See the section FAQ in the documentation (doc/bison.info) for frequently
 asked questions.  The documentation is also available in PDF and HTML,
-provided you have a recent version of Texinfo installed: run "make pdf" or
-"make html".
+provided you have a recent version of Texinfo installed: run `make pdf` or
+`make html`.
 
 If you have questions about using Bison and the documentation does not
 answer them, please send mail to <help-bison@gnu.org>.
 
-* Bug reports
+# Bug reports
 Please send bug reports to <bug-bison@gnu.org>.  Be sure to include the
-version number from 'bison --version', and a complete, self-contained test
+version number from `bison --version`, and a complete, self-contained test
 case in each bug report.
 
-* Copyright statements
+# Copyright statements
 For any copyright year range specified as YYYY-ZZZZ in this package, note
 that the range specifies every single year in that closed interval.
 
------
+<!--
 
-Local Variables:
-mode: outline
-fill-column: 76
-ispell-dictionary: "american"
-End:
-
-Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2015, 2018-2019 Free
+Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2015, 2018-2020 Free
 Software Foundation, Inc.
 
 This file is part of GNU bison, the GNU Compiler Compiler.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the "GNU Free
+Documentation License" file as part of this distribution.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+Local Variables:
+mode: markdown
+fill-column: 76
+ispell-dictionary: "american"
+End:
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+LocalWords:  parsers ngettext Texinfo pdf html YYYY ZZZZ ispell american md
+LocalWords:  MERCHANTABILITY GLR LALR IELR submodule init README src bw
+LocalWords:  Relocatability symlinks symlink
 
-# LocalWords:  parsers ngettext Texinfo pdf html YYYY ZZZZ ispell american
-# LocalWords:  MERCHANTABILITY
+-->
diff --git a/contrib/tools/bison/README-alpha b/contrib/tools/bison/README-alpha
index c4effc49328d..dbd0e88e2059 100644
--- a/contrib/tools/bison/README-alpha
+++ b/contrib/tools/bison/README-alpha
@@ -12,7 +12,7 @@ the problems you encounter.
 
 -----
 
-Copyright (C) 2002, 2004, 2009-2015, 2018-2019 Free Software Foundation,
+Copyright (C) 2002, 2004, 2009-2015, 2018-2020 Free Software Foundation,
 Inc.
 
 This file is part of GNU Bison.
diff --git a/contrib/tools/bison/data/README b/contrib/tools/bison/data/README.md
similarity index 98%
rename from contrib/tools/bison/data/README
rename to contrib/tools/bison/data/README.md
index ed217365b475..c91fe1c54599 100644
--- a/contrib/tools/bison/data/README
+++ b/contrib/tools/bison/data/README.md
@@ -138,9 +138,10 @@ The macro `b4_symbol(NUM, FIELD)` gives access to the following FIELDS:
 - `printer`: string
 - `printer_file`: string
 - `printer_line`: integer
+- `printer_loc`: location
   If the symbol has a printer, everything about it.
 
-- `has_destructor`, `destructor`, `destructor_file`, `destructor_line`
+- `has_destructor`, `destructor`, `destructor_file`, `destructor_line`, `destructor_loc`
   Likewise.
 
 ### `b4_symbol_value(VAL, [SYMBOL-NUM], [TYPE-TAG])`
@@ -173,7 +174,7 @@ fill-column: 76
 ispell-dictionary: "american"
 End:
 
-Copyright (C) 2002, 2008-2015, 2018-2019 Free Software Foundation, Inc.
+Copyright (C) 2002, 2008-2015, 2018-2020 Free Software Foundation, Inc.
 
 This file is part of GNU Bison.
 
diff --git a/contrib/tools/bison/data/skeletons/bison.m4 b/contrib/tools/bison/data/skeletons/bison.m4
index e3591875c0f6..8e01bd6a6d7a 100644
--- a/contrib/tools/bison/data/skeletons/bison.m4
+++ b/contrib/tools/bison/data/skeletons/bison.m4
@@ -2,7 +2,7 @@
 
 # Language-independent M4 Macros for Bison.
 
-# Copyright (C) 2002, 2004-2015, 2018-2019 Free Software Foundation,
+# Copyright (C) 2002, 2004-2015, 2018-2020 Free Software Foundation,
 # Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -192,7 +192,7 @@ m4_define([b4_error],
 #   @warn(1@)
 #   @warn(1@,2@)
 m4_define([b4_warn],
-[b4_error([[warn]], [], [], $@)])
+[b4_warn_at([], [], $@)])
 
 # b4_warn_at(START, END, FORMAT, [ARG1], [ARG2], ...)
 # ---------------------------------------------------
@@ -210,7 +210,7 @@ m4_define([b4_warn_at],
 #
 # See b4_warn example.
 m4_define([b4_complain],
-[b4_error([[complain]], [], [], $@)])
+[b4_complain_at([], [], $@)])
 
 # b4_complain_at(START, END, FORMAT, [ARG1], [ARG2], ...)
 # -------------------------------------------------------
@@ -226,8 +226,7 @@ m4_define([b4_complain_at],
 #
 # See b4_warn example.
 m4_define([b4_fatal],
-[b4_error([[fatal]], [], [], $@)dnl
-m4_exit(1)])
+[b4_fatal_at([], [], $@)])
 
 # b4_fatal_at(START, END, FORMAT, [ARG1], [ARG2], ...)
 # ----------------------------------------------------
@@ -438,13 +437,6 @@ m4_define([b4_symbol_tag_comment],
 ])
 
 
-# b4_symbol_action_location(SYMBOL-NUM, KIND)
-# -------------------------------------------
-# Report the location of the KIND action as FILE:LINE.
-m4_define([b4_symbol_action_location],
-[b4_symbol([$1], [$2_file]):b4_syncline([b4_symbol([$1], [$2_line])])])
-
-
 # b4_symbol_action(SYMBOL-NUM, KIND)
 # ----------------------------------
 # Run the action KIND (destructor or printer) for SYMBOL-NUM.
@@ -455,9 +447,9 @@ m4_define([b4_symbol_action],
                    [],
                    [(*yylocationp)])dnl
     _b4_symbol_case([$1])[]dnl
-b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])
-      b4_symbol([$1], [$2])
-b4_syncline([@oline@], [@ofile@])
+b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])dnl
+b4_symbol([$1], [$2])
+b4_syncline([@oline@], [@ofile@])dnl
         break;
 
 b4_dollar_popdef[]dnl
@@ -540,9 +532,9 @@ m4_define([b4_any_token_visible_if],
 # ----------------------------
 m4_define([b4_token_format],
 [b4_token_visible_if([$2],
-[m4_quote(m4_format([$1],
-                     [b4_symbol([$2], [id])],
-                     [b4_symbol([$2], [user_number])]))])])
+[m4_format([[$1]],
+           m4_quote(b4_symbol([$2], [id])),
+           m4_quote(b4_symbol([$2], b4_api_token_raw_if([[number]], [[user_number]]))))])])
 
 
 ## ------- ##
@@ -586,12 +578,15 @@ m4_define([b4_basename],
 [m4_bpatsubst([$1], [^.*/\([^/]+\)/*$], [\1])])
 
 
-# b4_syncline(LINE, FILE)
-# -----------------------
+# b4_syncline(LINE, FILE)dnl
+# --------------------------
+# Should always be following by a dnl.
+#
+# Emit "#line LINE FILE /* __LINE__ __FILE__ */".
 m4_define([b4_syncline],
 [b4_flag_if([synclines],
-[b4_sync_start([$1], [$2]) b4_sync_end([__line__],
-                                       [b4_basename(m4_quote(__file__))])[]dnl
+[b4_sync_start([$1], [$2])[]dnl
+b4_sync_end([__line__], [b4_basename(m4_quote(__file__))])
 ])])
 
 # b4_sync_start(LINE, FILE)
@@ -603,7 +598,17 @@ m4_define([b4_sync_start], [b4_comment([$2:$1])])
 # -----------------------
 # Syncline for the current place, which ends.  Typically a comment
 # left for the reader.
-m4_define([b4_sync_end],   [b4_comment([$2:$1])])
+m4_define([b4_sync_end],   [ b4_comment([$2:$1])]
+)
+# This generates dependencies on the Bison skeletons hence lots of
+# useless 'git diff'.  This location is useless for the regular
+# user (who does not care about the skeletons) and is actually not
+# useful for Bison developpers too (I, Akim, never used this to locate
+# the code in skeletons that generated output).  So disable it
+# completely.  If someone thinks this was actually useful, a %define
+# variable should be provided to control the level of verbosity of
+# '#line', in replacement of --no-lines.
+m4_define([b4_sync_end])
 
 
 # b4_user_code(USER-CODE)
@@ -753,8 +758,10 @@ m4_define([b4_percent_define_get_kind],
           [m4_indir([b4_percent_define_kind(]$1[)])],
           [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])])
 
-# b4_percent_define_get_syncline(VARIABLE)
-# ----------------------------------------
+# b4_percent_define_get_syncline(VARIABLE)dnl
+# -------------------------------------------
+# Should always be following by a dnl.
+#
 # Mimic muscle_percent_define_get_syncline in ../src/muscle-tab.h exactly.
 # That is, if the %define variable VARIABLE is undefined, complain fatally
 # since that's a Bison or skeleton error.  Otherwise, return its definition
@@ -968,10 +975,9 @@ m4_define([b4_percent_code_get],
 [m4_pushdef([b4_macro_name], [[b4_percent_code(]$1[)]])dnl
 m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])dnl
 m4_ifdef(b4_macro_name,
-[b4_comment([m4_if([$#], [0], [[Unqualified %code]],
-                   [["%code ]$1["]])[ blocks.]])
-b4_user_code([m4_indir(b4_macro_name)])
-])dnl
+[b4_comment(m4_if([$#], [0], [[[Unqualified %code blocks.]]],
+                  [[["%code ]$1[" blocks.]]]))
+b4_user_code([m4_indir(b4_macro_name)])])dnl
 m4_popdef([b4_macro_name])])
 
 # b4_percent_code_ifdef(QUALIFIER, IF-TRUE, [IF-FALSE])
@@ -995,6 +1001,7 @@ m4_define([b4_percent_code_ifdef],
 # b4_parse_trace_if([IF-DEBUG-TRACES-ARE-ENABLED], [IF-NOT])
 # b4_token_ctor_if([IF-YYLEX-RETURNS-A-TOKEN], [IF-NOT])
 # ----------------------------------------------------------
+b4_percent_define_if_define([api.token.raw])
 b4_percent_define_if_define([token_ctor], [api.token.constructor])
 b4_percent_define_if_define([locations])     # Whether locations are tracked.
 b4_percent_define_if_define([parse.assert])
@@ -1071,10 +1078,10 @@ m4_define_default([b4_location_initial_line],   [1])
 ## Sanity checks.  ##
 ## --------------- ##
 
-# api.location.prefix={...} (Java and C++).
+# api.location.type={...} (C, C++ and Java).
 b4_percent_define_check_kind([api.location.type], [code], [deprecated])
 
-# api.position.prefix={...} (Java).
+# api.position.type={...} (Java).
 b4_percent_define_check_kind([api.position.type], [code], [deprecated])
 
 # api.prefix >< %name-prefix.
diff --git a/contrib/tools/bison/data/skeletons/c++-skel.m4 b/contrib/tools/bison/data/skeletons/c++-skel.m4
index 1c3721cdbbb9..6d3becf5e6e7 100644
--- a/contrib/tools/bison/data/skeletons/c++-skel.m4
+++ b/contrib/tools/bison/data/skeletons/c++-skel.m4
@@ -2,7 +2,7 @@
 
 # C++ skeleton dispatching for Bison.
 
-# Copyright (C) 2006-2007, 2009-2015, 2018-2019 Free Software
+# Copyright (C) 2006-2007, 2009-2015, 2018-2020 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/data/skeletons/c++.m4 b/contrib/tools/bison/data/skeletons/c++.m4
index 35008f374515..c52f034c5682 100644
--- a/contrib/tools/bison/data/skeletons/c++.m4
+++ b/contrib/tools/bison/data/skeletons/c++.m4
@@ -2,7 +2,7 @@
 
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2019 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -147,13 +147,13 @@ m4_if(m4_bregexp(b4_namespace_ref, [::[	 ]*$]), [-1], [],
                 [[namespace reference has a trailing "::"]])])
 
 m4_define([b4_namespace_open],
-[b4_user_code([b4_percent_define_get_syncline([[api.namespace]])
+[b4_user_code([b4_percent_define_get_syncline([[api.namespace]])dnl
 [namespace ]m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref),
                                                 [^\(.\)[	 ]*::], [\1])),
                          [::], [ { namespace ])[ {]])])
 
 m4_define([b4_namespace_close],
-[b4_user_code([b4_percent_define_get_syncline([[api.namespace]])
+[b4_user_code([b4_percent_define_get_syncline([[api.namespace]])dnl
 m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]),
                                     [^\(.\)[	 ]*\(::\)?\([^][:]\|:[^:]\)*],
                                     [\1])),
@@ -194,7 +194,7 @@ m4_define([b4_value_type_declare],
 [union\|union-directive],
 [[    union semantic_type
     {
-    ]b4_user_union_members[
+]b4_user_union_members[
     };]])])dnl
 ])
 
@@ -367,9 +367,6 @@ m4_define([b4_symbol_type_define],
       /// \a empty when empty.
       symbol_number_type type_get () const YY_NOEXCEPT;
 
-      /// The token.
-      token_type token () const YY_NOEXCEPT;
-
       /// The symbol type.
       /// \a empty_symbol when empty.
       /// An int, not token_number_type, to be able to store empty_symbol.
@@ -498,22 +495,7 @@ m4_define([b4_public_types_define],
   {
     return type;
   }
-]b4_token_ctor_if([[
-  ]b4_inline([$1])b4_parser_class[::token_type
-  ]b4_parser_class[::by_type::token () const YY_NOEXCEPT
-  {
-    // YYTOKNUM[NUM] -- (External) token number corresponding to the
-    // (internal) symbol number NUM (which must be that of a token).  */
-    static
-    const ]b4_int_type_for([b4_toknum])[
-    yytoken_number_[] =
-    {
-  ]b4_toknum[
-    };
-    return token_type (yytoken_number_[type]);
-  }
-]])[]dnl
-])
+]])
 
 
 # b4_token_constructor_define
@@ -529,10 +511,11 @@ m4_define([b4_token_constructor_define], [])
 # sometimes in the cc file.
 m4_define([b4_yytranslate_define],
 [  b4_inline([$1])b4_parser_class[::token_number_type
-  ]b4_parser_class[::yytranslate_ (]b4_token_ctor_if([token_type],
-                                                          [int])[ t)
+  ]b4_parser_class[::yytranslate_ (int t)
   {
-    // YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to
+]b4_api_token_raw_if(
+[[    return static_cast<token_number_type> (t);]],
+[[    // YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to
     // TOKEN-NUM as returned by yylex.
     static
     const token_number_type
@@ -540,15 +523,14 @@ m4_define([b4_yytranslate_define],
     {
   ]b4_translate[
     };
-    const unsigned user_token_number_max_ = ]b4_user_token_number_max[;
-    const token_number_type undef_token_ = ]b4_undef_token_number[;
+    const int user_token_number_max_ = ]b4_user_token_number_max[;
 
-    if (static_cast<int> (t) <= yyeof_)
+    if (t <= 0)
       return yyeof_;
-    else if (static_cast<unsigned> (t) <= user_token_number_max_)
+    else if (t <= user_token_number_max_)
       return translate_table[t];
     else
-      return undef_token_;
+      return yy_undef_token_;]])[
   }
 ]])
 
diff --git a/contrib/tools/bison/data/skeletons/c-like.m4 b/contrib/tools/bison/data/skeletons/c-like.m4
index 8d891b67ef97..e0460d4834a9 100644
--- a/contrib/tools/bison/data/skeletons/c-like.m4
+++ b/contrib/tools/bison/data/skeletons/c-like.m4
@@ -2,7 +2,7 @@
 
 # Common code for C-like languages (C, C++, Java, etc.)
 
-# Copyright (C) 2012-2015, 2018-2019 Free Software Foundation, Inc.
+# Copyright (C) 2012-2015, 2018-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/data/skeletons/c-skel.m4 b/contrib/tools/bison/data/skeletons/c-skel.m4
index 2a21cfc7d0d5..68d057cb7422 100644
--- a/contrib/tools/bison/data/skeletons/c-skel.m4
+++ b/contrib/tools/bison/data/skeletons/c-skel.m4
@@ -2,7 +2,7 @@
 
 # C skeleton dispatching for Bison.
 
-# Copyright (C) 2006-2007, 2009-2015, 2018-2019 Free Software
+# Copyright (C) 2006-2007, 2009-2015, 2018-2020 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/data/skeletons/c.m4 b/contrib/tools/bison/data/skeletons/c.m4
index 3cde04a9571b..0987ef777a66 100644
--- a/contrib/tools/bison/data/skeletons/c.m4
+++ b/contrib/tools/bison/data/skeletons/c.m4
@@ -2,7 +2,7 @@
 
 # C M4 Macros for Bison.
 
-# Copyright (C) 2002, 2004-2015, 2018-2019 Free Software Foundation,
+# Copyright (C) 2002, 2004-2015, 2018-2020 Free Software Foundation,
 # Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -167,38 +167,110 @@ b4_parse_param_for([Decl], [Formal], [  YYUSE (Formal);
 
 # b4_int_type(MIN, MAX)
 # ---------------------
-# Return the smallest int type able to handle numbers ranging from
-# MIN to MAX (included).
+# Return a narrow int type able to handle integers ranging from MIN
+# to MAX (included) in portable C code.  Assume MIN and MAX fall in
+# 'int' range.
 m4_define([b4_int_type],
-[m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
-       b4_ints_in($@,   [-128],   [127]), [1], [signed char],
+[m4_if(b4_ints_in($@,   [-127],   [127]), [1], [signed char],
+       b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
 
+       b4_ints_in($@, [-32767], [32767]), [1], [short],
        b4_ints_in($@,      [0], [65535]), [1], [unsigned short],
-       b4_ints_in($@, [-32768], [32767]), [1], [short],
 
-       m4_eval([0 <= $1]),                [1], [unsigned],
+                                               [int])])
+
+# b4_c99_int_type(MIN, MAX)
+# -------------------------
+# Like b4_int_type, but for C99.
+# b4_c99_int_type_define replaces b4_int_type with this.
+m4_define([b4_c99_int_type],
+[m4_if(b4_ints_in($@,   [-127],   [127]), [1], [yytype_int8],
+       b4_ints_in($@,      [0],   [255]), [1], [yytype_uint8],
+
+       b4_ints_in($@, [-32767], [32767]), [1], [yytype_int16],
+       b4_ints_in($@,      [0], [65535]), [1], [yytype_uint16],
 
                                                [int])])
 
+# b4_c99_int_type_define
+# ----------------------
+# Define private types suitable for holding small integers in C99 or later.
+m4_define([b4_c99_int_type_define],
+[m4_copy_force([b4_c99_int_type], [b4_int_type])dnl
+[/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure
+   <limits.h> and (if available) <stdint.h> are included
+   so that the code can choose integer types of a good width.  */
+
+#ifndef __PTRDIFF_MAX__
+# include <limits.h> /* INFRINGES ON USER NAME SPACE */
+# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+#  include <stdint.h> /* INFRINGES ON USER NAME SPACE */
+#  define YY_STDINT_H
+# endif
+#endif
+
+/* Narrow types that promote to a signed type and that can represent a
+   signed or unsigned integer of at least N bits.  In tables they can
+   save space and decrease cache pressure.  Promoting to a signed type
+   helps avoid bugs in integer arithmetic.  */
+
+#ifdef __INT_LEAST8_MAX__
+typedef __INT_LEAST8_TYPE__ yytype_int8;
+#elif defined YY_STDINT_H
+typedef int_least8_t yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef __INT_LEAST16_MAX__
+typedef __INT_LEAST16_TYPE__ yytype_int16;
+#elif defined YY_STDINT_H
+typedef int_least16_t yytype_int16;
+#else
+typedef short yytype_int16;
+#endif
+
+#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
+typedef __UINT_LEAST8_TYPE__ yytype_uint8;
+#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST8_MAX <= INT_MAX)
+typedef uint_least8_t yytype_uint8;
+#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX
+typedef unsigned char yytype_uint8;
+#else
+typedef short yytype_uint8;
+#endif
+
+#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__
+typedef __UINT_LEAST16_TYPE__ yytype_uint16;
+#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST16_MAX <= INT_MAX)
+typedef uint_least16_t yytype_uint16;
+#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX
+typedef unsigned short yytype_uint16;
+#else
+typedef int yytype_uint16;
+#endif]])
+
 
 # b4_int_type_for(NAME)
 # ---------------------
-# Return the smallest int type able to handle numbers ranging from
+# Return a narrow int type able to handle numbers ranging from
 # 'NAME_min' to 'NAME_max' (included).
 m4_define([b4_int_type_for],
 [b4_int_type($1_min, $1_max)])
 
 
-# b4_table_value_equals(TABLE, VALUE, LITERAL)
-# --------------------------------------------
+# b4_table_value_equals(TABLE, VALUE, LITERAL, SYMBOL)
+# ----------------------------------------------------
 # Without inducing a comparison warning from the compiler, check if the
 # literal value LITERAL equals VALUE from table TABLE, which must have
-# TABLE_min and TABLE_max defined.
+# TABLE_min and TABLE_max defined.  SYMBOL denotes
 m4_define([b4_table_value_equals],
 [m4_if(m4_eval($3 < m4_indir([b4_]$1[_min])
                || m4_indir([b4_]$1[_max]) < $3), [1],
        [[0]],
-       [(!!(($2) == ($3)))])])
+       [(($2) == $4)])])
 
 
 ## ----------------- ##
@@ -210,37 +282,39 @@ m4_define([b4_table_value_equals],
 # Provide portable compiler "attributes".  If "noreturn" is passed, define
 # _Noreturn.
 m4_define([b4_attribute_define],
-[[#ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+[[#ifndef YY_ATTRIBUTE_PURE
+# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
 # else
-#  define YY_ATTRIBUTE(Spec) /* empty */
+#  define YY_ATTRIBUTE_PURE
 # endif
 #endif
 
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-
 #ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# else
+#  define YY_ATTRIBUTE_UNUSED
+# endif
 #endif
 
 ]m4_bmatch([$1], [\bnoreturn\b], [[/* The _Noreturn keyword of C11.  */
-#if ! defined _Noreturn
-# if defined __cplusplus && 201103L <= __cplusplus
+]dnl This is an exact copy of lib/_Noreturn.h.
+[#ifndef _Noreturn
+# if (defined __cplusplus \
+      && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
+          || (defined _MSC_VER && 1900 <= _MSC_VER)))
 #  define _Noreturn [[noreturn]]
-# elif !(defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)
-#  if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-       || 0x5110 <= __SUNPRO_C)
-#   define _Noreturn __attribute__ ((__noreturn__))
-#  elif defined _MSC_VER && 1200 <= _MSC_VER
-#   define _Noreturn __declspec (noreturn)
-#  else
-#   define _Noreturn
-#  endif
+# elif ((!defined __cplusplus || defined __clang__) \
+        && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0)  \
+            || 4 < __GNUC__ + (7 <= __GNUC_MINOR__)))
+   /* _Noreturn works as-is.  */
+# elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
+#  define _Noreturn __attribute__ ((__noreturn__))
+# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0)
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn
 # endif
 #endif
 
@@ -253,11 +327,11 @@ m4_define([b4_attribute_define],
 
 #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
 # define YY_INITIAL_VALUE(Value) Value
@@ -269,9 +343,36 @@ m4_define([b4_attribute_define],
 #ifndef YY_INITIAL_VALUE
 # define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
+
+#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
+# define YY_IGNORE_USELESS_CAST_BEGIN                          \
+    _Pragma ("GCC diagnostic push")                            \
+    _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
+# define YY_IGNORE_USELESS_CAST_END            \
+    _Pragma ("GCC diagnostic pop")
+#endif
+#ifndef YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_END
+#endif
 ]])
 
 
+# b4_cast_define
+# --------------
+m4_define([b4_cast_define],
+[# ifndef YY_CAST
+#  ifdef __cplusplus
+#   define YY_CAST(Type, Val) static_cast<Type> (Val)
+#   define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
+#  else
+#   define YY_CAST(Type, Val) ((Type) (Val))
+#   define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
+#  endif
+# endif[]dnl
+])
+
+
 # b4_null_define
 # --------------
 # Portability issues: define a YY_NULLPTR appropriate for the current
@@ -470,7 +571,7 @@ m4_define([b4_sync_start], [[#]line $1 $2])
 m4_define([b4_case],
 [  case $1:
 $2
-b4_syncline([@oline@], [@ofile@])
+b4_syncline([@oline@], [@ofile@])dnl
     break;])
 
 
@@ -480,7 +581,7 @@ m4_define([b4_predicate_case],
 [  case $1:
     if (! (
 $2)) YYERROR;
-b4_syncline([@oline@], [@ofile@])
+b4_syncline([@oline@], [@ofile@])dnl
     break;])
 
 
@@ -540,8 +641,12 @@ m4_if(b4_skeleton, ["yacc.c"],
     YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
 ]])dnl
-  b4_symbol_actions([printer])[
-}
+b4_percent_code_get([[pre-printer]])dnl
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  b4_symbol_actions([printer])
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+b4_percent_code_get([[post-printer]])dnl
+[}
 
 
 /*---------------------------.
@@ -709,13 +814,13 @@ typedef ]b4_percent_define_get([[api.value.type]])[ ]b4_api_PREFIX[STYPE;
 [m4_bmatch(b4_percent_define_get([[api.value.type]]),
 [union\|union-directive],
 [[#if ! defined ]b4_api_PREFIX[STYPE && ! defined ]b4_api_PREFIX[STYPE_IS_DECLARED
-]b4_percent_define_get_syncline([[api.value.union.name]])[
-union ]b4_percent_define_get([[api.value.union.name]])[
+]b4_percent_define_get_syncline([[api.value.union.name]])dnl
+[union ]b4_percent_define_get([[api.value.union.name]])[
 {
 ]b4_user_union_members[
 };
-]b4_percent_define_get_syncline([[api.value.union.name]])[
-typedef union ]b4_percent_define_get([[api.value.union.name]])[ ]b4_api_PREFIX[STYPE;
+]b4_percent_define_get_syncline([[api.value.union.name]])dnl
+[typedef union ]b4_percent_define_get([[api.value.union.name]])[ ]b4_api_PREFIX[STYPE;
 # define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1
 # define ]b4_api_PREFIX[STYPE_IS_DECLARED 1
 #endif
@@ -726,7 +831,10 @@ typedef union ]b4_percent_define_get([[api.value.union.name]])[ ]b4_api_PREFIX[S
 # -----------------------
 m4_define([b4_location_type_define],
 [[/* Location type.  */
-#if ! defined ]b4_api_PREFIX[LTYPE && ! defined ]b4_api_PREFIX[LTYPE_IS_DECLARED
+]b4_percent_define_ifdef([[api.location.type]],
+[[typedef ]b4_percent_define_get([[api.location.type]])[ ]b4_api_PREFIX[LTYPE;
+]],
+[[#if ! defined ]b4_api_PREFIX[LTYPE && ! defined ]b4_api_PREFIX[LTYPE_IS_DECLARED
 typedef struct ]b4_api_PREFIX[LTYPE ]b4_api_PREFIX[LTYPE;
 struct ]b4_api_PREFIX[LTYPE
 {
@@ -738,7 +846,7 @@ struct ]b4_api_PREFIX[LTYPE
 # define ]b4_api_PREFIX[LTYPE_IS_DECLARED 1
 # define ]b4_api_PREFIX[LTYPE_IS_TRIVIAL 1
 #endif
-]])
+]])])
 
 
 # b4_declare_yylstype
diff --git a/contrib/tools/bison/data/skeletons/glr.cc b/contrib/tools/bison/data/skeletons/glr.cc
index 562173416307..887b6146b4cf 100644
--- a/contrib/tools/bison/data/skeletons/glr.cc
+++ b/contrib/tools/bison/data/skeletons/glr.cc
@@ -1,6 +1,6 @@
 # C++ GLR skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -100,8 +100,8 @@ m4_defn([b4_initial_action])]))])[
 
 # Hijack the post prologue to declare yyerror.
 ]m4_append([b4_post_prologue],
-[b4_syncline([@oline@], [@ofile@])[
-]b4_function_declare([yyerror],
+[b4_syncline([@oline@], [@ofile@])dnl
+b4_function_declare([yyerror],
     [static void],b4_locations_if([
     [[const ]b4_namespace_ref::b4_parser_class[::location_type *yylocationp],
                         [yylocationp]],])
@@ -128,8 +128,8 @@ m4_if(b4_prefix, [yy], [],
 # Hijack the epilogue to define implementations (yyerror, parser member
 # functions etc.).
 m4_append([b4_epilogue],
-[b4_syncline([@oline@], [@ofile@])[
-
+[b4_syncline([@oline@], [@ofile@])dnl
+[
 /*------------------.
 | Report an error.  |
 `------------------*/
@@ -234,7 +234,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 
 #endif
 ]m4_popdef([b4_parse_param])dnl
-b4_namespace_close
+b4_namespace_close[]dnl
 ])
 
 
@@ -257,6 +257,21 @@ b4_percent_code_get([[requires]])[
 ]b4_attribute_define[
 ]b4_null_define[
 
+// This skeleton is based on C, yet compiles it as C++.
+// So expect warnings about C style casts.
+#if defined __clang__ && 306 <= __clang_major__ * 100 + __clang_minor__
+# pragma clang diagnostic ignored "-Wold-style-cast"
+#elif defined __GNUC__ && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
+# pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
+// On MacOS, PTRDIFF_MAX is defined as long long, which Clang's
+// -pedantic reports as being a C++11 extension.
+#if defined __APPLE__ && YY_CPLUSPLUS < 201103L \
+    && defined __clang__ && 4 <= __clang_major__
+# pragma clang diagnostic ignored "-Wc++11-long-long"
+#endif
+
 // Whether we are compiled with exception support.
 #ifndef YY_EXCEPTIONS
 # if defined __GNUC__ && !defined __EXCEPTIONS
@@ -351,15 +366,15 @@ b4_percent_define_flag_if([[global_tokens_and_yystype]],
 ])
 
 b4_defines_if(
-[b4_output_begin([b4_spec_defines_file])
+[b4_output_begin([b4_spec_header_file])
 b4_copyright([Skeleton interface for Bison GLR parsers in C++],
-             [2002-2015, 2018-2019])[
+             [2002-2015, 2018-2020])[
 // C++ GLR parser skeleton written by Akim Demaille.
 
 ]b4_disclaimer[
-]b4_cpp_guard_open([b4_spec_defines_file])[
+]b4_cpp_guard_open([b4_spec_header_file])[
 ]b4_shared_declarations[
-]b4_cpp_guard_close([b4_spec_defines_file])[
+]b4_cpp_guard_close([b4_spec_header_file])[
 ]b4_output_end])
 
 # Let glr.c (and b4_shared_declarations) believe that the user
diff --git a/contrib/tools/bison/data/skeletons/lalr1.cc b/contrib/tools/bison/data/skeletons/lalr1.cc
index 09f4259f2868..dc674a2d60eb 100644
--- a/contrib/tools/bison/data/skeletons/lalr1.cc
+++ b/contrib/tools/bison/data/skeletons/lalr1.cc
@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,14 +20,23 @@ m4_include(b4_skeletonsdir/[c++.m4])
 # api.value.type=variant is valid.
 m4_define([b4_value_type_setup_variant])
 
+# Check the value of %define parse.lac, where LAC stands for lookahead
+# correction.
+b4_percent_define_default([[parse.lac]], [[none]])
+b4_percent_define_check_values([[[[parse.lac]], [[full]], [[none]]]])
+b4_define_flag_if([lac])
+m4_define([b4_lac_flag],
+          [m4_if(b4_percent_define_get([[parse.lac]]),
+                 [none], [[0]], [[1]])])
+
 
 # b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT)
 # --------------------------------------------------------------
 # Declare "parser::yy<TABLE-NAME>_" whose contents is CONTENT.
 m4_define([b4_integral_parser_table_declare],
-[m4_ifval([$3], [b4_comment([$3], [  ])
+[m4_ifval([$3], [b4_comment([$3], [    ])
 ])dnl
-  static const b4_int_type_for([$2]) yy$1_[[]];dnl
+    static const b4_int_type_for([$2]) yy$1_[[]];dnl
 ])
 
 # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
@@ -111,9 +120,9 @@ b4_dollar_pushdef([yysym.value],
                   [],
                   [yysym.location])dnl
       _b4_symbol_case([$1])[]dnl
-b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])
+b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])dnl
         b4_symbol([$1], [$2])
-b4_syncline([@oline@], [@ofile@])
+b4_syncline([@oline@], [@ofile@])dnl
         break;
 
 m4_popdef([b4_symbol_value])[]dnl
@@ -135,7 +144,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param))])])
 
 
 m4_pushdef([b4_copyright_years],
-           [2002-2015, 2018-2019])
+           [2002-2015, 2018-2020])
 
 m4_define([b4_parser_class],
           [b4_percent_define_get([[api.parser.class]])])
@@ -166,6 +175,7 @@ m4_define([b4_shared_declarations],
 ]b4_variant_if([b4_variant_includes])[
 
 ]b4_attribute_define[
+]b4_cast_define[
 ]b4_null_define[
 
 ]b4_YYDEBUG_define[
@@ -220,10 +230,21 @@ m4_define([b4_shared_declarations],
   private:
     /// This class is not copyable.
     ]b4_parser_class[ (const ]b4_parser_class[&);
-    ]b4_parser_class[& operator= (const ]b4_parser_class[&);
-
-    /// State numbers.
-    typedef int state_type;
+    ]b4_parser_class[& operator= (const ]b4_parser_class[&);]b4_lac_if([[
+
+    /// Check the lookahead yytoken.
+    /// \returns  true iff the token will be eventually shifted.
+    bool yy_lac_check_ (int yytoken) const;
+    /// Establish the initial context if no initial context currently exists.
+    /// \returns  true iff the token will be eventually shifted.
+    bool yy_lac_establish_ (int yytoken);
+    /// Discard any previous initial lookahead context because of event.
+    /// \param event  the event which caused the lookahead to be discarded.
+    ///               Only used for debbuging output.
+    void yy_lac_discard_ (const char* event);]])[
+
+    /// Stored state numbers (used for stacks).
+    typedef ]b4_int_type(0, m4_eval(b4_states_number - 1))[ state_type;
 
     /// Generate an error message.
     /// \param yystate   the state where the error occurred.
@@ -234,7 +255,7 @@ m4_define([b4_shared_declarations],
     /// Compute post-reduction state.
     /// \param yystate   the current state
     /// \param yysym     the nonterminal to push on the stack
-    state_type yy_lr_goto_state_ (state_type yystate, int yysym);
+    static state_type yy_lr_goto_state_ (state_type yystate, int yysym);
 
     /// Whether the given \c yypact_ value indicates a defaulted state.
     /// \param yyvalue   the value to check
@@ -248,7 +269,9 @@ m4_define([b4_shared_declarations],
     static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_ninf_;
 
     /// Convert a scanner token number \a t to a symbol number.
-    static token_number_type yytranslate_ (]b4_token_ctor_if([token_type], [int])[ t);
+    /// In theory \a t should be a token_type, but character literals
+    /// are valid, yet not members of the token_type enum.
+    static token_number_type yytranslate_ (int t);
 
     // Tables.
 ]b4_parser_tables_declare[]b4_error_verbose_if([
@@ -313,7 +336,8 @@ m4_define([b4_shared_declarations],
       symbol_number_type type_get () const YY_NOEXCEPT;
 
       /// The state number used to denote an empty symbol.
-      enum { empty_state = -1 };
+      /// We use the initial state, as it does not have a value.
+      enum { empty_state = 0 };
 
       /// The state.
       /// \a empty when empty.
@@ -335,6 +359,10 @@ m4_define([b4_shared_declarations],
       /// Assignment, needed by push_back by some old implementations.
       /// Moves the contents of that.
       stack_symbol_type& operator= (stack_symbol_type& that);
+
+      /// Assignment, needed by push_back by other implementations.
+      /// Needed by some other old implementations.
+      stack_symbol_type& operator= (const stack_symbol_type& that);
 #endif
     };
 
@@ -344,7 +372,16 @@ m4_define([b4_shared_declarations],
     typedef stack<stack_symbol_type> stack_type;
 
     /// The stack.
-    stack_type yystack_;
+    stack_type yystack_;]b4_lac_if([[
+    /// The stack for LAC.
+    /// Logically, the yy_lac_stack's lifetime is confined to the function
+    /// yy_lac_check_. We just store it as a member of this class to hold
+    /// on to the memory and to avoid frequent reallocations.
+    /// Since yy_lac_check_ is const, this member must be mutable.
+    mutable std::vector<state_type> yylac_stack_;
+    /// Whether an initial LAC context was established.
+    bool yy_lac_established_;
+]])[
 
     /// Push a new state on the stack.
     /// \param m    a debug message to display
@@ -364,6 +401,10 @@ m4_define([b4_shared_declarations],
     /// Pop \a n symbols from the stack.
     void yypop_ (int n = 1);
 
+    /// Some specific tokens.
+    static const token_number_type yy_error_token_ = 1;
+    static const token_number_type yy_undef_token_ = ]b4_undef_token_number[;
+
     /// Constants.
     enum
     {
@@ -371,8 +412,6 @@ m4_define([b4_shared_declarations],
       yylast_ = ]b4_last[,     ///< Last index in yytable_.
       yynnts_ = ]b4_nterms_number[,  ///< Number of nonterminal symbols.
       yyfinal_ = ]b4_final_state_number[, ///< Termination state number.
-      yyterror_ = 1,
-      yyerrcode_ = 256,
       yyntokens_ = ]b4_tokens_number[  ///< Number of tokens.
     };
 
@@ -399,22 +438,22 @@ m4_define([b4_shared_declarations],
 ## -------------- ##
 
 b4_defines_if(
-[b4_output_begin([b4_spec_defines_file])
+[b4_output_begin([b4_spec_header_file])
 b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++])
 [
 /**
- ** \file ]b4_spec_defines_file[
+ ** \file ]b4_spec_header_file[
  ** Define the ]b4_namespace_ref[::parser class.
  */
 
 // C++ LALR(1) parser skeleton written by Akim Demaille.
 
 ]b4_disclaimer[
-]b4_cpp_guard_open([b4_spec_defines_file])[
+]b4_cpp_guard_open([b4_spec_header_file])[
 ]b4_shared_declarations(hh)[
-]b4_cpp_guard_close([b4_spec_defines_file])
-b4_output_end
-])
+]b4_cpp_guard_close([b4_spec_header_file])[
+]b4_output_end[
+]])
 
 
 b4_output_begin([b4_parser_file_name])[
@@ -428,7 +467,7 @@ m4_if(b4_prefix, [yy], [],
 
 ]b4_user_pre_prologue[
 
-]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
+]b4_defines_if([[#include "@basename(]b4_spec_header_file[@)"]],
                [b4_shared_declarations([cc])])[
 
 ]b4_user_post_prologue[
@@ -459,9 +498,6 @@ m4_if(b4_prefix, [yy], [],
 [#define YYRHSLOC(Rhs, K) ((Rhs)[K].location)
 ]b4_yylloc_default_define])[
 
-// Suppress unused-variable warnings by "using" E.
-#define YYUSE(E) ((void) (E))
-
 // Enable debugging if requested.
 #if ]b4_api_PREFIX[DEBUG
 
@@ -551,12 +587,14 @@ m4_if(b4_prefix, [yy], [],
 ]])[
 
   /// Build a parser object.
-  ]b4_parser_class::b4_parser_class[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [
-    :])[
+  ]b4_parser_class::b4_parser_class[ (]b4_parse_param_decl[)
 #if ]b4_api_PREFIX[DEBUG
-    ]m4_ifset([b4_parse_param], [  ], [ :])[yydebug_ (false),
-      yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[
-#endif]b4_parse_param_cons[
+    : yydebug_ (false),
+      yycdebug_ (&std::cerr)]b4_lac_if([,], [m4_ifset([b4_parse_param], [,])])[
+#else
+]b4_lac_if([    :], [m4_ifset([b4_parse_param], [    :])])[
+#endif]b4_lac_if([[
+      yy_lac_established_ (false)]m4_ifset([b4_parse_param], [,])])[]b4_parse_param_cons[
   {}
 
   ]b4_parser_class::~b4_parser_class[ ()
@@ -603,7 +641,7 @@ m4_if(b4_prefix, [yy], [],
     if (state == empty_state)
       return empty_symbol;
     else
-      return yystos_[state];
+      return yystos_[+state];
   }
 
   ]b4_parser_class[::stack_symbol_type::stack_symbol_type ()
@@ -630,6 +668,17 @@ m4_if(b4_prefix, [yy], [],
   }
 
 #if YY_CPLUSPLUS < 201103L
+  ]b4_parser_class[::stack_symbol_type&
+  ]b4_parser_class[::stack_symbol_type::operator= (const stack_symbol_type& that)
+  {
+    state = that.state;
+    ]b4_variant_if([b4_symbol_variant([that.type_get ()],
+                                      [value], [copy], [that.value])],
+                   [[value = that.value;]])[]b4_locations_if([
+    location = that.location;])[
+    return *this;
+  }
+
   ]b4_parser_class[::stack_symbol_type&
   ]b4_parser_class[::stack_symbol_type::operator= (stack_symbol_type& that)
   {
@@ -761,7 +810,6 @@ m4_if(b4_prefix, [yy], [],
   int
   ]b4_parser_class[::parse ()
   {
-    // State.
     int yyn;
     /// Length of the RHS of the rule being reduced.
     int yylen = 0;
@@ -777,7 +825,11 @@ m4_if(b4_prefix, [yy], [],
     stack_symbol_type yyerror_range[3];]])[
 
     /// The return value of parse ().
-    int yyresult;
+    int yyresult;]b4_lac_if([[
+
+    /// Discard the LAC context in case there still is one left from a
+    /// previous invocation.
+    yy_lac_discard_ ("init");]])[
 
 #if YY_EXCEPTIONS
     try
@@ -801,7 +853,7 @@ b4_dollar_popdef])[]dnl
   | yynewstate -- push a new symbol on the stack.  |
   `-----------------------------------------------*/
   yynewstate:
-    YYCDEBUG << "Entering state " << yystack_[0].state << '\n';
+    YYCDEBUG << "Entering state " << int (yystack_[0].state) << '\n';
 
     // Accept?
     if (yystack_[0].state == yyfinal_)
@@ -815,7 +867,7 @@ b4_dollar_popdef])[]dnl
   `-----------*/
   yybackup:
     // Try to take a decision without lookahead.
-    yyn = yypact_[yystack_[0].state];
+    yyn = yypact_[+yystack_[0].state];
     if (yy_pact_value_is_default_ (yyn))
       goto yydefault;
 
@@ -846,14 +898,21 @@ b4_dollar_popdef])[]dnl
        to detect an error, take that action.  */
     yyn += yyla.type_get ();
     if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yyla.type_get ())
-      goto yydefault;
+      {]b4_lac_if([[
+        if (!yy_lac_establish_ (yyla.type_get ()))
+           goto yyerrlab;]])[
+        goto yydefault;
+      }
 
     // Reduce or error.
     yyn = yytable_[yyn];
     if (yyn <= 0)
       {
         if (yy_table_value_is_error_ (yyn))
-          goto yyerrlab;
+          goto yyerrlab;]b4_lac_if([[
+        if (!yy_lac_establish_ (yyla.type_get ()))
+           goto yyerrlab;
+]])[
         yyn = -yyn;
         goto yyreduce;
       }
@@ -863,7 +922,8 @@ b4_dollar_popdef])[]dnl
       --yyerrstatus_;
 
     // Shift the lookahead token.
-    yypush_ ("Shifting", yyn, YY_MOVE (yyla));
+    yypush_ ("Shifting", state_type (yyn), YY_MOVE (yyla));]b4_lac_if([[
+    yy_lac_discard_ ("shift");]])[
     goto yynewstate;
 
 
@@ -871,7 +931,7 @@ b4_dollar_popdef])[]dnl
   | yydefault -- do the default action for the current state.  |
   `-----------------------------------------------------------*/
   yydefault:
-    yyn = yydefact_[yystack_[0].state];
+    yyn = yydefact_[+yystack_[0].state];
     if (yyn == 0)
       goto yyerrlab;
     goto yyreduce;
@@ -998,11 +1058,11 @@ b4_dollar_popdef])[]dnl
       stack_symbol_type error_token;
       for (;;)
         {
-          yyn = yypact_[yystack_[0].state];
+          yyn = yypact_[+yystack_[0].state];
           if (!yy_pact_value_is_default_ (yyn))
             {
-              yyn += yyterror_;
-              if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)
+              yyn += yy_error_token_;
+              if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yy_error_token_)
                 {
                   yyn = yytable_[yyn];
                   if (0 < yyn)
@@ -1023,8 +1083,9 @@ b4_dollar_popdef])[]dnl
       yyerror_range[2].location = yyla.location;
       YYLLOC_DEFAULT (error_token.location, yyerror_range, 2);]])[
 
-      // Shift the error token.
-      error_token.state = yyn;
+      // Shift the error token.]b4_lac_if([[
+      yy_lac_discard_ ("error recovery");]])[
+      error_token.state = state_type (yyn);
       yypush_ ("Shifting", YY_MOVE (error_token));
     }
     goto yynewstate;
@@ -1088,8 +1149,147 @@ b4_dollar_popdef])[]dnl
   {
     error (]b4_join(b4_locations_if([yyexc.location]),
                     [[yyexc.what ()]])[);
+  }]b4_lac_if([[
+
+  bool
+  ]b4_parser_class[::yy_lac_check_ (int yytoken) const
+  {
+    // Logically, the yylac_stack's lifetime is confined to this function.
+    // Clear it, to get rid of potential left-overs from previous call.
+    yylac_stack_.clear ();
+    // Reduce until we encounter a shift and thereby accept the token.
+#if ]b4_api_PREFIX[DEBUG
+    YYCDEBUG << "LAC: checking lookahead " << yytname_[yytoken] << ':';
+#endif
+    std::ptrdiff_t lac_top = 0;
+    while (true)
+      {
+        state_type top_state = (yylac_stack_.empty ()
+                                ? yystack_[lac_top].state
+                                : yylac_stack_.back ());
+        int yyrule = yypact_[+top_state];
+        if (yy_pact_value_is_default_ (yyrule)
+            || (yyrule += yytoken) < 0 || yylast_ < yyrule
+            || yycheck_[yyrule] != yytoken)
+          {
+            // Use the default action.
+            yyrule = yydefact_[+top_state];
+            if (yyrule == 0)
+              {
+                YYCDEBUG << " Err\n";
+                return false;
+              }
+          }
+        else
+          {
+            // Use the action from yytable.
+            yyrule = yytable_[yyrule];
+            if (yy_table_value_is_error_ (yyrule))
+              {
+                YYCDEBUG << " Err\n";
+                return false;
+              }
+            if (0 < yyrule)
+              {
+                YYCDEBUG << " S" << yyrule << '\n';
+                return true;
+              }
+            yyrule = -yyrule;
+          }
+        // By now we know we have to simulate a reduce.
+        YYCDEBUG << " R" << yyrule - 1;
+        // Pop the corresponding number of values from the stack.
+        {
+          std::ptrdiff_t yylen = yyr2_[yyrule];
+          // First pop from the LAC stack as many tokens as possible.
+          std::ptrdiff_t lac_size = std::ptrdiff_t (yylac_stack_.size ());
+          if (yylen < lac_size)
+            {
+              yylac_stack_.resize (std::size_t (lac_size - yylen));
+              yylen = 0;
+            }
+          else if (lac_size)
+            {
+              yylac_stack_.clear ();
+              yylen -= lac_size;
+            }
+          // Only afterwards look at the main stack.
+          // We simulate popping elements by incrementing lac_top.
+          lac_top += yylen;
+        }
+        // Keep top_state in sync with the updated stack.
+        top_state = (yylac_stack_.empty ()
+                     ? yystack_[lac_top].state
+                     : yylac_stack_.back ());
+        // Push the resulting state of the reduction.
+        state_type state = yy_lr_goto_state_ (top_state, yyr1_[yyrule]);
+        YYCDEBUG << " G" << state;
+        yylac_stack_.push_back (state);
+      }
   }
 
+  // Establish the initial context if no initial context currently exists.
+  bool
+  ]b4_parser_class[::yy_lac_establish_ (int yytoken)
+  {
+    /* Establish the initial context for the current lookahead if no initial
+       context is currently established.
+
+       We define a context as a snapshot of the parser stacks.  We define
+       the initial context for a lookahead as the context in which the
+       parser initially examines that lookahead in order to select a
+       syntactic action.  Thus, if the lookahead eventually proves
+       syntactically unacceptable (possibly in a later context reached via a
+       series of reductions), the initial context can be used to determine
+       the exact set of tokens that would be syntactically acceptable in the
+       lookahead's place.  Moreover, it is the context after which any
+       further semantic actions would be erroneous because they would be
+       determined by a syntactically unacceptable token.
+
+       yy_lac_establish_ should be invoked when a reduction is about to be
+       performed in an inconsistent state (which, for the purposes of LAC,
+       includes consistent states that don't know they're consistent because
+       their default reductions have been disabled).
+
+       For parse.lac=full, the implementation of yy_lac_establish_ is as
+       follows.  If no initial context is currently established for the
+       current lookahead, then check if that lookahead can eventually be
+       shifted if syntactic actions continue from the current context.  */
+    if (!yy_lac_established_)
+      {
+#if ]b4_api_PREFIX[DEBUG
+        YYCDEBUG << "LAC: initial context established for "
+                 << yytname_[yytoken] << '\n';
+#endif
+        yy_lac_established_ = true;
+        return yy_lac_check_ (yytoken);
+      }
+    return true;
+  }
+
+  // Discard any previous initial lookahead context.
+  void
+  ]b4_parser_class[::yy_lac_discard_ (const char* evt)
+  {
+   /* Discard any previous initial lookahead context because of Event,
+      which may be a lookahead change or an invalidation of the currently
+      established initial context for the current lookahead.
+
+      The most common example of a lookahead change is a shift.  An example
+      of both cases is syntax error recovery.  That is, a syntax error
+      occurs when the lookahead is syntactically erroneous for the
+      currently established initial context, so error recovery manipulates
+      the parser stacks to try to find a new initial context in which the
+      current lookahead is syntactically acceptable.  If it fails to find
+      such a context, it discards the lookahead.  */
+    if (yy_lac_established_)
+      {
+        YYCDEBUG << "LAC: initial context discarded due to "
+                 << evt << '\n';
+        yy_lac_established_ = false;
+      }
+  }]])[
+
   // Generate an error message.
   std::string
   ]b4_parser_class[::yysyntax_error_ (]dnl
@@ -1098,7 +1298,7 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
   {]b4_error_verbose_if([[
     // Number of reported tokens (one for the "unexpected", one per
     // "expected").
-    size_t yycount = 0;
+    std::ptrdiff_t yycount = 0;
     // Its maximum.
     enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
     // Arguments of yyformat.
@@ -1118,24 +1318,41 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
          a consistent state with a default action.  There might have
          been a previous inconsistent state, consistent state with a
          non-default action, or user semantic action that manipulated
-         yyla.  (However, yyla is currently not documented for users.)
+         yyla.  (However, yyla is currently not documented for users.)]b4_lac_if([[
+         In the first two cases, it might appear that the current syntax
+         error should have been detected in the previous state when
+         yy_lac_check was invoked.  However, at that time, there might
+         have been a different syntax error that discarded a different
+         initial context during error recovery, leaving behind the
+         current lookahead.]], [[
        - Of course, the expected token list depends on states to have
          correct lookahead information, and it depends on the parser not
          to perform extra reductions after fetching a lookahead from the
-         scanner and before detecting a syntax error.  Thus, state
-         merging (from LALR or IELR) and default reductions corrupt the
-         expected token list.  However, the list is correct for
-         canonical LR with one exception: it will still contain any
-         token that will not be accepted due to an error action in a
-         later state.
+         scanner and before detecting a syntax error.  Thus, state merging
+         (from LALR or IELR) and default reductions corrupt the expected
+         token list.  However, the list is correct for canonical LR with
+         one exception: it will still contain any token that will not be
+         accepted due to an error action in a later state.]])[
     */
     if (!yyla.empty ())
       {
-        int yytoken = yyla.type_get ();
-        yyarg[yycount++] = yytname_[yytoken];
-        int yyn = yypact_[yystate];
+        symbol_number_type yytoken = yyla.type_get ();
+        yyarg[yycount++] = yytname_[yytoken];]b4_lac_if([[
+
+#if ]b4_api_PREFIX[DEBUG
+        // Execute LAC once. We don't care if it is successful, we
+        // only do it for the sake of debugging output.
+        if (!yy_lac_established_)
+          yy_lac_check_ (yytoken);
+#endif]])[
+
+        int yyn = yypact_[+yystate];
         if (!yy_pact_value_is_default_ (yyn))
-          {
+          {]b4_lac_if([[
+            for (int yyx = 0; yyx < yyntokens_; ++yyx)
+              if (yyx != yy_error_token_ && yyx != yy_undef_token_
+                  && yy_lac_check_ (yyx))
+                {]], [[
             /* Start YYX at -YYN if negative to avoid negative indexes in
                YYCHECK.  In other words, skip the first -YYN actions for
                this state because they are default actions.  */
@@ -1144,9 +1361,9 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
             int yychecklim = yylast_ - yyn + 1;
             int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
             for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
-              if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_
+              if (yycheck_[yyx + yyn] == yyx && yyx != yy_error_token_
                   && !yy_table_value_is_error_ (yytable_[yyx + yyn]))
-                {
+                {]])[
                   if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
                     {
                       yycount = 1;
@@ -1177,7 +1394,7 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
 
     std::string yyres;
     // Argument number.
-    size_t yyi = 0;
+    std::ptrdiff_t yyi = 0;
     for (char const* yyp = yyformat; *yyp; ++yyp)
       if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount)
         {
@@ -1218,7 +1435,7 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
            i = yystack_.begin (),
            i_end = yystack_.end ();
          i != i_end; ++i)
-      *yycdebug_ << ' ' << i->state;
+      *yycdebug_ << ' ' << int (i->state);
     *yycdebug_ << '\n';
   }
 
@@ -1226,7 +1443,7 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
   void
   ]b4_parser_class[::yy_reduce_print_ (int yyrule)
   {
-    unsigned yylno = yyrline_[yyrule];
+    int yylno = yyrline_[yyrule];
     int yynrhs = yyr2_[yyrule];
     // Print the symbols being reduced, and their result.
     *yycdebug_ << "Reducing stack by rule " << yyrule - 1
diff --git a/contrib/tools/bison/data/skeletons/location.cc b/contrib/tools/bison/data/skeletons/location.cc
index a57c0fb67ad3..34db41881cbc 100644
--- a/contrib/tools/bison/data/skeletons/location.cc
+++ b/contrib/tools/bison/data/skeletons/location.cc
@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
-           [2002-2015, 2018-2019])
+           [2002-2015, 2018-2020])
 
 
 # b4_position_file
@@ -62,11 +62,14 @@ m4_define([b4_location_define],
 [[  /// A point in a source file.
   class position
   {
-  public:]m4_ifdef([b4_location_constructors], [[
+  public:
+    /// Type for line and column numbers.
+    typedef int counter_type;
+]m4_ifdef([b4_location_constructors], [[
     /// Construct a position.
     explicit position (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
-                       unsigned l = ]b4_location_initial_line[u,
-                       unsigned c = ]b4_location_initial_column[u)
+                       counter_type l = ]b4_location_initial_line[,
+                       counter_type c = ]b4_location_initial_column[)
       : filename (f)
       , line (l)
       , column (c)
@@ -75,8 +78,8 @@ m4_define([b4_location_define],
 ]])[
     /// Initialization.
     void initialize (]b4_percent_define_get([[filename_type]])[* fn = YY_NULLPTR,
-                     unsigned l = ]b4_location_initial_line[u,
-                     unsigned c = ]b4_location_initial_column[u)
+                     counter_type l = ]b4_location_initial_line[,
+                     counter_type c = ]b4_location_initial_column[)
     {
       filename = fn;
       line = l;
@@ -86,17 +89,17 @@ m4_define([b4_location_define],
     /** \name Line and Column related manipulators
      ** \{ */
     /// (line related) Advance to the COUNT next lines.
-    void lines (int count = 1)
+    void lines (counter_type count = 1)
     {
       if (count)
         {
-          column = ]b4_location_initial_column[u;
+          column = ]b4_location_initial_column[;
           line = add_ (line, count, ]b4_location_initial_line[);
         }
     }
 
     /// (column related) Advance to the COUNT next columns.
-    void columns (int count = 1)
+    void columns (counter_type count = 1)
     {
       column = add_ (column, count, ]b4_location_initial_column[);
     }
@@ -105,22 +108,21 @@ m4_define([b4_location_define],
     /// File name to which this position refers.
     ]b4_percent_define_get([[filename_type]])[* filename;
     /// Current line number.
-    unsigned line;
+    counter_type line;
     /// Current column number.
-    unsigned column;
+    counter_type column;
 
   private:
     /// Compute max (min, lhs+rhs).
-    static unsigned add_ (unsigned lhs, int rhs, int min)
+    static counter_type add_ (counter_type lhs, counter_type rhs, counter_type min)
     {
-      return static_cast<unsigned> (std::max (min,
-                                              static_cast<int> (lhs) + rhs));
+      return lhs + rhs < min ? min : lhs + rhs;
     }
   };
 
   /// Add \a width columns, in place.
   inline position&
-  operator+= (position& res, int width)
+  operator+= (position& res, position::counter_type width)
   {
     res.columns (width);
     return res;
@@ -128,21 +130,21 @@ m4_define([b4_location_define],
 
   /// Add \a width columns.
   inline position
-  operator+ (position res, int width)
+  operator+ (position res, position::counter_type width)
   {
     return res += width;
   }
 
   /// Subtract \a width columns, in place.
   inline position&
-  operator-= (position& res, int width)
+  operator-= (position& res, position::counter_type width)
   {
     return res += -width;
   }
 
   /// Subtract \a width columns.
   inline position
-  operator- (position res, int width)
+  operator- (position res, position::counter_type width)
   {
     return res -= width;
   }
@@ -182,6 +184,8 @@ m4_define([b4_location_define],
   class location
   {
   public:
+    /// Type for line and column numbers.
+    typedef position::counter_type counter_type;
 ]m4_ifdef([b4_location_constructors], [
     /// Construct a location from \a b to \a e.
     location (const position& b, const position& e)
@@ -197,8 +201,8 @@ m4_define([b4_location_define],
 
     /// Construct a 0-width location in \a f, \a l, \a c.
     explicit location (]b4_percent_define_get([[filename_type]])[* f,
-                       unsigned l = ]b4_location_initial_line[u,
-                       unsigned c = ]b4_location_initial_column[u)
+                       counter_type l = ]b4_location_initial_line[,
+                       counter_type c = ]b4_location_initial_column[)
       : begin (f, l, c)
       , end (f, l, c)
     {}
@@ -206,8 +210,8 @@ m4_define([b4_location_define],
 ])[
     /// Initialization.
     void initialize (]b4_percent_define_get([[filename_type]])[* f = YY_NULLPTR,
-                     unsigned l = ]b4_location_initial_line[u,
-                     unsigned c = ]b4_location_initial_column[u)
+                     counter_type l = ]b4_location_initial_line[,
+                     counter_type c = ]b4_location_initial_column[)
     {
       begin.initialize (f, l, c);
       end = begin;
@@ -223,13 +227,13 @@ m4_define([b4_location_define],
     }
 
     /// Extend the current location to the COUNT next columns.
-    void columns (int count = 1)
+    void columns (counter_type count = 1)
     {
       end += count;
     }
 
     /// Extend the current location to the COUNT next lines.
-    void lines (int count = 1)
+    void lines (counter_type count = 1)
     {
       end.lines (count);
     }
@@ -244,39 +248,45 @@ m4_define([b4_location_define],
   };
 
   /// Join two locations, in place.
-  inline location& operator+= (location& res, const location& end)
+  inline location&
+  operator+= (location& res, const location& end)
   {
     res.end = end.end;
     return res;
   }
 
   /// Join two locations.
-  inline location operator+ (location res, const location& end)
+  inline location
+  operator+ (location res, const location& end)
   {
     return res += end;
   }
 
   /// Add \a width columns to the end position, in place.
-  inline location& operator+= (location& res, int width)
+  inline location&
+  operator+= (location& res, location::counter_type width)
   {
     res.columns (width);
     return res;
   }
 
   /// Add \a width columns to the end position.
-  inline location operator+ (location res, int width)
+  inline location
+  operator+ (location res, location::counter_type width)
   {
     return res += width;
   }
 
   /// Subtract \a width columns to the end position, in place.
-  inline location& operator-= (location& res, int width)
+  inline location&
+  operator-= (location& res, location::counter_type width)
   {
     return res += -width;
   }
 
   /// Subtract \a width columns to the end position.
-  inline location operator- (location res, int width)
+  inline location
+  operator- (location res, location::counter_type width)
   {
     return res -= width;
   }
@@ -305,7 +315,8 @@ m4_define([b4_location_define],
   std::basic_ostream<YYChar>&
   operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
-    unsigned end_col = 0 < loc.end.column ? loc.end.column - 1 : 0;
+    location::counter_type end_col
+      = 0 < loc.end.column ? loc.end.column - 1 : 0;
     ostr << loc.begin;
     if (loc.end.filename
         && (!loc.begin.filename
@@ -327,7 +338,7 @@ m4_ifdef([b4_position_file], [[
 // used to define is now defined in "]b4_location_file[".
 //
 // To get rid of this file:
-// 1. add 'require "3.2"' (or newer) to your grammar file
+// 1. add '%require "3.2"' (or newer) to your grammar file
 // 2. remove references to this file from your build system
 // 3. if you used to include it, include "]b4_location_file[" instead.
 
@@ -346,7 +357,6 @@ m4_ifdef([b4_location_file], [[
 
 ]b4_cpp_guard_open([b4_location_path])[
 
-# include <algorithm> // std::max
 # include <iostream>
 # include <string>
 
diff --git a/contrib/tools/bison/data/skeletons/stack.hh b/contrib/tools/bison/data/skeletons/stack.hh
index 926a6f8cac24..5eb485696af1 100644
--- a/contrib/tools/bison/data/skeletons/stack.hh
+++ b/contrib/tools/bison/data/skeletons/stack.hh
@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,45 +35,28 @@ m4_define([b4_stack_define],
       typedef typename S::reverse_iterator iterator;
       typedef typename S::const_reverse_iterator const_iterator;
       typedef typename S::size_type size_type;
+      typedef typename std::ptrdiff_t index_type;
 
       stack (size_type n = 200)
         : seq_ (n)
       {}
 
-      /// Random access.
-      ///
-      /// Index 0 returns the topmost element.
-      T&
-      operator[] (size_type i)
-      {
-        return seq_[size () - 1 - i];
-      }
-
-      /// Random access.
-      ///
-      /// Index 0 returns the topmost element.
-      T&
-      operator[] (int i)
-      {
-        return operator[] (size_type (i));
-      }
-
       /// Random access.
       ///
       /// Index 0 returns the topmost element.
       const T&
-      operator[] (size_type i) const
+      operator[] (index_type i) const
       {
-        return seq_[size () - 1 - i];
+        return seq_[size_type (size () - 1 - i)];
       }
 
       /// Random access.
       ///
       /// Index 0 returns the topmost element.
-      const T&
-      operator[] (int i) const
+      T&
+      operator[] (index_type i)
       {
-        return operator[] (size_type (i));
+        return seq_[size_type (size () - 1 - i)];
       }
 
       /// Steal the contents of \a t.
@@ -88,7 +71,7 @@ m4_define([b4_stack_define],
 
       /// Pop elements from the stack.
       void
-      pop (int n = 1) YY_NOEXCEPT
+      pop (std::ptrdiff_t n = 1) YY_NOEXCEPT
       {
         for (; 0 < n; --n)
           seq_.pop_back ();
@@ -102,10 +85,16 @@ m4_define([b4_stack_define],
       }
 
       /// Number of elements on the stack.
-      size_type
+      index_type
       size () const YY_NOEXCEPT
       {
-        return seq_.size ();
+        return index_type (seq_.size ());
+      }
+
+      std::ptrdiff_t
+      ssize () const YY_NOEXCEPT
+      {
+        return std::ptrdiff_t (size ());
       }
 
       /// Iterator on top of the stack (going downwards).
@@ -126,20 +115,20 @@ m4_define([b4_stack_define],
       class slice
       {
       public:
-        slice (const stack& stack, int range)
+        slice (const stack& stack, index_type range)
           : stack_ (stack)
           , range_ (range)
         {}
 
         const T&
-        operator[] (int i) const
+        operator[] (index_type i) const
         {
           return stack_[range_ - i];
         }
 
       private:
         const stack& stack_;
-        int range_;
+        index_type range_;
       };
 
     private:
@@ -157,7 +146,7 @@ m4_ifdef([b4_stack_file],
 // used to define is now defined with the parser itself.
 //
 // To get rid of this file:
-// 1. add 'require "3.2"' (or newer) to your grammar file
+// 1. add '%require "3.2"' (or newer) to your grammar file
 // 2. remove references to this file from your build system.
 ]b4_output_end[
 ]])
diff --git a/contrib/tools/bison/data/skeletons/variant.hh b/contrib/tools/bison/data/skeletons/variant.hh
index 8b9d4802df9a..13a35c6dd5c3 100644
--- a/contrib/tools/bison/data/skeletons/variant.hh
+++ b/contrib/tools/bison/data/skeletons/variant.hh
@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
-# Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015, 2018-2020 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,9 +72,9 @@ m4_map([      b4_symbol_tag_comment], [$@])dnl
 # The needed includes for variants support.
 m4_define([b4_variant_includes],
 [b4_parse_assert_if([[#include <typeinfo>]])[
-#ifndef YYASSERT
+#ifndef YY_ASSERT
 # include <cassert>
-# define YYASSERT assert
+# define YY_ASSERT assert
 #endif
 ]])
 
@@ -111,14 +111,14 @@ m4_define([b4_value_type_declare],
     semantic_type (YY_RVREF (T) t)]b4_parse_assert_if([
       : yytypeid_ (&typeid (T))])[
     {
-      YYASSERT (sizeof (T) <= size);
+      YY_ASSERT (sizeof (T) <= size);
       new (yyas_<T> ()) T (YY_MOVE (t));
     }
 
     /// Destruction, allowed only if empty.
     ~semantic_type () YY_NOEXCEPT
     {]b4_parse_assert_if([
-      YYASSERT (!yytypeid_);
+      YY_ASSERT (!yytypeid_);
     ])[}
 
 # if 201103L <= YY_CPLUSPLUS
@@ -127,8 +127,8 @@ m4_define([b4_value_type_declare],
     T&
     emplace (U&&... u)
     {]b4_parse_assert_if([
-      YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= size);
+      YY_ASSERT (!yytypeid_);
+      YY_ASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);])[
       return *new (yyas_<T> ()) T (std::forward <U>(u)...);
     }
@@ -138,8 +138,8 @@ m4_define([b4_value_type_declare],
     T&
     emplace ()
     {]b4_parse_assert_if([
-      YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= size);
+      YY_ASSERT (!yytypeid_);
+      YY_ASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);])[
       return *new (yyas_<T> ()) T ();
     }
@@ -149,8 +149,8 @@ m4_define([b4_value_type_declare],
     T&
     emplace (const T& t)
     {]b4_parse_assert_if([
-      YYASSERT (!yytypeid_);
-      YYASSERT (sizeof (T) <= size);
+      YY_ASSERT (!yytypeid_);
+      YY_ASSERT (sizeof (T) <= size);
       yytypeid_ = & typeid (T);])[
       return *new (yyas_<T> ()) T (t);
     }
@@ -179,9 +179,9 @@ m4_define([b4_value_type_declare],
     T&
     as () YY_NOEXCEPT
     {]b4_parse_assert_if([
-      YYASSERT (yytypeid_);
-      YYASSERT (*yytypeid_ == typeid (T));
-      YYASSERT (sizeof (T) <= size);])[
+      YY_ASSERT (yytypeid_);
+      YY_ASSERT (*yytypeid_ == typeid (T));
+      YY_ASSERT (sizeof (T) <= size);])[
       return *yyas_<T> ();
     }
 
@@ -190,9 +190,9 @@ m4_define([b4_value_type_declare],
     const T&
     as () const YY_NOEXCEPT
     {]b4_parse_assert_if([
-      YYASSERT (yytypeid_);
-      YYASSERT (*yytypeid_ == typeid (T));
-      YYASSERT (sizeof (T) <= size);])[
+      YY_ASSERT (yytypeid_);
+      YY_ASSERT (*yytypeid_ == typeid (T));
+      YY_ASSERT (sizeof (T) <= size);])[
       return *yyas_<T> ();
     }
 
@@ -208,8 +208,8 @@ m4_define([b4_value_type_declare],
     void
     swap (self_type& that) YY_NOEXCEPT
     {]b4_parse_assert_if([
-      YYASSERT (yytypeid_);
-      YYASSERT (*yytypeid_ == *that.yytypeid_);])[
+      YY_ASSERT (yytypeid_);
+      YY_ASSERT (*yytypeid_ == *that.yytypeid_);])[
       std::swap (as<T> (), that.as<T> ());
     }
 
@@ -401,7 +401,7 @@ m4_define([_b4_token_constructor_define],
                               b4_symbol_if([$1], [has_type], [std::move (v)]),
                               b4_locations_if([std::move (l)]))[)
       {
-        YYASSERT (]m4_join([ || ], m4_map_sep([_b4_type_clause], [, ], [$@]))[);
+        YY_ASSERT (]m4_join([ || ], m4_map_sep([_b4_type_clause], [, ], [$@]))[);
       }
 #else
       symbol_type (]b4_join(
@@ -413,7 +413,7 @@ m4_define([_b4_token_constructor_define],
                               b4_symbol_if([$1], [has_type], [v]),
                               b4_locations_if([l]))[)
       {
-        YYASSERT (]m4_join([ || ], m4_map_sep([_b4_type_clause], [, ], [$@]))[);
+        YY_ASSERT (]m4_join([ || ], m4_map_sep([_b4_type_clause], [, ], [$@]))[);
       }
 #endif
 ]])])
diff --git a/contrib/tools/bison/data/skeletons/yacc.c b/contrib/tools/bison/data/skeletons/yacc.c
index 54e40e67412e..add943519257 100644
--- a/contrib/tools/bison/data/skeletons/yacc.c
+++ b/contrib/tools/bison/data/skeletons/yacc.c
@@ -1,11 +1,11 @@
-                                                             -*- C -*-
+#                                                            -*- C -*-
 # Yacc compatible skeleton for Bison
 
-# Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software
+# Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software
 # Foundation, Inc.
 
 m4_pushdef([b4_copyright_years],
-           [1984, 1989-1990, 2000-2015, 2018-2019])
+           [1984, 1989-1990, 2000-2015, 2018-2020])
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,34 @@ m4_pushdef([b4_copyright_years],
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check the value of %define api.push-pull.
+m4_include(b4_skeletonsdir/[c.m4])
+
+## ---------- ##
+## api.pure.  ##
+## ---------- ##
+
+b4_percent_define_default([[api.pure]], [[false]])
+b4_percent_define_check_values([[[[api.pure]],
+                                 [[false]], [[true]], [[]], [[full]]]])
+
+m4_define([b4_pure_flag], [[0]])
+m4_case(b4_percent_define_get([[api.pure]]),
+        [false], [m4_define([b4_pure_flag], [[0]])],
+        [true],  [m4_define([b4_pure_flag], [[1]])],
+        [],      [m4_define([b4_pure_flag], [[1]])],
+        [full],  [m4_define([b4_pure_flag], [[2]])])
+
+m4_define([b4_pure_if],
+[m4_case(b4_pure_flag,
+         [0], [$2],
+         [1], [$1],
+         [2], [$1])])
+         [m4_fatal([invalid api.pure value: ]$1)])])
+
+## --------------- ##
+## api.push-pull.  ##
+## --------------- ##
+
 b4_percent_define_default([[api.push-pull]], [[pull]])
 b4_percent_define_check_values([[[[api.push-pull]],
                                  [[pull]], [[push]], [[both]]]])
@@ -38,8 +65,10 @@ b4_use_push_for_pull_if([
   b4_push_if([m4_define([b4_use_push_for_pull_flag], [[0]])],
              [m4_define([b4_push_flag], [[1]])])])
 
-# Check the value of %define parse.lac and friends, where LAC stands for
-# lookahead correction.
+## ----------- ##
+## parse.lac.  ##
+## ----------- ##
+
 b4_percent_define_default([[parse.lac]], [[none]])
 b4_percent_define_default([[parse.lac.es-capacity-initial]], [[20]])
 b4_percent_define_default([[parse.lac.memory-trace]], [[failures]])
@@ -51,8 +80,6 @@ m4_define([b4_lac_flag],
           [m4_if(b4_percent_define_get([[parse.lac]]),
                  [none], [[0]], [[1]])])
 
-m4_include(b4_skeletonsdir/[c.m4])
-
 ## ---------------- ##
 ## Default values.  ##
 ## ---------------- ##
@@ -62,28 +89,6 @@ m4_define_default([b4_stack_depth_max], [10000])
 m4_define_default([b4_stack_depth_init],  [200])
 
 
-## ------------------------ ##
-## Pure/impure interfaces.  ##
-## ------------------------ ##
-
-b4_percent_define_default([[api.pure]], [[false]])
-b4_percent_define_check_values([[[[api.pure]],
-                                 [[false]], [[true]], [[]], [[full]]]])
-
-m4_define([b4_pure_flag], [[0]])
-m4_case(b4_percent_define_get([[api.pure]]),
-        [false], [m4_define([b4_pure_flag], [[0]])],
-        [true],  [m4_define([b4_pure_flag], [[1]])],
-        [],      [m4_define([b4_pure_flag], [[1]])],
-        [full],  [m4_define([b4_pure_flag], [[2]])])
-
-m4_define([b4_pure_if],
-[m4_case(b4_pure_flag,
-         [0], [$2],
-         [1], [$1],
-         [2], [$1])])
-         [m4_fatal([invalid api.pure value: ]$1)])])
-
 # b4_yyerror_arg_loc_if(ARG)
 # --------------------------
 # Expand ARG iff yyerror is to be given a location as argument.
@@ -101,28 +106,6 @@ m4_ifset([b4_parse_param], [b4_args(b4_parse_param), ])])
 
 
 
-## ------------ ##
-## Data Types.  ##
-## ------------ ##
-
-# b4_int_type(MIN, MAX)
-# ---------------------
-# Return the smallest int type able to handle numbers ranging from
-# MIN to MAX (included).  Overwrite the version from c.m4, which
-# uses only C89 types, so that the user can override the shorter
-# types, and so that pre-C89 compilers are handled correctly.
-m4_define([b4_int_type],
-[m4_if(b4_ints_in($@,      [0],   [255]), [1], [yytype_uint8],
-       b4_ints_in($@,   [-128],   [127]), [1], [yytype_int8],
-
-       b4_ints_in($@,      [0], [65535]), [1], [yytype_uint16],
-       b4_ints_in($@, [-32768], [32767]), [1], [yytype_int16],
-
-       m4_eval([0 <= $1]),                [1], [unsigned],
-
-                                               [int])])
-
-
 ## ----------------- ##
 ## Semantic Values.  ##
 ## ----------------- ##
@@ -199,7 +182,7 @@ m4_define([b4_declare_parser_state_variables], [b4_pure_if([[
     /* Number of syntax errors so far.  */
     int yynerrs;
 ]])[
-    int yystate;
+    yy_state_fast_t yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
 
@@ -212,9 +195,9 @@ m4_define([b4_declare_parser_state_variables], [b4_pure_if([[
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
+    yy_state_t yyssa[YYINITDEPTH];
+    yy_state_t *yyss;
+    yy_state_t *yyssp;
 
     /* The semantic value stack.  */
     YYSTYPE yyvsa[YYINITDEPTH];
@@ -229,11 +212,11 @@ m4_define([b4_declare_parser_state_variables], [b4_pure_if([[
     /* The locations where the error started and ended.  */
     YYLTYPE yyerror_range[3];]])[
 
-    YYSIZE_T yystacksize;]b4_lac_if([[
+    YYPTRDIFF_T yystacksize;]b4_lac_if([[
 
-    yytype_int16 yyesa@{]b4_percent_define_get([[parse.lac.es-capacity-initial]])[@};
-    yytype_int16 *yyes;
-    YYSIZE_T yyes_capacity;]])])
+    yy_state_t yyesa@{]b4_percent_define_get([[parse.lac.es-capacity-initial]])[@};
+    yy_state_t *yyes;
+    YYPTRDIFF_T yyes_capacity;]])])
 
 
 # _b4_declare_yyparse_push
@@ -284,20 +267,48 @@ m4_define([b4_declare_yyparse],
 # Declaration that might either go into the header (if --defines)
 # or open coded in the parser body.
 m4_define([b4_shared_declarations],
-[b4_cpp_guard_open([b4_spec_defines_file])[
+[b4_cpp_guard_open([b4_spec_header_file])[
 ]b4_declare_yydebug[
 ]b4_percent_code_get([[requires]])[
 ]b4_token_enums_defines[
 ]b4_declare_yylstype[
 ]b4_declare_yyparse[
 ]b4_percent_code_get([[provides]])[
-]b4_cpp_guard_close([b4_spec_defines_file])[]dnl
+]b4_cpp_guard_close([b4_spec_header_file])[]dnl
 ])
 
+
+# b4_header_include_if(IF-TRUE, IF-FALSE)
+# ---------------------------------------
+# Run IF-TRUE if we generate an output file and api.header.include
+# is defined.
+m4_define([b4_header_include_if],
+[m4_ifval(m4_quote(b4_spec_header_file),
+          [b4_percent_define_ifdef([[api.header.include]],
+                                   [$1],
+                                   [$2])],
+          [$2])])
+
+m4_if(b4_spec_header_file, [[y.tab.h]],
+      [b4_percent_define_default([[api.header.include]],
+                                 [["@basename(]b4_spec_header_file[@)"]])])
+
+
+
+
 ## -------------- ##
 ## Output files.  ##
 ## -------------- ##
 
+
+b4_defines_if([[
+]b4_output_begin([b4_spec_header_file])[
+]b4_copyright([Bison interface for Yacc-like parsers in C])[
+]b4_disclaimer[
+]b4_shared_declarations[
+]b4_output_end[
+]])# b4_defines_if
+
 b4_output_begin([b4_parser_file_name])[
 ]b4_copyright([Bison implementation for Yacc-like parsers in C])[
 /* C LALR(1) parser skeleton written by Richard Stallman, by
@@ -328,13 +339,13 @@ m4_if(b4_api_prefix, [yy], [],
 #define yylex           ]b4_prefix[lex
 #define yyerror         ]b4_prefix[error
 #define yydebug         ]b4_prefix[debug
-#define yynerrs         ]b4_prefix[nerrs
-]]b4_pure_if([], [[
+#define yynerrs         ]b4_prefix[nerrs]]b4_pure_if([], [[
 #define yylval          ]b4_prefix[lval
 #define yychar          ]b4_prefix[char]b4_locations_if([[
 #define yylloc          ]b4_prefix[lloc]])]))[
 
 ]b4_user_pre_prologue[
+]b4_cast_define[
 ]b4_null_define[
 
 /* Enabling verbose error messages.  */
@@ -345,11 +356,11 @@ m4_if(b4_api_prefix, [yy], [],
 # define YYERROR_VERBOSE ]b4_error_verbose_if([1], [0])[
 #endif
 
-]m4_ifval(m4_quote(b4_spec_defines_file),
-[[/* In a future release of Bison, this section will be replaced
-   by #include "@basename(]b4_spec_defines_file[@)".  */
-]])dnl
-b4_shared_declarations[
+]b4_header_include_if([[#include ]b4_percent_define_get([[api.header.include]])],
+                      [m4_ifval(m4_quote(b4_spec_header_file),
+                                [/* Use api.header.include to #include this header
+   instead of duplicating it here.  */
+])b4_shared_declarations])[
 
 ]b4_user_post_prologue[
 ]b4_percent_code_get[]dnl
@@ -358,28 +369,22 @@ b4_shared_declarations[
 # undef short
 #endif
 
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#else
-typedef signed char yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short yytype_uint16;
-#endif
+]b4_c99_int_type_define[
 
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short yytype_int16;
+#ifndef YYPTRDIFF_T
+# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
+#  define YYPTRDIFF_T __PTRDIFF_TYPE__
+#  define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
+# elif defined PTRDIFF_MAX
+#  ifndef ptrdiff_t
+#   include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  endif
+#  define YYPTRDIFF_T ptrdiff_t
+#  define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
+# else
+#  define YYPTRDIFF_T long
+#  define YYPTRDIFF_MAXIMUM LONG_MAX
+# endif
 #endif
 
 #ifndef YYSIZE_T
@@ -387,7 +392,7 @@ typedef short yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
+# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -395,7 +400,19 @@ typedef short yytype_int16;
 # endif
 #endif
 
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+#define YYSIZE_MAXIMUM                                  \
+  YY_CAST (YYPTRDIFF_T,                                 \
+           (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1)  \
+            ? YYPTRDIFF_MAXIMUM                         \
+            : YY_CAST (YYSIZE_T, -1)))
+
+#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
+
+/* Stored state numbers (used for stacks). */
+typedef ]b4_int_type(0, m4_eval(b4_states_number - 1))[ yy_state_t;
+
+/* State numbers in computations.  */
+typedef int yy_state_fast_t;
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -411,6 +428,15 @@ typedef short yytype_int16;
 
 ]b4_attribute_define[
 
+]b4_parse_assert_if([[#ifdef NDEBUG
+# define YY_ASSERT(E) ((void) (0 && (E)))
+#else
+# include <assert.h> /* INFRINGES ON USER NAME SPACE */
+# define YY_ASSERT(E) assert (E)
+#endif
+]],
+[[#define YY_ASSERT(E) ((void) (0 && (E)))]])[
+
 #if ]b4_lac_if([[1]], [[! defined yyoverflow || YYERROR_VERBOSE]])[
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */]dnl
@@ -489,22 +515,23 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
+  yy_state_t yyss_alloc;
   YYSTYPE yyvs_alloc;]b4_locations_if([
   YYLTYPE yyls_alloc;])[
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 ]b4_locations_if(
 [# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE) \
+             + YYSIZEOF (YYLTYPE)) \
       + 2 * YYSTACK_GAP_MAXIMUM)],
 [# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)])[
 
 # define YYCOPY_NEEDED 1
@@ -517,11 +544,11 @@ union yyalloc
 # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
     do                                                                  \
       {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
+        YYPTRDIFF_T yynewbytes;                                         \
         YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
         Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
+        yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / YYSIZEOF (*yyptr);                        \
       }                                                                 \
     while (0)
 
@@ -533,12 +560,12 @@ union yyalloc
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+      __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
 #  else
 #   define YYCOPY(Dst, Src, Count)              \
       do                                        \
         {                                       \
-          YYSIZE_T yyi;                         \
+          YYPTRDIFF_T yyi;                      \
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
@@ -564,17 +591,20 @@ union yyalloc
 #define YYUNDEFTOK  ]b4_undef_token_number[
 #define YYMAXUTOK   ]b4_user_token_number_max[
 
+
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+]b4_api_token_raw_if(dnl
+[[#define YYTRANSLATE(YYX) (YYX)]],
+[[#define YYTRANSLATE(YYX)                                                \
+  (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
 static const ]b4_int_type_for([b4_translate])[ yytranslate[] =
 {
   ]b4_translate[
-};
+};]])[
 
 #if ]b4_api_PREFIX[DEBUG
 ]b4_integral_parser_table_define([rline], [b4_rline],
@@ -599,15 +629,15 @@ static const ]b4_int_type_for([b4_toknum])[ yytoknum[] =
 };
 # endif
 
-#define YYPACT_NINF ]b4_pact_ninf[
+#define YYPACT_NINF (]b4_pact_ninf[)
 
-#define yypact_value_is_default(Yystate) \
-  ]b4_table_value_equals([[pact]], [[Yystate]], [b4_pact_ninf])[
+#define yypact_value_is_default(Yyn) \
+  ]b4_table_value_equals([[pact]], [[Yyn]], [b4_pact_ninf], [YYPACT_NINF])[
 
-#define YYTABLE_NINF ]b4_table_ninf[
+#define YYTABLE_NINF (]b4_table_ninf[)
 
-#define yytable_value_is_error(Yytable_value) \
-  ]b4_table_value_equals([[table]], [[Yytable_value]], [b4_table_ninf])[
+#define yytable_value_is_error(Yyn) \
+  ]b4_table_value_equals([[table]], [[Yyn]], [b4_table_ninf], [YYTABLE_NINF])[
 
 ]b4_parser_tables_define[
 
@@ -643,7 +673,7 @@ static const ]b4_int_type_for([b4_toknum])[ yytoknum[] =
 
 /* Error token number */
 #define YYTERROR        1
-#define YYERRCODE       256
+#define YYERRCODE       ]b4_symbol(1, user_number)[
 
 ]b4_locations_if([[
 ]b4_yylloc_default_define[
@@ -685,8 +715,8 @@ do {                                                                      \
 `------------------------------------------------------------------*/
 
 ]b4_function_define([yy_stack_print], [static void],
-                   [[yytype_int16 *yybottom], [yybottom]],
-                   [[yytype_int16 *yytop],    [yytop]])[
+                   [[yy_state_t *yybottom], [yybottom]],
+                   [[yy_state_t *yytop],    [yytop]])[
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -709,23 +739,23 @@ do {                                                            \
 `------------------------------------------------*/
 
 ]b4_function_define([yy_reduce_print], [static void],
-                   [[yytype_int16 *yyssp], [yyssp]],
+                   [[yy_state_t *yyssp], [yyssp]],
                    [[YYSTYPE *yyvsp], [yyvsp]],
     b4_locations_if([[[YYLTYPE *yylsp], [yylsp]],
                    ])[[int yyrule], [yyrule]]m4_ifset([b4_parse_param], [,
                    b4_parse_param]))[
 {
-  unsigned long yylno = yyrline[yyrule];
+  int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n",
              yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       yystos[+yyssp[yyi + 1 - yynrhs]],
                        &]b4_rhs_value(yynrhs, yyi + 1)[
                        ]b4_locations_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
                        b4_user_args[);
@@ -777,22 +807,22 @@ int yydebug;
    using YYSTACK_FREE.  Return 0 if successful or if no reallocation is
    required.  Return 1 if memory is exhausted.  */
 static int
-yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,
+yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd,
 #if ]b4_api_PREFIX[DEBUG
                       char const *yydebug_prefix,
                       char const *yydebug_suffix,
 #endif
-                      yytype_int16 **yybottom,
-                      yytype_int16 *yybottom_no_free,
-                      yytype_int16 **yytop, yytype_int16 *yytop_empty)
+                      yy_state_t **yybottom,
+                      yy_state_t *yybottom_no_free,
+                      yy_state_t **yytop, yy_state_t *yytop_empty)
 {
-  YYSIZE_T yysize_old =
-    (YYSIZE_T) (*yytop == yytop_empty ? 0 : *yytop - *yybottom + 1);
-  YYSIZE_T yysize_new = yysize_old + yyadd;
+  YYPTRDIFF_T yysize_old =
+    *yytop == yytop_empty ? 0 : *yytop - *yybottom + 1;
+  YYPTRDIFF_T yysize_new = yysize_old + yyadd;
   if (*yycapacity < yysize_new)
     {
-      YYSIZE_T yyalloc = 2 * yysize_new;
-      yytype_int16 *yybottom_new;
+      YYPTRDIFF_T yyalloc = 2 * yysize_new;
+      yy_state_t *yybottom_new;
       /* Use YYMAXDEPTH for maximum stack size given that the stack
          should never need to grow larger than the main state stack
          needs to grow without LAC.  */
@@ -805,7 +835,9 @@ yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,
       if (YYMAXDEPTH < yyalloc)
         yyalloc = YYMAXDEPTH;
       yybottom_new =
-        (yytype_int16*) YYSTACK_ALLOC (yyalloc * sizeof *yybottom_new);
+        YY_CAST (yy_state_t *,
+                 YYSTACK_ALLOC (YY_CAST (YYSIZE_T,
+                                         yyalloc * YYSIZEOF (*yybottom_new))));
       if (!yybottom_new)
         {
           YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix,
@@ -822,8 +854,10 @@ yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,
       *yybottom = yybottom_new;
       *yycapacity = yyalloc;]m4_if(b4_percent_define_get([[parse.lac.memory-trace]]),
                                    [full], [[
-      YYDPRINTF ((stderr, "%srealloc to %lu%s", yydebug_prefix,
-                  (unsigned long) yyalloc, yydebug_suffix));]])[
+      YY_IGNORE_USELESS_CAST_BEGIN
+      YYDPRINTF ((stderr, "%srealloc to %ld%s", yydebug_prefix,
+                  YY_CAST (long, yyalloc), yydebug_suffix));
+      YY_IGNORE_USELESS_CAST_END]])[
     }
   return 0;
 }
@@ -908,11 +942,11 @@ do {                                                                     \
    contents of either array, alter *YYES and *YYES_CAPACITY, and free
    any old *YYES other than YYESA.  */
 static int
-yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
-        YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken)
+yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
+        YYPTRDIFF_T *yyes_capacity, yy_state_t *yyssp, int yytoken)
 {
-  yytype_int16 *yyes_prev = yyssp;
-  yytype_int16 *yyesp = yyes_prev;
+  yy_state_t *yyes_prev = yyssp;
+  yy_state_t *yyesp = yyes_prev;
   YYDPRINTF ((stderr, "LAC: checking lookahead %s:", yytname[yytoken]));
   if (yytoken == YYUNDEFTOK)
     {
@@ -921,12 +955,12 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
     }
   while (1)
     {
-      int yyrule = yypact[*yyesp];
+      int yyrule = yypact[+*yyesp];
       if (yypact_value_is_default (yyrule)
           || (yyrule += yytoken) < 0 || YYLAST < yyrule
           || yycheck[yyrule] != yytoken)
         {
-          yyrule = yydefact[*yyesp];
+          yyrule = yydefact[+*yyesp];
           if (yyrule == 0)
             {
               YYDPRINTF ((stderr, " Err\n"));
@@ -949,11 +983,11 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
           yyrule = -yyrule;
         }
       {
-        YYSIZE_T yylen = yyr2[yyrule];
+        YYPTRDIFF_T yylen = yyr2[yyrule];
         YYDPRINTF ((stderr, " R%d", yyrule - 1));
         if (yyesp != yyes_prev)
           {
-            YYSIZE_T yysize = (YYSIZE_T) (yyesp - *yyes + 1);
+            YYPTRDIFF_T yysize = yyesp - *yyes + 1;
             if (yylen < yysize)
               {
                 yyesp -= yylen;
@@ -969,19 +1003,20 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
           yyesp = yyes_prev -= yylen;
       }
       {
-        yytype_int16 yystate;
+        yy_state_fast_t yystate;
         {
           const int yylhs = yyr1[yyrule] - YYNTOKENS;
           const int yyi = yypgoto[yylhs] + *yyesp;
-          yystate = ((yytype_int16)
-                     (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyesp
-                      ? yytable[yyi]
-                      : yydefgoto[yylhs]));
+          yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyesp
+                     ? yytable[yyi]
+                     : yydefgoto[yylhs]);
         }
         if (yyesp == yyes_prev)
           {
             yyesp = *yyes;
-            *yyesp = yystate;
+            YY_IGNORE_USELESS_CAST_BEGIN
+            *yyesp = YY_CAST (yy_state_t, yystate);
+            YY_IGNORE_USELESS_CAST_END
           }
         else
           {
@@ -994,9 +1029,11 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
                 YYDPRINTF ((stderr, "\n"));
                 return 2;
               }
-            *++yyesp = yystate;
+            YY_IGNORE_USELESS_CAST_BEGIN
+            *++yyesp = YY_CAST (yy_state_t, yystate);
+            YY_IGNORE_USELESS_CAST_END
           }
-        YYDPRINTF ((stderr, " G%d", (int) yystate));
+        YYDPRINTF ((stderr, " G%d", yystate));
       }
     }
 }]])[
@@ -1006,13 +1043,13 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
 
 # ifndef yystrlen
 #  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
+#   define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
 #  else
 /* Return the length of YYSTR.  */
-]b4_function_define([yystrlen], [static YYSIZE_T],
+]b4_function_define([yystrlen], [static YYPTRDIFF_T],
    [[const char *yystr], [yystr]])[
 {
-  YYSIZE_T yylen;
+  YYPTRDIFF_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
     continue;
   return yylen;
@@ -1048,12 +1085,12 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
-static YYSIZE_T
+static YYPTRDIFF_T
 yytnamerr (char *yyres, const char *yystr)
 {
   if (*yystr == '"')
     {
-      YYSIZE_T yyn = 0;
+      YYPTRDIFF_T yyn = 0;
       char const *yyp = yystr;
 
       for (;;)
@@ -1084,10 +1121,10 @@ yytnamerr (char *yyres, const char *yystr)
     do_not_strip_quotes: ;
     }
 
-  if (! yyres)
+  if (yyres)
+    return yystpcpy (yyres, yystr) - yyres;
+  else
     return yystrlen (yystr);
-
-  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
@@ -1102,20 +1139,20 @@ yytnamerr (char *yyres, const char *yystr)
    required number of bytes is too large to store]b4_lac_if([[ or if
    yy_lac returned 2]])[.  */
 static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                ]b4_lac_if([[yytype_int16 *yyesa, yytype_int16 **yyes,
-                YYSIZE_T *yyes_capacity, ]])[yytype_int16 *yyssp, int yytoken)
+yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
+                ]b4_lac_if([[yy_state_t *yyesa, yy_state_t **yyes,
+                YYPTRDIFF_T *yyes_capacity, ]])[yy_state_t *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat. */
+  /* Arguments of yyformat: reported tokens (one for the "unexpected",
+     one per "expected"). */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
+  /* Actual size of YYARG. */
   int yycount = 0;
+  /* Cumulated lengths of YYARG.  */
+  YYPTRDIFF_T yysize = 0;
 
   /* There are many possibilities here to consider:
      - If this state is a consistent state with a default action, then
@@ -1147,19 +1184,14 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   */
   if (yytoken != YYEMPTY)
     {
-      int yyn = yypact[*yyssp];]b4_lac_if([[
+      int yyn = yypact[+*yyssp];
+      YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+      yysize = yysize0;]b4_lac_if([[
       YYDPRINTF ((stderr, "Constructing syntax error message\n"));]])[
       yyarg[yycount++] = yytname[yytoken];
       if (!yypact_value_is_default (yyn))
-        {]b4_lac_if([], [[
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;]])[
-          int yyx;]b4_lac_if([[
+        {]b4_lac_if([[
+          int yyx;
 
           for (yyx = 0; yyx < YYNTOKENS; ++yyx)
             if (yyx != YYTERROR && yyx != YYUNDEFTOK)
@@ -1172,6 +1204,14 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                   if (yy_lac_status == 1)
                     continue;
                 }]], [[
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
 
           for (yyx = yyxbegin; yyx < yyxend; ++yyx)
             if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
@@ -1185,7 +1225,8 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                   }
                 yyarg[yycount++] = yytname[yyx];
                 {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  YYPTRDIFF_T yysize1
+                    = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
                   if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
                     yysize = yysize1;
                   else
@@ -1216,7 +1257,9 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
     }
 
   {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    /* Don't count the "%s"s in the final size, but reserve room for
+       the terminator.  */
+    YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1;
     if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
       yysize = yysize1;
     else
@@ -1246,8 +1289,8 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
         }
       else
         {
-          yyp++;
-          yyformat++;
+          ++yyp;
+          ++yyformat;
         }
   }
   return 0;
@@ -1313,7 +1356,7 @@ b4_function_define([[yyparse]], [[int]], b4_parse_param)[
   yypstate *yyps;]b4_pure_if([], [[
   if (yypstate_allocated)
     return YY_NULLPTR;]])[
-  yyps = (yypstate *) malloc (sizeof *yyps);
+  yyps = YY_CAST (yypstate *, malloc (sizeof *yyps));
   if (!yyps)
     return YY_NULLPTR;
   yyps->yynew = 1;]b4_pure_if([], [[
@@ -1397,7 +1440,7 @@ b4_function_define([[yyparse]], [[int]], b4_parse_param)[
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
   char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+  YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N)]b4_locations_if([, yylsp -= (N)])[)
@@ -1418,7 +1461,7 @@ b4_function_define([[yyparse]], [[int]], b4_parse_param)[
   yystacksize = YYINITDEPTH;]b4_lac_if([[
 
   yyes = yyesa;
-  yyes_capacity = sizeof yyesa / sizeof *yyes;
+  yyes_capacity = ]b4_percent_define_get([[parse.lac.es-capacity-initial]])[;
   if (YYMAXDEPTH < yyes_capacity)
     yyes_capacity = YYMAXDEPTH;]])[
 
@@ -1450,10 +1493,14 @@ b4_locations_if([[  yylsp[0] = ]b4_push_if([b4_pure_if([*])yypushed_loc], [yyllo
 
 
 /*--------------------------------------------------------------------.
-| yynewstate -- set current state (the top of the stack) to yystate.  |
+| yysetstate -- set current state (the top of the stack) to yystate.  |
 `--------------------------------------------------------------------*/
 yysetstate:
-  *yyssp = (yytype_int16) yystate;
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+  YY_IGNORE_USELESS_CAST_BEGIN
+  *yyssp = YY_CAST (yy_state_t, yystate);
+  YY_IGNORE_USELESS_CAST_END
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -1461,15 +1508,15 @@ b4_locations_if([[  yylsp[0] = ]b4_push_if([b4_pure_if([*])yypushed_loc], [yyllo
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
+      YYPTRDIFF_T yysize = yyssp - yyss + 1;
 
 # if defined yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
            memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;]b4_locations_if([
+        yy_state_t *yyss1 = yyss;
+        YYSTYPE *yyvs1 = yyvs;]b4_locations_if([
         YYLTYPE *yyls1 = yyls;])[
 
         /* Each stack pointer address is followed by the size of the
@@ -1477,9 +1524,9 @@ b4_locations_if([[  yylsp[0] = ]b4_push_if([b4_pure_if([*])yypushed_loc], [yyllo
            conditional around just the two extra args, but that might
            be undefined if yyoverflow is a macro.  */
         yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),]b4_locations_if([
-                    &yyls1, yysize * sizeof (*yylsp),])[
+                    &yyss1, yysize * YYSIZEOF (*yyssp),
+                    &yyvs1, yysize * YYSIZEOF (*yyvsp),]b4_locations_if([
+                    &yyls1, yysize * YYSIZEOF (*yylsp),])[
                     &yystacksize);
         yyss = yyss1;
         yyvs = yyvs1;]b4_locations_if([
@@ -1494,9 +1541,10 @@ b4_locations_if([[  yylsp[0] = ]b4_push_if([b4_pure_if([*])yypushed_loc], [yyllo
         yystacksize = YYMAXDEPTH;
 
       {
-        yytype_int16 *yyss1 = yyss;
+        yy_state_t *yyss1 = yyss;
         union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+          YY_CAST (union yyalloc *,
+                   YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
@@ -1512,16 +1560,16 @@ b4_locations_if([[  yylsp[0] = ]b4_push_if([b4_pure_if([*])yypushed_loc], [yyllo
       yyvsp = yyvs + yysize - 1;]b4_locations_if([
       yylsp = yyls + yysize - 1;])[
 
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long) yystacksize));
+      YY_IGNORE_USELESS_CAST_BEGIN
+      YYDPRINTF ((stderr, "Stack size increased to %ld\n",
+                  YY_CAST (long, yystacksize)));
+      YY_IGNORE_USELESS_CAST_END
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -1605,16 +1653,15 @@ yyread_pushed_token:]])[
 
   /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END]b4_locations_if([
+  *++yylsp = yylloc;])[
 
   /* Discard the shifted token.  */
   yychar = YYEMPTY;]b4_lac_if([[
   YY_LAC_DISCARD ("shift");]])[
-
-  yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-]b4_locations_if([  *++yylsp = yylloc;])[
   goto yynewstate;
 
 
@@ -1662,7 +1709,7 @@ yyread_pushed_token:]])[
   }]], [[
   switch (yyn)
     {
-      ]b4_user_actions[
+]b4_user_actions[
       default: break;
     }]])[
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1729,7 +1776,7 @@ yyread_pushed_token:]])[
           {
             if (yymsg != yymsgbuf)
               YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
             if (!yymsg)
               {
                 yymsg = yymsgbuf;
@@ -1893,7 +1940,7 @@ yyread_pushed_token:]])[
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);
+                  yystos[+*yyssp], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -1917,11 +1964,3 @@ yypushreturn:]])[
 }
 ]b4_epilogue[]dnl
 b4_output_end
-
-b4_defines_if([[
-]b4_output_begin([b4_spec_defines_file])[
-]b4_copyright([Bison interface for Yacc-like parsers in C])[
-]b4_disclaimer[
-]b4_shared_declarations[
-]b4_output_end[
-]])# b4_defines_if
diff --git a/contrib/tools/bison/lib/allocator.h b/contrib/tools/bison/lib/allocator.h
index 5a632ba6ff35..2b032383de25 100644
--- a/contrib/tools/bison/lib/allocator.h
+++ b/contrib/tools/bison/lib/allocator.h
@@ -1,6 +1,6 @@
 /* Memory allocators such as malloc+free.
 
-   Copyright (C) 2011-2019 Free Software Foundation, Inc.
+   Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/areadlink.c b/contrib/tools/bison/lib/areadlink.c
index 059435624db5..a72ddf8d650e 100644
--- a/contrib/tools/bison/lib/areadlink.c
+++ b/contrib/tools/bison/lib/areadlink.c
@@ -1,7 +1,7 @@
 /* areadlink.c -- readlink wrapper to return the link name in malloc'd storage
    Unlike xreadlink and xreadlink_with_size, don't ever call exit.
 
-   Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/areadlink.h b/contrib/tools/bison/lib/areadlink.h
index ddcd06d7d7af..f68efe5e3b3d 100644
--- a/contrib/tools/bison/lib/areadlink.h
+++ b/contrib/tools/bison/lib/areadlink.h
@@ -1,6 +1,6 @@
 /* Read symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2019 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/arg-nonnull.h b/contrib/tools/bison/lib/arg-nonnull.h
index ad8c26c225e7..ac26ca8cfedd 100644
--- a/contrib/tools/bison/lib/arg-nonnull.h
+++ b/contrib/tools/bison/lib/arg-nonnull.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/contrib/tools/bison/lib/argmatch.c b/contrib/tools/bison/lib/argmatch.c
index b9a3e400c41d..195f90252bce 100644
--- a/contrib/tools/bison/lib/argmatch.c
+++ b/contrib/tools/bison/lib/argmatch.c
@@ -1,6 +1,6 @@
 /* argmatch.c -- find a match for a string in an array
 
-   Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2019 Free Software
+   Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,12 +29,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 #include "error.h"
 #include "quotearg.h"
-#include "quote.h"
 #include "getprogname.h"
 
 #if USE_UNLOCKED_IO
@@ -82,7 +80,7 @@ argmatch_exit_fn argmatch_die = __argmatch_die;
 
 ptrdiff_t
 argmatch (const char *arg, const char *const *arglist,
-          const char *vallist, size_t valsize)
+          const void *vallist, size_t valsize)
 {
   size_t i;                     /* Temporary index in ARGLIST.  */
   size_t arglen;                /* Length of ARG.  */
@@ -106,8 +104,8 @@ argmatch (const char *arg, const char *const *arglist,
             {
               /* Second nonexact match found.  */
               if (vallist == NULL
-                  || memcmp (vallist + valsize * matchind,
-                             vallist + valsize * i, valsize))
+                  || memcmp ((char const *) vallist + valsize * matchind,
+                             (char const *) vallist + valsize * i, valsize))
                 {
                   /* There is a real ambiguity, or we could not
                      disambiguate. */
@@ -144,7 +142,7 @@ argmatch_invalid (const char *context, const char *value, ptrdiff_t problem)
    VALSIZE is the size of the elements of VALLIST */
 void
 argmatch_valid (const char *const *arglist,
-                const char *vallist, size_t valsize)
+                const void *vallist, size_t valsize)
 {
   size_t i;
   const char *last_val = NULL;
@@ -154,10 +152,10 @@ argmatch_valid (const char *const *arglist,
   fputs (_("Valid arguments are:"), stderr);
   for (i = 0; arglist[i]; i++)
     if ((i == 0)
-        || memcmp (last_val, vallist + valsize * i, valsize))
+        || memcmp (last_val, (char const *) vallist + valsize * i, valsize))
       {
         fprintf (stderr, "\n  - %s", quote (arglist[i]));
-        last_val = vallist + valsize * i;
+        last_val = (char const *) vallist + valsize * i;
       }
     else
       {
@@ -175,7 +173,7 @@ argmatch_valid (const char *const *arglist,
 ptrdiff_t
 __xargmatch_internal (const char *context,
                       const char *arg, const char *const *arglist,
-                      const char *vallist, size_t valsize,
+                      const void *vallist, size_t valsize,
                       argmatch_exit_fn exit_fn)
 {
   ptrdiff_t res = argmatch (arg, arglist, vallist, valsize);
@@ -194,14 +192,14 @@ __xargmatch_internal (const char *context,
 /* Look for VALUE in VALLIST, an array of objects of size VALSIZE and
    return the first corresponding argument in ARGLIST */
 const char *
-argmatch_to_argument (const char *value,
+argmatch_to_argument (const void *value,
                       const char *const *arglist,
-                      const char *vallist, size_t valsize)
+                      const void *vallist, size_t valsize)
 {
   size_t i;
 
   for (i = 0; arglist[i]; i++)
-    if (!memcmp (value, vallist + valsize * i, valsize))
+    if (!memcmp (value, (char const *) vallist + valsize * i, valsize))
       return arglist[i];
   return NULL;
 }
diff --git a/contrib/tools/bison/lib/argmatch.h b/contrib/tools/bison/lib/argmatch.h
index 51d2885879d8..daa0fdbf3ab0 100644
--- a/contrib/tools/bison/lib/argmatch.h
+++ b/contrib/tools/bison/lib/argmatch.h
@@ -1,6 +1,6 @@
 /* argmatch.h -- definitions and prototypes for argmatch.c
 
-   Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2019 Free Software
+   Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,13 +22,19 @@
 #ifndef ARGMATCH_H_
 # define ARGMATCH_H_ 1
 
+# include <limits.h>
+# include <stdbool.h>
 # include <stddef.h>
+# include <stdio.h>
+# include <string.h> /* memcmp */
 
+# include "gettext.h"
+# include "quote.h"
 # include "verify.h"
 
-#ifdef  __cplusplus
+# ifdef  __cplusplus
 extern "C" {
-#endif
+# endif
 
 # define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
 
@@ -44,10 +50,10 @@ extern "C" {
    to the same values in VALLIST).  */
 
 ptrdiff_t argmatch (char const *arg, char const *const *arglist,
-                    char const *vallist, size_t valsize) _GL_ATTRIBUTE_PURE;
+                    void const *vallist, size_t valsize) _GL_ATTRIBUTE_PURE;
 
 # define ARGMATCH(Arg, Arglist, Vallist) \
-  argmatch (Arg, Arglist, (char const *) (Vallist), sizeof *(Vallist))
+  argmatch (Arg, Arglist, (void const *) (Vallist), sizeof *(Vallist))
 
 /* xargmatch calls this function when it fails.  This function should not
    return.  By default, this is a function that calls ARGMATCH_DIE which
@@ -70,10 +76,10 @@ void argmatch_invalid (char const *context, char const *value,
 /* Report on stderr the list of possible arguments.  */
 
 void argmatch_valid (char const *const *arglist,
-                     char const *vallist, size_t valsize);
+                     void const *vallist, size_t valsize);
 
 # define ARGMATCH_VALID(Arglist, Vallist) \
-  argmatch_valid (Arglist, (char const *) (Vallist), sizeof *(Vallist))
+  argmatch_valid (Arglist, (void const *) (Vallist), sizeof *(Vallist))
 
 
 
@@ -82,30 +88,244 @@ void argmatch_valid (char const *const *arglist,
 
 ptrdiff_t __xargmatch_internal (char const *context,
                                 char const *arg, char const *const *arglist,
-                                char const *vallist, size_t valsize,
+                                void const *vallist, size_t valsize,
                                 argmatch_exit_fn exit_fn);
 
 /* Programmer friendly interface to __xargmatch_internal. */
 
 # define XARGMATCH(Context, Arg, Arglist, Vallist)              \
   ((Vallist) [__xargmatch_internal (Context, Arg, Arglist,      \
-                                    (char const *) (Vallist),   \
+                                    (void const *) (Vallist),   \
                                     sizeof *(Vallist),          \
                                     argmatch_die)])
 
 /* Convert a value into a corresponding argument. */
 
-char const *argmatch_to_argument (char const *value,
+char const *argmatch_to_argument (void const *value,
                                   char const *const *arglist,
-                                  char const *vallist, size_t valsize)
+                                  void const *vallist, size_t valsize)
   _GL_ATTRIBUTE_PURE;
 
 # define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist)                  \
   argmatch_to_argument (Value, Arglist,                                 \
-                        (char const *) (Vallist), sizeof *(Vallist))
-
-#ifdef  __cplusplus
+                        (void const *) (Vallist), sizeof *(Vallist))
+
+# define ARGMATCH_DEFINE_GROUP(Name, Type)                              \
+  /* The type of the values of this group.  */                          \
+  typedef Type argmatch_##Name##_type;                                  \
+                                                                        \
+  /* The size of the type of the values of this group. */               \
+  enum argmatch_##Name##_size_enum                                      \
+  {                                                                     \
+    argmatch_##Name##_size = sizeof (argmatch_##Name##_type)            \
+  };                                                                    \
+                                                                        \
+  /* Argument mapping of this group.  */                                \
+  typedef struct                                                        \
+  {                                                                     \
+    /* Argument (e.g., "simple").  */                                   \
+    const char *arg;                                                    \
+    /* Value (e.g., simple_backups).  */                                \
+    const argmatch_##Name##_type val;                                   \
+  } argmatch_##Name##_arg;                                              \
+                                                                        \
+  /* Documentation of this group.  */                                   \
+  typedef struct                                                        \
+  {                                                                     \
+    /* Argument (e.g., "simple").  */                                   \
+    const char *arg;                                                    \
+    /* Documentation (e.g., N_("always make simple backups")).  */      \
+    const char *doc;                                                    \
+  } argmatch_##Name##_doc;                                              \
+                                                                        \
+  /* All the features of an argmatch group.  */                         \
+  typedef struct                                                        \
+  {                                                                     \
+    const argmatch_##Name##_arg* args;                                  \
+    const argmatch_##Name##_doc* docs;                                  \
+                                                                        \
+    /* Printed before the usage message.  */                            \
+    const char *doc_pre;                                                \
+    /* Printed after the usage message.  */                             \
+    const char *doc_post;                                               \
+  } argmatch_##Name##_group_type;                                       \
+                                                                        \
+  /* The structure the user must build.  */                             \
+  extern const argmatch_##Name##_group_type argmatch_##Name##_group;    \
+                                                                        \
+  /* Print the documentation of this group.  */                         \
+  void argmatch_##Name##_usage (FILE *out);                             \
+                                                                        \
+  /* If nonnegative, the index I of ARG in ARGS, i.e,                   \
+     ARGS[I] == ARG.                                                    \
+     Return -1 for invalid argument, -2 for ambiguous argument. */      \
+  ptrdiff_t argmatch_##Name##_choice (const char *arg);                 \
+                                                                        \
+  /* A pointer to the corresponding value if it exists, or              \
+     report an error and exit with failure if the argument was          \
+     not recognized. */                                                 \
+  const argmatch_##Name##_type*                                         \
+  argmatch_##Name##_value (const char *context, const char *arg);       \
+                                                                        \
+  /* The first argument in ARGS that matches this value, or NULL.  */   \
+  const char *                                                          \
+  argmatch_##Name##_argument (const argmatch_##Name##_type *val);       \
+                                                                        \
+  ptrdiff_t                                                             \
+  argmatch_##Name##_choice (const char *arg)                            \
+  {                                                                     \
+    const argmatch_##Name##_group_type *g = &argmatch_##Name##_group;   \
+    size_t size = argmatch_##Name##_size;                               \
+    ptrdiff_t res = -1;      /* Index of first nonexact match.  */      \
+    bool ambiguous = false;  /* Whether multiple nonexact match(es). */ \
+    size_t arglen = strlen (arg);                                       \
+                                                                        \
+    /* Test all elements for either exact match or abbreviated          \
+       matches.  */                                                     \
+    for (size_t i = 0; g->args[i].arg; i++)                             \
+      if (!strncmp (g->args[i].arg, arg, arglen))                       \
+        {                                                               \
+          if (strlen (g->args[i].arg) == arglen)                        \
+            /* Exact match found.  */                                   \
+            return i;                                                   \
+          else if (res == -1)                                           \
+            /* First nonexact match found.  */                          \
+            res = i;                                                    \
+          else if (memcmp (&g->args[res].val, &g->args[i].val, size))   \
+            /* Second nonexact match found.  */                         \
+            /* There is a real ambiguity, or we could not               \
+               disambiguate. */                                         \
+            ambiguous = true;                                           \
+        }                                                               \
+    return ambiguous ? -2 : res;                                        \
+  }                                                                     \
+                                                                        \
+  const char *                                                          \
+  argmatch_##Name##_argument (const argmatch_##Name##_type *val)        \
+  {                                                                     \
+    const argmatch_##Name##_group_type *g = &argmatch_##Name##_group;   \
+    size_t size = argmatch_##Name##_size;                               \
+    for (size_t i = 0; g->args[i].arg; i++)                             \
+      if (!memcmp (val, &g->args[i].val, size))                         \
+        return g->args[i].arg;                                          \
+    return NULL;                                                        \
+  }                                                                     \
+                                                                        \
+  /* List the valid values of this group. */                            \
+  static void                                                           \
+  argmatch_##Name##_valid (FILE *out)                                   \
+  {                                                                     \
+    const argmatch_##Name##_group_type *g = &argmatch_##Name##_group;   \
+    size_t size = argmatch_##Name##_size;                               \
+                                                                        \
+    /* Try to put synonyms on the same line.  Synonyms are expected     \
+       to follow each other. */                                         \
+    fputs (gettext ("Valid arguments are:"), out);                      \
+    for (int i = 0; g->args[i].arg; i++)                                \
+      if (i == 0                                                        \
+          || memcmp (&g->args[i-1].val, &g->args[i].val, size))         \
+        fprintf (out, "\n  - %s", quote (g->args[i].arg));              \
+      else                                                              \
+        fprintf (out, ", %s", quote (g->args[i].arg));                  \
+    putc ('\n', out);                                                   \
+  }                                                                     \
+                                                                        \
+  const argmatch_##Name##_type*                                         \
+  argmatch_##Name##_value (const char *context, const char *arg)        \
+  {                                                                     \
+    const argmatch_##Name##_group_type *g = &argmatch_##Name##_group;   \
+    ptrdiff_t res = argmatch_##Name##_choice (arg);                     \
+    if (res < 0)                                                        \
+      {                                                                 \
+        argmatch_invalid (context, arg, res);                           \
+        argmatch_##Name##_valid (stderr);                               \
+        argmatch_die ();                                                \
+      }                                                                 \
+    return &g->args[res].val;                                           \
+  }                                                                     \
+                                                                        \
+  /* The column in which the documentation is displayed.                \
+     The leftmost possible, but no more than 20. */                     \
+  static int                                                            \
+  argmatch_##Name##_doc_col (void)                                      \
+  {                                                                     \
+    const argmatch_##Name##_group_type *g = &argmatch_##Name##_group;   \
+    size_t size = argmatch_##Name##_size;                               \
+    int res = 0;                                                        \
+    for (int i = 0; g->docs[i].arg; ++i)                                \
+      {                                                                 \
+        int col = 4;                                                    \
+        int ival = argmatch_##Name##_choice (g->docs[i].arg);           \
+        if (ival < 0)                                                   \
+          /* Pseudo argument, display it. */                            \
+          col += strlen (g->docs[i].arg);                               \
+        else                                                            \
+          /* Genuine argument, display it with its synonyms. */         \
+          for (int j = 0; g->args[j].arg; ++j)                          \
+            if (! memcmp (&g->args[ival].val, &g->args[j].val, size))   \
+              col += (col == 4 ? 0 : 2) + strlen (g->args[j].arg);      \
+        if (res <= col)                                                 \
+          res = col <= 20 ? col : 20;                                   \
+      }                                                                 \
+    return res ? res : 20;                                              \
+  }                                                                     \
+                                                                        \
+  void                                                                  \
+  argmatch_##Name##_usage (FILE *out)                                   \
+  {                                                                     \
+    const argmatch_##Name##_group_type *g = &argmatch_##Name##_group;   \
+    size_t size = argmatch_##Name##_size;                               \
+    /* Width of the screen.  Help2man does not seem to support          \
+       arguments on several lines, so in that case pretend a very       \
+       large width. */                                                  \
+    const int screen_width = getenv ("HELP2MAN") ? INT_MAX : 80;        \
+    if (g->doc_pre)                                                     \
+      fprintf (out, "%s\n", gettext (g->doc_pre));                      \
+    int doc_col = argmatch_##Name##_doc_col ();                         \
+    for (int i = 0; g->docs[i].arg; ++i)                                \
+      {                                                                 \
+        int col = 0;                                                    \
+        bool first = true;                                              \
+        int ival = argmatch_##Name##_choice (g->docs[i].arg);           \
+        if (ival < 0)                                                   \
+          /* Pseudo argument, display it. */                            \
+          col += fprintf (out,  "  %s", g->docs[i].arg);                \
+        else                                                            \
+          /* Genuine argument, display it with its synonyms. */         \
+          for (int j = 0; g->args[j].arg; ++j)                          \
+            if (! memcmp (&g->args[ival].val, &g->args[j].val, size))   \
+              {                                                         \
+                if (!first                                              \
+                    && screen_width < col + 2 + strlen (g->args[j].arg)) \
+                  {                                                     \
+                    fprintf (out, ",\n");                               \
+                    col = 0;                                            \
+                    first = true;                                       \
+                  }                                                     \
+                if (first)                                              \
+                  {                                                     \
+                    col += fprintf (out, " ");                          \
+                    first = false;                                      \
+                  }                                                     \
+                else                                                    \
+                  col += fprintf (out, ",");                            \
+                col += fprintf (out,  " %s", g->args[j].arg);           \
+              }                                                         \
+        /* The doc.  Separated by at least two spaces. */               \
+        if (doc_col < col + 2)                                          \
+          {                                                             \
+            fprintf (out, "\n");                                        \
+            col = 0;                                                    \
+          }                                                             \
+        fprintf (out, "%*s%s\n",                                        \
+                 doc_col - col, "", gettext (g->docs[i].doc));          \
+      }                                                                 \
+    if (g->doc_post)                                                    \
+      fprintf (out, "%s\n", gettext (g->doc_post));                     \
+  }
+
+# ifdef  __cplusplus
 }
-#endif
+# endif
 
 #endif /* ARGMATCH_H_ */
diff --git a/contrib/tools/bison/lib/asnprintf.c b/contrib/tools/bison/lib/asnprintf.c
index d2a8c0972052..37dcf925eccf 100644
--- a/contrib/tools/bison/lib/asnprintf.c
+++ b/contrib/tools/bison/lib/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/asprintf.c b/contrib/tools/bison/lib/asprintf.c
new file mode 100644
index 000000000000..f97580f74543
--- /dev/null
+++ b/contrib/tools/bison/lib/asprintf.c
@@ -0,0 +1,39 @@
+/* Formatted output to strings.
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2020 Free Software Foundation,
+   Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#ifdef IN_LIBASPRINTF
+# include "vasprintf.h"
+#else
+# include <stdio.h>
+#endif
+
+#include <stdarg.h>
+
+int
+asprintf (char **resultp, const char *format, ...)
+{
+  va_list args;
+  int result;
+
+  va_start (args, format);
+  result = vasprintf (resultp, format, args);
+  va_end (args);
+  return result;
+}
diff --git a/contrib/tools/bison/lib/assure.h b/contrib/tools/bison/lib/assure.h
new file mode 100644
index 000000000000..8ea2f6e480b6
--- /dev/null
+++ b/contrib/tools/bison/lib/assure.h
@@ -0,0 +1,37 @@
+/* Run-time assert-like macros.
+
+   Copyright (C) 2014-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert.  */
+
+#ifndef _GL_ASSURE_H
+#define _GL_ASSURE_H
+
+#include <assert.h>
+
+/* Check E's value at runtime, and report an error and abort if not.
+   However, do nothing if NDEBUG is defined.
+
+   Unlike standard 'assert', this macro always compiles E even when NDEBUG
+   is defined, so as to catch typos and avoid some GCC warnings.  */
+
+#ifdef NDEBUG
+# define assure(E) ((void) (0 && (E)))
+#else
+# define assure(E) assert (E)
+#endif
+
+#endif
diff --git a/contrib/tools/bison/lib/basename-lgpl.c b/contrib/tools/bison/lib/basename-lgpl.c
index 0ae04ee5722b..565469ea3d10 100644
--- a/contrib/tools/bison/lib/basename-lgpl.c
+++ b/contrib/tools/bison/lib/basename-lgpl.c
@@ -1,6 +1,6 @@
 /* basename.c -- return the last element in a file name
 
-   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2019 Free Software
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/basename.c b/contrib/tools/bison/lib/basename.c
index 1b6e0ea59bd7..b14417f48d70 100644
--- a/contrib/tools/bison/lib/basename.c
+++ b/contrib/tools/bison/lib/basename.c
@@ -1,6 +1,6 @@
 /* basename.c -- return the last element in a file name
 
-   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2019 Free Software
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/binary-io.c b/contrib/tools/bison/lib/binary-io.c
index 01e0bf64765d..e84e223fc88e 100644
--- a/contrib/tools/bison/lib/binary-io.c
+++ b/contrib/tools/bison/lib/binary-io.c
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright 2017-2019 Free Software Foundation, Inc.
+   Copyright 2017-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,18 +20,20 @@
 #include "binary-io.h"
 
 #if defined __DJGPP__ || defined __EMX__
-# include <errno.h>
 # include <unistd.h>
 
 int
-__gl_setmode_check (int fd)
+set_binary_mode (int fd, int mode)
 {
   if (isatty (fd))
-    {
-      errno = EINVAL;
-      return -1;
-    }
+    /* If FD refers to a console (not a pipe, not a regular file),
+       O_TEXT is the only reasonable mode, both on input and on output.
+       Silently ignore the request.  If we were to return -1 here,
+       all programs that use xset_binary_mode would fail when run
+       with console input or console output.  */
+    return O_TEXT;
   else
-    return 0;
+    return __gl_setmode (fd, mode);
 }
+
 #endif
diff --git a/contrib/tools/bison/lib/binary-io.h b/contrib/tools/bison/lib/binary-io.h
index 100ac3011c19..05f7986b5f9c 100644
--- a/contrib/tools/bison/lib/binary-io.h
+++ b/contrib/tools/bison/lib/binary-io.h
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005, 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2008-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -61,25 +61,21 @@ __gl_setmode (int fd _GL_UNUSED, int mode _GL_UNUSED)
 }
 #endif
 
-#if defined __DJGPP__ || defined __EMX__
-extern int __gl_setmode_check (int);
-#else
-BINARY_IO_INLINE int
-__gl_setmode_check (int fd _GL_UNUSED) { return 0; }
-#endif
-
 /* Set FD's mode to MODE, which should be either O_TEXT or O_BINARY.
    Return the old mode if successful, -1 (setting errno) on failure.
    Ordinarily this function would be called 'setmode', since that is
    its name on MS-Windows, but it is called 'set_binary_mode' here
    to avoid colliding with a BSD function of another name.  */
 
+#if defined __DJGPP__ || defined __EMX__
+extern int set_binary_mode (int fd, int mode);
+#else
 BINARY_IO_INLINE int
 set_binary_mode (int fd, int mode)
 {
-  int r = __gl_setmode_check (fd);
-  return r != 0 ? r : __gl_setmode (fd, mode);
+  return __gl_setmode (fd, mode);
 }
+#endif
 
 /* This macro is obsolescent.  */
 #define SET_BINARY(fd) ((void) set_binary_mode (fd, O_BINARY))
diff --git a/contrib/tools/bison/lib/bitrotate.h b/contrib/tools/bison/lib/bitrotate.h
index 862331e204b2..59827e2742b0 100644
--- a/contrib/tools/bison/lib/bitrotate.h
+++ b/contrib/tools/bison/lib/bitrotate.h
@@ -1,5 +1,5 @@
 /* bitrotate.h - Rotate bits in integers
-   Copyright (C) 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -95,7 +95,8 @@ rotr_sz (size_t x, int n)
 BITROTATE_INLINE uint16_t
 rotl16 (uint16_t x, int n)
 {
-  return ((x << n) | (x >> (16 - n))) & UINT16_MAX;
+  return (((unsigned int) x << n) | ((unsigned int) x >> (16 - n)))
+         & UINT16_MAX;
 }
 
 /* Given an unsigned 16-bit argument X, return the value corresponding
@@ -106,7 +107,8 @@ rotl16 (uint16_t x, int n)
 BITROTATE_INLINE uint16_t
 rotr16 (uint16_t x, int n)
 {
-  return ((x >> n) | (x << (16 - n))) & UINT16_MAX;
+  return (((unsigned int) x >> n) | ((unsigned int) x << (16 - n)))
+         & UINT16_MAX;
 }
 
 /* Given an unsigned 8-bit argument X, return the value corresponding
@@ -117,7 +119,7 @@ rotr16 (uint16_t x, int n)
 BITROTATE_INLINE uint8_t
 rotl8 (uint8_t x, int n)
 {
-  return ((x << n) | (x >> (8 - n))) & UINT8_MAX;
+  return (((unsigned int) x << n) | ((unsigned int) x >> (8 - n))) & UINT8_MAX;
 }
 
 /* Given an unsigned 8-bit argument X, return the value corresponding
@@ -128,7 +130,7 @@ rotl8 (uint8_t x, int n)
 BITROTATE_INLINE uint8_t
 rotr8 (uint8_t x, int n)
 {
-  return ((x >> n) | (x << (8 - n))) & UINT8_MAX;
+  return (((unsigned int) x >> n) | ((unsigned int) x << (8 - n))) & UINT8_MAX;
 }
 
 _GL_INLINE_HEADER_END
diff --git a/contrib/tools/bison/lib/bitset.c b/contrib/tools/bison/lib/bitset.c
index cccb1e83476a..c0fc13fd521f 100644
--- a/contrib/tools/bison/lib/bitset.c
+++ b/contrib/tools/bison/lib/bitset.c
@@ -1,6 +1,6 @@
 /* General bitsets.
 
-   Copyright (C) 2002-2006, 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -129,7 +129,7 @@ bitset_alloc (bitset_bindex n_bits, enum bitset_type type)
 {
   size_t bytes = bitset_bytes (type, n_bits);
 
-  bitset bset = xcalloc (1, bytes);
+  bitset bset = xzalloc (bytes);
 
   /* The cache is disabled until some elements are allocated.  If we
      have variable length arrays, then we may need to allocate a dummy
@@ -168,8 +168,11 @@ bitset_create (bitset_bindex n_bits, unsigned attr)
 void
 bitset_free (bitset bset)
 {
-  BITSET_FREE_ (bset);
-  free (bset);
+  if (bset)
+    {
+      BITSET_FREE_ (bset);
+      free (bset);
+    }
 }
 
 
@@ -177,7 +180,8 @@ bitset_free (bitset bset)
 void
 bitset_obstack_free (bitset bset)
 {
-  BITSET_FREE_ (bset);
+  if (bset)
+    BITSET_FREE_ (bset);
 }
 
 
diff --git a/contrib/tools/bison/lib/bitset.h b/contrib/tools/bison/lib/bitset.h
index 32d08e7aa97a..a13b8d4d1687 100644
--- a/contrib/tools/bison/lib/bitset.h
+++ b/contrib/tools/bison/lib/bitset.h
@@ -1,6 +1,6 @@
 /* Generic bitsets.
 
-   Copyright (C) 2002-2004, 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GL_BITSET_H
 #define _GL_BITSET_H
@@ -109,7 +109,7 @@ enum bitset_type bitset_type_choose (bitset_bindex, bitset_attrs);
 /* Create a bitset of desired type and size.  The bitset is zeroed.  */
 bitset bitset_alloc (bitset_bindex, enum bitset_type);
 
-/* Free bitset.  */
+/* Free bitset.  Do nothing if NULL.  */
 void bitset_free (bitset);
 
 /* Create a bitset of desired type and size using an obstack.  The
@@ -117,7 +117,7 @@ void bitset_free (bitset);
 bitset bitset_obstack_alloc (struct obstack *bobstack,
                              bitset_bindex, enum bitset_type);
 
-/* Free bitset allocated on obstack.  */
+/* Free bitset allocated on obstack.  Do nothing if NULL.  */
 void bitset_obstack_free (bitset);
 
 /* Create a bitset of desired size and attributes.  The bitset is zeroed.  */
@@ -178,8 +178,9 @@ bitset_test (bitset bset, bitset_bindex bitno)
 /* Return size in bits of bitset SRC.  */
 #define bitset_size(SRC) BITSET_SIZE_ (SRC)
 
-/* Change size of bitset.  */
-void bitset_resize (bitset, bitset_bindex);
+/* Change size in bits of bitset.  New bits are zeroed.  Return
+   SIZE.  */
+#define bitset_resize(DST, SIZE) BITSET_RESIZE_ (DST, SIZE)
 
 /* Return number of bits set in bitset SRC.  */
 #define bitset_count(SRC) BITSET_COUNT_ (SRC)
diff --git a/contrib/tools/bison/lib/bitset/array.c b/contrib/tools/bison/lib/bitset/array.c
index fde9fa24f562..e611f38bcfe8 100644
--- a/contrib/tools/bison/lib/bitset/array.c
+++ b/contrib/tools/bison/lib/bitset/array.c
@@ -1,6 +1,6 @@
 /* Array bitsets.
 
-   Copyright (C) 2002-2003, 2006, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002-2003, 2006, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/contrib/tools/bison/lib/bitset/array.h b/contrib/tools/bison/lib/bitset/array.h
index 6f49a2e04741..0ec6a46129af 100644
--- a/contrib/tools/bison/lib/bitset/array.h
+++ b/contrib/tools/bison/lib/bitset/array.h
@@ -1,6 +1,6 @@
 /* Functions to support abitsets.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BITSET_ARRAY_H
 #define _BITSET_ARRAY_H
diff --git a/contrib/tools/bison/lib/bitset/base.h b/contrib/tools/bison/lib/bitset/base.h
index 4fcafac8b67d..46ec894eceb1 100644
--- a/contrib/tools/bison/lib/bitset/base.h
+++ b/contrib/tools/bison/lib/bitset/base.h
@@ -1,6 +1,6 @@
 /* Base bitset stuff.
 
-   Copyright (C) 2002-2004, 2006, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002-2004, 2006, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BITSET_BASE_H
 #define _BITSET_BASE_H
@@ -55,8 +55,6 @@ enum bitset_type {BITSET_ARRAY, BITSET_LIST, BITSET_TABLE, BITSET_VECTOR,
 
 extern const char * const bitset_type_names[];
 
-enum bitset_alloc_type {BITSET_MALLOC, BITSET_OBALLOC};
-
 /* Data type used to store a word of bits.  */
 typedef unsigned long bitset_word;
 #define BITSET_WORD_BITS ((unsigned) (CHAR_BIT * sizeof (bitset_word)))
diff --git a/contrib/tools/bison/lib/bitset/list.c b/contrib/tools/bison/lib/bitset/list.c
index f42edb8ea3ec..f45367182714 100644
--- a/contrib/tools/bison/lib/bitset/list.c
+++ b/contrib/tools/bison/lib/bitset/list.c
@@ -1,6 +1,6 @@
 /* Functions to support link list bitsets.
 
-   Copyright (C) 2002-2004, 2006, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002-2004, 2006, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -859,7 +859,8 @@ lbitset_unused_clear (bitset dst)
       bitset_word *srcp = elt->words;
       bitset_windex windex = n_bits / BITSET_WORD_BITS;
 
-      srcp[windex - elt->index] &= ((bitset_word) 1 << last_bit) - 1;
+      srcp[windex - elt->index]
+        &= ((bitset_word) 1 << (last_bit % BITSET_WORD_BITS)) - 1;
       windex++;
 
       for (; (windex - elt->index) < LBITSET_ELT_WORDS; windex++)
diff --git a/contrib/tools/bison/lib/bitset/list.h b/contrib/tools/bison/lib/bitset/list.h
index a0fc09f8c6de..8b24f2593f15 100644
--- a/contrib/tools/bison/lib/bitset/list.h
+++ b/contrib/tools/bison/lib/bitset/list.h
@@ -1,6 +1,6 @@
 /* Functions to support lbitsets.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BITSET_LIST_H
 #define _BITSET_LIST_H
diff --git a/contrib/tools/bison/lib/bitset/stats.c b/contrib/tools/bison/lib/bitset/stats.c
index da73cdcac522..222cde09051b 100644
--- a/contrib/tools/bison/lib/bitset/stats.c
+++ b/contrib/tools/bison/lib/bitset/stats.c
@@ -1,6 +1,6 @@
 /* Bitset statistics.
 
-   Copyright (C) 2002-2006, 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* This file is a wrapper bitset implementation for the other bitset
    implementations.  It provides bitset compatibility checking and
@@ -694,7 +694,7 @@ bitset_stats_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
     case BITSET_ARRAY:
       {
         size_t bytes = abitset_bytes (n_bits);
-        bset->s.bset = xcalloc (1, bytes);
+        bset->s.bset = xzalloc (bytes);
         abitset_init (bset->s.bset, n_bits);
       }
       break;
@@ -702,7 +702,7 @@ bitset_stats_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
     case BITSET_LIST:
       {
         size_t bytes = lbitset_bytes (n_bits);
-        bset->s.bset = xcalloc (1, bytes);
+        bset->s.bset = xzalloc (bytes);
         lbitset_init (bset->s.bset, n_bits);
       }
       break;
@@ -710,7 +710,7 @@ bitset_stats_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
     case BITSET_TABLE:
       {
         size_t bytes = tbitset_bytes (n_bits);
-        bset->s.bset = xcalloc (1, bytes);
+        bset->s.bset = xzalloc (bytes);
         tbitset_init (bset->s.bset, n_bits);
       }
       break;
@@ -718,7 +718,7 @@ bitset_stats_init (bitset bset, bitset_bindex n_bits, enum bitset_type type)
     case BITSET_VECTOR:
       {
         size_t bytes = vbitset_bytes (n_bits);
-        bset->s.bset = xcalloc (1, bytes);
+        bset->s.bset = xzalloc (bytes);
         vbitset_init (bset->s.bset, n_bits);
       }
       break;
diff --git a/contrib/tools/bison/lib/bitset/stats.h b/contrib/tools/bison/lib/bitset/stats.h
index 95e64dc4e51b..0bfed3e21b80 100644
--- a/contrib/tools/bison/lib/bitset/stats.h
+++ b/contrib/tools/bison/lib/bitset/stats.h
@@ -1,6 +1,6 @@
 /* Functions to support bitset statistics.
 
-   Copyright (C) 2002-2004, 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BITSET_STATS_H
 #define _BITSET_STATS_H
diff --git a/contrib/tools/bison/lib/bitset/table.c b/contrib/tools/bison/lib/bitset/table.c
index 8351cf784825..ab68e518d040 100644
--- a/contrib/tools/bison/lib/bitset/table.c
+++ b/contrib/tools/bison/lib/bitset/table.c
@@ -1,6 +1,6 @@
 /* Functions to support expandable bitsets.
 
-   Copyright (C) 2002-2006, 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "obstack.h"
+#include "xalloc.h"
 
 /* This file implements expandable bitsets.  These bitsets can be of
    arbitrary length and are more efficient than arrays of bits for
@@ -142,7 +143,7 @@ tbitset_resize (bitset src, bitset_bindex n_bits)
 
           bitset_windex size = oldsize == 0 ? newsize : newsize + newsize / 4;
           EBITSET_ELTS (src)
-            = realloc (EBITSET_ELTS (src), size * sizeof (tbitset_elt *));
+            = xrealloc (EBITSET_ELTS (src), size * sizeof (tbitset_elt *));
           EBITSET_ASIZE (src) = size;
         }
 
@@ -155,9 +156,13 @@ tbitset_resize (bitset src, bitset_bindex n_bits)
          the memory unless it is shrinking by a reasonable amount.  */
       if ((oldsize - newsize) >= oldsize / 2)
         {
-          EBITSET_ELTS (src)
+          void *p
             = realloc (EBITSET_ELTS (src), newsize * sizeof (tbitset_elt *));
-          EBITSET_ASIZE (src) = newsize;
+          if (p)
+            {
+              EBITSET_ELTS (src) = p;
+              EBITSET_ASIZE (src) = newsize;
+            }
         }
 
       /* Need to prune any excess bits.  FIXME.  */
@@ -188,21 +193,21 @@ tbitset_elt_alloc (void)
           /* Let particular systems override the size of a chunk.  */
 
 #ifndef OBSTACK_CHUNK_SIZE
-#define OBSTACK_CHUNK_SIZE 0
+# define OBSTACK_CHUNK_SIZE 0
 #endif
 
           /* Let them override the alloc and free routines too.  */
 
 #ifndef OBSTACK_CHUNK_ALLOC
-#define OBSTACK_CHUNK_ALLOC xmalloc
+# define OBSTACK_CHUNK_ALLOC xmalloc
 #endif
 
 #ifndef OBSTACK_CHUNK_FREE
-#define OBSTACK_CHUNK_FREE free
+# define OBSTACK_CHUNK_FREE free
 #endif
 
 #if ! defined __GNUC__ || __GNUC__ < 2
-#define __alignof__(type) 0
+# define __alignof__(type) 0
 #endif
 
           obstack_specify_allocation (&tbitset_obstack, OBSTACK_CHUNK_SIZE,
@@ -300,7 +305,7 @@ tbitset_elt_find (bitset bset, bitset_bindex bindex,
       abort ();
 
     case EBITSET_FIND:
-      return 0;
+      return NULL;
 
     case EBITSET_CREATE:
       if (eindex >= size)
@@ -588,8 +593,8 @@ tbitset_list_reverse (bitset bset, bitset_bindex *list,
 
 
 /* Find list of up to NUM bits set in BSET starting from and including
- *NEXT and store in array LIST.  Return with actual number of bits
- found and with *NEXT indicating where search stopped.  */
+   *NEXT and store in array LIST.  Return with actual number of bits
+   found and with *NEXT indicating where search stopped.  */
 static bitset_bindex
 tbitset_list (bitset bset, bitset_bindex *list,
               bitset_bindex num, bitset_bindex *next)
@@ -607,17 +612,14 @@ tbitset_list (bitset bset, bitset_bindex *list,
   if (bitno % EBITSET_ELT_BITS)
     {
       /* We need to start within an element.  This is not very common.  */
-
       tbitset_elt *elt = elts[eindex];
       if (elt)
         {
-          bitset_windex woffset;
           bitset_word *srcp = EBITSET_WORDS (elt);
+          bitset_windex woffset = eindex * EBITSET_ELT_WORDS;
 
-          bitset_windex windex = bitno / BITSET_WORD_BITS;
-          woffset = eindex * EBITSET_ELT_WORDS;
-
-          for (; (windex - woffset) < EBITSET_ELT_WORDS; windex++)
+          for (bitset_windex windex = bitno / BITSET_WORD_BITS;
+               (windex - woffset) < EBITSET_ELT_WORDS; windex++)
             {
               bitset_word word = srcp[windex - woffset] >> (bitno % BITSET_WORD_BITS);
 
@@ -781,7 +783,8 @@ tbitset_unused_clear (bitset dst)
           bitset_windex windex = n_bits / BITSET_WORD_BITS;
           bitset_windex woffset = eindex * EBITSET_ELT_WORDS;
 
-          srcp[windex - woffset] &= ((bitset_word) 1 << last_bit) - 1;
+          srcp[windex - woffset]
+            &= ((bitset_word) 1 << (last_bit % BITSET_WORD_BITS)) - 1;
           windex++;
           for (; (windex - woffset) < EBITSET_ELT_WORDS; windex++)
             srcp[windex - woffset] = 0;
@@ -1020,13 +1023,9 @@ tbitset_op3_cmp (bitset dst, bitset src1, bitset src2, enum bitset_ops op)
         }
 
       if (!tbitset_elt_zero_p (delt))
-        {
-          tbitset_elt_add (dst, delt, j);
-        }
+        tbitset_elt_add (dst, delt, j);
       else
-        {
-          tbitset_elt_free (delt);
-        }
+        tbitset_elt_free (delt);
     }
 
   /* If we have elements of DST left over, free them all.  */
@@ -1061,7 +1060,8 @@ tbitset_and_cmp (bitset dst, bitset src1, bitset src2)
       tbitset_zero (dst);
       return changed;
     }
-  return tbitset_op3_cmp (dst, src1, src2, BITSET_OP_AND);
+  else
+    return tbitset_op3_cmp (dst, src1, src2, BITSET_OP_AND);
 }
 
 
@@ -1076,9 +1076,7 @@ static bool
 tbitset_andn_cmp (bitset dst, bitset src1, bitset src2)
 {
   if (EBITSET_ZERO_P (src2))
-    {
-      return tbitset_copy_cmp (dst, src1);
-    }
+    return tbitset_copy_cmp (dst, src1);
   else if (EBITSET_ZERO_P (src1))
     {
       tbitset_weed (dst);
@@ -1086,7 +1084,8 @@ tbitset_andn_cmp (bitset dst, bitset src1, bitset src2)
       tbitset_zero (dst);
       return changed;
     }
-  return tbitset_op3_cmp (dst, src1, src2, BITSET_OP_ANDN);
+  else
+    return tbitset_op3_cmp (dst, src1, src2, BITSET_OP_ANDN);
 }
 
 
@@ -1101,14 +1100,11 @@ static bool
 tbitset_or_cmp (bitset dst, bitset src1, bitset src2)
 {
   if (EBITSET_ZERO_P (src2))
-    {
-      return tbitset_copy_cmp (dst, src1);
-    }
+    return tbitset_copy_cmp (dst, src1);
   else if (EBITSET_ZERO_P (src1))
-    {
-      return tbitset_copy_cmp (dst, src2);
-    }
-  return tbitset_op3_cmp (dst, src1, src2, BITSET_OP_OR);
+    return tbitset_copy_cmp (dst, src2);
+  else
+    return tbitset_op3_cmp (dst, src1, src2, BITSET_OP_OR);
 }
 
 
@@ -1123,14 +1119,11 @@ static bool
 tbitset_xor_cmp (bitset dst, bitset src1, bitset src2)
 {
   if (EBITSET_ZERO_P (src2))
-    {
-      return tbitset_copy_cmp (dst, src1);
-    }
+    return tbitset_copy_cmp (dst, src1);
   else if (EBITSET_ZERO_P (src1))
-    {
-      return tbitset_copy_cmp (dst, src2);
-    }
-  return tbitset_op3_cmp (dst, src1, src2, BITSET_OP_XOR);
+    return tbitset_copy_cmp (dst, src2);
+  else
+    return tbitset_op3_cmp (dst, src1, src2, BITSET_OP_XOR);
 }
 
 
diff --git a/contrib/tools/bison/lib/bitset/table.h b/contrib/tools/bison/lib/bitset/table.h
index 6c781adde357..cf8555b9ce99 100644
--- a/contrib/tools/bison/lib/bitset/table.h
+++ b/contrib/tools/bison/lib/bitset/table.h
@@ -1,6 +1,6 @@
 /* Functions to support tbitsets.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BITSET_TABLE_H
 #define _BITSET_TABLE_H
diff --git a/contrib/tools/bison/lib/bitset/vector.c b/contrib/tools/bison/lib/bitset/vector.c
index 15d3e9956775..cb60ba4a3a85 100644
--- a/contrib/tools/bison/lib/bitset/vector.c
+++ b/contrib/tools/bison/lib/bitset/vector.c
@@ -1,6 +1,6 @@
 /* Variable array bitsets.
 
-   Copyright (C) 2002-2006, 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2006, 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
 
@@ -15,7 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -24,6 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "xalloc.h"
+
 /* This file implements variable size bitsets stored as a variable
    length array of words.  Any unused bits in the last word must be
    zero.
@@ -74,13 +76,12 @@ vbitset_resize (bitset src, bitset_bindex n_bits)
 
           bitset_windex size = oldsize == 0 ? newsize : newsize + newsize / 4;
           VBITSET_WORDS (src)
-            = realloc (VBITSET_WORDS (src), size * sizeof (bitset_word));
+            = xrealloc (VBITSET_WORDS (src), size * sizeof (bitset_word));
           VBITSET_ASIZE (src) = size;
         }
 
       memset (VBITSET_WORDS (src) + oldsize, 0,
               (newsize - oldsize) * sizeof (bitset_word));
-      VBITSET_SIZE (src) = newsize;
     }
   else
     {
@@ -88,16 +89,19 @@ vbitset_resize (bitset src, bitset_bindex n_bits)
          the memory unless it is shrinking by a reasonable amount.  */
       if ((oldsize - newsize) >= oldsize / 2)
         {
-          VBITSET_WORDS (src)
+          void *p
             = realloc (VBITSET_WORDS (src), newsize * sizeof (bitset_word));
-          VBITSET_ASIZE (src) = newsize;
+          if (p)
+            {
+              VBITSET_WORDS (src) = p;
+              VBITSET_ASIZE (src) = newsize;
+            }
         }
 
       /* Need to prune any excess bits.  FIXME.  */
-
-      VBITSET_SIZE (src) = newsize;
     }
 
+  VBITSET_SIZE (src) = newsize;
   BITSET_NBITS_ (src) = n_bits;
   return n_bits;
 }
@@ -467,7 +471,6 @@ vbitset_and (bitset dst, bitset src1, bitset src2)
 static bool
 vbitset_and_cmp (bitset dst, bitset src1, bitset src2)
 {
-  bool changed = false;
   vbitset_resize (dst, max (BITSET_SIZE_ (src1), BITSET_SIZE_ (src2)));
 
   bitset_windex dsize = VBITSET_SIZE (dst);
@@ -477,6 +480,7 @@ vbitset_and_cmp (bitset dst, bitset src1, bitset src2)
   bitset_word *src1p = VBITSET_WORDS (src1);
   bitset_word *src2p = VBITSET_WORDS (src2);
 
+  bool changed = false;
   unsigned i;
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
@@ -546,7 +550,6 @@ vbitset_andn (bitset dst, bitset src1, bitset src2)
 static bool
 vbitset_andn_cmp (bitset dst, bitset src1, bitset src2)
 {
-  bool changed = false;
   vbitset_resize (dst, max (BITSET_SIZE_ (src1), BITSET_SIZE_ (src2)));
 
   bitset_windex dsize = VBITSET_SIZE (dst);
@@ -556,6 +559,7 @@ vbitset_andn_cmp (bitset dst, bitset src1, bitset src2)
   bitset_word *src1p = VBITSET_WORDS (src1);
   bitset_word *src2p = VBITSET_WORDS (src2);
 
+  bool changed = false;
   unsigned i;
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
@@ -633,8 +637,6 @@ vbitset_or (bitset dst, bitset src1, bitset src2)
 static bool
 vbitset_or_cmp (bitset dst, bitset src1, bitset src2)
 {
-  bool changed = false;
-
   vbitset_resize (dst, max (BITSET_SIZE_ (src1), BITSET_SIZE_ (src2)));
 
   bitset_windex dsize = VBITSET_SIZE (dst);
@@ -644,6 +646,7 @@ vbitset_or_cmp (bitset dst, bitset src1, bitset src2)
   bitset_word *src1p = VBITSET_WORDS (src1);
   bitset_word *src2p = VBITSET_WORDS (src2);
 
+  bool changed = false;
   unsigned i;
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
@@ -711,7 +714,6 @@ vbitset_xor (bitset dst, bitset src1, bitset src2)
 static bool
 vbitset_xor_cmp (bitset dst, bitset src1, bitset src2)
 {
-  bool changed = false;
   vbitset_resize (dst, max (BITSET_SIZE_ (src1), BITSET_SIZE_ (src2)));
 
   bitset_windex dsize = VBITSET_SIZE (dst);
@@ -721,6 +723,7 @@ vbitset_xor_cmp (bitset dst, bitset src1, bitset src2)
   bitset_word *src1p = VBITSET_WORDS (src1);
   bitset_word *src2p = VBITSET_WORDS (src2);
 
+  bool changed = false;
   unsigned i;
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
@@ -903,8 +906,8 @@ vbitset_or_and_cmp (bitset dst, bitset src1, bitset src2, bitset src3)
   bitset_word *dstp = VBITSET_WORDS (dst);
   bitset_windex size = VBITSET_SIZE (dst);
 
-  unsigned i;
   bool changed = false;
+  unsigned i;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ | *src2p++) & *src3p++;
@@ -929,6 +932,13 @@ vbitset_copy (bitset dst, bitset src)
 }
 
 
+static void
+vbitset_free (bitset bset)
+{
+  free (VBITSET_WORDS (bset));
+}
+
+
 /* Vector of operations for multiple word bitsets.  */
 struct bitset_vtable vbitset_vtable = {
   vbitset_set,
@@ -962,7 +972,7 @@ struct bitset_vtable vbitset_vtable = {
   vbitset_or_and_cmp,
   vbitset_list,
   vbitset_list_reverse,
-  NULL,
+  vbitset_free,
   BITSET_VECTOR
 };
 
diff --git a/contrib/tools/bison/lib/bitset/vector.h b/contrib/tools/bison/lib/bitset/vector.h
index 1f5b94dea092..aeea89a6c723 100644
--- a/contrib/tools/bison/lib/bitset/vector.h
+++ b/contrib/tools/bison/lib/bitset/vector.h
@@ -1,6 +1,6 @@
 /* Functions to support vbitsets.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BITSET_VECTOR_H
 #define _BITSET_VECTOR_H
diff --git a/contrib/tools/bison/lib/bitsetv.c b/contrib/tools/bison/lib/bitsetv.c
index e3cc5845a766..0ec9ac38c232 100644
--- a/contrib/tools/bison/lib/bitsetv.c
+++ b/contrib/tools/bison/lib/bitsetv.c
@@ -1,6 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2001-2002, 2004-2006, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2001-2002, 2004-2006, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -14,7 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -41,7 +41,7 @@ bitsetv_alloc (bitset_bindex n_vecs, bitset_bindex n_bits,
   /* Allocate vector table at head of bitset array.  */
   size_t vector_bytes = (n_vecs + 1) * sizeof (bitset) + bytes - 1;
   vector_bytes -= vector_bytes % bytes;
-  bitset *bsetv = xcalloc (1, vector_bytes + bytes * n_vecs);
+  bitset *bsetv = xzalloc (vector_bytes + bytes * n_vecs);
 
   bitset_bindex i = 0;
   for (i = 0; i < n_vecs; i++)
@@ -71,9 +71,12 @@ bitsetv_create (bitset_bindex n_vecs, bitset_bindex n_bits, unsigned attr)
 void
 bitsetv_free (bitsetv bsetv)
 {
-  for (bitset_bindex i = 0; bsetv[i]; i++)
-    BITSET_FREE_ (bsetv[i]);
-  free (bsetv);
+  if (bsetv)
+    {
+      for (bitset_bindex i = 0; bsetv[i]; i++)
+        BITSET_FREE_ (bsetv[i]);
+      free (bsetv);
+    }
 }
 
 
diff --git a/contrib/tools/bison/lib/bitsetv.h b/contrib/tools/bison/lib/bitsetv.h
index 798b70d9b42d..13e9ba4cd6b5 100644
--- a/contrib/tools/bison/lib/bitsetv.h
+++ b/contrib/tools/bison/lib/bitsetv.h
@@ -1,6 +1,6 @@
 /* Bitset vectors.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz).
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _BITSETV_H
 #define _BITSETV_H
@@ -33,7 +33,7 @@ bitsetv bitsetv_alloc (bitset_bindex, bitset_bindex, enum bitset_type);
    attribute hints specified by ATTR.  */
 bitsetv bitsetv_create (bitset_bindex, bitset_bindex, unsigned);
 
-/* Free vector of bitsets.  */
+/* Free vector of bitsets.  Do nothing if NULL.  */
 void bitsetv_free (bitsetv);
 
 /* Zero vector of bitsets.  */
diff --git a/contrib/tools/bison/lib/c-ctype.h b/contrib/tools/bison/lib/c-ctype.h
index 4d521763843f..fbd11b34508f 100644
--- a/contrib/tools/bison/lib/c-ctype.h
+++ b/contrib/tools/bison/lib/c-ctype.h
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2020 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/c-strcase.h b/contrib/tools/bison/lib/c-strcase.h
index b67c9b5da0e3..3b711f5aa57f 100644
--- a/contrib/tools/bison/lib/c-strcase.h
+++ b/contrib/tools/bison/lib/c-strcase.h
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2019 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/c-strcasecmp.c b/contrib/tools/bison/lib/c-strcasecmp.c
index ec50f1abe763..951220f3e29e 100644
--- a/contrib/tools/bison/lib/c-strcasecmp.c
+++ b/contrib/tools/bison/lib/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/c-strcaseeq.h b/contrib/tools/bison/lib/c-strcaseeq.h
index bcc81fc388db..304c72ea49d1 100644
--- a/contrib/tools/bison/lib/c-strcaseeq.h
+++ b/contrib/tools/bison/lib/c-strcaseeq.h
@@ -1,5 +1,5 @@
 /* Optimized case-insensitive string comparison in C locale.
-   Copyright (C) 2001-2002, 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/contrib/tools/bison/lib/c-strncasecmp.c b/contrib/tools/bison/lib/c-strncasecmp.c
index 513c353f6c28..9ad49191b7fd 100644
--- a/contrib/tools/bison/lib/c-strncasecmp.c
+++ b/contrib/tools/bison/lib/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/careadlinkat.c b/contrib/tools/bison/lib/careadlinkat.c
index e56d5030856e..1effdb78451f 100644
--- a/contrib/tools/bison/lib/careadlinkat.c
+++ b/contrib/tools/bison/lib/careadlinkat.c
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2019 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -54,7 +54,7 @@
 
    The PREADLINKAT function specifies how to read links.  It operates
    like POSIX readlinkat()
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
+   <https://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
    but can assume that its first argument is the same as FD.
 
    If successful, return the buffer address; otherwise return NULL and
diff --git a/contrib/tools/bison/lib/careadlinkat.h b/contrib/tools/bison/lib/careadlinkat.h
index 68b69aa88939..a4a37b274d0a 100644
--- a/contrib/tools/bison/lib/careadlinkat.h
+++ b/contrib/tools/bison/lib/careadlinkat.h
@@ -1,6 +1,6 @@
 /* Read symbolic links into a buffer without size limitation, relative to fd.
 
-   Copyright (C) 2011-2019 Free Software Foundation, Inc.
+   Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -40,14 +40,14 @@ struct allocator;
 
    The PREADLINKAT function specifies how to read links.  It operates
    like POSIX readlinkat()
-   <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
+   <https://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>
    but can assume that its first argument is the same as FD.
 
    If successful, return the buffer address; otherwise return NULL and
    set errno.  */
 
 char *careadlinkat (int fd, char const *filename,
-                    char *buffer, size_t buffer_size,
+                    char *restrict buffer, size_t buffer_size,
                     struct allocator const *alloc,
                     ssize_t (*preadlinkat) (int, char const *,
                                             char *, size_t));
diff --git a/contrib/tools/bison/lib/cloexec.c b/contrib/tools/bison/lib/cloexec.c
index db425766a0e1..510be3d57ec0 100644
--- a/contrib/tools/bison/lib/cloexec.c
+++ b/contrib/tools/bison/lib/cloexec.c
@@ -1,6 +1,6 @@
 /* cloexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 1991, 2004-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2004-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/cloexec.h b/contrib/tools/bison/lib/cloexec.h
index 06ad945d8e2a..f14a99736d50 100644
--- a/contrib/tools/bison/lib/cloexec.h
+++ b/contrib/tools/bison/lib/cloexec.h
@@ -1,6 +1,6 @@
 /* cloexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 2004, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/close-stream.c b/contrib/tools/bison/lib/close-stream.c
index 5458c4f29f36..04bc8009a573 100644
--- a/contrib/tools/bison/lib/close-stream.c
+++ b/contrib/tools/bison/lib/close-stream.c
@@ -1,6 +1,6 @@
 /* Close a stream, with nicer error checking than fclose's.
 
-   Copyright (C) 1998-2002, 2004, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-2002, 2004, 2006-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/close.c b/contrib/tools/bison/lib/close.c
index 40ce845bc333..0c8780dc24ab 100644
--- a/contrib/tools/bison/lib/close.c
+++ b/contrib/tools/bison/lib/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/closeout.c b/contrib/tools/bison/lib/closeout.c
index 4a604ec35d4b..8b92ce9476b4 100644
--- a/contrib/tools/bison/lib/closeout.c
+++ b/contrib/tools/bison/lib/closeout.c
@@ -1,6 +1,6 @@
 /* Close standard output and standard error, exiting with a diagnostic on error.
 
-   Copyright (C) 1998-2002, 2004, 2006, 2008-2019 Free Software Foundation,
+   Copyright (C) 1998-2002, 2004, 2006, 2008-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/closeout.h b/contrib/tools/bison/lib/closeout.h
index ac89f760a952..8294c6268c9b 100644
--- a/contrib/tools/bison/lib/closeout.h
+++ b/contrib/tools/bison/lib/closeout.h
@@ -1,6 +1,6 @@
 /* Close standard output and standard error.
 
-   Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2019 Free Software
+   Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/concat-filename.c b/contrib/tools/bison/lib/concat-filename.c
index df0e170a89cf..367e41d22c95 100644
--- a/contrib/tools/bison/lib/concat-filename.c
+++ b/contrib/tools/bison/lib/concat-filename.c
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff --git a/contrib/tools/bison/lib/concat-filename.h b/contrib/tools/bison/lib/concat-filename.h
index 4448b783fce8..64b461e39d4c 100644
--- a/contrib/tools/bison/lib/concat-filename.h
+++ b/contrib/tools/bison/lib/concat-filename.h
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2007-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/config-linux.h b/contrib/tools/bison/lib/config-linux.h
index 9c4e201410b4..5d1714a49f11 100644
--- a/contrib/tools/bison/lib/config-linux.h
+++ b/contrib/tools/bison/lib/config-linux.h
@@ -31,9 +31,6 @@
 /* Define to 1 if using `alloca.c'. */
 /* #undef C_ALLOCA */
 
-/* Define to 1 if the C locale may have encoding errors. */
-#define C_LOCALE_MAYBE_EILSEQ 1
-
 /* Define as the bit index in the word where to find bit 0 of the exponent of
    'double'. */
 #define DBL_EXPBIT0_BIT 20
@@ -113,7 +110,7 @@
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module lock shall be considered present. */
-/* #undef GNULIB_LOCK */
+#define GNULIB_LOCK 1
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module malloc-gnu shall be considered present. */
@@ -187,9 +184,15 @@
 /* Define to 1 when the gnulib module fstat should be tested. */
 /* #undef GNULIB_TEST_FSTAT */
 
+/* Define to 1 when the gnulib module fsync should be tested. */
+#define GNULIB_TEST_FSYNC 1
+
 /* Define to 1 when the gnulib module getdtablesize should be tested. */
 #define GNULIB_TEST_GETDTABLESIZE 1
 
+/* Define to 1 when the gnulib module getopt-posix should be tested. */
+#define GNULIB_TEST_GETOPT_POSIX 1
+
 /* Define to 1 when the gnulib module getrusage should be tested. */
 #define GNULIB_TEST_GETRUSAGE 1
 
@@ -208,6 +211,15 @@
 /* Define to 1 when the gnulib module isnanl should be tested. */
 #define GNULIB_TEST_ISNANL 1
 
+/* Define to 1 when the gnulib module iswblank should be tested. */
+#define GNULIB_TEST_ISWBLANK 1
+
+/* Define to 1 when the gnulib module iswdigit should be tested. */
+#define GNULIB_TEST_ISWDIGIT 1
+
+/* Define to 1 when the gnulib module iswxdigit should be tested. */
+#define GNULIB_TEST_ISWXDIGIT 1
+
 /* Define to 1 when the gnulib module ldexpl should be tested. */
 #define GNULIB_TEST_LDEXPL 1
 
@@ -301,6 +313,9 @@
 /* Define to 1 when the gnulib module rmdir should be tested. */
 /* #undef GNULIB_TEST_RMDIR */
 
+/* Define to 1 when the gnulib module setlocale_null should be tested. */
+#define GNULIB_TEST_SETLOCALE_NULL 1
+
 /* Define to 1 when the gnulib module sigaction should be tested. */
 #define GNULIB_TEST_SIGACTION 1
 
@@ -349,6 +364,9 @@
 /* Define to 1 when the gnulib module unsetenv should be tested. */
 #define GNULIB_TEST_UNSETENV 1
 
+/* Define to 1 when the gnulib module vasprintf should be tested. */
+#define GNULIB_TEST_VASPRINTF 1
+
 /* Define to 1 when the gnulib module vfprintf-posix should be tested. */
 #define GNULIB_TEST_VFPRINTF_POSIX 1
 
@@ -364,6 +382,9 @@
 /* Define to 1 when the gnulib module wcwidth should be tested. */
 #define GNULIB_TEST_WCWIDTH 1
 
+/* Define if your system defines TIOCGWINSZ in sys/ioctl.h. */
+#define GWINSZ_IN_SYS_IOCTL 1
+
 /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
    may be supplied by this distribution. */
 #define HAVE_ALLOCA 1
@@ -391,10 +412,6 @@
    CoreFoundation framework. */
 /* #undef HAVE_CFLOCALECOPYCURRENT */
 
-/* Define to 1 if you have the Mac OS X function
-   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
-/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
-
 /* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
@@ -420,6 +437,9 @@
    libc. */
 /* #undef HAVE_COPYSIGN_IN_LIBC */
 
+/* Define to 1 if you have the `copy_file_range' function. */
+/* #undef HAVE_COPY_FILE_RANGE */
+
 /* Define to 1 if you have the <crtdefs.h> header file. */
 /* #undef HAVE_CRTDEFS_H */
 
@@ -495,6 +515,10 @@
    don't. */
 #define HAVE_DECL_GETHRTIME 0
 
+/* Define to 1 if you have the declaration of `iswblank', and to 0 if you
+   don't. */
+#define HAVE_DECL_ISWBLANK 1
+
 /* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you
    don't. */
 /* #undef HAVE_DECL_MBRTOWC */
@@ -597,6 +621,9 @@
 /* Define if the frexp function is available in libc. */
 #define HAVE_FREXP_IN_LIBC 1
 
+/* Define to 1 if you have the `fsync' function. */
+#define HAVE_FSYNC 1
+
 /* Define to 1 if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
@@ -649,6 +676,9 @@
 /* Define if the isnan(long double) function is available in libc. */
 #define HAVE_ISNANL_IN_LIBC 1
 
+/* Define to 1 if you have the `iswblank' function. */
+#define HAVE_ISWBLANK 1
+
 /* Define to 1 if you have the `iswcntrl' function. */
 #define HAVE_ISWCNTRL 1
 
@@ -664,6 +694,9 @@
 /* Define if the ldexp function is available in libc. */
 #define HAVE_LDEXP_IN_LIBC 1
 
+/* Define if you have the libtextstyle library. */
+/* #undef HAVE_LIBTEXTSTYLE */
+
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
@@ -754,11 +787,14 @@
 /* Define to 1 if the system has the type `posix_spawn_file_actions_t'. */
 #define HAVE_POSIX_SPAWN_FILE_ACTIONS_T 1
 
+/* Define if you have the <pthread.h> header and the POSIX threads API. */
+#define HAVE_PTHREAD_API 1
+
 /* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
-/* #undef HAVE_PTHREAD_MUTEX_RECURSIVE */
+#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
 
 /* Define if the POSIX multithreading library has read/write locks. */
-/* #undef HAVE_PTHREAD_RWLOCK */
+#define HAVE_PTHREAD_RWLOCK 1
 
 /* Define if the 'pthread_rwlock_rdlock' function prefers a writer to a
    reader. */
@@ -786,7 +822,7 @@
 /* #undef HAVE_SAME_LONG_DOUBLE_AS_DOUBLE */
 
 /* Define to 1 if you have the <sched.h> header file. */
-/* #undef HAVE_SCHED_H */
+#define HAVE_SCHED_H 1
 
 /* Define to 1 if you have the `sched_setparam' function. */
 /* #undef HAVE_SCHED_SETPARAM */
@@ -956,6 +992,15 @@
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #define HAVE_SYS_WAIT_H 1
 
+/* Define to 1 if you have the `tcdrain' function. */
+#define HAVE_TCDRAIN 1
+
+/* Define to 1 if you have the `thrd_create' function. */
+/* #undef HAVE_THRD_CREATE */
+
+/* Define to 1 if you have the <threads.h> header file. */
+#define HAVE_THREADS_H 1
+
 /* Define to 1 if you have the `towlower' function. */
 #define HAVE_TOWLOWER 1
 
@@ -977,9 +1022,16 @@
 /* Define to 1 if you have the `vasnprintf' function. */
 /* #undef HAVE_VASNPRINTF */
 
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
 /* Define to 1 if you have the `vfork' function. */
 /* #undef HAVE_VFORK */
 
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+   declarations. */
+/* #undef HAVE_VISIBILITY */
+
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1
 
@@ -1007,6 +1059,10 @@
 /* Define to 1 if you have the `wcwidth' function. */
 #define HAVE_WCWIDTH 1
 
+/* Define to 1 if the compiler and linker support weak declarations of
+   symbols. */
+#define HAVE_WEAK_SYMBOLS 1
+
 /* Define to 1 if you have the <winsock2.h> header file. */
 /* #undef HAVE_WINSOCK2_H */
 
@@ -1019,6 +1075,9 @@
 /* Define to 1 if O_NOFOLLOW works. */
 #define HAVE_WORKING_O_NOFOLLOW 1
 
+/* Define to 1 if you have the <xlocale.h> header file. */
+/* #undef HAVE_XLOCALE_H */
+
 /* Define to 1 if the system has the type `_Bool'. */
 #define HAVE__BOOL 1
 
@@ -1031,11 +1090,14 @@
 /* Define to 1 if you have the `__fseterr' function. */
 /* #undef HAVE___FSETERR */
 
+/* Define to 1 if the compiler supports the keyword '__inline'. */
+/* #undef HAVE___INLINE */
+
 /* Define to 1 if you have the `__xpg_strerror_r' function. */
 #define HAVE___XPG_STRERROR_R 1
 
 /* Define to the value of ${prefix}, as a string. */
-#define INSTALLPREFIX "/var/empty/bison-3.3.2"
+#define INSTALLPREFIX "/var/empty/bison-3.5.4"
 
 /* Define as the bit index in the word where to find bit 0 of the exponent of
    'long double'. */
@@ -1071,6 +1133,10 @@
    */
 /* #undef MBRTOWC_EMPTY_INPUT_BUG */
 
+/* Define if the mbrtowc function may signal encoding errors in the C locale.
+   */
+#define MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ 1
+
 /* Define if the mbrtowc function has the NULL pwc argument bug. */
 /* #undef MBRTOWC_NULL_ARG1_BUG */
 
@@ -1083,6 +1149,10 @@
 /* Define if the mbrtowc function returns a wrong return value. */
 /* #undef MBRTOWC_RETVAL_BUG */
 
+/* Define if the mbrtowc function stores a wide character when reporting
+   incomplete input. */
+/* #undef MBRTOWC_STORES_INCOMPLETE_BUG */
+
 /* Use GNU style printf and scanf.  */
 #ifndef __USE_MINGW_ANSI_STDIO
 # define __USE_MINGW_ANSI_STDIO 1
@@ -1150,22 +1220,22 @@
 #define PACKAGE_BUGREPORT "bug-bison@gnu.org"
 
 /* The copyright year for this package */
-#define PACKAGE_COPYRIGHT_YEAR 2019
+#define PACKAGE_COPYRIGHT_YEAR 2020
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "GNU Bison"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Bison 3.3.2"
+#define PACKAGE_STRING "GNU Bison 3.5.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "bison"
 
 /* Define to the home page for this package. */
-#define PACKAGE_URL "http://www.gnu.org/software/bison/"
+#define PACKAGE_URL "https://www.gnu.org/software/bison/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.3.2"
+#define PACKAGE_VERSION "3.5.4"
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */
@@ -1225,10 +1295,18 @@
    implementation. */
 #define REPLACE_VFPRINTF_POSIX 1
 
+/* Define to 1 if setlocale (LC_ALL, NULL) is multithread-safe. */
+#define SETLOCALE_NULL_ALL_MTSAFE 1
+
+/* Define to 1 if setlocale (category, NULL) is multithread-safe. */
+#define SETLOCALE_NULL_ONE_MTSAFE 1
+
 /* File name of the Bourne shell.  */
-#if defined __CYGWIN__
-/* Omit the directory part because for 32-bit Cygwin programs in a
-   64-bit Cygwin environment, the Cygwin mounts are not visible.  */
+#if defined __CYGWIN__ || defined __ANDROID__
+/* Omit the directory part because
+   - For 32-bit Cygwin programs in a 64-bit Cygwin environment, the Cygwin
+     mounts are not visible.
+   - On Android, /bin/sh does not exist. It's /system/bin/sh instead.  */
 # define BOURNE_SHELL "sh"
 #else
 # define BOURNE_SHELL "/bin/sh"
@@ -1276,6 +1354,13 @@
    an underscore or empty. */
 #define USER_LABEL_PREFIX 
 
+/* Define if the combination of the ISO C and POSIX multithreading APIs can be
+   used. */
+/* #undef USE_ISOC_AND_POSIX_THREADS */
+
+/* Define if the ISO C multithreading library can be used. */
+/* #undef USE_ISOC_THREADS */
+
 /* Define if the POSIX multithreading library can be used. */
 #define USE_POSIX_THREADS 1
 
@@ -1283,20 +1368,6 @@
    weak. */
 #define USE_POSIX_THREADS_WEAK 1
 
-/* Define if the GNU Pth multithreading library can be used. */
-/* #undef USE_PTH_THREADS */
-
-/* Define if references to the GNU Pth multithreading library should be made
-   weak. */
-/* #undef USE_PTH_THREADS_WEAK */
-
-/* Define if the old Solaris multithreading library can be used. */
-/* #undef USE_SOLARIS_THREADS */
-
-/* Define if references to the old Solaris multithreading library should be
-   made weak. */
-/* #undef USE_SOLARIS_THREADS_WEAK */
-
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # define _ALL_SOURCE 1
@@ -1379,7 +1450,7 @@
 /* #undef USE_WINDOWS_THREADS */
 
 /* Version number of package */
-#define VERSION "3.3.2"
+#define VERSION "3.5.4"
 
 /* Define to 1 if unsetenv returns void instead of int. */
 /* #undef VOID_UNSETENV */
@@ -1388,13 +1459,13 @@
    'wchar_t'. */
 /* #undef WCHAR_T_SUFFIX */
 
+/* Define if sys/ptem.h is required for struct winsize. */
+/* #undef WINSIZE_IN_PTEM */
+
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'wint_t'. */
 /* #undef WINT_T_SUFFIX */
 
-/* Define if using the dmalloc debugging malloc package */
-/* #undef WITH_DMALLOC */
-
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
@@ -1414,15 +1485,15 @@
    `char[]'. */
 /* #undef YYTEXT_POINTER */
 
-/* Enable large inode numbers on Mac OS X 10.5. */
-#define _DARWIN_USE_64_BIT_INODE 1
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
+/* Define to 1 on Solaris. */
+/* #undef _LCONV_C99 */
+
 /* Define to 1 if on MINIX. */
 /* #undef _MINIX */
 
@@ -1431,10 +1502,23 @@
 
 /* The _Noreturn keyword of C11.  */
 #ifndef _Noreturn
-# if 201103 <= (defined __cplusplus ? __cplusplus : 0)
+# if (defined __cplusplus \
+      && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
+          || (defined _MSC_VER && 1900 <= _MSC_VER)) \
+      && 0)
+    /* [[noreturn]] is not practically usable, because with it the syntax
+         extern _Noreturn void func (...);
+       would not be valid; such a declaration would only be valid with 'extern'
+       and '_Noreturn' swapped, or without the 'extern' keyword.  However, some
+       AIX system header files and several gnulib header files use precisely
+       this syntax with 'extern'.  */
 #  define _Noreturn [[noreturn]]
-# elif (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
-        || 4 < __GNUC__ + (7 <= __GNUC_MINOR__))
+# elif ((!defined __cplusplus || defined __clang__) \
+        && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0)  \
+            || 4 < __GNUC__ + (7 <= __GNUC_MINOR__) \
+            || (defined __apple_build_version__ \
+                ? 6000000 <= __apple_build_version__ \
+                : 3 < __clang_major__ + (5 <= __clang_minor__))))
    /* _Noreturn works as-is.  */
 # elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
 #  define _Noreturn __attribute__ ((__noreturn__))
@@ -1466,6 +1550,33 @@
 /* Define to 1 if the system <stdint.h> predates C++11. */
 /* #undef __STDC_LIMIT_MACROS */
 
+/* The _GL_ASYNC_SAFE marker should be attached to functions that are
+   signal handlers (for signals other than SIGABRT, SIGPIPE) or can be
+   invoked from such signal handlers.  Such functions have some restrictions:
+     * All functions that it calls should be marked _GL_ASYNC_SAFE as well,
+       or should be listed as async-signal-safe in POSIX
+       <https://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04>
+       section 2.4.3.  Note that malloc(), sprintf(), and fwrite(), in
+       particular, are NOT async-signal-safe.
+     * All memory locations (variables and struct fields) that these functions
+       access must be marked 'volatile'.  This holds for both read and write
+       accesses.  Otherwise the compiler might optimize away stores to and
+       reads from such locations that occur in the program, depending on its
+       data flow analysis.  For example, when the program contains a loop
+       that is intended to inspect a variable set from within a signal handler
+           while (!signal_occurred)
+             ;
+       the compiler is allowed to transform this into an endless loop if the
+       variable 'signal_occurred' is not declared 'volatile'.
+   Additionally, recall that:
+     * A signal handler should not modify errno (except if it is a handler
+       for a fatal signal and ends by raising the same signal again, thus
+       provoking the termination of the process).  If it invokes a function
+       that may clobber errno, it needs to save and restore the value of
+       errno.  */
+#define _GL_ASYNC_SAFE
+
+
 /* Please see the Gnulib manual for how to use these macros.
 
    Suppress extern inline with HP-UX cc, as it appears to be broken; see
@@ -1490,7 +1601,7 @@
      https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html
 
      DragonFly; see
-     http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
+     http://muscles.dragonflybsd.org/bulk/clang-master-potential/20141111_102002/logs/ah-tty-0.3.12.log
 
      FreeBSD; see:
      https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html
@@ -1612,12 +1723,13 @@
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
 #define restrict __restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT
+/* Work around a bug in older versions of Sun C++, which did not
+   #define __restrict__ or support _Restrict or __restrict__
+   even though the corresponding Sun C compiler ended up with
+   "#define restrict _Restrict" or "#define restrict __restrict__"
+   in the previous line.  This workaround can be removed once
+   we assume Oracle Developer Studio 12.5 (2016) or later.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__
 # define _Restrict
 # define __restrict__
 #endif
@@ -1678,4 +1790,5 @@
 # define _GL_ATTRIBUTE_MALLOC /* empty */
 #endif
 
+#undef HAVE_THREADS_H
 #define _GL_ATTRIBUTE_FORMAT_PRINTF(...)
diff --git a/contrib/tools/bison/lib/config-win.h b/contrib/tools/bison/lib/config-win.h
index a3a4ad1adec4..ef3a3edc5b01 100644
--- a/contrib/tools/bison/lib/config-win.h
+++ b/contrib/tools/bison/lib/config-win.h
@@ -1226,7 +1226,7 @@ char *strsignal (int signum);
 /* #undef PACKAGE_PACKAGER_VERSION */
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Bison 3.3.2"
+#define PACKAGE_STRING "GNU Bison 3.5.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "m4"
@@ -1235,7 +1235,7 @@ char *strsignal (int signum);
 #define PACKAGE_URL "http://www.gnu.org/software/m4/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.3.2"
+#define PACKAGE_VERSION "3.5.4"
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */
@@ -1398,7 +1398,7 @@ char *strsignal (int signum);
 /* #undef USE_WINDOWS_THREADS */
 
 /* Version number of package */
-#define VERSION "3.3.2"
+#define VERSION "3.5.4"
 
 /* Define to 1 if unsetenv returns void instead of int. */
 /* #undef VOID_UNSETENV */
@@ -1709,3 +1709,4 @@ char *strsignal (int signum);
 #define _GL_ATTRIBUTE_FORMAT_PRINTF(...) 
 #define HAVE_ISNANL_IN_LIBC 1
 #define HAVE_ISNAND_IN_LIBC 1
+#define _GL_ASYNC_SAFE
diff --git a/contrib/tools/bison/lib/configmake-linux.h b/contrib/tools/bison/lib/configmake-linux.h
index 14fe253583c5..7dc40e17b9ad 100644
--- a/contrib/tools/bison/lib/configmake-linux.h
+++ b/contrib/tools/bison/lib/configmake-linux.h
@@ -1,28 +1,31 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-#define PREFIX "/var/empty/bison-3.3.2"
-#define EXEC_PREFIX "/var/empty/bison-3.3.2"
-#define BINDIR "/var/empty/bison-3.3.2/bin"
-#define SBINDIR "/var/empty/bison-3.3.2/sbin"
-#define LIBEXECDIR "/var/empty/bison-3.3.2/libexec"
-#define DATAROOTDIR "/var/empty/bison-3.3.2/share"
-#define DATADIR "/var/empty/bison-3.3.2/share"
-#define SYSCONFDIR "/var/empty/bison-3.3.2/etc"
-#define SHAREDSTATEDIR "/var/empty/bison-3.3.2/com"
-#define LOCALSTATEDIR "/var/empty/bison-3.3.2/var"
-#define RUNSTATEDIR "/var/empty/bison-3.3.2/var/run"
-#define INCLUDEDIR "/var/empty/bison-3.3.2/include"
+#if HAVE_WINSOCK2_H
+# include <winsock2.h> /* avoid mingw pollution on DATADIR */
+#endif
+#define PREFIX "/var/empty/bison-3.5.4"
+#define EXEC_PREFIX "/var/empty/bison-3.5.4"
+#define BINDIR "/var/empty/bison-3.5.4/bin"
+#define SBINDIR "/var/empty/bison-3.5.4/sbin"
+#define LIBEXECDIR "/var/empty/bison-3.5.4/libexec"
+#define DATAROOTDIR "/var/empty/bison-3.5.4/share"
+#define DATADIR "/var/empty/bison-3.5.4/share"
+#define SYSCONFDIR "/var/empty/bison-3.5.4/etc"
+#define SHAREDSTATEDIR "/var/empty/bison-3.5.4/com"
+#define LOCALSTATEDIR "/var/empty/bison-3.5.4/var"
+#define RUNSTATEDIR "/var/empty/bison-3.5.4/var/run"
+#define INCLUDEDIR "/var/empty/bison-3.5.4/include"
 #define OLDINCLUDEDIR "/usr/include"
-#define DOCDIR "/var/empty/bison-3.3.2/share/doc/bison"
-#define INFODIR "/var/empty/bison-3.3.2/share/info"
-#define HTMLDIR "/var/empty/bison-3.3.2/share/doc/bison"
-#define DVIDIR "/var/empty/bison-3.3.2/share/doc/bison"
-#define PDFDIR "/var/empty/bison-3.3.2/share/doc/bison"
-#define PSDIR "/var/empty/bison-3.3.2/share/doc/bison"
-#define LIBDIR "/var/empty/bison-3.3.2/lib"
-#define LISPDIR "/var/empty/bison-3.3.2/share/emacs/site-lisp"
-#define LOCALEDIR "/var/empty/bison-3.3.2/share/locale"
-#define MANDIR "/var/empty/bison-3.3.2/share/man"
-#define PKGDATADIR "/var/empty/bison-3.3.2/share/bison"
-#define PKGINCLUDEDIR "/var/empty/bison-3.3.2/include/bison"
-#define PKGLIBDIR "/var/empty/bison-3.3.2/lib/bison"
-#define PKGLIBEXECDIR "/var/empty/bison-3.3.2/libexec/bison"
+#define DOCDIR "/var/empty/bison-3.5.4/share/doc/bison"
+#define INFODIR "/var/empty/bison-3.5.4/share/info"
+#define HTMLDIR "/var/empty/bison-3.5.4/share/doc/bison"
+#define DVIDIR "/var/empty/bison-3.5.4/share/doc/bison"
+#define PDFDIR "/var/empty/bison-3.5.4/share/doc/bison"
+#define PSDIR "/var/empty/bison-3.5.4/share/doc/bison"
+#define LIBDIR "/var/empty/bison-3.5.4/lib"
+#define LISPDIR "/var/empty/bison-3.5.4/share/emacs/site-lisp"
+#define LOCALEDIR "/var/empty/bison-3.5.4/share/locale"
+#define MANDIR "/var/empty/bison-3.5.4/share/man"
+#define PKGDATADIR "/var/empty/bison-3.5.4/share/bison"
+#define PKGINCLUDEDIR "/var/empty/bison-3.5.4/include/bison"
+#define PKGLIBDIR "/var/empty/bison-3.5.4/lib/bison"
+#define PKGLIBEXECDIR "/var/empty/bison-3.5.4/libexec/bison"
diff --git a/contrib/tools/bison/lib/configmake-win.h b/contrib/tools/bison/lib/configmake-win.h
index 3efbed28dfd3..5c53dc59ec38 100644
--- a/contrib/tools/bison/lib/configmake-win.h
+++ b/contrib/tools/bison/lib/configmake-win.h
@@ -1,3 +1,2 @@
-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
-
 #define LOCALEDIR "C:\\Windows"
+#define PKGDATADIR "C:\\Windows"
diff --git a/contrib/tools/bison/lib/diffseq.h b/contrib/tools/bison/lib/diffseq.h
new file mode 100644
index 000000000000..c89363ac9eef
--- /dev/null
+++ b/contrib/tools/bison/lib/diffseq.h
@@ -0,0 +1,529 @@
+/* Analyze differences between two vectors.
+
+   Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2020 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+
+/* The basic idea is to consider two vectors as similar if, when
+   transforming the first vector into the second vector through a
+   sequence of edits (inserts and deletes of one element each),
+   this sequence is short - or equivalently, if the ordered list
+   of elements that are untouched by these edits is long.  For a
+   good introduction to the subject, read about the "Levenshtein
+   distance" in Wikipedia.
+
+   The basic algorithm is described in:
+   "An O(ND) Difference Algorithm and its Variations", Eugene W. Myers,
+   Algorithmica Vol. 1, 1986, pp. 251-266,
+   <https://doi.org/10.1007/BF01840446>.
+   See especially section 4.2, which describes the variation used below.
+
+   The basic algorithm was independently discovered as described in:
+   "Algorithms for Approximate String Matching", Esko Ukkonen,
+   Information and Control Vol. 64, 1985, pp. 100-118,
+   <https://doi.org/10.1016/S0019-9958(85)80046-2>.
+
+   Unless the 'find_minimal' flag is set, this code uses the TOO_EXPENSIVE
+   heuristic, by Paul Eggert, to limit the cost to O(N**1.5 log N)
+   at the price of producing suboptimal output for large inputs with
+   many differences.  */
+
+/* Before including this file, you need to define:
+     ELEMENT                 The element type of the vectors being compared.
+     EQUAL                   A two-argument macro that tests two elements for
+                             equality.
+     OFFSET                  A signed integer type sufficient to hold the
+                             difference between two indices.  Usually
+                             something like ptrdiff_t.
+     EXTRA_CONTEXT_FIELDS    Declarations of fields for 'struct context'.
+     NOTE_DELETE(ctxt, xoff) Record the removal of the object xvec[xoff].
+     NOTE_INSERT(ctxt, yoff) Record the insertion of the object yvec[yoff].
+     EARLY_ABORT(ctxt)       (Optional) A boolean expression that triggers an
+                             early abort of the computation.
+     USE_HEURISTIC           (Optional) Define if you want to support the
+                             heuristic for large vectors.
+   It is also possible to use this file with abstract arrays.  In this case,
+   xvec and yvec are not represented in memory.  They only exist conceptually.
+   In this case, the list of defines above is amended as follows:
+     ELEMENT                 Undefined.
+     EQUAL                   Undefined.
+     XVECREF_YVECREF_EQUAL(ctxt, xoff, yoff)
+                             A three-argument macro: References xvec[xoff] and
+                             yvec[yoff] and tests these elements for equality.
+   Before including this file, you also need to include:
+     #include <limits.h>
+     #include <stdbool.h>
+     #include "minmax.h"
+ */
+
+/* Maximum value of type OFFSET.  */
+#define OFFSET_MAX \
+  ((((OFFSET)1 << (sizeof (OFFSET) * CHAR_BIT - 2)) - 1) * 2 + 1)
+
+/* Default to no early abort.  */
+#ifndef EARLY_ABORT
+# define EARLY_ABORT(ctxt) false
+#endif
+
+/* Use this to suppress gcc's "...may be used before initialized" warnings.
+   Beware: The Code argument must not contain commas.  */
+#ifndef IF_LINT
+# if defined GCC_LINT || defined lint
+#  define IF_LINT(Code) Code
+# else
+#  define IF_LINT(Code) /* empty */
+# endif
+#endif
+
+/* As above, but when Code must contain one comma. */
+#ifndef IF_LINT2
+# if defined GCC_LINT || defined lint
+#  define IF_LINT2(Code1, Code2) Code1, Code2
+# else
+#  define IF_LINT2(Code1, Code2) /* empty */
+# endif
+#endif
+
+/*
+ * Context of comparison operation.
+ */
+struct context
+{
+  #ifdef ELEMENT
+  /* Vectors being compared.  */
+  ELEMENT const *xvec;
+  ELEMENT const *yvec;
+  #endif
+
+  /* Extra fields.  */
+  EXTRA_CONTEXT_FIELDS
+
+  /* Vector, indexed by diagonal, containing 1 + the X coordinate of the point
+     furthest along the given diagonal in the forward search of the edit
+     matrix.  */
+  OFFSET *fdiag;
+
+  /* Vector, indexed by diagonal, containing the X coordinate of the point
+     furthest along the given diagonal in the backward search of the edit
+     matrix.  */
+  OFFSET *bdiag;
+
+  #ifdef USE_HEURISTIC
+  /* This corresponds to the diff --speed-large-files flag.  With this
+     heuristic, for vectors with a constant small density of changes,
+     the algorithm is linear in the vector size.  */
+  bool heuristic;
+  #endif
+
+  /* Edit scripts longer than this are too expensive to compute.  */
+  OFFSET too_expensive;
+
+  /* Snakes bigger than this are considered "big".  */
+  #define SNAKE_LIMIT 20
+};
+
+struct partition
+{
+  /* Midpoints of this partition.  */
+  OFFSET xmid;
+  OFFSET ymid;
+
+  /* True if low half will be analyzed minimally.  */
+  bool lo_minimal;
+
+  /* Likewise for high half.  */
+  bool hi_minimal;
+};
+
+
+/* Find the midpoint of the shortest edit script for a specified portion
+   of the two vectors.
+
+   Scan from the beginnings of the vectors, and simultaneously from the ends,
+   doing a breadth-first search through the space of edit-sequence.
+   When the two searches meet, we have found the midpoint of the shortest
+   edit sequence.
+
+   If FIND_MINIMAL is true, find the minimal edit script regardless of
+   expense.  Otherwise, if the search is too expensive, use heuristics to
+   stop the search and report a suboptimal answer.
+
+   Set PART->(xmid,ymid) to the midpoint (XMID,YMID).  The diagonal number
+   XMID - YMID equals the number of inserted elements minus the number
+   of deleted elements (counting only elements before the midpoint).
+
+   Set PART->lo_minimal to true iff the minimal edit script for the
+   left half of the partition is known; similarly for PART->hi_minimal.
+
+   This function assumes that the first elements of the specified portions
+   of the two vectors do not match, and likewise that the last elements do not
+   match.  The caller must trim matching elements from the beginning and end
+   of the portions it is going to specify.
+
+   If we return the "wrong" partitions, the worst this can do is cause
+   suboptimal diff output.  It cannot cause incorrect diff output.  */
+
+static void
+diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal,
+      struct partition *part, struct context *ctxt)
+{
+  OFFSET *const fd = ctxt->fdiag;       /* Give the compiler a chance. */
+  OFFSET *const bd = ctxt->bdiag;       /* Additional help for the compiler. */
+#ifdef ELEMENT
+  ELEMENT const *const xv = ctxt->xvec; /* Still more help for the compiler. */
+  ELEMENT const *const yv = ctxt->yvec; /* And more and more . . . */
+  #define XREF_YREF_EQUAL(x,y)  EQUAL (xv[x], yv[y])
+#else
+  #define XREF_YREF_EQUAL(x,y)  XVECREF_YVECREF_EQUAL (ctxt, x, y)
+#endif
+  const OFFSET dmin = xoff - ylim;      /* Minimum valid diagonal. */
+  const OFFSET dmax = xlim - yoff;      /* Maximum valid diagonal. */
+  const OFFSET fmid = xoff - yoff;      /* Center diagonal of top-down search. */
+  const OFFSET bmid = xlim - ylim;      /* Center diagonal of bottom-up search. */
+  OFFSET fmin = fmid;
+  OFFSET fmax = fmid;           /* Limits of top-down search. */
+  OFFSET bmin = bmid;
+  OFFSET bmax = bmid;           /* Limits of bottom-up search. */
+  OFFSET c;                     /* Cost. */
+  bool odd = (fmid - bmid) & 1; /* True if southeast corner is on an odd
+                                   diagonal with respect to the northwest. */
+
+  fd[fmid] = xoff;
+  bd[bmid] = xlim;
+
+  for (c = 1;; ++c)
+    {
+      OFFSET d;                 /* Active diagonal. */
+      bool big_snake = false;
+
+      /* Extend the top-down search by an edit step in each diagonal. */
+      if (fmin > dmin)
+        fd[--fmin - 1] = -1;
+      else
+        ++fmin;
+      if (fmax < dmax)
+        fd[++fmax + 1] = -1;
+      else
+        --fmax;
+      for (d = fmax; d >= fmin; d -= 2)
+        {
+          OFFSET x;
+          OFFSET y;
+          OFFSET tlo = fd[d - 1];
+          OFFSET thi = fd[d + 1];
+          OFFSET x0 = tlo < thi ? thi : tlo + 1;
+
+          for (x = x0, y = x0 - d;
+               x < xlim && y < ylim && XREF_YREF_EQUAL (x, y);
+               x++, y++)
+            continue;
+          if (x - x0 > SNAKE_LIMIT)
+            big_snake = true;
+          fd[d] = x;
+          if (odd && bmin <= d && d <= bmax && bd[d] <= x)
+            {
+              part->xmid = x;
+              part->ymid = y;
+              part->lo_minimal = part->hi_minimal = true;
+              return;
+            }
+        }
+
+      /* Similarly extend the bottom-up search.  */
+      if (bmin > dmin)
+        bd[--bmin - 1] = OFFSET_MAX;
+      else
+        ++bmin;
+      if (bmax < dmax)
+        bd[++bmax + 1] = OFFSET_MAX;
+      else
+        --bmax;
+      for (d = bmax; d >= bmin; d -= 2)
+        {
+          OFFSET x;
+          OFFSET y;
+          OFFSET tlo = bd[d - 1];
+          OFFSET thi = bd[d + 1];
+          OFFSET x0 = tlo < thi ? tlo : thi - 1;
+
+          for (x = x0, y = x0 - d;
+               xoff < x && yoff < y && XREF_YREF_EQUAL (x - 1, y - 1);
+               x--, y--)
+            continue;
+          if (x0 - x > SNAKE_LIMIT)
+            big_snake = true;
+          bd[d] = x;
+          if (!odd && fmin <= d && d <= fmax && x <= fd[d])
+            {
+              part->xmid = x;
+              part->ymid = y;
+              part->lo_minimal = part->hi_minimal = true;
+              return;
+            }
+        }
+
+      if (find_minimal)
+        continue;
+
+#ifdef USE_HEURISTIC
+      bool heuristic = ctxt->heuristic;
+#else
+      bool heuristic = false;
+#endif
+
+      /* Heuristic: check occasionally for a diagonal that has made lots
+         of progress compared with the edit distance.  If we have any
+         such, find the one that has made the most progress and return it
+         as if it had succeeded.
+
+         With this heuristic, for vectors with a constant small density
+         of changes, the algorithm is linear in the vector size.  */
+
+      if (200 < c && big_snake && heuristic)
+        {
+          {
+            OFFSET best = 0;
+
+            for (d = fmax; d >= fmin; d -= 2)
+              {
+                OFFSET dd = d - fmid;
+                OFFSET x = fd[d];
+                OFFSET y = x - d;
+                OFFSET v = (x - xoff) * 2 - dd;
+
+                if (v > 12 * (c + (dd < 0 ? -dd : dd)))
+                  {
+                    if (v > best
+                        && xoff + SNAKE_LIMIT <= x && x < xlim
+                        && yoff + SNAKE_LIMIT <= y && y < ylim)
+                      {
+                        /* We have a good enough best diagonal; now insist
+                           that it end with a significant snake.  */
+                        int k;
+
+                        for (k = 1; XREF_YREF_EQUAL (x - k, y - k); k++)
+                          if (k == SNAKE_LIMIT)
+                            {
+                              best = v;
+                              part->xmid = x;
+                              part->ymid = y;
+                              break;
+                            }
+                      }
+                  }
+              }
+            if (best > 0)
+              {
+                part->lo_minimal = true;
+                part->hi_minimal = false;
+                return;
+              }
+          }
+
+          {
+            OFFSET best = 0;
+
+            for (d = bmax; d >= bmin; d -= 2)
+              {
+                OFFSET dd = d - bmid;
+                OFFSET x = bd[d];
+                OFFSET y = x - d;
+                OFFSET v = (xlim - x) * 2 + dd;
+
+                if (v > 12 * (c + (dd < 0 ? -dd : dd)))
+                  {
+                    if (v > best
+                        && xoff < x && x <= xlim - SNAKE_LIMIT
+                        && yoff < y && y <= ylim - SNAKE_LIMIT)
+                      {
+                        /* We have a good enough best diagonal; now insist
+                           that it end with a significant snake.  */
+                        int k;
+
+                        for (k = 0; XREF_YREF_EQUAL (x + k, y + k); k++)
+                          if (k == SNAKE_LIMIT - 1)
+                            {
+                              best = v;
+                              part->xmid = x;
+                              part->ymid = y;
+                              break;
+                            }
+                      }
+                  }
+              }
+            if (best > 0)
+              {
+                part->lo_minimal = false;
+                part->hi_minimal = true;
+                return;
+              }
+          }
+        }
+
+      /* Heuristic: if we've gone well beyond the call of duty, give up
+         and report halfway between our best results so far.  */
+      if (c >= ctxt->too_expensive)
+        {
+          OFFSET fxybest;
+          OFFSET fxbest IF_LINT (= 0);
+          OFFSET bxybest;
+          OFFSET bxbest IF_LINT (= 0);
+
+          /* Find forward diagonal that maximizes X + Y.  */
+          fxybest = -1;
+          for (d = fmax; d >= fmin; d -= 2)
+            {
+              OFFSET x = MIN (fd[d], xlim);
+              OFFSET y = x - d;
+              if (ylim < y)
+                {
+                  x = ylim + d;
+                  y = ylim;
+                }
+              if (fxybest < x + y)
+                {
+                  fxybest = x + y;
+                  fxbest = x;
+                }
+            }
+
+          /* Find backward diagonal that minimizes X + Y.  */
+          bxybest = OFFSET_MAX;
+          for (d = bmax; d >= bmin; d -= 2)
+            {
+              OFFSET x = MAX (xoff, bd[d]);
+              OFFSET y = x - d;
+              if (y < yoff)
+                {
+                  x = yoff + d;
+                  y = yoff;
+                }
+              if (x + y < bxybest)
+                {
+                  bxybest = x + y;
+                  bxbest = x;
+                }
+            }
+
+          /* Use the better of the two diagonals.  */
+          if ((xlim + ylim) - bxybest < fxybest - (xoff + yoff))
+            {
+              part->xmid = fxbest;
+              part->ymid = fxybest - fxbest;
+              part->lo_minimal = true;
+              part->hi_minimal = false;
+            }
+          else
+            {
+              part->xmid = bxbest;
+              part->ymid = bxybest - bxbest;
+              part->lo_minimal = false;
+              part->hi_minimal = true;
+            }
+          return;
+        }
+    }
+  #undef XREF_YREF_EQUAL
+}
+
+
+/* Compare in detail contiguous subsequences of the two vectors
+   which are known, as a whole, to match each other.
+
+   The subsequence of vector 0 is [XOFF, XLIM) and likewise for vector 1.
+
+   Note that XLIM, YLIM are exclusive bounds.  All indices into the vectors
+   are origin-0.
+
+   If FIND_MINIMAL, find a minimal difference no matter how
+   expensive it is.
+
+   The results are recorded by invoking NOTE_DELETE and NOTE_INSERT.
+
+   Return false if terminated normally, or true if terminated through early
+   abort.  */
+
+static bool
+compareseq (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim,
+            bool find_minimal, struct context *ctxt)
+{
+#ifdef ELEMENT
+  ELEMENT const *xv = ctxt->xvec; /* Help the compiler.  */
+  ELEMENT const *yv = ctxt->yvec;
+  #define XREF_YREF_EQUAL(x,y)  EQUAL (xv[x], yv[y])
+#else
+  #define XREF_YREF_EQUAL(x,y)  XVECREF_YVECREF_EQUAL (ctxt, x, y)
+#endif
+
+  /* Slide down the bottom initial diagonal.  */
+  while (xoff < xlim && yoff < ylim && XREF_YREF_EQUAL (xoff, yoff))
+    {
+      xoff++;
+      yoff++;
+    }
+
+  /* Slide up the top initial diagonal. */
+  while (xoff < xlim && yoff < ylim && XREF_YREF_EQUAL (xlim - 1, ylim - 1))
+    {
+      xlim--;
+      ylim--;
+    }
+
+  /* Handle simple cases. */
+  if (xoff == xlim)
+    while (yoff < ylim)
+      {
+        NOTE_INSERT (ctxt, yoff);
+        if (EARLY_ABORT (ctxt))
+          return true;
+        yoff++;
+      }
+  else if (yoff == ylim)
+    while (xoff < xlim)
+      {
+        NOTE_DELETE (ctxt, xoff);
+        if (EARLY_ABORT (ctxt))
+          return true;
+        xoff++;
+      }
+  else
+    {
+      struct partition part IF_LINT2 (= { .xmid = 0, .ymid = 0 });
+
+      /* Find a point of correspondence in the middle of the vectors.  */
+      diag (xoff, xlim, yoff, ylim, find_minimal, &part, ctxt);
+
+      /* Use the partitions to split this problem into subproblems.  */
+      if (compareseq (xoff, part.xmid, yoff, part.ymid, part.lo_minimal, ctxt))
+        return true;
+      if (compareseq (part.xmid, xlim, part.ymid, ylim, part.hi_minimal, ctxt))
+        return true;
+    }
+
+  return false;
+  #undef XREF_YREF_EQUAL
+}
+
+#undef ELEMENT
+#undef EQUAL
+#undef OFFSET
+#undef EXTRA_CONTEXT_FIELDS
+#undef NOTE_DELETE
+#undef NOTE_INSERT
+#undef EARLY_ABORT
+#undef USE_HEURISTIC
+#undef XVECREF_YVECREF_EQUAL
+#undef OFFSET_MAX
diff --git a/contrib/tools/bison/lib/dirname-lgpl.c b/contrib/tools/bison/lib/dirname-lgpl.c
index 7cf89d8cf80e..27d4374c2e71 100644
--- a/contrib/tools/bison/lib/dirname-lgpl.c
+++ b/contrib/tools/bison/lib/dirname-lgpl.c
@@ -1,6 +1,6 @@
 /* dirname.c -- return all but the last element in a file name
 
-   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2019 Free Software
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/dirname.c b/contrib/tools/bison/lib/dirname.c
index 1e042a5cdc96..dc1997c810dd 100644
--- a/contrib/tools/bison/lib/dirname.c
+++ b/contrib/tools/bison/lib/dirname.c
@@ -1,6 +1,6 @@
 /* dirname.c -- return all but the last element in a file name
 
-   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2019 Free Software
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/dirname.h b/contrib/tools/bison/lib/dirname.h
index 579165947f74..8c12d93b510d 100644
--- a/contrib/tools/bison/lib/dirname.h
+++ b/contrib/tools/bison/lib/dirname.h
@@ -1,6 +1,6 @@
 /*  Take file names apart into directory and base names.
 
-    Copyright (C) 1998, 2001, 2003-2006, 2009-2019 Free Software Foundation,
+    Copyright (C) 1998, 2001, 2003-2006, 2009-2020 Free Software Foundation,
     Inc.
 
     This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/dosname.h b/contrib/tools/bison/lib/dosname.h
index c0ab6848a58a..57829600948c 100644
--- a/contrib/tools/bison/lib/dosname.h
+++ b/contrib/tools/bison/lib/dosname.h
@@ -1,6 +1,6 @@
 /* File names on MS-DOS/Windows systems.
 
-   Copyright (C) 2000-2001, 2004-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2004-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/dup-safer-flag.c b/contrib/tools/bison/lib/dup-safer-flag.c
index 485f7411bdb0..b2c345e0ed65 100644
--- a/contrib/tools/bison/lib/dup-safer-flag.c
+++ b/contrib/tools/bison/lib/dup-safer-flag.c
@@ -1,7 +1,7 @@
 /* Duplicate a file descriptor result, avoiding clobbering
    STD{IN,OUT,ERR}_FILENO, with specific flags.
 
-   Copyright (C) 2001, 2004-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/dup-safer.c b/contrib/tools/bison/lib/dup-safer.c
index c0c5f2a914b8..4ada3fe8d231 100644
--- a/contrib/tools/bison/lib/dup-safer.c
+++ b/contrib/tools/bison/lib/dup-safer.c
@@ -1,6 +1,6 @@
 /* Invoke dup, but avoid some glitches.
 
-   Copyright (C) 2001, 2004-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/dup2.c b/contrib/tools/bison/lib/dup2.c
index 56a27944789b..410064a93529 100644
--- a/contrib/tools/bison/lib/dup2.c
+++ b/contrib/tools/bison/lib/dup2.c
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/error.c b/contrib/tools/bison/lib/error.c
index 7e532f0e486c..3657b51cdfeb 100644
--- a/contrib/tools/bison/lib/error.c
+++ b/contrib/tools/bison/lib/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -119,7 +119,7 @@ int strerror_r (int errnum, char *buf, size_t buflen);
 #  endif
 # endif
 
-#define program_name getprogname ()
+# define program_name getprogname ()
 
 # if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r
diff --git a/contrib/tools/bison/lib/error.h b/contrib/tools/bison/lib/error.h
index 3759f8ad44e9..bad47a16dd28 100644
--- a/contrib/tools/bison/lib/error.h
+++ b/contrib/tools/bison/lib/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2019 Free Software Foundation,
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2020 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/contrib/tools/bison/lib/exitfail.c b/contrib/tools/bison/lib/exitfail.c
index 69b351372e5b..189fa16f46a8 100644
--- a/contrib/tools/bison/lib/exitfail.c
+++ b/contrib/tools/bison/lib/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/exitfail.h b/contrib/tools/bison/lib/exitfail.h
index 480ad1a1663d..a69a03bbd5b7 100644
--- a/contrib/tools/bison/lib/exitfail.h
+++ b/contrib/tools/bison/lib/exitfail.h
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/fatal-signal.c b/contrib/tools/bison/lib/fatal-signal.c
index 1fe31d10f59b..c8ff33804103 100644
--- a/contrib/tools/bison/lib/fatal-signal.c
+++ b/contrib/tools/bison/lib/fatal-signal.c
@@ -1,5 +1,5 @@
 /* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -107,7 +107,7 @@ init_fatal_signals (void)
 /* ========================================================================= */
 
 
-typedef void (*action_t) (void);
+typedef _GL_ASYNC_SAFE void (*action_t) (int sig);
 
 /* Type of an entry in the actions array.
    The 'action' field is accessed from within the fatal_signal_handler(),
@@ -131,7 +131,7 @@ static struct sigaction saved_sigactions[64];
 
 
 /* Uninstall the handlers.  */
-static void
+static _GL_ASYNC_SAFE void
 uninstall_handlers (void)
 {
   size_t i;
@@ -148,7 +148,7 @@ uninstall_handlers (void)
 
 
 /* The signal handler.  It gets called asynchronously.  */
-static void
+static _GL_ASYNC_SAFE void
 fatal_signal_handler (int sig)
 {
   for (;;)
@@ -162,7 +162,7 @@ fatal_signal_handler (int sig)
       actions_count = n;
       action = actions[n].action;
       /* Execute the action.  */
-      action ();
+      action (sig);
     }
 
   /* Now execute the signal's default action.
@@ -284,3 +284,20 @@ unblock_fatal_signals (void)
   init_fatal_signal_set ();
   sigprocmask (SIG_UNBLOCK, &fatal_signal_set, NULL);
 }
+
+
+unsigned int
+get_fatal_signals (int signals[64])
+{
+  init_fatal_signal_set ();
+
+  {
+    int *p = signals;
+    size_t i;
+
+    for (i = 0; i < num_fatal_signals; i++)
+      if (fatal_signals[i] >= 0)
+        *p++ = fatal_signals[i];
+    return p - signals;
+  }
+}
diff --git a/contrib/tools/bison/lib/fatal-signal.h b/contrib/tools/bison/lib/fatal-signal.h
index a2e60d3a629a..2c0154ffc3e0 100644
--- a/contrib/tools/bison/lib/fatal-signal.h
+++ b/contrib/tools/bison/lib/fatal-signal.h
@@ -1,5 +1,5 @@
 /* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2009-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,8 @@ extern "C" {
    occurs.
 
    Restrictions for the cleanup function:
-     - The cleanup function can do all kinds of system calls.
+     - The cleanup function can do all kinds of system calls.  It may also
+       modify (clobber) errno.
      - It can also access application dependent memory locations and data
        structures provided they are in a consistent state. One way to ensure
        this is through block_fatal_signals()/unblock_fatal_signals(), see
@@ -51,7 +52,7 @@ extern "C" {
    The cleanup function is executed asynchronously.  It is unspecified
    whether during its execution the catchable fatal signals are blocked
    or not.  */
-extern void at_fatal_signal (void (*function) (void));
+extern void at_fatal_signal (_GL_ASYNC_SAFE void (*function) (int sig));
 
 
 /* Sometimes it is necessary to block the usually fatal signals while the
@@ -71,6 +72,12 @@ extern void block_fatal_signals (void);
 extern void unblock_fatal_signals (void);
 
 
+/* Return the list of signals that block_fatal_signals/unblock_fatal_signals
+   would block or unblock.
+   Fills signals[0..count-1] and returns count.  */
+extern unsigned int get_fatal_signals (int signals[64]);
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/contrib/tools/bison/lib/fcntl.c b/contrib/tools/bison/lib/fcntl.c
index e65f1b21c7d7..cc54f62ed7c4 100644
--- a/contrib/tools/bison/lib/fcntl.c
+++ b/contrib/tools/bison/lib/fcntl.c
@@ -1,6 +1,6 @@
 /* Provide file descriptor control.
 
-   Copyright (C) 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #ifdef __KLIBC__
diff --git a/contrib/tools/bison/lib/fd-hook.c b/contrib/tools/bison/lib/fd-hook.c
index 78791198fa07..8840f634880a 100644
--- a/contrib/tools/bison/lib/fd-hook.c
+++ b/contrib/tools/bison/lib/fd-hook.c
@@ -1,5 +1,5 @@
 /* Hook for making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/contrib/tools/bison/lib/fd-hook.h b/contrib/tools/bison/lib/fd-hook.h
index bf07f0068b7e..ed1a15a230c5 100644
--- a/contrib/tools/bison/lib/fd-hook.h
+++ b/contrib/tools/bison/lib/fd-hook.h
@@ -1,5 +1,5 @@
 /* Hook for making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/contrib/tools/bison/lib/fd-safer-flag.c b/contrib/tools/bison/lib/fd-safer-flag.c
index 7c026ef54152..8fdf8dbc16ac 100644
--- a/contrib/tools/bison/lib/fd-safer-flag.c
+++ b/contrib/tools/bison/lib/fd-safer-flag.c
@@ -1,7 +1,7 @@
 /* Adjust a file descriptor result so that it avoids clobbering
    STD{IN,OUT,ERR}_FILENO, with specific flags.
 
-   Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/fd-safer.c b/contrib/tools/bison/lib/fd-safer.c
index b5113e13673f..e011c00308aa 100644
--- a/contrib/tools/bison/lib/fd-safer.c
+++ b/contrib/tools/bison/lib/fd-safer.c
@@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
 
-   Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/filename.h b/contrib/tools/bison/lib/filename.h
index 3ba31059f696..d4c70203e663 100644
--- a/contrib/tools/bison/lib/filename.h
+++ b/contrib/tools/bison/lib/filename.h
@@ -1,5 +1,5 @@
 /* Basic filename support macros.
-   Copyright (C) 2001-2004, 2007-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/float+.h b/contrib/tools/bison/lib/float+.h
index 5af861f7aeb6..1e19a7185a9c 100644
--- a/contrib/tools/bison/lib/float+.h
+++ b/contrib/tools/bison/lib/float+.h
@@ -1,5 +1,5 @@
 /* Supplemental information about the floating-point formats.
-   Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/fopen-safer.c b/contrib/tools/bison/lib/fopen-safer.c
index 5d4a4a9e7530..bd363177659d 100644
--- a/contrib/tools/bison/lib/fopen-safer.c
+++ b/contrib/tools/bison/lib/fopen-safer.c
@@ -1,6 +1,6 @@
 /* Invoke fopen, but avoid some glitches.
 
-   Copyright (C) 2001, 2004-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/fpending.c b/contrib/tools/bison/lib/fpending.c
index 3c01285bb837..802ebcba6544 100644
--- a/contrib/tools/bison/lib/fpending.c
+++ b/contrib/tools/bison/lib/fpending.c
@@ -1,5 +1,5 @@
 /* fpending.c -- return the number of pending output bytes on a stream
-   Copyright (C) 2000, 2004, 2006-2007, 2009-2019 Free Software Foundation,
+   Copyright (C) 2000, 2004, 2006-2007, 2009-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/fpending.h b/contrib/tools/bison/lib/fpending.h
index 097a3ef0717f..a8b8859726d3 100644
--- a/contrib/tools/bison/lib/fpending.h
+++ b/contrib/tools/bison/lib/fpending.h
@@ -1,6 +1,6 @@
 /* Declare __fpending.
 
-   Copyright (C) 2000, 2003, 2005-2006, 2009-2019 Free Software Foundation,
+   Copyright (C) 2000, 2003, 2005-2006, 2009-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/fpucw.h b/contrib/tools/bison/lib/fpucw.h
index caa51fe3bbbb..1c6edf6b7641 100644
--- a/contrib/tools/bison/lib/fpucw.h
+++ b/contrib/tools/bison/lib/fpucw.h
@@ -1,5 +1,5 @@
 /* Manipulating the FPU control word.  -*- coding: utf-8 -*-
-   Copyright (C) 2007-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
@@ -43,7 +43,7 @@
 
    See Vincent Lefèvre's page https://www.vinc17.net/research/extended.en.html
    for a good explanation.
-   See http://www.uwsg.iu.edu/hypermail/linux/kernel/0103.0/0453.html for
+   See https://web.archive.org/web/20060905133417/http://www.uwsg.iu.edu/hypermail/linux/kernel/0103.0/0453.html
    some argumentation which setting should be the default.  */
 
 /* This header file provides the following facilities:
@@ -70,12 +70,12 @@ typedef unsigned short fpucw_t; /* glibc calls this fpu_control_t */
 # define FPU_PC_DOUBLE 0x200    /* glibc calls this _FPU_DOUBLE */
 # define FPU_PC_EXTENDED 0x300  /* glibc calls this _FPU_EXTENDED */
 
-# define GET_FPUCW() \
+# define GET_FPUCW() __extension__ \
   ({ fpucw_t _cw;                                               \
      __asm__ __volatile__ ("fnstcw %0" : "=m" (*&_cw));         \
      _cw;                                                       \
    })
-# define SET_FPUCW(word) \
+# define SET_FPUCW(word) __extension__ \
   (void)({ fpucw_t _ncw = (word);                               \
            __asm__ __volatile__ ("fldcw %0" : : "m" (*&_ncw));  \
          })
diff --git a/contrib/tools/bison/lib/fseterr.c b/contrib/tools/bison/lib/fseterr.c
index 8cd68e8ce7ff..8f32b7e5af2d 100644
--- a/contrib/tools/bison/lib/fseterr.c
+++ b/contrib/tools/bison/lib/fseterr.c
@@ -1,5 +1,5 @@
 /* Set the error indicator of a stream.
-   Copyright (C) 2007-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/fseterr.h b/contrib/tools/bison/lib/fseterr.h
index 7b57faa3d2e4..bbeb6619f97e 100644
--- a/contrib/tools/bison/lib/fseterr.h
+++ b/contrib/tools/bison/lib/fseterr.h
@@ -1,5 +1,5 @@
 /* Set the error indicator of a stream.
-   Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/fstrcmp.c b/contrib/tools/bison/lib/fstrcmp.c
new file mode 100644
index 000000000000..1a4fbfdf8de6
--- /dev/null
+++ b/contrib/tools/bison/lib/fstrcmp.c
@@ -0,0 +1,263 @@
+/* Functions to make fuzzy comparisons between strings
+   Copyright (C) 1988-1989, 1992-1993, 1995, 2001-2003, 2006, 2008-2020 Free
+   Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+
+#include <config.h>
+
+/* Specification.  */
+#include "fstrcmp.h"
+
+#include <string.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#include "glthread/lock.h"
+#include "glthread/tls.h"
+#include "minmax.h"
+#include "xalloc.h"
+
+
+#define ELEMENT char
+#define EQUAL(x,y) ((x) == (y))
+#define OFFSET ptrdiff_t
+#define EXTRA_CONTEXT_FIELDS \
+  /* The number of edits beyond which the computation can be aborted. */ \
+  ptrdiff_t edit_count_limit; \
+  /* The number of edits (= number of elements inserted, plus the number of \
+     elements deleted), temporarily minus edit_count_limit. */ \
+  ptrdiff_t edit_count;
+#define NOTE_DELETE(ctxt, xoff) ctxt->edit_count++
+#define NOTE_INSERT(ctxt, yoff) ctxt->edit_count++
+#define EARLY_ABORT(ctxt) ctxt->edit_count > 0
+/* We don't need USE_HEURISTIC, since it is unlikely in typical uses of
+   fstrcmp().  */
+#include "diffseq.h"
+
+
+/* Because fstrcmp is typically called multiple times, attempt to minimize
+   the number of memory allocations performed.  Thus, let a call reuse the
+   memory already allocated by the previous call, if it is sufficient.
+   To make it multithread-safe, without need for a lock that protects the
+   already allocated memory, store the allocated memory per thread.  Free
+   it only when the thread exits.  */
+
+static gl_tls_key_t buffer_key; /* TLS key for a 'ptrdiff_t *' */
+static gl_tls_key_t bufmax_key; /* TLS key for a 'uintptr_t' */
+
+static void
+keys_init (void)
+{
+  gl_tls_key_init (buffer_key, free);
+  gl_tls_key_init (bufmax_key, NULL);
+  /* The per-thread initial values are NULL and 0, respectively.  */
+}
+
+/* Ensure that keys_init is called once only.  */
+gl_once_define(static, keys_init_once)
+
+void
+fstrcmp_free_resources (void)
+{
+  ptrdiff_t *buffer;
+
+  gl_once (keys_init_once, keys_init);
+  buffer = gl_tls_get (buffer_key);
+  if (buffer != NULL)
+    {
+      gl_tls_set (buffer_key, NULL);
+      gl_tls_set (bufmax_key, (void *) (uintptr_t) 0);
+      free (buffer);
+    }
+}
+
+
+/* In the code below, branch probabilities were measured by Ralf Wildenhues,
+   by running "msgmerge LL.po coreutils.pot" with msgmerge 0.18 for many
+   values of LL.  The probability indicates that the condition evaluates
+   to true; whether that leads to a branch or a non-branch in the code,
+   depends on the compiler's reordering of basic blocks.  */
+
+
+double
+fstrcmp_bounded (const char *string1, const char *string2, double lower_bound)
+{
+  struct context ctxt;
+  size_t xvec_length = strlen (string1);
+  size_t yvec_length = strlen (string2);
+  size_t length_sum = xvec_length + yvec_length;
+  ptrdiff_t i;
+
+  ptrdiff_t fdiag_len;
+  ptrdiff_t *buffer;
+  uintptr_t bufmax;
+
+  /* short-circuit obvious comparisons */
+  if (xvec_length == 0 || yvec_length == 0) /* Prob: 1% */
+    return length_sum == 0;
+
+  if (! (xvec_length <= length_sum
+         && length_sum <= MIN (UINTPTR_MAX, PTRDIFF_MAX) - 3))
+    xalloc_die ();
+
+  if (lower_bound > 0)
+    {
+      /* Compute a quick upper bound.
+         Each edit is an insertion or deletion of an element, hence modifies
+         the length of the sequence by at most 1.
+         Therefore, when starting from a sequence X and ending at a sequence Y,
+         with N edits,  | yvec_length - xvec_length | <= N.  (Proof by
+         induction over N.)
+         So, at the end, we will have
+           edit_count >= | xvec_length - yvec_length |.
+         and hence
+           result
+             = (xvec_length + yvec_length - edit_count)
+               / (xvec_length + yvec_length)
+             <= (xvec_length + yvec_length - | yvec_length - xvec_length |)
+                / (xvec_length + yvec_length)
+             = 2 * min (xvec_length, yvec_length) / (xvec_length + yvec_length).
+       */
+      ptrdiff_t length_min = MIN (xvec_length, yvec_length);
+      volatile double upper_bound = 2.0 * length_min / length_sum;
+
+      if (upper_bound < lower_bound) /* Prob: 74% */
+        /* Return an arbitrary value < LOWER_BOUND.  */
+        return 0.0;
+
+#if CHAR_BIT <= 8
+      /* When X and Y are both small, avoid the overhead of setting up an
+         array of size 256.  */
+      if (length_sum >= 20) /* Prob: 99% */
+        {
+          /* Compute a less quick upper bound.
+             Each edit is an insertion or deletion of a character, hence
+             modifies the occurrence count of a character by 1 and leaves the
+             other occurrence counts unchanged.
+             Therefore, when starting from a sequence X and ending at a
+             sequence Y, and denoting the occurrence count of C in X with
+             OCC (X, C), with N edits,
+               sum_C | OCC (X, C) - OCC (Y, C) | <= N.
+             (Proof by induction over N.)
+             So, at the end, we will have
+               edit_count >= sum_C | OCC (X, C) - OCC (Y, C) |,
+             and hence
+               result
+                 = (xvec_length + yvec_length - edit_count)
+                   / (xvec_length + yvec_length)
+                 <= (xvec_length + yvec_length - sum_C | OCC(X,C) - OCC(Y,C) |)
+                    / (xvec_length + yvec_length).
+           */
+          ptrdiff_t occ_diff[UCHAR_MAX + 1]; /* array C -> OCC(X,C) - OCC(Y,C) */
+          ptrdiff_t sum;
+          double dsum;
+
+          /* Determine the occurrence counts in X.  */
+          memset (occ_diff, 0, sizeof (occ_diff));
+          for (i = xvec_length - 1; i >= 0; i--)
+            occ_diff[(unsigned char) string1[i]]++;
+          /* Subtract the occurrence counts in Y.  */
+          for (i = yvec_length - 1; i >= 0; i--)
+            occ_diff[(unsigned char) string2[i]]--;
+          /* Sum up the absolute values.  */
+          sum = 0;
+          for (i = 0; i <= UCHAR_MAX; i++)
+            {
+              ptrdiff_t d = occ_diff[i];
+              sum += (d >= 0 ? d : -d);
+            }
+
+          dsum = sum;
+          upper_bound = 1.0 - dsum / length_sum;
+
+          if (upper_bound < lower_bound) /* Prob: 66% */
+            /* Return an arbitrary value < LOWER_BOUND.  */
+            return 0.0;
+        }
+#endif
+    }
+
+  /* set the info for each string.  */
+  ctxt.xvec = string1;
+  ctxt.yvec = string2;
+
+  /* Set TOO_EXPENSIVE to be approximate square root of input size,
+     bounded below by 4096.  */
+  ctxt.too_expensive = 1;
+  for (i = xvec_length + yvec_length; i != 0; i >>= 2)
+    ctxt.too_expensive <<= 1;
+  if (ctxt.too_expensive < 4096)
+    ctxt.too_expensive = 4096;
+
+  /* Allocate memory for fdiag and bdiag from a thread-local pool.  */
+  fdiag_len = length_sum + 3;
+  gl_once (keys_init_once, keys_init);
+  buffer = gl_tls_get (buffer_key);
+  bufmax = (uintptr_t) gl_tls_get (bufmax_key);
+  if (fdiag_len > bufmax)
+    {
+      /* Need more memory.  */
+      bufmax = 2 * bufmax;
+      if (fdiag_len > bufmax)
+        bufmax = fdiag_len;
+      /* Calling xrealloc would be a waste: buffer's contents does not need
+         to be preserved.  */
+      free (buffer);
+      buffer = xnmalloc (bufmax, 2 * sizeof *buffer);
+      gl_tls_set (buffer_key, buffer);
+      gl_tls_set (bufmax_key, (void *) (uintptr_t) bufmax);
+    }
+  ctxt.fdiag = buffer + yvec_length + 1;
+  ctxt.bdiag = ctxt.fdiag + fdiag_len;
+
+  /* The edit_count is only ever increased.  The computation can be aborted
+     when
+       (xvec_length + yvec_length - edit_count) / (xvec_length + yvec_length)
+       < lower_bound,
+     or equivalently
+       edit_count > (xvec_length + yvec_length) * (1 - lower_bound)
+     or equivalently
+       edit_count > floor((xvec_length + yvec_length) * (1 - lower_bound)).
+     We need to add an epsilon inside the floor(...) argument, to neutralize
+     rounding errors.  */
+  ctxt.edit_count_limit =
+    (lower_bound < 1.0
+     ? (ptrdiff_t) (length_sum * (1.0 - lower_bound + 0.000001))
+     : 0);
+
+  /* Now do the main comparison algorithm */
+  ctxt.edit_count = - ctxt.edit_count_limit;
+  if (compareseq (0, xvec_length, 0, yvec_length, 0, &ctxt)) /* Prob: 98% */
+    /* The edit_count passed the limit.  Hence the result would be
+       < lower_bound.  We can return any value < lower_bound instead.  */
+    return 0.0;
+  ctxt.edit_count += ctxt.edit_count_limit;
+
+  /* The result is
+        ((number of chars in common) / (average length of the strings)).
+     The numerator is
+        = xvec_length - (number of calls to NOTE_DELETE)
+        = yvec_length - (number of calls to NOTE_INSERT)
+        = 1/2 * (xvec_length + yvec_length - (number of edits)).
+     This is admittedly biased towards finding that the strings are
+     similar, however it does produce meaningful results.  */
+  return ((double) (xvec_length + yvec_length - ctxt.edit_count)
+          / (xvec_length + yvec_length));
+}
diff --git a/contrib/tools/bison/lib/fstrcmp.h b/contrib/tools/bison/lib/fstrcmp.h
new file mode 100644
index 000000000000..37df588a3edc
--- /dev/null
+++ b/contrib/tools/bison/lib/fstrcmp.h
@@ -0,0 +1,54 @@
+/* Fuzzy string comparison.
+   Copyright (C) 1995, 2000, 2002-2003, 2006, 2008-2020 Free Software
+   Foundation, Inc.
+
+   This file was written by Peter Miller <pmiller@agso.gov.au>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _FSTRCMP_H
+#define _FSTRCMP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Fuzzy compare of S1 and S2.  Return a measure for the similarity of S1
+   and S1.  The higher the result, the more similar the strings are.
+   The result is bounded between 0 (meaning very dissimilar strings) and
+   1 (meaning identical strings).  */
+extern double fstrcmp (const char *s1, const char *s2);
+
+/* Like fstrcmp (S1, S2), except that if the result is < LOWER_BOUND, an
+   arbitrary other value < LOWER_BOUND can be returned.  */
+extern double fstrcmp_bounded (const char *s1, const char *s2,
+                               double lower_bound);
+
+/* A shortcut for fstrcmp.  Avoids a function call.  */
+#define fstrcmp(s1,s2) fstrcmp_bounded (s1, s2, 0.0)
+
+/* Frees the per-thread resources allocated by this module for the current
+   thread.
+   You don't need to call this function in threads other than the main thread,
+   because per-thread resources are reclaimed automatically when the thread
+   exits.  However, per-thread resources allocated by the main thread are
+   comparable to static allocations; calling this function can be useful to
+   avoid an error report from valgrind.  */
+extern void fstrcmp_free_resources (void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/contrib/tools/bison/lib/get-errno.c b/contrib/tools/bison/lib/get-errno.c
index 36e07adaff77..ef3b71b4fb4f 100644
--- a/contrib/tools/bison/lib/get-errno.c
+++ b/contrib/tools/bison/lib/get-errno.c
@@ -1,6 +1,6 @@
 /* get-errno.c - get and set errno.
 
-   Copyright (C) 2002, 2006, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2006, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/get-errno.h b/contrib/tools/bison/lib/get-errno.h
index c13ac6b319c2..b6550852f561 100644
--- a/contrib/tools/bison/lib/get-errno.h
+++ b/contrib/tools/bison/lib/get-errno.h
@@ -1,6 +1,6 @@
 /* get-errno.h - get and set errno.
 
-   Copyright (C) 2002, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2002, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/getdtablesize.c b/contrib/tools/bison/lib/getdtablesize.c
index 03a92435f0b3..0fe70921f9d7 100644
--- a/contrib/tools/bison/lib/getdtablesize.c
+++ b/contrib/tools/bison/lib/getdtablesize.c
@@ -1,5 +1,5 @@
 /* getdtablesize() function: Return maximum possible file descriptor value + 1.
-   Copyright (C) 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/gethrxtime.c b/contrib/tools/bison/lib/gethrxtime.c
index 877596257a07..88342cb1026e 100644
--- a/contrib/tools/bison/lib/gethrxtime.c
+++ b/contrib/tools/bison/lib/gethrxtime.c
@@ -1,6 +1,6 @@
 /* gethrxtime -- get high resolution real time
 
-   Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/gethrxtime.h b/contrib/tools/bison/lib/gethrxtime.h
index 6491794554d0..44973397b543 100644
--- a/contrib/tools/bison/lib/gethrxtime.h
+++ b/contrib/tools/bison/lib/gethrxtime.h
@@ -1,6 +1,6 @@
 /* gethrxtime -- get high resolution real time
 
-   Copyright (C) 2005, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/getopt.c b/contrib/tools/bison/lib/getopt.c
index 8ee075a8091c..a6389d8ea9bb 100644
--- a/contrib/tools/bison/lib/getopt.c
+++ b/contrib/tools/bison/lib/getopt.c
@@ -1,5 +1,5 @@
 /* Getopt for GNU.
-   Copyright (C) 1987-2019 Free Software Foundation, Inc.
+   Copyright (C) 1987-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff --git a/contrib/tools/bison/lib/getopt1.c b/contrib/tools/bison/lib/getopt1.c
index 883aa6bbc916..0902efe68e38 100644
--- a/contrib/tools/bison/lib/getopt1.c
+++ b/contrib/tools/bison/lib/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-2019 Free Software Foundation, Inc.
+   Copyright (C) 1987-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff --git a/contrib/tools/bison/lib/getopt_int.h b/contrib/tools/bison/lib/getopt_int.h
index e63706f60ea3..afcd8a67fb2a 100644
--- a/contrib/tools/bison/lib/getopt_int.h
+++ b/contrib/tools/bison/lib/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-2019 Free Software Foundation, Inc.
+   Copyright (C) 1989-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff --git a/contrib/tools/bison/lib/getprogname.c b/contrib/tools/bison/lib/getprogname.c
index 50fe23cb890e..7507e0d7579c 100644
--- a/contrib/tools/bison/lib/getprogname.c
+++ b/contrib/tools/bison/lib/getprogname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2016-2019 Free Software Foundation, Inc.
+   Copyright (C) 2016-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -70,10 +70,10 @@ getprogname (void)
     p = "?";
   return last_component (p);
 # elif HAVE_DECL___ARGV                                     /* mingw, MSVC */
-  /* https://msdn.microsoft.com/en-us/library/dn727674.aspx */
+  /* https://docs.microsoft.com/en-us/cpp/c-runtime-library/argc-argv-wargv */
   const char *p = __argv && __argv[0] ? __argv[0] : "?";
   return last_component (p);
-# elif HAVE_VAR___PROGNAME                                  /* OpenBSD, QNX */
+# elif HAVE_VAR___PROGNAME                                  /* OpenBSD, Android, QNX */
   /* https://man.openbsd.org/style.9 */
   /* http://www.qnx.de/developers/docs/6.5.0/index.jsp?topic=%2Fcom.qnx.doc.neutrino_lib_ref%2Fp%2F__progname.html */
   /* Be careful to declare this only when we absolutely need it
@@ -82,7 +82,11 @@ getprogname (void)
      malfunction (have zero length) with Fedora 25's glibc.  */
   extern char *__progname;
   const char *p = __progname;
+#  if defined __ANDROID__
+  return last_component (p);
+#  else
   return p && p[0] ? p : "?";
+#  endif
 # elif _AIX                                                 /* AIX */
   /* Idea by Bastien ROUCARIÈS,
      https://lists.gnu.org/r/bug-gnulib/2010-12/msg00095.html
@@ -229,12 +233,13 @@ getprogname (void)
         {
           char *name = buf.pr_fname;
           size_t namesize = sizeof buf.pr_fname;
+          /* It may not be NUL-terminated.  */
           char *namenul = memchr (name, '\0', namesize);
           size_t namelen = namenul ? namenul - name : namesize;
           char *namecopy = malloc (namelen + 1);
           if (namecopy)
             {
-              namecopy[namelen] = 0;
+              namecopy[namelen] = '\0';
               return memcpy (namecopy, name, namelen);
             }
         }
diff --git a/contrib/tools/bison/lib/getprogname.h b/contrib/tools/bison/lib/getprogname.h
index 1590b38d3f14..676912b4b84c 100644
--- a/contrib/tools/bison/lib/getprogname.h
+++ b/contrib/tools/bison/lib/getprogname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2016-2019 Free Software Foundation, Inc.
+   Copyright (C) 2016-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/gettext.h b/contrib/tools/bison/lib/gettext.h
index c7c0fdb53116..0bd1e13348a7 100644
--- a/contrib/tools/bison/lib/gettext.h
+++ b/contrib/tools/bison/lib/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2019 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/gl_array_list.c b/contrib/tools/bison/lib/gl_array_list.c
index 4ac743fde4fa..49509620f735 100644
--- a/contrib/tools/bison/lib/gl_array_list.c
+++ b/contrib/tools/bison/lib/gl_array_list.c
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by an array.
-   Copyright (C) 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 2006-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 /* Specification.  */
 #include "gl_array_list.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 /* Get memcpy.  */
 #include <string.h>
@@ -27,10 +28,6 @@
 /* Checked size_t computations.  */
 #include "xsize.h"
 
-#ifndef uintptr_t
-# define uintptr_t unsigned long
-#endif
-
 /* -------------------------- gl_list_t Data Type -------------------------- */
 
 /* Concrete gl_list_impl type, valid for this file only.  */
diff --git a/contrib/tools/bison/lib/gl_array_list.h b/contrib/tools/bison/lib/gl_array_list.h
index 98158feb1b1c..8dd48bd36509 100644
--- a/contrib/tools/bison/lib/gl_array_list.h
+++ b/contrib/tools/bison/lib/gl_array_list.h
@@ -1,5 +1,5 @@
 /* Sequential list data type implemented by an array.
-   Copyright (C) 2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/gl_list.h b/contrib/tools/bison/lib/gl_list.h
index 5f2cade22cce..39d14401f96d 100644
--- a/contrib/tools/bison/lib/gl_list.h
+++ b/contrib/tools/bison/lib/gl_list.h
@@ -1,5 +1,5 @@
 /* Abstract sequential list data type.  -*- coding: utf-8 -*-
-   Copyright (C) 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 2006-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -130,7 +130,7 @@ typedef const struct gl_list_implementation * gl_list_implementation_t;
 
 #if 0 /* Unless otherwise specified, these are defined inline below.  */
 
-/* Create an empty list.
+/* Creates an empty list.
    IMPLEMENTATION is one of GL_ARRAY_LIST, GL_CARRAY_LIST, GL_LINKED_LIST,
    GL_AVLTREE_LIST, GL_RBTREE_LIST, GL_LINKEDHASH_LIST, GL_AVLTREEHASH_LIST,
    GL_RBTREEHASH_LIST.
@@ -145,14 +145,14 @@ extern gl_list_t gl_list_create_empty (gl_list_implementation_t implementation,
                                        gl_listelement_hashcode_fn hashcode_fn,
                                        gl_listelement_dispose_fn dispose_fn,
                                        bool allow_duplicates);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_t gl_list_nx_create_empty (gl_list_implementation_t implementation,
                                           gl_listelement_equals_fn equals_fn,
                                           gl_listelement_hashcode_fn hashcode_fn,
                                           gl_listelement_dispose_fn dispose_fn,
                                           bool allow_duplicates);
 
-/* Create a list with given contents.
+/* Creates a list with given contents.
    IMPLEMENTATION is one of GL_ARRAY_LIST, GL_CARRAY_LIST, GL_LINKED_LIST,
    GL_AVLTREE_LIST, GL_RBTREE_LIST, GL_LINKEDHASH_LIST, GL_AVLTREEHASH_LIST,
    GL_RBTREEHASH_LIST.
@@ -170,7 +170,7 @@ extern gl_list_t gl_list_create (gl_list_implementation_t implementation,
                                  gl_listelement_dispose_fn dispose_fn,
                                  bool allow_duplicates,
                                  size_t count, const void **contents);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_t gl_list_nx_create (gl_list_implementation_t implementation,
                                     gl_listelement_equals_fn equals_fn,
                                     gl_listelement_hashcode_fn hashcode_fn,
@@ -178,17 +178,17 @@ extern gl_list_t gl_list_nx_create (gl_list_implementation_t implementation,
                                     bool allow_duplicates,
                                     size_t count, const void **contents);
 
-/* Return the current number of elements in a list.  */
+/* Returns the current number of elements in a list.  */
 extern size_t gl_list_size (gl_list_t list);
 
-/* Return the element value represented by a list node.  */
+/* Returns the element value represented by a list node.  */
 extern const void * gl_list_node_value (gl_list_t list, gl_list_node_t node);
 
-/* Replace the element value represented by a list node.  */
+/* Replaces the element value represented by a list node.  */
 /* declared in gl_xlist.h */
 extern void gl_list_node_set_value (gl_list_t list, gl_list_node_t node,
                                     const void *elt);
-/* Likewise.  Return 0 upon success, -1 upon out-of-memory.  */
+/* Likewise.  Returns 0 upon success, -1 upon out-of-memory.  */
 extern int gl_list_node_nx_set_value (gl_list_t list, gl_list_node_t node,
                                       const void *elt)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
@@ -196,25 +196,25 @@ extern int gl_list_node_nx_set_value (gl_list_t list, gl_list_node_t node,
 #endif
   ;
 
-/* Return the node immediately after the given node in the list, or NULL
+/* Returns the node immediately after the given node in the list, or NULL
    if the given node is the last (rightmost) one in the list.  */
 extern gl_list_node_t gl_list_next_node (gl_list_t list, gl_list_node_t node);
 
-/* Return the node immediately before the given node in the list, or NULL
+/* Returns the node immediately before the given node in the list, or NULL
    if the given node is the first (leftmost) one in the list.  */
 extern gl_list_node_t gl_list_previous_node (gl_list_t list, gl_list_node_t node);
 
-/* Return the element at a given position in the list.
+/* Returns the element at a given position in the list.
    POSITION must be >= 0 and < gl_list_size (list).  */
 extern const void * gl_list_get_at (gl_list_t list, size_t position);
 
-/* Replace the element at a given position in the list.
+/* Replaces the element at a given position in the list.
    POSITION must be >= 0 and < gl_list_size (list).
-   Return its node.  */
+   Returns its node.  */
 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_set_at (gl_list_t list, size_t position,
                                       const void *elt);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_set_at (gl_list_t list, size_t position,
                                          const void *elt)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
@@ -222,69 +222,69 @@ extern gl_list_node_t gl_list_nx_set_at (gl_list_t list, size_t position,
 #endif
   ;
 
-/* Search whether an element is already in the list.
-   Return its node if found, or NULL if not present in the list.  */
+/* Searches whether an element is already in the list.
+   Returns its node if found, or NULL if not present in the list.  */
 extern gl_list_node_t gl_list_search (gl_list_t list, const void *elt);
 
-/* Search whether an element is already in the list,
+/* Searches whether an element is already in the list,
    at a position >= START_INDEX.
-   Return its node if found, or NULL if not present in the list.  */
+   Returns its node if found, or NULL if not present in the list.  */
 extern gl_list_node_t gl_list_search_from (gl_list_t list, size_t start_index,
                                            const void *elt);
 
-/* Search whether an element is already in the list,
+/* Searches whether an element is already in the list,
    at a position >= START_INDEX and < END_INDEX.
-   Return its node if found, or NULL if not present in the list.  */
+   Returns its node if found, or NULL if not present in the list.  */
 extern gl_list_node_t gl_list_search_from_to (gl_list_t list,
                                               size_t start_index,
                                               size_t end_index,
                                               const void *elt);
 
-/* Search whether an element is already in the list.
-   Return its position if found, or (size_t)(-1) if not present in the list.  */
+/* Searches whether an element is already in the list.
+   Returns its position if found, or (size_t)(-1) if not present in the list.  */
 extern size_t gl_list_indexof (gl_list_t list, const void *elt);
 
-/* Search whether an element is already in the list,
+/* Searches whether an element is already in the list,
    at a position >= START_INDEX.
-   Return its position if found, or (size_t)(-1) if not present in the list.  */
+   Returns its position if found, or (size_t)(-1) if not present in the list.  */
 extern size_t gl_list_indexof_from (gl_list_t list, size_t start_index,
                                     const void *elt);
 
-/* Search whether an element is already in the list,
+/* Searches whether an element is already in the list,
    at a position >= START_INDEX and < END_INDEX.
-   Return its position if found, or (size_t)(-1) if not present in the list.  */
+   Returns its position if found, or (size_t)(-1) if not present in the list.  */
 extern size_t gl_list_indexof_from_to (gl_list_t list,
                                        size_t start_index, size_t end_index,
                                        const void *elt);
 
-/* Add an element as the first element of the list.
-   Return its node.  */
+/* Adds an element as the first element of the list.
+   Returns its node.  */
 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_first (gl_list_t list, const void *elt);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_first (gl_list_t list, const void *elt)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
   __attribute__ ((__warn_unused_result__))
 #endif
   ;
 
-/* Add an element as the last element of the list.
-   Return its node.  */
+/* Adds an element as the last element of the list.
+   Returns its node.  */
 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_last (gl_list_t list, const void *elt);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_last (gl_list_t list, const void *elt)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
   __attribute__ ((__warn_unused_result__))
 #endif
   ;
 
-/* Add an element before a given element node of the list.
-   Return its node.  */
+/* Adds an element before a given element node of the list.
+   Returns its node.  */
 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_before (gl_list_t list, gl_list_node_t node,
                                           const void *elt);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_before (gl_list_t list,
                                              gl_list_node_t node,
                                              const void *elt)
@@ -293,12 +293,12 @@ extern gl_list_node_t gl_list_nx_add_before (gl_list_t list,
 #endif
   ;
 
-/* Add an element after a given element node of the list.
-   Return its node.  */
+/* Adds an element after a given element node of the list.
+   Returns its node.  */
 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_after (gl_list_t list, gl_list_node_t node,
                                          const void *elt);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_after (gl_list_t list, gl_list_node_t node,
                                             const void *elt)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
@@ -306,12 +306,12 @@ extern gl_list_node_t gl_list_nx_add_after (gl_list_t list, gl_list_node_t node,
 #endif
   ;
 
-/* Add an element at a given position in the list.
+/* Adds an element at a given position in the list.
    POSITION must be >= 0 and <= gl_list_size (list).  */
 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_list_add_at (gl_list_t list, size_t position,
                                       const void *elt);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_node_t gl_list_nx_add_at (gl_list_t list, size_t position,
                                          const void *elt)
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
@@ -319,20 +319,20 @@ extern gl_list_node_t gl_list_nx_add_at (gl_list_t list, size_t position,
 #endif
   ;
 
-/* Remove an element from the list.
-   Return true.  */
+/* Removes an element from the list.
+   Returns true.  */
 extern bool gl_list_remove_node (gl_list_t list, gl_list_node_t node);
 
-/* Remove an element at a given position from the list.
+/* Removes an element at a given position from the list.
    POSITION must be >= 0 and < gl_list_size (list).
-   Return true.  */
+   Returns true.  */
 extern bool gl_list_remove_at (gl_list_t list, size_t position);
 
-/* Search and remove an element from the list.
-   Return true if it was found and removed.  */
+/* Searches and removes an element from the list.
+   Returns true if it was found and removed.  */
 extern bool gl_list_remove (gl_list_t list, const void *elt);
 
-/* Free an entire list.
+/* Frees an entire list.
    (But this call does not free the elements of the list.  It only invokes
    the DISPOSE_FN on each of the elements of the list, and only if the list
    is not a sublist.)  */
@@ -361,12 +361,12 @@ typedef struct
 
 #if 0 /* These are defined inline below.  */
 
-/* Create an iterator traversing a list.
+/* Creates an iterator traversing a list.
    The list contents must not be modified while the iterator is in use,
    except for replacing or removing the last returned element.  */
 extern gl_list_iterator_t gl_list_iterator (gl_list_t list);
 
-/* Create an iterator traversing the element with indices i,
+/* Creates an iterator traversing the element with indices i,
    start_index <= i < end_index, of a list.
    The list contents must not be modified while the iterator is in use,
    except for replacing or removing the last returned element.  */
@@ -374,13 +374,13 @@ extern gl_list_iterator_t gl_list_iterator_from_to (gl_list_t list,
                                                     size_t start_index,
                                                     size_t end_index);
 
-/* If there is a next element, store the next element in *ELTP, store its
-   node in *NODEP if NODEP is non-NULL, advance the iterator and return true.
-   Otherwise, return false.  */
+/* If there is a next element, stores the next element in *ELTP, stores its
+   node in *NODEP if NODEP is non-NULL, advances the iterator and returns true.
+   Otherwise, returns false.  */
 extern bool gl_list_iterator_next (gl_list_iterator_t *iterator,
                                    const void **eltp, gl_list_node_t *nodep);
 
-/* Free an iterator.  */
+/* Frees an iterator.  */
 extern void gl_list_iterator_free (gl_list_iterator_t *iterator);
 
 #endif /* End of inline functions.  */
@@ -396,21 +396,21 @@ typedef int (*gl_listelement_compar_fn) (const void *elt1, const void *elt2);
 
 #if 0 /* Unless otherwise specified, these are defined inline below.  */
 
-/* Search whether an element is already in the list.
+/* Searches whether an element is already in the list.
    The list is assumed to be sorted with COMPAR.
-   Return its node if found, or NULL if not present in the list.
+   Returns its node if found, or NULL if not present in the list.
    If the list contains several copies of ELT, the node of the leftmost one is
    returned.  */
 extern gl_list_node_t gl_sortedlist_search (gl_list_t list,
                                             gl_listelement_compar_fn compar,
                                             const void *elt);
 
-/* Search whether an element is already in the list.
+/* Searches whether an element is already in the list.
    The list is assumed to be sorted with COMPAR.
    Only list elements with indices >= START_INDEX and < END_INDEX are
    considered; the implementation uses these bounds to minimize the number
    of COMPAR invocations.
-   Return its node if found, or NULL if not present in the list.
+   Returns its node if found, or NULL if not present in the list.
    If the list contains several copies of ELT, the node of the leftmost one is
    returned.  */
 extern gl_list_node_t gl_sortedlist_search_from_to (gl_list_t list,
@@ -419,21 +419,21 @@ extern gl_list_node_t gl_sortedlist_search_from_to (gl_list_t list,
                                                     size_t end_index,
                                                     const void *elt);
 
-/* Search whether an element is already in the list.
+/* Searches whether an element is already in the list.
    The list is assumed to be sorted with COMPAR.
-   Return its position if found, or (size_t)(-1) if not present in the list.
+   Returns its position if found, or (size_t)(-1) if not present in the list.
    If the list contains several copies of ELT, the position of the leftmost one
    is returned.  */
 extern size_t gl_sortedlist_indexof (gl_list_t list,
                                      gl_listelement_compar_fn compar,
                                      const void *elt);
 
-/* Search whether an element is already in the list.
+/* Searches whether an element is already in the list.
    The list is assumed to be sorted with COMPAR.
    Only list elements with indices >= START_INDEX and < END_INDEX are
    considered; the implementation uses these bounds to minimize the number
    of COMPAR invocations.
-   Return its position if found, or (size_t)(-1) if not present in the list.
+   Returns its position if found, or (size_t)(-1) if not present in the list.
    If the list contains several copies of ELT, the position of the leftmost one
    is returned.  */
 extern size_t gl_sortedlist_indexof_from_to (gl_list_t list,
@@ -442,14 +442,14 @@ extern size_t gl_sortedlist_indexof_from_to (gl_list_t list,
                                              size_t end_index,
                                              const void *elt);
 
-/* Add an element at the appropriate position in the list.
+/* Adds an element at the appropriate position in the list.
    The list is assumed to be sorted with COMPAR.
-   Return its node.  */
+   Returns its node.  */
 /* declared in gl_xlist.h */
 extern gl_list_node_t gl_sortedlist_add (gl_list_t list,
                                          gl_listelement_compar_fn compar,
                                          const void *elt);
-/* Likewise.  Return NULL upon out-of-memory.  */
+/* Likewise.  Returns NULL upon out-of-memory.  */
 extern gl_list_node_t gl_sortedlist_nx_add (gl_list_t list,
                                             gl_listelement_compar_fn compar,
                                             const void *elt)
@@ -458,9 +458,9 @@ extern gl_list_node_t gl_sortedlist_nx_add (gl_list_t list,
 #endif
   ;
 
-/* Search and remove an element from the list.
+/* Searches and removes an element from the list.
    The list is assumed to be sorted with COMPAR.
-   Return true if it was found and removed.
+   Returns true if it was found and removed.
    If the list contains several copies of ELT, only the leftmost one is
    removed.  */
 extern bool gl_sortedlist_remove (gl_list_t list,
diff --git a/contrib/tools/bison/lib/gl_xlist.h b/contrib/tools/bison/lib/gl_xlist.h
index 87885c33c81e..ef6b93f6a50d 100644
--- a/contrib/tools/bison/lib/gl_xlist.h
+++ b/contrib/tools/bison/lib/gl_xlist.h
@@ -1,5 +1,5 @@
 /* Abstract sequential list data type, with out-of-memory checking.
-   Copyright (C) 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/glthread/lock.c b/contrib/tools/bison/lib/glthread/lock.c
new file mode 100644
index 000000000000..10af6f2e1f07
--- /dev/null
+++ b/contrib/tools/bison/lib/glthread/lock.c
@@ -0,0 +1,749 @@
+/* Locking in multithreaded situations.
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-posix.h, gthr-posix95.h.  */
+
+#include <config.h>
+
+#include "glthread/lock.h"
+
+/* ========================================================================= */
+
+#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+int
+glthread_lock_init (gl_lock_t *lock)
+{
+  if (mtx_init (&lock->mutex, mtx_plain) != thrd_success)
+    return ENOMEM;
+  lock->init_needed = 0;
+  return 0;
+}
+
+int
+glthread_lock_lock (gl_lock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  if (mtx_lock (&lock->mutex) != thrd_success)
+    return EAGAIN;
+  return 0;
+}
+
+int
+glthread_lock_unlock (gl_lock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  if (mtx_unlock (&lock->mutex) != thrd_success)
+    return EINVAL;
+  return 0;
+}
+
+int
+glthread_lock_destroy (gl_lock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  mtx_destroy (&lock->mutex);
+  return 0;
+}
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+int
+glthread_rwlock_init (gl_rwlock_t *lock)
+{
+  if (mtx_init (&lock->lock, mtx_plain) != thrd_success
+      || cnd_init (&lock->waiting_readers) != thrd_success
+      || cnd_init (&lock->waiting_writers) != thrd_success)
+    return ENOMEM;
+  lock->waiting_writers_count = 0;
+  lock->runcount = 0;
+  lock->init_needed = 0;
+  return 0;
+}
+
+int
+glthread_rwlock_rdlock (gl_rwlock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  if (mtx_lock (&lock->lock) != thrd_success)
+    return EAGAIN;
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow, and whether no writer is waiting.  The latter
+     condition is because POSIX recommends that "write locks shall take
+     precedence over read locks", to avoid "writer starvation".  */
+  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_readers.  */
+      if (cnd_wait (&lock->waiting_readers, &lock->lock) != thrd_success)
+        {
+          mtx_unlock (&lock->lock);
+          return EINVAL;
+        }
+    }
+  lock->runcount++;
+  if (mtx_unlock (&lock->lock) != thrd_success)
+    return EINVAL;
+  return 0;
+}
+
+int
+glthread_rwlock_wrlock (gl_rwlock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  if (mtx_lock (&lock->lock) != thrd_success)
+    return EAGAIN;
+  /* Test whether no readers or writers are currently running.  */
+  while (!(lock->runcount == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_writers.  */
+      lock->waiting_writers_count++;
+      if (cnd_wait (&lock->waiting_writers, &lock->lock) != thrd_success)
+        {
+          lock->waiting_writers_count--;
+          mtx_unlock (&lock->lock);
+          return EINVAL;
+        }
+      lock->waiting_writers_count--;
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  if (mtx_unlock (&lock->lock) != thrd_success)
+    return EINVAL;
+  return 0;
+}
+
+int
+glthread_rwlock_unlock (gl_rwlock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  if (mtx_lock (&lock->lock) != thrd_success)
+    return EAGAIN;
+  if (lock->runcount < 0)
+    {
+      /* Drop a writer lock.  */
+      if (!(lock->runcount == -1))
+        {
+          mtx_unlock (&lock->lock);
+          return EINVAL;
+        }
+      lock->runcount = 0;
+    }
+  else
+    {
+      /* Drop a reader lock.  */
+      if (!(lock->runcount > 0))
+        {
+          mtx_unlock (&lock->lock);
+          return EINVAL;
+        }
+      lock->runcount--;
+    }
+  if (lock->runcount == 0)
+    {
+      /* POSIX recommends that "write locks shall take precedence over read
+         locks", to avoid "writer starvation".  */
+      if (lock->waiting_writers_count > 0)
+        {
+          /* Wake up one of the waiting writers.  */
+          if (cnd_signal (&lock->waiting_writers) != thrd_success)
+            {
+              mtx_unlock (&lock->lock);
+              return EINVAL;
+            }
+        }
+      else
+        {
+          /* Wake up all waiting readers.  */
+          if (cnd_broadcast (&lock->waiting_readers) != thrd_success)
+            {
+              mtx_unlock (&lock->lock);
+              return EINVAL;
+            }
+        }
+    }
+  if (mtx_unlock (&lock->lock) != thrd_success)
+    return EINVAL;
+  return 0;
+}
+
+int
+glthread_rwlock_destroy (gl_rwlock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  mtx_destroy (&lock->lock);
+  cnd_destroy (&lock->waiting_readers);
+  cnd_destroy (&lock->waiting_writers);
+  return 0;
+}
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+int
+glthread_recursive_lock_init (gl_recursive_lock_t *lock)
+{
+  if (mtx_init (&lock->mutex, mtx_plain | mtx_recursive) != thrd_success)
+    return ENOMEM;
+  lock->init_needed = 0;
+  return 0;
+}
+
+int
+glthread_recursive_lock_lock (gl_recursive_lock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  if (mtx_lock (&lock->mutex) != thrd_success)
+    return EAGAIN;
+  return 0;
+}
+
+int
+glthread_recursive_lock_unlock (gl_recursive_lock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  if (mtx_unlock (&lock->mutex) != thrd_success)
+    return EINVAL;
+  return 0;
+}
+
+int
+glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
+{
+  if (lock->init_needed)
+    call_once (&lock->init_once, lock->init_func);
+  mtx_destroy (&lock->mutex);
+  return 0;
+}
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1)))
+
+#  if defined PTHREAD_RWLOCK_INITIALIZER || defined PTHREAD_RWLOCK_INITIALIZER_NP
+
+#   if !HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
+     /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */
+
+int
+glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock)
+{
+  pthread_rwlockattr_t attributes;
+  int err;
+
+  err = pthread_rwlockattr_init (&attributes);
+  if (err != 0)
+    return err;
+  /* Note: PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP is the only value that
+     causes the writer to be preferred. PTHREAD_RWLOCK_PREFER_WRITER_NP does not
+     do this; see
+     http://man7.org/linux/man-pages/man3/pthread_rwlockattr_setkind_np.3.html */
+  err = pthread_rwlockattr_setkind_np (&attributes,
+                                       PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+  if (err == 0)
+    err = pthread_rwlock_init(lock, &attributes);
+  /* pthread_rwlockattr_destroy always returns 0.  It cannot influence the
+     return value.  */
+  pthread_rwlockattr_destroy (&attributes);
+  return err;
+}
+
+#   endif
+#  else
+
+int
+glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_rwlock_init (&lock->rwlock, NULL);
+  if (err != 0)
+    return err;
+  lock->initialized = 1;
+  return 0;
+}
+
+int
+glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      int err;
+
+      err = pthread_mutex_lock (&lock->guard);
+      if (err != 0)
+        return err;
+      if (!lock->initialized)
+        {
+          err = glthread_rwlock_init_multithreaded (lock);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->guard);
+              return err;
+            }
+        }
+      err = pthread_mutex_unlock (&lock->guard);
+      if (err != 0)
+        return err;
+    }
+  return pthread_rwlock_rdlock (&lock->rwlock);
+}
+
+int
+glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      int err;
+
+      err = pthread_mutex_lock (&lock->guard);
+      if (err != 0)
+        return err;
+      if (!lock->initialized)
+        {
+          err = glthread_rwlock_init_multithreaded (lock);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->guard);
+              return err;
+            }
+        }
+      err = pthread_mutex_unlock (&lock->guard);
+      if (err != 0)
+        return err;
+    }
+  return pthread_rwlock_wrlock (&lock->rwlock);
+}
+
+int
+glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
+{
+  if (!lock->initialized)
+    return EINVAL;
+  return pthread_rwlock_unlock (&lock->rwlock);
+}
+
+int
+glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  if (!lock->initialized)
+    return EINVAL;
+  err = pthread_rwlock_destroy (&lock->rwlock);
+  if (err != 0)
+    return err;
+  lock->initialized = 0;
+  return 0;
+}
+
+#  endif
+
+# else
+
+int
+glthread_rwlock_init_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_init (&lock->lock, NULL);
+  if (err != 0)
+    return err;
+  err = pthread_cond_init (&lock->waiting_readers, NULL);
+  if (err != 0)
+    return err;
+  err = pthread_cond_init (&lock->waiting_writers, NULL);
+  if (err != 0)
+    return err;
+  lock->waiting_writers_count = 0;
+  lock->runcount = 0;
+  return 0;
+}
+
+int
+glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_lock (&lock->lock);
+  if (err != 0)
+    return err;
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow, and whether no writer is waiting.  The latter
+     condition is because POSIX recommends that "write locks shall take
+     precedence over read locks", to avoid "writer starvation".  */
+  while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_readers.  */
+      err = pthread_cond_wait (&lock->waiting_readers, &lock->lock);
+      if (err != 0)
+        {
+          pthread_mutex_unlock (&lock->lock);
+          return err;
+        }
+    }
+  lock->runcount++;
+  return pthread_mutex_unlock (&lock->lock);
+}
+
+int
+glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_lock (&lock->lock);
+  if (err != 0)
+    return err;
+  /* Test whether no readers or writers are currently running.  */
+  while (!(lock->runcount == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_writers.  */
+      lock->waiting_writers_count++;
+      err = pthread_cond_wait (&lock->waiting_writers, &lock->lock);
+      if (err != 0)
+        {
+          lock->waiting_writers_count--;
+          pthread_mutex_unlock (&lock->lock);
+          return err;
+        }
+      lock->waiting_writers_count--;
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  return pthread_mutex_unlock (&lock->lock);
+}
+
+int
+glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_lock (&lock->lock);
+  if (err != 0)
+    return err;
+  if (lock->runcount < 0)
+    {
+      /* Drop a writer lock.  */
+      if (!(lock->runcount == -1))
+        {
+          pthread_mutex_unlock (&lock->lock);
+          return EINVAL;
+        }
+      lock->runcount = 0;
+    }
+  else
+    {
+      /* Drop a reader lock.  */
+      if (!(lock->runcount > 0))
+        {
+          pthread_mutex_unlock (&lock->lock);
+          return EINVAL;
+        }
+      lock->runcount--;
+    }
+  if (lock->runcount == 0)
+    {
+      /* POSIX recommends that "write locks shall take precedence over read
+         locks", to avoid "writer starvation".  */
+      if (lock->waiting_writers_count > 0)
+        {
+          /* Wake up one of the waiting writers.  */
+          err = pthread_cond_signal (&lock->waiting_writers);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->lock);
+              return err;
+            }
+        }
+      else
+        {
+          /* Wake up all waiting readers.  */
+          err = pthread_cond_broadcast (&lock->waiting_readers);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->lock);
+              return err;
+            }
+        }
+    }
+  return pthread_mutex_unlock (&lock->lock);
+}
+
+int
+glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_destroy (&lock->lock);
+  if (err != 0)
+    return err;
+  err = pthread_cond_destroy (&lock->waiting_readers);
+  if (err != 0)
+    return err;
+  err = pthread_cond_destroy (&lock->waiting_writers);
+  if (err != 0)
+    return err;
+  return 0;
+}
+
+# endif
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+# if HAVE_PTHREAD_MUTEX_RECURSIVE
+
+#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+
+int
+glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
+{
+  pthread_mutexattr_t attributes;
+  int err;
+
+  err = pthread_mutexattr_init (&attributes);
+  if (err != 0)
+    return err;
+  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
+  if (err != 0)
+    {
+      pthread_mutexattr_destroy (&attributes);
+      return err;
+    }
+  err = pthread_mutex_init (lock, &attributes);
+  if (err != 0)
+    {
+      pthread_mutexattr_destroy (&attributes);
+      return err;
+    }
+  err = pthread_mutexattr_destroy (&attributes);
+  if (err != 0)
+    return err;
+  return 0;
+}
+
+#  else
+
+int
+glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
+{
+  pthread_mutexattr_t attributes;
+  int err;
+
+  err = pthread_mutexattr_init (&attributes);
+  if (err != 0)
+    return err;
+  err = pthread_mutexattr_settype (&attributes, PTHREAD_MUTEX_RECURSIVE);
+  if (err != 0)
+    {
+      pthread_mutexattr_destroy (&attributes);
+      return err;
+    }
+  err = pthread_mutex_init (&lock->recmutex, &attributes);
+  if (err != 0)
+    {
+      pthread_mutexattr_destroy (&attributes);
+      return err;
+    }
+  err = pthread_mutexattr_destroy (&attributes);
+  if (err != 0)
+    return err;
+  lock->initialized = 1;
+  return 0;
+}
+
+int
+glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (!lock->initialized)
+    {
+      int err;
+
+      err = pthread_mutex_lock (&lock->guard);
+      if (err != 0)
+        return err;
+      if (!lock->initialized)
+        {
+          err = glthread_recursive_lock_init_multithreaded (lock);
+          if (err != 0)
+            {
+              pthread_mutex_unlock (&lock->guard);
+              return err;
+            }
+        }
+      err = pthread_mutex_unlock (&lock->guard);
+      if (err != 0)
+        return err;
+    }
+  return pthread_mutex_lock (&lock->recmutex);
+}
+
+int
+glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (!lock->initialized)
+    return EINVAL;
+  return pthread_mutex_unlock (&lock->recmutex);
+}
+
+int
+glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
+{
+  int err;
+
+  if (!lock->initialized)
+    return EINVAL;
+  err = pthread_mutex_destroy (&lock->recmutex);
+  if (err != 0)
+    return err;
+  lock->initialized = 0;
+  return 0;
+}
+
+#  endif
+
+# else
+
+int
+glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock)
+{
+  int err;
+
+  err = pthread_mutex_init (&lock->mutex, NULL);
+  if (err != 0)
+    return err;
+  lock->owner = (pthread_t) 0;
+  lock->depth = 0;
+  return 0;
+}
+
+int
+glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock)
+{
+  pthread_t self = pthread_self ();
+  if (lock->owner != self)
+    {
+      int err;
+
+      err = pthread_mutex_lock (&lock->mutex);
+      if (err != 0)
+        return err;
+      lock->owner = self;
+    }
+  if (++(lock->depth) == 0) /* wraparound? */
+    {
+      lock->depth--;
+      return EAGAIN;
+    }
+  return 0;
+}
+
+int
+glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != pthread_self ())
+    return EPERM;
+  if (lock->depth == 0)
+    return EINVAL;
+  if (--(lock->depth) == 0)
+    {
+      lock->owner = (pthread_t) 0;
+      return pthread_mutex_unlock (&lock->mutex);
+    }
+  else
+    return 0;
+}
+
+int
+glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
+{
+  if (lock->owner != (pthread_t) 0)
+    return EBUSY;
+  return pthread_mutex_destroy (&lock->mutex);
+}
+
+# endif
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
+
+int
+glthread_once_singlethreaded (pthread_once_t *once_control)
+{
+  /* We don't know whether pthread_once_t is an integer type, a floating-point
+     type, a pointer type, or a structure type.  */
+  char *firstbyte = (char *)once_control;
+  if (*firstbyte == *(const char *)&fresh_once)
+    {
+      /* First time use of once_control.  Invert the first byte.  */
+      *firstbyte = ~ *(const char *)&fresh_once;
+      return 1;
+    }
+  else
+    return 0;
+}
+
+# if !(PTHREAD_IN_USE_DETECTION_HARD || USE_POSIX_THREADS_WEAK)
+
+int
+glthread_once_multithreaded (pthread_once_t *once_control,
+                             void (*init_function) (void))
+{
+  int err = pthread_once (once_control, init_function);
+  if (err == ENOSYS)
+    {
+      /* This happens on FreeBSD 11: The pthread_once function in libc returns
+         ENOSYS.  */
+      if (glthread_once_singlethreaded (once_control))
+        init_function ();
+      return 0;
+    }
+  return err;
+}
+
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WINDOWS_THREADS
+
+#endif
+
+/* ========================================================================= */
diff --git a/contrib/tools/bison/lib/glthread/lock.h b/contrib/tools/bison/lib/glthread/lock.h
new file mode 100644
index 000000000000..59485f260140
--- /dev/null
+++ b/contrib/tools/bison/lib/glthread/lock.h
@@ -0,0 +1,789 @@
+/* Locking in multithreaded situations.
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-win32.h.  */
+
+/* This file contains locking primitives for use with a given thread library.
+   It does not contain primitives for creating threads or for other
+   synchronization primitives.
+
+   Normal (non-recursive) locks:
+     Type:                gl_lock_t
+     Declaration:         gl_lock_define(extern, name)
+     Initializer:         gl_lock_define_initialized(, name)
+     Initialization:      gl_lock_init (name);
+     Taking the lock:     gl_lock_lock (name);
+     Releasing the lock:  gl_lock_unlock (name);
+     De-initialization:   gl_lock_destroy (name);
+   Equivalent functions with control of error handling:
+     Initialization:      err = glthread_lock_init (&name);
+     Taking the lock:     err = glthread_lock_lock (&name);
+     Releasing the lock:  err = glthread_lock_unlock (&name);
+     De-initialization:   err = glthread_lock_destroy (&name);
+
+   Read-Write (non-recursive) locks:
+     Type:                gl_rwlock_t
+     Declaration:         gl_rwlock_define(extern, name)
+     Initializer:         gl_rwlock_define_initialized(, name)
+     Initialization:      gl_rwlock_init (name);
+     Taking the lock:     gl_rwlock_rdlock (name);
+                          gl_rwlock_wrlock (name);
+     Releasing the lock:  gl_rwlock_unlock (name);
+     De-initialization:   gl_rwlock_destroy (name);
+   Equivalent functions with control of error handling:
+     Initialization:      err = glthread_rwlock_init (&name);
+     Taking the lock:     err = glthread_rwlock_rdlock (&name);
+                          err = glthread_rwlock_wrlock (&name);
+     Releasing the lock:  err = glthread_rwlock_unlock (&name);
+     De-initialization:   err = glthread_rwlock_destroy (&name);
+
+   Recursive locks:
+     Type:                gl_recursive_lock_t
+     Declaration:         gl_recursive_lock_define(extern, name)
+     Initializer:         gl_recursive_lock_define_initialized(, name)
+     Initialization:      gl_recursive_lock_init (name);
+     Taking the lock:     gl_recursive_lock_lock (name);
+     Releasing the lock:  gl_recursive_lock_unlock (name);
+     De-initialization:   gl_recursive_lock_destroy (name);
+   Equivalent functions with control of error handling:
+     Initialization:      err = glthread_recursive_lock_init (&name);
+     Taking the lock:     err = glthread_recursive_lock_lock (&name);
+     Releasing the lock:  err = glthread_recursive_lock_unlock (&name);
+     De-initialization:   err = glthread_recursive_lock_destroy (&name);
+
+  Once-only execution:
+     Type:                gl_once_t
+     Initializer:         gl_once_define(extern, name)
+     Execution:           gl_once (name, initfunction);
+   Equivalent functions with control of error handling:
+     Execution:           err = glthread_once (&name, initfunction);
+*/
+
+
+#ifndef _LOCK_H
+#define _LOCK_H
+
+#include <errno.h>
+#include <stdlib.h>
+
+#if !defined c11_threads_in_use
+# if HAVE_THREADS_H && USE_POSIX_THREADS_WEAK
+#  include <threads.h>
+#  pragma weak thrd_exit
+#  define c11_threads_in_use() (thrd_exit != NULL)
+# else
+#  define c11_threads_in_use() 0
+# endif
+#endif
+
+/* ========================================================================= */
+
+#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS
+
+/* Use the ISO C threads library.  */
+
+# include <threads.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef struct
+        {
+          int volatile init_needed;
+          once_flag init_once;
+          void (*init_func) (void);
+          mtx_t mutex;
+        }
+        gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_lock_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    static void _atomic_init_##NAME (void);       \
+    STORAGECLASS gl_lock_t NAME =                 \
+      { 1, ONCE_FLAG_INIT, _atomic_init_##NAME }; \
+    static void _atomic_init_##NAME (void)        \
+    {                                             \
+      if (glthread_lock_init (&(NAME)))           \
+        abort ();                                 \
+    }
+extern int glthread_lock_init (gl_lock_t *lock);
+extern int glthread_lock_lock (gl_lock_t *lock);
+extern int glthread_lock_unlock (gl_lock_t *lock);
+extern int glthread_lock_destroy (gl_lock_t *lock);
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+typedef struct
+        {
+          int volatile init_needed;
+          once_flag init_once;
+          void (*init_func) (void);
+          mtx_t lock; /* protects the remaining fields */
+          cnd_t waiting_readers; /* waiting readers */
+          cnd_t waiting_writers; /* waiting writers */
+          unsigned int waiting_writers_count; /* number of waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    static void _atomic_init_##NAME (void);       \
+    STORAGECLASS gl_rwlock_t NAME =               \
+      { 1, ONCE_FLAG_INIT, _atomic_init_##NAME }; \
+    static void _atomic_init_##NAME (void)        \
+    {                                             \
+      if (glthread_rwlock_init (&(NAME)))         \
+        abort ();                                 \
+    }
+extern int glthread_rwlock_init (gl_rwlock_t *lock);
+extern int glthread_rwlock_rdlock (gl_rwlock_t *lock);
+extern int glthread_rwlock_wrlock (gl_rwlock_t *lock);
+extern int glthread_rwlock_unlock (gl_rwlock_t *lock);
+extern int glthread_rwlock_destroy (gl_rwlock_t *lock);
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+typedef struct
+        {
+          int volatile init_needed;
+          once_flag init_once;
+          void (*init_func) (void);
+          mtx_t mutex;
+        }
+        gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME;
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+    static void _atomic_init_##NAME (void);       \
+    STORAGECLASS gl_recursive_lock_t NAME =       \
+      { 1, ONCE_FLAG_INIT, _atomic_init_##NAME }; \
+    static void _atomic_init_##NAME (void)        \
+    {                                             \
+      if (glthread_recursive_lock_init (&(NAME))) \
+        abort ();                                 \
+    }
+extern int glthread_recursive_lock_init (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef once_flag gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS once_flag NAME = ONCE_FLAG_INIT;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (call_once (ONCE_CONTROL, INITFUNCTION), 0)
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* Use the POSIX threads library.  */
+
+# include <pthread.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# if PTHREAD_IN_USE_DETECTION_HARD
+
+/* The pthread_in_use() detection needs to be done at runtime.  */
+#  define pthread_in_use() \
+     glthread_in_use ()
+extern int glthread_in_use (void);
+
+# endif
+
+# if USE_POSIX_THREADS_WEAK
+
+/* Use weak references to the POSIX threads library.  */
+
+/* Weak references avoid dragging in external libraries if the other parts
+   of the program don't use them.  Here we use them, because we don't want
+   every program that uses libintl to depend on libpthread.  This assumes
+   that libpthread would not be loaded after libintl; i.e. if libintl is
+   loaded first, by an executable that does not depend on libpthread, and
+   then a module is dynamically loaded that depends on libpthread, libintl
+   will not be multithread-safe.  */
+
+/* The way to test at runtime whether libpthread is present is to test
+   whether a function pointer's value, such as &pthread_mutex_init, is
+   non-NULL.  However, some versions of GCC have a bug through which, in
+   PIC mode, &foo != NULL always evaluates to true if there is a direct
+   call to foo(...) in the same function.  To avoid this, we test the
+   address of a function in libpthread that we don't use.  */
+
+#  pragma weak pthread_mutex_init
+#  pragma weak pthread_mutex_lock
+#  pragma weak pthread_mutex_unlock
+#  pragma weak pthread_mutex_destroy
+#  pragma weak pthread_rwlock_init
+#  pragma weak pthread_rwlock_rdlock
+#  pragma weak pthread_rwlock_wrlock
+#  pragma weak pthread_rwlock_unlock
+#  pragma weak pthread_rwlock_destroy
+#  pragma weak pthread_once
+#  pragma weak pthread_cond_init
+#  pragma weak pthread_cond_wait
+#  pragma weak pthread_cond_signal
+#  pragma weak pthread_cond_broadcast
+#  pragma weak pthread_cond_destroy
+#  pragma weak pthread_mutexattr_init
+#  pragma weak pthread_mutexattr_settype
+#  pragma weak pthread_mutexattr_destroy
+#  pragma weak pthread_rwlockattr_init
+#  if __GNU_LIBRARY__ > 1
+#   pragma weak pthread_rwlockattr_setkind_np
+#  endif
+#  pragma weak pthread_rwlockattr_destroy
+#  ifndef pthread_self
+#   pragma weak pthread_self
+#  endif
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+    /* Considering all platforms with USE_POSIX_THREADS_WEAK, only few symbols
+       can be used to determine whether libpthread is in use.  These are:
+         pthread_mutexattr_gettype
+         pthread_rwlockattr_destroy
+         pthread_rwlockattr_init
+     */
+#   pragma weak pthread_mutexattr_gettype
+#   define pthread_in_use() \
+      (pthread_mutexattr_gettype != NULL || c11_threads_in_use ())
+#  endif
+
+# else
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+#   define pthread_in_use() 1
+#  endif
+
+# endif
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef pthread_mutex_t gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_mutex_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_mutex_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    PTHREAD_MUTEX_INITIALIZER
+# define glthread_lock_init(LOCK) \
+    (pthread_in_use () ? pthread_mutex_init (LOCK, NULL) : 0)
+# define glthread_lock_lock(LOCK) \
+    (pthread_in_use () ? pthread_mutex_lock (LOCK) : 0)
+# define glthread_lock_unlock(LOCK) \
+    (pthread_in_use () ? pthread_mutex_unlock (LOCK) : 0)
+# define glthread_lock_destroy(LOCK) \
+    (pthread_in_use () ? pthread_mutex_destroy (LOCK) : 0)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1)))
+
+#  if defined PTHREAD_RWLOCK_INITIALIZER || defined PTHREAD_RWLOCK_INITIALIZER_NP
+
+typedef pthread_rwlock_t gl_rwlock_t;
+#   define gl_rwlock_define(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_rwlock_t NAME;
+#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer;
+#   if HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER
+#    if defined PTHREAD_RWLOCK_INITIALIZER
+#     define gl_rwlock_initializer \
+        PTHREAD_RWLOCK_INITIALIZER
+#    else
+#     define gl_rwlock_initializer \
+        PTHREAD_RWLOCK_INITIALIZER_NP
+#    endif
+#    define glthread_rwlock_init(LOCK) \
+       (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0)
+#   else /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */
+#    define gl_rwlock_initializer \
+       PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP
+#    define glthread_rwlock_init(LOCK) \
+       (pthread_in_use () ? glthread_rwlock_init_for_glibc (LOCK) : 0)
+extern int glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock);
+#   endif
+#   define glthread_rwlock_rdlock(LOCK) \
+      (pthread_in_use () ? pthread_rwlock_rdlock (LOCK) : 0)
+#   define glthread_rwlock_wrlock(LOCK) \
+      (pthread_in_use () ? pthread_rwlock_wrlock (LOCK) : 0)
+#   define glthread_rwlock_unlock(LOCK) \
+      (pthread_in_use () ? pthread_rwlock_unlock (LOCK) : 0)
+#   define glthread_rwlock_destroy(LOCK) \
+      (pthread_in_use () ? pthread_rwlock_destroy (LOCK) : 0)
+
+#  else
+
+typedef struct
+        {
+          int initialized;
+          pthread_mutex_t guard;   /* protects the initialization */
+          pthread_rwlock_t rwlock; /* read-write lock */
+        }
+        gl_rwlock_t;
+#   define gl_rwlock_define(STORAGECLASS, NAME) \
+      STORAGECLASS gl_rwlock_t NAME;
+#   define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+#   define gl_rwlock_initializer \
+      { 0, PTHREAD_MUTEX_INITIALIZER }
+#   define glthread_rwlock_init(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
+#   define glthread_rwlock_rdlock(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
+#   define glthread_rwlock_wrlock(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
+#   define glthread_rwlock_unlock(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
+#   define glthread_rwlock_destroy(LOCK) \
+      (pthread_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
+
+#  endif
+
+# else
+
+typedef struct
+        {
+          pthread_mutex_t lock; /* protects the remaining fields */
+          pthread_cond_t waiting_readers; /* waiting readers */
+          pthread_cond_t waiting_writers; /* waiting writers */
+          unsigned int waiting_writers_count; /* number of waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+# define gl_rwlock_initializer \
+    { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 }
+# define glthread_rwlock_init(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0)
+# define glthread_rwlock_rdlock(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0)
+# define glthread_rwlock_wrlock(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0)
+# define glthread_rwlock_unlock(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0)
+# define glthread_rwlock_destroy(LOCK) \
+    (pthread_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock);
+extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock);
+
+# endif
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+# if HAVE_PTHREAD_MUTEX_RECURSIVE
+
+#  if defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER || defined PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+
+typedef pthread_mutex_t gl_recursive_lock_t;
+#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_mutex_t NAME;
+#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS pthread_mutex_t NAME = gl_recursive_lock_initializer;
+#   ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#    define gl_recursive_lock_initializer \
+       PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#   else
+#    define gl_recursive_lock_initializer \
+       PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#   endif
+#   define glthread_recursive_lock_init(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
+#   define glthread_recursive_lock_lock(LOCK) \
+      (pthread_in_use () ? pthread_mutex_lock (LOCK) : 0)
+#   define glthread_recursive_lock_unlock(LOCK) \
+      (pthread_in_use () ? pthread_mutex_unlock (LOCK) : 0)
+#   define glthread_recursive_lock_destroy(LOCK) \
+      (pthread_in_use () ? pthread_mutex_destroy (LOCK) : 0)
+extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
+
+#  else
+
+typedef struct
+        {
+          pthread_mutex_t recmutex; /* recursive mutex */
+          pthread_mutex_t guard;    /* protects the initialization */
+          int initialized;
+        }
+        gl_recursive_lock_t;
+#   define gl_recursive_lock_define(STORAGECLASS, NAME) \
+      STORAGECLASS gl_recursive_lock_t NAME;
+#   define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+      STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+#   define gl_recursive_lock_initializer \
+      { PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, 0 }
+#   define glthread_recursive_lock_init(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
+#   define glthread_recursive_lock_lock(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
+#   define glthread_recursive_lock_unlock(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
+#   define glthread_recursive_lock_destroy(LOCK) \
+      (pthread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
+
+#  endif
+
+# else
+
+/* Old versions of POSIX threads on Solaris did not have recursive locks.
+   We have to implement them ourselves.  */
+
+typedef struct
+        {
+          pthread_mutex_t mutex;
+          pthread_t owner;
+          unsigned long depth;
+        }
+        gl_recursive_lock_t;
+#  define gl_recursive_lock_define(STORAGECLASS, NAME) \
+     STORAGECLASS gl_recursive_lock_t NAME;
+#  define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+     STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+#  define gl_recursive_lock_initializer \
+     { PTHREAD_MUTEX_INITIALIZER, (pthread_t) 0, 0 }
+#  define glthread_recursive_lock_init(LOCK) \
+     (pthread_in_use () ? glthread_recursive_lock_init_multithreaded (LOCK) : 0)
+#  define glthread_recursive_lock_lock(LOCK) \
+     (pthread_in_use () ? glthread_recursive_lock_lock_multithreaded (LOCK) : 0)
+#  define glthread_recursive_lock_unlock(LOCK) \
+     (pthread_in_use () ? glthread_recursive_lock_unlock_multithreaded (LOCK) : 0)
+#  define glthread_recursive_lock_destroy(LOCK) \
+     (pthread_in_use () ? glthread_recursive_lock_destroy_multithreaded (LOCK) : 0)
+extern int glthread_recursive_lock_init_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_lock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_unlock_multithreaded (gl_recursive_lock_t *lock);
+extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock);
+
+# endif
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef pthread_once_t gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT;
+# if PTHREAD_IN_USE_DETECTION_HARD || USE_POSIX_THREADS_WEAK
+#  define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+     (pthread_in_use ()                                                        \
+      ? pthread_once (ONCE_CONTROL, INITFUNCTION)                              \
+      : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
+# else
+#  define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+     (pthread_in_use ()                                                        \
+      ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)               \
+      : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
+extern int glthread_once_multithreaded (pthread_once_t *once_control,
+                                        void (*init_function) (void));
+# endif
+extern int glthread_once_singlethreaded (pthread_once_t *once_control);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WINDOWS_THREADS
+
+# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+# include <windows.h>
+
+# include "windows-mutex.h"
+# include "windows-rwlock.h"
+# include "windows-recmutex.h"
+# include "windows-once.h"
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
+   Mutex, Semaphore types, because
+     - we need only to synchronize inside a single process (address space),
+       not inter-process locking,
+     - we don't need to support trylock operations.  (TryEnterCriticalSection
+       does not work on Windows 95/98/ME.  Packages that need trylock usually
+       define their own mutex type.)  */
+
+/* There is no way to statically initialize a CRITICAL_SECTION.  It needs
+   to be done lazily, once only.  For this we need spinlocks.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef glwthread_mutex_t gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_lock_t NAME;
+# define gl_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_lock_t NAME = gl_lock_initializer;
+# define gl_lock_initializer \
+    GLWTHREAD_MUTEX_INIT
+# define glthread_lock_init(LOCK) \
+    (glwthread_mutex_init (LOCK), 0)
+# define glthread_lock_lock(LOCK) \
+    glwthread_mutex_lock (LOCK)
+# define glthread_lock_unlock(LOCK) \
+    glwthread_mutex_unlock (LOCK)
+# define glthread_lock_destroy(LOCK) \
+    glwthread_mutex_destroy (LOCK)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+typedef glwthread_rwlock_t gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME;
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer;
+# define gl_rwlock_initializer \
+    GLWTHREAD_RWLOCK_INIT
+# define glthread_rwlock_init(LOCK) \
+    (glwthread_rwlock_init (LOCK), 0)
+# define glthread_rwlock_rdlock(LOCK) \
+    glwthread_rwlock_rdlock (LOCK)
+# define glthread_rwlock_wrlock(LOCK) \
+    glwthread_rwlock_wrlock (LOCK)
+# define glthread_rwlock_unlock(LOCK) \
+    glwthread_rwlock_unlock (LOCK)
+# define glthread_rwlock_destroy(LOCK) \
+    glwthread_rwlock_destroy (LOCK)
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+typedef glwthread_recmutex_t gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME;
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \
+    STORAGECLASS gl_recursive_lock_t NAME = gl_recursive_lock_initializer;
+# define gl_recursive_lock_initializer \
+    GLWTHREAD_RECMUTEX_INIT
+# define glthread_recursive_lock_init(LOCK) \
+    (glwthread_recmutex_init (LOCK), 0)
+# define glthread_recursive_lock_lock(LOCK) \
+    glwthread_recmutex_lock (LOCK)
+# define glthread_recursive_lock_unlock(LOCK) \
+    glwthread_recmutex_unlock (LOCK)
+# define glthread_recursive_lock_destroy(LOCK) \
+    glwthread_recmutex_destroy (LOCK)
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef glwthread_once_t gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = GLWTHREAD_ONCE_INIT;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (glwthread_once (ONCE_CONTROL, INITFUNCTION), 0)
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if !(USE_ISOC_THREADS || USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS || USE_WINDOWS_THREADS)
+
+/* Provide dummy implementation if threads are not supported.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+typedef int gl_lock_t;
+# define gl_lock_define(STORAGECLASS, NAME)
+# define gl_lock_define_initialized(STORAGECLASS, NAME)
+# define glthread_lock_init(NAME) 0
+# define glthread_lock_lock(NAME) 0
+# define glthread_lock_unlock(NAME) 0
+# define glthread_lock_destroy(NAME) 0
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+typedef int gl_rwlock_t;
+# define gl_rwlock_define(STORAGECLASS, NAME)
+# define gl_rwlock_define_initialized(STORAGECLASS, NAME)
+# define glthread_rwlock_init(NAME) 0
+# define glthread_rwlock_rdlock(NAME) 0
+# define glthread_rwlock_wrlock(NAME) 0
+# define glthread_rwlock_unlock(NAME) 0
+# define glthread_rwlock_destroy(NAME) 0
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+typedef int gl_recursive_lock_t;
+# define gl_recursive_lock_define(STORAGECLASS, NAME)
+# define gl_recursive_lock_define_initialized(STORAGECLASS, NAME)
+# define glthread_recursive_lock_init(NAME) 0
+# define glthread_recursive_lock_lock(NAME) 0
+# define glthread_recursive_lock_unlock(NAME) 0
+# define glthread_recursive_lock_destroy(NAME) 0
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef int gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = 0;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (*(ONCE_CONTROL) == 0 ? (*(ONCE_CONTROL) = ~ 0, INITFUNCTION (), 0) : 0)
+
+#endif
+
+/* ========================================================================= */
+
+/* Macros with built-in error handling.  */
+
+/* -------------------------- gl_lock_t datatype -------------------------- */
+
+#define gl_lock_init(NAME) \
+   do                                  \
+     {                                 \
+       if (glthread_lock_init (&NAME)) \
+         abort ();                     \
+     }                                 \
+   while (0)
+#define gl_lock_lock(NAME) \
+   do                                  \
+     {                                 \
+       if (glthread_lock_lock (&NAME)) \
+         abort ();                     \
+     }                                 \
+   while (0)
+#define gl_lock_unlock(NAME) \
+   do                                    \
+     {                                   \
+       if (glthread_lock_unlock (&NAME)) \
+         abort ();                       \
+     }                                   \
+   while (0)
+#define gl_lock_destroy(NAME) \
+   do                                     \
+     {                                    \
+       if (glthread_lock_destroy (&NAME)) \
+         abort ();                        \
+     }                                    \
+   while (0)
+
+/* ------------------------- gl_rwlock_t datatype ------------------------- */
+
+#define gl_rwlock_init(NAME) \
+   do                                    \
+     {                                   \
+       if (glthread_rwlock_init (&NAME)) \
+         abort ();                       \
+     }                                   \
+   while (0)
+#define gl_rwlock_rdlock(NAME) \
+   do                                      \
+     {                                     \
+       if (glthread_rwlock_rdlock (&NAME)) \
+         abort ();                         \
+     }                                     \
+   while (0)
+#define gl_rwlock_wrlock(NAME) \
+   do                                      \
+     {                                     \
+       if (glthread_rwlock_wrlock (&NAME)) \
+         abort ();                         \
+     }                                     \
+   while (0)
+#define gl_rwlock_unlock(NAME) \
+   do                                      \
+     {                                     \
+       if (glthread_rwlock_unlock (&NAME)) \
+         abort ();                         \
+     }                                     \
+   while (0)
+#define gl_rwlock_destroy(NAME) \
+   do                                       \
+     {                                      \
+       if (glthread_rwlock_destroy (&NAME)) \
+         abort ();                          \
+     }                                      \
+   while (0)
+
+/* --------------------- gl_recursive_lock_t datatype --------------------- */
+
+#define gl_recursive_lock_init(NAME) \
+   do                                            \
+     {                                           \
+       if (glthread_recursive_lock_init (&NAME)) \
+         abort ();                               \
+     }                                           \
+   while (0)
+#define gl_recursive_lock_lock(NAME) \
+   do                                            \
+     {                                           \
+       if (glthread_recursive_lock_lock (&NAME)) \
+         abort ();                               \
+     }                                           \
+   while (0)
+#define gl_recursive_lock_unlock(NAME) \
+   do                                              \
+     {                                             \
+       if (glthread_recursive_lock_unlock (&NAME)) \
+         abort ();                                 \
+     }                                             \
+   while (0)
+#define gl_recursive_lock_destroy(NAME) \
+   do                                               \
+     {                                              \
+       if (glthread_recursive_lock_destroy (&NAME)) \
+         abort ();                                  \
+     }                                              \
+   while (0)
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+#define gl_once(NAME, INITFUNCTION) \
+   do                                           \
+     {                                          \
+       if (glthread_once (&NAME, INITFUNCTION)) \
+         abort ();                              \
+     }                                          \
+   while (0)
+
+/* ========================================================================= */
+
+#endif /* _LOCK_H */
diff --git a/contrib/tools/bison/lib/glthread/threadlib.c b/contrib/tools/bison/lib/glthread/threadlib.c
new file mode 100644
index 000000000000..28bf3c6f76dc
--- /dev/null
+++ b/contrib/tools/bison/lib/glthread/threadlib.c
@@ -0,0 +1,73 @@
+/* Multithreading primitives.
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
+
+#include <config.h>
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS
+
+/* Use the POSIX threads library.  */
+
+# include <pthread.h>
+# include <stdlib.h>
+
+# if PTHREAD_IN_USE_DETECTION_HARD
+
+/* The function to be executed by a dummy thread.  */
+static void *
+dummy_thread_func (void *arg)
+{
+  return arg;
+}
+
+int
+glthread_in_use (void)
+{
+  static int tested;
+  static int result; /* 1: linked with -lpthread, 0: only with libc */
+
+  if (!tested)
+    {
+      pthread_t thread;
+
+      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
+        /* Thread creation failed.  */
+        result = 0;
+      else
+        {
+          /* Thread creation works.  */
+          void *retval;
+          if (pthread_join (thread, &retval) != 0)
+            abort ();
+          result = 1;
+        }
+      tested = 1;
+    }
+  return result;
+}
+
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+/* This declaration is solely to ensure that after preprocessing
+   this file is never empty.  */
+typedef int dummy;
diff --git a/contrib/tools/bison/lib/glthread/tls.c b/contrib/tools/bison/lib/glthread/tls.c
new file mode 100644
index 000000000000..2492b00c0e57
--- /dev/null
+++ b/contrib/tools/bison/lib/glthread/tls.c
@@ -0,0 +1,41 @@
+/* Thread-local storage in multithreaded situations.
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
+
+#include <config.h>
+
+#include "glthread/tls.h"
+
+/* ========================================================================= */
+
+#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WINDOWS_THREADS
+
+#endif
+
+/* ========================================================================= */
diff --git a/contrib/tools/bison/lib/glthread/tls.h b/contrib/tools/bison/lib/glthread/tls.h
new file mode 100644
index 000000000000..d11e89bac824
--- /dev/null
+++ b/contrib/tools/bison/lib/glthread/tls.h
@@ -0,0 +1,228 @@
+/* Thread-local storage in multithreaded situations.
+   Copyright (C) 2005, 2007-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
+
+/* This file contains thread-local storage primitives for use with a given
+   thread library.  It does not contain primitives for creating threads or
+   for other multithreading primitives.
+
+     Type:                      gl_tls_key_t
+     Initialization:            gl_tls_key_init (name, destructor);
+     Getting per-thread value:  gl_tls_get (name)
+     Setting per-thread value:  gl_tls_set (name, pointer);
+     De-initialization:         gl_tls_key_destroy (name);
+   Equivalent functions with control of error handling:
+     Initialization:            err = glthread_tls_key_init (&name, destructor);
+     Setting per-thread value:  err = glthread_tls_set (&name, pointer);
+     De-initialization:         err = glthread_tls_key_destroy (&name);
+
+   A per-thread value is of type 'void *'.
+
+   A destructor is a function pointer of type 'void (*) (void *)', called
+   when a thread exits, and taking the last per-thread value as argument.  It
+   is unspecified whether the destructor function is called when the last
+   per-thread value is NULL.  On some platforms, the destructor function is
+   not called at all.
+*/
+
+
+#ifndef _TLS_H
+#define _TLS_H
+
+#include <errno.h>
+#include <stdlib.h>
+
+#if !defined c11_threads_in_use
+# if HAVE_THREADS_H && USE_POSIX_THREADS_WEAK
+#  include <threads.h>
+#  pragma weak thrd_exit
+#  define c11_threads_in_use() (thrd_exit != NULL)
+# else
+#  define c11_threads_in_use() 0
+# endif
+#endif
+
+/* ========================================================================= */
+
+#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS
+
+/* Use the ISO C threads library.  */
+
+# include <threads.h>
+
+/* ------------------------- gl_tls_key_t datatype ------------------------- */
+
+typedef tss_t gl_tls_key_t;
+# define glthread_tls_key_init(KEY, DESTRUCTOR) \
+    (tss_create (KEY, DESTRUCTOR) != thrd_success ? EAGAIN : 0)
+# define gl_tls_get(NAME) \
+    tss_get (NAME)
+# define glthread_tls_set(KEY, POINTER) \
+    (tss_set (*(KEY), (POINTER)) != thrd_success ? ENOMEM : 0)
+# define glthread_tls_key_destroy(KEY) \
+    (tss_delete (*(KEY)), 0)
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* Use the POSIX threads library.  */
+
+# include <pthread.h>
+
+# if PTHREAD_IN_USE_DETECTION_HARD
+
+/* The pthread_in_use() detection needs to be done at runtime.  */
+#  define pthread_in_use() \
+     glthread_in_use ()
+extern int glthread_in_use (void);
+
+# endif
+
+# if USE_POSIX_THREADS_WEAK
+
+/* Use weak references to the POSIX threads library.  */
+
+#  pragma weak pthread_key_create
+#  pragma weak pthread_getspecific
+#  pragma weak pthread_setspecific
+#  pragma weak pthread_key_delete
+#  ifndef pthread_self
+#   pragma weak pthread_self
+#  endif
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+#   pragma weak pthread_mutexattr_gettype
+#   define pthread_in_use() \
+      (pthread_mutexattr_gettype != NULL || c11_threads_in_use ())
+#  endif
+
+# else
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+#   define pthread_in_use() 1
+#  endif
+
+# endif
+
+/* ------------------------- gl_tls_key_t datatype ------------------------- */
+
+typedef union
+        {
+          void *singlethread_value;
+          pthread_key_t key;
+        }
+        gl_tls_key_t;
+# define glthread_tls_key_init(KEY, DESTRUCTOR) \
+    (pthread_in_use ()                              \
+     ? pthread_key_create (&(KEY)->key, DESTRUCTOR) \
+     : ((KEY)->singlethread_value = NULL, 0))
+# define gl_tls_get(NAME) \
+    (pthread_in_use ()                  \
+     ? pthread_getspecific ((NAME).key) \
+     : (NAME).singlethread_value)
+# define glthread_tls_set(KEY, POINTER) \
+    (pthread_in_use ()                             \
+     ? pthread_setspecific ((KEY)->key, (POINTER)) \
+     : ((KEY)->singlethread_value = (POINTER), 0))
+# define glthread_tls_key_destroy(KEY) \
+    (pthread_in_use () ? pthread_key_delete ((KEY)->key) : 0)
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WINDOWS_THREADS
+
+# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+# include <windows.h>
+
+# include "windows-tls.h"
+
+/* ------------------------- gl_tls_key_t datatype ------------------------- */
+
+typedef glwthread_tls_key_t gl_tls_key_t;
+# define glthread_tls_key_init(KEY, DESTRUCTOR) \
+    glwthread_tls_key_create (KEY, DESTRUCTOR)
+# define gl_tls_get(NAME) \
+    TlsGetValue (NAME)
+# define glthread_tls_set(KEY, POINTER) \
+    (!TlsSetValue (*(KEY), POINTER) ? EINVAL : 0)
+# define glthread_tls_key_destroy(KEY) \
+    glwthread_tls_key_delete (*(KEY))
+
+#endif
+
+/* ========================================================================= */
+
+#if !(USE_ISOC_THREADS || USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS || USE_WINDOWS_THREADS)
+
+/* Provide dummy implementation if threads are not supported.  */
+
+/* ------------------------- gl_tls_key_t datatype ------------------------- */
+
+typedef struct
+        {
+          void *singlethread_value;
+        }
+        gl_tls_key_t;
+# define glthread_tls_key_init(KEY, DESTRUCTOR) \
+    ((KEY)->singlethread_value = NULL, \
+     (void) (DESTRUCTOR),              \
+     0)
+# define gl_tls_get(NAME) \
+    (NAME).singlethread_value
+# define glthread_tls_set(KEY, POINTER) \
+    ((KEY)->singlethread_value = (POINTER), 0)
+# define glthread_tls_key_destroy(KEY) \
+    0
+
+#endif
+
+/* ========================================================================= */
+
+/* Macros with built-in error handling.  */
+
+/* ------------------------- gl_tls_key_t datatype ------------------------- */
+
+#define gl_tls_key_init(NAME, DESTRUCTOR) \
+   do                                                 \
+     {                                                \
+       if (glthread_tls_key_init (&NAME, DESTRUCTOR)) \
+         abort ();                                    \
+     }                                                \
+   while (0)
+#define gl_tls_set(NAME, POINTER) \
+   do                                         \
+     {                                        \
+       if (glthread_tls_set (&NAME, POINTER)) \
+         abort ();                            \
+     }                                        \
+   while (0)
+#define gl_tls_key_destroy(NAME) \
+   do                                        \
+     {                                       \
+       if (glthread_tls_key_destroy (&NAME)) \
+         abort ();                           \
+     }                                       \
+   while (0)
+
+/* ========================================================================= */
+
+#endif /* _TLS_H */
diff --git a/contrib/tools/bison/lib/hard-locale.c b/contrib/tools/bison/lib/hard-locale.c
index dcfcad62ee7c..237f875b3a40 100644
--- a/contrib/tools/bison/lib/hard-locale.c
+++ b/contrib/tools/bison/lib/hard-locale.c
@@ -1,6 +1,6 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
-   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2019 Free Software
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -19,54 +19,18 @@
 #include <config.h>
 
 #include "hard-locale.h"
+#include "setlocale_null.h"
 
 #include <locale.h>
-#include <stdlib.h>
 #include <string.h>
 
-#ifdef __GLIBC__
-# define GLIBC_VERSION __GLIBC__
-#elif defined __UCLIBC__
-# define GLIBC_VERSION 2
-#else
-# define GLIBC_VERSION 0
-#endif
-
-/* Return true if the current CATEGORY locale is hard, i.e. if you
-   can't get away with assuming traditional C or POSIX behavior.  */
 bool
 hard_locale (int category)
 {
-  bool hard = true;
-  char const *p = setlocale (category, NULL);
-
-  if (p)
-    {
-      if (2 <= GLIBC_VERSION)
-        {
-          if (strcmp (p, "C") == 0 || strcmp (p, "POSIX") == 0)
-            hard = false;
-        }
-      else
-        {
-          char *locale = strdup (p);
-          if (locale)
-            {
-              /* Temporarily set the locale to the "C" and "POSIX" locales
-                 to find their names, so that we can determine whether one
-                 or the other is the caller's locale.  */
-              if (((p = setlocale (category, "C"))
-                   && strcmp (p, locale) == 0)
-                  || ((p = setlocale (category, "POSIX"))
-                      && strcmp (p, locale) == 0))
-                hard = false;
+  char locale[SETLOCALE_NULL_MAX];
 
-              /* Restore the caller's locale.  */
-              setlocale (category, locale);
-              free (locale);
-            }
-        }
-    }
+  if (setlocale_null_r (category, locale, sizeof (locale)))
+    return false;
 
-  return hard;
+  return !(strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0);
 }
diff --git a/contrib/tools/bison/lib/hard-locale.h b/contrib/tools/bison/lib/hard-locale.h
index 8f1da96e2f25..1886eaae9226 100644
--- a/contrib/tools/bison/lib/hard-locale.h
+++ b/contrib/tools/bison/lib/hard-locale.h
@@ -1,6 +1,6 @@
 /* Determine whether a locale is hard.
 
-   Copyright (C) 1999, 2003-2004, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003-2004, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,9 @@
 
 # include <stdbool.h>
 
-bool hard_locale (int);
+/* Return true if the specified CATEGORY of the current locale is hard, i.e.
+   different from the C or POSIX locale that has a fixed behavior.
+   CATEGORY must be one of the LC_* values, but not LC_ALL.  */
+extern bool hard_locale (int category);
 
 #endif /* HARD_LOCALE_H_ */
diff --git a/contrib/tools/bison/lib/hash.c b/contrib/tools/bison/lib/hash.c
index 9e1f8e8417eb..7aaf10626718 100644
--- a/contrib/tools/bison/lib/hash.c
+++ b/contrib/tools/bison/lib/hash.c
@@ -1,6 +1,6 @@
 /* hash - hashing table processing.
 
-   Copyright (C) 1998-2004, 2006-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-2004, 2006-2007, 2009-2020 Free Software Foundation, Inc.
 
    Written by Jim Meyering, 1992.
 
diff --git a/contrib/tools/bison/lib/hash.h b/contrib/tools/bison/lib/hash.h
index a1a483a35941..2ff4266a4fd9 100644
--- a/contrib/tools/bison/lib/hash.h
+++ b/contrib/tools/bison/lib/hash.h
@@ -1,5 +1,5 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998-1999, 2001, 2003, 2009-2019 Free Software Foundation,
+   Copyright (C) 1998-1999, 2001, 2003, 2009-2020 Free Software Foundation,
    Inc.
    Written by Jim Meyering <meyering@ascend.com>, 1998.
 
@@ -89,6 +89,9 @@ void hash_reset_tuning (Hash_tuning *);
 Hash_table *hash_initialize (size_t, const Hash_tuning *,
                              Hash_hasher, Hash_comparator,
                              Hash_data_freer) _GL_ATTRIBUTE_WUR;
+Hash_table *hash_xinitialize (size_t, const Hash_tuning *,
+                              Hash_hasher, Hash_comparator,
+                              Hash_data_freer) _GL_ATTRIBUTE_WUR;
 void hash_clear (Hash_table *);
 void hash_free (Hash_table *);
 
diff --git a/contrib/tools/bison/lib/intprops.h b/contrib/tools/bison/lib/intprops.h
new file mode 100644
index 000000000000..dfbcaae73e37
--- /dev/null
+++ b/contrib/tools/bison/lib/intprops.h
@@ -0,0 +1,584 @@
+/* intprops.h -- properties of integer types
+
+   Copyright (C) 2001-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert.  */
+
+#ifndef _GL_INTPROPS_H
+#define _GL_INTPROPS_H
+
+#include <limits.h>
+
+/* Return a value with the common real type of E and V and the value of V.
+   Do not evaluate E.  */
+#define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v))
+
+/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
+   <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00406.html>.  */
+#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v))
+
+/* The extra casts in the following macros work around compiler bugs,
+   e.g., in Cray C 5.0.3.0.  */
+
+/* True if the arithmetic type T is an integer type.  bool counts as
+   an integer.  */
+#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
+
+/* True if the real type T is signed.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+
+/* Return 1 if the real expression E, after promotion, has a
+   signed or floating type.  Do not evaluate E.  */
+#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
+
+
+/* Minimum and maximum values for integer types and expressions.  */
+
+/* The width in bits of the integer type or expression T.
+   Do not evaluate T.
+   Padding bits are not supported; this is checked at compile-time below.  */
+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
+
+/* The maximum and minimum values for the integer type T.  */
+#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+#define TYPE_MAXIMUM(t)                                                 \
+  ((t) (! TYPE_SIGNED (t)                                               \
+        ? (t) -1                                                        \
+        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
+
+/* The maximum and minimum values for the type of the expression E,
+   after integer promotion.  E is not evaluated.  */
+#define _GL_INT_MINIMUM(e)                                              \
+  (EXPR_SIGNED (e)                                                      \
+   ? ~ _GL_SIGNED_INT_MAXIMUM (e)                                       \
+   : _GL_INT_CONVERT (e, 0))
+#define _GL_INT_MAXIMUM(e)                                              \
+  (EXPR_SIGNED (e)                                                      \
+   ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
+   : _GL_INT_NEGATE_CONVERT (e, 1))
+#define _GL_SIGNED_INT_MAXIMUM(e)                                       \
+  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
+
+/* Work around OpenVMS incompatibility with C99.  */
+#if !defined LLONG_MAX && defined __INT64_MAX
+# define LLONG_MAX __INT64_MAX
+# define LLONG_MIN __INT64_MIN
+#endif
+
+/* This include file assumes that signed types are two's complement without
+   padding bits; the above macros have undefined behavior otherwise.
+   If this is a problem for you, please let us know how to fix it for your host.
+   This assumption is tested by the intprops-tests module.  */
+
+/* Does the __typeof__ keyword work?  This could be done by
+   'configure', but for now it's easier to do it by hand.  */
+#if (2 <= __GNUC__ \
+     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
+     || (0x5110 <= __SUNPRO_C && !__STDC__))
+# define _GL_HAVE___TYPEOF__ 1
+#else
+# define _GL_HAVE___TYPEOF__ 0
+#endif
+
+/* Return 1 if the integer type or expression T might be signed.  Return 0
+   if it is definitely unsigned.  This macro does not evaluate its argument,
+   and expands to an integer constant expression.  */
+#if _GL_HAVE___TYPEOF__
+# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t))
+#else
+# define _GL_SIGNED_TYPE_OR_EXPR(t) 1
+#endif
+
+/* Bound on length of the string representing an unsigned integer
+   value representable in B bits.  log10 (2.0) < 146/485.  The
+   smallest value of B where this bound is not tight is 2621.  */
+#define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485)
+
+/* Bound on length of the string representing an integer type or expression T.
+   Subtract 1 for the sign bit if T is signed, and then add 1 more for
+   a minus sign if needed.
+
+   Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 1 when its argument is
+   unsigned, this macro may overestimate the true bound by one byte when
+   applied to unsigned types of size 2, 4, 16, ... bytes.  */
+#define INT_STRLEN_BOUND(t)                                     \
+  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
+   + _GL_SIGNED_TYPE_OR_EXPR (t))
+
+/* Bound on buffer size needed to represent an integer type or expression T,
+   including the terminating null.  */
+#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
+
+
+/* Range overflow checks.
+
+   The INT_<op>_RANGE_OVERFLOW macros return 1 if the corresponding C
+   operators might not yield numerically correct answers due to
+   arithmetic overflow.  They do not rely on undefined or
+   implementation-defined behavior.  Their implementations are simple
+   and straightforward, but they are a bit harder to use than the
+   INT_<op>_OVERFLOW macros described below.
+
+   Example usage:
+
+     long int i = ...;
+     long int j = ...;
+     if (INT_MULTIPLY_RANGE_OVERFLOW (i, j, LONG_MIN, LONG_MAX))
+       printf ("multiply would overflow");
+     else
+       printf ("product is %ld", i * j);
+
+   Restrictions on *_RANGE_OVERFLOW macros:
+
+   These macros do not check for all possible numerical problems or
+   undefined or unspecified behavior: they do not check for division
+   by zero, for bad shift counts, or for shifting negative numbers.
+
+   These macros may evaluate their arguments zero or multiple times,
+   so the arguments should not have side effects.  The arithmetic
+   arguments (including the MIN and MAX arguments) must be of the same
+   integer type after the usual arithmetic conversions, and the type
+   must have minimum value MIN and maximum MAX.  Unsigned types should
+   use a zero MIN of the proper type.
+
+   These macros are tuned for constant MIN and MAX.  For commutative
+   operations such as A + B, they are also tuned for constant B.  */
+
+/* Return 1 if A + B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  */
+#define INT_ADD_RANGE_OVERFLOW(a, b, min, max)          \
+  ((b) < 0                                              \
+   ? (a) < (min) - (b)                                  \
+   : (max) - (b) < (a))
+
+/* Return 1 if A - B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  */
+#define INT_SUBTRACT_RANGE_OVERFLOW(a, b, min, max)     \
+  ((b) < 0                                              \
+   ? (max) + (b) < (a)                                  \
+   : (a) < (min) + (b))
+
+/* Return 1 if - A would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  */
+#define INT_NEGATE_RANGE_OVERFLOW(a, min, max)          \
+  ((min) < 0                                            \
+   ? (a) < - (max)                                      \
+   : 0 < (a))
+
+/* Return 1 if A * B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  Avoid && and || as they tickle
+   bugs in Sun C 5.11 2010/08/13 and other compilers; see
+   <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00401.html>.  */
+#define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max)     \
+  ((b) < 0                                              \
+   ? ((a) < 0                                           \
+      ? (a) < (max) / (b)                               \
+      : (b) == -1                                       \
+      ? 0                                               \
+      : (min) / (b) < (a))                              \
+   : (b) == 0                                           \
+   ? 0                                                  \
+   : ((a) < 0                                           \
+      ? (a) < (min) / (b)                               \
+      : (max) / (b) < (a)))
+
+/* Return 1 if A / B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  Do not check for division by zero.  */
+#define INT_DIVIDE_RANGE_OVERFLOW(a, b, min, max)       \
+  ((min) < 0 && (b) == -1 && (a) < - (max))
+
+/* Return 1 if A % B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  Do not check for division by zero.
+   Mathematically, % should never overflow, but on x86-like hosts
+   INT_MIN % -1 traps, and the C standard permits this, so treat this
+   as an overflow too.  */
+#define INT_REMAINDER_RANGE_OVERFLOW(a, b, min, max)    \
+  INT_DIVIDE_RANGE_OVERFLOW (a, b, min, max)
+
+/* Return 1 if A << B would overflow in [MIN,MAX] arithmetic.
+   See above for restrictions.  Here, MIN and MAX are for A only, and B need
+   not be of the same type as the other arguments.  The C standard says that
+   behavior is undefined for shifts unless 0 <= B < wordwidth, and that when
+   A is negative then A << B has undefined behavior and A >> B has
+   implementation-defined behavior, but do not check these other
+   restrictions.  */
+#define INT_LEFT_SHIFT_RANGE_OVERFLOW(a, b, min, max)   \
+  ((a) < 0                                              \
+   ? (a) < (min) >> (b)                                 \
+   : (max) >> (b) < (a))
+
+/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow
+   (A, B, P) work when P is non-null.  */
+#if 5 <= __GNUC__ && !defined __ICC
+# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1
+#elif defined __has_builtin
+# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow)
+#else
+# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0
+#endif
+
+/* True if __builtin_mul_overflow (A, B, P) works when P is non-null.  */
+#ifdef __clang__
+/* Work around Clang bug <https://bugs.llvm.org/show_bug.cgi?id=16404>.  */
+# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0
+#else
+# define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW
+#endif
+
+/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for
+   __builtin_mul_overflow_p and __builtin_mul_overflow_p.  */
+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
+
+/* The _GL*_OVERFLOW macros have the same restrictions as the
+   *_RANGE_OVERFLOW macros, except that they do not assume that operands
+   (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+   that the result (e.g., A + B) has that type.  */
+#if _GL_HAS_BUILTIN_OVERFLOW_P
+# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
+   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
+   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
+   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
+#else
+# define _GL_ADD_OVERFLOW(a, b, min, max)                                \
+   ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
+    : (a) < 0 ? (b) <= (a) + (b)                                         \
+    : (b) < 0 ? (a) <= (a) + (b)                                         \
+    : (a) + (b) < (b))
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
+   ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
+    : (a) < 0 ? 1                                                        \
+    : (b) < 0 ? (a) - (b) <= (a)                                         \
+    : (a) < (b))
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
+   (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
+    || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
+#endif
+#define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
+  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
+   : (a) < 0 ? (b) <= (a) + (b) - 1                                     \
+   : (b) < 0 && (a) + (b) <= (a))
+#define _GL_REMAINDER_OVERFLOW(a, b, min, max)                          \
+  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
+   : (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b)                     \
+   : (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max))
+
+/* Return a nonzero value if A is a mathematical multiple of B, where
+   A is unsigned, B is negative, and MAX is the maximum value of A's
+   type.  A's type must be the same as (A % B)'s type.  Normally (A %
+   -B == 0) suffices, but things get tricky if -B would overflow.  */
+#define _GL_UNSIGNED_NEG_MULTIPLE(a, b, max)                            \
+  (((b) < -_GL_SIGNED_INT_MAXIMUM (b)                                   \
+    ? (_GL_SIGNED_INT_MAXIMUM (b) == (max)                              \
+       ? (a)                                                            \
+       : (a) % (_GL_INT_CONVERT (a, _GL_SIGNED_INT_MAXIMUM (b)) + 1))   \
+    : (a) % - (b))                                                      \
+   == 0)
+
+/* Check for integer overflow, and report low order bits of answer.
+
+   The INT_<op>_OVERFLOW macros return 1 if the corresponding C operators
+   might not yield numerically correct answers due to arithmetic overflow.
+   The INT_<op>_WRAPV macros compute the low-order bits of the sum,
+   difference, and product of two C integers, and return 1 if these
+   low-order bits are not numerically correct.
+   These macros work correctly on all known practical hosts, and do not rely
+   on undefined behavior due to signed arithmetic overflow.
+
+   Example usage, assuming A and B are long int:
+
+     if (INT_MULTIPLY_OVERFLOW (a, b))
+       printf ("result would overflow\n");
+     else
+       printf ("result is %ld (no overflow)\n", a * b);
+
+   Example usage with WRAPV flavor:
+
+     long int result;
+     bool overflow = INT_MULTIPLY_WRAPV (a, b, &result);
+     printf ("result is %ld (%s)\n", result,
+             overflow ? "after overflow" : "no overflow");
+
+   Restrictions on these macros:
+
+   These macros do not check for all possible numerical problems or
+   undefined or unspecified behavior: they do not check for division
+   by zero, for bad shift counts, or for shifting negative numbers.
+
+   These macros may evaluate their arguments zero or multiple times, so the
+   arguments should not have side effects.
+
+   The WRAPV macros are not constant expressions.  They support only
+   +, binary -, and *.  Because the WRAPV macros convert the result,
+   they report overflow in different circumstances than the OVERFLOW
+   macros do.
+
+   These macros are tuned for their last input argument being a constant.
+
+   Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B,
+   A % B, and A << B would overflow, respectively.  */
+
+#define INT_ADD_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
+#define INT_SUBTRACT_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
+#if _GL_HAS_BUILTIN_OVERFLOW_P
+# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+#else
+# define INT_NEGATE_OVERFLOW(a) \
+   INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
+#endif
+#define INT_MULTIPLY_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
+#define INT_DIVIDE_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_DIVIDE_OVERFLOW)
+#define INT_REMAINDER_OVERFLOW(a, b) \
+  _GL_BINARY_OP_OVERFLOW (a, b, _GL_REMAINDER_OVERFLOW)
+#define INT_LEFT_SHIFT_OVERFLOW(a, b) \
+  INT_LEFT_SHIFT_RANGE_OVERFLOW (a, b, \
+                                 _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
+
+/* Return 1 if the expression A <op> B would overflow,
+   where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test,
+   assuming MIN and MAX are the minimum and maximum for the result type.
+   Arguments should be free of side effects.  */
+#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow)        \
+  op_result_overflow (a, b,                                     \
+                      _GL_INT_MINIMUM (_GL_INT_CONVERT (a, b)), \
+                      _GL_INT_MAXIMUM (_GL_INT_CONVERT (a, b)))
+
+/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
+   Return 1 if the result overflows.  See above for restrictions.  */
+#if _GL_HAS_BUILTIN_ADD_OVERFLOW
+# define INT_ADD_WRAPV(a, b, r) __builtin_add_overflow (a, b, r)
+# define INT_SUBTRACT_WRAPV(a, b, r) __builtin_sub_overflow (a, b, r)
+#else
+# define INT_ADD_WRAPV(a, b, r) \
+   _GL_INT_OP_WRAPV (a, b, r, +, _GL_INT_ADD_RANGE_OVERFLOW)
+# define INT_SUBTRACT_WRAPV(a, b, r) \
+   _GL_INT_OP_WRAPV (a, b, r, -, _GL_INT_SUBTRACT_RANGE_OVERFLOW)
+#endif
+#if _GL_HAS_BUILTIN_MUL_OVERFLOW
+# if (9 < __GNUC__ + (3 <= __GNUC_MINOR__) \
+      || (__GNUC__ == 8 && 4 <= __GNUC_MINOR__))
+#  define INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r)
+# else
+   /* Work around GCC bug 91450.  */
+#  define INT_MULTIPLY_WRAPV(a, b, r) \
+    ((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && EXPR_SIGNED (a) && EXPR_SIGNED (b) \
+      && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \
+     ? ((void) __builtin_mul_overflow (a, b, r), 1) \
+     : __builtin_mul_overflow (a, b, r))
+# endif
+#else
+# define INT_MULTIPLY_WRAPV(a, b, r) \
+   _GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW)
+#endif
+
+/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
+   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
+   https://llvm.org/bugs/show_bug.cgi?id=25390
+   For now, assume all versions of GCC-like compilers generate bogus
+   warnings for _Generic.  This matters only for compilers that
+   lack relevant builtins.  */
+#if __GNUC__
+# define _GL__GENERIC_BOGUS 1
+#else
+# define _GL__GENERIC_BOGUS 0
+#endif
+
+/* Store the low-order bits of A <op> B into *R, where OP specifies
+   the operation and OVERFLOW the overflow predicate.  Return 1 if the
+   result overflows.  See above for restrictions.  */
+#if 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
+# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \
+   (_Generic \
+    (*(r), \
+     signed char: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        signed char, SCHAR_MIN, SCHAR_MAX), \
+     unsigned char: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        unsigned char, 0, UCHAR_MAX), \
+     short int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        short int, SHRT_MIN, SHRT_MAX), \
+     unsigned short int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        unsigned short int, 0, USHRT_MAX), \
+     int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        int, INT_MIN, INT_MAX), \
+     unsigned int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                        unsigned int, 0, UINT_MAX), \
+     long int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                        long int, LONG_MIN, LONG_MAX), \
+     unsigned long int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                        unsigned long int, 0, ULONG_MAX), \
+     long long int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+                        long long int, LLONG_MIN, LLONG_MAX), \
+     unsigned long long int: \
+       _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+                        unsigned long long int, 0, ULLONG_MAX)))
+#else
+/* Store the low-order bits of A <op> B into *R, where OP specifies
+   the operation and OVERFLOW the overflow predicate.  If *R is
+   signed, its type is ST with bounds SMIN..SMAX; otherwise its type
+   is UT with bounds U..UMAX.  ST and UT are narrower than int.
+   Return 1 if the result overflows.  See above for restrictions.  */
+# if _GL_HAVE___TYPEOF__
+#  define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \
+    (TYPE_SIGNED (__typeof__ (*(r))) \
+     ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, st, smin, smax) \
+     : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, ut, 0, umax))
+# else
+#  define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \
+    (overflow (a, b, smin, smax) \
+     ? (overflow (a, b, 0, umax) \
+        ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 1) \
+        : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) < 0) \
+     : (overflow (a, b, 0, umax) \
+        ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) >= 0 \
+        : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 0)))
+# endif
+
+# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \
+   (sizeof *(r) == sizeof (signed char) \
+    ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \
+                                 signed char, SCHAR_MIN, SCHAR_MAX, \
+                                 unsigned char, UCHAR_MAX) \
+    : sizeof *(r) == sizeof (short int) \
+    ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \
+                                 short int, SHRT_MIN, SHRT_MAX, \
+                                 unsigned short int, USHRT_MAX) \
+    : sizeof *(r) == sizeof (int) \
+    ? (EXPR_SIGNED (*(r)) \
+       ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                          int, INT_MIN, INT_MAX) \
+       : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
+                          unsigned int, 0, UINT_MAX)) \
+    : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow))
+# ifdef LLONG_MAX
+#  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+    (sizeof *(r) == sizeof (long int) \
+     ? (EXPR_SIGNED (*(r)) \
+        ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                           long int, LONG_MIN, LONG_MAX) \
+        : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                           unsigned long int, 0, ULONG_MAX)) \
+     : (EXPR_SIGNED (*(r)) \
+        ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+                           long long int, LLONG_MIN, LLONG_MAX) \
+        : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
+                           unsigned long long int, 0, ULLONG_MAX)))
+# else
+#  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+    (EXPR_SIGNED (*(r)) \
+     ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                        long int, LONG_MIN, LONG_MAX) \
+     : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+                        unsigned long int, 0, ULONG_MAX))
+# endif
+#endif
+
+/* Store the low-order bits of A <op> B into *R, where the operation
+   is given by OP.  Use the unsigned type UT for calculation to avoid
+   overflow problems.  *R's type is T, with extrema TMIN and TMAX.
+   T must be a signed integer type.  Return 1 if the result overflows.  */
+#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
+  (overflow (a, b, tmin, tmax) \
+   ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \
+   : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0))
+
+/* Return the low-order bits of A <op> B, where the operation is given
+   by OP.  Use the unsigned type UT for calculation to avoid undefined
+   behavior on signed integer overflow, and convert the result to type T.
+   UT is at least as wide as T and is no narrower than unsigned int,
+   T is two's complement, and there is no padding or trap representations.
+   Assume that converting UT to T yields the low-order bits, as is
+   done in all known two's-complement C compilers.  E.g., see:
+   https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html
+
+   According to the C standard, converting UT to T yields an
+   implementation-defined result or signal for values outside T's
+   range.  However, code that works around this theoretical problem
+   runs afoul of a compiler bug in Oracle Studio 12.3 x86.  See:
+   https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html
+   As the compiler bug is real, don't try to work around the
+   theoretical problem.  */
+
+#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \
+  ((t) ((ut) (a) op (ut) (b)))
+
+/* Return true if the numeric values A + B, A - B, A * B fall outside
+   the range TMIN..TMAX.  Arguments should be integer expressions
+   without side effects.  TMIN should be signed and nonpositive.
+   TMAX should be positive, and should be signed unless TMIN is zero.  */
+#define _GL_INT_ADD_RANGE_OVERFLOW(a, b, tmin, tmax) \
+  ((b) < 0 \
+   ? (((tmin) \
+       ? ((EXPR_SIGNED (_GL_INT_CONVERT (a, (tmin) - (b))) || (b) < (tmin)) \
+          && (a) < (tmin) - (b)) \
+       : (a) <= -1 - (b)) \
+      || ((EXPR_SIGNED (a) ? 0 <= (a) : (tmax) < (a)) && (tmax) < (a) + (b))) \
+   : (a) < 0 \
+   ? (((tmin) \
+       ? ((EXPR_SIGNED (_GL_INT_CONVERT (b, (tmin) - (a))) || (a) < (tmin)) \
+          && (b) < (tmin) - (a)) \
+       : (b) <= -1 - (a)) \
+      || ((EXPR_SIGNED (_GL_INT_CONVERT (a, b)) || (tmax) < (b)) \
+          && (tmax) < (a) + (b))) \
+   : (tmax) < (b) || (tmax) - (b) < (a))
+#define _GL_INT_SUBTRACT_RANGE_OVERFLOW(a, b, tmin, tmax) \
+  (((a) < 0) == ((b) < 0) \
+   ? ((a) < (b) \
+      ? !(tmin) || -1 - (tmin) < (b) - (a) - 1 \
+      : (tmax) < (a) - (b)) \
+   : (a) < 0 \
+   ? ((!EXPR_SIGNED (_GL_INT_CONVERT ((a) - (tmin), b)) && (a) - (tmin) < 0) \
+      || (a) - (tmin) < (b)) \
+   : ((! (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \
+          && EXPR_SIGNED (_GL_INT_CONVERT ((tmax) + (b), a))) \
+       && (tmax) <= -1 - (b)) \
+      || (tmax) + (b) < (a)))
+#define _GL_INT_MULTIPLY_RANGE_OVERFLOW(a, b, tmin, tmax) \
+  ((b) < 0 \
+   ? ((a) < 0 \
+      ? (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \
+         ? (a) < (tmax) / (b) \
+         : ((INT_NEGATE_OVERFLOW (b) \
+             ? _GL_INT_CONVERT (b, tmax) >> (TYPE_WIDTH (b) - 1) \
+             : (tmax) / -(b)) \
+            <= -1 - (a))) \
+      : INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (b, tmin)) && (b) == -1 \
+      ? (EXPR_SIGNED (a) \
+         ? 0 < (a) + (tmin) \
+         : 0 < (a) && -1 - (tmin) < (a) - 1) \
+      : (tmin) / (b) < (a)) \
+   : (b) == 0 \
+   ? 0 \
+   : ((a) < 0 \
+      ? (INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (a, tmin)) && (a) == -1 \
+         ? (EXPR_SIGNED (b) ? 0 < (b) + (tmin) : -1 - (tmin) < (b) - 1) \
+         : (tmin) / (a) < (b)) \
+      : (tmax) / (b) < (a)))
+
+#endif /* _GL_INTPROPS_H */
diff --git a/contrib/tools/bison/lib/isnand-nolibm.h b/contrib/tools/bison/lib/isnand-nolibm.h
index 174c61ebd23e..cbabed4c10ca 100644
--- a/contrib/tools/bison/lib/isnand-nolibm.h
+++ b/contrib/tools/bison/lib/isnand-nolibm.h
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/isnanl-nolibm.h b/contrib/tools/bison/lib/isnanl-nolibm.h
index fdedf56b6261..c45e3ab2c7b1 100644
--- a/contrib/tools/bison/lib/isnanl-nolibm.h
+++ b/contrib/tools/bison/lib/isnanl-nolibm.h
@@ -1,5 +1,5 @@
 /* Test for NaN that does not need libm.
-   Copyright (C) 2007-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/localcharset.c b/contrib/tools/bison/lib/localcharset.c
index 579972bc2f90..38026dffed5c 100644
--- a/contrib/tools/bison/lib/localcharset.c
+++ b/contrib/tools/bison/lib/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -58,6 +58,9 @@
 #elif defined WINDOWS_NATIVE
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
+  /* For the use of setlocale() below, the Gnulib override in setlocale.c is
+     not needed; see the platform lists in setlocale_null.m4.  */
+# undef setlocale
 #endif
 #if defined OS2
 # define INCL_DOS
@@ -150,7 +153,8 @@ static const struct table_entry alias_table[] =
     { "ISO8859-2",  "ISO-8859-2" },
     { "ISO8859-4",  "ISO-8859-4" },
     { "ISO8859-5",  "ISO-8859-5" },
-    { "ISO8859-7",  "ISO-8859-7" }
+    { "ISO8859-7",  "ISO-8859-7" },
+    { "US-ASCII",   "ASCII" }
 #   define alias_table_defined
 #  endif
 #  if defined __APPLE__ && defined __MACH__                 /* Mac OS X */
@@ -377,27 +381,164 @@ static const struct table_entry alias_table[] =
     /* The list of encodings is taken from "List of OS/2 Codepages"
        by Alex Taylor:
        <http://altsan.org/os2/toolkits/uls/index.html#codepages>.
-       See also "IBM Globalization - Code page identifiers":
-       <https://www-01.ibm.com/software/globalization/cp/cp_cpgid.html>.  */
-    { "CP1089", "ISO-8859-6" },
-    { "CP1208", "UTF-8" },
-    { "CP1381", "GB2312" },
-    { "CP1386", "GBK" },
-    { "CP3372", "EUC-JP" },
-    { "CP813",  "ISO-8859-7" },
-    { "CP819",  "ISO-8859-1" },
-    { "CP878",  "KOI8-R" },
-    { "CP912",  "ISO-8859-2" },
-    { "CP913",  "ISO-8859-3" },
-    { "CP914",  "ISO-8859-4" },
-    { "CP915",  "ISO-8859-5" },
-    { "CP916",  "ISO-8859-8" },
-    { "CP920",  "ISO-8859-9" },
-    { "CP921",  "ISO-8859-13" },
-    { "CP923",  "ISO-8859-15" },
-    { "CP954",  "EUC-JP" },
-    { "CP964",  "EUC-TW" },
-    { "CP970",  "EUC-KR" }
+       See also "__convcp() of kLIBC":
+       <https://github.com/bitwiseworks/libc/blob/master/src/emx/src/lib/locale/__convcp.c>.  */
+    { "CP1004",        "CP1252" },
+  /*{ "CP1041",        "CP943" },*/
+  /*{ "CP1088",        "CP949" },*/
+    { "CP1089",        "ISO-8859-6" },
+  /*{ "CP1114",        "CP950" },*/
+  /*{ "CP1115",        "GB2312" },*/
+    { "CP1208",        "UTF-8" },
+  /*{ "CP1380",        "GB2312" },*/
+    { "CP1381",        "GB2312" },
+    { "CP1383",        "GB2312" },
+    { "CP1386",        "GBK" },
+  /*{ "CP301",         "CP943" },*/
+    { "CP3372",        "EUC-JP" },
+    { "CP4946",        "CP850" },
+  /*{ "CP5048",        "JIS_X0208-1990" },*/
+  /*{ "CP5049",        "JIS_X0212-1990" },*/
+  /*{ "CP5067",        "KS_C_5601-1987" },*/
+    { "CP813",         "ISO-8859-7" },
+    { "CP819",         "ISO-8859-1" },
+    { "CP878",         "KOI8-R" },
+  /*{ "CP897",         "CP943" },*/
+    { "CP912",         "ISO-8859-2" },
+    { "CP913",         "ISO-8859-3" },
+    { "CP914",         "ISO-8859-4" },
+    { "CP915",         "ISO-8859-5" },
+    { "CP916",         "ISO-8859-8" },
+    { "CP920",         "ISO-8859-9" },
+    { "CP921",         "ISO-8859-13" },
+    { "CP923",         "ISO-8859-15" },
+  /*{ "CP941",         "CP943" },*/
+  /*{ "CP947",         "CP950" },*/
+  /*{ "CP951",         "CP949" },*/
+  /*{ "CP952",         "JIS_X0208-1990" },*/
+  /*{ "CP953",         "JIS_X0212-1990" },*/
+    { "CP954",         "EUC-JP" },
+    { "CP964",         "EUC-TW" },
+    { "CP970",         "EUC-KR" },
+  /*{ "CP971",         "KS_C_5601-1987" },*/
+    { "IBM-1004",      "CP1252" },
+  /*{ "IBM-1006",      "?" },*/
+  /*{ "IBM-1008",      "?" },*/
+  /*{ "IBM-1041",      "CP943" },*/
+  /*{ "IBM-1051",      "?" },*/
+  /*{ "IBM-1088",      "CP949" },*/
+    { "IBM-1089",      "ISO-8859-6" },
+  /*{ "IBM-1098",      "?" },*/
+  /*{ "IBM-1114",      "CP950" },*/
+  /*{ "IBM-1115",      "GB2312" },*/
+  /*{ "IBM-1116",      "?" },*/
+  /*{ "IBM-1117",      "?" },*/
+  /*{ "IBM-1118",      "?" },*/
+  /*{ "IBM-1119",      "?" },*/
+    { "IBM-1124",      "CP1124" },
+    { "IBM-1125",      "CP1125" },
+    { "IBM-1131",      "CP1131" },
+    { "IBM-1208",      "UTF-8" },
+    { "IBM-1250",      "CP1250" },
+    { "IBM-1251",      "CP1251" },
+    { "IBM-1252",      "CP1252" },
+    { "IBM-1253",      "CP1253" },
+    { "IBM-1254",      "CP1254" },
+    { "IBM-1255",      "CP1255" },
+    { "IBM-1256",      "CP1256" },
+    { "IBM-1257",      "CP1257" },
+  /*{ "IBM-1275",      "?" },*/
+  /*{ "IBM-1276",      "?" },*/
+  /*{ "IBM-1277",      "?" },*/
+  /*{ "IBM-1280",      "?" },*/
+  /*{ "IBM-1281",      "?" },*/
+  /*{ "IBM-1282",      "?" },*/
+  /*{ "IBM-1283",      "?" },*/
+  /*{ "IBM-1380",      "GB2312" },*/
+    { "IBM-1381",      "GB2312" },
+    { "IBM-1383",      "GB2312" },
+    { "IBM-1386",      "GBK" },
+  /*{ "IBM-301",       "CP943" },*/
+    { "IBM-3372",      "EUC-JP" },
+    { "IBM-367",       "ASCII" },
+    { "IBM-437",       "CP437" },
+    { "IBM-4946",      "CP850" },
+  /*{ "IBM-5048",      "JIS_X0208-1990" },*/
+  /*{ "IBM-5049",      "JIS_X0212-1990" },*/
+  /*{ "IBM-5067",      "KS_C_5601-1987" },*/
+    { "IBM-813",       "ISO-8859-7" },
+    { "IBM-819",       "ISO-8859-1" },
+    { "IBM-850",       "CP850" },
+  /*{ "IBM-851",       "?" },*/
+    { "IBM-852",       "CP852" },
+    { "IBM-855",       "CP855" },
+    { "IBM-856",       "CP856" },
+    { "IBM-857",       "CP857" },
+  /*{ "IBM-859",       "?" },*/
+    { "IBM-860",       "CP860" },
+    { "IBM-861",       "CP861" },
+    { "IBM-862",       "CP862" },
+    { "IBM-863",       "CP863" },
+    { "IBM-864",       "CP864" },
+    { "IBM-865",       "CP865" },
+    { "IBM-866",       "CP866" },
+  /*{ "IBM-868",       "?" },*/
+    { "IBM-869",       "CP869" },
+    { "IBM-874",       "CP874" },
+    { "IBM-878",       "KOI8-R" },
+  /*{ "IBM-895",       "?" },*/
+  /*{ "IBM-897",       "CP943" },*/
+  /*{ "IBM-907",       "?" },*/
+  /*{ "IBM-909",       "?" },*/
+    { "IBM-912",       "ISO-8859-2" },
+    { "IBM-913",       "ISO-8859-3" },
+    { "IBM-914",       "ISO-8859-4" },
+    { "IBM-915",       "ISO-8859-5" },
+    { "IBM-916",       "ISO-8859-8" },
+    { "IBM-920",       "ISO-8859-9" },
+    { "IBM-921",       "ISO-8859-13" },
+    { "IBM-922",       "CP922" },
+    { "IBM-923",       "ISO-8859-15" },
+    { "IBM-932",       "CP932" },
+  /*{ "IBM-941",       "CP943" },*/
+  /*{ "IBM-942",       "?" },*/
+    { "IBM-943",       "CP943" },
+  /*{ "IBM-947",       "CP950" },*/
+    { "IBM-949",       "CP949" },
+    { "IBM-950",       "CP950" },
+  /*{ "IBM-951",       "CP949" },*/
+  /*{ "IBM-952",       "JIS_X0208-1990" },*/
+  /*{ "IBM-953",       "JIS_X0212-1990" },*/
+    { "IBM-954",       "EUC-JP" },
+  /*{ "IBM-955",       "?" },*/
+    { "IBM-964",       "EUC-TW" },
+    { "IBM-970",       "EUC-KR" },
+  /*{ "IBM-971",       "KS_C_5601-1987" },*/
+    { "IBM-eucCN",     "GB2312" },
+    { "IBM-eucJP",     "EUC-JP" },
+    { "IBM-eucKR",     "EUC-KR" },
+    { "IBM-eucTW",     "EUC-TW" },
+    { "IBM33722",      "EUC-JP" },
+    { "ISO8859-1",     "ISO-8859-1" },
+    { "ISO8859-2",     "ISO-8859-2" },
+    { "ISO8859-3",     "ISO-8859-3" },
+    { "ISO8859-4",     "ISO-8859-4" },
+    { "ISO8859-5",     "ISO-8859-5" },
+    { "ISO8859-6",     "ISO-8859-6" },
+    { "ISO8859-7",     "ISO-8859-7" },
+    { "ISO8859-8",     "ISO-8859-8" },
+    { "ISO8859-9",     "ISO-8859-9" },
+  /*{ "JISX0201-1976", "JISX0201-1976" },*/
+  /*{ "JISX0208-1978", "?" },*/
+  /*{ "JISX0208-1983", "JIS_X0208-1983" },*/
+  /*{ "JISX0208-1990", "JIS_X0208-1990" },*/
+  /*{ "JISX0212-1990", "JIS_X0212-1990" },*/
+  /*{ "KSC5601-1987",  "KS_C_5601-1987" },*/
+    { "SJIS-1",        "CP943" },
+    { "SJIS-2",        "CP943" },
+    { "eucJP",         "EUC-JP" },
+    { "eucKR",         "EUC-KR" },
+    { "eucTW-1993",    "EUC-TW" }
 #   define alias_table_defined
 #  endif
 #  if defined VMS                                           /* OpenVMS */
@@ -675,8 +816,11 @@ static const struct table_entry locale_table[] =
 
 
 /* Determine the current locale's character encoding, and canonicalize it
-   into one of the canonical names listed in localcharset.h.
-   The result must not be freed; it is statically allocated.
+   into one of the canonical names listed below.
+   The result must not be freed; it is statically allocated.  The result
+   becomes invalid when setlocale() is used to change the global locale, or
+   when the value of one of the environment variables LC_ALL, LC_CTYPE, LANG
+   is changed; threads in multithreaded programs should not do this.
    If the canonical name cannot be determined, the result is a non-canonical
    name.  */
 
@@ -688,6 +832,13 @@ locale_charset (void)
 {
   const char *codeset;
 
+  /* This function must be multithread-safe.  To achieve this without using
+     thread-local storage, we use a simple strcpy or memcpy to fill this static
+     buffer.  Filling it through, for example, strcpy + strcat would not be
+     guaranteed to leave the buffer's contents intact if another thread is
+     currently accessing it.  If necessary, the contents is first assembled in
+     a stack-allocated buffer.  */
+
 #if HAVE_LANGINFO_CODESET || defined WINDOWS_NATIVE || defined OS2
 
 # if HAVE_LANGINFO_CODESET
@@ -702,7 +853,7 @@ locale_charset (void)
   if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0)
     {
       const char *locale;
-      static char buf[2 + 10 + 1];
+      static char resultbuf[2 + 10 + 1];
 
       locale = getenv ("LC_ALL");
       if (locale == NULL || locale[0] == '\0')
@@ -726,11 +877,12 @@ locale_charset (void)
               modifier = strchr (dot, '@');
               if (modifier == NULL)
                 return dot;
-              if (modifier - dot < sizeof (buf))
+              if (modifier - dot < sizeof (resultbuf))
                 {
-                  memcpy (buf, dot, modifier - dot);
-                  buf [modifier - dot] = '\0';
-                  return buf;
+                  /* This way of filling resultbuf is multithread-safe.  */
+                  memcpy (resultbuf, dot, modifier - dot);
+                  resultbuf [modifier - dot] = '\0';
+                  return resultbuf;
                 }
             }
         }
@@ -746,8 +898,13 @@ locale_charset (void)
          converting to GetConsoleOutputCP().  This leads to correct results,
          except when SetConsoleOutputCP has been called and a raster font is
          in use.  */
-      sprintf (buf, "CP%u", GetACP ());
-      codeset = buf;
+      {
+        char buf[2 + 10 + 1];
+
+        sprintf (buf, "CP%u", GetACP ());
+        strcpy (resultbuf, buf);
+        codeset = resultbuf;
+      }
     }
 #  endif
 
@@ -757,42 +914,44 @@ locale_charset (void)
 
 # elif defined WINDOWS_NATIVE
 
-  static char buf[2 + 10 + 1];
+  char buf[2 + 10 + 1];
+  static char resultbuf[2 + 10 + 1];
 
   /* The Windows API has a function returning the locale's codepage as
      a number, but the value doesn't change according to what the
      'setlocale' call specified.  So we use it as a last resort, in
      case the string returned by 'setlocale' doesn't specify the
      codepage.  */
-  char *current_locale = setlocale (LC_ALL, NULL);
-  char *pdot;
+  char *current_locale = setlocale (LC_CTYPE, NULL);
+  char *pdot = strrchr (current_locale, '.');
 
-  /* If they set different locales for different categories,
-     'setlocale' will return a semi-colon separated list of locale
-     values.  To make sure we use the correct one, we choose LC_CTYPE.  */
-  if (strchr (current_locale, ';'))
-    current_locale = setlocale (LC_CTYPE, NULL);
-
-  pdot = strrchr (current_locale, '.');
   if (pdot && 2 + strlen (pdot + 1) + 1 <= sizeof (buf))
     sprintf (buf, "CP%s", pdot + 1);
   else
     {
       /* The Windows API has a function returning the locale's codepage as a
-        number: GetACP().
-        When the output goes to a console window, it needs to be provided in
-        GetOEMCP() encoding if the console is using a raster font, or in
-        GetConsoleOutputCP() encoding if it is using a TrueType font.
-        But in GUI programs and for output sent to files and pipes, GetACP()
-        encoding is the best bet.  */
+         number: GetACP().
+         When the output goes to a console window, it needs to be provided in
+         GetOEMCP() encoding if the console is using a raster font, or in
+         GetConsoleOutputCP() encoding if it is using a TrueType font.
+         But in GUI programs and for output sent to files and pipes, GetACP()
+         encoding is the best bet.  */
       sprintf (buf, "CP%u", GetACP ());
     }
-  codeset = buf;
+  /* For a locale name such as "French_France.65001", in Windows 10,
+     setlocale now returns "French_France.utf8" instead.  */
+  if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0)
+    codeset = "UTF-8";
+  else
+    {
+      strcpy (resultbuf, buf);
+      codeset = resultbuf;
+    }
 
 # elif defined OS2
 
   const char *locale;
-  static char buf[2 + 10 + 1];
+  static char resultbuf[2 + 10 + 1];
   ULONG cp[3];
   ULONG cplen;
 
@@ -821,11 +980,12 @@ locale_charset (void)
           modifier = strchr (dot, '@');
           if (modifier == NULL)
             return dot;
-          if (modifier - dot < sizeof (buf))
+          if (modifier - dot < sizeof (resultbuf))
             {
-              memcpy (buf, dot, modifier - dot);
-              buf [modifier - dot] = '\0';
-              return buf;
+              /* This way of filling resultbuf is multithread-safe.  */
+              memcpy (resultbuf, dot, modifier - dot);
+              resultbuf [modifier - dot] = '\0';
+              return resultbuf;
             }
         }
 
@@ -841,8 +1001,11 @@ locale_charset (void)
         codeset = "";
       else
         {
+          char buf[2 + 10 + 1];
+
           sprintf (buf, "CP%u", cp[0]);
-          codeset = buf;
+          strcpy (resultbuf, buf);
+          codeset = resultbuf;
         }
     }
 
diff --git a/contrib/tools/bison/lib/localcharset.h b/contrib/tools/bison/lib/localcharset.h
index 7d0d7711dbe4..aa623be07a12 100644
--- a/contrib/tools/bison/lib/localcharset.h
+++ b/contrib/tools/bison/lib/localcharset.h
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2020 Free Software Foundation, Inc.
    This file is part of the GNU CHARSET Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,10 @@ extern "C" {
 
 /* Determine the current locale's character encoding, and canonicalize it
    into one of the canonical names listed below.
-   The result must not be freed; it is statically allocated.
+   The result must not be freed; it is statically allocated.  The result
+   becomes invalid when setlocale() is used to change the global locale, or
+   when the value of one of the environment variables LC_ALL, LC_CTYPE, LANG
+   is changed; threads in multithreaded programs should not do this.
    If the canonical name cannot be determined, the result is a non-canonical
    name.  */
 extern const char * locale_charset (void);
@@ -45,15 +48,15 @@ extern const char * locale_charset (void);
                                     (darwin = Mac OS X, windows = native Windows)
 
    ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin minix cygwin
-   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
-   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos
+   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos
    ISO-8859-3              Y   glibc solaris cygwin
    ISO-8859-4              Y   hpux osf solaris freebsd netbsd openbsd darwin
-   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
+   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos
    ISO-8859-6              Y   glibc aix hpux solaris cygwin
-   ISO-8859-7              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
-   ISO-8859-8              Y   glibc aix hpux osf solaris cygwin
-   ISO-8859-9              Y   glibc aix hpux irix osf solaris freebsd darwin cygwin
+   ISO-8859-7              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin zos
+   ISO-8859-8              Y   glibc aix hpux osf solaris cygwin zos
+   ISO-8859-9              Y   glibc aix hpux irix osf solaris freebsd darwin cygwin zos
    ISO-8859-13                 glibc hpux solaris freebsd netbsd openbsd darwin cygwin
    ISO-8859-14                 glibc cygwin
    ISO-8859-15                 glibc aix irix osf solaris freebsd netbsd openbsd darwin cygwin
@@ -76,7 +79,7 @@ extern const char * locale_charset (void);
    CP874                       windows dos
    CP922                       aix
    CP932                       aix cygwin windows dos
-   CP943                       aix
+   CP943                       aix zos
    CP949                       osf darwin windows dos
    CP950                       windows dos
    CP1046                      aix
@@ -92,17 +95,17 @@ extern const char * locale_charset (void);
    CP1255                      glibc windows
    CP1256                      windows
    CP1257                      windows
-   GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin cygwin
+   GB2312                  Y   glibc aix hpux irix solaris freebsd netbsd darwin cygwin zos
    EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
-   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin
+   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin zos
    EUC-TW                      glibc aix hpux irix osf solaris netbsd
-   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin cygwin
+   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin cygwin zos
    BIG5-HKSCS                  glibc hpux solaris netbsd darwin
    GBK                         glibc aix osf solaris freebsd darwin cygwin windows dos
    GB18030                     glibc hpux solaris freebsd netbsd darwin
    SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
    JOHAB                       glibc solaris windows
-   TIS-620                     glibc aix hpux osf solaris cygwin
+   TIS-620                     glibc aix hpux osf solaris cygwin zos
    VISCII                  Y   glibc
    TCVN5712-1                  glibc
    ARMSCII-8                   glibc freebsd netbsd darwin
@@ -116,7 +119,7 @@ extern const char * locale_charset (void);
    HP-KANA8                    hpux
    DEC-KANJI                   osf
    DEC-HANYU                   osf
-   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin cygwin
+   UTF-8                   Y   glibc aix hpux osf solaris netbsd darwin cygwin zos
 
    Note: Names which are not marked as being a MIME name should not be used in
    Internet protocols for information interchange (mail, news, etc.).
diff --git a/contrib/tools/bison/lib/mbchar.c b/contrib/tools/bison/lib/mbchar.c
new file mode 100644
index 000000000000..bd5c93215d55
--- /dev/null
+++ b/contrib/tools/bison/lib/mbchar.c
@@ -0,0 +1,37 @@
+/* Copyright (C) 2001, 2006, 2009-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+
+#include <config.h>
+
+#define MBCHAR_INLINE _GL_EXTERN_INLINE
+
+#include <limits.h>
+
+#include "mbchar.h"
+
+#if IS_BASIC_ASCII
+
+/* Bit table of characters in the ISO C "basic character set".  */
+const unsigned int is_basic_table [UCHAR_MAX / 32 + 1] =
+{
+  0x00001a00,           /* '\t' '\v' '\f' */
+  0xffffffef,           /* ' '...'#' '%'...'?' */
+  0xfffffffe,           /* 'A'...'Z' '[' '\\' ']' '^' '_' */
+  0x7ffffffe            /* 'a'...'z' '{' '|' '}' '~' */
+  /* The remaining bits are 0.  */
+};
+
+#endif /* IS_BASIC_ASCII */
diff --git a/contrib/tools/bison/lib/mbchar.h b/contrib/tools/bison/lib/mbchar.h
new file mode 100644
index 000000000000..8ff58bf519ad
--- /dev/null
+++ b/contrib/tools/bison/lib/mbchar.h
@@ -0,0 +1,360 @@
+/* Multibyte character data type.
+   Copyright (C) 2001, 2005-2007, 2009-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+/* A multibyte character is a short subsequence of a char* string,
+   representing a single wide character.
+
+   We use multibyte characters instead of wide characters because of
+   the following goals:
+   1) correct multibyte handling, i.e. operate according to the LC_CTYPE
+      locale,
+   2) ease of maintenance, i.e. the maintainer needs not know all details
+      of the ISO C 99 standard,
+   3) don't fail grossly if the input is not in the encoding set by the
+      locale, because often different encodings are in use in the same
+      countries (ISO-8859-1/UTF-8, EUC-JP/Shift_JIS, ...),
+   4) fast in the case of ASCII characters,
+   5) portability, i.e. don't make unportable assumptions about wchar_t.
+
+   Multibyte characters are only accessed through the mb* macros.
+
+   mb_ptr (mbc)
+     return a pointer to the beginning of the multibyte sequence.
+
+   mb_len (mbc)
+     returns the number of bytes occupied by the multibyte sequence.
+     Always > 0.
+
+   mb_iseq (mbc, sc)
+     returns true if mbc is the standard ASCII character sc.
+
+   mb_isnul (mbc)
+     returns true if mbc is the nul character.
+
+   mb_cmp (mbc1, mbc2)
+     returns a positive, zero, or negative value depending on whether mbc1
+     sorts after, same or before mbc2.
+
+   mb_casecmp (mbc1, mbc2)
+     returns a positive, zero, or negative value depending on whether mbc1
+     sorts after, same or before mbc2, modulo upper/lowercase conversion.
+
+   mb_equal (mbc1, mbc2)
+     returns true if mbc1 and mbc2 are equal.
+
+   mb_caseequal (mbc1, mbc2)
+     returns true if mbc1 and mbc2 are equal modulo upper/lowercase conversion.
+
+   mb_isalnum (mbc)
+     returns true if mbc is alphanumeric.
+
+   mb_isalpha (mbc)
+     returns true if mbc is alphabetic.
+
+   mb_isascii(mbc)
+     returns true if mbc is plain ASCII.
+
+   mb_isblank (mbc)
+     returns true if mbc is a blank.
+
+   mb_iscntrl (mbc)
+     returns true if mbc is a control character.
+
+   mb_isdigit (mbc)
+     returns true if mbc is a decimal digit.
+
+   mb_isgraph (mbc)
+     returns true if mbc is a graphic character.
+
+   mb_islower (mbc)
+     returns true if mbc is lowercase.
+
+   mb_isprint (mbc)
+     returns true if mbc is a printable character.
+
+   mb_ispunct (mbc)
+     returns true if mbc is a punctuation character.
+
+   mb_isspace (mbc)
+     returns true if mbc is a space character.
+
+   mb_isupper (mbc)
+     returns true if mbc is uppercase.
+
+   mb_isxdigit (mbc)
+     returns true if mbc is a hexadecimal digit.
+
+   mb_width (mbc)
+     returns the number of columns on the output device occupied by mbc.
+     Always >= 0.
+
+   mb_putc (mbc, stream)
+     outputs mbc on stream, a byte oriented FILE stream opened for output.
+
+   mb_setascii (&mbc, sc)
+     assigns the standard ASCII character sc to mbc.
+
+   mb_copy (&destmbc, &srcmbc)
+     copies srcmbc to destmbc.
+
+   Here are the function prototypes of the macros.
+
+   extern const char *  mb_ptr (const mbchar_t mbc);
+   extern size_t        mb_len (const mbchar_t mbc);
+   extern bool          mb_iseq (const mbchar_t mbc, char sc);
+   extern bool          mb_isnul (const mbchar_t mbc);
+   extern int           mb_cmp (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern int           mb_casecmp (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool          mb_equal (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool          mb_caseequal (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool          mb_isalnum (const mbchar_t mbc);
+   extern bool          mb_isalpha (const mbchar_t mbc);
+   extern bool          mb_isascii (const mbchar_t mbc);
+   extern bool          mb_isblank (const mbchar_t mbc);
+   extern bool          mb_iscntrl (const mbchar_t mbc);
+   extern bool          mb_isdigit (const mbchar_t mbc);
+   extern bool          mb_isgraph (const mbchar_t mbc);
+   extern bool          mb_islower (const mbchar_t mbc);
+   extern bool          mb_isprint (const mbchar_t mbc);
+   extern bool          mb_ispunct (const mbchar_t mbc);
+   extern bool          mb_isspace (const mbchar_t mbc);
+   extern bool          mb_isupper (const mbchar_t mbc);
+   extern bool          mb_isxdigit (const mbchar_t mbc);
+   extern int           mb_width (const mbchar_t mbc);
+   extern void          mb_putc (const mbchar_t mbc, FILE *stream);
+   extern void          mb_setascii (mbchar_t *new, char sc);
+   extern void          mb_copy (mbchar_t *new, const mbchar_t *old);
+ */
+
+#ifndef _MBCHAR_H
+#define _MBCHAR_H 1
+
+#include <stdbool.h>
+#include <string.h>
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
+   <wchar.h>.  */
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBCHAR_INLINE
+# define MBCHAR_INLINE _GL_INLINE
+#endif
+
+#define MBCHAR_BUF_SIZE 24
+
+struct mbchar
+{
+  const char *ptr;      /* pointer to current character */
+  size_t bytes;         /* number of bytes of current character, > 0 */
+  bool wc_valid;        /* true if wc is a valid wide character */
+  wchar_t wc;           /* if wc_valid: the current character */
+  char buf[MBCHAR_BUF_SIZE]; /* room for the bytes, used for file input only */
+};
+
+/* EOF (not a real character) is represented with bytes = 0 and
+   wc_valid = false.  */
+
+typedef struct mbchar mbchar_t;
+
+/* Access the current character.  */
+#define mb_ptr(mbc) ((mbc).ptr)
+#define mb_len(mbc) ((mbc).bytes)
+
+/* Comparison of characters.  */
+#define mb_iseq(mbc, sc) ((mbc).wc_valid && (mbc).wc == (sc))
+#define mb_isnul(mbc) ((mbc).wc_valid && (mbc).wc == 0)
+#define mb_cmp(mbc1, mbc2) \
+  ((mbc1).wc_valid                                                      \
+   ? ((mbc2).wc_valid                                                   \
+      ? (int) (mbc1).wc - (int) (mbc2).wc                               \
+      : -1)                                                             \
+   : ((mbc2).wc_valid                                                   \
+      ? 1                                                               \
+      : (mbc1).bytes == (mbc2).bytes                                    \
+        ? memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes)                 \
+        : (mbc1).bytes < (mbc2).bytes                                   \
+          ? (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) > 0 ? 1 : -1) \
+          : (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc2).bytes) >= 0 ? 1 : -1)))
+#define mb_casecmp(mbc1, mbc2) \
+  ((mbc1).wc_valid                                                      \
+   ? ((mbc2).wc_valid                                                   \
+      ? (int) towlower ((mbc1).wc) - (int) towlower ((mbc2).wc)         \
+      : -1)                                                             \
+   : ((mbc2).wc_valid                                                   \
+      ? 1                                                               \
+      : (mbc1).bytes == (mbc2).bytes                                    \
+        ? memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes)                 \
+        : (mbc1).bytes < (mbc2).bytes                                   \
+          ? (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) > 0 ? 1 : -1) \
+          : (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc2).bytes) >= 0 ? 1 : -1)))
+#define mb_equal(mbc1, mbc2) \
+  ((mbc1).wc_valid && (mbc2).wc_valid                                   \
+   ? (mbc1).wc == (mbc2).wc                                             \
+   : (mbc1).bytes == (mbc2).bytes                                       \
+     && memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) == 0)
+#define mb_caseequal(mbc1, mbc2) \
+  ((mbc1).wc_valid && (mbc2).wc_valid                                   \
+   ? towlower ((mbc1).wc) == towlower ((mbc2).wc)                       \
+   : (mbc1).bytes == (mbc2).bytes                                       \
+     && memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) == 0)
+
+/* <ctype.h>, <wctype.h> classification.  */
+#define mb_isascii(mbc) \
+  ((mbc).wc_valid && (mbc).wc >= 0 && (mbc).wc <= 127)
+#define mb_isalnum(mbc) ((mbc).wc_valid && iswalnum ((mbc).wc))
+#define mb_isalpha(mbc) ((mbc).wc_valid && iswalpha ((mbc).wc))
+#define mb_isblank(mbc) ((mbc).wc_valid && iswblank ((mbc).wc))
+#define mb_iscntrl(mbc) ((mbc).wc_valid && iswcntrl ((mbc).wc))
+#define mb_isdigit(mbc) ((mbc).wc_valid && iswdigit ((mbc).wc))
+#define mb_isgraph(mbc) ((mbc).wc_valid && iswgraph ((mbc).wc))
+#define mb_islower(mbc) ((mbc).wc_valid && iswlower ((mbc).wc))
+#define mb_isprint(mbc) ((mbc).wc_valid && iswprint ((mbc).wc))
+#define mb_ispunct(mbc) ((mbc).wc_valid && iswpunct ((mbc).wc))
+#define mb_isspace(mbc) ((mbc).wc_valid && iswspace ((mbc).wc))
+#define mb_isupper(mbc) ((mbc).wc_valid && iswupper ((mbc).wc))
+#define mb_isxdigit(mbc) ((mbc).wc_valid && iswxdigit ((mbc).wc))
+
+/* Extra <wchar.h> function.  */
+
+/* Unprintable characters appear as a small box of width 1.  */
+#define MB_UNPRINTABLE_WIDTH 1
+
+MBCHAR_INLINE int
+mb_width_aux (wint_t wc)
+{
+  int w = wcwidth (wc);
+  /* For unprintable characters, arbitrarily return 0 for control characters
+     and MB_UNPRINTABLE_WIDTH otherwise.  */
+  return (w >= 0 ? w : iswcntrl (wc) ? 0 : MB_UNPRINTABLE_WIDTH);
+}
+
+#define mb_width(mbc) \
+  ((mbc).wc_valid ? mb_width_aux ((mbc).wc) : MB_UNPRINTABLE_WIDTH)
+
+/* Output.  */
+#define mb_putc(mbc, stream)  fwrite ((mbc).ptr, 1, (mbc).bytes, (stream))
+
+/* Assignment.  */
+#define mb_setascii(mbc, sc) \
+  ((mbc)->ptr = (mbc)->buf, (mbc)->bytes = 1, (mbc)->wc_valid = 1, \
+   (mbc)->wc = (mbc)->buf[0] = (sc))
+
+/* Copying a character.  */
+MBCHAR_INLINE void
+mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
+{
+  if (old_mbc->ptr == &old_mbc->buf[0])
+    {
+      memcpy (&new_mbc->buf[0], &old_mbc->buf[0], old_mbc->bytes);
+      new_mbc->ptr = &new_mbc->buf[0];
+    }
+  else
+    new_mbc->ptr = old_mbc->ptr;
+  new_mbc->bytes = old_mbc->bytes;
+  if ((new_mbc->wc_valid = old_mbc->wc_valid))
+    new_mbc->wc = old_mbc->wc;
+}
+
+
+/* is_basic(c) tests whether the single-byte character c is in the
+   ISO C "basic character set".
+   This is a convenience function, and is in this file only to share code
+   between mbiter_multi.h and mbfile_multi.h.  */
+#if (' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+    && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+    && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+    && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+    && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+    && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+    && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+    && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+    && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+    && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+    && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+    && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+    && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+    && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+    && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+    && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+    && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+    && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+    && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+    && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+    && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+    && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+    && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)
+/* The character set is ISO-646, not EBCDIC. */
+# define IS_BASIC_ASCII 1
+
+extern const unsigned int is_basic_table[];
+
+MBCHAR_INLINE bool
+is_basic (char c)
+{
+  return (is_basic_table [(unsigned char) c >> 5] >> ((unsigned char) c & 31))
+         & 1;
+}
+
+#else
+
+MBCHAR_INLINE bool
+is_basic (char c)
+{
+  switch (c)
+    {
+    case '\t': case '\v': case '\f':
+    case ' ': case '!': case '"': case '#': case '%':
+    case '&': case '\'': case '(': case ')': case '*':
+    case '+': case ',': case '-': case '.': case '/':
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+    case ':': case ';': case '<': case '=': case '>':
+    case '?':
+    case 'A': case 'B': case 'C': case 'D': case 'E':
+    case 'F': case 'G': case 'H': case 'I': case 'J':
+    case 'K': case 'L': case 'M': case 'N': case 'O':
+    case 'P': case 'Q': case 'R': case 'S': case 'T':
+    case 'U': case 'V': case 'W': case 'X': case 'Y':
+    case 'Z':
+    case '[': case '\\': case ']': case '^': case '_':
+    case 'a': case 'b': case 'c': case 'd': case 'e':
+    case 'f': case 'g': case 'h': case 'i': case 'j':
+    case 'k': case 'l': case 'm': case 'n': case 'o':
+    case 'p': case 'q': case 'r': case 's': case 't':
+    case 'u': case 'v': case 'w': case 'x': case 'y':
+    case 'z': case '{': case '|': case '}': case '~':
+      return 1;
+    default:
+      return 0;
+    }
+}
+
+#endif
+
+_GL_INLINE_HEADER_END
+
+#endif /* _MBCHAR_H */
diff --git a/contrib/tools/bison/lib/mbfile.c b/contrib/tools/bison/lib/mbfile.c
new file mode 100644
index 000000000000..b0a468efa6b7
--- /dev/null
+++ b/contrib/tools/bison/lib/mbfile.c
@@ -0,0 +1,3 @@
+#include <config.h>
+#define MBFILE_INLINE _GL_EXTERN_INLINE
+#include "mbfile.h"
diff --git a/contrib/tools/bison/lib/mbfile.h b/contrib/tools/bison/lib/mbfile.h
new file mode 100644
index 000000000000..6c86116f1c9b
--- /dev/null
+++ b/contrib/tools/bison/lib/mbfile.h
@@ -0,0 +1,252 @@
+/* Multibyte character I/O: macros for multi-byte encodings.
+   Copyright (C) 2001, 2005, 2009-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Mitsuru Chinen <mchinen@yamato.ibm.com>
+   and Bruno Haible <bruno@clisp.org>.  */
+
+/* The macros in this file implement multi-byte character input from a
+   stream.
+
+   mb_file_t
+     is the type for multibyte character input stream, usable for variable
+     declarations.
+
+   mbf_char_t
+     is the type for multibyte character or EOF, usable for variable
+     declarations.
+
+   mbf_init (mbf, stream)
+     initializes the MB_FILE for reading from stream.
+
+   mbf_getc (mbc, mbf)
+     reads the next multibyte character from mbf and stores it in mbc.
+
+   mb_iseof (mbc)
+     returns true if mbc represents the EOF value.
+
+   Here are the function prototypes of the macros.
+
+   extern void          mbf_init (mb_file_t mbf, FILE *stream);
+   extern void          mbf_getc (mbf_char_t mbc, mb_file_t mbf);
+   extern bool          mb_iseof (const mbf_char_t mbc);
+ */
+
+#ifndef _MBFILE_H
+#define _MBFILE_H 1
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
+   <wchar.h>.  */
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+
+#include "mbchar.h"
+
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBFILE_INLINE
+# define MBFILE_INLINE _GL_INLINE
+#endif
+
+struct mbfile_multi {
+  FILE *fp;
+  bool eof_seen;
+  bool have_pushback;
+  mbstate_t state;
+  unsigned int bufcount;
+  char buf[MBCHAR_BUF_SIZE];
+  struct mbchar pushback;
+};
+
+MBFILE_INLINE void
+mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf)
+{
+  size_t bytes;
+
+  /* If EOF has already been seen, don't use getc.  This matters if
+     mbf->fp is connected to an interactive tty.  */
+  if (mbf->eof_seen)
+    goto eof;
+
+  /* Return character pushed back, if there is one.  */
+  if (mbf->have_pushback)
+    {
+      mb_copy (mbc, &mbf->pushback);
+      mbf->have_pushback = false;
+      return;
+    }
+
+  /* Before using mbrtowc, we need at least one byte.  */
+  if (mbf->bufcount == 0)
+    {
+      int c = getc (mbf->fp);
+      if (c == EOF)
+        {
+          mbf->eof_seen = true;
+          goto eof;
+        }
+      mbf->buf[0] = (unsigned char) c;
+      mbf->bufcount++;
+    }
+
+  /* Handle most ASCII characters quickly, without calling mbrtowc().  */
+  if (mbf->bufcount == 1 && mbsinit (&mbf->state) && is_basic (mbf->buf[0]))
+    {
+      /* These characters are part of the basic character set.  ISO C 99
+         guarantees that their wide character code is identical to their
+         char code.  */
+      mbc->wc = mbc->buf[0] = mbf->buf[0];
+      mbc->wc_valid = true;
+      mbc->ptr = &mbc->buf[0];
+      mbc->bytes = 1;
+      mbf->bufcount = 0;
+      return;
+    }
+
+  /* Use mbrtowc on an increasing number of bytes.  Read only as many bytes
+     from mbf->fp as needed.  This is needed to give reasonable interactive
+     behaviour when mbf->fp is connected to an interactive tty.  */
+  for (;;)
+    {
+      /* We don't know whether the 'mbrtowc' function updates the state when
+         it returns -2, - this is the ISO C 99 and glibc-2.2 behaviour - or
+         not - amended ANSI C, glibc-2.1 and Solaris 2.7 behaviour.  We
+         don't have an autoconf test for this, yet.
+         The new behaviour would allow us to feed the bytes one by one into
+         mbrtowc.  But the old behaviour forces us to feed all bytes since
+         the end of the last character into mbrtowc.  Since we want to retry
+         with more bytes when mbrtowc returns -2, we must backup the state
+         before calling mbrtowc, because implementations with the new
+         behaviour will clobber it.  */
+      mbstate_t backup_state = mbf->state;
+
+      bytes = mbrtowc (&mbc->wc, &mbf->buf[0], mbf->bufcount, &mbf->state);
+
+      if (bytes == (size_t) -1)
+        {
+          /* An invalid multibyte sequence was encountered.  */
+          /* Return a single byte.  */
+          bytes = 1;
+          mbc->wc_valid = false;
+          break;
+        }
+      else if (bytes == (size_t) -2)
+        {
+          /* An incomplete multibyte character.  */
+          mbf->state = backup_state;
+          if (mbf->bufcount == MBCHAR_BUF_SIZE)
+            {
+              /* An overlong incomplete multibyte sequence was encountered.  */
+              /* Return a single byte.  */
+              bytes = 1;
+              mbc->wc_valid = false;
+              break;
+            }
+          else
+            {
+              /* Read one more byte and retry mbrtowc.  */
+              int c = getc (mbf->fp);
+              if (c == EOF)
+                {
+                  /* An incomplete multibyte character at the end.  */
+                  mbf->eof_seen = true;
+                  bytes = mbf->bufcount;
+                  mbc->wc_valid = false;
+                  break;
+                }
+              mbf->buf[mbf->bufcount] = (unsigned char) c;
+              mbf->bufcount++;
+            }
+        }
+      else
+        {
+          if (bytes == 0)
+            {
+              /* A null wide character was encountered.  */
+              bytes = 1;
+              assert (mbf->buf[0] == '\0');
+              assert (mbc->wc == 0);
+            }
+          mbc->wc_valid = true;
+          break;
+        }
+    }
+
+  /* Return the multibyte sequence mbf->buf[0..bytes-1].  */
+  mbc->ptr = &mbc->buf[0];
+  memcpy (&mbc->buf[0], &mbf->buf[0], bytes);
+  mbc->bytes = bytes;
+
+  mbf->bufcount -= bytes;
+  if (mbf->bufcount > 0)
+    {
+      /* It's not worth calling memmove() for so few bytes.  */
+      unsigned int count = mbf->bufcount;
+      char *p = &mbf->buf[0];
+
+      do
+        {
+          *p = *(p + bytes);
+          p++;
+        }
+      while (--count > 0);
+    }
+  return;
+
+eof:
+  /* An mbchar_t with bytes == 0 is used to indicate EOF.  */
+  mbc->ptr = NULL;
+  mbc->bytes = 0;
+  mbc->wc_valid = false;
+  return;
+}
+
+MBFILE_INLINE void
+mbfile_multi_ungetc (const struct mbchar *mbc, struct mbfile_multi *mbf)
+{
+  mb_copy (&mbf->pushback, mbc);
+  mbf->have_pushback = true;
+}
+
+typedef struct mbfile_multi mb_file_t;
+
+typedef mbchar_t mbf_char_t;
+
+#define mbf_init(mbf, stream)                                           \
+  ((mbf).fp = (stream),                                                 \
+   (mbf).eof_seen = false,                                              \
+   (mbf).have_pushback = false,                                         \
+   memset (&(mbf).state, '\0', sizeof (mbstate_t)),                     \
+   (mbf).bufcount = 0)
+
+#define mbf_getc(mbc, mbf) mbfile_multi_getc (&(mbc), &(mbf))
+
+#define mbf_ungetc(mbc, mbf) mbfile_multi_ungetc (&(mbc), &(mbf))
+
+#define mb_iseof(mbc) ((mbc).bytes == 0)
+
+_GL_INLINE_HEADER_END
+
+#endif /* _MBFILE_H */
diff --git a/contrib/tools/bison/lib/mbrtowc.c b/contrib/tools/bison/lib/mbrtowc.c
index bbe3f7a3b91e..08e181bc3bcb 100644
--- a/contrib/tools/bison/lib/mbrtowc.c
+++ b/contrib/tools/bison/lib/mbrtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2019 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,20 +20,39 @@
 /* Specification.  */
 #include <wchar.h>
 
-#if C_LOCALE_MAYBE_EILSEQ
-# include "hard-locale.h"
-# include <locale.h>
-#endif
-
 #if GNULIB_defined_mbstate_t
-/* Implement mbrtowc() on top of mbtowc().  */
+/* Implement mbrtowc() on top of mbtowc() for the non-UTF-8 locales
+   and directly for the UTF-8 locales.  */
 
 # include <errno.h>
+# include <stdint.h>
 # include <stdlib.h>
 
-# include "localcharset.h"
-# include "streq.h"
+# if defined _WIN32 && !defined __CYGWIN__
+
+#  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#  include <windows.h>
+
+# elif HAVE_PTHREAD_API
+
+#  include <pthread.h>
+#  if HAVE_THREADS_H && HAVE_WEAK_SYMBOLS
+#   include <threads.h>
+#   pragma weak thrd_exit
+#   define c11_threads_in_use() (thrd_exit != NULL)
+#  else
+#   define c11_threads_in_use() 0
+#  endif
+
+# elif HAVE_THREADS_H
+
+#  include <threads.h>
+
+# endif
+
 # include "verify.h"
+# error #include "lc-charset-dispatch.h"
+# error #include "mbtowc-lock.h"
 
 # ifndef FALLTHROUGH
 #  if __GNUC__ < 7
@@ -43,342 +62,24 @@
 #  endif
 # endif
 
-/* Returns a classification of special values of the encoding of the current
-   locale.  */
-typedef enum {
-  enc_other,      /* other */
-  enc_utf8,       /* UTF-8 */
-  enc_eucjp,      /* EUC-JP */
-  enc_94,         /* EUC-KR, GB2312, BIG5 */
-  enc_euctw,      /* EUC-TW */
-  enc_gb18030,    /* GB18030 */
-  enc_sjis        /* SJIS */
-} enc_t;
-static inline enc_t
-locale_enc (void)
-{
-  const char *encoding = locale_charset ();
-  if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
-    return enc_utf8;
-  if (STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0))
-    return enc_eucjp;
-  if (STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
-      || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
-      || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0))
-    return enc_94;
-  if (STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0))
-    return enc_euctw;
-  if (STREQ_OPT (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
-    return enc_gb18030;
-  if (STREQ_OPT (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
-    return enc_sjis;
-  return enc_other;
-}
-
-#if GNULIB_WCHAR_SINGLE
-/* When we know that the locale does not change, provide a speedup by
-   caching the value of locale_enc.  */
-static int cached_locale_enc = -1;
-static inline enc_t
-locale_enc_cached (void)
-{
-  if (cached_locale_enc < 0)
-    cached_locale_enc = locale_enc ();
-  return cached_locale_enc;
-}
-#else
-/* By default, don't make assumptions, hence no caching.  */
-# define locale_enc_cached locale_enc
-#endif
-
 verify (sizeof (mbstate_t) >= 4);
-
 static char internal_state[4];
 
 size_t
 mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
-  char *pstate = (char *)ps;
-
-  if (s == NULL)
-    {
-      pwc = NULL;
-      s = "";
-      n = 1;
-    }
-
-  if (n == 0)
-    return (size_t)(-2);
-
-  /* Here n > 0.  */
-
-  if (pstate == NULL)
-    pstate = internal_state;
-
-  {
-    size_t nstate = pstate[0];
-    char buf[4];
-    const char *p;
-    size_t m;
-
-    switch (nstate)
-      {
-      case 0:
-        p = s;
-        m = n;
-        break;
-      case 3:
-        buf[2] = pstate[3];
-        FALLTHROUGH;
-      case 2:
-        buf[1] = pstate[2];
-        FALLTHROUGH;
-      case 1:
-        buf[0] = pstate[1];
-        p = buf;
-        m = nstate;
-        buf[m++] = s[0];
-        if (n >= 2 && m < 4)
-          {
-            buf[m++] = s[1];
-            if (n >= 3 && m < 4)
-              buf[m++] = s[2];
-          }
-        break;
-      default:
-        errno = EINVAL;
-        return (size_t)(-1);
-      }
-
-    /* Here m > 0.  */
-
-# if __GLIBC__ || defined __UCLIBC__
-    /* Work around bug <https://sourceware.org/bugzilla/show_bug.cgi?id=9674> */
-    mbtowc (NULL, NULL, 0);
-# endif
-    {
-      int res = mbtowc (pwc, p, m);
-
-      if (res >= 0)
-        {
-          if (pwc != NULL && ((*pwc == 0) != (res == 0)))
-            abort ();
-          if (nstate >= (res > 0 ? res : 1))
-            abort ();
-          res -= nstate;
-          pstate[0] = 0;
-          return res;
-        }
-
-      /* mbtowc does not distinguish between invalid and incomplete multibyte
-         sequences.  But mbrtowc needs to make this distinction.
-         There are two possible approaches:
-           - Use iconv() and its return value.
-           - Use built-in knowledge about the possible encodings.
-         Given the low quality of implementation of iconv() on the systems that
-         lack mbrtowc(), we use the second approach.
-         The possible encodings are:
-           - 8-bit encodings,
-           - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS,
-           - UTF-8.
-         Use specialized code for each.  */
-      if (m >= 4 || m >= MB_CUR_MAX)
-        goto invalid;
-      /* Here MB_CUR_MAX > 1 and 0 < m < 4.  */
-      switch (locale_enc_cached ())
-        {
-        case enc_utf8: /* UTF-8 */
-          {
-            /* Cf. unistr/u8-mblen.c.  */
-            unsigned char c = (unsigned char) p[0];
-
-            if (c >= 0xc2)
-              {
-                if (c < 0xe0)
-                  {
-                    if (m == 1)
-                      goto incomplete;
-                  }
-                else if (c < 0xf0)
-                  {
-                    if (m == 1)
-                      goto incomplete;
-                    if (m == 2)
-                      {
-                        unsigned char c2 = (unsigned char) p[1];
-
-                        if ((c2 ^ 0x80) < 0x40
-                            && (c >= 0xe1 || c2 >= 0xa0)
-                            && (c != 0xed || c2 < 0xa0))
-                          goto incomplete;
-                      }
-                  }
-                else if (c <= 0xf4)
-                  {
-                    if (m == 1)
-                      goto incomplete;
-                    else /* m == 2 || m == 3 */
-                      {
-                        unsigned char c2 = (unsigned char) p[1];
-
-                        if ((c2 ^ 0x80) < 0x40
-                            && (c >= 0xf1 || c2 >= 0x90)
-                            && (c < 0xf4 || (c == 0xf4 && c2 < 0x90)))
-                          {
-                            if (m == 2)
-                              goto incomplete;
-                            else /* m == 3 */
-                              {
-                                unsigned char c3 = (unsigned char) p[2];
-
-                                if ((c3 ^ 0x80) < 0x40)
-                                  goto incomplete;
-                              }
-                          }
-                      }
-                  }
-              }
-            goto invalid;
-          }
-
-        /* As a reference for this code, you can use the GNU libiconv
-           implementation.  Look for uses of the RET_TOOFEW macro.  */
-
-        case enc_eucjp: /* EUC-JP */
-          {
-            if (m == 1)
-              {
-                unsigned char c = (unsigned char) p[0];
-
-                if ((c >= 0xa1 && c < 0xff) || c == 0x8e || c == 0x8f)
-                  goto incomplete;
-              }
-            if (m == 2)
-              {
-                unsigned char c = (unsigned char) p[0];
-
-                if (c == 0x8f)
-                  {
-                    unsigned char c2 = (unsigned char) p[1];
-
-                    if (c2 >= 0xa1 && c2 < 0xff)
-                      goto incomplete;
-                  }
-              }
-            goto invalid;
-          }
-
-        case enc_94: /* EUC-KR, GB2312, BIG5 */
-          {
-            if (m == 1)
-              {
-                unsigned char c = (unsigned char) p[0];
-
-                if (c >= 0xa1 && c < 0xff)
-                  goto incomplete;
-              }
-            goto invalid;
-          }
-
-        case enc_euctw: /* EUC-TW */
-          {
-            if (m == 1)
-              {
-                unsigned char c = (unsigned char) p[0];
-
-                if ((c >= 0xa1 && c < 0xff) || c == 0x8e)
-                  goto incomplete;
-              }
-            else /* m == 2 || m == 3 */
-              {
-                unsigned char c = (unsigned char) p[0];
-
-                if (c == 0x8e)
-                  goto incomplete;
-              }
-            goto invalid;
-          }
-
-        case enc_gb18030: /* GB18030 */
-          {
-            if (m == 1)
-              {
-                unsigned char c = (unsigned char) p[0];
-
-                if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe))
-                  goto incomplete;
-              }
-            else /* m == 2 || m == 3 */
-              {
-                unsigned char c = (unsigned char) p[0];
-
-                if (c >= 0x90 && c <= 0xe3)
-                  {
-                    unsigned char c2 = (unsigned char) p[1];
-
-                    if (c2 >= 0x30 && c2 <= 0x39)
-                      {
-                        if (m == 2)
-                          goto incomplete;
-                        else /* m == 3 */
-                          {
-                            unsigned char c3 = (unsigned char) p[2];
-
-                            if (c3 >= 0x81 && c3 <= 0xfe)
-                              goto incomplete;
-                          }
-                      }
-                  }
-              }
-            goto invalid;
-          }
-
-        case enc_sjis: /* SJIS */
-          {
-            if (m == 1)
-              {
-                unsigned char c = (unsigned char) p[0];
-
-                if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea)
-                    || (c >= 0xf0 && c <= 0xf9))
-                  goto incomplete;
-              }
-            goto invalid;
-          }
-
-        default:
-          /* An unknown multibyte encoding.  */
-          goto incomplete;
-        }
-
-     incomplete:
-      {
-        size_t k = nstate;
-        /* Here 0 <= k < m < 4.  */
-        pstate[++k] = s[0];
-        if (k < m)
-          {
-            pstate[++k] = s[1];
-            if (k < m)
-              pstate[++k] = s[2];
-          }
-        if (k != m)
-          abort ();
-      }
-      pstate[0] = m;
-      return (size_t)(-2);
-
-     invalid:
-      errno = EILSEQ;
-      /* The conversion state is undefined, says POSIX.  */
-      return (size_t)(-1);
-    }
-  }
+# define FITS_IN_CHAR_TYPE(wc)  ((wc) <= WCHAR_MAX)
+# error #include "mbrtowc-impl.h"
 }
 
 #else
 /* Override the system's mbrtowc() function.  */
 
+# if MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ
+#  include "hard-locale.h"
+#  include <locale.h>
+# endif
+
 # undef mbrtowc
 
 size_t
@@ -436,14 +137,20 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
   }
 # endif
 
+# if MBRTOWC_STORES_INCOMPLETE_BUG
+  ret = mbrtowc (&wc, s, n, ps);
+  if (ret < (size_t) -2 && pwc != NULL)
+    *pwc = wc;
+# else
   ret = mbrtowc (pwc, s, n, ps);
+# endif
 
 # if MBRTOWC_NUL_RETVAL_BUG
   if (ret < (size_t) -2 && !*pwc)
     return 0;
 # endif
 
-# if C_LOCALE_MAYBE_EILSEQ
+# if MBRTOWC_IN_C_LOCALE_MAYBE_EILSEQ
   if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
     {
       unsigned char uc = *s;
diff --git a/contrib/tools/bison/lib/mbswidth.c b/contrib/tools/bison/lib/mbswidth.c
index 408a15e34480..a3f2099beef4 100644
--- a/contrib/tools/bison/lib/mbswidth.c
+++ b/contrib/tools/bison/lib/mbswidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2019 Free Software Foundation, Inc.
+   Copyright (C) 2000-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/mbswidth.h b/contrib/tools/bison/lib/mbswidth.h
index 2b5c53c3728a..50ef747da85a 100644
--- a/contrib/tools/bison/lib/mbswidth.h
+++ b/contrib/tools/bison/lib/mbswidth.h
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2004, 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2000-2004, 2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/minmax.h b/contrib/tools/bison/lib/minmax.h
index d7f6bea0619c..b9477767b0df 100644
--- a/contrib/tools/bison/lib/minmax.h
+++ b/contrib/tools/bison/lib/minmax.h
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2019 Free Software
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/msvc-inval.c b/contrib/tools/bison/lib/msvc-inval.c
index 75b5a070ab59..863668889c6a 100644
--- a/contrib/tools/bison/lib/msvc-inval.c
+++ b/contrib/tools/bison/lib/msvc-inval.c
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2019 Free Software Foundation, Inc.
+   Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/msvc-inval.h b/contrib/tools/bison/lib/msvc-inval.h
index e31cf650919a..93ee7859ca9e 100644
--- a/contrib/tools/bison/lib/msvc-inval.h
+++ b/contrib/tools/bison/lib/msvc-inval.h
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2019 Free Software Foundation, Inc.
+   Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -95,7 +95,7 @@ extern void gl_msvc_inval_ensure_handler (void);
 
 /* Gnulib can define its own status codes, as described in the page
    "Raising Software Exceptions" on microsoft.com
-   <https://msdn.microsoft.com/en-us/library/het71c37.aspx>.
+   <https://docs.microsoft.com/en-us/cpp/cpp/raising-software-exceptions>.
    Our status codes are composed of
      - 0xE0000000, mandatory for all user-defined status codes,
      - 0x474E550, a API identifier ("GNU"),
@@ -106,7 +106,7 @@ extern void gl_msvc_inval_ensure_handler (void);
 #  if defined _MSC_VER
 /* A compiler that supports __try/__except, as described in the page
    "try-except statement" on microsoft.com
-   <https://msdn.microsoft.com/en-us/library/s58ftw19.aspx>.
+   <https://docs.microsoft.com/en-us/cpp/cpp/try-except-statement>.
    With __try/__except, we can use the multithread-safe exception handling.  */
 
 #   ifdef __cplusplus
diff --git a/contrib/tools/bison/lib/msvc-nothrow.c b/contrib/tools/bison/lib/msvc-nothrow.c
index 49b709ca4aa0..bf93b8824121 100644
--- a/contrib/tools/bison/lib/msvc-nothrow.c
+++ b/contrib/tools/bison/lib/msvc-nothrow.c
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2019 Free Software Foundation, Inc.
+   Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/msvc-nothrow.h b/contrib/tools/bison/lib/msvc-nothrow.h
index 8d3ca7892e89..fca541573fc3 100644
--- a/contrib/tools/bison/lib/msvc-nothrow.h
+++ b/contrib/tools/bison/lib/msvc-nothrow.h
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2019 Free Software Foundation, Inc.
+   Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/obstack.c b/contrib/tools/bison/lib/obstack.c
index 411de4742907..780cda7b529c 100644
--- a/contrib/tools/bison/lib/obstack.c
+++ b/contrib/tools/bison/lib/obstack.c
@@ -1,5 +1,5 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988-2019 Free Software Foundation, Inc.
+   Copyright (C) 1988-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/contrib/tools/bison/lib/obstack.h b/contrib/tools/bison/lib/obstack.h
index 90ba66004b0f..3a7beb0ca3fd 100644
--- a/contrib/tools/bison/lib/obstack.h
+++ b/contrib/tools/bison/lib/obstack.h
@@ -1,5 +1,5 @@
 /* obstack.h - object stack macros
-   Copyright (C) 1988-2019 Free Software Foundation, Inc.
+   Copyright (C) 1988-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/contrib/tools/bison/lib/obstack_printf.c b/contrib/tools/bison/lib/obstack_printf.c
index 0d59a8bcfff6..cdb9ecdabe48 100644
--- a/contrib/tools/bison/lib/obstack_printf.c
+++ b/contrib/tools/bison/lib/obstack_printf.c
@@ -1,5 +1,5 @@
 /* Formatted output to obstacks.
-   Copyright (C) 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/open.c b/contrib/tools/bison/lib/open.c
index 655260572d42..487194f6652b 100644
--- a/contrib/tools/bison/lib/open.c
+++ b/contrib/tools/bison/lib/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -92,22 +92,19 @@ open (const char *filename, int flags, ...)
 #endif
 
 #if OPEN_TRAILING_SLASH_BUG
-  /* If the filename ends in a slash and one of O_CREAT, O_WRONLY, O_RDWR
-     is specified, then fail.
-     Rationale: POSIX <http://www.opengroup.org/susv3/basedefs/xbd_chap04.html>
-     says that
-       "A pathname that contains at least one non-slash character and that
-        ends with one or more trailing slashes shall be resolved as if a
-        single dot character ( '.' ) were appended to the pathname."
-     and
-       "The special filename dot shall refer to the directory specified by
-        its predecessor."
+  /* Fail if one of O_CREAT, O_WRONLY, O_RDWR is specified and the filename
+     ends in a slash, as POSIX says such a filename must name a directory
+     <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13>:
+       "A pathname that contains at least one non-<slash> character and that
+        ends with one or more trailing <slash> characters shall not be resolved
+        successfully unless the last pathname component before the trailing
+        <slash> characters names an existing directory"
      If the named file already exists as a directory, then
        - if O_CREAT is specified, open() must fail because of the semantics
          of O_CREAT,
        - if O_WRONLY or O_RDWR is specified, open() must fail because POSIX
-         <http://www.opengroup.org/susv3/functions/open.html> says that it
-         fails with errno = EISDIR in this case.
+         <https://pubs.opengroup.org/onlinepubs/9699919799/functions/open.html>
+         says that it fails with errno = EISDIR in this case.
      If the named file does not exist or does not name a directory, then
        - if O_CREAT is specified, open() must fail since open() cannot create
          directories,
@@ -171,14 +168,12 @@ open (const char *filename, int flags, ...)
 #if OPEN_TRAILING_SLASH_BUG
   /* If the filename ends in a slash and fd does not refer to a directory,
      then fail.
-     Rationale: POSIX <http://www.opengroup.org/susv3/basedefs/xbd_chap04.html>
-     says that
-       "A pathname that contains at least one non-slash character and that
-        ends with one or more trailing slashes shall be resolved as if a
-        single dot character ( '.' ) were appended to the pathname."
-     and
-       "The special filename dot shall refer to the directory specified by
-        its predecessor."
+     Rationale: POSIX says such a filename must name a directory
+     <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13>:
+       "A pathname that contains at least one non-<slash> character and that
+        ends with one or more trailing <slash> characters shall not be resolved
+        successfully unless the last pathname component before the trailing
+        <slash> characters names an existing directory"
      If the named file without the slash is not a directory, open() must fail
      with ENOTDIR.  */
   if (fd >= 0)
diff --git a/contrib/tools/bison/lib/path-join.c b/contrib/tools/bison/lib/path-join.c
index 727874222a7c..411f33160394 100644
--- a/contrib/tools/bison/lib/path-join.c
+++ b/contrib/tools/bison/lib/path-join.c
@@ -1,5 +1,5 @@
 /* Concatenate path components.
-   Copyright (C) 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2018-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff --git a/contrib/tools/bison/lib/path-join.h b/contrib/tools/bison/lib/path-join.h
index 0ac7055ff0a2..c4444a472ccd 100644
--- a/contrib/tools/bison/lib/path-join.h
+++ b/contrib/tools/bison/lib/path-join.h
@@ -1,5 +1,5 @@
 /* Concatenate path components.
-   Copyright (C) 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2018-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff --git a/contrib/tools/bison/lib/pipe-safer.c b/contrib/tools/bison/lib/pipe-safer.c
index 62017397c60e..5a597c527015 100644
--- a/contrib/tools/bison/lib/pipe-safer.c
+++ b/contrib/tools/bison/lib/pipe-safer.c
@@ -1,5 +1,5 @@
 /* Invoke pipe, but avoid some glitches.
-   Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/pipe2-safer.c b/contrib/tools/bison/lib/pipe2-safer.c
index 390d96b51c37..b644daa38c81 100644
--- a/contrib/tools/bison/lib/pipe2-safer.c
+++ b/contrib/tools/bison/lib/pipe2-safer.c
@@ -1,5 +1,5 @@
 /* Invoke pipe2, but avoid some glitches.
-   Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/pipe2.c b/contrib/tools/bison/lib/pipe2.c
index 15a5dec98527..591e94db4ce1 100644
--- a/contrib/tools/bison/lib/pipe2.c
+++ b/contrib/tools/bison/lib/pipe2.c
@@ -1,5 +1,5 @@
 /* Create a pipe, with specific opening flags.
-   Copyright (C) 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -107,7 +107,7 @@ pipe2 (int fd[2], int flags)
   if (pipe (fd) < 0)
     return -1;
 
-  /* POSIX <http://www.opengroup.org/onlinepubs/9699919799/functions/pipe.html>
+  /* POSIX <https://pubs.opengroup.org/onlinepubs/9699919799/functions/pipe.html>
      says that initially, the O_NONBLOCK and FD_CLOEXEC flags are cleared on
      both fd[0] and fd[1].  */
 
diff --git a/contrib/tools/bison/lib/platform/win64/sys/ioctl.h b/contrib/tools/bison/lib/platform/win64/sys/ioctl.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/tools/bison/lib/platform/win64/sys/stat.h b/contrib/tools/bison/lib/platform/win64/sys/stat.h
index bf7dc29f6e56..7a9004a80d21 100644
--- a/contrib/tools/bison/lib/platform/win64/sys/stat.h
+++ b/contrib/tools/bison/lib/platform/win64/sys/stat.h
@@ -653,8 +653,8 @@ _GL_WARN_ON_USE (fchmodat, "fchmodat is not portable - "
 #endif
 
 
-#if 1
-# if 1
+#if 0 
+# if 0
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef fstat
 #   define fstat rpl_fstat
@@ -665,7 +665,7 @@ _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf));
 _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
 # endif
 _GL_CXXALIASWARN (fstat);
-#elif 1
+#elif 0
 /* Above, we define stat to _stati64.  */
 # define fstat _fstati64
 #elif defined GNULIB_POSIXCHECK
diff --git a/contrib/tools/bison/lib/platform/win64/termios.h b/contrib/tools/bison/lib/platform/win64/termios.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contrib/tools/bison/lib/printf-args.c b/contrib/tools/bison/lib/printf-args.c
index e45cfbede10e..943b77c23ce2 100644
--- a/contrib/tools/bison/lib/printf-args.c
+++ b/contrib/tools/bison/lib/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2019 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -65,14 +65,12 @@ PRINTF_FETCHARGS (va_list args, arguments *a)
       case TYPE_ULONGINT:
         ap->a.a_ulongint = va_arg (args, unsigned long int);
         break;
-#if HAVE_LONG_LONG_INT
       case TYPE_LONGLONGINT:
         ap->a.a_longlongint = va_arg (args, long long int);
         break;
       case TYPE_ULONGLONGINT:
         ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
         break;
-#endif
       case TYPE_DOUBLE:
         ap->a.a_double = va_arg (args, double);
         break;
@@ -135,11 +133,9 @@ PRINTF_FETCHARGS (va_list args, arguments *a)
       case TYPE_COUNT_LONGINT_POINTER:
         ap->a.a_count_longint_pointer = va_arg (args, long int *);
         break;
-#if HAVE_LONG_LONG_INT
       case TYPE_COUNT_LONGLONGINT_POINTER:
         ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
         break;
-#endif
 #if ENABLE_UNISTDIO
       /* The unistdio extensions.  */
       case TYPE_U8_STRING:
diff --git a/contrib/tools/bison/lib/printf-args.h b/contrib/tools/bison/lib/printf-args.h
index 866cba04d8ca..781f5723828b 100644
--- a/contrib/tools/bison/lib/printf-args.h
+++ b/contrib/tools/bison/lib/printf-args.h
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2019 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2020 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -57,10 +57,8 @@ typedef enum
   TYPE_UINT,
   TYPE_LONGINT,
   TYPE_ULONGINT,
-#if HAVE_LONG_LONG_INT
   TYPE_LONGLONGINT,
   TYPE_ULONGLONGINT,
-#endif
   TYPE_DOUBLE,
   TYPE_LONGDOUBLE,
   TYPE_CHAR,
@@ -75,10 +73,8 @@ typedef enum
   TYPE_COUNT_SCHAR_POINTER,
   TYPE_COUNT_SHORT_POINTER,
   TYPE_COUNT_INT_POINTER,
-  TYPE_COUNT_LONGINT_POINTER
-#if HAVE_LONG_LONG_INT
-, TYPE_COUNT_LONGLONGINT_POINTER
-#endif
+  TYPE_COUNT_LONGINT_POINTER,
+  TYPE_COUNT_LONGLONGINT_POINTER
 #if ENABLE_UNISTDIO
   /* The unistdio extensions.  */
 , TYPE_U8_STRING
@@ -101,10 +97,8 @@ typedef struct
     unsigned int                a_uint;
     long int                    a_longint;
     unsigned long int           a_ulongint;
-#if HAVE_LONG_LONG_INT
     long long int               a_longlongint;
     unsigned long long int      a_ulonglongint;
-#endif
     float                       a_float;
     double                      a_double;
     long double                 a_longdouble;
@@ -121,9 +115,7 @@ typedef struct
     short *                     a_count_short_pointer;
     int *                       a_count_int_pointer;
     long int *                  a_count_longint_pointer;
-#if HAVE_LONG_LONG_INT
     long long int *             a_count_longlongint_pointer;
-#endif
 #if ENABLE_UNISTDIO
     /* The unistdio extensions.  */
     const uint8_t *             a_u8_string;
diff --git a/contrib/tools/bison/lib/printf-frexp.c b/contrib/tools/bison/lib/printf-frexp.c
index 77eafab54453..6e1e647b44bb 100644
--- a/contrib/tools/bison/lib/printf-frexp.c
+++ b/contrib/tools/bison/lib/printf-frexp.c
@@ -1,5 +1,5 @@
 /* Split a double into fraction and mantissa, for hexadecimal printf.
-   Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/printf-frexp.h b/contrib/tools/bison/lib/printf-frexp.h
index 93107343adcb..321ea602dcfa 100644
--- a/contrib/tools/bison/lib/printf-frexp.h
+++ b/contrib/tools/bison/lib/printf-frexp.h
@@ -1,5 +1,5 @@
 /* Split a double into fraction and mantissa, for hexadecimal printf.
-   Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/printf-frexpl.c b/contrib/tools/bison/lib/printf-frexpl.c
index 693b88976d4a..7992cbb4b6d9 100644
--- a/contrib/tools/bison/lib/printf-frexpl.c
+++ b/contrib/tools/bison/lib/printf-frexpl.c
@@ -1,5 +1,5 @@
 /* Split a 'long double' into fraction and mantissa, for hexadecimal printf.
-   Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/printf-frexpl.h b/contrib/tools/bison/lib/printf-frexpl.h
index 276076944276..be729dd45e8d 100644
--- a/contrib/tools/bison/lib/printf-frexpl.h
+++ b/contrib/tools/bison/lib/printf-frexpl.h
@@ -1,5 +1,5 @@
 /* Split a 'long double' into fraction and mantissa, for hexadecimal printf.
-   Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/printf-parse.c b/contrib/tools/bison/lib/printf-parse.c
index 8596fd5f305c..99ddbc37a8a4 100644
--- a/contrib/tools/bison/lib/printf-parse.c
+++ b/contrib/tools/bison/lib/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -447,14 +447,12 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
               switch (c)
                 {
                 case 'd': case 'i':
-#if HAVE_LONG_LONG_INT
-                  /* If 'long long' exists and is larger than 'long':  */
+                  /* If 'long long' is larger than 'long':  */
                   if (flags >= 16 || (flags & 4))
                     type = TYPE_LONGLONGINT;
                   else
-#endif
-                  /* If 'long long' exists and is the same as 'long', we parse
-                     "lld" into TYPE_LONGINT.  */
+                  /* If 'long long' is the same as 'long', we parse "lld" into
+                     TYPE_LONGINT.  */
                   if (flags >= 8)
                     type = TYPE_LONGINT;
                   else if (flags & 2)
@@ -465,14 +463,12 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                     type = TYPE_INT;
                   break;
                 case 'o': case 'u': case 'x': case 'X':
-#if HAVE_LONG_LONG_INT
-                  /* If 'long long' exists and is larger than 'long':  */
+                  /* If 'unsigned long long' is larger than 'unsigned long':  */
                   if (flags >= 16 || (flags & 4))
                     type = TYPE_ULONGLONGINT;
                   else
-#endif
-                  /* If 'unsigned long long' exists and is the same as
-                     'unsigned long', we parse "llu" into TYPE_ULONGINT.  */
+                  /* If 'unsigned long long' is the same as 'unsigned long', we
+                     parse "llu" into TYPE_ULONGINT.  */
                   if (flags >= 8)
                     type = TYPE_ULONGINT;
                   else if (flags & 2)
@@ -525,14 +521,12 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                   type = TYPE_POINTER;
                   break;
                 case 'n':
-#if HAVE_LONG_LONG_INT
-                  /* If 'long long' exists and is larger than 'long':  */
+                  /* If 'long long' is larger than 'long':  */
                   if (flags >= 16 || (flags & 4))
                     type = TYPE_COUNT_LONGLONGINT_POINTER;
                   else
-#endif
-                  /* If 'long long' exists and is the same as 'long', we parse
-                     "lln" into TYPE_COUNT_LONGINT_POINTER.  */
+                  /* If 'long long' is the same as 'long', we parse "lln" into
+                     TYPE_COUNT_LONGINT_POINTER.  */
                   if (flags >= 8)
                     type = TYPE_COUNT_LONGINT_POINTER;
                   else if (flags & 2)
diff --git a/contrib/tools/bison/lib/printf-parse.h b/contrib/tools/bison/lib/printf-parse.h
index 746bb3fe0fa9..34b91f4f7694 100644
--- a/contrib/tools/bison/lib/printf-parse.h
+++ b/contrib/tools/bison/lib/printf-parse.h
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2019 Free Software
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2020 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/progname.c b/contrib/tools/bison/lib/progname.c
index a42b7fa2f700..d59d969ba659 100644
--- a/contrib/tools/bison/lib/progname.c
+++ b/contrib/tools/bison/lib/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/progname.h b/contrib/tools/bison/lib/progname.h
index c726e97e905e..bc276cc8e781 100644
--- a/contrib/tools/bison/lib/progname.h
+++ b/contrib/tools/bison/lib/progname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/quote.h b/contrib/tools/bison/lib/quote.h
index 5cef8ff1e093..391ff1a35390 100644
--- a/contrib/tools/bison/lib/quote.h
+++ b/contrib/tools/bison/lib/quote.h
@@ -1,6 +1,6 @@
 /* quote.h - prototypes for quote.c
 
-   Copyright (C) 1998-2001, 2003, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-2001, 2003, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/quotearg.c b/contrib/tools/bison/lib/quotearg.c
index 773d53f11549..c78fc1670f44 100644
--- a/contrib/tools/bison/lib/quotearg.c
+++ b/contrib/tools/bison/lib/quotearg.c
@@ -1,6 +1,6 @@
 /* quotearg.c - quote arguments for output
 
-   Copyright (C) 1998-2002, 2004-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-2002, 2004-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/quotearg.h b/contrib/tools/bison/lib/quotearg.h
index 0f07e0211e29..3bf149b39757 100644
--- a/contrib/tools/bison/lib/quotearg.h
+++ b/contrib/tools/bison/lib/quotearg.h
@@ -1,6 +1,6 @@
 /* quotearg.h - quote arguments for output
 
-   Copyright (C) 1998-2002, 2004, 2006, 2008-2019 Free Software Foundation,
+   Copyright (C) 1998-2002, 2004, 2006, 2008-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -323,7 +323,7 @@ void set_custom_quoting (struct quoting_options *o,
    On output, BUFFER might contain embedded null bytes if ARGSIZE was
    not -1, the style of O does not use backslash escapes, and the
    flags of O do not request elision of null bytes.*/
-size_t quotearg_buffer (char *buffer, size_t buffersize,
+size_t quotearg_buffer (char *restrict buffer, size_t buffersize,
                         char const *arg, size_t argsize,
                         struct quoting_options const *o);
 
diff --git a/contrib/tools/bison/lib/raise.c b/contrib/tools/bison/lib/raise.c
index e750b7a4c649..1b93e529a78d 100644
--- a/contrib/tools/bison/lib/raise.c
+++ b/contrib/tools/bison/lib/raise.c
@@ -1,6 +1,6 @@
 /* Provide a non-threads replacement for the POSIX raise function.
 
-   Copyright (C) 2002-2003, 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/relocatable.h b/contrib/tools/bison/lib/relocatable.h
index 896a7e59c02a..ffb8cdb2ec96 100644
--- a/contrib/tools/bison/lib/relocatable.h
+++ b/contrib/tools/bison/lib/relocatable.h
@@ -1,5 +1,5 @@
 /* Provide relocatable packages.
-   Copyright (C) 2003, 2005, 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2008-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/setlocale_null.c b/contrib/tools/bison/lib/setlocale_null.c
new file mode 100644
index 000000000000..64b1cef79490
--- /dev/null
+++ b/contrib/tools/bison/lib/setlocale_null.c
@@ -0,0 +1,413 @@
+/* Query the name of the current global locale.
+   Copyright (C) 2019-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2019.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "setlocale_null.h"
+
+#include <errno.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#if defined _WIN32 && !defined __CYGWIN__
+# include <wchar.h>
+#endif
+
+#if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE)
+# if defined _WIN32 && !defined __CYGWIN__
+
+#  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#  include <windows.h>
+
+# elif HAVE_PTHREAD_API
+
+#  include <pthread.h>
+#  if HAVE_THREADS_H && HAVE_WEAK_SYMBOLS
+#   include <threads.h>
+#   pragma weak thrd_exit
+#   define c11_threads_in_use() (thrd_exit != NULL)
+#  else
+#   define c11_threads_in_use() 0
+#  endif
+
+# elif HAVE_THREADS_H
+
+#  include <threads.h>
+
+# endif
+#endif
+
+/* Use the system's setlocale() function, not the gnulib override, here.  */
+#undef setlocale
+
+static const char *
+setlocale_null_androidfix (int category)
+{
+  const char *result = setlocale (category, NULL);
+
+#ifdef __ANDROID__
+  if (result == NULL)
+    switch (category)
+      {
+      case LC_CTYPE:
+      case LC_NUMERIC:
+      case LC_TIME:
+      case LC_COLLATE:
+      case LC_MONETARY:
+      case LC_MESSAGES:
+      case LC_ALL:
+      case LC_PAPER:
+      case LC_NAME:
+      case LC_ADDRESS:
+      case LC_TELEPHONE:
+      case LC_MEASUREMENT:
+        result = "C";
+        break;
+      default:
+        break;
+      }
+#endif
+
+  return result;
+}
+
+static int
+setlocale_null_unlocked (int category, char *buf, size_t bufsize)
+{
+#if defined _WIN32 && !defined __CYGWIN__ && defined _MSC_VER
+  /* On native Windows, nowadays, the setlocale() implementation is based
+     on _wsetlocale() and uses malloc() for the result.  We are better off
+     using _wsetlocale() directly.  */
+  const wchar_t *result = _wsetlocale (category, NULL);
+
+  if (result == NULL)
+    {
+      /* CATEGORY is invalid.  */
+      if (bufsize > 0)
+        /* Return an empty string in BUF.
+           This is a convenience for callers that don't want to write explicit
+           code for handling EINVAL.  */
+        buf[0] = '\0';
+      return EINVAL;
+    }
+  else
+    {
+      size_t length = wcslen (result);
+      if (length < bufsize)
+        {
+          size_t i;
+
+          /* Convert wchar_t[] -> char[], assuming plain ASCII.  */
+          for (i = 0; i <= length; i++)
+            buf[i] = result[i];
+
+          return 0;
+        }
+      else
+        {
+          if (bufsize > 0)
+            {
+              /* Return a truncated result in BUF.
+                 This is a convenience for callers that don't want to write
+                 explicit code for handling ERANGE.  */
+              size_t i;
+
+              /* Convert wchar_t[] -> char[], assuming plain ASCII.  */
+              for (i = 0; i < bufsize; i++)
+                buf[i] = result[i];
+              buf[bufsize - 1] = '\0';
+            }
+          return ERANGE;
+        }
+    }
+#else
+  const char *result = setlocale_null_androidfix (category);
+
+  if (result == NULL)
+    {
+      /* CATEGORY is invalid.  */
+      if (bufsize > 0)
+        /* Return an empty string in BUF.
+           This is a convenience for callers that don't want to write explicit
+           code for handling EINVAL.  */
+        buf[0] = '\0';
+      return EINVAL;
+    }
+  else
+    {
+      size_t length = strlen (result);
+      if (length < bufsize)
+        {
+          memcpy (buf, result, length + 1);
+          return 0;
+        }
+      else
+        {
+          if (bufsize > 0)
+            {
+              /* Return a truncated result in BUF.
+                 This is a convenience for callers that don't want to write
+                 explicit code for handling ERANGE.  */
+              memcpy (buf, result, bufsize - 1);
+              buf[bufsize - 1] = '\0';
+            }
+          return ERANGE;
+        }
+    }
+#endif
+}
+
+#if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin */
+
+/* Use a lock, so that no two threads can invoke setlocale_null_unlocked
+   at the same time.  */
+
+/* Prohibit renaming this symbol.  */
+# undef gl_get_setlocale_null_lock
+
+# if defined _WIN32 && !defined __CYGWIN__
+
+extern __declspec(dllimport) CRITICAL_SECTION *gl_get_setlocale_null_lock (void);
+
+static int
+setlocale_null_with_lock (int category, char *buf, size_t bufsize)
+{
+  CRITICAL_SECTION *lock = gl_get_setlocale_null_lock ();
+  int ret;
+
+  EnterCriticalSection (lock);
+  ret = setlocale_null_unlocked (category, buf, bufsize);
+  LeaveCriticalSection (lock);
+
+  return ret;
+}
+
+# elif HAVE_PTHREAD_API /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin */
+
+extern
+#  if defined _WIN32 || defined __CYGWIN__
+  __declspec(dllimport)
+#  endif
+  pthread_mutex_t *gl_get_setlocale_null_lock (void);
+
+#  if HAVE_WEAK_SYMBOLS /* musl libc, FreeBSD, NetBSD, OpenBSD, Haiku */
+
+    /* Avoid the need to link with '-lpthread'.  */
+#   pragma weak pthread_mutex_lock
+#   pragma weak pthread_mutex_unlock
+
+    /* Determine whether libpthread is in use.  */
+#   pragma weak pthread_mutexattr_gettype
+    /* See the comments in lock.h.  */
+#   define pthread_in_use() \
+      (pthread_mutexattr_gettype != NULL || c11_threads_in_use ())
+
+#  else
+#   define pthread_in_use() 1
+#  endif
+
+static int
+setlocale_null_with_lock (int category, char *buf, size_t bufsize)
+{
+  if (pthread_in_use())
+    {
+      pthread_mutex_t *lock = gl_get_setlocale_null_lock ();
+      int ret;
+
+      if (pthread_mutex_lock (lock))
+        abort ();
+      ret = setlocale_null_unlocked (category, buf, bufsize);
+      if (pthread_mutex_unlock (lock))
+        abort ();
+
+      return ret;
+    }
+  else
+    return setlocale_null_unlocked (category, buf, bufsize);
+}
+
+# elif HAVE_THREADS_H
+
+extern mtx_t *gl_get_setlocale_null_lock (void);
+
+static int
+setlocale_null_with_lock (int category, char *buf, size_t bufsize)
+{
+  mtx_t *lock = gl_get_setlocale_null_lock ();
+  int ret;
+
+  if (mtx_lock (lock) != thrd_success)
+    abort ();
+  ret = setlocale_null_unlocked (category, buf, bufsize);
+  if (mtx_unlock (lock) != thrd_success)
+    abort ();
+
+  return ret;
+}
+
+# endif
+
+#endif
+
+int
+setlocale_null_r (int category, char *buf, size_t bufsize)
+{
+#if SETLOCALE_NULL_ALL_MTSAFE
+# if SETLOCALE_NULL_ONE_MTSAFE
+
+  return setlocale_null_unlocked (category, buf, bufsize);
+
+# else
+
+  if (category == LC_ALL)
+    return setlocale_null_unlocked (category, buf, bufsize);
+  else
+    return setlocale_null_with_lock (category, buf, bufsize);
+
+# endif
+#else
+# if SETLOCALE_NULL_ONE_MTSAFE
+
+  if (category == LC_ALL)
+    return setlocale_null_with_lock (category, buf, bufsize);
+  else
+    return setlocale_null_unlocked (category, buf, bufsize);
+
+# else
+
+  return setlocale_null_with_lock (category, buf, bufsize);
+
+# endif
+#endif
+}
+
+const char *
+setlocale_null (int category)
+{
+#if SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE
+  return setlocale_null_androidfix (category);
+#else
+
+  /* This call must be multithread-safe.  To achieve this without using
+     thread-local storage:
+       1. We use a specific static buffer for each possible CATEGORY
+          argument.  So that different threads can call setlocale_mtsafe
+          with different CATEGORY arguments, without interfering.
+       2. We use a simple strcpy or memcpy to fill this static buffer.
+          Filling it through, for example, strcpy + strcat would not be
+          guaranteed to leave the buffer's contents intact if another thread
+          is currently accessing it.  If necessary, the contents is first
+          assembled in a stack-allocated buffer.  */
+  if (category == LC_ALL)
+    {
+# if SETLOCALE_NULL_ALL_MTSAFE
+      return setlocale_null_androidfix (LC_ALL);
+# else
+      char buf[SETLOCALE_NULL_ALL_MAX];
+      static char resultbuf[SETLOCALE_NULL_ALL_MAX];
+
+      if (setlocale_null_r (LC_ALL, buf, sizeof (buf)))
+        return "C";
+      strcpy (resultbuf, buf);
+      return resultbuf;
+# endif
+    }
+  else
+    {
+# if SETLOCALE_NULL_ONE_MTSAFE
+      return setlocale_null_androidfix (category);
+# else
+      enum
+        {
+          LC_CTYPE_INDEX,
+          LC_NUMERIC_INDEX,
+          LC_TIME_INDEX,
+          LC_COLLATE_INDEX,
+          LC_MONETARY_INDEX,
+          LC_MESSAGES_INDEX,
+#  ifdef LC_PAPER
+          LC_PAPER_INDEX,
+#  endif
+#  ifdef LC_NAME
+          LC_NAME_INDEX,
+#  endif
+#  ifdef LC_ADDRESS
+          LC_ADDRESS_INDEX,
+#  endif
+#  ifdef LC_TELEPHONE
+          LC_TELEPHONE_INDEX,
+#  endif
+#  ifdef LC_MEASUREMENT
+          LC_MEASUREMENT_INDEX,
+#  endif
+#  ifdef LC_IDENTIFICATION
+          LC_IDENTIFICATION_INDEX,
+#  endif
+          LC_INDICES_COUNT
+        }
+        i;
+      char buf[SETLOCALE_NULL_MAX];
+      static char resultbuf[LC_INDICES_COUNT][SETLOCALE_NULL_MAX];
+      int err;
+
+      err = setlocale_null_r (category, buf, sizeof (buf));
+      if (err == EINVAL)
+        return NULL;
+      if (err)
+        return "C";
+
+      switch (category)
+        {
+        case LC_CTYPE:          i = LC_CTYPE_INDEX;          break;
+        case LC_NUMERIC:        i = LC_NUMERIC_INDEX;        break;
+        case LC_TIME:           i = LC_TIME_INDEX;           break;
+        case LC_COLLATE:        i = LC_COLLATE_INDEX;        break;
+        case LC_MONETARY:       i = LC_MONETARY_INDEX;       break;
+#  ifdef LC_MESSAGES
+        case LC_MESSAGES:       i = LC_MESSAGES_INDEX;       break;
+#  endif
+#  ifdef LC_PAPER
+        case LC_PAPER:          i = LC_PAPER_INDEX;          break;
+#  endif
+#  ifdef LC_NAME
+        case LC_NAME:           i = LC_NAME_INDEX;           break;
+#  endif
+#  ifdef LC_ADDRESS
+        case LC_ADDRESS:        i = LC_ADDRESS_INDEX;        break;
+#  endif
+#  ifdef LC_TELEPHONE
+        case LC_TELEPHONE:      i = LC_TELEPHONE_INDEX;      break;
+#  endif
+#  ifdef LC_MEASUREMENT
+        case LC_MEASUREMENT:    i = LC_MEASUREMENT_INDEX;    break;
+#  endif
+#  ifdef LC_IDENTIFICATION
+        case LC_IDENTIFICATION: i = LC_IDENTIFICATION_INDEX; break;
+#  endif
+        default:
+          /* If you get here, a #ifdef LC_xxx is missing.  */
+          abort ();
+        }
+
+      strcpy (resultbuf[i], buf);
+      return resultbuf[i];
+# endif
+    }
+#endif
+}
diff --git a/contrib/tools/bison/lib/setlocale_null.h b/contrib/tools/bison/lib/setlocale_null.h
new file mode 100644
index 000000000000..6844be5fac65
--- /dev/null
+++ b/contrib/tools/bison/lib/setlocale_null.h
@@ -0,0 +1,82 @@
+/* Query the name of the current global locale.
+   Copyright (C) 2019-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2019.  */
+
+#ifndef _SETLOCALE_NULL_H
+#define _SETLOCALE_NULL_H
+
+#include <stddef.h>
+
+#include "arg-nonnull.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Recommended size of a buffer for a locale name for a single category.
+   On glibc systems, you can have locale names that are relative file names;
+   assume a maximum length 256.
+   In native Windows, in 2018 the longest locale name was of length 58
+   ("FYRO Macedonian_Former Yugoslav Republic of Macedonia.1251").  */
+#define SETLOCALE_NULL_MAX (256+1)
+
+/* Recommended size of a buffer for a locale name with all categories.
+   On glibc systems, you can have locale names that are relative file names;
+   assume maximum length 256 for each.  There are 12 categories; so, the
+   maximum total length is 148+12*256.
+   In native Windows, there are 5 categories, and the maximum total length is
+   55+5*58.  */
+#define SETLOCALE_NULL_ALL_MAX (148+12*256+1)
+
+/* setlocale_null_r (CATEGORY, BUF, BUFSIZE) is like setlocale (CATEGORY, NULL),
+   except that
+     - it is guaranteed to be multithread-safe,
+     - it returns the resulting locale category name or locale name in the
+       user-supplied buffer BUF, which must be BUFSIZE bytes long.
+   The recommended minimum buffer size is
+     - SETLOCALE_NULL_MAX for CATEGORY != LC_ALL, and
+     - SETLOCALE_NULL_ALL_MAX for CATEGORY == LC_ALL.
+   The return value is an error code: 0 if the call is successful, EINVAL if
+   CATEGORY is invalid, or ERANGE if BUFSIZE is smaller than the length needed
+   size (including the trailing NUL byte).  In the latter case, a truncated
+   result is returned in BUF, but still NUL-terminated if BUFSIZE > 0.
+   For this call to be multithread-safe, *all* calls to
+   setlocale (CATEGORY, NULL) in all other threads must have been converted
+   to use setlocale_null_r or setlocale_null as well, and the other threads
+   must not make other setlocale invocations (since changing the global locale
+   has side effects on all threads).  */
+extern int setlocale_null_r (int category, char *buf, size_t bufsize)
+  _GL_ARG_NONNULL ((2));
+
+/* setlocale_null (CATEGORY) is like setlocale (CATEGORY, NULL), except that
+   it is guaranteed to be multithread-safe.
+   The return value is NULL if CATEGORY is invalid.
+   For this call to be multithread-safe, *all* calls to
+   setlocale (CATEGORY, NULL) in all other threads must have been converted
+   to use setlocale_null_r or setlocale_null as well, and the other threads
+   must not make other setlocale invocations (since changing the global locale
+   has side effects on all threads).  */
+extern const char *setlocale_null (int category);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SETLOCALE_NULL_H */
diff --git a/contrib/tools/bison/lib/sig-handler.h b/contrib/tools/bison/lib/sig-handler.h
index b289473dbde3..17604eada383 100644
--- a/contrib/tools/bison/lib/sig-handler.h
+++ b/contrib/tools/bison/lib/sig-handler.h
@@ -1,6 +1,6 @@
 /* Convenience declarations when working with <signal.h>.
 
-   Copyright (C) 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/sigaction.c b/contrib/tools/bison/lib/sigaction.c
index abedfdcdc478..792b3e8dac70 100644
--- a/contrib/tools/bison/lib/sigaction.c
+++ b/contrib/tools/bison/lib/sigaction.c
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/sigprocmask.c b/contrib/tools/bison/lib/sigprocmask.c
index d6cd3f82e503..d18610691ea7 100644
--- a/contrib/tools/bison/lib/sigprocmask.c
+++ b/contrib/tools/bison/lib/sigprocmask.c
@@ -1,5 +1,5 @@
 /* POSIX compatible signal blocking.
-   Copyright (C) 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 2006-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/spawn-pipe.c b/contrib/tools/bison/lib/spawn-pipe.c
index 5fe50fc6403f..3e5afbef947d 100644
--- a/contrib/tools/bison/lib/spawn-pipe.c
+++ b/contrib/tools/bison/lib/spawn-pipe.c
@@ -1,5 +1,5 @@
 /* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/spawn-pipe.h b/contrib/tools/bison/lib/spawn-pipe.h
index 0d709686665a..6a95650ee0fa 100644
--- a/contrib/tools/bison/lib/spawn-pipe.h
+++ b/contrib/tools/bison/lib/spawn-pipe.h
@@ -1,5 +1,5 @@
 /* Creation of subprocesses, communicating via pipes.
-   Copyright (C) 2001-2003, 2006, 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2008-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/stdio-impl.h b/contrib/tools/bison/lib/stdio-impl.h
index 4260468b612e..067b95ebd64a 100644
--- a/contrib/tools/bison/lib/stdio-impl.h
+++ b/contrib/tools/bison/lib/stdio-impl.h
@@ -1,5 +1,5 @@
 /* Implementation details of FILE streams.
-   Copyright (C) 2007-2008, 2010-2019 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008, 2010-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,11 +18,16 @@
    the same implementation of stdio extension API, except that some fields
    have different naming conventions, or their access requires some casts.  */
 
-/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-   problem by defining it ourselves.  FIXME: Do not rely on glibc
+/* Glibc 2.28 made _IO_UNBUFFERED and _IO_IN_BACKUP private.  For now, work
+   around this problem by defining them ourselves.  FIXME: Do not rely on glibc
    internals.  */
-#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-# define _IO_IN_BACKUP 0x100
+#if defined _IO_EOF_SEEN
+# if !defined _IO_UNBUFFERED
+#  define _IO_UNBUFFERED 0x2
+# endif
+# if !defined _IO_IN_BACKUP
+#  define _IO_IN_BACKUP 0x100
+# endif
 #endif
 
 /* BSD stdio derived implementations.  */
diff --git a/contrib/tools/bison/lib/stdio-safer.h b/contrib/tools/bison/lib/stdio-safer.h
index 790846c2e7e4..ce74a93ea3d3 100644
--- a/contrib/tools/bison/lib/stdio-safer.h
+++ b/contrib/tools/bison/lib/stdio-safer.h
@@ -1,6 +1,6 @@
 /* Invoke stdio functions, but avoid some glitches.
 
-   Copyright (C) 2001, 2003, 2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/stpcpy.c b/contrib/tools/bison/lib/stpcpy.c
index a1d32fdaf81c..58265f0b797b 100644
--- a/contrib/tools/bison/lib/stpcpy.c
+++ b/contrib/tools/bison/lib/stpcpy.c
@@ -1,5 +1,5 @@
 /* stpcpy.c -- copy a string and return pointer to end of new string
-   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2019 Free Software
+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2020 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/contrib/tools/bison/lib/streq.h b/contrib/tools/bison/lib/streq.h
index 326537b6d020..d06c27200cd4 100644
--- a/contrib/tools/bison/lib/streq.h
+++ b/contrib/tools/bison/lib/streq.h
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/contrib/tools/bison/lib/stripslash.c b/contrib/tools/bison/lib/stripslash.c
index dfc15b43cc97..6818b3061416 100644
--- a/contrib/tools/bison/lib/stripslash.c
+++ b/contrib/tools/bison/lib/stripslash.c
@@ -1,6 +1,6 @@
 /* stripslash.c -- remove redundant trailing slashes from a file name
 
-   Copyright (C) 1990, 2001, 2003-2006, 2009-2019 Free Software Foundation,
+   Copyright (C) 1990, 2001, 2003-2006, 2009-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/strndup.c b/contrib/tools/bison/lib/strndup.c
index 5b74828469a8..d5294b88525b 100644
--- a/contrib/tools/bison/lib/strndup.c
+++ b/contrib/tools/bison/lib/strndup.c
@@ -1,6 +1,6 @@
 /* A replacement function, for systems that lack strndup.
 
-   Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2019 Free Software
+   Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff --git a/contrib/tools/bison/lib/strverscmp.c b/contrib/tools/bison/lib/strverscmp.c
index bf5ce5086f11..2e9284486da6 100644
--- a/contrib/tools/bison/lib/strverscmp.c
+++ b/contrib/tools/bison/lib/strverscmp.c
@@ -1,5 +1,5 @@
 /* Compare strings while treating digits characters numerically.
-   Copyright (C) 1997-2019 Free Software Foundation, Inc.
+   Copyright (C) 1997-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
 
@@ -17,10 +17,8 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#if !_LIBC
-# include <config.h>
-#endif
 
+#include <stdint.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -35,27 +33,25 @@
 #define  CMP    2
 #define  LEN    3
 
-#ifndef weak_alias
-# define __strverscmp strverscmp
-#endif
 
 /* Compare S1 and S2 as strings holding indices/version numbers,
    returning less than, equal to or greater than zero if S1 is less than,
    equal to or greater than S2 (for more info, see the texinfo doc).
 */
 
+#ifndef weak_alias
+#define __strverscmp strverscmp
+#endif
+
 int
 __strverscmp (const char *s1, const char *s2)
 {
   const unsigned char *p1 = (const unsigned char *) s1;
   const unsigned char *p2 = (const unsigned char *) s2;
-  unsigned char c1, c2;
-  int state;
-  int diff;
 
   /* Symbol(s)    0       [1-9]   others
      Transition   (10) 0  (01) d  (00) x   */
-  static const unsigned char next_state[] =
+  static const uint_least8_t next_state[] =
   {
       /* state    x    d    0  */
       /* S_N */  S_N, S_I, S_Z,
@@ -64,7 +60,7 @@ __strverscmp (const char *s1, const char *s2)
       /* S_Z */  S_N, S_F, S_Z
   };
 
-  static const signed char result_type[] =
+  static const int_least8_t result_type[] =
   {
       /* state   x/x  x/d  x/0  d/x  d/d  d/0  0/x  0/d  0/0  */
 
@@ -77,15 +73,16 @@ __strverscmp (const char *s1, const char *s2)
   if (p1 == p2)
     return 0;
 
-  c1 = *p1++;
-  c2 = *p2++;
+  unsigned char c1 = *p1++;
+  unsigned char c2 = *p2++;
   /* Hint: '0' is a digit too.  */
-  state = S_N + ((c1 == '0') + (isdigit (c1) != 0));
+  int state = S_N + ((c1 == '0') + (isdigit (c1) != 0));
 
+  int diff;
   while ((diff = c1 - c2) == 0)
     {
       if (c1 == '\0')
-        return diff;
+	return diff;
 
       state = next_state[state];
       c1 = *p1++;
@@ -96,20 +93,20 @@ __strverscmp (const char *s1, const char *s2)
   state = result_type[state * 3 + (((c2 == '0') + (isdigit (c2) != 0)))];
 
   switch (state)
-    {
+  {
     case CMP:
       return diff;
 
     case LEN:
       while (isdigit (*p1++))
-        if (!isdigit (*p2++))
-          return 1;
+	if (!isdigit (*p2++))
+	  return 1;
 
       return isdigit (*p2) ? -1 : diff;
 
     default:
       return state;
-    }
+  }
 }
 #ifdef weak_alias
 libc_hidden_def (__strverscmp)
diff --git a/contrib/tools/bison/lib/textstyle.h b/contrib/tools/bison/lib/textstyle.h
new file mode 100644
index 000000000000..8cf63c7979bb
--- /dev/null
+++ b/contrib/tools/bison/lib/textstyle.h
@@ -0,0 +1,466 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Dummy replacement for part of the public API of the libtextstyle library.
+   Copyright (C) 2006-2007, 2019-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2019.  */
+
+/* This file is used as replacement when libtextstyle with its include file
+   <textstyle.h> is not found.
+   It supports the essential API and implements it in a way that does not
+   provide text styling.  That is, it produces plain text output via <stdio.h>
+   FILE objects.
+   Thus, it allows a package to be build with or without a dependency to
+   libtextstyle, with very few occurrences of '#if HAVE_LIBTEXTSTYLE'.
+
+   Restriction:
+   It assumes that freopen() is not being called on stdout and stderr.  */
+
+#ifndef _TEXTSTYLE_H
+#define _TEXTSTYLE_H
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#if HAVE_TCDRAIN
+# include <termios.h>
+#endif
+
+/* ----------------------------- From ostream.h ----------------------------- */
+
+/* Describes the scope of a flush operation.  */
+typedef enum
+{
+  /* Flushes buffers in this ostream_t.
+     Use this value if you want to write to the underlying ostream_t.  */
+  FLUSH_THIS_STREAM = 0,
+  /* Flushes all buffers in the current process.
+     Use this value if you want to write to the same target through a
+     different file descriptor or a FILE stream.  */
+  FLUSH_THIS_PROCESS = 1,
+  /* Flushes buffers in the current process and attempts to flush the buffers
+     in the kernel.
+     Use this value so that some other process (or the kernel itself)
+     may write to the same target.  */
+  FLUSH_ALL = 2
+} ostream_flush_scope_t;
+
+
+/* An output stream is an object to which one can feed a sequence of bytes.  */
+
+typedef FILE * ostream_t;
+
+static inline void
+ostream_write_mem (ostream_t stream, const void *data, size_t len)
+{
+  if (len > 0)
+    fwrite (data, 1, len, stream);
+}
+
+static inline void
+ostream_flush (ostream_t stream, ostream_flush_scope_t scope)
+{
+  fflush (stream);
+  if (scope == FLUSH_ALL)
+    {
+      int fd = fileno (stream);
+      if (fd >= 0)
+        {
+          /* For streams connected to a disk file:  */
+          fsync (fd);
+          #if HAVE_TCDRAIN
+          /* For streams connected to a terminal:  */
+          {
+            int retval;
+
+            do
+              retval = tcdrain (fd);
+            while (retval < 0 && errno == EINTR);
+          }
+          #endif
+        }
+    }
+}
+
+static inline void
+ostream_free (ostream_t stream)
+{
+  if (stream == stdin || stream == stderr)
+    fflush (stream);
+  else
+    fclose (stream);
+}
+
+static inline void
+ostream_write_str (ostream_t stream, const char *string)
+{
+  ostream_write_mem (stream, string, strlen (string));
+}
+
+static inline ptrdiff_t ostream_printf (ostream_t stream,
+                                        const char *format, ...)
+#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3
+  __attribute__ ((__format__ (__printf__, 2, 3)))
+#endif
+  ;
+static inline ptrdiff_t
+ostream_printf (ostream_t stream, const char *format, ...)
+{
+  va_list args;
+  char *temp_string;
+  ptrdiff_t ret;
+
+  va_start (args, format);
+  ret = vasprintf (&temp_string, format, args);
+  va_end (args);
+  if (ret >= 0)
+    {
+      if (ret > 0)
+        ostream_write_str (stream, temp_string);
+      free (temp_string);
+    }
+  return ret;
+}
+
+static inline ptrdiff_t ostream_vprintf (ostream_t stream,
+                                         const char *format, va_list args)
+#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3
+  __attribute__ ((__format__ (__printf__, 2, 0)))
+#endif
+  ;
+static inline ptrdiff_t
+ostream_vprintf (ostream_t stream, const char *format, va_list args)
+{
+  char *temp_string;
+  ptrdiff_t ret = vasprintf (&temp_string, format, args);
+  if (ret >= 0)
+    {
+      if (ret > 0)
+        ostream_write_str (stream, temp_string);
+      free (temp_string);
+    }
+  return ret;
+}
+
+/* ------------------------- From styled-ostream.h ------------------------- */
+
+typedef ostream_t styled_ostream_t;
+
+#define styled_ostream_write_mem ostream_write_mem
+#define styled_ostream_flush ostream_flush
+#define styled_ostream_free ostream_free
+
+static inline void
+styled_ostream_begin_use_class (styled_ostream_t stream _GL_UNUSED,
+                                const char *classname _GL_UNUSED)
+{
+}
+
+static inline void
+styled_ostream_end_use_class (styled_ostream_t stream _GL_UNUSED,
+                              const char *classname _GL_UNUSED)
+{
+}
+
+static inline const char *
+styled_ostream_get_hyperlink_ref (styled_ostream_t stream _GL_UNUSED)
+{
+  return NULL;
+}
+
+static inline const char *
+styled_ostream_get_hyperlink_id (styled_ostream_t stream _GL_UNUSED)
+{
+  return NULL;
+}
+
+static inline void
+styled_ostream_set_hyperlink (styled_ostream_t stream _GL_UNUSED,
+                              const char *ref _GL_UNUSED,
+                              const char *id _GL_UNUSED)
+{
+}
+
+static inline void
+styled_ostream_flush_to_current_style (styled_ostream_t stream _GL_UNUSED)
+{
+}
+
+/* -------------------------- From file-ostream.h -------------------------- */
+
+typedef ostream_t file_ostream_t;
+
+#define file_ostream_write_mem ostream_write_mem
+#define file_ostream_flush ostream_flush
+#define file_ostream_free ostream_free
+
+static inline file_ostream_t
+file_ostream_create (FILE *fp)
+{
+  return fp;
+}
+
+/* --------------------------- From fd-ostream.h --------------------------- */
+
+typedef ostream_t fd_ostream_t;
+
+#define fd_ostream_write_mem ostream_write_mem
+#define fd_ostream_flush ostream_flush
+#define fd_ostream_free ostream_free
+
+static inline fd_ostream_t
+fd_ostream_create (int fd, const char *filename _GL_UNUSED,
+                   bool buffered _GL_UNUSED)
+{
+  if (fd == 1)
+    return stdout;
+  else if (fd == 2)
+    return stderr;
+  else
+    return fdopen (fd, "w");
+}
+
+/* -------------------------- From term-ostream.h -------------------------- */
+
+typedef int term_color_t;
+enum
+{
+  COLOR_DEFAULT = -1  /* unknown */
+};
+
+typedef enum
+{
+  WEIGHT_NORMAL = 0,
+  WEIGHT_BOLD,
+  WEIGHT_DEFAULT = WEIGHT_NORMAL
+} term_weight_t;
+
+typedef enum
+{
+  POSTURE_NORMAL = 0,
+  POSTURE_ITALIC, /* same as oblique */
+  POSTURE_DEFAULT = POSTURE_NORMAL
+} term_posture_t;
+
+typedef enum
+{
+  UNDERLINE_OFF = 0,
+  UNDERLINE_ON,
+  UNDERLINE_DEFAULT = UNDERLINE_OFF
+} term_underline_t;
+
+typedef ostream_t term_ostream_t;
+
+#define term_ostream_write_mem ostream_write_mem
+#define term_ostream_flush ostream_flush
+#define term_ostream_free ostream_free
+
+static inline term_color_t
+term_ostream_get_color (term_ostream_t stream _GL_UNUSED)
+{
+  return COLOR_DEFAULT;
+}
+
+static inline void
+term_ostream_set_color (term_ostream_t stream _GL_UNUSED,
+                        term_color_t color _GL_UNUSED)
+{
+}
+
+static inline term_color_t
+term_ostream_get_bgcolor (term_ostream_t stream _GL_UNUSED)
+{
+  return COLOR_DEFAULT;
+}
+
+static inline void
+term_ostream_set_bgcolor (term_ostream_t stream _GL_UNUSED,
+                          term_color_t color _GL_UNUSED)
+{
+}
+
+static inline term_weight_t
+term_ostream_get_weight (term_ostream_t stream _GL_UNUSED)
+{
+  return WEIGHT_DEFAULT;
+}
+
+static inline void
+term_ostream_set_weight (term_ostream_t stream _GL_UNUSED,
+                         term_weight_t weight _GL_UNUSED)
+{
+}
+
+static inline term_posture_t
+term_ostream_get_posture (term_ostream_t stream _GL_UNUSED)
+{
+  return POSTURE_DEFAULT;
+}
+
+static inline void
+term_ostream_set_posture (term_ostream_t stream _GL_UNUSED,
+                          term_posture_t posture _GL_UNUSED)
+{
+}
+
+static inline term_underline_t
+term_ostream_get_underline (term_ostream_t stream _GL_UNUSED)
+{
+  return UNDERLINE_DEFAULT;
+}
+
+static inline void
+term_ostream_set_underline (term_ostream_t stream _GL_UNUSED,
+                            term_underline_t underline _GL_UNUSED)
+{
+}
+
+static inline const char *
+term_ostream_get_hyperlink_ref (term_ostream_t stream _GL_UNUSED)
+{
+  return NULL;
+}
+
+static inline const char *
+term_ostream_get_hyperlink_id (term_ostream_t stream _GL_UNUSED)
+{
+  return NULL;
+}
+
+static inline void
+term_ostream_set_hyperlink (term_ostream_t stream _GL_UNUSED,
+                            const char *ref _GL_UNUSED,
+                            const char *id _GL_UNUSED)
+{
+}
+
+static inline void
+term_ostream_flush_to_current_style (term_ostream_t stream)
+{
+  fflush (stream);
+}
+
+typedef enum
+{
+  TTYCTL_AUTO = 0,  /* Automatic best-possible choice.  */
+  TTYCTL_NONE,      /* No control.
+                       Result: Garbled output can occur, and the terminal can
+                       be left in any state when the program is interrupted.  */
+  TTYCTL_PARTIAL,   /* Signal handling.
+                       Result: Garbled output can occur, but the terminal will
+                       be left in the default state when the program is
+                       interrupted.  */
+  TTYCTL_FULL       /* Signal handling and disabling echo and flush-upon-signal.
+                       Result: No garbled output, and the the terminal will
+                       be left in the default state when the program is
+                       interrupted.  */
+} ttyctl_t;
+
+static inline term_ostream_t
+term_ostream_create (int fd, const char *filename,
+                     ttyctl_t tty_control _GL_UNUSED)
+{
+  return fd_ostream_create (fd, filename, true);
+}
+
+/* ----------------------- From term-styled-ostream.h ----------------------- */
+
+typedef styled_ostream_t term_styled_ostream_t;
+
+#define term_styled_ostream_write_mem ostream_write_mem
+#define term_styled_ostream_flush ostream_flush
+#define term_styled_ostream_free ostream_free
+#define term_styled_ostream_begin_use_class styled_ostream_begin_use_class
+#define term_styled_ostream_end_use_class styled_ostream_end_use_class
+#define term_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref
+#define term_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id
+#define term_styled_ostream_set_hyperlink styled_ostream_set_hyperlink
+#define term_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style
+
+static inline term_styled_ostream_t
+term_styled_ostream_create (int fd, const char *filename,
+                            ttyctl_t tty_control _GL_UNUSED,
+                            const char *css_filename _GL_UNUSED)
+{
+  return fd_ostream_create (fd, filename, true);
+}
+
+/* ----------------------- From html-styled-ostream.h ----------------------- */
+
+typedef styled_ostream_t html_styled_ostream_t;
+
+static inline html_styled_ostream_t
+html_styled_ostream_create (ostream_t destination _GL_UNUSED,
+                            const char *css_filename _GL_UNUSED)
+{
+  abort ();
+  return NULL;
+}
+
+/* ------------------------------ From color.h ------------------------------ */
+
+#define color_test_mode false
+
+enum color_option { color_no, color_tty, color_yes, color_html };
+#define color_mode color_no
+
+#define style_file_name NULL
+
+static inline bool
+handle_color_option (const char *option _GL_UNUSED)
+{
+  return false;
+}
+
+static inline void
+handle_style_option (const char *option _GL_UNUSED)
+{
+}
+
+static inline void
+print_color_test (void)
+{
+  abort ();
+}
+
+static inline void
+style_file_prepare (const char *style_file_envvar _GL_UNUSED,
+                    const char *stylesdir_envvar _GL_UNUSED,
+                    const char *stylesdir_after_install _GL_UNUSED,
+                    const char *default_style_file _GL_UNUSED)
+{
+}
+
+/* ------------------------------ From misc.h ------------------------------ */
+
+static inline styled_ostream_t
+styled_ostream_create (int fd, const char *filename,
+                       ttyctl_t tty_control _GL_UNUSED,
+                       const char *css_filename _GL_UNUSED)
+{
+  return fd_ostream_create (fd, filename, true);
+}
+
+static inline void
+libtextstyle_set_failure_exit_code (int exit_code _GL_UNUSED)
+{
+}
+
+#endif /* _TEXTSTYLE_H */
diff --git a/contrib/tools/bison/lib/timespec.h b/contrib/tools/bison/lib/timespec.h
index 26f1bc1a4c78..02684ce6eace 100644
--- a/contrib/tools/bison/lib/timespec.h
+++ b/contrib/tools/bison/lib/timespec.h
@@ -1,6 +1,6 @@
 /* timespec -- System time interface
 
-   Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2019 Free Software
+   Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/timevar.c b/contrib/tools/bison/lib/timevar.c
index 0f6fb402e46f..6657e97c251d 100644
--- a/contrib/tools/bison/lib/timevar.c
+++ b/contrib/tools/bison/lib/timevar.c
@@ -1,6 +1,6 @@
 /* Timing variables for measuring compiler performance.
 
-   Copyright (C) 2000, 2002, 2004, 2006, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2000, 2002, 2004, 2006, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    Contributed by Alex Samuel <samuel@codesourcery.com>
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
diff --git a/contrib/tools/bison/lib/timevar.def b/contrib/tools/bison/lib/timevar.def
index 9de9b815a797..6e0d6ff0545b 100644
--- a/contrib/tools/bison/lib/timevar.def
+++ b/contrib/tools/bison/lib/timevar.def
@@ -1,7 +1,7 @@
 /* This file contains the definitions for timing variables used to -*- C -*-
    measure run-time performance of the compiler.
 
-   Copyright (C) 2002, 2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    Contributed by Akim Demaille <akim@freefriends.org>.
diff --git a/contrib/tools/bison/lib/timevar.h b/contrib/tools/bison/lib/timevar.h
index 5d5a279cc5d9..036be80893b8 100644
--- a/contrib/tools/bison/lib/timevar.h
+++ b/contrib/tools/bison/lib/timevar.h
@@ -1,6 +1,6 @@
 /* Timing variables for measuring application performance.
 
-   Copyright (C) 2000, 2002, 2004, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2000, 2002, 2004, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    Contributed by Alex Samuel <samuel@codesourcery.com>
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _TIMEVAR_H
 # define _TIMEVAR_H 1
diff --git a/contrib/tools/bison/lib/unistd-safer.h b/contrib/tools/bison/lib/unistd-safer.h
index 8eebffcae224..3e8350967832 100644
--- a/contrib/tools/bison/lib/unistd-safer.h
+++ b/contrib/tools/bison/lib/unistd-safer.h
@@ -1,6 +1,6 @@
 /* Invoke unistd-like functions, but avoid some glitches.
 
-   Copyright (C) 2001, 2003, 2005, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/unitypes.h b/contrib/tools/bison/lib/unitypes.h
index 8ce466142b2a..b277a0858abc 100644
--- a/contrib/tools/bison/lib/unitypes.h
+++ b/contrib/tools/bison/lib/unitypes.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -44,4 +44,17 @@ typedef uint32_t ucs4_t;
 # endif
 #endif
 
+/* Qualifier in a function declaration, that asserts that the caller must
+   pass a pointer to a different object in the specified pointer argument
+   than in the other pointer arguments.  */
+#ifndef _UC_RESTRICT
+# if defined __restrict || 2 < __GNUC__ + (95 <= __GNUC_MINOR__)
+#  define _UC_RESTRICT __restrict
+# elif 199901L <= __STDC_VERSION__ || defined restrict
+#  define _UC_RESTRICT restrict
+# else
+#  define _UC_RESTRICT
+# endif
+#endif
+
 #endif /* _UNITYPES_H */
diff --git a/contrib/tools/bison/lib/uniwidth.h b/contrib/tools/bison/lib/uniwidth.h
index cb79a7048157..b28898b54fed 100644
--- a/contrib/tools/bison/lib/uniwidth.h
+++ b/contrib/tools/bison/lib/uniwidth.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Display width functions.
-   Copyright (C) 2001-2002, 2005, 2007, 2009-2019 Free Software Foundation,
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/contrib/tools/bison/lib/uniwidth/cjk.h b/contrib/tools/bison/lib/uniwidth/cjk.h
index 9870422ca6c7..3dcc7cb856dc 100644
--- a/contrib/tools/bison/lib/uniwidth/cjk.h
+++ b/contrib/tools/bison/lib/uniwidth/cjk.h
@@ -1,5 +1,5 @@
 /* Test for CJK encoding.
-   Copyright (C) 2001-2002, 2005-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/contrib/tools/bison/lib/uniwidth/width.c b/contrib/tools/bison/lib/uniwidth/width.c
index a7f59b18eba0..ad92323cce52 100644
--- a/contrib/tools/bison/lib/uniwidth/width.c
+++ b/contrib/tools/bison/lib/uniwidth/width.c
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/contrib/tools/bison/lib/unlocked-io.h b/contrib/tools/bison/lib/unlocked-io.h
index ee1c06268fe4..e7f7199edae8 100644
--- a/contrib/tools/bison/lib/unlocked-io.h
+++ b/contrib/tools/bison/lib/unlocked-io.h
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/vasnprintf.c b/contrib/tools/bison/lib/vasnprintf.c
index f1f47f0d2170..e3a1e9fa75a7 100644
--- a/contrib/tools/bison/lib/vasnprintf.c
+++ b/contrib/tools/bison/lib/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2019 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1553,16 +1553,13 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
   switch (conversion)
     {
     case 'd': case 'i': case 'u':
-# if HAVE_LONG_LONG_INT
       if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
         tmp_length =
           (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
                           * 0.30103 /* binary -> decimal */
                          )
           + 1; /* turn floor into ceil */
-      else
-# endif
-      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+      else if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
         tmp_length =
           (unsigned int) (sizeof (unsigned long) * CHAR_BIT
                           * 0.30103 /* binary -> decimal */
@@ -1583,16 +1580,13 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
       break;
 
     case 'o':
-# if HAVE_LONG_LONG_INT
       if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
         tmp_length =
           (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
                           * 0.333334 /* binary -> octal */
                          )
           + 1; /* turn floor into ceil */
-      else
-# endif
-      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+      else if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
         tmp_length =
           (unsigned int) (sizeof (unsigned long) * CHAR_BIT
                           * 0.333334 /* binary -> octal */
@@ -1611,16 +1605,13 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
       break;
 
     case 'x': case 'X':
-# if HAVE_LONG_LONG_INT
       if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
         tmp_length =
           (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
                           * 0.25 /* binary -> hexadecimal */
                          )
           + 1; /* turn floor into ceil */
-      else
-# endif
-      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+      else if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
         tmp_length =
           (unsigned int) (sizeof (unsigned long) * CHAR_BIT
                           * 0.25 /* binary -> hexadecimal */
@@ -1939,11 +1930,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   case TYPE_COUNT_LONGINT_POINTER:
                     *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
                     break;
-#if HAVE_LONG_LONG_INT
                   case TYPE_COUNT_LONGLONGINT_POINTER:
                     *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
                     break;
-#endif
                   default:
                     abort ();
                   }
@@ -4835,17 +4824,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 
                 switch (type)
                   {
-#if HAVE_LONG_LONG_INT
                   case TYPE_LONGLONGINT:
                   case TYPE_ULONGLONGINT:
-# if defined _WIN32 && ! defined __CYGWIN__
+#if defined _WIN32 && ! defined __CYGWIN__
                     *fbp++ = 'I';
                     *fbp++ = '6';
                     *fbp++ = '4';
                     break;
-# else
+#else
                     *fbp++ = 'l';
-# endif
 #endif
                     FALLTHROUGH;
                   case TYPE_LONGINT:
@@ -4917,7 +4904,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                    Windows Vista, the use of %n in format strings by default
                    crashes the program. See
                      <https://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
-                     <https://msdn.microsoft.com/en-us/library/ms175782.aspx>
+                     <https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/set-printf-count-output>
                    So we should avoid %n in this situation.  */
                 fbp[1] = '\0';
 # endif
@@ -5063,7 +5050,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           SNPRINTF_BUF (arg);
                         }
                         break;
-#if HAVE_LONG_LONG_INT
                       case TYPE_LONGLONGINT:
                         {
                           long long int arg = a.arg[dp->arg_index].a.a_longlongint;
@@ -5076,7 +5062,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           SNPRINTF_BUF (arg);
                         }
                         break;
-#endif
                       case TYPE_DOUBLE:
                         {
                           double arg = a.arg[dp->arg_index].a.a_double;
diff --git a/contrib/tools/bison/lib/vasnprintf.h b/contrib/tools/bison/lib/vasnprintf.h
index 5b192b21e9bc..f63399a5e6c3 100644
--- a/contrib/tools/bison/lib/vasnprintf.h
+++ b/contrib/tools/bison/lib/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2007-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -67,9 +67,11 @@ extern "C" {
 # define asnprintf rpl_asnprintf
 # define vasnprintf rpl_vasnprintf
 #endif
-extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
+extern char * asnprintf (char *restrict resultbuf, size_t *lengthp,
+                         const char *format, ...)
        _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
-extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
+extern char * vasnprintf (char *restrict resultbuf, size_t *lengthp,
+                          const char *format, va_list args)
        _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 0));
 
 #ifdef __cplusplus
diff --git a/contrib/tools/bison/lib/vasprintf.c b/contrib/tools/bison/lib/vasprintf.c
new file mode 100644
index 000000000000..7bb21dde3b00
--- /dev/null
+++ b/contrib/tools/bison/lib/vasprintf.c
@@ -0,0 +1,50 @@
+/* Formatted output to strings.
+   Copyright (C) 1999, 2002, 2006-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#ifdef IN_LIBASPRINTF
+# include "vasprintf.h"
+#else
+# include <stdio.h>
+#endif
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#include "vasnprintf.h"
+
+int
+vasprintf (char **resultp, const char *format, va_list args)
+{
+  size_t length;
+  char *result = vasnprintf (NULL, &length, format, args);
+  if (result == NULL)
+    return -1;
+
+  if (length > INT_MAX)
+    {
+      free (result);
+      errno = EOVERFLOW;
+      return -1;
+    }
+
+  *resultp = result;
+  /* Return the number of resulting bytes, excluding the trailing NUL.  */
+  return length;
+}
diff --git a/contrib/tools/bison/lib/verify.h b/contrib/tools/bison/lib/verify.h
index 6930645a3501..d9ab89a570c9 100644
--- a/contrib/tools/bison/lib/verify.h
+++ b/contrib/tools/bison/lib/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,29 +21,37 @@
 #define _GL_VERIFY_H
 
 
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
-   This is supported by GCC 4.6.0 and later, in C mode, and its use
-   here generates easier-to-read diagnostics when verify (R) fails.
+/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert (R, DIAGNOSTIC)
+   works as per C11.  This is supported by GCC 4.6.0 and later, in C
+   mode.
 
-   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
-   This is supported by GCC 6.1.0 and later, in C++ mode.
+   Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as
+   per C2X, and define _GL_HAVE_STATIC_ASSERT1 if static_assert (R)
+   works as per C++17.  This is supported by GCC 9.1 and later.
 
-   Use this only with GCC.  If we were willing to slow 'configure'
-   down we could also use it with other compilers, but since this
-   affects only the quality of diagnostics, why bother?  */
-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
-     && (201112L <= __STDC_VERSION__  || !defined __STRICT_ANSI__) \
-     && !defined __cplusplus)
-# define _GL_HAVE__STATIC_ASSERT 1
-#endif
-#if (6 <= __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
+   Support compilers claiming conformance to the relevant standard,
+   and also support GCC when not pedantic.  If we were willing to slow
+   'configure' down we could also use it with other compilers, but
+   since this affects only the quality of diagnostics, why bother?  */
+#ifndef __cplusplus
+# if (201112L <= __STDC_VERSION__ \
+      || (!defined __STRICT_ANSI__ && 4 < __GNUC__ + (6 <= __GNUC_MINOR__)))
+#  define _GL_HAVE__STATIC_ASSERT 1
+# endif
+# if (202000L <= __STDC_VERSION__ \
+      || (!defined __STRICT_ANSI__ && 9 <= __GNUC__))
+#  define _GL_HAVE__STATIC_ASSERT1 1
+# endif
+#else
+# if 201703L <= __cplusplus || 9 <= __GNUC__
+#  define _GL_HAVE_STATIC_ASSERT1 1
+# endif
 #endif
 
 /* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
    system headers, defines a conflicting _Static_assert that is no
    better than ours; override it.  */
-#ifndef _GL_HAVE_STATIC_ASSERT
+#ifndef _GL_HAVE__STATIC_ASSERT
 # include <stddef.h>
 # undef _Static_assert
 #endif
@@ -141,9 +149,9 @@
      which do not support _Static_assert, also do not warn about the
      last declaration mentioned above.
 
-   * GCC warns if -Wnested-externs is enabled and verify() is used
+   * GCC warns if -Wnested-externs is enabled and 'verify' is used
      within a function body; but inside a function, you can always
-     arrange to use verify_expr() instead.
+     arrange to use verify_expr instead.
 
    * In C++, any struct definition inside sizeof is invalid.
      Use a template type to work around the problem.  */
@@ -195,48 +203,61 @@ template <int w>
 #endif
 
 /* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  If R is false, fail at compile-time, preferably
-   with a diagnostic that includes the string-literal DIAGNOSTIC.
+   trailing ';'.  If R is false, fail at compile-time.
+
+   This macro requires three or more arguments but uses at most the first
+   two, so that the _Static_assert macro optionally defined below supports
+   both the C11 two-argument syntax and the C2X one-argument syntax.
 
    Unfortunately, unlike C11, this implementation must appear as an
    ordinary declaration, and cannot appear inside struct { ... }.  */
 
-#ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
+#if defined _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC)
 #else
-# define _GL_VERIFY(R, DIAGNOSTIC)				       \
+# define _GL_VERIFY(R, DIAGNOSTIC, ...)                                \
     extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
       [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
 #endif
 
 /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
 #ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-#  define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
+# if !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert
+#  define _Static_assert(...) \
+     _GL_VERIFY (__VA_ARGS__, "static assertion failed", -)
 # endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
+# if !defined _GL_HAVE_STATIC_ASSERT1 && !defined static_assert
 #  define static_assert _Static_assert /* C11 requires this #define.  */
 # endif
 #endif
 
 /* @assert.h omit start@  */
 
+#if 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))
+# define _GL_HAS_BUILTIN_TRAP 1
+#elif defined __has_builtin
+# define _GL_HAS_BUILTIN_TRAP __has_builtin (__builtin_trap)
+#else
+# define _GL_HAS_BUILTIN_TRAP 0
+#endif
+
+#if 4 < __GNUC__ + (5 <= __GNUC_MINOR__)
+# define _GL_HAS_BUILTIN_UNREACHABLE 1
+#elif defined __has_builtin
+# define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable)
+#else
+# define _GL_HAS_BUILTIN_UNREACHABLE 0
+#endif
+
 /* Each of these macros verifies that its argument R is nonzero.  To
    be portable, R should be an integer constant expression.  Unlike
    assert (R), there is no run-time overhead.
 
    There are two macros, since no single macro can be used in all
-   contexts in C.  verify_true (R) is for scalar contexts, including
+   contexts in C.  verify_expr (R, E) is for scalar contexts, including
    integer constant expression contexts.  verify (R) is for declaration
    contexts, e.g., the top level.  */
 
-/* Verify requirement R at compile-time, as an integer constant expression.
-   Return 1.  This is equivalent to verify_expr (R, 1).
-
-   verify_true is obsolescent; please use verify_expr instead.  */
-
-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
-
 /* Verify requirement R at compile-time.  Return the value of the
    expression E.  */
 
@@ -244,31 +265,28 @@ template <int w>
    (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
 
 /* Verify requirement R at compile-time, as a declaration without a
-   trailing ';'.  */
+   trailing ';'.  verify (R) acts like static_assert (R) except that
+   it is portable to C11/C++14 and earlier, it can issue better
+   diagnostics, and its name is shorter and may be more convenient.  */
 
-#ifdef __GNUC__
-# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+#ifdef __PGI
+/* PGI barfs if R is long.  */
+# define verify(R) _GL_VERIFY (R, "verify (...)", -)
 #else
-/* PGI barfs if R is long.  Play it safe.  */
-# define verify(R) _GL_VERIFY (R, "verify (...)")
-#endif
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
+# define verify(R) _GL_VERIFY (R, "verify (" #R ")", -)
 #endif
 
-/* Assume that R always holds.  This lets the compiler optimize
-   accordingly.  R should not have side-effects; it may or may not be
-   evaluated.  Behavior is undefined if R is false.  */
+/* Assume that R always holds.  Behavior is undefined if R is false,
+   fails to evaluate, or has side effects.  Although assuming R can
+   help a compiler generate better code or diagnostics, performance
+   can suffer if R uses hard-to-optimize features such as function
+   calls not inlined by the compiler.  */
 
-#if (__has_builtin (__builtin_unreachable) \
-     || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
+#if _GL_HAS_BUILTIN_UNREACHABLE
 # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
 #elif 1200 <= _MSC_VER
 # define assume(R) __assume (R)
-#elif ((defined GCC_LINT || defined lint) \
-       && (__has_builtin (__builtin_trap) \
-           || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
+#elif (defined GCC_LINT || defined lint) && _GL_HAS_BUILTIN_TRAP
   /* Doing it this way helps various packages when configured with
      --enable-gcc-warnings, which compiles with -Dlint.  It's nicer
      when 'assume' silences warnings even with older GCCs.  */
diff --git a/contrib/tools/bison/lib/w32spawn.h b/contrib/tools/bison/lib/w32spawn.h
index 941ff1ab2d4e..a4b3b1e500b9 100644
--- a/contrib/tools/bison/lib/w32spawn.h
+++ b/contrib/tools/bison/lib/w32spawn.h
@@ -1,5 +1,5 @@
 /* Auxiliary functions for the creation of subprocesses.  Native Windows API.
-   Copyright (C) 2001, 2003-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/wait-process.c b/contrib/tools/bison/lib/wait-process.c
index 84c0e86b1f50..58a1e1121d4e 100644
--- a/contrib/tools/bison/lib/wait-process.c
+++ b/contrib/tools/bison/lib/wait-process.c
@@ -1,5 +1,5 @@
 /* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2005-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -80,7 +80,7 @@ static size_t slaves_allocated = SIZEOF (static_slaves);
 #endif
 
 /* The cleanup action.  It gets called asynchronously.  */
-static void
+static _GL_ASYNC_SAFE void
 cleanup_slaves (void)
 {
   for (;;)
@@ -102,6 +102,14 @@ cleanup_slaves (void)
     }
 }
 
+/* The cleanup action, taking a signal argument.
+   It gets called asynchronously.  */
+static _GL_ASYNC_SAFE void
+cleanup_slaves_action (int sig _GL_UNUSED)
+{
+  cleanup_slaves ();
+}
+
 /* Register a subprocess as being a slave process.  This means that the
    subprocess will be terminated when its creator receives a catchable fatal
    signal or exits normally.  Registration ends when wait_subprocess()
@@ -113,7 +121,7 @@ register_slave_subprocess (pid_t child)
   if (!cleanup_slaves_registered)
     {
       atexit (cleanup_slaves);
-      at_fatal_signal (cleanup_slaves);
+      at_fatal_signal (cleanup_slaves_action);
       cleanup_slaves_registered = true;
     }
 
diff --git a/contrib/tools/bison/lib/wait-process.h b/contrib/tools/bison/lib/wait-process.h
index 08470fb850c4..849d5156f956 100644
--- a/contrib/tools/bison/lib/wait-process.h
+++ b/contrib/tools/bison/lib/wait-process.h
@@ -1,5 +1,5 @@
 /* Waiting for a subprocess to finish.
-   Copyright (C) 2001-2003, 2006, 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2008-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/waitpid.c b/contrib/tools/bison/lib/waitpid.c
index a9dace628c49..2ef76615aa92 100644
--- a/contrib/tools/bison/lib/waitpid.c
+++ b/contrib/tools/bison/lib/waitpid.c
@@ -1,5 +1,5 @@
 /* Wait for process state change.
-   Copyright (C) 2001-2003, 2005-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/wcwidth.c b/contrib/tools/bison/lib/wcwidth.c
index 1f081ccaa120..6af212b2c259 100644
--- a/contrib/tools/bison/lib/wcwidth.c
+++ b/contrib/tools/bison/lib/wcwidth.c
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a character.
-   Copyright (C) 2006-2007, 2010-2019 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/windows-initguard.h b/contrib/tools/bison/lib/windows-initguard.h
new file mode 100644
index 000000000000..c4be45a5f8bb
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-initguard.h
@@ -0,0 +1,35 @@
+/* Init guards, somewhat like spinlocks (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#ifndef _WINDOWS_INITGUARD_H
+#define _WINDOWS_INITGUARD_H
+
+#define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#include <windows.h>
+
+typedef struct
+        {
+          volatile int done;
+          volatile LONG started;
+        }
+        glwthread_initguard_t;
+
+#define GLWTHREAD_INITGUARD_INIT { 0, -1 }
+
+#endif /* _WINDOWS_INITGUARD_H */
diff --git a/contrib/tools/bison/lib/windows-mutex.c b/contrib/tools/bison/lib/windows-mutex.c
new file mode 100644
index 000000000000..7eb38a2b1e92
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-mutex.c
@@ -0,0 +1,95 @@
+/* Plain mutexes (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "windows-mutex.h"
+
+#include <errno.h>
+
+void
+glwthread_mutex_init (glwthread_mutex_t *mutex)
+{
+  InitializeCriticalSection (&mutex->lock);
+  mutex->guard.done = 1;
+}
+
+int
+glwthread_mutex_lock (glwthread_mutex_t *mutex)
+{
+  if (!mutex->guard.done)
+    {
+      if (InterlockedIncrement (&mutex->guard.started) == 0)
+        /* This thread is the first one to need this mutex.  Initialize it.  */
+        glwthread_mutex_init (mutex);
+      else
+        {
+          /* Don't let mutex->guard.started grow and wrap around.  */
+          InterlockedDecrement (&mutex->guard.started);
+          /* Yield the CPU while waiting for another thread to finish
+             initializing this mutex.  */
+          while (!mutex->guard.done)
+            Sleep (0);
+        }
+    }
+  EnterCriticalSection (&mutex->lock);
+  return 0;
+}
+
+int
+glwthread_mutex_trylock (glwthread_mutex_t *mutex)
+{
+  if (!mutex->guard.done)
+    {
+      if (InterlockedIncrement (&mutex->guard.started) == 0)
+        /* This thread is the first one to need this mutex.  Initialize it.  */
+        glwthread_mutex_init (mutex);
+      else
+        {
+          /* Don't let mutex->guard.started grow and wrap around.  */
+          InterlockedDecrement (&mutex->guard.started);
+          /* Let another thread finish initializing this mutex, and let it also
+             lock this mutex.  */
+          return EBUSY;
+        }
+    }
+  if (!TryEnterCriticalSection (&mutex->lock))
+    return EBUSY;
+  return 0;
+}
+
+int
+glwthread_mutex_unlock (glwthread_mutex_t *mutex)
+{
+  if (!mutex->guard.done)
+    return EINVAL;
+  LeaveCriticalSection (&mutex->lock);
+  return 0;
+}
+
+int
+glwthread_mutex_destroy (glwthread_mutex_t *mutex)
+{
+  if (!mutex->guard.done)
+    return EINVAL;
+  DeleteCriticalSection (&mutex->lock);
+  mutex->guard.done = 0;
+  return 0;
+}
diff --git a/contrib/tools/bison/lib/windows-mutex.h b/contrib/tools/bison/lib/windows-mutex.h
new file mode 100644
index 000000000000..748b9883db60
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-mutex.h
@@ -0,0 +1,51 @@
+/* Plain mutexes (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#ifndef _WINDOWS_MUTEX_H
+#define _WINDOWS_MUTEX_H
+
+#define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#include <windows.h>
+
+#include "windows-initguard.h"
+
+typedef struct
+        {
+          glwthread_initguard_t guard; /* protects the initialization */
+          CRITICAL_SECTION lock;
+        }
+        glwthread_mutex_t;
+
+#define GLWTHREAD_MUTEX_INIT { GLWTHREAD_INITGUARD_INIT }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void glwthread_mutex_init (glwthread_mutex_t *mutex);
+extern int glwthread_mutex_lock (glwthread_mutex_t *mutex);
+extern int glwthread_mutex_trylock (glwthread_mutex_t *mutex);
+extern int glwthread_mutex_unlock (glwthread_mutex_t *mutex);
+extern int glwthread_mutex_destroy (glwthread_mutex_t *mutex);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_MUTEX_H */
diff --git a/contrib/tools/bison/lib/windows-once.c b/contrib/tools/bison/lib/windows-once.c
new file mode 100644
index 000000000000..c431bd67073b
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-once.c
@@ -0,0 +1,62 @@
+/* Once-only control (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "windows-once.h"
+
+#include <stdlib.h>
+
+void
+glwthread_once (glwthread_once_t *once_control, void (*initfunction) (void))
+{
+  if (once_control->inited <= 0)
+    {
+      if (InterlockedIncrement (&once_control->started) == 0)
+        {
+          /* This thread is the first one to come to this once_control.  */
+          InitializeCriticalSection (&once_control->lock);
+          EnterCriticalSection (&once_control->lock);
+          once_control->inited = 0;
+          initfunction ();
+          once_control->inited = 1;
+          LeaveCriticalSection (&once_control->lock);
+        }
+      else
+        {
+          /* Don't let once_control->started grow and wrap around.  */
+          InterlockedDecrement (&once_control->started);
+          /* Some other thread has already started the initialization.
+             Yield the CPU while waiting for the other thread to finish
+             initializing and taking the lock.  */
+          while (once_control->inited < 0)
+            Sleep (0);
+          if (once_control->inited <= 0)
+            {
+              /* Take the lock.  This blocks until the other thread has
+                 finished calling the initfunction.  */
+              EnterCriticalSection (&once_control->lock);
+              LeaveCriticalSection (&once_control->lock);
+              if (!(once_control->inited > 0))
+                abort ();
+            }
+        }
+    }
+}
diff --git a/contrib/tools/bison/lib/windows-once.h b/contrib/tools/bison/lib/windows-once.h
new file mode 100644
index 000000000000..d31717e861ee
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-once.h
@@ -0,0 +1,47 @@
+/* Once-only control (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#ifndef _WINDOWS_ONCE_H
+#define _WINDOWS_ONCE_H
+
+#define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#include <windows.h>
+
+typedef struct
+        {
+          volatile int inited;
+          volatile LONG started;
+          CRITICAL_SECTION lock;
+        }
+        glwthread_once_t;
+
+#define GLWTHREAD_ONCE_INIT { -1, -1 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void glwthread_once (glwthread_once_t *once_control,
+                            void (*initfunction) (void));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_ONCE_H */
diff --git a/contrib/tools/bison/lib/windows-recmutex.c b/contrib/tools/bison/lib/windows-recmutex.c
new file mode 100644
index 000000000000..db3c40c442fd
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-recmutex.c
@@ -0,0 +1,127 @@
+/* Plain recursive mutexes (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "windows-recmutex.h"
+
+#include <errno.h>
+
+void
+glwthread_recmutex_init (glwthread_recmutex_t *mutex)
+{
+  mutex->owner = 0;
+  mutex->depth = 0;
+  InitializeCriticalSection (&mutex->lock);
+  mutex->guard.done = 1;
+}
+
+int
+glwthread_recmutex_lock (glwthread_recmutex_t *mutex)
+{
+  if (!mutex->guard.done)
+    {
+      if (InterlockedIncrement (&mutex->guard.started) == 0)
+        /* This thread is the first one to need this mutex.  Initialize it.  */
+        glwthread_recmutex_init (mutex);
+      else
+        {
+          /* Don't let mutex->guard.started grow and wrap around.  */
+          InterlockedDecrement (&mutex->guard.started);
+          /* Yield the CPU while waiting for another thread to finish
+             initializing this mutex.  */
+          while (!mutex->guard.done)
+            Sleep (0);
+        }
+    }
+  {
+    DWORD self = GetCurrentThreadId ();
+    if (mutex->owner != self)
+      {
+        EnterCriticalSection (&mutex->lock);
+        mutex->owner = self;
+      }
+    if (++(mutex->depth) == 0) /* wraparound? */
+      {
+        mutex->depth--;
+        return EAGAIN;
+      }
+  }
+  return 0;
+}
+
+int
+glwthread_recmutex_trylock (glwthread_recmutex_t *mutex)
+{
+  if (!mutex->guard.done)
+    {
+      if (InterlockedIncrement (&mutex->guard.started) == 0)
+        /* This thread is the first one to need this mutex.  Initialize it.  */
+        glwthread_recmutex_init (mutex);
+      else
+        {
+          /* Don't let mutex->guard.started grow and wrap around.  */
+          InterlockedDecrement (&mutex->guard.started);
+          /* Let another thread finish initializing this mutex, and let it also
+             lock this mutex.  */
+          return EBUSY;
+        }
+    }
+  {
+    DWORD self = GetCurrentThreadId ();
+    if (mutex->owner != self)
+      {
+        if (!TryEnterCriticalSection (&mutex->lock))
+          return EBUSY;
+        mutex->owner = self;
+      }
+    if (++(mutex->depth) == 0) /* wraparound? */
+      {
+        mutex->depth--;
+        return EAGAIN;
+      }
+  }
+  return 0;
+}
+
+int
+glwthread_recmutex_unlock (glwthread_recmutex_t *mutex)
+{
+  if (mutex->owner != GetCurrentThreadId ())
+    return EPERM;
+  if (mutex->depth == 0)
+    return EINVAL;
+  if (--(mutex->depth) == 0)
+    {
+      mutex->owner = 0;
+      LeaveCriticalSection (&mutex->lock);
+    }
+  return 0;
+}
+
+int
+glwthread_recmutex_destroy (glwthread_recmutex_t *mutex)
+{
+  if (mutex->owner != 0)
+    return EBUSY;
+  DeleteCriticalSection (&mutex->lock);
+  mutex->guard.done = 0;
+  return 0;
+}
diff --git a/contrib/tools/bison/lib/windows-recmutex.h b/contrib/tools/bison/lib/windows-recmutex.h
new file mode 100644
index 000000000000..3b315e5ce9f2
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-recmutex.h
@@ -0,0 +1,57 @@
+/* Plain recursive mutexes (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#ifndef _WINDOWS_RECMUTEX_H
+#define _WINDOWS_RECMUTEX_H
+
+#define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#include <windows.h>
+
+#include "windows-initguard.h"
+
+/* The native Windows documentation says that CRITICAL_SECTION already
+   implements a recursive lock.  But we need not rely on it: It's easy to
+   implement a recursive lock without this assumption.  */
+
+typedef struct
+        {
+          glwthread_initguard_t guard; /* protects the initialization */
+          DWORD owner;
+          unsigned long depth;
+          CRITICAL_SECTION lock;
+        }
+        glwthread_recmutex_t;
+
+#define GLWTHREAD_RECMUTEX_INIT { GLWTHREAD_INITGUARD_INIT, 0, 0 }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void glwthread_recmutex_init (glwthread_recmutex_t *mutex);
+extern int glwthread_recmutex_lock (glwthread_recmutex_t *mutex);
+extern int glwthread_recmutex_trylock (glwthread_recmutex_t *mutex);
+extern int glwthread_recmutex_unlock (glwthread_recmutex_t *mutex);
+extern int glwthread_recmutex_destroy (glwthread_recmutex_t *mutex);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_RECMUTEX_H */
diff --git a/contrib/tools/bison/lib/windows-rwlock.c b/contrib/tools/bison/lib/windows-rwlock.c
new file mode 100644
index 000000000000..aafc5ddda3bd
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-rwlock.c
@@ -0,0 +1,373 @@
+/* Read-write locks (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "windows-rwlock.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+/* In this file, the waitqueues are implemented as circular arrays.  */
+#define glwthread_waitqueue_t glwthread_carray_waitqueue_t
+
+static void
+glwthread_waitqueue_init (glwthread_waitqueue_t *wq)
+{
+  wq->array = NULL;
+  wq->count = 0;
+  wq->alloc = 0;
+  wq->offset = 0;
+}
+
+/* Enqueues the current thread, represented by an event, in a wait queue.
+   Returns INVALID_HANDLE_VALUE if an allocation failure occurs.  */
+static HANDLE
+glwthread_waitqueue_add (glwthread_waitqueue_t *wq)
+{
+  HANDLE event;
+  unsigned int index;
+
+  if (wq->count == wq->alloc)
+    {
+      unsigned int new_alloc = 2 * wq->alloc + 1;
+      HANDLE *new_array =
+        (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
+      if (new_array == NULL)
+        /* No more memory.  */
+        return INVALID_HANDLE_VALUE;
+      /* Now is a good opportunity to rotate the array so that its contents
+         starts at offset 0.  */
+      if (wq->offset > 0)
+        {
+          unsigned int old_count = wq->count;
+          unsigned int old_alloc = wq->alloc;
+          unsigned int old_offset = wq->offset;
+          unsigned int i;
+          if (old_offset + old_count > old_alloc)
+            {
+              unsigned int limit = old_offset + old_count - old_alloc;
+              for (i = 0; i < limit; i++)
+                new_array[old_alloc + i] = new_array[i];
+            }
+          for (i = 0; i < old_count; i++)
+            new_array[i] = new_array[old_offset + i];
+          wq->offset = 0;
+        }
+      wq->array = new_array;
+      wq->alloc = new_alloc;
+    }
+  /* Whether the created event is a manual-reset one or an auto-reset one,
+     does not matter, since we will wait on it only once.  */
+  event = CreateEvent (NULL, TRUE, FALSE, NULL);
+  if (event == INVALID_HANDLE_VALUE)
+    /* No way to allocate an event.  */
+    return INVALID_HANDLE_VALUE;
+  index = wq->offset + wq->count;
+  if (index >= wq->alloc)
+    index -= wq->alloc;
+  wq->array[index] = event;
+  wq->count++;
+  return event;
+}
+
+/* Notifies the first thread from a wait queue and dequeues it.  */
+static void
+glwthread_waitqueue_notify_first (glwthread_waitqueue_t *wq)
+{
+  SetEvent (wq->array[wq->offset + 0]);
+  wq->offset++;
+  wq->count--;
+  if (wq->count == 0 || wq->offset == wq->alloc)
+    wq->offset = 0;
+}
+
+/* Notifies all threads from a wait queue and dequeues them all.  */
+static void
+glwthread_waitqueue_notify_all (glwthread_waitqueue_t *wq)
+{
+  unsigned int i;
+
+  for (i = 0; i < wq->count; i++)
+    {
+      unsigned int index = wq->offset + i;
+      if (index >= wq->alloc)
+        index -= wq->alloc;
+      SetEvent (wq->array[index]);
+    }
+  wq->count = 0;
+  wq->offset = 0;
+}
+
+void
+glwthread_rwlock_init (glwthread_rwlock_t *lock)
+{
+  InitializeCriticalSection (&lock->lock);
+  glwthread_waitqueue_init (&lock->waiting_readers);
+  glwthread_waitqueue_init (&lock->waiting_writers);
+  lock->runcount = 0;
+  lock->guard.done = 1;
+}
+
+int
+glwthread_rwlock_rdlock (glwthread_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+        /* This thread is the first one to need this lock.  Initialize it.  */
+        glwthread_rwlock_init (lock);
+      else
+        {
+          /* Don't let lock->guard.started grow and wrap around.  */
+          InterlockedDecrement (&lock->guard.started);
+          /* Yield the CPU while waiting for another thread to finish
+             initializing this lock.  */
+          while (!lock->guard.done)
+            Sleep (0);
+        }
+    }
+  EnterCriticalSection (&lock->lock);
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow, and whether no writer is waiting.  The latter
+     condition is because POSIX recommends that "write locks shall take
+     precedence over read locks", to avoid "writer starvation".  */
+  if (!(lock->runcount + 1 > 0 && lock->waiting_writers.count == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_readers.  */
+      HANDLE event = glwthread_waitqueue_add (&lock->waiting_readers);
+      if (event != INVALID_HANDLE_VALUE)
+        {
+          DWORD result;
+          LeaveCriticalSection (&lock->lock);
+          /* Wait until another thread signals this event.  */
+          result = WaitForSingleObject (event, INFINITE);
+          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
+            abort ();
+          CloseHandle (event);
+          /* The thread which signalled the event already did the bookkeeping:
+             removed us from the waiting_readers, incremented lock->runcount.  */
+          if (!(lock->runcount > 0))
+            abort ();
+          return 0;
+        }
+      else
+        {
+          /* Allocation failure.  Weird.  */
+          do
+            {
+              LeaveCriticalSection (&lock->lock);
+              Sleep (1);
+              EnterCriticalSection (&lock->lock);
+            }
+          while (!(lock->runcount + 1 > 0));
+        }
+    }
+  lock->runcount++;
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glwthread_rwlock_wrlock (glwthread_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+        /* This thread is the first one to need this lock.  Initialize it.  */
+        glwthread_rwlock_init (lock);
+      else
+        {
+          /* Don't let lock->guard.started grow and wrap around.  */
+          InterlockedDecrement (&lock->guard.started);
+          /* Yield the CPU while waiting for another thread to finish
+             initializing this lock.  */
+          while (!lock->guard.done)
+            Sleep (0);
+        }
+    }
+  EnterCriticalSection (&lock->lock);
+  /* Test whether no readers or writers are currently running.  */
+  if (!(lock->runcount == 0))
+    {
+      /* This thread has to wait for a while.  Enqueue it among the
+         waiting_writers.  */
+      HANDLE event = glwthread_waitqueue_add (&lock->waiting_writers);
+      if (event != INVALID_HANDLE_VALUE)
+        {
+          DWORD result;
+          LeaveCriticalSection (&lock->lock);
+          /* Wait until another thread signals this event.  */
+          result = WaitForSingleObject (event, INFINITE);
+          if (result == WAIT_FAILED || result == WAIT_TIMEOUT)
+            abort ();
+          CloseHandle (event);
+          /* The thread which signalled the event already did the bookkeeping:
+             removed us from the waiting_writers, set lock->runcount = -1.  */
+          if (!(lock->runcount == -1))
+            abort ();
+          return 0;
+        }
+      else
+        {
+          /* Allocation failure.  Weird.  */
+          do
+            {
+              LeaveCriticalSection (&lock->lock);
+              Sleep (1);
+              EnterCriticalSection (&lock->lock);
+            }
+          while (!(lock->runcount == 0));
+        }
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glwthread_rwlock_tryrdlock (glwthread_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+        /* This thread is the first one to need this lock.  Initialize it.  */
+        glwthread_rwlock_init (lock);
+      else
+        {
+          /* Don't let lock->guard.started grow and wrap around.  */
+          InterlockedDecrement (&lock->guard.started);
+          /* Yield the CPU while waiting for another thread to finish
+             initializing this lock.  */
+          while (!lock->guard.done)
+            Sleep (0);
+        }
+    }
+  /* It's OK to wait for this critical section, because it is never taken for a
+     long time.  */
+  EnterCriticalSection (&lock->lock);
+  /* Test whether only readers are currently running, and whether the runcount
+     field will not overflow, and whether no writer is waiting.  The latter
+     condition is because POSIX recommends that "write locks shall take
+     precedence over read locks", to avoid "writer starvation".  */
+  if (!(lock->runcount + 1 > 0 && lock->waiting_writers.count == 0))
+    {
+      /* This thread would have to wait for a while.  Return instead.  */
+      LeaveCriticalSection (&lock->lock);
+      return EBUSY;
+    }
+  lock->runcount++;
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glwthread_rwlock_trywrlock (glwthread_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    {
+      if (InterlockedIncrement (&lock->guard.started) == 0)
+        /* This thread is the first one to need this lock.  Initialize it.  */
+        glwthread_rwlock_init (lock);
+      else
+        {
+          /* Don't let lock->guard.started grow and wrap around.  */
+          InterlockedDecrement (&lock->guard.started);
+          /* Yield the CPU while waiting for another thread to finish
+             initializing this lock.  */
+          while (!lock->guard.done)
+            Sleep (0);
+        }
+    }
+  /* It's OK to wait for this critical section, because it is never taken for a
+     long time.  */
+  EnterCriticalSection (&lock->lock);
+  /* Test whether no readers or writers are currently running.  */
+  if (!(lock->runcount == 0))
+    {
+      /* This thread would have to wait for a while.  Return instead.  */
+      LeaveCriticalSection (&lock->lock);
+      return EBUSY;
+    }
+  lock->runcount--; /* runcount becomes -1 */
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glwthread_rwlock_unlock (glwthread_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    return EINVAL;
+  EnterCriticalSection (&lock->lock);
+  if (lock->runcount < 0)
+    {
+      /* Drop a writer lock.  */
+      if (!(lock->runcount == -1))
+        abort ();
+      lock->runcount = 0;
+    }
+  else
+    {
+      /* Drop a reader lock.  */
+      if (!(lock->runcount > 0))
+        {
+          LeaveCriticalSection (&lock->lock);
+          return EPERM;
+        }
+      lock->runcount--;
+    }
+  if (lock->runcount == 0)
+    {
+      /* POSIX recommends that "write locks shall take precedence over read
+         locks", to avoid "writer starvation".  */
+      if (lock->waiting_writers.count > 0)
+        {
+          /* Wake up one of the waiting writers.  */
+          lock->runcount--;
+          glwthread_waitqueue_notify_first (&lock->waiting_writers);
+        }
+      else
+        {
+          /* Wake up all waiting readers.  */
+          lock->runcount += lock->waiting_readers.count;
+          glwthread_waitqueue_notify_all (&lock->waiting_readers);
+        }
+    }
+  LeaveCriticalSection (&lock->lock);
+  return 0;
+}
+
+int
+glwthread_rwlock_destroy (glwthread_rwlock_t *lock)
+{
+  if (!lock->guard.done)
+    return EINVAL;
+  if (lock->runcount != 0)
+    return EBUSY;
+  DeleteCriticalSection (&lock->lock);
+  if (lock->waiting_readers.array != NULL)
+    free (lock->waiting_readers.array);
+  if (lock->waiting_writers.array != NULL)
+    free (lock->waiting_writers.array);
+  lock->guard.done = 0;
+  return 0;
+}
diff --git a/contrib/tools/bison/lib/windows-rwlock.h b/contrib/tools/bison/lib/windows-rwlock.h
new file mode 100644
index 000000000000..ae5b82f52755
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-rwlock.h
@@ -0,0 +1,68 @@
+/* Read-write locks (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-win32.h.  */
+
+#ifndef _WINDOWS_RWLOCK_H
+#define _WINDOWS_RWLOCK_H
+
+#define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#include <windows.h>
+
+#include "windows-initguard.h"
+
+/* It is impossible to implement read-write locks using plain locks, without
+   introducing an extra thread dedicated to managing read-write locks.
+   Therefore here we need to use the low-level Event type.  */
+
+typedef struct
+        {
+          HANDLE *array; /* array of waiting threads, each represented by an event */
+          unsigned int count; /* number of waiting threads */
+          unsigned int alloc; /* length of allocated array */
+          unsigned int offset; /* index of first waiting thread in array */
+        }
+        glwthread_carray_waitqueue_t;
+typedef struct
+        {
+          glwthread_initguard_t guard; /* protects the initialization */
+          CRITICAL_SECTION lock; /* protects the remaining fields */
+          glwthread_carray_waitqueue_t waiting_readers; /* waiting readers */
+          glwthread_carray_waitqueue_t waiting_writers; /* waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        glwthread_rwlock_t;
+
+#define GLWTHREAD_RWLOCK_INIT { GLWTHREAD_INITGUARD_INIT }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void glwthread_rwlock_init (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_rdlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_wrlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_tryrdlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_trywrlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_unlock (glwthread_rwlock_t *lock);
+extern int glwthread_rwlock_destroy (glwthread_rwlock_t *lock);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_RWLOCK_H */
diff --git a/contrib/tools/bison/lib/windows-tls.c b/contrib/tools/bison/lib/windows-tls.c
new file mode 100644
index 000000000000..d52515c95811
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-tls.c
@@ -0,0 +1,339 @@
+/* Thread-local storage (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "windows-tls.h"
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#include "windows-once.h"
+
+void *
+glwthread_tls_get (glwthread_tls_key_t key)
+{
+  return TlsGetValue (key);
+}
+
+int
+glwthread_tls_set (glwthread_tls_key_t key, void *value)
+{
+  if (!TlsSetValue (key, value))
+    return EINVAL;
+  return 0;
+}
+
+/* The following variables keep track of TLS keys with non-NULL destructor.  */
+
+static glwthread_once_t dtor_table_init_once = GLWTHREAD_ONCE_INIT;
+
+static CRITICAL_SECTION dtor_table_lock;
+
+struct dtor { glwthread_tls_key_t key; void (*destructor) (void *); };
+
+/* The table of dtors.  */
+static struct dtor *dtor_table;
+/* Number of active entries in the dtor_table.  */
+static unsigned int dtors_count;
+/* Valid indices into dtor_table are 0..dtors_used-1.  */
+static unsigned int dtors_used;
+/* Allocation size of dtor_table.  */
+static unsigned int dtors_allocated;
+/* Invariant: 0 <= dtors_count <= dtors_used <= dtors_allocated.  */
+
+/* Number of threads that are currently processing destructors.  */
+static unsigned int dtor_processing_threads;
+
+static void
+dtor_table_initialize (void)
+{
+  InitializeCriticalSection (&dtor_table_lock);
+  /* The other variables are already initialized to NULL or 0, respectively.  */
+}
+
+static void
+dtor_table_ensure_initialized (void)
+{
+  glwthread_once (&dtor_table_init_once, dtor_table_initialize);
+}
+
+/* Shrinks dtors_used down to dtors_count, by replacing inactive entries
+   with active ones.  */
+static void
+dtor_table_shrink_used (void)
+{
+  unsigned int i = 0;
+  unsigned int j = dtors_used;
+
+  for (;;)
+    {
+      BOOL i_found = FALSE;
+      BOOL j_found = FALSE;
+      /* Find the next inactive entry, from the left.  */
+      for (; i < dtors_count;)
+        {
+          if (dtor_table[i].destructor == NULL)
+            {
+              i_found = TRUE;
+              break;
+            }
+          i++;
+        }
+
+      /* Find the next active entry, from the right.  */
+      for (; j > dtors_count;)
+        {
+          j--;
+          if (dtor_table[j].destructor != NULL)
+            {
+              j_found = TRUE;
+              break;
+            }
+        }
+
+      if (i_found != j_found)
+        /* dtors_count was apparently wrong.  */
+        abort ();
+
+      if (!i_found)
+        break;
+
+      /* i_found and j_found are TRUE.  Swap the two entries.  */
+      dtor_table[i] = dtor_table[j];
+
+      i++;
+    }
+
+  dtors_used = dtors_count;
+}
+
+void
+glwthread_tls_process_destructors (void)
+{
+  unsigned int repeat;
+
+  dtor_table_ensure_initialized ();
+
+  EnterCriticalSection (&dtor_table_lock);
+  if (dtor_processing_threads == 0)
+    {
+      /* Now it's the appropriate time for shrinking dtors_used.  */
+      if (dtors_used > dtors_count)
+        dtor_table_shrink_used ();
+    }
+  dtor_processing_threads++;
+
+  for (repeat = GLWTHREAD_DESTRUCTOR_ITERATIONS; repeat > 0; repeat--)
+    {
+      unsigned int destructors_run = 0;
+
+      /* Iterate across dtor_table.  We don't need to make a copy of dtor_table,
+         because
+           * When another thread calls glwthread_tls_key_create with a non-NULL
+             destructor argument, this will possibly reallocate the dtor_table
+             array and increase dtors_allocated as well as dtors_used and
+             dtors_count, but it will not change dtors_used nor the contents of
+             the first dtors_used entries of dtor_table.
+           * When another thread calls glwthread_tls_key_delete, this will
+             possibly set some 'destructor' member to NULL, thus marking an
+             entry as inactive, but it will not otherwise change dtors_used nor
+             the contents of the first dtors_used entries of dtor_table.  */
+      unsigned int i_limit = dtors_used;
+      unsigned int i;
+
+      for (i = 0; i < i_limit; i++)
+        {
+          struct dtor current = dtor_table[i];
+          if (current.destructor != NULL)
+            {
+              /* The current dtor has not been deleted yet.  */
+              void *current_value = glwthread_tls_get (current.key);
+              if (current_value != NULL)
+                {
+                  /* The current value is non-NULL.  Run the destructor.  */
+                  glwthread_tls_set (current.key, NULL);
+                  LeaveCriticalSection (&dtor_table_lock);
+                  current.destructor (current_value);
+                  EnterCriticalSection (&dtor_table_lock);
+                  destructors_run++;
+                }
+            }
+        }
+
+      /* When all TLS values were already NULL, no further iterations are
+         needed.  */
+      if (destructors_run == 0)
+        break;
+    }
+
+  dtor_processing_threads--;
+  LeaveCriticalSection (&dtor_table_lock);
+}
+
+int
+glwthread_tls_key_create (glwthread_tls_key_t *keyp, void (*destructor) (void *))
+{
+  if (destructor != NULL)
+    {
+      dtor_table_ensure_initialized ();
+
+      EnterCriticalSection (&dtor_table_lock);
+      if (dtor_processing_threads == 0)
+        {
+          /* Now it's the appropriate time for shrinking dtors_used.  */
+          if (dtors_used > dtors_count)
+            dtor_table_shrink_used ();
+        }
+
+      while (dtors_used == dtors_allocated)
+        {
+          /* Need to grow the dtor_table.  */
+          unsigned int new_allocated = 2 * dtors_allocated + 1;
+          if (new_allocated < 7)
+            new_allocated = 7;
+          if (new_allocated <= dtors_allocated) /* overflow? */
+            new_allocated = UINT_MAX;
+
+          LeaveCriticalSection (&dtor_table_lock);
+          {
+            struct dtor *new_table =
+              (struct dtor *) malloc (new_allocated * sizeof (struct dtor));
+            if (new_table == NULL)
+              return ENOMEM;
+            EnterCriticalSection (&dtor_table_lock);
+            /* Attention! dtors_used, dtors_allocated may have changed!  */
+            if (dtors_used < new_allocated)
+              {
+                if (dtors_allocated < new_allocated)
+                  {
+                    /* The new_table is useful.  */
+                    memcpy (new_table, dtor_table,
+                            dtors_used * sizeof (struct dtor));
+                    dtor_table = new_table;
+                    dtors_allocated = new_allocated;
+                  }
+                else
+                  {
+                    /* The new_table is not useful, since another thread
+                       meanwhile allocated a drop_table that is at least
+                       as large.  */
+                    free (new_table);
+                  }
+                break;
+              }
+            /* The new_table is not useful, since other threads increased
+               dtors_used.  Free it any retry.  */
+            free (new_table);
+          }
+        }
+      /* Here dtors_used < dtors_allocated.  */
+      {
+        /* Allocate a new key.  */
+        glwthread_tls_key_t key = TlsAlloc ();
+        if (key == (DWORD)-1)
+          {
+            LeaveCriticalSection (&dtor_table_lock);
+            return EAGAIN;
+          }
+        /* Store the new dtor in the dtor_table, after all used entries.
+           Do not overwrite inactive entries with indices < dtors_used, in order
+           not to disturb glwthread_tls_process_destructors invocations that may
+           be executing in other threads.  */
+        dtor_table[dtors_used].key = key;
+        dtor_table[dtors_used].destructor = destructor;
+        dtors_used++;
+        dtors_count++;
+        LeaveCriticalSection (&dtor_table_lock);
+        *keyp = key;
+      }
+    }
+  else
+    {
+      /* Allocate a new key.  */
+      glwthread_tls_key_t key = TlsAlloc ();
+      if (key == (DWORD)-1)
+        return EAGAIN;
+      *keyp = key;
+    }
+  return 0;
+}
+
+int
+glwthread_tls_key_delete (glwthread_tls_key_t key)
+{
+  /* Should the destructor be called for all threads that are currently running?
+     Probably not, because
+       - ISO C does not specify when the destructor is to be invoked at all.
+       - In POSIX, the destructor functions specified with pthread_key_create()
+         are invoked at thread exit.
+       - It would be hard to implement, because there are no primitives for
+         accessing thread-specific values from a different thread.  */
+  dtor_table_ensure_initialized ();
+
+  EnterCriticalSection (&dtor_table_lock);
+  if (dtor_processing_threads == 0)
+    {
+      /* Now it's the appropriate time for shrinking dtors_used.  */
+      if (dtors_used > dtors_count)
+        dtor_table_shrink_used ();
+      /* Here dtors_used == dtors_count.  */
+
+      /* Find the key in dtor_table.  */
+      {
+        unsigned int i_limit = dtors_used;
+        unsigned int i;
+
+        for (i = 0; i < i_limit; i++)
+          if (dtor_table[i].key == key)
+            {
+              if (i < dtors_used - 1)
+                /* Swap the entries i and dtors_used - 1.  */
+                dtor_table[i] = dtor_table[dtors_used - 1];
+              dtors_count = dtors_used = dtors_used - 1;
+              break;
+            }
+      }
+    }
+  else
+    {
+      /* Be careful not to disturb the glwthread_tls_process_destructors
+         invocations that are executing in other threads.  */
+      unsigned int i_limit = dtors_used;
+      unsigned int i;
+
+      for (i = 0; i < i_limit; i++)
+        if (dtor_table[i].destructor != NULL /* skip inactive entries */
+            && dtor_table[i].key == key)
+          {
+            /* Mark this entry as inactive.  */
+            dtor_table[i].destructor = NULL;
+            dtors_count = dtors_count - 1;
+            break;
+          }
+    }
+  LeaveCriticalSection (&dtor_table_lock);
+  /* Now we have ensured that glwthread_tls_process_destructors will no longer
+     use this key.  */
+
+  if (!TlsFree (key))
+    return EINVAL;
+  return 0;
+}
diff --git a/contrib/tools/bison/lib/windows-tls.h b/contrib/tools/bison/lib/windows-tls.h
new file mode 100644
index 000000000000..2b39fabd5a5a
--- /dev/null
+++ b/contrib/tools/bison/lib/windows-tls.h
@@ -0,0 +1,42 @@
+/* Thread-local storage (native Windows implementation).
+   Copyright (C) 2005-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
+
+#ifndef _WINDOWS_TLS_H
+#define _WINDOWS_TLS_H
+
+#define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#include <windows.h>
+
+typedef DWORD glwthread_tls_key_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int glwthread_tls_key_create (glwthread_tls_key_t *keyp, void (*destructor) (void *));
+extern void *glwthread_tls_get (glwthread_tls_key_t key);
+extern int glwthread_tls_set (glwthread_tls_key_t key, void *value);
+extern int glwthread_tls_key_delete (glwthread_tls_key_t key);
+extern void glwthread_tls_process_destructors (void);
+#define GLWTHREAD_DESTRUCTOR_ITERATIONS 4
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WINDOWS_TLS_H */
diff --git a/contrib/tools/bison/lib/xalloc-die.c b/contrib/tools/bison/lib/xalloc-die.c
index 295f8d8e758d..68559deebb31 100644
--- a/contrib/tools/bison/lib/xalloc-die.c
+++ b/contrib/tools/bison/lib/xalloc-die.c
@@ -1,6 +1,6 @@
 /* Report a memory allocation failure and exit.
 
-   Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2019 Free Software
+   Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/xalloc-oversized.h b/contrib/tools/bison/lib/xalloc-oversized.h
index e3068c83c48f..13ee23031a05 100644
--- a/contrib/tools/bison/lib/xalloc-oversized.h
+++ b/contrib/tools/bison/lib/xalloc-oversized.h
@@ -1,6 +1,6 @@
 /* xalloc-oversized.h -- memory allocation size checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/xalloc.h b/contrib/tools/bison/lib/xalloc.h
index fc7e86bd89b3..19c64acb4168 100644
--- a/contrib/tools/bison/lib/xalloc.h
+++ b/contrib/tools/bison/lib/xalloc.h
@@ -1,6 +1,6 @@
 /* xalloc.h -- malloc with out-of-memory checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ extern "C" {
    or by using gnulib's xalloc-die module.  This is the
    function to call when one wants the program to die because of a
    memory allocation failure.  */
-extern _Noreturn void xalloc_die (void);
+/*extern*/ _Noreturn void xalloc_die (void);
 
 void *xmalloc (size_t s)
       _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1));
diff --git a/contrib/tools/bison/lib/xconcat-filename.c b/contrib/tools/bison/lib/xconcat-filename.c
index ad2d5f66b47a..e04d4337eb69 100644
--- a/contrib/tools/bison/lib/xconcat-filename.c
+++ b/contrib/tools/bison/lib/xconcat-filename.c
@@ -1,5 +1,5 @@
 /* Construct a full filename from a directory and a relative filename.
-   Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
diff --git a/contrib/tools/bison/lib/xhash.c b/contrib/tools/bison/lib/xhash.c
new file mode 100644
index 000000000000..1e998d2d15e4
--- /dev/null
+++ b/contrib/tools/bison/lib/xhash.c
@@ -0,0 +1,38 @@
+/* hash - hashing table processing.
+
+   Copyright (C) 2019-2020 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "hash.h"
+
+#include "xalloc.h"
+
+/* Same as hash_initialize, but invokes xalloc_die on memory
+   exhaustion.  */
+
+Hash_table *
+hash_xinitialize (size_t candidate, const Hash_tuning *tuning,
+                  Hash_hasher hasher, Hash_comparator comparator,
+                  Hash_data_freer data_freer)
+{
+  Hash_table *res =
+    hash_initialize (candidate, tuning, hasher, comparator, data_freer);
+  if (!res)
+    xalloc_die ();
+  return res;
+}
diff --git a/contrib/tools/bison/lib/xmalloc.c b/contrib/tools/bison/lib/xmalloc.c
index cbe9a4f5671e..486873602e4e 100644
--- a/contrib/tools/bison/lib/xmalloc.c
+++ b/contrib/tools/bison/lib/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- malloc with out of memory checking
 
-   Copyright (C) 1990-2000, 2002-2006, 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2002-2006, 2008-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -76,14 +76,14 @@ x2realloc (void *p, size_t *pn)
   return x2nrealloc (p, pn, 1);
 }
 
-/* Allocate S bytes of zeroed memory dynamically, with error checking.
+/* Allocate N bytes of zeroed memory dynamically, with error checking.
    There's no need for xnzalloc (N, S), since it would be equivalent
    to xcalloc (N, S).  */
 
 void *
-xzalloc (size_t s)
+xzalloc (size_t n)
 {
-  return memset (xmalloc (s), 0, s);
+  return xcalloc (n, 1);
 }
 
 /* Allocate zeroed memory for N elements of S bytes, with error
diff --git a/contrib/tools/bison/lib/xmemdup0.c b/contrib/tools/bison/lib/xmemdup0.c
index 4f491be1b8d0..c076b9affba9 100644
--- a/contrib/tools/bison/lib/xmemdup0.c
+++ b/contrib/tools/bison/lib/xmemdup0.c
@@ -1,6 +1,6 @@
 /* xmemdup0.c -- copy a block of arbitrary bytes, plus a trailing NUL
 
-   Copyright (C) 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,7 +38,8 @@ char *
 xmemdup0 (void const *p, size_t s)
 {
   char *result = xcharalloc (s + 1);
-  memcpy (result, p, s);
+  if (s > 0)
+    memcpy (result, p, s);
   result[s] = 0;
   return result;
 }
diff --git a/contrib/tools/bison/lib/xmemdup0.h b/contrib/tools/bison/lib/xmemdup0.h
index 768f0b274b66..9a61ade9c0e6 100644
--- a/contrib/tools/bison/lib/xmemdup0.h
+++ b/contrib/tools/bison/lib/xmemdup0.h
@@ -1,6 +1,6 @@
 /* xmemdup0.h -- copy a block of arbitrary bytes, plus a trailing NUL
 
-   Copyright (C) 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2008-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/xreadlink.c b/contrib/tools/bison/lib/xreadlink.c
index 59cfde91b943..31521b989527 100644
--- a/contrib/tools/bison/lib/xreadlink.c
+++ b/contrib/tools/bison/lib/xreadlink.c
@@ -1,6 +1,6 @@
 /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
 
-   Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003-2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/xreadlink.h b/contrib/tools/bison/lib/xreadlink.h
index 583205be54f3..be82e78d63f2 100644
--- a/contrib/tools/bison/lib/xreadlink.h
+++ b/contrib/tools/bison/lib/xreadlink.h
@@ -1,6 +1,6 @@
 /* Reading symbolic links without size limitation.
 
-   Copyright (C) 2001, 2003-2004, 2007, 2009-2019 Free Software Foundation,
+   Copyright (C) 2001, 2003-2004, 2007, 2009-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/contrib/tools/bison/lib/xsize.h b/contrib/tools/bison/lib/xsize.h
index ecfd478dcd56..45d41661794b 100644
--- a/contrib/tools/bison/lib/xsize.h
+++ b/contrib/tools/bison/lib/xsize.h
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008-2020 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/xstrndup.c b/contrib/tools/bison/lib/xstrndup.c
index a9738291130d..93dcfe50fdd7 100644
--- a/contrib/tools/bison/lib/xstrndup.c
+++ b/contrib/tools/bison/lib/xstrndup.c
@@ -1,6 +1,6 @@
 /* Duplicate a bounded initial segment of a string, with out-of-memory
    checking.
-   Copyright (C) 2003, 2006-2007, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/xstrndup.h b/contrib/tools/bison/lib/xstrndup.h
index 360ccfdbb1f2..4f1da97c3ffc 100644
--- a/contrib/tools/bison/lib/xstrndup.h
+++ b/contrib/tools/bison/lib/xstrndup.h
@@ -1,6 +1,6 @@
 /* Duplicate a bounded initial segment of a string, with out-of-memory
    checking.
-   Copyright (C) 2003, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/lib/xtime.h b/contrib/tools/bison/lib/xtime.h
index 9edd12392db9..7f2992c335f4 100644
--- a/contrib/tools/bison/lib/xtime.h
+++ b/contrib/tools/bison/lib/xtime.h
@@ -1,6 +1,6 @@
 /* xtime -- extended-resolution integer timestamps
 
-   Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,40 +29,27 @@ _GL_INLINE_HEADER_BEGIN
 #endif
 
 /* xtime_t is a signed type used for timestamps.  It is an integer
-   type that is a count of nanoseconds -- except for obsolescent hosts
-   without sufficiently-wide integers, where it is a count of
-   seconds.  */
-#if HAVE_LONG_LONG_INT
+   type that is a count of nanoseconds.  */
 typedef long long int xtime_t;
-# define XTIME_PRECISION 1000000000
-#else
-# include <limits.h>
-typedef long int xtime_t;
-# if LONG_MAX >> 31 >> 31 == 0
-#  define XTIME_PRECISION 1
-# else
-#  define XTIME_PRECISION 1000000000
-# endif
-#endif
+#define XTIME_PRECISION 1000000000
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
 /* Return an extended time value that contains S seconds and NS
-   nanoseconds.  */
+   nanoseconds.  S and NS should be nonnegative; otherwise, integer
+   overflow can occur even if the result is in range.  */
 XTIME_INLINE xtime_t
 xtime_make (xtime_t s, long int ns)
 {
-  const long int giga = 1000 * 1000 * 1000;
-  s += ns / giga;
-  ns %= giga;
-  if (XTIME_PRECISION == 1)
-    return s;
-  else
-    return XTIME_PRECISION * s + ns;
+  return XTIME_PRECISION * s + ns;
 }
 
+/* The following functions split an extended time value:
+   T = XTIME_PRECISION * xtime_sec (T) + xtime_nsec (T)
+   with  0 <= xtime_nsec (T) < XTIME_PRECISION.  */
+
 /* Return the number of seconds in T, which must be nonnegative.  */
 XTIME_INLINE xtime_t
 xtime_nonnegative_sec (xtime_t t)
@@ -74,11 +61,7 @@ xtime_nonnegative_sec (xtime_t t)
 XTIME_INLINE xtime_t
 xtime_sec (xtime_t t)
 {
-  return (XTIME_PRECISION == 1
-          ? t
-          : t < 0
-          ? (t + XTIME_PRECISION - 1) / XTIME_PRECISION - 1
-          : xtime_nonnegative_sec (t));
+  return (t + (t < 0)) / XTIME_PRECISION - (t < 0);
 }
 
 /* Return the number of nanoseconds in T, which must be nonnegative.  */
diff --git a/contrib/tools/bison/lib/ya.make b/contrib/tools/bison/lib/ya.make
index 4d6afb692a26..41aec50a8718 100644
--- a/contrib/tools/bison/lib/ya.make
+++ b/contrib/tools/bison/lib/ya.make
@@ -16,6 +16,7 @@ NO_COMPILER_WARNINGS()
 NO_RUNTIME()
 
 CFLAGS(
+    -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\"
     -DEXEEXT=\"\"
 )
 
@@ -24,6 +25,7 @@ SRCS(
     areadlink.c
     argmatch.c
     asnprintf.c
+    asprintf.c
     basename-lgpl.c
     basename.c
     binary-io.c
@@ -53,16 +55,22 @@ SRCS(
     fd-safer.c
     fopen-safer.c
     fseterr.c
+    fstrcmp.c
     get-errno.c
     gethrxtime.c
     getprogname.c
     gl_array_list.c
     gl_list.c
     gl_xlist.c
+    glthread/lock.c
+    glthread/threadlib.c
+    glthread/tls.c
     hard-locale.c
     hash.c
     localcharset.c
     math.c
+    mbchar.c
+    mbfile.c
     mbrtowc.c
     mbswidth.c
     path-join.c
@@ -75,6 +83,7 @@ SRCS(
     printf-parse.c
     progname.c
     quotearg.c
+    setlocale_null.c
     sig-handler.c
     spawn-pipe.c
     stripslash.c
@@ -83,10 +92,12 @@ SRCS(
     unistd.c
     uniwidth/width.c
     vasnprintf.c
+    vasprintf.c
     wait-process.c
     wctype-h.c
     xalloc-die.c
     xconcat-filename.c
+    xhash.c
     xmalloc.c
     xmemdup0.c
     xreadlink.c
@@ -130,6 +141,11 @@ ELSEIF (OS_WINDOWS)
         strverscmp.c
         waitpid.c
         wcwidth.c
+        windows-mutex.c
+        windows-once.c
+        windows-recmutex.c
+        windows-rwlock.c
+        windows-tls.c
     )
 ENDIF()
 
diff --git a/contrib/tools/bison/src/AnnotationList.c b/contrib/tools/bison/src/AnnotationList.c
index 4e29127c5760..f7ef09297178 100644
--- a/contrib/tools/bison/src/AnnotationList.c
+++ b/contrib/tools/bison/src/AnnotationList.c
@@ -1,6 +1,6 @@
 /* IELR's inadequacy annotation list.
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -269,7 +269,7 @@ AnnotationList__computePredecessorAnnotations (
                   if (item_number_is_rule_number (ritem[s->items[self_item]
                                                         - 2]))
                     {
-                      unsigned rulei;
+                      int rulei;
                       for (rulei = s->items[self_item];
                            !item_number_is_rule_number (ritem[rulei]);
                            ++rulei)
diff --git a/contrib/tools/bison/src/AnnotationList.h b/contrib/tools/bison/src/AnnotationList.h
index ef3eeb6b0fa0..d5258a57d368 100644
--- a/contrib/tools/bison/src/AnnotationList.h
+++ b/contrib/tools/bison/src/AnnotationList.h
@@ -1,6 +1,6 @@
 /* IELR's inadequacy annotation list.
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -25,7 +25,7 @@
 # include "InadequacyList.h"
 # include "state.h"
 
-typedef unsigned AnnotationIndex;
+typedef int AnnotationIndex;
 
 /**
  * A node in a list of annotations on a particular LR(0) state.  Each
diff --git a/contrib/tools/bison/src/InadequacyList.c b/contrib/tools/bison/src/InadequacyList.c
index 6caa14ea2f5e..6d7f19224eb0 100644
--- a/contrib/tools/bison/src/InadequacyList.c
+++ b/contrib/tools/bison/src/InadequacyList.c
@@ -1,6 +1,6 @@
 /* IELR's inadequacy list.
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,6 +22,8 @@
 
 #include "InadequacyList.h"
 
+#include <intprops.h>
+
 ContributionIndex const ContributionIndex__none = -1;
 ContributionIndex const ContributionIndex__error_action = -2;
 
@@ -31,8 +33,11 @@ InadequacyList__new_conflict (state *manifesting_state, symbol *token,
                               InadequacyListNodeCount *node_count)
 {
   InadequacyList *result = xmalloc (sizeof *result);
-  result->id = (*node_count)++;
-  aver (*node_count != 0);
+  result->id = *node_count;
+  IGNORE_TYPE_LIMITS_BEGIN
+  if (INT_ADD_WRAPV (*node_count, 1, node_count))
+    aver (false);
+  IGNORE_TYPE_LIMITS_END
   result->next = NULL;
   result->manifestingState = manifesting_state;
   result->contributionCount = bitset_count (actions);
diff --git a/contrib/tools/bison/src/InadequacyList.h b/contrib/tools/bison/src/InadequacyList.h
index bb52f7ae8498..317d9d5a5201 100644
--- a/contrib/tools/bison/src/InadequacyList.h
+++ b/contrib/tools/bison/src/InadequacyList.h
@@ -1,6 +1,6 @@
 /* IELR's inadequacy list.
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -27,11 +27,8 @@
 
 /**
  * A unique ID assigned to every \c InadequacyList node.
- *
- * This must remain unsigned so that the overflow check in
- * \c InadequacyList__new_conflict works properly.
  */
-typedef unsigned long long InadequacyListNodeCount;
+typedef long long InadequacyListNodeCount;
 
 /**
  * For a conflict, each rule in the grammar can have at most one contributing
diff --git a/contrib/tools/bison/src/Sbitset.c b/contrib/tools/bison/src/Sbitset.c
index aaa6819be06b..3b1651032286 100644
--- a/contrib/tools/bison/src/Sbitset.c
+++ b/contrib/tools/bison/src/Sbitset.c
@@ -1,6 +1,6 @@
 /* A simple, memory-efficient bitset implementation.
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/contrib/tools/bison/src/Sbitset.h b/contrib/tools/bison/src/Sbitset.h
index fc6347aa24e5..997dab2feac7 100644
--- a/contrib/tools/bison/src/Sbitset.h
+++ b/contrib/tools/bison/src/Sbitset.h
@@ -1,6 +1,6 @@
 /* A simple, memory-efficient bitset implementation.
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/contrib/tools/bison/src/assoc.c b/contrib/tools/bison/src/assoc.c
index fc1f937fb754..0c3de26fd5ae 100644
--- a/contrib/tools/bison/src/assoc.c
+++ b/contrib/tools/bison/src/assoc.c
@@ -1,6 +1,6 @@
 /* Associativity information.
 
-   Copyright (C) 2002, 2005-2006, 2008-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2005-2006, 2008-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -29,9 +29,6 @@ assoc_to_string (assoc a)
 {
   switch (a)
     {
-    default:
-      abort ();
-
     case undef_assoc:
       return "undefined associativity";
 
@@ -47,4 +44,5 @@ assoc_to_string (assoc a)
     case precedence_assoc:
       return "%precedence";
     }
+  abort ();
 }
diff --git a/contrib/tools/bison/src/assoc.h b/contrib/tools/bison/src/assoc.h
index 680e2fbcc652..9fdbb466f31e 100644
--- a/contrib/tools/bison/src/assoc.h
+++ b/contrib/tools/bison/src/assoc.h
@@ -1,6 +1,6 @@
 /* Associativity information.
 
-   Copyright (C) 2002, 2006, 2008-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2006, 2008-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/closure.c b/contrib/tools/bison/src/closure.c
index 16be6452297d..5a93ded7296f 100644
--- a/contrib/tools/bison/src/closure.c
+++ b/contrib/tools/bison/src/closure.c
@@ -1,7 +1,7 @@
 /* Closures for Bison
 
    Copyright (C) 1984, 1989, 2000-2002, 2004-2005, 2007, 2009-2015,
-   2018-2019 Free Software Foundation, Inc.
+   2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -35,6 +35,9 @@
 item_number *itemset;
 size_t nitemset;
 
+/* RULESET contains a bit for each rule.  CLOSURE sets the bits for
+   all rules which could potentially describe the next input to be
+   read.  */
 static bitset ruleset;
 
 /* internal data.  See comments before set_fderives and set_firsts.  */
@@ -51,7 +54,7 @@ static bitsetv firsts = NULL;
 `-----------------*/
 
 static void
-print_closure (char const *title, item_number const *array, size_t size)
+closure_print (char const *title, item_number const *array, size_t size)
 {
   fprintf (stderr, "Closure: %s\n", title);
   for (size_t i = 0; i < size; ++i)
@@ -167,7 +170,7 @@ set_fderives (void)
 
 
 void
-new_closure (unsigned n)
+closure_new (int n)
 {
   itemset = xnmalloc (n, sizeof *itemset);
 
@@ -181,8 +184,8 @@ new_closure (unsigned n)
 void
 closure (item_number const *core, size_t n)
 {
-  if (trace_flag & trace_sets)
-    print_closure ("input", core, n);
+  if (trace_flag & trace_closure)
+    closure_print ("input", core, n);
 
   bitset_zero (ruleset);
 
@@ -192,12 +195,12 @@ closure (item_number const *core, size_t n)
 
   /* core is sorted on item index in ritem, which is sorted on rule number.
      Compute itemset with the same sort.  */
+  nitemset = 0;
+  size_t c = 0;
+
   /* A bit index over RULESET. */
   rule_number ruleno;
   bitset_iterator iter;
-
-  nitemset = 0;
-  size_t c = 0;
   BITSET_FOR_EACH (iter, ruleset, ruleno, 0)
     {
       item_number itemno = rules[ruleno].rhs - ritem;
@@ -218,13 +221,13 @@ closure (item_number const *core, size_t n)
       c++;
     }
 
-  if (trace_flag & trace_sets)
-    print_closure ("output", itemset, nitemset);
+  if (trace_flag & trace_closure)
+    closure_print ("output", itemset, nitemset);
 }
 
 
 void
-free_closure (void)
+closure_free (void)
 {
   free (itemset);
   bitset_free (ruleset);
diff --git a/contrib/tools/bison/src/closure.h b/contrib/tools/bison/src/closure.h
index c75b8497e5a7..21d6ba196e94 100644
--- a/contrib/tools/bison/src/closure.h
+++ b/contrib/tools/bison/src/closure.h
@@ -1,6 +1,6 @@
 /* Subroutines for bison
 
-   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2015, 2018-2019 Free
+   Copyright (C) 1984, 1989, 2000-2002, 2007, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -27,29 +27,26 @@
    data so that closure can be called.  n is the number of elements to
    allocate for itemset.  */
 
-void new_closure (unsigned n);
+void closure_new (int n);
 
 
 /* Given the kernel (aka core) of a state (a sorted vector of item numbers
    ITEMS, of length N), set up RULESET and ITEMSET to indicate what
    rules could be run and which items could be accepted when those
-   items are the active ones.
+   items are the active ones.  */
 
-   RULESET contains a bit for each rule.  CLOSURE sets the bits for
-   all rules which could potentially describe the next input to be
-   read.
+void closure (item_number const *items, size_t n);
 
-   ITEMSET is a sorted vector of item numbers; NITEMSET is its size
-   (actually, points to just beyond the end of the part of it that is
-   significant).  CLOSURE places there the indices of all items which
-   represent units of input that could arrive next.  */
 
-void closure (item_number const *items, size_t n);
+/* Free ITEMSET, RULESET and internal data.  */
 
+void closure_free (void);
 
-/* Frees ITEMSET, RULESET and internal data.  */
 
-void free_closure (void);
+/* ITEMSET is a sorted vector of item numbers; NITEMSET is its size
+   (actually, points to just beyond the end of the part of it that is
+   significant).  CLOSURE places there the indices of all items which
+   represent units of input that could arrive next.  */
 
 extern item_number *itemset;
 extern size_t nitemset;
diff --git a/contrib/tools/bison/src/complain.c b/contrib/tools/bison/src/complain.c
index 50f65af54cef..f15c6b8bd14b 100644
--- a/contrib/tools/bison/src/complain.c
+++ b/contrib/tools/bison/src/complain.c
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000-2002, 2004-2006, 2009-2015, 2018-2019 Free
+   Copyright (C) 2000-2002, 2004-2006, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -23,8 +23,10 @@
 #include "system.h"
 
 #include <argmatch.h>
-#include <stdarg.h>
 #include <progname.h>
+#include <stdarg.h>
+#include <sys/stat.h>
+#include <textstyle.h>
 
 #include "complain.h"
 #include "files.h"
@@ -39,9 +41,9 @@ bool warnings_are_errors = false;
 /** Whether -Werror/-Wno-error was applied to a warning.  */
 typedef enum
   {
-    errority_unset = 0,     /** No explict status.  */
-    errority_disabled = 1,  /** Explictly disabled with -Wno-error=foo.  */
-    errority_enabled = 2    /** Explictly enabled with -Werror=foo. */
+    errority_unset = 0,     /** No explicit status.  */
+    errority_disabled = 1,  /** Explicitly disabled with -Wno-error=foo.  */
+    errority_enabled = 2    /** Explicitly enabled with -Werror=foo. */
   } errority;
 
 /** For each warning type, its errority.  */
@@ -61,52 +63,105 @@ typedef enum
 /** For each warning type, its severity.  */
 static severity warnings_flag[warnings_size];
 
-static unsigned *indent_ptr = 0;
+styled_ostream_t errstream = NULL;
+
+void
+begin_use_class (const char *s, FILE *out)
+{
+  if (out == stderr)
+    {
+      if (color_debug)
+        fprintf (out, "<%s>", s);
+      else
+        {
+          styled_ostream_begin_use_class (errstream, s);
+          styled_ostream_flush_to_current_style (errstream);
+        }
+    }
+}
+
+void
+end_use_class (const char *s, FILE *out)
+{
+  if (out == stderr)
+    {
+      if (color_debug)
+        fprintf (out, "</%s>", s);
+      else
+        {
+          styled_ostream_end_use_class (errstream, s);
+          styled_ostream_flush_to_current_style (errstream);
+        }
+    }
+}
+
+void
+flush (FILE *out)
+{
+  if (out == stderr)
+    ostream_flush (errstream, FLUSH_THIS_STREAM);
+  fflush (out);
+}
 
 /*------------------------.
 | --warnings's handling.  |
 `------------------------*/
 
-static const char * const warnings_args[] =
+ARGMATCH_DEFINE_GROUP (warning, warnings)
+
+static const argmatch_warning_doc argmatch_warning_docs[] =
 {
-  "none",
-  "midrule-values",
-  "yacc",
-  "conflicts-sr",
-  "conflicts-rr",
-  "deprecated",
-  "empty-rule",
-  "precedence",
-  "other",
-  "all",
-  "error",
-  "everything",
-  0
+  { "conflicts-sr",     N_("S/R conflicts (enabled by default)") },
+  { "conflicts-rr",     N_("R/R conflicts (enabled by default)") },
+  { "dangling-alias",   N_("string aliases not attached to a symbol") },
+  { "deprecated",       N_("obsolete constructs") },
+  { "empty-rule",       N_("empty rules without %empty") },
+  { "midrule-values",   N_("unset or unused midrule values") },
+  { "precedence",       N_("useless precedence and associativity") },
+  { "yacc",             N_("incompatibilities with POSIX Yacc") },
+  { "other",            N_("all other warnings (enabled by default)") },
+  { "all",              N_("all the warnings except 'dangling-alias' and 'yacc'") },
+  { "no-CATEGORY",      N_("turn off warnings in CATEGORY") },
+  { "none",             N_("turn off all the warnings") },
+  { "error[=CATEGORY]", N_("treat warnings as errors") },
+  { NULL, NULL }
 };
 
-static const warnings warnings_types[] =
+static const argmatch_warning_arg argmatch_warning_args[] =
 {
-  Wnone,
-  Wmidrule_values,
-  Wyacc,
-  Wconflicts_sr,
-  Wconflicts_rr,
-  Wdeprecated,
-  Wempty_rule,
-  Wprecedence,
-  Wother,
-  Wall,
-  Werror,
-  Weverything
+  { "all",            Wall },
+  { "conflicts-rr",   Wconflicts_rr },
+  { "conflicts-sr",   Wconflicts_sr },
+  { "dangling-alias", Wdangling_alias },
+  { "deprecated",     Wdeprecated },
+  { "empty-rule",     Wempty_rule },
+  { "everything",     Weverything },
+  { "midrule-values", Wmidrule_values },
+  { "none",           Wnone },
+  { "other",          Wother },
+  { "precedence",     Wprecedence },
+  { "yacc",           Wyacc },
+  { NULL, Wnone }
 };
 
-ARGMATCH_VERIFY (warnings_args, warnings_types);
+const argmatch_warning_group_type argmatch_warning_group =
+{
+  argmatch_warning_args,
+  argmatch_warning_docs,
+  N_("Warning categories include:"),
+  NULL
+};
+
+void
+warning_usage (FILE *out)
+{
+  argmatch_warning_usage (out);
+}
 
 void
 warning_argmatch (char const *arg, size_t no, size_t err)
 {
-  int value = XARGMATCH ("--warning", arg + no + err,
-                         warnings_args, warnings_types);
+  int value = *argmatch_warning_value ("--warning", arg + no + err);
 
   /* -Wnone == -Wno-everything, and -Wno-none == -Weverything.  */
   if (!value)
@@ -145,7 +200,14 @@ warning_argmatch (char const *arg, size_t no, size_t err)
 void
 warnings_argmatch (char *args)
 {
-  if (args)
+  if (!args)
+    warning_argmatch ("all", 0, 0);
+  else if (STREQ (args, "help"))
+    {
+      warning_usage (stdout);
+      exit (EXIT_SUCCESS);
+    }
+  else
     for (args = strtok (args, ","); args; args = strtok (NULL, ","))
       if (STREQ (args, "error"))
         warnings_are_errors = true;
@@ -161,8 +223,43 @@ warnings_argmatch (char *args)
 
           warning_argmatch (args, no, err);
         }
-  else
-    warning_argmatch ("all", 0, 0);
+}
+
+/* Color style for this type of message.  */
+static const char*
+severity_style (severity s)
+{
+  switch (s)
+    {
+    case severity_disabled:
+    case severity_unset:
+      return "note";
+    case severity_warning:
+      return "warning";
+    case severity_error:
+    case severity_fatal:
+      return "error";
+    }
+  abort ();
+}
+
+/* Prefix for this type of message.  */
+static const char*
+severity_prefix (severity s)
+{
+  switch (s)
+    {
+    case severity_disabled:
+    case severity_unset:
+      return "";
+    case severity_warning:
+      return _("warning");
+    case severity_error:
+      return  _("error");
+    case severity_fatal:
+      return _("fatal error");
+    }
+  abort ();
 }
 
 
@@ -170,9 +267,53 @@ warnings_argmatch (char *args)
 | complain.  |
 `-----------*/
 
+void
+complain_init_color (void)
+{
+#if HAVE_LIBTEXTSTYLE
+  if (color_mode == color_yes
+      || color_mode == color_html
+      || (color_mode == color_tty && isatty (STDERR_FILENO)))
+    {
+      style_file_prepare ("BISON_STYLE", "BISON_STYLEDIR", pkgdatadir (),
+                          "bison-default.css");
+      /* As a fallback, use the default in the current directory.  */
+      struct stat statbuf;
+      if ((style_file_name == NULL || stat (style_file_name, &statbuf) < 0)
+          && stat ("bison-default.css", &statbuf) == 0)
+        style_file_name = "bison-default.css";
+    }
+  else
+    /* No styling.  */
+    style_file_name = NULL;
+#endif
+
+  /* Workaround clang's warning (starting at Clang 3.5) about the stub
+     code of html_styled_ostream_create:
+
+     | src/complain.c:274:7: error: code will never be executed [-Werror,-Wunreachable-code]
+     |     ? html_styled_ostream_create (file_ostream_create (stderr),
+     |       ^~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#if defined __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+  errstream =
+    color_mode == color_html
+    ? html_styled_ostream_create (file_ostream_create (stderr),
+                                  style_file_name)
+    : styled_ostream_create (STDERR_FILENO, "(stderr)", TTYCTL_AUTO,
+                             style_file_name);
+#if defined __clang__
+# pragma clang diagnostic pop
+#endif
+}
+
 void
 complain_init (void)
 {
+  caret_init ();
+
   warnings warnings_default =
     Wconflicts_sr | Wconflicts_rr | Wdeprecated | Wother;
 
@@ -185,6 +326,12 @@ complain_init (void)
     }
 }
 
+void
+complain_free (void)
+{
+  caret_free ();
+  styled_ostream_free (errstream);
+}
 
 /* A diagnostic with FLAGS is about to be issued.  With what severity?
    (severity_fatal, severity_error, severity_disabled, or
@@ -229,19 +376,31 @@ warning_is_unset (warnings flags)
   return true;
 }
 
-/** Display a "[-Wyacc]" like message on \a f.  */
+bool
+warning_is_enabled (warnings flags)
+{
+  return severity_warning <= warning_severity (flags);
+}
+
+/** Display a "[-Wyacc]" like message on \a out.  */
 
 static void
-warnings_print_categories (warnings warn_flags, FILE *f)
+warnings_print_categories (warnings warn_flags, FILE *out)
 {
-  /* Display only the first match, the second is "-Wall".  */
-  for (size_t i = 0; warnings_args[i]; ++i)
-    if (warn_flags & warnings_types[i])
+  for (int wbit = 0; wbit < warnings_size; ++wbit)
+    if (warn_flags & (1 << wbit))
       {
-        severity s = warning_severity (warnings_types[i]);
-        fprintf (f, " [-W%s%s]",
+        warnings w = 1 << wbit;
+        severity s = warning_severity (w);
+        const char* style = severity_style (s);
+        fputs (" [", out);
+        begin_use_class (style, out);
+        fprintf (out, "-W%s%s",
                  s == severity_error ? "error=" : "",
-                 warnings_args[i]);
+                 argmatch_warning_argument (&w));
+        end_use_class (style, out);
+        fputc (']', out);
+        /* Display only the first match, the second is "-Wall".  */
         return;
       }
 }
@@ -250,8 +409,10 @@ warnings_print_categories (warnings warn_flags, FILE *f)
  *
  * \param loc     the location, defaulting to the current file,
  *                or the program name.
+ * \param indent  optional indentation for the error message.
  * \param flags   the category for this message.
- * \param prefix  put before the message (e.g., "warning").
+ * \param sever   to decide the prefix to put before the message
+ *                (e.g., "warning").
  * \param message the error message, a printf format string.  Iff it
  *                ends with ": ", then no trailing newline is printed,
  *                and the caller should print the remaining
@@ -260,35 +421,41 @@ warnings_print_categories (warnings warn_flags, FILE *f)
  */
 static
 void
-error_message (const location *loc, warnings flags, const char *prefix,
-               const char *message, va_list args)
+error_message (const location *loc, int *indent, warnings flags,
+               severity sever, const char *message, va_list args)
 {
-  unsigned pos = 0;
+  int pos = 0;
 
   if (loc)
     pos += location_print (*loc, stderr);
   else
-    pos += fprintf (stderr, "%s", current_file ? current_file : program_name);
+    pos += fprintf (stderr, "%s", grammar_file ? grammar_file : program_name);
   pos += fprintf (stderr, ": ");
 
-  if (indent_ptr)
+  if (indent)
     {
-      if (*indent_ptr)
-        prefix = NULL;
-      if (!*indent_ptr)
-        *indent_ptr = pos;
-      else if (*indent_ptr > pos)
-        fprintf (stderr, "%*s", *indent_ptr - pos, "");
-      indent_ptr = NULL;
+      if (*indent)
+        sever = severity_disabled;
+      if (!*indent)
+        *indent = pos;
+      else if (*indent > pos)
+        fprintf (stderr, "%*s", *indent - pos, "");
     }
 
-  if (prefix)
-    fprintf (stderr, "%s: ", prefix);
+  const char* style = severity_style (sever);
+
+  if (sever != severity_disabled)
+    {
+      begin_use_class (style, stderr);
+      fprintf (stderr, "%s:", severity_prefix (sever));
+      end_use_class (style, stderr);
+      fputc (' ', stderr);
+    }
 
   vfprintf (stderr, message, args);
   /* Print the type of warning, only if this is not a sub message
      (in which case the prefix is null).  */
-  if (! (flags & silent) && prefix)
+  if (! (flags & silent) && sever != severity_disabled)
     warnings_print_categories (flags, stderr);
 
   {
@@ -296,20 +463,19 @@ error_message (const location *loc, warnings flags, const char *prefix,
     if (l < 2 || message[l - 2] != ':' || message[l - 1] != ' ')
       {
         putc ('\n', stderr);
-        fflush (stderr);
+        flush (stderr);
         if (loc && feature_flag & feature_caret && !(flags & no_caret))
-          location_caret (*loc, stderr);
+          location_caret (*loc, style, stderr);
       }
   }
-  fflush (stderr);
+  flush (stderr);
 }
 
-/** Raise a complaint. That can be a fatal error, an error or just a
-    warning.  */
+/** Raise a complaint (fatal error, error or just warning).  */
 
 static void
-complains (const location *loc, warnings flags, const char *message,
-           va_list args)
+complains (const location *loc, int *indent, warnings flags,
+           const char *message, va_list args)
 {
   severity s = warning_severity (flags);
   if ((flags & complaint) && complaint_status < status_complaint)
@@ -317,13 +483,9 @@ complains (const location *loc, warnings flags, const char *message,
 
   if (severity_warning <= s)
     {
-      const char* prefix =
-        s == severity_fatal ? _("fatal error")
-        : s == severity_error ? _("error")
-        : _("warning");
       if (severity_error <= s && ! complaint_status)
         complaint_status = status_warning_as_error;
-      error_message (loc, flags, prefix, message, args);
+      error_message (loc, indent, flags, s, message, args);
     }
 
   if (flags & fatal)
@@ -335,23 +497,22 @@ complain (location const *loc, warnings flags, const char *message, ...)
 {
   va_list args;
   va_start (args, message);
-  complains (loc, flags, message, args);
+  complains (loc, NULL, flags, message, args);
   va_end (args);
 }
 
 void
-complain_indent (location const *loc, warnings flags, unsigned *indent,
+complain_indent (location const *loc, warnings flags, int *indent,
                  const char *message, ...)
 {
   va_list args;
-  indent_ptr = indent;
   va_start (args, message);
-  complains (loc, flags, message, args);
+  complains (loc, indent, flags, message, args);
   va_end (args);
 }
 
 void
-complain_args (location const *loc, warnings w, unsigned *indent,
+complain_args (location const *loc, warnings w, int *indent,
                int argc, char *argv[])
 {
   switch (argc)
@@ -389,24 +550,23 @@ bison_directive (location const *loc, char const *directive)
 void
 deprecated_directive (location const *loc, char const *old, char const *upd)
 {
-  if (feature_flag & feature_caret)
-    complain (loc, Wdeprecated,
-              _("deprecated directive, use %s"),
-              quote_n (1, upd));
-  else
-    complain (loc, Wdeprecated,
-              _("deprecated directive: %s, use %s"),
-              quote (old), quote_n (1, upd));
-  /* Register updates only if -Wdeprecated is enabled.  */
-  if (warnings_flag[warning_deprecated] != severity_disabled)
-    fixits_register (loc, upd);
+  if (warning_is_enabled (Wdeprecated))
+    {
+      complain (loc, Wdeprecated,
+                _("deprecated directive: %s, use %s"),
+                quote (old), quote_n (1, upd));
+      if (feature_flag & feature_caret)
+        location_caret_suggestion (*loc, upd, stderr);
+      /* Register updates only if -Wdeprecated is enabled.  */
+      fixits_register (loc, upd);
+    }
 }
 
 void
 duplicate_directive (char const *directive,
                      location first, location second)
 {
-  unsigned i = 0;
+  int i = 0;
   if (feature_flag & feature_caret)
     complain_indent (&second, Wother, &i, _("duplicate directive"));
   else
@@ -420,7 +580,7 @@ void
 duplicate_rule_directive (char const *directive,
                           location first, location second)
 {
-  unsigned i = 0;
+  int i = 0;
   complain_indent (&second, complaint, &i,
                    _("only one %s allowed per rule"), directive);
   i += SUB_INDENT;
diff --git a/contrib/tools/bison/src/complain.h b/contrib/tools/bison/src/complain.h
index 266992f6f461..9cb6a60657a4 100644
--- a/contrib/tools/bison/src/complain.h
+++ b/contrib/tools/bison/src/complain.h
@@ -1,6 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 
-   Copyright (C) 2000-2002, 2006, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2000-2002, 2006, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -24,6 +24,20 @@
 /* Sub-messages indent. */
 # define SUB_INDENT (4)
 
+/*---------------.
+| Error stream.  |
+`---------------*/
+
+/** Enable a style on \a out provided it's stderr.  */
+void begin_use_class (const char *style, FILE *out);
+
+/** Disable a style on \a out provided it's stderr.  */
+void end_use_class (const char *style, FILE *out);
+
+/** Flush \a out.  */
+void flush (FILE *out);
+
+
 /*-------------.
 | --warnings.  |
 `-------------*/
@@ -31,14 +45,15 @@
 /** The bits assigned to each warning type.  */
 typedef enum
   {
-    warning_midrule_values, /**< Unset or unused midrule values.  */
+    warning_conflicts_rr,
+    warning_conflicts_sr,
+    warning_dangling_alias,
+    warning_deprecated,
+    warning_empty_rule,
+    warning_midrule_values,
+    warning_other,
+    warning_precedence,
     warning_yacc,           /**< POSIXME.  */
-    warning_conflicts_sr,   /**< S/R conflicts.  */
-    warning_conflicts_rr,   /**< R/R conflicts.  */
-    warning_empty_rule,     /**< Implicitly empty rules.  */
-    warning_deprecated,     /**< Obsolete constructs.  */
-    warning_precedence,     /**< Useless precedence and associativity.  */
-    warning_other,          /**< All other warnings.  */
 
     warnings_size           /**< The number of warnings.  Must be last.  */
   } warning_bit;
@@ -46,6 +61,9 @@ typedef enum
 /** Whether -Werror was set. */
 extern bool warnings_are_errors;
 
+/** Document --warning arguments.  */
+void warning_usage (FILE *out);
+
 /** Decode a single argument from -W.
  *
  *  \param arg      the subarguments to decode.
@@ -76,20 +94,26 @@ void warnings_argmatch (char *args);
 /** Initialize this module.  */
 void complain_init (void);
 
+/** Reclaim resources.  */
+void complain_free (void);
+
+/** Initialize support for colored messages.  */
+void complain_init_color (void);
+
+/** Flags passed to diagnostics functions.  */
 typedef enum
   {
     Wnone             = 0,       /**< Issue no warnings.  */
 
-    Wmidrule_values   = 1 << warning_midrule_values,
-    Wyacc             = 1 << warning_yacc,
-    Wconflicts_sr     = 1 << warning_conflicts_sr,
     Wconflicts_rr     = 1 << warning_conflicts_rr,
+    Wconflicts_sr     = 1 << warning_conflicts_sr,
+    Wdangling_alias   = 1 << warning_dangling_alias,
     Wdeprecated       = 1 << warning_deprecated,
     Wempty_rule       = 1 << warning_empty_rule,
-    Wprecedence       = 1 << warning_precedence,
+    Wmidrule_values   = 1 << warning_midrule_values,
     Wother            = 1 << warning_other,
-
-    Werror            = 1 << 10, /** This bit is no longer used. */
+    Wprecedence       = 1 << warning_precedence,
+    Wyacc             = 1 << warning_yacc,
 
     complaint         = 1 << 11, /**< All complaints.  */
     fatal             = 1 << 12, /**< All fatal errors.  */
@@ -98,23 +122,26 @@ typedef enum
 
     /**< All above warnings.  */
     Weverything       = ~complaint & ~fatal & ~silent,
-    Wall              = Weverything & ~Wyacc
+    Wall              = Weverything & ~Wdangling_alias & ~Wyacc
   } warnings;
 
 /** Whether the warnings of \a flags are all unset.
     (Never enabled, never disabled). */
 bool warning_is_unset (warnings flags);
 
+/** Whether warnings of \a flags should be reported. */
+bool warning_is_enabled (warnings flags);
+
 /** Make a complaint, with maybe a location.  */
 void complain (location const *loc, warnings flags, char const *message, ...)
   __attribute__ ((__format__ (__printf__, 3, 4)));
 
 /** Likewise, but with an \a argc/argv interface.  */
-void complain_args (location const *loc, warnings w, unsigned *indent,
+void complain_args (location const *loc, warnings w, int *indent,
                     int argc, char *arg[]);
 
 /** Make a complaint with location and some indentation.  */
-void complain_indent (location const *loc, warnings flags, unsigned *indent,
+void complain_indent (location const *loc, warnings flags, int *indent,
                       char const *message, ...)
   __attribute__ ((__format__ (__printf__, 4, 5)));
 
diff --git a/contrib/tools/bison/src/conflicts.c b/contrib/tools/bison/src/conflicts.c
index f81d8318645b..5ecd7d17476a 100644
--- a/contrib/tools/bison/src/conflicts.c
+++ b/contrib/tools/bison/src/conflicts.c
@@ -1,6 +1,6 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 1984, 1989, 1992, 2000-2015, 2018-2019 Free Software
+   Copyright (C) 1984, 1989, 1992, 2000-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -23,13 +23,13 @@
 
 #include <bitset.h>
 
-#include "LR0.h"
 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
+#include "lr0.h"
 #include "print-xml.h"
 #include "reader.h"
 #include "state.h"
@@ -38,7 +38,10 @@
 /* -1 stands for not specified. */
 int expected_sr_conflicts = -1;
 int expected_rr_conflicts = -1;
-static char *conflicts;
+
+/* CONFLICTS[STATE-NUM] -- Whether that state has unresolved conflicts.  */
+static bool *conflicts;
+
 static struct obstack solved_conflicts_obstack;
 static struct obstack solved_conflicts_xml_obstack;
 
@@ -73,8 +76,9 @@ log_resolution (rule *r, symbol_number token,
         {
         case shift_resolution:
         case right_resolution:
+          obstack_sgrow (&solved_conflicts_obstack, "    ");
           obstack_printf (&solved_conflicts_obstack,
-                          _("    Conflict between rule %d and token %s"
+                          _("Conflict between rule %d and token %s"
                             " resolved as shift"),
                           r->number,
                           symbols[token]->tag);
@@ -82,16 +86,18 @@ log_resolution (rule *r, symbol_number token,
 
         case reduce_resolution:
         case left_resolution:
+          obstack_sgrow (&solved_conflicts_obstack, "    ");
           obstack_printf (&solved_conflicts_obstack,
-                          _("    Conflict between rule %d and token %s"
+                          _("Conflict between rule %d and token %s"
                             " resolved as reduce"),
                           r->number,
                           symbols[token]->tag);
           break;
 
         case nonassoc_resolution:
+          obstack_sgrow (&solved_conflicts_obstack, "    ");
           obstack_printf (&solved_conflicts_obstack,
-                          _("    Conflict between rule %d and token %s"
+                          _("Conflict between rule %d and token %s"
                             " resolved as an error"),
                           r->number,
                           symbols[token]->tag);
@@ -369,13 +375,16 @@ set_conflicts (state *s, symbol **errors)
     s->solved_conflicts_xml = obstack_finish0 (&solved_conflicts_xml_obstack);
 
   /* Loop over all rules which require lookahead in this state.  Check
-     for conflicts not resolved above.  */
-  for (int i = 0; i < reds->num; ++i)
-    {
-      if (!bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
-        conflicts[s->number] = 1;
-      bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]);
-    }
+     for conflicts not resolved above.
+
+     reds->lookahead_tokens can be NULL if the LR type is LR(0).  */
+  if (reds->lookahead_tokens)
+    for (int i = 0; i < reds->num; ++i)
+      {
+        if (!bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
+          conflicts[s->number] = true;
+        bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]);
+      }
 }
 
 
@@ -425,7 +434,7 @@ conflicts_update_state_numbers (state_number old_to_new[],
 `---------------------------------------------*/
 
 static size_t
-count_state_sr_conflicts (state *s)
+count_state_sr_conflicts (const state *s)
 {
   transitions *trans = s->transitions;
   reductions *reds = s->reductions;
@@ -473,7 +482,7 @@ count_sr_conflicts (void)
 `-----------------------------------------------------------------*/
 
 static size_t
-count_state_rr_conflicts (state *s)
+count_state_rr_conflicts (const state *s)
 {
   reductions *reds = s->reductions;
   size_t res = 0;
@@ -585,24 +594,22 @@ conflicts_output (FILE *out)
 {
   bool printed_sth = false;
   for (state_number i = 0; i < nstates; ++i)
-    {
-      state *s = states[i];
-      if (conflicts[i])
-        {
-          int src = count_state_sr_conflicts (s);
-          int rrc = count_state_rr_conflicts (s);
-          fprintf (out, _("State %d "), i);
-          if (src && rrc)
-            fprintf (out,
-                     _("conflicts: %d shift/reduce, %d reduce/reduce\n"),
-                     src, rrc);
-          else if (src)
-            fprintf (out, _("conflicts: %d shift/reduce\n"), src);
-          else if (rrc)
-            fprintf (out, _("conflicts: %d reduce/reduce\n"), rrc);
-          printed_sth = true;
-        }
-    }
+    if (conflicts[i])
+      {
+        const state *s = states[i];
+        int src = count_state_sr_conflicts (s);
+        int rrc = count_state_rr_conflicts (s);
+        fprintf (out, _("State %d "), i);
+        if (src && rrc)
+          fprintf (out,
+                   _("conflicts: %d shift/reduce, %d reduce/reduce\n"),
+                   src, rrc);
+        else if (src)
+          fprintf (out, _("conflicts: %d shift/reduce\n"), src);
+        else if (rrc)
+          fprintf (out, _("conflicts: %d reduce/reduce\n"), rrc);
+        printed_sth = true;
+      }
   if (printed_sth)
     fputs ("\n\n", out);
 }
diff --git a/contrib/tools/bison/src/conflicts.h b/contrib/tools/bison/src/conflicts.h
index c068e36da96e..5b26efdefe09 100644
--- a/contrib/tools/bison/src/conflicts.h
+++ b/contrib/tools/bison/src/conflicts.h
@@ -1,6 +1,6 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 2000-2002, 2004, 2007, 2009-2015, 2018-2019 Free
+   Copyright (C) 2000-2002, 2004, 2007, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/derives.c b/contrib/tools/bison/src/derives.c
index 7b7d5c94af39..c859a5e23d39 100644
--- a/contrib/tools/bison/src/derives.c
+++ b/contrib/tools/bison/src/derives.c
@@ -1,6 +1,6 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2015, 2018-2019 Free
+   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -40,15 +40,12 @@ rule ***derives;
 static void
 print_derives (void)
 {
-  int i;
-
   fputs ("DERIVES\n", stderr);
 
-  for (i = ntokens; i < nsyms; i++)
+  for (symbol_number i = ntokens; i < nsyms; ++i)
     {
-      rule **rp;
       fprintf (stderr, "  %s derives\n", symbols[i]->tag);
-      for (rp = derives[i - ntokens]; *rp; ++rp)
+      for (rule **rp = derives[i - ntokens]; *rp; ++rp)
         {
           fprintf (stderr, "    %3d ", (*rp)->user_number);
           rule_rhs_print (*rp, stderr);
@@ -63,10 +60,6 @@ print_derives (void)
 void
 derives_compute (void)
 {
-  symbol_number i;
-  rule_number r;
-  rule **q;
-
   /* DSET[NTERM - NTOKENS] -- A linked list of the numbers of the rules
      whose LHS is NTERM.  */
   rule_list **dset = xcalloc (nvars, sizeof *dset);
@@ -76,7 +69,7 @@ derives_compute (void)
      indexed by rule numbers.  */
   rule_list *delts = xnmalloc (nrules, sizeof *delts);
 
-  for (r = nrules - 1; r >= 0; --r)
+  for (rule_number r = nrules - 1; r >= 0; --r)
     {
       symbol_number lhs = rules[r].lhs->number;
       rule_list *p = &delts[r];
@@ -90,9 +83,10 @@ derives_compute (void)
      it a single array.  */
 
   derives = xnmalloc (nvars, sizeof *derives);
-  q = xnmalloc (nvars + nrules, sizeof *q);
+  /* Q is the storage for DERIVES[...] (DERIVES[0] = q).  */
+  rule **q = xnmalloc (nvars + nrules, sizeof *q);
 
-  for (i = ntokens; i < nsyms; i++)
+  for (symbol_number i = ntokens; i < nsyms; ++i)
     {
       rule_list *p = dset[i - ntokens];
       derives[i - ntokens] = q;
@@ -115,6 +109,9 @@ derives_compute (void)
 void
 derives_free (void)
 {
-  free (derives[0]);
-  free (derives);
+  if (derives)
+    {
+      free (derives[0]);
+      free (derives);
+    }
 }
diff --git a/contrib/tools/bison/src/derives.h b/contrib/tools/bison/src/derives.h
index 521a10c60b0b..33430e6ff5ea 100644
--- a/contrib/tools/bison/src/derives.h
+++ b/contrib/tools/bison/src/derives.h
@@ -1,6 +1,6 @@
 /* Match rules with nonterminals for bison,
 
-   Copyright (C) 1984, 1989, 2000-2002, 2009-2015, 2018-2019 Free
+   Copyright (C) 1984, 1989, 2000-2002, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/files.c b/contrib/tools/bison/src/files.c
index 727a41af802c..8bc7a4da041f 100644
--- a/contrib/tools/bison/src/files.c
+++ b/contrib/tools/bison/src/files.c
@@ -1,6 +1,6 @@
 /* Open and close files for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2019 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,11 +21,13 @@
 #include <config.h>
 #include "system.h"
 
+#include <configmake.h> /* PKGDATADIR */
 #include <error.h>
 #include <dirname.h>
 #include <get-errno.h>
 #include <quote.h>
 #include <quotearg.h>
+#include <relocatable.h> /* relocate2 */
 #include <stdio-safer.h>
 #include <xstrndup.h>
 
@@ -49,7 +51,7 @@ location spec_name_prefix_loc = EMPTY_LOCATION_INIT;
 char *spec_verbose_file = NULL;  /* for --verbose. */
 char *spec_graph_file = NULL;    /* for -g. */
 char *spec_xml_file = NULL;      /* for -x. */
-char *spec_defines_file = NULL;  /* for --defines. */
+char *spec_header_file = NULL;  /* for --defines. */
 char *parser_file_name;
 
 /* All computed output file names.  */
@@ -66,7 +68,6 @@ static generated_file *generated_files = NULL;
 static int generated_files_size = 0;
 
 uniqstr grammar_file = NULL;
-uniqstr current_file = NULL;
 
 /* If --output=dir/foo.c was specified,
    DIR_PREFIX is 'dir/' and ALL_BUT_EXT and ALL_BUT_TAB_EXT are 'dir/foo'.
@@ -343,14 +344,15 @@ compute_output_file_names (void)
 
   if (defines_flag)
     {
-      if (! spec_defines_file)
-        spec_defines_file = concat2 (all_but_ext, header_extension);
+      if (! spec_header_file)
+        spec_header_file = concat2 (all_but_ext, header_extension);
     }
 
   if (graph_flag)
     {
       if (! spec_graph_file)
-        spec_graph_file = concat2 (all_but_tab_ext, ".dot");
+        spec_graph_file = concat2 (all_but_tab_ext,
+                                   304 <= required_version ? ".gv" : ".dot");
       output_file_name_check (&spec_graph_file, false);
     }
 
@@ -414,6 +416,30 @@ unlink_generated_sources (void)
       unlink (generated_files[i].name);
 }
 
+/* Memory allocated by relocate2, to free.  */
+static char *relocate_buffer = NULL;
+
+#include "uniqstr.h"
+#include <contrib/tools/bison/arcadia_root.h>
+#define STR(a) XSTR(a)
+#define XSTR(a) #a
+char const *
+pkgdatadir (void)
+{
+  const char* arc_path  = getenv("ARCADIA_ROOT_DISTBUILD");
+  if (arc_path == NULL)
+    arc_path = ArcadiaRoot();
+  return uniqstr_concat(3, arc_path, "/", STR(BISON_DATA_DIR));
+  
+  if (relocate_buffer)
+    return relocate_buffer;
+  else
+    {
+      char const *cp = getenv ("BISON_PKGDATADIR");
+      return cp ? cp : relocate2 (PKGDATADIR, &relocate_buffer);
+    }
+}
+
 void
 output_file_names_free (void)
 {
@@ -421,10 +447,11 @@ output_file_names_free (void)
   free (spec_verbose_file);
   free (spec_graph_file);
   free (spec_xml_file);
-  free (spec_defines_file);
+  free (spec_header_file);
   free (parser_file_name);
   free (dir_prefix);
   for (int i = 0; i < generated_files_size; i++)
     free (generated_files[i].name);
   free (generated_files);
+  free (relocate_buffer);
 }
diff --git a/contrib/tools/bison/src/files.h b/contrib/tools/bison/src/files.h
index d5ee44c274a3..00814ad05176 100644
--- a/contrib/tools/bison/src/files.h
+++ b/contrib/tools/bison/src/files.h
@@ -1,6 +1,6 @@
 /* File names and variables for bison,
 
-   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2015, 2018-2019
+   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2015, 2018-2020
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -48,7 +48,7 @@ extern char *spec_graph_file;
 extern char *spec_xml_file;
 
 /* File name specified with --defines.  */
-extern char *spec_defines_file;
+extern char *spec_header_file;
 
 /* Directory prefix of output file names.  */
 extern char *dir_prefix;
@@ -58,12 +58,12 @@ extern char *dir_prefix;
    and therefore GCC warns about a name clash. */
 extern uniqstr grammar_file;
 
-/* The current file name.  Might change with #line.  */
-extern uniqstr current_file;
-
 /* The computed base for output file names.  */
 extern char *all_but_ext;
 
+/* Where our data files are installed.  */
+char const *pkgdatadir (void);
+
 void compute_output_file_names (void);
 void output_file_names_free (void);
 
diff --git a/contrib/tools/bison/src/fixits.c b/contrib/tools/bison/src/fixits.c
index 5ffd793524e7..37a0b7dd998a 100644
--- a/contrib/tools/bison/src/fixits.c
+++ b/contrib/tools/bison/src/fixits.c
@@ -1,6 +1,6 @@
 /* Support for fixing grammar files.
 
-   Copyright (C) 2019 Free Software Foundation, Inc.
+   Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -52,6 +52,11 @@ fixit_new (location const *loc, char const* fix)
   return res;
 }
 
+static int
+fixit_cmp (const  fixit *a, const fixit *b)
+{
+  return location_cmp (a->location, b->location);
+}
 
 static void
 fixit_free (fixit *f)
@@ -69,8 +74,8 @@ fixit_print (fixit const *f, FILE *out)
 {
   fprintf (out, "fix-it:%s:{%d:%d-%d:%d}:%s\n",
            quotearg_n_style (1, c_quoting_style, f->location.start.file),
-           f->location.start.line, f->location.start.column,
-           f->location.end.line, f->location.end.column,
+           f->location.start.line, f->location.start.byte,
+           f->location.end.line, f->location.end.byte,
            quotearg_n_style (2, c_quoting_style, f->fix));
 }
 
@@ -85,8 +90,8 @@ fixits_register (location const *loc, char const* fix)
                                    (gl_listelement_dispose_fn) fixit_free,
                                    true);
   fixit *f = fixit_new (loc, fix);
-  gl_list_add_last (fixits, f);
-  if (feature_flag & feature_fixit_parsable)
+  gl_sortedlist_add (fixits, (gl_listelement_compar_fn) fixit_cmp, f);
+  if (feature_flag & feature_fixit)
     fixit_print (f, stderr);
 }
 
@@ -136,19 +141,29 @@ fixits_run (void)
             }
           putc (c, out);
         }
+
       /* Look for the right offset. */
-      while (offset < f->location.start.column)
+      bool need_eol = false;
+      while (offset < f->location.start.byte)
         {
           int c = getc (in);
           if (c == EOF)
             break;
           ++offset;
-          putc (c, out);
+          if (c == '\n')
+            /* The position we are asked for is beyond the actual
+               line: pad with spaces, and remember we need a \n.  */
+            need_eol = true;
+          putc (need_eol ? ' ' : c, out);
         }
 
       /* Paste the fix instead. */
       fputs (f->fix, out);
 
+      /* Maybe install the eol afterwards.  */
+      if (need_eol)
+        putc ('\n', out);
+
       /* Skip the bad input. */
       while (line < f->location.end.line)
         {
@@ -161,16 +176,17 @@ fixits_run (void)
               offset = 1;
             }
         }
-      while (offset < f->location.end.column)
+      while (offset < f->location.end.byte)
         {
           int c = getc (in);
           if (c == EOF)
             break;
           ++offset;
         }
+
       /* If erasing the content of a full line, also remove the
          end-of-line. */
-      if (f->fix[0] == 0 && f->location.start.column == 1)
+      if (f->fix[0] == 0 && f->location.start.byte == 1)
         {
           int c = getc (in);
           if (c == EOF)
diff --git a/contrib/tools/bison/src/fixits.h b/contrib/tools/bison/src/fixits.h
index 45c2780af8f5..f79217a3d322 100644
--- a/contrib/tools/bison/src/fixits.h
+++ b/contrib/tools/bison/src/fixits.h
@@ -1,6 +1,6 @@
 /* Support for fixing grammar files.
 
-   Copyright (C) 2019 Free Software Foundation, Inc.
+   Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/contrib/tools/bison/src/flex-scanner.h b/contrib/tools/bison/src/flex-scanner.h
index 9e4408f49dc1..6f6861741acd 100644
--- a/contrib/tools/bison/src/flex-scanner.h
+++ b/contrib/tools/bison/src/flex-scanner.h
@@ -1,6 +1,6 @@
 /* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
 
-   Copyright (C) 2006, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2006, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/getargs.c b/contrib/tools/bison/src/getargs.c
index 417e163c2aaf..6f19a4ea8cc5 100644
--- a/contrib/tools/bison/src/getargs.c
+++ b/contrib/tools/bison/src/getargs.c
@@ -1,6 +1,6 @@
 /* Parse command line arguments for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2019 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -19,8 +19,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include "getargs.h"
+
 #include "system.h"
-#include "output.h"
 
 #include <argmatch.h>
 #include <c-strcase.h>
@@ -28,12 +29,13 @@
 #include <error.h>
 #include <getopt.h>
 #include <progname.h>
+#include <quote.h>
+#include <textstyle.h>
 
 #include "complain.h"
 #include "files.h"
-#include "getargs.h"
 #include "muscle-tab.h"
-#include "quote.h"
+#include "output.h"
 #include "uniqstr.h"
 
 bool defines_flag = false;
@@ -43,6 +45,7 @@ bool no_lines_flag = false;
 bool token_table_flag = false;
 location yacc_loc = EMPTY_LOCATION_INIT;
 bool update_flag = false; /* for -u */
+bool color_debug = false;
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
@@ -65,28 +68,28 @@ const char *skeleton = NULL;
 int language_prio = default_prio;
 struct bison_language const *language = &valid_languages[0];
 
+typedef int* (xargmatch_fn) (const char *context, const char *arg);
+
 /** Decode an option's key.
  *
- *  \param opt      option being decoded.
- *  \param keys     array of valid subarguments.
- *  \param values   array of corresponding (int) values.
- *  \param all      the all value.
- *  \param flags    the flags to update
- *  \param arg      the subarguments to decode.
- *                  If null, then activate all the flags.
- *  \param no       length of the potential "no-" prefix.
- *                  Can be 0 or 3. If 3, negate the action of the subargument.
+ *  \param opt        option being decoded.
+ *  \param xargmatch  matching function.
+ *  \param all        the value of the argument 'all'.
+ *  \param flags      the flags to update
+ *  \param arg        the subarguments to decode.
+ *                    If null, then activate all the flags.
+ *  \param no         length of the potential "no-" prefix.
+ *                    Can be 0 or 3. If 3, negate the action of the subargument.
  *
  *  If VALUE != 0 then KEY sets flags and no-KEY clears them.
  *  If VALUE == 0 then KEY clears all flags from \c all and no-KEY sets all
  *  flags from \c all.  Thus no-none = all and no-all = none.
  */
 static void
-flag_argmatch (const char *opt,
-               const char *const keys[], const int values[],
+flag_argmatch (const char *opt, xargmatch_fn xargmatch,
                int all, int *flags, char *arg, size_t no)
 {
-  int value = XARGMATCH (opt, arg + no, keys, values);
+  int value = *xargmatch (opt, arg + no);
 
   /* -rnone == -rno-all, and -rno-none == -rall.  */
   if (!value)
@@ -101,30 +104,38 @@ flag_argmatch (const char *opt,
     *flags |= value;
 }
 
+typedef void (usage_fn) (FILE *out);
+
 /** Decode an option's set of keys.
  *
- *  \param opt      option being decoded (e.g., --report).
- *  \param keys     array of valid subarguments.
- *  \param values   array of corresponding (int) values.
- *  \param all      the all value.
- *  \param flags    the flags to update
- *  \param args     comma separated list of effective subarguments to decode.
- *                  If 0, then activate all the flags.
+ *  \param opt        option being decoded (e.g., --report).
+ *  \param xargmatch  matching function.
+ *  \param usage      function that implement --help for this option.
+ *  \param all        the value of the argument 'all'.
+ *  \param flags      the flags to update
+ *  \param args       comma separated list of effective subarguments to decode.
+ *                    If 0, then activate all the flags.
  */
 static void
 flags_argmatch (const char *opt,
-                const char * const keys[], const int values[],
+                xargmatch_fn xargmatch,
+                usage_fn usage,
                 int all, int *flags, char *args)
 {
-  if (args)
+  if (!args)
+    *flags |= all;
+  else if (STREQ (args, "help"))
+    {
+      usage (stdout);
+      exit (EXIT_SUCCESS);
+    }
+  else
     for (args = strtok (args, ","); args; args = strtok (NULL, ","))
       {
         size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
-        flag_argmatch (opt, keys,
-                       values, all, flags, args, no);
+        flag_argmatch (opt, xargmatch,
+                       all, flags, args, no);
       }
-  else
-    *flags |= all;
 }
 
 
@@ -139,110 +150,188 @@ flags_argmatch (const char *opt,
  *  \arg FlagName_flag   the flag to update.
  */
 #define FLAGS_ARGMATCH(FlagName, Args, All)                             \
-  flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \
+  flags_argmatch ("--" #FlagName,                                       \
+                  (xargmatch_fn*) argmatch_## FlagName ## _value,        \
+                  argmatch_## FlagName ## _usage,                       \
                   All, &FlagName ## _flag, Args)
 
+/*---------------------.
+| --color's handling.  |
+`---------------------*/
+
+enum color
+  {
+    color_always,
+    color_never,
+    color_auto
+  };
+
+ARGMATCH_DEFINE_GROUP (color, enum color)
+
+static const argmatch_color_doc argmatch_color_docs[] =
+{
+  { "always",     N_("colorize the output") },
+  { "never",      N_("don't colorize the output") },
+  { "auto",       N_("colorize if the output device is a tty") },
+  { NULL, NULL },
+};
+
+static const argmatch_color_arg argmatch_color_args[] =
+{
+  { "always",   color_always },
+  { "yes",      color_always },
+  { "never",    color_never },
+  { "no",       color_never },
+  { "auto",     color_auto },
+  { "tty",      color_auto },
+  { NULL, color_always },
+};
+
+const argmatch_color_group_type argmatch_color_group =
+{
+  argmatch_color_args,
+  argmatch_color_docs,
+  /* TRANSLATORS: Use the same translation for WHEN as in the
+     --color=WHEN help message.  */
+  N_("WHEN can be one of the following:"),
+  NULL
+};
+
 
 /*----------------------.
 | --report's handling.  |
 `----------------------*/
 
-static const char * const report_args[] =
+ARGMATCH_DEFINE_GROUP (report, enum report)
+
+static const argmatch_report_doc argmatch_report_docs[] =
 {
-  /* In a series of synonyms, present the most meaningful first, so
-     that argmatch_valid be more readable.  */
-  "none",
-  "state", "states",
-  "itemset", "itemsets",
-  "lookahead", "lookaheads", "look-ahead",
-  "solved",
-  "all",
-  0
+  { "states",     N_("describe the states") },
+  { "itemsets",   N_("complete the core item sets with their closure") },
+  { "lookaheads", N_("explicitly associate lookahead tokens to items") },
+  { "solved",     N_("describe shift/reduce conflicts solving") },
+  { "all",        N_("include all the above information") },
+  { "none",       N_("disable the report") },
+  { NULL, NULL },
 };
 
-static const int report_types[] =
+static const argmatch_report_arg argmatch_report_args[] =
 {
-  report_none,
-  report_states, report_states,
-  report_states | report_itemsets, report_states | report_itemsets,
-  report_states | report_lookahead_tokens,
-  report_states | report_lookahead_tokens,
-  report_states | report_lookahead_tokens,
-  report_states | report_solved_conflicts,
-  report_all
+  { "none",        report_none },
+  { "states",      report_states },
+  { "itemsets",    report_states | report_itemsets },
+  { "lookaheads",  report_states | report_lookahead_tokens },
+  { "solved",      report_states | report_solved_conflicts },
+  { "all",         report_all },
+  { NULL, report_none },
 };
 
-ARGMATCH_VERIFY (report_args, report_types);
-
+const argmatch_report_group_type argmatch_report_group =
+{
+  argmatch_report_args,
+  argmatch_report_docs,
+  /* TRANSLATORS: Use the same translation for THINGS as in the
+     --report=THINGS help message.  */
+  N_("THINGS is a list of comma separated words that can include:"),
+  NULL
+};
 
 /*---------------------.
 | --trace's handling.  |
 `---------------------*/
 
-static const char * const trace_args[] =
+ARGMATCH_DEFINE_GROUP (trace, enum trace)
+
+static const argmatch_trace_doc argmatch_trace_docs[] =
 {
-  "none       - no traces",
-  "scan       - grammar scanner traces",
-  "parse      - grammar parser traces",
-  "automaton  - construction of the automaton",
-  "bitsets    - use of bitsets",
-  "grammar    - reading, reducing the grammar",
-  "resource   - memory consumption (where available)",
-  "sets       - grammar sets: firsts, nullable etc.",
-  "muscles    - m4 definitions passed to the skeleton",
-  "tools      - m4 invocation",
-  "m4         - m4 traces",
-  "skeleton   - skeleton postprocessing",
-  "time       - time consumption",
-  "ielr       - IELR conversion",
-  "all        - all of the above",
-  0
+  /* Meant for developers only, don't translate them.  */
+  { "none",       "no traces" },
+  { "locations",  "full display of the locations" },
+  { "scan",       "grammar scanner traces" },
+  { "parse",      "grammar parser traces" },
+  { "automaton",  "construction of the automaton" },
+  { "bitsets",    "use of bitsets" },
+  { "closure",    "input/output of closure" },
+  { "grammar",    "reading, reducing the grammar" },
+  { "resource",   "memory consumption (where available)" },
+  { "sets",       "grammar sets: firsts, nullable etc." },
+  { "muscles",    "m4 definitions passed to the skeleton" },
+  { "tools",      "m4 invocation" },
+  { "m4",         "m4 traces" },
+  { "skeleton",   "skeleton postprocessing" },
+  { "time",       "time consumption" },
+  { "ielr",       "IELR conversion" },
+  { "all",        "all of the above" },
+  { NULL, NULL},
 };
 
-static const int trace_types[] =
+static const argmatch_trace_arg argmatch_trace_args[] =
 {
-  trace_none,
-  trace_scan,
-  trace_parse,
-  trace_automaton,
-  trace_bitsets,
-  trace_grammar,
-  trace_resource,
-  trace_sets,
-  trace_muscles,
-  trace_tools,
-  trace_m4,
-  trace_skeleton,
-  trace_time,
-  trace_ielr,
-  trace_all
+  { "none",      trace_none },
+  { "locations", trace_locations },
+  { "scan",      trace_scan },
+  { "parse",     trace_parse },
+  { "automaton", trace_automaton },
+  { "bitsets",   trace_bitsets },
+  { "closure",   trace_closure },
+  { "grammar",   trace_grammar },
+  { "resource",  trace_resource },
+  { "sets",      trace_sets },
+  { "muscles",   trace_muscles },
+  { "tools",     trace_tools },
+  { "m4",        trace_m4 },
+  { "skeleton",  trace_skeleton },
+  { "time",      trace_time },
+  { "ielr",      trace_ielr },
+  { "all",       trace_all },
+  { NULL,        trace_none},
 };
 
-ARGMATCH_VERIFY (trace_args, trace_types);
-
+const argmatch_trace_group_type argmatch_trace_group =
+{
+  argmatch_trace_args,
+  argmatch_trace_docs,
+  N_("TRACES is a list of comma separated words that can include:"),
+  NULL
+};
 
 /*-----------------------.
 | --feature's handling.  |
 `-----------------------*/
 
-static const char * const feature_args[] =
+ARGMATCH_DEFINE_GROUP (feature, enum feature)
+
+static const argmatch_feature_doc argmatch_feature_docs[] =
 {
-  "none",
-  "caret", "diagnostics-show-caret",
-  "fixit", "diagnostics-parseable-fixits",
-  "all",
-  0
+  { "caret",       N_("show errors with carets") },
+  { "fixit",       N_("show machine-readable fixes") },
+  { "syntax-only", N_("do not generate any file") },
+  { "all",         N_("all of the above") },
+  { "none",        N_("disable all of the above") },
+  { NULL, NULL }
 };
 
-static const int feature_types[] =
+static const argmatch_feature_arg argmatch_feature_args[] =
 {
-  feature_none,
-  feature_caret, feature_caret,
-  feature_fixit_parsable, feature_fixit_parsable,
-  feature_all
+  { "none",                          feature_none },
+  { "caret",                         feature_caret },
+  { "diagnostics-show-caret",        feature_caret },
+  { "fixit",                         feature_fixit },
+  { "diagnostics-parseable-fixits",  feature_fixit },
+  { "syntax-only",                   feature_syntax_only },
+  { "all",                           feature_all },
+  { NULL, feature_none}
 };
 
-ARGMATCH_VERIFY (feature_args, feature_types);
+const argmatch_feature_group_type argmatch_feature_group =
+{
+  argmatch_feature_args,
+  argmatch_feature_docs,
+  /* TRANSLATORS: Use the same translation for FEATURES as in the
+     --feature=FEATURES help message.  */
+  N_("FEATURES is a list of comma separated words that can include:"),
+  NULL
+};
 
 /*-------------------------------------------.
 | Display the help message and exit STATUS.  |
@@ -266,8 +355,7 @@ usage (int status)
       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\
 Generate a deterministic LR or generalized LR (GLR) parser employing\n\
-LALR(1), IELR(1), or canonical LR(1) parser tables.  IELR(1) and\n\
-canonical LR(1) support is experimental.\n\
+LALR(1), IELR(1), or canonical LR(1) parser tables.\n\
 \n\
 "), stdout);
 
@@ -277,10 +365,10 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       fputs (_("\
 The same is true for optional arguments.\n\
 "), stdout);
+      putc ('\n', stdout);
 
       fputs (_("\
-\n\
-Operation modes:\n\
+Operation Modes:\n\
   -h, --help                 display this help and exit\n\
   -V, --version              output version information and exit\n\
       --print-localedir      output directory containing locale-dependent data\n\
@@ -288,32 +376,48 @@ Operation modes:\n\
       --print-datadir        output directory containing skeletons and XSLT\n\
                              and exit\n\
   -u, --update               apply fixes to the source grammar file and exit\n\
-  -y, --yacc                 emulate POSIX Yacc\n\
+  -f, --feature[=FEATURES]   activate miscellaneous features\n\
+\n\
+"), stdout);
+
+      argmatch_feature_usage (stdout);
+      putc ('\n', stdout);
+
+      fputs (_("\
+Diagnostics:\n\
   -W, --warnings[=CATEGORY]  report the warnings falling in CATEGORY\n\
-  -f, --feature[=FEATURE]    activate miscellaneous features\n\
+      --color[=WHEN]         whether to colorize the diagnostics\n\
+      --style=FILE           specify the CSS FILE for colorizer diagnostics\n\
 \n\
 "), stdout);
 
+      warning_usage (stdout);
+      putc ('\n', stdout);
+
+      argmatch_color_usage (stdout);
+      putc ('\n', stdout);
+
       fputs (_("\
-Parser:\n\
+Tuning the Parser:\n\
   -L, --language=LANGUAGE          specify the output programming language\n\
   -S, --skeleton=FILE              specify the skeleton to use\n\
   -t, --debug                      instrument the parser for tracing\n\
                                    same as '-Dparse.trace'\n\
       --locations                  enable location support\n\
-  -D, --define=NAME[=VALUE]        similar to '%define NAME \"VALUE\"'\n\
-  -F, --force-define=NAME[=VALUE]  override '%define NAME \"VALUE\"'\n\
+  -D, --define=NAME[=VALUE]        similar to '%define NAME VALUE'\n\
+  -F, --force-define=NAME[=VALUE]  override '%define NAME VALUE'\n\
   -p, --name-prefix=PREFIX         prepend PREFIX to the external symbols\n\
-                                   deprecated by '-Dapi.prefix=PREFIX'\n\
+                                   deprecated by '-Dapi.prefix={PREFIX}'\n\
   -l, --no-lines                   don't generate '#line' directives\n\
   -k, --token-table                include a table of token names\n\
+  -y, --yacc                       emulate POSIX Yacc\n\
 "), stdout);
       putc ('\n', stdout);
 
       /* Keep -d and --defines separate so that ../build-aux/cross-options.pl
        * won't assume that -d also takes an argument.  */
       fputs (_("\
-Output:\n\
+Output Files:\n\
       --defines[=FILE]       also produce a header file\n\
   -d                         likewise but cannot specify FILE (for POSIX Yacc)\n\
   -r, --report=THINGS        also produce details on the automaton\n\
@@ -323,46 +427,12 @@ Output:\n\
   -o, --output=FILE          leave output to FILE\n\
   -g, --graph[=FILE]         also output a graph of the automaton\n\
   -x, --xml[=FILE]           also output an XML report of the automaton\n\
-                             (the XML schema is experimental)\n\
-"), stdout);
-      putc ('\n', stdout);
-
-      fputs (_("\
-Warning categories include:\n\
-  'midrule-values'    unset or unused midrule values\n\
-  'yacc'              incompatibilities with POSIX Yacc\n\
-  'conflicts-sr'      S/R conflicts (enabled by default)\n\
-  'conflicts-rr'      R/R conflicts (enabled by default)\n\
-  'deprecated'        obsolete constructs\n\
-  'empty-rule'        empty rules without %empty\n\
-  'precedence'        useless precedence and associativity\n\
-  'other'             all other warnings (enabled by default)\n\
-  'all'               all the warnings except 'yacc'\n\
-  'no-CATEGORY'       turn off warnings in CATEGORY\n\
-  'none'              turn off all the warnings\n\
-  'error[=CATEGORY]'  treat warnings as errors\n\
 "), stdout);
       putc ('\n', stdout);
 
-      fputs (_("\
-THINGS is a list of comma separated words that can include:\n\
-  'state'        describe the states\n\
-  'itemset'      complete the core item sets with their closure\n\
-  'lookahead'    explicitly associate lookahead tokens to items\n\
-  'solved'       describe shift/reduce conflicts solving\n\
-  'all'          include all the above information\n\
-  'none'         disable the report\n\
-"), stdout);
+      argmatch_report_usage (stdout);
       putc ('\n', stdout);
 
-      fputs (_("\
-FEATURE is a list of comma separated words that can include:\n\
-  'caret'        show errors with carets\n\
-  'all'          all of the above\n\
-  'none'         disable all of the above\n\
-  "), stdout);
-
-      putc ('\n', stdout);
       printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
       printf (_("%s home page: <%s>.\n"), PACKAGE_NAME, PACKAGE_URL);
       fputs (_("General help using GNU software: "
@@ -436,7 +506,7 @@ skeleton_arg (char const *arg, int prio, location loc)
 void
 language_argmatch (char const *arg, int prio, location loc)
 {
-  char const *msg;
+  char const *msg = NULL;
 
   if (prio < language_prio)
     {
@@ -451,10 +521,9 @@ language_argmatch (char const *arg, int prio, location loc)
     }
   else if (language_prio == prio)
     msg = _("multiple language declarations are invalid");
-  else
-    return;
 
-  complain (&loc, complaint, msg, quotearg_colon (arg));
+  if (msg)
+    complain (&loc, complaint, msg, quotearg_colon (arg));
 }
 
 /*----------------------.
@@ -491,12 +560,16 @@ static char const short_options[] =
 /* Values for long options that do not have single-letter equivalents.  */
 enum
 {
-  LOCATIONS_OPTION = CHAR_MAX + 1,
-  PRINT_LOCALEDIR_OPTION,
+  COLOR_OPTION = CHAR_MAX + 1,
+  FIXED_OUTPUT_FILES_OPTION,
+  LOCATIONS_OPTION,
   PRINT_DATADIR_OPTION,
-  REPORT_FILE_OPTION
+  PRINT_LOCALEDIR_OPTION,
+  REPORT_FILE_OPTION,
+  STYLE_OPTION
 };
 
+/* In the same order as in usage(), and in the documentation.  */
 static struct option const long_options[] =
 {
   /* Operation modes. */
@@ -505,53 +578,43 @@ static struct option const long_options[] =
   { "print-localedir", no_argument,       0,   PRINT_LOCALEDIR_OPTION },
   { "print-datadir",   no_argument,       0,   PRINT_DATADIR_OPTION   },
   { "update",          no_argument,       0,   'u' },
-  { "warnings",        optional_argument, 0,   'W' },
-
-  /* Parser. */
-  { "name-prefix",   required_argument,   0,   'p' },
-
-  /* Output. */
+  { "feature",         optional_argument, 0,   'f' },
+
+  /* Diagnostics.  */
+  { "warnings",        optional_argument,  0, 'W' },
+  { "color",           optional_argument,  0,  COLOR_OPTION },
+  { "style",           optional_argument,  0,  STYLE_OPTION },
+
+  /* Tuning the Parser. */
+  { "language",       required_argument,   0, 'L' },
+  { "skeleton",       required_argument,   0, 'S' },
+  { "debug",          no_argument,         0, 't' },
+  { "locations",      no_argument,         0, LOCATIONS_OPTION },
+  { "define",         required_argument,   0, 'D' },
+  { "force-define",   required_argument,   0, 'F' },
+  { "name-prefix",    required_argument,   0, 'p' },
+  { "no-lines",       no_argument,         0, 'l' },
+  { "token-table",    no_argument,         0, 'k' },
+  { "yacc",           no_argument,         0, 'y' },
+
+  /* Output Files. */
+  { "defines",     optional_argument,   0,   'd' },
+  { "report",      required_argument,   0,   'r' },
+  { "report-file", required_argument,   0,   REPORT_FILE_OPTION },
+  { "verbose",     no_argument,         0,   'v' },
   { "file-prefix", required_argument,   0,   'b' },
   { "output",      required_argument,   0,   'o' },
-  { "output-file", required_argument,   0,   'o' },
   { "graph",       optional_argument,   0,   'g' },
   { "xml",         optional_argument,   0,   'x' },
-  { "report",      required_argument,   0,   'r' },
-  { "report-file", required_argument,   0,   REPORT_FILE_OPTION },
-  { "verbose",     no_argument,         0,   'v' },
 
   /* Hidden. */
-  { "trace",         optional_argument,   0,     'T' },
-
-  /* Output.  */
-  { "defines",     optional_argument,   0,   'd' },
-  { "feature",     optional_argument,   0,   'f' },
-
-  /* Operation modes.  */
-  { "fixed-output-files", no_argument,  0,   'y' },
-  { "yacc",               no_argument,  0,   'y' },
-
-  /* Parser.  */
-  { "debug",          no_argument,               0,   't' },
-  { "define",         required_argument,         0,   'D' },
-  { "force-define",   required_argument,         0,   'F' },
-  { "locations",      no_argument,               0, LOCATIONS_OPTION },
-  { "no-lines",       no_argument,               0,   'l' },
-  { "skeleton",       required_argument,         0,   'S' },
-  { "language",       required_argument,         0,   'L' },
-  { "token-table",    no_argument,               0,   'k' },
+  { "fixed-output-files", no_argument,       0,  FIXED_OUTPUT_FILES_OPTION },
+  { "output-file",        required_argument, 0,  'o' },
+  { "trace",              optional_argument, 0,  'T' },
 
   {0, 0, 0, 0}
 };
 
-/* Under DOS, there is no difference on the case.  This can be
-   troublesome when looking for '.tab' etc.  */
-#ifdef MSDOS
-# define AS_FILE_NAME(File) (strlwr (File), (File))
-#else
-# define AS_FILE_NAME(File) (File)
-#endif
-
 /* Build a location for the current command line argument. */
 static
 location
@@ -559,19 +622,52 @@ command_line_location (void)
 {
   location res;
   /* "<command line>" is used in GCC's messages about -D. */
-  boundary_set (&res.start, uniqstr_new ("<command line>"), optind - 1, -1);
+  boundary_set (&res.start, uniqstr_new ("<command line>"), optind - 1, -1, -1);
   res.end = res.start;
   return res;
 }
 
 
+/* Handle the command line options for color support.  Do it early, so
+   that error messages from getargs be also colored as per the user's
+   request.  This is consistent with the way GCC and Clang behave.  */
+
+static void
+getargs_colors (int argc, char *argv[])
+{
+  for (int i = 1; i < argc; i++)
+    {
+      const char *arg = argv[i];
+      if (STRPREFIX_LIT ("--color=", arg))
+        {
+          const char *color = arg + strlen ("--color=");
+          if (STREQ (color, "debug"))
+            color_debug = true;
+          else
+            handle_color_option (color);
+        }
+      else if (STREQ ("--color", arg))
+        handle_color_option (NULL);
+      else if (STRPREFIX_LIT ("--style=", arg))
+        {
+          const char *style = arg + strlen ("--style=");
+          handle_style_option (style);
+        }
+    }
+  complain_init_color ();
+}
+
+
 void
 getargs (int argc, char *argv[])
 {
-  int c;
+  getargs_colors (argc, argv);
 
+  int c;
   while ((c = getopt_long (argc, argv, short_options, long_options, NULL))
          != -1)
+  {
+    location loc = command_line_location ();
     switch (c)
       {
         /* ASCII Sorting for short options (i.e., upper case then
@@ -604,7 +700,7 @@ getargs (int argc, char *argv[])
                   *end = 0;
                 }
             }
-          muscle_percent_define_insert (name, command_line_location (),
+          muscle_percent_define_insert (name, loc,
                                         kind, value ? value : "",
                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);
@@ -612,13 +708,11 @@ getargs (int argc, char *argv[])
         break;
 
       case 'L':
-        language_argmatch (optarg, command_line_prio,
-                           command_line_location ());
+        language_argmatch (optarg, command_line_prio, loc);
         break;
 
       case 'S':
-        skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
-                      command_line_location ());
+        skeleton_arg (optarg, command_line_prio, loc);
         break;
 
       case 'T':
@@ -638,7 +732,7 @@ getargs (int argc, char *argv[])
         break;
 
       case 'b':
-        spec_file_prefix = AS_FILE_NAME (optarg);
+        spec_file_prefix = optarg;
         break;
 
       case 'd':
@@ -646,8 +740,8 @@ getargs (int argc, char *argv[])
         defines_flag = true;
         if (optarg)
           {
-            free (spec_defines_file);
-            spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+            free (spec_header_file);
+            spec_header_file = xstrdup (optarg);
           }
         break;
 
@@ -656,7 +750,7 @@ getargs (int argc, char *argv[])
         if (optarg)
           {
             free (spec_graph_file);
-            spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+            spec_graph_file = xstrdup (optarg);
           }
         break;
 
@@ -672,7 +766,7 @@ getargs (int argc, char *argv[])
         break;
 
       case 'o':
-        spec_outfile = AS_FILE_NAME (optarg);
+        spec_outfile = optarg;
         break;
 
       case 'p':
@@ -685,13 +779,14 @@ getargs (int argc, char *argv[])
 
       case 't':
         muscle_percent_define_insert ("parse.trace",
-                                      command_line_location (),
+                                      loc,
                                       muscle_keyword, "",
                                       MUSCLE_PERCENT_DEFINE_D);
         break;
 
       case 'u':
         update_flag = true;
+        feature_flag |= feature_syntax_only;
         break;
 
       case 'v':
@@ -703,18 +798,28 @@ getargs (int argc, char *argv[])
         if (optarg)
           {
             free (spec_xml_file);
-            spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+            spec_xml_file = xstrdup (optarg);
           }
         break;
 
       case 'y':
         warning_argmatch ("yacc", 0, 0);
-        yacc_loc = command_line_location ();
+        yacc_loc = loc;
+        break;
+
+      case COLOR_OPTION:
+        /* Handled in getargs_colors. */
+        break;
+
+      case FIXED_OUTPUT_FILES_OPTION:
+        complain (&loc, Wdeprecated,
+                  _("deprecated option: %s, use %s"),
+                  quote ("--fixed-output-files"), quote_n (1, "-o y.tab.c"));
+        spec_outfile = "y.tab.c";
         break;
 
       case LOCATIONS_OPTION:
-        muscle_percent_define_ensure ("locations",
-                                      command_line_location (), true);
+        muscle_percent_define_ensure ("locations", loc, true);
         break;
 
       case PRINT_LOCALEDIR_OPTION:
@@ -727,12 +832,17 @@ getargs (int argc, char *argv[])
 
       case REPORT_FILE_OPTION:
         free (spec_verbose_file);
-        spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
+        spec_verbose_file = xstrdup (optarg);
+        break;
+
+      case STYLE_OPTION:
+        /* Handled in getargs_colors. */
         break;
 
       default:
         usage (EXIT_FAILURE);
       }
+  }
 
   if (argc - optind != 1)
     {
@@ -743,7 +853,7 @@ getargs (int argc, char *argv[])
       usage (EXIT_FAILURE);
     }
 
-  current_file = grammar_file = uniqstr_new (argv[optind]);
+  grammar_file = uniqstr_new (argv[optind]);
   MUSCLE_INSERT_C_STRING ("file_name", grammar_file);
 }
 
diff --git a/contrib/tools/bison/src/getargs.h b/contrib/tools/bison/src/getargs.h
index c5adb8487ab5..397419262ed3 100644
--- a/contrib/tools/bison/src/getargs.h
+++ b/contrib/tools/bison/src/getargs.h
@@ -1,6 +1,6 @@
 /* Parse command line arguments for bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2019 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -41,7 +41,7 @@ extern bool no_lines_flag;              /* for -l */
 extern bool token_table_flag;           /* for -k */
 extern location yacc_loc;               /* for -y */
 extern bool update_flag;                /* for -u */
-
+extern bool color_debug;                /* --color=debug. */
 /* GLR_PARSER is true if the input file says to use the GLR
    (Generalized LR) parser, and to output some additional information
    used by the GLR algorithm.  */
@@ -103,6 +103,8 @@ enum trace
     trace_m4        = 1 << 10, /**< M4 traces. */
     trace_muscles   = 1 << 11, /**< M4 definitions of the muscles. */
     trace_ielr      = 1 << 12, /**< IELR conversion. */
+    trace_closure   = 1 << 13, /**< Input/output of closure(). */
+    trace_locations = 1 << 14, /**< Full display of locations. */
     trace_all       = ~0       /**< All of the above.  */
   };
 /** What debug items bison displays during its run.  */
@@ -114,10 +116,11 @@ extern int trace_flag;
 
 enum feature
   {
-    feature_none           = 0,       /**< No additional feature.  */
-    feature_caret          = 1 << 0,  /**< Output errors with carets.  */
-    feature_fixit_parsable = 1 << 1,  /**< Issue instructions to fix the sources.  */
-    feature_all            = ~0       /**< All above features.  */
+    feature_none             = 0,      /**< No additional feature.  */
+    feature_caret            = 1 << 0, /**< Output errors with carets.  */
+    feature_fixit            = 1 << 1, /**< Issue instructions to fix the sources.  */
+    feature_syntax_only      = 1 << 2, /**< Don't generate output.  */
+    feature_all              = ~0      /**< All above features.  */
   };
 /** What additional features to use.  */
 extern int feature_flag;
diff --git a/contrib/tools/bison/src/gram.c b/contrib/tools/bison/src/gram.c
index 7f2c943961ca..6202b82a735a 100644
--- a/contrib/tools/bison/src/gram.c
+++ b/contrib/tools/bison/src/gram.c
@@ -1,6 +1,6 @@
 /* Allocate input grammar variables for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2015, 2018-2019 Free
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -32,7 +32,7 @@
 /* Comments for these variables are in gram.h.  */
 
 item_number *ritem = NULL;
-unsigned nritems = 0;
+int nritems = 0;
 
 rule *rules = NULL;
 rule_number nrules = 0;
@@ -48,6 +48,34 @@ int max_user_token_number = 256;
 
 int required_version = 0;
 
+rule const *
+item_rule (item_number const *item)
+{
+  item_number const *sp = item;
+  while (0 <= *sp)
+    ++sp;
+  rule_number r = item_number_as_rule_number (*sp);
+  return &rules[r];
+}
+
+
+void
+item_print (item_number *item, rule const *previous_rule, FILE *out)
+{
+  rule const *r = item_rule (item);
+  rule_lhs_print (r, previous_rule ? previous_rule->lhs : NULL, out);
+
+  for (item_number *sp = r->rhs; sp < item; sp++)
+    fprintf (out, " %s", symbols[*sp]->tag);
+  fputs (" .", out);
+  if (0 <= *r->rhs)
+    for (item_number *sp = item; 0 <= *sp; ++sp)
+      fprintf (out, " %s", symbols[*sp]->tag);
+  else
+    fprintf (out, " %%empty");
+}
+
+
 bool
 rule_useful_in_grammar_p (rule const *r)
 {
@@ -66,6 +94,12 @@ rule_useless_in_parser_p (rule const *r)
   return !r->useful && rule_useful_in_grammar_p (r);
 }
 
+bool
+rule_useless_chain_p (rule const *r)
+{
+  return rule_rhs_length (r) == 1 && !r->action;
+}
+
 void
 rule_lhs_print (rule const *r, sym_content const *previous_lhs, FILE *out)
 {
@@ -86,7 +120,7 @@ size_t
 rule_rhs_length (rule const *r)
 {
   size_t res = 0;
-  for (item_number *rhsp = r->rhs; *rhsp >= 0; ++rhsp)
+  for (item_number *rhsp = r->rhs; 0 <= *rhsp; ++rhsp)
     ++res;
   return res;
 }
@@ -95,8 +129,8 @@ void
 rule_rhs_print (rule const *r, FILE *out)
 {
   if (0 <= *r->rhs)
-    for (item_number *rp = r->rhs; *rp >= 0; rp++)
-      fprintf (out, " %s", symbols[*rp]->tag);
+    for (item_number *rhsp = r->rhs; 0 <= *rhsp; ++rhsp)
+      fprintf (out, " %s", symbols[*rhsp]->tag);
   else
     fputs (" %empty", out);
 }
@@ -107,9 +141,9 @@ rule_rhs_print_xml (rule const *r, FILE *out, int level)
   if (*r->rhs >= 0)
     {
       xml_puts (out, level, "<rhs>");
-      for (item_number *rp = r->rhs; *rp >= 0; rp++)
+      for (item_number *rhsp = r->rhs; 0 <= *rhsp; ++rhsp)
         xml_printf (out, level + 1, "<symbol>%s</symbol>",
-                    xml_escape (symbols[*rp]->tag));
+                    xml_escape (symbols[*rhsp]->tag));
       xml_puts (out, level, "</rhs>");
     }
   else
@@ -120,11 +154,18 @@ rule_rhs_print_xml (rule const *r, FILE *out, int level)
     }
 }
 
+void
+rule_print (rule const *r, rule const *prev_rule, FILE *out)
+{
+  rule_lhs_print (r, prev_rule ? prev_rule->lhs : NULL, out);
+  rule_rhs_print (r, out);
+}
+
 void
 ritem_print (FILE *out)
 {
   fputs ("RITEM\n", out);
-  for (unsigned i = 0; i < nritems; ++i)
+  for (int i = 0; i < nritems; ++i)
     if (ritem[i] >= 0)
       fprintf (out, "  %s", symbols[ritem[i]]->tag);
     else
@@ -138,7 +179,7 @@ ritem_longest_rhs (void)
   int max = 0;
   for (rule_number r = 0; r < nrules; ++r)
     {
-      int length = rule_rhs_length (&rules[r]);
+      size_t length = rule_rhs_length (&rules[r]);
       if (length > max)
         max = length;
     }
@@ -151,7 +192,7 @@ grammar_rules_partial_print (FILE *out, const char *title,
                              rule_filter filter)
 {
   bool first = true;
-  sym_content *previous_lhs = NULL;
+  rule *previous_rule = NULL;
 
   /* rule # : LHS -> RHS */
   for (rule_number r = 0; r < nrules + nuseless_productions; r++)
@@ -160,13 +201,12 @@ grammar_rules_partial_print (FILE *out, const char *title,
         continue;
       if (first)
         fprintf (out, "%s\n\n", title);
-      else if (previous_lhs && previous_lhs != rules[r].lhs)
+      else if (previous_rule && previous_rule->lhs != rules[r].lhs)
         fputc ('\n', out);
       first = false;
-      rule_lhs_print (&rules[r], previous_lhs, out);
-      rule_rhs_print (&rules[r], out);
-      fprintf (out, "\n");
-      previous_lhs = rules[r].lhs;
+      rule_print (&rules[r], previous_rule, out);
+      fputc ('\n', out);
+      previous_rule = &rules[r];
     }
   if (!first)
     fputs ("\n\n", out);
@@ -189,13 +229,10 @@ grammar_rules_print_xml (FILE *out, int level)
         xml_puts (out, level + 1, "<rules>");
       first = false;
       {
-        char const *usefulness;
-        if (rule_useless_in_grammar_p (&rules[r]))
-          usefulness = "useless-in-grammar";
-        else if (rule_useless_in_parser_p (&rules[r]))
-          usefulness = "useless-in-parser";
-        else
-          usefulness = "useful";
+        char const *usefulness
+          = rule_useless_in_grammar_p (&rules[r]) ? "useless-in-grammar"
+          : rule_useless_in_parser_p (&rules[r])  ? "useless-in-parser"
+          :                                         "useful";
         xml_indent (out, level + 2);
         fprintf (out, "<rule number=\"%d\" usefulness=\"%s\"",
                  rules[r].number, usefulness);
@@ -222,12 +259,11 @@ grammar_dump (FILE *out, const char *title)
            "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nritems = %d\n\n",
            ntokens, nvars, nsyms, nrules, nritems);
 
-
-  fprintf (out, "Variables\n---------\n\n");
+  fprintf (out, "Tokens\n------\n\n");
   {
     fprintf (out, "Value  Sprec  Sassoc  Tag\n");
 
-    for (symbol_number i = ntokens; i < nsyms; i++)
+    for (symbol_number i = 0; i < ntokens; i++)
       fprintf (out, "%5d  %5d   %5d  %s\n",
                i,
                symbols[i]->content->prec, symbols[i]->content->assoc,
@@ -235,42 +271,49 @@ grammar_dump (FILE *out, const char *title)
     fprintf (out, "\n\n");
   }
 
+  fprintf (out, "Non terminals\n-------------\n\n");
+  {
+    fprintf (out, "Value  Tag\n");
+
+    for (symbol_number i = ntokens; i < nsyms; i++)
+      fprintf (out, "%5d  %s\n",
+               i, symbols[i]->tag);
+    fprintf (out, "\n\n");
+  }
+
   fprintf (out, "Rules\n-----\n\n");
   {
     fprintf (out,
-             "Num (Prec, Assoc, Useful, Ritem Range) Lhs"
-             " -> Rhs (Ritem range) [Num]\n");
-    for (rule_number i = 0; i < nrules + nuseless_productions; i++)
+             "Num (Prec, Assoc, Useful, UselessChain) Lhs"
+             " -> (Ritem Range) Rhs\n");
+    for (rule_number i = 0; i < nrules + nuseless_productions; ++i)
       {
         rule const *rule_i = &rules[i];
-        unsigned const rhs_itemno = rule_i->rhs - ritem;
-        /* Find the last RHS index in ritems. */
-        unsigned rhs_count = 0;
-        for (item_number *rp = rule_i->rhs; *rp >= 0; ++rp)
-          ++rhs_count;
-        fprintf (out, "%3d (%2d, %2d, %2d, %2u-%2u)   %2d ->",
+        int const rhs_itemno = rule_i->rhs - ritem;
+        int length = rule_rhs_length (rule_i);
+        aver (item_number_as_rule_number (rule_i->rhs[length]) == i);
+        fprintf (out, "%3d (%2d, %2d, %2s, %2s)   %2d -> (%2u-%2u)",
                  i,
                  rule_i->prec ? rule_i->prec->prec : 0,
                  rule_i->prec ? rule_i->prec->assoc : 0,
-                 rule_i->useful,
-                 rhs_itemno,
-                 rhs_itemno + rhs_count - 1,
-                 rule_i->lhs->number);
+                 rule_i->useful ? "t" : "f",
+                 rule_useless_chain_p (rule_i) ? "t" : "f",
+                 rule_i->lhs->number,
+                 rhs_itemno, rhs_itemno + length - 1);
         /* Dumped the RHS. */
-        for (item_number *rp = rule_i->rhs; *rp >= 0; ++rp)
-          fprintf (out, " %3d", *rp);
-        fprintf (out, "  [%d]\n",
-                 item_number_as_rule_number (rule_i->rhs[rhs_count+1]));
+        for (item_number *rhsp = rule_i->rhs; 0 <= *rhsp; ++rhsp)
+          fprintf (out, " %3d", *rhsp);
+        fputc ('\n', out);
       }
   }
   fprintf (out, "\n\n");
 
   fprintf (out, "Rules interpreted\n-----------------\n\n");
-  for (rule_number r = 0; r < nrules + nuseless_productions; r++)
+  for (rule_number r = 0; r < nrules + nuseless_productions; ++r)
     {
       fprintf (out, "%-5d  %s:", r, rules[r].lhs->symbol->tag);
       rule_rhs_print (&rules[r], out);
-      fprintf (out, "\n");
+      fputc ('\n', out);
     }
   fprintf (out, "\n\n");
 }
@@ -278,7 +321,7 @@ grammar_dump (FILE *out, const char *title)
 void
 grammar_rules_useless_report (const char *message)
 {
-  for (rule_number r = 0; r < nrules ; ++r)
+  for (rule_number r = 0; r < nrules; ++r)
     /* Don't complain about rules whose LHS is useless, we already
        complained about it.  */
     if (!reduce_nonterminal_useless_in_grammar (rules[r].lhs)
diff --git a/contrib/tools/bison/src/gram.h b/contrib/tools/bison/src/gram.h
index 83dd8aacf7c5..afae95a78b26 100644
--- a/contrib/tools/bison/src/gram.h
+++ b/contrib/tools/bison/src/gram.h
@@ -1,6 +1,6 @@
 /* Data definitions for internal representation of Bison's input.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2015, 2018-2019
+   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2015, 2018-2020
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -42,9 +42,9 @@
 
    Internally, we cannot use the number 0 for a rule because for
    instance RITEM stores both symbol (the RHS) and rule numbers: the
-   symbols are shorts >= 0, and rule number are stored negative.
+   symbols are integers >= 0, and rule numbers are stored negative.
    Therefore 0 cannot be used, since it would be both the rule number
-   0, and the token $end).
+   0, and the token $end.
 
    Actions are accessed via the rule number.
 
@@ -55,8 +55,7 @@
 
    RULES[R].lhs -- the symbol of the left hand side of rule R.
 
-   RULES[R].rhs -- the index in RITEM of the beginning of the portion
-   for rule R.
+   RULES[R].rhs -- the beginning of the portion of RITEM for rule R.
 
    RULES[R].prec -- the symbol providing the precedence level of R.
 
@@ -75,16 +74,16 @@
 
    RULES[R].line -- the line where R was defined.
 
-   RULES[R].useful -- true iff the rule is used (i.e., false if thrown
-   away by reduce).
+   RULES[R].useful -- whether the rule is used.  False if thrown away
+   by reduce().
 
    The right hand side is stored as symbol numbers in a portion of
    RITEM.
 
    The length of the portion is one greater than the number of symbols
    in the rule's right hand side.  The last element in the portion
-   contains minus R, which identifies it as the end of a portion and
-   says which rule it is for.
+   contains -R, which identifies it as the end of a portion and says
+   which rule it is for.
 
    The portions of RITEM come in order of increasing rule number.
    NRITEMS is the total length of RITEM.  Each element of RITEM is
@@ -115,7 +114,7 @@ extern int nvars;
 typedef int item_number;
 # define ITEM_NUMBER_MAX INT_MAX
 extern item_number *ritem;
-extern unsigned nritems;
+extern int nritems;
 
 /* There is weird relationship between OT1H item_number and OTOH
    symbol_number and rule_number: we store the latter in
@@ -146,7 +145,6 @@ item_number_is_symbol_number (item_number i)
 /* Rule numbers.  */
 typedef int rule_number;
 # define RULE_NUMBER_MAX INT_MAX
-extern rule_number nrules;
 
 static inline item_number
 rule_number_as_item_number (rule_number r)
@@ -166,6 +164,7 @@ item_number_is_rule_number (item_number i)
   return i < 0;
 }
 
+
 /*--------.
 | Rules.  |
 `--------*/
@@ -192,6 +191,7 @@ typedef struct
   /* This symbol was attached to the rule via %prec. */
   sym_content *precsym;
 
+  /* Location of the rhs.  */
   location location;
   bool useful;
   bool is_predicate;
@@ -202,26 +202,40 @@ typedef struct
   int expected_rr_conflicts;
 
   const char *action;
-  location action_location;
+  location action_loc;
 } rule;
 
+/* The used rules (size NRULES).  */
 extern rule *rules;
+extern rule_number nrules;
+
+/* Get the rule associated to this item.  ITEM points inside RITEM.  */
+rule const *item_rule (item_number const *item);
+
+/* Pretty-print this ITEM (as in the report).  ITEM points inside
+   RITEM.  PREVIOUS_RULE is used to see if the lhs is common, in which
+   case LHS is factored.  Passing NULL is fine.  */
+void item_print (item_number *item, rule const *previous_rule,
+                 FILE *out);
 
 /* A function that selects a rule.  */
 typedef bool (*rule_filter) (rule const *);
 
-/* Return true IFF the rule has a 'number' smaller than NRULES.  That is, it is
-   useful in the grammar.  */
+/* Whether the rule has a 'number' smaller than NRULES.  That is, it
+   is useful in the grammar.  */
 bool rule_useful_in_grammar_p (rule const *r);
 
-/* Return true IFF the rule has a 'number' higher than NRULES.  That is, it is
+/* Whether the rule has a 'number' higher than NRULES.  That is, it is
    useless in the grammar.  */
 bool rule_useless_in_grammar_p (rule const *r);
 
-/* Return true IFF the rule is not flagged as useful but is useful in the
+/* Whether the rule is not flagged as useful but is useful in the
    grammar.  In other words, it was discarded because of conflicts.  */
 bool rule_useless_in_parser_p (rule const *r);
 
+/* Whether the rule has a single RHS, and no user action. */
+bool rule_useless_chain_p (rule const *r);
+
 /* Print this rule's number and lhs on OUT.  If a PREVIOUS_LHS was
    already displayed (by a previous call for another rule), avoid
    useless repetitions.  */
@@ -229,12 +243,15 @@ void rule_lhs_print (rule const *r, sym_content const *previous_lhs,
                      FILE *out);
 void rule_lhs_print_xml (rule const *r, FILE *out, int level);
 
-/* Return the length of the RHS.  */
+/* The length of the RHS.  */
 size_t rule_rhs_length (rule const *r);
 
 /* Print this rule's RHS on OUT.  */
 void rule_rhs_print (rule const *r, FILE *out);
 
+/* Print this rule on OUT.  If a PREVIOUS_RULE was already displayed,
+   avoid useless repetitions of their LHS. */
+void rule_print (rule const *r, rule const *prev_rule, FILE *out);
 
 
 
@@ -252,7 +269,7 @@ extern int max_user_token_number;
 /* Dump RITEM for traces. */
 void ritem_print (FILE *out);
 
-/* Return the size of the longest rule RHS.  */
+/* The size of the longest rule RHS.  */
 size_t ritem_longest_rhs (void);
 
 /* Print the grammar's rules that match FILTER on OUT under TITLE.  */
diff --git a/contrib/tools/bison/src/graphviz.c b/contrib/tools/bison/src/graphviz.c
index 75e4a6e6a8fc..80a2ff99ddd8 100644
--- a/contrib/tools/bison/src/graphviz.c
+++ b/contrib/tools/bison/src/graphviz.c
@@ -1,6 +1,6 @@
 /* Output Graphviz specification of a state machine generated by Bison.
 
-   Copyright (C) 2006-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2006-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -159,6 +159,9 @@ output_red (state const *s, reductions const *reds, FILE *fout)
   bitset no_reduce_set;
   no_reduce_bitset_init (s, &no_reduce_set);
 
+  rule *default_reduction
+    = yydefact[s->number] ? &rules[yydefact[s->number] - 1] : NULL;
+
   /* Two obstacks are needed: one for the enabled reductions, and one
      for the disabled reductions, because in the end we want two
      separate edges, even though in most cases only one will actually
@@ -171,11 +174,6 @@ output_red (state const *s, reductions const *reds, FILE *fout)
   const int source = s->number;
   for (int j = 0; j < reds->num; ++j)
     {
-      rule *default_reduction =
-        yydefact[s->number]
-        ? &rules[yydefact[s->number] - 1]
-        : NULL;
-
       bool defaulted = default_reduction && default_reduction == reds->rules[j];
 
       /* Build the lookahead tokens lists, one for enabled transitions
diff --git a/contrib/tools/bison/src/graphviz.h b/contrib/tools/bison/src/graphviz.h
index cceb1fbd3d71..06b423586684 100644
--- a/contrib/tools/bison/src/graphviz.h
+++ b/contrib/tools/bison/src/graphviz.h
@@ -1,6 +1,6 @@
 /* Output Graphviz specification of a state machine generated by Bison.
 
-   Copyright (C) 2006, 2010-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2006, 2010-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/ielr.c b/contrib/tools/bison/src/ielr.c
index 867b8a0a2afc..8e34b2cc3237 100644
--- a/contrib/tools/bison/src/ielr.c
+++ b/contrib/tools/bison/src/ielr.c
@@ -1,6 +1,6 @@
 /* IELR main implementation.
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -36,7 +36,36 @@
 #include "symtab.h"
 
 /** Records the value of the \%define variable lr.type.  */
-typedef enum { LR_TYPE__LALR, LR_TYPE__IELR, LR_TYPE__CANONICAL_LR } LrType;
+typedef enum
+  {
+   LR_TYPE__LR0,
+   LR_TYPE__LALR,
+   LR_TYPE__IELR,
+   LR_TYPE__CANONICAL_LR
+  } LrType;
+
+/* The user's requested LR type.  */
+static LrType
+lr_type_get (void)
+{
+  char *type = muscle_percent_define_get ("lr.type");
+  LrType res;
+  if (STREQ (type, "lr""(0)"))
+    res = LR_TYPE__LR0;
+  else if (STREQ (type, "lalr"))
+    res = LR_TYPE__LALR;
+  else if (STREQ (type, "ielr"))
+    res = LR_TYPE__IELR;
+  else if (STREQ (type, "canonical-lr"))
+    res = LR_TYPE__CANONICAL_LR;
+  else
+    {
+      aver (false);
+      abort ();
+    }
+  free (type);
+  return res;
+}
 
 /**
  * \post:
@@ -49,7 +78,7 @@ static bitset
 ielr_compute_ritem_sees_lookahead_set (void)
 {
   bitset result = bitset_create (nritems, BITSET_FIXED);
-  unsigned i = nritems-1;
+  int i = nritems-1;
   while (0 < i)
     {
       --i;
@@ -167,10 +196,7 @@ ielr_compute_internal_follow_edges (bitset ritem_sees_lookahead_set,
   relation_transpose (edgesp, ngotos);
 
   if (trace_flag & trace_ielr)
-    {
-      fprintf (stderr, "internal_follow_edges:\n");
-      relation_print (*edgesp, ngotos, stderr);
-    }
+    relation_print ("internal_follow_edges", *edgesp, ngotos, NULL, stderr);
 }
 
 /**
@@ -215,7 +241,7 @@ ielr_compute_follow_kernel_items (bitset ritem_sees_lookahead_set,
             && bitset_test (ritem_sees_lookahead_set, items[j]))
           bitset_set ((*follow_kernel_itemsp)[i], j);
     }
-  relation_digraph (internal_follow_edges, ngotos, follow_kernel_itemsp);
+  relation_digraph (internal_follow_edges, ngotos, *follow_kernel_itemsp);
 
   if (trace_flag & trace_ielr)
     {
@@ -271,12 +297,11 @@ ielr_compute_always_follows (goto_number ***edgesp,
       }
     free (edge_array);
   }
-  relation_digraph (*edgesp, ngotos, always_followsp);
+  relation_digraph (*edgesp, ngotos, *always_followsp);
 
   if (trace_flag & trace_ielr)
     {
-      fprintf (stderr, "always follow edges:\n");
-      relation_print (*edgesp, ngotos, stderr);
+      relation_print ("always follow edges", *edgesp, ngotos, NULL, stderr);
       fprintf (stderr, "always_follows:\n");
       debug_bitsetv (*always_followsp);
     }
@@ -393,7 +418,7 @@ ielr_item_has_lookahead (state *s, symbol_number lhs, size_t item,
              top-level invocation), go get it.  */
           if (!lhs)
             {
-              unsigned i;
+              int i;
               for (i = s->items[item];
                    !item_number_is_rule_number (ritem[i]);
                    ++i)
@@ -471,7 +496,7 @@ ielr_compute_annotation_lists (bitsetv follow_kernel_items,
   AnnotationIndex *annotation_counts =
     xnmalloc (nstates, sizeof *annotation_counts);
   ContributionIndex max_contributions = 0;
-  unsigned total_annotations = 0;
+  int total_annotations = 0;
 
   *inadequacy_listsp = xnmalloc (nstates, sizeof **inadequacy_listsp);
   *annotation_listsp = xnmalloc (nstates, sizeof **annotation_listsp);
@@ -540,7 +565,7 @@ typedef struct state_list
   /**
    * nextIsocore is the next state in a circularly linked-list of all states
    * with the same core.  The one originally computed by generate_states in
-   * LR0.c is lr0Isocore.
+   * lr0.c is lr0Isocore.
    */
   struct state_list *lr0Isocore;
   struct state_list *nextIsocore;
@@ -608,7 +633,7 @@ ielr_compute_lookaheads (bitsetv follow_kernel_items, bitsetv always_follows,
         {
           if (item_number_is_rule_number (ritem[t->items[t_item] - 2]))
             {
-              unsigned rule_item;
+              int rule_item;
               for (rule_item = t->items[t_item];
                    !item_number_is_rule_number (ritem[rule_item]);
                    ++rule_item)
@@ -1051,41 +1076,40 @@ ielr_split_states (bitsetv follow_kernel_items, bitsetv always_follows,
     }
 }
 
+
 void
 ielr (void)
 {
-  LrType lr_type;
-
-  /* Examine user options.  */
-  {
-    char *type = muscle_percent_define_get ("lr.type");
-    if (STREQ (type, "lalr"))
-      lr_type = LR_TYPE__LALR;
-    else if (STREQ (type, "ielr"))
-      lr_type = LR_TYPE__IELR;
-    else if (STREQ (type, "canonical-lr"))
-      lr_type = LR_TYPE__CANONICAL_LR;
-    else
-      {
-        aver (false);
-        abort ();
-      }
-    free (type);
-  }
+  LrType lr_type = lr_type_get ();
 
   /* Phase 0: LALR(1).  */
-  timevar_push (tv_lalr);
-  if (lr_type == LR_TYPE__CANONICAL_LR)
-    set_goto_map ();
-  else
-    lalr ();
-  if (lr_type == LR_TYPE__LALR)
+  switch (lr_type)
     {
+    case LR_TYPE__LR0:
+      timevar_push (tv_lalr);
+      set_goto_map ();
+      timevar_pop (tv_lalr);
+      return;
+
+    case LR_TYPE__CANONICAL_LR:
+      timevar_push (tv_lalr);
+      set_goto_map ();
+      timevar_pop (tv_lalr);
+      break;
+
+    case LR_TYPE__LALR:
+      timevar_push (tv_lalr);
+      lalr ();
       bitsetv_free (goto_follows);
       timevar_pop (tv_lalr);
       return;
+
+    case LR_TYPE__IELR:
+      timevar_push (tv_lalr);
+      lalr ();
+      timevar_pop (tv_lalr);
+      break;
     }
-  timevar_pop (tv_lalr);
 
   {
     bitsetv follow_kernel_items;
diff --git a/contrib/tools/bison/src/ielr.h b/contrib/tools/bison/src/ielr.h
index 17dcb2c8c87e..bb62625a0657 100644
--- a/contrib/tools/bison/src/ielr.h
+++ b/contrib/tools/bison/src/ielr.h
@@ -1,6 +1,6 @@
 /* IELR main implementation.
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/contrib/tools/bison/src/lalr.c b/contrib/tools/bison/src/lalr.c
index 0f1149d7fbdf..8b8724d04f95 100644
--- a/contrib/tools/bison/src/lalr.c
+++ b/contrib/tools/bison/src/lalr.c
@@ -1,6 +1,6 @@
 /* Compute lookahead criteria for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000-2015, 2018-2019 Free Software
+   Copyright (C) 1984, 1986, 1989, 2000-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -28,18 +28,19 @@
 #include <bitset.h>
 #include <bitsetv.h>
 
-#include "LR0.h"
 #include "complain.h"
 #include "derives.h"
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
+#include "lr0.h"
 #include "muscle-tab.h"
 #include "nullable.h"
 #include "reader.h"
 #include "relation.h"
 #include "symtab.h"
 
+/* goto_map[nterm - NTOKENS] -> number of gotos.  */
 goto_number *goto_map = NULL;
 goto_number ngotos = 0;
 state_number *from_state = NULL;
@@ -53,8 +54,16 @@ typedef struct goto_list
   goto_number value;
 } goto_list;
 
+static goto_list *
+goto_list_new (goto_number value, struct goto_list *next)
+{
+  goto_list *res = xmalloc (sizeof *res);
+  res->next = next;
+  res->value = value;
+  return res;
+}
 
-/* LA is an NLA by NTOKENS matrix of bits.  LA[l, i] is 1 if the rule
+/* LA is an nLA by NTOKENS matrix of bits.  LA[l, i] is 1 if the rule
    LArule[l] is applicable in the appropriate state when the next
    token is symbol i.  If LA[l, i] and LA[l, j] are both 1 for i != j,
    it is a conflict.  */
@@ -63,31 +72,48 @@ static bitsetv LA = NULL;
 size_t nLA;
 
 
+/* "(p, A) includes (p', B)" iff
+   B → βAγ, γ nullable, and p'-- β --> p (i.e., state p' reaches p on label β).
+
+   Definition p.621 [DeRemer 1982].
+
+   INCLUDES[(p, A)] = [(p', B),...] */
 static goto_number **includes;
+
+/* "(q, A → ω) lookback (p, A)" iff state p reaches state q on label ω.
+
+   Definition p.621 [DeRemer 1982]. */
 static goto_list **lookback;
 
+static void
+goto_print (goto_number i, FILE *out)
+{
+  const state_number src = from_state[i];
+  const state_number dst = to_state[i];
+  symbol_number var = states[dst]->accessing_symbol;
+  fprintf (out,
+           "goto[%ld] = (%d, %s, %d)", i, src, symbols[var]->tag, dst);
+}
 
 void
 set_goto_map (void)
 {
-  goto_number *temp_map = xnmalloc (nvars + 1, sizeof *temp_map);
-
+  /* Count the number of gotos (ngotos) per nterm (goto_map). */
   goto_map = xcalloc (nvars + 1, sizeof *goto_map);
   ngotos = 0;
   for (state_number s = 0; s < nstates; ++s)
     {
-      transitions *sp = states[s]->transitions;
-      for (int i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i)
+      transitions *trans = states[s]->transitions;
+      for (int i = trans->num - 1; 0 <= i && TRANSITION_IS_GOTO (trans, i); --i)
         {
           ngotos++;
-
           /* Abort if (ngotos + 1) would overflow.  */
           aver (ngotos != GOTO_NUMBER_MAXIMUM);
-
-          goto_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;
+          goto_map[TRANSITION_SYMBOL (trans, i) - ntokens]++;
         }
     }
 
+  goto_number *temp_map = xnmalloc (nvars + 1, sizeof *temp_map);
   {
     goto_number k = 0;
     for (symbol_number i = ntokens; i < nsyms; ++i)
@@ -108,21 +134,28 @@ set_goto_map (void)
 
   for (state_number s = 0; s < nstates; ++s)
     {
-      const transitions *sp = states[s]->transitions;
-      for (int i = sp->num - 1; i >= 0 && TRANSITION_IS_GOTO (sp, i); --i)
+      const transitions *trans = states[s]->transitions;
+      for (int i = trans->num - 1; 0 <= i && TRANSITION_IS_GOTO (trans, i); --i)
         {
-          goto_number k = temp_map[TRANSITION_SYMBOL (sp, i) - ntokens]++;
+          goto_number k = temp_map[TRANSITION_SYMBOL (trans, i) - ntokens]++;
           from_state[k] = s;
-          to_state[k] = sp->states[i]->number;
+          to_state[k] = trans->states[i]->number;
         }
     }
 
   free (temp_map);
+
+  if (trace_flag & trace_automaton)
+    for (int i = 0; i < ngotos; ++i)
+      {
+        goto_print (i, stderr);
+        fputc ('\n', stderr);
+      }
 }
 
 
 goto_number
-map_goto (state_number s0, symbol_number sym)
+map_goto (state_number src, symbol_number sym)
 {
   goto_number low = goto_map[sym - ntokens];
   goto_number high = goto_map[sym - ntokens + 1] - 1;
@@ -132,39 +165,62 @@ map_goto (state_number s0, symbol_number sym)
       aver (low <= high);
       goto_number middle = (low + high) / 2;
       state_number s = from_state[middle];
-      if (s == s0)
+      if (s == src)
         return middle;
-      else if (s < s0)
+      else if (s < src)
         low = middle + 1;
       else
         high = middle - 1;
     }
 }
 
+/* Print FOLLOWS for debugging.  */
+static void
+follows_print (const char* title, FILE *out)
+{
+  fprintf (out, "%s:\n", title);
+  for (goto_number i = 0; i < ngotos; ++i)
+    {
+      fputs ("    FOLLOWS[", out);
+      goto_print (i, out);
+      fputs ("] =", out);
+      bitset_iterator iter;
+      symbol_number sym;
+      BITSET_FOR_EACH (iter, goto_follows[i], sym, 0)
+        fprintf (out, " %s", symbols[sym]->tag);
+      fputc ('\n', out);
+    }
+  fputc ('\n', out);
+}
 
+/* Build goto_follows. */
 static void
-initialize_F (void)
+initialize_goto_follows (void)
 {
   goto_number **reads = xnmalloc (ngotos, sizeof *reads);
-  goto_number *edge = xnmalloc (ngotos + 1, sizeof *edge);
-  goto_number nedges = 0;
+  goto_number *edge = xnmalloc (ngotos, sizeof *edge);
 
   goto_follows = bitsetv_create (ngotos, ntokens, BITSET_FIXED);
 
   for (goto_number i = 0; i < ngotos; ++i)
     {
-      state_number stateno = to_state[i];
-      const transitions *sp = states[stateno]->transitions;
+      state_number dst = to_state[i];
+      const transitions *trans = states[dst]->transitions;
 
       int j;
-      FOR_EACH_SHIFT (sp, j)
-        bitset_set (goto_follows[i], TRANSITION_SYMBOL (sp, j));
+      FOR_EACH_SHIFT (trans, j)
+        bitset_set (goto_follows[i], TRANSITION_SYMBOL (trans, j));
 
-      for (; j < sp->num; ++j)
+      /* Gotos outgoing from DST. */
+      goto_number nedges = 0;
+      for (; j < trans->num; ++j)
         {
-          symbol_number sym = TRANSITION_SYMBOL (sp, j);
+          symbol_number sym = TRANSITION_SYMBOL (trans, j);
           if (nullable[sym - ntokens])
-            edge[nedges++] = map_goto (stateno, sym);
+            {
+              assert (nedges < ngotos);
+              edge[nedges++] = map_goto (dst, sym);
+            }
         }
 
       if (nedges == 0)
@@ -174,82 +230,164 @@ initialize_F (void)
           reads[i] = xnmalloc (nedges + 1, sizeof reads[i][0]);
           memcpy (reads[i], edge, nedges * sizeof edge[0]);
           reads[i][nedges] = END_NODE;
-          nedges = 0;
         }
     }
+  if (trace_flag & trace_automaton)
+    {
+      follows_print ("follows after shifts", stderr);
+      relation_print ("reads", reads, ngotos, goto_print, stderr);
+    }
 
-  relation_digraph (reads, ngotos, &goto_follows);
+  relation_digraph (reads, ngotos, goto_follows);
+  if (trace_flag & trace_automaton)
+    follows_print ("follows after read", stderr);
 
   for (goto_number i = 0; i < ngotos; ++i)
     free (reads[i]);
-
   free (reads);
   free (edge);
 }
 
 
+/* Find the state which LOOKBACK[LOOKBACK_INDEX] is about.  */
+static const state *
+lookback_find_state (int lookback_index)
+{
+  state *res = NULL;
+  for (int j = 0; j < nstates; ++j)
+    if (states[j]->reductions
+        && states[j]->reductions->lookahead_tokens)
+      {
+        if (states[j]->reductions->lookahead_tokens - LA > lookback_index)
+          /* Went too far. */
+          break;
+        else
+          res = states[j];
+      }
+  /* Pacify "potential null pointer dereference" warning.  */
+  if (!res)
+    abort ();
+  return res;
+}
+
+/* Print LOOKBACK for debugging.  */
 static void
-add_lookback_edge (state *s, rule *r, goto_number gotono)
+lookback_print (FILE *out)
 {
-  int ri = state_reduction_find (s, r);
-  goto_list *sp = xmalloc (sizeof *sp);
-  sp->next = lookback[(s->reductions->lookahead_tokens - LA) + ri];
-  sp->value = gotono;
-  lookback[(s->reductions->lookahead_tokens - LA) + ri] = sp;
+  fputs ("lookback:\n", out);
+  for (int i = 0; i < nLA; ++i)
+    if (lookback[i])
+    {
+      fprintf (out, "   %3d = ", i);
+      const state *s = lookback_find_state (i);
+      int rnum = i - (s->reductions->lookahead_tokens - LA);
+      const rule *r = s->reductions->rules[rnum];
+      fprintf (out, "(%3d, ", s->number);
+      rule_print (r, NULL, out);
+      fputs (") ->", out);
+      for (goto_list *sp = lookback[i]; sp; sp = sp->next)
+        {
+          fputc (' ', out);
+          goto_print (sp->value, out);
+        }
+      fputc ('\n', out);
+    }
+  fputc ('\n', out);
 }
 
+/* Add (S, R) -> GOTONO to LOOKBACK.
 
+   "(q, A → ω) lookback (p, A)" iff state p reaches state q on label ω.
 
+   The goto number GOTONO, whose source is S (which is
+   inconsistent), */
+static void
+add_lookback_edge (state *s, rule const *r, goto_number gotono)
+{
+  int ri = state_reduction_find (s, r);
+  int idx = (s->reductions->lookahead_tokens - LA) + ri;
+  lookback[idx] = goto_list_new (gotono, lookback[idx]);
+}
+
+
+/* Compute INCLUDES and LOOKBACK.  Corresponds to step E in Sec. 6 of
+   [DeRemer 1982].  */
 static void
 build_relations (void)
 {
-  goto_number *edge = xnmalloc (ngotos + 1, sizeof *edge);
-  state_number *states1 = xnmalloc (ritem_longest_rhs () + 1, sizeof *states1);
+  goto_number *edge = xnmalloc (ngotos, sizeof *edge);
+  state_number *path = xnmalloc (ritem_longest_rhs () + 1, sizeof *path);
 
   includes = xnmalloc (ngotos, sizeof *includes);
 
+  /* For each goto (from SRC to DST labeled by nterm VAR), iterate
+     over each rule with VAR as LHS, and find the path PATH from SRC
+     labeled with the RHS of the rule. */
   for (goto_number i = 0; i < ngotos; ++i)
     {
-      int nedges = 0;
-      symbol_number symbol1 = states[to_state[i]]->accessing_symbol;
+      const state_number src = from_state[i];
+      const state_number dst = to_state[i];
+      symbol_number var = states[dst]->accessing_symbol;
 
-      for (rule **rulep = derives[symbol1 - ntokens]; *rulep; rulep++)
+      /* Size of EDGE.  */
+      int nedges = 0;
+      for (rule **rulep = derives[var - ntokens]; *rulep; ++rulep)
         {
-          int length = 1;
-          item_number const *rp;
-          state *s = states[from_state[i]];
-          states1[0] = s->number;
+          rule const *r = *rulep;
+          state *s = states[src];
+          path[0] = s->number;
 
-          for (rp = (*rulep)->rhs; ! item_number_is_rule_number (*rp); rp++)
+          /* Length of PATH.  */
+          int length = 1;
+          for (item_number const *rp = r->rhs; 0 <= *rp; rp++)
             {
-              s = transitions_to (s->transitions,
-                                  item_number_as_symbol_number (*rp));
-              states1[length++] = s->number;
+              symbol_number sym = item_number_as_symbol_number (*rp);
+              s = transitions_to (s, sym);
+              path[length++] = s->number;
             }
 
+          /* S is the end of PATH.  */
           if (!s->consistent)
-            add_lookback_edge (s, *rulep, i);
+            add_lookback_edge (s, r, i);
 
-          length--;
-          bool done = false;
-          while (!done)
+          /* Walk back PATH from penultimate to beginning.
+
+             The "0 <= p" part is actually useless: each rhs ends in a
+             rule number (for which ISVAR(...) is false), and there is
+             a sentinel (ritem[-1]=0) before the first rhs.  */
+          for (int p = length - 2; 0 <= p && ISVAR (r->rhs[p]); --p)
             {
-              done = true;
-              /* Each rhs ends in a rule number, and there is a
-                 sentinel (ritem[-1]=0) before the first rhs, so it is safe to
-                 decrement RP here.  */
-              rp--;
-              if (ISVAR (*rp))
-                {
-                  /* Downcasting from item_number to symbol_number.  */
-                  edge[nedges++] = map_goto (states1[--length],
-                                             item_number_as_symbol_number (*rp));
-                  if (nullable[*rp - ntokens])
-                    done = false;
-                }
+              symbol_number sym = item_number_as_symbol_number (r->rhs[p]);
+              goto_number g = map_goto (path[p], sym);
+              /* Insert G if not already in EDGE.
+                 FIXME: linear search.  A bitset instead?  */
+              {
+                bool found = false;
+                for (int j = 0; !found && j < nedges; ++j)
+                  found = edge[j] == g;
+                if (!found)
+                  {
+                    assert (nedges < ngotos);
+                    edge[nedges++] = g;
+                  }
+              }
+              if (!nullable[sym - ntokens])
+                break;
             }
         }
 
+      if (trace_flag & trace_automaton)
+        {
+          goto_print (i, stderr);
+          fputs (" edges = ", stderr);
+          for (int j = 0; j < nedges; ++j)
+            {
+              fputc (' ', stderr);
+              goto_print (edge[j], stderr);
+            }
+          fputc ('\n', stderr);
+        }
+
       if (nedges == 0)
         includes[i] = NULL;
       else
@@ -262,21 +400,22 @@ build_relations (void)
     }
 
   free (edge);
-  free (states1);
+  free (path);
 
   relation_transpose (&includes, ngotos);
+  if (trace_flag & trace_automaton)
+    relation_print ("includes", includes, ngotos, goto_print, stderr);
 }
 
-
-
+/* Compute FOLLOWS from INCLUDES, and free INCLUDES.  */
 static void
-compute_FOLLOWS (void)
+compute_follows (void)
 {
-  relation_digraph (includes, ngotos, &goto_follows);
-
+  relation_digraph (includes, ngotos, goto_follows);
+  if (trace_flag & trace_sets)
+    follows_print ("follows after includes", stderr);
   for (goto_number i = 0; i < ngotos; ++i)
     free (includes[i]);
-
   free (includes);
 }
 
@@ -284,6 +423,9 @@ compute_FOLLOWS (void)
 static void
 compute_lookahead_tokens (void)
 {
+  if (trace_flag & trace_automaton)
+      lookback_print (stderr);
+
   for (size_t i = 0; i < nLA; ++i)
     for (goto_list *sp = lookback[i]; sp; sp = sp->next)
       bitset_or (LA[i], LA[i], goto_follows[sp->value]);
@@ -291,7 +433,6 @@ compute_lookahead_tokens (void)
   /* Free LOOKBACK. */
   for (size_t i = 0; i < nLA; ++i)
     LIST_FREE (goto_list, lookback[i]);
-
   free (lookback);
 }
 
@@ -304,16 +445,15 @@ compute_lookahead_tokens (void)
 static int
 state_lookahead_tokens_count (state *s, bool default_reduction_only_for_accept)
 {
-  int n_lookahead_tokens = 0;
-  reductions *rp = s->reductions;
-  transitions *sp = s->transitions;
+  const reductions *reds = s->reductions;
+  const transitions *trans = s->transitions;
 
   /* Transitions are only disabled during conflict resolution, and that
      hasn't happened yet, so there should be no need to check that
      transition 0 hasn't been disabled before checking if it is a shift.
      However, this check was performed at one time, so we leave it as an
      aver.  */
-  aver (sp->num == 0 || !TRANSITION_IS_DISABLED (sp, 0));
+  aver (trans->num == 0 || !TRANSITION_IS_DISABLED (trans, 0));
 
   /* We need a lookahead either to distinguish different reductions
      (i.e., there are two or more), or to distinguish a reduction from a
@@ -323,15 +463,13 @@ state_lookahead_tokens_count (state *s, bool default_reduction_only_for_accept)
      a lookahead token that makes sense there, and so no lookahead token
      should be read) if the user has otherwise disabled default
      reductions.  */
-  if (rp->num > 1
-      || (rp->num == 1 && sp->num && TRANSITION_IS_SHIFT (sp, 0))
-      || (rp->num == 1 && rp->rules[0]->number != 0
-          && default_reduction_only_for_accept))
-    n_lookahead_tokens += rp->num;
-  else
-    s->consistent = true;
-
-  return n_lookahead_tokens;
+  s->consistent =
+    !(reds->num > 1
+      || (reds->num == 1 && trans->num && TRANSITION_IS_SHIFT (trans, 0))
+      || (reds->num == 1 && reds->rules[0]->number != 0
+          && default_reduction_only_for_accept));
+
+  return s->consistent ? 0 : reds->num;
 }
 
 
@@ -385,47 +523,58 @@ initialize_LA (void)
 static void
 lookahead_tokens_print (FILE *out)
 {
-  fprintf (out, "Lookahead tokens: BEGIN\n");
+  fputs ("Lookaheads:\n", out);
   for (state_number i = 0; i < nstates; ++i)
     {
       const reductions *reds = states[i]->reductions;
-      int n_lookahead_tokens = 0;
-
-      if (reds->lookahead_tokens)
-        for (int j = 0; j < reds->num; ++j)
-          if (reds->lookahead_tokens[j])
-            ++n_lookahead_tokens;
-
-      fprintf (out, "State %d: %d lookahead tokens\n",
-               i, n_lookahead_tokens);
-
-      if (reds->lookahead_tokens)
-        for (int j = 0; j < reds->num; ++j)
-          {
-            bitset_iterator iter;
-            int k;
-            BITSET_FOR_EACH (iter, reds->lookahead_tokens[j], k, 0)
-              fprintf (out, "   on %d (%s) -> rule %d\n",
-                       k, symbols[k]->tag,
-                       reds->rules[j]->number);
-          }
+      if (reds->num)
+        {
+          fprintf (out, "  State %d:\n", i);
+          for (int j = 0; j < reds->num; ++j)
+            {
+              fprintf (out, "    rule %d:", reds->rules[j]->number);
+              if (reds->lookahead_tokens)
+              {
+                bitset_iterator iter;
+                int k;
+                BITSET_FOR_EACH (iter, reds->lookahead_tokens[j], k, 0)
+                  fprintf (out, " %s", symbols[k]->tag);
+              }
+              fputc ('\n', out);
+            }
+        }
     }
-  fprintf (out, "Lookahead tokens: END\n");
+  fputc ('\n', out);
 }
 
 void
 lalr (void)
 {
+  if (trace_flag & trace_automaton)
+    {
+      fputc ('\n', stderr);
+      begin_use_class ("trace0", stderr);
+      fprintf (stderr, "lalr: begin");
+      end_use_class ("trace0", stderr);
+      fputc ('\n', stderr);
+    }
   initialize_LA ();
   set_goto_map ();
-  initialize_F ();
+  initialize_goto_follows ();
   lookback = xcalloc (nLA, sizeof *lookback);
   build_relations ();
-  compute_FOLLOWS ();
+  compute_follows ();
   compute_lookahead_tokens ();
 
   if (trace_flag & trace_sets)
     lookahead_tokens_print (stderr);
+  if (trace_flag & trace_automaton)
+    {
+      begin_use_class ("trace0", stderr);
+      fprintf (stderr, "lalr: done");
+      end_use_class ("trace0", stderr);
+      fputc ('\n', stderr);
+    }
 }
 
 
diff --git a/contrib/tools/bison/src/lalr.h b/contrib/tools/bison/src/lalr.h
index b06b3051ec1b..f94123a4bcba 100644
--- a/contrib/tools/bison/src/lalr.h
+++ b/contrib/tools/bison/src/lalr.h
@@ -1,7 +1,7 @@
 /* Compute lookahead criteria for bison,
 
    Copyright (C) 1984, 1986, 1989, 2000, 2002, 2004, 2006-2007,
-   2009-2015, 2018-2019 Free Software Foundation, Inc.
+   2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -83,8 +83,8 @@ typedef size_t goto_number;
 /** Index into #from_state and #to_state.
 
    All the transitions that accept a particular variable are grouped
-   together and GOTO_MAP[I - NTOKENS] is the index in FROM_STATE and
-   TO_STATE of the first of them.  */
+   together in FROM_STATE and TO_STATE, with indexes from GOTO_MAP[I -
+   NTOKENS] to GOTO_MAP[I - NTOKENS + 1] - 1 (including both).  */
 extern goto_number *goto_map;
 
 /** The size of #from_state and #to_state.  */
@@ -96,11 +96,10 @@ extern state_number *from_state;
 /** State number it leads to.  */
 extern state_number *to_state;
 
-/** Map a state/symbol pair into its numeric representation.  */
-goto_number map_goto (state_number s0, symbol_number sym);
+/** The number of the goto from state SRC labeled with nterm SYM.  */
+goto_number map_goto (state_number src, symbol_number sym);
 
 /* goto_follows[i] is the set of tokens following goto i.  */
 extern bitsetv goto_follows;
 
-
 #endif /* !LALR_H_ */
diff --git a/contrib/tools/bison/src/location.c b/contrib/tools/bison/src/location.c
index 6876890c02a7..5631b10bfa94 100644
--- a/contrib/tools/bison/src/location.c
+++ b/contrib/tools/bison/src/location.c
@@ -1,6 +1,6 @@
 /* Locations for Bison
 
-   Copyright (C) 2002, 2005-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2002, 2005-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,57 +21,99 @@
 #include <config.h>
 #include "system.h"
 
+#include <mbfile.h>
 #include <mbswidth.h>
 #include <quotearg.h>
+#include <stdio.h>    /* fileno */
+#include <sys/ioctl.h>
+#include <sys/stat.h> /* fstat */
+#include <termios.h>
+
+#ifdef WINSIZE_IN_PTEM
+# include <sys/stream.h>
+# error #include <sys/ptem.h>
+#endif
 
 #include "complain.h"
+#include "getargs.h"
 #include "location.h"
 
-location const empty_location = EMPTY_LOCATION_INIT;
+location const empty_loc = EMPTY_LOCATION_INIT;
 
-/* If BUF is null, add BUFSIZE (which in this case must be less than
-   INT_MAX) to COLUMN; otherwise, add mbsnwidth (BUF, BUFSIZE, 0) to
-   COLUMN.  If an overflow occurs, or might occur but is undetectable,
-   return INT_MAX.  Assume COLUMN is nonnegative.  */
+static int
+min_int (int a, int b)
+{
+  return a < b ? a : b;
+}
 
-static inline int
-add_column_width (int column, char const *buf, size_t bufsize)
+static int
+max_int (int a, int b)
 {
-  size_t width;
-  unsigned remaining_columns = INT_MAX - column;
+  return a >= b ? a : b;
+}
 
-  if (buf)
+/* The terminal width.  Not less than 40.  */
+static int
+columns (void)
+{
+  const char *cp = getenv ("COLUMNS");
+  int res = 80;
+  if (cp && *cp)
     {
-      if (INT_MAX / 2 <= bufsize)
-        return INT_MAX;
-      width = mbsnwidth (buf, bufsize, 0);
+      long l = strtol (cp, NULL, 10);
+      res = 0 <= l && l <= INT_MAX ? l : INT_MAX;
     }
   else
-    width = bufsize;
-
-  return width <= remaining_columns ? column + width : INT_MAX;
+    {
+#ifdef TIOCGWINSZ
+      struct winsize ws;
+      if (ioctl (STDERR_FILENO, TIOCGWINSZ, &ws) != -1
+          && 0 < ws.ws_col && ws.ws_col == (size_t) ws.ws_col)
+        res = ws.ws_col;
+#endif
+    }
+  return max_int (res, 40);
 }
 
-/* Set *LOC and adjust scanner cursor to account for token TOKEN of
-   size SIZE.  */
+/* Available screen width.  */
+static int screen_width = 80;
 
-void
-location_compute (location *loc, boundary *cur, char const *token, size_t size)
+/* The ellipsis symbol to use for this locale, and the number of
+   screen-columns it uses.  */
+static const char *ellipsis = "...";
+static int ellipsize = 3;
+
+/* If BUF is null, add BUFSIZE (which in this case must be less than
+   INT_MAX) to COLUMN; otherwise, add mbsnwidth (BUF, BUFSIZE, 0) to
+   COLUMN.  If an overflow occurs, return INT_MAX.  */
+
+static inline int
+add_column_width (int column, char const *buf, size_t bufsize)
+{
+  int width
+    = buf ? mbsnwidth (buf, bufsize, 0)
+    : INT_MAX <= bufsize ? INT_MAX
+    : bufsize;
+  return column <= INT_MAX - width ? column + width : INT_MAX;
+}
+
+static void
+boundary_compute (boundary *cur, char const *token, size_t size)
 {
   int line = cur->line;
   int column = cur->column;
+  int byte = cur->byte;
   char const *p0 = token;
   char const *p = token;
   char const *lim = token + size;
 
-  loc->start = *cur;
-
-  for (p = token; p < lim; p++)
+  for (p = token; p < lim; ++p)
     switch (*p)
       {
       case '\n':
         line += line < INT_MAX;
         column = 1;
+        byte = 1;
         p0 = p + 1;
         break;
 
@@ -79,59 +121,94 @@ location_compute (location *loc, boundary *cur, char const *token, size_t size)
         column = add_column_width (column, p0, p - p0);
         column = add_column_width (column, NULL, 8 - ((column - 1) & 7));
         p0 = p + 1;
+        byte += byte < INT_MAX;
         break;
 
       default:
+        byte += byte < INT_MAX;
         break;
       }
+  column = add_column_width (column, p0, p - p0);
 
   cur->line = line;
-  cur->column = column = add_column_width (column, p0, p - p0);
+  cur->column = column;
+  cur->byte = byte;
+}
+
+
+/* Set *LOC and adjust scanner cursor to account for token TOKEN of
+   size SIZE.  */
 
+void
+location_compute (location *loc, boundary *cur, char const *token, size_t size)
+{
+  loc->start = *cur;
+  boundary_compute (cur, token, size);
   loc->end = *cur;
 
-  if (line == INT_MAX && loc->start.line != INT_MAX)
+  if (loc->end.line == INT_MAX && loc->start.line != INT_MAX)
     complain (loc, Wother, _("line number overflow"));
-  if (column == INT_MAX && loc->start.column != INT_MAX)
+  if (loc->end.column == INT_MAX && loc->start.column != INT_MAX)
     complain (loc, Wother, _("column number overflow"));
+  /* TRANSLATORS: we are counting bytes, and there are too many.  */
+  if (loc->end.byte == INT_MAX && loc->start.byte != INT_MAX)
+    complain (loc, Wother, _("byte number overflow"));
 }
 
+static int
+boundary_print (boundary const *b, FILE *out)
+{
+  return fprintf (out, "%s:%d.%d@%d",
+                  quotearg_n_style (3, escape_quoting_style, b->file),
+                  b->line, b->column, b->byte);
+}
 
-unsigned
+int
 location_print (location loc, FILE *out)
 {
-  unsigned res = 0;
-  int end_col = 0 != loc.end.column ? loc.end.column - 1 : 0;
-  res += fprintf (out, "%s",
-                  quotearg_n_style (3, escape_quoting_style, loc.start.file));
-  if (0 <= loc.start.line)
+  int res = 0;
+  if (trace_flag & trace_locations)
     {
-      res += fprintf (out, ":%d", loc.start.line);
-      if (0 <= loc.start.column)
-        res += fprintf (out, ".%d", loc.start.column);
+      res += boundary_print (&loc.start, out);
+      res += fprintf (out, "-");
+      res += boundary_print (&loc.end, out);
     }
-  if (loc.start.file != loc.end.file)
+  else
     {
-      res += fprintf (out, "-%s",
-                      quotearg_n_style (3, escape_quoting_style,
-                                        loc.end.file));
-      if (0 <= loc.end.line)
+      aver (loc.start.file);
+      aver (loc.end.file);
+      int end_col = 0 != loc.end.column ? loc.end.column - 1 : 0;
+      res += fprintf (out, "%s",
+                      quotearg_n_style (3, escape_quoting_style, loc.start.file));
+      if (0 < loc.start.line)
         {
-          res += fprintf (out, ":%d", loc.end.line);
-          if (0 <= end_col)
-            res += fprintf (out, ".%d", end_col);
+          res += fprintf (out, ":%d", loc.start.line);
+          if (0 < loc.start.column)
+            res += fprintf (out, ".%d", loc.start.column);
         }
-    }
-  else if (0 <= loc.end.line)
-    {
-      if (loc.start.line < loc.end.line)
+      if (loc.start.file != loc.end.file)
         {
-          res += fprintf (out, "-%d", loc.end.line);
-          if (0 <= end_col)
-            res += fprintf (out, ".%d", end_col);
+          res += fprintf (out, "-%s",
+                          quotearg_n_style (3, escape_quoting_style,
+                                            loc.end.file));
+          if (0 < loc.end.line)
+            {
+              res += fprintf (out, ":%d", loc.end.line);
+              if (0 <= end_col)
+                res += fprintf (out, ".%d", end_col);
+            }
+        }
+      else if (0 < loc.end.line)
+        {
+          if (loc.start.line < loc.end.line)
+            {
+              res += fprintf (out, "-%d", loc.end.line);
+              if (0 <= end_col)
+                res += fprintf (out, ".%d", end_col);
+            }
+          else if (0 <= end_col && loc.start.column < end_col)
+            res += fprintf (out, "-%d", end_col);
         }
-      else if (0 <= end_col && loc.start.column < end_col)
-        res += fprintf (out, "-%d", end_col);
     }
 
   return res;
@@ -140,82 +217,300 @@ location_print (location loc, FILE *out)
 
 /* Persistent data used by location_caret to avoid reopening and rereading the
    same file all over for each error.  */
-struct caret_info
+static struct
 {
-  FILE *source;
-  size_t line;
+  /* Raw input file.  */
+  FILE *file;
+  /* Input file as a stream of multibyte characters.  */
+  mb_file_t mbfile;
+  /* The position within the last file we quoted.  If POS.FILE is non
+     NULL, but FILE is NULL, it means this file is special and should
+     not be quoted. */
+  boundary pos;
+  /* Offset in FILE of the current line (i.e., where line POS.LINE
+     starts).  */
   size_t offset;
-};
-
-static struct caret_info caret_info = { NULL, 1, 0 };
+  /* Length of the current line.  */
+  int line_len;
+  /* Given the initial column to display, the offset (number of
+     characters to skip at the beginning of the line). */
+  int skip;
+
+  /* Available width to quote the source file.  Eight chars are
+     consumed by the left-margin (with line number).  */
+  int width;
+} caret_info;
+
+void caret_init (void)
+{
+  screen_width = columns ();
+  /* TRANSLATORS: This is used when a line is too long, and is
+     displayed truncated.  Use an ellipsis appropriate for your
+     language, remembering that "…" (U+2026 HORIZONTAL ELLIPSIS)
+     sometimes misdisplays and that "..." (three ASCII periods) is a
+     safer choice in some locales.  */
+  ellipsis = _("...");
+  ellipsize = mbswidth (ellipsis, 0);
+}
 
 void
-cleanup_caret ()
+caret_free (void)
 {
-  if (caret_info.source)
-    fclose (caret_info.source);
-  caret_info.source = NULL;
-  caret_info.line = 1;
-  caret_info.offset = 0;
+  if (caret_info.file)
+    {
+      fclose (caret_info.file);
+      caret_info.file = NULL;
+    }
 }
 
-void
-location_caret (location loc, FILE *out)
+/* Open FILE for quoting, if needed, and if possible.  Return whether
+   the file can quoted. */
+static bool
+caret_set_file (const char *file)
 {
-  /* FIXME: find a way to support multifile locations, and only open once each
-     file. That would make the procedure future-proof.  */
-  if (! (caret_info.source
-         || (caret_info.source = fopen (loc.start.file, "r")))
-      || loc.start.column == -1 || loc.start.line == -1)
-    return;
+  /* If a different file than before, close and let the rest open
+     the new one. */
+  if (caret_info.pos.file && caret_info.pos.file != file)
+    {
+      caret_free ();
+      caret_info.pos.file = NULL;
+    }
+  if (!caret_info.pos.file)
+    {
+      caret_info.pos.file = file;
+      if ((caret_info.file = fopen (caret_info.pos.file, "r")))
+        {
+          /* If the file is not regular (imagine #line 1 "/dev/stdin"
+             in the input file for instance), don't try to quote the
+             file.  Keep caret_info.file set so that we don't try to
+             open it again, but leave caret_info.file NULL so that we
+             don't try to quote it. */
+          struct stat buf;
+          if (fstat (fileno (caret_info.file), &buf) == 0
+              && buf.st_mode & S_IFREG)
+            {
+              caret_info.pos.line = 1;
+              mbf_init (caret_info.mbfile, caret_info.file);
+            }
+          else
+            caret_free ();
+        }
+    }
+  return !!caret_info.file;
+}
+
+/* Getc, but smash \r\n as \n.  */
+static void
+caret_getc_internal (mbchar_t *res)
+{
+  mbf_getc (*res, caret_info.mbfile);
+  if (mb_iseq (*res, '\r'))
+    {
+      mbchar_t c;
+      mbf_getc (c, caret_info.mbfile);
+      if (mb_iseq (c, '\n'))
+        mb_copy (res, &c);
+      else
+        mbf_ungetc (c, caret_info.mbfile);
+    }
+}
+
+#define caret_getc(Var) caret_getc_internal(&Var)
 
+/* Move CARET_INFO (which has a valid FILE) to the line number LINE.
+   Compute and cache that line's length in CARET_INFO.LINE_LEN.
+   Return whether successful.  */
+static bool
+caret_set_line (int line)
+{
   /* If the line we want to quote is seekable (the same line as the previous
      location), just seek it. If it was a previous line, we lost track of it,
      so return to the start of file.  */
-  if (caret_info.line <= loc.start.line)
-    fseek (caret_info.source, caret_info.offset, SEEK_SET);
-  else
+  if (line < caret_info.pos.line)
     {
-      caret_info.line = 1;
+      caret_info.pos.line = 1;
       caret_info.offset = 0;
-      fseek (caret_info.source, caret_info.offset, SEEK_SET);
     }
+  if (fseek (caret_info.file, caret_info.offset, SEEK_SET))
+    return false;
+
+  /* If this is the same line as the previous one, we are done. */
+  if (line < caret_info.pos.line)
+    return true;
 
   /* Advance to the line's position, keeping track of the offset.  */
-  while (caret_info.line < loc.start.line)
-    caret_info.line += getc (caret_info.source) == '\n';
-  caret_info.offset = ftell (caret_info.source);
+  while (caret_info.pos.line < line)
+    {
+      mbchar_t c;
+      caret_getc (c);
+      if (mb_iseof (c))
+        /* Something is wrong, that line number does not exist.  */
+        return false;
+      caret_info.pos.line += mb_iseq (c, '\n');
+    }
+  caret_info.offset = ftell (caret_info.file);
+  caret_info.pos.column = 1;
+  /* Reset mbf's internal state.
+     FIXME: should be done in mbfile.  */
+  caret_info.mbfile.eof_seen = 0;
+
+  /* Find the number of columns of this line.  */
+  while (true)
+    {
+      mbchar_t c;
+      caret_getc (c);
+      if (mb_iseof (c) || mb_iseq (c, '\n'))
+        break;
+      boundary_compute (&caret_info.pos, mb_ptr (c), mb_len (c));
+    }
+  caret_info.line_len = caret_info.pos.column;
+  /* Go back to the beginning of line.  */
+  if (fseek (caret_info.file, caret_info.offset, SEEK_SET))
+    return false;
+  /* Reset mbf's internal state.
+     FIXME: should be done in mbfile.  */
+  caret_info.mbfile.eof_seen = 0;
+  caret_info.pos.column = 1;
+  return true;
+}
+
+/* Compute CARET_INFO.WIDTH and CARET_INFO.SKIP based on the fact that
+   the first column to display in the current line is COL.  */
+static bool
+caret_set_column (int col)
+{
+  /* Available width.  Eight chars are consumed by the left-margin
+     (with line number).  */
+  caret_info.width = screen_width - 8;
+  caret_info.skip = 0;
+  if (caret_info.width < caret_info.line_len)
+    {
+      /* We cannot quote the whole line.  Make sure we can see the
+         beginning of the location.  */
+      caret_info.skip = caret_info.width < col ? col - 10 : 0;
+    }
+  /* If we skip the initial part, we insert "..." before.  */
+  if (caret_info.skip)
+    caret_info.width -= ellipsize;
+  /* If the end of line does not fit, we also need to truncate the
+     end, and leave "..." there.  */
+  if (caret_info.width < caret_info.line_len - caret_info.skip)
+    caret_info.width -= ellipsize;
+  return true;
+}
+
+void
+location_caret (location loc, const char *style, FILE *out)
+{
+  if (!loc.start.line)
+    return;
+  if (!caret_set_file (loc.start.file))
+    return;
+  if (!caret_set_line (loc.start.line))
+    return;
+  if (!caret_set_column (loc.start.column))
+    return;
+
+  const int width = caret_info.width;
+  const int skip = caret_info.skip;
 
   /* Read the actual line.  Don't update the offset, so that we keep a pointer
      to the start of the line.  */
   {
-    int c = getc (caret_info.source);
-    if (c != EOF)
+    mbchar_t c;
+    caret_getc (c);
+    if (!mb_iseof (c))
       {
-        /* Quote the file, indent by a single column.  */
-        putc (' ', out);
-        do
-          putc (c, out);
-        while ((c = getc (caret_info.source)) != EOF && c != '\n');
-        putc ('\n', out);
+        /* The last column to highlight.  Only the first line of
+           multiline locations are quoted, in which case the ending
+           column is the end of line.
+
+           We used to work with byte offsets, and that was much
+           easier.  However, we went back to using (visual) columns to
+           support truncating of long lines.  */
+        const int col_end
+          = loc.start.line == loc.end.line
+          ? loc.end.column
+          : caret_info.line_len;
+        /* Quote the file (at most the first line in the case of
+           multiline locations).  */
+        {
+          fprintf (out, "%5d | %s", loc.start.line, skip ? ellipsis : "");
+          /* Whether we opened the style.  If the line is not as
+             expected (maybe the file was changed since the scanner
+             ran), we might reach the end before we actually saw the
+             opening column.  */
+          enum { before, inside, after } state = before;
+          while (!mb_iseof (c) && !mb_iseq (c, '\n'))
+            {
+              // We might have already opened (and even closed!) the
+              // style and yet have the equality of the columns if we
+              // just saw zero-width characters.
+              if (state == before
+                  && caret_info.pos.column == loc.start.column)
+                {
+                  begin_use_class (style, out);
+                  state = inside;
+                }
+              if (skip < caret_info.pos.column)
+                mb_putc (c, out);
+              boundary_compute (&caret_info.pos, mb_ptr (c), mb_len (c));
+              caret_getc (c);
+              if (state == inside
+                  && (caret_info.pos.column == col_end
+                      || width < caret_info.pos.column - skip))
+                {
+                  end_use_class (style, out);
+                  state = after;
+                }
+              if (width < caret_info.pos.column - skip)
+                {
+                  fputs (ellipsis, out);
+                  break;
+                }
+            }
+          if (state == inside)
+            {
+              // The line is shorter than expected.
+              end_use_class (style, out);
+              state = after;
+            }
+          putc ('\n', out);
+        }
 
+        /* Print the carets with the same indentation as above.  */
         {
-          /* The caret of a multiline location ends with the first line.  */
-          size_t len = loc.start.line != loc.end.line
-            ? ftell (caret_info.source) - caret_info.offset
-            : loc.end.column;
-          int i;
-
-          /* Print the carets (at least one), with the same indent as above.*/
-          fprintf (out, " %*s", loc.start.column - 1, "");
-          for (i = loc.start.column; i == loc.start.column || i < len; ++i)
-            putc (i == loc.start.column ? '^' : '~', out);
-          }
-        putc ('\n', out);
+          fprintf (out, "      | %*s",
+                   loc.start.column - 1 - skip + (skip ? ellipsize : 0), "");
+          begin_use_class (style, out);
+          putc ('^', out);
+          /* Underlining a multiline location ends with the first
+             line.  */
+          for (int i = loc.start.column - 1 - skip + 1,
+                 i_end = min_int (col_end - 1 - skip, width);
+               i < i_end; ++i)
+            putc ('~', out);
+          end_use_class (style, out);
+          putc ('\n', out);
+        }
       }
   }
 }
 
+void
+location_caret_suggestion (location loc, const char *s, FILE *out)
+{
+  const char *style = "fixit-insert";
+  fprintf (out, "      | %*s",
+           loc.start.column - 1 - caret_info.skip
+           + (caret_info.skip ? ellipsize : 0),
+           "");
+  begin_use_class (style, out);
+  fputs (s, out);
+  end_use_class (style, out);
+  putc ('\n', out);
+}
+
 bool
 location_empty (location loc)
 {
@@ -224,17 +519,29 @@ location_empty (location loc)
 }
 
 void
-boundary_set_from_string (boundary *bound, char *loc_str)
-{
-  /* Must search in reverse since the file name field may
-   * contain '.' or ':'.  */
-  char *delim = strrchr (loc_str, '.');
-  aver (delim);
-  *delim = '\0';
-  bound->column = atoi (delim+1);
-  delim = strrchr (loc_str, ':');
-  aver (delim);
-  *delim = '\0';
-  bound->line = atoi (delim+1);
-  bound->file = uniqstr_new (loc_str);
+boundary_set_from_string (boundary *bound, char *str)
+{
+  /* Must search in reverse since the file name field may contain '.'
+     or ':'.  */
+  char *at = strrchr (str, '@');
+  if (at)
+    {
+      *at = '\0';
+      bound->byte = atoi (at+1);
+    }
+  {
+    char *dot = strrchr (str, '.');
+    aver (dot);
+    *dot = '\0';
+    bound->column = atoi (dot+1);
+    if (!at)
+      bound->byte = bound->column;
+  }
+  {
+    char *colon = strrchr (str, ':');
+    aver (colon);
+    *colon = '\0';
+    bound->line = atoi (colon+1);
+  }
+  bound->file = uniqstr_new (str);
 }
diff --git a/contrib/tools/bison/src/location.h b/contrib/tools/bison/src/location.h
index 39e0507d967c..cb3025c6a830 100644
--- a/contrib/tools/bison/src/location.h
+++ b/contrib/tools/bison/src/location.h
@@ -1,6 +1,6 @@
 /* Locations for Bison
 
-   Copyright (C) 2002, 2004-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2002, 2004-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -33,31 +33,35 @@ typedef struct
   /* The name of the file that contains the boundary.  */
   uniqstr file;
 
-  /* If nonnegative, the (origin-1) line that contains the boundary.
+  /* If positive, the line (starting at 1) that contains the boundary.
      If this is INT_MAX, the line number has overflowed.
 
-     Meaningless and not displayed if negative.
+     Meaningless and not displayed if nonpositive.
   */
   int line;
 
-  /* If nonnegative, the (origin-1) column just after the boundary.
+  /* If positive, the column (starting at 1) just after the boundary.
      This is neither a byte count, nor a character count; it is a
-     column count.  If this is INT_MAX, the column number has
+     (visual) column count.  If this is INT_MAX, the column number has
      overflowed.
 
-     Meaningless and not displayed if negative.
-  */
+     Meaningless and not displayed if nonpositive.  */
   int column;
 
+  /* If nonnegative, the byte number (starting at 0) in the current
+     line.  Not displayed (unless --trace=location).  */
+  int byte;
+
 } boundary;
 
-/* Set the position of \a a. */
+/* Set the position of \a p. */
 static inline void
-boundary_set (boundary *b, const char *f, int l, int c)
+boundary_set (boundary *p, const char *f, int l, int c, int b)
 {
-  b->file = f;
-  b->line = l;
-  b->column = c;
+  p->file = f;
+  p->line = l;
+  p->column = c;
+  p->byte = b;
 }
 
 /* Return -1, 0, 1, depending whether a is before, equal, or
@@ -65,7 +69,12 @@ boundary_set (boundary *b, const char *f, int l, int c)
 static inline int
 boundary_cmp (boundary a, boundary b)
 {
-  int res = strcmp (a.file, b.file);
+  /* Locations with no file first.  */
+  int res =
+    a.file && b.file ? strcmp (a.file, b.file)
+    : a.file ? 1
+    : b.file ? -1
+    : 0;
   if (!res)
     res = a.line - b.line;
   if (!res)
@@ -95,8 +104,8 @@ typedef struct
 
 # define GRAM_LTYPE location
 
-# define EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}}
-extern location const empty_location;
+# define EMPTY_LOCATION_INIT {{NULL, 0, 0, 0}, {NULL, 0, 0, 0}}
+extern location const empty_loc;
 
 /* Set *LOC and adjust scanner cursor to account for token TOKEN of
    size SIZE.  */
@@ -106,14 +115,22 @@ void location_compute (location *loc,
 /* Print location to file.
    Return number of actually printed characters.
    Warning: uses quotearg's slot 3. */
-unsigned location_print (location loc, FILE *out);
+int location_print (location loc, FILE *out);
+
+/* Prepare the use of location_caret.  */
+void caret_init (void);
 
 /* Free any allocated resources and close any open file handles that are
    left-over by the usage of location_caret.  */
-void cleanup_caret (void);
+void caret_free (void);
+
+/* Quote the line containing LOC onto OUT.  Highlight the part of LOC
+   with the color STYLE.  */
+void location_caret (location loc, const char* style, FILE *out);
 
-/* Output to OUT the line and caret corresponding to location LOC.  */
-void location_caret (location loc, FILE *out);
+/* Display a suggestion of replacement for LOC with S.  To call after
+   location_caret.  */
+void location_caret_suggestion (location loc, const char *s, FILE *out);
 
 /* Return -1, 0, 1, depending whether a is before, equal, or
    after b.  */
@@ -129,7 +146,8 @@ location_cmp (location a, location b)
 /* Whether this is the empty location.  */
 bool location_empty (location loc);
 
-/* LOC_STR must be formatted as 'file:line.column', it will be modified.  */
-void boundary_set_from_string (boundary *bound, char *loc_str);
+/* STR must be formatted as 'file:line.column@byte' or 'file:line.column',
+   it will be modified.  */
+void boundary_set_from_string (boundary *bound, char *str);
 
 #endif /* ! defined LOCATION_H_ */
diff --git a/contrib/tools/bison/src/LR0.c b/contrib/tools/bison/src/lr0.c
similarity index 70%
rename from contrib/tools/bison/src/LR0.c
rename to contrib/tools/bison/src/lr0.c
index d977d3645581..2ebdcf8a4dc4 100644
--- a/contrib/tools/bison/src/LR0.c
+++ b/contrib/tools/bison/src/lr0.c
@@ -1,6 +1,6 @@
 /* Generate the LR(0) parser states for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2015, 2018-2019 Free
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2004-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -27,12 +27,12 @@
 
 #include <bitset.h>
 
-#include "LR0.h"
 #include "closure.h"
 #include "complain.h"
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
+#include "lr0.h"
 #include "reader.h"
 #include "reduce.h"
 #include "state.h"
@@ -47,24 +47,35 @@ typedef struct state_list
 static state_list *first_state = NULL;
 static state_list *last_state = NULL;
 
+/* Print CORE for debugging. */
+static void
+core_print (size_t core_size, item_number *core, FILE *out)
+{
+  for (int i = 0; i < core_size; ++i)
+    {
+      item_print (ritem + core[i], NULL, out);
+      fputc ('\n', out);
+    }
+}
 
-/*------------------------------------------------------------------.
-| A state was just discovered from another state.  Queue it for     |
-| later examination, in order to find its transitions.  Return it.  |
-`------------------------------------------------------------------*/
+/*-----------------------------------------------------------------.
+| A state was just discovered by transitioning on SYM from another |
+| state.  Queue this state for later examination, in order to find |
+| its outgoing transitions.  Return it.                            |
+`-----------------------------------------------------------------*/
 
 static state *
 state_list_append (symbol_number sym, size_t core_size, item_number *core)
 {
   state_list *node = xmalloc (sizeof *node);
-  state *s = state_new (sym, core_size, core);
+  state *res = state_new (sym, core_size, core);
 
   if (trace_flag & trace_automaton)
     fprintf (stderr, "state_list_append (state = %d, symbol = %d (%s))\n",
              nstates, sym, symbols[sym]->tag);
 
   node->next = NULL;
-  node->state = s;
+  node->state = res;
 
   if (!first_state)
     first_state = node;
@@ -72,17 +83,28 @@ state_list_append (symbol_number sym, size_t core_size, item_number *core)
     last_state->next = node;
   last_state = node;
 
-  return s;
+  return res;
 }
 
-static int nshifts;
-static symbol_number *shift_symbol;
+/* Symbols that can be "shifted" (including non terminals) from the
+   current state.  */
+bitset shift_symbol;
 
 static rule **redset;
+/* For the current state, the list of pointers to states that can be
+   reached via a shift/goto.  Could be indexed by the reaching symbol,
+   but labels of incoming transitions can be recovered by the state
+   itself.  */
 static state **shiftset;
 
+
+/* KERNEL_BASE[symbol-number] -> list of item numbers (offsets inside
+   RITEM) of length KERNEL_SIZE[symbol-number]. */
 static item_number **kernel_base;
 static int *kernel_size;
+
+/* A single dimension array that serves as storage for
+   KERNEL_BASE.  */
 static item_number *kernel_items;
 
 
@@ -98,10 +120,11 @@ allocate_itemsets (void)
                                   sizeof *symbol_count);
 
   for (rule_number r = 0; r < nrules; ++r)
-    for (item_number *rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
+    for (item_number *rhsp = rules[r].rhs; 0 <= *rhsp; ++rhsp)
       {
-        count++;
-        symbol_count[*rhsp]++;
+        symbol_number sym = item_number_as_symbol_number (*rhsp);
+        count += 1;
+        symbol_count[sym] += 1;
       }
 
   /* See comments before new_itemsets.  All the vectors of items
@@ -124,6 +147,25 @@ allocate_itemsets (void)
   kernel_size = xnmalloc (nsyms, sizeof *kernel_size);
 }
 
+/* Print the current kernel (in KERNEL_BASE). */
+static void
+kernel_print (FILE *out)
+{
+  for (symbol_number i = 0; i < nsyms; ++i)
+    if (kernel_size[i])
+      {
+        fprintf (out, "kernel[%s] =\n", symbols[i]->tag);
+        core_print (kernel_size[i], kernel_base[i], out);
+      }
+}
+
+/* Make sure the kernel is in sane state. */
+static void
+kernel_check (void)
+{
+  for (symbol_number i = 0; i < nsyms - 1; ++i)
+    assert (kernel_base[i] + kernel_size[i] <= kernel_base[i + 1]);
+}
 
 static void
 allocate_storage (void)
@@ -133,14 +175,14 @@ allocate_storage (void)
   shiftset = xnmalloc (nsyms, sizeof *shiftset);
   redset = xnmalloc (nrules, sizeof *redset);
   state_hash_new ();
-  shift_symbol = xnmalloc (nsyms, sizeof *shift_symbol);
+  shift_symbol = bitset_create (nsyms, BITSET_FIXED);
 }
 
 
 static void
 free_storage (void)
 {
-  free (shift_symbol);
+  bitset_free (shift_symbol);
   free (redset);
   free (shiftset);
   free (kernel_base);
@@ -152,44 +194,58 @@ free_storage (void)
 
 
 
-/*---------------------------------------------------------------.
-| Find which symbols can be shifted in S, and for each one       |
-| record which items would be active after that shift.  Uses the |
-| contents of itemset.                                           |
-|                                                                |
-| shift_symbol is set to a vector of the symbols that can be     |
-| shifted.  For each symbol in the grammar, kernel_base[symbol]  |
-| points to a vector of item numbers activated if that symbol is |
-| shifted, and kernel_size[symbol] is their numbers.             |
-|                                                                |
-| itemset is sorted on item index in ritem, which is sorted on   |
-| rule number.  Compute each kernel_base[symbol] with the same   |
-| sort.                                                          |
-`---------------------------------------------------------------*/
+/*------------------------------------------------------------------.
+| Find which term/nterm symbols can be "shifted" in S, and for each |
+| one record which items would be active after that transition.     |
+| Uses the contents of itemset.                                     |
+|                                                                   |
+| shift_symbol is a bitset of the term/nterm symbols that can be    |
+| shifted.  For each symbol in the grammar, kernel_base[symbol]     |
+| points to a vector of item numbers activated if that symbol is    |
+| shifted, and kernel_size[symbol] is their numbers.                |
+|                                                                   |
+| itemset is sorted on item index in ritem, which is sorted on rule |
+| number.  Compute each kernel_base[symbol] with the same sort.     |
+`------------------------------------------------------------------*/
 
 static void
 new_itemsets (state *s)
 {
   if (trace_flag & trace_automaton)
-    fprintf (stderr, "Entering new_itemsets, state = %d\n", s->number);
+    fprintf (stderr, "new_itemsets: begin: state = %d\n", s->number);
 
   memset (kernel_size, 0, nsyms * sizeof *kernel_size);
 
-  nshifts = 0;
+  bitset_zero (shift_symbol);
+
+  if (trace_flag & trace_automaton)
+    {
+      fprintf (stderr, "initial kernel:\n");
+      kernel_print (stderr);
+    }
 
   for (size_t i = 0; i < nitemset; ++i)
     if (item_number_is_symbol_number (ritem[itemset[i]]))
       {
-        symbol_number sym = item_number_as_symbol_number (ritem[itemset[i]]);
-        if (!kernel_size[sym])
+        if (trace_flag & trace_automaton)
           {
-            shift_symbol[nshifts] = sym;
-            nshifts++;
+            fputs ("working on: ", stderr);
+            item_print (ritem + itemset[i], NULL, stderr);
+            fputc ('\n', stderr);
           }
-
+        symbol_number sym = item_number_as_symbol_number (ritem[itemset[i]]);
+        bitset_set (shift_symbol, sym);
         kernel_base[sym][kernel_size[sym]] = itemset[i] + 1;
         kernel_size[sym]++;
       }
+
+  if (trace_flag & trace_automaton)
+    {
+      fprintf (stderr, "final kernel:\n");
+      kernel_print (stderr);
+      fprintf (stderr, "new_itemsets: end: state = %d\n\n", s->number);
+    }
+  kernel_check ();
 }
 
 
@@ -204,8 +260,12 @@ static state *
 get_state (symbol_number sym, size_t core_size, item_number *core)
 {
   if (trace_flag & trace_automaton)
-    fprintf (stderr, "Entering get_state, symbol = %d (%s)\n",
-             sym, symbols[sym]->tag);
+    {
+      fprintf (stderr, "Entering get_state, symbol = %d (%s), core:\n",
+               sym, symbols[sym]->tag);
+      core_print (core_size, core, stderr);
+      fputc ('\n', stderr);
+    }
 
   state *s = state_hash_lookup (core_size, core);
   if (!s)
@@ -228,24 +288,19 @@ static void
 append_states (state *s)
 {
   if (trace_flag & trace_automaton)
-    fprintf (stderr, "Entering append_states, state = %d\n", s->number);
+    fprintf (stderr, "append_states: begin: state = %d\n", s->number);
 
-  /* First sort shift_symbol into increasing order.  */
-
-  for (int i = 1; i < nshifts; i++)
-    {
-      const symbol_number sym = shift_symbol[i];
-      int j = i;
-      for (; 0 < j && sym < shift_symbol[j - 1]; j--)
-        shift_symbol[j] = shift_symbol[j - 1];
-      shift_symbol[j] = sym;
-    }
-
-  for (int i = 0; i < nshifts; i++)
+  bitset_iterator iter;
+  symbol_number sym;
+  int i = 0;
+  BITSET_FOR_EACH (iter, shift_symbol, sym, 0)
     {
-      const symbol_number sym = shift_symbol[i];
       shiftset[i] = get_state (sym, kernel_size[sym], kernel_base[sym]);
+      ++i;
     }
+
+  if (trace_flag & trace_automaton)
+    fprintf (stderr, "append_states: end: state = %d\n", s->number);
 }
 
 
@@ -277,6 +332,17 @@ save_reductions (state *s)
         }
     }
 
+  if (trace_flag & trace_automaton)
+    {
+      fprintf (stderr, "reduction[%d] = {\n", s->number);
+      for (int i = 0; i < count; ++i)
+        {
+          rule_print (redset[i], NULL, stderr);
+          fputc ('\n', stderr);
+        }
+      fputs ("}\n", stderr);
+    }
+
   /* Make a reductions structure and copy the data into it.  */
   state_reductions_set (s, count, redset);
 }
@@ -324,7 +390,7 @@ void
 generate_states (void)
 {
   allocate_storage ();
-  new_closure (nritems);
+  closure_new (nritems);
 
   /* Create the initial state.  The 0 at the lhs is the index of the
      item of this initial rule.  */
@@ -344,18 +410,17 @@ generate_states (void)
       closure (s->items, s->nitems);
       /* Record the reductions allowed out of this state.  */
       save_reductions (s);
-      /* Find the itemsets of the states that shifts can reach.  */
+      /* Find the itemsets of the states that shifts/gotos can reach.  */
       new_itemsets (s);
       /* Find or create the core structures for those states.  */
       append_states (s);
 
       /* Create the shifts structures for the shifts to those states,
          now that the state numbers transitioning to are known.  */
-      state_transitions_set (s, nshifts, shiftset);
+      state_transitions_set (s, bitset_count (shift_symbol), shiftset);
     }
 
   /* discard various storage */
-  free_closure ();
   free_storage ();
 
   /* Set up STATES. */
diff --git a/contrib/tools/bison/src/LR0.h b/contrib/tools/bison/src/lr0.h
similarity index 96%
rename from contrib/tools/bison/src/LR0.h
rename to contrib/tools/bison/src/lr0.h
index 3197ee905524..31366dbdea7f 100644
--- a/contrib/tools/bison/src/LR0.h
+++ b/contrib/tools/bison/src/lr0.h
@@ -1,6 +1,6 @@
 /* Generate the LR(0) parser states for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2015, 2018-2019 Free
+   Copyright (C) 1984, 1986, 1989, 2000-2002, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,8 +21,6 @@
 #ifndef LR0_H_
 # define LR0_H_
 
-# include "state.h"
-
 void generate_states (void);
 
 #endif /* !LR0_H_ */
diff --git a/contrib/tools/bison/src/main.c b/contrib/tools/bison/src/main.c
index 164712f484e7..9b9374278763 100644
--- a/contrib/tools/bison/src/main.c
+++ b/contrib/tools/bison/src/main.c
@@ -1,7 +1,7 @@
 /* Top level entry point of Bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2015,
-   2018-2019 Free Software Foundation, Inc.
+   2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -23,14 +23,14 @@
 
 #include <bitset.h>
 #include <bitset/stats.h>
+#include <closeout.h>
 #include <configmake.h>
 #include <progname.h>
+#include <quote.h>
 #include <quotearg.h>
 #include <relocatable.h> /* relocate2 */
 #include <timevar.h>
 
-#include "LR0.h"
-#include "closeout.h"
 #include "complain.h"
 #include "conflicts.h"
 #include "derives.h"
@@ -38,15 +38,15 @@
 #include "fixits.h"
 #include "getargs.h"
 #include "gram.h"
-#include "lalr.h"
 #include "ielr.h"
+#include "lalr.h"
+#include "lr0.h"
 #include "muscle-tab.h"
 #include "nullable.h"
 #include "output.h"
-#include "print.h"
-#include "print_graph.h"
+#include "print-graph.h"
 #include "print-xml.h"
-#include <quote.h>
+#include "print.h"
 #include "reader.h"
 #include "reduce.h"
 #include "scan-code.h"
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
      the grammar; see gram.h.  */
 
   timevar_push (tv_reader);
-  reader ();
+  reader (grammar_file);
   timevar_pop (tv_reader);
 
   if (complaint_status == status_complaint)
@@ -147,7 +147,10 @@ main (int argc, char *argv[])
 
   print_precedence_warnings ();
 
-  if (!update_flag)
+  /* Whether to generate output files.  */
+  bool generate = !(feature_flag & feature_syntax_only);
+
+  if (generate)
     {
       /* Output file names. */
       compute_output_file_names ();
@@ -188,13 +191,15 @@ main (int argc, char *argv[])
   timevar_pop (tv_free);
 
   /* Output the tables and the parser to ftable.  In file output.  */
-  if (!update_flag)
+  if (generate)
     {
       timevar_push (tv_parser);
       output ();
       timevar_pop (tv_parser);
     }
 
+ finish:
+
   timevar_push (tv_free);
   nullable_free ();
   derives_free ();
@@ -211,20 +216,15 @@ main (int argc, char *argv[])
   muscle_free ();
   code_scanner_free ();
   skel_scanner_free ();
-  quotearg_free ();
   timevar_pop (tv_free);
 
   if (trace_flag & trace_bitsets)
     bitset_stats_dump (stderr);
 
- finish:
-
   /* Stop timing and print the times.  */
   timevar_stop (tv_total);
   timevar_print (stderr);
 
-  cleanup_caret ();
-
   /* Fix input file now, even if there are errors: that's less
      warnings in the following runs.  */
   if (!fixits_empty ())
@@ -238,5 +238,8 @@ main (int argc, char *argv[])
     }
   uniqstrs_free ();
 
+  complain_free ();
+  quotearg_free ();
+
   return complaint_status ? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/contrib/tools/bison/src/muscle-tab.c b/contrib/tools/bison/src/muscle-tab.c
index 8a1b00fc638c..5778b8f31944 100644
--- a/contrib/tools/bison/src/muscle-tab.c
+++ b/contrib/tools/bison/src/muscle-tab.c
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison.
 
-   Copyright (C) 2001-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -21,13 +21,13 @@
 #include "system.h"
 
 #include <hash.h>
+#include <quote.h>
 
 #include "complain.h"
 #include "files.h"
 #include "fixits.h"
 #include "getargs.h"
 #include "muscle-tab.h"
-#include "quote.h"
 
 muscle_kind
 muscle_kind_new (char const *k)
@@ -126,8 +126,8 @@ muscle_init (void)
   /* Initialize the muscle obstack.  */
   obstack_init (&muscle_obstack);
 
-  muscle_table = hash_initialize (HT_INITIAL_CAPACITY, NULL, hash_muscle,
-                                  hash_compare_muscles, muscle_entry_free);
+  muscle_table = hash_xinitialize (HT_INITIAL_CAPACITY, NULL, hash_muscle,
+                                   hash_compare_muscles, muscle_entry_free);
 
   /* Version and input file.  */
   MUSCLE_INSERT_STRING ("version", VERSION);
@@ -211,7 +211,7 @@ muscle_syncline_grow (char const *key, location loc)
   obstack_printf (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line);
   obstack_quote (&muscle_obstack,
                  quotearg_style (c_quoting_style, loc.start.file));
-  obstack_sgrow (&muscle_obstack, ")[");
+  obstack_sgrow (&muscle_obstack, ")dnl\n[");
   char const *extension = obstack_finish0 (&muscle_obstack);
   muscle_grow (key, extension, "", "");
   obstack_free (&muscle_obstack, extension);
@@ -227,7 +227,7 @@ void
 muscle_code_grow (const char *key, const char *val, location loc)
 {
   muscle_syncline_grow (key, loc);
-  muscle_grow (key, val, "\n", "\n");
+  muscle_grow (key, val, "", "\n");
 }
 
 
@@ -275,18 +275,14 @@ muscle_boundary_grow (char const *key, boundary bound)
 {
   obstack_sgrow  (&muscle_obstack, "[[");
   obstack_escape (&muscle_obstack, bound.file);
-  obstack_printf (&muscle_obstack, ":%d.%d]]", bound.line, bound.column);
+  obstack_printf (&muscle_obstack, ":%d.%d@@%d]]", bound.line, bound.column, bound.byte);
   char const *extension = obstack_finish0 (&muscle_obstack);
   muscle_grow (key, extension, "", "");
   obstack_free (&muscle_obstack, extension);
 }
 
 
-/* In the format '[[file_name:line.column]], [[file_name:line.column]]',
-   append LOC to MUSCLE.  Use digraphs for special characters in each
-   file name.  */
-
-static void
+void
 muscle_location_grow (char const *key, location loc)
 {
   muscle_boundary_grow (key, loc.start);
@@ -296,7 +292,6 @@ muscle_location_grow (char const *key, location loc)
 
 #define COMMON_DECODE(Value)                                    \
   case '$':                                                     \
-    ++(Value); aver (*(Value) == '[');                          \
     ++(Value); aver (*(Value) == ']');                          \
     ++(Value); aver (*(Value) == '[');                          \
     obstack_sgrow (&muscle_obstack, "$");                       \
@@ -529,7 +524,7 @@ muscle_percent_define_insert (char const *var, location variable_loc,
             = atoi (muscle_find_const (how_name));
           if (how_old == MUSCLE_PERCENT_DEFINE_F)
             goto end;
-          unsigned i = 0;
+          int i = 0;
           /* If assigning the same value, make it a warning.  */
           warnings warn = STREQ (value, current_value) ? Wother : complaint;
           complain_indent (&variable_loc, warn, &i,
@@ -630,17 +625,17 @@ muscle_percent_define_check_kind (char const *variable, muscle_kind kind)
         {
         case muscle_code:
           complain (&loc, Wdeprecated,
-                    "%%define variable '%s' requires '{...}' values",
+                    _("%%define variable '%s' requires '{...}' values"),
                     variable);
           break;
         case muscle_keyword:
           complain (&loc, Wdeprecated,
-                    "%%define variable '%s' requires keyword values",
+                    _("%%define variable '%s' requires keyword values"),
                     variable);
           break;
         case muscle_string:
           complain (&loc, Wdeprecated,
-                    "%%define variable '%s' requires '\"...\"' values",
+                    _("%%define variable '%s' requires '\"...\"' values"),
                     variable);
           break;
         }
@@ -714,9 +709,11 @@ muscle_percent_define_default (char const *variable, char const *value)
       {
         uniqstr loc_name = muscle_name (variable, "loc");
         location loc;
-        loc.start.file = loc.end.file = "<default value>";
-        loc.start.line = loc.end.line = -1;
-        loc.start.column = loc.end.column = -1;
+        loc.start.file = "<default value>";
+        loc.start.line = -1;
+        loc.start.column = -1;
+        loc.start.byte = -1;
+        loc.end = loc.start;
         muscle_insert (loc_name, "");
         muscle_location_grow (loc_name, loc);
       }
@@ -741,7 +738,7 @@ muscle_percent_define_check_values (char const * const *values)
           if (!*values)
             {
               location loc = muscle_percent_define_get_loc (*variablep);
-              unsigned i = 0;
+              int i = 0;
               complain_indent (&loc, complaint, &i,
                                _("invalid value for %%define variable %s: %s"),
                                quote (*variablep), quote_n (1, value));
diff --git a/contrib/tools/bison/src/muscle-tab.h b/contrib/tools/bison/src/muscle-tab.h
index 70c45db57c7a..a0dd2020a52f 100644
--- a/contrib/tools/bison/src/muscle-tab.h
+++ b/contrib/tools/bison/src/muscle-tab.h
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison,
 
-   Copyright (C) 2001-2003, 2006-2015, 2018-2019 Free Software
+   Copyright (C) 2001-2003, 2006-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -119,6 +119,11 @@ void muscle_pair_list_grow (const char *muscle,
 void muscle_user_name_list_grow (char const *key, char const *user_name,
                                  location loc);
 
+/* In the format '[[file_name:line.column]], [[file_name:line.column]]',
+   append LOC to MUSCLE.  Use digraphs for special characters in each
+   file name.  */
+void muscle_location_grow (char const *key, location loc);
+
 /* Indicates whether a variable's value was specified with -D/--define, with
    -F/--force-define, or in the grammar file.  */
 typedef enum {
diff --git a/contrib/tools/bison/src/named-ref.c b/contrib/tools/bison/src/named-ref.c
index b9f49c4f6353..6e639ac221f6 100644
--- a/contrib/tools/bison/src/named-ref.c
+++ b/contrib/tools/bison/src/named-ref.c
@@ -1,6 +1,6 @@
 /* Named symbol references for Bison
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/contrib/tools/bison/src/named-ref.h b/contrib/tools/bison/src/named-ref.h
index bc9f99fac3cc..250c713fa8b2 100644
--- a/contrib/tools/bison/src/named-ref.h
+++ b/contrib/tools/bison/src/named-ref.h
@@ -1,6 +1,6 @@
 /* Named symbol references for Bison
 
-   Copyright (C) 2009-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
diff --git a/contrib/tools/bison/src/nullable.c b/contrib/tools/bison/src/nullable.c
index 7d6cf9c88541..453b4e596be2 100644
--- a/contrib/tools/bison/src/nullable.c
+++ b/contrib/tools/bison/src/nullable.c
@@ -1,6 +1,6 @@
 /* Calculate which nonterminals can expand into the null string for Bison.
 
-   Copyright (C) 1984, 1989, 2000-2006, 2009-2015, 2018-2019 Free
+   Copyright (C) 1984, 1989, 2000-2006, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/nullable.h b/contrib/tools/bison/src/nullable.h
index 60caf3db2214..236c50541d5f 100644
--- a/contrib/tools/bison/src/nullable.h
+++ b/contrib/tools/bison/src/nullable.h
@@ -1,6 +1,6 @@
 /* Part of the bison parser generator,
 
-   Copyright (C) 2000, 2002, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2000, 2002, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/output.c b/contrib/tools/bison/src/output.c
index 10a6d38a7ad5..5eccea4941e0 100644
--- a/contrib/tools/bison/src/output.c
+++ b/contrib/tools/bison/src/output.c
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2019 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,12 +21,10 @@
 #include <config.h>
 #include "system.h"
 
-#include <configmake.h>
 #include <filename.h> /* IS_PATH_WITH_DIR */
 #include <get-errno.h>
 #include <path-join.h>
 #include <quotearg.h>
-#include <relocatable.h> /* relocate2 */
 #include <spawn-pipe.h>
 #include <timevar.h>
 #include <wait-process.h>
@@ -44,29 +42,8 @@
 #include "symtab.h"
 #include "tables.h"
 
-#include "uniqstr.h"
-
-#include <contrib/tools/bison/arcadia_root.h>
-
-#define STR(a) XSTR(a)
-#define XSTR(a) #a
-
-const char*
-default_pkgdatadir()
-{
-    const char* arc_path  = getenv("ARCADIA_ROOT_DISTBUILD");
-    if (arc_path == NULL)
-        arc_path = ArcadiaRoot();
-    return uniqstr_concat(3, arc_path, "/", STR(BISON_DATA_DIR));
-}
-#undef PKGDATADIR
-#define PKGDATADIR (default_pkgdatadir())
-
 static struct obstack format_obstack;
 
-/* Memory allocated by relocate2, to free.  */
-static char *relocate_buffer = NULL;
-
 
 /*-------------------------------------------------------------------.
 | Create a function NAME which associates to the muscle NAME the     |
@@ -114,7 +91,6 @@ Name (char const *name, Type *table_data, Type first,                   \
   MUSCLE_INSERT_LONG_INT (obstack_finish0 (&format_obstack), lmax);     \
 }
 
-GENERATE_MUSCLE_INSERT_TABLE (muscle_insert_unsigned_table, unsigned)
 GENERATE_MUSCLE_INSERT_TABLE (muscle_insert_int_table, int)
 GENERATE_MUSCLE_INSERT_TABLE (muscle_insert_base_table, base_number)
 GENERATE_MUSCLE_INSERT_TABLE (muscle_insert_rule_number_table, rule_number)
@@ -156,9 +132,8 @@ string_output (FILE *out, char const *string)
 }
 
 
-/*----------------------------.
-| Prepare the symbols names.  |
-`----------------------------*/
+/* Generate the b4_<MUSCLE_NAME> (e.g., b4_tname) table with the
+   symbol names (aka tags). */
 
 static void
 prepare_symbol_names (char const *muscle_name)
@@ -238,17 +213,17 @@ prepare_symbols (void)
 static void
 prepare_rules (void)
 {
-  unsigned *prhs = xnmalloc (nrules, sizeof *prhs);
+  int *prhs = xnmalloc (nrules, sizeof *prhs);
   item_number *rhs = xnmalloc (nritems, sizeof *rhs);
-  unsigned *rline = xnmalloc (nrules, sizeof *rline);
+  int *rline = xnmalloc (nrules, sizeof *rline);
   symbol_number *r1 = xnmalloc (nrules, sizeof *r1);
-  unsigned *r2 = xnmalloc (nrules, sizeof *r2);
+  int *r2 = xnmalloc (nrules, sizeof *r2);
   int *dprec = xnmalloc (nrules, sizeof *dprec);
   int *merger = xnmalloc (nrules, sizeof *merger);
   int *immediate = xnmalloc (nrules, sizeof *immediate);
 
   /* Index in RHS.  */
-  unsigned i = 0;
+  int i = 0;
   for (rule_number r = 0; r < nrules; ++r)
     {
       /* Index of rule R in RHS. */
@@ -275,10 +250,10 @@ prepare_rules (void)
   aver (i == nritems);
 
   muscle_insert_item_number_table ("rhs", rhs, ritem[0], 1, nritems);
-  muscle_insert_unsigned_table ("prhs", prhs, 0, 0, nrules);
-  muscle_insert_unsigned_table ("rline", rline, 0, 0, nrules);
+  muscle_insert_int_table ("prhs", prhs, 0, 0, nrules);
+  muscle_insert_int_table ("rline", rline, 0, 0, nrules);
   muscle_insert_symbol_number_table ("r1", r1, 0, 0, nrules);
-  muscle_insert_unsigned_table ("r2", r2, 0, 0, nrules);
+  muscle_insert_int_table ("r2", r2, 0, 0, nrules);
   muscle_insert_int_table ("dprec", dprec, 0, 0, nrules);
   muscle_insert_int_table ("merger", merger, 0, 0, nrules);
   muscle_insert_int_table ("immediate", immediate, 0, 0, nrules);
@@ -383,9 +358,9 @@ symbol_numbers_output (FILE *out)
 }
 
 
-/*---------------------------------.
-| Output the user actions to OUT.  |
-`---------------------------------*/
+/*-------------------------------------------.
+| Output the user reduction actions to OUT.  |
+`-------------------------------------------*/
 
 static void
 user_actions_output (FILE *out)
@@ -394,11 +369,20 @@ user_actions_output (FILE *out)
   for (rule_number r = 0; r < nrules; ++r)
     if (rules[r].action)
       {
-        fprintf (out, "%s(%d, [b4_syncline(%d, ",
+        /* The useless "" is there to pacify syntax-check.  */
+        fprintf (out, "%s""(%d, [",
                  rules[r].is_predicate ? "b4_predicate_case" : "b4_case",
-                 r + 1, rules[r].action_location.start.line);
-        string_output (out, rules[r].action_location.start.file);
-        fprintf (out, ")\n[    %s]])\n\n", rules[r].action);
+                 r + 1);
+        if (!no_lines_flag)
+          {
+            fprintf (out, "b4_syncline(%d, ",
+                     rules[r].action_loc.start.line);
+            string_output (out, rules[r].action_loc.start.file);
+            fprintf (out, ")dnl\n");
+          }
+        fprintf (out, "[%*s%s]])\n\n",
+                 rules[r].action_loc.start.column - 1, "",
+                 rules[r].action);
       }
   fputs ("])\n\n", out);
 }
@@ -457,13 +441,13 @@ prepare_symbol_definitions (void)
       key = obstack_finish0 (&format_obstack);
 
       /* Whether the symbol has an identifier.  */
-      const char *value = symbol_id_get (sym);
+      const char *id = symbol_id_get (sym);
       SET_KEY ("has_id");
-      MUSCLE_INSERT_INT (key, !!value);
+      MUSCLE_INSERT_INT (key, !!id);
 
       /* Its identifier.  */
       SET_KEY ("id");
-      MUSCLE_INSERT_STRING (key, value ? value : "");
+      MUSCLE_INSERT_STRING (key, id ? id : "");
 
       /* Its tag.  Typically for documentation purpose.  */
       SET_KEY ("tag");
@@ -502,8 +486,13 @@ prepare_symbol_definitions (void)
               SET_KEY2 (pname, "line");
               MUSCLE_INSERT_INT (key, p->location.start.line);
 
+              SET_KEY2 (pname, "loc");
+              muscle_location_grow (key, p->location);
+
               SET_KEY (pname);
-              MUSCLE_INSERT_STRING_RAW (key, p->code);
+              obstack_printf (&muscle_obstack,
+                              "%*s%s", p->location.start.column - 1, "", p->code);
+              muscle_insert (key, obstack_finish0 (&muscle_obstack));
             }
         }
 #undef SET_KEY2
@@ -553,10 +542,10 @@ prepare_actions (void)
      parser, so we could avoid accidents by not writing them out in
      that case.  Nevertheless, it seems even better to be able to use
      the GLR skeletons even without the non-deterministic tables.  */
-  muscle_insert_unsigned_table ("conflict_list_heads", conflict_table,
-                                conflict_table[0], 1, high + 1);
-  muscle_insert_unsigned_table ("conflicting_rules", conflict_list,
-                                0, 1, conflict_list_cnt);
+  muscle_insert_int_table ("conflict_list_heads", conflict_table,
+                           conflict_table[0], 1, high + 1);
+  muscle_insert_int_table ("conflicting_rules", conflict_list,
+                           0, 1, conflict_list_cnt);
 }
 
 
@@ -703,7 +692,7 @@ prepare (void)
 #define DEFINE(Name) MUSCLE_INSERT_STRING (#Name, Name ? Name : "")
   DEFINE (dir_prefix);
   DEFINE (parser_file_name);
-  DEFINE (spec_defines_file);
+  DEFINE (spec_header_file);
   DEFINE (spec_file_prefix);
   DEFINE (spec_graph_file);
   DEFINE (spec_name_prefix);
@@ -755,17 +744,4 @@ output (void)
     unlink_generated_sources ();
 
   obstack_free (&format_obstack, NULL);
-  free (relocate_buffer);
-}
-
-char const *
-pkgdatadir (void)
-{
-  if (relocate_buffer)
-    return relocate_buffer;
-  else
-    {
-      char const *cp = getenv ("BISON_PKGDATADIR");
-      return cp ? cp : relocate2 (PKGDATADIR, &relocate_buffer);
-    }
 }
diff --git a/contrib/tools/bison/src/output.h b/contrib/tools/bison/src/output.h
index c308bf563030..641013063fa0 100644
--- a/contrib/tools/bison/src/output.h
+++ b/contrib/tools/bison/src/output.h
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for bison,
 
-   Copyright (C) 2000-2003, 2006-2007, 2009-2015, 2018-2019 Free
+   Copyright (C) 2000-2003, 2006-2007, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -24,7 +24,4 @@
 /* Output the parsing tables and the parser code to FTABLE.  */
 void output (void);
 
-/* Where our data files are installed.  */
-char const *pkgdatadir (void);
-
 #endif /* !OUTPUT_H_ */
diff --git a/contrib/tools/bison/src/parse-gram.c b/contrib/tools/bison/src/parse-gram.c
index fb5add9c28a5..33f9553f0383 100644
--- a/contrib/tools/bison/src/parse-gram.c
+++ b/contrib/tools/bison/src/parse-gram.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.2.90.23-0bbcb-dirty.  */
+/* A Bison parser, made by GNU Bison 3.5.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.2.90.23-0bbcb-dirty"
+#define YYBISON_VERSION "3.5.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -63,12 +63,12 @@
 #define YYPULL 1
 
 /* "%code top" blocks.  */
-#line 27 "src/parse-gram.y" /* yacc.c:315  */
+#line 27 "src/parse-gram.y"
 
   /* On column 0 to please syntax-check.  */
 #include <config.h>
 
-#line 72 "src/parse-gram.c" /* yacc.c:315  */
+#line 72 "src/parse-gram.c"
 /* Substitute the type names.  */
 #define YYSTYPE         GRAM_STYPE
 #define YYLTYPE         GRAM_LTYPE
@@ -80,7 +80,15 @@
 #define yynerrs         gram_nerrs
 
 
-
+# ifndef YY_CAST
+#  ifdef __cplusplus
+#   define YY_CAST(Type, Val) static_cast<Type> (Val)
+#   define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
+#  else
+#   define YY_CAST(Type, Val) ((Type) (Val))
+#   define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
+#  endif
+# endif
 # ifndef YY_NULLPTR
 #  if defined __cplusplus
 #   if 201103L <= __cplusplus
@@ -101,253 +109,33 @@
 # define YYERROR_VERBOSE 1
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "src/parse-gram.h".  */
-#ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
-# define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
-/* Debug traces.  */
-#ifndef GRAM_DEBUG
-# if defined YYDEBUG
-#if YYDEBUG
-#   define GRAM_DEBUG 1
-#  else
-#   define GRAM_DEBUG 0
-#  endif
-# else /* ! defined YYDEBUG */
-#  define GRAM_DEBUG 1
-# endif /* ! defined YYDEBUG */
-#endif  /* ! defined GRAM_DEBUG */
-#if GRAM_DEBUG
-extern int gram_debug;
-#endif
-/* "%code requires" blocks.  */
-#line 21 "src/parse-gram.y" /* yacc.c:352  */
-
-  #include "symlist.h"
-  #include "symtab.h"
-#line 239 "src/parse-gram.y" /* yacc.c:352  */
-
-  typedef enum
-  {
-    param_none   = 0,
-    param_lex    = 1 << 0,
-    param_parse  = 1 << 1,
-    param_both   = param_lex | param_parse
-  } param_type;
-#line 682 "src/parse-gram.y" /* yacc.c:352  */
-
-  #include "muscle-tab.h"
-  typedef struct
-  {
-    char const *chars;
-    muscle_kind kind;
-  } value_type;
-
-#line 147 "src/parse-gram.c" /* yacc.c:352  */
-
-/* Token type.  */
-#ifndef GRAM_TOKENTYPE
-# define GRAM_TOKENTYPE
-  enum gram_tokentype
-  {
-    GRAM_EOF = 0,
-    STRING = 258,
-    PERCENT_TOKEN = 259,
-    PERCENT_NTERM = 260,
-    PERCENT_TYPE = 261,
-    PERCENT_DESTRUCTOR = 262,
-    PERCENT_PRINTER = 263,
-    PERCENT_LEFT = 264,
-    PERCENT_RIGHT = 265,
-    PERCENT_NONASSOC = 266,
-    PERCENT_PRECEDENCE = 267,
-    PERCENT_PREC = 268,
-    PERCENT_DPREC = 269,
-    PERCENT_MERGE = 270,
-    PERCENT_CODE = 271,
-    PERCENT_DEFAULT_PREC = 272,
-    PERCENT_DEFINE = 273,
-    PERCENT_DEFINES = 274,
-    PERCENT_ERROR_VERBOSE = 275,
-    PERCENT_EXPECT = 276,
-    PERCENT_EXPECT_RR = 277,
-    PERCENT_FLAG = 278,
-    PERCENT_FILE_PREFIX = 279,
-    PERCENT_GLR_PARSER = 280,
-    PERCENT_INITIAL_ACTION = 281,
-    PERCENT_LANGUAGE = 282,
-    PERCENT_NAME_PREFIX = 283,
-    PERCENT_NO_DEFAULT_PREC = 284,
-    PERCENT_NO_LINES = 285,
-    PERCENT_NONDETERMINISTIC_PARSER = 286,
-    PERCENT_OUTPUT = 287,
-    PERCENT_REQUIRE = 288,
-    PERCENT_SKELETON = 289,
-    PERCENT_START = 290,
-    PERCENT_TOKEN_TABLE = 291,
-    PERCENT_VERBOSE = 292,
-    PERCENT_YACC = 293,
-    BRACED_CODE = 294,
-    BRACED_PREDICATE = 295,
-    BRACKETED_ID = 296,
-    CHAR = 297,
-    EPILOGUE = 298,
-    EQUAL = 299,
-    ID = 300,
-    ID_COLON = 301,
-    PERCENT_PERCENT = 302,
-    PIPE = 303,
-    PROLOGUE = 304,
-    SEMICOLON = 305,
-    TAG = 306,
-    TAG_ANY = 307,
-    TAG_NONE = 308,
-    INT = 309,
-    PERCENT_PARAM = 310,
-    PERCENT_UNION = 311,
-    PERCENT_EMPTY = 312
-  };
-#endif
-
-/* Value type.  */
-#if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
-
-union GRAM_STYPE
-{
-
-  /* precedence_declarator  */
-  assoc precedence_declarator;
-  /* "string"  */
-  char* STRING;
-  /* "{...}"  */
-  char* BRACED_CODE;
-  /* "%?{...}"  */
-  char* BRACED_PREDICATE;
-  /* "epilogue"  */
-  char* EPILOGUE;
-  /* "%{...%}"  */
-  char* PROLOGUE;
-  /* code_props_type  */
-  code_props_type code_props_type;
-  /* "integer"  */
-  int INT;
-  /* int.opt  */
-  int yytype_79;
-  /* named_ref.opt  */
-  named_ref* yytype_91;
-  /* "%param"  */
-  param_type PERCENT_PARAM;
-  /* token_decl  */
-  symbol* token_decl;
-  /* token_decl_for_prec  */
-  symbol* token_decl_for_prec;
-  /* id  */
-  symbol* id;
-  /* id_colon  */
-  symbol* id_colon;
-  /* symbol  */
-  symbol* symbol;
-  /* string_as_id  */
-  symbol* string_as_id;
-  /* string_as_id.opt  */
-  symbol* yytype_98;
-  /* generic_symlist  */
-  symbol_list* generic_symlist;
-  /* generic_symlist_item  */
-  symbol_list* generic_symlist_item;
-  /* nterm_decls  */
-  symbol_list* nterm_decls;
-  /* token_decls  */
-  symbol_list* token_decls;
-  /* token_decl.1  */
-  symbol_list* yytype_77;
-  /* token_decls_for_prec  */
-  symbol_list* token_decls_for_prec;
-  /* token_decl_for_prec.1  */
-  symbol_list* yytype_81;
-  /* symbol_decls  */
-  symbol_list* symbol_decls;
-  /* symbol_decl.1  */
-  symbol_list* yytype_84;
-  /* "%error-verbose"  */
-  uniqstr PERCENT_ERROR_VERBOSE;
-  /* "%<flag>"  */
-  uniqstr PERCENT_FLAG;
-  /* "%file-prefix"  */
-  uniqstr PERCENT_FILE_PREFIX;
-  /* "%name-prefix"  */
-  uniqstr PERCENT_NAME_PREFIX;
-  /* "%yacc"  */
-  uniqstr PERCENT_YACC;
-  /* "[identifier]"  */
-  uniqstr BRACKETED_ID;
-  /* "identifier"  */
-  uniqstr ID;
-  /* "identifier:"  */
-  uniqstr ID_COLON;
-  /* "<tag>"  */
-  uniqstr TAG;
-  /* tag.opt  */
-  uniqstr yytype_71;
-  /* tag  */
-  uniqstr tag;
-  /* variable  */
-  uniqstr variable;
-  /* "char"  */
-  unsigned char CHAR;
-  /* value  */
-  value_type value;
-#line 301 "src/parse-gram.c" /* yacc.c:352  */
-};
-
-typedef union GRAM_STYPE GRAM_STYPE;
-# define GRAM_STYPE_IS_TRIVIAL 1
-# define GRAM_STYPE_IS_DECLARED 1
-#endif
-
-/* Location type.  */
-#if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED
-typedef struct GRAM_LTYPE GRAM_LTYPE;
-struct GRAM_LTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define GRAM_LTYPE_IS_DECLARED 1
-# define GRAM_LTYPE_IS_TRIVIAL 1
-#endif
-
-
-
-int gram_parse (void);
-
-#endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED  */
+#include "parse-gram.h"
 
 
 /* Unqualified %code blocks.  */
-#line 33 "src/parse-gram.y" /* yacc.c:355  */
+#line 33 "src/parse-gram.y"
 
   #include "system.h"
+
+  #include <c-ctype.h>
   #include <errno.h>
+  #include <intprops.h>
+  #include <quotearg.h>
+  #include <vasnprintf.h>
+  #include <xmemdup0.h>
 
-  #include "c-ctype.h"
   #include "complain.h"
   #include "conflicts.h"
   #include "files.h"
   #include "getargs.h"
   #include "gram.h"
   #include "named-ref.h"
-  #include "quotearg.h"
   #include "reader.h"
   #include "scan-code.h"
   #include "scan-gram.h"
-  #include "vasnprintf.h"
-  #include "xmemdup0.h"
 
   static int current_prec = 0;
-  static location current_lhs_location;
+  static location current_lhs_loc;
   static named_ref *current_lhs_named_ref;
   static symbol *current_lhs_symbol;
   static symbol_class current_class = unknown_sym;
@@ -392,6 +180,9 @@ int gram_parse (void);
   static void handle_name_prefix (location const *loc,
                                   char const *directive, char const *value);
 
+  /* Handle a %pure-parser directive.  */
+  static void handle_pure_parser (location const *loc, char const *directive);
+
   /* Handle a %require directive.  */
   static void handle_require (location const *loc, char const *version);
 
@@ -399,18 +190,18 @@ int gram_parse (void);
   static void handle_skeleton (location const *loc, char const *skel);
 
   /* Handle a %yacc directive.  */
-  static void handle_yacc (location const *loc, char const *directive);
+  static void handle_yacc (location const *loc);
 
+  /* Implementation of yyerror.  */
   static void gram_error (location const *, char const *);
 
   /* A string that describes a char (e.g., 'a' -> "'a'").  */
   static char const *char_name (char);
 
-  #define YYTYPE_INT16 int_fast16_t
-  #define YYTYPE_INT8 int_fast8_t
-  #define YYTYPE_UINT16 uint_fast16_t
-  #define YYTYPE_UINT8 uint_fast8_t
-#line 249 "src/parse-gram.y" /* yacc.c:355  */
+  /* Add style to semantic values in traces.  */
+  static void tron (FILE *yyo);
+  static void troff (FILE *yyo);
+#line 261 "src/parse-gram.y"
 
   /** Add a lex-param and/or a parse-param.
    *
@@ -421,34 +212,81 @@ int gram_parse (void);
   static void add_param (param_type type, char *decl, location loc);
   static param_type current_param = param_none;
 
-#line 425 "src/parse-gram.c" /* yacc.c:355  */
+#line 216 "src/parse-gram.c"
 
 #ifdef short
 # undef short
 #endif
 
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
+/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure
+   <limits.h> and (if available) <stdint.h> are included
+   so that the code can choose integer types of a good width.  */
+
+#ifndef __PTRDIFF_MAX__
+# include <limits.h> /* INFRINGES ON USER NAME SPACE */
+# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+#  include <stdint.h> /* INFRINGES ON USER NAME SPACE */
+#  define YY_STDINT_H
+# endif
 #endif
 
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
+/* Narrow types that promote to a signed type and that can represent a
+   signed or unsigned integer of at least N bits.  In tables they can
+   save space and decrease cache pressure.  Promoting to a signed type
+   helps avoid bugs in integer arithmetic.  */
+
+#ifdef __INT_LEAST8_MAX__
+typedef __INT_LEAST8_TYPE__ yytype_int8;
+#elif defined YY_STDINT_H
+typedef int_least8_t yytype_int8;
 #else
 typedef signed char yytype_int8;
 #endif
 
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
+#ifdef __INT_LEAST16_MAX__
+typedef __INT_LEAST16_TYPE__ yytype_int16;
+#elif defined YY_STDINT_H
+typedef int_least16_t yytype_int16;
 #else
-typedef unsigned short yytype_uint16;
+typedef short yytype_int16;
 #endif
 
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
+#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
+typedef __UINT_LEAST8_TYPE__ yytype_uint8;
+#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST8_MAX <= INT_MAX)
+typedef uint_least8_t yytype_uint8;
+#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX
+typedef unsigned char yytype_uint8;
 #else
-typedef short yytype_int16;
+typedef short yytype_uint8;
+#endif
+
+#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__
+typedef __UINT_LEAST16_TYPE__ yytype_uint16;
+#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \
+       && UINT_LEAST16_MAX <= INT_MAX)
+typedef uint_least16_t yytype_uint16;
+#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX
+typedef unsigned short yytype_uint16;
+#else
+typedef int yytype_uint16;
+#endif
+
+#ifndef YYPTRDIFF_T
+# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
+#  define YYPTRDIFF_T __PTRDIFF_TYPE__
+#  define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
+# elif defined PTRDIFF_MAX
+#  ifndef ptrdiff_t
+#   include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  endif
+#  define YYPTRDIFF_T ptrdiff_t
+#  define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
+# else
+#  define YYPTRDIFF_T long
+#  define YYPTRDIFF_MAXIMUM LONG_MAX
+# endif
 #endif
 
 #ifndef YYSIZE_T
@@ -456,7 +294,7 @@ typedef short yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
+# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -464,7 +302,19 @@ typedef short yytype_int16;
 # endif
 #endif
 
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+#define YYSIZE_MAXIMUM                                  \
+  YY_CAST (YYPTRDIFF_T,                                 \
+           (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1)  \
+            ? YYPTRDIFF_MAXIMUM                         \
+            : YY_CAST (YYSIZE_T, -1)))
+
+#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
+
+/* Stored state numbers (used for stacks). */
+typedef yytype_uint8 yy_state_t;
+
+/* State numbers in computations.  */
+typedef int yy_state_fast_t;
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -478,22 +328,20 @@ typedef short yytype_int16;
 # endif
 #endif
 
-#ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+#ifndef YY_ATTRIBUTE_PURE
+# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
 # else
-#  define YY_ATTRIBUTE(Spec) /* empty */
+#  define YY_ATTRIBUTE_PURE
 # endif
 #endif
 
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-
 #ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+#  define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# else
+#  define YY_ATTRIBUTE_UNUSED
+# endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
@@ -505,11 +353,11 @@ typedef short yytype_int16;
 
 #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
+    _Pragma ("GCC diagnostic push")                                     \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
 # define YY_INITIAL_VALUE(Value) Value
@@ -522,6 +370,20 @@ typedef short yytype_int16;
 # define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
+# define YY_IGNORE_USELESS_CAST_BEGIN                          \
+    _Pragma ("GCC diagnostic push")                            \
+    _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
+# define YY_IGNORE_USELESS_CAST_END            \
+    _Pragma ("GCC diagnostic pop")
+#endif
+#ifndef YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_END
+#endif
+
+
+#define YY_ASSERT(E) ((void) (0 && (E)))
 
 #if 1
 
@@ -576,18 +438,19 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
+  yy_state_t yyss_alloc;
   YYSTYPE yyvs_alloc;
   YYLTYPE yyls_alloc;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+     ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE) \
+             + YYSIZEOF (YYLTYPE)) \
       + 2 * YYSTACK_GAP_MAXIMUM)
 
 # define YYCOPY_NEEDED 1
@@ -600,11 +463,11 @@ union yyalloc
 # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
     do                                                                  \
       {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
+        YYPTRDIFF_T yynewbytes;                                         \
         YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
         Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
+        yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / YYSIZEOF (*yyptr);                        \
       }                                                                 \
     while (0)
 
@@ -616,12 +479,12 @@ union yyalloc
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+      __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
 #  else
 #   define YYCOPY(Dst, Src, Count)              \
       do                                        \
         {                                       \
-          YYSIZE_T yyi;                         \
+          YYPTRDIFF_T yyi;                      \
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
@@ -633,80 +496,42 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   229
+#define YYLAST   234
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  58
+#define YYNTOKENS  60
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  42
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  121
+#define YYNRULES  122
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  164
+#define YYNSTATES  166
 
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   312
+#define YYMAXUTOK   314
+
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex.  */
-static const yytype_uint8 yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57
-};
+#define YYTRANSLATE(YYX) (YYX)
 
 #if GRAM_DEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
+static const yytype_int16 yyrline[] =
 {
-       0,   281,   281,   290,   291,   295,   296,   302,   306,   311,
-     312,   317,   318,   319,   320,   321,   326,   331,   332,   333,
-     334,   335,   336,   336,   337,   338,   339,   340,   341,   342,
-     343,   347,   348,   357,   358,   362,   373,   377,   381,   389,
-     399,   400,   410,   411,   417,   430,   430,   435,   435,   440,
-     444,   454,   455,   456,   457,   461,   462,   467,   468,   472,
-     473,   477,   478,   479,   492,   501,   505,   509,   517,   518,
-     522,   535,   536,   548,   552,   556,   564,   566,   571,   578,
-     588,   592,   596,   604,   605,   613,   614,   620,   621,   622,
-     629,   629,   637,   638,   639,   644,   647,   649,   651,   653,
-     655,   657,   659,   661,   663,   668,   669,   678,   702,   703,
-     704,   705,   717,   719,   734,   739,   740,   745,   754,   755,
-     759,   760
+       0,   293,   293,   302,   303,   307,   308,   314,   318,   323,
+     324,   329,   330,   331,   332,   333,   338,   343,   344,   345,
+     346,   347,   348,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   360,   361,   370,   371,   375,   386,   390,   394,
+     402,   412,   413,   423,   424,   430,   443,   443,   448,   448,
+     453,   457,   467,   468,   469,   470,   474,   475,   480,   481,
+     485,   486,   490,   491,   492,   505,   514,   518,   522,   530,
+     531,   535,   548,   549,   561,   565,   569,   577,   579,   584,
+     591,   601,   605,   609,   617,   622,   634,   635,   641,   642,
+     643,   650,   650,   658,   659,   660,   665,   668,   670,   672,
+     674,   676,   678,   680,   682,   684,   689,   690,   699,   723,
+     724,   725,   726,   738,   740,   767,   772,   773,   778,   787,
+     788,   792,   793
 };
 #endif
 
@@ -723,14 +548,15 @@ static const char *const yytname[] =
   "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
   "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
   "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
-  "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"",
-  "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
-  "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"",
-  "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
-  "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
-  "\"integer\"", "\"%param\"", "\"%union\"", "\"%empty\"", "$accept",
-  "input", "prologue_declarations", "prologue_declaration", "$@1",
-  "params", "grammar_declaration", "code_props_type", "union_name",
+  "\"%nondeterministic-parser\"", "\"%output\"", "\"%pure-parser\"",
+  "\"%require\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"",
+  "\"%verbose\"", "\"%yacc\"", "\"{...}\"", "\"%?{...}\"",
+  "\"[identifier]\"", "\"character literal\"", "\":\"", "\"epilogue\"",
+  "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"",
+  "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"", "\"integer\"",
+  "\"%param\"", "\"%union\"", "\"%empty\"", "$accept", "input",
+  "prologue_declarations", "prologue_declaration", "$@1", "params",
+  "grammar_declaration", "code_props_type", "union_name",
   "symbol_declaration", "$@2", "$@3", "precedence_declarator", "tag.opt",
   "generic_symlist", "generic_symlist_item", "tag", "nterm_decls",
   "token_decls", "token_decl.1", "token_decl", "int.opt",
@@ -745,92 +571,92 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_uint16 yytoknum[] =
+static const yytype_int16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314
 };
 # endif
 
-#define YYPACT_NINF -123
+#define YYPACT_NINF (-130)
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-123)))
+#define yypact_value_is_default(Yyn) \
+  ((Yyn) == YYPACT_NINF)
 
-#define YYTABLE_NINF -121
+#define YYTABLE_NINF (-122)
 
-#define yytable_value_is_error(Yytable_value) \
+#define yytable_value_is_error(Yyn) \
   0
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -123,     6,   109,  -123,   -21,  -123,  -123,     2,  -123,  -123,
-    -123,  -123,  -123,  -123,   -11,  -123,    -7,    46,  -123,     3,
-      13,  -123,    77,  -123,    43,    87,    88,  -123,  -123,  -123,
-      91,    92,    94,    32,  -123,  -123,  -123,   162,  -123,  -123,
-    -123,    53,  -123,  -123,    61,  -123,    30,  -123,   -15,   -15,
-    -123,  -123,  -123,    32,    50,    32,  -123,  -123,  -123,  -123,
-      64,  -123,    23,  -123,  -123,  -123,  -123,  -123,  -123,  -123,
-    -123,  -123,  -123,  -123,    54,  -123,    55,     8,  -123,  -123,
-      65,    68,  -123,    69,    18,    32,    60,    32,  -123,    70,
-    -123,    16,    72,    16,  -123,    70,  -123,    72,    32,    32,
-    -123,  -123,  -123,  -123,  -123,  -123,  -123,  -123,   105,  -123,
-    -123,  -123,  -123,  -123,   110,  -123,  -123,  -123,  -123,    18,
-    -123,  -123,  -123,    32,    32,  -123,  -123,  -123,    16,    16,
-    -123,   147,    32,  -123,  -123,  -123,  -123,    32,    16,  -123,
-    -123,    37,   172,  -123,  -123,    32,    97,   101,    99,   100,
-    -123,  -123,  -123,   116,    65,   172,  -123,  -123,  -123,  -123,
-    -123,    65,  -123,  -123
+    -130,    36,   110,  -130,   -22,  -130,  -130,     2,  -130,  -130,
+    -130,  -130,  -130,  -130,   -19,  -130,    -9,    40,  -130,   -17,
+      -2,  -130,    57,  -130,    21,    66,    77,  -130,  -130,  -130,
+      78,  -130,    87,    92,    44,  -130,  -130,  -130,   165,  -130,
+    -130,  -130,    50,  -130,  -130,    58,  -130,    29,  -130,    15,
+      15,  -130,  -130,  -130,    44,    47,    44,  -130,  -130,  -130,
+    -130,    61,  -130,    30,  -130,  -130,  -130,  -130,  -130,  -130,
+    -130,  -130,  -130,  -130,  -130,    51,  -130,    53,     8,  -130,
+    -130,    64,    67,  -130,    68,    20,    44,    56,    44,  -130,
+      69,  -130,   -37,    59,   -37,  -130,    69,  -130,    59,    44,
+      44,  -130,  -130,  -130,  -130,  -130,  -130,  -130,  -130,    79,
+    -130,  -130,  -130,  -130,  -130,   111,  -130,  -130,  -130,  -130,
+      20,  -130,  -130,  -130,    44,    44,  -130,  -130,  -130,   -37,
+     -37,  -130,   147,    44,  -130,   108,  -130,  -130,    44,   -37,
+    -130,  -130,  -130,   -21,   175,  -130,  -130,    44,    97,   101,
+      99,   100,  -130,  -130,  -130,   117,    64,   175,  -130,  -130,
+    -130,  -130,  -130,    64,  -130,  -130
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
      Performed when YYTABLE does not specify something else to do.  Zero
      means the default is an error.  */
-static const yytype_uint8 yydefact[] =
+static const yytype_int8 yydefact[] =
 {
-       3,     0,     0,     1,     0,    47,    45,     0,    40,    41,
-      51,    52,    53,    54,     0,    36,     0,     9,    11,     0,
-       0,     7,     0,    15,     0,     0,     0,    37,    19,    20,
-       0,     0,     0,     0,    26,    27,    28,     0,     6,    30,
-      22,    42,     4,     5,     0,    33,     0,    29,     0,     0,
-     117,   113,   112,     0,    49,    80,   115,    83,   116,    38,
-       0,   107,   108,    10,    12,    13,    14,    16,    17,    18,
-      21,    24,    25,    34,     0,   114,     0,     0,    85,    87,
-     105,     0,    43,     0,     0,     0,    50,    73,    76,    71,
-      79,     0,    48,    65,    68,    71,    46,    64,    81,     0,
-      84,    39,   110,   111,   109,     8,    89,    88,     0,    86,
-       2,   106,    90,    32,    23,    44,    61,    62,    63,    35,
-      57,    60,    59,    74,     0,    77,    72,    78,    66,     0,
-      69,   118,    82,   121,    95,    31,    58,    75,    67,   119,
-      70,    91,    92,    95,    94,     0,     0,     0,     0,     0,
-      98,    56,    99,     0,   105,    93,   100,   101,   102,   103,
-     104,   105,    96,    97
+       3,     0,     0,     1,     0,    48,    46,     0,    41,    42,
+      52,    53,    54,    55,     0,    37,     0,     9,    11,     0,
+       0,     7,     0,    15,     0,     0,     0,    38,    19,    20,
+       0,    24,     0,     0,     0,    27,    28,    29,     0,     6,
+      31,    22,    43,     4,     5,     0,    34,     0,    30,     0,
+       0,   118,   114,   113,     0,    50,    81,   116,    84,   117,
+      39,     0,   108,   109,    10,    12,    13,    14,    16,    17,
+      18,    21,    25,    26,    35,     0,   115,     0,     0,    86,
+      88,   106,     0,    44,     0,     0,     0,    51,    74,    77,
+      72,    80,     0,    49,    66,    69,    72,    47,    65,    82,
+       0,    85,    40,   111,   112,   110,     8,    90,    89,     0,
+      87,     2,   107,    91,    33,    23,    45,    62,    63,    64,
+      36,    58,    61,    60,    75,     0,    78,    73,    79,    67,
+       0,    70,   119,    83,   122,     0,    32,    59,    76,    68,
+     120,    71,    96,    92,    93,    96,    95,     0,     0,     0,
+       0,     0,    99,    57,   100,     0,   106,    94,   101,   102,
+     103,   104,   105,   106,    97,    98
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -123,  -123,  -123,  -123,  -123,  -123,   155,  -123,  -123,  -123,
-    -123,  -123,  -123,  -123,  -123,    41,  -123,  -123,   112,   -84,
-     -62,    67,  -123,   -83,   -64,  -123,   -43,  -123,   103,  -123,
-    -123,  -123,    33,  -122,  -123,  -123,   -45,  -123,   -33,   -35,
-    -123,  -123
+    -130,  -130,  -130,  -130,  -130,  -130,   156,  -130,  -130,  -130,
+    -130,  -130,  -130,  -130,  -130,    43,  -130,  -130,   114,   -66,
+     -35,    83,  -130,   -84,   -53,  -130,   -47,  -130,    82,  -130,
+    -130,  -130,    35,  -129,  -130,  -130,   -46,  -130,   -34,   -36,
+    -130,  -130
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     2,    42,    81,   114,    76,    44,    83,    45,
-      49,    48,    46,   153,   119,   120,   121,    96,    92,    93,
-      94,   127,    86,    87,    88,    54,    55,    77,    78,    79,
-     134,   141,   142,   112,    62,   105,    56,    80,    57,    58,
-     140,   110
+      -1,     1,     2,    43,    82,   115,    77,    45,    84,    46,
+      50,    49,    47,   155,   120,   121,   122,    97,    93,    94,
+      95,   128,    87,    88,    89,    55,    56,    78,    79,    80,
+     135,   143,   144,   113,    63,   106,    57,    81,    58,    59,
+     141,   111
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -838,115 +664,117 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      73,    89,   123,    95,    95,    50,     3,   128,  -120,    74,
-      98,    90,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    50,   100,   125,    14,    15,   102,    51,    59,    47,
-      52,   130,   162,    50,    60,    50,    91,    27,    61,   163,
-      89,   137,    89,    33,    51,   138,    95,    52,    95,    63,
-      90,   122,    90,    53,    75,   108,   132,    64,    51,   125,
-      51,    52,   103,    52,    41,   100,   130,    65,   104,   116,
-     117,   118,    51,   125,    51,    52,   130,    52,    89,    89,
-      66,    85,    67,    95,    95,   143,   122,   144,    90,    90,
-      68,    69,    89,    95,    70,    71,   139,    72,    82,   100,
-      84,    99,    90,   101,   106,   107,   111,   113,   115,   154,
-       4,   124,   156,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,   154,   129,   126,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,   133,   135,
-      50,   157,   158,   159,   160,   161,    37,    43,    38,    39,
-     136,    97,   131,    74,    40,    41,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,    50,   155,     0,    14,    15,
-     109,     0,     0,     0,     0,   145,   146,   147,     0,     0,
-       0,    27,     0,   148,   149,     0,     0,    33,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    75,     0,
-       0,   -55,   150,     0,    51,     0,     0,    52,    41,     0,
-       0,     0,     0,   151,     0,     0,     0,     0,     0,   152
+      74,    90,   124,    96,    96,    51,    52,    99,  -121,    75,
+      53,    91,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    60,   101,    51,    14,    15,   129,   164,    61,   145,
+      48,   146,    51,   103,   165,   126,     3,    27,    62,    65,
+      90,   138,    90,    64,    34,    52,    96,    51,    96,    53,
+      91,   123,    91,   133,    66,    54,    76,   109,    52,   131,
+      67,    68,    53,    52,   139,   101,    42,    53,    92,    69,
+     104,   126,    52,   117,   118,   119,    53,   105,    90,    90,
+      70,    71,    86,    96,    96,   126,   123,    52,    91,    91,
+      72,    53,    90,    96,   131,    73,   140,    83,    85,   101,
+     100,   102,    91,   107,   131,   108,   112,   114,   116,   125,
+     156,     4,   130,   158,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,   156,   134,   127,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      51,   136,   142,   159,   160,   161,   162,   163,    44,    38,
+     110,    39,    40,   137,    98,     0,    75,    41,    42,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    51,   132,
+     157,    14,    15,     0,     0,     0,     0,     0,   147,   148,
+     149,     0,     0,     0,    27,     0,   150,   151,     0,     0,
+       0,    34,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    76,     0,   -56,   152,     0,    52,     0,
+       0,     0,    53,    42,     0,     0,     0,     0,   153,     0,
+       0,     0,     0,     0,   154
 };
 
 static const yytype_int16 yycheck[] =
 {
-      33,    46,    85,    48,    49,     3,     0,    91,     0,     1,
-      53,    46,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,     3,    55,    87,    16,    17,     3,    42,    39,    50,
-      45,    93,   154,     3,    45,     3,    51,    29,    45,   161,
-      85,   124,    87,    35,    42,   129,    91,    45,    93,     3,
-      85,    84,    87,    51,    46,    47,    99,    54,    42,   123,
-      42,    45,    39,    45,    56,    98,   128,    54,    45,    51,
-      52,    53,    42,   137,    42,    45,   138,    45,   123,   124,
-       3,    51,    39,   128,   129,    48,   119,    50,   123,   124,
-       3,     3,   137,   138,     3,     3,   131,     3,    45,   132,
-      39,    51,   137,    39,    50,    50,    41,    39,    39,   142,
-       1,    51,   145,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,   155,    51,    54,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    43,    39,
-       3,    54,    51,    54,    54,    39,    47,     2,    49,    50,
-     119,    49,    95,     1,    55,    56,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,     3,   143,    -1,    16,    17,
-      77,    -1,    -1,    -1,    -1,    13,    14,    15,    -1,    -1,
-      -1,    29,    -1,    21,    22,    -1,    -1,    35,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    46,    -1,
-      -1,    39,    40,    -1,    42,    -1,    -1,    45,    56,    -1,
-      -1,    -1,    -1,    51,    -1,    -1,    -1,    -1,    -1,    57
+      34,    47,    86,    49,    50,     3,    43,    54,     0,     1,
+      47,    47,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    40,    56,     3,    16,    17,    92,   156,    47,    50,
+      52,    52,     3,     3,   163,    88,     0,    29,    47,    56,
+      86,   125,    88,     3,    36,    43,    92,     3,    94,    47,
+      86,    85,    88,   100,    56,    53,    48,    49,    43,    94,
+       3,    40,    47,    43,   130,    99,    58,    47,    53,     3,
+      40,   124,    43,    53,    54,    55,    47,    47,   124,   125,
+       3,     3,    53,   129,   130,   138,   120,    43,   124,   125,
+       3,    47,   138,   139,   129,     3,   132,    47,    40,   133,
+      53,    40,   138,    52,   139,    52,    42,    40,    40,    53,
+     144,     1,    53,   147,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,   157,    45,    56,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+       3,    40,    44,    56,    53,    56,    56,    40,     2,    49,
+      78,    51,    52,   120,    50,    -1,     1,    57,    58,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,     3,    96,
+     145,    16,    17,    -1,    -1,    -1,    -1,    -1,    13,    14,
+      15,    -1,    -1,    -1,    29,    -1,    21,    22,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    48,    -1,    40,    41,    -1,    43,    -1,
+      -1,    -1,    47,    58,    -1,    -1,    -1,    -1,    53,    -1,
+      -1,    -1,    -1,    -1,    59
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+static const yytype_int8 yystos[] =
 {
-       0,    59,    60,     0,     1,     4,     5,     6,     7,     8,
+       0,    61,    62,     0,     1,     4,     5,     6,     7,     8,
        9,    10,    11,    12,    16,    17,    18,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    47,    49,    50,
-      55,    56,    61,    64,    65,    67,    70,    50,    69,    68,
-       3,    42,    45,    51,    83,    84,    94,    96,    97,    39,
-      45,    45,    92,     3,    54,    54,     3,    39,     3,     3,
-       3,     3,     3,    96,     1,    46,    64,    85,    86,    87,
-      95,    62,    45,    66,    39,    51,    80,    81,    82,    94,
-      97,    51,    76,    77,    78,    94,    75,    76,    84,    51,
-      96,    39,     3,    39,    45,    93,    50,    50,    47,    86,
-      99,    41,    91,    39,    63,    39,    51,    52,    53,    72,
-      73,    74,    96,    81,    51,    82,    54,    79,    77,    51,
-      78,    79,    84,    43,    88,    39,    73,    81,    77,    97,
-      98,    89,    90,    48,    50,    13,    14,    15,    21,    22,
-      40,    51,    57,    71,    96,    90,    96,    54,    51,    54,
-      54,    39,    91,    91
+      32,    33,    34,    35,    36,    37,    38,    39,    49,    51,
+      52,    57,    58,    63,    66,    67,    69,    72,    52,    71,
+      70,     3,    43,    47,    53,    85,    86,    96,    98,    99,
+      40,    47,    47,    94,     3,    56,    56,     3,    40,     3,
+       3,     3,     3,     3,    98,     1,    48,    66,    87,    88,
+      89,    97,    64,    47,    68,    40,    53,    82,    83,    84,
+      96,    99,    53,    78,    79,    80,    96,    77,    78,    86,
+      53,    98,    40,     3,    40,    47,    95,    52,    52,    49,
+      88,   101,    42,    93,    40,    65,    40,    53,    54,    55,
+      74,    75,    76,    98,    83,    53,    84,    56,    81,    79,
+      53,    80,    81,    86,    45,    90,    40,    75,    83,    79,
+      99,   100,    44,    91,    92,    50,    52,    13,    14,    15,
+      21,    22,    41,    53,    59,    73,    98,    92,    98,    56,
+      53,    56,    56,    40,    93,    93
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+static const yytype_int8 yyr1[] =
 {
-       0,    58,    59,    60,    60,    61,    61,    61,    61,    61,
-      61,    61,    61,    61,    61,    61,    61,    61,    61,    61,
-      61,    61,    62,    61,    61,    61,    61,    61,    61,    61,
-      61,    63,    63,    64,    64,    64,    64,    64,    64,    64,
-      65,    65,    66,    66,    64,    68,    67,    69,    67,    67,
-      67,    70,    70,    70,    70,    71,    71,    72,    72,    73,
-      73,    74,    74,    74,    75,    76,    76,    76,    77,    77,
-      78,    79,    79,    80,    80,    80,    81,    81,    82,    82,
-      83,    83,    83,    84,    84,    85,    85,    86,    86,    86,
-      88,    87,    89,    89,    89,    90,    90,    90,    90,    90,
-      90,    90,    90,    90,    90,    91,    91,    92,    93,    93,
-      93,    93,    94,    94,    95,    96,    96,    97,    98,    98,
-      99,    99
+       0,    60,    61,    62,    62,    63,    63,    63,    63,    63,
+      63,    63,    63,    63,    63,    63,    63,    63,    63,    63,
+      63,    63,    64,    63,    63,    63,    63,    63,    63,    63,
+      63,    63,    65,    65,    66,    66,    66,    66,    66,    66,
+      66,    67,    67,    68,    68,    66,    70,    69,    71,    69,
+      69,    69,    72,    72,    72,    72,    73,    73,    74,    74,
+      75,    75,    76,    76,    76,    77,    78,    78,    78,    79,
+      79,    80,    81,    81,    82,    82,    82,    83,    83,    84,
+      84,    85,    85,    85,    86,    86,    87,    87,    88,    88,
+      88,    90,    89,    91,    91,    91,    92,    92,    92,    92,
+      92,    92,    92,    92,    92,    92,    93,    93,    94,    95,
+      95,    95,    95,    96,    96,    97,    98,    98,    99,   100,
+     100,   101,   101
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+static const yytype_int8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
        2,     1,     2,     2,     2,     1,     2,     2,     2,     1,
-       1,     2,     0,     3,     2,     2,     1,     1,     1,     2,
-       1,     2,     1,     1,     2,     3,     1,     1,     2,     3,
-       1,     1,     0,     1,     3,     0,     3,     0,     3,     2,
-       2,     1,     1,     1,     1,     0,     1,     1,     2,     1,
-       1,     1,     1,     1,     1,     1,     2,     3,     1,     2,
-       3,     0,     1,     1,     2,     3,     1,     2,     2,     1,
-       1,     2,     3,     1,     2,     1,     2,     1,     2,     2,
-       0,     4,     1,     3,     2,     0,     3,     4,     2,     2,
-       3,     3,     3,     3,     3,     0,     1,     1,     0,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     1,
-       0,     2
+       1,     2,     0,     3,     1,     2,     2,     1,     1,     1,
+       2,     1,     2,     1,     1,     2,     3,     1,     1,     2,
+       3,     1,     1,     0,     1,     3,     0,     3,     0,     3,
+       2,     2,     1,     1,     1,     1,     0,     1,     1,     2,
+       1,     1,     1,     1,     1,     1,     1,     2,     3,     1,
+       2,     3,     0,     1,     1,     2,     3,     1,     2,     2,
+       1,     1,     2,     3,     1,     2,     1,     2,     1,     2,
+       2,     0,     5,     1,     3,     2,     0,     3,     4,     2,
+       2,     3,     3,     3,     3,     3,     0,     1,     1,     0,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
+       1,     0,     2
 };
 
 
@@ -1099,107 +927,113 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YY
   if (yytype < YYNTOKENS)
     YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
+/* "%code pre-printer" blocks.  */
+#line 213 "src/parse-gram.y"
+tron (yyo);
+
+#line 935 "src/parse-gram.c"
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   switch (yytype)
     {
     case 3: /* "string"  */
-#line 207 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).STRING)), yyo); }
-#line 1108 "src/parse-gram.c" /* yacc.c:680  */
+#line 220 "src/parse-gram.y"
+         { fputs (((*yyvaluep).STRING), yyo); }
+#line 942 "src/parse-gram.c"
         break;
 
     case 20: /* "%error-verbose"  */
-#line 215 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (((*yyvaluep).PERCENT_ERROR_VERBOSE), yyo); }
-#line 1114 "src/parse-gram.c" /* yacc.c:680  */
+#line 227 "src/parse-gram.y"
+         { fputs (((*yyvaluep).PERCENT_ERROR_VERBOSE), yyo); }
+#line 948 "src/parse-gram.c"
         break;
 
     case 23: /* "%<flag>"  */
-#line 218 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%%%s", ((*yyvaluep).PERCENT_FLAG)); }
-#line 1120 "src/parse-gram.c" /* yacc.c:680  */
+#line 230 "src/parse-gram.y"
+         { fprintf (yyo, "%%%s", ((*yyvaluep).PERCENT_FLAG)); }
+#line 954 "src/parse-gram.c"
         break;
 
     case 24: /* "%file-prefix"  */
-#line 215 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (((*yyvaluep).PERCENT_FILE_PREFIX), yyo); }
-#line 1126 "src/parse-gram.c" /* yacc.c:680  */
+#line 227 "src/parse-gram.y"
+         { fputs (((*yyvaluep).PERCENT_FILE_PREFIX), yyo); }
+#line 960 "src/parse-gram.c"
         break;
 
     case 28: /* "%name-prefix"  */
-#line 215 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (((*yyvaluep).PERCENT_NAME_PREFIX), yyo); }
-#line 1132 "src/parse-gram.c" /* yacc.c:680  */
+#line 227 "src/parse-gram.y"
+         { fputs (((*yyvaluep).PERCENT_NAME_PREFIX), yyo); }
+#line 966 "src/parse-gram.c"
         break;
 
-    case 38: /* "%yacc"  */
-#line 215 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (((*yyvaluep).PERCENT_YACC), yyo); }
-#line 1138 "src/parse-gram.c" /* yacc.c:680  */
+    case 33: /* "%pure-parser"  */
+#line 227 "src/parse-gram.y"
+         { fputs (((*yyvaluep).PERCENT_PURE_PARSER), yyo); }
+#line 972 "src/parse-gram.c"
         break;
 
-    case 39: /* "{...}"  */
-#line 208 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).BRACED_CODE)); }
-#line 1144 "src/parse-gram.c" /* yacc.c:680  */
+    case 40: /* "{...}"  */
+#line 220 "src/parse-gram.y"
+         { fputs (((*yyvaluep).BRACED_CODE), yyo); }
+#line 978 "src/parse-gram.c"
         break;
 
-    case 40: /* "%?{...}"  */
-#line 208 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).BRACED_PREDICATE)); }
-#line 1150 "src/parse-gram.c" /* yacc.c:680  */
+    case 41: /* "%?{...}"  */
+#line 220 "src/parse-gram.y"
+         { fputs (((*yyvaluep).BRACED_PREDICATE), yyo); }
+#line 984 "src/parse-gram.c"
         break;
 
-    case 41: /* "[identifier]"  */
-#line 216 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "[%s]", ((*yyvaluep).BRACKETED_ID)); }
-#line 1156 "src/parse-gram.c" /* yacc.c:680  */
+    case 42: /* "[identifier]"  */
+#line 228 "src/parse-gram.y"
+         { fprintf (yyo, "[%s]", ((*yyvaluep).BRACKETED_ID)); }
+#line 990 "src/parse-gram.c"
         break;
 
-    case 42: /* "char"  */
-#line 204 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (char_name (((*yyvaluep).CHAR)), yyo); }
-#line 1162 "src/parse-gram.c" /* yacc.c:680  */
+    case 43: /* "character literal"  */
+#line 217 "src/parse-gram.y"
+         { fputs (char_name (((*yyvaluep).CHAR)), yyo); }
+#line 996 "src/parse-gram.c"
         break;
 
-    case 43: /* "epilogue"  */
-#line 208 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).EPILOGUE)); }
-#line 1168 "src/parse-gram.c" /* yacc.c:680  */
+    case 45: /* "epilogue"  */
+#line 220 "src/parse-gram.y"
+         { fputs (((*yyvaluep).EPILOGUE), yyo); }
+#line 1002 "src/parse-gram.c"
         break;
 
-    case 45: /* "identifier"  */
-#line 215 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (((*yyvaluep).ID), yyo); }
-#line 1174 "src/parse-gram.c" /* yacc.c:680  */
+    case 47: /* "identifier"  */
+#line 227 "src/parse-gram.y"
+         { fputs (((*yyvaluep).ID), yyo); }
+#line 1008 "src/parse-gram.c"
         break;
 
-    case 46: /* "identifier:"  */
-#line 217 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s:", ((*yyvaluep).ID_COLON)); }
-#line 1180 "src/parse-gram.c" /* yacc.c:680  */
+    case 48: /* "identifier:"  */
+#line 229 "src/parse-gram.y"
+         { fprintf (yyo, "%s:", ((*yyvaluep).ID_COLON)); }
+#line 1014 "src/parse-gram.c"
         break;
 
-    case 49: /* "%{...%}"  */
-#line 208 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).PROLOGUE)); }
-#line 1186 "src/parse-gram.c" /* yacc.c:680  */
+    case 51: /* "%{...%}"  */
+#line 220 "src/parse-gram.y"
+         { fputs (((*yyvaluep).PROLOGUE), yyo); }
+#line 1020 "src/parse-gram.c"
         break;
 
-    case 51: /* "<tag>"  */
-#line 219 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "<%s>", ((*yyvaluep).TAG)); }
-#line 1192 "src/parse-gram.c" /* yacc.c:680  */
+    case 53: /* "<tag>"  */
+#line 231 "src/parse-gram.y"
+         { fprintf (yyo, "<%s>", ((*yyvaluep).TAG)); }
+#line 1026 "src/parse-gram.c"
         break;
 
-    case 54: /* "integer"  */
-#line 222 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%d", ((*yyvaluep).INT)); }
-#line 1198 "src/parse-gram.c" /* yacc.c:680  */
+    case 56: /* "integer"  */
+#line 234 "src/parse-gram.y"
+         { fprintf (yyo, "%d", ((*yyvaluep).INT)); }
+#line 1032 "src/parse-gram.c"
         break;
 
-    case 55: /* "%param"  */
-#line 261 "src/parse-gram.y" /* yacc.c:680  */
-      {
+    case 57: /* "%param"  */
+#line 273 "src/parse-gram.y"
+{
   switch (((*yyvaluep).PERCENT_PARAM))
     {
 #define CASE(In, Out)                                           \
@@ -1211,108 +1045,108 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YY
       case param_none: aver (false); break;
     }
 }
-#line 1215 "src/parse-gram.c" /* yacc.c:680  */
+#line 1049 "src/parse-gram.c"
         break;
 
-    case 65: /* code_props_type  */
-#line 397 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_props_type))); }
-#line 1221 "src/parse-gram.c" /* yacc.c:680  */
+    case 67: /* code_props_type  */
+#line 410 "src/parse-gram.y"
+         { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_props_type))); }
+#line 1055 "src/parse-gram.c"
         break;
 
-    case 71: /* tag.opt  */
-#line 215 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (((*yyvaluep).yytype_71), yyo); }
-#line 1227 "src/parse-gram.c" /* yacc.c:680  */
+    case 73: /* tag.opt  */
+#line 227 "src/parse-gram.y"
+         { fputs (((*yyvaluep).yytype_73), yyo); }
+#line 1061 "src/parse-gram.c"
         break;
 
-    case 72: /* generic_symlist  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).generic_symlist), yyo); }
-#line 1233 "src/parse-gram.c" /* yacc.c:680  */
+    case 74: /* generic_symlist  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).generic_symlist), yyo); }
+#line 1067 "src/parse-gram.c"
         break;
 
-    case 73: /* generic_symlist_item  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).generic_symlist_item), yyo); }
-#line 1239 "src/parse-gram.c" /* yacc.c:680  */
+    case 75: /* generic_symlist_item  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).generic_symlist_item), yyo); }
+#line 1073 "src/parse-gram.c"
         break;
 
-    case 74: /* tag  */
-#line 219 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "<%s>", ((*yyvaluep).tag)); }
-#line 1245 "src/parse-gram.c" /* yacc.c:680  */
+    case 76: /* tag  */
+#line 231 "src/parse-gram.y"
+         { fprintf (yyo, "<%s>", ((*yyvaluep).tag)); }
+#line 1079 "src/parse-gram.c"
         break;
 
-    case 75: /* nterm_decls  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).nterm_decls), yyo); }
-#line 1251 "src/parse-gram.c" /* yacc.c:680  */
+    case 77: /* nterm_decls  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).nterm_decls), yyo); }
+#line 1085 "src/parse-gram.c"
         break;
 
-    case 76: /* token_decls  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).token_decls), yyo); }
-#line 1257 "src/parse-gram.c" /* yacc.c:680  */
+    case 78: /* token_decls  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).token_decls), yyo); }
+#line 1091 "src/parse-gram.c"
         break;
 
-    case 77: /* token_decl.1  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).yytype_77), yyo); }
-#line 1263 "src/parse-gram.c" /* yacc.c:680  */
+    case 79: /* token_decl.1  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).yytype_79), yyo); }
+#line 1097 "src/parse-gram.c"
         break;
 
-    case 78: /* token_decl  */
-#line 225 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s", ((*yyvaluep).token_decl) ? ((*yyvaluep).token_decl)->tag : "<NULL>"); }
-#line 1269 "src/parse-gram.c" /* yacc.c:680  */
+    case 80: /* token_decl  */
+#line 237 "src/parse-gram.y"
+         { fprintf (yyo, "%s", ((*yyvaluep).token_decl) ? ((*yyvaluep).token_decl)->tag : "<NULL>"); }
+#line 1103 "src/parse-gram.c"
         break;
 
-    case 79: /* int.opt  */
-#line 222 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%d", ((*yyvaluep).yytype_79)); }
-#line 1275 "src/parse-gram.c" /* yacc.c:680  */
+    case 81: /* int.opt  */
+#line 234 "src/parse-gram.y"
+         { fprintf (yyo, "%d", ((*yyvaluep).yytype_81)); }
+#line 1109 "src/parse-gram.c"
         break;
 
-    case 80: /* token_decls_for_prec  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).token_decls_for_prec), yyo); }
-#line 1281 "src/parse-gram.c" /* yacc.c:680  */
+    case 82: /* token_decls_for_prec  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).token_decls_for_prec), yyo); }
+#line 1115 "src/parse-gram.c"
         break;
 
-    case 81: /* token_decl_for_prec.1  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).yytype_81), yyo); }
-#line 1287 "src/parse-gram.c" /* yacc.c:680  */
+    case 83: /* token_decl_for_prec.1  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).yytype_83), yyo); }
+#line 1121 "src/parse-gram.c"
         break;
 
-    case 82: /* token_decl_for_prec  */
-#line 225 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s", ((*yyvaluep).token_decl_for_prec) ? ((*yyvaluep).token_decl_for_prec)->tag : "<NULL>"); }
-#line 1293 "src/parse-gram.c" /* yacc.c:680  */
+    case 84: /* token_decl_for_prec  */
+#line 237 "src/parse-gram.y"
+         { fprintf (yyo, "%s", ((*yyvaluep).token_decl_for_prec) ? ((*yyvaluep).token_decl_for_prec)->tag : "<NULL>"); }
+#line 1127 "src/parse-gram.c"
         break;
 
-    case 83: /* symbol_decls  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).symbol_decls), yyo); }
-#line 1299 "src/parse-gram.c" /* yacc.c:680  */
+    case 85: /* symbol_decls  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).symbol_decls), yyo); }
+#line 1133 "src/parse-gram.c"
         break;
 
-    case 84: /* symbol_decl.1  */
-#line 231 "src/parse-gram.y" /* yacc.c:680  */
-      { symbol_list_syms_print (((*yyvaluep).yytype_84), yyo); }
-#line 1305 "src/parse-gram.c" /* yacc.c:680  */
+    case 86: /* symbol_decl.1  */
+#line 243 "src/parse-gram.y"
+         { symbol_list_syms_print (((*yyvaluep).yytype_86), yyo); }
+#line 1139 "src/parse-gram.c"
         break;
 
-    case 92: /* variable  */
-#line 215 "src/parse-gram.y" /* yacc.c:680  */
-      { fputs (((*yyvaluep).variable), yyo); }
-#line 1311 "src/parse-gram.c" /* yacc.c:680  */
+    case 94: /* variable  */
+#line 227 "src/parse-gram.y"
+         { fputs (((*yyvaluep).variable), yyo); }
+#line 1145 "src/parse-gram.c"
         break;
 
-    case 93: /* value  */
-#line 692 "src/parse-gram.y" /* yacc.c:680  */
-      {
+    case 95: /* value  */
+#line 713 "src/parse-gram.y"
+{
   switch (((*yyvaluep).value).kind)
     {
     case muscle_code:    fprintf (yyo,  "{%s}",  ((*yyvaluep).value).chars); break;
@@ -1320,42 +1154,48 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YY
     case muscle_string:  fprintf (yyo, "\"%s\"", ((*yyvaluep).value).chars); break;
     }
 }
-#line 1324 "src/parse-gram.c" /* yacc.c:680  */
+#line 1158 "src/parse-gram.c"
         break;
 
-    case 94: /* id  */
-#line 225 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s", ((*yyvaluep).id) ? ((*yyvaluep).id)->tag : "<NULL>"); }
-#line 1330 "src/parse-gram.c" /* yacc.c:680  */
+    case 96: /* id  */
+#line 237 "src/parse-gram.y"
+         { fprintf (yyo, "%s", ((*yyvaluep).id) ? ((*yyvaluep).id)->tag : "<NULL>"); }
+#line 1164 "src/parse-gram.c"
         break;
 
-    case 95: /* id_colon  */
-#line 226 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s:", ((*yyvaluep).id_colon)->tag); }
-#line 1336 "src/parse-gram.c" /* yacc.c:680  */
+    case 97: /* id_colon  */
+#line 238 "src/parse-gram.y"
+         { fprintf (yyo, "%s:", ((*yyvaluep).id_colon)->tag); }
+#line 1170 "src/parse-gram.c"
         break;
 
-    case 96: /* symbol  */
-#line 225 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s", ((*yyvaluep).symbol) ? ((*yyvaluep).symbol)->tag : "<NULL>"); }
-#line 1342 "src/parse-gram.c" /* yacc.c:680  */
+    case 98: /* symbol  */
+#line 237 "src/parse-gram.y"
+         { fprintf (yyo, "%s", ((*yyvaluep).symbol) ? ((*yyvaluep).symbol)->tag : "<NULL>"); }
+#line 1176 "src/parse-gram.c"
         break;
 
-    case 97: /* string_as_id  */
-#line 225 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s", ((*yyvaluep).string_as_id) ? ((*yyvaluep).string_as_id)->tag : "<NULL>"); }
-#line 1348 "src/parse-gram.c" /* yacc.c:680  */
+    case 99: /* string_as_id  */
+#line 237 "src/parse-gram.y"
+         { fprintf (yyo, "%s", ((*yyvaluep).string_as_id) ? ((*yyvaluep).string_as_id)->tag : "<NULL>"); }
+#line 1182 "src/parse-gram.c"
         break;
 
-    case 98: /* string_as_id.opt  */
-#line 225 "src/parse-gram.y" /* yacc.c:680  */
-      { fprintf (yyo, "%s", ((*yyvaluep).yytype_98) ? ((*yyvaluep).yytype_98)->tag : "<NULL>"); }
-#line 1354 "src/parse-gram.c" /* yacc.c:680  */
+    case 100: /* string_as_id.opt  */
+#line 237 "src/parse-gram.y"
+         { fprintf (yyo, "%s", ((*yyvaluep).yytype_100) ? ((*yyvaluep).yytype_100)->tag : "<NULL>"); }
+#line 1188 "src/parse-gram.c"
         break;
 
       default:
         break;
     }
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+/* "%code post-printer" blocks.  */
+#line 214 "src/parse-gram.y"
+troff (yyo);
+
+#line 1199 "src/parse-gram.c"
 }
 
 
@@ -1381,7 +1221,7 @@ yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE
 `------------------------------------------------------------------*/
 
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -1404,19 +1244,19 @@ do {                                                            \
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
 {
-  unsigned long yylno = yyrline[yyrule];
+  int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n",
              yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       yystos[+yyssp[yyi + 1 - yynrhs]],
                        &yyvsp[(yyi + 1) - (yynrhs)]
                        , &(yylsp[(yyi + 1) - (yynrhs)])                       );
       YYFPRINTF (stderr, "\n");
@@ -1467,22 +1307,22 @@ int yydebug;
    using YYSTACK_FREE.  Return 0 if successful or if no reallocation is
    required.  Return 1 if memory is exhausted.  */
 static int
-yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,
+yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd,
 #if GRAM_DEBUG
                       char const *yydebug_prefix,
                       char const *yydebug_suffix,
 #endif
-                      yytype_int16 **yybottom,
-                      yytype_int16 *yybottom_no_free,
-                      yytype_int16 **yytop, yytype_int16 *yytop_empty)
+                      yy_state_t **yybottom,
+                      yy_state_t *yybottom_no_free,
+                      yy_state_t **yytop, yy_state_t *yytop_empty)
 {
-  YYSIZE_T yysize_old =
-    (YYSIZE_T) (*yytop == yytop_empty ? 0 : *yytop - *yybottom + 1);
-  YYSIZE_T yysize_new = yysize_old + yyadd;
+  YYPTRDIFF_T yysize_old =
+    *yytop == yytop_empty ? 0 : *yytop - *yybottom + 1;
+  YYPTRDIFF_T yysize_new = yysize_old + yyadd;
   if (*yycapacity < yysize_new)
     {
-      YYSIZE_T yyalloc = 2 * yysize_new;
-      yytype_int16 *yybottom_new;
+      YYPTRDIFF_T yyalloc = 2 * yysize_new;
+      yy_state_t *yybottom_new;
       /* Use YYMAXDEPTH for maximum stack size given that the stack
          should never need to grow larger than the main state stack
          needs to grow without LAC.  */
@@ -1495,7 +1335,9 @@ yy_lac_stack_realloc (YYSIZE_T *yycapacity, YYSIZE_T yyadd,
       if (YYMAXDEPTH < yyalloc)
         yyalloc = YYMAXDEPTH;
       yybottom_new =
-        (yytype_int16*) YYSTACK_ALLOC (yyalloc * sizeof *yybottom_new);
+        YY_CAST (yy_state_t *,
+                 YYSTACK_ALLOC (YY_CAST (YYSIZE_T,
+                                         yyalloc * YYSIZEOF (*yybottom_new))));
       if (!yybottom_new)
         {
           YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix,
@@ -1595,11 +1437,11 @@ do {                                                                     \
    contents of either array, alter *YYES and *YYES_CAPACITY, and free
    any old *YYES other than YYESA.  */
 static int
-yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
-        YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken)
+yy_lac (yy_state_t *yyesa, yy_state_t **yyes,
+        YYPTRDIFF_T *yyes_capacity, yy_state_t *yyssp, int yytoken)
 {
-  yytype_int16 *yyes_prev = yyssp;
-  yytype_int16 *yyesp = yyes_prev;
+  yy_state_t *yyes_prev = yyssp;
+  yy_state_t *yyesp = yyes_prev;
   YYDPRINTF ((stderr, "LAC: checking lookahead %s:", yytname[yytoken]));
   if (yytoken == YYUNDEFTOK)
     {
@@ -1608,12 +1450,12 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
     }
   while (1)
     {
-      int yyrule = yypact[*yyesp];
+      int yyrule = yypact[+*yyesp];
       if (yypact_value_is_default (yyrule)
           || (yyrule += yytoken) < 0 || YYLAST < yyrule
           || yycheck[yyrule] != yytoken)
         {
-          yyrule = yydefact[*yyesp];
+          yyrule = yydefact[+*yyesp];
           if (yyrule == 0)
             {
               YYDPRINTF ((stderr, " Err\n"));
@@ -1636,11 +1478,11 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
           yyrule = -yyrule;
         }
       {
-        YYSIZE_T yylen = yyr2[yyrule];
+        YYPTRDIFF_T yylen = yyr2[yyrule];
         YYDPRINTF ((stderr, " R%d", yyrule - 1));
         if (yyesp != yyes_prev)
           {
-            YYSIZE_T yysize = (YYSIZE_T) (yyesp - *yyes + 1);
+            YYPTRDIFF_T yysize = yyesp - *yyes + 1;
             if (yylen < yysize)
               {
                 yyesp -= yylen;
@@ -1656,19 +1498,20 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
           yyesp = yyes_prev -= yylen;
       }
       {
-        yytype_int16 yystate;
+        yy_state_fast_t yystate;
         {
           const int yylhs = yyr1[yyrule] - YYNTOKENS;
           const int yyi = yypgoto[yylhs] + *yyesp;
-          yystate = ((yytype_int16)
-                     (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyesp
-                      ? yytable[yyi]
-                      : yydefgoto[yylhs]));
+          yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyesp
+                     ? yytable[yyi]
+                     : yydefgoto[yylhs]);
         }
         if (yyesp == yyes_prev)
           {
             yyesp = *yyes;
-            *yyesp = yystate;
+            YY_IGNORE_USELESS_CAST_BEGIN
+            *yyesp = YY_CAST (yy_state_t, yystate);
+            YY_IGNORE_USELESS_CAST_END
           }
         else
           {
@@ -1681,9 +1524,11 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
                 YYDPRINTF ((stderr, "\n"));
                 return 2;
               }
-            *++yyesp = yystate;
+            YY_IGNORE_USELESS_CAST_BEGIN
+            *++yyesp = YY_CAST (yy_state_t, yystate);
+            YY_IGNORE_USELESS_CAST_END
           }
-        YYDPRINTF ((stderr, " G%d", (int) yystate));
+        YYDPRINTF ((stderr, " G%d", yystate));
       }
     }
 }
@@ -1693,13 +1538,13 @@ yy_lac (yytype_int16 *yyesa, yytype_int16 **yyes,
 
 # ifndef yystrlen
 #  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
+#   define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
 #  else
 /* Return the length of YYSTR.  */
-static YYSIZE_T
+static YYPTRDIFF_T
 yystrlen (const char *yystr)
 {
-  YYSIZE_T yylen;
+  YYPTRDIFF_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
     continue;
   return yylen;
@@ -1735,12 +1580,12 @@ yystpcpy (char *yydest, const char *yysrc)
    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
    null, do not copy; instead, return the length of what the result
    would have been.  */
-static YYSIZE_T
+static YYPTRDIFF_T
 yytnamerr (char *yyres, const char *yystr)
 {
   if (*yystr == '"')
     {
-      YYSIZE_T yyn = 0;
+      YYPTRDIFF_T yyn = 0;
       char const *yyp = yystr;
 
       for (;;)
@@ -1771,10 +1616,10 @@ yytnamerr (char *yyres, const char *yystr)
     do_not_strip_quotes: ;
     }
 
-  if (! yyres)
+  if (yyres)
+    return yystpcpy (yyres, yystr) - yyres;
+  else
     return yystrlen (yystr);
-
-  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
@@ -1789,20 +1634,20 @@ yytnamerr (char *yyres, const char *yystr)
    required number of bytes is too large to store or if
    yy_lac returned 2.  */
 static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyesa, yytype_int16 **yyes,
-                YYSIZE_T *yyes_capacity, yytype_int16 *yyssp, int yytoken)
+yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
+                yy_state_t *yyesa, yy_state_t **yyes,
+                YYPTRDIFF_T *yyes_capacity, yy_state_t *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat. */
+  /* Arguments of yyformat: reported tokens (one for the "unexpected",
+     one per "expected"). */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
+  /* Actual size of YYARG. */
   int yycount = 0;
+  /* Cumulated lengths of YYARG.  */
+  YYPTRDIFF_T yysize = 0;
 
   /* There are many possibilities here to consider:
      - If this state is a consistent state with a default action, then
@@ -1826,7 +1671,9 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   */
   if (yytoken != YYEMPTY)
     {
-      int yyn = yypact[*yyssp];
+      int yyn = yypact[+*yyssp];
+      YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+      yysize = yysize0;
       YYDPRINTF ((stderr, "Constructing syntax error message\n"));
       yyarg[yycount++] = yytname[yytoken];
       if (!yypact_value_is_default (yyn))
@@ -1852,7 +1699,8 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                   }
                 yyarg[yycount++] = yytname[yyx];
                 {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  YYPTRDIFF_T yysize1
+                    = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
                   if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
                     yysize = yysize1;
                   else
@@ -1883,7 +1731,9 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
     }
 
   {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    /* Don't count the "%s"s in the final size, but reserve room for
+       the terminator.  */
+    YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1;
     if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
       yysize = yysize1;
     else
@@ -1913,8 +1763,8 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
         }
       else
         {
-          yyp++;
-          yyformat++;
+          ++yyp;
+          ++yyformat;
         }
   }
   return 0;
@@ -1937,58 +1787,58 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   switch (yytype)
     {
-    case 72: /* generic_symlist  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).generic_symlist)); }
-#line 1944 "src/parse-gram.c" /* yacc.c:1257  */
+    case 74: /* generic_symlist  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).generic_symlist)); }
+#line 1794 "src/parse-gram.c"
         break;
 
-    case 73: /* generic_symlist_item  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).generic_symlist_item)); }
-#line 1950 "src/parse-gram.c" /* yacc.c:1257  */
+    case 75: /* generic_symlist_item  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).generic_symlist_item)); }
+#line 1800 "src/parse-gram.c"
         break;
 
-    case 75: /* nterm_decls  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).nterm_decls)); }
-#line 1956 "src/parse-gram.c" /* yacc.c:1257  */
+    case 77: /* nterm_decls  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).nterm_decls)); }
+#line 1806 "src/parse-gram.c"
         break;
 
-    case 76: /* token_decls  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).token_decls)); }
-#line 1962 "src/parse-gram.c" /* yacc.c:1257  */
+    case 78: /* token_decls  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).token_decls)); }
+#line 1812 "src/parse-gram.c"
         break;
 
-    case 77: /* token_decl.1  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).yytype_77)); }
-#line 1968 "src/parse-gram.c" /* yacc.c:1257  */
+    case 79: /* token_decl.1  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).yytype_79)); }
+#line 1818 "src/parse-gram.c"
         break;
 
-    case 80: /* token_decls_for_prec  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).token_decls_for_prec)); }
-#line 1974 "src/parse-gram.c" /* yacc.c:1257  */
+    case 82: /* token_decls_for_prec  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).token_decls_for_prec)); }
+#line 1824 "src/parse-gram.c"
         break;
 
-    case 81: /* token_decl_for_prec.1  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).yytype_81)); }
-#line 1980 "src/parse-gram.c" /* yacc.c:1257  */
+    case 83: /* token_decl_for_prec.1  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).yytype_83)); }
+#line 1830 "src/parse-gram.c"
         break;
 
-    case 83: /* symbol_decls  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).symbol_decls)); }
-#line 1986 "src/parse-gram.c" /* yacc.c:1257  */
+    case 85: /* symbol_decls  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).symbol_decls)); }
+#line 1836 "src/parse-gram.c"
         break;
 
-    case 84: /* symbol_decl.1  */
-#line 230 "src/parse-gram.y" /* yacc.c:1257  */
-      { symbol_list_free (((*yyvaluep).yytype_84)); }
-#line 1992 "src/parse-gram.c" /* yacc.c:1257  */
+    case 86: /* symbol_decl.1  */
+#line 242 "src/parse-gram.y"
+            { symbol_list_free (((*yyvaluep).yytype_86)); }
+#line 1842 "src/parse-gram.c"
         break;
 
       default:
@@ -2028,7 +1878,7 @@ YYLTYPE yylloc = yyloc_default;
     /* Number of syntax errors so far.  */
     int yynerrs;
 
-    int yystate;
+    yy_state_fast_t yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
 
@@ -2041,9 +1891,9 @@ YYLTYPE yylloc = yyloc_default;
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
+    yy_state_t yyssa[YYINITDEPTH];
+    yy_state_t *yyss;
+    yy_state_t *yyssp;
 
     /* The semantic value stack.  */
     YYSTYPE yyvsa[YYINITDEPTH];
@@ -2058,11 +1908,11 @@ YYLTYPE yylloc = yyloc_default;
     /* The locations where the error started and ended.  */
     YYLTYPE yyerror_range[3];
 
-    YYSIZE_T yystacksize;
+    YYPTRDIFF_T yystacksize;
 
-    yytype_int16 yyesa[20];
-    yytype_int16 *yyes;
-    YYSIZE_T yyes_capacity;
+    yy_state_t yyesa[20];
+    yy_state_t *yyes;
+    YYPTRDIFF_T yyes_capacity;
 
   int yy_lac_established = 0;
   int yyn;
@@ -2078,7 +1928,7 @@ YYLTYPE yylloc = yyloc_default;
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
   char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+  YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
@@ -2093,7 +1943,7 @@ YYLTYPE yylloc = yyloc_default;
   yystacksize = YYINITDEPTH;
 
   yyes = yyesa;
-  yyes_capacity = sizeof yyesa / sizeof *yyes;
+  yyes_capacity = 20;
   if (YYMAXDEPTH < yyes_capacity)
     yyes_capacity = YYMAXDEPTH;
 
@@ -2105,15 +1955,16 @@ YYLTYPE yylloc = yyloc_default;
   yychar = YYEMPTY; /* Cause a token to be read.  */
 
 /* User initialization code.  */
-#line 129 "src/parse-gram.y" /* yacc.c:1431  */
+#line 136 "src/parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
-  boundary_set (&yylloc.start, current_file, 1, 1);
-  boundary_set (&yylloc.end, current_file, 1, 1);
+  boundary_set (&yylloc.start, grammar_file, 1, 1, 1);
+  boundary_set (&yylloc.end, grammar_file, 1, 1, 1);
 }
 
-#line 2117 "src/parse-gram.c" /* yacc.c:1431  */
+#line 1967 "src/parse-gram.c"
+
   yylsp[0] = yylloc;
   goto yysetstate;
 
@@ -2128,10 +1979,14 @@ YYLTYPE yylloc = yyloc_default;
 
 
 /*--------------------------------------------------------------------.
-| yynewstate -- set current state (the top of the stack) to yystate.  |
+| yysetstate -- set current state (the top of the stack) to yystate.  |
 `--------------------------------------------------------------------*/
 yysetstate:
-  *yyssp = (yytype_int16) yystate;
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+  YY_IGNORE_USELESS_CAST_BEGIN
+  *yyssp = YY_CAST (yy_state_t, yystate);
+  YY_IGNORE_USELESS_CAST_END
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -2139,15 +1994,15 @@ YYLTYPE yylloc = yyloc_default;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
+      YYPTRDIFF_T yysize = yyssp - yyss + 1;
 
 # if defined yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
            memory.  */
+        yy_state_t *yyss1 = yyss;
         YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
         YYLTYPE *yyls1 = yyls;
 
         /* Each stack pointer address is followed by the size of the
@@ -2155,9 +2010,9 @@ YYLTYPE yylloc = yyloc_default;
            conditional around just the two extra args, but that might
            be undefined if yyoverflow is a macro.  */
         yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yyls1, yysize * sizeof (*yylsp),
+                    &yyss1, yysize * YYSIZEOF (*yyssp),
+                    &yyvs1, yysize * YYSIZEOF (*yyvsp),
+                    &yyls1, yysize * YYSIZEOF (*yylsp),
                     &yystacksize);
         yyss = yyss1;
         yyvs = yyvs1;
@@ -2172,9 +2027,10 @@ YYLTYPE yylloc = yyloc_default;
         yystacksize = YYMAXDEPTH;
 
       {
-        yytype_int16 *yyss1 = yyss;
+        yy_state_t *yyss1 = yyss;
         union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+          YY_CAST (union yyalloc *,
+                   YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
@@ -2190,16 +2046,16 @@ YYLTYPE yylloc = yyloc_default;
       yyvsp = yyvs + yysize - 1;
       yylsp = yyls + yysize - 1;
 
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long) yystacksize));
+      YY_IGNORE_USELESS_CAST_BEGIN
+      YYDPRINTF ((stderr, "Stack size increased to %ld\n",
+                  YY_CAST (long, yystacksize)));
+      YY_IGNORE_USELESS_CAST_END
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -2263,16 +2119,15 @@ YYLTYPE yylloc = yyloc_default;
 
   /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-  YY_LAC_DISCARD ("shift");
-
   yystate = yyn;
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
   YY_IGNORE_MAYBE_UNINITIALIZED_END
   *++yylsp = yylloc;
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+  YY_LAC_DISCARD ("shift");
   goto yynewstate;
 
 
@@ -2312,189 +2167,195 @@ YYLTYPE yylloc = yyloc_default;
     switch (yyn)
       {
   case 6:
-#line 297 "src/parse-gram.y" /* yacc.c:1652  */
+#line 309 "src/parse-gram.y"
     {
       muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
                         translate_code ((yyvsp[0].PROLOGUE), (yylsp[0]), true), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-#line 2322 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2177 "src/parse-gram.c"
     break;
 
   case 7:
-#line 303 "src/parse-gram.y" /* yacc.c:1652  */
+#line 315 "src/parse-gram.y"
     {
       muscle_percent_define_ensure ((yyvsp[0].PERCENT_FLAG), (yylsp[0]), true);
     }
-#line 2330 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2185 "src/parse-gram.c"
     break;
 
   case 8:
-#line 307 "src/parse-gram.y" /* yacc.c:1652  */
+#line 319 "src/parse-gram.y"
     {
       muscle_percent_define_insert ((yyvsp[-1].variable), (yyloc), (yyvsp[0].value).kind, (yyvsp[0].value).chars,
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-#line 2339 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2194 "src/parse-gram.c"
     break;
 
   case 9:
-#line 311 "src/parse-gram.y" /* yacc.c:1652  */
-    { defines_flag = true; }
-#line 2345 "src/parse-gram.c" /* yacc.c:1652  */
+#line 323 "src/parse-gram.y"
+                                   { defines_flag = true; }
+#line 2200 "src/parse-gram.c"
     break;
 
   case 10:
-#line 313 "src/parse-gram.y" /* yacc.c:1652  */
+#line 325 "src/parse-gram.y"
     {
       defines_flag = true;
-      spec_defines_file = xstrdup ((yyvsp[0].STRING));
+      spec_header_file = xstrdup ((yyvsp[0].STRING));
     }
-#line 2354 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2209 "src/parse-gram.c"
     break;
 
   case 11:
-#line 317 "src/parse-gram.y" /* yacc.c:1652  */
-    { handle_error_verbose (&(yyloc), (yyvsp[0].PERCENT_ERROR_VERBOSE)); }
-#line 2360 "src/parse-gram.c" /* yacc.c:1652  */
+#line 329 "src/parse-gram.y"
+                                   { handle_error_verbose (&(yyloc), (yyvsp[0].PERCENT_ERROR_VERBOSE)); }
+#line 2215 "src/parse-gram.c"
     break;
 
   case 12:
-#line 318 "src/parse-gram.y" /* yacc.c:1652  */
-    { expected_sr_conflicts = (yyvsp[0].INT); }
-#line 2366 "src/parse-gram.c" /* yacc.c:1652  */
+#line 330 "src/parse-gram.y"
+                                   { expected_sr_conflicts = (yyvsp[0].INT); }
+#line 2221 "src/parse-gram.c"
     break;
 
   case 13:
-#line 319 "src/parse-gram.y" /* yacc.c:1652  */
-    { expected_rr_conflicts = (yyvsp[0].INT); }
-#line 2372 "src/parse-gram.c" /* yacc.c:1652  */
+#line 331 "src/parse-gram.y"
+                                   { expected_rr_conflicts = (yyvsp[0].INT); }
+#line 2227 "src/parse-gram.c"
     break;
 
   case 14:
-#line 320 "src/parse-gram.y" /* yacc.c:1652  */
-    { handle_file_prefix (&(yyloc), &(yylsp[-1]), (yyvsp[-1].PERCENT_FILE_PREFIX), (yyvsp[0].STRING)); }
-#line 2378 "src/parse-gram.c" /* yacc.c:1652  */
+#line 332 "src/parse-gram.y"
+                                   { handle_file_prefix (&(yyloc), &(yylsp[-1]), (yyvsp[-1].PERCENT_FILE_PREFIX), (yyvsp[0].STRING)); }
+#line 2233 "src/parse-gram.c"
     break;
 
   case 15:
-#line 322 "src/parse-gram.y" /* yacc.c:1652  */
+#line 334 "src/parse-gram.y"
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
-#line 2387 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2242 "src/parse-gram.c"
     break;
 
   case 16:
-#line 327 "src/parse-gram.y" /* yacc.c:1652  */
+#line 339 "src/parse-gram.y"
     {
       muscle_code_grow ("initial_action", translate_code ((yyvsp[0].BRACED_CODE), (yylsp[0]), false), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-#line 2396 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2251 "src/parse-gram.c"
     break;
 
   case 17:
-#line 331 "src/parse-gram.y" /* yacc.c:1652  */
-    { language_argmatch ((yyvsp[0].STRING), grammar_prio, (yylsp[-1])); }
-#line 2402 "src/parse-gram.c" /* yacc.c:1652  */
+#line 343 "src/parse-gram.y"
+                                { language_argmatch ((yyvsp[0].STRING), grammar_prio, (yylsp[-1])); }
+#line 2257 "src/parse-gram.c"
     break;
 
   case 18:
-#line 332 "src/parse-gram.y" /* yacc.c:1652  */
-    { handle_name_prefix (&(yyloc), (yyvsp[-1].PERCENT_NAME_PREFIX), (yyvsp[0].STRING)); }
-#line 2408 "src/parse-gram.c" /* yacc.c:1652  */
+#line 344 "src/parse-gram.y"
+                                { handle_name_prefix (&(yyloc), (yyvsp[-1].PERCENT_NAME_PREFIX), (yyvsp[0].STRING)); }
+#line 2263 "src/parse-gram.c"
     break;
 
   case 19:
-#line 333 "src/parse-gram.y" /* yacc.c:1652  */
-    { no_lines_flag = true; }
-#line 2414 "src/parse-gram.c" /* yacc.c:1652  */
+#line 345 "src/parse-gram.y"
+                                { no_lines_flag = true; }
+#line 2269 "src/parse-gram.c"
     break;
 
   case 20:
-#line 334 "src/parse-gram.y" /* yacc.c:1652  */
-    { nondeterministic_parser = true; }
-#line 2420 "src/parse-gram.c" /* yacc.c:1652  */
+#line 346 "src/parse-gram.y"
+                                { nondeterministic_parser = true; }
+#line 2275 "src/parse-gram.c"
     break;
 
   case 21:
-#line 335 "src/parse-gram.y" /* yacc.c:1652  */
-    { spec_outfile = (yyvsp[0].STRING); }
-#line 2426 "src/parse-gram.c" /* yacc.c:1652  */
+#line 347 "src/parse-gram.y"
+                                { spec_outfile = (yyvsp[0].STRING); }
+#line 2281 "src/parse-gram.c"
     break;
 
   case 22:
-#line 336 "src/parse-gram.y" /* yacc.c:1652  */
-    { current_param = (yyvsp[0].PERCENT_PARAM); }
-#line 2432 "src/parse-gram.c" /* yacc.c:1652  */
+#line 348 "src/parse-gram.y"
+           { current_param = (yyvsp[0].PERCENT_PARAM); }
+#line 2287 "src/parse-gram.c"
     break;
 
   case 23:
-#line 336 "src/parse-gram.y" /* yacc.c:1652  */
-    { current_param = param_none; }
-#line 2438 "src/parse-gram.c" /* yacc.c:1652  */
+#line 348 "src/parse-gram.y"
+                                          { current_param = param_none; }
+#line 2293 "src/parse-gram.c"
     break;
 
   case 24:
-#line 337 "src/parse-gram.y" /* yacc.c:1652  */
-    { handle_require (&(yylsp[0]), (yyvsp[0].STRING)); }
-#line 2444 "src/parse-gram.c" /* yacc.c:1652  */
+#line 349 "src/parse-gram.y"
+                                { handle_pure_parser (&(yyloc), (yyvsp[0].PERCENT_PURE_PARSER)); }
+#line 2299 "src/parse-gram.c"
     break;
 
   case 25:
-#line 338 "src/parse-gram.y" /* yacc.c:1652  */
-    { handle_skeleton (&(yylsp[0]), (yyvsp[0].STRING)); }
-#line 2450 "src/parse-gram.c" /* yacc.c:1652  */
+#line 350 "src/parse-gram.y"
+                                { handle_require (&(yylsp[0]), (yyvsp[0].STRING)); }
+#line 2305 "src/parse-gram.c"
     break;
 
   case 26:
-#line 339 "src/parse-gram.y" /* yacc.c:1652  */
-    { token_table_flag = true; }
-#line 2456 "src/parse-gram.c" /* yacc.c:1652  */
+#line 351 "src/parse-gram.y"
+                                { handle_skeleton (&(yylsp[0]), (yyvsp[0].STRING)); }
+#line 2311 "src/parse-gram.c"
     break;
 
   case 27:
-#line 340 "src/parse-gram.y" /* yacc.c:1652  */
-    { report_flag |= report_states; }
-#line 2462 "src/parse-gram.c" /* yacc.c:1652  */
+#line 352 "src/parse-gram.y"
+                                { token_table_flag = true; }
+#line 2317 "src/parse-gram.c"
     break;
 
   case 28:
-#line 341 "src/parse-gram.y" /* yacc.c:1652  */
-    { handle_yacc (&(yyloc), (yyvsp[0].PERCENT_YACC)); }
-#line 2468 "src/parse-gram.c" /* yacc.c:1652  */
+#line 353 "src/parse-gram.y"
+                                { report_flag |= report_states; }
+#line 2323 "src/parse-gram.c"
     break;
 
   case 29:
-#line 342 "src/parse-gram.y" /* yacc.c:1652  */
-    { current_class = unknown_sym; yyerrok; }
-#line 2474 "src/parse-gram.c" /* yacc.c:1652  */
+#line 354 "src/parse-gram.y"
+                                { handle_yacc (&(yyloc)); }
+#line 2329 "src/parse-gram.c"
     break;
 
-  case 31:
-#line 347 "src/parse-gram.y" /* yacc.c:1652  */
-    { add_param (current_param, (yyvsp[0].BRACED_CODE), (yylsp[0])); }
-#line 2480 "src/parse-gram.c" /* yacc.c:1652  */
+  case 30:
+#line 355 "src/parse-gram.y"
+                                { current_class = unknown_sym; yyerrok; }
+#line 2335 "src/parse-gram.c"
     break;
 
   case 32:
-#line 348 "src/parse-gram.y" /* yacc.c:1652  */
-    { add_param (current_param, (yyvsp[0].BRACED_CODE), (yylsp[0])); }
-#line 2486 "src/parse-gram.c" /* yacc.c:1652  */
+#line 360 "src/parse-gram.y"
+                   { add_param (current_param, (yyvsp[0].BRACED_CODE), (yylsp[0])); }
+#line 2341 "src/parse-gram.c"
+    break;
+
+  case 33:
+#line 361 "src/parse-gram.y"
+                   { add_param (current_param, (yyvsp[0].BRACED_CODE), (yylsp[0])); }
+#line 2347 "src/parse-gram.c"
     break;
 
-  case 34:
-#line 359 "src/parse-gram.y" /* yacc.c:1652  */
+  case 35:
+#line 372 "src/parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
-#line 2494 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2355 "src/parse-gram.c"
     break;
 
-  case 35:
-#line 363 "src/parse-gram.y" /* yacc.c:1652  */
+  case 36:
+#line 376 "src/parse-gram.y"
     {
       code_props code;
       code_props_symbol_action_init (&code, (yyvsp[-1].BRACED_CODE), (yylsp[-1]));
@@ -2505,27 +2366,27 @@ YYLTYPE yylloc = yyloc_default;
         symbol_list_free ((yyvsp[0].generic_symlist));
       }
     }
-#line 2509 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2370 "src/parse-gram.c"
     break;
 
-  case 36:
-#line 374 "src/parse-gram.y" /* yacc.c:1652  */
+  case 37:
+#line 387 "src/parse-gram.y"
     {
       default_prec = true;
     }
-#line 2517 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2378 "src/parse-gram.c"
     break;
 
-  case 37:
-#line 378 "src/parse-gram.y" /* yacc.c:1652  */
+  case 38:
+#line 391 "src/parse-gram.y"
     {
       default_prec = false;
     }
-#line 2525 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2386 "src/parse-gram.c"
     break;
 
-  case 38:
-#line 382 "src/parse-gram.y" /* yacc.c:1652  */
+  case 39:
+#line 395 "src/parse-gram.y"
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
@@ -2533,493 +2394,512 @@ YYLTYPE yylloc = yyloc_default;
                         translate_code_braceless ((yyvsp[0].BRACED_CODE), (yylsp[0])), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-#line 2537 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2398 "src/parse-gram.c"
     break;
 
-  case 39:
-#line 390 "src/parse-gram.y" /* yacc.c:1652  */
+  case 40:
+#line 403 "src/parse-gram.y"
     {
       muscle_percent_code_grow ((yyvsp[-1].ID), (yylsp[-1]), translate_code_braceless ((yyvsp[0].BRACED_CODE), (yylsp[0])), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-#line 2546 "src/parse-gram.c" /* yacc.c:1652  */
-    break;
-
-  case 40:
-#line 399 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.code_props_type) = destructor; }
-#line 2552 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2407 "src/parse-gram.c"
     break;
 
   case 41:
-#line 400 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.code_props_type) = printer; }
-#line 2558 "src/parse-gram.c" /* yacc.c:1652  */
+#line 412 "src/parse-gram.y"
+                 { (yyval.code_props_type) = destructor; }
+#line 2413 "src/parse-gram.c"
     break;
 
   case 42:
-#line 410 "src/parse-gram.y" /* yacc.c:1652  */
-    {}
-#line 2564 "src/parse-gram.c" /* yacc.c:1652  */
+#line 413 "src/parse-gram.y"
+                 { (yyval.code_props_type) = printer; }
+#line 2419 "src/parse-gram.c"
     break;
 
   case 43:
-#line 411 "src/parse-gram.y" /* yacc.c:1652  */
-    { muscle_percent_define_insert ("api.value.union.name",
+#line 423 "src/parse-gram.y"
+         {}
+#line 2425 "src/parse-gram.c"
+    break;
+
+  case 44:
+#line 424 "src/parse-gram.y"
+         { muscle_percent_define_insert ("api.value.union.name",
                                          (yylsp[0]), muscle_keyword, (yyvsp[0].ID),
                                          MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); }
-#line 2572 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2433 "src/parse-gram.c"
     break;
 
-  case 44:
-#line 418 "src/parse-gram.y" /* yacc.c:1652  */
+  case 45:
+#line 431 "src/parse-gram.y"
     {
       union_seen = true;
       muscle_code_grow ("union_members", translate_code_braceless ((yyvsp[0].BRACED_CODE), (yylsp[0])), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-#line 2582 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2443 "src/parse-gram.c"
     break;
 
-  case 45:
-#line 430 "src/parse-gram.y" /* yacc.c:1652  */
-    { current_class = nterm_sym; }
-#line 2588 "src/parse-gram.c" /* yacc.c:1652  */
+  case 46:
+#line 443 "src/parse-gram.y"
+           { current_class = nterm_sym; }
+#line 2449 "src/parse-gram.c"
     break;
 
-  case 46:
-#line 431 "src/parse-gram.y" /* yacc.c:1652  */
+  case 47:
+#line 444 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       symbol_list_free ((yyvsp[0].nterm_decls));
     }
-#line 2597 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2458 "src/parse-gram.c"
     break;
 
-  case 47:
-#line 435 "src/parse-gram.y" /* yacc.c:1652  */
-    { current_class = token_sym; }
-#line 2603 "src/parse-gram.c" /* yacc.c:1652  */
+  case 48:
+#line 448 "src/parse-gram.y"
+           { current_class = token_sym; }
+#line 2464 "src/parse-gram.c"
     break;
 
-  case 48:
-#line 436 "src/parse-gram.y" /* yacc.c:1652  */
+  case 49:
+#line 449 "src/parse-gram.y"
     {
       current_class = unknown_sym;
       symbol_list_free ((yyvsp[0].token_decls));
     }
-#line 2612 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2473 "src/parse-gram.c"
     break;
 
-  case 49:
-#line 441 "src/parse-gram.y" /* yacc.c:1652  */
+  case 50:
+#line 454 "src/parse-gram.y"
     {
       symbol_list_free ((yyvsp[0].symbol_decls));
     }
-#line 2620 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2481 "src/parse-gram.c"
     break;
 
-  case 50:
-#line 445 "src/parse-gram.y" /* yacc.c:1652  */
+  case 51:
+#line 458 "src/parse-gram.y"
     {
       ++current_prec;
       for (symbol_list *list = (yyvsp[0].token_decls_for_prec); list; list = list->next)
         symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-1].precedence_declarator), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].token_decls_for_prec));
     }
-#line 2631 "src/parse-gram.c" /* yacc.c:1652  */
-    break;
-
-  case 51:
-#line 454 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.precedence_declarator) = left_assoc; }
-#line 2637 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2492 "src/parse-gram.c"
     break;
 
   case 52:
-#line 455 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.precedence_declarator) = right_assoc; }
-#line 2643 "src/parse-gram.c" /* yacc.c:1652  */
+#line 467 "src/parse-gram.y"
+                { (yyval.precedence_declarator) = left_assoc; }
+#line 2498 "src/parse-gram.c"
     break;
 
   case 53:
-#line 456 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.precedence_declarator) = non_assoc; }
-#line 2649 "src/parse-gram.c" /* yacc.c:1652  */
+#line 468 "src/parse-gram.y"
+                { (yyval.precedence_declarator) = right_assoc; }
+#line 2504 "src/parse-gram.c"
     break;
 
   case 54:
-#line 457 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.precedence_declarator) = precedence_assoc; }
-#line 2655 "src/parse-gram.c" /* yacc.c:1652  */
+#line 469 "src/parse-gram.y"
+                { (yyval.precedence_declarator) = non_assoc; }
+#line 2510 "src/parse-gram.c"
     break;
 
   case 55:
-#line 461 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_71) = NULL; }
-#line 2661 "src/parse-gram.c" /* yacc.c:1652  */
+#line 470 "src/parse-gram.y"
+                { (yyval.precedence_declarator) = precedence_assoc; }
+#line 2516 "src/parse-gram.c"
     break;
 
   case 56:
-#line 462 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_71) = (yyvsp[0].TAG); }
-#line 2667 "src/parse-gram.c" /* yacc.c:1652  */
+#line 474 "src/parse-gram.y"
+         { (yyval.yytype_73) = NULL; }
+#line 2522 "src/parse-gram.c"
     break;
 
-  case 58:
-#line 468 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.generic_symlist) = symbol_list_append ((yyvsp[-1].generic_symlist), (yyvsp[0].generic_symlist_item)); }
-#line 2673 "src/parse-gram.c" /* yacc.c:1652  */
+  case 57:
+#line 475 "src/parse-gram.y"
+         { (yyval.yytype_73) = (yyvsp[0].TAG); }
+#line 2528 "src/parse-gram.c"
     break;
 
   case 59:
-#line 472 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.generic_symlist_item) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2679 "src/parse-gram.c" /* yacc.c:1652  */
+#line 481 "src/parse-gram.y"
+                                         { (yyval.generic_symlist) = symbol_list_append ((yyvsp[-1].generic_symlist), (yyvsp[0].generic_symlist_item)); }
+#line 2534 "src/parse-gram.c"
     break;
 
   case 60:
-#line 473 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.generic_symlist_item) = symbol_list_type_new ((yyvsp[0].tag), (yylsp[0])); }
-#line 2685 "src/parse-gram.c" /* yacc.c:1652  */
+#line 485 "src/parse-gram.y"
+            { (yyval.generic_symlist_item) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+#line 2540 "src/parse-gram.c"
     break;
 
-  case 62:
-#line 478 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.tag) = uniqstr_new ("*"); }
-#line 2691 "src/parse-gram.c" /* yacc.c:1652  */
+  case 61:
+#line 486 "src/parse-gram.y"
+            { (yyval.generic_symlist_item) = symbol_list_type_new ((yyvsp[0].tag), (yylsp[0])); }
+#line 2546 "src/parse-gram.c"
     break;
 
   case 63:
-#line 479 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.tag) = uniqstr_new (""); }
-#line 2697 "src/parse-gram.c" /* yacc.c:1652  */
+#line 491 "src/parse-gram.y"
+        { (yyval.tag) = uniqstr_new ("*"); }
+#line 2552 "src/parse-gram.c"
     break;
 
-  case 65:
-#line 502 "src/parse-gram.y" /* yacc.c:1652  */
-    {
-      (yyval.token_decls) = (yyvsp[0].yytype_77);
-    }
-#line 2705 "src/parse-gram.c" /* yacc.c:1652  */
+  case 64:
+#line 492 "src/parse-gram.y"
+        { (yyval.tag) = uniqstr_new (""); }
+#line 2558 "src/parse-gram.c"
     break;
 
   case 66:
-#line 506 "src/parse-gram.y" /* yacc.c:1652  */
+#line 515 "src/parse-gram.y"
     {
-      (yyval.token_decls) = symbol_list_type_set ((yyvsp[0].yytype_77), (yyvsp[-1].TAG), (yylsp[-1]));
+      (yyval.token_decls) = (yyvsp[0].yytype_79);
     }
-#line 2713 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2566 "src/parse-gram.c"
     break;
 
   case 67:
-#line 510 "src/parse-gram.y" /* yacc.c:1652  */
+#line 519 "src/parse-gram.y"
     {
-      (yyval.token_decls) = symbol_list_append ((yyvsp[-2].token_decls), symbol_list_type_set ((yyvsp[0].yytype_77), (yyvsp[-1].TAG), (yylsp[-1])));
+      (yyval.token_decls) = symbol_list_type_set ((yyvsp[0].yytype_79), (yyvsp[-1].TAG), (yylsp[-1]));
     }
-#line 2721 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2574 "src/parse-gram.c"
     break;
 
   case 68:
-#line 517 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_77) = symbol_list_sym_new ((yyvsp[0].token_decl), (yylsp[0])); }
-#line 2727 "src/parse-gram.c" /* yacc.c:1652  */
+#line 523 "src/parse-gram.y"
+    {
+      (yyval.token_decls) = symbol_list_append ((yyvsp[-2].token_decls), symbol_list_type_set ((yyvsp[0].yytype_79), (yyvsp[-1].TAG), (yylsp[-1])));
+    }
+#line 2582 "src/parse-gram.c"
     break;
 
   case 69:
-#line 518 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_77) = symbol_list_append ((yyvsp[-1].yytype_77), symbol_list_sym_new ((yyvsp[0].token_decl), (yylsp[0]))); }
-#line 2733 "src/parse-gram.c" /* yacc.c:1652  */
+#line 530 "src/parse-gram.y"
+                            { (yyval.yytype_79) = symbol_list_sym_new ((yyvsp[0].token_decl), (yylsp[0])); }
+#line 2588 "src/parse-gram.c"
     break;
 
   case 70:
-#line 523 "src/parse-gram.y" /* yacc.c:1652  */
+#line 531 "src/parse-gram.y"
+                            { (yyval.yytype_79) = symbol_list_append ((yyvsp[-1].yytype_79), symbol_list_sym_new ((yyvsp[0].token_decl), (yylsp[0]))); }
+#line 2594 "src/parse-gram.c"
+    break;
+
+  case 71:
+#line 536 "src/parse-gram.y"
     {
       (yyval.token_decl) = (yyvsp[-2].id);
       symbol_class_set ((yyvsp[-2].id), current_class, (yylsp[-2]), true);
-      if (0 <= (yyvsp[-1].yytype_79))
-        symbol_user_token_number_set ((yyvsp[-2].id), (yyvsp[-1].yytype_79), (yylsp[-1]));
-      if ((yyvsp[0].yytype_98))
-        symbol_make_alias ((yyvsp[-2].id), (yyvsp[0].yytype_98), (yylsp[0]));
+      if (0 <= (yyvsp[-1].yytype_81))
+        symbol_user_token_number_set ((yyvsp[-2].id), (yyvsp[-1].yytype_81), (yylsp[-1]));
+      if ((yyvsp[0].yytype_100))
+        symbol_make_alias ((yyvsp[-2].id), (yyvsp[0].yytype_100), (yylsp[0]));
     }
-#line 2746 "src/parse-gram.c" /* yacc.c:1652  */
-    break;
-
-  case 71:
-#line 535 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_79) = -1; }
-#line 2752 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2607 "src/parse-gram.c"
     break;
 
-  case 73:
-#line 549 "src/parse-gram.y" /* yacc.c:1652  */
-    {
-      (yyval.token_decls_for_prec) = (yyvsp[0].yytype_81);
-    }
-#line 2760 "src/parse-gram.c" /* yacc.c:1652  */
+  case 72:
+#line 548 "src/parse-gram.y"
+          { (yyval.yytype_81) = -1; }
+#line 2613 "src/parse-gram.c"
     break;
 
   case 74:
-#line 553 "src/parse-gram.y" /* yacc.c:1652  */
+#line 562 "src/parse-gram.y"
     {
-      (yyval.token_decls_for_prec) = symbol_list_type_set ((yyvsp[0].yytype_81), (yyvsp[-1].TAG), (yylsp[-1]));
+      (yyval.token_decls_for_prec) = (yyvsp[0].yytype_83);
     }
-#line 2768 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2621 "src/parse-gram.c"
     break;
 
   case 75:
-#line 557 "src/parse-gram.y" /* yacc.c:1652  */
+#line 566 "src/parse-gram.y"
     {
-      (yyval.token_decls_for_prec) = symbol_list_append ((yyvsp[-2].token_decls_for_prec), symbol_list_type_set ((yyvsp[0].yytype_81), (yyvsp[-1].TAG), (yylsp[-1])));
+      (yyval.token_decls_for_prec) = symbol_list_type_set ((yyvsp[0].yytype_83), (yyvsp[-1].TAG), (yylsp[-1]));
     }
-#line 2776 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2629 "src/parse-gram.c"
     break;
 
   case 76:
-#line 565 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_81) = symbol_list_sym_new ((yyvsp[0].token_decl_for_prec), (yylsp[0])); }
-#line 2782 "src/parse-gram.c" /* yacc.c:1652  */
+#line 570 "src/parse-gram.y"
+    {
+      (yyval.token_decls_for_prec) = symbol_list_append ((yyvsp[-2].token_decls_for_prec), symbol_list_type_set ((yyvsp[0].yytype_83), (yyvsp[-1].TAG), (yylsp[-1])));
+    }
+#line 2637 "src/parse-gram.c"
     break;
 
   case 77:
-#line 567 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_81) = symbol_list_append ((yyvsp[-1].yytype_81), symbol_list_sym_new ((yyvsp[0].token_decl_for_prec), (yylsp[0]))); }
-#line 2788 "src/parse-gram.c" /* yacc.c:1652  */
+#line 578 "src/parse-gram.y"
+    { (yyval.yytype_83) = symbol_list_sym_new ((yyvsp[0].token_decl_for_prec), (yylsp[0])); }
+#line 2643 "src/parse-gram.c"
     break;
 
   case 78:
-#line 572 "src/parse-gram.y" /* yacc.c:1652  */
-    {
-      (yyval.token_decl_for_prec) = (yyvsp[-1].id);
-      symbol_class_set ((yyvsp[-1].id), token_sym, (yylsp[-1]), false);
-      if (0 <= (yyvsp[0].yytype_79))
-        symbol_user_token_number_set ((yyvsp[-1].id), (yyvsp[0].yytype_79), (yylsp[0]));
-    }
-#line 2799 "src/parse-gram.c" /* yacc.c:1652  */
+#line 580 "src/parse-gram.y"
+    { (yyval.yytype_83) = symbol_list_append ((yyvsp[-1].yytype_83), symbol_list_sym_new ((yyvsp[0].token_decl_for_prec), (yylsp[0]))); }
+#line 2649 "src/parse-gram.c"
     break;
 
-  case 80:
-#line 589 "src/parse-gram.y" /* yacc.c:1652  */
+  case 79:
+#line 585 "src/parse-gram.y"
     {
-      (yyval.symbol_decls) = (yyvsp[0].yytype_84);
+      (yyval.token_decl_for_prec) = (yyvsp[-1].id);
+      symbol_class_set ((yyvsp[-1].id), token_sym, (yylsp[-1]), false);
+      if (0 <= (yyvsp[0].yytype_81))
+        symbol_user_token_number_set ((yyvsp[-1].id), (yyvsp[0].yytype_81), (yylsp[0]));
     }
-#line 2807 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2660 "src/parse-gram.c"
     break;
 
   case 81:
-#line 593 "src/parse-gram.y" /* yacc.c:1652  */
+#line 602 "src/parse-gram.y"
     {
-      (yyval.symbol_decls) = symbol_list_type_set ((yyvsp[0].yytype_84), (yyvsp[-1].TAG), (yylsp[-1]));
+      (yyval.symbol_decls) = (yyvsp[0].yytype_86);
     }
-#line 2815 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2668 "src/parse-gram.c"
     break;
 
   case 82:
-#line 597 "src/parse-gram.y" /* yacc.c:1652  */
+#line 606 "src/parse-gram.y"
     {
-      (yyval.symbol_decls) = symbol_list_append ((yyvsp[-2].symbol_decls), symbol_list_type_set ((yyvsp[0].yytype_84), (yyvsp[-1].TAG), (yylsp[-1])));
+      (yyval.symbol_decls) = symbol_list_type_set ((yyvsp[0].yytype_86), (yyvsp[-1].TAG), (yylsp[-1]));
     }
-#line 2823 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2676 "src/parse-gram.c"
     break;
 
   case 83:
-#line 604 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_84) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2829 "src/parse-gram.c" /* yacc.c:1652  */
+#line 610 "src/parse-gram.y"
+    {
+      (yyval.symbol_decls) = symbol_list_append ((yyvsp[-2].symbol_decls), symbol_list_type_set ((yyvsp[0].yytype_86), (yyvsp[-1].TAG), (yylsp[-1])));
+    }
+#line 2684 "src/parse-gram.c"
     break;
 
   case 84:
-#line 605 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_84) = symbol_list_append ((yyvsp[-1].yytype_84), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-#line 2835 "src/parse-gram.c" /* yacc.c:1652  */
+#line 618 "src/parse-gram.y"
+    {
+      symbol_class_set ((yyvsp[0].symbol), pct_type_sym, (yylsp[0]), false);
+      (yyval.yytype_86) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]));
+    }
+#line 2693 "src/parse-gram.c"
     break;
 
-  case 89:
-#line 623 "src/parse-gram.y" /* yacc.c:1652  */
+  case 85:
+#line 623 "src/parse-gram.y"
     {
-      yyerrok;
+      symbol_class_set ((yyvsp[0].symbol), pct_type_sym, (yylsp[0]), false);
+      (yyval.yytype_86) = symbol_list_append ((yyvsp[-1].yytype_86), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])));
     }
-#line 2843 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2702 "src/parse-gram.c"
     break;
 
   case 90:
-#line 629 "src/parse-gram.y" /* yacc.c:1652  */
-    { current_lhs ((yyvsp[-1].id_colon), (yylsp[-1]), (yyvsp[0].yytype_91)); }
-#line 2849 "src/parse-gram.c" /* yacc.c:1652  */
+#line 644 "src/parse-gram.y"
+    {
+      yyerrok;
+    }
+#line 2710 "src/parse-gram.c"
     break;
 
   case 91:
-#line 630 "src/parse-gram.y" /* yacc.c:1652  */
-    {
-      /* Free the current lhs. */
-      current_lhs (0, (yylsp[-3]), 0);
-    }
-#line 2858 "src/parse-gram.c" /* yacc.c:1652  */
+#line 650 "src/parse-gram.y"
+                         { current_lhs ((yyvsp[-1].id_colon), (yylsp[-1]), (yyvsp[0].yytype_93)); }
+#line 2716 "src/parse-gram.c"
     break;
 
   case 92:
-#line 637 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_end ((yylsp[0])); }
-#line 2864 "src/parse-gram.c" /* yacc.c:1652  */
+#line 651 "src/parse-gram.y"
+    {
+      /* Free the current lhs. */
+      current_lhs (0, (yylsp[-4]), 0);
+    }
+#line 2725 "src/parse-gram.c"
     break;
 
   case 93:
-#line 638 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_end ((yylsp[0])); }
-#line 2870 "src/parse-gram.c" /* yacc.c:1652  */
+#line 658 "src/parse-gram.y"
+                     { grammar_current_rule_end ((yylsp[0])); }
+#line 2731 "src/parse-gram.c"
     break;
 
-  case 95:
-#line 645 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
-                                  current_lhs_named_ref); }
-#line 2877 "src/parse-gram.c" /* yacc.c:1652  */
+  case 94:
+#line 659 "src/parse-gram.y"
+                     { grammar_current_rule_end ((yylsp[0])); }
+#line 2737 "src/parse-gram.c"
     break;
 
   case 96:
-#line 648 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].yytype_91)); }
-#line 2883 "src/parse-gram.c" /* yacc.c:1652  */
+#line 666 "src/parse-gram.y"
+    { grammar_current_rule_begin (current_lhs_symbol, current_lhs_loc,
+                                  current_lhs_named_ref); }
+#line 2744 "src/parse-gram.c"
     break;
 
   case 97:
-#line 650 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_action_append ((yyvsp[-1].BRACED_CODE), (yylsp[-1]), (yyvsp[0].yytype_91), (yyvsp[-2].yytype_71)); }
-#line 2889 "src/parse-gram.c" /* yacc.c:1652  */
+#line 669 "src/parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].yytype_93)); }
+#line 2750 "src/parse-gram.c"
     break;
 
   case 98:
-#line 652 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_predicate_append ((yyvsp[0].BRACED_PREDICATE), (yylsp[0])); }
-#line 2895 "src/parse-gram.c" /* yacc.c:1652  */
+#line 671 "src/parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[-1].BRACED_CODE), (yylsp[-1]), (yyvsp[0].yytype_93), (yyvsp[-2].yytype_73)); }
+#line 2756 "src/parse-gram.c"
     break;
 
   case 99:
-#line 654 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_empty_set ((yylsp[0])); }
-#line 2901 "src/parse-gram.c" /* yacc.c:1652  */
+#line 673 "src/parse-gram.y"
+    { grammar_current_rule_predicate_append ((yyvsp[0].BRACED_PREDICATE), (yylsp[0])); }
+#line 2762 "src/parse-gram.c"
     break;
 
   case 100:
-#line 656 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-#line 2907 "src/parse-gram.c" /* yacc.c:1652  */
+#line 675 "src/parse-gram.y"
+    { grammar_current_rule_empty_set ((yylsp[0])); }
+#line 2768 "src/parse-gram.c"
     break;
 
   case 101:
-#line 658 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_dprec_set ((yyvsp[0].INT), (yylsp[0])); }
-#line 2913 "src/parse-gram.c" /* yacc.c:1652  */
+#line 677 "src/parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+#line 2774 "src/parse-gram.c"
     break;
 
   case 102:
-#line 660 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_merge_set ((yyvsp[0].TAG), (yylsp[0])); }
-#line 2919 "src/parse-gram.c" /* yacc.c:1652  */
+#line 679 "src/parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].INT), (yylsp[0])); }
+#line 2780 "src/parse-gram.c"
     break;
 
   case 103:
-#line 662 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_expect_sr ((yyvsp[0].INT), (yylsp[0])); }
-#line 2925 "src/parse-gram.c" /* yacc.c:1652  */
+#line 681 "src/parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].TAG), (yylsp[0])); }
+#line 2786 "src/parse-gram.c"
     break;
 
   case 104:
-#line 664 "src/parse-gram.y" /* yacc.c:1652  */
-    { grammar_current_rule_expect_rr ((yyvsp[0].INT), (yylsp[0])); }
-#line 2931 "src/parse-gram.c" /* yacc.c:1652  */
+#line 683 "src/parse-gram.y"
+    { grammar_current_rule_expect_sr ((yyvsp[0].INT), (yylsp[0])); }
+#line 2792 "src/parse-gram.c"
     break;
 
   case 105:
-#line 668 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_91) = 0; }
-#line 2937 "src/parse-gram.c" /* yacc.c:1652  */
+#line 685 "src/parse-gram.y"
+    { grammar_current_rule_expect_rr ((yyvsp[0].INT), (yylsp[0])); }
+#line 2798 "src/parse-gram.c"
     break;
 
   case 106:
-#line 669 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_91) = named_ref_new ((yyvsp[0].BRACKETED_ID), (yylsp[0])); }
-#line 2943 "src/parse-gram.c" /* yacc.c:1652  */
+#line 689 "src/parse-gram.y"
+                 { (yyval.yytype_93) = NULL; }
+#line 2804 "src/parse-gram.c"
     break;
 
-  case 108:
-#line 702 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
-#line 2949 "src/parse-gram.c" /* yacc.c:1652  */
+  case 107:
+#line 690 "src/parse-gram.y"
+                 { (yyval.yytype_93) = named_ref_new ((yyvsp[0].BRACKETED_ID), (yylsp[0])); }
+#line 2810 "src/parse-gram.c"
     break;
 
   case 109:
-#line 703 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].ID); }
-#line 2955 "src/parse-gram.c" /* yacc.c:1652  */
+#line 723 "src/parse-gram.y"
+          { (yyval.value).kind = muscle_keyword; (yyval.value).chars = ""; }
+#line 2816 "src/parse-gram.c"
     break;
 
   case 110:
-#line 704 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.value).kind = muscle_string;  (yyval.value).chars = (yyvsp[0].STRING); }
-#line 2961 "src/parse-gram.c" /* yacc.c:1652  */
+#line 724 "src/parse-gram.y"
+          { (yyval.value).kind = muscle_keyword; (yyval.value).chars = (yyvsp[0].ID); }
+#line 2822 "src/parse-gram.c"
     break;
 
   case 111:
-#line 705 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.value).kind = muscle_code;    (yyval.value).chars = strip_braces ((yyvsp[0].BRACED_CODE)); }
-#line 2967 "src/parse-gram.c" /* yacc.c:1652  */
+#line 725 "src/parse-gram.y"
+          { (yyval.value).kind = muscle_string;  (yyval.value).chars = (yyvsp[0].STRING); }
+#line 2828 "src/parse-gram.c"
     break;
 
   case 112:
-#line 718 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.id) = symbol_from_uniqstr ((yyvsp[0].ID), (yylsp[0])); }
-#line 2973 "src/parse-gram.c" /* yacc.c:1652  */
+#line 726 "src/parse-gram.y"
+          { (yyval.value).kind = muscle_code;    (yyval.value).chars = strip_braces ((yyvsp[0].BRACED_CODE)); }
+#line 2834 "src/parse-gram.c"
     break;
 
   case 113:
-#line 720 "src/parse-gram.y" /* yacc.c:1652  */
+#line 739 "src/parse-gram.y"
+    { (yyval.id) = symbol_from_uniqstr ((yyvsp[0].ID), (yylsp[0])); }
+#line 2840 "src/parse-gram.c"
+    break;
+
+  case 114:
+#line 741 "src/parse-gram.y"
     {
+      const char *var = "api.token.raw";
       if (current_class == nterm_sym)
         {
-          gram_error (&(yylsp[0]),
-                      _("character literals cannot be nonterminals"));
+          complain (&(yylsp[0]), complaint,
+                    _("character literals cannot be nonterminals"));
           YYERROR;
         }
+      if (muscle_percent_define_ifdef (var))
+        {
+          int indent = 0;
+          complain_indent (&(yylsp[0]), complaint, &indent,
+                           _("character literals cannot be used together"
+                             " with %s"), var);
+          indent += SUB_INDENT;
+          location loc = muscle_percent_define_get_loc (var);
+          complain_indent (&loc, complaint, &indent,
+                           _("definition of %s"), var);
+        }
       (yyval.id) = symbol_get (char_name ((yyvsp[0].CHAR)), (yylsp[0]));
       symbol_class_set ((yyval.id), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.id), (yyvsp[0].CHAR), (yylsp[0]));
     }
-#line 2989 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2868 "src/parse-gram.c"
     break;
 
-  case 114:
-#line 734 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.id_colon) = symbol_from_uniqstr ((yyvsp[0].ID_COLON), (yylsp[0])); }
-#line 2995 "src/parse-gram.c" /* yacc.c:1652  */
+  case 115:
+#line 767 "src/parse-gram.y"
+           { (yyval.id_colon) = symbol_from_uniqstr ((yyvsp[0].ID_COLON), (yylsp[0])); }
+#line 2874 "src/parse-gram.c"
     break;
 
-  case 117:
-#line 746 "src/parse-gram.y" /* yacc.c:1652  */
+  case 118:
+#line 779 "src/parse-gram.y"
     {
       (yyval.string_as_id) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].STRING)), (yylsp[0]));
       symbol_class_set ((yyval.string_as_id), token_sym, (yylsp[0]), false);
     }
-#line 3004 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2883 "src/parse-gram.c"
     break;
 
-  case 118:
-#line 754 "src/parse-gram.y" /* yacc.c:1652  */
-    { (yyval.yytype_98) = NULL; }
-#line 3010 "src/parse-gram.c" /* yacc.c:1652  */
+  case 119:
+#line 787 "src/parse-gram.y"
+                     { (yyval.yytype_100) = NULL; }
+#line 2889 "src/parse-gram.c"
     break;
 
-  case 121:
-#line 761 "src/parse-gram.y" /* yacc.c:1652  */
+  case 122:
+#line 794 "src/parse-gram.y"
     {
       muscle_code_grow ("epilogue", translate_code ((yyvsp[0].EPILOGUE), (yylsp[0]), true), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-#line 3019 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2898 "src/parse-gram.c"
     break;
 
 
-#line 3023 "src/parse-gram.c" /* yacc.c:1652  */
+#line 2902 "src/parse-gram.c"
+
         default: break;
       }
     if (yychar_backup != yychar)
@@ -3089,7 +2969,7 @@ YYLTYPE yylloc = yyloc_default;
           {
             if (yymsg != yymsgbuf)
               YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
             if (!yymsg)
               {
                 yymsg = yymsgbuf;
@@ -3253,7 +3133,7 @@ YYLTYPE yylloc = yyloc_default;
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp, yylsp);
+                  yystos[+*yyssp], yyvsp, yylsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -3268,7 +3148,7 @@ YYLTYPE yylloc = yyloc_default;
 #endif
   return yyresult;
 }
-#line 767 "src/parse-gram.y" /* yacc.c:1918  */
+#line 800 "src/parse-gram.y"
 
 
 /* Return the location of the left-hand side of a rule whose
@@ -3406,6 +3286,7 @@ handle_file_prefix (location const *loc,
     deprecated_directive (dir_loc, directive, "%file-prefix");
 }
 
+
 static void
 handle_name_prefix (location const *loc,
                     char const *directive, char const *value)
@@ -3441,36 +3322,64 @@ handle_name_prefix (location const *loc,
 
 
 static void
-handle_require (location const *loc, char const *version)
+handle_pure_parser (location const *loc, char const *directive)
+{
+  bison_directive (loc, directive);
+  deprecated_directive (loc, directive, "%define api.pure");
+  muscle_percent_define_insert ("api.pure", *loc, muscle_keyword, "",
+                                MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+}
+
+
+/* Convert VERSION into an int (MAJOR * 100 + MINOR).  Return -1 on
+   errors.
+
+   Changes of behavior are only on minor version changes, so "3.0.5"
+   is the same as "3.0": 300. */
+static int
+str_to_version (char const *version)
 {
-  /* Changes of behavior are only on minor version changes, so "3.0.5"
-     is the same as "3.0". */
+  IGNORE_TYPE_LIMITS_BEGIN
+  int res = 0;
   errno = 0;
-  char* cp = NULL;
-  unsigned long major = strtoul (version, &cp, 10);
-  if (errno || *cp != '.')
-    {
-      complain (loc, complaint, _("invalid version requirement: %s"),
-                version);
-      return;
-    }
+  char *cp = NULL;
+  long major = strtol (version, &cp, 10);
+  if (errno || cp == version || *cp != '.' || major < 0
+      || INT_MULTIPLY_WRAPV (major, 100, &res))
+    return -1;
+
   ++cp;
-  unsigned long minor = strtoul (cp, NULL, 10);
-  if (errno)
+  char *cp1 = NULL;
+  long minor = strtol (cp, &cp1, 10);
+  if (errno || cp1 == cp || (*cp1 != '\0' && *cp1 != '.')
+      || ! (0 <= minor && minor < 100)
+      || INT_ADD_WRAPV (minor, res, &res))
+    return -1;
+
+  IGNORE_TYPE_LIMITS_END
+  return res;
+}
+
+
+static void
+handle_require (location const *loc, char const *version)
+{
+  required_version = str_to_version (version);
+  if (required_version == -1)
     {
       complain (loc, complaint, _("invalid version requirement: %s"),
                 version);
+      required_version = 0;
       return;
     }
-  required_version = major * 100 + minor;
-  /* Pretend to be at least 3.2, even if we are only 3.1-211, as it
-     allows us to check features published in 3.2 while developping
-     3.2.  */
-  const char* api_version = "3.2";
+
+  /* Pretend to be at least 3.5, to check features published in that
+     version while developping it.  */
+  const char* api_version = "3.5";
   const char* package_version =
-    strverscmp (api_version, PACKAGE_VERSION) > 0
+    0 < strverscmp (api_version, PACKAGE_VERSION)
     ? api_version : PACKAGE_VERSION;
-  if (strverscmp (version, package_version) > 0)
+  if (0 < strverscmp (version, package_version))
     {
       complain (loc, complaint, _("require bison %s, but have %s"),
                 version, package_version);
@@ -3484,16 +3393,16 @@ handle_skeleton (location const *loc, char const *skel)
   char const *skeleton_user = skel;
   if (strchr (skeleton_user, '/'))
     {
-      size_t dir_length = strlen (current_file);
-      while (dir_length && current_file[dir_length - 1] != '/')
+      size_t dir_length = strlen (grammar_file);
+      while (dir_length && grammar_file[dir_length - 1] != '/')
         --dir_length;
-      while (dir_length && current_file[dir_length - 1] == '/')
+      while (dir_length && grammar_file[dir_length - 1] == '/')
         --dir_length;
       char *skeleton_build =
         xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
       if (dir_length > 0)
         {
-          memcpy (skeleton_build, current_file, dir_length);
+          memcpy (skeleton_build, grammar_file, dir_length);
           skeleton_build[dir_length++] = '/';
         }
       strcpy (skeleton_build + dir_length, skeleton_user);
@@ -3503,26 +3412,19 @@ handle_skeleton (location const *loc, char const *skel)
   skeleton_arg (skeleton_user, grammar_prio, *loc);
 }
 
+
 static void
-handle_yacc (location const *loc, char const *directive)
+handle_yacc (location const *loc)
 {
+  const char *directive = "%yacc";
   bison_directive (loc, directive);
-  bool warned = false;
-
   if (location_empty (yacc_loc))
     yacc_loc = *loc;
   else
-    {
-      duplicate_directive (directive, yacc_loc, *loc);
-      warned = true;
-    }
-
-  if (!warned
-      && STRNEQ (directive, "%fixed-output-files")
-      && STRNEQ (directive, "%yacc"))
-    deprecated_directive (loc, directive, "%fixed-output-files");
+    duplicate_directive (directive, yacc_loc, *loc);
 }
 
+
 static void
 gram_error (location const *loc, char const *msg)
 {
@@ -3547,7 +3449,7 @@ void
 current_lhs (symbol *sym, location loc, named_ref *ref)
 {
   current_lhs_symbol = sym;
-  current_lhs_location = loc;
+  current_lhs_loc = loc;
   if (sym)
     symbol_location_as_lhs_set (sym, loc);
   /* In order to simplify memory management, named references for lhs
@@ -3558,3 +3460,13 @@ current_lhs (symbol *sym, location loc, named_ref *ref)
   free (current_lhs_named_ref);
   current_lhs_named_ref = ref;
 }
+
+static void tron (FILE *yyo)
+{
+  begin_use_class ("value", yyo);
+}
+
+static void troff (FILE *yyo)
+{
+  end_use_class ("value", yyo);
+}
diff --git a/contrib/tools/bison/src/parse-gram.h b/contrib/tools/bison/src/parse-gram.h
index 935488ff28bb..3a36b3c27370 100644
--- a/contrib/tools/bison/src/parse-gram.h
+++ b/contrib/tools/bison/src/parse-gram.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.2.90.23-0bbcb-dirty.  */
+/* A Bison parser, made by GNU Bison 3.5.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -52,11 +52,11 @@
 extern int gram_debug;
 #endif
 /* "%code requires" blocks.  */
-#line 21 "src/parse-gram.y" /* yacc.c:1921  */
+#line 21 "src/parse-gram.y"
 
   #include "symlist.h"
   #include "symtab.h"
-#line 239 "src/parse-gram.y" /* yacc.c:1921  */
+#line 251 "src/parse-gram.y"
 
   typedef enum
   {
@@ -65,7 +65,7 @@ extern int gram_debug;
     param_parse  = 1 << 1,
     param_both   = param_lex | param_parse
   } param_type;
-#line 682 "src/parse-gram.y" /* yacc.c:1921  */
+#line 703 "src/parse-gram.y"
 
   #include "muscle-tab.h"
   typedef struct
@@ -74,7 +74,7 @@ extern int gram_debug;
     muscle_kind kind;
   } value_type;
 
-#line 78 "src/parse-gram.h" /* yacc.c:1921  */
+#line 78 "src/parse-gram.h"
 
 /* Token type.  */
 #ifndef GRAM_TOKENTYPE
@@ -82,67 +82,68 @@ extern int gram_debug;
   enum gram_tokentype
   {
     GRAM_EOF = 0,
-    STRING = 258,
-    PERCENT_TOKEN = 259,
-    PERCENT_NTERM = 260,
-    PERCENT_TYPE = 261,
-    PERCENT_DESTRUCTOR = 262,
-    PERCENT_PRINTER = 263,
-    PERCENT_LEFT = 264,
-    PERCENT_RIGHT = 265,
-    PERCENT_NONASSOC = 266,
-    PERCENT_PRECEDENCE = 267,
-    PERCENT_PREC = 268,
-    PERCENT_DPREC = 269,
-    PERCENT_MERGE = 270,
-    PERCENT_CODE = 271,
-    PERCENT_DEFAULT_PREC = 272,
-    PERCENT_DEFINE = 273,
-    PERCENT_DEFINES = 274,
-    PERCENT_ERROR_VERBOSE = 275,
-    PERCENT_EXPECT = 276,
-    PERCENT_EXPECT_RR = 277,
-    PERCENT_FLAG = 278,
-    PERCENT_FILE_PREFIX = 279,
-    PERCENT_GLR_PARSER = 280,
-    PERCENT_INITIAL_ACTION = 281,
-    PERCENT_LANGUAGE = 282,
-    PERCENT_NAME_PREFIX = 283,
-    PERCENT_NO_DEFAULT_PREC = 284,
-    PERCENT_NO_LINES = 285,
-    PERCENT_NONDETERMINISTIC_PARSER = 286,
-    PERCENT_OUTPUT = 287,
-    PERCENT_REQUIRE = 288,
-    PERCENT_SKELETON = 289,
-    PERCENT_START = 290,
-    PERCENT_TOKEN_TABLE = 291,
-    PERCENT_VERBOSE = 292,
-    PERCENT_YACC = 293,
-    BRACED_CODE = 294,
-    BRACED_PREDICATE = 295,
-    BRACKETED_ID = 296,
-    CHAR = 297,
-    EPILOGUE = 298,
-    EQUAL = 299,
-    ID = 300,
-    ID_COLON = 301,
-    PERCENT_PERCENT = 302,
-    PIPE = 303,
-    PROLOGUE = 304,
-    SEMICOLON = 305,
-    TAG = 306,
-    TAG_ANY = 307,
-    TAG_NONE = 308,
-    INT = 309,
-    PERCENT_PARAM = 310,
-    PERCENT_UNION = 311,
-    PERCENT_EMPTY = 312
+    STRING = 3,
+    PERCENT_TOKEN = 4,
+    PERCENT_NTERM = 5,
+    PERCENT_TYPE = 6,
+    PERCENT_DESTRUCTOR = 7,
+    PERCENT_PRINTER = 8,
+    PERCENT_LEFT = 9,
+    PERCENT_RIGHT = 10,
+    PERCENT_NONASSOC = 11,
+    PERCENT_PRECEDENCE = 12,
+    PERCENT_PREC = 13,
+    PERCENT_DPREC = 14,
+    PERCENT_MERGE = 15,
+    PERCENT_CODE = 16,
+    PERCENT_DEFAULT_PREC = 17,
+    PERCENT_DEFINE = 18,
+    PERCENT_DEFINES = 19,
+    PERCENT_ERROR_VERBOSE = 20,
+    PERCENT_EXPECT = 21,
+    PERCENT_EXPECT_RR = 22,
+    PERCENT_FLAG = 23,
+    PERCENT_FILE_PREFIX = 24,
+    PERCENT_GLR_PARSER = 25,
+    PERCENT_INITIAL_ACTION = 26,
+    PERCENT_LANGUAGE = 27,
+    PERCENT_NAME_PREFIX = 28,
+    PERCENT_NO_DEFAULT_PREC = 29,
+    PERCENT_NO_LINES = 30,
+    PERCENT_NONDETERMINISTIC_PARSER = 31,
+    PERCENT_OUTPUT = 32,
+    PERCENT_PURE_PARSER = 33,
+    PERCENT_REQUIRE = 34,
+    PERCENT_SKELETON = 35,
+    PERCENT_START = 36,
+    PERCENT_TOKEN_TABLE = 37,
+    PERCENT_VERBOSE = 38,
+    PERCENT_YACC = 39,
+    BRACED_CODE = 40,
+    BRACED_PREDICATE = 41,
+    BRACKETED_ID = 42,
+    CHAR = 43,
+    COLON = 44,
+    EPILOGUE = 45,
+    EQUAL = 46,
+    ID = 47,
+    ID_COLON = 48,
+    PERCENT_PERCENT = 49,
+    PIPE = 50,
+    PROLOGUE = 51,
+    SEMICOLON = 52,
+    TAG = 53,
+    TAG_ANY = 54,
+    TAG_NONE = 55,
+    INT = 56,
+    PERCENT_PARAM = 57,
+    PERCENT_UNION = 58,
+    PERCENT_EMPTY = 59
   };
 #endif
 
 /* Value type.  */
 #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
-
 union GRAM_STYPE
 {
 
@@ -163,9 +164,9 @@ union GRAM_STYPE
   /* "integer"  */
   int INT;
   /* int.opt  */
-  int yytype_79;
+  int yytype_81;
   /* named_ref.opt  */
-  named_ref* yytype_91;
+  named_ref* yytype_93;
   /* "%param"  */
   param_type PERCENT_PARAM;
   /* token_decl  */
@@ -181,7 +182,7 @@ union GRAM_STYPE
   /* string_as_id  */
   symbol* string_as_id;
   /* string_as_id.opt  */
-  symbol* yytype_98;
+  symbol* yytype_100;
   /* generic_symlist  */
   symbol_list* generic_symlist;
   /* generic_symlist_item  */
@@ -191,15 +192,15 @@ union GRAM_STYPE
   /* token_decls  */
   symbol_list* token_decls;
   /* token_decl.1  */
-  symbol_list* yytype_77;
+  symbol_list* yytype_79;
   /* token_decls_for_prec  */
   symbol_list* token_decls_for_prec;
   /* token_decl_for_prec.1  */
-  symbol_list* yytype_81;
+  symbol_list* yytype_83;
   /* symbol_decls  */
   symbol_list* symbol_decls;
   /* symbol_decl.1  */
-  symbol_list* yytype_84;
+  symbol_list* yytype_86;
   /* "%error-verbose"  */
   uniqstr PERCENT_ERROR_VERBOSE;
   /* "%<flag>"  */
@@ -208,8 +209,8 @@ union GRAM_STYPE
   uniqstr PERCENT_FILE_PREFIX;
   /* "%name-prefix"  */
   uniqstr PERCENT_NAME_PREFIX;
-  /* "%yacc"  */
-  uniqstr PERCENT_YACC;
+  /* "%pure-parser"  */
+  uniqstr PERCENT_PURE_PARSER;
   /* "[identifier]"  */
   uniqstr BRACKETED_ID;
   /* "identifier"  */
@@ -219,18 +220,18 @@ union GRAM_STYPE
   /* "<tag>"  */
   uniqstr TAG;
   /* tag.opt  */
-  uniqstr yytype_71;
+  uniqstr yytype_73;
   /* tag  */
   uniqstr tag;
   /* variable  */
   uniqstr variable;
-  /* "char"  */
+  /* "character literal"  */
   unsigned char CHAR;
   /* value  */
   value_type value;
-#line 232 "src/parse-gram.h" /* yacc.c:1921  */
-};
+#line 233 "src/parse-gram.h"
 
+};
 typedef union GRAM_STYPE GRAM_STYPE;
 # define GRAM_STYPE_IS_TRIVIAL 1
 # define GRAM_STYPE_IS_DECLARED 1
diff --git a/contrib/tools/bison/src/print_graph.c b/contrib/tools/bison/src/print-graph.c
similarity index 93%
rename from contrib/tools/bison/src/print_graph.c
rename to contrib/tools/bison/src/print-graph.c
index ec0327868677..1dd6b15e7c23 100644
--- a/contrib/tools/bison/src/print_graph.c
+++ b/contrib/tools/bison/src/print-graph.c
@@ -1,6 +1,6 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2001-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2001-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -19,9 +19,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include "print-graph.h"
+
 #include "system.h"
 
-#include "LR0.h"
 #include "closure.h"
 #include "complain.h"
 #include "conflicts.h"
@@ -30,7 +31,7 @@
 #include "gram.h"
 #include "graphviz.h"
 #include "lalr.h"
-#include "print_graph.h"
+#include "lr0.h"
 #include "reader.h"
 #include "state.h"
 #include "symtab.h"
@@ -63,12 +64,7 @@ print_core (struct obstack *oout, state *s)
   for (size_t i = 0; i < snritems; ++i)
     {
       item_number const *sp1 = ritem + sitems[i];
-      item_number const *sp = sp1;
-
-      while (0 <= *sp)
-        sp++;
-
-      rule *r = &rules[item_number_as_rule_number (*sp)];
+      rule const *r = item_rule (sp1);
 
       obstack_printf (oout, "%3d ", r->number);
       if (previous_lhs && UNIQSTR_EQ (previous_lhs->symbol->tag,
@@ -79,13 +75,13 @@ print_core (struct obstack *oout, state *s)
         obstack_printf (oout, "%s: ", escape (r->lhs->symbol->tag));
       previous_lhs = r->lhs;
 
-      for (sp = r->rhs; sp < sp1; sp++)
+      for (item_number const *sp = r->rhs; sp < sp1; sp++)
         obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));
 
       obstack_1grow (oout, '.');
 
       if (0 <= *r->rhs)
-        for (/* Nothing */; *sp >= 0; ++sp)
+        for (item_number const *sp = sp1; 0 <= *sp; ++sp)
           obstack_printf (oout, " %s", escape (symbols[*sp]->tag));
       else
         obstack_printf (oout, " %%empty");
@@ -184,10 +180,8 @@ print_graph (void)
   start_graph (fgraph);
 
   /* Output nodes and edges. */
-  new_closure (nritems);
   for (int i = 0; i < nstates; i++)
     print_state (states[i], fgraph);
-  free_closure ();
 
   finish_graph (fgraph);
   xfclose (fgraph);
diff --git a/contrib/tools/bison/src/print_graph.h b/contrib/tools/bison/src/print-graph.h
similarity index 93%
rename from contrib/tools/bison/src/print_graph.h
rename to contrib/tools/bison/src/print-graph.h
index a3e2b6763f67..c31a5ca28a83 100644
--- a/contrib/tools/bison/src/print_graph.h
+++ b/contrib/tools/bison/src/print-graph.h
@@ -1,6 +1,6 @@
 /* Output a graph of the generated parser, for Bison.
 
-   Copyright (C) 2000, 2006, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2000, 2006, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/print-xml.c b/contrib/tools/bison/src/print-xml.c
index b251e1504ccc..61fb93b4bff8 100644
--- a/contrib/tools/bison/src/print-xml.c
+++ b/contrib/tools/bison/src/print-xml.c
@@ -1,6 +1,6 @@
 /* Print an xml on generated parser, for Bison,
 
-   Copyright (C) 2007, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2007, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -19,21 +19,21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
-#include "system.h"
+#include "print-xml.h"
 
-#include <stdarg.h>
+#include "system.h"
 
 #include <bitset.h>
+#include <stdarg.h>
 
-#include "LR0.h"
 #include "closure.h"
 #include "conflicts.h"
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
+#include "lr0.h"
 #include "print.h"
-#include "print-xml.h"
 #include "reader.h"
 #include "reduce.h"
 #include "state.h"
@@ -57,7 +57,6 @@ static struct escape_buf escape_bufs[num_escape_bufs];
 static void
 print_core (FILE *out, int level, state *s)
 {
-  size_t i;
   item_number *sitems = s->items;
   size_t snritems = s->nitems;
 
@@ -74,18 +73,12 @@ print_core (FILE *out, int level, state *s)
 
   xml_puts (out, level, "<itemset>");
 
-  for (i = 0; i < snritems; i++)
+  for (size_t i = 0; i < snritems; i++)
     {
       bool printed = false;
       item_number *sp1 = ritem + sitems[i];
-      item_number *sp = sp1;
-      rule *r;
-
-      while (0 <= *sp)
-        sp++;
-
-      r = &rules[item_number_as_rule_number (*sp)];
-      sp = r->rhs;
+      rule const *r = item_rule (sp1);
+      item_number *sp = r->rhs;
 
       /* Display the lookahead tokens?  */
       if (item_number_is_rule_number (*sp1))
@@ -336,7 +329,7 @@ print_reductions (FILE *out, int level, state *s)
 
 /*--------------------------------------------------------------.
 | Report on OUT all the actions (shifts, gotos, reductions, and |
-| explicit erros from %nonassoc) of S.                          |
+| explicit errors from %nonassoc) of S.                         |
 `--------------------------------------------------------------*/
 
 static void
@@ -380,15 +373,13 @@ print_state (FILE *out, int level, state *s)
 static void
 print_grammar (FILE *out, int level)
 {
-  symbol_number i;
-
   fputc ('\n', out);
   xml_puts (out, level, "<grammar>");
   grammar_rules_print_xml (out, level);
 
   /* Terminals */
   xml_puts (out, level + 1, "<terminals>");
-  for (i = 0; i < max_user_token_number + 1; i++)
+  for (symbol_number i = 0; i < max_user_token_number + 1; i++)
     if (token_translations[i] != undeftoken->content->number)
       {
         char const *tag = symbols[token_translations[i]]->tag;
@@ -411,7 +402,7 @@ print_grammar (FILE *out, int level)
 
   /* Nonterminals */
   xml_puts (out, level + 1, "<nonterminals>");
-  for (i = ntokens; i < nsyms + nuseless_nonterminals; i++)
+  for (symbol_number i = ntokens; i < nsyms + nuseless_nonterminals; i++)
     {
       char const *tag = symbols[i]->tag;
       xml_printf (out, level + 2,
@@ -428,8 +419,7 @@ print_grammar (FILE *out, int level)
 void
 xml_indent (FILE *out, int level)
 {
-  int i;
-  for (i = 0; i < level; i++)
+  for (int i = 0; i < level; i++)
     fputs ("  ", out);
 }
 
@@ -460,14 +450,13 @@ xml_escape_string (struct escape_buf *buf, char const *str)
 {
   size_t len = strlen (str);
   size_t max_expansion = sizeof "&quot;" - 1;
-  char *p;
 
   if (buf->size <= max_expansion * len)
     {
       buf->size = max_expansion * len + 1;
       buf->ptr = x2realloc (buf->ptr, &buf->size);
     }
-  p = buf->ptr;
+  char *p = buf->ptr;
 
   for (; *str; str++)
     switch (*str)
@@ -498,11 +487,11 @@ xml_escape (char const *str)
 void
 print_xml (void)
 {
-  int level = 0;
-
   FILE *out = xfopen (spec_xml_file, "w");
 
   fputs ("<?xml version=\"1.0\"?>\n\n", out);
+
+  int level = 0;
   xml_printf (out, level,
               "<bison-xml-report version=\"%s\" bug-report=\"%s\""
               " url=\"%s\">",
@@ -517,29 +506,21 @@ print_xml (void)
   /* print grammar */
   print_grammar (out, level + 1);
 
-  new_closure (nritems);
-  no_reduce_set =  bitset_create (ntokens, BITSET_FIXED);
+  no_reduce_set = bitset_create (ntokens, BITSET_FIXED);
 
   /* print automaton */
   fputc ('\n', out);
   xml_puts (out, level + 1, "<automaton>");
-  {
-    state_number i;
-    for (i = 0; i < nstates; i++)
-      print_state (out, level + 2, states[i]);
-  }
+  for (state_number i = 0; i < nstates; i++)
+    print_state (out, level + 2, states[i]);
   xml_puts (out, level + 1, "</automaton>");
 
   bitset_free (no_reduce_set);
-  free_closure ();
 
   xml_puts (out, 0, "</bison-xml-report>");
 
-  {
-    int i;
-    for (i = 0; i < num_escape_bufs; ++i)
-      free (escape_bufs[i].ptr);
-  }
+  for (int i = 0; i < num_escape_bufs; ++i)
+    free (escape_bufs[i].ptr);
 
   xfclose (out);
 }
diff --git a/contrib/tools/bison/src/print-xml.h b/contrib/tools/bison/src/print-xml.h
index 122c5595e74e..c057780b9386 100644
--- a/contrib/tools/bison/src/print-xml.h
+++ b/contrib/tools/bison/src/print-xml.h
@@ -1,6 +1,6 @@
 /* Output an xml of the generated parser, for Bison.
 
-   Copyright (C) 2007, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2007, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,6 +21,10 @@
 #ifndef PRINT_XML_H_
 # define PRINT_XML_H_
 
+# include <config.h>
+
+# include <stdio.h>
+
 void xml_indent (FILE *out, int level);
 void xml_puts (FILE *, int, char const *);
 void xml_printf (FILE *, int, char const *, ...);
diff --git a/contrib/tools/bison/src/print.c b/contrib/tools/bison/src/print.c
index 60bb2b3658f3..259c16b3f5f2 100644
--- a/contrib/tools/bison/src/print.c
+++ b/contrib/tools/bison/src/print.c
@@ -1,6 +1,6 @@
 /* Print information on generated parser, for bison,
 
-   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2015, 2018-2019
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2015, 2018-2020
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -23,13 +23,13 @@
 
 #include <bitset.h>
 
-#include "LR0.h"
 #include "closure.h"
 #include "conflicts.h"
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
+#include "lr0.h"
 #include "muscle-tab.h"
 #include "print.h"
 #include "reader.h"
@@ -63,8 +63,6 @@ print_core (FILE *out, state *s)
 {
   item_number *sitems = s->items;
   size_t snritems = s->nitems;
-  sym_content *previous_lhs = NULL;
-
   /* Output all the items of a state, not only its kernel.  */
   if (report_flag & report_itemsets)
     {
@@ -78,33 +76,18 @@ print_core (FILE *out, state *s)
 
   fputc ('\n', out);
 
+  rule const *previous_rule = NULL;
   for (size_t i = 0; i < snritems; i++)
     {
       item_number *sp1 = ritem + sitems[i];
-
-      item_number *sp = sp1;
-      while (*sp >= 0)
-        sp++;
-
-      rule_number r = item_number_as_rule_number (*sp);
-
-      rule_lhs_print (&rules[r], previous_lhs, out);
-      previous_lhs = rules[r].lhs;
-
-      for (sp = rules[r].rhs; sp < sp1; sp++)
-        fprintf (out, " %s", symbols[*sp]->tag);
-      fputs (" .", out);
-      if (0 <= *rules[r].rhs)
-        for (/* Nothing */; 0 <= *sp; ++sp)
-          fprintf (out, " %s", symbols[*sp]->tag);
-      else
-        fprintf (out, " %%empty");
+      rule const *r = item_rule (sp1);
+      item_print (sp1, previous_rule, out);
+      previous_rule = r;
 
       /* Display the lookahead tokens?  */
       if (report_flag & report_lookahead_tokens
           && item_number_is_rule_number (*sp1))
-        state_rule_lookahead_tokens_print (s, &rules[r], out);
-
+        state_rule_lookahead_tokens_print (s, r, out);
       fputc ('\n', out);
     }
 }
@@ -336,7 +319,7 @@ print_reductions (FILE *out, state *s)
 
 /*--------------------------------------------------------------.
 | Report on OUT all the actions (shifts, gotos, reductions, and |
-| explicit erros from %nonassoc) of S.                          |
+| explicit errors from %nonassoc) of S.                         |
 `--------------------------------------------------------------*/
 
 static void
@@ -374,17 +357,6 @@ print_state (FILE *out, state *s)
 | Print information on the whole grammar.  |
 `-----------------------------------------*/
 
-#define END_TEST(End)                           \
-  do {                                          \
-    if (column + strlen (buffer) > (End))       \
-      {                                         \
-        fprintf (out, "%s\n   ", buffer);       \
-        column = 3;                             \
-        buffer[0] = 0;                          \
-      }                                         \
-  } while (0)
-
-
 static void
 print_terminal_symbols (FILE *out)
 {
@@ -394,29 +366,20 @@ print_terminal_symbols (FILE *out)
     if (token_translations[i] != undeftoken->content->number)
       {
         const char *tag = symbols[token_translations[i]]->tag;
-        int column = strlen (tag);
-        char buffer[90];
-
-        buffer[0] = 0;
-        fputs (tag, out);
-        END_TEST (65);
+        fprintf (out, "%4s%s", "", tag);
         if (symbols[token_translations[i]]->content->type_name)
-          {
-            column += fprintf (out, " <%s>",
-                               symbols[token_translations[i]]->content->type_name);
-            END_TEST (65);
-          }
-        sprintf (buffer, " (%d)", i);
+          fprintf (out, " <%s>",
+                   symbols[token_translations[i]]->content->type_name);
+        fprintf (out, " (%d)", i);
 
         for (rule_number r = 0; r < nrules; r++)
           for (item_number *rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
             if (item_number_as_symbol_number (*rhsp) == token_translations[i])
               {
-                END_TEST (65);
-                sprintf (buffer + strlen (buffer), " %d", r);
+                fprintf (out, " %d", r);
                 break;
               }
-        fprintf (out, "%s\n", buffer);
+        fputc ('\n', out);
       }
   fputs ("\n\n", out);
 }
@@ -429,64 +392,46 @@ print_nonterminal_symbols (FILE *out)
   for (symbol_number i = ntokens; i < nsyms; i++)
     {
       const char *tag = symbols[i]->tag;
-      int column = strlen (tag);
-      int left_count = 0, right_count = 0;
+      bool on_left = false;
+      bool on_right = false;
 
       for (rule_number r = 0; r < nrules; r++)
         {
-          if (rules[r].lhs->number == i)
-            left_count++;
-          for (item_number *rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
-            if (item_number_as_symbol_number (*rhsp) == i)
-              {
-                right_count++;
-                break;
-              }
+          on_left |= rules[r].lhs->number == i;
+          for (item_number *rhsp = rules[r].rhs; !on_right && 0 <= *rhsp; ++rhsp)
+            on_right |= item_number_as_symbol_number (*rhsp) == i;
+          if (on_left && on_right)
+            break;
         }
 
-      fputs (tag, out);
+      int column = 4 + strlen (tag);
+      fprintf (out, "%4s%s", "", tag);
       if (symbols[i]->content->type_name)
         column += fprintf (out, " <%s>",
                            symbols[i]->content->type_name);
-      char buffer[90];
-      buffer[0] = 0;
-      sprintf (buffer, " (%d)", i);
-      END_TEST (0);
+      fprintf (out, " (%d)\n", i);
 
-      if (left_count > 0)
+      if (on_left)
         {
-          END_TEST (65);
-          sprintf (buffer + strlen (buffer), _(" on left:"));
-
+          fprintf (out, "%8s%s", "", _("on left:"));
           for (rule_number r = 0; r < nrules; r++)
-            {
-              if (rules[r].lhs->number == i)
-                {
-                  END_TEST (65);
-                  sprintf (buffer + strlen (buffer), " %d", r);
-                }
-            }
+            if (rules[r].lhs->number == i)
+              fprintf (out, " %d", r);
+          fputc ('\n', out);
         }
 
-      if (right_count > 0)
+      if (on_right)
         {
-          if (left_count > 0)
-            sprintf (buffer + strlen (buffer), ",");
-          END_TEST (65);
-          sprintf (buffer + strlen (buffer), _(" on right:"));
+          fprintf (out, "%8s%s", "", _("on right:"));
           for (rule_number r = 0; r < nrules; r++)
-            {
-              item_number *rhsp;
-              for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
-                if (item_number_as_symbol_number (*rhsp) == i)
-                  {
-                    END_TEST (65);
-                    sprintf (buffer + strlen (buffer), " %d", r);
-                    break;
-                  }
-            }
+            for (item_number *rhsp = rules[r].rhs; 0 <= *rhsp; ++rhsp)
+              if (item_number_as_symbol_number (*rhsp) == i)
+                {
+                  fprintf (out, " %d", r);
+                  break;
+                }
+          fputc ('\n', out);
         }
-      fprintf (out, "%s\n", buffer);
     }
 }
 
@@ -507,17 +452,11 @@ print_results (void)
   print_terminal_symbols (out);
   print_nonterminal_symbols (out);
 
-  /* If the whole state item sets, not only the kernels, are wanted,
-     'closure' will be run, which needs memory allocation/deallocation.   */
-  if (report_flag & report_itemsets)
-    new_closure (nritems);
   /* Storage for print_reductions.  */
   no_reduce_set = bitset_create (ntokens, BITSET_FIXED);
   for (state_number i = 0; i < nstates; i++)
     print_state (out, states[i]);
   bitset_free (no_reduce_set);
-  if (report_flag & report_itemsets)
-    free_closure ();
 
   xfclose (out);
 }
diff --git a/contrib/tools/bison/src/print.h b/contrib/tools/bison/src/print.h
index 83520062509f..027abce46c58 100644
--- a/contrib/tools/bison/src/print.h
+++ b/contrib/tools/bison/src/print.h
@@ -1,6 +1,6 @@
 /* Print information on generated parser, for bison,
 
-   Copyright (C) 2000, 2009-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 2000, 2009-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/reader.c b/contrib/tools/bison/src/reader.c
index 8d373416df88..80d307c6c213 100644
--- a/contrib/tools/bison/src/reader.c
+++ b/contrib/tools/bison/src/reader.c
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
    Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
-   2009-2015, 2018-2019 Free Software Foundation, Inc.
+   2009-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -26,6 +26,7 @@
 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"
+#include "fixits.h"
 #include "getargs.h"
 #include "gram.h"
 #include "muscle-tab.h"
@@ -61,7 +62,7 @@ grammar_start_symbol_set (symbol *sym, location loc)
     {
       start_flag = true;
       startsymbol = sym;
-      startsymbol_location = loc;
+      startsymbol_loc = loc;
     }
 }
 
@@ -123,19 +124,19 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
   aver (merge_function != NULL && merger_find == merger);
   if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
     {
-      unsigned indent = 0;
+      int indent = 0;
       complain_indent (&declaration_loc, complaint, &indent,
                        _("result type clash on merge function %s: "
                          "<%s> != <%s>"),
                        quote (merge_function->name), type,
                        merge_function->type);
       indent += SUB_INDENT;
-      complain_indent (&merge_function->type_declaration_location, complaint,
+      complain_indent (&merge_function->type_declaration_loc, complaint,
                        &indent,
                        _("previous declaration"));
     }
   merge_function->type = uniqstr_new (type);
-  merge_function->type_declaration_location = declaration_loc;
+  merge_function->type_declaration_loc = declaration_loc;
 }
 
 /*--------------------------------------.
@@ -226,19 +227,13 @@ grammar_current_rule_begin (symbol *lhs, location loc,
   ++nrules;
   previous_rule_end = grammar_end;
 
-  symbol_list *p = grammar_symbol_append (lhs, loc);
+  current_rule = grammar_symbol_append (lhs, loc);
   if (lhs_name)
-    assign_named_ref (p, named_ref_copy (lhs_name));
-
-  current_rule = grammar_end;
+    assign_named_ref (current_rule, named_ref_copy (lhs_name));
 
   /* Mark the rule's lhs as a nonterminal if not already so.  */
-  if (lhs->content->class == unknown_sym)
-    {
-      lhs->content->class = nterm_sym;
-      lhs->content->number = nvars;
-      ++nvars;
-    }
+  if (lhs->content->class == unknown_sym || lhs->content->class == pct_type_sym)
+    symbol_class_set (lhs, nterm_sym, empty_loc, false);
   else if (lhs->content->class == token_sym)
     complain (&loc, complaint, _("rule given for %s, which is a token"),
               lhs->tag);
@@ -293,10 +288,10 @@ grammar_rule_check_and_complete (symbol_list *r)
       if (first_rhs)
         {
           char const *lhs_type = r->content.sym->content->type_name;
-          const char *rhs_type =
+          char const *rhs_type =
             first_rhs->content->type_name ? first_rhs->content->type_name : "";
           if (!UNIQSTR_EQ (lhs_type, rhs_type))
-            complain (&r->location, Wother,
+            complain (&r->rhs_loc, Wother,
                       _("type clash on default action: <%s> != <%s>"),
                       lhs_type, rhs_type);
           else
@@ -309,7 +304,7 @@ grammar_rule_check_and_complete (symbol_list *r)
               if (is_cxx)
                 {
                   code_props_rule_action_init (&r->action_props, "{ $$ = $1; }",
-                                               r->location, r,
+                                               r->rhs_loc, r,
                                                /* name */ NULL,
                                                /* type */ NULL,
                                                /* is_predicate */ false);
@@ -319,7 +314,7 @@ grammar_rule_check_and_complete (symbol_list *r)
         }
       /* Warn if there is no default for $$ but we need one.  */
       else
-        complain (&r->location, Wother,
+        complain (&r->rhs_loc, Wother,
                   _("empty rule for typed nonterminal, and no action"));
     }
 
@@ -336,9 +331,9 @@ grammar_rule_check_and_complete (symbol_list *r)
           {
             warnings warn_flag = midrule_warning ? Wmidrule_values : Wother;
             if (n)
-              complain (&l->location, warn_flag, _("unused value: $%d"), n);
+              complain (&l->sym_loc, warn_flag, _("unused value: $%d"), n);
             else
-              complain (&l->location, warn_flag, _("unset value: $$"));
+              complain (&l->rhs_loc, warn_flag, _("unset value: $$"));
           }
       }
   }
@@ -346,14 +341,25 @@ grammar_rule_check_and_complete (symbol_list *r)
   /* Check that %empty => empty rule.  */
   if (r->percent_empty_loc.start.file
       && r->next && r->next->content.sym)
-    complain (&r->percent_empty_loc, complaint,
-              _("%%empty on non-empty rule"));
+    {
+      complain (&r->percent_empty_loc, complaint,
+                _("%%empty on non-empty rule"));
+      fixits_register (&r->percent_empty_loc, "");
+    }
 
   /* Check that empty rule => %empty.  */
   if (!(r->next && r->next->content.sym)
       && !r->midrule_parent_rule
-      && !r->percent_empty_loc.start.file)
-    complain (&r->location, Wempty_rule, _("empty rule without %%empty"));
+      && !r->percent_empty_loc.start.file
+      && warning_is_enabled (Wempty_rule))
+    {
+      complain (&r->rhs_loc, Wempty_rule, _("empty rule without %%empty"));
+      if (feature_flag & feature_caret)
+        location_caret_suggestion (r->rhs_loc, "%empty", stderr);
+      location loc = r->rhs_loc;
+      loc.end = loc.start;
+      fixits_register (&loc, " %empty ");
+    }
 
   /* See comments in grammar_current_rule_prec_set for how POSIX
      mandates this complaint.  It's only for identifiers, so skip
@@ -362,12 +368,12 @@ grammar_rule_check_and_complete (symbol_list *r)
       && r->ruleprec->tag[0] != '\'' && r->ruleprec->tag[0] != '"'
       && r->ruleprec->content->status != declared
       && !r->ruleprec->content->prec)
-    complain (&r->location, Wother,
+    complain (&r->rhs_loc, Wother,
               _("token for %%prec is not defined: %s"), r->ruleprec->tag);
 
   /* Check that the (main) action was not typed.  */
   if (r->action_props.type)
-    complain (&r->location, Wother,
+    complain (&r->rhs_loc, Wother,
               _("only midrule actions can be typed: %s"), r->action_props.type);
 }
 
@@ -380,8 +386,8 @@ void
 grammar_current_rule_end (location loc)
 {
   /* Put an empty link in the list to mark the end of this rule  */
-  grammar_symbol_append (NULL, grammar_end->location);
-  current_rule->location = loc;
+  grammar_symbol_append (NULL, grammar_end->rhs_loc);
+  current_rule->rhs_loc = loc;
 }
 
 
@@ -401,11 +407,11 @@ grammar_midrule_action (void)
 
   /* Make a DUMMY nonterminal, whose location is that of the midrule
      action.  Create the MIDRULE.  */
-  location dummy_location = current_rule->action_props.location;
-  symbol *dummy = dummy_symbol_get (dummy_location);
+  location dummy_loc = current_rule->action_props.location;
+  symbol *dummy = dummy_symbol_get (dummy_loc);
   symbol_type_set(dummy,
                   current_rule->action_props.type, current_rule->action_props.location);
-  symbol_list *midrule = symbol_list_sym_new (dummy, dummy_location);
+  symbol_list *midrule = symbol_list_sym_new (dummy, dummy_loc);
 
   /* Remember named_ref of previous action. */
   named_ref *action_name = current_rule->action_props.named_ref;
@@ -415,7 +421,7 @@ grammar_midrule_action (void)
   ++nrules;
   ++nritems;
   /* Attach its location and actions to that of the DUMMY.  */
-  midrule->location = dummy_location;
+  midrule->rhs_loc = dummy_loc;
   code_props_rule_action_init (&midrule->action_props,
                                current_rule->action_props.code,
                                current_rule->action_props.location,
@@ -436,14 +442,14 @@ grammar_midrule_action (void)
     grammar = midrule;
 
   /* End the dummy's rule.  */
-  midrule->next = symbol_list_sym_new (NULL, dummy_location);
+  midrule->next = symbol_list_sym_new (NULL, dummy_loc);
   midrule->next->next = current_rule;
 
   previous_rule_end = midrule->next;
 
   /* Insert the dummy nonterminal replacing the midrule action into
      the current rule.  Bind it to its dedicated rule.  */
-  grammar_current_rule_symbol_append (dummy, dummy_location,
+  grammar_current_rule_symbol_append (dummy, dummy_loc,
                                       action_name);
   grammar_end->midrule = midrule;
   midrule->midrule_parent_rule = current_rule;
@@ -502,11 +508,11 @@ grammar_current_rule_dprec_set (int dprec, location loc)
               "%dprec");
   else if (current_rule->dprec != 0)
     duplicate_rule_directive ("%dprec",
-                              current_rule->dprec_location, loc);
+                              current_rule->dprec_loc, loc);
   else
     {
       current_rule->dprec = dprec;
-      current_rule->dprec_location = loc;
+      current_rule->dprec_loc = loc;
     }
 }
 
@@ -521,11 +527,11 @@ grammar_current_rule_merge_set (uniqstr name, location loc)
               "%merge");
   if (current_rule->merger != 0)
     duplicate_rule_directive ("%merge",
-                              current_rule->merger_declaration_location, loc);
+                              current_rule->merger_declaration_loc, loc);
   else
     {
       current_rule->merger = get_merge_function (name);
-      current_rule->merger_declaration_location = loc;
+      current_rule->merger_declaration_loc = loc;
     }
 }
 
@@ -595,17 +601,16 @@ grammar_current_rule_expect_rr (int count, location loc)
 }
 
 
-/*---------------------------------------------------------------.
-| Convert the rules into the representation using RRHS, RLHS and |
-| RITEM.                                                         |
-`---------------------------------------------------------------*/
+/*---------------------------------------------.
+| Build RULES and RITEM from what was parsed.  |
+`---------------------------------------------*/
 
 static void
 packgram (void)
 {
-  unsigned itemno = 0;
+  int itemno = 0;
   ritem = xnmalloc (nritems + 1, sizeof *ritem);
-  /* This sentinel is used by build_relations in gram.c.  */
+  /* This sentinel is used by build_relations() in lalr.c.  */
   *ritem++ = 0;
 
   rule_number ruleno = 0;
@@ -615,11 +620,11 @@ packgram (void)
     {
       symbol_list *lhs = p;
       record_merge_function_type (lhs->merger, lhs->content.sym->content->type_name,
-                                  lhs->merger_declaration_location);
+                                  lhs->merger_declaration_loc);
       /* If the midrule's $$ is set or its $n is used, remove the '$' from the
          symbol name so that it's a user-defined symbol so that the default
          %destructor and %printer apply.  */
-      if (lhs->midrule_parent_rule
+      if (lhs->midrule_parent_rule /* i.e., symbol_is_dummy (lhs->content.sym).  */
           && (lhs->action_props.is_value_used
               || (symbol_list_n_get (lhs->midrule_parent_rule,
                                      lhs->midrule_parent_rhs_index)
@@ -629,8 +634,8 @@ packgram (void)
       /* Don't check the generated rule 0.  It has no action, so some rhs
          symbols may appear unused, but the parsing algorithm ensures that
          %destructor's are invoked appropriately.  */
-      if (p != grammar)
-        grammar_rule_check_and_complete (p);
+      if (lhs != grammar)
+        grammar_rule_check_and_complete (lhs);
 
       rules[ruleno].user_number = ruleno;
       rules[ruleno].number = ruleno;
@@ -640,18 +645,18 @@ packgram (void)
       rules[ruleno].dprec = lhs->dprec;
       rules[ruleno].merger = lhs->merger;
       rules[ruleno].precsym = NULL;
-      rules[ruleno].location = lhs->location;
+      rules[ruleno].location = lhs->rhs_loc;
       rules[ruleno].useful = true;
       rules[ruleno].action = lhs->action_props.code;
-      rules[ruleno].action_location = lhs->action_props.location;
+      rules[ruleno].action_loc = lhs->action_props.location;
       rules[ruleno].is_predicate = lhs->action_props.is_predicate;
-      rules[ruleno].expected_sr_conflicts = p->expected_sr_conflicts;
-      rules[ruleno].expected_rr_conflicts = p->expected_rr_conflicts;
+      rules[ruleno].expected_sr_conflicts = lhs->expected_sr_conflicts;
+      rules[ruleno].expected_rr_conflicts = lhs->expected_rr_conflicts;
 
       /* Traverse the rhs.  */
       {
         size_t rule_length = 0;
-        for (p = p->next; p->content.sym; p = p->next)
+        for (p = lhs->next; p->content.sym; p = p->next)
           {
             ++rule_length;
 
@@ -691,7 +696,8 @@ packgram (void)
   if (trace_flag & trace_sets)
     ritem_print (stderr);
 }
-
+
+
 /*------------------------------------------------------------------.
 | Read in the grammar specification and record it in the format     |
 | described in gram.h.  All actions are copied into ACTION_OBSTACK, |
@@ -700,39 +706,20 @@ packgram (void)
 `------------------------------------------------------------------*/
 
 void
-reader (void)
+reader (const char *gram)
 {
-  /* Initialize the symbol table.  */
+  /* Set up symbol_table, semantic_type_table, and the built-in
+     symbols.  */
   symbols_new ();
 
-  /* Construct the accept symbol. */
-  accept = symbol_get ("$accept", empty_location);
-  accept->content->class = nterm_sym;
-  accept->content->number = nvars++;
-
-  /* Construct the error token */
-  errtoken = symbol_get ("error", empty_location);
-  errtoken->content->class = token_sym;
-  errtoken->content->number = ntokens++;
-
-  /* Construct a token that represents all undefined literal tokens.
-     It is always token number 2.  */
-  undeftoken = symbol_get ("$undefined", empty_location);
-  undeftoken->content->class = token_sym;
-  undeftoken->content->number = ntokens++;
-
-  gram_in = xfopen (grammar_file, "r");
-
-  gram__flex_debug = trace_flag & trace_scan;
-  gram_debug = trace_flag & trace_parse;
-  gram_scanner_initialize ();
+  gram_scanner_open (gram);
   gram_parse ();
+  gram_scanner_close ();
+
   prepare_percent_define_front_end_variables ();
 
   if (complaint_status  < status_complaint)
     check_and_convert_grammar ();
-
-  xfclose (gram_in);
 }
 
 static void
@@ -754,11 +741,12 @@ prepare_percent_define_front_end_variables (void)
 
   /* Check %define front-end variables.  */
   {
-    static char const * const values[] = {
-      "lr.type", "lalr", "ielr", "canonical-lr", NULL,
-      "lr.default-reduction", "most", "consistent", "accepting", NULL,
-      NULL
-    };
+    static char const * const values[] =
+      {
+       "lr.type", "lr""(0)", "lalr", "ielr", "canonical-lr", NULL,
+       "lr.default-reduction", "most", "consistent", "accepting", NULL,
+       NULL
+      };
     muscle_percent_define_check_values (values);
   }
 }
@@ -793,7 +781,7 @@ check_and_convert_grammar (void)
   /* If the user did not define her ENDTOKEN, do it now. */
   if (!endtoken)
     {
-      endtoken = symbol_get ("$end", empty_location);
+      endtoken = symbol_get ("$end", empty_loc);
       endtoken->content->class = token_sym;
       endtoken->content->number = 0;
       /* Value specified by POSIX.  */
@@ -815,11 +803,11 @@ check_and_convert_grammar (void)
 
      $accept: %start $end.  */
   {
-    symbol_list *p = symbol_list_sym_new (accept, empty_location);
-    p->location = grammar->location;
-    p->next = symbol_list_sym_new (startsymbol, empty_location);
-    p->next->next = symbol_list_sym_new (endtoken, empty_location);
-    p->next->next->next = symbol_list_sym_new (NULL, empty_location);
+    symbol_list *p = symbol_list_sym_new (accept, empty_loc);
+    p->rhs_loc = grammar->rhs_loc;
+    p->next = symbol_list_sym_new (startsymbol, empty_loc);
+    p->next->next = symbol_list_sym_new (endtoken, empty_loc);
+    p->next->next->next = symbol_list_sym_new (NULL, empty_loc);
     p->next->next->next->next = grammar;
     nrules += 1;
     nritems += 3;
@@ -829,8 +817,7 @@ check_and_convert_grammar (void)
   aver (nsyms <= SYMBOL_NUMBER_MAXIMUM);
   aver (nsyms == ntokens + nvars);
 
-  /* Assign the symbols their symbol numbers.  Write #defines for the
-     token symbols into FDEFINES if requested.  */
+  /* Assign the symbols their symbol numbers.  */
   symbols_pack ();
 
   /* Scan rule actions after invoking symbol_check_alias_consistency (in
diff --git a/contrib/tools/bison/src/reader.h b/contrib/tools/bison/src/reader.h
index 9f59dc0053c1..6b4f57ff1ac0 100644
--- a/contrib/tools/bison/src/reader.h
+++ b/contrib/tools/bison/src/reader.h
@@ -1,6 +1,6 @@
 /* Input parser for Bison
 
-   Copyright (C) 2000-2003, 2005-2007, 2009-2015, 2018-2019 Free
+   Copyright (C) 2000-2003, 2005-2007, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -32,15 +32,9 @@ typedef struct merger_list
   struct merger_list* next;
   uniqstr name;
   uniqstr type;
-  location type_declaration_location;
+  location type_declaration_loc;
 } merger_list;
 
-/* From the parser.  */
-extern int gram_debug;
-int gram_parse (void);
-
-
-/* From reader.c. */
 void grammar_start_symbol_set (symbol *sym, location loc);
 void grammar_current_rule_begin (symbol *lhs, location loc,
                                  named_ref *lhs_named_ref);
@@ -60,7 +54,7 @@ void grammar_current_rule_action_append (const char *action, location loc,
                                          named_ref *nref, uniqstr tag);
 /* Attach a PREDICATE to the current rule.  */
 void grammar_current_rule_predicate_append (const char *predicate, location loc);
-void reader (void);
+void reader (const char *gram);
 void free_merger_functions (void);
 
 extern merger_list *merge_functions;
diff --git a/contrib/tools/bison/src/reduce.c b/contrib/tools/bison/src/reduce.c
index ff2f2325c082..4ed8531ecc82 100644
--- a/contrib/tools/bison/src/reduce.c
+++ b/contrib/tools/bison/src/reduce.c
@@ -1,6 +1,6 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 1988-1989, 2000-2003, 2005-2015, 2018-2019 Free
+   Copyright (C) 1988-1989, 2000-2003, 2005-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -39,21 +39,21 @@
 #include "reduce.h"
 #include "symtab.h"
 
-/* Set of all nonterminals whose language is not empty.  */
+/* Set of nonterminals whose language is not empty.  */
 static bitset N;
 
-/* Set of all rules which have no useless nonterminals in their RHS.  */
+/* Set of rules that have no useless nonterminals in their RHS.  */
 static bitset P;
 
-/* Set of all accessible symbols.  */
+/* Set of accessible symbols.  */
 static bitset V;
 
 /* Set of symbols used to define rule precedence (so they are
    'useless', but no warning should be issued).  */
 static bitset V1;
 
-unsigned nuseless_productions;
-unsigned nuseless_nonterminals;
+int nuseless_productions;
+int nuseless_nonterminals;
 
 #define bitset_swap(Lhs, Rhs)                   \
   do {                                          \
@@ -81,9 +81,11 @@ useful_production (rule_number r, bitset N0)
 }
 
 
-/*---------------------------------------------------------.
-| Remember that rules are 1-origin, symbols are 0-origin.  |
-`---------------------------------------------------------*/
+/*-----------------------------------------------------------------.
+| Compute N, the set of nonterminals whose language is not empty.  |
+|                                                                  |
+| Remember that rules are 1-origin, symbols are 0-origin.          |
+`-----------------------------------------------------------------*/
 
 static void
 useless_nonterminals (void)
@@ -193,10 +195,10 @@ inaccessable_symbols (void)
   bitset_free (P);
   P = Pp;
 
-  unsigned nuseful_productions = bitset_count (P);
+  int nuseful_productions = bitset_count (P);
   nuseless_productions = nrules - nuseful_productions;
 
-  unsigned nuseful_nonterminals = 0;
+  int nuseful_nonterminals = 0;
   for (symbol_number i = ntokens; i < nsyms; ++i)
     nuseful_nonterminals += bitset_test (V, i);
   nuseless_nonterminals = nvars - nuseful_nonterminals;
@@ -248,10 +250,7 @@ reduce_grammar_tables (void)
 
   /* Adjust NRITEMS.  */
   for (rule_number r = nrules; r < nrules + nuseless_productions; ++r)
-    {
-      int length = rule_rhs_length (&rules[r]);
-      nritems -= length + 1;
-  }
+    nritems -= rule_rhs_length (&rules[r]) + 1;
 }
 
 
@@ -321,7 +320,7 @@ reduce_output (FILE *out)
     {
       fprintf (out, "%s\n\n", _("Nonterminals useless in grammar"));
       for (int i = 0; i < nuseless_nonterminals; ++i)
-        fprintf (out, "   %s\n", symbols[nsyms + i]->tag);
+        fprintf (out, "    %s\n", symbols[nsyms + i]->tag);
       fputs ("\n\n", out);
     }
 
@@ -333,7 +332,7 @@ reduce_output (FILE *out)
           if (!b)
             fprintf (out, "%s\n\n", _("Terminals unused in grammar"));
           b = true;
-          fprintf (out, "   %s\n", symbols[i]->tag);
+          fprintf (out, "    %s\n", symbols[i]->tag);
         }
     if (b)
       fputs ("\n\n", out);
@@ -378,23 +377,23 @@ reduce_grammar (void)
   inaccessable_symbols ();
 
   /* Did we reduce something? */
-  if (!nuseless_nonterminals && !nuseless_productions)
-    return;
-
-  reduce_print ();
-
-  if (!bitset_test (N, accept->content->number - ntokens))
-    complain (&startsymbol_location, fatal,
-              _("start symbol %s does not derive any sentence"),
-              startsymbol->tag);
-
-  /* First reduce the nonterminals, as they renumber themselves in the
-     whole grammar.  If you change the order, nonterms would be
-     renumbered only in the reduced grammar.  */
-  if (nuseless_nonterminals)
-    nonterminals_reduce ();
-  if (nuseless_productions)
-    reduce_grammar_tables ();
+  if (nuseless_nonterminals || nuseless_productions)
+    {
+      reduce_print ();
+
+      if (!bitset_test (N, accept->content->number - ntokens))
+        complain (&startsymbol_loc, fatal,
+                  _("start symbol %s does not derive any sentence"),
+                  startsymbol->tag);
+
+      /* First reduce the nonterminals, as they renumber themselves in the
+         whole grammar.  If you change the order, nonterms would be
+         renumbered only in the reduced grammar.  */
+      if (nuseless_nonterminals)
+        nonterminals_reduce ();
+      if (nuseless_productions)
+        reduce_grammar_tables ();
+    }
 
   if (trace_flag & trace_grammar)
     {
diff --git a/contrib/tools/bison/src/reduce.h b/contrib/tools/bison/src/reduce.h
index 9814962d7607..e55bedb80b6f 100644
--- a/contrib/tools/bison/src/reduce.h
+++ b/contrib/tools/bison/src/reduce.h
@@ -1,6 +1,6 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 2000-2002, 2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2000-2002, 2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -36,7 +36,7 @@ void reduce_free (void);
  * reduce_grammar.  Size nvars + nuseless_nonterminals.  */
 extern symbol_number *nterm_map;
 
-extern unsigned nuseless_nonterminals;
-extern unsigned nuseless_productions;
+extern int nuseless_nonterminals;
+extern int nuseless_productions;
 
 #endif /* !REDUCE_H_ */
diff --git a/contrib/tools/bison/src/relation.c b/contrib/tools/bison/src/relation.c
index 4371501d47b4..e9c500860301 100644
--- a/contrib/tools/bison/src/relation.c
+++ b/contrib/tools/bison/src/relation.c
@@ -1,6 +1,6 @@
 /* Binary relations.
 
-   Copyright (C) 2002, 2004-2005, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2004-2005, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -27,19 +27,31 @@
 #include "relation.h"
 
 void
-relation_print (relation r, relation_node size, FILE *out)
+relation_print (const char *title,
+                relation r, relation_node size,
+                relation_node_print print, FILE *out)
 {
-  relation_node i;
-  relation_node j;
-
-  for (i = 0; i < size; ++i)
-    {
-      fprintf (out, "%3lu: ", (unsigned long) i);
-      if (r[i])
-        for (j = 0; r[i][j] != END_NODE; ++j)
-          fprintf (out, "%3lu ", (unsigned long) r[i][j]);
-      fputc ('\n', out);
-    }
+  if (title)
+    fprintf (out, "%s:\n", title);
+  for (relation_node i = 0; i < size; ++i)
+    if (r[i])
+      {
+        fputs ("    ", out);
+        if (print)
+          print (i, out);
+        else
+          fprintf (out, "%3ld", (long) i);
+        fputc (':', out);
+        for (relation_node j = 0; r[i][j] != END_NODE; ++j)
+          {
+            fputc (' ', out);
+            if (print)
+              print (r[i][j], out);
+            else
+              fprintf (out, "%3ld", (long) r[i][j]);
+          }
+        fputc ('\n', out);
+      }
   fputc ('\n', out);
 }
 
@@ -52,8 +64,8 @@ relation_print (relation r, relation_node size, FILE *out)
 `---------------------------------------------------------------*/
 
 static relation R;
-static relation_nodes INDEX;
-static relation_nodes VERTICES;
+static relation_nodes indexes;
+static relation_nodes vertices;
 static relation_node top;
 static relation_node infinity;
 static bitsetv F;
@@ -61,29 +73,26 @@ static bitsetv F;
 static void
 traverse (relation_node i)
 {
-  relation_node j;
-  relation_node height;
-
-  VERTICES[++top] = i;
-  INDEX[i] = height = top;
+  vertices[++top] = i;
+  relation_node height = indexes[i] = top;
 
   if (R[i])
-    for (j = 0; R[i][j] != END_NODE; ++j)
+    for (relation_node j = 0; R[i][j] != END_NODE; ++j)
       {
-        if (INDEX[R[i][j]] == 0)
+        if (indexes[R[i][j]] == 0)
           traverse (R[i][j]);
 
-        if (INDEX[i] > INDEX[R[i][j]])
-          INDEX[i] = INDEX[R[i][j]];
+        if (indexes[i] > indexes[R[i][j]])
+          indexes[i] = indexes[R[i][j]];
 
         bitset_or (F[i], F[i], F[R[i][j]]);
       }
 
-  if (INDEX[i] == height)
+  if (indexes[i] == height)
     for (;;)
       {
-        j = VERTICES[top--];
-        INDEX[j] = infinity;
+        relation_node j = vertices[top--];
+        indexes[j] = infinity;
 
         if (i == j)
           break;
@@ -94,26 +103,24 @@ traverse (relation_node i)
 
 
 void
-relation_digraph (relation r, relation_node size, bitsetv *function)
+relation_digraph (relation r, relation_node size, bitsetv function)
 {
-  relation_node i;
-
   infinity = size + 2;
-  INDEX = xcalloc (size + 1, sizeof *INDEX);
-  VERTICES = xnmalloc (size + 1, sizeof *VERTICES);
+  indexes = xcalloc (size + 1, sizeof *indexes);
+  vertices = xnmalloc (size + 1, sizeof *vertices);
   top = 0;
 
   R = r;
-  F = *function;
+  F = function;
 
-  for (i = 0; i < size; i++)
-    if (INDEX[i] == 0 && R[i])
+  for (relation_node i = 0; i < size; i++)
+    if (indexes[i] == 0 && R[i])
       traverse (i);
 
-  free (INDEX);
-  free (VERTICES);
+  free (indexes);
+  free (vertices);
 
-  *function = F;
+  function = F;
 }
 
 
@@ -122,32 +129,27 @@ relation_digraph (relation r, relation_node size, bitsetv *function)
 `-------------------------------------------*/
 
 void
-relation_transpose (relation *R_arg, relation_node n)
+relation_transpose (relation *R_arg, relation_node size)
 {
   relation r = *R_arg;
-  /* The result. */
-  relation new_R = xnmalloc (n, sizeof *new_R);
-  /* END_R[I] -- next entry of NEW_R[I]. */
-  relation end_R = xnmalloc (n, sizeof *end_R);
-  /* NEDGES[I] -- total size of NEW_R[I]. */
-  size_t *nedges = xcalloc (n, sizeof *nedges);
-  relation_node i;
-  relation_node j;
 
   if (trace_flag & trace_sets)
-    {
-      fputs ("relation_transpose: input\n", stderr);
-      relation_print (r, n, stderr);
-    }
+    relation_print ("relation_transpose", r, size, NULL, stderr);
 
   /* Count. */
-  for (i = 0; i < n; i++)
+  /* NEDGES[I] -- total size of NEW_R[I]. */
+  size_t *nedges = xcalloc (size, sizeof *nedges);
+  for (relation_node i = 0; i < size; i++)
     if (r[i])
-      for (j = 0; r[i][j] != END_NODE; ++j)
+      for (relation_node j = 0; r[i][j] != END_NODE; ++j)
         ++nedges[r[i][j]];
 
   /* Allocate. */
-  for (i = 0; i < n; i++)
+  /* The result. */
+  relation new_R = xnmalloc (size, sizeof *new_R);
+  /* END_R[I] -- next entry of NEW_R[I]. */
+  relation end_R = xnmalloc (size, sizeof *end_R);
+  for (relation_node i = 0; i < size; i++)
     {
       relation_node *sp = NULL;
       if (nedges[i] > 0)
@@ -160,24 +162,21 @@ relation_transpose (relation *R_arg, relation_node n)
     }
 
   /* Store. */
-  for (i = 0; i < n; i++)
+  for (relation_node i = 0; i < size; i++)
     if (r[i])
-      for (j = 0; r[i][j] != END_NODE; ++j)
+      for (relation_node j = 0; r[i][j] != END_NODE; ++j)
         *end_R[r[i][j]]++ = i;
 
   free (nedges);
   free (end_R);
 
   /* Free the input: it is replaced with the result. */
-  for (i = 0; i < n; i++)
+  for (relation_node i = 0; i < size; i++)
     free (r[i]);
   free (r);
 
   if (trace_flag & trace_sets)
-    {
-      fputs ("relation_transpose: output\n", stderr);
-      relation_print (new_R, n, stderr);
-    }
+    relation_print ("relation_transpose: output", new_R, size, NULL, stderr);
 
   *R_arg = new_R;
 }
diff --git a/contrib/tools/bison/src/relation.h b/contrib/tools/bison/src/relation.h
index e6b59ff8699b..143663934b61 100644
--- a/contrib/tools/bison/src/relation.h
+++ b/contrib/tools/bison/src/relation.h
@@ -1,6 +1,6 @@
 /* Binary relations.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -33,18 +33,23 @@ typedef size_t relation_node;
 typedef relation_node *relation_nodes;
 typedef relation_nodes *relation;
 
+typedef void (relation_node_print) (relation_node node, FILE* out);
 
 /* Report a relation R that has SIZE vertices.  */
-void relation_print (relation r, relation_node size, FILE *out);
+void relation_print (const char *title,
+                     relation r, size_t size,
+                     relation_node_print print, FILE *out);
 
 /* Compute the transitive closure of the FUNCTION on the relation R
    with SIZE vertices.
 
-   If R (NODE-1, NODE-2) then on exit FUNCTION[NODE - 1] was extended
-   (unioned) with FUNCTION[NODE - 2].  */
-void relation_digraph (relation r, relation_node size, bitsetv *function);
+   If R (NODE1, NODE2) then on exit FUNCTION[NODE1] was extended
+   (unioned) with FUNCTION[NODE2].
 
-/* Destructively transpose *R_ARG, of size N.  */
-void relation_transpose (relation *R_arg, relation_node n);
+   FUNCTION is in-out, R is read only.  */
+void relation_digraph (const relation r, relation_node size, bitsetv function);
+
+/* Destructively transpose *R_ARG, of size SIZE.  */
+void relation_transpose (relation *R_arg, relation_node size);
 
 #endif /* ! RELATION_H_ */
diff --git a/contrib/tools/bison/src/scan-code.c b/contrib/tools/bison/src/scan-code.c
index 39b16dc3fe68..99d287b31f2b 100644
--- a/contrib/tools/bison/src/scan-code.c
+++ b/contrib/tools/bison/src/scan-code.c
@@ -700,7 +700,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[91] =
+static const flex_int16_t yy_accept[82] =
     {   0,
         0,    0,    0,    0,    3,    3,    4,    4,    4,    4,
         0,    0,    0,    0,   19,   17,   16,   17,    2,   17,
@@ -708,9 +708,9 @@ static const flex_int16_t yy_accept[91] =
         1,    0,    0,    3,    4,    4,    4,    4,   12,    0,
        12,   12,    0,    0,    9,   10,    0,   13,    0,   13,
        13,    0,   14,    0,   15,    0,    0,    0,    0,    0,
-        0,    0,   12,    0,    0,    0,    0,    0,   13,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   12,    0,
-       12,   12,    0,   14,   12,   12,    0,    0,    0,    0
+        0,    0,   12,    0,    0,    0,    0,    0,    0,   13,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -747,89 +747,85 @@ static const YY_CHAR yy_ec[256] =
 
 static const YY_CHAR yy_meta[19] =
     {   0,
-        1,    1,    2,    1,    1,    1,    1,    3,    3,    1,
-        3,    1,    2,    1,    1,    1,    1,    2
+        1,    1,    1,    1,    1,    1,    1,    2,    2,    1,
+        2,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[97] =
+static const flex_int16_t yy_base[88] =
     {   0,
-        0,   13,  121,  120,    0,    3,    4,    5,    6,    7,
-       27,    0,   20,   21,  125,  178,  178,   26,  178,    8,
-      178,   41,  178,  178,   53,  178,   62,   74,   33,  119,
-      178,   37,   44,  105,  178,   46,  101,   48,  178,   99,
-        0,   96,   98,   91,  178,  178,   50,  178,   87,    0,
-       86,   87,  178,   76,  178,   52,   50,   68,   71,   73,
-       78,   74,    0,   16,   78,   84,   85,    0,    0,   94,
-       86,   96,   55,  107,    0,    0,   58,  118,  100,  124,
-      130,  136,  142,  106,   46,    0,  148,   43,    0,  178,
-      165,  168,    4,  171,    1,  174
-
+        0,   13,  101,  100,    0,    3,    4,    5,    6,    7,
+       27,    0,   20,   21,  104,  182,  182,   26,  182,    8,
+      182,   41,  182,  182,   53,  182,   62,   74,   33,   98,
+      182,   37,   44,   86,  182,   46,   85,   48,  182,   88,
+        0,   87,   87,   87,  182,  182,   50,  182,   83,    0,
+       82,   79,  182,  103,  182,   52,   50,   68,   71,   73,
+       78,   81,    0,  119,   64,   50,  130,   84,    0,    0,
+      140,  155,   43,   16,   79,   12,    0,    0,   54,    2,
+      182,  173,  175,    2,  177,    0,  179
     } ;
 
-static const flex_int16_t yy_def[97] =
+static const flex_int16_t yy_def[88] =
     {   0,
-       91,   91,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,   11,   11,   11,   90,   90,   90,   90,   90,   90,
-       90,   92,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       93,   90,   94,   90,   90,   90,   90,   90,   90,   95,
-       90,   90,   90,   96,   90,   90,   90,   90,   90,   90,
-       90,   92,   93,   94,   94,   90,   90,   27,   95,   90,
-       96,   96,   25,   94,   66,   70,   90,   96,   94,   94,
-       94,   94,   94,   96,   81,   81,   81,   87,   87,    0,
-       90,   90,   90,   90,   90,   90
-
+       82,   82,    2,    2,    2,    2,    2,    2,    2,    2,
+        2,   11,   11,   11,   81,   81,   81,   81,   81,   81,
+       81,   83,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       84,   81,   85,   81,   81,   81,   81,   81,   81,   86,
+       81,   81,   81,   87,   81,   81,   81,   81,   81,   81,
+       81,   83,   84,   85,   81,   64,   81,   81,   27,   86,
+       81,   87,   81,   72,   25,   25,   67,   71,   81,   81,
+        0,   81,   81,   81,   81,   81,   81
     } ;
 
-static const flex_int16_t yy_nxt[197] =
+static const flex_int16_t yy_nxt[201] =
     {   0,
-       90,   90,   19,   69,   17,   19,   63,   21,   21,   33,
+       81,   70,   19,   63,   17,   19,   53,   21,   21,   33,
        34,   23,   23,   17,   17,   20,   17,   17,   20,   22,
-       22,   22,   22,   65,   29,   29,   17,   17,   73,   17,
+       22,   22,   22,   81,   29,   29,   17,   17,   72,   17,
        24,   25,   26,   30,   30,   31,   27,   53,   56,   57,
        28,   32,   36,   37,   54,   33,   34,   59,   37,   61,
-       62,   67,   68,   56,   57,   74,   38,   39,   74,   31,
-       40,   41,   53,   42,   43,   32,   90,   44,   45,   33,
-       34,   46,   59,   37,   59,   37,   90,   47,   48,   61,
-       62,   49,   50,   72,   51,   65,   67,   68,   52,   38,
-       74,   75,   75,   72,   75,   70,   51,   51,   77,   66,
-
-       39,   76,   76,   72,   76,   65,   42,   65,   78,   42,
-       48,   79,   73,   72,   80,   81,   60,   82,   77,   73,
-       58,   83,   84,   55,   90,   72,   18,   18,   90,   90,
-       77,   65,   90,   90,   82,   90,   74,   85,   86,   90,
-       86,   90,   73,   65,   90,   90,   82,   90,   73,   65,
-       87,   90,   90,   90,   73,   88,   89,   90,   89,   90,
-       90,   90,   90,   90,   79,   16,   16,   16,   35,   35,
-       35,   64,   90,   64,   71,   90,   71,   15,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90
+       62,   68,   69,   56,   57,   80,   38,   39,   53,   31,
+       40,   41,   64,   42,   43,   32,   80,   44,   45,   33,
+       34,   46,   59,   37,   59,   37,   76,   47,   48,   61,
+       62,   49,   50,   81,   51,   68,   69,   71,   52,   65,
+       81,   76,   51,   51,   66,   67,   38,   42,   42,   65,
+
+       60,   58,   55,   81,   65,   73,   18,   18,   81,   81,
+       74,   81,   81,   81,   81,   73,   81,   81,   81,   81,
+       73,   65,   81,   81,   81,   81,   66,   81,   81,   81,
+       81,   75,   81,   81,   81,   81,   65,   77,   77,   81,
+       77,   81,   81,   81,   81,   81,   39,   78,   78,   81,
+       78,   81,   81,   81,   81,   81,   48,   73,   81,   81,
+       81,   81,   74,   81,   81,   81,   81,   79,   81,   81,
+       81,   81,   73,   16,   16,   35,   35,   64,   64,   72,
+       72,   15,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81
 
     } ;
 
-static const flex_int16_t yy_chk[197] =
+static const flex_int16_t yy_chk[201] =
     {   0,
-        0,    0,    5,   95,    1,    6,   93,    7,    8,   20,
+        0,   86,    5,   84,    1,    6,   80,    7,    8,   20,
        20,    9,   10,    1,    1,    5,    1,    2,    6,    7,
-        8,    9,   10,   64,   13,   14,    2,    2,   64,    2,
+        8,    9,   10,   76,   13,   14,    2,    2,   74,    2,
        11,   11,   11,   13,   14,   18,   11,   29,   32,   32,
        11,   18,   22,   22,   29,   33,   33,   36,   36,   38,
-       38,   47,   47,   56,   56,   88,   22,   25,   85,   57,
-       25,   25,   77,   25,   25,   57,   73,   25,   27,   58,
-       58,   27,   59,   59,   60,   60,   62,   27,   28,   61,
-       61,   28,   28,   54,   28,   65,   67,   67,   28,   62,
-       65,   66,   66,   71,   66,   52,   51,   49,   71,   44,
-
-       66,   70,   70,   72,   70,   43,   42,   79,   72,   40,
-       70,   74,   79,   84,   74,   74,   37,   74,   84,   74,
-       34,   74,   78,   30,   15,   78,    4,    3,    0,    0,
-       78,   80,    0,    0,   80,    0,   80,   81,   81,    0,
-       81,    0,   81,   82,    0,    0,   82,    0,   82,   83,
-       83,    0,    0,    0,   83,   87,   87,    0,   87,    0,
-        0,    0,    0,    0,   87,   91,   91,   91,   92,   92,
-       92,   94,    0,   94,   96,    0,   96,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90
+       38,   47,   47,   56,   56,   73,   22,   25,   79,   57,
+       25,   25,   66,   25,   25,   57,   79,   25,   27,   58,
+       58,   27,   59,   59,   60,   60,   65,   27,   28,   61,
+       61,   28,   28,   62,   28,   68,   68,   52,   28,   43,
+       75,   75,   51,   49,   43,   44,   62,   42,   40,   43,
+
+       37,   34,   30,   15,   43,   54,    4,    3,    0,    0,
+       54,    0,    0,    0,    0,   54,    0,    0,    0,    0,
+       54,   64,    0,    0,    0,    0,   64,    0,    0,    0,
+        0,   64,    0,    0,    0,    0,   64,   67,   67,    0,
+       67,    0,    0,    0,    0,    0,   67,   71,   71,    0,
+       71,    0,    0,    0,    0,    0,   71,   72,    0,    0,
+        0,    0,   72,    0,    0,    0,    0,   72,    0,    0,
+        0,    0,   72,   82,   82,   83,   83,   85,   85,   87,
+       87,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81
 
     } ;
 
@@ -841,8 +837,8 @@ int yy_flex_debug = 1;
 
 static const flex_int16_t yy_rule_linenum[18] =
     {   0,
-      115,  125,  126,  136,  141,  146,  152,  153,  154,  155,
-      157,  165,  171,  181,  189,  199,  202
+      116,  126,  127,  137,  142,  147,  153,  154,  155,  156,
+      158,  166,  172,  182,  190,  200,  203
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -856,7 +852,7 @@ char *yytext;
 #line 1 "/Users/akim/src/gnu/bison/src/scan-code.l"
 /* Bison Action Scanner                             -*- C -*-
 
-   Copyright (C) 2006-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2006-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -901,17 +897,18 @@ YY_DECL;
 #define YY_USER_ACTION  location_compute (loc, &loc->end, yytext, yyleng);
 
 static char *fetch_type_name (char *cp, char const **type_name,
-                              location dollar_loc);
+                              const location *dollar_loc);
 
 static void handle_action_dollar (symbol_list *rule, char *cp,
-                                  location dollar_loc);
-static void handle_action_at (symbol_list *rule, char *cp, location at_loc);
+                                  const location *dollar_loc);
+static void handle_action_at (symbol_list *rule, char *cp,
+                              const location *at_loc);
 
 /* A string to be pushed to obstack after dollar/at has been handled. */
 static char *ref_tail_fields;
 
-static location the_location;
-static location *loc = &the_location;
+static location current_loc;
+static location *loc = &current_loc;
 
 /* A string representing the most recent translation.  */
 static char *last_string;
@@ -919,8 +916,8 @@ static char *last_string;
 /* True if an untyped $$ or $n was seen.  */
 static bool untyped_var_seen;
 
-#line 922 "src/scan-code.c"
-#line 71 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 919 "src/scan-code.c"
+#line 72 "/Users/akim/src/gnu/bison/src/scan-code.l"
  /* C and C++ comments in code. */
 
  /* Strings and characters in code. */
@@ -937,7 +934,7 @@ static bool untyped_var_seen;
 /* C style identifier. Must start with letter. Will be used for
    named symbol references. Shall be kept synchronized with
    scan-gram.l "letter" and "id". */
-#line 940 "src/scan-code.c"
+#line 937 "src/scan-code.c"
 
 #define INITIAL 0
 #define SC_COMMENT 1
@@ -1221,7 +1218,7 @@ YY_DECL
 
 	{
 /* %% [7.0] user's declarations go here */
-#line 97 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 98 "/Users/akim/src/gnu/bison/src/scan-code.l"
 
 
 
@@ -1238,7 +1235,7 @@ YY_DECL
   | Scanning a C comment.  The initial '/ *' is already eaten.  |
   `------------------------------------------------------------*/
 
-#line 1241 "src/scan-code.c"
+#line 1238 "src/scan-code.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1267,13 +1264,13 @@ YY_DECL
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 91 )
+				if ( yy_current_state >= 82 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 90 );
+		while ( yy_current_state != 81 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
@@ -1317,7 +1314,7 @@ YY_DECL
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 115 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 116 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW; BEGIN sc_context;
 	YY_BREAK
 
@@ -1329,13 +1326,13 @@ STRING_GROW; BEGIN sc_context;
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 125 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 126 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW; BEGIN sc_context;
 	YY_BREAK
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 126 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 127 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW;
 	YY_BREAK
 
@@ -1347,7 +1344,7 @@ STRING_GROW;
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
-#line 136 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 137 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW;
 	YY_BREAK
 
@@ -1355,7 +1352,7 @@ STRING_GROW;
 
 case 5:
 YY_RULE_SETUP
-#line 141 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 142 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW; BEGIN sc_context;
 	YY_BREAK
 
@@ -1363,7 +1360,7 @@ STRING_GROW; BEGIN sc_context;
 
 case 6:
 YY_RULE_SETUP
-#line 146 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 147 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW; BEGIN sc_context;
 	YY_BREAK
 
@@ -1371,29 +1368,29 @@ STRING_GROW; BEGIN sc_context;
 
 case 7:
 YY_RULE_SETUP
-#line 152 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 153 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW; BEGIN SC_CHARACTER;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 153 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 154 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW; BEGIN SC_STRING;
 	YY_BREAK
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 154 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 155 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW; BEGIN SC_COMMENT;
 	YY_BREAK
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 155 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 156 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW; BEGIN SC_LINE_COMMENT;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 157 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 158 "/Users/akim/src/gnu/bison/src/scan-code.l"
 {
     complain (loc, Wother, _("stray '%s'"), yytext);
     obstack_escape (&obstack_for_string, yytext);
@@ -1403,21 +1400,22 @@ YY_RULE_SETUP
 
 
 case 12:
+/* rule 12 can match eol */
 YY_RULE_SETUP
-#line 165 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 166 "/Users/akim/src/gnu/bison/src/scan-code.l"
 {
     ref_tail_fields = NULL;
-    handle_action_dollar (self->rule, yytext, *loc);
+    handle_action_dollar (self->rule, yytext, loc);
     if (ref_tail_fields)
       obstack_sgrow (&obstack_for_string, ref_tail_fields);
   }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 171 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 172 "/Users/akim/src/gnu/bison/src/scan-code.l"
 {
     ref_tail_fields = NULL;
-    handle_action_at (self->rule, yytext, *loc);
+    handle_action_at (self->rule, yytext, loc);
     if (ref_tail_fields)
       obstack_sgrow (&obstack_for_string, ref_tail_fields);
   }
@@ -1426,11 +1424,12 @@ YY_RULE_SETUP
 
 
 case 14:
+/* rule 14 can match eol */
 YY_RULE_SETUP
-#line 181 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 182 "/Users/akim/src/gnu/bison/src/scan-code.l"
 {
     const char *type_name = NULL;
-    fetch_type_name (yytext + 1, &type_name, *loc)[-1] = 0;
+    fetch_type_name (yytext + 1, &type_name, loc)[-1] = 0;
     obstack_sgrow (&obstack_for_string, "]b4_dollar_dollar(");
     obstack_quote (&obstack_for_string, type_name);
     obstack_sgrow (&obstack_for_string, ")[");
@@ -1439,10 +1438,10 @@ YY_RULE_SETUP
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 189 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 190 "/Users/akim/src/gnu/bison/src/scan-code.l"
 {
     obstack_sgrow (&obstack_for_string, "]b4_at_dollar[");
-    muscle_percent_define_ensure("locations", the_location, true);
+    muscle_percent_define_ensure("locations", *loc, true);
   }
 	YY_BREAK
 
@@ -1451,14 +1450,14 @@ YY_RULE_SETUP
 /* Escape M4 quoting characters in C code.  */
 case 16:
 YY_RULE_SETUP
-#line 199 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 200 "/Users/akim/src/gnu/bison/src/scan-code.l"
 obstack_escape (&obstack_for_string, yytext);
 	YY_BREAK
 /* By default, grow the string obstack with the input.  */
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 202 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 203 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_GROW;
 	YY_BREAK
 /* End of processing. */
@@ -1469,16 +1468,16 @@ case YY_STATE_EOF(SC_STRING):
 case YY_STATE_EOF(SC_CHARACTER):
 case YY_STATE_EOF(SC_RULE_ACTION):
 case YY_STATE_EOF(SC_SYMBOL_ACTION):
-#line 205 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 206 "/Users/akim/src/gnu/bison/src/scan-code.l"
 STRING_FINISH; return last_string;
 	YY_BREAK
 
 case 18:
 YY_RULE_SETUP
-#line 208 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 209 "/Users/akim/src/gnu/bison/src/scan-code.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1481 "src/scan-code.c"
+#line 1480 "src/scan-code.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1797,7 +1796,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 91 )
+			if ( yy_current_state >= 82 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1830,11 +1829,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 91 )
+		if ( yy_current_state >= 82 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 90);
+	yy_is_jam = (yy_current_state == 81);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2583,7 +2582,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 208 "/Users/akim/src/gnu/bison/src/scan-code.l"
+#line 209 "/Users/akim/src/gnu/bison/src/scan-code.l"
 
 
 static inline bool
@@ -2595,14 +2594,14 @@ is_dot_or_dash (char ch)
 static inline bool
 contains_dot_or_dash (const char* p)
 {
-  return strpbrk(p, ".-");
+  return !!strpbrk (p, ".-");
 }
 
 /* Defines a variant of a symbolic name resolution. */
 typedef struct
 {
   /* Index in symbol list. */
-  unsigned symbol_index;
+  int symbol_index;
 
   /* Matched symbol id and loc. */
   uniqstr id;
@@ -2629,8 +2628,8 @@ typedef struct
 #define VARIANT_NOT_VISIBLE_FROM_MIDRULE (1 << 2)
 
 static variant *variant_table = NULL;
-static unsigned variant_table_size = 0;
-static unsigned variant_count = 0;
+static int variant_table_size = 0;
+static int variant_count = 0;
 
 static variant *
 variant_table_grow (void)
@@ -2665,7 +2664,7 @@ find_prefix_end (char const *prefix, char const *cp, char const *end)
 }
 
 static variant *
-variant_add (uniqstr id, location id_loc, unsigned symbol_index,
+variant_add (uniqstr id, location id_loc, int symbol_index,
              char const *cp, char const *cp_end, bool explicit_bracketing)
 {
   char const *prefix_end = find_prefix_end (id, cp, cp_end);
@@ -2686,7 +2685,7 @@ variant_add (uniqstr id, location id_loc, unsigned symbol_index,
 }
 
 static const char *
-get_at_spec(unsigned symbol_index)
+get_at_spec(int symbol_index)
 {
   static char at_buf[20];
   if (symbol_index == 0)
@@ -2700,7 +2699,7 @@ static void
 show_sub_message (warnings warning,
                   const char* cp, bool explicit_bracketing,
                   int midrule_rhs_index, char dollar_or_at,
-                  unsigned indent, const variant *var)
+                  int indent, const variant *var)
 {
   const char *at_spec = get_at_spec (var->symbol_index);
 
@@ -2764,9 +2763,9 @@ static void
 show_sub_messages (warnings warning,
                    const char* cp, bool explicit_bracketing,
                    int midrule_rhs_index, char dollar_or_at,
-                   unsigned indent)
+                   int indent)
 {
-  for (unsigned i = 0; i < variant_count; ++i)
+  for (int i = 0; i < variant_count; ++i)
     show_sub_message (warning | silent,
                       cp, explicit_bracketing,
                       midrule_rhs_index, dollar_or_at,
@@ -2786,7 +2785,7 @@ show_sub_messages (warnings warning,
    accesses. */
 static long
 parse_ref (char *cp, symbol_list *rule, int rule_length,
-           int midrule_rhs_index, char *text, location text_loc,
+           int midrule_rhs_index, char *text, const location *text_loc,
            char dollar_or_at)
 {
   if ('$' == *cp)
@@ -2799,7 +2798,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
         return num;
       else
         {
-          complain (&text_loc, complaint, _("integer out of range: %s"),
+          complain (text_loc, complaint, _("integer out of range: %s"),
                     quote (text));
           return INVALID_REF;
         }
@@ -2816,7 +2815,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
 
   /* Add all relevant variants. */
   {
-    unsigned symbol_index;
+    int symbol_index;
     symbol_list *l;
     variant_count = 0;
     for (symbol_index = 0, l = rule; !symbol_list_null (l);
@@ -2838,12 +2837,12 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
   }
 
   /* Check errors. */
-  unsigned valid_variants = 0;
-  unsigned valid_variant_index = 0;
-  for (unsigned i = 0; i < variant_count; ++i)
+  int valid_variants = 0;
+  int valid_variant_index = 0;
+  for (int i = 0; i < variant_count; ++i)
     {
       variant *var = &variant_table[i];
-      unsigned symbol_index = var->symbol_index;
+      int symbol_index = var->symbol_index;
 
       /* Check visibility from midrule actions. */
       if (midrule_rhs_index != 0
@@ -2869,16 +2868,16 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
     {
     case 0:
       {
-        unsigned len = (explicit_bracketing || !ref_tail_fields) ?
+        int len = (explicit_bracketing || !ref_tail_fields) ?
           cp_end - cp : ref_tail_fields - cp;
-        unsigned indent = 0;
+        int indent = 0;
 
-        complain_indent (&text_loc, complaint, &indent,
+        complain_indent (text_loc, complaint, &indent,
                          _("invalid reference: %s"), quote (text));
         indent += SUB_INDENT;
         if (len == 0)
           {
-            location sym_loc = text_loc;
+            location sym_loc = *text_loc;
             sym_loc.start.column += 1;
             sym_loc.end = sym_loc.start;
             complain_indent (&sym_loc, complaint, &indent,
@@ -2887,12 +2886,12 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
                              dollar_or_at);
           }
         else if (midrule_rhs_index)
-          complain_indent (&rule->location, complaint, &indent,
+          complain_indent (&rule->rhs_loc, complaint, &indent,
                            _("symbol not found in production before $%d: "
                              "%.*s"),
                            midrule_rhs_index, len, cp);
         else
-          complain_indent (&rule->location, complaint, &indent,
+          complain_indent (&rule->rhs_loc, complaint, &indent,
                            _("symbol not found in production: %.*s"),
                            len, cp);
 
@@ -2904,17 +2903,17 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
       }
     case 1:
       {
-        unsigned indent = 0;
+        int indent = 0;
         if (variant_count > 1)
           {
-            complain_indent (&text_loc, Wother, &indent,
+            complain_indent (text_loc, Wother, &indent,
                              _("misleading reference: %s"), quote (text));
             show_sub_messages (Wother,
                                cp, explicit_bracketing, midrule_rhs_index,
                                dollar_or_at, indent + SUB_INDENT);
           }
         {
-          unsigned symbol_index =
+          int symbol_index =
             variant_table[valid_variant_index].symbol_index;
           return (symbol_index == midrule_rhs_index) ? LHS_REF : symbol_index;
         }
@@ -2922,8 +2921,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
     case 2:
     default:
       {
-        unsigned indent = 0;
-        complain_indent (&text_loc, complaint, &indent,
+        int indent = 0;
+        complain_indent (text_loc, complaint, &indent,
                          _("ambiguous reference: %s"), quote (text));
         show_sub_messages (complaint,
                            cp, explicit_bracketing, midrule_rhs_index,
@@ -2946,7 +2945,7 @@ int max_left_semantic_context = 0;
 static
 char *
 fetch_type_name (char *cp, char const **type_name,
-                 location dollar_loc)
+                 const location *dollar_loc)
 {
   if (*cp == '<')
     {
@@ -2959,7 +2958,7 @@ fetch_type_name (char *cp, char const **type_name,
          'text' is needed for error messages. */
       ++cp;
       if (untyped_var_seen)
-        complain (&dollar_loc, complaint,
+        complain (dollar_loc, complaint,
                   _("explicit type given in untyped grammar"));
       tag_seen = true;
     }
@@ -2975,7 +2974,7 @@ fetch_type_name (char *cp, char const **type_name,
 `------------------------------------------------------------------*/
 
 static void
-handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
+handle_action_dollar (symbol_list *rule, char *text, const location *dollar_loc)
 {
   symbol_list *effective_rule;
   int effective_rule_length;
@@ -2996,7 +2995,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
   char *cp = fetch_type_name (text + 1, &type_name, dollar_loc);
   int n = parse_ref (cp, effective_rule, effective_rule_length,
                      rule->midrule_parent_rhs_index, text, dollar_loc, '$');
-  /* End type_name.  Don't do it ealier: parse_ref depends on TEXT.  */
+  /* End type_name.  Don't do it earlier: parse_ref depends on TEXT.  */
   if (type_name)
     cp[-1] = '\0';
 
@@ -3011,16 +3010,16 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
         if (!type_name
             && !sym->content.sym->content->type_name)
           {
-            if (union_seen | tag_seen)
+            if (union_seen || tag_seen)
               {
                 if (rule->midrule_parent_rule)
-                  complain (&dollar_loc, complaint,
+                  complain (dollar_loc, complaint,
                             _("$$ for the midrule at $%d of %s"
                               " has no declared type"),
                             rule->midrule_parent_rhs_index,
                             quote (effective_rule->content.sym->tag));
                 else
-                  complain (&dollar_loc, complaint,
+                  complain (dollar_loc, complaint,
                             _("$$ of %s has no declared type"),
                             quote (rule->content.sym->tag));
               }
@@ -3045,8 +3044,8 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
         if (!type_name
             && (!sym || !sym->content.sym->content->type_name))
           {
-            if (union_seen | tag_seen)
-              complain (&dollar_loc, complaint,
+            if (union_seen || tag_seen)
+              complain (dollar_loc, complaint,
                         _("$%s of %s has no declared type"), cp,
                         quote (effective_rule->content.sym->tag));
             else
@@ -3069,7 +3068,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
           {
             if (muscle_percent_define_ifdef ("api.value.automove")
                 && sym->action_props.is_value_used)
-              complain (&dollar_loc, Wother,
+              complain (dollar_loc, Wother,
                         _("multiple occurrences of $%d with api.value.automove"),
                         n);
             sym->action_props.is_value_used = true;
@@ -3086,7 +3085,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
 `------------------------------------------------------*/
 
 static void
-handle_action_at (symbol_list *rule, char *text, location at_loc)
+handle_action_at (symbol_list *rule, char *text, const location *at_loc)
 {
   symbol_list *effective_rule;
   int effective_rule_length;
@@ -3102,7 +3101,7 @@ handle_action_at (symbol_list *rule, char *text, location at_loc)
       effective_rule_length = symbol_list_length (rule->next);
     }
 
-  muscle_percent_define_ensure("locations", at_loc, true);
+  muscle_percent_define_ensure ("locations", *at_loc, true);
 
   int n = parse_ref (text + 1, effective_rule, effective_rule_length,
                      rule->midrule_parent_rhs_index, text, at_loc, '@');
@@ -3127,8 +3126,8 @@ handle_action_at (symbol_list *rule, char *text, location at_loc)
 | Initialize the scanner.  |
 `-------------------------*/
 
-/* Translate the dollars and ats in \a self, in the context \a sc_context
-   (SC_RULE_ACTION, SC_SYMBOL_ACTION, INITIAL).  */
+/* Translate the '$...' and '@...' in \a self, in the context \a
+   sc_context (SC_RULE_ACTION, SC_SYMBOL_ACTION, INITIAL).  */
 
 static char const *
 translate_action (code_props *self, int sc_context)
diff --git a/contrib/tools/bison/src/scan-code.h b/contrib/tools/bison/src/scan-code.h
index 483fe9ba56ce..06b6a73a1ecc 100644
--- a/contrib/tools/bison/src/scan-code.h
+++ b/contrib/tools/bison/src/scan-code.h
@@ -1,6 +1,6 @@
 /* Bison code properties structure and scanner.
 
-   Copyright (C) 2006-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2006-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/scan-gram.c b/contrib/tools/bison/src/scan-gram.c
index 49d954188727..a34ddb8f5f4f 100644
--- a/contrib/tools/bison/src/scan-gram.c
+++ b/contrib/tools/bison/src/scan-gram.c
@@ -691,8 +691,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
 	(yy_c_buf_p) = yy_cp;
 /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
-#define YY_NUM_RULES 129
-#define YY_END_OF_BUFFER 130
+#define YY_NUM_RULES 127
+#define YY_END_OF_BUFFER 128
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -700,495 +700,584 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[573] =
+static const flex_int16_t yy_accept[600] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   92,   92,  112,  112,  112,  112,    0,    0,
-        0,    0,  130,   79,    2,    2,   70,   79,   69,   79,
-        1,   65,   79,   66,   66,   64,   76,   62,   65,   78,
-       72,   63,   79,   89,   89,  127,   94,   93,  127,   80,
-       96,   95,   83,    2,    1,   83,   82,   81,   83,   98,
-       98,   99,   97,   80,  128,  118,  127,  117,  127,  127,
-      127,  121,  124,  125,  127,   91,  127,  116,  115,  127,
-      114,  113,   86,    2,    1,   84,   86,   86,   85,   86,
-
-       87,    2,    1,   87,   87,   79,   77,   61,    0,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   71,   65,   65,
-        4,    3,   68,   66,   68,    0,   75,    0,   88,  111,
-      109,  100,  111,  102,  103,  104,  105,  106,  107,  111,
-      108,  111,   98,   98,   99,  126,  119,  120,    0,  122,
-        0,  121,  123,    0,   90,    0,    0,   92,  112,  112,
-      112,  112,   86,   84,   61,    0,   73,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-
-       61,   61,   61,   61,   61,   61,   61,   61,    3,   68,
-       67,   74,    0,  100,    0,    0,  101,    0,    0,    0,
+        0,    0,   91,   91,  111,  111,  111,  111,    0,    0,
+        0,    0,  128,   78,    2,    2,    2,   69,   78,   68,
+       78,    1,   64,   78,   65,   65,   60,   63,   75,   61,
+       64,   77,   71,   62,   78,   88,   88,   88,  126,  126,
+       93,  126,   92,  126,  126,  126,  126,  126,  126,  126,
+      126,   79,   95,  126,   94,   82,    2,    2,    1,   82,
+       81,   80,   82,   97,   97,   98,   96,   79,  117,  126,
+      116,  126,  126,  126,  120,  123,  124,  126,   90,  126,
+
+      126,  115,  126,  114,  126,  113,  126,  112,   85,    2,
+        2,    1,   83,   85,   85,   84,   85,   86,    2,    2,
+        1,   86,   86,   78,    2,   76,   59,    0,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   70,   64,   64,    4,
+        3,   67,   65,   67,    0,   74,    0,   88,   87,   93,
+      110,  110,  108,   99,  110,  101,  102,  103,  104,  105,
+      106,  110,  107,  110,  126,    0,    0,    0,    0,    0,
+        0,   95,   97,   97,   98,  125,  118,  119,    0,  121,
+        0,  120,  122,    0,   89,    0,   90,    0,   91,    0,
+
+      115,  111,  111,  111,  111,  111,  113,   85,   83,   59,
+        0,    0,   72,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,    3,   67,   66,   73,    0,   99,
+        0,    0,  100,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,    0,  100,
-        0,    0,   61,    7,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   22,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-
-       61,   61,   34,   61,   61,   61,   61,   61,   61,   42,
-       61,   45,   61,   61,   48,    0,    0,    0,   61,    8,
-       61,   61,   61,   13,   14,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   25,   61,   61,   61,   61,   61,
-       61,   61,   30,   61,   32,   61,   61,   61,   61,   61,
-       61,   39,   61,   41,   43,   46,   61,    0,    0,  110,
-        6,   61,   10,   61,   61,   61,   15,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   31,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,    0,   61,   11,   61,   61,   61,   61,
-
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,    0,   58,   61,   61,
-       36,   61,   61,   38,   61,   61,   61,   47,    5,    0,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   21,   61,   61,   61,   61,   27,   61,   57,
-       28,   61,   61,   61,   61,   61,   40,   61,   61,    0,
-       61,   61,   61,   61,   61,   16,   53,   61,   61,   61,
-       61,   61,   23,   24,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,    0,    0,   61,   61,   12,   61,
-       61,   61,   61,   61,   20,   61,   61,   61,   61,   61,
-
-       61,   35,   61,   61,   61,   61,   61,   61,   61,   61,
-       17,   61,   61,   61,   50,   61,   61,   61,   33,   37,
-       59,   44,   60,    9,   51,   61,   61,    0,   54,   61,
-       61,   61,   50,   50,   61,   61,   61,   49,   52,   61,
-       61,   61,   50,   61,   61,   61,   61,   61,   19,   61,
-       61,   61,   61,   61,   26,   56,   61,   61,   61,   61,
-       61,   61,   61,   18,   55,   61,   61,   61,   61,   61,
-       29,    0
+        0,    0,    0,    0,    0,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,    0,   99,    0,    0,   59,    7,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   21,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   33,   59,   59,
+       59,   59,   59,   59,   40,   59,   43,   59,   59,   46,
+        0,    0,    0,   59,    8,   59,   59,   59,   13,   14,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   24,
+       59,   59,   59,   59,   59,   59,   59,   29,   59,   31,
+       59,   59,   59,   59,   59,   37,   59,   39,   41,   44,
+
+       59,    0,    0,  109,    6,   59,   10,   59,   59,   59,
+       15,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   30,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,    0,   59,   11,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   59,   59,   59,    0,   57,   59,
+       59,   35,   59,   36,   59,   59,   59,   45,    5,    0,
+        0,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   20,   59,   59,   59,   59,   26,   59,   56,
+       27,   59,   59,   59,   59,   38,   59,   59,    0,   59,
+
+       59,   59,   59,   59,   16,   52,   59,   59,   59,   59,
+       22,   23,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,    0,    0,   59,   59,   12,   59,   59,   59,   59,
+       19,   59,   59,   59,   59,   59,   59,   34,   59,   59,
+       59,    0,   59,   59,   59,   59,   17,   59,   59,   49,
+       59,   59,   59,   32,   47,   42,   58,    9,   50,   59,
+       59,    0,   53,   59,   59,   49,   49,   59,   59,   59,
+       48,   51,   59,   59,   49,   59,   59,   59,   59,   18,
+       59,   59,   59,   59,   25,   55,   59,   59,   59,   59,
+       59,   54,   59,   59,   59,   59,   59,   28,    0
+
     } ;
 
 static const YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        2,    2,    4,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    5,    1,    6,    7,    1,    8,    1,    9,    1,
-        1,   10,    1,   11,   12,   13,   14,   15,   16,   16,
-       16,   16,   16,   16,   16,   17,   17,   18,   19,   20,
-       21,   22,   23,    1,   24,   24,   24,   24,   24,   24,
-       25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-       25,   25,   25,   25,   26,   25,   25,   27,   25,   25,
-       28,   29,   30,    1,   31,    1,   32,   33,   34,   35,
-
-       36,   37,   38,   39,   40,   25,   41,   42,   43,   44,
-       45,   46,   47,   48,   49,   50,   51,   52,   25,   53,
-       54,   25,   55,   56,   57,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        4,    4,    5,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    6,    7,    8,    9,    7,   10,    7,   11,    7,
+        7,   12,    7,   13,   14,   15,   16,   17,   18,   18,
+       18,   18,   18,   18,   18,   19,   19,   20,   21,   22,
+       23,   24,   25,   26,   27,   27,   27,   27,   27,   27,
+       28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
+       28,   28,   28,   28,   29,   28,   28,   30,   28,   28,
+       31,   32,   33,   26,   34,   26,   35,   36,   37,   38,
+
+       39,   40,   41,   42,   43,   28,   44,   45,   46,   47,
+       48,   49,   50,   51,   52,   53,   54,   55,   28,   56,
+       57,   28,   58,   59,   60,   26,   61,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   63,   63,   63,   63,   63,   63,   63,
+       63,   63,   63,   63,   63,   63,   63,   63,   63,   64,
+       64,   64,   64,   64,   64,   64,   64,   64,   64,   64,
+       64,   64,   64,   64,   64,   64,   64,   64,   64,   64,
+       64,   64,   64,   64,   64,   64,   64,   64,   64,   64,
+       64,    1,    1,   65,   65,   65,   65,   65,   65,   65,
+
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
+       65,   65,   65,   66,   67,   67,   67,   67,   67,   67,
+       67,   67,   67,   67,   67,   67,   68,   67,   67,   69,
+       70,   70,   70,   71,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1
     } ;
 
-static const YY_CHAR yy_meta[59] =
+static const YY_CHAR yy_meta[73] =
     {   0,
-        1,    2,    3,    1,    2,    4,    1,    4,    4,    4,
-        4,    5,    6,    2,    7,    7,    7,    1,    4,    8,
-        4,    8,    1,    7,    9,    9,    9,   10,    1,   11,
-        9,    7,    7,    7,    7,    7,    7,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    4,    4,    4,    1
+        1,    2,    3,    2,    2,    2,    1,    4,    1,    4,
+        4,    4,    4,    5,    6,    2,    7,    7,    7,    8,
+        9,   10,    9,   10,    8,    8,    7,    7,    7,    7,
+       11,    8,   12,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    9,    9,    9,
+        8,    8,    8,    8,    1,    1,    1,    1,    1,    1,
+        1,    8
     } ;
 
-static const flex_int16_t yy_base[599] =
+static const flex_int16_t yy_base[618] =
     {   0,
-        0,  998,  994,  993,   56,   57,   58,   61,   63,   90,
-       76,   87,   70,   97,  117,  121,   66,  130,  140,  144,
-       79,  107,   99,  109,  153,  159,  148,  152,  201,  995,
-      182,  258, 1001,    0, 1006, 1006, 1006,  265, 1006, 1006,
-     1006,  320,  153,  313,  153, 1006,   61, 1006,  330, 1006,
-     1006, 1006,  958, 1006,  985, 1006, 1006, 1006,  383, 1006,
-     1006, 1006, 1006, 1006, 1006,  161, 1006, 1006,  956,  985,
-      110,  976, 1006,  983, 1006, 1006,  937, 1006,  169,  144,
-      254, 1006, 1006, 1006,  250, 1006,  187, 1006, 1006,  265,
-     1006, 1006,    0, 1006,    0,    0,  261, 1006, 1006,  951,
-
-     1006, 1006, 1006,  266,  950,    0, 1006,    0,  320,  951,
-      945,  241,  293,  949,  946,  943,  250,  950,  294,  934,
-      303,  245,  150,  311,  940,  947,  950, 1006,  436,    0,
-     1006,    0,    0,  346,  480,  959, 1006,  940, 1006, 1006,
-     1006,  342,    0, 1006, 1006, 1006, 1006, 1006, 1006,    0,
-     1006,    0,  967,  330,  958, 1006, 1006, 1006,  365, 1006,
-      369, 1006, 1006,  374, 1006,  378,  382,  948, 1006,  388,
-      947,  392,    0,    0,    0,  398, 1006,  931,  939,  374,
-      925,  926,  923,  924,  360,  921,  928,  923,  368,  932,
-      917,  921,  398,  927,  912,  913,  333,  912,  912,  920,
-
-      921,  924,  907,  913,  907,  912,  903,  916,    0,    0,
-        0, 1006,  905,  402,    0,    0,    0,  423,  431,  453,
-      410,  459,  443,  465,  390,  471,  475,  479,  483,  379,
-      916,  911,  895,   81,  895,  908,  893,  897,  905,  904,
-      903,  926,  887,  898,  885,  922,  901,  894,  895,  415,
-      448,  412,  882,  883,  420,  894,  883,  890,  874,  885,
-      881,  874,  878,  884,  883,  873,  884,  882,  879, 1006,
-        0,    0,  866,    0,  875,  861,  867,  862,  875,  854,
-      859,  872,  893,  869,  857,  862,  850,    0,  854,  849,
-      862,  333,  861,  856,  859,  854,  844,  856,  848,  839,
-
-      846,  852,  851,  836,  467,  845,  834,  847,  832,    0,
-      837,    0,  836,  834,    0,  873,    0,    0,  823,    0,
-      834,  839,  823,    0,    0,  475,  823,  826,  477,  839,
-      838,  837,  836,  827,    0,  820,  828,  820,  826,  818,
-      812,  810,    0,  809,    0,  846,  822,  820,  809,  808,
-      805,    0,  802,    0,  479,    0,  802,  484,    0, 1006,
-        0,  800,  800,  814,  795,  794,  480,  797,  799,  798,
-      794,  799,  802,  791,  793,  789,  804,  799,  802,  797,
-      787,  795,  516,  784,  793,  780,  795,  794,  789,  779,
-      773,  772,  785,  519,  495,    0,  770,  783,  782,  769,
-
-      768,  779,  763,  762,  763,  799,  774,  777,  764,  771,
-      755,  756,  753,  754,  768,  753,  525, 1006,  768,  755,
-        0,  750,  749,    0,  752,  763,  762,    0, 1006,  787,
-      746,  745,  745,  741,  740,  739,  738,  748,  734,  733,
-      746,  749,    0,  737,  730,  741,  735,    0,  734,    0,
-        0,  732,  726,  739,  723,  722,    0,  737,  736,  762,
-      719,  718,  717,  731,  730,    0,    0,  722,  715,  714,
-      711,  724,    0,    0,  717,  706,  705,  714,  721,  716,
-      715,  714,  707,  706,  741,  499,  710,  709,    0,  699,
-      698,  689,  690,  681,    0,  678,  663,  511,  513,  668,
-
-      664,    0,  654,  652,  663,  660,  661,  647,  612,  608,
-      536,  605,  601,  610,  545,  603,  600,  605,    0,    0,
-        0,    0,    0,    0,    0,  608,  607,  549, 1006,  531,
-      533,  595,  556,  569,  591,  590,  527,    0,    0,  538,
-      532,  524,  576,  531,  529,  513,  516,  515,    0,  499,
-      498,  491,  467,  461,    0,    0,  459,  439,  435,  434,
-      389,  381,  378,    0,    0,  390,  366,  347,  350,  307,
-        0, 1006,  581,  592,  603,  614,  625,  636,  647,  653,
-      662,  673,  684,  693,  699,  704,  713,  720,  286,  277,
-      259,  187,  179,  173,  135,  133,   87,  729
-
+        0, 1341,   68,   69,   81,  153,   85,   89,   99,  105,
+      102,  109,  157,  161,  231,  301,  179,  194,  371,  441,
+      195,  247,  241,  253,  266,  267,  273,  319,  513, 1340,
+      344,  362, 1348,    0, 1351, 1351, 1344, 1351,  576, 1351,
+     1351, 1351,  634,   63,  278,   59,    0, 1351,   71, 1351,
+        0, 1351, 1351, 1351, 1301, 1351, 1342, 1328, 1351, 1351,
+     1351, 1340, 1351,  702,   65, 1278,   75,   36,    0,  116,
+     1279, 1351, 1351, 1337, 1351, 1351, 1351, 1336, 1351,   75,
+     1351, 1351, 1293, 1323,  108, 1314, 1351, 1321, 1351, 1274,
+     1351,  143,  159,  255, 1351, 1351, 1351,  154, 1351, 1330,
+
+      338, 1351, 1329, 1351,  392, 1351, 1328, 1351,    0, 1351,
+     1327,    0,    0,  176, 1351, 1351, 1284, 1351, 1351, 1325,
+     1351,  192, 1282,    0, 1351, 1351,    0,  350, 1283, 1277,
+      157,  184, 1281, 1278, 1275,  253, 1282,  267, 1266,  177,
+      170,  201,  344, 1272, 1279, 1282, 1351,    0,    0, 1351,
+        0,    0,  318,  398, 1292, 1351, 1272, 1351, 1351, 1351,
+     1351, 1311, 1351,  117,  441, 1351, 1351, 1351, 1351, 1351,
+     1351,  447, 1351,  471, 1351,  322,  326,  342,  347,  350,
+      356, 1351, 1299,  224, 1290, 1351, 1351, 1351,  489, 1351,
+      590, 1351, 1351,  634, 1351,  712, 1351,  719, 1279, 1307,
+
+     1351, 1351,  741, 1277, 1305,  757, 1351,    0,    0,    0,
+      762, 1304, 1351, 1259, 1267,  228, 1253, 1254, 1251, 1252,
+       61, 1249, 1256, 1251,  254, 1260, 1245, 1249,  393, 1255,
+     1240, 1241,  243, 1240, 1240, 1248, 1249, 1252, 1235, 1241,
+     1235, 1240, 1231, 1244,    0,    0,    0, 1351, 1233,  123,
+      752,  758,  786,  359,  391,  407,  778,  416, 1276,  804,
+      294, 1275,  812,  348, 1274,  825,  284, 1273,  830,  835,
+     1272,  840,  845,  464, 1271, 1238, 1233, 1217,  286, 1217,
+     1230, 1215, 1219, 1227, 1226, 1225, 1249, 1209, 1220, 1207,
+     1245, 1223, 1216, 1217,  156,  245,  222, 1204, 1205,  279,
+
+     1216, 1205, 1212, 1196, 1207, 1203, 1196, 1200, 1206, 1205,
+     1195, 1206, 1204, 1201, 1351,  835,  841, 1188,    0, 1197,
+     1183, 1189, 1184, 1197, 1176, 1181, 1194, 1216, 1191, 1179,
+     1184, 1172,    0, 1176, 1171, 1184,  416, 1183, 1178, 1181,
+     1176, 1166, 1178, 1170, 1161, 1168, 1174, 1173, 1158,  427,
+     1167, 1156, 1169, 1154,    0, 1159,    0, 1158, 1156,    0,
+     1197,  865,  871, 1145,    0, 1156, 1161, 1145,    0,    0,
+      428, 1145, 1148,  573, 1161, 1160, 1159, 1158, 1149,    0,
+     1142, 1150, 1142, 1148, 1140, 1134, 1132,    0, 1131,    0,
+     1169, 1144, 1142, 1131, 1128,    0, 1125,    0,  574,    0,
+
+     1125,  485,  895, 1351,    0, 1123, 1123, 1137, 1118, 1117,
+      575, 1120, 1122, 1118, 1123, 1126, 1115, 1117, 1113, 1128,
+     1123, 1126, 1121, 1111, 1119,  913, 1108, 1117, 1104, 1119,
+     1114, 1104, 1098, 1097, 1110,  639,  678,    0, 1095, 1108,
+     1107, 1094, 1093, 1104, 1088, 1080, 1103, 1065, 1068, 1053,
+     1060, 1031,  999,  996,  997, 1010,  993,  921, 1351, 1008,
+      995,    0,  928,    0,  931,  942,  941,    0, 1351,  972,
+      966,  924,  923,  922,  918,  917,  916,  914,  924,  904,
+      917,  920,    0,  897,  890,  889,  883,    0,  876,    0,
+        0,  874,  848,  854,  835,    0,  850,  849,  861,  810,
+
+      806,  805,  819,  783,    0,    0,  769,  762,  751,  764,
+        0,    0,  757,  746,  733,  735,  739,  734,  733,  709,
+      707,  743,  594,  709,  702,    0,  692,  691,  680,  681,
+        0,  680,  676,  694,  695,  679,  665,    0,  643,  654,
+      626,  229,  618,  613,  595,  594,  935,  547,  555,  943,
+      541,  463,  462,    0,    0,    0,    0,    0,    0,  461,
+      458,  948, 1351,  716,  427,  957,  861,  421,  405,  395,
+        0,    0,  405,  392,  891,  387,  363,  347,  356,    0,
+      340,  335,  326,  318,    0,    0,  325,  293,  314,  255,
+      244,    0,  227,  192,  124,  124,   69,    0, 1351,  980,
+
+      992, 1004, 1016, 1028, 1040, 1047, 1050, 1057, 1063, 1075,
+     1087, 1097, 1104, 1107, 1114, 1122, 1129
     } ;
 
-static const flex_int16_t yy_def[599] =
+static const flex_int16_t yy_def[618] =
     {   0,
-      572,    1,  573,  573,  574,  574,  574,  574,  575,  575,
-      576,  576,  574,  574,  574,  574,  574,  574,  574,  574,
-      574,  574,  574,  574,  574,  574,  574,  574,  572,   29,
-      577,  577,  572,  578,  572,  572,  572,  572,  572,  572,
-      572,  579,  572,  580,  580,  572,  572,  572,  579,  572,
-      572,  572,  578,  572,  572,  572,  572,  572,  581,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  582,
-      582,  572,  572,  582,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  583,
-      572,  572,  584,  572,  584,  585,  572,  572,  572,  584,
-
-      572,  572,  572,  572,  572,  578,  572,  586,  572,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  572,  579,   49,
-      572,  587,  588,  580,  588,  572,  572,  572,  572,  572,
-      572,  572,  589,  572,  572,  572,  572,  572,  572,  590,
-      572,  591,  582,  582,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  584,  585,  586,  572,  572,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-
-      586,  586,  586,  586,  586,  586,  586,  586,  587,  588,
-      135,  572,  572,  572,  592,  593,  591,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  583,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  572,  572,
-      594,  595,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  572,  596,  597,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  572,  590,  572,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  572,  586,  586,  586,  586,  586,  586,
-
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  572,  572,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  572,  572,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  598,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  598,  598,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  572,  572,  586,
-      586,  586,  572,  572,  586,  586,  586,  586,  586,  586,
-      586,  586,  572,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,  586,  586,  586,  586,  586,  586,  586,  586,  586,
-      586,    0,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572
-
+      599,    1,  600,  600,  601,  601,    6,    6,  602,  602,
+      603,  603,    6,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,    6,    6,    6,  599,   29,
+      604,  604,  599,  605,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  606,  606,  605,  599,  599,  599,
+      607,  599,  599,  599,  605,  599,  599,  599,  599,  599,
+      599,  599,  599,  608,  599,  599,  599,  599,  609,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  610,  610,  599,  599,  610,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+
+      599,  599,  599,  599,  611,  599,  599,  599,  612,  599,
+      599,  612,  613,  599,  599,  599,  612,  599,  599,  599,
+      599,  599,  599,  605,  599,  599,  614,  599,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  599,   43,  607,  599,
+      615,  616,  606,  616,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  610,  610,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  612,  613,  614,
+      599,  599,  599,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  615,  616,  154,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  611,  599,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  599,  599,  599,  599,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      599,  599,  599,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+
+      614,  599,  599,  599,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  599,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  599,  599,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  599,  599,
+      599,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  617,  614,
+
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  617,  617,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  617,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  599,  599,  614,  614,  599,  599,  614,  614,  614,
+      614,  614,  614,  614,  599,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
+      614,  614,  614,  614,  614,  614,  614,  614,    0,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599
     } ;
 
-static const flex_int16_t yy_nxt[1065] =
+static const flex_int16_t yy_nxt[1424] =
     {   0,
-       34,   35,   36,   34,   35,   37,   34,   38,   39,   40,
-       41,   34,   42,   43,   44,   45,   45,   34,   46,   47,
-       48,   40,   34,   49,   49,   49,   49,   50,   34,   34,
-       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   51,   52,   40,   34,   57,   57,
-       61,   58,   58,   61,   64,   36,   62,   64,   75,   62,
-      136,   76,   75,   65,   78,   76,   66,   77,   78,   79,
-       67,   75,  137,   79,   59,   59,   59,   71,   85,   59,
-       68,   64,   36,  360,   64,   72,   69,   73,   71,   75,
-
-       65,   86,   76,   66,   77,   78,   72,   67,   73,   75,
-       79,   86,  276,   60,   60,   60,   85,   68,   60,   75,
-      277,  154,   76,   75,   80,   78,   76,   87,   80,   78,
-       79,  153,   75,   74,   79,   76,   81,   87,   78,  359,
-       81,  318,   75,   79,   74,   76,   75,   80,   78,   76,
-       91,   80,   78,   79,   91,   88,   92,   79,   89,   81,
-       92,   88,  131,   81,   89,  160,  132,  134,  134,  134,
-      131,   82,  161,   83,  132,   82,   90,   83,  157,  317,
-       90,   90,  158,  102,   36,  272,  102,   90,  167,  168,
-      201,  167,  103,  271,   82,  104,   84,  159,   82,  202,
-
-       84,   93,   94,   36,   93,   94,   93,   93,   93,   93,
-       93,   95,   93,   96,   97,   98,   98,   98,   93,   93,
-       93,   93,   93,   93,   96,   96,   96,   96,   93,   93,
-       99,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-       96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-       96,   96,   96,   96,   96,   93,   93,   93,   93,  102,
-       36,  162,  102,  165,  105,  217,  170,  171,  103,  170,
-      131,  104,  107,  163,  132,  131,  180,  108,  166,  132,
-      199,  188,  164,  216,  200,  189,  181,  109,  108,  108,
-      108,  108,  215,  172,  190,  108,  108,  110,  111,  112,
-
-      113,  114,  115,  108,  116,  108,  117,  118,  119,  120,
-      121,  108,  122,  123,  124,  125,  126,  108,  127,  128,
-      106,  176,  176,  106,  176,  192,  106,  134,  134,  134,
-      572,  129,  129,  572,  196,  182,  572,  106,  193,  135,
-      183,  154,  106,  194,  336,  184,  203,  572,  106,  106,
-      197,  153,  572,  198,  571,  204,  214,  214,  572,  572,
-      134,  134,  134,  336,  205,  135,  218,  219,  256,  218,
-      220,  221,  257,  220,  177,  222,  223,  106,  222,  224,
-      225,  572,  224,  167,  168,  570,  167,  572,  141,  227,
-      171,  141,  227,  229,  230,  569,  229,  142,  142,  176,
-
-      176,  240,  176,  165,  245,  141,  233,  172,  143,  250,
-      234,  141,  241,  568,  144,  145,  270,  270,  166,  146,
-      246,  567,  235,  566,  218,  219,  147,  218,  251,  565,
-      148,  160,  149,  150,  151,  152,  106,  564,  161,  106,
-      157,  252,  106,  297,  158,  563,  298,  129,  129,  293,
-      162,  301,  177,  106,  220,  221,  294,  220,  106,  159,
-      222,  223,  163,  222,  106,  106,  224,  225,  302,  224,
-      562,  164,  167,  168,  561,  167,  227,  171,  349,  227,
-      227,  171,  295,  227,  229,  230,  365,  229,  369,  296,
-      391,  400,  560,  106,  211,  211,  211,  350,  394,  394,
-
-      394,  429,  559,  211,  486,  366,  431,  370,  558,  392,
-      401,  211,  211,  211,  211,  211,  211,  417,  417,  417,
-      417,  429,  516,  430,  517,  432,  417,  417,  417,  417,
-      557,  556,  555,  394,  394,  394,  418,  528,  528,  528,
-      528,  517,  540,  517,  541,  418,  533,  533,  533,  533,
-      528,  528,  528,  528,  554,  553,  529,  533,  533,  533,
-      533,  541,  552,  541,  551,  534,  550,  549,  548,  529,
-      543,  543,  543,  543,  547,  546,  534,  543,  543,  543,
-      543,   54,   54,   54,   54,   54,   54,   54,   54,   54,
-       54,   54,   56,   56,   56,   56,   56,   56,   56,   56,
-
-       56,   56,   56,   63,   63,   63,   63,   63,   63,   63,
-       63,   63,   63,   63,   70,   70,   70,   70,   70,   70,
-       70,   70,   70,   70,   70,  101,  101,  101,  101,  101,
-      101,  101,  101,  101,  101,  101,  106,  545,  544,  542,
-      106,  106,  539,  538,  537,  536,  106,  130,  535,  532,
-      531,  130,  130,  130,  530,  130,  527,  130,  133,  133,
-      526,  133,  140,  140,  140,  140,  140,  140,  140,  140,
-      140,  140,  140,  153,  153,  153,  153,  153,  153,  153,
-      525,  153,  153,  153,  169,  169,  169,  169,  169,  169,
-      169,  169,  169,  173,  524,  523,  173,  173,  522,  521,
-
-      173,  520,  173,  174,  174,  174,  519,  174,  175,  175,
-      175,  518,  175,  209,  209,  515,  209,  209,  209,  209,
-      209,  209,  209,  209,  210,  210,  210,  514,  210,  485,
-      485,  513,  485,  485,  485,  485,  485,  485,  485,  485,
-      512,  511,  510,  509,  508,  507,  486,  506,  505,  504,
-      503,  502,  501,  500,  499,  498,  497,  496,  495,  494,
-      493,  492,  491,  490,  489,  488,  487,  486,  484,  483,
-      482,  481,  480,  479,  478,  477,  476,  475,  474,  473,
-      472,  471,  470,  469,  468,  467,  466,  465,  464,  463,
-      462,  461,  460,  459,  458,  457,  456,  455,  454,  453,
-
-      452,  451,  450,  449,  448,  447,  446,  445,  444,  443,
-      442,  441,  440,  439,  438,  437,  436,  435,  434,  433,
-      428,  427,  426,  425,  424,  423,  422,  421,  420,  419,
-      416,  415,  414,  413,  412,  411,  410,  409,  408,  407,
-      406,  405,  404,  403,  402,  399,  398,  397,  396,  395,
-      393,  390,  389,  388,  387,  386,  385,  384,  383,  382,
-      381,  380,  379,  378,  377,  376,  375,  374,  373,  372,
-      371,  368,  367,  364,  363,  362,  361,  358,  357,  356,
-      355,  354,  353,  352,  351,  348,  347,  346,  345,  344,
-      343,  342,  341,  340,  339,  338,  337,  335,  334,  333,
-
+       34,   35,   36,   35,   37,   35,   34,   38,   34,   39,
+       40,   41,   42,   34,   43,   44,   45,   46,   46,   47,
+       48,   49,   50,   41,   34,   34,   51,   51,   51,   51,
+       52,   34,   34,   51,   51,   51,   51,   51,   51,   51,
+       51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+       51,   51,   51,   51,   51,   51,   51,   53,   54,   41,
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,   34,   57,   57,  150,  153,  153,  153,  151,   58,
+       58,   59,  155,   61,   59,   62,  150,   73,   63,   74,
+      151,   73,   60,   74,  156,   75,   60,  178,  178,   75,
+
+       77,   36,   77,   78,   77,  285,   77,   36,   77,   78,
+       77,   79,   64,   83,   80,   85,  286,   79,   81,  598,
+       80,  184,   85,   86,   81,   87,  175,  175,  175,   82,
+       86,  183,   87,  250,  250,   82,  177,  177,  177,  315,
+      315,   59,   59,   59,   59,   65,   66,   67,   68,   69,
+       70,   71,   72,   59,  187,   61,   59,   62,  188,   59,
+       63,   60,  597,   59,   89,   60,   90,   91,   89,  195,
+       90,   91,   92,   88,  189,  596,   92,  180,  180,  180,
+       88,   59,  190,   60,   64,  196,   89,  150,   60,   91,
+      191,  151,   60,  338,   92,  216,   59,   59,   60,   60,
+
+      339,   89,   60,  150,   91,  217,   98,  151,  235,   92,
+       60,  232,  236,   59,   59,   59,   59,   65,   66,   67,
+       68,   69,   70,   71,   72,   60,   60,  233,   59,  218,
+      234,  469,   59,   59,  219,   60,  523,  184,   89,  220,
+       93,   91,  595,   99,  237,  100,   92,  183,   60,   59,
+       59,   60,   94,  238,   60,   99,  342,  100,   98,  343,
+       60,  594,   60,  278,  192,   59,   59,  279,  102,  102,
+      103,  103,  101,  104,  104,  106,  193,  107,   60,  280,
+       60,  301,  340,  108,  101,  302,  194,  224,   95,  341,
+       96,  225,  593,  290,  153,  153,  153,  105,  105,  195,
+
+      226,  228,   59,   59,  105,   60,  592,  154,   89,  291,
+       93,   91,   59,  346,  229,  196,   92,  190,   59,  230,
+      321,  106,   94,  107,   59,  191,   60,  591,  322,  108,
+      347,  590,   60,  154,  153,  153,  153,   59,   59,  198,
+      199,  198,  200,  198,   59,  119,   36,  119,  120,  119,
+      105,  211,  211,  211,  212,  211,  121,  192,   95,  122,
+       96,  589,  588,  119,   36,  119,  120,  119,  587,  193,
+      123,  586,   59,   59,  121,   60,  585,  122,   89,  194,
+       93,   91,  239,  175,  175,  175,   92,  175,  175,  175,
+       59,  240,   94,  203,  204,  203,  205,  203,  584,  583,
+
+      241,  582,   60,  175,  175,  175,  295,  213,  254,  254,
+      254,  255,  255,  255,  247,  247,  247,  256,  256,  256,
+      175,  175,  175,  206,  247,  581,  296,  187,   95,  381,
+       97,  188,  247,  247,  247,  247,  247,  247,  580,  297,
+      394,  409,   59,   59,  579,   60,  578,  189,   89,  381,
+       93,   91,  175,  175,  175,  577,   92,  251,  251,  251,
+      394,  410,   94,  252,  252,  252,  599,  251,  175,  175,
+      175,  576,   60,  252,  574,  251,  251,  251,  251,  251,
+      251,  252,  252,  252,  252,  252,  252,  253,  253,  253,
+      257,  258,  257,  259,  257,  206,  572,  253,   95,  571,
+
+       97,  436,  436,  436,  570,  253,  253,  253,  253,  253,
+      253,  569,   59,  109,  110,   36,  110,  111,  110,  109,
+      109,  109,  109,  109,  109,  112,  109,  113,  114,  115,
+      115,  115,  109,  109,  109,  109,  109,  109,  109,  113,
+      113,  113,  113,  109,  109,  116,  113,  113,  113,  113,
+      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
+      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
+      109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
+      109,  109,  109,  109,  109,  126,  413,  433,  442,  568,
+      127,  260,  261,  260,  262,  260,  469,  565,  542,  564,
+
+      128,  523,  127,  127,  127,  127,  413,  434,  443,  127,
+      127,  129,  130,  131,  132,  133,  134,  127,  135,  127,
+      136,  137,  138,  139,  140,  127,  141,  142,  143,  144,
+      145,  127,  146,  147,  124,  263,  264,  263,  265,  263,
+      124,  469,  124,  470,  471,  561,  560,  148,  148,  559,
+      149,  149,  149,  124,  558,  436,  436,  436,  124,  124,
+      149,  149,  149,  149,  557,  124,  124,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  472,  556,  555,  124,  124,  124,  124,  124,  124,
+
+      124,  124,  124,  124,  124,  124,  162,  551,  552,  163,
+      554,  473,  163,  266,  267,  266,  268,  266,  164,  164,
+      198,  199,  198,  200,  198,  553,  163,  552,  552,  573,
+      165,  550,  549,  163,  548,  547,  166,  167,  546,  545,
+      544,  168,  270,  204,  270,  271,  270,  543,  169,  573,
+      523,  541,  170,  540,  171,  172,  173,  174,  273,  274,
+      273,  275,  273,  211,  211,  211,  212,  211,  316,  316,
+      316,  539,  538,  537,  317,  317,  317,  536,  316,  257,
+      258,  257,  259,  257,  317,  535,  316,  316,  316,  316,
+      316,  316,  317,  317,  317,  317,  317,  317,  534,  533,
+
+      532,  531,  253,  253,  253,  260,  261,  260,  262,  260,
+      530,  529,  253,  263,  264,  263,  265,  263,  528,  213,
+      253,  253,  253,  253,  253,  253,  266,  267,  266,  268,
+      266,  198,  199,  198,  200,  198,  270,  204,  270,  271,
+      270,  270,  204,  270,  271,  270,  273,  274,  273,  275,
+      273,  362,  362,  362,  527,  526,  525,  363,  363,  363,
+      524,  362,  575,  575,  575,  575,  575,  363,  523,  362,
+      362,  362,  362,  362,  362,  363,  363,  363,  363,  363,
+      363,  403,  403,  403,  521,  520,  519,  404,  404,  404,
+      518,  403,  575,  575,  575,  575,  575,  404,  517,  403,
+
+      403,  403,  403,  403,  403,  404,  404,  404,  404,  404,
+      404,  252,  252,  252,  458,  458,  458,  458,  458,  516,
+      515,  252,  458,  458,  458,  458,  458,  514,  513,  252,
+      252,  252,  252,  252,  252,  459,  562,  562,  562,  562,
+      562,  512,  511,  459,  566,  566,  566,  566,  566,  562,
+      562,  562,  562,  562,  510,  509,  508,  563,  566,  566,
+      566,  566,  566,  507,  506,  567,  505,  504,  503,  502,
+      563,  501,  500,  499,  469,  498,  497,  496,  495,  567,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   60,   60,   60,   60,   60,   60,   60,   60,
+
+       60,   60,   60,   60,   76,   76,   76,   76,   76,   76,
+       76,   76,   76,   76,   76,   76,   84,   84,   84,   84,
+       84,   84,   84,   84,   84,   84,   84,   84,  118,  118,
+      118,  118,  118,  118,  118,  118,  118,  118,  118,  118,
+      124,  494,  493,  492,  124,  124,  491,  124,  490,  489,
+      488,  124,  152,  152,  149,  149,  149,  161,  161,  161,
+      161,  161,  161,  161,  161,  161,  161,  161,  161,  179,
+      179,  179,  179,  179,  179,  183,  183,  183,  183,  183,
+      183,  183,  183,  183,  487,  183,  183,  202,  202,  202,
+      202,  202,  202,  202,  202,  202,  202,  208,  486,  485,
+
+      208,  208,  484,  483,  208,  208,  208,  208,  209,  209,
+      209,  210,  210,  210,  245,  245,  482,  245,  245,  245,
+      245,  245,  245,  245,  245,  245,  246,  246,  246,  522,
+      522,  481,  522,  522,  522,  522,  522,  522,  522,  522,
+      522,  480,  479,  478,  477,  476,  475,  474,  468,  467,
+      466,  465,  464,  463,  462,  461,  460,  457,  456,  455,
+      454,  453,  452,  451,  450,  449,  448,  447,  446,  445,
+      444,  441,  440,  439,  438,  437,  435,  432,  431,  430,
+      429,  428,  427,  426,  425,  424,  423,  422,  421,  420,
+      419,  418,  417,  416,  415,  414,  412,  411,  408,  407,
+
+      406,  405,  402,  401,  400,  399,  398,  397,  396,  395,
+      393,  392,  391,  390,  389,  388,  387,  386,  385,  384,
+      383,  382,  380,  379,  378,  377,  376,  375,  374,  373,
+      372,  371,  370,  369,  368,  367,  366,  365,  364,  361,
+      360,  359,  358,  357,  356,  355,  354,  353,  352,  351,
+      350,  349,  348,  345,  344,  337,  336,  335,  334,  333,
       332,  331,  330,  329,  328,  327,  326,  325,  324,  323,
-      322,  321,  320,  319,  316,  315,  314,  313,  312,  311,
-      310,  309,  308,  307,  306,  305,  304,  303,  300,  299,
-      292,  291,  290,  289,  288,  287,  286,  285,  284,  283,
-      282,  281,  280,  279,  278,  275,  274,  273,  269,  268,
-      267,  266,  265,  264,  263,  262,  261,  260,  259,  258,
-      255,  254,  253,  249,  248,  247,  244,  243,  242,  239,
-      238,  237,  236,  232,  231,  228,  226,  155,  154,  213,
-      212,  208,  207,  206,  195,  191,  187,  186,  185,  179,
-      178,  138,  138,  156,  154,  155,  154,  138,  139,  138,
-
-      572,  100,   55,   55,   53,   33,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572
+      320,  319,  318,  274,  204,  267,  264,  261,  258,  314,
+      313,  312,  311,  310,  309,  308,  307,  306,  305,  304,
+      303,  300,  299,  298,  294,  293,  292,  289,  288,  287,
+
+      284,  283,  282,  281,  277,  276,  211,  204,  272,  199,
+      269,  185,  184,  161,  249,  248,  244,  243,  242,  231,
+      227,  223,  222,  221,  215,  214,  157,  125,  157,  125,
+      207,  201,  197,  186,  184,  185,  184,  157,  125,  182,
+      181,  176,  160,  159,  158,  157,  125,  599,  117,   55,
+       33,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599
     } ;
 
-static const flex_int16_t yy_chk[1065] =
+static const flex_int16_t yy_chk[1424] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    5,    6,
-        7,    5,    6,    8,    9,    9,    7,    9,   17,    8,
-       47,   17,   13,    9,   17,   13,    9,   13,   13,   17,
-        9,   21,   47,   13,    5,    6,    7,   11,   21,    8,
-        9,   10,   10,  597,   10,   11,   10,   11,   12,   14,
-
-       10,   23,   14,   10,   14,   14,   12,   10,   12,   22,
-       14,   24,  234,    5,    6,    7,   22,   10,    8,   15,
-      234,   71,   15,   16,   15,   15,   16,   23,   16,   16,
-       15,   71,   18,   11,   16,   18,   15,   24,   18,  596,
-       16,  595,   19,   18,   12,   19,   20,   19,   19,   20,
-       27,   20,   20,   19,   28,   25,   27,   20,   25,   19,
-       28,   26,   43,   20,   26,   80,   43,   45,   45,   45,
-       66,   15,   80,   15,   66,   16,   27,   16,   79,  594,
-       28,   25,   79,   31,   31,  593,   31,   26,   87,   87,
-      123,   87,   31,  592,   19,   31,   19,   79,   20,  123,
-
-       20,   29,   29,   29,   29,   29,   29,   29,   29,   29,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    3,    4,   44,   46,   46,   46,   44,    3,
+        4,    5,   49,    5,    5,    5,   80,    7,    5,    7,
+       80,    8,    7,    8,   49,    7,    8,   68,   68,    8,
+
+        9,    9,    9,    9,    9,  221,   10,   10,   10,   10,
+       10,    9,    5,   10,    9,   11,  221,   10,    9,  597,
+       10,   85,   12,   11,   10,   11,   65,   65,   65,    9,
+       12,   85,   12,  164,  164,   10,   67,   67,   67,  250,
+      250,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    6,   92,    6,    6,    6,   92,   13,
+        6,   13,  596,   14,   13,   14,   13,   13,   14,   98,
+       14,   14,   13,   11,   92,  595,   14,   70,   70,   70,
+       12,   17,   93,   17,    6,   98,   17,  114,   13,   17,
+       93,  114,   14,  295,   17,  131,   18,   21,   18,   21,
+
+      295,   18,   21,  122,   18,  131,   21,  122,  141,   18,
+       17,  140,  141,    6,    6,    6,    6,    6,    6,    6,
+        6,    6,    6,    6,    6,   18,   21,  140,   13,  132,
+      140,  542,   14,   15,  132,   15,  542,  184,   15,  132,
+       15,   15,  594,   23,  142,   23,   15,  184,   23,   22,
+       17,   22,   15,  142,   22,   24,  297,   24,   22,  297,
+       24,  593,   15,  216,   94,   18,   21,  216,   25,   26,
+       25,   26,   23,   25,   26,   27,   94,   27,   22,  216,
+       27,  233,  296,   27,   24,  233,   94,  136,   15,  296,
+       15,  136,  591,  225,   45,   45,   45,   25,   26,  267,
+
+      136,  138,   15,   16,   27,   16,  590,   45,   16,  225,
+       16,   16,   23,  300,  138,  267,   16,  261,   22,  138,
+      279,   28,   16,   28,   24,  261,   28,  589,  279,   28,
+      300,  588,   16,   45,  153,  153,  153,   25,   26,  101,
+      101,  101,  101,  101,   27,   31,   31,   31,   31,   31,
+       28,  128,  128,  128,  128,  128,   31,  264,   16,   31,
+       16,  587,  584,   32,   32,   32,   32,   32,  583,  264,
+       32,  582,   16,   19,   32,   19,  581,   32,   19,  264,
+       19,   19,  143,  176,  176,  176,   19,  177,  177,  177,
+       28,  143,   19,  105,  105,  105,  105,  105,  579,  578,
+
+      143,  577,   19,  178,  178,  178,  229,  128,  179,  179,
+      179,  180,  180,  180,  154,  154,  154,  181,  181,  181,
+      254,  254,  254,  105,  154,  576,  229,  258,   19,  337,
+       19,  258,  154,  154,  154,  154,  154,  154,  574,  229,
+      350,  371,   19,   20,  573,   20,  570,  258,   20,  337,
+       20,   20,  255,  255,  255,  569,   20,  165,  165,  165,
+      350,  371,   20,  172,  172,  172,  274,  165,  256,  256,
+      256,  568,   20,  172,  565,  165,  165,  165,  165,  165,
+      165,  172,  172,  172,  172,  172,  172,  174,  174,  174,
+      189,  189,  189,  189,  189,  274,  561,  174,   20,  560,
+
+       20,  402,  402,  402,  553,  174,  174,  174,  174,  174,
+      174,  552,   20,   29,   29,   29,   29,   29,   29,   29,
        29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
        29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
        29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
        29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   32,
-       32,   81,   32,   85,   32,  591,   90,   90,   32,   90,
-       97,   32,   38,   81,   97,  104,  112,   38,   85,  104,
-      122,  117,   81,  590,  122,  117,  112,   38,   38,   38,
-       38,   38,  589,   90,  117,   38,   38,   38,   38,   38,
-
-       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
-       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
-       42,  109,  109,   42,  109,  119,   42,   44,   44,   44,
-       49,   42,   42,   49,  121,  113,   49,   42,  119,   44,
-      113,  154,   42,  119,  292,  113,  124,   49,   42,   42,
-      121,  154,   49,  121,  570,  124,  142,  142,   49,   49,
-      134,  134,  134,  292,  124,   44,  159,  159,  197,  159,
-      161,  161,  197,  161,  109,  164,  164,   42,  164,  166,
-      166,  230,  166,  167,  167,  569,  167,   49,   59,  170,
-      170,   59,  170,  172,  172,  568,  172,   59,   59,  176,
-
-      176,  185,  176,  225,  189,   59,  180,  230,   59,  193,
-      180,   59,  185,  567,   59,   59,  214,  214,  225,   59,
-      189,  566,  180,  563,  218,  218,   59,  218,  193,  562,
-       59,  221,   59,   59,   59,   59,  129,  561,  221,  129,
-      219,  193,  129,  252,  219,  560,  252,  129,  129,  250,
-      223,  255,  176,  129,  220,  220,  250,  220,  129,  219,
-      222,  222,  223,  222,  129,  129,  224,  224,  255,  224,
-      559,  223,  226,  226,  558,  226,  227,  227,  305,  227,
-      228,  228,  251,  228,  229,  229,  326,  229,  329,  251,
-      355,  367,  557,  129,  135,  135,  135,  305,  358,  358,
-
-      358,  486,  554,  135,  486,  326,  395,  329,  553,  355,
-      367,  135,  135,  135,  135,  135,  135,  383,  383,  383,
-      383,  394,  498,  394,  499,  395,  417,  417,  417,  417,
-      552,  551,  550,  394,  394,  394,  383,  511,  511,  511,
-      511,  498,  530,  499,  531,  417,  515,  515,  515,  515,
-      528,  528,  528,  528,  548,  547,  511,  533,  533,  533,
-      533,  530,  546,  531,  545,  515,  544,  542,  541,  528,
-      534,  534,  534,  534,  540,  537,  533,  543,  543,  543,
-      543,  573,  573,  573,  573,  573,  573,  573,  573,  573,
-      573,  573,  574,  574,  574,  574,  574,  574,  574,  574,
-
-      574,  574,  574,  575,  575,  575,  575,  575,  575,  575,
-      575,  575,  575,  575,  576,  576,  576,  576,  576,  576,
-      576,  576,  576,  576,  576,  577,  577,  577,  577,  577,
-      577,  577,  577,  577,  577,  577,  578,  536,  535,  532,
-      578,  578,  527,  526,  518,  517,  578,  579,  516,  514,
-      513,  579,  579,  579,  512,  579,  510,  579,  580,  580,
-      509,  580,  581,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  581,  582,  582,  582,  582,  582,  582,  582,
-      508,  582,  582,  582,  583,  583,  583,  583,  583,  583,
-      583,  583,  583,  584,  507,  506,  584,  584,  505,  504,
-
-      584,  503,  584,  585,  585,  585,  501,  585,  586,  586,
-      586,  500,  586,  587,  587,  497,  587,  587,  587,  587,
-      587,  587,  587,  587,  588,  588,  588,  496,  588,  598,
-      598,  494,  598,  598,  598,  598,  598,  598,  598,  598,
-      493,  492,  491,  490,  488,  487,  485,  484,  483,  482,
-      481,  480,  479,  478,  477,  476,  475,  472,  471,  470,
-      469,  468,  465,  464,  463,  462,  461,  460,  459,  458,
-      456,  455,  454,  453,  452,  449,  447,  446,  445,  444,
-      442,  441,  440,  439,  438,  437,  436,  435,  434,  433,
-      432,  431,  430,  427,  426,  425,  423,  422,  420,  419,
-
-      416,  415,  414,  413,  412,  411,  410,  409,  408,  407,
-      406,  405,  404,  403,  402,  401,  400,  399,  398,  397,
-      393,  392,  391,  390,  389,  388,  387,  386,  385,  384,
-      382,  381,  380,  379,  378,  377,  376,  375,  374,  373,
-      372,  371,  370,  369,  368,  366,  365,  364,  363,  362,
-      357,  353,  351,  350,  349,  348,  347,  346,  344,  342,
-      341,  340,  339,  338,  337,  336,  334,  333,  332,  331,
-      330,  328,  327,  323,  322,  321,  319,  316,  314,  313,
-      311,  309,  308,  307,  306,  304,  303,  302,  301,  300,
-      299,  298,  297,  296,  295,  294,  293,  291,  290,  289,
-
-      287,  286,  285,  284,  283,  282,  281,  280,  279,  278,
-      277,  276,  275,  273,  269,  268,  267,  266,  265,  264,
-      263,  262,  261,  260,  259,  258,  257,  256,  254,  253,
-      249,  248,  247,  246,  245,  244,  243,  242,  241,  240,
-      239,  238,  237,  236,  235,  233,  232,  231,  213,  208,
-      207,  206,  205,  204,  203,  202,  201,  200,  199,  198,
-      196,  195,  194,  192,  191,  190,  188,  187,  186,  184,
-      183,  182,  181,  179,  178,  171,  168,  155,  153,  138,
-      136,  127,  126,  125,  120,  118,  116,  115,  114,  111,
-      110,  105,  100,   77,   74,   72,   70,   69,   55,   53,
-
-       33,   30,    4,    3,    2,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572,  572,  572,  572,  572,  572,  572,
-      572,  572,  572,  572
+       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
+       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
+       29,   29,   29,   29,   29,   39,  374,  399,  411,  551,
+       39,  191,  191,  191,  191,  191,  523,  549,  523,  548,
+
+       39,  523,   39,   39,   39,   39,  374,  399,  411,   39,
+       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
+       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
+       39,   39,   39,   39,   43,  194,  194,  194,  194,  194,
+       43,  436,   43,  436,  436,  546,  545,   43,   43,  544,
+       43,   43,   43,   43,  543,  436,  436,  436,   43,   43,
+       43,   43,   43,   43,  541,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+       43,  437,  540,  539,   43,   43,   43,   43,   43,   43,
+
+       43,   43,   43,   43,   43,   43,   64,  534,  535,   64,
+      537,  437,   64,  196,  196,  196,  196,  196,   64,   64,
+      198,  198,  198,  198,  198,  536,   64,  534,  535,  564,
+       64,  533,  532,   64,  530,  529,   64,   64,  528,  527,
+      525,   64,  203,  203,  203,  203,  203,  524,   64,  564,
+      522,  521,   64,  520,   64,   64,   64,   64,  206,  206,
+      206,  206,  206,  211,  211,  211,  211,  211,  251,  251,
+      251,  519,  518,  517,  252,  252,  252,  516,  251,  257,
+      257,  257,  257,  257,  252,  515,  251,  251,  251,  251,
+      251,  251,  252,  252,  252,  252,  252,  252,  514,  513,
+
+      510,  509,  253,  253,  253,  260,  260,  260,  260,  260,
+      508,  507,  253,  263,  263,  263,  263,  263,  504,  211,
+      253,  253,  253,  253,  253,  253,  266,  266,  266,  266,
+      266,  269,  269,  269,  269,  269,  270,  270,  270,  270,
+      270,  272,  272,  272,  272,  272,  273,  273,  273,  273,
+      273,  316,  316,  316,  503,  502,  501,  317,  317,  317,
+      500,  316,  567,  567,  567,  567,  567,  317,  499,  316,
+      316,  316,  316,  316,  316,  317,  317,  317,  317,  317,
+      317,  362,  362,  362,  498,  497,  495,  363,  363,  363,
+      494,  362,  575,  575,  575,  575,  575,  363,  493,  362,
+
+      362,  362,  362,  362,  362,  363,  363,  363,  363,  363,
+      363,  403,  403,  403,  426,  426,  426,  426,  426,  492,
+      489,  403,  458,  458,  458,  458,  458,  487,  486,  403,
+      403,  403,  403,  403,  403,  426,  547,  547,  547,  547,
+      547,  485,  484,  458,  550,  550,  550,  550,  550,  562,
+      562,  562,  562,  562,  482,  481,  480,  547,  566,  566,
+      566,  566,  566,  479,  478,  550,  477,  476,  475,  474,
+      562,  473,  472,  471,  470,  467,  466,  465,  463,  566,
+      600,  600,  600,  600,  600,  600,  600,  600,  600,  600,
+      600,  600,  601,  601,  601,  601,  601,  601,  601,  601,
+
+      601,  601,  601,  601,  602,  602,  602,  602,  602,  602,
+      602,  602,  602,  602,  602,  602,  603,  603,  603,  603,
+      603,  603,  603,  603,  603,  603,  603,  603,  604,  604,
+      604,  604,  604,  604,  604,  604,  604,  604,  604,  604,
+      605,  461,  460,  457,  605,  605,  456,  605,  455,  454,
+      453,  605,  606,  606,  607,  607,  607,  608,  608,  608,
+      608,  608,  608,  608,  608,  608,  608,  608,  608,  609,
+      609,  609,  609,  609,  609,  610,  610,  610,  610,  610,
+      610,  610,  610,  610,  452,  610,  610,  611,  611,  611,
+      611,  611,  611,  611,  611,  611,  611,  612,  451,  450,
+
+      612,  612,  449,  448,  612,  612,  612,  612,  613,  613,
+      613,  614,  614,  614,  615,  615,  447,  615,  615,  615,
+      615,  615,  615,  615,  615,  615,  616,  616,  616,  617,
+      617,  446,  617,  617,  617,  617,  617,  617,  617,  617,
+      617,  445,  444,  443,  442,  441,  440,  439,  435,  434,
+      433,  432,  431,  430,  429,  428,  427,  425,  424,  423,
+      422,  421,  420,  419,  418,  417,  416,  415,  414,  413,
+      412,  410,  409,  408,  407,  406,  401,  397,  395,  394,
+      393,  392,  391,  389,  387,  386,  385,  384,  383,  382,
+      381,  379,  378,  377,  376,  375,  373,  372,  368,  367,
+
+      366,  364,  361,  359,  358,  356,  354,  353,  352,  351,
+      349,  348,  347,  346,  345,  344,  343,  342,  341,  340,
+      339,  338,  336,  335,  334,  332,  331,  330,  329,  328,
+      327,  326,  325,  324,  323,  322,  321,  320,  318,  314,
+      313,  312,  311,  310,  309,  308,  307,  306,  305,  304,
+      303,  302,  301,  299,  298,  294,  293,  292,  291,  290,
+      289,  288,  287,  286,  285,  284,  283,  282,  281,  280,
+      278,  277,  276,  275,  271,  268,  265,  262,  259,  249,
+      244,  243,  242,  241,  240,  239,  238,  237,  236,  235,
+      234,  232,  231,  230,  228,  227,  226,  224,  223,  222,
+
+      220,  219,  218,  217,  215,  214,  212,  205,  204,  200,
+      199,  185,  183,  162,  157,  155,  146,  145,  144,  139,
+      137,  135,  134,  133,  130,  129,  123,  120,  117,  111,
+      107,  103,  100,   90,   88,   86,   84,   83,   78,   74,
+       71,   66,   62,   58,   57,   55,   37,   33,   30,    2,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599,  599,  599,  599,  599,  599,  599,  599,
+      599,  599,  599
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1197,22 +1286,22 @@ static char *yy_last_accepting_cpos;
 extern int yy_flex_debug;
 int yy_flex_debug = 1;
 
-static const flex_int16_t yy_rule_linenum[129] =
+static const flex_int16_t yy_rule_linenum[127] =
     {   0,
-      190,  193,  194,  195,  203,  221,  222,  223,  224,  225,
-      226,  227,  228,  229,  230,  231,  232,  233,  234,  235,
-      236,  237,  238,  239,  240,  241,  242,  243,  244,  245,
-      246,  247,  248,  249,  250,  251,  252,  253,  254,  255,
-      256,  257,  258,  259,  260,  261,  262,  263,  267,  271,
-      274,  275,  276,  277,  278,  279,  280,  281,  282,  283,
-      285,  289,  290,  291,  293,  300,  301,  305,  310,  313,
-      316,  319,  327,  334,  335,  336,  342,  349,  356,  376,
-      386,  401,  406,  425,  438,  454,  469,  486,  487,  498,
-      509,  510,  522,  531,  541,  560,  572,  586,  587,  598,
-
-      608,  618,  619,  620,  621,  622,  623,  624,  627,  629,
-      637,  655,  660,  661,  667,  668,  679,  685,  691,  697,
-      713,  714,  718,  725,  741,  761,  792,  793
+      198,  201,  202,  203,  209,  227,  228,  229,  230,  231,
+      232,  233,  234,  235,  236,  237,  238,  239,  240,  241,
+      242,  243,  244,  245,  246,  247,  248,  249,  250,  251,
+      252,  253,  254,  255,  256,  257,  258,  259,  260,  261,
+      262,  263,  264,  265,  266,  267,  271,  275,  279,  282,
+      283,  284,  285,  286,  287,  288,  289,  290,  292,  296,
+      297,  298,  299,  301,  308,  309,  313,  318,  321,  324,
+      327,  335,  342,  343,  344,  350,  357,  364,  384,  394,
+      409,  415,  434,  447,  463,  478,  495,  496,  507,  518,
+      519,  531,  540,  550,  569,  581,  595,  596,  607,  617,
+
+      627,  628,  629,  630,  631,  632,  633,  636,  638,  646,
+      664,  669,  670,  676,  677,  688,  694,  700,  706,  722,
+      723,  727,  734,  750,  770,  809
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -1226,7 +1315,7 @@ char *yytext;
 #line 1 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 /* Bison Grammar Scanner                             -*- C -*-
 
-   Copyright (C) 2002-2015, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015, 2018-2020 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -1244,6 +1333,8 @@ char *yytext;
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define YY_NO_INPUT 1
 #line 24 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#include <errno.h>
+
 #include <c-ctype.h>
 #include <mbswidth.h>
 #include <quote.h>
@@ -1272,9 +1363,6 @@ static boundary scanner_cursor;
 
 #define YY_USER_ACTION  location_compute (loc, &scanner_cursor, yytext, yyleng);
 
-static size_t no_cr_read (FILE *, char *, size_t);
-#define YY_INPUT(buf, result, size) ((result) = no_cr_read (yyin, buf, size))
-
 /* Report that yytext is an extension, and evaluate to its token type.  */
 #define BISON_DIRECTIVE(Directive)                              \
   (bison_directive (loc, yytext), PERCENT_ ## Directive)
@@ -1294,6 +1382,7 @@ static size_t no_cr_read (FILE *, char *, size_t);
 #define ROLLBACK_CURRENT_TOKEN                                  \
   do {                                                          \
     scanner_cursor.column -= mbsnwidth (yytext, yyleng, 0);     \
+    scanner_cursor.byte -= yyleng;                              \
     yyless (0);                                                 \
   } while (0)
 
@@ -1301,10 +1390,14 @@ static size_t no_cr_read (FILE *, char *, size_t);
   do {                                                          \
     deprecated_directive (loc, yytext, Msg);                    \
     scanner_cursor.column -= mbsnwidth (Msg, strlen (Msg), 0);  \
+    scanner_cursor.byte -= strlen (Msg);                        \
     for (size_t i = strlen (Msg); i != 0; --i)                  \
       unput (Msg[i - 1]);                                       \
   } while (0)
 
+/* The current file name.  Might change with #line.  */
+static uniqstr current_file = NULL;
+
 /* A string representing the most recently saved token.  */
 static char *last_string = NULL;
 
@@ -1321,13 +1414,13 @@ gram_scanner_last_string_free (void)
 }
 
 static void handle_syncline (char *, location);
-static unsigned long scan_integer (char const *p, int base, location loc);
+static int scan_integer (char const *p, int base, location loc);
 static int convert_ucn_to_byte (char const *hex_text);
 static void unexpected_eof (boundary, char const *);
 static void unexpected_newline (boundary, char const *);
 
-#line 1329 "src/scan-gram.c"
-#line 108 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 1422 "src/scan-gram.c"
+#line 112 "/Users/akim/src/gnu/bison/src/scan-gram.l"
  /* A C-like comment in directives/rules. */
 
  /* Strings and characters in directives/rules. */
@@ -1353,11 +1446,12 @@ static void unexpected_newline (boundary, char const *);
 
  /* Bracketed identifiers support. */
 
+ /* UTF-8 Encoded Unicode Code Point, from Flex's documentation. */
 /* Zero or more instances of backslash-newline.  Following GCC, allow
    white space between the backslash and the newline.  */
 /* An equal sign, with optional leading whitespaces. This is used in some
    deprecated constructs. */
-#line 1360 "src/scan-gram.c"
+#line 1454 "src/scan-gram.c"
 
 #define INITIAL 0
 #define SC_YACC_COMMENT 1
@@ -1655,7 +1749,7 @@ YY_DECL
 
 	{
 /* %% [7.0] user's declarations go here */
-#line 151 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 159 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 
 
   /* Nesting level.  Either for nested braces, or nested angle brackets
@@ -1666,7 +1760,7 @@ YY_DECL
   int context_state PACIFY_CC (= 0);
 
   /* Location of most recent identifier, when applicable.  */
-  location id_loc PACIFY_CC (= empty_location);
+  location id_loc PACIFY_CC (= empty_loc);
 
   /* Where containing code started, when applicable.  Its initial
      value is relevant only when yylex is invoked in the SC_EPILOGUE
@@ -1692,7 +1786,7 @@ YY_DECL
   | Scanning white space.  |
   `-----------------------*/
 
-#line 1695 "src/scan-gram.c"
+#line 1789 "src/scan-gram.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1722,13 +1816,13 @@ YY_DECL
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 573 )
+				if ( yy_current_state >= 600 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 572 );
+		while ( yy_current_state != 599 );
 		yy_cp = (yy_last_accepting_cpos);
 		yy_current_state = (yy_last_accepting_state);
 
@@ -1747,13 +1841,13 @@ YY_DECL
 			{
 			if ( yy_act == 0 )
 				fprintf( stderr, "--scanner backing up\n" );
-			else if ( yy_act < 129 )
+			else if ( yy_act < 127 )
 				fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
 				         (long)yy_rule_linenum[yy_act], yytext );
-			else if ( yy_act == 129 )
+			else if ( yy_act == 127 )
 				fprintf( stderr, "--accepting default rule (\"%s\")\n",
 				         yytext );
-			else if ( yy_act == 130 )
+			else if ( yy_act == 128 )
 				fprintf( stderr, "--(end of buffer or a NUL)\n" );
 			else
 				fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
@@ -1772,35 +1866,33 @@ YY_DECL
 /* Comments and white space.  */
 case 1:
 YY_RULE_SETUP
-#line 190 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 198 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
      complain (loc, Wother, _("stray ',' treated as white space"));
   }
 	YY_BREAK
 case 2:
 /* rule 2 can match eol */
-#line 194 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 202 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
-#line 194 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 202 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 continue;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 195 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 203 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     token_start = loc->start;
     context_state = YY_START;
     BEGIN SC_YACC_COMMENT;
   }
 	YY_BREAK
-/* #line directives are not documented, and may be withdrawn or
-     modified in future versions of Bison.  */
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 203 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 209 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     handle_syncline (yytext + sizeof "#line " - 1, *loc);
   }
@@ -1818,312 +1910,309 @@ YY_RULE_SETUP
 
 case 6:
 YY_RULE_SETUP
-#line 221 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 227 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (NONASSOC);
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 222 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 228 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (CODE);
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 223 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 229 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 RETURN_PERCENT_FLAG ("parse.trace");
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 224 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 230 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (DEFAULT_PREC);
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 225 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 231 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (DEFINE);
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 226 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 232 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (DEFINES);
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 227 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 233 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (DESTRUCTOR);
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 228 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 234 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (DPREC);
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 229 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 235 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (EMPTY);
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 230 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 236 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (EXPECT);
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 231 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 237 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return BISON_DIRECTIVE (EXPECT_RR);
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 232 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 238 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 RETURN_VALUE (PERCENT_FILE_PREFIX, uniqstr_new (yytext));
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 233 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-RETURN_VALUE (PERCENT_YACC, uniqstr_new (yytext));
+#line 239 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (INITIAL_ACTION);
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 234 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (INITIAL_ACTION);
+#line 240 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (GLR_PARSER);
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 235 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (GLR_PARSER);
+#line 241 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (LANGUAGE);
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 236 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (LANGUAGE);
+#line 242 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_LEFT;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 237 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return PERCENT_LEFT;
+#line 243 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+RETURN_PERCENT_PARAM (lex);
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 238 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-RETURN_PERCENT_PARAM (lex);
+#line 244 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+RETURN_PERCENT_FLAG ("locations");
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 239 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-RETURN_PERCENT_FLAG ("locations");
+#line 245 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (MERGE);
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 240 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (MERGE);
+#line 246 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (NO_DEFAULT_PREC);
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 241 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (NO_DEFAULT_PREC);
+#line 247 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (NO_LINES);
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 242 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (NO_LINES);
+#line 248 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_NONASSOC;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 243 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return PERCENT_NONASSOC;
+#line 249 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (NONDETERMINISTIC_PARSER);
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 244 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (NONDETERMINISTIC_PARSER);
+#line 250 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (NTERM);
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 245 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (NTERM);
+#line 251 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (OUTPUT);
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 246 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (OUTPUT);
+#line 252 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+RETURN_PERCENT_PARAM (both);
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 247 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-RETURN_PERCENT_PARAM (both);
+#line 253 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+RETURN_PERCENT_PARAM (parse);
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 248 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-RETURN_PERCENT_PARAM (parse);
+#line 254 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_PREC;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 249 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return PERCENT_PREC;
+#line 255 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (PRECEDENCE);
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 250 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (PRECEDENCE);
+#line 256 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (PRINTER);
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 251 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (PRINTER);
+#line 257 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (REQUIRE);
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 252 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-RETURN_PERCENT_FLAG ("api.pure");
+#line 258 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_RIGHT;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 253 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (REQUIRE);
+#line 259 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (SKELETON);
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 254 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return PERCENT_RIGHT;
+#line 260 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_START;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 255 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (SKELETON);
+#line 261 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (TOKEN);
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 256 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return PERCENT_START;
+#line 262 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_TOKEN;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 257 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (TOKEN);
+#line 263 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (TOKEN_TABLE);
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 258 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return PERCENT_TOKEN;
+#line 264 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_TYPE;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 259 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (TOKEN_TABLE);
+#line 265 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_UNION;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 260 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return PERCENT_TYPE;
+#line 266 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return BISON_DIRECTIVE (VERBOSE);
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 261 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return PERCENT_UNION;
+#line 267 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return PERCENT_YACC;
 	YY_BREAK
+/* Deprecated since Bison 2.3b (2008-05-27), but the warning is
+     issued only since Bison 3.4. */
 case 47:
 YY_RULE_SETUP
-#line 262 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-return BISON_DIRECTIVE (VERBOSE);
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 263 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-RETURN_VALUE (PERCENT_YACC, uniqstr_new (yytext));
+#line 271 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+RETURN_VALUE (PERCENT_PURE_PARSER, uniqstr_new (yytext));
 	YY_BREAK
 /* Deprecated since Bison 3.0 (2013-07-25), but the warning is
      issued only since Bison 3.3. */
-case 49:
+case 48:
 YY_RULE_SETUP
-#line 267 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 275 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 RETURN_VALUE (PERCENT_ERROR_VERBOSE, uniqstr_new (yytext));
 	YY_BREAK
 /* Deprecated since Bison 2.6 (2012-07-19), but the warning is
      issued only since Bison 3.3. */
-case 50:
-/* rule 50 can match eol */
+case 49:
+/* rule 49 can match eol */
 YY_RULE_SETUP
-#line 271 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 279 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 RETURN_VALUE (PERCENT_NAME_PREFIX, uniqstr_new (yytext));
 	YY_BREAK
 /* Deprecated since Bison 2.7.90, 2012. */
-case 51:
+case 50:
 YY_RULE_SETUP
-#line 274 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 282 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 DEPRECATED ("%default-prec");
 	YY_BREAK
-case 52:
+case 51:
 YY_RULE_SETUP
-#line 275 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 283 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 RETURN_VALUE (PERCENT_ERROR_VERBOSE, uniqstr_new (yytext));
 	YY_BREAK
-case 53:
+case 52:
 YY_RULE_SETUP
-#line 276 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 284 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 DEPRECATED ("%expect-rr");
 	YY_BREAK
-case 54:
-/* rule 54 can match eol */
+case 53:
+/* rule 53 can match eol */
 YY_RULE_SETUP
-#line 277 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 285 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 RETURN_VALUE (PERCENT_FILE_PREFIX, uniqstr_new (yytext));
 	YY_BREAK
-case 55:
+case 54:
 YY_RULE_SETUP
-#line 278 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-RETURN_VALUE (PERCENT_YACC, uniqstr_new (yytext));
+#line 286 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+DEPRECATED ("%output \"y.tab.c\"");
 	YY_BREAK
-case 56:
+case 55:
 YY_RULE_SETUP
-#line 279 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 287 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 DEPRECATED ("%no-default-prec");
 	YY_BREAK
-case 57:
+case 56:
 YY_RULE_SETUP
-#line 280 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 288 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 DEPRECATED ("%no-lines");
 	YY_BREAK
-case 58:
-/* rule 58 can match eol */
+case 57:
+/* rule 57 can match eol */
 YY_RULE_SETUP
-#line 281 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 289 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 DEPRECATED ("%output");
 	YY_BREAK
-case 59:
-YY_RULE_SETUP
-#line 282 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-DEPRECATED ("%pure-parser");
-	YY_BREAK
-case 60:
+case 58:
 YY_RULE_SETUP
-#line 283 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 290 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 DEPRECATED ("%token-table");
 	YY_BREAK
-case 61:
+case 59:
 YY_RULE_SETUP
-#line 285 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 292 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     complain (loc, complaint, _("invalid directive: %s"), quote (yytext));
   }
 	YY_BREAK
-case 62:
+case 60:
 YY_RULE_SETUP
-#line 289 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 296 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+return COLON;
+	YY_BREAK
+case 61:
+YY_RULE_SETUP
+#line 297 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return EQUAL;
 	YY_BREAK
-case 63:
+case 62:
 YY_RULE_SETUP
-#line 290 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 298 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return PIPE;
 	YY_BREAK
-case 64:
+case 63:
 YY_RULE_SETUP
-#line 291 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 299 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return SEMICOLON;
 	YY_BREAK
-case 65:
+case 64:
 YY_RULE_SETUP
-#line 293 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 301 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     val->ID = uniqstr_new (yytext);
     id_loc = *loc;
@@ -2131,47 +2220,47 @@ YY_RULE_SETUP
     BEGIN SC_AFTER_IDENTIFIER;
   }
 	YY_BREAK
-case 66:
+case 65:
 YY_RULE_SETUP
-#line 300 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 308 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 RETURN_VALUE (INT, scan_integer (yytext, 10, *loc));
 	YY_BREAK
-case 67:
+case 66:
 YY_RULE_SETUP
-#line 301 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 309 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 RETURN_VALUE (INT, scan_integer (yytext, 16, *loc));
 	YY_BREAK
 /* Identifiers may not start with a digit.  Yet, don't silently
      accept "1FOO" as "1 FOO".  */
-case 68:
+case 67:
 YY_RULE_SETUP
-#line 305 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 313 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     complain (loc, complaint, _("invalid identifier: %s"), quote (yytext));
   }
 	YY_BREAK
 /* Characters.  */
-case 69:
+case 68:
 YY_RULE_SETUP
-#line 310 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 318 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER;
 	YY_BREAK
 /* Strings. */
-case 70:
+case 69:
 YY_RULE_SETUP
-#line 313 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 321 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 token_start = loc->start; BEGIN SC_ESCAPED_STRING;
 	YY_BREAK
 /* Prologue. */
-case 71:
+case 70:
 YY_RULE_SETUP
-#line 316 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 324 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 code_start = loc->start; BEGIN SC_PROLOGUE;
 	YY_BREAK
 /* Code in between braces.  */
-case 72:
+case 71:
 YY_RULE_SETUP
-#line 319 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 327 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_GROW;
     nesting = 0;
@@ -2180,10 +2269,10 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 /* Semantic predicate. */
-case 73:
-/* rule 73 can match eol */
+case 72:
+/* rule 72 can match eol */
 YY_RULE_SETUP
-#line 327 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 335 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     nesting = 0;
     code_start = loc->start;
@@ -2191,28 +2280,28 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 /* A type. */
-case 74:
+case 73:
 YY_RULE_SETUP
-#line 334 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 342 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return TAG_ANY;
 	YY_BREAK
-case 75:
+case 74:
 YY_RULE_SETUP
-#line 335 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 343 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 return TAG_NONE;
 	YY_BREAK
-case 76:
+case 75:
 YY_RULE_SETUP
-#line 336 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 344 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     nesting = 0;
     token_start = loc->start;
     BEGIN SC_TAG;
   }
 	YY_BREAK
-case 77:
+case 76:
 YY_RULE_SETUP
-#line 342 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 350 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     static int percent_percent_count;
     if (++percent_percent_count == 2)
@@ -2220,9 +2309,9 @@ YY_RULE_SETUP
     return PERCENT_PERCENT;
   }
 	YY_BREAK
-case 78:
+case 77:
 YY_RULE_SETUP
-#line 349 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 357 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     bracketed_id_str = NULL;
     bracketed_id_start = loc->start;
@@ -2230,9 +2319,9 @@ YY_RULE_SETUP
     BEGIN SC_BRACKETED_ID;
   }
 	YY_BREAK
-case 79:
+case 78:
 YY_RULE_SETUP
-#line 356 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 364 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     complain (loc, complaint, "%s: %s",
               ngettext ("invalid character", "invalid characters", yyleng),
@@ -2240,7 +2329,7 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 362 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 370 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     loc->start = loc->end = scanner_cursor;
     yyterminate ();
@@ -2253,9 +2342,9 @@ case YY_STATE_EOF(INITIAL):
   `--------------------------------------------------------------*/
 
 
-case 80:
+case 79:
 YY_RULE_SETUP
-#line 376 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 384 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 complain (loc, complaint, _("invalid null character"));
 	YY_BREAK
 
@@ -2264,9 +2353,9 @@ complain (loc, complaint, _("invalid null character"));
   `-----------------------------------------------------------------*/
 
 
-case 81:
+case 80:
 YY_RULE_SETUP
-#line 386 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 394 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     if (bracketed_id_str)
       {
@@ -2283,18 +2372,19 @@ YY_RULE_SETUP
       }
   }
 	YY_BREAK
-case 82:
+case 81:
 YY_RULE_SETUP
-#line 401 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 409 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
+    ROLLBACK_CURRENT_TOKEN;
     BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
     *loc = id_loc;
     return ID_COLON;
   }
 	YY_BREAK
-case 83:
+case 82:
 YY_RULE_SETUP
-#line 406 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 415 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     ROLLBACK_CURRENT_TOKEN;
     BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
@@ -2303,7 +2393,7 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 case YY_STATE_EOF(SC_AFTER_IDENTIFIER):
-#line 412 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 421 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
     *loc = id_loc;
@@ -2316,9 +2406,9 @@ case YY_STATE_EOF(SC_AFTER_IDENTIFIER):
   `--------------------------------*/
 
 
-case 84:
+case 83:
 YY_RULE_SETUP
-#line 425 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 434 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     if (bracketed_id_str)
       {
@@ -2333,9 +2423,9 @@ YY_RULE_SETUP
       }
   }
 	YY_BREAK
-case 85:
+case 84:
 YY_RULE_SETUP
-#line 438 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 447 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     BEGIN bracketed_id_context_state;
     if (bracketed_id_str)
@@ -2352,9 +2442,9 @@ YY_RULE_SETUP
       complain (loc, complaint, _("an identifier expected"));
   }
 	YY_BREAK
-case 86:
+case 85:
 YY_RULE_SETUP
-#line 454 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 463 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     complain (loc, complaint, "%s: %s",
               ngettext ("invalid character in bracketed name",
@@ -2363,7 +2453,7 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 case YY_STATE_EOF(SC_BRACKETED_ID):
-#line 461 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 470 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     BEGIN bracketed_id_context_state;
     unexpected_eof (bracketed_id_start, "]");
@@ -2372,9 +2462,9 @@ case YY_STATE_EOF(SC_BRACKETED_ID):
 
 
 
-case 87:
+case 86:
 YY_RULE_SETUP
-#line 469 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 478 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     ROLLBACK_CURRENT_TOKEN;
     val->BRACKETED_ID = bracketed_id_str;
@@ -2390,19 +2480,19 @@ YY_RULE_SETUP
   `---------------------------------------------------------------*/
 
 
-case 88:
+case 87:
 YY_RULE_SETUP
-#line 486 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 495 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 BEGIN context_state;
 	YY_BREAK
-case 89:
-/* rule 89 can match eol */
+case 88:
+/* rule 88 can match eol */
 YY_RULE_SETUP
-#line 487 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 496 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 continue;
 	YY_BREAK
 case YY_STATE_EOF(SC_YACC_COMMENT):
-#line 488 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 497 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (token_start, "*/"); BEGIN context_state;
 	YY_BREAK
 
@@ -2411,14 +2501,14 @@ unexpected_eof (token_start, "*/"); BEGIN context_state;
   `------------------------------------------------------------*/
 
 
-case 90:
-/* rule 90 can match eol */
+case 89:
+/* rule 89 can match eol */
 YY_RULE_SETUP
-#line 498 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 507 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW; BEGIN context_state;
 	YY_BREAK
 case YY_STATE_EOF(SC_COMMENT):
-#line 499 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 508 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (token_start, "*/"); BEGIN context_state;
 	YY_BREAK
 
@@ -2427,20 +2517,20 @@ unexpected_eof (token_start, "*/"); BEGIN context_state;
   `--------------------------------------------------------------*/
 
 
-case 91:
-/* rule 91 can match eol */
+case 90:
+/* rule 90 can match eol */
 YY_RULE_SETUP
-#line 509 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 518 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW; BEGIN context_state;
 	YY_BREAK
-case 92:
-/* rule 92 can match eol */
+case 91:
+/* rule 91 can match eol */
 YY_RULE_SETUP
-#line 510 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 519 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW;
 	YY_BREAK
 case YY_STATE_EOF(SC_LINE_COMMENT):
-#line 511 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 520 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 BEGIN context_state;
 	YY_BREAK
 
@@ -2450,9 +2540,9 @@ BEGIN context_state;
   `------------------------------------------------*/
 
 
-case 93:
+case 92:
 YY_RULE_SETUP
-#line 522 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 531 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_FINISH;
     BEGIN INITIAL;
@@ -2463,13 +2553,13 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_STRING):
-#line 530 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 539 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (token_start, "\"");
 	YY_BREAK
-case 94:
-/* rule 94 can match eol */
+case 93:
+/* rule 93 can match eol */
 YY_RULE_SETUP
-#line 531 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 540 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_newline (token_start, "\"");
 	YY_BREAK
 
@@ -2479,9 +2569,9 @@ unexpected_newline (token_start, "\"");
   `----------------------------------------------------------*/
 
 
-case 95:
+case 94:
 YY_RULE_SETUP
-#line 541 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 550 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_FINISH;
     loc->start = token_start;
@@ -2502,14 +2592,14 @@ YY_RULE_SETUP
     return CHAR;
   }
 	YY_BREAK
-case 96:
-/* rule 96 can match eol */
+case 95:
+/* rule 95 can match eol */
 YY_RULE_SETUP
-#line 560 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 569 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_newline (token_start, "'");
 	YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_CHARACTER):
-#line 561 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 570 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (token_start, "'");
 	YY_BREAK
 
@@ -2518,9 +2608,9 @@ unexpected_eof (token_start, "'");
   `--------------------------------------------------------------*/
 
 
-case 97:
+case 96:
 YY_RULE_SETUP
-#line 572 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 581 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     --nesting;
     if (nesting < 0)
@@ -2535,19 +2625,19 @@ YY_RULE_SETUP
     STRING_GROW;
   }
 	YY_BREAK
-case 98:
-/* rule 98 can match eol */
+case 97:
+/* rule 97 can match eol */
 YY_RULE_SETUP
-#line 586 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 595 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW;
 	YY_BREAK
-case 99:
+case 98:
 YY_RULE_SETUP
-#line 587 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 596 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW; nesting += yyleng;
 	YY_BREAK
 case YY_STATE_EOF(SC_TAG):
-#line 589 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 598 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (token_start, ">");
 	YY_BREAK
 
@@ -2556,76 +2646,76 @@ unexpected_eof (token_start, ">");
   `----------------------------*/
 
 
-case 100:
+case 99:
 YY_RULE_SETUP
-#line 598 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 607 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     verify (UCHAR_MAX < ULONG_MAX);
-    unsigned long c = strtoul (yytext + 1, NULL, 8);
-    if (!c || UCHAR_MAX < c)
+    long c = strtol (yytext + 1, NULL, 8);
+    if (0 < c && c <= UCHAR_MAX)
+      obstack_1grow (&obstack_for_string, c);
+    else
       complain (loc, complaint, _("invalid number after \\-escape: %s"),
                 yytext+1);
-    else
-      obstack_1grow (&obstack_for_string, c);
   }
 	YY_BREAK
-case 101:
+case 100:
 YY_RULE_SETUP
-#line 608 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 617 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     verify (UCHAR_MAX < ULONG_MAX);
-    unsigned long c = strtoul (yytext + 2, NULL, 16);
-    if (!c || UCHAR_MAX < c)
+    long c = strtol (yytext + 2, NULL, 16);
+    if (0 < c && c <= UCHAR_MAX)
+      obstack_1grow (&obstack_for_string, c);
+    else
       complain (loc, complaint, _("invalid number after \\-escape: %s"),
                 yytext+1);
-    else
-      obstack_1grow (&obstack_for_string, c);
   }
 	YY_BREAK
-case 102:
+case 101:
 YY_RULE_SETUP
-#line 618 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 627 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 obstack_1grow (&obstack_for_string, '\a');
 	YY_BREAK
-case 103:
+case 102:
 YY_RULE_SETUP
-#line 619 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 628 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 obstack_1grow (&obstack_for_string, '\b');
 	YY_BREAK
-case 104:
+case 103:
 YY_RULE_SETUP
-#line 620 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 629 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 obstack_1grow (&obstack_for_string, '\f');
 	YY_BREAK
-case 105:
+case 104:
 YY_RULE_SETUP
-#line 621 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 630 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 obstack_1grow (&obstack_for_string, '\n');
 	YY_BREAK
-case 106:
+case 105:
 YY_RULE_SETUP
-#line 622 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 631 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 obstack_1grow (&obstack_for_string, '\r');
 	YY_BREAK
-case 107:
+case 106:
 YY_RULE_SETUP
-#line 623 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 632 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 obstack_1grow (&obstack_for_string, '\t');
 	YY_BREAK
-case 108:
+case 107:
 YY_RULE_SETUP
-#line 624 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 633 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 obstack_1grow (&obstack_for_string, '\v');
 	YY_BREAK
 /* \\[\"\'?\\] would be shorter, but it confuses xgettext.  */
-case 109:
+case 108:
 YY_RULE_SETUP
-#line 627 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 636 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 obstack_1grow (&obstack_for_string, yytext[1]);
 	YY_BREAK
-case 110:
+case 109:
 YY_RULE_SETUP
-#line 629 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 638 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     int c = convert_ucn_to_byte (yytext);
     if (c <= 0)
@@ -2635,10 +2725,10 @@ YY_RULE_SETUP
       obstack_1grow (&obstack_for_string, c);
   }
 	YY_BREAK
-case 111:
-/* rule 111 can match eol */
+case 110:
+/* rule 110 can match eol */
 YY_RULE_SETUP
-#line 637 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 646 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     char const *p = yytext + 1;
     /* Quote only if escaping won't make the character visible.  */
@@ -2656,46 +2746,46 @@ YY_RULE_SETUP
   `--------------------------------------------*/
 
 
-case 112:
-/* rule 112 can match eol */
+case 111:
+/* rule 111 can match eol */
 YY_RULE_SETUP
-#line 655 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 664 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW;
 	YY_BREAK
 
 
 
-case 113:
+case 112:
 YY_RULE_SETUP
-#line 660 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 669 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW; BEGIN context_state;
 	YY_BREAK
-case 114:
-/* rule 114 can match eol */
+case 113:
+/* rule 113 can match eol */
 YY_RULE_SETUP
-#line 661 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 670 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_newline (token_start, "'");
 	YY_BREAK
 case YY_STATE_EOF(SC_CHARACTER):
-#line 662 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 671 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (token_start, "'");
 	YY_BREAK
 
 
 
-case 115:
+case 114:
 YY_RULE_SETUP
-#line 667 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 676 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW; BEGIN context_state;
 	YY_BREAK
-case 116:
-/* rule 116 can match eol */
+case 115:
+/* rule 115 can match eol */
 YY_RULE_SETUP
-#line 668 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 677 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_newline (token_start, "\"");
 	YY_BREAK
 case YY_STATE_EOF(SC_STRING):
-#line 669 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 678 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (token_start, "\"");
 	YY_BREAK
 
@@ -2704,9 +2794,9 @@ unexpected_eof (token_start, "\"");
   `---------------------------------------------------*/
 
 
-case 117:
+case 116:
 YY_RULE_SETUP
-#line 679 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 688 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_GROW;
     context_state = YY_START;
@@ -2714,9 +2804,9 @@ YY_RULE_SETUP
     BEGIN SC_CHARACTER;
   }
 	YY_BREAK
-case 118:
+case 117:
 YY_RULE_SETUP
-#line 685 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 694 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_GROW;
     context_state = YY_START;
@@ -2724,10 +2814,10 @@ YY_RULE_SETUP
     BEGIN SC_STRING;
   }
 	YY_BREAK
-case 119:
-/* rule 119 can match eol */
+case 118:
+/* rule 118 can match eol */
 YY_RULE_SETUP
-#line 691 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 700 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_GROW;
     context_state = YY_START;
@@ -2735,10 +2825,10 @@ YY_RULE_SETUP
     BEGIN SC_COMMENT;
   }
 	YY_BREAK
-case 120:
-/* rule 120 can match eol */
+case 119:
+/* rule 119 can match eol */
 YY_RULE_SETUP
-#line 697 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 706 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_GROW;
     context_state = YY_START;
@@ -2752,37 +2842,37 @@ YY_RULE_SETUP
   `-----------------------------------------------------------*/
 
 
-case 121:
-/* rule 121 can match eol */
+case 120:
+/* rule 120 can match eol */
 YY_RULE_SETUP
-#line 713 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 722 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW; nesting++;
 	YY_BREAK
-case 122:
-/* rule 122 can match eol */
+case 121:
+/* rule 121 can match eol */
 YY_RULE_SETUP
-#line 714 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 723 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW; nesting--;
 	YY_BREAK
 /* Tokenize '<<%' correctly (as '<<' '%') rather than incorrectly
      (as '<' '<%').  */
-case 123:
-/* rule 123 can match eol */
+case 122:
+/* rule 122 can match eol */
 YY_RULE_SETUP
-#line 718 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 727 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW;
 	YY_BREAK
 case YY_STATE_EOF(SC_BRACED_CODE):
 case YY_STATE_EOF(SC_PREDICATE):
-#line 720 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 729 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (code_start, "}");
 	YY_BREAK
 
 
 
-case 124:
+case 123:
 YY_RULE_SETUP
-#line 725 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 734 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     obstack_1grow (&obstack_for_string, '}');
 
@@ -2799,9 +2889,9 @@ YY_RULE_SETUP
 
 
 
-case 125:
+case 124:
 YY_RULE_SETUP
-#line 741 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 750 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     --nesting;
     if (nesting < 0)
@@ -2821,9 +2911,9 @@ YY_RULE_SETUP
   `--------------------------------------------------------------*/
 
 
-case 126:
+case 125:
 YY_RULE_SETUP
-#line 761 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 770 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_FINISH;
     loc->start = code_start;
@@ -2832,7 +2922,7 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 case YY_STATE_EOF(SC_PROLOGUE):
-#line 768 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 777 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 unexpected_eof (code_start, "%}");
 	YY_BREAK
 
@@ -2843,7 +2933,7 @@ unexpected_eof (code_start, "%}");
 
 
 case YY_STATE_EOF(SC_EPILOGUE):
-#line 779 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 788 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 {
     STRING_FINISH;
     loc->start = code_start;
@@ -2855,20 +2945,27 @@ case YY_STATE_EOF(SC_EPILOGUE):
 /*-----------------------------------------------------.
   | By default, grow the string obstack with the input.  |
   `-----------------------------------------------------*/
-case 127:
-#line 793 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-case 128:
-/* rule 128 can match eol */
+
+
+/* Accept multibyte characters in one block instead of byte after
+     byte, so that add_column_width and mbsnwidth can compute correct
+     screen width.
+
+     Add a fallthrough "|." so that non UTF-8 input is still accepted
+     and does not jam the scanner.  */
+case 126:
+/* rule 126 can match eol */
 YY_RULE_SETUP
-#line 793 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 809 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 STRING_GROW;
 	YY_BREAK
-case 129:
+
+case 127:
 YY_RULE_SETUP
-#line 795 "/Users/akim/src/gnu/bison/src/scan-gram.l"
+#line 812 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2871 "src/scan-gram.c"
+#line 2968 "src/scan-gram.c"
 case YY_STATE_EOF(SC_RETURN_BRACKETED_ID):
 	yyterminate();
 
@@ -3181,7 +3278,7 @@ static int yy_get_next_buffer (void)
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 /* %% [16.0] code to find the next state goes here */
-		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 58);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 72);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -3190,7 +3287,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 573 )
+			if ( yy_current_state >= 600 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -3214,7 +3311,7 @@ static int yy_get_next_buffer (void)
     /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
 	char *yy_cp = (yy_c_buf_p);
 
-	YY_CHAR yy_c = 58;
+	YY_CHAR yy_c = 72;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -3223,11 +3320,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 573 )
+		if ( yy_current_state >= 600 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 572);
+	yy_is_jam = (yy_current_state == 599);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -4020,54 +4117,7 @@ void yyfree (void * ptr )
 
 /* %ok-for-header */
 
-#line 795 "/Users/akim/src/gnu/bison/src/scan-gram.l"
-
-
-/* Read bytes from FP into buffer BUF of size SIZE.  Return the
-   number of bytes read.  Remove '\r' from input, treating \r\n
-   and isolated \r as \n.  */
-
-static size_t
-no_cr_read (FILE *fp, char *buf, size_t size)
-{
-  size_t bytes_read = fread (buf, 1, size, fp);
-  if (bytes_read)
-    {
-      char *w = memchr (buf, '\r', bytes_read);
-      if (w)
-        {
-          char const *r = ++w;
-          char const *lim = buf + bytes_read;
-
-          for (;;)
-            {
-              /* Found an '\r'.  Treat it like '\n', but ignore any
-                 '\n' that immediately follows.  */
-              w[-1] = '\n';
-              if (r == lim)
-                {
-                  int ch = getc (fp);
-                  if (ch != '\n' && ungetc (ch, fp) != ch)
-                    break;
-                }
-              else if (*r == '\n')
-                r++;
-
-              /* Copy until the next '\r'.  */
-              do
-                {
-                  if (r == lim)
-                    return w - buf;
-                }
-              while ((*w++ = *r++) != '\r');
-            }
-
-          return w - buf;
-        }
-    }
-
-  return bytes_read;
-}
+#line 812 "/Users/akim/src/gnu/bison/src/scan-gram.l"
 
 
 
@@ -4075,7 +4125,7 @@ no_cr_read (FILE *fp, char *buf, size_t size)
 | Scan NUMBER for a base-BASE integer at location LOC.  |
 `------------------------------------------------------*/
 
-static unsigned long
+static int
 scan_integer (char const *number, int base, location loc)
 {
   verify (INT_MAX < ULONG_MAX);
@@ -4083,9 +4133,10 @@ scan_integer (char const *number, int base, location loc)
     complain (&loc, Wyacc,
               _("POSIX Yacc does not support hexadecimal literals"));
 
-  unsigned long num = strtoul (number, NULL, base);
+  errno = 0;
+  long num = strtol (number, NULL, base);
 
-  if (INT_MAX < num)
+  if (! (0 <= num && num <= INT_MAX && errno == 0))
     {
       complain (&loc, complaint, _("integer out of range: %s"),
                 quote (number));
@@ -4106,7 +4157,7 @@ static int
 convert_ucn_to_byte (char const *ucn)
 {
   verify (UCHAR_MAX <= INT_MAX);
-  unsigned long code = strtoul (ucn + 2, NULL, 16);
+  long code = strtol (ucn + 2, NULL, 16);
 
   /* FIXME: Currently we assume Unicode-compatible unibyte characters
      on ASCII hosts (i.e., Latin-1 on hosts with 8-bit bytes).  On
@@ -4114,7 +4165,7 @@ convert_ucn_to_byte (char const *ucn)
      These limitations should be removed once we add support for
      multibyte characters.  */
 
-  if (UCHAR_MAX < code)
+  if (! (0 <= code && code <= UCHAR_MAX))
     return -1;
 
 #if ! ('$' == 0x24 && '@' == 0x40 && '`' == 0x60 && '~' == 0x7e)
@@ -4161,8 +4212,9 @@ static void
 handle_syncline (char *args, location loc)
 {
   char *file;
-  unsigned long lineno = strtoul (args, &file, 10);
-  if (INT_MAX <= lineno)
+  errno = 0;
+  long lineno = strtol (args, &file, 10);
+  if (! (0 <= lineno && lineno <= INT_MAX && errno == 0))
     {
       complain (&loc, Wother, _("line number overflow"));
       lineno = INT_MAX;
@@ -4174,7 +4226,7 @@ handle_syncline (char *args, location loc)
       *strchr (file + 1, '"') = '\0';
       current_file = uniqstr_new (file + 1);
     }
-  boundary_set (&scanner_cursor, current_file, lineno, 1);
+  boundary_set (&scanner_cursor, current_file, lineno, 1, 1);
 }
 
 
@@ -4195,6 +4247,7 @@ unexpected_end (boundary start, char const *msgid, char const *token_end)
   /* Adjust scanner cursor so that any later message does not count
      the characters about to be inserted.  */
   scanner_cursor.column -= i;
+  scanner_cursor.byte -= i;
 
   while (i != 0)
     unput (token_end[--i]);
@@ -4231,26 +4284,30 @@ unexpected_newline (boundary start, char const *token_end)
 }
 
 
-/*-------------------------.
-| Initialize the scanner.  |
-`-------------------------*/
-
 void
-gram_scanner_initialize (void)
+gram_scanner_open (const char *gram)
 {
+  gram__flex_debug = trace_flag & trace_scan;
+  gram_debug = trace_flag & trace_parse;
   obstack_init (&obstack_for_string);
+  current_file = gram;
+  gram_in = xfopen (gram, "r");
+}
+
+
+void
+gram_scanner_close ()
+{
+  xfclose (gram_in);
+  /* Reclaim Flex's buffers.  */
+  yylex_destroy ();
 }
 
 
-/*-----------------------------------------------.
-| Free all the memory allocated to the scanner.  |
-`-----------------------------------------------*/
 
 void
 gram_scanner_free (void)
 {
   obstack_free (&obstack_for_string, 0);
-  /* Reclaim Flex's buffers.  */
-  yylex_destroy ();
 }
 
diff --git a/contrib/tools/bison/src/scan-gram.h b/contrib/tools/bison/src/scan-gram.h
index f25d183f1e59..4483fa816a51 100644
--- a/contrib/tools/bison/src/scan-gram.h
+++ b/contrib/tools/bison/src/scan-gram.h
@@ -1,6 +1,6 @@
 /* Bison Grammar Scanner
 
-   Copyright (C) 2006-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2006-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,18 +21,15 @@
 #ifndef SCAN_GRAM_H_
 # define SCAN_GRAM_H_
 
-/* From the scanner.  */
-extern FILE *gram_in;
-extern int gram__flex_debug;
-void gram_scanner_initialize (void);
+/* Initialize the scanner to read file GRAM. */
+void gram_scanner_open (const char *gram);
+/* Close the open files.  */
+void gram_scanner_close (void);
+
+/* Free all the memory allocated to the scanner. */
 void gram_scanner_free (void);
 void gram_scanner_last_string_free (void);
 
-/* These are declared by the scanner, but not used.  We put them here
-   to pacify "make syntax-check".  */
-extern FILE *gram_out;
-extern int gram_lineno;
-
 # define GRAM_LEX_DECL int gram_lex (GRAM_STYPE *val, location *loc)
 GRAM_LEX_DECL;
 
diff --git a/contrib/tools/bison/src/scan-skel.h b/contrib/tools/bison/src/scan-skel.h
index 20fa09da8e90..5a6b5f3f361b 100644
--- a/contrib/tools/bison/src/scan-skel.h
+++ b/contrib/tools/bison/src/scan-skel.h
@@ -1,6 +1,6 @@
 /* Scan Bison Skeletons.
 
-   Copyright (C) 2005-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2005-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/src/state.c b/contrib/tools/bison/src/state.c
index 0fc93206012f..356ccdf17fd6 100644
--- a/contrib/tools/bison/src/state.c
+++ b/contrib/tools/bison/src/state.c
@@ -1,6 +1,6 @@
 /* Type definitions for the finite state machine for Bison.
 
-   Copyright (C) 2001-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2001-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -19,13 +19,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include "state.h"
+
 #include "system.h"
 
 #include <hash.h>
 
+#include "closure.h"
 #include "complain.h"
+#include "getargs.h"
 #include "gram.h"
-#include "state.h"
 #include "print-xml.h"
 
 
@@ -39,31 +42,24 @@
 `-----------------------------------------*/
 
 static transitions *
-transitions_new (int num, state **the_states)
+transitions_new (int num, state **dst)
 {
-  size_t states_size = num * sizeof *the_states;
+  size_t states_size = num * sizeof *dst;
   transitions *res = xmalloc (offsetof (transitions, states) + states_size);
   res->num = num;
-  memcpy (res->states, the_states, states_size);
+  memcpy (res->states, dst, states_size);
   return res;
 }
 
 
-/*-------------------------------------------------------.
-| Return the state such that SHIFTS contain a shift/goto |
-| to it on SYM.  Abort if none found.                    |
-`-------------------------------------------------------*/
-
 state *
-transitions_to (transitions *shifts, symbol_number sym)
+transitions_to (state *s, symbol_number sym)
 {
-  int j;
-  for (j = 0; ; j++)
-    {
-      aver (j < shifts->num);
-      if (TRANSITION_SYMBOL (shifts, j) == sym)
-        return shifts->states[j];
-    }
+  transitions *trans = s->transitions;
+  for (int i = 0; i < trans->num; ++i)
+    if (TRANSITION_SYMBOL (trans, i) == sym)
+      return trans->states[i];
+  abort ();
 }
 
 
@@ -82,7 +78,8 @@ errs_new (int num, symbol **tokens)
   size_t symbols_size = num * sizeof *tokens;
   errs *res = xmalloc (offsetof (errs, symbols) + symbols_size);
   res->num = num;
-  memcpy (res->symbols, tokens, symbols_size);
+  if (tokens)
+    memcpy (res->symbols, tokens, symbols_size);
   return res;
 }
 
@@ -131,12 +128,10 @@ state *
 state_new (symbol_number accessing_symbol,
            size_t nitems, item_number *core)
 {
-  state *res;
-  size_t items_size = nitems * sizeof *core;
-
   aver (nstates < STATE_NUMBER_MAXIMUM);
 
-  res = xmalloc (offsetof (state, items) + items_size);
+  size_t items_size = nitems * sizeof *core;
+  state *res = xmalloc (offsetof (state, items) + items_size);
   res->number = nstates++;
   res->accessing_symbol = accessing_symbol;
   res->transitions = NULL;
@@ -158,12 +153,10 @@ state_new (symbol_number accessing_symbol,
 state *
 state_new_isocore (state const *s)
 {
-  state *res;
-  size_t items_size = s->nitems * sizeof *s->items;
-
   aver (nstates < STATE_NUMBER_MAXIMUM);
 
-  res = xmalloc (offsetof (state, items) + items_size);
+  size_t items_size = s->nitems * sizeof *s->items;
+  state *res = xmalloc (offsetof (state, items) + items_size);
   res->number = nstates++;
   res->accessing_symbol = s->accessing_symbol;
   res->transitions =
@@ -196,15 +189,32 @@ state_free (state *s)
 }
 
 
+void
+state_transitions_print (const state *s, FILE *out)
+{
+  const transitions *trans = s->transitions;
+  fprintf (out, "transitions of %d (%d):\n",
+           s->number, trans->num);
+  for (int i = 0; i < trans->num; ++i)
+    fprintf (out, "  %d: (%d, %s, %d)\n",
+             i,
+             s->number,
+             symbols[s->transitions->states[i]->accessing_symbol]->tag,
+             s->transitions->states[i]->number);
+}
+
+
 /*---------------------------.
 | Set the transitions of S.  |
 `---------------------------*/
 
 void
-state_transitions_set (state *s, int num, state **trans)
+state_transitions_set (state *s, int num, state **dst)
 {
   aver (!s->transitions);
-  s->transitions = transitions_new (num, trans);
+  s->transitions = transitions_new (num, dst);
+  if (trace_flag & trace_automaton)
+    state_transitions_print (s, stderr);
 }
 
 
@@ -221,14 +231,13 @@ state_reductions_set (state *s, int num, rule **reds)
 
 
 int
-state_reduction_find (state *s, rule *r)
+state_reduction_find (state *s, rule const *r)
 {
-  int i;
   reductions *reds = s->reductions;
-  for (i = 0; i < reds->num; ++i)
+  for (int i = 0; i < reds->num; ++i)
     if (reds->rules[i] == r)
       return i;
-  return -1;
+  abort ();
 }
 
 
@@ -251,7 +260,7 @@ state_errs_set (state *s, int num, symbol **tokens)
 `--------------------------------------------------*/
 
 void
-state_rule_lookahead_tokens_print (state *s, rule *r, FILE *out)
+state_rule_lookahead_tokens_print (state *s, rule const *r, FILE *out)
 {
   /* Find the reduction we are handling.  */
   reductions *reds = s->reductions;
@@ -274,7 +283,7 @@ state_rule_lookahead_tokens_print (state *s, rule *r, FILE *out)
 }
 
 void
-state_rule_lookahead_tokens_print_xml (state *s, rule *r,
+state_rule_lookahead_tokens_print_xml (state *s, rule const *r,
                                        FILE *out, int level)
 {
   /* Find the reduction we are handling.  */
@@ -310,12 +319,10 @@ static struct hash_table *state_table = NULL;
 static inline bool
 state_compare (state const *s1, state const *s2)
 {
-  size_t i;
-
   if (s1->nitems != s2->nitems)
     return false;
 
-  for (i = 0; i < s1->nitems; ++i)
+  for (size_t i = 0; i < s1->nitems; ++i)
     if (s1->items[i] != s2->items[i])
       return false;
 
@@ -333,8 +340,7 @@ state_hash (state const *s, size_t tablesize)
 {
   /* Add up the state's item numbers to get a hash key.  */
   size_t key = 0;
-  size_t i;
-  for (i = 0; i < s->nitems; ++i)
+  for (size_t i = 0; i < s->nitems; ++i)
     key += s->items[i];
   return key % tablesize;
 }
@@ -353,11 +359,11 @@ state_hasher (void const *s, size_t tablesize)
 void
 state_hash_new (void)
 {
-  state_table = hash_initialize (HT_INITIAL_CAPACITY,
-                                 NULL,
-                                 state_hasher,
-                                 state_comparator,
-                                 NULL);
+  state_table = hash_xinitialize (HT_INITIAL_CAPACITY,
+                                  NULL,
+                                  state_hasher,
+                                  state_comparator,
+                                  NULL);
 }
 
 
@@ -394,11 +400,9 @@ state_hash_lookup (size_t nitems, item_number *core)
 {
   size_t items_size = nitems * sizeof *core;
   state *probe = xmalloc (offsetof (state, items) + items_size);
-  state *entry;
-
   probe->nitems = nitems;
   memcpy (probe->items, core, items_size);
-  entry = hash_lookup (state_table, probe);
+  state *entry = hash_lookup (state_table, probe);
   free (probe);
   return entry;
 }
@@ -414,12 +418,9 @@ state_record_reachable_states (state *s, bitset reachable)
   if (bitset_test (reachable, s->number))
     return;
   bitset_set (reachable, s->number);
-  {
-    int i;
-    for (i = 0; i < s->transitions->num; ++i)
-      if (!TRANSITION_IS_DISABLED (s->transitions, i))
-        state_record_reachable_states (s->transitions->states[i], reachable);
-  }
+  for (int i = 0; i < s->transitions->num; ++i)
+    if (!TRANSITION_IS_DISABLED (s->transitions, i))
+      state_record_reachable_states (s->transitions->states[i], reachable);
 }
 
 void
@@ -428,23 +429,20 @@ state_remove_unreachable_states (state_number old_to_new[])
   state_number nstates_reachable = 0;
   bitset reachable = bitset_create (nstates, BITSET_FIXED);
   state_record_reachable_states (states[0], reachable);
-  {
-    state_number i;
-    for (i = 0; i < nstates; ++i)
-      {
-        if (bitset_test (reachable, states[i]->number))
-          {
-            states[nstates_reachable] = states[i];
-            states[nstates_reachable]->number = nstates_reachable;
-            old_to_new[i] = nstates_reachable++;
-          }
-        else
-          {
-            state_free (states[i]);
-            old_to_new[i] = nstates;
-          }
-      }
-  }
+  for (state_number i = 0; i < nstates; ++i)
+    {
+      if (bitset_test (reachable, states[i]->number))
+        {
+          states[nstates_reachable] = states[i];
+          states[nstates_reachable]->number = nstates_reachable;
+          old_to_new[i] = nstates_reachable++;
+        }
+      else
+        {
+          state_free (states[i]);
+          old_to_new[i] = nstates;
+        }
+    }
   nstates = nstates_reachable;
   bitset_free (reachable);
 }
@@ -460,8 +458,8 @@ state **states = NULL;
 void
 states_free (void)
 {
-  state_number i;
-  for (i = 0; i < nstates; ++i)
+  closure_free ();
+  for (state_number i = 0; i < nstates; ++i)
     state_free (states[i]);
   free (states);
 }
diff --git a/contrib/tools/bison/src/state.h b/contrib/tools/bison/src/state.h
index 5b37ed6a4790..8fd9088ab358 100644
--- a/contrib/tools/bison/src/state.h
+++ b/contrib/tools/bison/src/state.h
@@ -1,6 +1,6 @@
 /* Type definitions for the finite state machine for Bison.
 
-   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2015, 2018-2019 Free
+   Copyright (C) 1984, 1989, 2000-2004, 2007, 2009-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -51,11 +51,11 @@
    lookahead token alone).  When the states are generated, these
    actions are represented in two other lists.
 
-   Each transition structure describes the possible transitions out
-   of one state, the state whose number is in the number field.  Each
-   contains a vector of numbers of the states that transitions can go
-   to.  The accessing_symbol fields of those states' cores say what
-   kind of input leads to them.
+   Each transition structure describes the possible transitions out of
+   one state (there are NUM of them).  Each contains a vector of
+   numbers of the states that transitions can go to.  The
+   accessing_symbol fields of those states' cores say what kind of
+   input leads to them.
 
    A transition to state zero should be ignored: conflict resolution
    deletes transitions by having them point to zero.
@@ -112,7 +112,7 @@ typedef struct state state;
 
 typedef struct
 {
-  int num;
+  int num;            /** Size of destination STATES.  */
   state *states[1];
 } transitions;
 
@@ -159,9 +159,9 @@ typedef struct
     if (!TRANSITION_IS_DISABLED (Transitions, Iter))
 
 
-/* Return the state such SHIFTS contain a shift/goto to it on SYM.
-   Abort if none found.  */
-struct state *transitions_to (transitions *shifts, symbol_number sym);
+/* The destination of the transition (shift/goto) from state S on
+   label SYM (term or nterm).  Abort if none found.  */
+struct state *transitions_to (state *s, symbol_number sym);
 
 
 /*-------.
@@ -233,21 +233,26 @@ state *state_new (symbol_number accessing_symbol,
                   size_t core_size, item_number *core);
 state *state_new_isocore (state const *s);
 
-/* Set the transitions of STATE.  */
-void state_transitions_set (state *s, int num, state **trans);
+/* Record that from S we can reach all the DST states (NUM of them).  */
+void state_transitions_set (state *s, int num, state **dst);
+
+/* Print the transitions of state s for debug.  */
+void state_transitions_print (const state *s, FILE *out);
 
 /* Set the reductions of STATE.  */
 void state_reductions_set (state *s, int num, rule **reds);
 
-int state_reduction_find (state *s, rule *r);
+/* The index of the reduction of state S that corresponds to rule R.
+   Aborts if there is no reduction of R in S.  */
+int state_reduction_find (state *s, rule const *r);
 
 /* Set the errs of STATE.  */
 void state_errs_set (state *s, int num, symbol **errors);
 
 /* Print on OUT all the lookahead tokens such that this STATE wants to
    reduce R.  */
-void state_rule_lookahead_tokens_print (state *s, rule *r, FILE *out);
-void state_rule_lookahead_tokens_print_xml (state *s, rule *r,
+void state_rule_lookahead_tokens_print (state *s, rule const *r, FILE *out);
+void state_rule_lookahead_tokens_print_xml (state *s, rule const *r,
                                             FILE *out, int level);
 
 /* Create/destroy the states hash table.  */
diff --git a/contrib/tools/bison/src/symlist.c b/contrib/tools/bison/src/symlist.c
index c5947cc8903f..9bb0deaacbdb 100644
--- a/contrib/tools/bison/src/symlist.c
+++ b/contrib/tools/bison/src/symlist.c
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2005-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -34,7 +34,7 @@ symbol_list_sym_new (symbol *sym, location loc)
 
   res->content_type = SYMLIST_SYMBOL;
   res->content.sym = sym;
-  res->location = res->sym_loc = loc;
+  res->sym_loc = loc;
   res->named_ref = NULL;
 
   res->midrule = NULL;
@@ -42,13 +42,14 @@ symbol_list_sym_new (symbol *sym, location loc)
   res->midrule_parent_rhs_index = 0;
 
   /* Members used for LHS only.  */
+  res->rhs_loc = empty_loc;
   res->ruleprec = NULL;
-  res->percent_empty_loc = empty_location;
+  res->percent_empty_loc = empty_loc;
   code_props_none_init (&res->action_props);
   res->dprec = 0;
-  res->dprec_location = empty_location;
+  res->dprec_loc = empty_loc;
   res->merger = 0;
-  res->merger_declaration_location = empty_location;
+  res->merger_declaration_loc = empty_loc;
   res->expected_sr_conflicts = -1;
   res->expected_rr_conflicts = -1;
 
@@ -73,7 +74,7 @@ symbol_list_type_new (uniqstr type_name, location loc)
   res->content.sem_type->location = loc;
   res->content.sem_type->status = undeclared;
 
-  res->location = res->sym_loc = loc;
+  res->sym_loc = loc;
   res->named_ref = NULL;
   res->next = NULL;
 
@@ -97,6 +98,7 @@ symbol_list_type_set (symbol_list *syms, uniqstr type_name, location loc)
 void
 symbol_list_syms_print (const symbol_list *l, FILE *f)
 {
+  fputc ('[', f);
   char const *sep = "";
   for (/* Nothing. */; l && l->content.sym; l = l->next)
     {
@@ -105,10 +107,12 @@ symbol_list_syms_print (const symbol_list *l, FILE *f)
              : l->content_type == SYMLIST_TYPE ? "type: "
              : "invalid content_type: ",
              f);
-      symbol_print (l->content.sym, f);
-      fputs (l->action_props.is_value_used ? " used" : " unused", f);
+      if (l->content_type == SYMLIST_SYMBOL)
+        symbol_print (l->content.sym, f);
+      fputs (l->action_props.is_value_used ? " (used)" : " (unused)", f);
       sep = ", ";
     }
+  fputc (']', f);
 }
 
 
@@ -148,14 +152,13 @@ symbol_list_append (symbol_list *list, symbol_list *node)
 void
 symbol_list_free (symbol_list *list)
 {
-  symbol_list *node, *next;
-  for (node = list; node; node = next)
+  for (symbol_list *next; list; list = next)
     {
-      next = node->next;
-      named_ref_free (node->named_ref);
-      if (node->content_type == SYMLIST_TYPE)
-        free (node->content.sem_type);
-      free (node);
+      next = list->next;
+      named_ref_free (list->named_ref);
+      if (list->content_type == SYMLIST_TYPE)
+        free (list->content.sem_type);
+      free (list);
     }
 }
 
diff --git a/contrib/tools/bison/src/symlist.h b/contrib/tools/bison/src/symlist.h
index d8ae90c97d22..d94b7aa1b0d7 100644
--- a/contrib/tools/bison/src/symlist.h
+++ b/contrib/tools/bison/src/symlist.h
@@ -1,6 +1,6 @@
 /* Lists of symbols for Bison
 
-   Copyright (C) 2002, 2005-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2005-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -26,7 +26,9 @@
 # include "symtab.h"
 # include "named-ref.h"
 
-/* A list of symbols, used during the parsing to store the rules.  */
+/* A list of symbols, used during the parsing for many different
+   purposes: rules, symbol declarations or properties (such as
+   %destructor, etc.)...  */
 typedef struct symbol_list
 {
   /**
@@ -48,7 +50,6 @@ typedef struct symbol_list
      */
     semantic_type *sem_type;
   } content;
-  location location;
 
   /* Named reference. */
   named_ref *named_ref;
@@ -67,9 +68,13 @@ typedef struct symbol_list
   struct symbol_list *midrule_parent_rule;
   int midrule_parent_rhs_index;
 
-  /* ---------------------------------------------- */
-  /* Apply to the rule (attached to the LHS only).  */
-  /* ---------------------------------------------- */
+  /*--------------------------------------------------------------.
+  | Used for rules only (attached to the "LHS", one per rule even |
+  | when several RHSs are bound to a single lhs via "|").         |
+  `--------------------------------------------------------------*/
+
+  /* Location of the RHS. */
+  location rhs_loc;
 
   /* Precedence/associativity.  */
   symbol *ruleprec;
@@ -79,13 +84,13 @@ typedef struct symbol_list
   code_props action_props;
 
   /* The location of the first %empty for this rule, or \a
-     empty_location.  */
+     empty_loc.  */
   location percent_empty_loc;
 
   int dprec;
-  location dprec_location;
+  location dprec_loc;
   int merger;
-  location merger_declaration_location;
+  location merger_declaration_loc;
 
   /* Counts of the number of expected conflicts for this rule, or -1 if none
      given. */
diff --git a/contrib/tools/bison/src/symtab.c b/contrib/tools/bison/src/symtab.c
index b9a934f72665..b4106ea0b04c 100644
--- a/contrib/tools/bison/src/symtab.c
+++ b/contrib/tools/bison/src/symtab.c
@@ -1,6 +1,6 @@
 /* Symbol table manager for Bison.
 
-   Copyright (C) 1984, 1989, 2000-2002, 2004-2015, 2018-2019 Free
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -19,21 +19,31 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include "symtab.h"
+
 #include "system.h"
 
+#include <assure.h>
+#include <fstrcmp.h>
 #include <hash.h>
+#include <quote.h>
 
 #include "complain.h"
+#include "getargs.h"
 #include "gram.h"
-#include "symtab.h"
+#include "intprops.h"
 
-/*-------------------------------------------------------------------.
-| Symbols sorted by tag.  Allocated by the first invocation of       |
-| symbols_do, after which no more symbols should be created.         |
-`-------------------------------------------------------------------*/
+static struct hash_table *symbol_table = NULL;
+static struct hash_table *semantic_type_table = NULL;
+
+/*----------------------------------------------------------------.
+| Symbols sorted by tag.  Allocated by table_sort, after which no |
+| more symbols should be created.                                 |
+`----------------------------------------------------------------*/
 
 static symbol **symbols_sorted = NULL;
-static symbol **semantic_types_sorted = NULL;
+static semantic_type **semantic_types_sorted = NULL;
+
 
 /*------------------------.
 | Distinguished symbols.  |
@@ -44,7 +54,7 @@ symbol *undeftoken = NULL;
 symbol *endtoken = NULL;
 symbol *accept = NULL;
 symbol *startsymbol = NULL;
-location startsymbol_location;
+location startsymbol_loc;
 
 /* Precedence relation graph. */
 static symgraph **prec_nodes;
@@ -67,10 +77,12 @@ sym_content_new (symbol *s)
   res->symbol = s;
 
   res->type_name = NULL;
+  res->type_loc = empty_loc;
   for (int i = 0; i < CODE_PROPS_SIZE; ++i)
     code_props_none_init (&res->props[i]);
 
   res->number = NUMBER_UNDEFINED;
+  res->prec_loc = empty_loc;
   res->prec = 0;
   res->assoc = undef_assoc;
   res->user_token_number = USER_NUMBER_UNDEFINED;
@@ -147,8 +159,8 @@ symbol_free (void *ptr)
    declaration first.
 */
 
-static
-void symbols_sort (symbol **first, symbol **second)
+static void
+symbols_sort (symbol **first, symbol **second)
 {
   if (0 < location_cmp ((*first)->location, (*second)->location))
     {
@@ -160,8 +172,8 @@ void symbols_sort (symbol **first, symbol **second)
 
 /* Likewise, for locations.  */
 
-static
-void locations_sort (location *first, location *second)
+static void
+locations_sort (location *first, location *second)
 {
   if (0 < location_cmp (*first, *second))
     {
@@ -196,7 +208,7 @@ semantic_type_new (uniqstr tag, const location *loc)
 
   uniqstr_assert (tag);
   res->tag = tag;
-  res->location = loc ? *loc : empty_location;
+  res->location = loc ? *loc : empty_loc;
   res->status = undeclared;
   for (int i = 0; i < CODE_PROPS_SIZE; ++i)
     code_props_none_init (&res->props[i]);
@@ -222,7 +234,14 @@ symbol_print (symbol const *s, FILE *f)
 {
   if (s)
     {
-      fputs (s->tag, f);
+      symbol_class c = s->content->class;
+      fprintf (f, "%s: %s",
+               c == unknown_sym    ? "unknown"
+               : c == pct_type_sym ? "%type"
+               : c == token_sym    ? "token"
+               : c == nterm_sym    ? "nterm"
+               : NULL, /* abort.  */
+               s->tag);
       SYMBOL_ATTR_PRINT (type_name);
       SYMBOL_CODE_PRINT (destructor);
       SYMBOL_CODE_PRINT (printer);
@@ -277,7 +296,7 @@ static void
 complain_symbol_redeclared (symbol *s, const char *what, location first,
                             location second)
 {
-  unsigned i = 0;
+  int i = 0;
   locations_sort (&first, &second);
   complain_indent (&second, complaint, &i,
                    _("%s redeclaration for %s"), what, s->tag);
@@ -290,7 +309,7 @@ static void
 complain_semantic_type_redeclared (semantic_type *s, const char *what, location first,
                                    location second)
 {
-  unsigned i = 0;
+  int i = 0;
   locations_sort (&first, &second);
   complain_indent (&second, complaint, &i,
                    _("%s redeclaration for <%s>"), what, s->tag);
@@ -302,16 +321,68 @@ complain_semantic_type_redeclared (semantic_type *s, const char *what, location
 static void
 complain_class_redeclared (symbol *sym, symbol_class class, location second)
 {
-  unsigned i = 0;
+  int i = 0;
   complain_indent (&second, complaint, &i,
                    class == token_sym
                    ? _("symbol %s redeclared as a token")
                    : _("symbol %s redeclared as a nonterminal"), sym->tag);
-  i += SUB_INDENT;
-  complain_indent (&sym->location, complaint, &i,
-                   _("previous definition"));
+  if (!location_empty (sym->location))
+    {
+      i += SUB_INDENT;
+      complain_indent (&sym->location, complaint, &i,
+                       _("previous definition"));
+    }
 }
 
+static const symbol *
+symbol_from_uniqstr_fuzzy (const uniqstr key)
+{
+  aver (symbols_sorted);
+#define FSTRCMP_THRESHOLD 0.6
+  double best_similarity = FSTRCMP_THRESHOLD;
+  const symbol *res = NULL;
+  size_t count = hash_get_n_entries (symbol_table);
+  for (int i = 0; i < count; ++i)
+    {
+      symbol *sym = symbols_sorted[i];
+      if (STRNEQ (key, sym->tag)
+          && (sym->content->status == declared
+              || sym->content->status == undeclared))
+        {
+          double similarity = fstrcmp_bounded (key, sym->tag, best_similarity);
+          if (best_similarity < similarity)
+            {
+              res = sym;
+              best_similarity = similarity;
+            }
+        }
+    }
+  return res;
+}
+
+static void
+complain_symbol_undeclared (symbol *sym)
+{
+  assert (sym->content->status != declared);
+  const symbol *best = symbol_from_uniqstr_fuzzy (sym->tag);
+  if (best)
+    {
+      complain (&sym->location,
+                sym->content->status == needed ? complaint : Wother,
+                _("symbol %s is used, but is not defined as a token"
+                  " and has no rules; did you mean %s?"),
+                quote_n (0, sym->tag),
+                quote_n (1, best->tag));
+      if (feature_flag & feature_caret)
+        location_caret_suggestion (sym->location, best->tag, stderr);
+    }
+  else
+    complain (&sym->location,
+              sym->content->status == needed ? complaint : Wother,
+              _("symbol %s is used, but is not defined as a token"
+                " and has no rules"),
+              quote (sym->tag));
+}
 
 void
 symbol_location_as_lhs_set (symbol *sym, location loc)
@@ -334,12 +405,12 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc)
       tag_seen = true;
       if (sym->content->type_name)
         complain_symbol_redeclared (sym, "%type",
-                                    sym->content->type_location, loc);
+                                    sym->content->type_loc, loc);
       else
         {
           uniqstr_assert (type_name);
           sym->content->type_name = type_name;
-          sym->content->type_location = loc;
+          sym->content->type_loc = loc;
         }
     }
 }
@@ -421,12 +492,12 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
       sym_content *s = sym->content;
       if (s->prec)
         complain_symbol_redeclared (sym, assoc_to_string (a),
-                                    s->prec_location, loc);
+                                    s->prec_loc, loc);
       else
         {
           s->prec = prec;
           s->assoc = a;
-          s->prec_location = loc;
+          s->prec_loc = loc;
         }
     }
 
@@ -439,15 +510,33 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
 | Set the CLASS associated with SYM.  |
 `------------------------------------*/
 
+static void
+complain_pct_type_on_token (location *loc)
+{
+  complain (loc, Wyacc,
+            _("POSIX yacc reserves %%type to nonterminals"));
+}
+
 void
 symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
 {
   aver (class != unknown_sym);
   sym_content *s = sym->content;
-  if (s->class != unknown_sym && s->class != class)
+  if (class == pct_type_sym)
+    {
+      if (s->class == token_sym)
+        complain_pct_type_on_token (&loc);
+      else if (s->class == unknown_sym)
+        s->class = class;
+    }
+  else if (s->class != unknown_sym && s->class != pct_type_sym
+           && s->class != class)
     complain_class_redeclared (sym, class, loc);
   else
     {
+      if (class == token_sym && s->class == pct_type_sym)
+        complain_pct_type_on_token (&sym->location);
+
       if (class == nterm_sym && s->class != nterm_sym)
         s->number = nvars++;
       else if (class == token_sym && s->number == NUMBER_UNDEFINED)
@@ -457,9 +546,19 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
       if (declaring)
         {
           if (s->status == declared)
-            complain (&loc, Wother, _("symbol %s redeclared"), sym->tag);
+            {
+              int i = 0;
+              complain_indent (&loc, Wother, &i,
+                               _("symbol %s redeclared"), sym->tag);
+              i += SUB_INDENT;
+              complain_indent (&sym->location, Wother, &i,
+                               _("previous declaration"));
+            }
           else
-            s->status = declared;
+            {
+              sym->location = loc;
+              s->status = declared;
+            }
         }
     }
 }
@@ -480,11 +579,14 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
            && *user_token_numberp != user_token_number)
     complain (&loc, complaint, _("redefining user token number of %s"),
               sym->tag);
+  else if (user_token_number == INT_MAX)
+    complain (&loc, complaint, _("user token number of %s too large"),
+              sym->tag);
   else
     {
       *user_token_numberp = user_token_number;
       /* User defined $end token? */
-      if (user_token_number == 0)
+      if (user_token_number == 0 && !endtoken)
         {
           endtoken = sym->content->symbol;
           /* It is always mapped to 0, so it was already counted in
@@ -502,22 +604,24 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
 | nonterminal.                                              |
 `----------------------------------------------------------*/
 
-static inline bool
+static void
 symbol_check_defined (symbol *sym)
 {
   sym_content *s = sym->content;
-  if (s->class == unknown_sym)
+  if (s->class == unknown_sym || s->class == pct_type_sym)
     {
-      assert (s->status != declared);
-      complain (&sym->location,
-                s->status == needed ? complaint : Wother,
-                _("symbol %s is used, but is not defined as a token"
-                  " and has no rules"),
-                  sym->tag);
+      complain_symbol_undeclared (sym);
       s->class = nterm_sym;
       s->number = nvars++;
     }
 
+  if (s->class == token_sym
+      && sym->tag[0] == '"'
+      && !sym->is_alias)
+    complain (&sym->location, Wdangling_alias,
+              _("string literal %s not attached to a symbol"),
+              sym->tag);
+
   for (int i = 0; i < 2; ++i)
     symbol_code_props_get (sym, i)->is_used = true;
 
@@ -529,11 +633,9 @@ symbol_check_defined (symbol *sym)
       if (sem_type)
         sem_type->status = declared;
     }
-
-  return true;
 }
 
-static inline bool
+static void
 semantic_type_check_defined (semantic_type *sem_type)
 {
   /* <*> and <> do not have to be "declared".  */
@@ -552,24 +654,8 @@ semantic_type_check_defined (semantic_type *sem_type)
     complain (&sem_type->location, Wother,
               _("type <%s> is used, but is not associated to any symbol"),
               sem_type->tag);
-
-  return true;
-}
-
-static bool
-symbol_check_defined_processor (void *sym, void *null ATTRIBUTE_UNUSED)
-{
-  return symbol_check_defined (sym);
-}
-
-static bool
-semantic_type_check_defined_processor (void *sem_type,
-                                       void *null ATTRIBUTE_UNUSED)
-{
-  return semantic_type_check_defined (sem_type);
 }
 
-
 /*-------------------------------------------------------------------.
 | Merge the properties (precedence, associativity, etc.) of SYM, and |
 | its string-named alias STR; check consistency.                     |
@@ -582,10 +668,10 @@ symbol_merge_properties (symbol *sym, symbol *str)
     {
       if (str->content->type_name)
         symbol_type_set (sym,
-                         str->content->type_name, str->content->type_location);
+                         str->content->type_name, str->content->type_loc);
       else
         symbol_type_set (str,
-                         sym->content->type_name, sym->content->type_location);
+                         sym->content->type_name, sym->content->type_loc);
     }
 
 
@@ -599,10 +685,10 @@ symbol_merge_properties (symbol *sym, symbol *str)
     {
       if (str->content->prec)
         symbol_precedence_set (sym, str->content->prec, str->content->assoc,
-                               str->content->prec_location);
+                               str->content->prec_loc);
       else
         symbol_precedence_set (str, sym->content->prec, sym->content->assoc,
-                               sym->content->prec_location);
+                               sym->content->prec_loc);
     }
 }
 
@@ -636,7 +722,7 @@ symbol_make_alias (symbol *sym, symbol *str, location loc)
 | into FDEFINES.  Put in SYMBOLS.                                    |
 `-------------------------------------------------------------------*/
 
-static inline bool
+static void
 symbol_pack (symbol *this)
 {
   aver (this->content->number != NUMBER_UNDEFINED);
@@ -644,19 +730,12 @@ symbol_pack (symbol *this)
     this->content->number += ntokens;
 
   symbols[this->content->number] = this->content->symbol;
-  return true;
-}
-
-static bool
-symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED)
-{
-  return symbol_pack (this);
 }
 
 static void
 complain_user_token_number_redeclared (int num, symbol *first, symbol *second)
 {
-  unsigned i = 0;
+  int i = 0;
   symbols_sort (&first, &second);
   complain_indent (&second->location, complaint, &i,
                    _("user token number %d redeclaration for %s"),
@@ -671,7 +750,7 @@ complain_user_token_number_redeclared (int num, symbol *first, symbol *second)
 | Put THIS in TOKEN_TRANSLATIONS if it is a token.  |
 `--------------------------------------------------*/
 
-static inline bool
+static void
 symbol_translation (symbol *this)
 {
   /* Nonterminal? */
@@ -688,14 +767,6 @@ symbol_translation (symbol *this)
         token_translations[this->content->user_token_number]
           = this->content->number;
     }
-
-  return true;
-}
-
-static bool
-symbol_translation_processor (void *this, void *null ATTRIBUTE_UNUSED)
-{
-  return symbol_translation (this);
 }
 
 
@@ -706,9 +777,6 @@ symbol_translation_processor (void *this, void *null ATTRIBUTE_UNUSED)
 /* Initial capacity of symbol and semantic type hash table.  */
 #define HT_INITIAL_CAPACITY 257
 
-static struct hash_table *symbol_table = NULL;
-static struct hash_table *semantic_type_table = NULL;
-
 static inline bool
 hash_compare_symbol (const symbol *m1, const symbol *m2)
 {
@@ -768,16 +836,33 @@ hash_semantic_type_hasher (void const *m, size_t tablesize)
 void
 symbols_new (void)
 {
-  symbol_table = hash_initialize (HT_INITIAL_CAPACITY,
-                                  NULL,
-                                  hash_symbol_hasher,
-                                  hash_symbol_comparator,
-                                  symbol_free);
-  semantic_type_table = hash_initialize (HT_INITIAL_CAPACITY,
-                                         NULL,
-                                         hash_semantic_type_hasher,
-                                         hash_semantic_type_comparator,
-                                         free);
+  symbol_table = hash_xinitialize (HT_INITIAL_CAPACITY,
+                                   NULL,
+                                   hash_symbol_hasher,
+                                   hash_symbol_comparator,
+                                   symbol_free);
+
+  /* Construct the accept symbol. */
+  accept = symbol_get ("$accept", empty_loc);
+  accept->content->class = nterm_sym;
+  accept->content->number = nvars++;
+
+  /* Construct the error token */
+  errtoken = symbol_get ("error", empty_loc);
+  errtoken->content->class = token_sym;
+  errtoken->content->number = ntokens++;
+
+  /* Construct a token that represents all undefined literal tokens.
+     It is always token number 2.  */
+  undeftoken = symbol_get ("$undefined", empty_loc);
+  undeftoken->content->class = token_sym;
+  undeftoken->content->number = ntokens++;
+
+  semantic_type_table = hash_xinitialize (HT_INITIAL_CAPACITY,
+                                          NULL,
+                                          hash_semantic_type_hasher,
+                                          hash_semantic_type_comparator,
+                                          free);
 }
 
 
@@ -864,9 +949,9 @@ dummy_symbol_get (location loc)
 {
   /* Incremented for each generated symbol.  */
   static int dummy_count = 0;
-  static char buf[256];
-
-  sprintf (buf, "$@%d", ++dummy_count);
+  char buf[32];
+  int len = snprintf (buf, sizeof buf, "$@%d", ++dummy_count);
+  assure (len < sizeof buf);
   symbol *sym = symbol_get (buf, loc);
   sym->content->class = nterm_sym;
   sym->content->number = nvars++;
@@ -894,36 +979,25 @@ symbols_free (void)
 }
 
 
-/*---------------------------------------------------------------.
-| Look for undefined symbols, report an error, and consider them |
-| terminals.                                                     |
-`---------------------------------------------------------------*/
-
 static int
-symbols_cmp (symbol const *a, symbol const *b)
+symbol_cmp (void const *a, void const *b)
 {
-  return strcmp (a->tag, b->tag);
+  return location_cmp ((*(symbol * const *)a)->location,
+                       (*(symbol * const *)b)->location);
 }
 
-static int
-symbols_cmp_qsort (void const *a, void const *b)
-{
-  return symbols_cmp (*(symbol * const *)a, *(symbol * const *)b);
-}
+/* Store in *SORTED an array of pointers to the symbols contained in
+   TABLE, sorted (alphabetically) by tag. */
 
 static void
-symbols_do (Hash_processor processor, void *processor_data,
-            struct hash_table *table, symbol ***sorted)
+table_sort (struct hash_table *table, symbol ***sorted)
 {
+  aver (!*sorted);
   size_t count = hash_get_n_entries (table);
-  if (!*sorted)
-    {
-      *sorted = xnmalloc (count, sizeof **sorted);
-      hash_get_entries (table, (void**)*sorted, count);
-      qsort (*sorted, count, sizeof **sorted, symbols_cmp_qsort);
-    }
-  for (size_t i = 0; i < count; ++i)
-    processor ((*sorted)[i], processor_data);
+  *sorted = xnmalloc (count + 1, sizeof **sorted);
+  hash_get_entries (table, (void**)*sorted, count);
+  qsort (*sorted, count, sizeof **sorted, symbol_cmp);
+  (*sorted)[count] = NULL;
 }
 
 /*--------------------------------------------------------------.
@@ -934,10 +1008,20 @@ symbols_do (Hash_processor processor, void *processor_data,
 void
 symbols_check_defined (void)
 {
-  symbols_do (symbol_check_defined_processor, NULL,
-              symbol_table, &symbols_sorted);
-  symbols_do (semantic_type_check_defined_processor, NULL,
-              semantic_type_table, &semantic_types_sorted);
+  table_sort (symbol_table, &symbols_sorted);
+  /* semantic_type, like symbol, starts with a 'tag' field and then a
+     'location' field.  And here we only deal with arrays/hashes of
+     pointers, sizeof is not an issue.
+
+     So instead of implementing table_sort (and symbol_cmp) once for
+     each type, let's lie a bit to the typing system, and treat
+     'semantic_type' as if it were 'symbol'. */
+  table_sort (semantic_type_table, (symbol ***) &semantic_types_sorted);
+
+  for (int i = 0; symbols_sorted[i]; ++i)
+    symbol_check_defined (symbols_sorted[i]);
+  for (int i = 0; semantic_types_sorted[i]; ++i)
+    semantic_type_check_defined (semantic_types_sorted[i]);
 }
 
 /*------------------------------------------------------------------.
@@ -978,7 +1062,13 @@ symbols_token_translations_init (void)
     {
       sym_content *this = symbols[i]->content;
       if (this->user_token_number == USER_NUMBER_UNDEFINED)
-        this->user_token_number = ++max_user_token_number;
+        {
+          IGNORE_TYPE_LIMITS_BEGIN
+          if (INT_ADD_WRAPV (max_user_token_number, 1, &max_user_token_number))
+            complain (NULL, fatal, _("token number too large"));
+          IGNORE_TYPE_LIMITS_END
+          this->user_token_number = max_user_token_number;
+        }
       if (this->user_token_number > max_user_token_number)
         max_user_token_number = this->user_token_number;
     }
@@ -988,10 +1078,10 @@ symbols_token_translations_init (void)
 
   /* Initialize all entries for literal tokens to the internal token
      number for $undefined, which represents all invalid inputs.  */
-  for (int i = 0; i < max_user_token_number + 1; i++)
+  for (int i = 0; i < max_user_token_number + 1; ++i)
     token_translations[i] = undeftoken->content->number;
-  symbols_do (symbol_translation_processor, NULL,
-              symbol_table, &symbols_sorted);
+  for (int i = 0; symbols_sorted[i]; ++i)
+    symbol_translation (symbols_sorted[i]);
 }
 
 
@@ -1004,7 +1094,8 @@ void
 symbols_pack (void)
 {
   symbols = xcalloc (nsyms, sizeof *symbols);
-  symbols_do (symbol_pack_processor, NULL, symbol_table, &symbols_sorted);
+  for (int i = 0; symbols_sorted[i]; ++i)
+    symbol_pack (symbols_sorted[i]);
 
   /* Aliases leave empty slots in symbols, so remove them.  */
   {
@@ -1029,11 +1120,11 @@ symbols_pack (void)
   symbols_token_translations_init ();
 
   if (startsymbol->content->class == unknown_sym)
-    complain (&startsymbol_location, fatal,
+    complain (&startsymbol_loc, fatal,
               _("the start symbol %s is undefined"),
               startsymbol->tag);
   else if (startsymbol->content->class == token_sym)
-    complain (&startsymbol_location, fatal,
+    complain (&startsymbol_loc, fatal,
               _("the start symbol %s is a token"),
               startsymbol->tag);
 }
@@ -1204,14 +1295,14 @@ print_precedence_warnings (void)
           && !prec_nodes[i]->succ)
         {
           if (is_assoc_useless (s))
-            complain (&s->content->prec_location, Wprecedence,
+            complain (&s->content->prec_loc, Wprecedence,
                       _("useless precedence and associativity for %s"), s->tag);
           else if (s->content->assoc == precedence_assoc)
-            complain (&s->content->prec_location, Wprecedence,
+            complain (&s->content->prec_loc, Wprecedence,
                       _("useless precedence for %s"), s->tag);
         }
       else if (is_assoc_useless (s))
-        complain (&s->content->prec_location, Wprecedence,
+        complain (&s->content->prec_loc, Wprecedence,
                   _("useless associativity for %s, use %%precedence"), s->tag);
     }
   free (used_assoc);
diff --git a/contrib/tools/bison/src/symtab.h b/contrib/tools/bison/src/symtab.h
index c22811265d2a..f3421774df64 100644
--- a/contrib/tools/bison/src/symtab.h
+++ b/contrib/tools/bison/src/symtab.h
@@ -1,6 +1,6 @@
 /* Definitions for symtab.c and callers, part of Bison.
 
-   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2015, 2018-2019 Free
+   Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2015, 2018-2020 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -38,9 +38,15 @@
 /** Symbol classes.  */
 typedef enum
 {
-  unknown_sym,          /**< Undefined.  */
-  token_sym,            /**< Terminal. */
-  nterm_sym             /**< Nonterminal. */
+  /** Undefined.  */
+  unknown_sym,
+  /** Declared with %type: same as Undefined, but triggered a Wyacc if
+      applied to a terminal. */
+  pct_type_sym,
+  /** Terminal. */
+  token_sym,
+  /** Nonterminal. */
+  nterm_sym
 } symbol_class;
 
 
@@ -72,7 +78,7 @@ typedef enum
     needed,
     /** Defined with %type or %token (good).  */
     declared,
-  } status;
+  } declaration_status;
 
 enum code_props_type
   {
@@ -122,9 +128,9 @@ struct sym_content
   uniqstr type_name;
 
   /** Its \c \%type's location.  */
-  location type_location;
+  location type_loc;
 
-  /** Any \c \%destructor (resp. \%printer) declared specificially for this
+  /** Any \c \%destructor (resp. \%printer) declared specifically for this
       symbol.
 
       Access this field only through <tt>symbol</tt>'s interface functions. For
@@ -134,7 +140,7 @@ struct sym_content
   code_props props[CODE_PROPS_SIZE];
 
   symbol_number number;
-  location prec_location;
+  location prec_loc;
   int prec;
   assoc assoc;
 
@@ -144,7 +150,7 @@ struct sym_content
   int user_token_number;
 
   symbol_class class;
-  status status;
+  declaration_status status;
 };
 
 /** Undefined user number.  */
@@ -219,7 +225,8 @@ void symbol_precedence_set (symbol *sym, int prec, assoc a, location loc);
 /** Set the \c class associated with \c sym.
 
     Whether \c declaring means whether this class definition comes
-    from %nterm or %token.  */
+    from %nterm or %token (but not %type, prec/assoc, etc.).  A symbol
+    can have "declaring" set only at most once.  */
 void symbol_class_set (symbol *sym, symbol_class class, location loc,
                        bool declaring);
 
@@ -246,7 +253,7 @@ extern symbol *accept;
 /** The user start symbol. */
 extern symbol *startsymbol;
 /** The location of the \c \%start declaration.  */
-extern location startsymbol_location;
+extern location startsymbol_loc;
 
 /** Whether a symbol declared with a type tag.  */
 extern bool tag_seen;
@@ -321,7 +328,7 @@ typedef struct {
 
   /** Its status : "undeclared", "used" or "declared".
       It cannot be "needed".  */
-  status status;
+  declaration_status status;
 
   /** Any \c %destructor and %printer declared for this
       semantic type.  */
@@ -345,7 +352,8 @@ void semantic_type_code_props_set (semantic_type *type,
 | Symbol and semantic type tables.  |
 `----------------------------------*/
 
-/** Create the symbol and semantic type tables.  */
+/** Create the symbol and semantic type tables, and the built-in
+    symbols.  */
 void symbols_new (void);
 
 /** Free all the memory allocated for symbols and semantic types.  */
diff --git a/contrib/tools/bison/src/system.h b/contrib/tools/bison/src/system.h
index 8a82c788e0bf..606d3c466813 100644
--- a/contrib/tools/bison/src/system.h
+++ b/contrib/tools/bison/src/system.h
@@ -1,6 +1,6 @@
 /* System-dependent definitions for Bison.
 
-   Copyright (C) 2000-2007, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2000-2007, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -73,6 +73,24 @@ typedef size_t uintptr_t;
 # include <verify.h>
 # include <xalloc.h>
 
+// Clang and ICC like to pretend they are GCC.
+# if defined __GNUC__ && !defined __clang__ && !defined __ICC
+#  define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+# endif
+
+// See https://lists.gnu.org/archive/html/bug-bison/2019-10/msg00061.html
+// and https://trac.macports.org/ticket/59927.
+# if defined GCC_VERSION && 405 <= GCC_VERSION
+#  define IGNORE_TYPE_LIMITS_BEGIN \
+     _Pragma ("GCC diagnostic push") \
+     _Pragma ("GCC diagnostic ignored \"-Wtype-limits\"")
+#  define IGNORE_TYPE_LIMITS_END \
+     _Pragma ("GCC diagnostic pop")
+# else
+#  define IGNORE_TYPE_LIMITS_BEGIN
+#  define IGNORE_TYPE_LIMITS_END
+# endif
+
 
 /*-----------------.
 | GCC extensions.  |
@@ -196,10 +214,10 @@ typedef size_t uintptr_t;
 
 /* Output Str both quoted for M4 (i.e., embed in [[...]]), and escaped
    for our postprocessing (i.e., escape M4 special characters).  If
-   Str is empty (or NULL), output "[]" instead of "[[]]" as it make M4
-   programming easier (m4_ifval can be used).
+   Str is empty (or NULL), output "[]" instead of "[[]]" as it makes
+   M4 programming easier (m4_ifval can be used).
 
-   For instance "[foo]" -> "[[@{foo@}]]", "$$" -> "[[$][$][]]". */
+   For instance "[foo]" -> "[[@{foo@}]]", "$$" -> "[[$][$][]]".  */
 
 # define obstack_quote(Obs, Str)                \
   do {                                          \
@@ -249,14 +267,4 @@ typedef size_t uintptr_t;
       }                                         \
   } while (0)
 
-
-/*---------------------------------------------.
-| Debugging memory allocation (must be last).  |
-`---------------------------------------------*/
-
-# if WITH_DMALLOC
-#  define DMALLOC_FUNC_CHECK
-#  include <dmalloc.h>
-# endif /* WITH_DMALLOC */
-
 #endif  /* ! BISON_SYSTEM_H */
diff --git a/contrib/tools/bison/src/tables.c b/contrib/tools/bison/src/tables.c
index 30849c33b57f..b6a8404ae6e7 100644
--- a/contrib/tools/bison/src/tables.c
+++ b/contrib/tools/bison/src/tables.c
@@ -1,6 +1,6 @@
 /* Output the generated parsing program for Bison.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2015, 2018-2019
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2015, 2018-2020
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,6 +21,7 @@
 #include <config.h>
 #include "system.h"
 
+#include <bitset.h>
 #include <bitsetv.h>
 
 #include "complain.h"
@@ -83,7 +84,7 @@ int nvectors;
 
 static base_number **froms;
 static base_number **tos;
-static unsigned **conflict_tos;
+static int **conflict_tos;
 static size_t *tally;
 static base_number *width;
 
@@ -110,11 +111,13 @@ base_number *base = NULL;
    computation equals to BASE_MINIMUM, later mapped to BASE_NINF to
    keep parser tables small.  */
 base_number base_ninf = 0;
-static base_number *pos = NULL;
+/* Bitset representing an integer set in the range
+   -nstates..table_size (as an upper bound) */
+static bitset pos_set = NULL;
 
-static unsigned *conflrow;
-unsigned *conflict_table;
-unsigned *conflict_list;
+static int *conflrow;
+int *conflict_table;
+int *conflict_list;
 int conflict_list_cnt;
 static int conflict_list_free;
 
@@ -150,20 +153,23 @@ table_grow (int desired)
     table_size *= 2;
 
   if (trace_flag & trace_resource)
-    fprintf (stderr, "growing table and check from: %d to %d\n",
+    fprintf (stderr, "growing tables from %d to %d\n",
              old_size, table_size);
 
   table = xnrealloc (table, table_size, sizeof *table);
+  memset (table + old_size, 0,
+          sizeof *table * (table_size - old_size));
+
   conflict_table = xnrealloc (conflict_table, table_size,
                               sizeof *conflict_table);
+  memset (conflict_table + old_size, 0,
+          sizeof *conflict_table * (table_size - old_size));
+
   check = xnrealloc (check, table_size, sizeof *check);
+  for (int i = old_size; i < table_size; ++i)
+    check[i] = -1;
 
-  for (/* Nothing. */; old_size < table_size; ++old_size)
-    {
-      table[old_size] = 0;
-      conflict_table[old_size] = 0;
-      check[old_size] = -1;
-    }
+  bitset_resize (pos_set, table_size + nstates);
 }
 
 
@@ -236,22 +242,16 @@ conflict_row (state *s)
 static rule *
 action_row (state *s)
 {
-  rule *default_reduction = NULL;
-  reductions *reds = s->reductions;
-  transitions *trans = s->transitions;
-  errs *errp = s->errs;
-  /* Set to nonzero to inhibit having any default reduction.  */
-  bool nodefault = false;
-  bool conflicted = false;
-
   for (state_number i = 0; i < ntokens; i++)
     actrow[i] = conflrow[i] = 0;
 
+  reductions *reds = s->reductions;
+  bool conflicted = false;
   if (reds->lookahead_tokens)
     /* loop over all the rules available here which require
        lookahead (in reverse order to give precedence to the first
        rule) */
-    for (int i = reds->num - 1; i >= 0; --i)
+    for (int i = reds->num - 1; 0 <= i; --i)
       /* and find each token which the rule finds acceptable
          to come next */
       {
@@ -273,6 +273,9 @@ action_row (state *s)
   /* Now see which tokens are allowed for shifts in this state.  For
      them, record the shift as the thing to do.  So shift is preferred
      to reduce.  */
+  transitions *trans = s->transitions;
+  /* Set to nonzero to inhibit having any default reduction.  */
+  bool nodefault = false;
   {
     int i;
     FOR_EACH_SHIFT (trans, i)
@@ -297,6 +300,7 @@ action_row (state *s)
   /* See which tokens are an explicit error in this state (due to
      %nonassoc).  For them, record ACTION_NUMBER_MINIMUM as the
      action.  */
+  errs *errp = s->errs;
   for (int i = 0; i < errp->num; i++)
     {
       symbol *sym = errp->symbols[i];
@@ -316,7 +320,7 @@ action_row (state *s)
 
   /* Now find the most common reduction and make it the default action
      for this state.  */
-
+  rule *default_reduction = NULL;
   if (reds->num >= 1 && !nodefault)
     {
       if (s->consistent)
@@ -345,14 +349,12 @@ action_row (state *s)
              actions that match the default are replaced with zero,
              which means "use the default". */
 
-          if (max > 0)
-            {
-              for (symbol_number j = 0; j < ntokens; j++)
-                if (actrow[j]
-                    == rule_number_as_item_number (default_reduction->number)
-                    && ! (nondeterministic_parser && conflrow[j]))
-                  actrow[j] = 0;
-            }
+          if (0 < max)
+            for (symbol_number j = 0; j < ntokens; j++)
+              if (actrow[j]
+                  == rule_number_as_item_number (default_reduction->number)
+                  && ! (nondeterministic_parser && conflrow[j]))
+                actrow[j] = 0;
         }
     }
 
@@ -389,7 +391,7 @@ save_row (state_number s)
       /* Allocate non defaulted actions.  */
       base_number *sp1 = froms[s] = xnmalloc (count, sizeof *sp1);
       base_number *sp2 = tos[s] = xnmalloc (count, sizeof *sp2);
-      unsigned *sp3 = conflict_tos[s] =
+      int *sp3 = conflict_tos[s] =
         nondeterministic_parser ? xnmalloc (count, sizeof *sp3) : NULL;
 
       /* Store non defaulted actions.  */
@@ -606,7 +608,6 @@ matching_state (vector_number vector)
     {
       size_t t = tally[i];
       int w = width[i];
-      int prev;
 
       /* If VECTOR has GLR conflicts, return -1 */
       if (conflict_tos[i] != NULL)
@@ -614,7 +615,7 @@ matching_state (vector_number vector)
           if (conflict_tos[i][j] != 0)
             return -1;
 
-      for (prev = vector - 1; 0 <= prev; prev--)
+      for (int prev = vector - 1; 0 <= prev; prev--)
         {
           vector_number j = order[prev];
           /* Given how ORDER was computed, if the WIDTH or TALLY is
@@ -645,7 +646,7 @@ pack_vector (vector_number vector)
   size_t t = tally[i];
   base_number *from = froms[i];
   base_number *to = tos[i];
-  unsigned *conflict_to = conflict_tos[i];
+  int *conflict_to = conflict_tos[i];
 
   aver (t != 0);
 
@@ -664,10 +665,8 @@ pack_vector (vector_number vector)
               ok = false;
           }
 
-        if (ok)
-          for (int k = 0; k < vector; k++)
-            if (pos[k] == res)
-              ok = false;
+        if (ok && bitset_test (pos_set, nstates + res))
+          ok = false;
       }
 
       if (ok)
@@ -725,7 +724,7 @@ static void
 pack_table (void)
 {
   base = xnmalloc (nvectors, sizeof *base);
-  pos = xnmalloc (nentries, sizeof *pos);
+  pos_set = bitset_create (table_size + nstates, BITSET_FRUGAL);
   table = xcalloc (table_size, sizeof *table);
   conflict_table = xcalloc (table_size, sizeof *conflict_table);
   check = xnmalloc (table_size, sizeof *check);
@@ -751,7 +750,12 @@ pack_table (void)
         /* Action of I were already coded for S.  */
         place = base[s];
 
-      pos[i] = place;
+      /* Store PLACE into POS_SET.  PLACE might not belong to the set
+         of possible values for instance with useless tokens.  It
+         would be more satisfying to eliminate the need for this
+         'if'.  */
+      if (0 <= nstates + place)
+        bitset_set (pos_set, nstates + place);
       base[order[i]] = place;
     }
 
@@ -759,7 +763,7 @@ pack_table (void)
   base_ninf = table_ninf_remap (base, nvectors, BASE_MINIMUM);
   table_ninf = table_ninf_remap (table, high + 1, ACTION_NUMBER_MINIMUM);
 
-  free (pos);
+  bitset_free (pos_set);
 }
 
 
diff --git a/contrib/tools/bison/src/tables.h b/contrib/tools/bison/src/tables.h
index 0504e38c46e2..b0d420ad13de 100644
--- a/contrib/tools/bison/src/tables.h
+++ b/contrib/tools/bison/src/tables.h
@@ -1,6 +1,6 @@
 /* Prepare the LALR and GLR parser tables.
 
-   Copyright (C) 2002, 2004, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002, 2004, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -122,8 +122,8 @@ extern base_number *base;
    keep parser tables small.  */
 extern base_number base_ninf;
 
-extern unsigned *conflict_table;
-extern unsigned *conflict_list;
+extern int *conflict_table;
+extern int *conflict_list;
 extern int conflict_list_cnt;
 
 extern base_number *table;
diff --git a/contrib/tools/bison/src/uniqstr.c b/contrib/tools/bison/src/uniqstr.c
index f654d55ef178..d16e254a60cb 100644
--- a/contrib/tools/bison/src/uniqstr.c
+++ b/contrib/tools/bison/src/uniqstr.c
@@ -1,6 +1,6 @@
 /* Keep a unique copy of strings.
 
-   Copyright (C) 2002-2005, 2009-2015, 2018-2019 Free Software
+   Copyright (C) 2002-2005, 2009-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -157,11 +157,11 @@ hash_uniqstr (void const *m, size_t tablesize)
 void
 uniqstrs_new (void)
 {
-  uniqstrs_table = hash_initialize (HT_INITIAL_CAPACITY,
-                                    NULL,
-                                    hash_uniqstr,
-                                    hash_compare_uniqstr,
-                                    free);
+  uniqstrs_table = hash_xinitialize (HT_INITIAL_CAPACITY,
+                                     NULL,
+                                     hash_uniqstr,
+                                     hash_compare_uniqstr,
+                                     free);
 }
 
 
diff --git a/contrib/tools/bison/src/uniqstr.h b/contrib/tools/bison/src/uniqstr.h
index 1fd731807f26..8f61ef4be1eb 100644
--- a/contrib/tools/bison/src/uniqstr.h
+++ b/contrib/tools/bison/src/uniqstr.h
@@ -1,6 +1,6 @@
 /* Keeping a unique copy of strings.
 
-   Copyright (C) 2002-2003, 2008-2015, 2018-2019 Free Software
+   Copyright (C) 2002-2003, 2008-2015, 2018-2020 Free Software
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
diff --git a/contrib/tools/bison/ya.make b/contrib/tools/bison/ya.make
index 1fc51ad5ab12..975025a0e13f 100644
--- a/contrib/tools/bison/ya.make
+++ b/contrib/tools/bison/ya.make
@@ -3,6 +3,7 @@
 PROGRAM(bison)
 
 LICENSE(
+    Bison-exception-2.2 AND
     GPL-3.0-only AND
     GPL-3.0-or-later AND
     GPL-3.0-or-later WITH Bison-exception-2.2
@@ -10,9 +11,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(3.3.2)
+VERSION(3.5.4)
 
-ORIGINAL_SOURCE(mirror://gnu/bison/bison-3.3.2.tar.gz)
+ORIGINAL_SOURCE(mirror://gnu/bison/bison-3.5.4.tar.gz)
 
 PEERDIR(
     contrib/tools/bison/lib
@@ -29,7 +30,7 @@ NO_RUNTIME()
 
 CFLAGS(
     -DEXEEXT=\"\"
-    -DINSTALLDIR=\"/var/empty/bison-3.3.2/bin\"
+    -DINSTALLDIR=\"/var/empty/bison-3.5.4/bin\"
     -DBISON_DATA_DIR=contrib/tools/bison/data
 )
 
@@ -37,7 +38,6 @@ SRCS(
     arcadia_root.cpp.in
     src/AnnotationList.c
     src/InadequacyList.c
-    src/LR0.c
     src/Sbitset.c
     src/assoc.c
     src/closure.c
@@ -52,15 +52,16 @@ SRCS(
     src/ielr.c
     src/lalr.c
     src/location.c
+    src/lr0.c
     src/main.c
     src/muscle-tab.c
     src/named-ref.c
     src/nullable.c
     src/output.c
     src/parse-gram.c
+    src/print-graph.c
     src/print-xml.c
     src/print.c
-    src/print_graph.c
     src/reader.c
     src/reduce.c
     src/relation.c

From 55c4d6e43a8d293d088b2501098a802a40cade9a Mon Sep 17 00:00:00 2001
From: nechda <nechda@yandex-team.com>
Date: Sun, 4 Aug 2024 11:39:23 +0300
Subject: [PATCH 035/104] Append Y_ prefix for ANNOTATE* macro
 d0e25a75f327b12876f6c11ca30660f3b99a4c71

---
 .../base/internal/dynamic_annotations.h       | 124 +++++++++---------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/dynamic_annotations.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/dynamic_annotations.h
index 2ac2679133ea..7233cde126d2 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/dynamic_annotations.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/dynamic_annotations.h
@@ -21,7 +21,7 @@
 // in the program.
 //
 // The annotations that should be used by users are macros in all upper-case
-// (e.g., ANNOTATE_THREAD_NAME).
+// (e.g., Y_ANNOTATE_THREAD_NAME).
 //
 // Actual implementation of these macros may differ depending on the dynamic
 // analysis tool being used.
@@ -122,21 +122,21 @@
 // Report that we may have a benign race at `pointer`, with size
 // "sizeof(*(pointer))". `pointer` must be a non-void* pointer. Insert at the
 // point where `pointer` has been allocated, preferably close to the point
-// where the race happens. See also ANNOTATE_BENIGN_RACE_STATIC.
-#define ANNOTATE_BENIGN_RACE(pointer, description)     \
+// where the race happens. See also Y_ANNOTATE_BENIGN_RACE_STATIC.
+#define Y_ANNOTATE_BENIGN_RACE(pointer, description)     \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateBenignRaceSized) \
   (__FILE__, __LINE__, pointer, sizeof(*(pointer)), description)
 
-// Same as ANNOTATE_BENIGN_RACE(`address`, `description`), but applies to
+// Same as Y_ANNOTATE_BENIGN_RACE(`address`, `description`), but applies to
 // the memory range [`address`, `address`+`size`).
-#define ANNOTATE_BENIGN_RACE_SIZED(address, size, description) \
+#define Y_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateBenignRaceSized)         \
   (__FILE__, __LINE__, address, size, description)
 
 // Enable (`enable`!=0) or disable (`enable`==0) race detection for all threads.
 // This annotation could be useful if you want to skip expensive race analysis
 // during some period of program execution, e.g. during initialization.
-#define ANNOTATE_ENABLE_RACE_DETECTION(enable)             \
+#define Y_ANNOTATE_ENABLE_RACE_DETECTION(enable)             \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateEnableRaceDetection) \
   (__FILE__, __LINE__, enable)
 
@@ -144,7 +144,7 @@
 // Annotations useful for debugging.
 
 // Report the current thread `name` to a race detector.
-#define ANNOTATE_THREAD_NAME(name) \
+#define Y_ANNOTATE_THREAD_NAME(name) \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateThreadName)(__FILE__, __LINE__, name)
 
 // -------------------------------------------------------------
@@ -153,41 +153,41 @@
 // object.
 
 // Report that a lock has been created at address `lock`.
-#define ANNOTATE_RWLOCK_CREATE(lock) \
+#define Y_ANNOTATE_RWLOCK_CREATE(lock) \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateRWLockCreate)(__FILE__, __LINE__, lock)
 
 // Report that a linker initialized lock has been created at address `lock`.
 #ifdef Y_ABSL_HAVE_THREAD_SANITIZER
-#define ANNOTATE_RWLOCK_CREATE_STATIC(lock)               \
+#define Y_ANNOTATE_RWLOCK_CREATE_STATIC(lock)               \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateRWLockCreateStatic) \
   (__FILE__, __LINE__, lock)
 #else
-#define ANNOTATE_RWLOCK_CREATE_STATIC(lock) ANNOTATE_RWLOCK_CREATE(lock)
+#define Y_ANNOTATE_RWLOCK_CREATE_STATIC(lock) Y_ANNOTATE_RWLOCK_CREATE(lock)
 #endif
 
 // Report that the lock at address `lock` is about to be destroyed.
-#define ANNOTATE_RWLOCK_DESTROY(lock) \
+#define Y_ANNOTATE_RWLOCK_DESTROY(lock) \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateRWLockDestroy)(__FILE__, __LINE__, lock)
 
 // Report that the lock at address `lock` has been acquired.
 // `is_w`=1 for writer lock, `is_w`=0 for reader lock.
-#define ANNOTATE_RWLOCK_ACQUIRED(lock, is_w)          \
+#define Y_ANNOTATE_RWLOCK_ACQUIRED(lock, is_w)          \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateRWLockAcquired) \
   (__FILE__, __LINE__, lock, is_w)
 
 // Report that the lock at address `lock` is about to be released.
 // `is_w`=1 for writer lock, `is_w`=0 for reader lock.
-#define ANNOTATE_RWLOCK_RELEASED(lock, is_w)          \
+#define Y_ANNOTATE_RWLOCK_RELEASED(lock, is_w)          \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateRWLockReleased) \
   (__FILE__, __LINE__, lock, is_w)
 
-// Apply ANNOTATE_BENIGN_RACE_SIZED to a static variable `static_var`.
-#define ANNOTATE_BENIGN_RACE_STATIC(static_var, description)      \
+// Apply Y_ANNOTATE_BENIGN_RACE_SIZED to a static variable `static_var`.
+#define Y_ANNOTATE_BENIGN_RACE_STATIC(static_var, description)      \
   namespace {                                                     \
   class static_var##_annotator {                                  \
    public:                                                        \
     static_var##_annotator() {                                    \
-      ANNOTATE_BENIGN_RACE_SIZED(&static_var, sizeof(static_var), \
+      Y_ANNOTATE_BENIGN_RACE_SIZED(&static_var, sizeof(static_var), \
                                  #static_var ": " description);   \
     }                                                             \
   };                                                              \
@@ -196,16 +196,16 @@
 
 #else  // Y_ABSL_INTERNAL_RACE_ANNOTATIONS_ENABLED == 0
 
-#define ANNOTATE_RWLOCK_CREATE(lock)                            // empty
-#define ANNOTATE_RWLOCK_CREATE_STATIC(lock)                     // empty
-#define ANNOTATE_RWLOCK_DESTROY(lock)                           // empty
-#define ANNOTATE_RWLOCK_ACQUIRED(lock, is_w)                    // empty
-#define ANNOTATE_RWLOCK_RELEASED(lock, is_w)                    // empty
-#define ANNOTATE_BENIGN_RACE(address, description)              // empty
-#define ANNOTATE_BENIGN_RACE_SIZED(address, size, description)  // empty
-#define ANNOTATE_THREAD_NAME(name)                              // empty
-#define ANNOTATE_ENABLE_RACE_DETECTION(enable)                  // empty
-#define ANNOTATE_BENIGN_RACE_STATIC(static_var, description)    // empty
+#define Y_ANNOTATE_RWLOCK_CREATE(lock)                            // empty
+#define Y_ANNOTATE_RWLOCK_CREATE_STATIC(lock)                     // empty
+#define Y_ANNOTATE_RWLOCK_DESTROY(lock)                           // empty
+#define Y_ANNOTATE_RWLOCK_ACQUIRED(lock, is_w)                    // empty
+#define Y_ANNOTATE_RWLOCK_RELEASED(lock, is_w)                    // empty
+#define Y_ANNOTATE_BENIGN_RACE(address, description)              // empty
+#define Y_ANNOTATE_BENIGN_RACE_SIZED(address, size, description)  // empty
+#define Y_ANNOTATE_THREAD_NAME(name)                              // empty
+#define Y_ANNOTATE_ENABLE_RACE_DETECTION(enable)                  // empty
+#define Y_ANNOTATE_BENIGN_RACE_STATIC(static_var, description)    // empty
 
 #endif  // Y_ABSL_INTERNAL_RACE_ANNOTATIONS_ENABLED
 
@@ -216,28 +216,28 @@
 
 #include <sanitizer/msan_interface.h>
 
-#define ANNOTATE_MEMORY_IS_INITIALIZED(address, size) \
+#define Y_ANNOTATE_MEMORY_IS_INITIALIZED(address, size) \
   __msan_unpoison(address, size)
 
-#define ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size) \
+#define Y_ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size) \
   __msan_allocated_memory(address, size)
 
 #else  // Y_ABSL_INTERNAL_MEMORY_ANNOTATIONS_ENABLED == 0
 
 #if DYNAMIC_ANNOTATIONS_ENABLED == 1
-#define ANNOTATE_MEMORY_IS_INITIALIZED(address, size) \
+#define Y_ANNOTATE_MEMORY_IS_INITIALIZED(address, size) \
   do {                                                \
     (void)(address);                                  \
     (void)(size);                                     \
   } while (0)
-#define ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size) \
+#define Y_ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size) \
   do {                                                  \
     (void)(address);                                    \
     (void)(size);                                       \
   } while (0)
 #else
-#define ANNOTATE_MEMORY_IS_INITIALIZED(address, size)    // empty
-#define ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size)  // empty
+#define Y_ANNOTATE_MEMORY_IS_INITIALIZED(address, size)    // empty
+#define Y_ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size)  // empty
 #endif
 
 #endif  // Y_ABSL_INTERNAL_MEMORY_ANNOTATIONS_ENABLED
@@ -265,14 +265,14 @@
 #if Y_ABSL_INTERNAL_READS_ANNOTATIONS_ENABLED == 1
 
 // Request the analysis tool to ignore all reads in the current thread until
-// ANNOTATE_IGNORE_READS_END is called. Useful to ignore intentional racey
+// Y_ANNOTATE_IGNORE_READS_END is called. Useful to ignore intentional racey
 // reads, while still checking other reads and all writes.
-// See also ANNOTATE_UNPROTECTED_READ.
-#define ANNOTATE_IGNORE_READS_BEGIN() \
+// See also Y_ANNOTATE_UNPROTECTED_READ.
+#define Y_ANNOTATE_IGNORE_READS_BEGIN() \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateIgnoreReadsBegin)(__FILE__, __LINE__)
 
 // Stop ignoring reads.
-#define ANNOTATE_IGNORE_READS_END() \
+#define Y_ANNOTATE_IGNORE_READS_END() \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateIgnoreReadsEnd)(__FILE__, __LINE__)
 
 #elif defined(Y_ABSL_INTERNAL_ANNOTALYSIS_ENABLED)
@@ -284,16 +284,16 @@
 // TODO(delesley) -- The exclusive lock here ignores writes as well, but
 // allows IGNORE_READS_AND_WRITES to work properly.
 
-#define ANNOTATE_IGNORE_READS_BEGIN() \
+#define Y_ANNOTATE_IGNORE_READS_BEGIN() \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AbslInternalAnnotateIgnoreReadsBegin)()
 
-#define ANNOTATE_IGNORE_READS_END() \
+#define Y_ANNOTATE_IGNORE_READS_END() \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AbslInternalAnnotateIgnoreReadsEnd)()
 
 #else
 
-#define ANNOTATE_IGNORE_READS_BEGIN()  // empty
-#define ANNOTATE_IGNORE_READS_END()    // empty
+#define Y_ANNOTATE_IGNORE_READS_BEGIN()  // empty
+#define Y_ANNOTATE_IGNORE_READS_END()    // empty
 
 #endif
 
@@ -302,60 +302,60 @@
 
 #if Y_ABSL_INTERNAL_WRITES_ANNOTATIONS_ENABLED == 1
 
-// Similar to ANNOTATE_IGNORE_READS_BEGIN, but ignore writes instead.
-#define ANNOTATE_IGNORE_WRITES_BEGIN() \
+// Similar to Y_ANNOTATE_IGNORE_READS_BEGIN, but ignore writes instead.
+#define Y_ANNOTATE_IGNORE_WRITES_BEGIN() \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateIgnoreWritesBegin)(__FILE__, __LINE__)
 
 // Stop ignoring writes.
-#define ANNOTATE_IGNORE_WRITES_END() \
+#define Y_ANNOTATE_IGNORE_WRITES_END() \
   Y_ABSL_INTERNAL_GLOBAL_SCOPED(AnnotateIgnoreWritesEnd)(__FILE__, __LINE__)
 
 #else
 
-#define ANNOTATE_IGNORE_WRITES_BEGIN()  // empty
-#define ANNOTATE_IGNORE_WRITES_END()    // empty
+#define Y_ANNOTATE_IGNORE_WRITES_BEGIN()  // empty
+#define Y_ANNOTATE_IGNORE_WRITES_END()    // empty
 
 #endif
 
 // -------------------------------------------------------------------------
-// Define the ANNOTATE_IGNORE_READS_AND_WRITES_* annotations using the more
+// Define the Y_ANNOTATE_IGNORE_READS_AND_WRITES_* annotations using the more
 // primitive annotations defined above.
 //
 //     Instead of doing
-//        ANNOTATE_IGNORE_READS_BEGIN();
+//        Y_ANNOTATE_IGNORE_READS_BEGIN();
 //        ... = x;
-//        ANNOTATE_IGNORE_READS_END();
+//        Y_ANNOTATE_IGNORE_READS_END();
 //     one can use
-//        ... = ANNOTATE_UNPROTECTED_READ(x);
+//        ... = Y_ANNOTATE_UNPROTECTED_READ(x);
 
 #if defined(Y_ABSL_INTERNAL_READS_WRITES_ANNOTATIONS_ENABLED)
 
 // Start ignoring all memory accesses (both reads and writes).
-#define ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() \
+#define Y_ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() \
   do {                                           \
-    ANNOTATE_IGNORE_READS_BEGIN();               \
-    ANNOTATE_IGNORE_WRITES_BEGIN();              \
+    Y_ANNOTATE_IGNORE_READS_BEGIN();               \
+    Y_ANNOTATE_IGNORE_WRITES_BEGIN();              \
   } while (0)
 
 // Stop ignoring both reads and writes.
-#define ANNOTATE_IGNORE_READS_AND_WRITES_END() \
+#define Y_ANNOTATE_IGNORE_READS_AND_WRITES_END() \
   do {                                         \
-    ANNOTATE_IGNORE_WRITES_END();              \
-    ANNOTATE_IGNORE_READS_END();               \
+    Y_ANNOTATE_IGNORE_WRITES_END();              \
+    Y_ANNOTATE_IGNORE_READS_END();               \
   } while (0)
 
 #ifdef __cplusplus
-// ANNOTATE_UNPROTECTED_READ is the preferred way to annotate racey reads.
-#define ANNOTATE_UNPROTECTED_READ(x) \
+// Y_ANNOTATE_UNPROTECTED_READ is the preferred way to annotate racey reads.
+#define Y_ANNOTATE_UNPROTECTED_READ(x) \
   y_absl::base_internal::AnnotateUnprotectedRead(x)
 
 #endif
 
 #else
 
-#define ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN()  // empty
-#define ANNOTATE_IGNORE_READS_AND_WRITES_END()    // empty
-#define ANNOTATE_UNPROTECTED_READ(x) (x)
+#define Y_ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN()  // empty
+#define Y_ANNOTATE_IGNORE_READS_AND_WRITES_END()    // empty
+#define Y_ANNOTATE_UNPROTECTED_READ(x) (x)
 
 #endif
 
@@ -368,7 +368,7 @@
 // sanitizer/common_interface_defs.h, which is provided by the compiler.
 #include <sanitizer/common_interface_defs.h>
 
-#define ANNOTATE_CONTIGUOUS_CONTAINER(beg, end, old_mid, new_mid) \
+#define Y_ANNOTATE_CONTIGUOUS_CONTAINER(beg, end, old_mid, new_mid) \
   __sanitizer_annotate_contiguous_container(beg, end, old_mid, new_mid)
 #define ADDRESS_SANITIZER_REDZONE(name)    \
   struct {                                 \
@@ -377,7 +377,7 @@
 
 #else
 
-#define ANNOTATE_CONTIGUOUS_CONTAINER(beg, end, old_mid, new_mid)
+#define Y_ANNOTATE_CONTIGUOUS_CONTAINER(beg, end, old_mid, new_mid)
 #define ADDRESS_SANITIZER_REDZONE(name) static_assert(true, "")
 
 #endif  // Y_ABSL_HAVE_ADDRESS_SANITIZER

From e30f7061bad712a7934e383fef27613fc6a1b2d7 Mon Sep 17 00:00:00 2001
From: nechda <nechda@yandex-team.com>
Date: Sun, 4 Aug 2024 13:43:56 +0300
Subject: [PATCH 036/104] fix _io.TextIOWrapper.write() write during flush
 816f3097d548522bcfae2b763098747304285d0f

---
 contrib/tools/python3/Modules/_io/textio.c | 31 +++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/contrib/tools/python3/Modules/_io/textio.c b/contrib/tools/python3/Modules/_io/textio.c
index 14dd19d95c24..4a1ba22d381a 100644
--- a/contrib/tools/python3/Modules/_io/textio.c
+++ b/contrib/tools/python3/Modules/_io/textio.c
@@ -1723,16 +1723,26 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
         bytes_len = PyBytes_GET_SIZE(b);
     }
 
-    if (self->pending_bytes == NULL) {
-        self->pending_bytes_count = 0;
-        self->pending_bytes = b;
-    }
-    else if (self->pending_bytes_count + bytes_len > self->chunk_size) {
-        // Prevent to concatenate more than chunk_size data.
-        if (_textiowrapper_writeflush(self) < 0) {
-            Py_DECREF(b);
-            return NULL;
+    // We should avoid concatinating huge data.
+    // Flush the buffer before adding b to the buffer if b is not small.
+    // https://github.com/python/cpython/issues/87426
+    if (bytes_len >= self->chunk_size) {
+        // _textiowrapper_writeflush() calls buffer.write().
+        // self->pending_bytes can be appended during buffer->write()
+        // or other thread.
+        // We need to loop until buffer becomes empty.
+        // https://github.com/python/cpython/issues/118138
+        // https://github.com/python/cpython/issues/119506
+        while (self->pending_bytes != NULL) {
+            if (_textiowrapper_writeflush(self) < 0) {
+                Py_DECREF(b);
+                return NULL;
+            }
         }
+    }
+
+    if (self->pending_bytes == NULL) {
+        assert(self->pending_bytes_count == 0);
         self->pending_bytes = b;
     }
     else if (!PyList_CheckExact(self->pending_bytes)) {
@@ -1741,6 +1751,9 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
             Py_DECREF(b);
             return NULL;
         }
+        // Since Python 3.12, allocating GC object won't trigger GC and release
+        // GIL. See https://github.com/python/cpython/issues/97922
+        assert(!PyList_CheckExact(self->pending_bytes));
         PyList_SET_ITEM(list, 0, self->pending_bytes);
         PyList_SET_ITEM(list, 1, b);
         self->pending_bytes = list;

From df5a8e17b7f64a8c7086988670187d172bf9392a Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Sun, 4 Aug 2024 15:38:59 +0300
Subject: [PATCH 037/104] Update contrib/restricted/abseil-cpp to 20240722.0
 d546de87f4113d314e722b1646c13db9f6aa5026

---
 .../abseil-cpp/absl/algorithm/container.h     |   75 +-
 .../abseil-cpp/absl/algorithm/ya.make         |    4 +-
 .../abseil-cpp/absl/base/attributes.h         |   84 +
 .../restricted/abseil-cpp/absl/base/config.h  |   85 +-
 .../absl/base/dynamic_annotations.h           |   16 -
 .../absl/base/internal/nullability_impl.h     |    4 +-
 .../abseil-cpp/absl/base/internal/poison.cc   |   84 +
 .../abseil-cpp/absl/base/internal/poison.h    |   59 +
 .../abseil-cpp/absl/base/internal/spinlock.h  |   16 +-
 .../absl/base/internal/unscaledcycleclock.cc  |   12 -
 .../base/internal/unscaledcycleclock_config.h |    8 +-
 .../restricted/abseil-cpp/absl/base/macros.h  |   48 +
 .../abseil-cpp/absl/base/no_destructor.h      |   75 +-
 .../abseil-cpp/absl/base/nullability.h        |   40 +-
 .../abseil-cpp/absl/base/optimization.h       |   11 +
 .../restricted/abseil-cpp/absl/base/options.h |    2 +-
 .../abseil-cpp/absl/base/prefetch.h           |    2 +-
 .../restricted/abseil-cpp/absl/base/ya.make   |    1 +
 .../abseil-cpp/absl/container/flat_hash_map.h |   80 +-
 .../abseil-cpp/absl/container/flat_hash_set.h |   66 +-
 .../absl/container/hash_container_defaults.h  |   45 +
 .../absl/container/inlined_vector.h           |   13 +
 .../container/internal/common_policy_traits.h |   31 +-
 .../container/internal/compressed_tuple.h     |   31 +-
 .../container/internal/container_memory.h     |   35 +-
 .../internal/hash_function_defaults.h         |   69 +-
 .../container/internal/hash_policy_traits.h   |   50 +
 .../container/internal/hashtablez_sampler.cc  |   29 +-
 .../container/internal/hashtablez_sampler.h   |   34 +-
 .../absl/container/internal/inlined_vector.h  |   74 +-
 .../absl/container/internal/raw_hash_map.h    |   14 +-
 .../absl/container/internal/raw_hash_set.cc   |  405 +++-
 .../absl/container/internal/raw_hash_set.h    | 1757 ++++++++++++-----
 .../internal/crc32_x86_arm_combined_simd.h    |   36 +-
 .../absl/crc/internal/crc_cord_state.cc       |    7 +-
 .../absl/crc/internal/crc_memcpy_fallback.cc  |    3 +-
 .../internal/crc_memcpy_x86_arm_combined.cc   |   20 +-
 .../crc/internal/crc_non_temporal_memcpy.cc   |    2 +-
 .../absl/crc/internal/crc_x86_arm_combined.cc |   18 +-
 .../absl/crc/internal/non_temporal_memcpy.h   |   35 +-
 .../absl/debugging/failure_signal_handler.h   |    2 +-
 .../internal/bounded_utf8_length_sequence.h   |  126 ++
 .../internal/decode_rust_punycode.cc          |  258 +++
 .../debugging/internal/decode_rust_punycode.h |   55 +
 .../absl/debugging/internal/demangle.cc       | 1143 ++++++++++-
 .../absl/debugging/internal/demangle.h        |    3 +
 .../absl/debugging/internal/demangle_rust.cc  |  925 +++++++++
 .../absl/debugging/internal/demangle_rust.h   |   42 +
 .../absl/debugging/internal/elf_mem_image.cc  |   59 +-
 .../absl/debugging/internal/elf_mem_image.h   |   15 +-
 .../internal/stacktrace_aarch64-inl.inc       |   17 +-
 .../debugging/internal/utf8_for_code_point.cc |   70 +
 .../debugging/internal/utf8_for_code_point.h  |   47 +
 .../abseil-cpp/absl/debugging/ya.make         |    3 +
 .../abseil-cpp/absl/flags/commandlineflag.h   |   11 +
 .../restricted/abseil-cpp/absl/flags/flag.h   |    2 +
 .../abseil-cpp/absl/flags/internal/flag.cc    |  147 +-
 .../abseil-cpp/absl/flags/internal/flag.h     |  222 ++-
 .../abseil-cpp/absl/flags/reflection.cc       |   10 +
 .../absl/functional/any_invocable.h           |   16 +-
 .../absl/functional/internal/any_invocable.h  |   14 +-
 .../abseil-cpp/absl/functional/ya.make        |    4 +-
 .../abseil-cpp/absl/hash/internal/hash.cc     |    2 +-
 .../abseil-cpp/absl/hash/internal/hash.h      |   16 +-
 .../absl/hash/internal/low_level_hash.cc      |   88 +-
 .../absl/hash/internal/low_level_hash.h       |    4 +
 .../abseil-cpp/absl/log/absl_vlog_is_on.h     |    6 +-
 .../abseil-cpp/absl/log/die_if_null.h         |    2 +-
 .../restricted/abseil-cpp/absl/log/globals.h  |   43 +-
 .../abseil-cpp/absl/log/internal/check_op.cc  |   20 +
 .../abseil-cpp/absl/log/internal/check_op.h   |   84 +-
 .../abseil-cpp/absl/log/internal/conditions.h |    4 +-
 .../abseil-cpp/absl/log/internal/log_impl.h   |   46 +-
 .../absl/log/internal/log_message.cc          |  151 +-
 .../absl/log/internal/log_message.h           |   27 +-
 .../abseil-cpp/absl/log/internal/nullstream.h |   11 +-
 .../abseil-cpp/absl/log/internal/strip.h      |   36 +
 contrib/restricted/abseil-cpp/absl/log/log.h  |    6 +-
 .../restricted/abseil-cpp/absl/log/log_sink.h |   15 +-
 .../abseil-cpp/absl/log/vlog_is_on.h          |   72 -
 .../restricted/abseil-cpp/absl/memory/ya.make |    4 +-
 .../abseil-cpp/absl/meta/type_traits.h        |  180 +-
 .../restricted/abseil-cpp/absl/meta/ya.make   |    4 +-
 .../abseil-cpp/absl/numeric/int128.cc         |    3 -
 .../abseil-cpp/absl/numeric/int128.h          |   40 +-
 .../absl/numeric/int128_have_intrinsic.inc    |   14 +
 .../absl/numeric/int128_no_intrinsic.inc      |   18 +
 .../abseil-cpp/absl/numeric/internal/bits.h   |    8 +-
 .../profiling/internal/periodic_sampler.h     |    2 +-
 .../abseil-cpp/absl/random/seed_sequences.h   |    2 +
 .../absl/status/internal/statusor_internal.h  |   63 +-
 .../abseil-cpp/absl/status/status.cc          |    4 -
 .../abseil-cpp/absl/status/status.h           |    8 +-
 .../abseil-cpp/absl/status/statusor.h         |  250 +--
 .../abseil-cpp/absl/strings/ascii.cc          |  103 +-
 .../abseil-cpp/absl/strings/cord.cc           |   35 +-
 .../restricted/abseil-cpp/absl/strings/cord.h |   75 +-
 .../abseil-cpp/absl/strings/escaping.cc       |   91 +-
 .../abseil-cpp/absl/strings/escaping.h        |   33 +-
 .../absl/strings/has_absl_stringify.h         |    1 +
 .../absl/strings/internal/charconv_bigint.h   |   10 +
 .../absl/strings/internal/cord_internal.h     |   38 +-
 .../absl/strings/internal/cord_rep_btree.h    |    4 +-
 .../absl/strings/internal/cordz_functions.cc  |   32 +-
 .../absl/strings/internal/cordz_functions.h   |   36 +-
 .../absl/strings/internal/cordz_handle.cc     |   48 +-
 .../absl/strings/internal/cordz_info.cc       |   19 +-
 .../absl/strings/internal/cordz_info.h        |   13 +-
 .../absl/strings/internal/escaping.cc         |    7 +-
 .../absl/strings/internal/str_join_internal.h |   25 +-
 .../strings/internal/str_split_internal.h     |    6 +-
 .../abseil-cpp/absl/strings/numbers.cc        |  440 +----
 .../abseil-cpp/absl/strings/numbers.h         |  163 +-
 .../abseil-cpp/absl/strings/str_cat.cc        |  191 +-
 .../abseil-cpp/absl/strings/str_cat.h         |  154 +-
 .../abseil-cpp/absl/strings/str_format.h      |    2 +-
 .../abseil-cpp/absl/strings/str_join.h        |   24 +-
 .../abseil-cpp/absl/strings/str_split.h       |    4 +-
 .../abseil-cpp/absl/strings/string_view.h     |    5 +-
 .../abseil-cpp/absl/strings/substitute.cc     |    4 +
 .../synchronization/internal/graphcycles.cc   |   13 +-
 .../synchronization/internal/graphcycles.h    |    5 +
 .../abseil-cpp/absl/synchronization/mutex.h   |    9 +-
 .../abseil-cpp/absl/time/civil_time.h         |    4 +-
 .../restricted/abseil-cpp/absl/time/clock.cc  |   16 +-
 .../abseil-cpp/absl/time/duration.cc          |  111 +-
 .../restricted/abseil-cpp/absl/time/format.cc |    3 +-
 .../time/internal/cctz/src/time_zone_libc.cc  |    2 +-
 .../internal/cctz/src/time_zone_lookup.cc     |   29 -
 .../absl/time/internal/cctz/src/tzfile.h      |    6 +-
 .../restricted/abseil-cpp/absl/time/time.h    |  102 +-
 .../abseil-cpp/absl/types/compare.h           |  505 +++++
 .../abseil-cpp/absl/types/internal/optional.h |    4 +-
 .../abseil-cpp/absl/types/internal/variant.h  |  122 +-
 .../abseil-cpp/absl/types/optional.h          |   33 +-
 .../restricted/abseil-cpp/absl/types/span.h   |    5 +-
 .../abseil-cpp/absl/types/variant.h           |   43 +-
 .../abseil-cpp/absl/utility/utility.h         |   44 +-
 .../abseil-cpp/absl/utility/ya.make           |    4 +-
 contrib/restricted/abseil-cpp/ya.make         |    6 +-
 140 files changed, 7858 insertions(+), 2675 deletions(-)
 create mode 100644 contrib/restricted/abseil-cpp/absl/base/internal/poison.cc
 create mode 100644 contrib/restricted/abseil-cpp/absl/base/internal/poison.h
 create mode 100644 contrib/restricted/abseil-cpp/absl/container/hash_container_defaults.h
 create mode 100644 contrib/restricted/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h
 create mode 100644 contrib/restricted/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc
 create mode 100644 contrib/restricted/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h
 create mode 100644 contrib/restricted/abseil-cpp/absl/debugging/internal/demangle_rust.cc
 create mode 100644 contrib/restricted/abseil-cpp/absl/debugging/internal/demangle_rust.h
 create mode 100644 contrib/restricted/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc
 create mode 100644 contrib/restricted/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h
 delete mode 100644 contrib/restricted/abseil-cpp/absl/log/vlog_is_on.h
 create mode 100644 contrib/restricted/abseil-cpp/absl/types/compare.h

diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/container.h b/contrib/restricted/abseil-cpp/absl/algorithm/container.h
index c7bafae1477c..6bbe3b5adf40 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/container.h
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/container.h
@@ -44,6 +44,7 @@
 #include <cassert>
 #include <iterator>
 #include <numeric>
+#include <random>
 #include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
@@ -51,6 +52,7 @@
 #include <vector>
 
 #include "absl/algorithm/algorithm.h"
+#include "absl/base/config.h"
 #include "absl/base/macros.h"
 #include "absl/base/nullability.h"
 #include "absl/meta/type_traits.h"
@@ -92,17 +94,17 @@ using ContainerPointerType =
 //   using std::end;
 //   std::foo(begin(c), end(c));
 // becomes
-//   std::foo(container_algorithm_internal::begin(c),
-//            container_algorithm_internal::end(c));
+//   std::foo(container_algorithm_internal::c_begin(c),
+//            container_algorithm_internal::c_end(c));
 // These are meant for internal use only.
 
 template <typename C>
-ContainerIter<C> c_begin(C& c) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17 ContainerIter<C> c_begin(C& c) {
   return begin(c);
 }
 
 template <typename C>
-ContainerIter<C> c_end(C& c) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17 ContainerIter<C> c_end(C& c) {
   return end(c);
 }
 
@@ -145,8 +147,9 @@ bool c_linear_search(const C& c, EqualityComparable&& value) {
 // Container-based version of the <iterator> `std::distance()` function to
 // return the number of elements within a container.
 template <typename C>
-container_algorithm_internal::ContainerDifferenceType<const C> c_distance(
-    const C& c) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerDifferenceType<const C>
+    c_distance(const C& c) {
   return std::distance(container_algorithm_internal::c_begin(c),
                        container_algorithm_internal::c_end(c));
 }
@@ -210,6 +213,16 @@ container_algorithm_internal::ContainerIter<C> c_find(C& c, T&& value) {
                    std::forward<T>(value));
 }
 
+// c_contains()
+//
+// Container-based version of the <algorithm> `std::ranges::contains()` C++23
+// function to search a container for a value.
+template <typename Sequence, typename T>
+bool c_contains(const Sequence& sequence, T&& value) {
+  return absl::c_find(sequence, std::forward<T>(value)) !=
+         container_algorithm_internal::c_end(sequence);
+}
+
 // c_find_if()
 //
 // Container-based version of the <algorithm> `std::find_if()` function to find
@@ -426,6 +439,26 @@ container_algorithm_internal::ContainerIter<Sequence1> c_search(
                      std::forward<BinaryPredicate>(pred));
 }
 
+// c_contains_subrange()
+//
+// Container-based version of the <algorithm> `std::ranges::contains_subrange()`
+// C++23 function to search a container for a subsequence.
+template <typename Sequence1, typename Sequence2>
+bool c_contains_subrange(Sequence1& sequence, Sequence2& subsequence) {
+  return absl::c_search(sequence, subsequence) !=
+         container_algorithm_internal::c_end(sequence);
+}
+
+// Overload of c_contains_subrange() for using a predicate evaluation other than
+// `==` as the function's test condition.
+template <typename Sequence1, typename Sequence2, typename BinaryPredicate>
+bool c_contains_subrange(Sequence1& sequence, Sequence2& subsequence,
+                         BinaryPredicate&& pred) {
+  return absl::c_search(sequence, subsequence,
+                        std::forward<BinaryPredicate>(pred)) !=
+         container_algorithm_internal::c_end(sequence);
+}
+
 // c_search_n()
 //
 // Container-based version of the <algorithm> `std::search_n()` function to
@@ -1500,8 +1533,9 @@ c_is_heap_until(RandomAccessContainer& sequence, LessThan&& comp) {
 // to return an iterator pointing to the element with the smallest value, using
 // `operator<` to make the comparisons.
 template <typename Sequence>
-container_algorithm_internal::ContainerIter<Sequence> c_min_element(
-    Sequence& sequence) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIter<Sequence>
+    c_min_element(Sequence& sequence) {
   return std::min_element(container_algorithm_internal::c_begin(sequence),
                           container_algorithm_internal::c_end(sequence));
 }
@@ -1509,8 +1543,9 @@ container_algorithm_internal::ContainerIter<Sequence> c_min_element(
 // Overload of c_min_element() for performing a `comp` comparison other than
 // `operator<`.
 template <typename Sequence, typename LessThan>
-container_algorithm_internal::ContainerIter<Sequence> c_min_element(
-    Sequence& sequence, LessThan&& comp) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIter<Sequence>
+    c_min_element(Sequence& sequence, LessThan&& comp) {
   return std::min_element(container_algorithm_internal::c_begin(sequence),
                           container_algorithm_internal::c_end(sequence),
                           std::forward<LessThan>(comp));
@@ -1522,8 +1557,9 @@ container_algorithm_internal::ContainerIter<Sequence> c_min_element(
 // to return an iterator pointing to the element with the largest value, using
 // `operator<` to make the comparisons.
 template <typename Sequence>
-container_algorithm_internal::ContainerIter<Sequence> c_max_element(
-    Sequence& sequence) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIter<Sequence>
+    c_max_element(Sequence& sequence) {
   return std::max_element(container_algorithm_internal::c_begin(sequence),
                           container_algorithm_internal::c_end(sequence));
 }
@@ -1531,8 +1567,9 @@ container_algorithm_internal::ContainerIter<Sequence> c_max_element(
 // Overload of c_max_element() for performing a `comp` comparison other than
 // `operator<`.
 template <typename Sequence, typename LessThan>
-container_algorithm_internal::ContainerIter<Sequence> c_max_element(
-    Sequence& sequence, LessThan&& comp) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIter<Sequence>
+    c_max_element(Sequence& sequence, LessThan&& comp) {
   return std::max_element(container_algorithm_internal::c_begin(sequence),
                           container_algorithm_internal::c_end(sequence),
                           std::forward<LessThan>(comp));
@@ -1545,8 +1582,9 @@ container_algorithm_internal::ContainerIter<Sequence> c_max_element(
 // smallest and largest values, respectively, using `operator<` to make the
 // comparisons.
 template <typename C>
-container_algorithm_internal::ContainerIterPairType<C, C> c_minmax_element(
-    C& c) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIterPairType<C, C>
+    c_minmax_element(C& c) {
   return std::minmax_element(container_algorithm_internal::c_begin(c),
                              container_algorithm_internal::c_end(c));
 }
@@ -1554,8 +1592,9 @@ container_algorithm_internal::ContainerIterPairType<C, C> c_minmax_element(
 // Overload of c_minmax_element() for performing `comp` comparisons other than
 // `operator<`.
 template <typename C, typename LessThan>
-container_algorithm_internal::ContainerIterPairType<C, C> c_minmax_element(
-    C& c, LessThan&& comp) {
+ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIterPairType<C, C>
+    c_minmax_element(C& c, LessThan&& comp) {
   return std::minmax_element(container_algorithm_internal::c_begin(c),
                              container_algorithm_internal::c_end(c),
                              std::forward<LessThan>(comp));
diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/ya.make b/contrib/restricted/abseil-cpp/absl/algorithm/ya.make
index ac5695f0720e..467248d2799d 100644
--- a/contrib/restricted/abseil-cpp/absl/algorithm/ya.make
+++ b/contrib/restricted/abseil-cpp/absl/algorithm/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 NO_RUNTIME()
 
diff --git a/contrib/restricted/abseil-cpp/absl/base/attributes.h b/contrib/restricted/abseil-cpp/absl/base/attributes.h
index d4f67a1295c9..5ea5ee3ef8c6 100644
--- a/contrib/restricted/abseil-cpp/absl/base/attributes.h
+++ b/contrib/restricted/abseil-cpp/absl/base/attributes.h
@@ -195,6 +195,9 @@
 // ABSL_ATTRIBUTE_NORETURN
 //
 // Tells the compiler that a given function never returns.
+//
+// Deprecated: Prefer the `[[noreturn]]` attribute standardized by C++11 over
+// this macro.
 #if ABSL_HAVE_ATTRIBUTE(noreturn) || (defined(__GNUC__) && !defined(__clang__))
 #define ABSL_ATTRIBUTE_NORETURN __attribute__((noreturn))
 #elif defined(_MSC_VER)
@@ -702,6 +705,11 @@
   _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
 #define ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING \
   _Pragma("GCC diagnostic pop")
+#elif defined(_MSC_VER)
+#define ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING \
+  _Pragma("warning(push)") _Pragma("warning(disable: 4996)")
+#define ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING \
+  _Pragma("warning(pop)")
 #else
 #define ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
 #define ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
@@ -808,14 +816,43 @@
 //
 // See also the upstream documentation:
 // https://clang.llvm.org/docs/AttributeReference.html#lifetimebound
+// https://learn.microsoft.com/en-us/cpp/code-quality/c26816?view=msvc-170
 #if ABSL_HAVE_CPP_ATTRIBUTE(clang::lifetimebound)
 #define ABSL_ATTRIBUTE_LIFETIME_BOUND [[clang::lifetimebound]]
+#elif ABSL_HAVE_CPP_ATTRIBUTE(msvc::lifetimebound)
+#define ABSL_ATTRIBUTE_LIFETIME_BOUND [[msvc::lifetimebound]]
 #elif ABSL_HAVE_ATTRIBUTE(lifetimebound)
 #define ABSL_ATTRIBUTE_LIFETIME_BOUND __attribute__((lifetimebound))
 #else
 #define ABSL_ATTRIBUTE_LIFETIME_BOUND
 #endif
 
+// ABSL_INTERNAL_ATTRIBUTE_VIEW indicates that a type acts like a view i.e. a
+// raw (non-owning) pointer. This enables diagnoses similar to those enabled by
+// ABSL_ATTRIBUTE_LIFETIME_BOUND.
+//
+// See the following links for details:
+// https://reviews.llvm.org/D64448
+// https://lists.llvm.org/pipermail/cfe-dev/2018-November/060355.html
+#if ABSL_HAVE_CPP_ATTRIBUTE(gsl::Pointer)
+#define ABSL_INTERNAL_ATTRIBUTE_VIEW [[gsl::Pointer]]
+#else
+#define ABSL_INTERNAL_ATTRIBUTE_VIEW
+#endif
+
+// ABSL_INTERNAL_ATTRIBUTE_OWNER indicates that a type acts like a smart
+// (owning) pointer. This enables diagnoses similar to those enabled by
+// ABSL_ATTRIBUTE_LIFETIME_BOUND.
+//
+// See the following links for details:
+// https://reviews.llvm.org/D64448
+// https://lists.llvm.org/pipermail/cfe-dev/2018-November/060355.html
+#if ABSL_HAVE_CPP_ATTRIBUTE(gsl::Owner)
+#define ABSL_INTERNAL_ATTRIBUTE_OWNER [[gsl::Owner]]
+#else
+#define ABSL_INTERNAL_ATTRIBUTE_OWNER
+#endif
+
 // ABSL_ATTRIBUTE_TRIVIAL_ABI
 // Indicates that a type is "trivially relocatable" -- meaning it can be
 // relocated without invoking the constructor/destructor, using a form of move
@@ -871,4 +908,51 @@
 #define ABSL_ATTRIBUTE_NO_UNIQUE_ADDRESS
 #endif
 
+// ABSL_ATTRIBUTE_UNINITIALIZED
+//
+// GCC and Clang support a flag `-ftrivial-auto-var-init=<option>` (<option>
+// can be "zero" or "pattern") that can be used to initialize automatic stack
+// variables. Variables with this attribute will be left uninitialized,
+// overriding the compiler flag.
+//
+// See https://clang.llvm.org/docs/AttributeReference.html#uninitialized
+// and https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html#index-uninitialized-variable-attribute
+#if ABSL_HAVE_CPP_ATTRIBUTE(clang::uninitialized)
+#define ABSL_ATTRIBUTE_UNINITIALIZED [[clang::uninitialized]]
+#elif ABSL_HAVE_CPP_ATTRIBUTE(gnu::uninitialized)
+#define ABSL_ATTRIBUTE_UNINITIALIZED [[gnu::uninitialized]]
+#elif ABSL_HAVE_ATTRIBUTE(uninitialized)
+#define ABSL_ATTRIBUTE_UNINITIALIZED __attribute__((uninitialized))
+#else
+#define ABSL_ATTRIBUTE_UNINITIALIZED
+#endif
+
+// ABSL_ATTRIBUTE_WARN_UNUSED
+//
+// Compilers routinely warn about trivial variables that are unused.  For
+// non-trivial types, this warning is suppressed since the
+// constructor/destructor may be intentional and load-bearing, for example, with
+// a RAII scoped lock.
+//
+// For example:
+//
+// class ABSL_ATTRIBUTE_WARN_UNUSED MyType {
+//  public:
+//   MyType();
+//   ~MyType();
+// };
+//
+// void foo() {
+//   // Warns with ABSL_ATTRIBUTE_WARN_UNUSED attribute present.
+//   MyType unused;
+// }
+//
+// See https://clang.llvm.org/docs/AttributeReference.html#warn-unused and
+// https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html#index-warn_005funused-type-attribute
+#if ABSL_HAVE_CPP_ATTRIBUTE(gnu::warn_unused)
+#define ABSL_ATTRIBUTE_WARN_UNUSED [[gnu::warn_unused]]
+#else
+#define ABSL_ATTRIBUTE_WARN_UNUSED
+#endif
+
 #endif  // ABSL_BASE_ATTRIBUTES_H_
diff --git a/contrib/restricted/abseil-cpp/absl/base/config.h b/contrib/restricted/abseil-cpp/absl/base/config.h
index cbd9eac58e72..51687ebb524e 100644
--- a/contrib/restricted/abseil-cpp/absl/base/config.h
+++ b/contrib/restricted/abseil-cpp/absl/base/config.h
@@ -117,8 +117,8 @@
 //
 // LTS releases can be obtained from
 // https://github.com/abseil/abseil-cpp/releases.
-#define ABSL_LTS_RELEASE_VERSION 20240116
-#define ABSL_LTS_RELEASE_PATCH_LEVEL 2
+#define ABSL_LTS_RELEASE_VERSION 20240722
+#define ABSL_LTS_RELEASE_PATCH_LEVEL 0
 
 // Helper macro to convert a CPP variable to a string literal.
 #define ABSL_INTERNAL_DO_TOKEN_STR(x) #x
@@ -231,12 +231,11 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #endif
 
 // ABSL_HAVE_TLS is defined to 1 when __thread should be supported.
-// We assume __thread is supported on Linux or Asylo when compiled with Clang or
+// We assume __thread is supported on Linux when compiled with Clang or
 // compiled against libstdc++ with _GLIBCXX_HAVE_TLS defined.
 #ifdef ABSL_HAVE_TLS
 #error ABSL_HAVE_TLS cannot be directly set
-#elif (defined(__linux__) || defined(__ASYLO__)) && \
-    (defined(__clang__) || defined(_GLIBCXX_HAVE_TLS))
+#elif (defined(__linux__)) && (defined(__clang__) || defined(_GLIBCXX_HAVE_TLS))
 #define ABSL_HAVE_TLS 1
 #endif
 
@@ -275,53 +274,18 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #define ABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE 1
 #endif
 
+
 // ABSL_HAVE_THREAD_LOCAL
 //
+// DEPRECATED - `thread_local` is available on all supported platforms.
 // Checks whether C++11's `thread_local` storage duration specifier is
 // supported.
 #ifdef ABSL_HAVE_THREAD_LOCAL
 #error ABSL_HAVE_THREAD_LOCAL cannot be directly set
-#elif defined(__APPLE__)
-// Notes:
-// * Xcode's clang did not support `thread_local` until version 8, and
-//   even then not for all iOS < 9.0.
-// * Xcode 9.3 started disallowing `thread_local` for 32-bit iOS simulator
-//   targeting iOS 9.x.
-// * Xcode 10 moves the deployment target check for iOS < 9.0 to link time
-//   making ABSL_HAVE_FEATURE unreliable there.
-//
-#if ABSL_HAVE_FEATURE(cxx_thread_local) && \
-    !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
-#define ABSL_HAVE_THREAD_LOCAL 1
-#endif
-#else  // !defined(__APPLE__)
+#else
 #define ABSL_HAVE_THREAD_LOCAL 1
 #endif
 
-// There are platforms for which TLS should not be used even though the compiler
-// makes it seem like it's supported (Android NDK < r12b for example).
-// This is primarily because of linker problems and toolchain misconfiguration:
-// Abseil does not intend to support this indefinitely. Currently, the newest
-// toolchain that we intend to support that requires this behavior is the
-// r11 NDK - allowing for a 5 year support window on that means this option
-// is likely to be removed around June of 2021.
-// TLS isn't supported until NDK r12b per
-// https://developer.android.com/ndk/downloads/revision_history.html
-// Since NDK r16, `__NDK_MAJOR__` and `__NDK_MINOR__` are defined in
-// <android/ndk-version.h>. For NDK < r16, users should define these macros,
-// e.g. `-D__NDK_MAJOR__=11 -D__NKD_MINOR__=0` for NDK r11.
-#if defined(__ANDROID__) && defined(__clang__)
-#if __has_include(<android/ndk-version.h>)
-#include <android/ndk-version.h>
-#endif  // __has_include(<android/ndk-version.h>)
-#if defined(__ANDROID__) && defined(__clang__) && defined(__NDK_MAJOR__) && \
-    defined(__NDK_MINOR__) &&                                               \
-    ((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))
-#undef ABSL_HAVE_TLS
-#undef ABSL_HAVE_THREAD_LOCAL
-#endif
-#endif  // defined(__ANDROID__) && defined(__clang__)
-
 // ABSL_HAVE_INTRINSIC_INT128
 //
 // Checks whether the __int128 compiler extension for a 128-bit integral type is
@@ -379,9 +343,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #define ABSL_HAVE_EXCEPTIONS 1
 #endif  // defined(__EXCEPTIONS) && ABSL_HAVE_FEATURE(cxx_exceptions)
 // Handle remaining special cases and default to exceptions being supported.
-#elif !(defined(__GNUC__) && (__GNUC__ < 5) && !defined(__EXCEPTIONS)) && \
-    !(ABSL_INTERNAL_HAVE_MIN_GNUC_VERSION(5, 0) &&                        \
-      !defined(__cpp_exceptions)) &&                                      \
+#elif !(defined(__GNUC__) && !defined(__cpp_exceptions)) && \
     !(defined(_MSC_VER) && !defined(_CPPUNWIND))
 #define ABSL_HAVE_EXCEPTIONS 1
 #endif
@@ -416,9 +378,9 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||    \
     defined(_AIX) || defined(__ros__) || defined(__native_client__) ||       \
     defined(__asmjs__) || defined(__EMSCRIPTEN__) || defined(__Fuchsia__) || \
-    defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) ||          \
-    defined(__HAIKU__) || defined(__OpenBSD__) || defined(__NetBSD__) ||     \
-    defined(__QNX__) || defined(__VXWORKS__) || defined(__hexagon__)
+    defined(__sun) || defined(__myriad2__) || defined(__HAIKU__) ||          \
+    defined(__OpenBSD__) || defined(__NetBSD__) || defined(__QNX__) ||       \
+    defined(__VXWORKS__) || defined(__hexagon__)
 #define ABSL_HAVE_MMAP 1
 #endif
 
@@ -902,9 +864,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #error ABSL_INTERNAL_HAS_CXA_DEMANGLE cannot be directly set
 #elif defined(OS_ANDROID) && (defined(__i386__) || defined(__x86_64__))
 #define ABSL_INTERNAL_HAS_CXA_DEMANGLE 0
-#elif defined(__GNUC__) && defined(__GNUC_MINOR__) &&            \
-    (__GNUC__ >= 4 || (__GNUC__ >= 3 && __GNUC_MINOR__ >= 4)) && \
-    !defined(__mips__)
+#elif defined(__GNUC__)
 #define ABSL_INTERNAL_HAS_CXA_DEMANGLE 1
 #elif defined(__clang__) && !defined(_MSC_VER)
 #define ABSL_INTERNAL_HAS_CXA_DEMANGLE 1
@@ -981,6 +941,27 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #define ABSL_HAVE_CONSTANT_EVALUATED 1
 #endif
 
+// ABSL_INTERNAL_CONSTEXPR_SINCE_CXXYY is used to conditionally define constexpr
+// for different C++ versions.
+//
+// These macros are an implementation detail and will be unconditionally removed
+// once the minimum supported C++ version catches up to a given version.
+//
+// For this reason, this symbol is considered INTERNAL and code outside of
+// Abseil must not use it.
+#if defined(ABSL_INTERNAL_CPLUSPLUS_LANG) && \
+    ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L
+#define ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17 constexpr
+#else
+#define ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+#endif
+#if defined(ABSL_INTERNAL_CPLUSPLUS_LANG) && \
+    ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L
+#define ABSL_INTERNAL_CONSTEXPR_SINCE_CXX20 constexpr
+#else
+#define ABSL_INTERNAL_CONSTEXPR_SINCE_CXX20
+#endif
+
 // ABSL_INTERNAL_EMSCRIPTEN_VERSION combines Emscripten's three version macros
 // into an integer that can be compared against.
 #ifdef ABSL_INTERNAL_EMSCRIPTEN_VERSION
diff --git a/contrib/restricted/abseil-cpp/absl/base/dynamic_annotations.h b/contrib/restricted/abseil-cpp/absl/base/dynamic_annotations.h
index 7ba8912ea638..f18b5e0a8fa9 100644
--- a/contrib/restricted/abseil-cpp/absl/base/dynamic_annotations.h
+++ b/contrib/restricted/abseil-cpp/absl/base/dynamic_annotations.h
@@ -252,25 +252,9 @@ ABSL_INTERNAL_END_EXTERN_C
 
 #else  // !defined(ABSL_HAVE_MEMORY_SANITIZER)
 
-// TODO(rogeeff): remove this branch
-#ifdef ABSL_HAVE_THREAD_SANITIZER
-#define ABSL_ANNOTATE_MEMORY_IS_INITIALIZED(address, size) \
-  do {                                                     \
-    (void)(address);                                       \
-    (void)(size);                                          \
-  } while (0)
-#define ABSL_ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size) \
-  do {                                                       \
-    (void)(address);                                         \
-    (void)(size);                                            \
-  } while (0)
-#else
-
 #define ABSL_ANNOTATE_MEMORY_IS_INITIALIZED(address, size)    // empty
 #define ABSL_ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size)  // empty
 
-#endif
-
 #endif  // ABSL_HAVE_MEMORY_SANITIZER
 
 // -------------------------------------------------------------------------
diff --git a/contrib/restricted/abseil-cpp/absl/base/internal/nullability_impl.h b/contrib/restricted/abseil-cpp/absl/base/internal/nullability_impl.h
index 36e1b33d65a4..03fa2434ce5e 100644
--- a/contrib/restricted/abseil-cpp/absl/base/internal/nullability_impl.h
+++ b/contrib/restricted/abseil-cpp/absl/base/internal/nullability_impl.h
@@ -19,10 +19,11 @@
 #include <type_traits>
 
 #include "absl/base/attributes.h"
+#include "absl/base/config.h"
 #include "absl/meta/type_traits.h"
 
 namespace absl {
-
+ABSL_NAMESPACE_BEGIN
 namespace nullability_internal {
 
 // `IsNullabilityCompatible` checks whether its first argument is a class
@@ -101,6 +102,7 @@ using NullabilityUnknownImpl
     = T;
 
 }  // namespace nullability_internal
+ABSL_NAMESPACE_END
 }  // namespace absl
 
 #endif  // ABSL_BASE_INTERNAL_NULLABILITY_IMPL_H_
diff --git a/contrib/restricted/abseil-cpp/absl/base/internal/poison.cc b/contrib/restricted/abseil-cpp/absl/base/internal/poison.cc
new file mode 100644
index 000000000000..b33d4c2d3d5b
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/base/internal/poison.cc
@@ -0,0 +1,84 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/base/internal/poison.h"
+
+#include <cstdlib>
+
+#include "absl/base/config.h"
+#include "absl/base/internal/direct_mmap.h"
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
+#if defined(ABSL_HAVE_ADDRESS_SANITIZER)
+#include <sanitizer/asan_interface.h>
+#elif defined(ABSL_HAVE_MEMORY_SANITIZER)
+#include <sanitizer/msan_interface.h>
+#elif defined(ABSL_HAVE_MMAP)
+#include <sys/mman.h>
+#endif
+
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace base_internal {
+
+namespace {
+
+size_t GetPageSize() {
+#ifdef _WIN32
+  SYSTEM_INFO system_info;
+  GetSystemInfo(&system_info);
+  return system_info.dwPageSize;
+#elif defined(__wasm__) || defined(__asmjs__) || defined(__hexagon__)
+  return getpagesize();
+#else
+  return static_cast<size_t>(sysconf(_SC_PAGESIZE));
+#endif
+}
+
+}  // namespace
+
+void* InitializePoisonedPointerInternal() {
+  const size_t block_size = GetPageSize();
+#if defined(ABSL_HAVE_ADDRESS_SANITIZER)
+  void* data = malloc(block_size);
+  ASAN_POISON_MEMORY_REGION(data, block_size);
+#elif defined(ABSL_HAVE_MEMORY_SANITIZER)
+  void* data = malloc(block_size);
+  __msan_poison(data, block_size);
+#elif defined(ABSL_HAVE_MMAP)
+  void* data = DirectMmap(nullptr, block_size, PROT_NONE,
+                          MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+  if (data == MAP_FAILED) return GetBadPointerInternal();
+#elif defined(_WIN32)
+  void* data = VirtualAlloc(nullptr, block_size, MEM_RESERVE | MEM_COMMIT,
+                            PAGE_NOACCESS);
+  if (data == nullptr) return GetBadPointerInternal();
+#else
+  return GetBadPointerInternal();
+#endif
+  // Return the middle of the block so that dereferences before and after the
+  // pointer will both crash.
+  return static_cast<char*>(data) + block_size / 2;
+}
+
+}  // namespace base_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/base/internal/poison.h b/contrib/restricted/abseil-cpp/absl/base/internal/poison.h
new file mode 100644
index 000000000000..28113bdd71a3
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/base/internal/poison.h
@@ -0,0 +1,59 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_BASE_INTERNAL_POISON_H_
+#define ABSL_BASE_INTERNAL_POISON_H_
+
+#include <cstdint>
+
+#include "absl/base/config.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace base_internal {
+
+inline void* GetBadPointerInternal() {
+  // A likely bad pointer. Pointers are required to have high bits that are all
+  // zero or all one for certain 64-bit CPUs. This pointer value will hopefully
+  // cause a crash on dereference and also be clearly recognizable as invalid.
+  constexpr uint64_t kBadPtr = 0xBAD0BAD0BAD0BAD0;
+  auto ret = reinterpret_cast<void*>(static_cast<uintptr_t>(kBadPtr));
+#ifndef _MSC_VER  // MSVC doesn't support inline asm with `volatile`.
+  // Try to prevent the compiler from optimizing out the undefined behavior.
+  asm volatile("" : : "r"(ret) :);  // NOLINT
+#endif
+  return ret;
+}
+
+void* InitializePoisonedPointerInternal();
+
+inline void* get_poisoned_pointer() {
+#if defined(NDEBUG) && !defined(ABSL_HAVE_ADDRESS_SANITIZER) && \
+    !defined(ABSL_HAVE_MEMORY_SANITIZER)
+  // In optimized non-sanitized builds, avoid the function-local static because
+  // of the codegen and runtime cost.
+  return GetBadPointerInternal();
+#else
+  // Non-optimized builds may use more robust implementation. Note that we can't
+  // use a static global because Chromium doesn't allow non-constinit globals.
+  static void* ptr = InitializePoisonedPointerInternal();
+  return ptr;
+#endif
+}
+
+}  // namespace base_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_BASE_INTERNAL_POISON_H_
diff --git a/contrib/restricted/abseil-cpp/absl/base/internal/spinlock.h b/contrib/restricted/abseil-cpp/absl/base/internal/spinlock.h
index 2929cd6f5c1c..1bb260f46bf9 100644
--- a/contrib/restricted/abseil-cpp/absl/base/internal/spinlock.h
+++ b/contrib/restricted/abseil-cpp/absl/base/internal/spinlock.h
@@ -53,7 +53,7 @@ namespace absl {
 ABSL_NAMESPACE_BEGIN
 namespace base_internal {
 
-class ABSL_LOCKABLE SpinLock {
+class ABSL_LOCKABLE ABSL_ATTRIBUTE_WARN_UNUSED SpinLock {
  public:
   SpinLock() : lockword_(kSpinLockCooperative) {
     ABSL_TSAN_MUTEX_CREATE(this, __tsan_mutex_not_static);
@@ -89,7 +89,8 @@ class ABSL_LOCKABLE SpinLock {
   // acquisition was successful.  If the lock was not acquired, false is
   // returned.  If this SpinLock is free at the time of the call, TryLock
   // will return true with high probability.
-  inline bool TryLock() ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+  ABSL_MUST_USE_RESULT inline bool TryLock()
+      ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
     ABSL_TSAN_MUTEX_PRE_LOCK(this, __tsan_mutex_try_lock);
     bool res = TryLockImpl();
     ABSL_TSAN_MUTEX_POST_LOCK(
@@ -120,7 +121,7 @@ class ABSL_LOCKABLE SpinLock {
   // Determine if the lock is held.  When the lock is held by the invoking
   // thread, true will always be returned. Intended to be used as
   // CHECK(lock.IsHeld()).
-  inline bool IsHeld() const {
+  ABSL_MUST_USE_RESULT inline bool IsHeld() const {
     return (lockword_.load(std::memory_order_relaxed) & kSpinLockHeld) != 0;
   }
 
@@ -202,6 +203,15 @@ class ABSL_LOCKABLE SpinLock {
 
 // Corresponding locker object that arranges to acquire a spinlock for
 // the duration of a C++ scope.
+//
+// TODO(b/176172494): Use only [[nodiscard]] when baseline is raised.
+// TODO(b/6695610): Remove forward declaration when #ifdef is no longer needed.
+#if ABSL_HAVE_CPP_ATTRIBUTE(nodiscard)
+class [[nodiscard]] SpinLockHolder;
+#else
+class ABSL_MUST_USE_RESULT ABSL_ATTRIBUTE_TRIVIAL_ABI SpinLockHolder;
+#endif
+
 class ABSL_SCOPED_LOCKABLE SpinLockHolder {
  public:
   inline explicit SpinLockHolder(SpinLock* l) ABSL_EXCLUSIVE_LOCK_FUNCTION(l)
diff --git a/contrib/restricted/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/contrib/restricted/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
index 05e0e7ba5ee9..a0bf3a65f7cd 100644
--- a/contrib/restricted/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
+++ b/contrib/restricted/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() {
   return aarch64_timer_frequency;
 }
 
-#elif defined(__riscv)
-
-int64_t UnscaledCycleClock::Now() {
-  int64_t virtual_timer_value;
-  asm volatile("rdcycle %0" : "=r"(virtual_timer_value));
-  return virtual_timer_value;
-}
-
-double UnscaledCycleClock::Frequency() {
-  return base_internal::NominalCPUFrequency();
-}
-
 #elif defined(_M_IX86) || defined(_M_X64)
 
 #pragma intrinsic(__rdtsc)
diff --git a/contrib/restricted/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/contrib/restricted/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
index 24b324ac99f8..43a3dabeeabc 100644
--- a/contrib/restricted/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
+++ b/contrib/restricted/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
@@ -21,8 +21,8 @@
 
 // The following platforms have an implementation of a hardware counter.
 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
-    defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+    defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) ||     \
+    (defined(_M_X64) && !defined(_M_ARM64EC))
 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
 #else
 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
@@ -53,8 +53,8 @@
 #if ABSL_USE_UNSCALED_CYCLECLOCK
 // This macro can be used to test if UnscaledCycleClock::Frequency()
 // is NominalCPUFrequency() on a particular platform.
-#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \
-     defined(_M_IX86) || defined(_M_X64))
+#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
+     defined(_M_X64))
 #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
 #endif
 #endif
diff --git a/contrib/restricted/abseil-cpp/absl/base/macros.h b/contrib/restricted/abseil-cpp/absl/base/macros.h
index f33cd1927bfd..b318f11664c0 100644
--- a/contrib/restricted/abseil-cpp/absl/base/macros.h
+++ b/contrib/restricted/abseil-cpp/absl/base/macros.h
@@ -138,4 +138,52 @@ ABSL_NAMESPACE_END
 #define ABSL_INTERNAL_RETHROW do {} while (false)
 #endif  // ABSL_HAVE_EXCEPTIONS
 
+// ABSL_DEPRECATE_AND_INLINE()
+//
+// Marks a function or type alias as deprecated and tags it to be picked up for
+// automated refactoring by go/cpp-inliner. It can added to inline function
+// definitions or type aliases. It should only be used within a header file. It
+// differs from `ABSL_DEPRECATED` in the following ways:
+//
+// 1. New uses of the function or type will be discouraged via Tricorder
+//    warnings.
+// 2. If enabled via `METADATA`, automated changes will be sent out inlining the
+//    functions's body or replacing the type where it is used.
+//
+// For example:
+//
+// ABSL_DEPRECATE_AND_INLINE() inline int OldFunc(int x) {
+//   return NewFunc(x, 0);
+// }
+//
+// will mark `OldFunc` as deprecated, and the go/cpp-inliner service will
+// replace calls to `OldFunc(x)` with calls to `NewFunc(x, 0)`. Once all calls
+// to `OldFunc` have been replaced, `OldFunc` can be deleted.
+//
+// See go/cpp-inliner for more information.
+//
+// Note: go/cpp-inliner is Google-internal service for automated refactoring.
+// While open-source users do not have access to this service, the macro is
+// provided for compatibility, and so that users receive deprecation warnings.
+#if ABSL_HAVE_CPP_ATTRIBUTE(deprecated) && \
+    ABSL_HAVE_CPP_ATTRIBUTE(clang::annotate)
+#define ABSL_DEPRECATE_AND_INLINE() [[deprecated, clang::annotate("inline-me")]]
+#elif ABSL_HAVE_CPP_ATTRIBUTE(deprecated)
+#define ABSL_DEPRECATE_AND_INLINE() [[deprecated]]
+#else
+#define ABSL_DEPRECATE_AND_INLINE()
+#endif
+
+// Requires the compiler to prove that the size of the given object is at least
+// the expected amount.
+#if ABSL_HAVE_ATTRIBUTE(diagnose_if) && ABSL_HAVE_BUILTIN(__builtin_object_size)
+#define ABSL_INTERNAL_NEED_MIN_SIZE(Obj, N)                     \
+  __attribute__((diagnose_if(__builtin_object_size(Obj, 0) < N, \
+                             "object size provably too small "  \
+                             "(this would corrupt memory)",     \
+                             "error")))
+#else
+#define ABSL_INTERNAL_NEED_MIN_SIZE(Obj, N)
+#endif
+
 #endif  // ABSL_BASE_MACROS_H_
diff --git a/contrib/restricted/abseil-cpp/absl/base/no_destructor.h b/contrib/restricted/abseil-cpp/absl/base/no_destructor.h
index d4b16a6e8859..43b3540aeba9 100644
--- a/contrib/restricted/abseil-cpp/absl/base/no_destructor.h
+++ b/contrib/restricted/abseil-cpp/absl/base/no_destructor.h
@@ -21,14 +21,13 @@
 // such an object survives during program exit (and can be safely accessed at
 // any time).
 //
-// Objects of such type, if constructed safely and under the right conditions,
-// provide two main benefits over other alternatives:
-//
-//   * Global objects not normally allowed due to concerns of destruction order
-//     (i.e. no "complex globals") can be safely allowed, provided that such
-//     objects can be constant initialized.
-//   * Function scope static objects can be optimized to avoid heap allocation,
-//     pointer chasing, and allow lazy construction.
+// absl::NoDestructor<T> is useful when when a variable has static storage
+// duration but its type has a non-trivial destructor. Global constructors are
+// not recommended because of the C++'s static initialization order fiasco (See
+// https://en.cppreference.com/w/cpp/language/siof). Global destructors are not
+// allowed due to similar concerns about destruction ordering. Using
+// absl::NoDestructor<T> as a function-local static prevents both of these
+// issues.
 //
 // See below for complete details.
 
@@ -41,6 +40,7 @@
 #include <utility>
 
 #include "absl/base/config.h"
+#include "absl/base/nullability.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
@@ -49,8 +49,8 @@ ABSL_NAMESPACE_BEGIN
 //
 // NoDestructor<T> is a wrapper around an object of type T that behaves as an
 // object of type T but never calls T's destructor. NoDestructor<T> makes it
-// safer and/or more efficient to use such objects in static storage contexts:
-// as global or function scope static variables.
+// safer and/or more efficient to use such objects in static storage contexts,
+// ideally as function scope static variables.
 //
 // An instance of absl::NoDestructor<T> has similar type semantics to an
 // instance of T:
@@ -61,9 +61,6 @@ ABSL_NAMESPACE_BEGIN
 //   `->`, `*`, and `get()`.
 //   (Note that `const NoDestructor<T>` works like a pointer to const `T`.)
 //
-// An object of type NoDestructor<T> should be defined in static storage:
-// as either a global static object, or as a function scope static variable.
-//
 // Additionally, NoDestructor<T> provides the following benefits:
 //
 // * Never calls T's destructor for the object
@@ -71,24 +68,7 @@ ABSL_NAMESPACE_BEGIN
 //   lazily constructed.
 //
 // An object of type NoDestructor<T> is "trivially destructible" in the notion
-// that its destructor is never run. Provided that an object of this type can be
-// safely initialized and does not need to be cleaned up on program shutdown,
-// NoDestructor<T> allows you to define global static variables, since Google's
-// C++ style guide ban on such objects doesn't apply to objects that are
-// trivially destructible.
-//
-// Usage as Global Static Variables
-//
-// NoDestructor<T> allows declaration of a global object with a non-trivial
-// constructor in static storage without needing to add a destructor.
-// However, such objects still need to worry about initialization order, so
-// such objects should be const initialized:
-//
-//    // Global or namespace scope.
-//    ABSL_CONST_INIT absl::NoDestructor<MyRegistry> reg{"foo", "bar", 8008};
-//
-// Note that if your object already has a trivial destructor, you don't need to
-// use NoDestructor<T>.
+// that its destructor is never run.
 //
 // Usage as Function Scope Static Variables
 //
@@ -114,6 +94,21 @@ ABSL_NAMESPACE_BEGIN
 //     return *x;
 //   }
 //
+// Usage as Global Static Variables
+//
+// NoDestructor<T> allows declaration of a global object of type T that has a
+// non-trivial destructor since its destructor is never run. However, such
+// objects still need to worry about initialization order, so such use is not
+// recommended, strongly discouraged by the Google C++ Style Guide, and outright
+// banned in Chromium.
+// See https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables
+//
+//    // Global or namespace scope.
+//    absl::NoDestructor<MyRegistry> reg{"foo", "bar", 8008};
+//
+// Note that if your object already has a trivial destructor, you don't need to
+// use NoDestructor<T>.
+//
 template <typename T>
 class NoDestructor {
  public:
@@ -140,11 +135,11 @@ class NoDestructor {
   // Pretend to be a smart pointer to T with deep constness.
   // Never returns a null pointer.
   T& operator*() { return *get(); }
-  T* operator->() { return get(); }
-  T* get() { return impl_.get(); }
+  absl::Nonnull<T*> operator->() { return get(); }
+  absl::Nonnull<T*> get() { return impl_.get(); }
   const T& operator*() const { return *get(); }
-  const T* operator->() const { return get(); }
-  const T* get() const { return impl_.get(); }
+  absl::Nonnull<const T*> operator->() const { return get(); }
+  absl::Nonnull<const T*> get() const { return impl_.get(); }
 
  private:
   class DirectImpl {
@@ -152,8 +147,8 @@ class NoDestructor {
     template <typename... Args>
     explicit constexpr DirectImpl(Args&&... args)
         : value_(std::forward<Args>(args)...) {}
-    const T* get() const { return &value_; }
-    T* get() { return &value_; }
+    absl::Nonnull<const T*> get() const { return &value_; }
+    absl::Nonnull<T*> get() { return &value_; }
 
    private:
     T value_;
@@ -165,14 +160,14 @@ class NoDestructor {
     explicit PlacementImpl(Args&&... args) {
       new (&space_) T(std::forward<Args>(args)...);
     }
-    const T* get() const {
+    absl::Nonnull<const T*> get() const {
       return Launder(reinterpret_cast<const T*>(&space_));
     }
-    T* get() { return Launder(reinterpret_cast<T*>(&space_)); }
+    absl::Nonnull<T*> get() { return Launder(reinterpret_cast<T*>(&space_)); }
 
    private:
     template <typename P>
-    static P* Launder(P* p) {
+    static absl::Nonnull<P*> Launder(absl::Nonnull<P*> p) {
 #if defined(__cpp_lib_launder) && __cpp_lib_launder >= 201606L
       return std::launder(p);
 #elif ABSL_HAVE_BUILTIN(__builtin_launder)
diff --git a/contrib/restricted/abseil-cpp/absl/base/nullability.h b/contrib/restricted/abseil-cpp/absl/base/nullability.h
index 6f49b6f535b6..34dc083a4e84 100644
--- a/contrib/restricted/abseil-cpp/absl/base/nullability.h
+++ b/contrib/restricted/abseil-cpp/absl/base/nullability.h
@@ -128,9 +128,17 @@
 //
 // By default, nullability annotations are applicable to raw and smart
 // pointers. User-defined types can indicate compatibility with nullability
-// annotations by providing an `absl_nullability_compatible` nested type. The
-// actual definition of this inner type is not relevant as it is used merely as
-// a marker. It is common to use a using declaration of
+// annotations by adding the ABSL_NULLABILITY_COMPATIBLE attribute.
+//
+// // Example:
+// struct ABSL_NULLABILITY_COMPATIBLE MyPtr {
+//   ...
+// };
+//
+// Note: For the time being, nullability-compatible classes should additionally
+// be marked with an `absl_nullability_compatible` nested type (this will soon
+// be deprecated). The actual definition of this inner type is not relevant as
+// it is used merely as a marker. It is common to use a using declaration of
 // `absl_nullability_compatible` set to void.
 //
 // // Example:
@@ -150,14 +158,16 @@
 #ifndef ABSL_BASE_NULLABILITY_H_
 #define ABSL_BASE_NULLABILITY_H_
 
+#include "absl/base/config.h"
 #include "absl/base/internal/nullability_impl.h"
 
 namespace absl {
+ABSL_NAMESPACE_BEGIN
 
 // absl::Nonnull
 //
 // The indicated pointer is never null. It is the responsibility of the provider
-// of this pointer across an API boundary to ensure that the pointer is never be
+// of this pointer across an API boundary to ensure that the pointer is never
 // set to null. Consumers of this pointer across an API boundary may safely
 // dereference the pointer.
 //
@@ -198,9 +208,9 @@ using Nullable = nullability_internal::NullableImpl<T>;
 // migrated into one of the above two nullability states: `Nonnull<T>` or
 //  `Nullable<T>`.
 //
-// NOTE: Because this annotation is the global default state, pointers without
-// any annotation are assumed to have "unknown" semantics. This assumption is
-// designed to minimize churn and reduce clutter within the codebase.
+// NOTE: Because this annotation is the global default state, unannotated
+// pointers are assumed to have "unknown" semantics. This assumption is designed
+// to minimize churn and reduce clutter within the codebase.
 //
 // Example:
 //
@@ -219,6 +229,22 @@ using Nullable = nullability_internal::NullableImpl<T>;
 template <typename T>
 using NullabilityUnknown = nullability_internal::NullabilityUnknownImpl<T>;
 
+ABSL_NAMESPACE_END
 }  // namespace absl
 
+// ABSL_NULLABILITY_COMPATIBLE
+//
+// Indicates that a class is compatible with nullability annotations.
+//
+// For example:
+//
+// struct ABSL_NULLABILITY_COMPATIBLE MyPtr {
+//   ...
+// };
+#if ABSL_HAVE_FEATURE(nullability_on_classes)
+#define ABSL_NULLABILITY_COMPATIBLE _Nullable
+#else
+#define ABSL_NULLABILITY_COMPATIBLE
+#endif
+
 #endif  // ABSL_BASE_NULLABILITY_H_
diff --git a/contrib/restricted/abseil-cpp/absl/base/optimization.h b/contrib/restricted/abseil-cpp/absl/base/optimization.h
index f9859958999b..3aa66e1c7dba 100644
--- a/contrib/restricted/abseil-cpp/absl/base/optimization.h
+++ b/contrib/restricted/abseil-cpp/absl/base/optimization.h
@@ -18,12 +18,23 @@
 // -----------------------------------------------------------------------------
 //
 // This header file defines portable macros for performance optimization.
+//
+// This header is included in both C++ code and legacy C code and thus must
+// remain compatible with both C and C++. C compatibility will be removed if
+// the legacy code is removed or converted to C++. Do not include this header in
+// new code that requires C compatibility or assume C compatibility will remain
+// indefinitely.
 
 #ifndef ABSL_BASE_OPTIMIZATION_H_
 #define ABSL_BASE_OPTIMIZATION_H_
 
 #include <assert.h>
 
+#ifdef __cplusplus
+// Included for std::unreachable()
+#include <utility>
+#endif  // __cplusplus
+
 #include "absl/base/config.h"
 #include "absl/base/options.h"
 
diff --git a/contrib/restricted/abseil-cpp/absl/base/options.h b/contrib/restricted/abseil-cpp/absl/base/options.h
index d7bf8cffe6df..61a996b6c8cd 100644
--- a/contrib/restricted/abseil-cpp/absl/base/options.h
+++ b/contrib/restricted/abseil-cpp/absl/base/options.h
@@ -226,7 +226,7 @@
 // allowed.
 
 #define ABSL_OPTION_USE_INLINE_NAMESPACE 1
-#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240116
+#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722
 
 // ABSL_OPTION_HARDENED
 //
diff --git a/contrib/restricted/abseil-cpp/absl/base/prefetch.h b/contrib/restricted/abseil-cpp/absl/base/prefetch.h
index eb40a4453c53..482cde3a0166 100644
--- a/contrib/restricted/abseil-cpp/absl/base/prefetch.h
+++ b/contrib/restricted/abseil-cpp/absl/base/prefetch.h
@@ -129,7 +129,7 @@ void PrefetchToLocalCacheNta(const void* addr);
 //
 //  void* Arena::Allocate(size_t size) {
 //    void* ptr = AllocateBlock(size);
-//    absl::PrefetchToLocalCacheForWrite(p);
+//    absl::PrefetchToLocalCacheForWrite(ptr);
 //    return ptr;
 //  }
 //
diff --git a/contrib/restricted/abseil-cpp/absl/base/ya.make b/contrib/restricted/abseil-cpp/absl/base/ya.make
index 70ca844324cb..b19ed93c5d4b 100644
--- a/contrib/restricted/abseil-cpp/absl/base/ya.make
+++ b/contrib/restricted/abseil-cpp/absl/base/ya.make
@@ -21,6 +21,7 @@ NO_UTIL()
 SRCS(
     internal/cycleclock.cc
     internal/low_level_alloc.cc
+    internal/poison.cc
     internal/raw_logging.cc
     internal/scoped_set_env.cc
     internal/spinlock.cc
diff --git a/contrib/restricted/abseil-cpp/absl/container/flat_hash_map.h b/contrib/restricted/abseil-cpp/absl/container/flat_hash_map.h
index acd013b0262b..ebd9ed675662 100644
--- a/contrib/restricted/abseil-cpp/absl/container/flat_hash_map.h
+++ b/contrib/restricted/abseil-cpp/absl/container/flat_hash_map.h
@@ -26,21 +26,24 @@
 //
 // In most cases, your default choice for a hash map should be a map of type
 // `flat_hash_map`.
+//
+// `flat_hash_map` is not exception-safe.
 
 #ifndef ABSL_CONTAINER_FLAT_HASH_MAP_H_
 #define ABSL_CONTAINER_FLAT_HASH_MAP_H_
 
 #include <cstddef>
-#include <new>
+#include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/algorithm/container.h"
+#include "absl/base/attributes.h"
 #include "absl/base/macros.h"
+#include "absl/container/hash_container_defaults.h"
 #include "absl/container/internal/container_memory.h"
-#include "absl/container/internal/hash_function_defaults.h"  // IWYU pragma: export
 #include "absl/container/internal/raw_hash_map.h"  // IWYU pragma: export
-#include "absl/memory/memory.h"
+#include "absl/meta/type_traits.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
@@ -62,7 +65,7 @@ struct FlatHashMapPolicy;
 // * Requires values that are MoveConstructible
 // * Supports heterogeneous lookup, through `find()`, `operator[]()` and
 //   `insert()`, provided that the map is provided a compatible heterogeneous
-//   hashing function and equality operator.
+//   hashing function and equality operator. See below for details.
 // * Invalidates any references and pointers to elements within the table after
 //   `rehash()` and when the table is moved.
 // * Contains a `capacity()` member function indicating the number of element
@@ -80,6 +83,19 @@ struct FlatHashMapPolicy;
 // libraries (e.g. .dll, .so) is unsupported due to way `absl::Hash` values may
 // be randomized across dynamically loaded libraries.
 //
+// To achieve heterogeneous lookup for custom types either `Hash` and `Eq` type
+// parameters can be used or `T` should have public inner types
+// `absl_container_hash` and (optionally) `absl_container_eq`. In either case,
+// `typename Hash::is_transparent` and `typename Eq::is_transparent` should be
+// well-formed. Both types are basically functors:
+// * `Hash` should support `size_t operator()(U val) const` that returns a hash
+// for the given `val`.
+// * `Eq` should support `bool operator()(U lhs, V rhs) const` that returns true
+// if `lhs` is equal to `rhs`.
+//
+// In most cases `T` needs only to provide the `absl_container_hash`. In this
+// case `std::equal_to<void>` will be used instead of `eq` part.
+//
 // NOTE: A `flat_hash_map` stores its value types directly inside its
 // implementation array to avoid memory indirection. Because a `flat_hash_map`
 // is designed to move data when rehashed, map values will not retain pointer
@@ -106,13 +122,13 @@ struct FlatHashMapPolicy;
 //  if (result != ducks.end()) {
 //    std::cout << "Result: " << result->second << std::endl;
 //  }
-template <class K, class V,
-          class Hash = absl::container_internal::hash_default_hash<K>,
-          class Eq = absl::container_internal::hash_default_eq<K>,
+template <class K, class V, class Hash = DefaultHashContainerHash<K>,
+          class Eq = DefaultHashContainerEq<K>,
           class Allocator = std::allocator<std::pair<const K, V>>>
-class flat_hash_map : public absl::container_internal::raw_hash_map<
-                          absl::container_internal::FlatHashMapPolicy<K, V>,
-                          Hash, Eq, Allocator> {
+class ABSL_INTERNAL_ATTRIBUTE_OWNER flat_hash_map
+    : public absl::container_internal::raw_hash_map<
+          absl::container_internal::FlatHashMapPolicy<K, V>, Hash, Eq,
+          Allocator> {
   using Base = typename flat_hash_map::raw_hash_map;
 
  public:
@@ -560,6 +576,38 @@ typename flat_hash_map<K, V, H, E, A>::size_type erase_if(
 
 namespace container_internal {
 
+// c_for_each_fast(flat_hash_map<>, Function)
+//
+// Container-based version of the <algorithm> `std::for_each()` function to
+// apply a function to a container's elements.
+// There is no guarantees on the order of the function calls.
+// Erasure and/or insertion of elements in the function is not allowed.
+template <typename K, typename V, typename H, typename E, typename A,
+          typename Function>
+decay_t<Function> c_for_each_fast(const flat_hash_map<K, V, H, E, A>& c,
+                                  Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+template <typename K, typename V, typename H, typename E, typename A,
+          typename Function>
+decay_t<Function> c_for_each_fast(flat_hash_map<K, V, H, E, A>& c,
+                                  Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+template <typename K, typename V, typename H, typename E, typename A,
+          typename Function>
+decay_t<Function> c_for_each_fast(flat_hash_map<K, V, H, E, A>&& c,
+                                  Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+
+}  // namespace container_internal
+
+namespace container_internal {
+
 template <class K, class V>
 struct FlatHashMapPolicy {
   using slot_policy = container_internal::map_slot_policy<K, V>;
@@ -573,9 +621,10 @@ struct FlatHashMapPolicy {
     slot_policy::construct(alloc, slot, std::forward<Args>(args)...);
   }
 
+  // Returns std::true_type in case destroy is trivial.
   template <class Allocator>
-  static void destroy(Allocator* alloc, slot_type* slot) {
-    slot_policy::destroy(alloc, slot);
+  static auto destroy(Allocator* alloc, slot_type* slot) {
+    return slot_policy::destroy(alloc, slot);
   }
 
   template <class Allocator>
@@ -592,6 +641,13 @@ struct FlatHashMapPolicy {
                                                    std::forward<Args>(args)...);
   }
 
+  template <class Hash>
+  static constexpr HashSlotFn get_hash_slot_fn() {
+    return memory_internal::IsLayoutCompatible<K, V>::value
+               ? &TypeErasedApplyToSlotFn<Hash, K>
+               : nullptr;
+  }
+
   static size_t space_used(const slot_type*) { return 0; }
 
   static std::pair<const K, V>& element(slot_type* slot) { return slot->value; }
diff --git a/contrib/restricted/abseil-cpp/absl/container/flat_hash_set.h b/contrib/restricted/abseil-cpp/absl/container/flat_hash_set.h
index a94a82a0bf6d..a3e36e05e3b1 100644
--- a/contrib/restricted/abseil-cpp/absl/container/flat_hash_set.h
+++ b/contrib/restricted/abseil-cpp/absl/container/flat_hash_set.h
@@ -26,18 +26,25 @@
 //
 // In most cases, your default choice for a hash set should be a set of type
 // `flat_hash_set`.
+//
+// `flat_hash_set` is not exception-safe.
+
 #ifndef ABSL_CONTAINER_FLAT_HASH_SET_H_
 #define ABSL_CONTAINER_FLAT_HASH_SET_H_
 
+#include <cstddef>
+#include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/algorithm/container.h"
+#include "absl/base/attributes.h"
 #include "absl/base/macros.h"
+#include "absl/container/hash_container_defaults.h"
 #include "absl/container/internal/container_memory.h"
-#include "absl/container/internal/hash_function_defaults.h"  // IWYU pragma: export
 #include "absl/container/internal/raw_hash_set.h"  // IWYU pragma: export
 #include "absl/memory/memory.h"
+#include "absl/meta/type_traits.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
@@ -58,7 +65,7 @@ struct FlatHashSetPolicy;
 // * Requires keys that are CopyConstructible
 // * Supports heterogeneous lookup, through `find()` and `insert()`, provided
 //   that the set is provided a compatible heterogeneous hashing function and
-//   equality operator.
+//   equality operator. See below for details.
 // * Invalidates any references and pointers to elements within the table after
 //   `rehash()` and when the table is moved.
 // * Contains a `capacity()` member function indicating the number of element
@@ -76,6 +83,19 @@ struct FlatHashSetPolicy;
 // libraries (e.g. .dll, .so) is unsupported due to way `absl::Hash` values may
 // be randomized across dynamically loaded libraries.
 //
+// To achieve heterogeneous lookup for custom types either `Hash` and `Eq` type
+// parameters can be used or `T` should have public inner types
+// `absl_container_hash` and (optionally) `absl_container_eq`. In either case,
+// `typename Hash::is_transparent` and `typename Eq::is_transparent` should be
+// well-formed. Both types are basically functors:
+// * `Hash` should support `size_t operator()(U val) const` that returns a hash
+// for the given `val`.
+// * `Eq` should support `bool operator()(U lhs, V rhs) const` that returns true
+// if `lhs` is equal to `rhs`.
+//
+// In most cases `T` needs only to provide the `absl_container_hash`. In this
+// case `std::equal_to<void>` will be used instead of `eq` part.
+//
 // NOTE: A `flat_hash_set` stores its keys directly inside its implementation
 // array to avoid memory indirection. Because a `flat_hash_set` is designed to
 // move data when rehashed, set keys will not retain pointer stability. If you
@@ -99,10 +119,10 @@ struct FlatHashSetPolicy;
 //  if (ducks.contains("dewey")) {
 //    std::cout << "We found dewey!" << std::endl;
 //  }
-template <class T, class Hash = absl::container_internal::hash_default_hash<T>,
-          class Eq = absl::container_internal::hash_default_eq<T>,
+template <class T, class Hash = DefaultHashContainerHash<T>,
+          class Eq = DefaultHashContainerEq<T>,
           class Allocator = std::allocator<T>>
-class flat_hash_set
+class ABSL_INTERNAL_ATTRIBUTE_OWNER flat_hash_set
     : public absl::container_internal::raw_hash_set<
           absl::container_internal::FlatHashSetPolicy<T>, Hash, Eq, Allocator> {
   using Base = typename flat_hash_set::raw_hash_set;
@@ -460,6 +480,33 @@ typename flat_hash_set<T, H, E, A>::size_type erase_if(
 
 namespace container_internal {
 
+// c_for_each_fast(flat_hash_set<>, Function)
+//
+// Container-based version of the <algorithm> `std::for_each()` function to
+// apply a function to a container's elements.
+// There is no guarantees on the order of the function calls.
+// Erasure and/or insertion of elements in the function is not allowed.
+template <typename T, typename H, typename E, typename A, typename Function>
+decay_t<Function> c_for_each_fast(const flat_hash_set<T, H, E, A>& c,
+                                  Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+template <typename T, typename H, typename E, typename A, typename Function>
+decay_t<Function> c_for_each_fast(flat_hash_set<T, H, E, A>& c, Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+template <typename T, typename H, typename E, typename A, typename Function>
+decay_t<Function> c_for_each_fast(flat_hash_set<T, H, E, A>&& c, Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+
+}  // namespace container_internal
+
+namespace container_internal {
+
 template <class T>
 struct FlatHashSetPolicy {
   using slot_type = T;
@@ -473,9 +520,11 @@ struct FlatHashSetPolicy {
                                                  std::forward<Args>(args)...);
   }
 
+  // Return std::true_type in case destroy is trivial.
   template <class Allocator>
-  static void destroy(Allocator* alloc, slot_type* slot) {
+  static auto destroy(Allocator* alloc, slot_type* slot) {
     absl::allocator_traits<Allocator>::destroy(*alloc, slot);
+    return IsDestructionTrivial<Allocator, slot_type>();
   }
 
   static T& element(slot_type* slot) { return *slot; }
@@ -489,6 +538,11 @@ struct FlatHashSetPolicy {
   }
 
   static size_t space_used(const T*) { return 0; }
+
+  template <class Hash>
+  static constexpr HashSlotFn get_hash_slot_fn() {
+    return &TypeErasedApplyToSlotFn<Hash, T>;
+  }
 };
 }  // namespace container_internal
 
diff --git a/contrib/restricted/abseil-cpp/absl/container/hash_container_defaults.h b/contrib/restricted/abseil-cpp/absl/container/hash_container_defaults.h
new file mode 100644
index 000000000000..eb944a7c817e
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/container/hash_container_defaults.h
@@ -0,0 +1,45 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_CONTAINER_HASH_CONTAINER_DEFAULTS_H_
+#define ABSL_CONTAINER_HASH_CONTAINER_DEFAULTS_H_
+
+#include "absl/base/config.h"
+#include "absl/container/internal/hash_function_defaults.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// DefaultHashContainerHash is a convenience alias for the functor that is used
+// by default by Abseil hash-based (unordered) containers for hashing when
+// `Hash` type argument is not explicitly specified.
+//
+// This type alias can be used by generic code that wants to provide more
+// flexibility for defining underlying containers.
+template <typename T>
+using DefaultHashContainerHash = absl::container_internal::hash_default_hash<T>;
+
+// DefaultHashContainerEq is a convenience alias for the functor that is used by
+// default by Abseil hash-based (unordered) containers for equality check when
+// `Eq` type argument is not explicitly specified.
+//
+// This type alias can be used by generic code that wants to provide more
+// flexibility for defining underlying containers.
+template <typename T>
+using DefaultHashContainerEq = absl::container_internal::hash_default_eq<T>;
+
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_CONTAINER_HASH_CONTAINER_DEFAULTS_H_
diff --git a/contrib/restricted/abseil-cpp/absl/container/inlined_vector.h b/contrib/restricted/abseil-cpp/absl/container/inlined_vector.h
index 04e2c3856749..974b6521a0f8 100644
--- a/contrib/restricted/abseil-cpp/absl/container/inlined_vector.h
+++ b/contrib/restricted/abseil-cpp/absl/container/inlined_vector.h
@@ -775,7 +775,20 @@ class InlinedVector {
     ABSL_HARDENING_ASSERT(pos >= begin());
     ABSL_HARDENING_ASSERT(pos < end());
 
+    // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102329#c2
+    // It appears that GCC thinks that since `pos` is a const pointer and may
+    // point to uninitialized memory at this point, a warning should be
+    // issued. But `pos` is actually only used to compute an array index to
+    // write to.
+#if !defined(__clang__) && defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#pragma GCC diagnostic ignored "-Wuninitialized"
+#endif
     return storage_.Erase(pos, pos + 1);
+#if !defined(__clang__) && defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
   }
 
   // Overload of `InlinedVector::erase(...)` that erases every element in the
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/common_policy_traits.h b/contrib/restricted/abseil-cpp/absl/container/internal/common_policy_traits.h
index 57eac678faba..c521f6122eea 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/common_policy_traits.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/common_policy_traits.h
@@ -45,9 +45,10 @@ struct common_policy_traits {
 
   // PRECONDITION: `slot` is INITIALIZED
   // POSTCONDITION: `slot` is UNINITIALIZED
+  // Returns std::true_type in case destroy is trivial.
   template <class Alloc>
-  static void destroy(Alloc* alloc, slot_type* slot) {
-    Policy::destroy(alloc, slot);
+  static auto destroy(Alloc* alloc, slot_type* slot) {
+    return Policy::destroy(alloc, slot);
   }
 
   // Transfers the `old_slot` to `new_slot`. Any memory allocated by the
@@ -63,7 +64,7 @@ struct common_policy_traits {
   //                UNINITIALIZED
   template <class Alloc>
   static void transfer(Alloc* alloc, slot_type* new_slot, slot_type* old_slot) {
-    transfer_impl(alloc, new_slot, old_slot, Rank0{});
+    transfer_impl(alloc, new_slot, old_slot, Rank2{});
   }
 
   // PRECONDITION: `slot` is INITIALIZED
@@ -82,23 +83,31 @@ struct common_policy_traits {
 
   static constexpr bool transfer_uses_memcpy() {
     return std::is_same<decltype(transfer_impl<std::allocator<char>>(
-                            nullptr, nullptr, nullptr, Rank0{})),
+                            nullptr, nullptr, nullptr, Rank2{})),
+                        std::true_type>::value;
+  }
+
+  // Returns true if destroy is trivial and can be omitted.
+  template <class Alloc>
+  static constexpr bool destroy_is_trivial() {
+    return std::is_same<decltype(destroy<Alloc>(nullptr, nullptr)),
                         std::true_type>::value;
   }
 
  private:
-  // To rank the overloads below for overload resolution. Rank0 is preferred.
-  struct Rank2 {};
-  struct Rank1 : Rank2 {};
-  struct Rank0 : Rank1 {};
+  // Use go/ranked-overloads for dispatching.
+  struct Rank0 {};
+  struct Rank1 : Rank0 {};
+  struct Rank2 : Rank1 {};
 
   // Use auto -> decltype as an enabler.
   // P::transfer returns std::true_type if transfer uses memcpy (e.g. in
   // node_slot_policy).
   template <class Alloc, class P = Policy>
   static auto transfer_impl(Alloc* alloc, slot_type* new_slot,
-                            slot_type* old_slot, Rank0)
-      -> decltype(P::transfer(alloc, new_slot, old_slot)) {
+                            slot_type* old_slot,
+                            Rank2) -> decltype(P::transfer(alloc, new_slot,
+                                                           old_slot)) {
     return P::transfer(alloc, new_slot, old_slot);
   }
 #if defined(__cpp_lib_launder) && __cpp_lib_launder >= 201606
@@ -121,7 +130,7 @@ struct common_policy_traits {
 
   template <class Alloc>
   static void transfer_impl(Alloc* alloc, slot_type* new_slot,
-                            slot_type* old_slot, Rank2) {
+                            slot_type* old_slot, Rank0) {
     construct(alloc, new_slot, std::move(element(old_slot)));
     destroy(alloc, old_slot);
   }
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/compressed_tuple.h b/contrib/restricted/abseil-cpp/absl/container/internal/compressed_tuple.h
index 59e70eb21de0..6db0468d99a4 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/compressed_tuple.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/compressed_tuple.h
@@ -87,11 +87,11 @@ struct Storage {
   constexpr Storage() = default;
   template <typename V>
   explicit constexpr Storage(absl::in_place_t, V&& v)
-      : value(absl::forward<V>(v)) {}
+      : value(std::forward<V>(v)) {}
   constexpr const T& get() const& { return value; }
-  T& get() & { return value; }
-  constexpr const T&& get() const&& { return absl::move(*this).value; }
-  T&& get() && { return std::move(*this).value; }
+  constexpr T& get() & { return value; }
+  constexpr const T&& get() const&& { return std::move(*this).value; }
+  constexpr T&& get() && { return std::move(*this).value; }
 };
 
 template <typename T, size_t I>
@@ -99,13 +99,12 @@ struct ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC Storage<T, I, true> : T {
   constexpr Storage() = default;
 
   template <typename V>
-  explicit constexpr Storage(absl::in_place_t, V&& v)
-      : T(absl::forward<V>(v)) {}
+  explicit constexpr Storage(absl::in_place_t, V&& v) : T(std::forward<V>(v)) {}
 
   constexpr const T& get() const& { return *this; }
-  T& get() & { return *this; }
-  constexpr const T&& get() const&& { return absl::move(*this); }
-  T&& get() && { return std::move(*this); }
+  constexpr T& get() & { return *this; }
+  constexpr const T&& get() const&& { return std::move(*this); }
+  constexpr T&& get() && { return std::move(*this); }
 };
 
 template <typename D, typename I, bool ShouldAnyUseBase>
@@ -123,7 +122,7 @@ struct ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTupleImpl<
   constexpr CompressedTupleImpl() = default;
   template <typename... Vs>
   explicit constexpr CompressedTupleImpl(absl::in_place_t, Vs&&... args)
-      : Storage<Ts, I>(absl::in_place, absl::forward<Vs>(args))... {}
+      : Storage<Ts, I>(absl::in_place, std::forward<Vs>(args))... {}
   friend CompressedTuple<Ts...>;
 };
 
@@ -135,7 +134,7 @@ struct ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTupleImpl<
   constexpr CompressedTupleImpl() = default;
   template <typename... Vs>
   explicit constexpr CompressedTupleImpl(absl::in_place_t, Vs&&... args)
-      : Storage<Ts, I, false>(absl::in_place, absl::forward<Vs>(args))... {}
+      : Storage<Ts, I, false>(absl::in_place, std::forward<Vs>(args))... {}
   friend CompressedTuple<Ts...>;
 };
 
@@ -234,11 +233,11 @@ class ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTuple
                 bool> = true>
   explicit constexpr CompressedTuple(First&& first, Vs&&... base)
       : CompressedTuple::CompressedTupleImpl(absl::in_place,
-                                             absl::forward<First>(first),
-                                             absl::forward<Vs>(base)...) {}
+                                             std::forward<First>(first),
+                                             std::forward<Vs>(base)...) {}
 
   template <int I>
-  ElemT<I>& get() & {
+  constexpr ElemT<I>& get() & {
     return StorageT<I>::get();
   }
 
@@ -248,13 +247,13 @@ class ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTuple
   }
 
   template <int I>
-  ElemT<I>&& get() && {
+  constexpr ElemT<I>&& get() && {
     return std::move(*this).StorageT<I>::get();
   }
 
   template <int I>
   constexpr const ElemT<I>&& get() const&& {
-    return absl::move(*this).StorageT<I>::get();
+    return std::move(*this).StorageT<I>::get();
   }
 };
 
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/container_memory.h b/contrib/restricted/abseil-cpp/absl/container/internal/container_memory.h
index 3262d4eb8d28..ba8e08a2d223 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/container_memory.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/container_memory.h
@@ -68,6 +68,18 @@ void* Allocate(Alloc* alloc, size_t n) {
   return p;
 }
 
+// Returns true if the destruction of the value with given Allocator will be
+// trivial.
+template <class Allocator, class ValueType>
+constexpr auto IsDestructionTrivial() {
+  constexpr bool result =
+      std::is_trivially_destructible<ValueType>::value &&
+      std::is_same<typename absl::allocator_traits<
+                       Allocator>::template rebind_alloc<char>,
+                   std::allocator<char>>::value;
+  return std::integral_constant<bool, result>();
+}
+
 // The pointer must have been previously obtained by calling
 // Allocate<Alignment>(alloc, n).
 template <size_t Alignment, class Alloc>
@@ -414,12 +426,13 @@ struct map_slot_policy {
   }
 
   template <class Allocator>
-  static void destroy(Allocator* alloc, slot_type* slot) {
+  static auto destroy(Allocator* alloc, slot_type* slot) {
     if (kMutableKeys::value) {
       absl::allocator_traits<Allocator>::destroy(*alloc, &slot->mutable_value);
     } else {
       absl::allocator_traits<Allocator>::destroy(*alloc, &slot->value);
     }
+    return IsDestructionTrivial<Allocator, value_type>();
   }
 
   template <class Allocator>
@@ -451,6 +464,26 @@ struct map_slot_policy {
   }
 };
 
+// Type erased function for computing hash of the slot.
+using HashSlotFn = size_t (*)(const void* hash_fn, void* slot);
+
+// Type erased function to apply `Fn` to data inside of the `slot`.
+// The data is expected to have type `T`.
+template <class Fn, class T>
+size_t TypeErasedApplyToSlotFn(const void* fn, void* slot) {
+  const auto* f = static_cast<const Fn*>(fn);
+  return (*f)(*static_cast<const T*>(slot));
+}
+
+// Type erased function to apply `Fn` to data inside of the `*slot_ptr`.
+// The data is expected to have type `T`.
+template <class Fn, class T>
+size_t TypeErasedDerefAndApplyToSlotFn(const void* fn, void* slot_ptr) {
+  const auto* f = static_cast<const Fn*>(fn);
+  const T* slot = *static_cast<const T**>(slot_ptr);
+  return (*f)(*slot);
+}
+
 }  // namespace container_internal
 ABSL_NAMESPACE_END
 }  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/hash_function_defaults.h b/contrib/restricted/abseil-cpp/absl/container/internal/hash_function_defaults.h
index a3613b4bc514..0f07bcfe2944 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/hash_function_defaults.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/hash_function_defaults.h
@@ -45,14 +45,16 @@
 #ifndef ABSL_CONTAINER_INTERNAL_HASH_FUNCTION_DEFAULTS_H_
 #define ABSL_CONTAINER_INTERNAL_HASH_FUNCTION_DEFAULTS_H_
 
-#include <stdint.h>
 #include <cstddef>
+#include <functional>
 #include <memory>
 #include <string>
 #include <type_traits>
 
 #include "absl/base/config.h"
+#include "absl/container/internal/common.h"
 #include "absl/hash/hash.h"
+#include "absl/meta/type_traits.h"
 #include "absl/strings/cord.h"
 #include "absl/strings/string_view.h"
 
@@ -188,6 +190,71 @@ struct HashEq<std::unique_ptr<T, D>> : HashEq<T*> {};
 template <class T>
 struct HashEq<std::shared_ptr<T>> : HashEq<T*> {};
 
+template <typename T, typename E = void>
+struct HasAbslContainerHash : std::false_type {};
+
+template <typename T>
+struct HasAbslContainerHash<T, absl::void_t<typename T::absl_container_hash>>
+    : std::true_type {};
+
+template <typename T, typename E = void>
+struct HasAbslContainerEq : std::false_type {};
+
+template <typename T>
+struct HasAbslContainerEq<T, absl::void_t<typename T::absl_container_eq>>
+    : std::true_type {};
+
+template <typename T, typename E = void>
+struct AbslContainerEq {
+  using type = std::equal_to<>;
+};
+
+template <typename T>
+struct AbslContainerEq<
+    T, typename std::enable_if_t<HasAbslContainerEq<T>::value>> {
+  using type = typename T::absl_container_eq;
+};
+
+template <typename T, typename E = void>
+struct AbslContainerHash {
+  using type = void;
+};
+
+template <typename T>
+struct AbslContainerHash<
+    T, typename std::enable_if_t<HasAbslContainerHash<T>::value>> {
+  using type = typename T::absl_container_hash;
+};
+
+// HashEq specialization for user types that provide `absl_container_hash` and
+// (optionally) `absl_container_eq`. This specialization allows user types to
+// provide heterogeneous lookup without requiring to explicitly specify Hash/Eq
+// type arguments in unordered Abseil containers.
+//
+// Both `absl_container_hash` and `absl_container_eq` should be transparent
+// (have inner is_transparent type). While there is no technical reason to
+// restrict to transparent-only types, there is also no feasible use case when
+// it shouldn't be transparent - it is easier to relax the requirement later if
+// such a case arises rather than restricting it.
+//
+// If type provides only `absl_container_hash` then `eq` part will be
+// `std::equal_to<void>`.
+//
+// User types are not allowed to provide only a `Eq` part as there is no
+// feasible use case for this behavior - if Hash should be a default one then Eq
+// should be an equivalent to the `std::equal_to<T>`.
+template <typename T>
+struct HashEq<T, typename std::enable_if_t<HasAbslContainerHash<T>::value>> {
+  using Hash = typename AbslContainerHash<T>::type;
+  using Eq = typename AbslContainerEq<T>::type;
+  static_assert(IsTransparent<Hash>::value,
+                "absl_container_hash must be transparent. To achieve it add a "
+                "`using is_transparent = void;` clause to this type.");
+  static_assert(IsTransparent<Eq>::value,
+                "absl_container_eq must be transparent. To achieve it add a "
+                "`using is_transparent = void;` clause to this type.");
+};
+
 // This header's visibility is restricted.  If you need to access the default
 // hasher please use the container's ::hasher alias instead.
 //
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/hash_policy_traits.h b/contrib/restricted/abseil-cpp/absl/container/internal/hash_policy_traits.h
index 164ec123166d..ad835d6fcded 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/hash_policy_traits.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/hash_policy_traits.h
@@ -148,6 +148,56 @@ struct hash_policy_traits : common_policy_traits<Policy> {
   static auto value(T* elem) -> decltype(P::value(elem)) {
     return P::value(elem);
   }
+
+  using HashSlotFn = size_t (*)(const void* hash_fn, void* slot);
+
+  template <class Hash>
+  static constexpr HashSlotFn get_hash_slot_fn() {
+// get_hash_slot_fn may return nullptr to signal that non type erased function
+// should be used. GCC warns against comparing function address with nullptr.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+// silent error: the address of * will never be NULL [-Werror=address]
+#pragma GCC diagnostic ignored "-Waddress"
+#endif
+    return Policy::template get_hash_slot_fn<Hash>() == nullptr
+               ? &hash_slot_fn_non_type_erased<Hash>
+               : Policy::template get_hash_slot_fn<Hash>();
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+  }
+
+  // Whether small object optimization is enabled. True by default.
+  static constexpr bool soo_enabled() { return soo_enabled_impl(Rank1{}); }
+
+ private:
+  template <class Hash>
+  struct HashElement {
+    template <class K, class... Args>
+    size_t operator()(const K& key, Args&&...) const {
+      return h(key);
+    }
+    const Hash& h;
+  };
+
+  template <class Hash>
+  static size_t hash_slot_fn_non_type_erased(const void* hash_fn, void* slot) {
+    return Policy::apply(HashElement<Hash>{*static_cast<const Hash*>(hash_fn)},
+                         Policy::element(static_cast<slot_type*>(slot)));
+  }
+
+  // Use go/ranked-overloads for dispatching. Rank1 is preferred.
+  struct Rank0 {};
+  struct Rank1 : Rank0 {};
+
+  // Use auto -> decltype as an enabler.
+  template <class P = Policy>
+  static constexpr auto soo_enabled_impl(Rank1) -> decltype(P::soo_enabled()) {
+    return P::soo_enabled();
+  }
+
+  static constexpr bool soo_enabled_impl(Rank0) { return true; }
 };
 
 }  // namespace container_internal
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/hashtablez_sampler.cc b/contrib/restricted/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
index 79a0973a6d46..fd21d966b700 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
@@ -18,12 +18,18 @@
 #include <atomic>
 #include <cassert>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <limits>
 
 #include "absl/base/attributes.h"
 #include "absl/base/config.h"
+#include "absl/base/internal/per_thread_tls.h"
 #include "absl/base/internal/raw_logging.h"
+#include "absl/base/macros.h"
+#include "absl/base/no_destructor.h"
+#include "absl/base/optimization.h"
 #include "absl/debugging/stacktrace.h"
 #include "absl/memory/memory.h"
 #include "absl/profiling/internal/exponential_biased.h"
@@ -64,7 +70,7 @@ ABSL_PER_THREAD_TLS_KEYWORD SamplingState global_next_sample = {0, 0};
 #endif  // defined(ABSL_INTERNAL_HASHTABLEZ_SAMPLE)
 
 HashtablezSampler& GlobalHashtablezSampler() {
-  static auto* sampler = new HashtablezSampler();
+  static absl::NoDestructor<HashtablezSampler> sampler;
   return *sampler;
 }
 
@@ -72,7 +78,10 @@ HashtablezInfo::HashtablezInfo() = default;
 HashtablezInfo::~HashtablezInfo() = default;
 
 void HashtablezInfo::PrepareForSampling(int64_t stride,
-                                        size_t inline_element_size_value) {
+                                        size_t inline_element_size_value,
+                                        size_t key_size_value,
+                                        size_t value_size_value,
+                                        uint16_t soo_capacity_value) {
   capacity.store(0, std::memory_order_relaxed);
   size.store(0, std::memory_order_relaxed);
   num_erases.store(0, std::memory_order_relaxed);
@@ -92,6 +101,9 @@ void HashtablezInfo::PrepareForSampling(int64_t stride,
   depth = absl::GetStackTrace(stack, HashtablezInfo::kMaxStackDepth,
                               /* skip_count= */ 0);
   inline_element_size = inline_element_size_value;
+  key_size = key_size_value;
+  value_size = value_size_value;
+  soo_capacity = soo_capacity_value;
 }
 
 static bool ShouldForceSampling() {
@@ -115,12 +127,13 @@ static bool ShouldForceSampling() {
 }
 
 HashtablezInfo* SampleSlow(SamplingState& next_sample,
-                           size_t inline_element_size) {
+                           size_t inline_element_size, size_t key_size,
+                           size_t value_size, uint16_t soo_capacity) {
   if (ABSL_PREDICT_FALSE(ShouldForceSampling())) {
     next_sample.next_sample = 1;
     const int64_t old_stride = exchange(next_sample.sample_stride, 1);
-    HashtablezInfo* result =
-        GlobalHashtablezSampler().Register(old_stride, inline_element_size);
+    HashtablezInfo* result = GlobalHashtablezSampler().Register(
+        old_stride, inline_element_size, key_size, value_size, soo_capacity);
     return result;
   }
 
@@ -150,10 +163,12 @@ HashtablezInfo* SampleSlow(SamplingState& next_sample,
   // that case.
   if (first) {
     if (ABSL_PREDICT_TRUE(--next_sample.next_sample > 0)) return nullptr;
-    return SampleSlow(next_sample, inline_element_size);
+    return SampleSlow(next_sample, inline_element_size, key_size, value_size,
+                      soo_capacity);
   }
 
-  return GlobalHashtablezSampler().Register(old_stride, inline_element_size);
+  return GlobalHashtablezSampler().Register(old_stride, inline_element_size,
+                                            key_size, value_size, soo_capacity);
 #endif
 }
 
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/hashtablez_sampler.h b/contrib/restricted/abseil-cpp/absl/container/internal/hashtablez_sampler.h
index e41ee2d747ae..d74acf8c6e2b 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/hashtablez_sampler.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/hashtablez_sampler.h
@@ -40,15 +40,20 @@
 #define ABSL_CONTAINER_INTERNAL_HASHTABLEZ_SAMPLER_H_
 
 #include <atomic>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <vector>
 
+#include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/internal/per_thread_tls.h"
 #include "absl/base/optimization.h"
+#include "absl/base/thread_annotations.h"
 #include "absl/profiling/internal/sample_recorder.h"
 #include "absl/synchronization/mutex.h"
+#include "absl/time/time.h"
 #include "absl/utility/utility.h"
 
 namespace absl {
@@ -67,7 +72,9 @@ struct HashtablezInfo : public profiling_internal::Sample<HashtablezInfo> {
 
   // Puts the object into a clean state, fills in the logically `const` members,
   // blocking for any readers that are currently sampling the object.
-  void PrepareForSampling(int64_t stride, size_t inline_element_size_value)
+  void PrepareForSampling(int64_t stride, size_t inline_element_size_value,
+                          size_t key_size, size_t value_size,
+                          uint16_t soo_capacity_value)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(init_mu);
 
   // These fields are mutated by the various Record* APIs and need to be
@@ -91,8 +98,15 @@ struct HashtablezInfo : public profiling_internal::Sample<HashtablezInfo> {
   static constexpr int kMaxStackDepth = 64;
   absl::Time create_time;
   int32_t depth;
+  // The SOO capacity for this table in elements (not bytes). Note that sampled
+  // tables are never SOO because we need to store the infoz handle on the heap.
+  // Tables that would be SOO if not sampled should have: soo_capacity > 0 &&
+  // size <= soo_capacity && max_reserve <= soo_capacity.
+  uint16_t soo_capacity;
   void* stack[kMaxStackDepth];
-  size_t inline_element_size;  // How big is the slot?
+  size_t inline_element_size;  // How big is the slot in bytes?
+  size_t key_size;             // sizeof(key_type)
+  size_t value_size;           // sizeof(value_type)
 };
 
 void RecordRehashSlow(HashtablezInfo* info, size_t total_probe_length);
@@ -117,7 +131,8 @@ struct SamplingState {
 };
 
 HashtablezInfo* SampleSlow(SamplingState& next_sample,
-                           size_t inline_element_size);
+                           size_t inline_element_size, size_t key_size,
+                           size_t value_size, uint16_t soo_capacity);
 void UnsampleSlow(HashtablezInfo* info);
 
 #if defined(ABSL_INTERNAL_HASHTABLEZ_SAMPLE)
@@ -204,16 +219,19 @@ class HashtablezInfoHandle {
 extern ABSL_PER_THREAD_TLS_KEYWORD SamplingState global_next_sample;
 #endif  // defined(ABSL_INTERNAL_HASHTABLEZ_SAMPLE)
 
-// Returns an RAII sampling handle that manages registration and unregistation
-// with the global sampler.
+// Returns a sampling handle.
 inline HashtablezInfoHandle Sample(
-    size_t inline_element_size ABSL_ATTRIBUTE_UNUSED) {
+    ABSL_ATTRIBUTE_UNUSED size_t inline_element_size,
+    ABSL_ATTRIBUTE_UNUSED size_t key_size,
+    ABSL_ATTRIBUTE_UNUSED size_t value_size,
+    ABSL_ATTRIBUTE_UNUSED uint16_t soo_capacity) {
 #if defined(ABSL_INTERNAL_HASHTABLEZ_SAMPLE)
   if (ABSL_PREDICT_TRUE(--global_next_sample.next_sample > 0)) {
     return HashtablezInfoHandle(nullptr);
   }
-  return HashtablezInfoHandle(
-      SampleSlow(global_next_sample, inline_element_size));
+  return HashtablezInfoHandle(SampleSlow(global_next_sample,
+                                         inline_element_size, key_size,
+                                         value_size, soo_capacity));
 #else
   return HashtablezInfoHandle(nullptr);
 #endif  // !ABSL_PER_THREAD_TLS
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/inlined_vector.h b/contrib/restricted/abseil-cpp/absl/container/internal/inlined_vector.h
index 0eb9c34ddd58..2f24e4616f43 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/inlined_vector.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/inlined_vector.h
@@ -27,6 +27,7 @@
 
 #include "absl/base/attributes.h"
 #include "absl/base/config.h"
+#include "absl/base/internal/identity.h"
 #include "absl/base/macros.h"
 #include "absl/container/internal/compressed_tuple.h"
 #include "absl/memory/memory.h"
@@ -82,16 +83,6 @@ using IsMoveAssignOk = std::is_move_assignable<ValueType<A>>;
 template <typename A>
 using IsSwapOk = absl::type_traits_internal::IsSwappable<ValueType<A>>;
 
-template <typename T>
-struct TypeIdentity {
-  using type = T;
-};
-
-// Used for function arguments in template functions to prevent ADL by forcing
-// callers to explicitly specify the template parameter.
-template <typename T>
-using NoTypeDeduction = typename TypeIdentity<T>::type;
-
 template <typename A, bool IsTriviallyDestructible =
                           absl::is_trivially_destructible<ValueType<A>>::value>
 struct DestroyAdapter;
@@ -139,7 +130,7 @@ struct MallocAdapter {
 };
 
 template <typename A, typename ValueAdapter>
-void ConstructElements(NoTypeDeduction<A>& allocator,
+void ConstructElements(absl::internal::type_identity_t<A>& allocator,
                        Pointer<A> construct_first, ValueAdapter& values,
                        SizeType<A> construct_size) {
   for (SizeType<A> i = 0; i < construct_size; ++i) {
@@ -322,14 +313,13 @@ class Storage {
 
   // The policy to be used specifically when swapping inlined elements.
   using SwapInlinedElementsPolicy = absl::conditional_t<
-      // Fast path: if the value type can be trivially move constructed/assigned
-      // and destroyed, and we know the allocator doesn't do anything fancy,
-      // then it's safe for us to simply swap the bytes in the inline storage.
-      // It's as if we had move-constructed a temporary vector, move-assigned
-      // one to the other, then move-assigned the first from the temporary.
-      absl::conjunction<absl::is_trivially_move_constructible<ValueType<A>>,
-                        absl::is_trivially_move_assignable<ValueType<A>>,
-                        absl::is_trivially_destructible<ValueType<A>>,
+      // Fast path: if the value type can be trivially relocated, and we
+      // know the allocator doesn't do anything fancy, then it's safe for us
+      // to simply swap the bytes in the inline storage. It's as if we had
+      // relocated the first vector's elements into temporary storage,
+      // relocated the second's elements into the (now-empty) first's,
+      // and then relocated from temporary storage into the second.
+      absl::conjunction<absl::is_trivially_relocatable<ValueType<A>>,
                         std::is_same<A, std::allocator<ValueType<A>>>>::value,
       MemcpyPolicy,
       absl::conditional_t<IsSwapOk<A>::value, ElementwiseSwapPolicy,
@@ -624,8 +614,8 @@ void Storage<T, N, A>::InitFrom(const Storage& other) {
 
 template <typename T, size_t N, typename A>
 template <typename ValueAdapter>
-auto Storage<T, N, A>::Initialize(ValueAdapter values, SizeType<A> new_size)
-    -> void {
+auto Storage<T, N, A>::Initialize(ValueAdapter values,
+                                  SizeType<A> new_size) -> void {
   // Only callable from constructors!
   ABSL_HARDENING_ASSERT(!GetIsAllocated());
   ABSL_HARDENING_ASSERT(GetSize() == 0);
@@ -656,8 +646,8 @@ auto Storage<T, N, A>::Initialize(ValueAdapter values, SizeType<A> new_size)
 
 template <typename T, size_t N, typename A>
 template <typename ValueAdapter>
-auto Storage<T, N, A>::Assign(ValueAdapter values, SizeType<A> new_size)
-    -> void {
+auto Storage<T, N, A>::Assign(ValueAdapter values,
+                              SizeType<A> new_size) -> void {
   StorageView<A> storage_view = MakeStorageView();
 
   AllocationTransaction<A> allocation_tx(GetAllocator());
@@ -699,8 +689,8 @@ auto Storage<T, N, A>::Assign(ValueAdapter values, SizeType<A> new_size)
 
 template <typename T, size_t N, typename A>
 template <typename ValueAdapter>
-auto Storage<T, N, A>::Resize(ValueAdapter values, SizeType<A> new_size)
-    -> void {
+auto Storage<T, N, A>::Resize(ValueAdapter values,
+                              SizeType<A> new_size) -> void {
   StorageView<A> storage_view = MakeStorageView();
   Pointer<A> const base = storage_view.data;
   const SizeType<A> size = storage_view.size;
@@ -885,8 +875,8 @@ auto Storage<T, N, A>::EmplaceBackSlow(Args&&... args) -> Reference<A> {
 }
 
 template <typename T, size_t N, typename A>
-auto Storage<T, N, A>::Erase(ConstIterator<A> from, ConstIterator<A> to)
-    -> Iterator<A> {
+auto Storage<T, N, A>::Erase(ConstIterator<A> from,
+                             ConstIterator<A> to) -> Iterator<A> {
   StorageView<A> storage_view = MakeStorageView();
 
   auto erase_size = static_cast<SizeType<A>>(std::distance(from, to));
@@ -894,16 +884,30 @@ auto Storage<T, N, A>::Erase(ConstIterator<A> from, ConstIterator<A> to)
       std::distance(ConstIterator<A>(storage_view.data), from));
   SizeType<A> erase_end_index = erase_index + erase_size;
 
-  IteratorValueAdapter<A, MoveIterator<A>> move_values(
-      MoveIterator<A>(storage_view.data + erase_end_index));
-
-  AssignElements<A>(storage_view.data + erase_index, move_values,
-                    storage_view.size - erase_end_index);
+  // Fast path: if the value type is trivially relocatable and we know
+  // the allocator doesn't do anything fancy, then we know it is legal for us to
+  // simply destroy the elements in the "erasure window" (which cannot throw)
+  // and then memcpy downward to close the window.
+  if (absl::is_trivially_relocatable<ValueType<A>>::value &&
+      std::is_nothrow_destructible<ValueType<A>>::value &&
+      std::is_same<A, std::allocator<ValueType<A>>>::value) {
+    DestroyAdapter<A>::DestroyElements(
+        GetAllocator(), storage_view.data + erase_index, erase_size);
+    std::memmove(
+        reinterpret_cast<char*>(storage_view.data + erase_index),
+        reinterpret_cast<const char*>(storage_view.data + erase_end_index),
+        (storage_view.size - erase_end_index) * sizeof(ValueType<A>));
+  } else {
+    IteratorValueAdapter<A, MoveIterator<A>> move_values(
+        MoveIterator<A>(storage_view.data + erase_end_index));
 
-  DestroyAdapter<A>::DestroyElements(
-      GetAllocator(), storage_view.data + (storage_view.size - erase_size),
-      erase_size);
+    AssignElements<A>(storage_view.data + erase_index, move_values,
+                      storage_view.size - erase_end_index);
 
+    DestroyAdapter<A>::DestroyElements(
+        GetAllocator(), storage_view.data + (storage_view.size - erase_size),
+        erase_size);
+  }
   SubtractSize(erase_size);
   return Iterator<A>(storage_view.data + erase_index);
 }
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_map.h b/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_map.h
index 97182bc7bdb4..464bf23bd316 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_map.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_map.h
@@ -198,22 +198,24 @@ class raw_hash_map : public raw_hash_set<Policy, Hash, Eq, Alloc> {
   std::pair<iterator, bool> insert_or_assign_impl(K&& k, V&& v)
       ABSL_ATTRIBUTE_LIFETIME_BOUND {
     auto res = this->find_or_prepare_insert(k);
-    if (res.second)
+    if (res.second) {
       this->emplace_at(res.first, std::forward<K>(k), std::forward<V>(v));
-    else
-      Policy::value(&*this->iterator_at(res.first)) = std::forward<V>(v);
-    return {this->iterator_at(res.first), res.second};
+    } else {
+      Policy::value(&*res.first) = std::forward<V>(v);
+    }
+    return res;
   }
 
   template <class K = key_type, class... Args>
   std::pair<iterator, bool> try_emplace_impl(K&& k, Args&&... args)
       ABSL_ATTRIBUTE_LIFETIME_BOUND {
     auto res = this->find_or_prepare_insert(k);
-    if (res.second)
+    if (res.second) {
       this->emplace_at(res.first, std::piecewise_construct,
                        std::forward_as_tuple(std::forward<K>(k)),
                        std::forward_as_tuple(std::forward<Args>(args)...));
-    return {this->iterator_at(res.first), res.second};
+    }
+    return res;
   }
 };
 
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.cc b/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.cc
index 9f8ea5198768..1cae03819d60 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.cc
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.cc
@@ -23,19 +23,24 @@
 #include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/dynamic_annotations.h"
+#include "absl/base/internal/endian.h"
+#include "absl/base/optimization.h"
 #include "absl/container/internal/container_memory.h"
+#include "absl/container/internal/hashtablez_sampler.h"
 #include "absl/hash/hash.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
 namespace container_internal {
 
-// We have space for `growth_left` before a single block of control bytes. A
+// Represents a control byte corresponding to a full slot with arbitrary hash.
+constexpr ctrl_t ZeroCtrlT() { return static_cast<ctrl_t>(0); }
+
+// We have space for `growth_info` before a single block of control bytes. A
 // single block of empty control bytes for tables without any slots allocated.
 // This enables removing a branch in the hot path of find(). In order to ensure
 // that the control bytes are aligned to 16, we have 16 bytes before the control
-// bytes even though growth_left only needs 8.
-constexpr ctrl_t ZeroCtrlT() { return static_cast<ctrl_t>(0); }
+// bytes even though growth_info only needs 8.
 alignas(16) ABSL_CONST_INIT ABSL_DLL const ctrl_t kEmptyGroup[32] = {
     ZeroCtrlT(),       ZeroCtrlT(),    ZeroCtrlT(),    ZeroCtrlT(),
     ZeroCtrlT(),       ZeroCtrlT(),    ZeroCtrlT(),    ZeroCtrlT(),
@@ -46,6 +51,18 @@ alignas(16) ABSL_CONST_INIT ABSL_DLL const ctrl_t kEmptyGroup[32] = {
     ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty, ctrl_t::kEmpty,
     ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty, ctrl_t::kEmpty};
 
+// We need one full byte followed by a sentinel byte for iterator::operator++ to
+// work. We have a full group after kSentinel to be safe (in case operator++ is
+// changed to read a full group).
+ABSL_CONST_INIT ABSL_DLL const ctrl_t kSooControl[17] = {
+    ZeroCtrlT(),    ctrl_t::kSentinel, ZeroCtrlT(),    ctrl_t::kEmpty,
+    ctrl_t::kEmpty, ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty,
+    ctrl_t::kEmpty, ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty,
+    ctrl_t::kEmpty, ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty,
+    ctrl_t::kEmpty};
+static_assert(NumControlBytes(SooCapacity()) <= 17,
+              "kSooControl capacity too small");
+
 #ifdef ABSL_INTERNAL_NEED_REDUNDANT_CONSTEXPR_DECL
 constexpr size_t Group::kWidth;
 #endif
@@ -104,10 +121,25 @@ bool CommonFieldsGenerationInfoEnabled::should_rehash_for_bug_detection_on_move(
   return ShouldRehashForBugDetection(ctrl, capacity);
 }
 
-bool ShouldInsertBackwards(size_t hash, const ctrl_t* ctrl) {
+bool ShouldInsertBackwardsForDebug(size_t capacity, size_t hash,
+                                   const ctrl_t* ctrl) {
   // To avoid problems with weak hashes and single bit tests, we use % 13.
   // TODO(kfm,sbenza): revisit after we do unconditional mixing
-  return (H1(hash, ctrl) ^ RandomSeed()) % 13 > 6;
+  return !is_small(capacity) && (H1(hash, ctrl) ^ RandomSeed()) % 13 > 6;
+}
+
+size_t PrepareInsertAfterSoo(size_t hash, size_t slot_size,
+                             CommonFields& common) {
+  assert(common.capacity() == NextCapacity(SooCapacity()));
+  // After resize from capacity 1 to 3, we always have exactly the slot with
+  // index 1 occupied, so we need to insert either at index 0 or index 2.
+  assert(HashSetResizeHelper::SooSlotIndex() == 1);
+  PrepareInsertCommon(common);
+  const size_t offset = H1(hash, common.control()) & 2;
+  common.growth_info().OverwriteEmptyAsFull();
+  SetCtrlInSingleGroupTable(common, offset, H2(hash), slot_size);
+  common.infoz().RecordInsert(hash, /*distance_from_desired=*/0);
+  return offset;
 }
 
 void ConvertDeletedToEmptyAndFullToDeleted(ctrl_t* ctrl, size_t capacity) {
@@ -128,6 +160,8 @@ FindInfo find_first_non_full_outofline(const CommonFields& common,
   return find_first_non_full(common, hash);
 }
 
+namespace {
+
 // Returns the address of the slot just after slot assuming each slot has the
 // specified size.
 static inline void* NextSlot(void* slot, size_t slot_size) {
@@ -140,8 +174,22 @@ static inline void* PrevSlot(void* slot, size_t slot_size) {
   return reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(slot) - slot_size);
 }
 
+// Finds guaranteed to exists empty slot from the given position.
+// NOTE: this function is almost never triggered inside of the
+// DropDeletesWithoutResize, so we keep it simple.
+// The table is rather sparse, so empty slot will be found very quickly.
+size_t FindEmptySlot(size_t start, size_t end, const ctrl_t* ctrl) {
+  for (size_t i = start; i < end; ++i) {
+    if (IsEmpty(ctrl[i])) {
+      return i;
+    }
+  }
+  assert(false && "no empty slot");
+  return ~size_t{};
+}
+
 void DropDeletesWithoutResize(CommonFields& common,
-                              const PolicyFunctions& policy, void* tmp_space) {
+                              const PolicyFunctions& policy) {
   void* set = &common;
   void* slot_array = common.slot_array();
   const size_t capacity = common.capacity();
@@ -165,17 +213,28 @@ void DropDeletesWithoutResize(CommonFields& common,
   //       repeat procedure for current slot with moved from element (target)
   ctrl_t* ctrl = common.control();
   ConvertDeletedToEmptyAndFullToDeleted(ctrl, capacity);
+  const void* hash_fn = policy.hash_fn(common);
   auto hasher = policy.hash_slot;
   auto transfer = policy.transfer;
   const size_t slot_size = policy.slot_size;
 
   size_t total_probe_length = 0;
   void* slot_ptr = SlotAddress(slot_array, 0, slot_size);
+
+  // The index of an empty slot that can be used as temporary memory for
+  // the swap operation.
+  constexpr size_t kUnknownId = ~size_t{};
+  size_t tmp_space_id = kUnknownId;
+
   for (size_t i = 0; i != capacity;
        ++i, slot_ptr = NextSlot(slot_ptr, slot_size)) {
     assert(slot_ptr == SlotAddress(slot_array, i, slot_size));
+    if (IsEmpty(ctrl[i])) {
+      tmp_space_id = i;
+      continue;
+    }
     if (!IsDeleted(ctrl[i])) continue;
-    const size_t hash = (*hasher)(set, slot_ptr);
+    const size_t hash = (*hasher)(hash_fn, slot_ptr);
     const FindInfo target = find_first_non_full(common, hash);
     const size_t new_i = target.offset;
     total_probe_length += target.probe_length;
@@ -202,16 +261,26 @@ void DropDeletesWithoutResize(CommonFields& common,
       SetCtrl(common, new_i, H2(hash), slot_size);
       (*transfer)(set, new_slot_ptr, slot_ptr);
       SetCtrl(common, i, ctrl_t::kEmpty, slot_size);
+      // Initialize or change empty space id.
+      tmp_space_id = i;
     } else {
       assert(IsDeleted(ctrl[new_i]));
       SetCtrl(common, new_i, H2(hash), slot_size);
       // Until we are done rehashing, DELETED marks previously FULL slots.
 
+      if (tmp_space_id == kUnknownId) {
+        tmp_space_id = FindEmptySlot(i + 1, capacity, ctrl);
+      }
+      void* tmp_space = SlotAddress(slot_array, tmp_space_id, slot_size);
+      SanitizerUnpoisonMemoryRegion(tmp_space, slot_size);
+
       // Swap i and new_i elements.
       (*transfer)(set, tmp_space, new_slot_ptr);
       (*transfer)(set, new_slot_ptr, slot_ptr);
       (*transfer)(set, slot_ptr, tmp_space);
 
+      SanitizerPoisonMemoryRegion(tmp_space, slot_size);
+
       // repeat the processing of the ith slot
       --i;
       slot_ptr = PrevSlot(slot_ptr, slot_size);
@@ -238,6 +307,8 @@ static bool WasNeverFull(CommonFields& c, size_t index) {
              Group::kWidth;
 }
 
+}  // namespace
+
 void EraseMetaOnly(CommonFields& c, size_t index, size_t slot_size) {
   assert(IsFull(c.control()[index]) && "erasing a dangling iterator");
   c.decrement_size();
@@ -245,17 +316,19 @@ void EraseMetaOnly(CommonFields& c, size_t index, size_t slot_size) {
 
   if (WasNeverFull(c, index)) {
     SetCtrl(c, index, ctrl_t::kEmpty, slot_size);
-    c.set_growth_left(c.growth_left() + 1);
+    c.growth_info().OverwriteFullAsEmpty();
     return;
   }
 
+  c.growth_info().OverwriteFullAsDeleted();
   SetCtrl(c, index, ctrl_t::kDeleted, slot_size);
 }
 
 void ClearBackingArray(CommonFields& c, const PolicyFunctions& policy,
-                       bool reuse) {
+                       bool reuse, bool soo_enabled) {
   c.set_size(0);
   if (reuse) {
+    assert(!soo_enabled || c.capacity() > SooCapacity());
     ResetCtrl(c, policy.slot_size);
     ResetGrowthLeft(c);
     c.infoz().RecordStorageChanged(0, c.capacity());
@@ -263,118 +336,308 @@ void ClearBackingArray(CommonFields& c, const PolicyFunctions& policy,
     // We need to record infoz before calling dealloc, which will unregister
     // infoz.
     c.infoz().RecordClearedReservation();
-    c.infoz().RecordStorageChanged(0, 0);
+    c.infoz().RecordStorageChanged(0, soo_enabled ? SooCapacity() : 0);
     (*policy.dealloc)(c, policy);
-    c.set_control(EmptyGroup());
-    c.set_generation_ptr(EmptyGeneration());
-    c.set_slots(nullptr);
-    c.set_capacity(0);
+    c = soo_enabled ? CommonFields{soo_tag_t{}} : CommonFields{};
   }
 }
 
 void HashSetResizeHelper::GrowIntoSingleGroupShuffleControlBytes(
-    ctrl_t* new_ctrl, size_t new_capacity) const {
+    ctrl_t* __restrict new_ctrl, size_t new_capacity) const {
   assert(is_single_group(new_capacity));
   constexpr size_t kHalfWidth = Group::kWidth / 2;
+  constexpr size_t kQuarterWidth = Group::kWidth / 4;
   assert(old_capacity_ < kHalfWidth);
+  static_assert(sizeof(uint64_t) >= kHalfWidth,
+                "Group size is too large. The ctrl bytes for half a group must "
+                "fit into a uint64_t for this implementation.");
+  static_assert(sizeof(uint64_t) <= Group::kWidth,
+                "Group size is too small. The ctrl bytes for a group must "
+                "cover a uint64_t for this implementation.");
 
   const size_t half_old_capacity = old_capacity_ / 2;
 
   // NOTE: operations are done with compile time known size = kHalfWidth.
   // Compiler optimizes that into single ASM operation.
 
-  // Copy second half of bytes to the beginning.
-  // We potentially copy more bytes in order to have compile time known size.
-  // Mirrored bytes from the old_ctrl_ will also be copied.
-  // In case of old_capacity_ == 3, we will copy 1st element twice.
+  // Load the bytes from half_old_capacity + 1. This contains the last half of
+  // old_ctrl bytes, followed by the sentinel byte, and then the first half of
+  // the cloned bytes. This effectively shuffles the control bytes.
+  uint64_t copied_bytes = 0;
+  copied_bytes =
+      absl::little_endian::Load64(old_ctrl() + half_old_capacity + 1);
+
+  // We change the sentinel byte to kEmpty before storing to both the start of
+  // the new_ctrl, and past the end of the new_ctrl later for the new cloned
+  // bytes. Note that this is faster than setting the sentinel byte to kEmpty
+  // after the copy directly in new_ctrl because we are limited on store
+  // bandwidth.
+  constexpr uint64_t kEmptyXorSentinel =
+      static_cast<uint8_t>(ctrl_t::kEmpty) ^
+      static_cast<uint8_t>(ctrl_t::kSentinel);
+  const uint64_t mask_convert_old_sentinel_to_empty =
+      kEmptyXorSentinel << (half_old_capacity * 8);
+  copied_bytes ^= mask_convert_old_sentinel_to_empty;
+
+  // Copy second half of bytes to the beginning. This correctly sets the bytes
+  // [0, old_capacity]. We potentially copy more bytes in order to have compile
+  // time known size. Mirrored bytes from the old_ctrl() will also be copied. In
+  // case of old_capacity_ == 3, we will copy 1st element twice.
   // Examples:
+  // (old capacity = 1)
   // old_ctrl = 0S0EEEEEEE...
-  // new_ctrl = S0EEEEEEEE...
+  // new_ctrl = E0EEEEEE??...
   //
-  // old_ctrl = 01S01EEEEE...
-  // new_ctrl = 1S01EEEEEE...
+  // (old capacity = 3)
+  // old_ctrl = 012S012EEEEE...
+  // new_ctrl = 12E012EE????...
   //
+  // (old capacity = 7)
   // old_ctrl = 0123456S0123456EE...
-  // new_ctrl = 456S0123?????????...
-  std::memcpy(new_ctrl, old_ctrl_ + half_old_capacity + 1, kHalfWidth);
-  // Clean up copied kSentinel from old_ctrl.
-  new_ctrl[half_old_capacity] = ctrl_t::kEmpty;
-
-  // Clean up damaged or uninitialized bytes.
-
-  // Clean bytes after the intended size of the copy.
-  // Example:
-  // new_ctrl = 1E01EEEEEEE????
-  // *new_ctrl= 1E0EEEEEEEE????
-  // position      /
-  std::memset(new_ctrl + old_capacity_ + 1, static_cast<int8_t>(ctrl_t::kEmpty),
-              kHalfWidth);
-  // Clean non-mirrored bytes that are not initialized.
-  // For small old_capacity that may be inside of mirrored bytes zone.
+  // new_ctrl = 456E0123?????????...
+  absl::little_endian::Store64(new_ctrl, copied_bytes);
+
+  // Set the space [old_capacity + 1, new_capacity] to empty as these bytes will
+  // not be written again. This is safe because
+  // NumControlBytes = new_capacity + kWidth and new_capacity >=
+  // old_capacity+1.
   // Examples:
-  // new_ctrl = 1E0EEEEEEEE??????????....
-  // *new_ctrl= 1E0EEEEEEEEEEEEE?????....
-  // position           /
+  // (old_capacity = 3, new_capacity = 15)
+  // new_ctrl  = 12E012EE?????????????...??
+  // *new_ctrl = 12E0EEEEEEEEEEEEEEEE?...??
+  // position        /          S
   //
-  // new_ctrl = 456E0123???????????...
-  // *new_ctrl= 456E0123EEEEEEEE???...
-  // position           /
-  std::memset(new_ctrl + kHalfWidth, static_cast<int8_t>(ctrl_t::kEmpty),
-              kHalfWidth);
-  // Clean last mirrored bytes that are not initialized
-  // and will not be overwritten by mirroring.
+  // (old_capacity = 7, new_capacity = 15)
+  // new_ctrl  = 456E0123?????????????????...??
+  // *new_ctrl = 456E0123EEEEEEEEEEEEEEEE?...??
+  // position            /      S
+  std::memset(new_ctrl + old_capacity_ + 1, static_cast<int8_t>(ctrl_t::kEmpty),
+              Group::kWidth);
+
+  // Set the last kHalfWidth bytes to empty, to ensure the bytes all the way to
+  // the end are initialized.
   // Examples:
-  // new_ctrl = 1E0EEEEEEEEEEEEE????????
-  // *new_ctrl= 1E0EEEEEEEEEEEEEEEEEEEEE
-  // position           S       /
+  // new_ctrl  = 12E0EEEEEEEEEEEEEEEE?...???????
+  // *new_ctrl = 12E0EEEEEEEEEEEEEEEE???EEEEEEEE
+  // position                   S       /
   //
-  // new_ctrl = 456E0123EEEEEEEE???????????????
-  // *new_ctrl= 456E0123EEEEEEEE???????EEEEEEEE
-  // position                  S       /
-  std::memset(new_ctrl + new_capacity + kHalfWidth,
+  // new_ctrl  = 456E0123EEEEEEEEEEEEEEEE???????
+  // *new_ctrl = 456E0123EEEEEEEEEEEEEEEEEEEEEEE
+  // position                   S       /
+  std::memset(new_ctrl + NumControlBytes(new_capacity) - kHalfWidth,
               static_cast<int8_t>(ctrl_t::kEmpty), kHalfWidth);
 
-  // Create mirrored bytes. old_capacity_ < kHalfWidth
-  // Example:
-  // new_ctrl = 456E0123EEEEEEEE???????EEEEEEEE
-  // *new_ctrl= 456E0123EEEEEEEE456E0123EEEEEEE
-  // position                  S/
-  ctrl_t g[kHalfWidth];
-  std::memcpy(g, new_ctrl, kHalfWidth);
-  std::memcpy(new_ctrl + new_capacity + 1, g, kHalfWidth);
+  // Copy the first bytes to the end (starting at new_capacity +1) to set the
+  // cloned bytes. Note that we use the already copied bytes from old_ctrl here
+  // rather than copying from new_ctrl to avoid a Read-after-Write hazard, since
+  // new_ctrl was just written to. The first old_capacity-1 bytes are set
+  // correctly. Then there may be up to old_capacity bytes that need to be
+  // overwritten, and any remaining bytes will be correctly set to empty. This
+  // sets [new_capacity + 1, new_capacity +1 + old_capacity] correctly.
+  // Examples:
+  // new_ctrl  = 12E0EEEEEEEEEEEEEEEE?...???????
+  // *new_ctrl = 12E0EEEEEEEEEEEE12E012EEEEEEEEE
+  // position                   S/
+  //
+  // new_ctrl  = 456E0123EEEEEEEE?...???EEEEEEEE
+  // *new_ctrl = 456E0123EEEEEEEE456E0123EEEEEEE
+  // position                   S/
+  absl::little_endian::Store64(new_ctrl + new_capacity + 1, copied_bytes);
+
+  // Set The remaining bytes at the end past the cloned bytes to empty. The
+  // incorrectly set bytes are [new_capacity + old_capacity + 2,
+  // min(new_capacity + 1 + kHalfWidth, new_capacity + old_capacity + 2 +
+  // half_old_capacity)]. Taking the difference, we need to set min(kHalfWidth -
+  // (old_capacity + 1), half_old_capacity)]. Since old_capacity < kHalfWidth,
+  // half_old_capacity < kQuarterWidth, so we set kQuarterWidth beginning at
+  // new_capacity + old_capacity + 2 to kEmpty.
+  // Examples:
+  // new_ctrl  = 12E0EEEEEEEEEEEE12E012EEEEEEEEE
+  // *new_ctrl = 12E0EEEEEEEEEEEE12E0EEEEEEEEEEE
+  // position                   S    /
+  //
+  // new_ctrl  = 456E0123EEEEEEEE456E0123EEEEEEE
+  // *new_ctrl = 456E0123EEEEEEEE456E0123EEEEEEE (no change)
+  // position                   S        /
+  std::memset(new_ctrl + new_capacity + old_capacity_ + 2,
+              static_cast<int8_t>(ctrl_t::kEmpty), kQuarterWidth);
+
+  // Finally, we set the new sentinel byte.
+  new_ctrl[new_capacity] = ctrl_t::kSentinel;
+}
 
-  // Finally set sentinel to its place.
+void HashSetResizeHelper::InitControlBytesAfterSoo(ctrl_t* new_ctrl, ctrl_t h2,
+                                                   size_t new_capacity) {
+  assert(is_single_group(new_capacity));
+  std::memset(new_ctrl, static_cast<int8_t>(ctrl_t::kEmpty),
+              NumControlBytes(new_capacity));
+  assert(HashSetResizeHelper::SooSlotIndex() == 1);
+  // This allows us to avoid branching on had_soo_slot_.
+  assert(had_soo_slot_ || h2 == ctrl_t::kEmpty);
+  new_ctrl[1] = new_ctrl[new_capacity + 2] = h2;
   new_ctrl[new_capacity] = ctrl_t::kSentinel;
 }
 
 void HashSetResizeHelper::GrowIntoSingleGroupShuffleTransferableSlots(
-    void* old_slots, void* new_slots, size_t slot_size) const {
+    void* new_slots, size_t slot_size) const {
   assert(old_capacity_ > 0);
   const size_t half_old_capacity = old_capacity_ / 2;
 
-  SanitizerUnpoisonMemoryRegion(old_slots, slot_size * old_capacity_);
+  SanitizerUnpoisonMemoryRegion(old_slots(), slot_size * old_capacity_);
   std::memcpy(new_slots,
-              SlotAddress(old_slots, half_old_capacity + 1, slot_size),
+              SlotAddress(old_slots(), half_old_capacity + 1, slot_size),
               slot_size * half_old_capacity);
   std::memcpy(SlotAddress(new_slots, half_old_capacity + 1, slot_size),
-              old_slots, slot_size * (half_old_capacity + 1));
+              old_slots(), slot_size * (half_old_capacity + 1));
 }
 
 void HashSetResizeHelper::GrowSizeIntoSingleGroupTransferable(
-    CommonFields& c, void* old_slots, size_t slot_size) {
+    CommonFields& c, size_t slot_size) {
   assert(old_capacity_ < Group::kWidth / 2);
   assert(is_single_group(c.capacity()));
   assert(IsGrowingIntoSingleGroupApplicable(old_capacity_, c.capacity()));
 
   GrowIntoSingleGroupShuffleControlBytes(c.control(), c.capacity());
-  GrowIntoSingleGroupShuffleTransferableSlots(old_slots, c.slot_array(),
-                                              slot_size);
+  GrowIntoSingleGroupShuffleTransferableSlots(c.slot_array(), slot_size);
 
   // We poison since GrowIntoSingleGroupShuffleTransferableSlots
   // may leave empty slots unpoisoned.
   PoisonSingleGroupEmptySlots(c, slot_size);
 }
 
+void HashSetResizeHelper::TransferSlotAfterSoo(CommonFields& c,
+                                               size_t slot_size) {
+  assert(was_soo_);
+  assert(had_soo_slot_);
+  assert(is_single_group(c.capacity()));
+  std::memcpy(SlotAddress(c.slot_array(), SooSlotIndex(), slot_size),
+              old_soo_data(), slot_size);
+  PoisonSingleGroupEmptySlots(c, slot_size);
+}
+
+namespace {
+
+// Called whenever the table needs to vacate empty slots either by removing
+// tombstones via rehash or growth.
+ABSL_ATTRIBUTE_NOINLINE
+FindInfo FindInsertPositionWithGrowthOrRehash(CommonFields& common, size_t hash,
+                                              const PolicyFunctions& policy) {
+  const size_t cap = common.capacity();
+  if (cap > Group::kWidth &&
+      // Do these calculations in 64-bit to avoid overflow.
+      common.size() * uint64_t{32} <= cap * uint64_t{25}) {
+    // Squash DELETED without growing if there is enough capacity.
+    //
+    // Rehash in place if the current size is <= 25/32 of capacity.
+    // Rationale for such a high factor: 1) DropDeletesWithoutResize() is
+    // faster than resize, and 2) it takes quite a bit of work to add
+    // tombstones.  In the worst case, seems to take approximately 4
+    // insert/erase pairs to create a single tombstone and so if we are
+    // rehashing because of tombstones, we can afford to rehash-in-place as
+    // long as we are reclaiming at least 1/8 the capacity without doing more
+    // than 2X the work.  (Where "work" is defined to be size() for rehashing
+    // or rehashing in place, and 1 for an insert or erase.)  But rehashing in
+    // place is faster per operation than inserting or even doubling the size
+    // of the table, so we actually afford to reclaim even less space from a
+    // resize-in-place.  The decision is to rehash in place if we can reclaim
+    // at about 1/8th of the usable capacity (specifically 3/28 of the
+    // capacity) which means that the total cost of rehashing will be a small
+    // fraction of the total work.
+    //
+    // Here is output of an experiment using the BM_CacheInSteadyState
+    // benchmark running the old case (where we rehash-in-place only if we can
+    // reclaim at least 7/16*capacity) vs. this code (which rehashes in place
+    // if we can recover 3/32*capacity).
+    //
+    // Note that although in the worst-case number of rehashes jumped up from
+    // 15 to 190, but the number of operations per second is almost the same.
+    //
+    // Abridged output of running BM_CacheInSteadyState benchmark from
+    // raw_hash_set_benchmark.   N is the number of insert/erase operations.
+    //
+    //      | OLD (recover >= 7/16        | NEW (recover >= 3/32)
+    // size |    N/s LoadFactor NRehashes |    N/s LoadFactor NRehashes
+    //  448 | 145284       0.44        18 | 140118       0.44        19
+    //  493 | 152546       0.24        11 | 151417       0.48        28
+    //  538 | 151439       0.26        11 | 151152       0.53        38
+    //  583 | 151765       0.28        11 | 150572       0.57        50
+    //  628 | 150241       0.31        11 | 150853       0.61        66
+    //  672 | 149602       0.33        12 | 150110       0.66        90
+    //  717 | 149998       0.35        12 | 149531       0.70       129
+    //  762 | 149836       0.37        13 | 148559       0.74       190
+    //  807 | 149736       0.39        14 | 151107       0.39        14
+    //  852 | 150204       0.42        15 | 151019       0.42        15
+    DropDeletesWithoutResize(common, policy);
+  } else {
+    // Otherwise grow the container.
+    policy.resize(common, NextCapacity(cap), HashtablezInfoHandle{});
+  }
+  // This function is typically called with tables containing deleted slots.
+  // The table will be big and `FindFirstNonFullAfterResize` will always
+  // fallback to `find_first_non_full`. So using `find_first_non_full` directly.
+  return find_first_non_full(common, hash);
+}
+
+}  // namespace
+
+const void* GetHashRefForEmptyHasher(const CommonFields& common) {
+  // Empty base optimization typically make the empty base class address to be
+  // the same as the first address of the derived class object.
+  // But we generally assume that for empty hasher we can return any valid
+  // pointer.
+  return &common;
+}
+
+size_t PrepareInsertNonSoo(CommonFields& common, size_t hash, FindInfo target,
+                           const PolicyFunctions& policy) {
+  // When there are no deleted slots in the table
+  // and growth_left is positive, we can insert at the first
+  // empty slot in the probe sequence (target).
+  const bool use_target_hint =
+      // Optimization is disabled when generations are enabled.
+      // We have to rehash even sparse tables randomly in such mode.
+      !SwisstableGenerationsEnabled() &&
+      common.growth_info().HasNoDeletedAndGrowthLeft();
+  if (ABSL_PREDICT_FALSE(!use_target_hint)) {
+    // Notes about optimized mode when generations are disabled:
+    // We do not enter this branch if table has no deleted slots
+    // and growth_left is positive.
+    // We enter this branch in the following cases listed in decreasing
+    // frequency:
+    // 1. Table without deleted slots (>95% cases) that needs to be resized.
+    // 2. Table with deleted slots that has space for the inserting element.
+    // 3. Table with deleted slots that needs to be rehashed or resized.
+    if (ABSL_PREDICT_TRUE(common.growth_info().HasNoGrowthLeftAndNoDeleted())) {
+      const size_t old_capacity = common.capacity();
+      policy.resize(common, NextCapacity(old_capacity), HashtablezInfoHandle{});
+      target = HashSetResizeHelper::FindFirstNonFullAfterResize(
+          common, old_capacity, hash);
+    } else {
+      // Note: the table may have no deleted slots here when generations
+      // are enabled.
+      const bool rehash_for_bug_detection =
+          common.should_rehash_for_bug_detection_on_insert();
+      if (rehash_for_bug_detection) {
+        // Move to a different heap allocation in order to detect bugs.
+        const size_t cap = common.capacity();
+        policy.resize(common,
+                      common.growth_left() > 0 ? cap : NextCapacity(cap),
+                      HashtablezInfoHandle{});
+      }
+      if (ABSL_PREDICT_TRUE(common.growth_left() > 0)) {
+        target = find_first_non_full(common, hash);
+      } else {
+        target = FindInsertPositionWithGrowthOrRehash(common, hash, policy);
+      }
+    }
+  }
+  PrepareInsertCommon(common);
+  common.growth_info().OverwriteControlAsFull(common.control()[target.offset]);
+  SetCtrl(common, target.offset, H2(hash), policy.slot_size);
+  common.infoz().RecordInsert(hash, target.probe_length);
+  return target.offset;
+}
+
 }  // namespace container_internal
 ABSL_NAMESPACE_END
 }  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.h b/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.h
index 3518bc34040d..d4fe8f5c21be 100644
--- a/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.h
+++ b/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.h
@@ -80,7 +80,7 @@
 //     slot_type slots[capacity];
 //   };
 //
-// The length of this array is computed by `AllocSize()` below.
+// The length of this array is computed by `RawHashSetLayout::alloc_size` below.
 //
 // Control bytes (`ctrl_t`) are bytes (collected into groups of a
 // platform-specific size) that define the state of the corresponding slot in
@@ -100,6 +100,13 @@
 // Storing control bytes in a separate array also has beneficial cache effects,
 // since more logical slots will fit into a cache line.
 //
+// # Small Object Optimization (SOO)
+//
+// When the size/alignment of the value_type and the capacity of the table are
+// small, we enable small object optimization and store the values inline in
+// the raw_hash_set object. This optimization allows us to avoid
+// allocation/deallocation as well as cache/dTLB misses.
+//
 // # Hashing
 //
 // We compute two separate hashes, `H1` and `H2`, from the hash of an object.
@@ -233,9 +240,10 @@ namespace container_internal {
 
 #ifdef ABSL_SWISSTABLE_ENABLE_GENERATIONS
 #error ABSL_SWISSTABLE_ENABLE_GENERATIONS cannot be directly set
-#elif defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
-    defined(ABSL_HAVE_HWADDRESS_SANITIZER) || \
-    defined(ABSL_HAVE_MEMORY_SANITIZER)
+#elif (defined(ABSL_HAVE_ADDRESS_SANITIZER) ||   \
+       defined(ABSL_HAVE_HWADDRESS_SANITIZER) || \
+       defined(ABSL_HAVE_MEMORY_SANITIZER)) &&   \
+    !defined(NDEBUG_SANITIZER)  // If defined, performance is important.
 // When compiled in sanitizer mode, we add generation integers to the backing
 // array and iterators. In the backing array, we store the generation between
 // the control bytes and the slots. When iterators are dereferenced, we assert
@@ -374,6 +382,9 @@ uint32_t TrailingZeros(T x) {
   return static_cast<uint32_t>(countr_zero(x));
 }
 
+// 8 bytes bitmask with most significant bit set for every byte.
+constexpr uint64_t kMsbs8Bytes = 0x8080808080808080ULL;
+
 // An abstract bitmask, such as that emitted by a SIMD instruction.
 //
 // Specifically, this type implements a simple bitset whose representation is
@@ -423,27 +434,35 @@ class NonIterableBitMask {
 // an ordinary 16-bit bitset occupying the low 16 bits of `mask`. When
 // `SignificantBits` is 8 and `Shift` is 3, abstract bits are represented as
 // the bytes `0x00` and `0x80`, and it occupies all 64 bits of the bitmask.
+// If NullifyBitsOnIteration is true (only allowed for Shift == 3),
+// non zero abstract bit is allowed to have additional bits
+// (e.g., `0xff`, `0x83` and `0x9c` are ok, but `0x6f` is not).
 //
 // For example:
 //   for (int i : BitMask<uint32_t, 16>(0b101)) -> yields 0, 2
 //   for (int i : BitMask<uint64_t, 8, 3>(0x0000000080800000)) -> yields 2, 3
-template <class T, int SignificantBits, int Shift = 0>
+template <class T, int SignificantBits, int Shift = 0,
+          bool NullifyBitsOnIteration = false>
 class BitMask : public NonIterableBitMask<T, SignificantBits, Shift> {
   using Base = NonIterableBitMask<T, SignificantBits, Shift>;
   static_assert(std::is_unsigned<T>::value, "");
   static_assert(Shift == 0 || Shift == 3, "");
+  static_assert(!NullifyBitsOnIteration || Shift == 3, "");
 
  public:
-  explicit BitMask(T mask) : Base(mask) {}
+  explicit BitMask(T mask) : Base(mask) {
+    if (Shift == 3 && !NullifyBitsOnIteration) {
+      assert(this->mask_ == (this->mask_ & kMsbs8Bytes));
+    }
+  }
   // BitMask is an iterator over the indices of its abstract bits.
   using value_type = int;
   using iterator = BitMask;
   using const_iterator = BitMask;
 
   BitMask& operator++() {
-    if (Shift == 3) {
-      constexpr uint64_t msbs = 0x8080808080808080ULL;
-      this->mask_ &= msbs;
+    if (Shift == 3 && NullifyBitsOnIteration) {
+      this->mask_ &= kMsbs8Bytes;
     }
     this->mask_ &= (this->mask_ - 1);
     return *this;
@@ -520,10 +539,24 @@ ABSL_DLL extern const ctrl_t kEmptyGroup[32];
 // Returns a pointer to a control byte group that can be used by empty tables.
 inline ctrl_t* EmptyGroup() {
   // Const must be cast away here; no uses of this function will actually write
-  // to it, because it is only used for empty tables.
+  // to it because it is only used for empty tables.
   return const_cast<ctrl_t*>(kEmptyGroup + 16);
 }
 
+// For use in SOO iterators.
+// TODO(b/289225379): we could potentially get rid of this by adding an is_soo
+// bit in iterators. This would add branches but reduce cache misses.
+ABSL_DLL extern const ctrl_t kSooControl[17];
+
+// Returns a pointer to a full byte followed by a sentinel byte.
+inline ctrl_t* SooControl() {
+  // Const must be cast away here; no uses of this function will actually write
+  // to it because it is only used for SOO iterators.
+  return const_cast<ctrl_t*>(kSooControl);
+}
+// Whether ctrl is from the SooControl array.
+inline bool IsSooControl(const ctrl_t* ctrl) { return ctrl == SooControl(); }
+
 // Returns a pointer to a generation to use for an empty hashtable.
 GenerationType* EmptyGeneration();
 
@@ -535,7 +568,37 @@ inline bool IsEmptyGeneration(const GenerationType* generation) {
 
 // Mixes a randomly generated per-process seed with `hash` and `ctrl` to
 // randomize insertion order within groups.
-bool ShouldInsertBackwards(size_t hash, const ctrl_t* ctrl);
+bool ShouldInsertBackwardsForDebug(size_t capacity, size_t hash,
+                                   const ctrl_t* ctrl);
+
+ABSL_ATTRIBUTE_ALWAYS_INLINE inline bool ShouldInsertBackwards(
+    ABSL_ATTRIBUTE_UNUSED size_t capacity, ABSL_ATTRIBUTE_UNUSED size_t hash,
+    ABSL_ATTRIBUTE_UNUSED const ctrl_t* ctrl) {
+#if defined(NDEBUG)
+  return false;
+#else
+  return ShouldInsertBackwardsForDebug(capacity, hash, ctrl);
+#endif
+}
+
+// Returns insert position for the given mask.
+// We want to add entropy even when ASLR is not enabled.
+// In debug build we will randomly insert in either the front or back of
+// the group.
+// TODO(kfm,sbenza): revisit after we do unconditional mixing
+template <class Mask>
+ABSL_ATTRIBUTE_ALWAYS_INLINE inline auto GetInsertionOffset(
+    Mask mask, ABSL_ATTRIBUTE_UNUSED size_t capacity,
+    ABSL_ATTRIBUTE_UNUSED size_t hash,
+    ABSL_ATTRIBUTE_UNUSED const ctrl_t* ctrl) {
+#if defined(NDEBUG)
+  return mask.LowestBitSet();
+#else
+  return ShouldInsertBackwardsForDebug(capacity, hash, ctrl)
+             ? mask.HighestBitSet()
+             : mask.LowestBitSet();
+#endif
+}
 
 // Returns a per-table, hash salt, which changes on resize. This gets mixed into
 // H1 to randomize iteration order per-table.
@@ -560,7 +623,12 @@ inline h2_t H2(size_t hash) { return hash & 0x7F; }
 
 // Helpers for checking the state of a control byte.
 inline bool IsEmpty(ctrl_t c) { return c == ctrl_t::kEmpty; }
-inline bool IsFull(ctrl_t c) { return c >= static_cast<ctrl_t>(0); }
+inline bool IsFull(ctrl_t c) {
+  // Cast `c` to the underlying type instead of casting `0` to `ctrl_t` as `0`
+  // is not a value in the enum. Both ways are equivalent, but this way makes
+  // linters happier.
+  return static_cast<std::underlying_type_t<ctrl_t>>(c) >= 0;
+}
 inline bool IsDeleted(ctrl_t c) { return c == ctrl_t::kDeleted; }
 inline bool IsEmptyOrDeleted(ctrl_t c) { return c < ctrl_t::kSentinel; }
 
@@ -646,6 +714,14 @@ struct GroupSse2Impl {
         static_cast<uint16_t>(_mm_movemask_epi8(ctrl) ^ 0xffff));
   }
 
+  // Returns a bitmask representing the positions of non full slots.
+  // Note: this includes: kEmpty, kDeleted, kSentinel.
+  // It is useful in contexts when kSentinel is not present.
+  auto MaskNonFull() const {
+    return BitMask<uint16_t, kWidth>(
+        static_cast<uint16_t>(_mm_movemask_epi8(ctrl)));
+  }
+
   // Returns a bitmask representing the positions of empty or deleted slots.
   NonIterableBitMask<uint16_t, kWidth> MaskEmptyOrDeleted() const {
     auto special = _mm_set1_epi8(static_cast<char>(ctrl_t::kSentinel));
@@ -685,10 +761,11 @@ struct GroupAArch64Impl {
     ctrl = vld1_u8(reinterpret_cast<const uint8_t*>(pos));
   }
 
-  BitMask<uint64_t, kWidth, 3> Match(h2_t hash) const {
+  auto Match(h2_t hash) const {
     uint8x8_t dup = vdup_n_u8(hash);
     auto mask = vceq_u8(ctrl, dup);
-    return BitMask<uint64_t, kWidth, 3>(
+    return BitMask<uint64_t, kWidth, /*Shift=*/3,
+                   /*NullifyBitsOnIteration=*/true>(
         vget_lane_u64(vreinterpret_u64_u8(mask), 0));
   }
 
@@ -704,12 +781,25 @@ struct GroupAArch64Impl {
   // Returns a bitmask representing the positions of full slots.
   // Note: for `is_small()` tables group may contain the "same" slot twice:
   // original and mirrored.
-  BitMask<uint64_t, kWidth, 3> MaskFull() const {
+  auto MaskFull() const {
     uint64_t mask = vget_lane_u64(
         vreinterpret_u64_u8(vcge_s8(vreinterpret_s8_u8(ctrl),
                                     vdup_n_s8(static_cast<int8_t>(0)))),
         0);
-    return BitMask<uint64_t, kWidth, 3>(mask);
+    return BitMask<uint64_t, kWidth, /*Shift=*/3,
+                   /*NullifyBitsOnIteration=*/true>(mask);
+  }
+
+  // Returns a bitmask representing the positions of non full slots.
+  // Note: this includes: kEmpty, kDeleted, kSentinel.
+  // It is useful in contexts when kSentinel is not present.
+  auto MaskNonFull() const {
+    uint64_t mask = vget_lane_u64(
+        vreinterpret_u64_u8(vclt_s8(vreinterpret_s8_u8(ctrl),
+                                    vdup_n_s8(static_cast<int8_t>(0)))),
+        0);
+    return BitMask<uint64_t, kWidth, /*Shift=*/3,
+                   /*NullifyBitsOnIteration=*/true>(mask);
   }
 
   NonIterableBitMask<uint64_t, kWidth, 3> MaskEmptyOrDeleted() const {
@@ -736,11 +826,10 @@ struct GroupAArch64Impl {
 
   void ConvertSpecialToEmptyAndFullToDeleted(ctrl_t* dst) const {
     uint64_t mask = vget_lane_u64(vreinterpret_u64_u8(ctrl), 0);
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     constexpr uint64_t slsbs = 0x0202020202020202ULL;
     constexpr uint64_t midbs = 0x7e7e7e7e7e7e7e7eULL;
     auto x = slsbs & (mask >> 6);
-    auto res = (x + midbs) | msbs;
+    auto res = (x + midbs) | kMsbs8Bytes;
     little_endian::Store64(dst, res);
   }
 
@@ -768,30 +857,33 @@ struct GroupPortableImpl {
     //   v = 0x1716151413121110
     //   hash = 0x12
     //   retval = (v - lsbs) & ~v & msbs = 0x0000000080800000
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     constexpr uint64_t lsbs = 0x0101010101010101ULL;
     auto x = ctrl ^ (lsbs * hash);
-    return BitMask<uint64_t, kWidth, 3>((x - lsbs) & ~x & msbs);
+    return BitMask<uint64_t, kWidth, 3>((x - lsbs) & ~x & kMsbs8Bytes);
   }
 
   NonIterableBitMask<uint64_t, kWidth, 3> MaskEmpty() const {
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     return NonIterableBitMask<uint64_t, kWidth, 3>((ctrl & ~(ctrl << 6)) &
-                                                   msbs);
+                                                   kMsbs8Bytes);
   }
 
   // Returns a bitmask representing the positions of full slots.
   // Note: for `is_small()` tables group may contain the "same" slot twice:
   // original and mirrored.
   BitMask<uint64_t, kWidth, 3> MaskFull() const {
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
-    return BitMask<uint64_t, kWidth, 3>((ctrl ^ msbs) & msbs);
+    return BitMask<uint64_t, kWidth, 3>((ctrl ^ kMsbs8Bytes) & kMsbs8Bytes);
+  }
+
+  // Returns a bitmask representing the positions of non full slots.
+  // Note: this includes: kEmpty, kDeleted, kSentinel.
+  // It is useful in contexts when kSentinel is not present.
+  auto MaskNonFull() const {
+    return BitMask<uint64_t, kWidth, 3>(ctrl & kMsbs8Bytes);
   }
 
   NonIterableBitMask<uint64_t, kWidth, 3> MaskEmptyOrDeleted() const {
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     return NonIterableBitMask<uint64_t, kWidth, 3>((ctrl & ~(ctrl << 7)) &
-                                                   msbs);
+                                                   kMsbs8Bytes);
   }
 
   uint32_t CountLeadingEmptyOrDeleted() const {
@@ -803,9 +895,8 @@ struct GroupPortableImpl {
   }
 
   void ConvertSpecialToEmptyAndFullToDeleted(ctrl_t* dst) const {
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     constexpr uint64_t lsbs = 0x0101010101010101ULL;
-    auto x = ctrl & msbs;
+    auto x = ctrl & kMsbs8Bytes;
     auto res = (~x + (x >> 7)) & ~lsbs;
     little_endian::Store64(dst, res);
   }
@@ -815,21 +906,21 @@ struct GroupPortableImpl {
 
 #ifdef ABSL_INTERNAL_HAVE_SSE2
 using Group = GroupSse2Impl;
-using GroupEmptyOrDeleted = GroupSse2Impl;
+using GroupFullEmptyOrDeleted = GroupSse2Impl;
 #elif defined(ABSL_INTERNAL_HAVE_ARM_NEON) && defined(ABSL_IS_LITTLE_ENDIAN)
 using Group = GroupAArch64Impl;
 // For Aarch64, we use the portable implementation for counting and masking
-// empty or deleted group elements. This is to avoid the latency of moving
+// full, empty or deleted group elements. This is to avoid the latency of moving
 // between data GPRs and Neon registers when it does not provide a benefit.
 // Using Neon is profitable when we call Match(), but is not when we don't,
-// which is the case when we do *EmptyOrDeleted operations. It is difficult to
-// make a similar approach beneficial on other architectures such as x86 since
-// they have much lower GPR <-> vector register transfer latency and 16-wide
-// Groups.
-using GroupEmptyOrDeleted = GroupPortableImpl;
+// which is the case when we do *EmptyOrDeleted and MaskFull operations.
+// It is difficult to make a similar approach beneficial on other architectures
+// such as x86 since they have much lower GPR <-> vector register transfer
+// latency and 16-wide Groups.
+using GroupFullEmptyOrDeleted = GroupPortableImpl;
 #else
 using Group = GroupPortableImpl;
-using GroupEmptyOrDeleted = GroupPortableImpl;
+using GroupFullEmptyOrDeleted = GroupPortableImpl;
 #endif
 
 // When there is an insertion with no reserved growth, we rehash with
@@ -978,17 +1069,96 @@ using CommonFieldsGenerationInfo = CommonFieldsGenerationInfoDisabled;
 using HashSetIteratorGenerationInfo = HashSetIteratorGenerationInfoDisabled;
 #endif
 
+// Stored the information regarding number of slots we can still fill
+// without needing to rehash.
+//
+// We want to ensure sufficient number of empty slots in the table in order
+// to keep probe sequences relatively short. Empty slot in the probe group
+// is required to stop probing.
+//
+// Tombstones (kDeleted slots) are not included in the growth capacity,
+// because we'd like to rehash when the table is filled with tombstones and/or
+// full slots.
+//
+// GrowthInfo also stores a bit that encodes whether table may have any
+// deleted slots.
+// Most of the tables (>95%) have no deleted slots, so some functions can
+// be more efficient with this information.
+//
+// Callers can also force a rehash via the standard `rehash(0)`,
+// which will recompute this value as a side-effect.
+//
+// See also `CapacityToGrowth()`.
+class GrowthInfo {
+ public:
+  // Leaves data member uninitialized.
+  GrowthInfo() = default;
+
+  // Initializes the GrowthInfo assuming we can grow `growth_left` elements
+  // and there are no kDeleted slots in the table.
+  void InitGrowthLeftNoDeleted(size_t growth_left) {
+    growth_left_info_ = growth_left;
+  }
+
+  // Overwrites single full slot with an empty slot.
+  void OverwriteFullAsEmpty() { ++growth_left_info_; }
+
+  // Overwrites single empty slot with a full slot.
+  void OverwriteEmptyAsFull() {
+    assert(GetGrowthLeft() > 0);
+    --growth_left_info_;
+  }
+
+  // Overwrites several empty slots with full slots.
+  void OverwriteManyEmptyAsFull(size_t cnt) {
+    assert(GetGrowthLeft() >= cnt);
+    growth_left_info_ -= cnt;
+  }
+
+  // Overwrites specified control element with full slot.
+  void OverwriteControlAsFull(ctrl_t ctrl) {
+    assert(GetGrowthLeft() >= static_cast<size_t>(IsEmpty(ctrl)));
+    growth_left_info_ -= static_cast<size_t>(IsEmpty(ctrl));
+  }
+
+  // Overwrites single full slot with a deleted slot.
+  void OverwriteFullAsDeleted() { growth_left_info_ |= kDeletedBit; }
+
+  // Returns true if table satisfies two properties:
+  // 1. Guaranteed to have no kDeleted slots.
+  // 2. There is a place for at least one element to grow.
+  bool HasNoDeletedAndGrowthLeft() const {
+    return static_cast<std::make_signed_t<size_t>>(growth_left_info_) > 0;
+  }
+
+  // Returns true if the table satisfies two properties:
+  // 1. Guaranteed to have no kDeleted slots.
+  // 2. There is no growth left.
+  bool HasNoGrowthLeftAndNoDeleted() const { return growth_left_info_ == 0; }
+
+  // Returns true if table guaranteed to have no k
+  bool HasNoDeleted() const {
+    return static_cast<std::make_signed_t<size_t>>(growth_left_info_) >= 0;
+  }
+
+  // Returns the number of elements left to grow.
+  size_t GetGrowthLeft() const { return growth_left_info_ & kGrowthLeftMask; }
+
+ private:
+  static constexpr size_t kGrowthLeftMask = ((~size_t{}) >> 1);
+  static constexpr size_t kDeletedBit = ~kGrowthLeftMask;
+  // Topmost bit signal whenever there are deleted slots.
+  size_t growth_left_info_;
+};
+
+static_assert(sizeof(GrowthInfo) == sizeof(size_t), "");
+static_assert(alignof(GrowthInfo) == alignof(size_t), "");
+
 // Returns whether `n` is a valid capacity (i.e., number of slots).
 //
 // A valid capacity is a non-zero integer `2^m - 1`.
 inline bool IsValidCapacity(size_t n) { return ((n + 1) & n) == 0 && n > 0; }
 
-// Computes the offset from the start of the backing allocation of control.
-// infoz and growth_left are stored at the beginning of the backing array.
-inline size_t ControlOffset(bool has_infoz) {
-  return (has_infoz ? sizeof(HashtablezInfoHandle) : 0) + sizeof(size_t);
-}
-
 // Returns the number of "cloned control bytes".
 //
 // This is the number of control bytes that are present both at the beginning
@@ -996,36 +1166,157 @@ inline size_t ControlOffset(bool has_infoz) {
 // `Group::kWidth`-width probe window starting from any control byte.
 constexpr size_t NumClonedBytes() { return Group::kWidth - 1; }
 
-// Given the capacity of a table, computes the offset (from the start of the
-// backing allocation) of the generation counter (if it exists).
-inline size_t GenerationOffset(size_t capacity, bool has_infoz) {
-  assert(IsValidCapacity(capacity));
-  const size_t num_control_bytes = capacity + 1 + NumClonedBytes();
-  return ControlOffset(has_infoz) + num_control_bytes;
+// Returns the number of control bytes including cloned.
+constexpr size_t NumControlBytes(size_t capacity) {
+  return capacity + 1 + NumClonedBytes();
 }
 
-// Given the capacity of a table, computes the offset (from the start of the
-// backing allocation) at which the slots begin.
-inline size_t SlotOffset(size_t capacity, size_t slot_align, bool has_infoz) {
-  assert(IsValidCapacity(capacity));
-  return (GenerationOffset(capacity, has_infoz) + NumGenerationBytes() +
-          slot_align - 1) &
-         (~slot_align + 1);
+// Computes the offset from the start of the backing allocation of control.
+// infoz and growth_info are stored at the beginning of the backing array.
+inline static size_t ControlOffset(bool has_infoz) {
+  return (has_infoz ? sizeof(HashtablezInfoHandle) : 0) + sizeof(GrowthInfo);
 }
 
-// Given the capacity of a table, computes the total size of the backing
-// array.
-inline size_t AllocSize(size_t capacity, size_t slot_size, size_t slot_align,
-                        bool has_infoz) {
-  return SlotOffset(capacity, slot_align, has_infoz) + capacity * slot_size;
-}
+// Helper class for computing offsets and allocation size of hash set fields.
+class RawHashSetLayout {
+ public:
+  explicit RawHashSetLayout(size_t capacity, size_t slot_align, bool has_infoz)
+      : capacity_(capacity),
+        control_offset_(ControlOffset(has_infoz)),
+        generation_offset_(control_offset_ + NumControlBytes(capacity)),
+        slot_offset_(
+            (generation_offset_ + NumGenerationBytes() + slot_align - 1) &
+            (~slot_align + 1)) {
+    assert(IsValidCapacity(capacity));
+  }
+
+  // Returns the capacity of a table.
+  size_t capacity() const { return capacity_; }
+
+  // Returns precomputed offset from the start of the backing allocation of
+  // control.
+  size_t control_offset() const { return control_offset_; }
+
+  // Given the capacity of a table, computes the offset (from the start of the
+  // backing allocation) of the generation counter (if it exists).
+  size_t generation_offset() const { return generation_offset_; }
+
+  // Given the capacity of a table, computes the offset (from the start of the
+  // backing allocation) at which the slots begin.
+  size_t slot_offset() const { return slot_offset_; }
+
+  // Given the capacity of a table, computes the total size of the backing
+  // array.
+  size_t alloc_size(size_t slot_size) const {
+    return slot_offset_ + capacity_ * slot_size;
+  }
+
+ private:
+  size_t capacity_;
+  size_t control_offset_;
+  size_t generation_offset_;
+  size_t slot_offset_;
+};
+
+struct HashtableFreeFunctionsAccess;
+
+// We only allow a maximum of 1 SOO element, which makes the implementation
+// much simpler. Complications with multiple SOO elements include:
+// - Satisfying the guarantee that erasing one element doesn't invalidate
+//   iterators to other elements means we would probably need actual SOO
+//   control bytes.
+// - In order to prevent user code from depending on iteration order for small
+//   tables, we would need to randomize the iteration order somehow.
+constexpr size_t SooCapacity() { return 1; }
+// Sentinel type to indicate SOO CommonFields construction.
+struct soo_tag_t {};
+// Sentinel type to indicate SOO CommonFields construction with full size.
+struct full_soo_tag_t {};
+
+// Suppress erroneous uninitialized memory errors on GCC. For example, GCC
+// thinks that the call to slot_array() in find_or_prepare_insert() is reading
+// uninitialized memory, but slot_array is only called there when the table is
+// non-empty and this memory is initialized when the table is non-empty.
+#if !defined(__clang__) && defined(__GNUC__)
+#define ABSL_SWISSTABLE_IGNORE_UNINITIALIZED(x)                    \
+  _Pragma("GCC diagnostic push")                                   \
+      _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")  \
+          _Pragma("GCC diagnostic ignored \"-Wuninitialized\"") x; \
+  _Pragma("GCC diagnostic pop")
+#define ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(x) \
+  ABSL_SWISSTABLE_IGNORE_UNINITIALIZED(return x)
+#else
+#define ABSL_SWISSTABLE_IGNORE_UNINITIALIZED(x) x
+#define ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(x) return x
+#endif
+
+// This allows us to work around an uninitialized memory warning when
+// constructing begin() iterators in empty hashtables.
+union MaybeInitializedPtr {
+  void* get() const { ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(p); }
+  void set(void* ptr) { p = ptr; }
+
+  void* p;
+};
+
+struct HeapPtrs {
+  HeapPtrs() = default;
+  explicit HeapPtrs(ctrl_t* c) : control(c) {}
+
+  // The control bytes (and, also, a pointer near to the base of the backing
+  // array).
+  //
+  // This contains `capacity + 1 + NumClonedBytes()` entries, even
+  // when the table is empty (hence EmptyGroup).
+  //
+  // Note that growth_info is stored immediately before this pointer.
+  // May be uninitialized for SOO tables.
+  ctrl_t* control;
+
+  // The beginning of the slots, located at `SlotOffset()` bytes after
+  // `control`. May be uninitialized for empty tables.
+  // Note: we can't use `slots` because Qt defines "slots" as a macro.
+  MaybeInitializedPtr slot_array;
+};
+
+// Manages the backing array pointers or the SOO slot. When raw_hash_set::is_soo
+// is true, the SOO slot is stored in `soo_data`. Otherwise, we use `heap`.
+union HeapOrSoo {
+  HeapOrSoo() = default;
+  explicit HeapOrSoo(ctrl_t* c) : heap(c) {}
+
+  ctrl_t*& control() {
+    ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(heap.control);
+  }
+  ctrl_t* control() const {
+    ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(heap.control);
+  }
+  MaybeInitializedPtr& slot_array() {
+    ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(heap.slot_array);
+  }
+  MaybeInitializedPtr slot_array() const {
+    ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(heap.slot_array);
+  }
+  void* get_soo_data() {
+    ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(soo_data);
+  }
+  const void* get_soo_data() const {
+    ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(soo_data);
+  }
+
+  HeapPtrs heap;
+  unsigned char soo_data[sizeof(HeapPtrs)];
+};
 
 // CommonFields hold the fields in raw_hash_set that do not depend
 // on template parameters. This allows us to conveniently pass all
 // of this state to helper functions as a single argument.
 class CommonFields : public CommonFieldsGenerationInfo {
  public:
-  CommonFields() = default;
+  CommonFields() : capacity_(0), size_(0), heap_or_soo_(EmptyGroup()) {}
+  explicit CommonFields(soo_tag_t) : capacity_(SooCapacity()), size_(0) {}
+  explicit CommonFields(full_soo_tag_t)
+      : capacity_(SooCapacity()), size_(size_t{1} << HasInfozShift()) {}
 
   // Not copyable
   CommonFields(const CommonFields&) = delete;
@@ -1035,23 +1326,44 @@ class CommonFields : public CommonFieldsGenerationInfo {
   CommonFields(CommonFields&& that) = default;
   CommonFields& operator=(CommonFields&&) = default;
 
-  ctrl_t* control() const { return control_; }
-  void set_control(ctrl_t* c) { control_ = c; }
+  template <bool kSooEnabled>
+  static CommonFields CreateDefault() {
+    return kSooEnabled ? CommonFields{soo_tag_t{}} : CommonFields{};
+  }
+
+  // The inline data for SOO is written on top of control_/slots_.
+  const void* soo_data() const { return heap_or_soo_.get_soo_data(); }
+  void* soo_data() { return heap_or_soo_.get_soo_data(); }
+
+  HeapOrSoo heap_or_soo() const { return heap_or_soo_; }
+  const HeapOrSoo& heap_or_soo_ref() const { return heap_or_soo_; }
+
+  ctrl_t* control() const { return heap_or_soo_.control(); }
+  void set_control(ctrl_t* c) { heap_or_soo_.control() = c; }
   void* backing_array_start() const {
-    // growth_left (and maybe infoz) is stored before control bytes.
+    // growth_info (and maybe infoz) is stored before control bytes.
     assert(reinterpret_cast<uintptr_t>(control()) % alignof(size_t) == 0);
     return control() - ControlOffset(has_infoz());
   }
 
   // Note: we can't use slots() because Qt defines "slots" as a macro.
-  void* slot_array() const { return slots_; }
-  void set_slots(void* s) { slots_ = s; }
+  void* slot_array() const { return heap_or_soo_.slot_array().get(); }
+  MaybeInitializedPtr slots_union() const { return heap_or_soo_.slot_array(); }
+  void set_slots(void* s) { heap_or_soo_.slot_array().set(s); }
 
   // The number of filled slots.
   size_t size() const { return size_ >> HasInfozShift(); }
   void set_size(size_t s) {
     size_ = (s << HasInfozShift()) | (size_ & HasInfozMask());
   }
+  void set_empty_soo() {
+    AssertInSooMode();
+    size_ = 0;
+  }
+  void set_full_soo() {
+    AssertInSooMode();
+    size_ = size_t{1} << HasInfozShift();
+  }
   void increment_size() {
     assert(size() < capacity());
     size_ += size_t{1} << HasInfozShift();
@@ -1070,15 +1382,17 @@ class CommonFields : public CommonFieldsGenerationInfo {
 
   // The number of slots we can still fill without needing to rehash.
   // This is stored in the heap allocation before the control bytes.
-  size_t growth_left() const {
-    const size_t* gl_ptr = reinterpret_cast<size_t*>(control()) - 1;
-    assert(reinterpret_cast<uintptr_t>(gl_ptr) % alignof(size_t) == 0);
+  // TODO(b/289225379): experiment with moving growth_info back inline to
+  // increase room for SOO.
+  size_t growth_left() const { return growth_info().GetGrowthLeft(); }
+
+  GrowthInfo& growth_info() {
+    auto* gl_ptr = reinterpret_cast<GrowthInfo*>(control()) - 1;
+    assert(reinterpret_cast<uintptr_t>(gl_ptr) % alignof(GrowthInfo) == 0);
     return *gl_ptr;
   }
-  void set_growth_left(size_t gl) {
-    size_t* gl_ptr = reinterpret_cast<size_t*>(control()) - 1;
-    assert(reinterpret_cast<uintptr_t>(gl_ptr) % alignof(size_t) == 0);
-    *gl_ptr = gl;
+  GrowthInfo growth_info() const {
+    return const_cast<CommonFields*>(this)->growth_info();
   }
 
   bool has_infoz() const {
@@ -1103,12 +1417,8 @@ class CommonFields : public CommonFieldsGenerationInfo {
         should_rehash_for_bug_detection_on_insert(control(), capacity());
   }
   bool should_rehash_for_bug_detection_on_move() const {
-    return CommonFieldsGenerationInfo::
-        should_rehash_for_bug_detection_on_move(control(), capacity());
-  }
-  void maybe_increment_generation_on_move() {
-    if (capacity() == 0) return;
-    increment_generation();
+    return CommonFieldsGenerationInfo::should_rehash_for_bug_detection_on_move(
+        control(), capacity());
   }
   void reset_reserved_growth(size_t reservation) {
     CommonFieldsGenerationInfo::reset_reserved_growth(reservation, size());
@@ -1116,7 +1426,16 @@ class CommonFields : public CommonFieldsGenerationInfo {
 
   // The size of the backing array allocation.
   size_t alloc_size(size_t slot_size, size_t slot_align) const {
-    return AllocSize(capacity(), slot_size, slot_align, has_infoz());
+    return RawHashSetLayout(capacity(), slot_align, has_infoz())
+        .alloc_size(slot_size);
+  }
+
+  // Move fields other than heap_or_soo_.
+  void move_non_heap_or_soo_fields(CommonFields& that) {
+    static_cast<CommonFieldsGenerationInfo&>(*this) =
+        std::move(static_cast<CommonFieldsGenerationInfo&>(that));
+    capacity_ = that.capacity_;
+    size_ = that.size_;
   }
 
   // Returns the number of control bytes set to kDeleted. For testing only.
@@ -1132,21 +1451,12 @@ class CommonFields : public CommonFieldsGenerationInfo {
     return (size_t{1} << HasInfozShift()) - 1;
   }
 
-  // TODO(b/182800944): Investigate removing some of these fields:
-  // - control/slots can be derived from each other
-
-  // The control bytes (and, also, a pointer near to the base of the backing
-  // array).
-  //
-  // This contains `capacity + 1 + NumClonedBytes()` entries, even
-  // when the table is empty (hence EmptyGroup).
-  //
-  // Note that growth_left is stored immediately before this pointer.
-  ctrl_t* control_ = EmptyGroup();
-
-  // The beginning of the slots, located at `SlotOffset()` bytes after
-  // `control`. May be null for empty tables.
-  void* slots_ = nullptr;
+  // We can't assert that SOO is enabled because we don't have SooEnabled(), but
+  // we assert what we can.
+  void AssertInSooMode() const {
+    assert(capacity() == SooCapacity());
+    assert(!has_infoz());
+  }
 
   // The number of slots in the backing array. This is always 2^N-1 for an
   // integer N. NOTE: we tried experimenting with compressing the capacity and
@@ -1154,10 +1464,16 @@ class CommonFields : public CommonFieldsGenerationInfo {
   // power (N in 2^N-1), and (b) storing 2^N as the most significant bit of
   // size_ and storing size in the low bits. Both of these experiments were
   // regressions, presumably because we need capacity to do find operations.
-  size_t capacity_ = 0;
+  size_t capacity_;
 
   // The size and also has one bit that stores whether we have infoz.
-  size_t size_ = 0;
+  // TODO(b/289225379): we could put size_ into HeapOrSoo and make capacity_
+  // encode the size in SOO case. We would be making size()/capacity() more
+  // expensive in order to have more SOO space.
+  size_t size_;
+
+  // Either the control/slots pointers or the SOO slot.
+  HeapOrSoo heap_or_soo_;
 };
 
 template <class Policy, class Hash, class Eq, class Alloc>
@@ -1320,6 +1636,10 @@ inline bool AreItersFromSameContainer(const ctrl_t* ctrl_a,
                                       const void* const& slot_b) {
   // If either control byte is null, then we can't tell.
   if (ctrl_a == nullptr || ctrl_b == nullptr) return true;
+  const bool a_is_soo = IsSooControl(ctrl_a);
+  if (a_is_soo != IsSooControl(ctrl_b)) return false;
+  if (a_is_soo) return slot_a == slot_b;
+
   const void* low_slot = slot_a;
   const void* hi_slot = slot_b;
   if (ctrl_a > ctrl_b) {
@@ -1343,41 +1663,45 @@ inline void AssertSameContainer(const ctrl_t* ctrl_a, const ctrl_t* ctrl_b,
   // - use `ABSL_PREDICT_FALSE()` to provide a compiler hint for code layout
   // - use `ABSL_RAW_LOG()` with a format string to reduce code size and improve
   //   the chances that the hot paths will be inlined.
+
+  // fail_if(is_invalid, message) crashes when is_invalid is true and provides
+  // an error message based on `message`.
+  const auto fail_if = [](bool is_invalid, const char* message) {
+    if (ABSL_PREDICT_FALSE(is_invalid)) {
+      ABSL_RAW_LOG(FATAL, "Invalid iterator comparison. %s", message);
+    }
+  };
+
   const bool a_is_default = ctrl_a == EmptyGroup();
   const bool b_is_default = ctrl_b == EmptyGroup();
-  if (ABSL_PREDICT_FALSE(a_is_default != b_is_default)) {
-    ABSL_RAW_LOG(
-        FATAL,
-        "Invalid iterator comparison. Comparing default-constructed iterator "
-        "with non-default-constructed iterator.");
-  }
   if (a_is_default && b_is_default) return;
+  fail_if(a_is_default != b_is_default,
+          "Comparing default-constructed hashtable iterator with a "
+          "non-default-constructed hashtable iterator.");
 
   if (SwisstableGenerationsEnabled()) {
     if (ABSL_PREDICT_TRUE(generation_ptr_a == generation_ptr_b)) return;
+    // Users don't need to know whether the tables are SOO so don't mention SOO
+    // in the debug message.
+    const bool a_is_soo = IsSooControl(ctrl_a);
+    const bool b_is_soo = IsSooControl(ctrl_b);
+    fail_if(a_is_soo != b_is_soo || (a_is_soo && b_is_soo),
+            "Comparing iterators from different hashtables.");
+
     const bool a_is_empty = IsEmptyGeneration(generation_ptr_a);
     const bool b_is_empty = IsEmptyGeneration(generation_ptr_b);
-    if (a_is_empty != b_is_empty) {
-      ABSL_RAW_LOG(FATAL,
-                   "Invalid iterator comparison. Comparing iterator from a "
-                   "non-empty hashtable with an iterator from an empty "
-                   "hashtable.");
-    }
-    if (a_is_empty && b_is_empty) {
-      ABSL_RAW_LOG(FATAL,
-                   "Invalid iterator comparison. Comparing iterators from "
-                   "different empty hashtables.");
-    }
+    fail_if(a_is_empty != b_is_empty,
+            "Comparing an iterator from an empty hashtable with an iterator "
+            "from a non-empty hashtable.");
+    fail_if(a_is_empty && b_is_empty,
+            "Comparing iterators from different empty hashtables.");
+
     const bool a_is_end = ctrl_a == nullptr;
     const bool b_is_end = ctrl_b == nullptr;
-    if (a_is_end || b_is_end) {
-      ABSL_RAW_LOG(FATAL,
-                   "Invalid iterator comparison. Comparing iterator with an "
-                   "end() iterator from a different hashtable.");
-    }
-    ABSL_RAW_LOG(FATAL,
-                 "Invalid iterator comparison. Comparing non-end() iterators "
-                 "from different hashtables.");
+    fail_if(a_is_end || b_is_end,
+            "Comparing iterator with an end() iterator from a different "
+            "hashtable.");
+    fail_if(true, "Comparing non-end() iterators from different hashtables.");
   } else {
     ABSL_HARDENING_ASSERT(
         AreItersFromSameContainer(ctrl_a, ctrl_b, slot_a, slot_b) &&
@@ -1432,20 +1756,17 @@ template <typename = void>
 inline FindInfo find_first_non_full(const CommonFields& common, size_t hash) {
   auto seq = probe(common, hash);
   const ctrl_t* ctrl = common.control();
+  if (IsEmptyOrDeleted(ctrl[seq.offset()]) &&
+      !ShouldInsertBackwards(common.capacity(), hash, ctrl)) {
+    return {seq.offset(), /*probe_length=*/0};
+  }
   while (true) {
-    GroupEmptyOrDeleted g{ctrl + seq.offset()};
+    GroupFullEmptyOrDeleted g{ctrl + seq.offset()};
     auto mask = g.MaskEmptyOrDeleted();
     if (mask) {
-#if !defined(NDEBUG)
-      // We want to add entropy even when ASLR is not enabled.
-      // In debug build we will randomly insert in either the front or back of
-      // the group.
-      // TODO(kfm,sbenza): revisit after we do unconditional mixing
-      if (!is_small(common.capacity()) && ShouldInsertBackwards(hash, ctrl)) {
-        return {seq.offset(mask.HighestBitSet()), seq.index()};
-      }
-#endif
-      return {seq.offset(mask.LowestBitSet()), seq.index()};
+      return {
+          seq.offset(GetInsertionOffset(mask, common.capacity(), hash, ctrl)),
+          seq.index()};
     }
     seq.next();
     assert(seq.index() <= common.capacity() && "full table!");
@@ -1462,7 +1783,8 @@ extern template FindInfo find_first_non_full(const CommonFields&, size_t);
 FindInfo find_first_non_full_outofline(const CommonFields&, size_t);
 
 inline void ResetGrowthLeft(CommonFields& common) {
-  common.set_growth_left(CapacityToGrowth(common.capacity()) - common.size());
+  common.growth_info().InitGrowthLeftNoDeleted(
+      CapacityToGrowth(common.capacity()) - common.size());
 }
 
 // Sets `ctrl` to `{kEmpty, kSentinel, ..., kEmpty}`, marking the entire
@@ -1476,43 +1798,140 @@ inline void ResetCtrl(CommonFields& common, size_t slot_size) {
   SanitizerPoisonMemoryRegion(common.slot_array(), slot_size * capacity);
 }
 
-// Sets `ctrl[i]` to `h`.
-//
-// Unlike setting it directly, this function will perform bounds checks and
-// mirror the value to the cloned tail if necessary.
-inline void SetCtrl(const CommonFields& common, size_t i, ctrl_t h,
-                    size_t slot_size) {
-  const size_t capacity = common.capacity();
-  assert(i < capacity);
-
-  auto* slot_i = static_cast<const char*>(common.slot_array()) + i * slot_size;
+// Sets sanitizer poisoning for slot corresponding to control byte being set.
+inline void DoSanitizeOnSetCtrl(const CommonFields& c, size_t i, ctrl_t h,
+                                size_t slot_size) {
+  assert(i < c.capacity());
+  auto* slot_i = static_cast<const char*>(c.slot_array()) + i * slot_size;
   if (IsFull(h)) {
     SanitizerUnpoisonMemoryRegion(slot_i, slot_size);
   } else {
     SanitizerPoisonMemoryRegion(slot_i, slot_size);
   }
+}
 
-  ctrl_t* ctrl = common.control();
+// Sets `ctrl[i]` to `h`.
+//
+// Unlike setting it directly, this function will perform bounds checks and
+// mirror the value to the cloned tail if necessary.
+inline void SetCtrl(const CommonFields& c, size_t i, ctrl_t h,
+                    size_t slot_size) {
+  DoSanitizeOnSetCtrl(c, i, h, slot_size);
+  ctrl_t* ctrl = c.control();
   ctrl[i] = h;
-  ctrl[((i - NumClonedBytes()) & capacity) + (NumClonedBytes() & capacity)] = h;
+  ctrl[((i - NumClonedBytes()) & c.capacity()) +
+       (NumClonedBytes() & c.capacity())] = h;
+}
+// Overload for setting to an occupied `h2_t` rather than a special `ctrl_t`.
+inline void SetCtrl(const CommonFields& c, size_t i, h2_t h, size_t slot_size) {
+  SetCtrl(c, i, static_cast<ctrl_t>(h), slot_size);
 }
 
+// Like SetCtrl, but in a single group table, we can save some operations when
+// setting the cloned control byte.
+inline void SetCtrlInSingleGroupTable(const CommonFields& c, size_t i, ctrl_t h,
+                                      size_t slot_size) {
+  assert(is_single_group(c.capacity()));
+  DoSanitizeOnSetCtrl(c, i, h, slot_size);
+  ctrl_t* ctrl = c.control();
+  ctrl[i] = h;
+  ctrl[i + c.capacity() + 1] = h;
+}
 // Overload for setting to an occupied `h2_t` rather than a special `ctrl_t`.
-inline void SetCtrl(const CommonFields& common, size_t i, h2_t h,
-                    size_t slot_size) {
-  SetCtrl(common, i, static_cast<ctrl_t>(h), slot_size);
+inline void SetCtrlInSingleGroupTable(const CommonFields& c, size_t i, h2_t h,
+                                      size_t slot_size) {
+  SetCtrlInSingleGroupTable(c, i, static_cast<ctrl_t>(h), slot_size);
 }
 
-// growth_left (which is a size_t) is stored with the backing array.
+// growth_info (which is a size_t) is stored with the backing array.
 constexpr size_t BackingArrayAlignment(size_t align_of_slot) {
-  return (std::max)(align_of_slot, alignof(size_t));
+  return (std::max)(align_of_slot, alignof(GrowthInfo));
 }
 
 // Returns the address of the ith slot in slots where each slot occupies
 // slot_size.
 inline void* SlotAddress(void* slot_array, size_t slot, size_t slot_size) {
-  return reinterpret_cast<void*>(reinterpret_cast<char*>(slot_array) +
-                                 (slot * slot_size));
+  return static_cast<void*>(static_cast<char*>(slot_array) +
+                            (slot * slot_size));
+}
+
+// Iterates over all full slots and calls `cb(const ctrl_t*, SlotType*)`.
+// No insertion to the table allowed during Callback call.
+// Erasure is allowed only for the element passed to the callback.
+template <class SlotType, class Callback>
+ABSL_ATTRIBUTE_ALWAYS_INLINE inline void IterateOverFullSlots(
+    const CommonFields& c, SlotType* slot, Callback cb) {
+  const size_t cap = c.capacity();
+  const ctrl_t* ctrl = c.control();
+  if (is_small(cap)) {
+    // Mirrored/cloned control bytes in small table are also located in the
+    // first group (starting from position 0). We are taking group from position
+    // `capacity` in order to avoid duplicates.
+
+    // Small tables capacity fits into portable group, where
+    // GroupPortableImpl::MaskFull is more efficient for the
+    // capacity <= GroupPortableImpl::kWidth.
+    assert(cap <= GroupPortableImpl::kWidth &&
+           "unexpectedly large small capacity");
+    static_assert(Group::kWidth >= GroupPortableImpl::kWidth,
+                  "unexpected group width");
+    // Group starts from kSentinel slot, so indices in the mask will
+    // be increased by 1.
+    const auto mask = GroupPortableImpl(ctrl + cap).MaskFull();
+    --ctrl;
+    --slot;
+    for (uint32_t i : mask) {
+      cb(ctrl + i, slot + i);
+    }
+    return;
+  }
+  size_t remaining = c.size();
+  ABSL_ATTRIBUTE_UNUSED const size_t original_size_for_assert = remaining;
+  while (remaining != 0) {
+    for (uint32_t i : GroupFullEmptyOrDeleted(ctrl).MaskFull()) {
+      assert(IsFull(ctrl[i]) && "hash table was modified unexpectedly");
+      cb(ctrl + i, slot + i);
+      --remaining;
+    }
+    ctrl += Group::kWidth;
+    slot += Group::kWidth;
+    assert((remaining == 0 || *(ctrl - 1) != ctrl_t::kSentinel) &&
+           "hash table was modified unexpectedly");
+  }
+  // NOTE: erasure of the current element is allowed in callback for
+  // absl::erase_if specialization. So we use `>=`.
+  assert(original_size_for_assert >= c.size() &&
+         "hash table was modified unexpectedly");
+}
+
+template <typename CharAlloc>
+constexpr bool ShouldSampleHashtablezInfo() {
+  // Folks with custom allocators often make unwarranted assumptions about the
+  // behavior of their classes vis-a-vis trivial destructability and what
+  // calls they will or won't make.  Avoid sampling for people with custom
+  // allocators to get us out of this mess.  This is not a hard guarantee but
+  // a workaround while we plan the exact guarantee we want to provide.
+  return std::is_same<CharAlloc, std::allocator<char>>::value;
+}
+
+template <bool kSooEnabled>
+HashtablezInfoHandle SampleHashtablezInfo(size_t sizeof_slot, size_t sizeof_key,
+                                          size_t sizeof_value,
+                                          size_t old_capacity, bool was_soo,
+                                          HashtablezInfoHandle forced_infoz,
+                                          CommonFields& c) {
+  if (forced_infoz.IsSampled()) return forced_infoz;
+  // In SOO, we sample on the first insertion so if this is an empty SOO case
+  // (e.g. when reserve is called), then we still need to sample.
+  if (kSooEnabled && was_soo && c.size() == 0) {
+    return Sample(sizeof_slot, sizeof_key, sizeof_value, SooCapacity());
+  }
+  // For non-SOO cases, we sample whenever the capacity is increasing from zero
+  // to non-zero.
+  if (!kSooEnabled && old_capacity == 0) {
+    return Sample(sizeof_slot, sizeof_key, sizeof_value, 0);
+  }
+  return c.infoz();
 }
 
 // Helper class to perform resize of the hash set.
@@ -1521,17 +1940,21 @@ inline void* SlotAddress(void* slot_array, size_t slot, size_t slot_size) {
 // See GrowIntoSingleGroupShuffleControlBytes for details.
 class HashSetResizeHelper {
  public:
-  explicit HashSetResizeHelper(CommonFields& c)
-      : old_ctrl_(c.control()),
-        old_capacity_(c.capacity()),
-        had_infoz_(c.has_infoz()) {}
-
-  // Optimized for small groups version of `find_first_non_full` applicable
-  // only right after calling `raw_hash_set::resize`.
+  explicit HashSetResizeHelper(CommonFields& c, bool was_soo, bool had_soo_slot,
+                               HashtablezInfoHandle forced_infoz)
+      : old_capacity_(c.capacity()),
+        had_infoz_(c.has_infoz()),
+        was_soo_(was_soo),
+        had_soo_slot_(had_soo_slot),
+        forced_infoz_(forced_infoz) {}
+
+  // Optimized for small groups version of `find_first_non_full`.
+  // Beneficial only right after calling `raw_hash_set::resize`.
+  // It is safe to call in case capacity is big or was not changed, but there
+  // will be no performance benefit.
   // It has implicit assumption that `resize` will call
   // `GrowSizeIntoSingleGroup*` in case `IsGrowingIntoSingleGroupApplicable`.
-  // Falls back to `find_first_non_full` in case of big groups, so it is
-  // safe to use after `rehash_and_grow_if_necessary`.
+  // Falls back to `find_first_non_full` in case of big groups.
   static FindInfo FindFirstNonFullAfterResize(const CommonFields& c,
                                               size_t old_capacity,
                                               size_t hash) {
@@ -1553,14 +1976,30 @@ class HashSetResizeHelper {
     return FindInfo{offset, 0};
   }
 
-  ctrl_t* old_ctrl() const { return old_ctrl_; }
+  HeapOrSoo& old_heap_or_soo() { return old_heap_or_soo_; }
+  void* old_soo_data() { return old_heap_or_soo_.get_soo_data(); }
+  ctrl_t* old_ctrl() const {
+    assert(!was_soo_);
+    return old_heap_or_soo_.control();
+  }
+  void* old_slots() const {
+    assert(!was_soo_);
+    return old_heap_or_soo_.slot_array().get();
+  }
   size_t old_capacity() const { return old_capacity_; }
 
+  // Returns the index of the SOO slot when growing from SOO to non-SOO in a
+  // single group. See also InitControlBytesAfterSoo(). It's important to use
+  // index 1 so that when resizing from capacity 1 to 3, we can still have
+  // random iteration order between the first two inserted elements.
+  // I.e. it allows inserting the second element at either index 0 or 2.
+  static size_t SooSlotIndex() { return 1; }
+
   // Allocates a backing array for the hashtable.
   // Reads `capacity` and updates all other fields based on the result of
   // the allocation.
   //
-  // It also may do the folowing actions:
+  // It also may do the following actions:
   // 1. initialize control bytes
   // 2. initialize slots
   // 3. deallocate old slots.
@@ -1590,45 +2029,45 @@ class HashSetResizeHelper {
   //
   //  Returns IsGrowingIntoSingleGroupApplicable result to avoid recomputation.
   template <typename Alloc, size_t SizeOfSlot, bool TransferUsesMemcpy,
-            size_t AlignOfSlot>
-  ABSL_ATTRIBUTE_NOINLINE bool InitializeSlots(CommonFields& c, void* old_slots,
-                                               Alloc alloc) {
+            bool SooEnabled, size_t AlignOfSlot>
+  ABSL_ATTRIBUTE_NOINLINE bool InitializeSlots(CommonFields& c, Alloc alloc,
+                                               ctrl_t soo_slot_h2,
+                                               size_t key_size,
+                                               size_t value_size) {
     assert(c.capacity());
-    // Folks with custom allocators often make unwarranted assumptions about the
-    // behavior of their classes vis-a-vis trivial destructability and what
-    // calls they will or won't make.  Avoid sampling for people with custom
-    // allocators to get us out of this mess.  This is not a hard guarantee but
-    // a workaround while we plan the exact guarantee we want to provide.
-    const size_t sample_size =
-        (std::is_same<Alloc, std::allocator<char>>::value &&
-         c.slot_array() == nullptr)
-            ? SizeOfSlot
-            : 0;
     HashtablezInfoHandle infoz =
-        sample_size > 0 ? Sample(sample_size) : c.infoz();
+        ShouldSampleHashtablezInfo<Alloc>()
+            ? SampleHashtablezInfo<SooEnabled>(SizeOfSlot, key_size, value_size,
+                                               old_capacity_, was_soo_,
+                                               forced_infoz_, c)
+            : HashtablezInfoHandle{};
 
     const bool has_infoz = infoz.IsSampled();
-    const size_t cap = c.capacity();
-    const size_t alloc_size =
-        AllocSize(cap, SizeOfSlot, AlignOfSlot, has_infoz);
-    char* mem = static_cast<char*>(
-        Allocate<BackingArrayAlignment(AlignOfSlot)>(&alloc, alloc_size));
+    RawHashSetLayout layout(c.capacity(), AlignOfSlot, has_infoz);
+    char* mem = static_cast<char*>(Allocate<BackingArrayAlignment(AlignOfSlot)>(
+        &alloc, layout.alloc_size(SizeOfSlot)));
     const GenerationType old_generation = c.generation();
-    c.set_generation_ptr(reinterpret_cast<GenerationType*>(
-        mem + GenerationOffset(cap, has_infoz)));
+    c.set_generation_ptr(
+        reinterpret_cast<GenerationType*>(mem + layout.generation_offset()));
     c.set_generation(NextGeneration(old_generation));
-    c.set_control(reinterpret_cast<ctrl_t*>(mem + ControlOffset(has_infoz)));
-    c.set_slots(mem + SlotOffset(cap, AlignOfSlot, has_infoz));
+    c.set_control(reinterpret_cast<ctrl_t*>(mem + layout.control_offset()));
+    c.set_slots(mem + layout.slot_offset());
     ResetGrowthLeft(c);
 
     const bool grow_single_group =
-        IsGrowingIntoSingleGroupApplicable(old_capacity_, c.capacity());
-    if (old_capacity_ != 0 && grow_single_group) {
+        IsGrowingIntoSingleGroupApplicable(old_capacity_, layout.capacity());
+    if (SooEnabled && was_soo_ && grow_single_group) {
+      InitControlBytesAfterSoo(c.control(), soo_slot_h2, layout.capacity());
+      if (TransferUsesMemcpy && had_soo_slot_) {
+        TransferSlotAfterSoo(c, SizeOfSlot);
+      }
+      // SooEnabled implies that old_capacity_ != 0.
+    } else if ((SooEnabled || old_capacity_ != 0) && grow_single_group) {
       if (TransferUsesMemcpy) {
-        GrowSizeIntoSingleGroupTransferable(c, old_slots, SizeOfSlot);
-        DeallocateOld<AlignOfSlot>(alloc, SizeOfSlot, old_slots);
+        GrowSizeIntoSingleGroupTransferable(c, SizeOfSlot);
+        DeallocateOld<AlignOfSlot>(alloc, SizeOfSlot);
       } else {
-        GrowIntoSingleGroupShuffleControlBytes(c.control(), c.capacity());
+        GrowIntoSingleGroupShuffleControlBytes(c.control(), layout.capacity());
       }
     } else {
       ResetCtrl(c, SizeOfSlot);
@@ -1636,8 +2075,8 @@ class HashSetResizeHelper {
 
     c.set_has_infoz(has_infoz);
     if (has_infoz) {
-      infoz.RecordStorageChanged(c.size(), cap);
-      if (grow_single_group || old_capacity_ == 0) {
+      infoz.RecordStorageChanged(c.size(), layout.capacity());
+      if ((SooEnabled && was_soo_) || grow_single_group || old_capacity_ == 0) {
         infoz.RecordRehash(0);
       }
       c.set_infoz(infoz);
@@ -1651,21 +2090,22 @@ class HashSetResizeHelper {
   // PRECONDITIONS:
   // 1. GrowIntoSingleGroupShuffleControlBytes was already called.
   template <class PolicyTraits, class Alloc>
-  void GrowSizeIntoSingleGroup(CommonFields& c, Alloc& alloc_ref,
-                               typename PolicyTraits::slot_type* old_slots) {
+  void GrowSizeIntoSingleGroup(CommonFields& c, Alloc& alloc_ref) {
     assert(old_capacity_ < Group::kWidth / 2);
     assert(IsGrowingIntoSingleGroupApplicable(old_capacity_, c.capacity()));
     using slot_type = typename PolicyTraits::slot_type;
     assert(is_single_group(c.capacity()));
 
-    auto* new_slots = reinterpret_cast<slot_type*>(c.slot_array());
+    auto* new_slots = static_cast<slot_type*>(c.slot_array());
+    auto* old_slots_ptr = static_cast<slot_type*>(old_slots());
 
     size_t shuffle_bit = old_capacity_ / 2 + 1;
     for (size_t i = 0; i < old_capacity_; ++i) {
-      if (IsFull(old_ctrl_[i])) {
+      if (IsFull(old_ctrl()[i])) {
         size_t new_i = i ^ shuffle_bit;
         SanitizerUnpoisonMemoryRegion(new_slots + new_i, sizeof(slot_type));
-        PolicyTraits::transfer(&alloc_ref, new_slots + new_i, old_slots + i);
+        PolicyTraits::transfer(&alloc_ref, new_slots + new_i,
+                               old_slots_ptr + i);
       }
     }
     PoisonSingleGroupEmptySlots(c, sizeof(slot_type));
@@ -1673,11 +2113,12 @@ class HashSetResizeHelper {
 
   // Deallocates old backing array.
   template <size_t AlignOfSlot, class CharAlloc>
-  void DeallocateOld(CharAlloc alloc_ref, size_t slot_size, void* old_slots) {
-    SanitizerUnpoisonMemoryRegion(old_slots, slot_size * old_capacity_);
+  void DeallocateOld(CharAlloc alloc_ref, size_t slot_size) {
+    SanitizerUnpoisonMemoryRegion(old_slots(), slot_size * old_capacity_);
+    auto layout = RawHashSetLayout(old_capacity_, AlignOfSlot, had_infoz_);
     Deallocate<BackingArrayAlignment(AlignOfSlot)>(
-        &alloc_ref, old_ctrl_ - ControlOffset(had_infoz_),
-        AllocSize(old_capacity_, slot_size, AlignOfSlot, had_infoz_));
+        &alloc_ref, old_ctrl() - layout.control_offset(),
+        layout.alloc_size(slot_size));
   }
 
  private:
@@ -1692,8 +2133,12 @@ class HashSetResizeHelper {
   // Relocates control bytes and slots into new single group for
   // transferable objects.
   // Must be called only if IsGrowingIntoSingleGroupApplicable returned true.
-  void GrowSizeIntoSingleGroupTransferable(CommonFields& c, void* old_slots,
-                                           size_t slot_size);
+  void GrowSizeIntoSingleGroupTransferable(CommonFields& c, size_t slot_size);
+
+  // If there was an SOO slot and slots are transferable, transfers the SOO slot
+  // into the new heap allocation. Must be called only if
+  // IsGrowingIntoSingleGroupApplicable returned true.
+  void TransferSlotAfterSoo(CommonFields& c, size_t slot_size);
 
   // Shuffle control bits deterministically to the next capacity.
   // Returns offset for newly added element with given hash.
@@ -1726,6 +2171,13 @@ class HashSetResizeHelper {
   void GrowIntoSingleGroupShuffleControlBytes(ctrl_t* new_ctrl,
                                               size_t new_capacity) const;
 
+  // If the table was SOO, initializes new control bytes. `h2` is the control
+  // byte corresponding to the full slot. Must be called only if
+  // IsGrowingIntoSingleGroupApplicable returned true.
+  // Requires: `had_soo_slot_ || h2 == ctrl_t::kEmpty`.
+  void InitControlBytesAfterSoo(ctrl_t* new_ctrl, ctrl_t h2,
+                                size_t new_capacity);
+
   // Shuffle trivially transferable slots in the way consistent with
   // GrowIntoSingleGroupShuffleControlBytes.
   //
@@ -1739,8 +2191,7 @@ class HashSetResizeHelper {
   // 1. new_slots are transferred from old_slots_ consistent with
   //    GrowIntoSingleGroupShuffleControlBytes.
   // 2. Empty new_slots are *not* poisoned.
-  void GrowIntoSingleGroupShuffleTransferableSlots(void* old_slots,
-                                                   void* new_slots,
+  void GrowIntoSingleGroupShuffleTransferableSlots(void* new_slots,
                                                    size_t slot_size) const;
 
   // Poison empty slots that were transferred using the deterministic algorithm
@@ -1760,11 +2211,24 @@ class HashSetResizeHelper {
     }
   }
 
-  ctrl_t* old_ctrl_;
+  HeapOrSoo old_heap_or_soo_;
   size_t old_capacity_;
   bool had_infoz_;
+  bool was_soo_;
+  bool had_soo_slot_;
+  // Either null infoz or a pre-sampled forced infoz for SOO tables.
+  HashtablezInfoHandle forced_infoz_;
 };
 
+inline void PrepareInsertCommon(CommonFields& common) {
+  common.increment_size();
+  common.maybe_increment_generation_on_insert();
+}
+
+// Like prepare_insert, but for the case of inserting into a full SOO table.
+size_t PrepareInsertAfterSoo(size_t hash, size_t slot_size,
+                             CommonFields& common);
+
 // PolicyFunctions bundles together some information for a particular
 // raw_hash_set<T, ...> instantiation. This information is passed to
 // type-erased functions that want to do small amounts of type-specific
@@ -1772,21 +2236,29 @@ class HashSetResizeHelper {
 struct PolicyFunctions {
   size_t slot_size;
 
+  // Returns the pointer to the hash function stored in the set.
+  const void* (*hash_fn)(const CommonFields& common);
+
   // Returns the hash of the pointed-to slot.
-  size_t (*hash_slot)(void* set, void* slot);
+  size_t (*hash_slot)(const void* hash_fn, void* slot);
 
-  // Transfer the contents of src_slot to dst_slot.
+  // Transfers the contents of src_slot to dst_slot.
   void (*transfer)(void* set, void* dst_slot, void* src_slot);
 
-  // Deallocate the backing store from common.
+  // Deallocates the backing store from common.
   void (*dealloc)(CommonFields& common, const PolicyFunctions& policy);
+
+  // Resizes set to the new capacity.
+  // Arguments are used as in raw_hash_set::resize_impl.
+  void (*resize)(CommonFields& common, size_t new_capacity,
+                 HashtablezInfoHandle forced_infoz);
 };
 
 // ClearBackingArray clears the backing array, either modifying it in place,
 // or creating a new one based on the value of "reuse".
 // REQUIRES: c.capacity > 0
 void ClearBackingArray(CommonFields& c, const PolicyFunctions& policy,
-                       bool reuse);
+                       bool reuse, bool soo_enabled);
 
 // Type-erased version of raw_hash_set::erase_meta_only.
 void EraseMetaOnly(CommonFields& c, size_t index, size_t slot_size);
@@ -1817,9 +2289,26 @@ ABSL_ATTRIBUTE_NOINLINE void TransferRelocatable(void*, void* dst, void* src) {
   memcpy(dst, src, SizeOfSlot);
 }
 
-// Type-erased version of raw_hash_set::drop_deletes_without_resize.
-void DropDeletesWithoutResize(CommonFields& common,
-                              const PolicyFunctions& policy, void* tmp_space);
+// Type erased raw_hash_set::get_hash_ref_fn for the empty hash function case.
+const void* GetHashRefForEmptyHasher(const CommonFields& common);
+
+// Given the hash of a value not currently in the table and the first empty
+// slot in the probe sequence, finds a viable slot index to insert it at.
+//
+// In case there's no space left, the table can be resized or rehashed
+// (for tables with deleted slots, see FindInsertPositionWithGrowthOrRehash).
+//
+// In the case of absence of deleted slots and positive growth_left, the element
+// can be inserted in the provided `target` position.
+//
+// When the table has deleted slots (according to GrowthInfo), the target
+// position will be searched one more time using `find_first_non_full`.
+//
+// REQUIRES: Table is not SOO.
+// REQUIRES: At least one non-full slot available.
+// REQUIRES: `target` is a valid empty position to insert.
+size_t PrepareInsertNonSoo(CommonFields& common, size_t hash, FindInfo target,
+                           const PolicyFunctions& policy);
 
 // A SwissTable.
 //
@@ -1875,6 +2364,26 @@ class raw_hash_set {
   using key_arg = typename KeyArgImpl::template type<K, key_type>;
 
  private:
+  // TODO(b/289225379): we could add extra SOO space inside raw_hash_set
+  // after CommonFields to allow inlining larger slot_types (e.g. std::string),
+  // but it's a bit complicated if we want to support incomplete mapped_type in
+  // flat_hash_map. We could potentially do this for flat_hash_set and for an
+  // allowlist of `mapped_type`s of flat_hash_map that includes e.g. arithmetic
+  // types, strings, cords, and pairs/tuples of allowlisted types.
+  constexpr static bool SooEnabled() {
+    return PolicyTraits::soo_enabled() &&
+           sizeof(slot_type) <= sizeof(HeapOrSoo) &&
+           alignof(slot_type) <= alignof(HeapOrSoo);
+  }
+
+  // Whether `size` fits in the SOO capacity of this table.
+  bool fits_in_soo(size_t size) const {
+    return SooEnabled() && size <= SooCapacity();
+  }
+  // Whether this table is in SOO mode or non-SOO mode.
+  bool is_soo() const { return fits_in_soo(capacity()); }
+  bool is_full_soo() const { return is_soo() && !empty(); }
+
   // Give an early error when key_type is not hashable/eq.
   auto KeyTypeCanBeHashed(const Hash& h, const key_type& k) -> decltype(h(k));
   auto KeyTypeCanBeEq(const Eq& eq, const key_type& k) -> decltype(eq(k, k));
@@ -1928,6 +2437,7 @@ class raw_hash_set {
 
   class iterator : private HashSetIteratorGenerationInfo {
     friend class raw_hash_set;
+    friend struct HashtableFreeFunctionsAccess;
 
    public:
     using iterator_category = std::forward_iterator_tag;
@@ -1958,6 +2468,7 @@ class raw_hash_set {
       ++ctrl_;
       ++slot_;
       skip_empty_or_deleted();
+      if (ABSL_PREDICT_FALSE(*ctrl_ == ctrl_t::kSentinel)) ctrl_ = nullptr;
       return *this;
     }
     // PRECONDITION: not an end() iterator.
@@ -1988,22 +2499,31 @@ class raw_hash_set {
       // not equal to any end iterator.
       ABSL_ASSUME(ctrl != nullptr);
     }
+    // This constructor is used in begin() to avoid an MSan
+    // use-of-uninitialized-value error. Delegating from this constructor to
+    // the previous one doesn't avoid the error.
+    iterator(ctrl_t* ctrl, MaybeInitializedPtr slot,
+             const GenerationType* generation_ptr)
+        : HashSetIteratorGenerationInfo(generation_ptr),
+          ctrl_(ctrl),
+          slot_(to_slot(slot.get())) {
+      // This assumption helps the compiler know that any non-end iterator is
+      // not equal to any end iterator.
+      ABSL_ASSUME(ctrl != nullptr);
+    }
     // For end() iterators.
     explicit iterator(const GenerationType* generation_ptr)
         : HashSetIteratorGenerationInfo(generation_ptr), ctrl_(nullptr) {}
 
-    // Fixes up `ctrl_` to point to a full by advancing it and `slot_` until
-    // they reach one.
-    //
-    // If a sentinel is reached, we null `ctrl_` out instead.
+    // Fixes up `ctrl_` to point to a full or sentinel by advancing `ctrl_` and
+    // `slot_` until they reach one.
     void skip_empty_or_deleted() {
       while (IsEmptyOrDeleted(*ctrl_)) {
         uint32_t shift =
-            GroupEmptyOrDeleted{ctrl_}.CountLeadingEmptyOrDeleted();
+            GroupFullEmptyOrDeleted{ctrl_}.CountLeadingEmptyOrDeleted();
         ctrl_ += shift;
         slot_ += shift;
       }
-      if (ABSL_PREDICT_FALSE(*ctrl_ == ctrl_t::kSentinel)) ctrl_ = nullptr;
     }
 
     ctrl_t* control() const { return ctrl_; }
@@ -2091,8 +2611,9 @@ class raw_hash_set {
       size_t bucket_count, const hasher& hash = hasher(),
       const key_equal& eq = key_equal(),
       const allocator_type& alloc = allocator_type())
-      : settings_(CommonFields{}, hash, eq, alloc) {
-    if (bucket_count) {
+      : settings_(CommonFields::CreateDefault<SooEnabled()>(), hash, eq,
+                  alloc) {
+    if (bucket_count > (SooEnabled() ? SooCapacity() : 0)) {
       resize(NormalizeCapacity(bucket_count));
     }
   }
@@ -2193,22 +2714,69 @@ class raw_hash_set {
                                that.alloc_ref())) {}
 
   raw_hash_set(const raw_hash_set& that, const allocator_type& a)
-      : raw_hash_set(0, that.hash_ref(), that.eq_ref(), a) {
+      : raw_hash_set(GrowthToLowerboundCapacity(that.size()), that.hash_ref(),
+                     that.eq_ref(), a) {
     const size_t size = that.size();
-    if (size == 0) return;
-    reserve(size);
-    // Because the table is guaranteed to be empty, we can do something faster
-    // than a full `insert`.
-    for (const auto& v : that) {
-      const size_t hash = PolicyTraits::apply(HashElement{hash_ref()}, v);
-      auto target = find_first_non_full_outofline(common(), hash);
-      SetCtrl(common(), target.offset, H2(hash), sizeof(slot_type));
-      emplace_at(target.offset, v);
-      common().maybe_increment_generation_on_insert();
-      infoz().RecordInsert(hash, target.probe_length);
+    if (size == 0) {
+      return;
+    }
+    // We don't use `that.is_soo()` here because `that` can have non-SOO
+    // capacity but have a size that fits into SOO capacity.
+    if (fits_in_soo(size)) {
+      assert(size == 1);
+      common().set_full_soo();
+      emplace_at(soo_iterator(), *that.begin());
+      const HashtablezInfoHandle infoz = try_sample_soo();
+      if (infoz.IsSampled()) resize_with_soo_infoz(infoz);
+      return;
+    }
+    assert(!that.is_soo());
+    const size_t cap = capacity();
+    // Note about single group tables:
+    // 1. It is correct to have any order of elements.
+    // 2. Order has to be non deterministic.
+    // 3. We are assigning elements with arbitrary `shift` starting from
+    //    `capacity + shift` position.
+    // 4. `shift` must be coprime with `capacity + 1` in order to be able to use
+    //     modular arithmetic to traverse all positions, instead if cycling
+    //     through a subset of positions. Odd numbers are coprime with any
+    //     `capacity + 1` (2^N).
+    size_t offset = cap;
+    const size_t shift =
+        is_single_group(cap) ? (PerTableSalt(control()) | 1) : 0;
+    IterateOverFullSlots(
+        that.common(), that.slot_array(),
+        [&](const ctrl_t* that_ctrl,
+            slot_type* that_slot) ABSL_ATTRIBUTE_ALWAYS_INLINE {
+          if (shift == 0) {
+            // Big tables case. Position must be searched via probing.
+            // The table is guaranteed to be empty, so we can do faster than
+            // a full `insert`.
+            const size_t hash = PolicyTraits::apply(
+                HashElement{hash_ref()}, PolicyTraits::element(that_slot));
+            FindInfo target = find_first_non_full_outofline(common(), hash);
+            infoz().RecordInsert(hash, target.probe_length);
+            offset = target.offset;
+          } else {
+            // Small tables case. Next position is computed via shift.
+            offset = (offset + shift) & cap;
+          }
+          const h2_t h2 = static_cast<h2_t>(*that_ctrl);
+          assert(  // We rely that hash is not changed for small tables.
+              H2(PolicyTraits::apply(HashElement{hash_ref()},
+                                     PolicyTraits::element(that_slot))) == h2 &&
+              "hash function value changed unexpectedly during the copy");
+          SetCtrl(common(), offset, h2, sizeof(slot_type));
+          emplace_at(iterator_at(offset), PolicyTraits::element(that_slot));
+          common().maybe_increment_generation_on_insert();
+        });
+    if (shift != 0) {
+      // On small table copy we do not record individual inserts.
+      // RecordInsert requires hash, but it is unknown for small tables.
+      infoz().RecordStorageChanged(size, cap);
     }
     common().set_size(size);
-    set_growth_left(growth_left() - size);
+    growth_info().OverwriteManyEmptyAsFull(size);
   }
 
   ABSL_ATTRIBUTE_NOINLINE raw_hash_set(raw_hash_set&& that) noexcept(
@@ -2220,16 +2788,22 @@ class raw_hash_set {
          // would create a nullptr functor that cannot be called.
          // TODO(b/296061262): move instead of copying hash/eq/alloc.
          // Note: we avoid using exchange for better generated code.
-        settings_(std::move(that.common()), that.hash_ref(), that.eq_ref(),
-                  that.alloc_ref()) {
-    that.common() = CommonFields{};
+        settings_(PolicyTraits::transfer_uses_memcpy() || !that.is_full_soo()
+                      ? std::move(that.common())
+                      : CommonFields{full_soo_tag_t{}},
+                  that.hash_ref(), that.eq_ref(), that.alloc_ref()) {
+    if (!PolicyTraits::transfer_uses_memcpy() && that.is_full_soo()) {
+      transfer(soo_slot(), that.soo_slot());
+    }
+    that.common() = CommonFields::CreateDefault<SooEnabled()>();
     maybe_increment_generation_or_rehash_on_move();
   }
 
   raw_hash_set(raw_hash_set&& that, const allocator_type& a)
-      : settings_(CommonFields{}, that.hash_ref(), that.eq_ref(), a) {
+      : settings_(CommonFields::CreateDefault<SooEnabled()>(), that.hash_ref(),
+                  that.eq_ref(), a) {
     if (a == that.alloc_ref()) {
-      std::swap(common(), that.common());
+      swap_common(that);
       maybe_increment_generation_or_rehash_on_move();
     } else {
       move_elements_allocs_unequal(std::move(that));
@@ -2264,8 +2838,12 @@ class raw_hash_set {
   ~raw_hash_set() { destructor_impl(); }
 
   iterator begin() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    auto it = iterator_at(0);
+    if (ABSL_PREDICT_FALSE(empty())) return end();
+    if (is_soo()) return soo_iterator();
+    iterator it = {control(), common().slots_union(),
+                   common().generation_ptr()};
     it.skip_empty_or_deleted();
+    assert(IsFull(*it.control()));
     return it;
   }
   iterator end() ABSL_ATTRIBUTE_LIFETIME_BOUND {
@@ -2285,7 +2863,14 @@ class raw_hash_set {
 
   bool empty() const { return !size(); }
   size_t size() const { return common().size(); }
-  size_t capacity() const { return common().capacity(); }
+  size_t capacity() const {
+    const size_t cap = common().capacity();
+    // Compiler complains when using functions in assume so use local variables.
+    ABSL_ATTRIBUTE_UNUSED static constexpr bool kEnabled = SooEnabled();
+    ABSL_ATTRIBUTE_UNUSED static constexpr size_t kCapacity = SooCapacity();
+    ABSL_ASSUME(!kEnabled || cap >= kCapacity);
+    return cap;
+  }
   size_t max_size() const { return (std::numeric_limits<size_t>::max)(); }
 
   ABSL_ATTRIBUTE_REINITIALIZES void clear() {
@@ -2299,9 +2884,13 @@ class raw_hash_set {
     const size_t cap = capacity();
     if (cap == 0) {
       // Already guaranteed to be empty; so nothing to do.
+    } else if (is_soo()) {
+      if (!empty()) destroy(soo_slot());
+      common().set_empty_soo();
     } else {
       destroy_slots();
-      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/cap < 128);
+      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/cap < 128,
+                        SooEnabled());
     }
     common().set_reserved_growth(0);
     common().set_reservation_size(0);
@@ -2432,7 +3021,7 @@ class raw_hash_set {
   std::pair<iterator, bool> emplace(Args&&... args)
       ABSL_ATTRIBUTE_LIFETIME_BOUND {
     alignas(slot_type) unsigned char raw[sizeof(slot_type)];
-    slot_type* slot = reinterpret_cast<slot_type*>(&raw);
+    slot_type* slot = to_slot(&raw);
 
     construct(slot, std::forward<Args>(args)...);
     const auto& elem = PolicyTraits::element(slot);
@@ -2496,11 +3085,11 @@ class raw_hash_set {
                         F&& f) ABSL_ATTRIBUTE_LIFETIME_BOUND {
     auto res = find_or_prepare_insert(key);
     if (res.second) {
-      slot_type* slot = slot_array() + res.first;
+      slot_type* slot = res.first.slot();
       std::forward<F>(f)(constructor(&alloc_ref(), &slot));
       assert(!slot);
     }
-    return iterator_at(res.first);
+    return res.first;
   }
 
   // Extension API: support for heterogeneous keys.
@@ -2524,7 +3113,7 @@ class raw_hash_set {
   // this method returns void to reduce algorithmic complexity to O(1).  The
   // iterator is invalidated, so any increment should be done before calling
   // erase.  In order to erase while iterating across a map, use the following
-  // idiom (which also works for standard containers):
+  // idiom (which also works for some standard containers):
   //
   // for (auto it = m.begin(), end = m.end(); it != end;) {
   //   // `erase()` will invalidate `it`, so advance `it` first.
@@ -2540,7 +3129,11 @@ class raw_hash_set {
   void erase(iterator it) {
     AssertIsFull(it.control(), it.generation(), it.generation_ptr(), "erase()");
     destroy(it.slot());
-    erase_meta_only(it);
+    if (is_soo()) {
+      common().set_empty_soo();
+    } else {
+      erase_meta_only(it);
+    }
   }
 
   iterator erase(const_iterator first,
@@ -2548,12 +3141,19 @@ class raw_hash_set {
     // We check for empty first because ClearBackingArray requires that
     // capacity() > 0 as a precondition.
     if (empty()) return end();
+    if (first == last) return last.inner_;
+    if (is_soo()) {
+      destroy(soo_slot());
+      common().set_empty_soo();
+      return end();
+    }
     if (first == begin() && last == end()) {
       // TODO(ezb): we access control bytes in destroy_slots so it could make
       // sense to combine destroy_slots and ClearBackingArray to avoid cache
       // misses when the table is large. Note that we also do this in clear().
       destroy_slots();
-      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/true);
+      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/true,
+                        SooEnabled());
       common().set_reserved_growth(common().reservation_size());
       return end();
     }
@@ -2568,13 +3168,21 @@ class raw_hash_set {
   template <typename H, typename E>
   void merge(raw_hash_set<Policy, H, E, Alloc>& src) {  // NOLINT
     assert(this != &src);
+    // Returns whether insertion took place.
+    const auto insert_slot = [this](slot_type* src_slot) {
+      return PolicyTraits::apply(InsertSlot<false>{*this, std::move(*src_slot)},
+                                 PolicyTraits::element(src_slot))
+          .second;
+    };
+
+    if (src.is_soo()) {
+      if (src.empty()) return;
+      if (insert_slot(src.soo_slot())) src.common().set_empty_soo();
+      return;
+    }
     for (auto it = src.begin(), e = src.end(); it != e;) {
       auto next = std::next(it);
-      if (PolicyTraits::apply(InsertSlot<false>{*this, std::move(*it.slot())},
-                              PolicyTraits::element(it.slot()))
-              .second) {
-        src.erase_meta_only(it);
-      }
+      if (insert_slot(it.slot())) src.erase_meta_only(it);
       it = next;
     }
   }
@@ -2588,7 +3196,11 @@ class raw_hash_set {
     AssertIsFull(position.control(), position.inner_.generation(),
                  position.inner_.generation_ptr(), "extract()");
     auto node = CommonAccess::Transfer<node_type>(alloc_ref(), position.slot());
-    erase_meta_only(position);
+    if (is_soo()) {
+      common().set_empty_soo();
+    } else {
+      erase_meta_only(position);
+    }
     return node;
   }
 
@@ -2605,7 +3217,7 @@ class raw_hash_set {
       IsNoThrowSwappable<allocator_type>(
           typename AllocTraits::propagate_on_container_swap{})) {
     using std::swap;
-    swap(common(), that.common());
+    swap_common(that);
     swap(hash_ref(), that.hash_ref());
     swap(eq_ref(), that.eq_ref());
     SwapAlloc(alloc_ref(), that.alloc_ref(),
@@ -2613,17 +3225,41 @@ class raw_hash_set {
   }
 
   void rehash(size_t n) {
-    if (n == 0 && capacity() == 0) return;
-    if (n == 0 && size() == 0) {
-      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/false);
-      return;
+    const size_t cap = capacity();
+    if (n == 0) {
+      if (cap == 0 || is_soo()) return;
+      if (empty()) {
+        ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/false,
+                          SooEnabled());
+        return;
+      }
+      if (fits_in_soo(size())) {
+        // When the table is already sampled, we keep it sampled.
+        if (infoz().IsSampled()) {
+          const size_t kInitialSampledCapacity = NextCapacity(SooCapacity());
+          if (capacity() > kInitialSampledCapacity) {
+            resize(kInitialSampledCapacity);
+          }
+          // This asserts that we didn't lose sampling coverage in `resize`.
+          assert(infoz().IsSampled());
+          return;
+        }
+        alignas(slot_type) unsigned char slot_space[sizeof(slot_type)];
+        slot_type* tmp_slot = to_slot(slot_space);
+        transfer(tmp_slot, begin().slot());
+        ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/false,
+                          SooEnabled());
+        transfer(soo_slot(), tmp_slot);
+        common().set_full_soo();
+        return;
+      }
     }
 
     // bitor is a faster way of doing `max` here. We will round up to the next
     // power-of-2-minus-1, so bitor is good enough.
     auto m = NormalizeCapacity(n | GrowthToLowerboundCapacity(size()));
     // n == 0 unconditionally rehashes as per the standard.
-    if (n == 0 || m > capacity()) {
+    if (n == 0 || m > cap) {
       resize(m);
 
       // This is after resize, to ensure that we have completed the allocation
@@ -2633,7 +3269,9 @@ class raw_hash_set {
   }
 
   void reserve(size_t n) {
-    if (n > size() + growth_left()) {
+    const size_t max_size_before_growth =
+        is_soo() ? SooCapacity() : size() + growth_left();
+    if (n > max_size_before_growth) {
       size_t m = GrowthToLowerboundCapacity(n);
       resize(NormalizeCapacity(m));
 
@@ -2666,6 +3304,7 @@ class raw_hash_set {
   // specific benchmarks indicating its importance.
   template <class K = key_type>
   void prefetch(const key_arg<K>& key) const {
+    if (SooEnabled() ? is_soo() : capacity() == 0) return;
     (void)key;
     // Avoid probing if we won't be able to prefetch the addresses received.
 #ifdef ABSL_HAVE_PREFETCH
@@ -2686,26 +3325,16 @@ class raw_hash_set {
   template <class K = key_type>
   iterator find(const key_arg<K>& key,
                 size_t hash) ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    auto seq = probe(common(), hash);
-    slot_type* slot_ptr = slot_array();
-    const ctrl_t* ctrl = control();
-    while (true) {
-      Group g{ctrl + seq.offset()};
-      for (uint32_t i : g.Match(H2(hash))) {
-        if (ABSL_PREDICT_TRUE(PolicyTraits::apply(
-                EqualElement<K>{key, eq_ref()},
-                PolicyTraits::element(slot_ptr + seq.offset(i)))))
-          return iterator_at(seq.offset(i));
-      }
-      if (ABSL_PREDICT_TRUE(g.MaskEmpty())) return end();
-      seq.next();
-      assert(seq.index() <= capacity() && "full table!");
-    }
+    AssertHashEqConsistent(key);
+    if (is_soo()) return find_soo(key);
+    return find_non_soo(key, hash);
   }
   template <class K = key_type>
   iterator find(const key_arg<K>& key) ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    AssertHashEqConsistent(key);
+    if (is_soo()) return find_soo(key);
     prefetch_heap_block();
-    return find(key, hash_ref()(key));
+    return find_non_soo(key, hash_ref()(key));
   }
 
   template <class K = key_type>
@@ -2716,8 +3345,7 @@ class raw_hash_set {
   template <class K = key_type>
   const_iterator find(const key_arg<K>& key) const
       ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    prefetch_heap_block();
-    return find(key, hash_ref()(key));
+    return const_cast<raw_hash_set*>(this)->find(key);
   }
 
   template <class K = key_type>
@@ -2791,6 +3419,8 @@ class raw_hash_set {
   friend struct absl::container_internal::hashtable_debug_internal::
       HashtableDebugAccess;
 
+  friend struct absl::container_internal::HashtableFreeFunctionsAccess;
+
   struct FindElement {
     template <class K, class... Args>
     const_iterator operator()(const K& key, Args&&...) const {
@@ -2824,7 +3454,7 @@ class raw_hash_set {
       if (res.second) {
         s.emplace_at(res.first, std::forward<Args>(args)...);
       }
-      return {s.iterator_at(res.first), res.second};
+      return res;
     }
     raw_hash_set& s;
   };
@@ -2835,11 +3465,11 @@ class raw_hash_set {
     std::pair<iterator, bool> operator()(const K& key, Args&&...) && {
       auto res = s.find_or_prepare_insert(key);
       if (res.second) {
-        s.transfer(s.slot_array() + res.first, &slot);
+        s.transfer(res.first.slot(), &slot);
       } else if (do_destroy) {
         s.destroy(&slot);
       }
-      return {s.iterator_at(res.first), res.second};
+      return res;
     }
     raw_hash_set& s;
     // Constructed slot. Either moved into place or destroyed.
@@ -2858,17 +3488,55 @@ class raw_hash_set {
     PolicyTraits::transfer(&alloc_ref(), to, from);
   }
 
-  inline void destroy_slots() {
-    const size_t cap = capacity();
+  // TODO(b/289225379): consider having a helper class that has the impls for
+  // SOO functionality.
+  template <class K = key_type>
+  iterator find_soo(const key_arg<K>& key) {
+    assert(is_soo());
+    return empty() || !PolicyTraits::apply(EqualElement<K>{key, eq_ref()},
+                                           PolicyTraits::element(soo_slot()))
+               ? end()
+               : soo_iterator();
+  }
+
+  template <class K = key_type>
+  iterator find_non_soo(const key_arg<K>& key, size_t hash) {
+    assert(!is_soo());
+    auto seq = probe(common(), hash);
     const ctrl_t* ctrl = control();
-    slot_type* slot = slot_array();
-    for (size_t i = 0; i != cap; ++i) {
-      if (IsFull(ctrl[i])) {
-        destroy(slot + i);
+    while (true) {
+      Group g{ctrl + seq.offset()};
+      for (uint32_t i : g.Match(H2(hash))) {
+        if (ABSL_PREDICT_TRUE(PolicyTraits::apply(
+                EqualElement<K>{key, eq_ref()},
+                PolicyTraits::element(slot_array() + seq.offset(i)))))
+          return iterator_at(seq.offset(i));
       }
+      if (ABSL_PREDICT_TRUE(g.MaskEmpty())) return end();
+      seq.next();
+      assert(seq.index() <= capacity() && "full table!");
     }
   }
 
+  // Conditionally samples hashtablez for SOO tables. This should be called on
+  // insertion into an empty SOO table and in copy construction when the size
+  // can fit in SOO capacity.
+  inline HashtablezInfoHandle try_sample_soo() {
+    assert(is_soo());
+    if (!ShouldSampleHashtablezInfo<CharAlloc>()) return HashtablezInfoHandle{};
+    return Sample(sizeof(slot_type), sizeof(key_type), sizeof(value_type),
+                  SooCapacity());
+  }
+
+  inline void destroy_slots() {
+    assert(!is_soo());
+    if (PolicyTraits::template destroy_is_trivial<Alloc>()) return;
+    IterateOverFullSlots(
+        common(), slot_array(),
+        [&](const ctrl_t*, slot_type* slot)
+            ABSL_ATTRIBUTE_ALWAYS_INLINE { this->destroy(slot); });
+  }
+
   inline void dealloc() {
     assert(capacity() != 0);
     // Unpoison before returning the memory to the allocator.
@@ -2881,6 +3549,12 @@ class raw_hash_set {
 
   inline void destructor_impl() {
     if (capacity() == 0) return;
+    if (is_soo()) {
+      if (!empty()) {
+        ABSL_SWISSTABLE_IGNORE_UNINITIALIZED(destroy(soo_slot()));
+      }
+      return;
+    }
     destroy_slots();
     dealloc();
   }
@@ -2890,10 +3564,16 @@ class raw_hash_set {
   // This merely updates the pertinent control byte. This can be used in
   // conjunction with Policy::transfer to move the object to another place.
   void erase_meta_only(const_iterator it) {
+    assert(!is_soo());
     EraseMetaOnly(common(), static_cast<size_t>(it.control() - control()),
                   sizeof(slot_type));
   }
 
+  size_t hash_of(slot_type* slot) const {
+    return PolicyTraits::apply(HashElement{hash_ref()},
+                               PolicyTraits::element(slot));
+  }
+
   // Resizes table to the new capacity and move all elements to the new
   // positions accordingly.
   //
@@ -2902,143 +3582,165 @@ class raw_hash_set {
   // HashSetResizeHelper::FindFirstNonFullAfterResize(
   //    common(), old_capacity, hash)
   // can be called right after `resize`.
-  ABSL_ATTRIBUTE_NOINLINE void resize(size_t new_capacity) {
+  void resize(size_t new_capacity) {
+    raw_hash_set::resize_impl(common(), new_capacity, HashtablezInfoHandle{});
+  }
+
+  // As above, except that we also accept a pre-sampled, forced infoz for
+  // SOO tables, since they need to switch from SOO to heap in order to
+  // store the infoz.
+  void resize_with_soo_infoz(HashtablezInfoHandle forced_infoz) {
+    assert(forced_infoz.IsSampled());
+    raw_hash_set::resize_impl(common(), NextCapacity(SooCapacity()),
+                              forced_infoz);
+  }
+
+  // Resizes set to the new capacity.
+  // It is a static function in order to use its pointer in GetPolicyFunctions.
+  ABSL_ATTRIBUTE_NOINLINE static void resize_impl(
+      CommonFields& common, size_t new_capacity,
+      HashtablezInfoHandle forced_infoz) {
+    raw_hash_set* set = reinterpret_cast<raw_hash_set*>(&common);
     assert(IsValidCapacity(new_capacity));
-    HashSetResizeHelper resize_helper(common());
-    auto* old_slots = slot_array();
-    common().set_capacity(new_capacity);
+    assert(!set->fits_in_soo(new_capacity));
+    const bool was_soo = set->is_soo();
+    const bool had_soo_slot = was_soo && !set->empty();
+    const ctrl_t soo_slot_h2 =
+        had_soo_slot ? static_cast<ctrl_t>(H2(set->hash_of(set->soo_slot())))
+                     : ctrl_t::kEmpty;
+    HashSetResizeHelper resize_helper(common, was_soo, had_soo_slot,
+                                      forced_infoz);
+    // Initialize HashSetResizeHelper::old_heap_or_soo_. We can't do this in
+    // HashSetResizeHelper constructor because it can't transfer slots when
+    // transfer_uses_memcpy is false.
+    // TODO(b/289225379): try to handle more of the SOO cases inside
+    // InitializeSlots. See comment on cl/555990034 snapshot #63.
+    if (PolicyTraits::transfer_uses_memcpy() || !had_soo_slot) {
+      resize_helper.old_heap_or_soo() = common.heap_or_soo();
+    } else {
+      set->transfer(set->to_slot(resize_helper.old_soo_data()),
+                    set->soo_slot());
+    }
+    common.set_capacity(new_capacity);
     // Note that `InitializeSlots` does different number initialization steps
     // depending on the values of `transfer_uses_memcpy` and capacities.
     // Refer to the comment in `InitializeSlots` for more details.
     const bool grow_single_group =
         resize_helper.InitializeSlots<CharAlloc, sizeof(slot_type),
                                       PolicyTraits::transfer_uses_memcpy(),
-                                      alignof(slot_type)>(
-            common(), const_cast<std::remove_const_t<slot_type>*>(old_slots),
-            CharAlloc(alloc_ref()));
+                                      SooEnabled(), alignof(slot_type)>(
+            common, CharAlloc(set->alloc_ref()), soo_slot_h2, sizeof(key_type),
+            sizeof(value_type));
 
-    if (resize_helper.old_capacity() == 0) {
+    // In the SooEnabled() case, capacity is never 0 so we don't check.
+    if (!SooEnabled() && resize_helper.old_capacity() == 0) {
       // InitializeSlots did all the work including infoz().RecordRehash().
       return;
     }
+    assert(resize_helper.old_capacity() > 0);
+    // Nothing more to do in this case.
+    if (was_soo && !had_soo_slot) return;
 
+    slot_type* new_slots = set->slot_array();
     if (grow_single_group) {
       if (PolicyTraits::transfer_uses_memcpy()) {
         // InitializeSlots did all the work.
         return;
       }
-      // We want GrowSizeIntoSingleGroup to be called here in order to make
-      // InitializeSlots not depend on PolicyTraits.
-      resize_helper.GrowSizeIntoSingleGroup<PolicyTraits>(common(), alloc_ref(),
-                                                          old_slots);
+      if (was_soo) {
+        set->transfer(new_slots + resize_helper.SooSlotIndex(),
+                      to_slot(resize_helper.old_soo_data()));
+        return;
+      } else {
+        // We want GrowSizeIntoSingleGroup to be called here in order to make
+        // InitializeSlots not depend on PolicyTraits.
+        resize_helper.GrowSizeIntoSingleGroup<PolicyTraits>(common,
+                                                            set->alloc_ref());
+      }
     } else {
       // InitializeSlots prepares control bytes to correspond to empty table.
-      auto* new_slots = slot_array();
-      size_t total_probe_length = 0;
-      for (size_t i = 0; i != resize_helper.old_capacity(); ++i) {
-        if (IsFull(resize_helper.old_ctrl()[i])) {
-          size_t hash = PolicyTraits::apply(
-              HashElement{hash_ref()}, PolicyTraits::element(old_slots + i));
-          auto target = find_first_non_full(common(), hash);
-          size_t new_i = target.offset;
-          total_probe_length += target.probe_length;
-          SetCtrl(common(), new_i, H2(hash), sizeof(slot_type));
-          transfer(new_slots + new_i, old_slots + i);
+      const auto insert_slot = [&](slot_type* slot) {
+        size_t hash = PolicyTraits::apply(HashElement{set->hash_ref()},
+                                          PolicyTraits::element(slot));
+        auto target = find_first_non_full(common, hash);
+        SetCtrl(common, target.offset, H2(hash), sizeof(slot_type));
+        set->transfer(new_slots + target.offset, slot);
+        return target.probe_length;
+      };
+      if (was_soo) {
+        insert_slot(to_slot(resize_helper.old_soo_data()));
+        return;
+      } else {
+        auto* old_slots = static_cast<slot_type*>(resize_helper.old_slots());
+        size_t total_probe_length = 0;
+        for (size_t i = 0; i != resize_helper.old_capacity(); ++i) {
+          if (IsFull(resize_helper.old_ctrl()[i])) {
+            total_probe_length += insert_slot(old_slots + i);
+          }
         }
+        common.infoz().RecordRehash(total_probe_length);
       }
-      infoz().RecordRehash(total_probe_length);
     }
-    resize_helper.DeallocateOld<alignof(slot_type)>(
-        CharAlloc(alloc_ref()), sizeof(slot_type),
-        const_cast<std::remove_const_t<slot_type>*>(old_slots));
+    resize_helper.DeallocateOld<alignof(slot_type)>(CharAlloc(set->alloc_ref()),
+                                                    sizeof(slot_type));
   }
 
-  // Prunes control bytes to remove as many tombstones as possible.
-  //
-  // See the comment on `rehash_and_grow_if_necessary()`.
-  inline void drop_deletes_without_resize() {
-    // Stack-allocate space for swapping elements.
-    alignas(slot_type) unsigned char tmp[sizeof(slot_type)];
-    DropDeletesWithoutResize(common(), GetPolicyFunctions(), tmp);
-  }
+  // Casting directly from e.g. char* to slot_type* can cause compilation errors
+  // on objective-C. This function converts to void* first, avoiding the issue.
+  static slot_type* to_slot(void* buf) { return static_cast<slot_type*>(buf); }
 
-  // Called whenever the table *might* need to conditionally grow.
-  //
-  // This function is an optimization opportunity to perform a rehash even when
-  // growth is unnecessary, because vacating tombstones is beneficial for
-  // performance in the long-run.
-  void rehash_and_grow_if_necessary() {
-    const size_t cap = capacity();
-    if (cap > Group::kWidth &&
-        // Do these calculations in 64-bit to avoid overflow.
-        size() * uint64_t{32} <= cap * uint64_t{25}) {
-      // Squash DELETED without growing if there is enough capacity.
-      //
-      // Rehash in place if the current size is <= 25/32 of capacity.
-      // Rationale for such a high factor: 1) drop_deletes_without_resize() is
-      // faster than resize, and 2) it takes quite a bit of work to add
-      // tombstones.  In the worst case, seems to take approximately 4
-      // insert/erase pairs to create a single tombstone and so if we are
-      // rehashing because of tombstones, we can afford to rehash-in-place as
-      // long as we are reclaiming at least 1/8 the capacity without doing more
-      // than 2X the work.  (Where "work" is defined to be size() for rehashing
-      // or rehashing in place, and 1 for an insert or erase.)  But rehashing in
-      // place is faster per operation than inserting or even doubling the size
-      // of the table, so we actually afford to reclaim even less space from a
-      // resize-in-place.  The decision is to rehash in place if we can reclaim
-      // at about 1/8th of the usable capacity (specifically 3/28 of the
-      // capacity) which means that the total cost of rehashing will be a small
-      // fraction of the total work.
-      //
-      // Here is output of an experiment using the BM_CacheInSteadyState
-      // benchmark running the old case (where we rehash-in-place only if we can
-      // reclaim at least 7/16*capacity) vs. this code (which rehashes in place
-      // if we can recover 3/32*capacity).
-      //
-      // Note that although in the worst-case number of rehashes jumped up from
-      // 15 to 190, but the number of operations per second is almost the same.
-      //
-      // Abridged output of running BM_CacheInSteadyState benchmark from
-      // raw_hash_set_benchmark.   N is the number of insert/erase operations.
-      //
-      //      | OLD (recover >= 7/16        | NEW (recover >= 3/32)
-      // size |    N/s LoadFactor NRehashes |    N/s LoadFactor NRehashes
-      //  448 | 145284       0.44        18 | 140118       0.44        19
-      //  493 | 152546       0.24        11 | 151417       0.48        28
-      //  538 | 151439       0.26        11 | 151152       0.53        38
-      //  583 | 151765       0.28        11 | 150572       0.57        50
-      //  628 | 150241       0.31        11 | 150853       0.61        66
-      //  672 | 149602       0.33        12 | 150110       0.66        90
-      //  717 | 149998       0.35        12 | 149531       0.70       129
-      //  762 | 149836       0.37        13 | 148559       0.74       190
-      //  807 | 149736       0.39        14 | 151107       0.39        14
-      //  852 | 150204       0.42        15 | 151019       0.42        15
-      drop_deletes_without_resize();
+  // Requires that lhs does not have a full SOO slot.
+  static void move_common(bool that_is_full_soo, allocator_type& rhs_alloc,
+                          CommonFields& lhs, CommonFields&& rhs) {
+    if (PolicyTraits::transfer_uses_memcpy() || !that_is_full_soo) {
+      lhs = std::move(rhs);
     } else {
-      // Otherwise grow the container.
-      resize(NextCapacity(cap));
+      lhs.move_non_heap_or_soo_fields(rhs);
+      // TODO(b/303305702): add reentrancy guard.
+      PolicyTraits::transfer(&rhs_alloc, to_slot(lhs.soo_data()),
+                             to_slot(rhs.soo_data()));
     }
   }
 
+  // Swaps common fields making sure to avoid memcpy'ing a full SOO slot if we
+  // aren't allowed to do so.
+  void swap_common(raw_hash_set& that) {
+    using std::swap;
+    if (PolicyTraits::transfer_uses_memcpy()) {
+      swap(common(), that.common());
+      return;
+    }
+    CommonFields tmp = CommonFields::CreateDefault<SooEnabled()>();
+    const bool that_is_full_soo = that.is_full_soo();
+    move_common(that_is_full_soo, that.alloc_ref(), tmp,
+                std::move(that.common()));
+    move_common(is_full_soo(), alloc_ref(), that.common(), std::move(common()));
+    move_common(that_is_full_soo, that.alloc_ref(), common(), std::move(tmp));
+  }
+
   void maybe_increment_generation_or_rehash_on_move() {
-    common().maybe_increment_generation_on_move();
+    if (!SwisstableGenerationsEnabled() || capacity() == 0 || is_soo()) {
+      return;
+    }
+    common().increment_generation();
     if (!empty() && common().should_rehash_for_bug_detection_on_move()) {
       resize(capacity());
     }
   }
 
-  template<bool propagate_alloc>
+  template <bool propagate_alloc>
   raw_hash_set& assign_impl(raw_hash_set&& that) {
     // We don't bother checking for this/that aliasing. We just need to avoid
     // breaking the invariants in that case.
     destructor_impl();
-    common() = std::move(that.common());
+    move_common(that.is_full_soo(), that.alloc_ref(), common(),
+                std::move(that.common()));
     // TODO(b/296061262): move instead of copying hash/eq/alloc.
     hash_ref() = that.hash_ref();
     eq_ref() = that.eq_ref();
     CopyAlloc(alloc_ref(), that.alloc_ref(),
               std::integral_constant<bool, propagate_alloc>());
-    that.common() = CommonFields{};
+    that.common() = CommonFields::CreateDefault<SooEnabled()>();
     maybe_increment_generation_or_rehash_on_move();
     return *this;
   }
@@ -3051,8 +3753,8 @@ class raw_hash_set {
       insert(std::move(PolicyTraits::element(it.slot())));
       that.destroy(it.slot());
     }
-    that.dealloc();
-    that.common() = CommonFields{};
+    if (!that.is_soo()) that.dealloc();
+    that.common() = CommonFields::CreateDefault<SooEnabled()>();
     maybe_increment_generation_or_rehash_on_move();
     return *this;
   }
@@ -3078,12 +3780,30 @@ class raw_hash_set {
     return move_elements_allocs_unequal(std::move(that));
   }
 
- protected:
-  // Attempts to find `key` in the table; if it isn't found, returns a slot that
-  // the value can be inserted into, with the control byte already set to
-  // `key`'s H2.
   template <class K>
-  std::pair<size_t, bool> find_or_prepare_insert(const K& key) {
+  std::pair<iterator, bool> find_or_prepare_insert_soo(const K& key) {
+    if (empty()) {
+      const HashtablezInfoHandle infoz = try_sample_soo();
+      if (infoz.IsSampled()) {
+        resize_with_soo_infoz(infoz);
+      } else {
+        common().set_full_soo();
+        return {soo_iterator(), true};
+      }
+    } else if (PolicyTraits::apply(EqualElement<K>{key, eq_ref()},
+                                   PolicyTraits::element(soo_slot()))) {
+      return {soo_iterator(), false};
+    } else {
+      resize(NextCapacity(SooCapacity()));
+    }
+    const size_t index =
+        PrepareInsertAfterSoo(hash_ref()(key), sizeof(slot_type), common());
+    return {iterator_at(index), true};
+  }
+
+  template <class K>
+  std::pair<iterator, bool> find_or_prepare_insert_non_soo(const K& key) {
+    assert(!is_soo());
     prefetch_heap_block();
     auto hash = hash_ref()(key);
     auto seq = probe(common(), hash);
@@ -3094,65 +3814,92 @@ class raw_hash_set {
         if (ABSL_PREDICT_TRUE(PolicyTraits::apply(
                 EqualElement<K>{key, eq_ref()},
                 PolicyTraits::element(slot_array() + seq.offset(i)))))
-          return {seq.offset(i), false};
+          return {iterator_at(seq.offset(i)), false};
+      }
+      auto mask_empty = g.MaskEmpty();
+      if (ABSL_PREDICT_TRUE(mask_empty)) {
+        size_t target = seq.offset(
+            GetInsertionOffset(mask_empty, capacity(), hash, control()));
+        return {iterator_at(PrepareInsertNonSoo(common(), hash,
+                                                FindInfo{target, seq.index()},
+                                                GetPolicyFunctions())),
+                true};
       }
-      if (ABSL_PREDICT_TRUE(g.MaskEmpty())) break;
       seq.next();
       assert(seq.index() <= capacity() && "full table!");
     }
-    return {prepare_insert(hash), true};
   }
 
-  // Given the hash of a value not currently in the table, finds the next
-  // viable slot index to insert it at.
-  //
-  // REQUIRES: At least one non-full slot available.
-  size_t prepare_insert(size_t hash) ABSL_ATTRIBUTE_NOINLINE {
-    const bool rehash_for_bug_detection =
-        common().should_rehash_for_bug_detection_on_insert();
-    if (rehash_for_bug_detection) {
-      // Move to a different heap allocation in order to detect bugs.
-      const size_t cap = capacity();
-      resize(growth_left() > 0 ? cap : NextCapacity(cap));
-    }
-    auto target = find_first_non_full(common(), hash);
-    if (!rehash_for_bug_detection &&
-        ABSL_PREDICT_FALSE(growth_left() == 0 &&
-                           !IsDeleted(control()[target.offset]))) {
-      size_t old_capacity = capacity();
-      rehash_and_grow_if_necessary();
-      // NOTE: It is safe to use `FindFirstNonFullAfterResize`.
-      // `FindFirstNonFullAfterResize` must be called right after resize.
-      // `rehash_and_grow_if_necessary` may *not* call `resize`
-      // and perform `drop_deletes_without_resize` instead. But this
-      // could happen only on big tables.
-      // For big tables `FindFirstNonFullAfterResize` will always
-      // fallback to normal `find_first_non_full`, so it is safe to use it.
-      target = HashSetResizeHelper::FindFirstNonFullAfterResize(
-          common(), old_capacity, hash);
-    }
-    common().increment_size();
-    set_growth_left(growth_left() - IsEmpty(control()[target.offset]));
-    SetCtrl(common(), target.offset, H2(hash), sizeof(slot_type));
-    common().maybe_increment_generation_on_insert();
-    infoz().RecordInsert(hash, target.probe_length);
-    return target.offset;
+ protected:
+  // Asserts that hash and equal functors provided by the user are consistent,
+  // meaning that `eq(k1, k2)` implies `hash(k1)==hash(k2)`.
+  template <class K>
+  void AssertHashEqConsistent(ABSL_ATTRIBUTE_UNUSED const K& key) {
+#ifndef NDEBUG
+    if (empty()) return;
+
+    const size_t hash_of_arg = hash_ref()(key);
+    const auto assert_consistent = [&](const ctrl_t*, slot_type* slot) {
+      const value_type& element = PolicyTraits::element(slot);
+      const bool is_key_equal =
+          PolicyTraits::apply(EqualElement<K>{key, eq_ref()}, element);
+      if (!is_key_equal) return;
+
+      const size_t hash_of_slot =
+          PolicyTraits::apply(HashElement{hash_ref()}, element);
+      const bool is_hash_equal = hash_of_arg == hash_of_slot;
+      if (!is_hash_equal) {
+        // In this case, we're going to crash. Do a couple of other checks for
+        // idempotence issues. Recalculating hash/eq here is also convenient for
+        // debugging with gdb/lldb.
+        const size_t once_more_hash_arg = hash_ref()(key);
+        assert(hash_of_arg == once_more_hash_arg && "hash is not idempotent.");
+        const size_t once_more_hash_slot =
+            PolicyTraits::apply(HashElement{hash_ref()}, element);
+        assert(hash_of_slot == once_more_hash_slot &&
+               "hash is not idempotent.");
+        const bool once_more_eq =
+            PolicyTraits::apply(EqualElement<K>{key, eq_ref()}, element);
+        assert(is_key_equal == once_more_eq && "equality is not idempotent.");
+      }
+      assert((!is_key_equal || is_hash_equal) &&
+             "eq(k1, k2) must imply that hash(k1) == hash(k2). "
+             "hash/eq functors are inconsistent.");
+    };
+
+    if (is_soo()) {
+      assert_consistent(/*unused*/ nullptr, soo_slot());
+      return;
+    }
+    // We only do validation for small tables so that it's constant time.
+    if (capacity() > 16) return;
+    IterateOverFullSlots(common(), slot_array(), assert_consistent);
+#endif
+  }
+
+  // Attempts to find `key` in the table; if it isn't found, returns an iterator
+  // where the value can be inserted into, with the control byte already set to
+  // `key`'s H2. Returns a bool indicating whether an insertion can take place.
+  template <class K>
+  std::pair<iterator, bool> find_or_prepare_insert(const K& key) {
+    AssertHashEqConsistent(key);
+    if (is_soo()) return find_or_prepare_insert_soo(key);
+    return find_or_prepare_insert_non_soo(key);
   }
 
   // Constructs the value in the space pointed by the iterator. This only works
   // after an unsuccessful find_or_prepare_insert() and before any other
   // modifications happen in the raw_hash_set.
   //
-  // PRECONDITION: i is an index returned from find_or_prepare_insert(k), where
-  // k is the key decomposed from `forward<Args>(args)...`, and the bool
-  // returned by find_or_prepare_insert(k) was true.
+  // PRECONDITION: iter was returned from find_or_prepare_insert(k), where k is
+  // the key decomposed from `forward<Args>(args)...`, and the bool returned by
+  // find_or_prepare_insert(k) was true.
   // POSTCONDITION: *m.iterator_at(i) == value_type(forward<Args>(args)...).
   template <class... Args>
-  void emplace_at(size_t i, Args&&... args) {
-    construct(slot_array() + i, std::forward<Args>(args)...);
+  void emplace_at(iterator iter, Args&&... args) {
+    construct(iter.slot(), std::forward<Args>(args)...);
 
-    assert(PolicyTraits::apply(FindElement{*this}, *iterator_at(i)) ==
-               iterator_at(i) &&
+    assert(PolicyTraits::apply(FindElement{*this}, *iter) == iter &&
            "constructed value does not match the lookup key");
   }
 
@@ -3160,7 +3907,7 @@ class raw_hash_set {
     return {control() + i, slot_array() + i, common().generation_ptr()};
   }
   const_iterator iterator_at(size_t i) const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return {control() + i, slot_array() + i, common().generation_ptr()};
+    return const_cast<raw_hash_set*>(this)->iterator_at(i);
   }
 
   reference unchecked_deref(iterator it) { return it.unchecked_deref(); }
@@ -3178,13 +3925,25 @@ class raw_hash_set {
   // side-effect.
   //
   // See `CapacityToGrowth()`.
-  size_t growth_left() const { return common().growth_left(); }
-  void set_growth_left(size_t gl) { return common().set_growth_left(gl); }
+  size_t growth_left() const {
+    assert(!is_soo());
+    return common().growth_left();
+  }
+
+  GrowthInfo& growth_info() {
+    assert(!is_soo());
+    return common().growth_info();
+  }
+  GrowthInfo growth_info() const {
+    assert(!is_soo());
+    return common().growth_info();
+  }
 
   // Prefetch the heap-allocated memory region to resolve potential TLB and
   // cache misses. This is intended to overlap with execution of calculating the
   // hash for a key.
   void prefetch_heap_block() const {
+    assert(!is_soo());
 #if ABSL_HAVE_BUILTIN(__builtin_prefetch) || defined(__GNUC__)
     __builtin_prefetch(control(), 0, 1);
 #endif
@@ -3193,11 +3952,31 @@ class raw_hash_set {
   CommonFields& common() { return settings_.template get<0>(); }
   const CommonFields& common() const { return settings_.template get<0>(); }
 
-  ctrl_t* control() const { return common().control(); }
+  ctrl_t* control() const {
+    assert(!is_soo());
+    return common().control();
+  }
   slot_type* slot_array() const {
+    assert(!is_soo());
     return static_cast<slot_type*>(common().slot_array());
   }
-  HashtablezInfoHandle infoz() { return common().infoz(); }
+  slot_type* soo_slot() {
+    assert(is_soo());
+    return static_cast<slot_type*>(common().soo_data());
+  }
+  const slot_type* soo_slot() const {
+    return const_cast<raw_hash_set*>(this)->soo_slot();
+  }
+  iterator soo_iterator() {
+    return {SooControl(), soo_slot(), common().generation_ptr()};
+  }
+  const_iterator soo_iterator() const {
+    return const_cast<raw_hash_set*>(this)->soo_iterator();
+  }
+  HashtablezInfoHandle infoz() {
+    assert(!is_soo());
+    return common().infoz();
+  }
 
   hasher& hash_ref() { return settings_.template get<1>(); }
   const hasher& hash_ref() const { return settings_.template get<1>(); }
@@ -3208,12 +3987,9 @@ class raw_hash_set {
     return settings_.template get<3>();
   }
 
-  // Make type-specific functions for this type's PolicyFunctions struct.
-  static size_t hash_slot_fn(void* set, void* slot) {
-    auto* h = static_cast<raw_hash_set*>(set);
-    return PolicyTraits::apply(
-        HashElement{h->hash_ref()},
-        PolicyTraits::element(static_cast<slot_type*>(slot)));
+  static const void* get_hash_ref_fn(const CommonFields& common) {
+    auto* h = reinterpret_cast<const raw_hash_set*>(&common);
+    return &h->hash_ref();
   }
   static void transfer_slot_fn(void* set, void* dst, void* src) {
     auto* h = static_cast<raw_hash_set*>(set);
@@ -3236,13 +4012,18 @@ class raw_hash_set {
   static const PolicyFunctions& GetPolicyFunctions() {
     static constexpr PolicyFunctions value = {
         sizeof(slot_type),
-        &raw_hash_set::hash_slot_fn,
+        // TODO(b/328722020): try to type erase
+        // for standard layout and alignof(Hash) <= alignof(CommonFields).
+        std::is_empty<hasher>::value ? &GetHashRefForEmptyHasher
+                                     : &raw_hash_set::get_hash_ref_fn,
+        PolicyTraits::template get_hash_slot_fn<hasher>(),
         PolicyTraits::transfer_uses_memcpy()
             ? TransferRelocatable<sizeof(slot_type)>
             : &raw_hash_set::transfer_slot_fn,
         (std::is_same<SlotAlloc, std::allocator<slot_type>>::value
              ? &DeallocateStandard<alignof(slot_type)>
              : &raw_hash_set::dealloc_fn),
+        &raw_hash_set::resize_impl,
     };
     return value;
   }
@@ -3252,22 +4033,78 @@ class raw_hash_set {
   // fields that occur after CommonFields.
   absl::container_internal::CompressedTuple<CommonFields, hasher, key_equal,
                                             allocator_type>
-      settings_{CommonFields{}, hasher{}, key_equal{}, allocator_type{}};
+      settings_{CommonFields::CreateDefault<SooEnabled()>(), hasher{},
+                key_equal{}, allocator_type{}};
+};
+
+// Friend access for free functions in raw_hash_set.h.
+struct HashtableFreeFunctionsAccess {
+  template <class Predicate, typename Set>
+  static typename Set::size_type EraseIf(Predicate& pred, Set* c) {
+    if (c->empty()) {
+      return 0;
+    }
+    if (c->is_soo()) {
+      auto it = c->soo_iterator();
+      if (!pred(*it)) {
+        assert(c->size() == 1 && "hash table was modified unexpectedly");
+        return 0;
+      }
+      c->destroy(it.slot());
+      c->common().set_empty_soo();
+      return 1;
+    }
+    ABSL_ATTRIBUTE_UNUSED const size_t original_size_for_assert = c->size();
+    size_t num_deleted = 0;
+    IterateOverFullSlots(
+        c->common(), c->slot_array(), [&](const ctrl_t* ctrl, auto* slot) {
+          if (pred(Set::PolicyTraits::element(slot))) {
+            c->destroy(slot);
+            EraseMetaOnly(c->common(), static_cast<size_t>(ctrl - c->control()),
+                          sizeof(*slot));
+            ++num_deleted;
+          }
+        });
+    // NOTE: IterateOverFullSlots allow removal of the current element, so we
+    // verify the size additionally here.
+    assert(original_size_for_assert - num_deleted == c->size() &&
+           "hash table was modified unexpectedly");
+    return num_deleted;
+  }
+
+  template <class Callback, typename Set>
+  static void ForEach(Callback& cb, Set* c) {
+    if (c->empty()) {
+      return;
+    }
+    if (c->is_soo()) {
+      cb(*c->soo_iterator());
+      return;
+    }
+    using ElementTypeWithConstness = decltype(*c->begin());
+    IterateOverFullSlots(
+        c->common(), c->slot_array(), [&cb](const ctrl_t*, auto* slot) {
+          ElementTypeWithConstness& element = Set::PolicyTraits::element(slot);
+          cb(element);
+        });
+  }
 };
 
 // Erases all elements that satisfy the predicate `pred` from the container `c`.
 template <typename P, typename H, typename E, typename A, typename Predicate>
 typename raw_hash_set<P, H, E, A>::size_type EraseIf(
     Predicate& pred, raw_hash_set<P, H, E, A>* c) {
-  const auto initial_size = c->size();
-  for (auto it = c->begin(), last = c->end(); it != last;) {
-    if (pred(*it)) {
-      c->erase(it++);
-    } else {
-      ++it;
-    }
-  }
-  return initial_size - c->size();
+  return HashtableFreeFunctionsAccess::EraseIf(pred, c);
+}
+
+// Calls `cb` for all elements in the container `c`.
+template <typename P, typename H, typename E, typename A, typename Callback>
+void ForEach(Callback& cb, raw_hash_set<P, H, E, A>* c) {
+  return HashtableFreeFunctionsAccess::ForEach(cb, c);
+}
+template <typename P, typename H, typename E, typename A, typename Callback>
+void ForEach(Callback& cb, const raw_hash_set<P, H, E, A>* c) {
+  return HashtableFreeFunctionsAccess::ForEach(cb, c);
 }
 
 namespace hashtable_debug_internal {
@@ -3278,6 +4115,7 @@ struct HashtableDebugAccess<Set, absl::void_t<typename Set::raw_hash_set>> {
 
   static size_t GetNumProbes(const Set& set,
                              const typename Set::key_type& key) {
+    if (set.is_soo()) return 0;
     size_t num_probes = 0;
     size_t hash = set.hash_ref()(key);
     auto seq = probe(set.common(), hash);
@@ -3301,7 +4139,8 @@ struct HashtableDebugAccess<Set, absl::void_t<typename Set::raw_hash_set>> {
   static size_t AllocatedByteSize(const Set& c) {
     size_t capacity = c.capacity();
     if (capacity == 0) return 0;
-    size_t m = c.common().alloc_size(sizeof(Slot), alignof(Slot));
+    size_t m =
+        c.is_soo() ? 0 : c.common().alloc_size(sizeof(Slot), alignof(Slot));
 
     size_t per_slot = Traits::space_used(static_cast<const Slot*>(nullptr));
     if (per_slot != ~size_t{}) {
@@ -3321,5 +4160,7 @@ ABSL_NAMESPACE_END
 }  // namespace absl
 
 #undef ABSL_SWISSTABLE_ENABLE_GENERATIONS
+#undef ABSL_SWISSTABLE_IGNORE_UNINITIALIZED
+#undef ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN
 
 #endif  // ABSL_CONTAINER_INTERNAL_RAW_HASH_SET_H_
diff --git a/contrib/restricted/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h b/contrib/restricted/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h
index 59995ae3e238..0f6e3479e67c 100644
--- a/contrib/restricted/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h
+++ b/contrib/restricted/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h
@@ -33,14 +33,15 @@
 #include <x86intrin.h>
 #define ABSL_CRC_INTERNAL_HAVE_X86_SIMD
 
-#elif defined(_MSC_VER) && !defined(__clang__) && defined(__AVX__)
+#elif defined(_MSC_VER) && !defined(__clang__) && defined(__AVX__) && \
+    defined(_M_AMD64)
 
 // MSVC AVX (/arch:AVX) implies SSE 4.2 and PCLMULQDQ.
 #include <intrin.h>
 #define ABSL_CRC_INTERNAL_HAVE_X86_SIMD
 
-#elif defined(__aarch64__) && defined(__LITTLE_ENDIAN__) && \
-    defined(__ARM_FEATURE_CRC32) && defined(ABSL_INTERNAL_HAVE_ARM_NEON) &&  \
+#elif defined(__aarch64__) && defined(__LITTLE_ENDIAN__) &&                 \
+    defined(__ARM_FEATURE_CRC32) && defined(ABSL_INTERNAL_HAVE_ARM_NEON) && \
     defined(__ARM_FEATURE_CRYPTO)
 
 #include <arm_acle.h>
@@ -101,10 +102,11 @@ V128 V128_Xor(const V128 l, const V128 r);
 // Produces an AND operation of |l| and |r|.
 V128 V128_And(const V128 l, const V128 r);
 
-// Sets two 64 bit integers to one 128 bit vector. The order is reverse.
+// Sets the lower half of a 128 bit register to the given 64-bit value and
+// zeroes the upper half.
 // dst[63:0] := |r|
-// dst[127:64] := |l|
-V128 V128_From2x64(const uint64_t l, const uint64_t r);
+// dst[127:64] := |0|
+V128 V128_From64WithZeroFill(const uint64_t r);
 
 // Shift |l| right by |imm| bytes while shifting in zeros.
 template <int imm>
@@ -121,8 +123,8 @@ uint64_t V128_Extract64(const V128 l);
 // Extracts the low 64 bits from V128.
 int64_t V128_Low64(const V128 l);
 
-// Left-shifts packed 64-bit integers in l by r.
-V128 V128_ShiftLeft64(const V128 l, const V128 r);
+// Add packed 64-bit integers in |l| and |r|.
+V128 V128_Add64(const V128 l, const V128 r);
 
 #endif
 
@@ -170,8 +172,8 @@ inline V128 V128_Xor(const V128 l, const V128 r) { return _mm_xor_si128(l, r); }
 
 inline V128 V128_And(const V128 l, const V128 r) { return _mm_and_si128(l, r); }
 
-inline V128 V128_From2x64(const uint64_t l, const uint64_t r) {
-  return _mm_set_epi64x(static_cast<int64_t>(l), static_cast<int64_t>(r));
+inline V128 V128_From64WithZeroFill(const uint64_t r) {
+  return _mm_set_epi64x(static_cast<int64_t>(0), static_cast<int64_t>(r));
 }
 
 template <int imm>
@@ -191,8 +193,8 @@ inline uint64_t V128_Extract64(const V128 l) {
 
 inline int64_t V128_Low64(const V128 l) { return _mm_cvtsi128_si64(l); }
 
-inline V128 V128_ShiftLeft64(const V128 l, const V128 r) {
-  return _mm_sll_epi64(l, r);
+inline V128 V128_Add64(const V128 l, const V128 r) {
+  return _mm_add_epi64(l, r);
 }
 
 #elif defined(ABSL_CRC_INTERNAL_HAVE_ARM_SIMD)
@@ -261,10 +263,12 @@ inline V128 V128_Xor(const V128 l, const V128 r) { return veorq_u64(l, r); }
 
 inline V128 V128_And(const V128 l, const V128 r) { return vandq_u64(l, r); }
 
-inline V128 V128_From2x64(const uint64_t l, const uint64_t r) {
-  return vcombine_u64(vcreate_u64(r), vcreate_u64(l));
+inline V128 V128_From64WithZeroFill(const uint64_t r){
+  constexpr uint64x2_t kZero = {0, 0};
+  return vsetq_lane_u64(r, kZero, 0);
 }
 
+
 template <int imm>
 inline V128 V128_ShiftRight(const V128 l) {
   return vreinterpretq_u64_s8(
@@ -285,9 +289,7 @@ inline int64_t V128_Low64(const V128 l) {
   return vgetq_lane_s64(vreinterpretq_s64_u64(l), 0);
 }
 
-inline V128 V128_ShiftLeft64(const V128 l, const V128 r) {
-  return vshlq_u64(l, vreinterpretq_s64_u64(r));
-}
+inline V128 V128_Add64(const V128 l, const V128 r) { return vaddq_u64(l, r); }
 
 #endif
 
diff --git a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_cord_state.cc b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_cord_state.cc
index 28d04dc4ea9f..303a55593a29 100644
--- a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_cord_state.cc
+++ b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_cord_state.cc
@@ -17,6 +17,7 @@
 #include <cassert>
 
 #include "absl/base/config.h"
+#include "absl/base/no_destructor.h"
 #include "absl/numeric/bits.h"
 
 namespace absl {
@@ -24,14 +25,14 @@ ABSL_NAMESPACE_BEGIN
 namespace crc_internal {
 
 CrcCordState::RefcountedRep* CrcCordState::RefSharedEmptyRep() {
-  static CrcCordState::RefcountedRep* empty = new CrcCordState::RefcountedRep;
+  static absl::NoDestructor<CrcCordState::RefcountedRep> empty;
 
   assert(empty->count.load(std::memory_order_relaxed) >= 1);
   assert(empty->rep.removed_prefix.length == 0);
   assert(empty->rep.prefix_crc.empty());
 
-  Ref(empty);
-  return empty;
+  Ref(empty.get());
+  return empty.get();
 }
 
 CrcCordState::CrcCordState() : refcounted_rep_(new RefcountedRep) {}
diff --git a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc
index 07795504e398..e34249f07dea 100644
--- a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc
+++ b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_memcpy_fallback.cc
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <cstdint>
+#include <cstring>
 #include <memory>
 
 #include "absl/base/config.h"
 #include "absl/crc/crc32c.h"
 #include "absl/crc/internal/crc_memcpy.h"
+#include "absl/strings/string_view.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
diff --git a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc
index 968e9ae359fe..38f61e9b1fd4 100644
--- a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc
+++ b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_memcpy_x86_arm_combined.cc
@@ -52,6 +52,7 @@
 #include <cstring>
 #include <memory>
 
+#include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/optimization.h"
 #include "absl/base/prefetch.h"
@@ -88,9 +89,11 @@ inline crc32c_t ShortCrcCopy(char* dst, const char* src, std::size_t length,
 constexpr size_t kIntLoadsPerVec = sizeof(V128) / sizeof(uint64_t);
 
 // Common function for copying the tails of multiple large regions.
+// Disable ubsan for benign unaligned access. See b/254108538.
 template <size_t vec_regions, size_t int_regions>
-inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src,
-                          size_t region_size, size_t copy_rounds) {
+ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED inline void LargeTailCopy(
+    crc32c_t* crcs, char** dst, const char** src, size_t region_size,
+    size_t copy_rounds) {
   std::array<V128, vec_regions> data;
   std::array<uint64_t, kIntLoadsPerVec * int_regions> int_data;
 
@@ -127,8 +130,8 @@ inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src,
         size_t data_index = i * kIntLoadsPerVec + j;
 
         int_data[data_index] = *(usrc + j);
-        crcs[region] = crc32c_t{static_cast<uint32_t>(CRC32_u64(
-            static_cast<uint32_t>(crcs[region]), int_data[data_index]))};
+        crcs[region] = crc32c_t{CRC32_u64(static_cast<uint32_t>(crcs[region]),
+                                          int_data[data_index])};
 
         *(udst + j) = int_data[data_index];
       }
@@ -155,8 +158,10 @@ class AcceleratedCrcMemcpyEngine : public CrcMemcpyEngine {
                    std::size_t length, crc32c_t initial_crc) const override;
 };
 
+// Disable ubsan for benign unaligned access. See b/254108538.
 template <size_t vec_regions, size_t int_regions>
-crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
+ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED crc32c_t
+AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
     void* __restrict dst, const void* __restrict src, std::size_t length,
     crc32c_t initial_crc) const {
   constexpr std::size_t kRegions = vec_regions + int_regions;
@@ -196,7 +201,6 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
 
   // Start work on the CRC: undo the XOR from the previous calculation or set up
   // the initial value of the CRC.
-  // initial_crc ^= kCrcDataXor;
   initial_crc = crc32c_t{static_cast<uint32_t>(initial_crc) ^ kCrcDataXor};
 
   // Do an initial alignment copy, so we can use aligned store instructions to
@@ -295,8 +299,8 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
 
           // Load and CRC the data.
           int_data[data_index] = *(usrc + i * kIntLoadsPerVec + k);
-          crcs[region] = crc32c_t{static_cast<uint32_t>(CRC32_u64(
-              static_cast<uint32_t>(crcs[region]), int_data[data_index]))};
+          crcs[region] = crc32c_t{CRC32_u64(static_cast<uint32_t>(crcs[region]),
+                                            int_data[data_index])};
 
           // Store the data.
           *(udst + i * kIntLoadsPerVec + k) = int_data[data_index];
diff --git a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc
index adc867f6b7d2..a56f1eb0e060 100644
--- a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc
+++ b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <cstdint>
+#include <cstddef>
 
 #include "absl/base/config.h"
 #include "absl/crc/crc32c.h"
diff --git a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc
index 51eff4eddcb3..79dace34f44f 100644
--- a/contrib/restricted/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc
+++ b/contrib/restricted/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc
@@ -101,13 +101,17 @@ constexpr size_t kMediumCutoff = 2048;
 namespace {
 
 uint32_t multiply(uint32_t a, uint32_t b) {
-  V128 shifts = V128_From2x64(0, 1);
-  V128 power = V128_From2x64(0, a);
-  V128 crc = V128_From2x64(0, b);
+  V128 power = V128_From64WithZeroFill(a);
+  V128 crc = V128_From64WithZeroFill(b);
   V128 res = V128_PMulLow(power, crc);
 
-  // Combine crc values
-  res = V128_ShiftLeft64(res, shifts);
+  // Combine crc values.
+  //
+  // Adding res to itself is equivalent to multiplying by 2,
+  // or shifting left by 1. Addition is used as not all compilers
+  // are able to generate optimal code without this hint.
+  // https://godbolt.org/z/rr3fMnf39
+  res = V128_Add64(res, res);
   return static_cast<uint32_t>(V128_Extract32<1>(res)) ^
          CRC32_u32(0, static_cast<uint32_t>(V128_Low64(res)));
 }
@@ -444,11 +448,11 @@ class CRC32AcceleratedX86ARMCombinedMultipleStreams
 
         V128 magic = *(reinterpret_cast<const V128*>(kClmulConstants) + bs - 1);
 
-        V128 tmp = V128_From2x64(0, l64);
+        V128 tmp = V128_From64WithZeroFill(l64);
 
         V128 res1 = V128_PMulLow(tmp, magic);
 
-        tmp = V128_From2x64(0, l641);
+        tmp = V128_From64WithZeroFill(l641);
 
         V128 res2 = V128_PMul10(tmp, magic);
         V128 x = V128_Xor(res1, res2);
diff --git a/contrib/restricted/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h b/contrib/restricted/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h
index b3d94badfc16..7ae83bdcbd24 100644
--- a/contrib/restricted/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h
+++ b/contrib/restricted/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h
@@ -19,19 +19,8 @@
 #include <intrin.h>
 #endif
 
-#ifdef __SSE__
-#include <xmmintrin.h>
-#endif
-
-#ifdef __SSE2__
-#include <emmintrin.h>
-#endif
-
-#ifdef __SSE3__
-#include <pmmintrin.h>
-#endif
-
-#ifdef __AVX__
+#if defined(__SSE__) || defined(__AVX__)
+// Pulls in both SSE and AVX intrinsics.
 #include <immintrin.h>
 #endif
 
@@ -44,6 +33,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/optimization.h"
 
@@ -57,7 +47,9 @@ namespace crc_internal {
 // memcpy can save 1 DRAM load of the destination cacheline.
 constexpr size_t kCacheLineSize = ABSL_CACHELINE_SIZE;
 
-// If the objects overlap, the behavior is undefined.
+// If the objects overlap, the behavior is undefined. Uses regular memcpy
+// instead of non-temporal memcpy if the required CPU intrinsics are unavailable
+// at compile time.
 inline void *non_temporal_store_memcpy(void *__restrict dst,
                                        const void *__restrict src, size_t len) {
 #if defined(__SSE3__) || defined(__aarch64__) || \
@@ -119,10 +111,20 @@ inline void *non_temporal_store_memcpy(void *__restrict dst,
 #endif  // __SSE3__ || __aarch64__ || (_MSC_VER && __AVX__)
 }
 
+// If the objects overlap, the behavior is undefined. Uses regular memcpy
+// instead of non-temporal memcpy if the required CPU intrinsics are unavailable
+// at compile time.
+#if ABSL_HAVE_CPP_ATTRIBUTE(gnu::target) && \
+    (defined(__x86_64__) || defined(__i386__))
+[[gnu::target("avx")]]
+#endif
 inline void *non_temporal_store_memcpy_avx(void *__restrict dst,
                                            const void *__restrict src,
                                            size_t len) {
-#ifdef __AVX__
+  // This function requires AVX. For clang and gcc we compile it with AVX even
+  // if the translation unit isn't built with AVX support. This works because we
+  // only select this implementation at runtime if the CPU supports AVX.
+#if defined(__SSE3__) || (defined(_MSC_VER) && defined(__AVX__))
   uint8_t *d = reinterpret_cast<uint8_t *>(dst);
   const uint8_t *s = reinterpret_cast<const uint8_t *>(src);
 
@@ -168,9 +170,8 @@ inline void *non_temporal_store_memcpy_avx(void *__restrict dst,
   }
   return dst;
 #else
-  // Fallback to regular memcpy when AVX is not available.
   return memcpy(dst, src, len);
-#endif  // __AVX__
+#endif  // __SSE3__ || (_MSC_VER && __AVX__)
 }
 
 }  // namespace crc_internal
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/failure_signal_handler.h b/contrib/restricted/abseil-cpp/absl/debugging/failure_signal_handler.h
index 5e034785f37b..4117facb56e4 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/failure_signal_handler.h
+++ b/contrib/restricted/abseil-cpp/absl/debugging/failure_signal_handler.h
@@ -33,7 +33,7 @@
 // }
 //
 // Any program that raises a fatal signal (such as `SIGSEGV`, `SIGILL`,
-// `SIGFPE`, `SIGABRT`, `SIGTERM`, `SIGBUG`, and `SIGTRAP`) will call the
+// `SIGFPE`, `SIGABRT`, `SIGTERM`, `SIGBUS`, and `SIGTRAP`) will call the
 // installed failure signal handler and provide debugging information to stderr.
 //
 // Note that you should *not* install the Abseil failure signal handler more
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h b/contrib/restricted/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h
new file mode 100644
index 000000000000..188e06c4afba
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h
@@ -0,0 +1,126 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_DEBUGGING_INTERNAL_BOUNDED_UTF8_LENGTH_SEQUENCE_H_
+#define ABSL_DEBUGGING_INTERNAL_BOUNDED_UTF8_LENGTH_SEQUENCE_H_
+
+#include <cstdint>
+
+#include "absl/base/config.h"
+#include "absl/numeric/bits.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+// A sequence of up to max_elements integers between 1 and 4 inclusive, whose
+// insertion operation computes the sum of all the elements before the insertion
+// point.  This is useful in decoding Punycode, where one needs to know where in
+// a UTF-8 byte stream the n-th code point begins.
+//
+// BoundedUtf8LengthSequence is async-signal-safe and suitable for use in
+// symbolizing stack traces in a signal handler, provided max_elements is not
+// improvidently large.  For inputs of lengths accepted by the Rust demangler,
+// up to a couple hundred code points, InsertAndReturnSumOfPredecessors should
+// run in a few dozen clock cycles, on par with the other arithmetic required
+// for Punycode decoding.
+template <uint32_t max_elements>
+class BoundedUtf8LengthSequence {
+ public:
+  // Constructs an empty sequence.
+  BoundedUtf8LengthSequence() = default;
+
+  // Inserts `utf_length` at position `index`, shifting any existing elements at
+  // or beyond `index` one position to the right.  If the sequence is already
+  // full, the rightmost element is discarded.
+  //
+  // Returns the sum of the elements at positions 0 to `index - 1` inclusive.
+  // If `index` is greater than the number of elements already inserted, the
+  // excess positions in the range count 1 apiece.
+  //
+  // REQUIRES: index < max_elements and 1 <= utf8_length <= 4.
+  uint32_t InsertAndReturnSumOfPredecessors(
+      uint32_t index, uint32_t utf8_length) {
+    // The caller shouldn't pass out-of-bounds inputs, but if it does happen,
+    // clamp the values and try to continue.  If we're being called from a
+    // signal handler, the last thing we want to do is crash.  Emitting
+    // malformed UTF-8 is a lesser evil.
+    if (index >= max_elements) index = max_elements - 1;
+    if (utf8_length == 0 || utf8_length > 4) utf8_length = 1;
+
+    const uint32_t word_index = index/32;
+    const uint32_t bit_index = 2 * (index % 32);
+    const uint64_t ones_bit = uint64_t{1} << bit_index;
+
+    // Compute the sum of predecessors.
+    //   - Each value from 1 to 4 is represented by a bit field with value from
+    //     0 to 3, so the desired sum is index plus the sum of the
+    //     representations actually stored.
+    //   - For each bit field, a set low bit should contribute 1 to the sum, and
+    //     a set high bit should contribute 2.
+    //   - Another way to say the same thing is that each set bit contributes 1,
+    //     and each set high bit contributes an additional 1.
+    //   - So the sum we want is index + popcount(everything) + popcount(bits in
+    //     odd positions).
+    const uint64_t odd_bits_mask = 0xaaaaaaaaaaaaaaaa;
+    const uint64_t lower_seminibbles_mask = ones_bit - 1;
+    const uint64_t higher_seminibbles_mask = ~lower_seminibbles_mask;
+    const uint64_t same_word_bits_below_insertion =
+        rep_[word_index] & lower_seminibbles_mask;
+    int full_popcount = absl::popcount(same_word_bits_below_insertion);
+    int odd_popcount =
+        absl::popcount(same_word_bits_below_insertion & odd_bits_mask);
+    for (uint32_t j = word_index; j > 0; --j) {
+      const uint64_t word_below_insertion = rep_[j - 1];
+      full_popcount += absl::popcount(word_below_insertion);
+      odd_popcount += absl::popcount(word_below_insertion & odd_bits_mask);
+    }
+    const uint32_t sum_of_predecessors =
+        index + static_cast<uint32_t>(full_popcount + odd_popcount);
+
+    // Now insert utf8_length's representation, shifting successors up one
+    // place.
+    for (uint32_t j = max_elements/32 - 1; j > word_index; --j) {
+      rep_[j] = (rep_[j] << 2) | (rep_[j - 1] >> 62);
+    }
+    rep_[word_index] =
+        (rep_[word_index] & lower_seminibbles_mask) |
+        (uint64_t{utf8_length - 1} << bit_index) |
+        ((rep_[word_index] & higher_seminibbles_mask) << 2);
+
+    return sum_of_predecessors;
+  }
+
+ private:
+  // If the (32 * i + j)-th element of the represented sequence has the value k
+  // (0 <= j < 32, 1 <= k <= 4), then bits 2 * j and 2 * j + 1 of rep_[i]
+  // contain the seminibble (k - 1).
+  //
+  // In particular, the zero-initialization of rep_ makes positions not holding
+  // any inserted element count as 1 in InsertAndReturnSumOfPredecessors.
+  //
+  // Example: rep_ = {0xb1, ... the rest zeroes ...} represents the sequence
+  // (2, 1, 4, 3, ... the rest 1's ...).  Constructing the sequence of Unicode
+  // code points "Àa🂻中" = {U+00C0, U+0061, U+1F0BB, U+4E2D} (among many
+  // other examples) would yield this value of rep_.
+  static_assert(max_elements > 0 && max_elements % 32 == 0,
+                "max_elements must be a positive multiple of 32");
+  uint64_t rep_[max_elements/32] = {};
+};
+
+}  // namespace debugging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_DEBUGGING_INTERNAL_BOUNDED_UTF8_LENGTH_SEQUENCE_H_
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc b/contrib/restricted/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc
new file mode 100644
index 000000000000..43b46bf940b1
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc
@@ -0,0 +1,258 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/debugging/internal/decode_rust_punycode.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+
+#include "absl/base/config.h"
+#include "absl/base/nullability.h"
+#include "absl/debugging/internal/bounded_utf8_length_sequence.h"
+#include "absl/debugging/internal/utf8_for_code_point.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+namespace {
+
+// Decoding Punycode requires repeated random-access insertion into a stream of
+// variable-length UTF-8 code-point encodings.  We need this to be tolerably
+// fast (no N^2 slowdown for unfortunate inputs), and we can't allocate any data
+// structures on the heap (async-signal-safety).
+//
+// It is pragmatic to impose a moderately low limit on the identifier length and
+// bail out if we ever hit it.  Then BoundedUtf8LengthSequence efficiently
+// determines where to insert the next code point, and memmove efficiently makes
+// room for it.
+//
+// The chosen limit is a round number several times larger than identifiers
+// expected in practice, yet still small enough that a memmove of this many
+// UTF-8 characters is not much more expensive than the division and modulus
+// operations that Punycode decoding requires.
+constexpr uint32_t kMaxChars = 256;
+
+// Constants from RFC 3492 section 5.
+constexpr uint32_t kBase = 36, kTMin = 1, kTMax = 26, kSkew = 38, kDamp = 700;
+
+constexpr uint32_t kMaxCodePoint = 0x10ffff;
+
+// Overflow threshold in DecodeRustPunycode's inner loop; see comments there.
+constexpr uint32_t kMaxI = 1 << 30;
+
+// If punycode_begin .. punycode_end begins with a prefix matching the regular
+// expression [0-9a-zA-Z_]+_, removes that prefix, copies all but the final
+// underscore into out_begin .. out_end, sets num_ascii_chars to the number of
+// bytes copied, and returns true.  (A prefix of this sort represents the
+// nonempty subsequence of ASCII characters in the corresponding plaintext.)
+//
+// If punycode_begin .. punycode_end does not contain an underscore, sets
+// num_ascii_chars to zero and returns true.  (The encoding of a plaintext
+// without any ASCII characters does not carry such a prefix.)
+//
+// Returns false and zeroes num_ascii_chars on failure (either parse error or
+// not enough space in the output buffer).
+bool ConsumeOptionalAsciiPrefix(const char*& punycode_begin,
+                                const char* const punycode_end,
+                                char* const out_begin,
+                                char* const out_end,
+                                uint32_t& num_ascii_chars) {
+  num_ascii_chars = 0;
+
+  // Remember the last underscore if any.  Also use the same string scan to
+  // reject any ASCII bytes that do not belong in an identifier, including NUL,
+  // as well as non-ASCII bytes, which should have been delta-encoded instead.
+  int last_underscore = -1;
+  for (int i = 0; i < punycode_end - punycode_begin; ++i) {
+    const char c = punycode_begin[i];
+    if (c == '_') {
+      last_underscore = i;
+      continue;
+    }
+    // We write out the meaning of absl::ascii_isalnum rather than call that
+    // function because its documentation does not promise it will remain
+    // async-signal-safe under future development.
+    if ('a' <= c && c <= 'z') continue;
+    if ('A' <= c && c <= 'Z') continue;
+    if ('0' <= c && c <= '9') continue;
+    return false;
+  }
+
+  // If there was no underscore, that means there were no ASCII characters in
+  // the plaintext, so there is no prefix to consume.  Our work is done.
+  if (last_underscore < 0) return true;
+
+  // Otherwise there will be an underscore delimiter somewhere.  It can't be
+  // initial because then there would be no ASCII characters to its left, and no
+  // delimiter would have been added in that case.
+  if (last_underscore == 0) return false;
+
+  // Any other position is reasonable.  Make sure there's room in the buffer.
+  if (last_underscore + 1 > out_end - out_begin) return false;
+
+  // Consume and write out the ASCII characters.
+  num_ascii_chars = static_cast<uint32_t>(last_underscore);
+  std::memcpy(out_begin, punycode_begin, num_ascii_chars);
+  out_begin[num_ascii_chars] = '\0';
+  punycode_begin += num_ascii_chars + 1;
+  return true;
+}
+
+// Returns the value of `c` as a base-36 digit according to RFC 3492 section 5,
+// or -1 if `c` is not such a digit.
+int DigitValue(char c) {
+  if ('0' <= c && c <= '9') return c - '0' + 26;
+  if ('a' <= c && c <= 'z') return c - 'a';
+  if ('A' <= c && c <= 'Z') return c - 'A';
+  return -1;
+}
+
+// Consumes the next delta encoding from punycode_begin .. punycode_end,
+// updating i accordingly.  Returns true on success.  Returns false on parse
+// failure or arithmetic overflow.
+bool ScanNextDelta(const char*& punycode_begin, const char* const punycode_end,
+                   uint32_t bias, uint32_t& i) {
+  uint64_t w = 1;  // 64 bits to prevent overflow in w *= kBase - t
+
+  // "for k = base to infinity in steps of base do begin ... end" in RFC 3492
+  // section 6.2.  Each loop iteration scans one digit of the delta.
+  for (uint32_t k = kBase; punycode_begin != punycode_end; k += kBase) {
+    const int digit_value = DigitValue(*punycode_begin++);
+    if (digit_value < 0) return false;
+
+    // Compute this in 64-bit arithmetic so we can check for overflow afterward.
+    const uint64_t new_i = i + static_cast<uint64_t>(digit_value) * w;
+
+    // Valid deltas are bounded by (#chars already emitted) * kMaxCodePoint, but
+    // invalid input could encode an arbitrarily large delta.  Nip that in the
+    // bud here.
+    static_assert(
+        kMaxI >= kMaxChars * kMaxCodePoint,
+        "kMaxI is too small to prevent spurious failures on good input");
+    if (new_i > kMaxI) return false;
+
+    static_assert(
+        kMaxI < (uint64_t{1} << 32),
+        "Make kMaxI smaller or i 64 bits wide to prevent silent wraparound");
+    i = static_cast<uint32_t>(new_i);
+
+    // Compute the threshold that determines whether this is the last digit and
+    // (if not) what the next digit's place value will be.  This logic from RFC
+    // 3492 section 6.2 is explained in section 3.3.
+    uint32_t t;
+    if (k <= bias + kTMin) {
+      t = kTMin;
+    } else if (k >= bias + kTMax) {
+      t = kTMax;
+    } else {
+      t = k - bias;
+    }
+    if (static_cast<uint32_t>(digit_value) < t) return true;
+
+    // If this gets too large, the range check on new_i in the next iteration
+    // will catch it.  We know this multiplication will not overwrap because w
+    // is 64 bits wide.
+    w *= kBase - t;
+  }
+  return false;
+}
+
+}  // namespace
+
+absl::Nullable<char*> DecodeRustPunycode(DecodeRustPunycodeOptions options) {
+  const char* punycode_begin = options.punycode_begin;
+  const char* const punycode_end = options.punycode_end;
+  char* const out_begin = options.out_begin;
+  char* const out_end = options.out_end;
+
+  // Write a NUL terminator first.  Later memcpy calls will keep bumping it
+  // along to its new right place.
+  const size_t out_size = static_cast<size_t>(out_end - out_begin);
+  if (out_size == 0) return nullptr;
+  *out_begin = '\0';
+
+  // RFC 3492 section 6.2 begins here.  We retain the names of integer variables
+  // appearing in that text.
+  uint32_t n = 128, i = 0, bias = 72, num_chars = 0;
+
+  // If there are any ASCII characters, consume them and their trailing
+  // underscore delimiter.
+  if (!ConsumeOptionalAsciiPrefix(punycode_begin, punycode_end,
+                                  out_begin, out_end, num_chars)) {
+    return nullptr;
+  }
+  uint32_t total_utf8_bytes = num_chars;
+
+  BoundedUtf8LengthSequence<kMaxChars> utf8_lengths;
+
+  // "while the input is not exhausted do begin ... end"
+  while (punycode_begin != punycode_end) {
+    if (num_chars >= kMaxChars) return nullptr;
+
+    const uint32_t old_i = i;
+
+    if (!ScanNextDelta(punycode_begin, punycode_end, bias, i)) return nullptr;
+
+    // Update bias as in RFC 3492 section 6.1.  (We have inlined adapt.)
+    uint32_t delta = i - old_i;
+    delta /= (old_i == 0 ? kDamp : 2);
+    delta += delta/(num_chars + 1);
+    bias = 0;
+    while (delta > ((kBase - kTMin) * kTMax)/2) {
+      delta /= kBase - kTMin;
+      bias += kBase;
+    }
+    bias += ((kBase - kTMin + 1) * delta)/(delta + kSkew);
+
+    // Back in section 6.2, compute the new code point and insertion index.
+    static_assert(
+        kMaxI + kMaxCodePoint < (uint64_t{1} << 32),
+        "Make kMaxI smaller or n 64 bits wide to prevent silent wraparound");
+    n += i/(num_chars + 1);
+    i %= num_chars + 1;
+
+    // To actually insert, we need to convert the code point n to UTF-8 and the
+    // character index i to an index into the byte stream emitted so far.  First
+    // prepare the UTF-8 encoding for n, rejecting surrogates, overlarge values,
+    // and anything that won't fit into the remaining output storage.
+    Utf8ForCodePoint utf8_for_code_point(n);
+    if (!utf8_for_code_point.ok()) return nullptr;
+    if (total_utf8_bytes + utf8_for_code_point.length + 1 > out_size) {
+      return nullptr;
+    }
+
+    // Now insert the new character into both our length map and the output.
+    uint32_t n_index =
+        utf8_lengths.InsertAndReturnSumOfPredecessors(
+            i, utf8_for_code_point.length);
+    std::memmove(
+        out_begin + n_index + utf8_for_code_point.length, out_begin + n_index,
+        total_utf8_bytes + 1 - n_index);
+    std::memcpy(out_begin + n_index, utf8_for_code_point.bytes,
+                utf8_for_code_point.length);
+    total_utf8_bytes += utf8_for_code_point.length;
+    ++num_chars;
+
+    // Finally, advance to the next state before continuing.
+    ++i;
+  }
+
+  return out_begin + total_utf8_bytes;
+}
+
+}  // namespace debugging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h b/contrib/restricted/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h
new file mode 100644
index 000000000000..0ae53ff31ec1
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h
@@ -0,0 +1,55 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_DEBUGGING_INTERNAL_DECODE_RUST_PUNYCODE_H_
+#define ABSL_DEBUGGING_INTERNAL_DECODE_RUST_PUNYCODE_H_
+
+#include "absl/base/config.h"
+#include "absl/base/nullability.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+struct DecodeRustPunycodeOptions {
+  const char* punycode_begin;
+  const char* punycode_end;
+  char* out_begin;
+  char* out_end;
+};
+
+// Given Rust Punycode in `punycode_begin .. punycode_end`, writes the
+// corresponding UTF-8 plaintext into `out_begin .. out_end`, followed by a NUL
+// character, and returns a pointer to that final NUL on success.  On failure
+// returns a null pointer, and the contents of `out_begin .. out_end` are
+// unspecified.
+//
+// Failure occurs in precisely these cases:
+//   - Any input byte does not match [0-9a-zA-Z_].
+//   - The first input byte is an underscore, but no other underscore appears in
+//     the input.
+//   - The delta sequence does not represent a valid sequence of code-point
+//     insertions.
+//   - The plaintext would contain more than 256 code points.
+//
+// DecodeRustPunycode is async-signal-safe with bounded runtime and a small
+// stack footprint, making it suitable for use in demangling Rust symbol names
+// from a signal handler.
+absl::Nullable<char*> DecodeRustPunycode(DecodeRustPunycodeOptions options);
+
+}  // namespace debugging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_DEBUGGING_INTERNAL_DECODE_RUST_PUNYCODE_H_
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc
index 381a2b504bae..caac76367f0c 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc
@@ -14,18 +14,19 @@
 
 // For reference check out:
 // https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling
-//
-// Note that we only have partial C++11 support yet.
 
 #include "absl/debugging/internal/demangle.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <limits>
 #include <string>
 
 #include "absl/base/config.h"
+#include "absl/debugging/internal/demangle_rust.h"
 
 #if ABSL_INTERNAL_HAS_CXA_DEMANGLE
 #include <cxxabi.h>
@@ -44,14 +45,16 @@ typedef struct {
 
 // List of operators from Itanium C++ ABI.
 static const AbbrevPair kOperatorList[] = {
-    // New has special syntax (not currently supported).
+    // New has special syntax.
     {"nw", "new", 0},
     {"na", "new[]", 0},
 
-    // Works except that the 'gs' prefix is not supported.
+    // Special-cased elsewhere to support the optional gs prefix.
     {"dl", "delete", 1},
     {"da", "delete[]", 1},
 
+    {"aw", "co_await", 1},
+
     {"ps", "+", 1},  // "positive"
     {"ng", "-", 1},  // "negative"
     {"ad", "&", 1},  // "address-of"
@@ -79,6 +82,7 @@ static const AbbrevPair kOperatorList[] = {
     {"rs", ">>", 2},
     {"lS", "<<=", 2},
     {"rS", ">>=", 2},
+    {"ss", "<=>", 2},
     {"eq", "==", 2},
     {"ne", "!=", 2},
     {"lt", "<", 2},
@@ -98,6 +102,7 @@ static const AbbrevPair kOperatorList[] = {
     {"qu", "?", 3},
     {"st", "sizeof", 0},  // Special syntax
     {"sz", "sizeof", 1},  // Not a real operator name, but used in expressions.
+    {"sZ", "sizeof...", 0},  // Special syntax
     {nullptr, nullptr, 0},
 };
 
@@ -187,9 +192,50 @@ typedef struct {
   int recursion_depth;        // For stack exhaustion prevention.
   int steps;               // Cap how much work we'll do, regardless of depth.
   ParseState parse_state;  // Backtrackable state copied for most frames.
+
+  // Conditionally compiled support for marking the position of the first
+  // construct Demangle couldn't parse.  This preprocessor symbol is intended
+  // for use by Abseil demangler maintainers only; its behavior is not part of
+  // Abseil's public interface.
+#ifdef ABSL_INTERNAL_DEMANGLE_RECORDS_HIGH_WATER_MARK
+  int high_water_mark;  // Input position where parsing failed.
+  bool too_complex;  // True if any guard.IsTooComplex() call returned true.
+#endif
 } State;
 
 namespace {
+
+#ifdef ABSL_INTERNAL_DEMANGLE_RECORDS_HIGH_WATER_MARK
+void UpdateHighWaterMark(State *state) {
+  if (state->high_water_mark < state->parse_state.mangled_idx) {
+    state->high_water_mark = state->parse_state.mangled_idx;
+  }
+}
+
+void ReportHighWaterMark(State *state) {
+  // Write out the mangled name with the trouble point marked, provided that the
+  // output buffer is large enough and the mangled name did not hit a complexity
+  // limit (in which case the high water mark wouldn't point out an unparsable
+  // construct, only the point where a budget ran out).
+  const size_t input_length = std::strlen(state->mangled_begin);
+  if (input_length + 6 > static_cast<size_t>(state->out_end_idx) ||
+      state->too_complex) {
+    if (state->out_end_idx > 0) state->out[0] = '\0';
+    return;
+  }
+  const size_t high_water_mark = static_cast<size_t>(state->high_water_mark);
+  std::memcpy(state->out, state->mangled_begin, high_water_mark);
+  std::memcpy(state->out + high_water_mark, "--!--", 5);
+  std::memcpy(state->out + high_water_mark + 5,
+              state->mangled_begin + high_water_mark,
+              input_length - high_water_mark);
+  state->out[input_length + 5] = '\0';
+}
+#else
+void UpdateHighWaterMark(State *) {}
+void ReportHighWaterMark(State *) {}
+#endif
+
 // Prevent deep recursion / stack exhaustion.
 // Also prevent unbounded handling of complex inputs.
 class ComplexityGuard {
@@ -201,7 +247,7 @@ class ComplexityGuard {
   ~ComplexityGuard() { --state_->recursion_depth; }
 
   // 256 levels of recursion seems like a reasonable upper limit on depth.
-  // 128 is not enough to demagle synthetic tests from demangle_unittest.txt:
+  // 128 is not enough to demangle synthetic tests from demangle_unittest.txt:
   // "_ZaaZZZZ..." and "_ZaaZcvZcvZ..."
   static constexpr int kRecursionDepthLimit = 256;
 
@@ -222,8 +268,14 @@ class ComplexityGuard {
   static constexpr int kParseStepsLimit = 1 << 17;
 
   bool IsTooComplex() const {
-    return state_->recursion_depth > kRecursionDepthLimit ||
-           state_->steps > kParseStepsLimit;
+    if (state_->recursion_depth > kRecursionDepthLimit ||
+        state_->steps > kParseStepsLimit) {
+#ifdef ABSL_INTERNAL_DEMANGLE_RECORDS_HIGH_WATER_MARK
+      state_->too_complex = true;
+#endif
+      return true;
+    }
+    return false;
   }
 
  private:
@@ -270,6 +322,10 @@ static void InitState(State* state,
   state->out_end_idx = static_cast<int>(out_size);
   state->recursion_depth = 0;
   state->steps = 0;
+#ifdef ABSL_INTERNAL_DEMANGLE_RECORDS_HIGH_WATER_MARK
+  state->high_water_mark = 0;
+  state->too_complex = false;
+#endif
 
   state->parse_state.mangled_idx = 0;
   state->parse_state.out_cur_idx = 0;
@@ -291,13 +347,14 @@ static bool ParseOneCharToken(State *state, const char one_char_token) {
   if (guard.IsTooComplex()) return false;
   if (RemainingInput(state)[0] == one_char_token) {
     ++state->parse_state.mangled_idx;
+    UpdateHighWaterMark(state);
     return true;
   }
   return false;
 }
 
-// Returns true and advances "mangled_cur" if we find "two_char_token"
-// at "mangled_cur" position.  It is assumed that "two_char_token" does
+// Returns true and advances "mangled_idx" if we find "two_char_token"
+// at "mangled_idx" position.  It is assumed that "two_char_token" does
 // not contain '\0'.
 static bool ParseTwoCharToken(State *state, const char *two_char_token) {
   ComplexityGuard guard(state);
@@ -305,11 +362,45 @@ static bool ParseTwoCharToken(State *state, const char *two_char_token) {
   if (RemainingInput(state)[0] == two_char_token[0] &&
       RemainingInput(state)[1] == two_char_token[1]) {
     state->parse_state.mangled_idx += 2;
+    UpdateHighWaterMark(state);
     return true;
   }
   return false;
 }
 
+// Returns true and advances "mangled_idx" if we find "three_char_token"
+// at "mangled_idx" position.  It is assumed that "three_char_token" does
+// not contain '\0'.
+static bool ParseThreeCharToken(State *state, const char *three_char_token) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  if (RemainingInput(state)[0] == three_char_token[0] &&
+      RemainingInput(state)[1] == three_char_token[1] &&
+      RemainingInput(state)[2] == three_char_token[2]) {
+    state->parse_state.mangled_idx += 3;
+    UpdateHighWaterMark(state);
+    return true;
+  }
+  return false;
+}
+
+// Returns true and advances "mangled_idx" if we find a copy of the
+// NUL-terminated string "long_token" at "mangled_idx" position.
+static bool ParseLongToken(State *state, const char *long_token) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  int i = 0;
+  for (; long_token[i] != '\0'; ++i) {
+    // Note that we cannot run off the end of the NUL-terminated input here.
+    // Inside the loop body, long_token[i] is known to be different from NUL.
+    // So if we read the NUL on the end of the input here, we return at once.
+    if (RemainingInput(state)[i] != long_token[i]) return false;
+  }
+  state->parse_state.mangled_idx += i;
+  UpdateHighWaterMark(state);
+  return true;
+}
+
 // Returns true and advances "mangled_cur" if we find any character in
 // "char_class" at "mangled_cur" position.
 static bool ParseCharClass(State *state, const char *char_class) {
@@ -322,6 +413,7 @@ static bool ParseCharClass(State *state, const char *char_class) {
   for (; *p != '\0'; ++p) {
     if (RemainingInput(state)[0] == *p) {
       ++state->parse_state.mangled_idx;
+      UpdateHighWaterMark(state);
       return true;
     }
   }
@@ -554,6 +646,7 @@ static bool ParseFloatNumber(State *state);
 static bool ParseSeqId(State *state);
 static bool ParseIdentifier(State *state, size_t length);
 static bool ParseOperatorName(State *state, int *arity);
+static bool ParseConversionOperatorType(State *state);
 static bool ParseSpecialName(State *state);
 static bool ParseCallOffset(State *state);
 static bool ParseNVOffset(State *state);
@@ -563,21 +656,33 @@ static bool ParseCtorDtorName(State *state);
 static bool ParseDecltype(State *state);
 static bool ParseType(State *state);
 static bool ParseCVQualifiers(State *state);
+static bool ParseExtendedQualifier(State *state);
 static bool ParseBuiltinType(State *state);
+static bool ParseVendorExtendedType(State *state);
 static bool ParseFunctionType(State *state);
 static bool ParseBareFunctionType(State *state);
+static bool ParseOverloadAttribute(State *state);
 static bool ParseClassEnumType(State *state);
 static bool ParseArrayType(State *state);
 static bool ParsePointerToMemberType(State *state);
 static bool ParseTemplateParam(State *state);
+static bool ParseTemplateParamDecl(State *state);
 static bool ParseTemplateTemplateParam(State *state);
 static bool ParseTemplateArgs(State *state);
 static bool ParseTemplateArg(State *state);
 static bool ParseBaseUnresolvedName(State *state);
 static bool ParseUnresolvedName(State *state);
+static bool ParseUnresolvedQualifierLevel(State *state);
+static bool ParseUnionSelector(State* state);
+static bool ParseFunctionParam(State* state);
+static bool ParseBracedExpression(State *state);
 static bool ParseExpression(State *state);
+static bool ParseInitializer(State *state);
 static bool ParseExprPrimary(State *state);
-static bool ParseExprCastValue(State *state);
+static bool ParseExprCastValueAndTrailingE(State *state);
+static bool ParseQRequiresClauseExpr(State *state);
+static bool ParseRequirement(State *state);
+static bool ParseTypeConstraint(State *state);
 static bool ParseLocalName(State *state);
 static bool ParseLocalNameSuffix(State *state);
 static bool ParseDiscriminator(State *state);
@@ -622,22 +727,34 @@ static bool ParseMangledName(State *state) {
 }
 
 // <encoding> ::= <(function) name> <bare-function-type>
+//                [`Q` <requires-clause expr>]
 //            ::= <(data) name>
 //            ::= <special-name>
+//
+// NOTE: Based on http://shortn/_Hoq9qG83rx
 static bool ParseEncoding(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
-  // Implementing the first two productions together as <name>
-  // [<bare-function-type>] avoids exponential blowup of backtracking.
+  // Since the first two productions both start with <name>, attempt
+  // to parse it only once to avoid exponential blowup of backtracking.
   //
-  // Since Optional(...) can't fail, there's no need to copy the state for
-  // backtracking.
-  if (ParseName(state) && Optional(ParseBareFunctionType(state))) {
+  // We're careful about exponential blowup because <encoding> recursively
+  // appears in other productions downstream of its first two productions,
+  // which means that every call to `ParseName` would possibly indirectly
+  // result in two calls to `ParseName` etc.
+  if (ParseName(state)) {
+    if (!ParseBareFunctionType(state)) {
+      return true;  // <(data) name>
+    }
+
+    // Parsed: <(function) name> <bare-function-type>
+    // Pending: [`Q` <requires-clause expr>]
+    ParseQRequiresClauseExpr(state);  // restores state on failure
     return true;
   }
 
   if (ParseSpecialName(state)) {
-    return true;
+    return true;  // <special-name>
   }
   return false;
 }
@@ -723,19 +840,26 @@ static bool ParseNestedName(State *state) {
 // <prefix> ::= <prefix> <unqualified-name>
 //          ::= <template-prefix> <template-args>
 //          ::= <template-param>
+//          ::= <decltype>
 //          ::= <substitution>
 //          ::= # empty
 // <template-prefix> ::= <prefix> <(template) unqualified-name>
 //                   ::= <template-param>
 //                   ::= <substitution>
+//                   ::= <vendor-extended-type>
 static bool ParsePrefix(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   bool has_something = false;
   while (true) {
     MaybeAppendSeparator(state);
-    if (ParseTemplateParam(state) ||
+    if (ParseTemplateParam(state) || ParseDecltype(state) ||
         ParseSubstitution(state, /*accept_std=*/true) ||
+        // Although the official grammar does not mention it, nested-names
+        // shaped like Nu14__some_builtinIiE6memberE occur in practice, and it
+        // is not clear what else a compiler is supposed to do when a
+        // vendor-extended type has named members.
+        ParseVendorExtendedType(state) ||
         ParseUnscopedName(state) ||
         (ParseOneCharToken(state, 'M') && ParseUnnamedTypeName(state))) {
       has_something = true;
@@ -757,8 +881,14 @@ static bool ParsePrefix(State *state) {
 //                    ::= <source-name> [<abi-tags>]
 //                    ::= <local-source-name> [<abi-tags>]
 //                    ::= <unnamed-type-name> [<abi-tags>]
+//                    ::= DC <source-name>+ E  # C++17 structured binding
+//                    ::= F <source-name>  # C++20 constrained friend
+//                    ::= F <operator-name>  # C++20 constrained friend
 //
 // <local-source-name> is a GCC extension; see below.
+//
+// For the F notation for constrained friends, see
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/24#issuecomment-1491130332.
 static bool ParseUnqualifiedName(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
@@ -767,6 +897,23 @@ static bool ParseUnqualifiedName(State *state) {
       ParseUnnamedTypeName(state)) {
     return ParseAbiTags(state);
   }
+
+  // DC <source-name>+ E
+  ParseState copy = state->parse_state;
+  if (ParseTwoCharToken(state, "DC") && OneOrMore(ParseSourceName, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // F <source-name>
+  // F <operator-name>
+  if (ParseOneCharToken(state, 'F') && MaybeAppend(state, "friend ") &&
+      (ParseSourceName(state) || ParseOperatorName(state, nullptr))) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
@@ -824,7 +971,11 @@ static bool ParseLocalSourceName(State *state) {
 // <unnamed-type-name> ::= Ut [<(nonnegative) number>] _
 //                     ::= <closure-type-name>
 // <closure-type-name> ::= Ul <lambda-sig> E [<(nonnegative) number>] _
-// <lambda-sig>        ::= <(parameter) type>+
+// <lambda-sig>        ::= <template-param-decl>* <(parameter) type>+
+//
+// For <template-param-decl>* in <lambda-sig> see:
+//
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/31
 static bool ParseUnnamedTypeName(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
@@ -847,6 +998,7 @@ static bool ParseUnnamedTypeName(State *state) {
   // Closure type.
   which = -1;
   if (ParseTwoCharToken(state, "Ul") && DisableAppend(state) &&
+      ZeroOrMore(ParseTemplateParamDecl, state) &&
       OneOrMore(ParseType, state) && RestoreAppend(state, copy.append) &&
       ParseOneCharToken(state, 'E') && Optional(ParseNumber(state, &which)) &&
       which <= std::numeric_limits<int>::max() - 2 &&  // Don't overflow.
@@ -888,6 +1040,7 @@ static bool ParseNumber(State *state, int *number_out) {
   }
   if (p != RemainingInput(state)) {  // Conversion succeeded.
     state->parse_state.mangled_idx += p - RemainingInput(state);
+    UpdateHighWaterMark(state);
     if (number_out != nullptr) {
       // Note: possibly truncate "number".
       *number_out = static_cast<int>(number);
@@ -910,6 +1063,7 @@ static bool ParseFloatNumber(State *state) {
   }
   if (p != RemainingInput(state)) {  // Conversion succeeded.
     state->parse_state.mangled_idx += p - RemainingInput(state);
+    UpdateHighWaterMark(state);
     return true;
   }
   return false;
@@ -928,6 +1082,7 @@ static bool ParseSeqId(State *state) {
   }
   if (p != RemainingInput(state)) {  // Conversion succeeded.
     state->parse_state.mangled_idx += p - RemainingInput(state);
+    UpdateHighWaterMark(state);
     return true;
   }
   return false;
@@ -946,11 +1101,13 @@ static bool ParseIdentifier(State *state, size_t length) {
     MaybeAppendWithLength(state, RemainingInput(state), length);
   }
   state->parse_state.mangled_idx += length;
+  UpdateHighWaterMark(state);
   return true;
 }
 
 // <operator-name> ::= nw, and other two letters cases
 //                 ::= cv <type>  # (cast)
+//                 ::= li <source-name>  # C++11 user-defined literal
 //                 ::= v  <digit> <source-name> # vendor extended operator
 static bool ParseOperatorName(State *state, int *arity) {
   ComplexityGuard guard(state);
@@ -961,7 +1118,7 @@ static bool ParseOperatorName(State *state, int *arity) {
   // First check with "cv" (cast) case.
   ParseState copy = state->parse_state;
   if (ParseTwoCharToken(state, "cv") && MaybeAppend(state, "operator ") &&
-      EnterNestedName(state) && ParseType(state) &&
+      EnterNestedName(state) && ParseConversionOperatorType(state) &&
       LeaveNestedName(state, copy.nest_level)) {
     if (arity != nullptr) {
       *arity = 1;
@@ -970,6 +1127,13 @@ static bool ParseOperatorName(State *state, int *arity) {
   }
   state->parse_state = copy;
 
+  // Then user-defined literals.
+  if (ParseTwoCharToken(state, "li") && MaybeAppend(state, "operator\"\" ") &&
+      ParseSourceName(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   // Then vendor extended operators.
   if (ParseOneCharToken(state, 'v') && ParseDigit(state, arity) &&
       ParseSourceName(state)) {
@@ -997,36 +1161,120 @@ static bool ParseOperatorName(State *state, int *arity) {
       }
       MaybeAppend(state, p->real_name);
       state->parse_state.mangled_idx += 2;
+      UpdateHighWaterMark(state);
       return true;
     }
   }
   return false;
 }
 
+// <operator-name> ::= cv <type>  # (cast)
+//
+// The name of a conversion operator is the one place where cv-qualifiers, *, &,
+// and other simple type combinators are expected to appear in our stripped-down
+// demangling (elsewhere they appear in function signatures or template
+// arguments, which we omit from the output).  We make reasonable efforts to
+// render simple cases accurately.
+static bool ParseConversionOperatorType(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  // Scan pointers, const, and other easy mangling prefixes with postfix
+  // demanglings.  Remember the range of input for later rescanning.
+  //
+  // See `ParseType` and the `switch` below for the meaning of each char.
+  const char* begin_simple_prefixes = RemainingInput(state);
+  while (ParseCharClass(state, "OPRCGrVK")) {}
+  const char* end_simple_prefixes = RemainingInput(state);
+
+  // Emit the base type first.
+  if (!ParseType(state)) {
+    state->parse_state = copy;
+    return false;
+  }
+
+  // Then rescan the easy type combinators in reverse order to emit their
+  // demanglings in the expected output order.
+  while (begin_simple_prefixes != end_simple_prefixes) {
+    switch (*--end_simple_prefixes) {
+      case 'P':
+        MaybeAppend(state, "*");
+        break;
+      case 'R':
+        MaybeAppend(state, "&");
+        break;
+      case 'O':
+        MaybeAppend(state, "&&");
+        break;
+      case 'C':
+        MaybeAppend(state, " _Complex");
+        break;
+      case 'G':
+        MaybeAppend(state, " _Imaginary");
+        break;
+      case 'r':
+        MaybeAppend(state, " restrict");
+        break;
+      case 'V':
+        MaybeAppend(state, " volatile");
+        break;
+      case 'K':
+        MaybeAppend(state, " const");
+        break;
+    }
+  }
+  return true;
+}
+
 // <special-name> ::= TV <type>
 //                ::= TT <type>
 //                ::= TI <type>
 //                ::= TS <type>
-//                ::= TH <type>  # thread-local
+//                ::= TW <name>  # thread-local wrapper
+//                ::= TH <name>  # thread-local initialization
 //                ::= Tc <call-offset> <call-offset> <(base) encoding>
 //                ::= GV <(object) name>
+//                ::= GR <(object) name> [<seq-id>] _
 //                ::= T <call-offset> <(base) encoding>
+//                ::= GTt <encoding>  # transaction-safe entry point
+//                ::= TA <template-arg>  # nontype template parameter object
 // G++ extensions:
 //                ::= TC <type> <(offset) number> _ <(base) type>
 //                ::= TF <type>
 //                ::= TJ <type>
-//                ::= GR <name>
+//                ::= GR <name>  # without final _, perhaps an earlier form?
 //                ::= GA <encoding>
 //                ::= Th <call-offset> <(base) encoding>
 //                ::= Tv <call-offset> <(base) encoding>
 //
-// Note: we don't care much about them since they don't appear in
-// stack traces.  The are special data.
+// Note: Most of these are special data, not functions that occur in stack
+// traces.  Exceptions are TW and TH, which denote functions supporting the
+// thread_local feature.  For these see:
+//
+// https://maskray.me/blog/2021-02-14-all-about-thread-local-storage
+//
+// For TA see https://github.com/itanium-cxx-abi/cxx-abi/issues/63.
 static bool ParseSpecialName(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
-  if (ParseOneCharToken(state, 'T') && ParseCharClass(state, "VTISH") &&
+
+  if (ParseTwoCharToken(state, "TW")) {
+    MaybeAppend(state, "thread-local wrapper routine for ");
+    if (ParseName(state)) return true;
+    state->parse_state = copy;
+    return false;
+  }
+
+  if (ParseTwoCharToken(state, "TH")) {
+    MaybeAppend(state, "thread-local initialization routine for ");
+    if (ParseName(state)) return true;
+    state->parse_state = copy;
+    return false;
+  }
+
+  if (ParseOneCharToken(state, 'T') && ParseCharClass(state, "VTIS") &&
       ParseType(state)) {
     return true;
   }
@@ -1064,21 +1312,51 @@ static bool ParseSpecialName(State *state) {
   }
   state->parse_state = copy;
 
-  if (ParseTwoCharToken(state, "GR") && ParseName(state)) {
+  // <special-name> ::= GR <(object) name> [<seq-id>] _  # modern standard
+  //                ::= GR <(object) name>  # also recognized
+  if (ParseTwoCharToken(state, "GR")) {
+    MaybeAppend(state, "reference temporary for ");
+    if (!ParseName(state)) {
+      state->parse_state = copy;
+      return false;
+    }
+    const bool has_seq_id = ParseSeqId(state);
+    const bool has_underscore = ParseOneCharToken(state, '_');
+    if (has_seq_id && !has_underscore) {
+      state->parse_state = copy;
+      return false;
+    }
     return true;
   }
-  state->parse_state = copy;
 
   if (ParseTwoCharToken(state, "GA") && ParseEncoding(state)) {
     return true;
   }
   state->parse_state = copy;
 
+  if (ParseThreeCharToken(state, "GTt") &&
+      MaybeAppend(state, "transaction clone for ") && ParseEncoding(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   if (ParseOneCharToken(state, 'T') && ParseCharClass(state, "hv") &&
       ParseCallOffset(state) && ParseEncoding(state)) {
     return true;
   }
   state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "TA")) {
+    bool append = state->parse_state.append;
+    DisableAppend(state);
+    if (ParseTemplateArg(state)) {
+      RestoreAppend(state, append);
+      MaybeAppend(state, "template parameter object");
+      return true;
+    }
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
@@ -1182,7 +1460,6 @@ static bool ParseDecltype(State *state) {
 //        ::= O <type>   # rvalue reference-to (C++0x)
 //        ::= C <type>   # complex pair (C 2000)
 //        ::= G <type>   # imaginary (C 2000)
-//        ::= U <source-name> <type>  # vendor extended type qualifier
 //        ::= <builtin-type>
 //        ::= <function-type>
 //        ::= <class-enum-type>  # note: just an alias for <name>
@@ -1193,7 +1470,9 @@ static bool ParseDecltype(State *state) {
 //        ::= <decltype>
 //        ::= <substitution>
 //        ::= Dp <type>          # pack expansion of (C++0x)
-//        ::= Dv <num-elems> _   # GNU vector extension
+//        ::= Dv <(elements) number> _ <type>  # GNU vector extension
+//        ::= Dv <(bytes) expression> _ <type>
+//        ::= Dk <type-constraint>  # constrained auto
 //
 static bool ParseType(State *state) {
   ComplexityGuard guard(state);
@@ -1236,12 +1515,6 @@ static bool ParseType(State *state) {
   }
   state->parse_state = copy;
 
-  if (ParseOneCharToken(state, 'U') && ParseSourceName(state) &&
-      ParseType(state)) {
-    return true;
-  }
-  state->parse_state = copy;
-
   if (ParseBuiltinType(state) || ParseFunctionType(state) ||
       ParseClassEnumType(state) || ParseArrayType(state) ||
       ParsePointerToMemberType(state) || ParseDecltype(state) ||
@@ -1260,54 +1533,160 @@ static bool ParseType(State *state) {
     return true;
   }
 
+  // GNU vector extension Dv <number> _ <type>
   if (ParseTwoCharToken(state, "Dv") && ParseNumber(state, nullptr) &&
-      ParseOneCharToken(state, '_')) {
+      ParseOneCharToken(state, '_') && ParseType(state)) {
     return true;
   }
   state->parse_state = copy;
 
-  return false;
+  // GNU vector extension Dv <expression> _ <type>
+  if (ParseTwoCharToken(state, "Dv") && ParseExpression(state) &&
+      ParseOneCharToken(state, '_') && ParseType(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Dk") && ParseTypeConstraint(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // For this notation see CXXNameMangler::mangleType in Clang's source code.
+  // The relevant logic and its comment "not clear how to mangle this!" date
+  // from 2011, so it may be with us awhile.
+  return ParseLongToken(state, "_SUBSTPACK_");
 }
 
+// <qualifiers> ::= <extended-qualifier>* <CV-qualifiers>
 // <CV-qualifiers> ::= [r] [V] [K]
+//
 // We don't allow empty <CV-qualifiers> to avoid infinite loop in
 // ParseType().
 static bool ParseCVQualifiers(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   int num_cv_qualifiers = 0;
+  while (ParseExtendedQualifier(state)) ++num_cv_qualifiers;
   num_cv_qualifiers += ParseOneCharToken(state, 'r');
   num_cv_qualifiers += ParseOneCharToken(state, 'V');
   num_cv_qualifiers += ParseOneCharToken(state, 'K');
   return num_cv_qualifiers > 0;
 }
 
+// <extended-qualifier> ::= U <source-name> [<template-args>]
+static bool ParseExtendedQualifier(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  if (!ParseOneCharToken(state, 'U')) return false;
+
+  bool append = state->parse_state.append;
+  DisableAppend(state);
+  if (!ParseSourceName(state)) {
+    state->parse_state = copy;
+    return false;
+  }
+  Optional(ParseTemplateArgs(state));
+  RestoreAppend(state, append);
+  return true;
+}
+
 // <builtin-type> ::= v, etc.  # single-character builtin types
-//                ::= u <source-name>
+//                ::= <vendor-extended-type>
 //                ::= Dd, etc.  # two-character builtin types
+//                ::= DB (<number> | <expression>) _  # _BitInt(N)
+//                ::= DU (<number> | <expression>) _  # unsigned _BitInt(N)
+//                ::= DF <number> _  # _FloatN (N bits)
+//                ::= DF <number> x  # _FloatNx
+//                ::= DF16b  # std::bfloat16_t
 //
 // Not supported:
-//                ::= DF <number> _ # _FloatN (N bits)
-//
+//                ::= [DS] DA <fixed-point-size>
+//                ::= [DS] DR <fixed-point-size>
+// because real implementations of N1169 fixed-point are scant.
 static bool ParseBuiltinType(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
-  const AbbrevPair *p;
-  for (p = kBuiltinTypeList; p->abbrev != nullptr; ++p) {
+  ParseState copy = state->parse_state;
+
+  // DB (<number> | <expression>) _  # _BitInt(N)
+  // DU (<number> | <expression>) _  # unsigned _BitInt(N)
+  if (ParseTwoCharToken(state, "DB") ||
+      (ParseTwoCharToken(state, "DU") && MaybeAppend(state, "unsigned "))) {
+    bool append = state->parse_state.append;
+    DisableAppend(state);
+    int number = -1;
+    if (!ParseNumber(state, &number) && !ParseExpression(state)) {
+      state->parse_state = copy;
+      return false;
+    }
+    RestoreAppend(state, append);
+
+    if (!ParseOneCharToken(state, '_')) {
+      state->parse_state = copy;
+      return false;
+    }
+
+    MaybeAppend(state, "_BitInt(");
+    if (number >= 0) {
+      MaybeAppendDecimal(state, number);
+    } else {
+      MaybeAppend(state, "?");  // the best we can do for dependent sizes
+    }
+    MaybeAppend(state, ")");
+    return true;
+  }
+
+  // DF <number> _  # _FloatN
+  // DF <number> x  # _FloatNx
+  // DF16b  # std::bfloat16_t
+  if (ParseTwoCharToken(state, "DF")) {
+    if (ParseThreeCharToken(state, "16b")) {
+      MaybeAppend(state, "std::bfloat16_t");
+      return true;
+    }
+    int number = 0;
+    if (!ParseNumber(state, &number)) {
+      state->parse_state = copy;
+      return false;
+    }
+    MaybeAppend(state, "_Float");
+    MaybeAppendDecimal(state, number);
+    if (ParseOneCharToken(state, 'x')) {
+      MaybeAppend(state, "x");
+      return true;
+    }
+    if (ParseOneCharToken(state, '_')) return true;
+    state->parse_state = copy;
+    return false;
+  }
+
+  for (const AbbrevPair *p = kBuiltinTypeList; p->abbrev != nullptr; ++p) {
     // Guaranteed only 1- or 2-character strings in kBuiltinTypeList.
     if (p->abbrev[1] == '\0') {
       if (ParseOneCharToken(state, p->abbrev[0])) {
         MaybeAppend(state, p->real_name);
-        return true;
+        return true;  // ::= v, etc.  # single-character builtin types
       }
     } else if (p->abbrev[2] == '\0' && ParseTwoCharToken(state, p->abbrev)) {
       MaybeAppend(state, p->real_name);
-      return true;
+      return true;  // ::= Dd, etc.  # two-character builtin types
     }
   }
 
+  return ParseVendorExtendedType(state);
+}
+
+// <vendor-extended-type> ::= u <source-name> [<template-args>]
+static bool ParseVendorExtendedType(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
   ParseState copy = state->parse_state;
-  if (ParseOneCharToken(state, 'u') && ParseSourceName(state)) {
+  if (ParseOneCharToken(state, 'u') && ParseSourceName(state) &&
+      Optional(ParseTemplateArgs(state))) {
     return true;
   }
   state->parse_state = copy;
@@ -1342,28 +1721,44 @@ static bool ParseExceptionSpec(State *state) {
   return false;
 }
 
-// <function-type> ::= [exception-spec] F [Y] <bare-function-type> [O] E
+// <function-type> ::=
+//     [exception-spec] [Dx] F [Y] <bare-function-type> [<ref-qualifier>] E
+//
+// <ref-qualifier> ::= R | O
 static bool ParseFunctionType(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
-  if (Optional(ParseExceptionSpec(state)) && ParseOneCharToken(state, 'F') &&
-      Optional(ParseOneCharToken(state, 'Y')) && ParseBareFunctionType(state) &&
-      Optional(ParseOneCharToken(state, 'O')) &&
-      ParseOneCharToken(state, 'E')) {
-    return true;
+  Optional(ParseExceptionSpec(state));
+  Optional(ParseTwoCharToken(state, "Dx"));
+  if (!ParseOneCharToken(state, 'F')) {
+    state->parse_state = copy;
+    return false;
   }
-  state->parse_state = copy;
-  return false;
+  Optional(ParseOneCharToken(state, 'Y'));
+  if (!ParseBareFunctionType(state)) {
+    state->parse_state = copy;
+    return false;
+  }
+  Optional(ParseCharClass(state, "RO"));
+  if (!ParseOneCharToken(state, 'E')) {
+    state->parse_state = copy;
+    return false;
+  }
+  return true;
 }
 
-// <bare-function-type> ::= <(signature) type>+
+// <bare-function-type> ::= <overload-attribute>* <(signature) type>+
+//
+// The <overload-attribute>* prefix is nonstandard; see the comment on
+// ParseOverloadAttribute.
 static bool ParseBareFunctionType(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
   DisableAppend(state);
-  if (OneOrMore(ParseType, state)) {
+  if (ZeroOrMore(ParseOverloadAttribute, state) &&
+      OneOrMore(ParseType, state)) {
     RestoreAppend(state, copy.append);
     MaybeAppend(state, "()");
     return true;
@@ -1372,11 +1767,43 @@ static bool ParseBareFunctionType(State *state) {
   return false;
 }
 
+// <overload-attribute> ::= Ua <name>
+//
+// The nonstandard <overload-attribute> production is sufficient to accept the
+// current implementation of __attribute__((enable_if(condition, "message")))
+// and future attributes of a similar shape.  See
+// https://clang.llvm.org/docs/AttributeReference.html#enable-if and the
+// definition of CXXNameMangler::mangleFunctionEncodingBareType in Clang's
+// source code.
+static bool ParseOverloadAttribute(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+  if (ParseTwoCharToken(state, "Ua") && ParseName(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+  return false;
+}
+
 // <class-enum-type> ::= <name>
+//                   ::= Ts <name>  # struct Name or class Name
+//                   ::= Tu <name>  # union Name
+//                   ::= Te <name>  # enum Name
+//
+// See http://shortn/_W3YrltiEd0.
 static bool ParseClassEnumType(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
-  return ParseName(state);
+  ParseState copy = state->parse_state;
+  if (Optional(ParseTwoCharToken(state, "Ts") ||
+               ParseTwoCharToken(state, "Tu") ||
+               ParseTwoCharToken(state, "Te")) &&
+      ParseName(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+  return false;
 }
 
 // <array-type> ::= A <(positive dimension) number> _ <(element) type>
@@ -1413,21 +1840,83 @@ static bool ParsePointerToMemberType(State *state) {
 
 // <template-param> ::= T_
 //                  ::= T <parameter-2 non-negative number> _
+//                  ::= TL <level-1> __
+//                  ::= TL <level-1> _ <parameter-2 non-negative number> _
 static bool ParseTemplateParam(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   if (ParseTwoCharToken(state, "T_")) {
     MaybeAppend(state, "?");  // We don't support template substitutions.
-    return true;
+    return true;              // ::= T_
   }
 
   ParseState copy = state->parse_state;
   if (ParseOneCharToken(state, 'T') && ParseNumber(state, nullptr) &&
       ParseOneCharToken(state, '_')) {
     MaybeAppend(state, "?");  // We don't support template substitutions.
+    return true;              // ::= T <parameter-2 non-negative number> _
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "TL") && ParseNumber(state, nullptr)) {
+    if (ParseTwoCharToken(state, "__")) {
+      MaybeAppend(state, "?");  // We don't support template substitutions.
+      return true;              // ::= TL <level-1> __
+    }
+
+    if (ParseOneCharToken(state, '_') && ParseNumber(state, nullptr) &&
+        ParseOneCharToken(state, '_')) {
+      MaybeAppend(state, "?");  // We don't support template substitutions.
+      return true;  // ::= TL <level-1> _ <parameter-2 non-negative number> _
+    }
+  }
+  state->parse_state = copy;
+  return false;
+}
+
+// <template-param-decl>
+//   ::= Ty                                  # template type parameter
+//   ::= Tk <concept name> [<template-args>] # constrained type parameter
+//   ::= Tn <type>                           # template non-type parameter
+//   ::= Tt <template-param-decl>* E         # template template parameter
+//   ::= Tp <template-param-decl>            # template parameter pack
+//
+// NOTE: <concept name> is just a <name>: http://shortn/_MqJVyr0fc1
+// TODO(b/324066279): Implement optional suffix for `Tt`:
+// [Q <requires-clause expr>]
+static bool ParseTemplateParamDecl(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  if (ParseTwoCharToken(state, "Ty")) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Tk") && ParseName(state) &&
+      Optional(ParseTemplateArgs(state))) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Tn") && ParseType(state)) {
     return true;
   }
   state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Tt") &&
+      ZeroOrMore(ParseTemplateParamDecl, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Tp") && ParseTemplateParamDecl(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
@@ -1441,13 +1930,14 @@ static bool ParseTemplateTemplateParam(State *state) {
           ParseSubstitution(state, /*accept_std=*/false));
 }
 
-// <template-args> ::= I <template-arg>+ E
+// <template-args> ::= I <template-arg>+ [Q <requires-clause expr>] E
 static bool ParseTemplateArgs(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
   DisableAppend(state);
   if (ParseOneCharToken(state, 'I') && OneOrMore(ParseTemplateArg, state) &&
+      Optional(ParseQRequiresClauseExpr(state)) &&
       ParseOneCharToken(state, 'E')) {
     RestoreAppend(state, copy.append);
     MaybeAppend(state, "<>");
@@ -1457,7 +1947,8 @@ static bool ParseTemplateArgs(State *state) {
   return false;
 }
 
-// <template-arg>  ::= <type>
+// <template-arg>  ::= <template-param-decl> <template-arg>
+//                 ::= <type>
 //                 ::= <expr-primary>
 //                 ::= J <template-arg>* E        # argument pack
 //                 ::= X <expression> E
@@ -1541,7 +2032,7 @@ static bool ParseTemplateArg(State *state) {
   //     ::= L <source-name> [<template-args>] [<expr-cast-value> E]
   if (ParseLocalSourceName(state) && Optional(ParseTemplateArgs(state))) {
     copy = state->parse_state;
-    if (ParseExprCastValue(state) && ParseOneCharToken(state, 'E')) {
+    if (ParseExprCastValueAndTrailingE(state)) {
       return true;
     }
     state->parse_state = copy;
@@ -1560,6 +2051,12 @@ static bool ParseTemplateArg(State *state) {
     return true;
   }
   state->parse_state = copy;
+
+  if (ParseTemplateParamDecl(state) && ParseTemplateArg(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
@@ -1614,6 +2111,13 @@ static bool ParseBaseUnresolvedName(State *state) {
 //                         <base-unresolved-name>
 //                   ::= [gs] sr <unresolved-qualifier-level>+ E
 //                         <base-unresolved-name>
+//                   ::= sr St <simple-id> <simple-id>  # nonstandard
+//
+// The last case is not part of the official grammar but has been observed in
+// real-world examples that the GNU demangler (but not the LLVM demangler) is
+// able to decode; see demangle_test.cc for one such symbol name.  The shape
+// sr St <simple-id> <simple-id> was inferred by closed-box testing of the GNU
+// demangler.
 static bool ParseUnresolvedName(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
@@ -1633,7 +2137,7 @@ static bool ParseUnresolvedName(State *state) {
 
   if (ParseTwoCharToken(state, "sr") && ParseOneCharToken(state, 'N') &&
       ParseUnresolvedType(state) &&
-      OneOrMore(/* <unresolved-qualifier-level> ::= */ ParseSimpleId, state) &&
+      OneOrMore(ParseUnresolvedQualifierLevel, state) &&
       ParseOneCharToken(state, 'E') && ParseBaseUnresolvedName(state)) {
     return true;
   }
@@ -1641,35 +2145,160 @@ static bool ParseUnresolvedName(State *state) {
 
   if (Optional(ParseTwoCharToken(state, "gs")) &&
       ParseTwoCharToken(state, "sr") &&
-      OneOrMore(/* <unresolved-qualifier-level> ::= */ ParseSimpleId, state) &&
+      OneOrMore(ParseUnresolvedQualifierLevel, state) &&
       ParseOneCharToken(state, 'E') && ParseBaseUnresolvedName(state)) {
     return true;
   }
   state->parse_state = copy;
 
+  if (ParseTwoCharToken(state, "sr") && ParseTwoCharToken(state, "St") &&
+      ParseSimpleId(state) && ParseSimpleId(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
+// <unresolved-qualifier-level> ::= <simple-id>
+//                              ::= <substitution> <template-args>
+//
+// The production <substitution> <template-args> is nonstandard but is observed
+// in practice.  An upstream discussion on the best shape of <unresolved-name>
+// has not converged:
+//
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/38
+static bool ParseUnresolvedQualifierLevel(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
+  if (ParseSimpleId(state)) return true;
+
+  ParseState copy = state->parse_state;
+  if (ParseSubstitution(state, /*accept_std=*/false) &&
+      ParseTemplateArgs(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+  return false;
+}
+
+// <union-selector> ::= _ [<number>]
+//
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/47
+static bool ParseUnionSelector(State *state) {
+  return ParseOneCharToken(state, '_') && Optional(ParseNumber(state, nullptr));
+}
+
+// <function-param> ::= fp <(top-level) CV-qualifiers> _
+//                  ::= fp <(top-level) CV-qualifiers> <number> _
+//                  ::= fL <number> p <(top-level) CV-qualifiers> _
+//                  ::= fL <number> p <(top-level) CV-qualifiers> <number> _
+//                  ::= fpT  # this
+static bool ParseFunctionParam(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
+  ParseState copy = state->parse_state;
+
+  // Function-param expression (level 0).
+  if (ParseTwoCharToken(state, "fp") && Optional(ParseCVQualifiers(state)) &&
+      Optional(ParseNumber(state, nullptr)) && ParseOneCharToken(state, '_')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // Function-param expression (level 1+).
+  if (ParseTwoCharToken(state, "fL") && Optional(ParseNumber(state, nullptr)) &&
+      ParseOneCharToken(state, 'p') && Optional(ParseCVQualifiers(state)) &&
+      Optional(ParseNumber(state, nullptr)) && ParseOneCharToken(state, '_')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  return ParseThreeCharToken(state, "fpT");
+}
+
+// <braced-expression> ::= <expression>
+//                     ::= di <field source-name> <braced-expression>
+//                     ::= dx <index expression> <braced-expression>
+//                     ::= dX <expression> <expression> <braced-expression>
+static bool ParseBracedExpression(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
+  ParseState copy = state->parse_state;
+
+  if (ParseTwoCharToken(state, "di") && ParseSourceName(state) &&
+      ParseBracedExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "dx") && ParseExpression(state) &&
+      ParseBracedExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "dX") &&
+      ParseExpression(state) && ParseExpression(state) &&
+      ParseBracedExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  return ParseExpression(state);
+}
+
 // <expression> ::= <1-ary operator-name> <expression>
 //              ::= <2-ary operator-name> <expression> <expression>
 //              ::= <3-ary operator-name> <expression> <expression> <expression>
+//              ::= pp_ <expression>  # ++e; pp <expression> is e++
+//              ::= mm_ <expression>  # --e; mm <expression> is e--
 //              ::= cl <expression>+ E
 //              ::= cp <simple-id> <expression>* E # Clang-specific.
+//              ::= so <type> <expression> [<number>] <union-selector>* [p] E
 //              ::= cv <type> <expression>      # type (expression)
 //              ::= cv <type> _ <expression>* E # type (expr-list)
+//              ::= tl <type> <braced-expression>* E
+//              ::= il <braced-expression>* E
+//              ::= [gs] nw <expression>* _ <type> E
+//              ::= [gs] nw <expression>* _ <type> <initializer>
+//              ::= [gs] na <expression>* _ <type> E
+//              ::= [gs] na <expression>* _ <type> <initializer>
+//              ::= [gs] dl <expression>
+//              ::= [gs] da <expression>
+//              ::= dc <type> <expression>
+//              ::= sc <type> <expression>
+//              ::= cc <type> <expression>
+//              ::= rc <type> <expression>
+//              ::= ti <type>
+//              ::= te <expression>
 //              ::= st <type>
+//              ::= at <type>
+//              ::= az <expression>
+//              ::= nx <expression>
 //              ::= <template-param>
 //              ::= <function-param>
+//              ::= sZ <template-param>
+//              ::= sZ <function-param>
+//              ::= sP <template-arg>* E
 //              ::= <expr-primary>
 //              ::= dt <expression> <unresolved-name> # expr.name
 //              ::= pt <expression> <unresolved-name> # expr->name
 //              ::= sp <expression>         # argument pack expansion
+//              ::= fl <binary operator-name> <expression>
+//              ::= fr <binary operator-name> <expression>
+//              ::= fL <binary operator-name> <expression> <expression>
+//              ::= fR <binary operator-name> <expression> <expression>
+//              ::= tw <expression>
+//              ::= tr
 //              ::= sr <type> <unqualified-name> <template-args>
 //              ::= sr <type> <unqualified-name>
-// <function-param> ::= fp <(top-level) CV-qualifiers> _
-//                  ::= fp <(top-level) CV-qualifiers> <number> _
-//                  ::= fL <number> p <(top-level) CV-qualifiers> _
-//                  ::= fL <number> p <(top-level) CV-qualifiers> <number> _
+//              ::= u <source-name> <template-arg>* E  # vendor extension
+//              ::= rq <requirement>+ E
+//              ::= rQ <bare-function-type> _ <requirement>+ E
 static bool ParseExpression(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
@@ -1686,6 +2315,15 @@ static bool ParseExpression(State *state) {
   }
   state->parse_state = copy;
 
+  // Preincrement and predecrement.  Postincrement and postdecrement are handled
+  // by the operator-name logic later on.
+  if ((ParseThreeCharToken(state, "pp_") ||
+       ParseThreeCharToken(state, "mm_")) &&
+      ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   // Clang-specific "cp <simple-id> <expression>* E"
   //   https://clang.llvm.org/doxygen/ItaniumMangle_8cpp_source.html#l04338
   if (ParseTwoCharToken(state, "cp") && ParseSimpleId(state) &&
@@ -1694,17 +2332,65 @@ static bool ParseExpression(State *state) {
   }
   state->parse_state = copy;
 
-  // Function-param expression (level 0).
-  if (ParseTwoCharToken(state, "fp") && Optional(ParseCVQualifiers(state)) &&
-      Optional(ParseNumber(state, nullptr)) && ParseOneCharToken(state, '_')) {
+  // <expression> ::= so <type> <expression> [<number>] <union-selector>* [p] E
+  //
+  // https://github.com/itanium-cxx-abi/cxx-abi/issues/47
+  if (ParseTwoCharToken(state, "so") && ParseType(state) &&
+      ParseExpression(state) && Optional(ParseNumber(state, nullptr)) &&
+      ZeroOrMore(ParseUnionSelector, state) &&
+      Optional(ParseOneCharToken(state, 'p')) &&
+      ParseOneCharToken(state, 'E')) {
     return true;
   }
   state->parse_state = copy;
 
-  // Function-param expression (level 1+).
-  if (ParseTwoCharToken(state, "fL") && Optional(ParseNumber(state, nullptr)) &&
-      ParseOneCharToken(state, 'p') && Optional(ParseCVQualifiers(state)) &&
-      Optional(ParseNumber(state, nullptr)) && ParseOneCharToken(state, '_')) {
+  // <expression> ::= <function-param>
+  if (ParseFunctionParam(state)) return true;
+  state->parse_state = copy;
+
+  // <expression> ::= tl <type> <braced-expression>* E
+  if (ParseTwoCharToken(state, "tl") && ParseType(state) &&
+      ZeroOrMore(ParseBracedExpression, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= il <braced-expression>* E
+  if (ParseTwoCharToken(state, "il") &&
+      ZeroOrMore(ParseBracedExpression, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= [gs] nw <expression>* _ <type> E
+  //              ::= [gs] nw <expression>* _ <type> <initializer>
+  //              ::= [gs] na <expression>* _ <type> E
+  //              ::= [gs] na <expression>* _ <type> <initializer>
+  if (Optional(ParseTwoCharToken(state, "gs")) &&
+      (ParseTwoCharToken(state, "nw") || ParseTwoCharToken(state, "na")) &&
+      ZeroOrMore(ParseExpression, state) && ParseOneCharToken(state, '_') &&
+      ParseType(state) &&
+      (ParseOneCharToken(state, 'E') || ParseInitializer(state))) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= [gs] dl <expression>
+  //              ::= [gs] da <expression>
+  if (Optional(ParseTwoCharToken(state, "gs")) &&
+      (ParseTwoCharToken(state, "dl") || ParseTwoCharToken(state, "da")) &&
+      ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // dynamic_cast, static_cast, const_cast, reinterpret_cast.
+  //
+  // <expression> ::= (dc | sc | cc | rc) <type> <expression>
+  if (ParseCharClass(state, "dscr") && ParseOneCharToken(state, 'c') &&
+      ParseType(state) && ParseExpression(state)) {
     return true;
   }
   state->parse_state = copy;
@@ -1746,15 +2432,96 @@ static bool ParseExpression(State *state) {
   }
   state->parse_state = copy;
 
+  // typeid(type)
+  if (ParseTwoCharToken(state, "ti") && ParseType(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // typeid(expression)
+  if (ParseTwoCharToken(state, "te") && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   // sizeof type
   if (ParseTwoCharToken(state, "st") && ParseType(state)) {
     return true;
   }
   state->parse_state = copy;
 
+  // alignof(type)
+  if (ParseTwoCharToken(state, "at") && ParseType(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // alignof(expression), a GNU extension
+  if (ParseTwoCharToken(state, "az") && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // noexcept(expression) appearing as an expression in a dependent signature
+  if (ParseTwoCharToken(state, "nx") && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // sizeof...(pack)
+  //
+  // <expression> ::= sZ <template-param>
+  //              ::= sZ <function-param>
+  if (ParseTwoCharToken(state, "sZ") &&
+      (ParseFunctionParam(state) || ParseTemplateParam(state))) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // sizeof...(pack) captured from an alias template
+  //
+  // <expression> ::= sP <template-arg>* E
+  if (ParseTwoCharToken(state, "sP") && ZeroOrMore(ParseTemplateArg, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // Unary folds (... op pack) and (pack op ...).
+  //
+  // <expression> ::= fl <binary operator-name> <expression>
+  //              ::= fr <binary operator-name> <expression>
+  if ((ParseTwoCharToken(state, "fl") || ParseTwoCharToken(state, "fr")) &&
+      ParseOperatorName(state, nullptr) && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // Binary folds (init op ... op pack) and (pack op ... op init).
+  //
+  // <expression> ::= fL <binary operator-name> <expression> <expression>
+  //              ::= fR <binary operator-name> <expression> <expression>
+  if ((ParseTwoCharToken(state, "fL") || ParseTwoCharToken(state, "fR")) &&
+      ParseOperatorName(state, nullptr) && ParseExpression(state) &&
+      ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // tw <expression>: throw e
+  if (ParseTwoCharToken(state, "tw") && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // tr: throw (rethrows an exception from the handler that caught it)
+  if (ParseTwoCharToken(state, "tr")) return true;
+
   // Object and pointer member access expressions.
+  //
+  // <expression> ::= (dt | pt) <expression> <unresolved-name>
   if ((ParseTwoCharToken(state, "dt") || ParseTwoCharToken(state, "pt")) &&
-      ParseExpression(state) && ParseType(state)) {
+      ParseExpression(state) && ParseUnresolvedName(state)) {
     return true;
   }
   state->parse_state = copy;
@@ -1774,9 +2541,61 @@ static bool ParseExpression(State *state) {
   }
   state->parse_state = copy;
 
+  // Vendor extended expressions
+  if (ParseOneCharToken(state, 'u') && ParseSourceName(state) &&
+      ZeroOrMore(ParseTemplateArg, state) && ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= rq <requirement>+ E
+  //
+  // https://github.com/itanium-cxx-abi/cxx-abi/issues/24
+  if (ParseTwoCharToken(state, "rq") && OneOrMore(ParseRequirement, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= rQ <bare-function-type> _ <requirement>+ E
+  //
+  // https://github.com/itanium-cxx-abi/cxx-abi/issues/24
+  if (ParseTwoCharToken(state, "rQ") && ParseBareFunctionType(state) &&
+      ParseOneCharToken(state, '_') && OneOrMore(ParseRequirement, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return ParseUnresolvedName(state);
 }
 
+// <initializer> ::= pi <expression>* E
+//               ::= il <braced-expression>* E
+//
+// The il ... E form is not in the ABI spec but is seen in practice for
+// braced-init-lists in new-expressions, which are standard syntax from C++11
+// on.
+static bool ParseInitializer(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  if (ParseTwoCharToken(state, "pi") && ZeroOrMore(ParseExpression, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "il") &&
+      ZeroOrMore(ParseBracedExpression, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+  return false;
+}
+
 // <expr-primary> ::= L <type> <(value) number> E
 //                ::= L <type> <(value) float> E
 //                ::= L <mangled-name> E
@@ -1819,10 +2638,35 @@ static bool ParseExprPrimary(State *state) {
     return false;
   }
 
-  // The merged cast production.
-  if (ParseOneCharToken(state, 'L') && ParseType(state) &&
-      ParseExprCastValue(state)) {
-    return true;
+  if (ParseOneCharToken(state, 'L')) {
+    // There are two special cases in which a literal may or must contain a type
+    // without a value.  The first is that both LDnE and LDn0E are valid
+    // encodings of nullptr, used in different situations.  Recognize LDnE here,
+    // leaving LDn0E to be recognized by the general logic afterward.
+    if (ParseThreeCharToken(state, "DnE")) return true;
+
+    // The second special case is a string literal, currently mangled in C++98
+    // style as LA<length + 1>_KcE.  This is inadequate to support C++11 and
+    // later versions, and the discussion of this problem has not converged.
+    //
+    // https://github.com/itanium-cxx-abi/cxx-abi/issues/64
+    //
+    // For now the bare-type mangling is what's used in practice, so we
+    // recognize this form and only this form if an array type appears here.
+    // Someday we'll probably have to accept a new form of value mangling in
+    // LA...E constructs.  (Note also that C++20 allows a wide range of
+    // class-type objects as template arguments, so someday their values will be
+    // mangled and we'll have to recognize them here too.)
+    if (RemainingInput(state)[0] == 'A' /* an array type follows */) {
+      if (ParseType(state) && ParseOneCharToken(state, 'E')) return true;
+      state->parse_state = copy;
+      return false;
+    }
+
+    // The merged cast production.
+    if (ParseType(state) && ParseExprCastValueAndTrailingE(state)) {
+      return true;
+    }
   }
   state->parse_state = copy;
 
@@ -1836,7 +2680,7 @@ static bool ParseExprPrimary(State *state) {
 }
 
 // <number> or <float>, followed by 'E', as described above ParseExprPrimary.
-static bool ParseExprCastValue(State *state) {
+static bool ParseExprCastValueAndTrailingE(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   // We have to be able to backtrack after accepting a number because we could
@@ -1848,39 +2692,148 @@ static bool ParseExprCastValue(State *state) {
   }
   state->parse_state = copy;
 
-  if (ParseFloatNumber(state) && ParseOneCharToken(state, 'E')) {
+  if (ParseFloatNumber(state)) {
+    // <float> for ordinary floating-point types
+    if (ParseOneCharToken(state, 'E')) return true;
+
+    // <float> _ <float> for complex floating-point types
+    if (ParseOneCharToken(state, '_') && ParseFloatNumber(state) &&
+        ParseOneCharToken(state, 'E')) {
+      return true;
+    }
+  }
+  state->parse_state = copy;
+
+  return false;
+}
+
+// Parses `Q <requires-clause expr>`.
+// If parsing fails, applies backtracking to `state`.
+//
+// This function covers two symbols instead of one for convenience,
+// because in LLVM's Itanium ABI mangling grammar, <requires-clause expr>
+// always appears after Q.
+//
+// Does not emit the parsed `requires` clause to simplify the implementation.
+// In other words, these two functions' mangled names will demangle identically:
+//
+// template <typename T>
+// int foo(T) requires IsIntegral<T>;
+//
+// vs.
+//
+// template <typename T>
+// int foo(T);
+static bool ParseQRequiresClauseExpr(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+  DisableAppend(state);
+
+  // <requires-clause expr> is just an <expression>: http://shortn/_9E1Ul0rIM8
+  if (ParseOneCharToken(state, 'Q') && ParseExpression(state)) {
+    RestoreAppend(state, copy.append);
+    return true;
+  }
+
+  // also restores append
+  state->parse_state = copy;
+  return false;
+}
+
+// <requirement> ::= X <expression> [N] [R <type-constraint>]
+// <requirement> ::= T <type>
+// <requirement> ::= Q <constraint-expression>
+//
+// <constraint-expression> ::= <expression>
+//
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/24
+static bool ParseRequirement(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
+  ParseState copy = state->parse_state;
+
+  if (ParseOneCharToken(state, 'X') && ParseExpression(state) &&
+      Optional(ParseOneCharToken(state, 'N')) &&
+      // This logic backtracks cleanly if we eat an R but a valid type doesn't
+      // follow it.
+      (!ParseOneCharToken(state, 'R') || ParseTypeConstraint(state))) {
     return true;
   }
   state->parse_state = copy;
 
+  if (ParseOneCharToken(state, 'T') && ParseType(state)) return true;
+  state->parse_state = copy;
+
+  if (ParseOneCharToken(state, 'Q') && ParseExpression(state)) return true;
+  state->parse_state = copy;
+
   return false;
 }
 
+// <type-constraint> ::= <name>
+static bool ParseTypeConstraint(State *state) {
+  return ParseName(state);
+}
+
 // <local-name> ::= Z <(function) encoding> E <(entity) name> [<discriminator>]
 //              ::= Z <(function) encoding> E s [<discriminator>]
+//              ::= Z <(function) encoding> E d [<(parameter) number>] _ <name>
 //
 // Parsing a common prefix of these two productions together avoids an
 // exponential blowup of backtracking.  Parse like:
 //   <local-name> := Z <encoding> E <local-name-suffix>
 //   <local-name-suffix> ::= s [<discriminator>]
+//                       ::= d [<(parameter) number>] _ <name>
 //                       ::= <name> [<discriminator>]
 
 static bool ParseLocalNameSuffix(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  // <local-name-suffix> ::= d [<(parameter) number>] _ <name>
+  if (ParseOneCharToken(state, 'd') &&
+      (IsDigit(RemainingInput(state)[0]) || RemainingInput(state)[0] == '_')) {
+    int number = -1;
+    Optional(ParseNumber(state, &number));
+    if (number < -1 || number > 2147483645) {
+      // Work around overflow cases.  We do not expect these outside of a fuzzer
+      // or other source of adversarial input.  If we do detect overflow here,
+      // we'll print {default arg#1}.
+      number = -1;
+    }
+    number += 2;
+
+    // The ::{default arg#1}:: infix must be rendered before the lambda itself,
+    // so print this before parsing the rest of the <local-name-suffix>.
+    MaybeAppend(state, "::{default arg#");
+    MaybeAppendDecimal(state, number);
+    MaybeAppend(state, "}::");
+    if (ParseOneCharToken(state, '_') && ParseName(state)) return true;
+
+    // On late parse failure, roll back not only the input but also the output,
+    // whose trailing NUL was overwritten.
+    state->parse_state = copy;
+    if (state->parse_state.append) {
+      state->out[state->parse_state.out_cur_idx] = '\0';
+    }
+    return false;
+  }
+  state->parse_state = copy;
 
+  // <local-name-suffix> ::= <name> [<discriminator>]
   if (MaybeAppend(state, "::") && ParseName(state) &&
       Optional(ParseDiscriminator(state))) {
     return true;
   }
-
-  // Since we're not going to overwrite the above "::" by re-parsing the
-  // <encoding> (whose trailing '\0' byte was in the byte now holding the
-  // first ':'), we have to rollback the "::" if the <name> parse failed.
+  state->parse_state = copy;
   if (state->parse_state.append) {
-    state->out[state->parse_state.out_cur_idx - 2] = '\0';
+    state->out[state->parse_state.out_cur_idx] = '\0';
   }
 
+  // <local-name-suffix> ::= s [<discriminator>]
   return ParseOneCharToken(state, 's') && Optional(ParseDiscriminator(state));
 }
 
@@ -1896,12 +2849,22 @@ static bool ParseLocalName(State *state) {
   return false;
 }
 
-// <discriminator> := _ <(non-negative) number>
+// <discriminator> := _ <digit>
+//                 := __ <number (>= 10)> _
 static bool ParseDiscriminator(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
-  if (ParseOneCharToken(state, '_') && ParseNumber(state, nullptr)) {
+
+  // Both forms start with _ so parse that first.
+  if (!ParseOneCharToken(state, '_')) return false;
+
+  // <digit>
+  if (ParseDigit(state, nullptr)) return true;
+
+  // _ <number> _
+  if (ParseOneCharToken(state, '_') && ParseNumber(state, nullptr) &&
+      ParseOneCharToken(state, '_')) {
     return true;
   }
   state->parse_state = copy;
@@ -1947,6 +2910,7 @@ static bool ParseSubstitution(State *state, bool accept_std) {
           MaybeAppend(state, p->real_name);
         }
         ++state->parse_state.mangled_idx;
+        UpdateHighWaterMark(state);
         return true;
       }
     }
@@ -1972,10 +2936,13 @@ static bool ParseTopLevelMangledName(State *state) {
         MaybeAppend(state, RemainingInput(state));
         return true;
       }
+      ReportHighWaterMark(state);
       return false;  // Unconsumed suffix.
     }
     return true;
   }
+
+  ReportHighWaterMark(state);
   return false;
 }
 
@@ -1985,6 +2952,10 @@ static bool Overflowed(const State *state) {
 
 // The demangler entry point.
 bool Demangle(const char* mangled, char* out, size_t out_size) {
+  if (mangled[0] == '_' && mangled[1] == 'R') {
+    return DemangleRustSymbolEncoding(mangled, out, out_size);
+  }
+
   State state;
   InitState(&state, mangled, out, out_size);
   return ParseTopLevelMangledName(&state) && !Overflowed(&state) &&
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.h b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.h
index 146d1150efec..cb0aba13e558 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.h
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.h
@@ -56,6 +56,9 @@ namespace debugging_internal {
 //
 // See the unit test for more examples.
 //
+// Demangle also recognizes Rust mangled names by delegating the parsing of
+// anything that starts with _R to DemangleRustSymbolEncoding (demangle_rust.h).
+//
 // Note: we might want to write demanglers for ABIs other than Itanium
 // C++ ABI in the future.
 bool Demangle(const char* mangled, char* out, size_t out_size);
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle_rust.cc b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle_rust.cc
new file mode 100644
index 000000000000..4309bd849a1e
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle_rust.cc
@@ -0,0 +1,925 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/debugging/internal/demangle_rust.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <limits>
+
+#include "absl/base/attributes.h"
+#include "absl/base/config.h"
+#include "absl/debugging/internal/decode_rust_punycode.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+namespace {
+
+// Same step limit as the C++ demangler in demangle.cc uses.
+constexpr int kMaxReturns = 1 << 17;
+
+bool IsDigit(char c) { return '0' <= c && c <= '9'; }
+bool IsLower(char c) { return 'a' <= c && c <= 'z'; }
+bool IsUpper(char c) { return 'A' <= c && c <= 'Z'; }
+bool IsAlpha(char c) { return IsLower(c) || IsUpper(c); }
+bool IsIdentifierChar(char c) { return IsAlpha(c) || IsDigit(c) || c == '_'; }
+bool IsLowerHexDigit(char c) { return IsDigit(c) || ('a' <= c && c <= 'f'); }
+
+const char* BasicTypeName(char c) {
+  switch (c) {
+    case 'a': return "i8";
+    case 'b': return "bool";
+    case 'c': return "char";
+    case 'd': return "f64";
+    case 'e': return "str";
+    case 'f': return "f32";
+    case 'h': return "u8";
+    case 'i': return "isize";
+    case 'j': return "usize";
+    case 'l': return "i32";
+    case 'm': return "u32";
+    case 'n': return "i128";
+    case 'o': return "u128";
+    case 'p': return "_";
+    case 's': return "i16";
+    case 't': return "u16";
+    case 'u': return "()";
+    case 'v': return "...";
+    case 'x': return "i64";
+    case 'y': return "u64";
+    case 'z': return "!";
+  }
+  return nullptr;
+}
+
+// Parser for Rust symbol mangling v0, whose grammar is defined here:
+//
+// https://doc.rust-lang.org/rustc/symbol-mangling/v0.html#symbol-grammar-summary
+class RustSymbolParser {
+ public:
+  // Prepares to demangle the given encoding, a Rust symbol name starting with
+  // _R, into the output buffer [out, out_end).  The caller is expected to
+  // continue by calling the new object's Parse function.
+  RustSymbolParser(const char* encoding, char* out, char* const out_end)
+      : encoding_(encoding), out_(out), out_end_(out_end) {
+    if (out_ != out_end_) *out_ = '\0';
+  }
+
+  // Parses the constructor's encoding argument, writing output into the range
+  // [out, out_end).  Returns true on success and false for input whose
+  // structure was not recognized or exceeded implementation limits, such as by
+  // nesting structures too deep.  In either case *this should not be used
+  // again.
+  ABSL_MUST_USE_RESULT bool Parse() && {
+    // Recursively parses the grammar production named by callee, then resumes
+    // execution at the next statement.
+    //
+    // Recursive-descent parsing is a beautifully readable translation of a
+    // grammar, but it risks stack overflow if implemented by naive recursion on
+    // the C++ call stack.  So we simulate recursion by goto and switch instead,
+    // keeping a bounded stack of "return addresses" in the recursion_stack_
+    // member.
+    //
+    // The callee argument is a statement label.  We goto that label after
+    // saving the "return address" on recursion_stack_.  The next continue
+    // statement in the for loop below "returns" from this "call".
+    //
+    // The caller argument names the return point.  Each value of caller must
+    // appear in only one ABSL_DEMANGLER_RECURSE call and be listed in the
+    // definition of enum ReturnAddress.  The switch implements the control
+    // transfer from the end of a "called" subroutine back to the statement
+    // after the "call".
+    //
+    // Note that not all the grammar productions have to be packed into the
+    // switch, but only those which appear in a cycle in the grammar.  Anything
+    // acyclic can be written as ordinary functions and function calls, e.g.,
+    // ParseIdentifier.
+#define ABSL_DEMANGLER_RECURSE(callee, caller) \
+    do { \
+      if (recursion_depth_ == kStackSize) return false; \
+      /* The next continue will switch on this saved value ... */ \
+      recursion_stack_[recursion_depth_++] = caller; \
+      goto callee; \
+      /* ... and will land here, resuming the suspended code. */ \
+      case caller: {} \
+    } while (0)
+
+    // Parse the encoding, counting completed recursive calls to guard against
+    // excessively complex input and infinite-loop bugs.
+    int iter = 0;
+    goto whole_encoding;
+    for (; iter < kMaxReturns && recursion_depth_ > 0; ++iter) {
+      // This switch resumes the code path most recently suspended by
+      // ABSL_DEMANGLER_RECURSE.
+      switch (recursion_stack_[--recursion_depth_]) {
+        //
+        // symbol-name ->
+        // _R decimal-number? path instantiating-crate? vendor-specific-suffix?
+        whole_encoding:
+          if (!Eat('_') || !Eat('R')) return false;
+          // decimal-number? is always empty today, so proceed to path, which
+          // can't start with a decimal digit.
+          ABSL_DEMANGLER_RECURSE(path, kInstantiatingCrate);
+          if (IsAlpha(Peek())) {
+            ++silence_depth_;  // Print nothing more from here on.
+            ABSL_DEMANGLER_RECURSE(path, kVendorSpecificSuffix);
+          }
+          switch (Take()) {
+            case '.': case '$': case '\0': return true;
+          }
+          return false;  // unexpected trailing content
+
+        // path -> crate-root | inherent-impl | trait-impl | trait-definition |
+        //         nested-path | generic-args | backref
+        //
+        // Note that ABSL_DEMANGLER_RECURSE does not work inside a nested switch
+        // (which would hide the generated case label).  Thus we jump out of the
+        // inner switch with gotos before performing any fake recursion.
+        path:
+          switch (Take()) {
+            case 'C': goto crate_root;
+            case 'M': goto inherent_impl;
+            case 'X': goto trait_impl;
+            case 'Y': goto trait_definition;
+            case 'N': goto nested_path;
+            case 'I': goto generic_args;
+            case 'B': goto path_backref;
+            default: return false;
+          }
+
+        // crate-root -> C identifier (C consumed above)
+        crate_root:
+          if (!ParseIdentifier()) return false;
+          continue;
+
+        // inherent-impl -> M impl-path type (M already consumed)
+        inherent_impl:
+          if (!Emit("<")) return false;
+          ABSL_DEMANGLER_RECURSE(impl_path, kInherentImplType);
+          ABSL_DEMANGLER_RECURSE(type, kInherentImplEnding);
+          if (!Emit(">")) return false;
+          continue;
+
+        // trait-impl -> X impl-path type path (X already consumed)
+        trait_impl:
+          if (!Emit("<")) return false;
+          ABSL_DEMANGLER_RECURSE(impl_path, kTraitImplType);
+          ABSL_DEMANGLER_RECURSE(type, kTraitImplInfix);
+          if (!Emit(" as ")) return false;
+          ABSL_DEMANGLER_RECURSE(path, kTraitImplEnding);
+          if (!Emit(">")) return false;
+          continue;
+
+        // impl-path -> disambiguator? path (but never print it!)
+        impl_path:
+          ++silence_depth_;
+          {
+            int ignored_disambiguator;
+            if (!ParseDisambiguator(ignored_disambiguator)) return false;
+          }
+          ABSL_DEMANGLER_RECURSE(path, kImplPathEnding);
+          --silence_depth_;
+          continue;
+
+        // trait-definition -> Y type path (Y already consumed)
+        trait_definition:
+          if (!Emit("<")) return false;
+          ABSL_DEMANGLER_RECURSE(type, kTraitDefinitionInfix);
+          if (!Emit(" as ")) return false;
+          ABSL_DEMANGLER_RECURSE(path, kTraitDefinitionEnding);
+          if (!Emit(">")) return false;
+          continue;
+
+        // nested-path -> N namespace path identifier (N already consumed)
+        // namespace -> lower | upper
+        nested_path:
+          // Uppercase namespaces must be saved on a stack so we can print
+          // ::{closure#0} or ::{shim:vtable#0} or ::{X:name#0} as needed.
+          if (IsUpper(Peek())) {
+            if (!PushNamespace(Take())) return false;
+            ABSL_DEMANGLER_RECURSE(path, kIdentifierInUppercaseNamespace);
+            if (!Emit("::")) return false;
+            if (!ParseIdentifier(PopNamespace())) return false;
+            continue;
+          }
+
+          // Lowercase namespaces, however, are never represented in the output;
+          // they all emit just ::name.
+          if (IsLower(Take())) {
+            ABSL_DEMANGLER_RECURSE(path, kIdentifierInLowercaseNamespace);
+            if (!Emit("::")) return false;
+            if (!ParseIdentifier()) return false;
+            continue;
+          }
+
+          // Neither upper or lower
+          return false;
+
+        // type -> basic-type | array-type | slice-type | tuple-type |
+        //         ref-type | mut-ref-type | const-ptr-type | mut-ptr-type |
+        //         fn-type | dyn-trait-type | path | backref
+        //
+        // We use ifs instead of switch (Take()) because the default case jumps
+        // to path, which will need to see the first character not yet Taken
+        // from the input.  Because we do not use a nested switch here,
+        // ABSL_DEMANGLER_RECURSE works fine in the 'S' case.
+        type:
+          if (IsLower(Peek())) {
+            const char* type_name = BasicTypeName(Take());
+            if (type_name == nullptr || !Emit(type_name)) return false;
+            continue;
+          }
+          if (Eat('A')) {
+            // array-type = A type const
+            if (!Emit("[")) return false;
+            ABSL_DEMANGLER_RECURSE(type, kArraySize);
+            if (!Emit("; ")) return false;
+            ABSL_DEMANGLER_RECURSE(constant, kFinishArray);
+            if (!Emit("]")) return false;
+            continue;
+          }
+          if (Eat('S')) {
+            if (!Emit("[")) return false;
+            ABSL_DEMANGLER_RECURSE(type, kSliceEnding);
+            if (!Emit("]")) return false;
+            continue;
+          }
+          if (Eat('T')) goto tuple_type;
+          if (Eat('R')) {
+            if (!Emit("&")) return false;
+            if (!ParseOptionalLifetime()) return false;
+            goto type;
+          }
+          if (Eat('Q')) {
+            if (!Emit("&mut ")) return false;
+            if (!ParseOptionalLifetime()) return false;
+            goto type;
+          }
+          if (Eat('P')) {
+            if (!Emit("*const ")) return false;
+            goto type;
+          }
+          if (Eat('O')) {
+            if (!Emit("*mut ")) return false;
+            goto type;
+          }
+          if (Eat('F')) goto fn_type;
+          if (Eat('D')) goto dyn_trait_type;
+          if (Eat('B')) goto type_backref;
+          goto path;
+
+        // tuple-type -> T type* E (T already consumed)
+        tuple_type:
+          if (!Emit("(")) return false;
+
+          // The toolchain should call the unit type u instead of TE, but the
+          // grammar and other demanglers also recognize TE, so we do too.
+          if (Eat('E')) {
+            if (!Emit(")")) return false;
+            continue;
+          }
+
+          // A tuple with one element is rendered (type,) instead of (type).
+          ABSL_DEMANGLER_RECURSE(type, kAfterFirstTupleElement);
+          if (Eat('E')) {
+            if (!Emit(",)")) return false;
+            continue;
+          }
+
+          // A tuple with two elements is of course (x, y).
+          if (!Emit(", ")) return false;
+          ABSL_DEMANGLER_RECURSE(type, kAfterSecondTupleElement);
+          if (Eat('E')) {
+            if (!Emit(")")) return false;
+            continue;
+          }
+
+          // And (x, y, z) for three elements.
+          if (!Emit(", ")) return false;
+          ABSL_DEMANGLER_RECURSE(type, kAfterThirdTupleElement);
+          if (Eat('E')) {
+            if (!Emit(")")) return false;
+            continue;
+          }
+
+          // For longer tuples we write (x, y, z, ...), printing none of the
+          // content of the fourth and later types.  Thus we avoid exhausting
+          // output buffers and human readers' patience when some library has a
+          // long tuple as an implementation detail, without having to
+          // completely obfuscate all tuples.
+          if (!Emit(", ...)")) return false;
+          ++silence_depth_;
+          while (!Eat('E')) {
+            ABSL_DEMANGLER_RECURSE(type, kAfterSubsequentTupleElement);
+          }
+          --silence_depth_;
+          continue;
+
+        // fn-type -> F fn-sig (F already consumed)
+        // fn-sig -> binder? U? (K abi)? type* E type
+        // abi -> C | undisambiguated-identifier
+        //
+        // We follow the C++ demangler in suppressing details of function
+        // signatures.  Every function type is rendered "fn...".
+        fn_type:
+          if (!Emit("fn...")) return false;
+          ++silence_depth_;
+          if (!ParseOptionalBinder()) return false;
+          (void)Eat('U');
+          if (Eat('K')) {
+            if (!Eat('C') && !ParseUndisambiguatedIdentifier()) return false;
+          }
+          while (!Eat('E')) {
+            ABSL_DEMANGLER_RECURSE(type, kContinueParameterList);
+          }
+          ABSL_DEMANGLER_RECURSE(type, kFinishFn);
+          --silence_depth_;
+          continue;
+
+        // dyn-trait-type -> D dyn-bounds lifetime (D already consumed)
+        // dyn-bounds -> binder? dyn-trait* E
+        //
+        // The grammar strangely allows an empty trait list, even though the
+        // compiler should never output one.  We follow existing demanglers in
+        // rendering DEL_ as "dyn ".
+        //
+        // Because auto traits lengthen a type name considerably without
+        // providing much value to a search for related source code, it would be
+        // desirable to abbreviate
+        //     dyn main::Trait + std::marker::Copy + std::marker::Send
+        // to
+        //     dyn main::Trait + ...,
+        // eliding the auto traits.  But it is difficult to do so correctly, in
+        // part because there is no guarantee that the mangling will list the
+        // main trait first.  So we just print all the traits in their order of
+        // appearance in the mangled name.
+        dyn_trait_type:
+          if (!Emit("dyn ")) return false;
+          if (!ParseOptionalBinder()) return false;
+          if (!Eat('E')) {
+            ABSL_DEMANGLER_RECURSE(dyn_trait, kBeginAutoTraits);
+            while (!Eat('E')) {
+              if (!Emit(" + ")) return false;
+              ABSL_DEMANGLER_RECURSE(dyn_trait, kContinueAutoTraits);
+            }
+          }
+          if (!ParseRequiredLifetime()) return false;
+          continue;
+
+        // dyn-trait -> path dyn-trait-assoc-binding*
+        // dyn-trait-assoc-binding -> p undisambiguated-identifier type
+        //
+        // We render nonempty binding lists as <>, omitting their contents as
+        // for generic-args.
+        dyn_trait:
+          ABSL_DEMANGLER_RECURSE(path, kContinueDynTrait);
+          if (Peek() == 'p') {
+            if (!Emit("<>")) return false;
+            ++silence_depth_;
+            while (Eat('p')) {
+              if (!ParseUndisambiguatedIdentifier()) return false;
+              ABSL_DEMANGLER_RECURSE(type, kContinueAssocBinding);
+            }
+            --silence_depth_;
+          }
+          continue;
+
+        // const -> type const-data | p | backref
+        //
+        // const is a C++ keyword, so we use the label `constant` instead.
+        constant:
+          if (Eat('B')) goto const_backref;
+          if (Eat('p')) {
+            if (!Emit("_")) return false;
+            continue;
+          }
+
+          // Scan the type without printing it.
+          //
+          // The Rust language restricts the type of a const generic argument
+          // much more than the mangling grammar does.  We do not enforce this.
+          //
+          // We also do not bother printing false, true, 'A', and '\u{abcd}' for
+          // the types bool and char.  Because we do not print generic-args
+          // contents, we expect to print constants only in array sizes, and
+          // those should not be bool or char.
+          ++silence_depth_;
+          ABSL_DEMANGLER_RECURSE(type, kConstData);
+          --silence_depth_;
+
+          // const-data -> n? hex-digit* _
+          //
+          // Although the grammar doesn't say this, existing demanglers expect
+          // that zero is 0, not an empty digit sequence, and no nonzero value
+          // may have leading zero digits.  Also n0_ is accepted and printed as
+          // -0, though a toolchain will probably never write that encoding.
+          if (Eat('n') && !EmitChar('-')) return false;
+          if (!Emit("0x")) return false;
+          if (Eat('0')) {
+            if (!EmitChar('0')) return false;
+            if (!Eat('_')) return false;
+            continue;
+          }
+          while (IsLowerHexDigit(Peek())) {
+            if (!EmitChar(Take())) return false;
+          }
+          if (!Eat('_')) return false;
+          continue;
+
+        // generic-args -> I path generic-arg* E (I already consumed)
+        //
+        // We follow the C++ demangler in omitting all the arguments from the
+        // output, printing only the list opening and closing tokens.
+        generic_args:
+          ABSL_DEMANGLER_RECURSE(path, kBeginGenericArgList);
+          if (!Emit("::<>")) return false;
+          ++silence_depth_;
+          while (!Eat('E')) {
+            ABSL_DEMANGLER_RECURSE(generic_arg, kContinueGenericArgList);
+          }
+          --silence_depth_;
+          continue;
+
+        // generic-arg -> lifetime | type | K const
+        generic_arg:
+          if (Peek() == 'L') {
+            if (!ParseOptionalLifetime()) return false;
+            continue;
+          }
+          if (Eat('K')) goto constant;
+          goto type;
+
+        // backref -> B base-62-number (B already consumed)
+        //
+        // The BeginBackref call parses and range-checks the base-62-number.  We
+        // always do that much.
+        //
+        // The recursive call parses and prints what the backref points at.  We
+        // save CPU and stack by skipping this work if the output would be
+        // suppressed anyway.
+        path_backref:
+          if (!BeginBackref()) return false;
+          if (silence_depth_ == 0) {
+            ABSL_DEMANGLER_RECURSE(path, kPathBackrefEnding);
+          }
+          EndBackref();
+          continue;
+
+        // This represents the same backref production as in path_backref but
+        // parses the target as a type instead of a path.
+        type_backref:
+          if (!BeginBackref()) return false;
+          if (silence_depth_ == 0) {
+            ABSL_DEMANGLER_RECURSE(type, kTypeBackrefEnding);
+          }
+          EndBackref();
+          continue;
+
+        const_backref:
+          if (!BeginBackref()) return false;
+          if (silence_depth_ == 0) {
+            ABSL_DEMANGLER_RECURSE(constant, kConstantBackrefEnding);
+          }
+          EndBackref();
+          continue;
+      }
+    }
+
+    return false;  // hit iteration limit or a bug in our stack handling
+  }
+
+ private:
+  // Enumerates resumption points for ABSL_DEMANGLER_RECURSE calls.
+  enum ReturnAddress : uint8_t {
+    kInstantiatingCrate,
+    kVendorSpecificSuffix,
+    kIdentifierInUppercaseNamespace,
+    kIdentifierInLowercaseNamespace,
+    kInherentImplType,
+    kInherentImplEnding,
+    kTraitImplType,
+    kTraitImplInfix,
+    kTraitImplEnding,
+    kImplPathEnding,
+    kTraitDefinitionInfix,
+    kTraitDefinitionEnding,
+    kArraySize,
+    kFinishArray,
+    kSliceEnding,
+    kAfterFirstTupleElement,
+    kAfterSecondTupleElement,
+    kAfterThirdTupleElement,
+    kAfterSubsequentTupleElement,
+    kContinueParameterList,
+    kFinishFn,
+    kBeginAutoTraits,
+    kContinueAutoTraits,
+    kContinueDynTrait,
+    kContinueAssocBinding,
+    kConstData,
+    kBeginGenericArgList,
+    kContinueGenericArgList,
+    kPathBackrefEnding,
+    kTypeBackrefEnding,
+    kConstantBackrefEnding,
+  };
+
+  // Element counts for the stack arrays.  Larger stack sizes accommodate more
+  // deeply nested names at the cost of a larger footprint on the C++ call
+  // stack.
+  enum {
+    // Maximum recursive calls outstanding at one time.
+    kStackSize = 256,
+
+    // Maximum N<uppercase> nested-paths open at once.  We do not expect
+    // closures inside closures inside closures as much as functions inside
+    // modules inside other modules, so we can use a smaller array here.
+    kNamespaceStackSize = 64,
+
+    // Maximum number of nested backrefs.  We can keep this stack pretty small
+    // because we do not follow backrefs inside generic-args or other contexts
+    // that suppress printing, so deep stacking is unlikely in practice.
+    kPositionStackSize = 16,
+  };
+
+  // Returns the next input character without consuming it.
+  char Peek() const { return encoding_[pos_]; }
+
+  // Consumes and returns the next input character.
+  char Take() { return encoding_[pos_++]; }
+
+  // If the next input character is the given character, consumes it and returns
+  // true; otherwise returns false without consuming a character.
+  ABSL_MUST_USE_RESULT bool Eat(char want) {
+    if (encoding_[pos_] != want) return false;
+    ++pos_;
+    return true;
+  }
+
+  // Provided there is enough remaining output space, appends c to the output,
+  // writing a fresh NUL terminator afterward, and returns true.  Returns false
+  // if the output buffer had less than two bytes free.
+  ABSL_MUST_USE_RESULT bool EmitChar(char c) {
+    if (silence_depth_ > 0) return true;
+    if (out_end_ - out_ < 2) return false;
+    *out_++ = c;
+    *out_ = '\0';
+    return true;
+  }
+
+  // Provided there is enough remaining output space, appends the C string token
+  // to the output, followed by a NUL character, and returns true.  Returns
+  // false if not everything fit into the output buffer.
+  ABSL_MUST_USE_RESULT bool Emit(const char* token) {
+    if (silence_depth_ > 0) return true;
+    const size_t token_length = std::strlen(token);
+    const size_t bytes_to_copy = token_length + 1;  // token and final NUL
+    if (static_cast<size_t>(out_end_ - out_) < bytes_to_copy) return false;
+    std::memcpy(out_, token, bytes_to_copy);
+    out_ += token_length;
+    return true;
+  }
+
+  // Provided there is enough remaining output space, appends the decimal form
+  // of disambiguator (if it's nonnegative) or "?" (if it's negative) to the
+  // output, followed by a NUL character, and returns true.  Returns false if
+  // not everything fit into the output buffer.
+  ABSL_MUST_USE_RESULT bool EmitDisambiguator(int disambiguator) {
+    if (disambiguator < 0) return EmitChar('?');  // parsed but too large
+    if (disambiguator == 0) return EmitChar('0');
+    // Convert disambiguator to decimal text.  Three digits per byte is enough
+    // because 999 > 256.  The bound will remain correct even if future
+    // maintenance changes the type of the disambiguator variable.
+    char digits[3 * sizeof(disambiguator)] = {};
+    size_t leading_digit_index = sizeof(digits) - 1;
+    for (; disambiguator > 0; disambiguator /= 10) {
+      digits[--leading_digit_index] =
+          static_cast<char>('0' + disambiguator % 10);
+    }
+    return Emit(digits + leading_digit_index);
+  }
+
+  // Consumes an optional disambiguator (s123_) from the input.
+  //
+  // On success returns true and fills value with the encoded value if it was
+  // not too big, otherwise with -1.  If the optional disambiguator was omitted,
+  // value is 0.  On parse failure returns false and sets value to -1.
+  ABSL_MUST_USE_RESULT bool ParseDisambiguator(int& value) {
+    value = -1;
+
+    // disambiguator = s base-62-number
+    //
+    // Disambiguators are optional.  An omitted disambiguator is zero.
+    if (!Eat('s')) {
+      value = 0;
+      return true;
+    }
+    int base_62_value = 0;
+    if (!ParseBase62Number(base_62_value)) return false;
+    value = base_62_value < 0 ? -1 : base_62_value + 1;
+    return true;
+  }
+
+  // Consumes a base-62 number like _ or 123_ from the input.
+  //
+  // On success returns true and fills value with the encoded value if it was
+  // not too big, otherwise with -1.  On parse failure returns false and sets
+  // value to -1.
+  ABSL_MUST_USE_RESULT bool ParseBase62Number(int& value) {
+    value = -1;
+
+    // base-62-number = (digit | lower | upper)* _
+    //
+    // An empty base-62 digit sequence means 0.
+    if (Eat('_')) {
+      value = 0;
+      return true;
+    }
+
+    // A nonempty digit sequence denotes its base-62 value plus 1.
+    int encoded_number = 0;
+    bool overflowed = false;
+    while (IsAlpha(Peek()) || IsDigit(Peek())) {
+      const char c = Take();
+      if (encoded_number >= std::numeric_limits<int>::max()/62) {
+        // If we are close to overflowing an int, keep parsing but stop updating
+        // encoded_number and remember to return -1 at the end.  The point is to
+        // avoid undefined behavior while parsing crate-root disambiguators,
+        // which are large in practice but not shown in demangling, while
+        // successfully computing closure and shim disambiguators, which are
+        // typically small and are printed out.
+        overflowed = true;
+      } else {
+        int digit;
+        if (IsDigit(c)) {
+          digit = c - '0';
+        } else if (IsLower(c)) {
+          digit = c - 'a' + 10;
+        } else {
+          digit = c - 'A' + 36;
+        }
+        encoded_number = 62 * encoded_number + digit;
+      }
+    }
+
+    if (!Eat('_')) return false;
+    if (!overflowed) value = encoded_number + 1;
+    return true;
+  }
+
+  // Consumes an identifier from the input, returning true on success.
+  //
+  // A nonzero uppercase_namespace specifies the character after the N in a
+  // nested-identifier, e.g., 'C' for a closure, allowing ParseIdentifier to
+  // write out the name with the conventional decoration for that namespace.
+  ABSL_MUST_USE_RESULT bool ParseIdentifier(char uppercase_namespace = '\0') {
+    // identifier -> disambiguator? undisambiguated-identifier
+    int disambiguator = 0;
+    if (!ParseDisambiguator(disambiguator)) return false;
+
+    return ParseUndisambiguatedIdentifier(uppercase_namespace, disambiguator);
+  }
+
+  // Consumes from the input an identifier with no preceding disambiguator,
+  // returning true on success.
+  //
+  // When ParseIdentifier calls this, it passes the N<namespace> character and
+  // disambiguator value so that "{closure#42}" and similar forms can be
+  // rendered correctly.
+  //
+  // At other appearances of undisambiguated-identifier in the grammar, this
+  // treatment is not applicable, and the call site omits both arguments.
+  ABSL_MUST_USE_RESULT bool ParseUndisambiguatedIdentifier(
+      char uppercase_namespace = '\0', int disambiguator = 0) {
+    // undisambiguated-identifier -> u? decimal-number _? bytes
+    const bool is_punycoded = Eat('u');
+    if (!IsDigit(Peek())) return false;
+    int num_bytes = 0;
+    if (!ParseDecimalNumber(num_bytes)) return false;
+    (void)Eat('_');  // optional separator, needed if a digit follows
+    if (is_punycoded) {
+      DecodeRustPunycodeOptions options;
+      options.punycode_begin = &encoding_[pos_];
+      options.punycode_end = &encoding_[pos_] + num_bytes;
+      options.out_begin = out_;
+      options.out_end = out_end_;
+      out_ = DecodeRustPunycode(options);
+      if (out_ == nullptr) return false;
+      pos_ += static_cast<size_t>(num_bytes);
+    }
+
+    // Emit the beginnings of braced forms like {shim:vtable#0}.
+    if (uppercase_namespace != '\0') {
+      switch (uppercase_namespace) {
+        case 'C':
+          if (!Emit("{closure")) return false;
+          break;
+        case 'S':
+          if (!Emit("{shim")) return false;
+          break;
+        default:
+          if (!EmitChar('{') || !EmitChar(uppercase_namespace)) return false;
+          break;
+      }
+      if (num_bytes > 0 && !Emit(":")) return false;
+    }
+
+    // Emit the name itself.
+    if (!is_punycoded) {
+      for (int i = 0; i < num_bytes; ++i) {
+        const char c = Take();
+        if (!IsIdentifierChar(c) &&
+            // The spec gives toolchains the choice of Punycode or raw UTF-8 for
+            // identifiers containing code points above 0x7f, so accept bytes
+            // with the high bit set.
+            (c & 0x80) == 0) {
+          return false;
+        }
+        if (!EmitChar(c)) return false;
+      }
+    }
+
+    // Emit the endings of braced forms, e.g., "#42}".
+    if (uppercase_namespace != '\0') {
+      if (!EmitChar('#')) return false;
+      if (!EmitDisambiguator(disambiguator)) return false;
+      if (!EmitChar('}')) return false;
+    }
+
+    return true;
+  }
+
+  // Consumes a decimal number like 0 or 123 from the input.  On success returns
+  // true and fills value with the encoded value.  If the encoded value is too
+  // large or otherwise unparsable, returns false and sets value to -1.
+  ABSL_MUST_USE_RESULT bool ParseDecimalNumber(int& value) {
+    value = -1;
+    if (!IsDigit(Peek())) return false;
+    int encoded_number = Take() - '0';
+    if (encoded_number == 0) {
+      // Decimal numbers are never encoded with extra leading zeroes.
+      value = 0;
+      return true;
+    }
+    while (IsDigit(Peek()) &&
+           // avoid overflow
+           encoded_number < std::numeric_limits<int>::max()/10) {
+      encoded_number = 10 * encoded_number + (Take() - '0');
+    }
+    if (IsDigit(Peek())) return false;  // too big
+    value = encoded_number;
+    return true;
+  }
+
+  // Consumes a binder of higher-ranked lifetimes if one is present.  On success
+  // returns true and discards the encoded lifetime count.  On parse failure
+  // returns false.
+  ABSL_MUST_USE_RESULT bool ParseOptionalBinder() {
+    // binder -> G base-62-number
+    if (!Eat('G')) return true;
+    int ignored_binding_count;
+    return ParseBase62Number(ignored_binding_count);
+  }
+
+  // Consumes a lifetime if one is present.
+  //
+  // On success returns true and discards the lifetime index.  We do not print
+  // or even range-check lifetimes because they are a finer detail than other
+  // things we omit from output, such as the entire contents of generic-args.
+  //
+  // On parse failure returns false.
+  ABSL_MUST_USE_RESULT bool ParseOptionalLifetime() {
+    // lifetime -> L base-62-number
+    if (!Eat('L')) return true;
+    int ignored_de_bruijn_index;
+    return ParseBase62Number(ignored_de_bruijn_index);
+  }
+
+  // Consumes a lifetime just like ParseOptionalLifetime, but returns false if
+  // there is no lifetime here.
+  ABSL_MUST_USE_RESULT bool ParseRequiredLifetime() {
+    if (Peek() != 'L') return false;
+    return ParseOptionalLifetime();
+  }
+
+  // Pushes ns onto the namespace stack and returns true if the stack is not
+  // full, else returns false.
+  ABSL_MUST_USE_RESULT bool PushNamespace(char ns) {
+    if (namespace_depth_ == kNamespaceStackSize) return false;
+    namespace_stack_[namespace_depth_++] = ns;
+    return true;
+  }
+
+  // Pops the last pushed namespace.  Requires that the namespace stack is not
+  // empty (namespace_depth_ > 0).
+  char PopNamespace() { return namespace_stack_[--namespace_depth_]; }
+
+  // Pushes position onto the position stack and returns true if the stack is
+  // not full, else returns false.
+  ABSL_MUST_USE_RESULT bool PushPosition(int position) {
+    if (position_depth_ == kPositionStackSize) return false;
+    position_stack_[position_depth_++] = position;
+    return true;
+  }
+
+  // Pops the last pushed input position.  Requires that the position stack is
+  // not empty (position_depth_ > 0).
+  int PopPosition() { return position_stack_[--position_depth_]; }
+
+  // Consumes a base-62-number denoting a backref target, pushes the current
+  // input position on the data stack, and sets the input position to the
+  // beginning of the backref target.  Returns true on success.  Returns false
+  // if parsing failed, the stack is exhausted, or the backref target position
+  // is out of range.
+  ABSL_MUST_USE_RESULT bool BeginBackref() {
+    // backref = B base-62-number (B already consumed)
+    //
+    // Reject backrefs that don't parse, overflow int, or don't point backward.
+    // If the offset looks fine, adjust it to account for the _R prefix.
+    int offset = 0;
+    const int offset_of_this_backref =
+        pos_ - 2 /* _R */ - 1 /* B already consumed */;
+    if (!ParseBase62Number(offset) || offset < 0 ||
+        offset >= offset_of_this_backref) {
+      return false;
+    }
+    offset += 2;
+
+    // Save the old position to restore later.
+    if (!PushPosition(pos_)) return false;
+
+    // Move the input position to the backref target.
+    //
+    // Note that we do not check whether the new position points to the
+    // beginning of a construct matching the context in which the backref
+    // appeared.  We just jump to it and see whether nested parsing succeeds.
+    // We therefore accept various wrong manglings, e.g., a type backref
+    // pointing to an 'l' character inside an identifier, which happens to mean
+    // i32 when parsed as a type mangling.  This saves the complexity and RAM
+    // footprint of remembering which offsets began which kinds of
+    // substructures.  Existing demanglers take similar shortcuts.
+    pos_ = offset;
+    return true;
+  }
+
+  // Cleans up after a backref production by restoring the previous input
+  // position from the data stack.
+  void EndBackref() { pos_ = PopPosition(); }
+
+  // The leftmost recursion_depth_ elements of recursion_stack_ contain the
+  // ReturnAddresses pushed by ABSL_DEMANGLER_RECURSE calls not yet completed.
+  ReturnAddress recursion_stack_[kStackSize] = {};
+  int recursion_depth_ = 0;
+
+  // The leftmost namespace_depth_ elements of namespace_stack_ contain the
+  // uppercase namespace identifiers for open nested-paths, e.g., 'C' for a
+  // closure.
+  char namespace_stack_[kNamespaceStackSize] = {};
+  int namespace_depth_ = 0;
+
+  // The leftmost position_depth_ elements of position_stack_ contain the input
+  // positions to return to after fully printing the targets of backrefs.
+  int position_stack_[kPositionStackSize] = {};
+  int position_depth_ = 0;
+
+  // Anything parsed while silence_depth_ > 0 contributes nothing to the
+  // demangled output.  For constructs omitted from the demangling, such as
+  // impl-path and the contents of generic-args, we will increment
+  // silence_depth_ on the way in and decrement silence_depth_ on the way out.
+  int silence_depth_ = 0;
+
+  // Input: encoding_ points to a Rust mangled symbol, and encoding_[pos_] is
+  // the next input character to be scanned.
+  int pos_ = 0;
+  const char* encoding_ = nullptr;
+
+  // Output: *out_ is where the next output character should be written, and
+  // out_end_ points past the last byte of available space.
+  char* out_ = nullptr;
+  char* out_end_ = nullptr;
+};
+
+}  // namespace
+
+bool DemangleRustSymbolEncoding(const char* mangled, char* out,
+                                size_t out_size) {
+  return RustSymbolParser(mangled, out, out + out_size).Parse();
+}
+
+}  // namespace debugging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle_rust.h b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle_rust.h
new file mode 100644
index 000000000000..94a9aecb5eb9
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle_rust.h
@@ -0,0 +1,42 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_DEBUGGING_INTERNAL_DEMANGLE_RUST_H_
+#define ABSL_DEBUGGING_INTERNAL_DEMANGLE_RUST_H_
+
+#include <cstddef>
+
+#include "absl/base/config.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+// Demangle the Rust encoding `mangled`.  On success, return true and write the
+// demangled symbol name to `out`.  Otherwise, return false, leaving unspecified
+// contents in `out`.  For example, calling DemangleRustSymbolEncoding with
+// `mangled = "_RNvC8my_crate7my_func"` will yield `my_crate::my_func` in `out`,
+// provided `out_size` is large enough for that value and its trailing NUL.
+//
+// DemangleRustSymbolEncoding is async-signal-safe and runs in bounded C++
+// call-stack space.  It is suitable for symbolizing stack traces in a signal
+// handler.
+bool DemangleRustSymbolEncoding(const char* mangled, char* out,
+                                size_t out_size);
+
+}  // namespace debugging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_DEBUGGING_INTERNAL_DEMANGLE_RUST_H_
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.cc b/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
index 42dcd3cde962..2c1683098393 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
@@ -20,8 +20,11 @@
 #ifdef ABSL_HAVE_ELF_MEM_IMAGE  // defined in elf_mem_image.h
 
 #include <string.h>
+
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
+
 #include "absl/base/config.h"
 #include "absl/base/internal/raw_logging.h"
 
@@ -86,20 +89,14 @@ ElfMemImage::ElfMemImage(const void *base) {
   Init(base);
 }
 
-int ElfMemImage::GetNumSymbols() const {
-  if (!hash_) {
-    return 0;
-  }
-  // See http://www.caldera.com/developers/gabi/latest/ch5.dynamic.html#hash
-  return static_cast<int>(hash_[1]);
-}
+uint32_t ElfMemImage::GetNumSymbols() const { return num_syms_; }
 
-const ElfW(Sym) *ElfMemImage::GetDynsym(int index) const {
+const ElfW(Sym) * ElfMemImage::GetDynsym(uint32_t index) const {
   ABSL_RAW_CHECK(index < GetNumSymbols(), "index out of range");
   return dynsym_ + index;
 }
 
-const ElfW(Versym) *ElfMemImage::GetVersym(int index) const {
+const ElfW(Versym) *ElfMemImage::GetVersym(uint32_t index) const {
   ABSL_RAW_CHECK(index < GetNumSymbols(), "index out of range");
   return versym_ + index;
 }
@@ -154,7 +151,7 @@ void ElfMemImage::Init(const void *base) {
   dynstr_    = nullptr;
   versym_    = nullptr;
   verdef_    = nullptr;
-  hash_      = nullptr;
+  num_syms_ = 0;
   strsize_   = 0;
   verdefnum_ = 0;
   // Sentinel: PT_LOAD .p_vaddr can't possibly be this.
@@ -219,12 +216,17 @@ void ElfMemImage::Init(const void *base) {
       base_as_char - reinterpret_cast<const char *>(link_base_);
   ElfW(Dyn)* dynamic_entry = reinterpret_cast<ElfW(Dyn)*>(
       static_cast<intptr_t>(dynamic_program_header->p_vaddr) + relocation);
+  uint32_t *sysv_hash = nullptr;
+  uint32_t *gnu_hash = nullptr;
   for (; dynamic_entry->d_tag != DT_NULL; ++dynamic_entry) {
     const auto value =
         static_cast<intptr_t>(dynamic_entry->d_un.d_val) + relocation;
     switch (dynamic_entry->d_tag) {
       case DT_HASH:
-        hash_ = reinterpret_cast<ElfW(Word) *>(value);
+        sysv_hash = reinterpret_cast<uint32_t *>(value);
+        break;
+      case DT_GNU_HASH:
+        gnu_hash = reinterpret_cast<uint32_t *>(value);
         break;
       case DT_SYMTAB:
         dynsym_ = reinterpret_cast<ElfW(Sym) *>(value);
@@ -249,13 +251,38 @@ void ElfMemImage::Init(const void *base) {
         break;
     }
   }
-  if (!hash_ || !dynsym_ || !dynstr_ || !versym_ ||
+  if ((!sysv_hash && !gnu_hash) || !dynsym_ || !dynstr_ || !versym_ ||
       !verdef_ || !verdefnum_ || !strsize_) {
     assert(false);  // invalid VDSO
     // Mark this image as not present. Can not recur infinitely.
     Init(nullptr);
     return;
   }
+  if (sysv_hash) {
+    num_syms_ = sysv_hash[1];
+  } else {
+    assert(gnu_hash);
+    // Compute the number of symbols for DT_GNU_HASH, which is specified by
+    // https://sourceware.org/gnu-gabi/program-loading-and-dynamic-linking.txt
+    uint32_t nbuckets = gnu_hash[0];
+    // The buckets array is located after the header (4 uint32) and the bloom
+    // filter (size_t array of gnu_hash[2] elements).
+    uint32_t *buckets = gnu_hash + 4 + sizeof(size_t) / 4 * gnu_hash[2];
+    // Find the chain of the last non-empty bucket.
+    uint32_t idx = 0;
+    for (uint32_t i = nbuckets; i > 0;) {
+      idx = buckets[--i];
+      if (idx != 0) break;
+    }
+    if (idx != 0) {
+      // Find the last element of the chain, which has an odd value.
+      // Add one to get the number of symbols.
+      uint32_t *chain = buckets + nbuckets - gnu_hash[1];
+      while (chain[idx++] % 2 == 0) {
+      }
+    }
+    num_syms_ = idx;
+  }
 }
 
 bool ElfMemImage::LookupSymbol(const char *name,
@@ -300,9 +327,9 @@ bool ElfMemImage::LookupSymbolByAddress(const void *address,
   return false;
 }
 
-ElfMemImage::SymbolIterator::SymbolIterator(const void *const image, int index)
-    : index_(index), image_(image) {
-}
+ElfMemImage::SymbolIterator::SymbolIterator(const void *const image,
+                                            uint32_t index)
+    : index_(index), image_(image) {}
 
 const ElfMemImage::SymbolInfo *ElfMemImage::SymbolIterator::operator->() const {
   return &info_;
@@ -335,7 +362,7 @@ ElfMemImage::SymbolIterator ElfMemImage::end() const {
   return SymbolIterator(this, GetNumSymbols());
 }
 
-void ElfMemImage::SymbolIterator::Update(int increment) {
+void ElfMemImage::SymbolIterator::Update(uint32_t increment) {
   const ElfMemImage *image = reinterpret_cast<const ElfMemImage *>(image_);
   ABSL_RAW_CHECK(image->IsPresent() || increment == 0, "");
   if (!image->IsPresent()) {
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.h b/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.h
index e7fe6ab06e2f..19c4952e2f7e 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.h
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.h
@@ -22,6 +22,7 @@
 // Including this will define the __GLIBC__ macro if glibc is being
 // used.
 #include <climits>
+#include <cstdint>
 
 #include "absl/base/config.h"
 
@@ -82,10 +83,10 @@ class ElfMemImage {
     bool operator!=(const SymbolIterator &rhs) const;
     bool operator==(const SymbolIterator &rhs) const;
    private:
-    SymbolIterator(const void *const image, int index);
-    void Update(int incr);
+    SymbolIterator(const void *const image, uint32_t index);
+    void Update(uint32_t incr);
     SymbolInfo info_;
-    int index_;
+    uint32_t index_;
     const void *const image_;
   };
 
@@ -94,14 +95,14 @@ class ElfMemImage {
   void                 Init(const void *base);
   bool                 IsPresent() const { return ehdr_ != nullptr; }
   const ElfW(Phdr)*    GetPhdr(int index) const;
-  const ElfW(Sym)*     GetDynsym(int index) const;
-  const ElfW(Versym)*  GetVersym(int index) const;
+  const ElfW(Sym) * GetDynsym(uint32_t index) const;
+  const ElfW(Versym)*  GetVersym(uint32_t index) const;
   const ElfW(Verdef)*  GetVerdef(int index) const;
   const ElfW(Verdaux)* GetVerdefAux(const ElfW(Verdef) *verdef) const;
   const char*          GetDynstr(ElfW(Word) offset) const;
   const void*          GetSymAddr(const ElfW(Sym) *sym) const;
   const char*          GetVerstr(ElfW(Word) offset) const;
-  int                  GetNumSymbols() const;
+  uint32_t GetNumSymbols() const;
 
   SymbolIterator begin() const;
   SymbolIterator end() const;
@@ -124,8 +125,8 @@ class ElfMemImage {
   const ElfW(Sym) *dynsym_;
   const ElfW(Versym) *versym_;
   const ElfW(Verdef) *verdef_;
-  const ElfW(Word) *hash_;
   const char *dynstr_;
+  uint32_t num_syms_;
   size_t strsize_;
   size_t verdefnum_;
   ElfW(Addr) link_base_;     // Link-time base (p_vaddr of first PT_LOAD).
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc b/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
index 1caf7bbe3591..b123479b1ae5 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
@@ -89,6 +89,8 @@ struct StackInfo {
 
 static bool InsideSignalStack(void** ptr, const StackInfo* stack_info) {
   uintptr_t comparable_ptr = reinterpret_cast<uintptr_t>(ptr);
+  if (stack_info->sig_stack_high == kUnknownStackEnd)
+    return false;
   return (comparable_ptr >= stack_info->sig_stack_low &&
           comparable_ptr < stack_info->sig_stack_high);
 }
@@ -122,13 +124,6 @@ static void **NextStackFrame(void **old_frame_pointer, const void *uc,
       if (pre_signal_frame_pointer >= old_frame_pointer) {
         new_frame_pointer = pre_signal_frame_pointer;
       }
-      // Check that alleged frame pointer is actually readable. This is to
-      // prevent "double fault" in case we hit the first fault due to e.g.
-      // stack corruption.
-      if (!absl::debugging_internal::AddressIsReadable(
-              new_frame_pointer))
-        return nullptr;
-    }
   }
 #endif
 
@@ -136,6 +131,14 @@ static void **NextStackFrame(void **old_frame_pointer, const void *uc,
   if ((reinterpret_cast<uintptr_t>(new_frame_pointer) & 7) != 0)
     return nullptr;
 
+  // Check that alleged frame pointer is actually readable. This is to
+  // prevent "double fault" in case we hit the first fault due to e.g.
+  // stack corruption.
+  if (!absl::debugging_internal::AddressIsReadable(
+          new_frame_pointer))
+    return nullptr;
+  }
+
   // Only check the size if both frames are in the same stack.
   if (InsideSignalStack(new_frame_pointer, stack_info) ==
       InsideSignalStack(old_frame_pointer, stack_info)) {
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc b/contrib/restricted/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc
new file mode 100644
index 000000000000..658a3b513b7d
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc
@@ -0,0 +1,70 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/debugging/internal/utf8_for_code_point.h"
+
+#include <cstdint>
+
+#include "absl/base/config.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+namespace {
+
+// UTF-8 encoding bounds.
+constexpr uint32_t kMinSurrogate = 0xd800, kMaxSurrogate = 0xdfff;
+constexpr uint32_t kMax1ByteCodePoint = 0x7f;
+constexpr uint32_t kMax2ByteCodePoint = 0x7ff;
+constexpr uint32_t kMax3ByteCodePoint = 0xffff;
+constexpr uint32_t kMaxCodePoint = 0x10ffff;
+
+}  // namespace
+
+Utf8ForCodePoint::Utf8ForCodePoint(uint64_t code_point) {
+  if (code_point <= kMax1ByteCodePoint) {
+    length = 1;
+    bytes[0] = static_cast<char>(code_point);
+    return;
+  }
+
+  if (code_point <= kMax2ByteCodePoint) {
+    length = 2;
+    bytes[0] = static_cast<char>(0xc0 | (code_point >> 6));
+    bytes[1] = static_cast<char>(0x80 | (code_point & 0x3f));
+    return;
+  }
+
+  if (kMinSurrogate <= code_point && code_point <= kMaxSurrogate) return;
+
+  if (code_point <= kMax3ByteCodePoint) {
+    length = 3;
+    bytes[0] = static_cast<char>(0xe0 | (code_point >> 12));
+    bytes[1] = static_cast<char>(0x80 | ((code_point >> 6) & 0x3f));
+    bytes[2] = static_cast<char>(0x80 | (code_point & 0x3f));
+    return;
+  }
+
+  if (code_point > kMaxCodePoint) return;
+
+  length = 4;
+  bytes[0] = static_cast<char>(0xf0 | (code_point >> 18));
+  bytes[1] = static_cast<char>(0x80 | ((code_point >> 12) & 0x3f));
+  bytes[2] = static_cast<char>(0x80 | ((code_point >> 6) & 0x3f));
+  bytes[3] = static_cast<char>(0x80 | (code_point & 0x3f));
+}
+
+}  // namespace debugging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h b/contrib/restricted/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h
new file mode 100644
index 000000000000..f23cde6d953a
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h
@@ -0,0 +1,47 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_DEBUGGING_INTERNAL_UTF8_FOR_CODE_POINT_H_
+#define ABSL_DEBUGGING_INTERNAL_UTF8_FOR_CODE_POINT_H_
+
+#include <cstdint>
+
+#include "absl/base/config.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+struct Utf8ForCodePoint {
+  // Converts a Unicode code point to the corresponding UTF-8 byte sequence.
+  // Async-signal-safe to support use in symbolizing stack traces from a signal
+  // handler.
+  explicit Utf8ForCodePoint(uint64_t code_point);
+
+  // Returns true if the constructor's code_point argument was valid.
+  bool ok() const { return length != 0; }
+
+  // If code_point was in range, then 1 <= length <= 4, and the UTF-8 encoding
+  // is found in bytes[0 .. (length - 1)].  If code_point was invalid, then
+  // length == 0.  In either case, the contents of bytes[length .. 3] are
+  // unspecified.
+  char bytes[4] = {};
+  uint32_t length = 0;
+};
+
+}  // namespace debugging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_DEBUGGING_INTERNAL_UTF8_FOR_CODE_POINT_H_
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/ya.make b/contrib/restricted/abseil-cpp/absl/debugging/ya.make
index cc02fbcb4fed..4440433c509c 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/ya.make
+++ b/contrib/restricted/abseil-cpp/absl/debugging/ya.make
@@ -22,9 +22,12 @@ NO_UTIL()
 SRCS(
     failure_signal_handler.cc
     internal/address_is_readable.cc
+    internal/decode_rust_punycode.cc
     internal/demangle.cc
+    internal/demangle_rust.cc
     internal/elf_mem_image.cc
     internal/examine_stack.cc
+    internal/utf8_for_code_point.cc
     internal/vdso_support.cc
     leak_check.cc
     stacktrace.cc
diff --git a/contrib/restricted/abseil-cpp/absl/flags/commandlineflag.h b/contrib/restricted/abseil-cpp/absl/flags/commandlineflag.h
index c30aa6094f57..26ec0e7d84ef 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/commandlineflag.h
+++ b/contrib/restricted/abseil-cpp/absl/flags/commandlineflag.h
@@ -59,6 +59,14 @@ class PrivateHandleAccessor;
 //   // Now you can get flag info from that reflection handle.
 //   std::string flag_location = my_flag_data->Filename();
 //   ...
+
+// These are only used as constexpr global objects.
+// They do not use a virtual destructor to simplify their implementation.
+// They are not destroyed except at program exit, so leaks do not matter.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 class CommandLineFlag {
  public:
   constexpr CommandLineFlag() = default;
@@ -193,6 +201,9 @@ class CommandLineFlag {
   // flag's value type.
   virtual void CheckDefaultValueParsingRoundtrip() const = 0;
 };
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 
 ABSL_NAMESPACE_END
 }  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/flags/flag.h b/contrib/restricted/abseil-cpp/absl/flags/flag.h
index 06ea6932f9aa..a8e0e93299f7 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/flag.h
+++ b/contrib/restricted/abseil-cpp/absl/flags/flag.h
@@ -29,12 +29,14 @@
 #ifndef ABSL_FLAGS_FLAG_H_
 #define ABSL_FLAGS_FLAG_H_
 
+#include <cstdint>
 #include <string>
 #include <type_traits>
 
 #include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/optimization.h"
+#include "absl/flags/commandlineflag.h"
 #include "absl/flags/config.h"
 #include "absl/flags/internal/flag.h"
 #include "absl/flags/internal/registry.h"
diff --git a/contrib/restricted/abseil-cpp/absl/flags/internal/flag.cc b/contrib/restricted/abseil-cpp/absl/flags/internal/flag.cc
index 65d0e58f84ba..981f19fdb8da 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/internal/flag.cc
+++ b/contrib/restricted/abseil-cpp/absl/flags/internal/flag.cc
@@ -22,14 +22,17 @@
 
 #include <array>
 #include <atomic>
+#include <cstring>
 #include <memory>
-#include <new>
 #include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "absl/base/attributes.h"
 #include "absl/base/call_once.h"
 #include "absl/base/casts.h"
 #include "absl/base/config.h"
+#include "absl/base/const_init.h"
 #include "absl/base/dynamic_annotations.h"
 #include "absl/base/optimization.h"
 #include "absl/flags/config.h"
@@ -44,10 +47,9 @@ namespace absl {
 ABSL_NAMESPACE_BEGIN
 namespace flags_internal {
 
-// The help message indicating that the commandline flag has been
-// 'stripped'. It will not show up when doing "-help" and its
-// variants. The flag is stripped if ABSL_FLAGS_STRIP_HELP is set to 1
-// before including absl/flags/flag.h
+// The help message indicating that the commandline flag has been stripped. It
+// will not show up when doing "-help" and its variants. The flag is stripped
+// if ABSL_FLAGS_STRIP_HELP is set to 1 before including absl/flags/flag.h
 const char kStrippedFlagHelp[] = "\001\002\003\004 (unknown) \004\003\002\001";
 
 namespace {
@@ -78,8 +80,31 @@ class MutexRelock {
   absl::Mutex& mu_;
 };
 
+// This is a freelist of leaked flag values and guard for its access.
+// When we can't guarantee it is safe to reuse the memory for flag values,
+// we move the memory to the freelist where it lives indefinitely, so it can
+// still be safely accessed. This also prevents leak checkers from complaining
+// about the leaked memory that can no longer be accessed through any pointer.
+ABSL_CONST_INIT absl::Mutex s_freelist_guard(absl::kConstInit);
+ABSL_CONST_INIT std::vector<void*>* s_freelist = nullptr;
+
+void AddToFreelist(void* p) {
+  absl::MutexLock l(&s_freelist_guard);
+  if (!s_freelist) {
+    s_freelist = new std::vector<void*>;
+  }
+  s_freelist->push_back(p);
+}
+
 }  // namespace
 
+///////////////////////////////////////////////////////////////////////////////
+
+uint64_t NumLeakedFlagValues() {
+  absl::MutexLock l(&s_freelist_guard);
+  return s_freelist == nullptr ? 0u : s_freelist->size();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Persistent state of the flag data.
 
@@ -97,7 +122,7 @@ class FlagState : public flags_internal::FlagStateInterface {
         counter_(counter) {}
 
   ~FlagState() override {
-    if (flag_impl_.ValueStorageKind() != FlagValueStorageKind::kAlignedBuffer &&
+    if (flag_impl_.ValueStorageKind() != FlagValueStorageKind::kHeapAllocated &&
         flag_impl_.ValueStorageKind() != FlagValueStorageKind::kSequenceLocked)
       return;
     flags_internal::Delete(flag_impl_.op_, value_.heap_allocated);
@@ -140,6 +165,33 @@ void DynValueDeleter::operator()(void* ptr) const {
   Delete(op, ptr);
 }
 
+MaskedPointer::MaskedPointer(ptr_t rhs, bool is_candidate) : ptr_(rhs) {
+  if (is_candidate) {
+    ApplyMask(kUnprotectedReadCandidate);
+  }
+}
+
+bool MaskedPointer::IsUnprotectedReadCandidate() const {
+  return CheckMask(kUnprotectedReadCandidate);
+}
+
+bool MaskedPointer::HasBeenRead() const { return CheckMask(kHasBeenRead); }
+
+void MaskedPointer::Set(FlagOpFn op, const void* src, bool is_candidate) {
+  flags_internal::Copy(op, src, Ptr());
+  if (is_candidate) {
+    ApplyMask(kUnprotectedReadCandidate);
+  }
+}
+void MaskedPointer::MarkAsRead() { ApplyMask(kHasBeenRead); }
+
+void MaskedPointer::ApplyMask(mask_t mask) {
+  ptr_ = reinterpret_cast<ptr_t>(reinterpret_cast<mask_t>(ptr_) | mask);
+}
+bool MaskedPointer::CheckMask(mask_t mask) const {
+  return (reinterpret_cast<mask_t>(ptr_) & mask) != 0;
+}
+
 void FlagImpl::Init() {
   new (&data_guard_) absl::Mutex;
 
@@ -174,11 +226,16 @@ void FlagImpl::Init() {
       (*default_value_.gen_func)(AtomicBufferValue());
       break;
     }
-    case FlagValueStorageKind::kAlignedBuffer:
+    case FlagValueStorageKind::kHeapAllocated:
       // For this storage kind the default_value_ always points to gen_func
       // during initialization.
       assert(def_kind == FlagDefaultKind::kGenFunc);
-      (*default_value_.gen_func)(AlignedBufferValue());
+      // Flag value initially points to the internal buffer.
+      MaskedPointer ptr_value = PtrStorage().load(std::memory_order_acquire);
+      (*default_value_.gen_func)(ptr_value.Ptr());
+      // Default value is a candidate for an unprotected read.
+      PtrStorage().store(MaskedPointer(ptr_value.Ptr(), true),
+                         std::memory_order_release);
       break;
   }
   seq_lock_.MarkInitialized();
@@ -234,7 +291,7 @@ std::unique_ptr<void, DynValueDeleter> FlagImpl::MakeInitValue() const {
   return {res, DynValueDeleter{op_}};
 }
 
-void FlagImpl::StoreValue(const void* src) {
+void FlagImpl::StoreValue(const void* src, ValueSource source) {
   switch (ValueStorageKind()) {
     case FlagValueStorageKind::kValueAndInitBit:
     case FlagValueStorageKind::kOneWordAtomic: {
@@ -249,8 +306,27 @@ void FlagImpl::StoreValue(const void* src) {
       seq_lock_.Write(AtomicBufferValue(), src, Sizeof(op_));
       break;
     }
-    case FlagValueStorageKind::kAlignedBuffer:
-      Copy(op_, src, AlignedBufferValue());
+    case FlagValueStorageKind::kHeapAllocated:
+      MaskedPointer ptr_value = PtrStorage().load(std::memory_order_acquire);
+
+      if (ptr_value.IsUnprotectedReadCandidate() && ptr_value.HasBeenRead()) {
+        // If current value is a candidate for an unprotected read and if it was
+        // already read at least once, follow up reads (if any) are done without
+        // mutex protection. We can't guarantee it is safe to reuse this memory
+        // since it may have been accessed by another thread concurrently, so
+        // instead we move the memory to a freelist so it can still be safely
+        // accessed, and allocate a new one for the new value.
+        AddToFreelist(ptr_value.Ptr());
+        ptr_value = MaskedPointer(Clone(op_, src), source == kCommandLine);
+      } else {
+        // Current value either was set programmatically or was never read.
+        // We can reuse the memory since all accesses to this value (if any)
+        // were protected by mutex. That said, if a new value comes from command
+        // line it now becomes a candidate for an unprotected read.
+        ptr_value.Set(op_, src, source == kCommandLine);
+      }
+
+      PtrStorage().store(ptr_value, std::memory_order_release);
       seq_lock_.IncrementModificationCount();
       break;
   }
@@ -305,9 +381,10 @@ std::string FlagImpl::CurrentValue() const {
       ReadSequenceLockedData(cloned.get());
       return flags_internal::Unparse(op_, cloned.get());
     }
-    case FlagValueStorageKind::kAlignedBuffer: {
+    case FlagValueStorageKind::kHeapAllocated: {
       absl::MutexLock l(guard);
-      return flags_internal::Unparse(op_, AlignedBufferValue());
+      return flags_internal::Unparse(
+          op_, PtrStorage().load(std::memory_order_acquire).Ptr());
     }
   }
 
@@ -370,10 +447,12 @@ std::unique_ptr<FlagStateInterface> FlagImpl::SaveState() {
       return absl::make_unique<FlagState>(*this, cloned, modified,
                                           on_command_line, ModificationCount());
     }
-    case FlagValueStorageKind::kAlignedBuffer: {
+    case FlagValueStorageKind::kHeapAllocated: {
       return absl::make_unique<FlagState>(
-          *this, flags_internal::Clone(op_, AlignedBufferValue()), modified,
-          on_command_line, ModificationCount());
+          *this,
+          flags_internal::Clone(
+              op_, PtrStorage().load(std::memory_order_acquire).Ptr()),
+          modified, on_command_line, ModificationCount());
     }
   }
   return nullptr;
@@ -388,11 +467,11 @@ bool FlagImpl::RestoreState(const FlagState& flag_state) {
   switch (ValueStorageKind()) {
     case FlagValueStorageKind::kValueAndInitBit:
     case FlagValueStorageKind::kOneWordAtomic:
-      StoreValue(&flag_state.value_.one_word);
+      StoreValue(&flag_state.value_.one_word, kProgrammaticChange);
       break;
     case FlagValueStorageKind::kSequenceLocked:
-    case FlagValueStorageKind::kAlignedBuffer:
-      StoreValue(flag_state.value_.heap_allocated);
+    case FlagValueStorageKind::kHeapAllocated:
+      StoreValue(flag_state.value_.heap_allocated, kProgrammaticChange);
       break;
   }
 
@@ -411,11 +490,6 @@ StorageT* FlagImpl::OffsetValue() const {
   return reinterpret_cast<StorageT*>(p + offset);
 }
 
-void* FlagImpl::AlignedBufferValue() const {
-  assert(ValueStorageKind() == FlagValueStorageKind::kAlignedBuffer);
-  return OffsetValue<void>();
-}
-
 std::atomic<uint64_t>* FlagImpl::AtomicBufferValue() const {
   assert(ValueStorageKind() == FlagValueStorageKind::kSequenceLocked);
   return OffsetValue<std::atomic<uint64_t>>();
@@ -427,6 +501,11 @@ std::atomic<int64_t>& FlagImpl::OneWordValue() const {
   return OffsetValue<FlagOneWordValue>()->value;
 }
 
+std::atomic<MaskedPointer>& FlagImpl::PtrStorage() const {
+  assert(ValueStorageKind() == FlagValueStorageKind::kHeapAllocated);
+  return OffsetValue<FlagMaskedPointerValue>()->value;
+}
+
 // Attempts to parse supplied `value` string using parsing routine in the `flag`
 // argument. If parsing successful, this function replaces the dst with newly
 // parsed value. In case if any error is encountered in either step, the error
@@ -460,9 +539,17 @@ void FlagImpl::Read(void* dst) const {
       ReadSequenceLockedData(dst);
       break;
     }
-    case FlagValueStorageKind::kAlignedBuffer: {
+    case FlagValueStorageKind::kHeapAllocated: {
       absl::MutexLock l(guard);
-      flags_internal::CopyConstruct(op_, AlignedBufferValue(), dst);
+      MaskedPointer ptr_value = PtrStorage().load(std::memory_order_acquire);
+
+      flags_internal::CopyConstruct(op_, ptr_value.Ptr(), dst);
+
+      // For unprotected read candidates, mark that the value as has been read.
+      if (ptr_value.IsUnprotectedReadCandidate() && !ptr_value.HasBeenRead()) {
+        ptr_value.MarkAsRead();
+        PtrStorage().store(ptr_value, std::memory_order_release);
+      }
       break;
     }
   }
@@ -513,7 +600,7 @@ void FlagImpl::Write(const void* src) {
     }
   }
 
-  StoreValue(src);
+  StoreValue(src, kProgrammaticChange);
 }
 
 // Sets the value of the flag based on specified string `value`. If the flag
@@ -534,7 +621,7 @@ bool FlagImpl::ParseFrom(absl::string_view value, FlagSettingMode set_mode,
       auto tentative_value = TryParse(value, err);
       if (!tentative_value) return false;
 
-      StoreValue(tentative_value.get());
+      StoreValue(tentative_value.get(), source);
 
       if (source == kCommandLine) {
         on_command_line_ = true;
@@ -555,7 +642,7 @@ bool FlagImpl::ParseFrom(absl::string_view value, FlagSettingMode set_mode,
       auto tentative_value = TryParse(value, err);
       if (!tentative_value) return false;
 
-      StoreValue(tentative_value.get());
+      StoreValue(tentative_value.get(), source);
       break;
     }
     case SET_FLAGS_DEFAULT: {
@@ -573,7 +660,7 @@ bool FlagImpl::ParseFrom(absl::string_view value, FlagSettingMode set_mode,
 
       if (!modified_) {
         // Need to set both default value *and* current, in this case.
-        StoreValue(default_value_.dynamic_value);
+        StoreValue(default_value_.dynamic_value, source);
         modified_ = false;
       }
       break;
diff --git a/contrib/restricted/abseil-cpp/absl/flags/internal/flag.h b/contrib/restricted/abseil-cpp/absl/flags/internal/flag.h
index 2e6e6b874254..a0be31d93a74 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/internal/flag.h
+++ b/contrib/restricted/abseil-cpp/absl/flags/internal/flag.h
@@ -22,7 +22,6 @@
 #include <atomic>
 #include <cstring>
 #include <memory>
-#include <new>
 #include <string>
 #include <type_traits>
 #include <typeinfo>
@@ -296,11 +295,8 @@ constexpr FlagDefaultArg DefaultArg(char) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// Flag current value auxiliary structs.
-
-constexpr int64_t UninitializedFlagValue() {
-  return static_cast<int64_t>(0xababababababababll);
-}
+// Flag storage selector traits. Each trait indicates what kind of storage kind
+// to use for the flag value.
 
 template <typename T>
 using FlagUseValueAndInitBitStorage =
@@ -322,9 +318,11 @@ enum class FlagValueStorageKind : uint8_t {
   kValueAndInitBit = 0,
   kOneWordAtomic = 1,
   kSequenceLocked = 2,
-  kAlignedBuffer = 3,
+  kHeapAllocated = 3,
 };
 
+// This constexpr function returns the storage kind for the given flag value
+// type.
 template <typename T>
 static constexpr FlagValueStorageKind StorageKind() {
   return FlagUseValueAndInitBitStorage<T>::value
@@ -333,14 +331,24 @@ static constexpr FlagValueStorageKind StorageKind() {
              ? FlagValueStorageKind::kOneWordAtomic
          : FlagUseSequenceLockStorage<T>::value
              ? FlagValueStorageKind::kSequenceLocked
-             : FlagValueStorageKind::kAlignedBuffer;
+             : FlagValueStorageKind::kHeapAllocated;
 }
 
+// This is a base class for the storage classes used by kOneWordAtomic and
+// kValueAndInitBit storage kinds. It literally just stores the one word value
+// as an atomic. By default, it is initialized to a magic value that is unlikely
+// a valid value for the flag value type.
 struct FlagOneWordValue {
+  constexpr static int64_t Uninitialized() {
+    return static_cast<int64_t>(0xababababababababll);
+  }
+
+  constexpr FlagOneWordValue() : value(Uninitialized()) {}
   constexpr explicit FlagOneWordValue(int64_t v) : value(v) {}
   std::atomic<int64_t> value;
 };
 
+// This class represents a memory layout used by kValueAndInitBit storage kind.
 template <typename T>
 struct alignas(8) FlagValueAndInitBit {
   T value;
@@ -349,16 +357,91 @@ struct alignas(8) FlagValueAndInitBit {
   uint8_t init;
 };
 
+// This class implements an aligned pointer with two options stored via masks
+// in unused bits of the pointer value (due to alignment requirement).
+//  - IsUnprotectedReadCandidate - indicates that the value can be switched to
+//    unprotected read without a lock.
+//  - HasBeenRead - indicates that the value has been read at least once.
+//  - AllowsUnprotectedRead - combination of the two options above and indicates
+//    that the value can now be read without a lock.
+// Further details of these options and their use is covered in the description
+// of the FlagValue<T, FlagValueStorageKind::kHeapAllocated> specialization.
+class MaskedPointer {
+ public:
+  using mask_t = uintptr_t;
+  using ptr_t = void*;
+
+  static constexpr int RequiredAlignment() { return 4; }
+
+  constexpr explicit MaskedPointer(ptr_t rhs) : ptr_(rhs) {}
+  MaskedPointer(ptr_t rhs, bool is_candidate);
+
+  void* Ptr() const {
+    return reinterpret_cast<void*>(reinterpret_cast<mask_t>(ptr_) &
+                                   kPtrValueMask);
+  }
+  bool AllowsUnprotectedRead() const {
+    return (reinterpret_cast<mask_t>(ptr_) & kAllowsUnprotectedRead) ==
+           kAllowsUnprotectedRead;
+  }
+  bool IsUnprotectedReadCandidate() const;
+  bool HasBeenRead() const;
+
+  void Set(FlagOpFn op, const void* src, bool is_candidate);
+  void MarkAsRead();
+
+ private:
+  // Masks
+  // Indicates that the flag value either default or originated from command
+  // line.
+  static constexpr mask_t kUnprotectedReadCandidate = 0x1u;
+  // Indicates that flag has been read.
+  static constexpr mask_t kHasBeenRead = 0x2u;
+  static constexpr mask_t kAllowsUnprotectedRead =
+      kUnprotectedReadCandidate | kHasBeenRead;
+  static constexpr mask_t kPtrValueMask = ~kAllowsUnprotectedRead;
+
+  void ApplyMask(mask_t mask);
+  bool CheckMask(mask_t mask) const;
+
+  ptr_t ptr_;
+};
+
+// This class implements a type erased storage of the heap allocated flag value.
+// It is used as a base class for the storage class for kHeapAllocated storage
+// kind. The initial_buffer is expected to have an alignment of at least
+// MaskedPointer::RequiredAlignment(), so that the bits used by the
+// MaskedPointer to store masks are set to 0. This guarantees that value starts
+// in an uninitialized state.
+struct FlagMaskedPointerValue {
+  constexpr explicit FlagMaskedPointerValue(MaskedPointer::ptr_t initial_buffer)
+      : value(MaskedPointer(initial_buffer)) {}
+
+  std::atomic<MaskedPointer> value;
+};
+
+// This is the forward declaration for the template that represents a storage
+// for the flag values. This template is expected to be explicitly specialized
+// for each storage kind and it does not have a generic default
+// implementation.
 template <typename T,
           FlagValueStorageKind Kind = flags_internal::StorageKind<T>()>
 struct FlagValue;
 
+// This specialization represents the storage of flag values types with the
+// kValueAndInitBit storage kind. It is based on the FlagOneWordValue class
+// and relies on memory layout in FlagValueAndInitBit<T> to indicate that the
+// value has been initialized or not.
 template <typename T>
 struct FlagValue<T, FlagValueStorageKind::kValueAndInitBit> : FlagOneWordValue {
   constexpr FlagValue() : FlagOneWordValue(0) {}
   bool Get(const SequenceLock&, T& dst) const {
     int64_t storage = value.load(std::memory_order_acquire);
     if (ABSL_PREDICT_FALSE(storage == 0)) {
+      // This assert is to ensure that the initialization inside FlagImpl::Init
+      // is able to set init member correctly.
+      static_assert(offsetof(FlagValueAndInitBit<T>, init) == sizeof(T),
+                    "Unexpected memory layout of FlagValueAndInitBit");
       return false;
     }
     dst = absl::bit_cast<FlagValueAndInitBit<T>>(storage).value;
@@ -366,12 +449,16 @@ struct FlagValue<T, FlagValueStorageKind::kValueAndInitBit> : FlagOneWordValue {
   }
 };
 
+// This specialization represents the storage of flag values types with the
+// kOneWordAtomic storage kind. It is based on the FlagOneWordValue class
+// and relies on the magic uninitialized state of default constructed instead of
+// FlagOneWordValue to indicate that the value has been initialized or not.
 template <typename T>
 struct FlagValue<T, FlagValueStorageKind::kOneWordAtomic> : FlagOneWordValue {
-  constexpr FlagValue() : FlagOneWordValue(UninitializedFlagValue()) {}
+  constexpr FlagValue() : FlagOneWordValue() {}
   bool Get(const SequenceLock&, T& dst) const {
     int64_t one_word_val = value.load(std::memory_order_acquire);
-    if (ABSL_PREDICT_FALSE(one_word_val == UninitializedFlagValue())) {
+    if (ABSL_PREDICT_FALSE(one_word_val == FlagOneWordValue::Uninitialized())) {
       return false;
     }
     std::memcpy(&dst, static_cast<const void*>(&one_word_val), sizeof(T));
@@ -379,6 +466,12 @@ struct FlagValue<T, FlagValueStorageKind::kOneWordAtomic> : FlagOneWordValue {
   }
 };
 
+// This specialization represents the storage of flag values types with the
+// kSequenceLocked storage kind. This storage is used by trivially copyable
+// types with size greater than 8 bytes. This storage relies on uninitialized
+// state of the SequenceLock to indicate that the value has been initialized or
+// not. This storage also provides lock-free read access to the underlying
+// value once it is initialized.
 template <typename T>
 struct FlagValue<T, FlagValueStorageKind::kSequenceLocked> {
   bool Get(const SequenceLock& lock, T& dst) const {
@@ -392,11 +485,62 @@ struct FlagValue<T, FlagValueStorageKind::kSequenceLocked> {
       std::atomic<uint64_t>) std::atomic<uint64_t> value_words[kNumWords];
 };
 
+// This specialization represents the storage of flag values types with the
+// kHeapAllocated storage kind. This is a storage of last resort and is used
+// if none of other storage kinds are applicable.
+//
+// Generally speaking the values with this storage kind can't be accessed
+// atomically and thus can't be read without holding a lock. If we would ever
+// want to avoid the lock, we'd need to leak the old value every time new flag
+// value is being set (since we are in danger of having a race condition
+// otherwise).
+//
+// Instead of doing that, this implementation attempts to cater to some common
+// use cases by allowing at most 2 values to be leaked - default value and
+// value set from the command line.
+//
+// This specialization provides an initial buffer for the first flag value. This
+// is where the default value is going to be stored. We attempt to reuse this
+// buffer if possible, including storing the value set from the command line
+// there.
+//
+// As long as we only read this value, we can access it without a lock (in
+// practice we still use the lock for the very first read to be able set
+// "has been read" option on this flag).
+//
+// If flag is specified on the command line we store the parsed value either
+// in the internal buffer (if the default value never been read) or we leak the
+// default value and allocate the new storage for the parse value. This value is
+// also a candidate for an unprotected read. If flag is set programmatically
+// after the command line is parsed, the storage for this value is going to be
+// leaked. Note that in both scenarios we are not going to have a real leak.
+// Instead we'll store the leaked value pointers in the internal freelist to
+// avoid triggering the memory leak checker complains.
+//
+// If the flag is ever set programmatically, it stops being the candidate for an
+// unprotected read, and any follow up access to the flag value requires a lock.
+// Note that if the value if set programmatically before the command line is
+// parsed, we can switch back to enabling unprotected reads for that value.
 template <typename T>
-struct FlagValue<T, FlagValueStorageKind::kAlignedBuffer> {
-  bool Get(const SequenceLock&, T&) const { return false; }
+struct FlagValue<T, FlagValueStorageKind::kHeapAllocated>
+    : FlagMaskedPointerValue {
+  // We const initialize the value with unmasked pointer to the internal buffer,
+  // making sure it is not a candidate for unprotected read. This way we can
+  // ensure Init is done before any access to the flag value.
+  constexpr FlagValue() : FlagMaskedPointerValue(&buffer[0]) {}
+
+  bool Get(const SequenceLock&, T& dst) const {
+    MaskedPointer ptr_value = value.load(std::memory_order_acquire);
 
-  alignas(T) char value[sizeof(T)];
+    if (ABSL_PREDICT_TRUE(ptr_value.AllowsUnprotectedRead())) {
+      ::new (static_cast<void*>(&dst)) T(*static_cast<T*>(ptr_value.Ptr()));
+      return true;
+    }
+    return false;
+  }
+
+  alignas(MaskedPointer::RequiredAlignment()) alignas(
+      T) char buffer[sizeof(T)]{};
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -425,6 +569,13 @@ struct DynValueDeleter {
 
 class FlagState;
 
+// These are only used as constexpr global objects.
+// They do not use a virtual destructor to simplify their implementation.
+// They are not destroyed except at program exit, so leaks do not matter.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 class FlagImpl final : public CommandLineFlag {
  public:
   constexpr FlagImpl(const char* name, const char* filename, FlagOpFn op,
@@ -477,7 +628,7 @@ class FlagImpl final : public CommandLineFlag {
   // Used in read/write operations to validate source/target has correct type.
   // For example if flag is declared as absl::Flag<int> FLAGS_foo, a call to
   // absl::GetFlag(FLAGS_foo) validates that the type of FLAGS_foo is indeed
-  // int. To do that we pass the "assumed" type id (which is deduced from type
+  // int. To do that we pass the assumed type id (which is deduced from type
   // int) as an argument `type_id`, which is in turn is validated against the
   // type id stored in flag object by flag definition statement.
   void AssertValidType(FlagFastTypeId type_id,
@@ -498,17 +649,13 @@ class FlagImpl final : public CommandLineFlag {
   void Init();
 
   // Offset value access methods. One per storage kind. These methods to not
-  // respect const correctness, so be very carefull using them.
+  // respect const correctness, so be very careful using them.
 
   // This is a shared helper routine which encapsulates most of the magic. Since
   // it is only used inside the three routines below, which are defined in
   // flag.cc, we can define it in that file as well.
   template <typename StorageT>
   StorageT* OffsetValue() const;
-  // This is an accessor for a value stored in an aligned buffer storage
-  // used for non-trivially-copyable data types.
-  // Returns a mutable pointer to the start of a buffer.
-  void* AlignedBufferValue() const;
 
   // The same as above, but used for sequencelock-protected storage.
   std::atomic<uint64_t>* AtomicBufferValue() const;
@@ -517,13 +664,16 @@ class FlagImpl final : public CommandLineFlag {
   // mutable reference to an atomic value.
   std::atomic<int64_t>& OneWordValue() const;
 
+  std::atomic<MaskedPointer>& PtrStorage() const;
+
   // Attempts to parse supplied `value` string. If parsing is successful,
   // returns new value. Otherwise returns nullptr.
   std::unique_ptr<void, DynValueDeleter> TryParse(absl::string_view value,
                                                   std::string& err) const
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(*DataGuard());
   // Stores the flag value based on the pointer to the source.
-  void StoreValue(const void* src) ABSL_EXCLUSIVE_LOCKS_REQUIRED(*DataGuard());
+  void StoreValue(const void* src, ValueSource source)
+      ABSL_EXCLUSIVE_LOCKS_REQUIRED(*DataGuard());
 
   // Copy the flag data, protected by `seq_lock_` into `dst`.
   //
@@ -579,7 +729,7 @@ class FlagImpl final : public CommandLineFlag {
   const char* const name_;
   // The file name where ABSL_FLAG resides.
   const char* const filename_;
-  // Type-specific operations "vtable".
+  // Type-specific operations vtable.
   const FlagOpFn op_;
   // Help message literal or function to generate it.
   const FlagHelpMsg help_;
@@ -624,6 +774,9 @@ class FlagImpl final : public CommandLineFlag {
   // problems.
   alignas(absl::Mutex) mutable char data_guard_[sizeof(absl::Mutex)];
 };
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // The Flag object parameterized by the flag's value type. This class implements
@@ -711,16 +864,21 @@ class FlagImplPeer {
 // Implementation of Flag value specific operations routine.
 template <typename T>
 void* FlagOps(FlagOp op, const void* v1, void* v2, void* v3) {
+  struct AlignedSpace {
+    alignas(MaskedPointer::RequiredAlignment()) alignas(T) char buf[sizeof(T)];
+  };
+  using Allocator = std::allocator<AlignedSpace>;
   switch (op) {
     case FlagOp::kAlloc: {
-      std::allocator<T> alloc;
-      return std::allocator_traits<std::allocator<T>>::allocate(alloc, 1);
+      Allocator alloc;
+      return std::allocator_traits<Allocator>::allocate(alloc, 1);
     }
     case FlagOp::kDelete: {
       T* p = static_cast<T*>(v2);
       p->~T();
-      std::allocator<T> alloc;
-      std::allocator_traits<std::allocator<T>>::deallocate(alloc, p, 1);
+      Allocator alloc;
+      std::allocator_traits<Allocator>::deallocate(
+          alloc, reinterpret_cast<AlignedSpace*>(p), 1);
       return nullptr;
     }
     case FlagOp::kCopy:
@@ -754,8 +912,7 @@ void* FlagOps(FlagOp op, const void* v1, void* v2, void* v3) {
       // Round sizeof(FlagImp) to a multiple of alignof(FlagValue<T>) to get the
       // offset of the data.
       size_t round_to = alignof(FlagValue<T>);
-      size_t offset =
-          (sizeof(FlagImpl) + round_to - 1) / round_to * round_to;
+      size_t offset = (sizeof(FlagImpl) + round_to - 1) / round_to * round_to;
       return reinterpret_cast<void*>(offset);
     }
   }
@@ -770,7 +927,8 @@ struct FlagRegistrarEmpty {};
 template <typename T, bool do_register>
 class FlagRegistrar {
  public:
-  explicit FlagRegistrar(Flag<T>& flag, const char* filename) : flag_(flag) {
+  constexpr explicit FlagRegistrar(Flag<T>& flag, const char* filename)
+      : flag_(flag) {
     if (do_register)
       flags_internal::RegisterCommandLineFlag(flag_.impl_, filename);
   }
@@ -780,15 +938,19 @@ class FlagRegistrar {
     return *this;
   }
 
-  // Make the registrar "die" gracefully as an empty struct on a line where
+  // Makes the registrar die gracefully as an empty struct on a line where
   // registration happens. Registrar objects are intended to live only as
   // temporary.
-  operator FlagRegistrarEmpty() const { return {}; }  // NOLINT
+  constexpr operator FlagRegistrarEmpty() const { return {}; }  // NOLINT
 
  private:
   Flag<T>& flag_;  // Flag being registered (not owned).
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// Test only API
+uint64_t NumLeakedFlagValues();
+
 }  // namespace flags_internal
 ABSL_NAMESPACE_END
 }  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/flags/reflection.cc b/contrib/restricted/abseil-cpp/absl/flags/reflection.cc
index 841921a926ff..ea856ff9c160 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/reflection.cc
+++ b/contrib/restricted/abseil-cpp/absl/flags/reflection.cc
@@ -217,6 +217,13 @@ void FinalizeRegistry() {
 
 namespace {
 
+// These are only used as constexpr global objects.
+// They do not use a virtual destructor to simplify their implementation.
+// They are not destroyed except at program exit, so leaks do not matter.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 class RetiredFlagObj final : public CommandLineFlag {
  public:
   constexpr RetiredFlagObj(const char* name, FlagFastTypeId type_id)
@@ -276,6 +283,9 @@ class RetiredFlagObj final : public CommandLineFlag {
   const char* const name_;
   const FlagFastTypeId type_id_;
 };
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 
 }  // namespace
 
diff --git a/contrib/restricted/abseil-cpp/absl/functional/any_invocable.h b/contrib/restricted/abseil-cpp/absl/functional/any_invocable.h
index 68d882532e1b..3acb9fd08962 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/any_invocable.h
+++ b/contrib/restricted/abseil-cpp/absl/functional/any_invocable.h
@@ -34,6 +34,7 @@
 #define ABSL_FUNCTIONAL_ANY_INVOCABLE_H_
 
 #include <cstddef>
+#include <functional>
 #include <initializer_list>
 #include <type_traits>
 #include <utility>
@@ -98,9 +99,9 @@ ABSL_NAMESPACE_BEGIN
 // `AnyInvocable` also properly respects `const` qualifiers, reference
 // qualifiers, and the `noexcept` specification (only in C++ 17 and beyond) as
 // part of the user-specified function type (e.g.
-// `AnyInvocable<void()&& const noexcept>`). These qualifiers will be applied to
-// the `AnyInvocable` object's `operator()`, and the underlying invocable must
-// be compatible with those qualifiers.
+// `AnyInvocable<void() const && noexcept>`). These qualifiers will be applied
+// to the `AnyInvocable` object's `operator()`, and the underlying invocable
+// must be compatible with those qualifiers.
 //
 // Comparison of const and non-const function types:
 //
@@ -151,6 +152,12 @@ ABSL_NAMESPACE_BEGIN
 //
 // Attempting to call `absl::AnyInvocable` multiple times in such a case
 // results in undefined behavior.
+//
+// Invoking an empty `absl::AnyInvocable` results in undefined behavior:
+//
+//   // Create an empty instance using the default constructor.
+//   AnyInvocable<void()> empty;
+//   empty();  // WARNING: Undefined behavior!
 template <class Sig>
 class AnyInvocable : private internal_any_invocable::Impl<Sig> {
  private:
@@ -167,6 +174,7 @@ class AnyInvocable : private internal_any_invocable::Impl<Sig> {
   // Constructors
 
   // Constructs the `AnyInvocable` in an empty state.
+  // Invoking it results in undefined behavior.
   AnyInvocable() noexcept = default;
   AnyInvocable(std::nullptr_t) noexcept {}  // NOLINT
 
@@ -277,6 +285,8 @@ class AnyInvocable : private internal_any_invocable::Impl<Sig> {
   // In other words:
   //   std::function<void()> f;  // empty
   //   absl::AnyInvocable<void()> a = std::move(f);  // not empty
+  //
+  // Invoking an empty `AnyInvocable` results in undefined behavior.
   explicit operator bool() const noexcept { return this->HasValue(); }
 
   // Invokes the target object of `*this`. `*this` must not be empty.
diff --git a/contrib/restricted/abseil-cpp/absl/functional/internal/any_invocable.h b/contrib/restricted/abseil-cpp/absl/functional/internal/any_invocable.h
index b04436d1d642..c2d8cd4727a7 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/internal/any_invocable.h
+++ b/contrib/restricted/abseil-cpp/absl/functional/internal/any_invocable.h
@@ -19,11 +19,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
-// This implementation of the proposed `any_invocable` uses an approach that  //
-// chooses between local storage and remote storage for the contained target  //
-// object based on the target object's size, alignment requirements, and      //
-// whether or not it has a nothrow move constructor. Additional optimizations //
-// are performed when the object is a trivially copyable type [basic.types].  //
+// This implementation chooses between local storage and remote storage for   //
+// the contained target object based on the target object's size, alignment   //
+// requirements, and whether or not it has a nothrow move constructor.        //
+// Additional optimizations are performed when the object is a trivially      //
+// copyable type [basic.types].                                               //
 //                                                                            //
 // There are three datamembers per `AnyInvocable` instance                    //
 //                                                                            //
@@ -39,7 +39,7 @@
 //    target object, directly returning the result.                           //
 //                                                                            //
 // When in the logically empty state, the manager function is an empty        //
-// function and the invoker function is one that would be undefined-behavior  //
+// function and the invoker function is one that would be undefined behavior  //
 // to call.                                                                   //
 //                                                                            //
 // An additional optimization is performed when converting from one           //
@@ -58,12 +58,12 @@
 #include <cstring>
 #include <exception>
 #include <functional>
-#include <initializer_list>
 #include <memory>
 #include <new>
 #include <type_traits>
 #include <utility>
 
+#include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/internal/invoke.h"
 #include "absl/base/macros.h"
diff --git a/contrib/restricted/abseil-cpp/absl/functional/ya.make b/contrib/restricted/abseil-cpp/absl/functional/ya.make
index ac5695f0720e..467248d2799d 100644
--- a/contrib/restricted/abseil-cpp/absl/functional/ya.make
+++ b/contrib/restricted/abseil-cpp/absl/functional/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 NO_RUNTIME()
 
diff --git a/contrib/restricted/abseil-cpp/absl/hash/internal/hash.cc b/contrib/restricted/abseil-cpp/absl/hash/internal/hash.cc
index 11451e575c0a..93906ef87268 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/internal/hash.cc
+++ b/contrib/restricted/abseil-cpp/absl/hash/internal/hash.cc
@@ -61,7 +61,7 @@ constexpr uint64_t kHashSalt[5] = {
 
 uint64_t MixingHashState::LowLevelHashImpl(const unsigned char* data,
                                            size_t len) {
-  return LowLevelHash(data, len, Seed(), kHashSalt);
+  return LowLevelHashLenGt16(data, len, Seed(), kHashSalt);
 }
 
 }  // namespace hash_internal
diff --git a/contrib/restricted/abseil-cpp/absl/hash/internal/hash.h b/contrib/restricted/abseil-cpp/absl/hash/internal/hash.h
index f4a94f9129f4..03bf18390574 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/internal/hash.h
+++ b/contrib/restricted/abseil-cpp/absl/hash/internal/hash.h
@@ -24,6 +24,15 @@
 #include <TargetConditionals.h>
 #endif
 
+#include "absl/base/config.h"
+
+// For feature testing and determining which headers can be included.
+#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L
+#include <version>
+#else
+#include <ciso646>
+#endif
+
 #include <algorithm>
 #include <array>
 #include <bitset>
@@ -47,7 +56,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/base/config.h"
 #include "absl/base/internal/unaligned_access.h"
 #include "absl/base/port.h"
 #include "absl/container/fixed_array.h"
@@ -61,7 +69,7 @@
 #include "absl/types/variant.h"
 #include "absl/utility/utility.h"
 
-#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L && \
+#if defined(__cpp_lib_filesystem) && __cpp_lib_filesystem >= 201703L && \
     !defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)
 #include <filesystem>  // NOLINT
 #endif
@@ -591,7 +599,9 @@ H AbslHashValue(H hash_state, std::basic_string_view<Char> str) {
 #if defined(__cpp_lib_filesystem) && __cpp_lib_filesystem >= 201703L && \
     !defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY) && \
     (!defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) ||        \
-     __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000)
+     __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000) &&       \
+    (!defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) ||         \
+     __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101500)
 
 #define ABSL_INTERNAL_STD_FILESYSTEM_PATH_HASH_AVAILABLE 1
 
diff --git a/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.cc b/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.cc
index b5db0b89601c..6dc71cf7cdf1 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.cc
+++ b/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.cc
@@ -14,6 +14,9 @@
 
 #include "absl/hash/internal/low_level_hash.h"
 
+#include <cstddef>
+#include <cstdint>
+
 #include "absl/base/internal/unaligned_access.h"
 #include "absl/base/prefetch.h"
 #include "absl/numeric/int128.h"
@@ -28,19 +31,22 @@ static uint64_t Mix(uint64_t v0, uint64_t v1) {
   return absl::Uint128Low64(p) ^ absl::Uint128High64(p);
 }
 
-uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
-                      const uint64_t salt[5]) {
+uint64_t LowLevelHashLenGt16(const void* data, size_t len, uint64_t seed,
+                             const uint64_t salt[5]) {
   // Prefetch the cacheline that data resides in.
   PrefetchToLocalCache(data);
   const uint8_t* ptr = static_cast<const uint8_t*>(data);
   uint64_t starting_length = static_cast<uint64_t>(len);
+  const uint8_t* last_16_ptr = ptr + starting_length - 16;
   uint64_t current_state = seed ^ salt[0];
 
   if (len > 64) {
     // If we have more than 64 bytes, we're going to handle chunks of 64
     // bytes at a time. We're going to build up two separate hash states
     // which we will then hash together.
-    uint64_t duplicated_state = current_state;
+    uint64_t duplicated_state0 = current_state;
+    uint64_t duplicated_state1 = current_state;
+    uint64_t duplicated_state2 = current_state;
 
     do {
       // Always prefetch the next cacheline.
@@ -55,40 +61,72 @@ uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
       uint64_t g = absl::base_internal::UnalignedLoad64(ptr + 48);
       uint64_t h = absl::base_internal::UnalignedLoad64(ptr + 56);
 
-      uint64_t cs0 = Mix(a ^ salt[1], b ^ current_state);
-      uint64_t cs1 = Mix(c ^ salt[2], d ^ current_state);
-      current_state = (cs0 ^ cs1);
+      current_state = Mix(a ^ salt[1], b ^ current_state);
+      duplicated_state0 = Mix(c ^ salt[2], d ^ duplicated_state0);
 
-      uint64_t ds0 = Mix(e ^ salt[3], f ^ duplicated_state);
-      uint64_t ds1 = Mix(g ^ salt[4], h ^ duplicated_state);
-      duplicated_state = (ds0 ^ ds1);
+      duplicated_state1 = Mix(e ^ salt[3], f ^ duplicated_state1);
+      duplicated_state2 = Mix(g ^ salt[4], h ^ duplicated_state2);
 
       ptr += 64;
       len -= 64;
     } while (len > 64);
 
-    current_state = current_state ^ duplicated_state;
+    current_state = (current_state ^ duplicated_state0) ^
+                    (duplicated_state1 + duplicated_state2);
   }
 
   // We now have a data `ptr` with at most 64 bytes and the current state
   // of the hashing state machine stored in current_state.
-  while (len > 16) {
+  if (len > 32) {
     uint64_t a = absl::base_internal::UnalignedLoad64(ptr);
     uint64_t b = absl::base_internal::UnalignedLoad64(ptr + 8);
+    uint64_t c = absl::base_internal::UnalignedLoad64(ptr + 16);
+    uint64_t d = absl::base_internal::UnalignedLoad64(ptr + 24);
 
-    current_state = Mix(a ^ salt[1], b ^ current_state);
+    uint64_t cs0 = Mix(a ^ salt[1], b ^ current_state);
+    uint64_t cs1 = Mix(c ^ salt[2], d ^ current_state);
+    current_state = cs0 ^ cs1;
+
+    ptr += 32;
+    len -= 32;
+  }
 
-    ptr += 16;
-    len -= 16;
+  // We now have a data `ptr` with at most 32 bytes and the current state
+  // of the hashing state machine stored in current_state.
+  if (len > 16) {
+    uint64_t a = absl::base_internal::UnalignedLoad64(ptr);
+    uint64_t b = absl::base_internal::UnalignedLoad64(ptr + 8);
+
+    current_state = Mix(a ^ salt[1], b ^ current_state);
   }
 
-  // We now have a data `ptr` with at most 16 bytes.
+  // We now have a data `ptr` with at least 1 and at most 16 bytes. But we can
+  // safely read from `ptr + len - 16`.
+  uint64_t a = absl::base_internal::UnalignedLoad64(last_16_ptr);
+  uint64_t b = absl::base_internal::UnalignedLoad64(last_16_ptr + 8);
+
+  return Mix(a ^ salt[1] ^ starting_length, b ^ current_state);
+}
+
+uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
+                      const uint64_t salt[5]) {
+  if (len > 16) return LowLevelHashLenGt16(data, len, seed, salt);
+
+  // Prefetch the cacheline that data resides in.
+  PrefetchToLocalCache(data);
+  const uint8_t* ptr = static_cast<const uint8_t*>(data);
+  uint64_t starting_length = static_cast<uint64_t>(len);
+  uint64_t current_state = seed ^ salt[0];
+  if (len == 0) return current_state;
+
   uint64_t a = 0;
   uint64_t b = 0;
+
+  // We now have a data `ptr` with at least 1 and at most 16 bytes.
   if (len > 8) {
     // When we have at least 9 and at most 16 bytes, set A to the first 64
-    // bits of the input and B to the last 64 bits of the input. Yes, they will
-    // overlap in the middle if we are working with less than the full 16
+    // bits of the input and B to the last 64 bits of the input. Yes, they
+    // will overlap in the middle if we are working with less than the full 16
     // bytes.
     a = absl::base_internal::UnalignedLoad64(ptr);
     b = absl::base_internal::UnalignedLoad64(ptr + len - 8);
@@ -97,20 +135,14 @@ uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
     // bits and B to the last 32 bits.
     a = absl::base_internal::UnalignedLoad32(ptr);
     b = absl::base_internal::UnalignedLoad32(ptr + len - 4);
-  } else if (len > 0) {
-    // If we have at least 1 and at most 3 bytes, read all of the provided
-    // bits into A, with some adjustments.
-    a = static_cast<uint64_t>((ptr[0] << 16) | (ptr[len >> 1] << 8) |
-                              ptr[len - 1]);
-    b = 0;
   } else {
-    a = 0;
-    b = 0;
+    // If we have at least 1 and at most 3 bytes, read 2 bytes into A and the
+    // other byte into B, with some adjustments.
+    a = static_cast<uint64_t>((ptr[0] << 8) | ptr[len - 1]);
+    b = static_cast<uint64_t>(ptr[len >> 1]);
   }
 
-  uint64_t w = Mix(a ^ salt[1], b ^ current_state);
-  uint64_t z = salt[1] ^ starting_length;
-  return Mix(w, z);
+  return Mix(a ^ salt[1] ^ starting_length, b ^ current_state);
 }
 
 }  // namespace hash_internal
diff --git a/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.h b/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.h
index 439968aa9808..d460e351980f 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.h
+++ b/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.h
@@ -43,6 +43,10 @@ namespace hash_internal {
 uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
                       const uint64_t salt[5]);
 
+// Same as above except the length must be greater than 16.
+uint64_t LowLevelHashLenGt16(const void* data, size_t len, uint64_t seed,
+                             const uint64_t salt[5]);
+
 }  // namespace hash_internal
 ABSL_NAMESPACE_END
 }  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/log/absl_vlog_is_on.h b/contrib/restricted/abseil-cpp/absl/log/absl_vlog_is_on.h
index 29096b4857b7..6bf6c413399f 100644
--- a/contrib/restricted/abseil-cpp/absl/log/absl_vlog_is_on.h
+++ b/contrib/restricted/abseil-cpp/absl/log/absl_vlog_is_on.h
@@ -46,12 +46,12 @@
 // Files which do not match any pattern in `--vmodule` use the value of `--v` as
 // their effective verbosity level.  The default is 0.
 //
-// SetVLOGLevel helper function is provided to do limited dynamic control over
+// SetVLogLevel helper function is provided to do limited dynamic control over
 // V-logging by appending to `--vmodule`. Because these go at the beginning of
 // the list, they take priority over any globs previously added.
 //
 // Resetting --vmodule will override all previous modifications to `--vmodule`,
-// including via SetVLOGLevel.
+// including via SetVLogLevel.
 
 #ifndef ABSL_LOG_ABSL_VLOG_IS_ON_H_
 #define ABSL_LOG_ABSL_VLOG_IS_ON_H_
@@ -77,7 +77,7 @@
 // Each ABSL_VLOG_IS_ON call site gets its own VLogSite that registers with the
 // global linked list of sites to asynchronously update its verbosity level on
 // changes to --v or --vmodule. The verbosity can also be set by manually
-// calling SetVLOGLevel.
+// calling SetVLogLevel.
 //
 // ABSL_VLOG_IS_ON is not async signal safe, but it is guaranteed not to
 // allocate new memory.
diff --git a/contrib/restricted/abseil-cpp/absl/log/die_if_null.h b/contrib/restricted/abseil-cpp/absl/log/die_if_null.h
index 127a9ac8824f..f773aa854e91 100644
--- a/contrib/restricted/abseil-cpp/absl/log/die_if_null.h
+++ b/contrib/restricted/abseil-cpp/absl/log/die_if_null.h
@@ -55,7 +55,7 @@ namespace log_internal {
 // `line` location. Called when `ABSL_DIE_IF_NULL` fails. Calling this function
 // generates less code than its implementation would if inlined, for a slight
 // code size reduction each time `ABSL_DIE_IF_NULL` is called.
-ABSL_ATTRIBUTE_NORETURN ABSL_ATTRIBUTE_NOINLINE void DieBecauseNull(
+[[noreturn]] ABSL_ATTRIBUTE_NOINLINE void DieBecauseNull(
     const char* file, int line, const char* exprtext);
 
 // Helper for `ABSL_DIE_IF_NULL`.
diff --git a/contrib/restricted/abseil-cpp/absl/log/globals.h b/contrib/restricted/abseil-cpp/absl/log/globals.h
index b36e47e6d137..4feec4078fa9 100644
--- a/contrib/restricted/abseil-cpp/absl/log/globals.h
+++ b/contrib/restricted/abseil-cpp/absl/log/globals.h
@@ -140,7 +140,7 @@ void ClearLogBacktraceLocation();
 //
 // This option tells the logging library that every logged message
 // should include the prefix (severity, date, time, PID, etc.)
-
+//
 // ShouldPrependLogPrefix()
 //
 // Returns the value of the Prepend Log Prefix option.
@@ -154,25 +154,38 @@ ABSL_MUST_USE_RESULT bool ShouldPrependLogPrefix();
 void EnableLogPrefix(bool on_off);
 
 //------------------------------------------------------------------------------
-// Set Global VLOG Level
+// `VLOG` Configuration
 //------------------------------------------------------------------------------
 //
-// Sets the global `(ABSL_)VLOG(_IS_ON)` level to `log_level`.  This level is
-// applied to any sites whose filename doesn't match any `module_pattern`.
-// Returns the prior value.
-inline int SetGlobalVLogLevel(int log_level) {
-  return absl::log_internal::UpdateGlobalVLogLevel(log_level);
+// These methods set the `(ABSL_)VLOG(_IS_ON)` threshold.  They allow
+// programmatic control of the thresholds set by the --v and --vmodule flags.
+//
+// Only `VLOG`s with a severity level LESS THAN OR EQUAL TO the threshold will
+// be evaluated.
+//
+// For example, if the threshold is 2, then:
+//
+//   VLOG(2) << "This message will be logged.";
+//   VLOG(3) << "This message will NOT be logged.";
+//
+// The default threshold is 0. Since `VLOG` levels must not be negative, a
+// negative threshold value will turn off all VLOGs.
+
+// SetGlobalVLogLevel()
+//
+// Sets the global `VLOG` level to threshold. Returns the previous global
+// threshold.
+inline int SetGlobalVLogLevel(int threshold) {
+  return absl::log_internal::UpdateGlobalVLogLevel(threshold);
 }
 
-//------------------------------------------------------------------------------
-// Set VLOG Level
-//------------------------------------------------------------------------------
+// SetVLogLevel()
 //
-// Sets `(ABSL_)VLOG(_IS_ON)` level for `module_pattern` to `log_level`.  This
-// allows programmatic control of what is normally set by the --vmodule flag.
-// Returns the level that previously applied to `module_pattern`.
-inline int SetVLogLevel(absl::string_view module_pattern, int log_level) {
-  return absl::log_internal::PrependVModule(module_pattern, log_level);
+// Sets the `VLOG` threshold for all files that match `module_pattern`,
+// overwriting any prior value. Files that don't match aren't affected.
+// Returns the threshold that previously applied to `module_pattern`.
+inline int SetVLogLevel(absl::string_view module_pattern, int threshold) {
+  return absl::log_internal::PrependVModule(module_pattern, threshold);
 }
 
 //------------------------------------------------------------------------------
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/check_op.cc b/contrib/restricted/abseil-cpp/absl/log/internal/check_op.cc
index f4b67647a6fb..23c4a3b20542 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/check_op.cc
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/check_op.cc
@@ -16,6 +16,10 @@
 
 #include <string.h>
 
+#include <ostream>
+
+#include "absl/strings/string_view.h"
+
 #ifdef _MSC_VER
 #define strcasecmp _stricmp
 #else
@@ -113,6 +117,22 @@ DEFINE_CHECK_STROP_IMPL(CHECK_STRCASEEQ, strcasecmp, true)
 DEFINE_CHECK_STROP_IMPL(CHECK_STRCASENE, strcasecmp, false)
 #undef DEFINE_CHECK_STROP_IMPL
 
+namespace detect_specialization {
+
+StringifySink::StringifySink(std::ostream& os) : os_(os) {}
+
+void StringifySink::Append(absl::string_view text) { os_ << text; }
+
+void StringifySink::Append(size_t length, char ch) {
+  for (size_t i = 0; i < length; ++i) os_.put(ch);
+}
+
+void AbslFormatFlush(StringifySink* sink, absl::string_view text) {
+  sink->Append(text);
+}
+
+}  // namespace detect_specialization
+
 }  // namespace log_internal
 ABSL_NAMESPACE_END
 }  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/check_op.h b/contrib/restricted/abseil-cpp/absl/log/internal/check_op.h
index 11f0f4078b62..215922079c96 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/check_op.h
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/check_op.h
@@ -24,9 +24,11 @@
 
 #include <stdint.h>
 
+#include <cstddef>
 #include <ostream>
 #include <sstream>
 #include <string>
+#include <type_traits>
 #include <utility>
 
 #include "absl/base/attributes.h"
@@ -35,6 +37,8 @@
 #include "absl/log/internal/nullguard.h"
 #include "absl/log/internal/nullstream.h"
 #include "absl/log/internal/strip.h"
+#include "absl/strings/has_absl_stringify.h"
+#include "absl/strings/string_view.h"
 
 // `ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL` wraps string literals that
 // should be stripped when `ABSL_MIN_LOG_LEVEL` exceeds `kFatal`.
@@ -58,13 +62,13 @@
 #endif
 
 #define ABSL_LOG_INTERNAL_CHECK_OP(name, op, val1, val1_text, val2, val2_text) \
-  while (                                                                      \
-      ::std::string* absl_log_internal_check_op_result ABSL_ATTRIBUTE_UNUSED = \
-          ::absl::log_internal::name##Impl(                                    \
-              ::absl::log_internal::GetReferenceableValue(val1),               \
-              ::absl::log_internal::GetReferenceableValue(val2),               \
-              ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(val1_text                 \
-                                                     " " #op " " val2_text)))  \
+  while (::std::string* absl_log_internal_check_op_result                      \
+             ABSL_LOG_INTERNAL_ATTRIBUTE_UNUSED_IF_STRIP_LOG =                 \
+                 ::absl::log_internal::name##Impl(                             \
+                     ::absl::log_internal::GetReferenceableValue(val1),        \
+                     ::absl::log_internal::GetReferenceableValue(val2),        \
+                     ABSL_LOG_INTERNAL_STRIP_STRING_LITERAL(                   \
+                         val1_text " " #op " " val2_text)))                    \
     ABSL_LOG_INTERNAL_CONDITION_FATAL(STATELESS, true)                         \
   ABSL_LOG_INTERNAL_CHECK(*absl_log_internal_check_op_result).InternalStream()
 #define ABSL_LOG_INTERNAL_QCHECK_OP(name, op, val1, val1_text, val2, \
@@ -287,6 +291,44 @@ decltype(detect_specialization::operator<<(std::declval<std::ostream&>(),
                                            std::declval<const T&>()))
 Detect(char);
 
+// A sink for AbslStringify which redirects everything to a std::ostream.
+class StringifySink {
+ public:
+  explicit StringifySink(std::ostream& os ABSL_ATTRIBUTE_LIFETIME_BOUND);
+
+  void Append(absl::string_view text);
+  void Append(size_t length, char ch);
+  friend void AbslFormatFlush(StringifySink* sink, absl::string_view text);
+
+ private:
+  std::ostream& os_;
+};
+
+// Wraps a type implementing AbslStringify, and implements operator<<.
+template <typename T>
+class StringifyToStreamWrapper {
+ public:
+  explicit StringifyToStreamWrapper(const T& v ABSL_ATTRIBUTE_LIFETIME_BOUND)
+      : v_(v) {}
+
+  friend std::ostream& operator<<(std::ostream& os,
+                                  const StringifyToStreamWrapper& wrapper) {
+    StringifySink sink(os);
+    AbslStringify(sink, wrapper.v_);
+    return os;
+  }
+
+ private:
+  const T& v_;
+};
+
+// This overload triggers when T implements AbslStringify.
+// StringifyToStreamWrapper is used to allow MakeCheckOpString to use
+// operator<<.
+template <typename T>
+std::enable_if_t<HasAbslStringify<T>::value,
+                 StringifyToStreamWrapper<T>>
+Detect(...);  // Ellipsis has lowest preference when int passed.
 }  // namespace detect_specialization
 
 template <typename T>
@@ -342,20 +384,20 @@ ABSL_LOG_INTERNAL_DEFINE_MAKE_CHECK_OP_STRING_EXTERN(const void*);
 // `(int, int)` override works around the issue that the compiler will not
 // instantiate the template version of the function on values of unnamed enum
 // type.
-#define ABSL_LOG_INTERNAL_CHECK_OP_IMPL(name, op)                        \
-  template <typename T1, typename T2>                                    \
-  inline constexpr ::std::string* name##Impl(const T1& v1, const T2& v2, \
-                                             const char* exprtext) {     \
-    using U1 = CheckOpStreamType<T1>;                                    \
-    using U2 = CheckOpStreamType<T2>;                                    \
-    return ABSL_PREDICT_TRUE(v1 op v2)                                   \
-               ? nullptr                                                 \
-               : ABSL_LOG_INTERNAL_CHECK_OP_IMPL_RESULT(U1, U2, v1, v2,  \
-                                                        exprtext);       \
-  }                                                                      \
-  inline constexpr ::std::string* name##Impl(int v1, int v2,             \
-                                             const char* exprtext) {     \
-    return name##Impl<int, int>(v1, v2, exprtext);                       \
+#define ABSL_LOG_INTERNAL_CHECK_OP_IMPL(name, op)                          \
+  template <typename T1, typename T2>                                      \
+  inline constexpr ::std::string* name##Impl(const T1& v1, const T2& v2,   \
+                                             const char* exprtext) {       \
+    using U1 = CheckOpStreamType<T1>;                                      \
+    using U2 = CheckOpStreamType<T2>;                                      \
+    return ABSL_PREDICT_TRUE(v1 op v2)                                     \
+               ? nullptr                                                   \
+               : ABSL_LOG_INTERNAL_CHECK_OP_IMPL_RESULT(U1, U2, U1(v1),    \
+                                                        U2(v2), exprtext); \
+  }                                                                        \
+  inline constexpr ::std::string* name##Impl(int v1, int v2,               \
+                                             const char* exprtext) {       \
+    return name##Impl<int, int>(v1, v2, exprtext);                         \
   }
 
 ABSL_LOG_INTERNAL_CHECK_OP_IMPL(Check_EQ, ==)
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/conditions.h b/contrib/restricted/abseil-cpp/absl/log/internal/conditions.h
index 645f3c23ea55..9dc15db4283d 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/conditions.h
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/conditions.h
@@ -230,8 +230,8 @@ class LogEveryNSecState final {
 
 // Helper routines to abort the application quietly
 
-ABSL_ATTRIBUTE_NORETURN inline void AbortQuietly() { abort(); }
-ABSL_ATTRIBUTE_NORETURN inline void ExitQuietly() { _exit(1); }
+[[noreturn]] inline void AbortQuietly() { abort(); }
+[[noreturn]] inline void ExitQuietly() { _exit(1); }
 }  // namespace log_internal
 ABSL_NAMESPACE_END
 }  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/log_impl.h b/contrib/restricted/abseil-cpp/absl/log/internal/log_impl.h
index 99de6dbb24c6..a67f2f31b4c7 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/log_impl.h
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/log_impl.h
@@ -35,14 +35,14 @@
 #ifndef NDEBUG
 #define ABSL_LOG_INTERNAL_DLOG_IMPL(severity)            \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATELESS, true) \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 #else
 #define ABSL_LOG_INTERNAL_DLOG_IMPL(severity)             \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATELESS, false) \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 #endif
 
-// The `switch` ensures that this expansion is the begnning of a statement (as
+// The `switch` ensures that this expansion is the beginning of a statement (as
 // opposed to an expression). The use of both `case 0` and `default` is to
 // suppress a compiler warning.
 #define ABSL_LOG_INTERNAL_VLOG_IMPL(verbose_level)                         \
@@ -58,7 +58,7 @@
   switch (const int absl_logging_internal_verbose_level = (verbose_level)) \
   case 0:                                                                  \
   default:                                                                 \
-    ABSL_LOG_INTERNAL_LOG_IF_IMPL(                                         \
+    ABSL_LOG_INTERNAL_DLOG_IF_IMPL(                                         \
         _INFO, ABSL_VLOG_IS_ON(absl_logging_internal_verbose_level))       \
         .WithVerbosity(absl_logging_internal_verbose_level)
 #else
@@ -66,7 +66,7 @@
   switch (const int absl_logging_internal_verbose_level = (verbose_level))    \
   case 0:                                                                     \
   default:                                                                    \
-    ABSL_LOG_INTERNAL_LOG_IF_IMPL(                                            \
+    ABSL_LOG_INTERNAL_DLOG_IF_IMPL(                                            \
         _INFO, false && ABSL_VLOG_IS_ON(absl_logging_internal_verbose_level)) \
         .WithVerbosity(absl_logging_internal_verbose_level)
 #endif
@@ -82,11 +82,11 @@
 #ifndef NDEBUG
 #define ABSL_LOG_INTERNAL_DLOG_IF_IMPL(severity, condition)   \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATELESS, condition) \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 #else
 #define ABSL_LOG_INTERNAL_DLOG_IF_IMPL(severity, condition)              \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATELESS, false && (condition)) \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 #endif
 
 // ABSL_LOG_EVERY_N
@@ -132,36 +132,36 @@
 #ifndef NDEBUG
 #define ABSL_LOG_INTERNAL_DLOG_EVERY_N_IMPL(severity, n) \
   ABSL_LOG_INTERNAL_CONDITION_INFO(STATEFUL, true)       \
-  (EveryN, n) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+  (EveryN, n) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_FIRST_N_IMPL(severity, n) \
   ABSL_LOG_INTERNAL_CONDITION_INFO(STATEFUL, true)       \
-  (FirstN, n) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+  (FirstN, n) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_EVERY_POW_2_IMPL(severity) \
   ABSL_LOG_INTERNAL_CONDITION_INFO(STATEFUL, true)        \
-  (EveryPow2) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+  (EveryPow2) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_EVERY_N_SEC_IMPL(severity, n_seconds) \
   ABSL_LOG_INTERNAL_CONDITION_INFO(STATEFUL, true)                   \
-  (EveryNSec, n_seconds) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+  (EveryNSec, n_seconds) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #else  // def NDEBUG
 #define ABSL_LOG_INTERNAL_DLOG_EVERY_N_IMPL(severity, n) \
   ABSL_LOG_INTERNAL_CONDITION_INFO(STATEFUL, false)      \
-  (EveryN, n) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+  (EveryN, n) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_FIRST_N_IMPL(severity, n) \
   ABSL_LOG_INTERNAL_CONDITION_INFO(STATEFUL, false)      \
-  (FirstN, n) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+  (FirstN, n) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_EVERY_POW_2_IMPL(severity) \
   ABSL_LOG_INTERNAL_CONDITION_INFO(STATEFUL, false)       \
-  (EveryPow2) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+  (EveryPow2) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_EVERY_N_SEC_IMPL(severity, n_seconds) \
   ABSL_LOG_INTERNAL_CONDITION_INFO(STATEFUL, false)                  \
-  (EveryNSec, n_seconds) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+  (EveryNSec, n_seconds) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 #endif  // def NDEBUG
 
 #define ABSL_LOG_INTERNAL_VLOG_EVERY_N_IMPL(verbose_level, n)                \
@@ -243,40 +243,40 @@
 #ifndef NDEBUG
 #define ABSL_LOG_INTERNAL_DLOG_IF_EVERY_N_IMPL(severity, condition, n)  \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATEFUL, condition)(EveryN, n) \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_IF_FIRST_N_IMPL(severity, condition, n)  \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATEFUL, condition)(FirstN, n) \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_IF_EVERY_POW_2_IMPL(severity, condition) \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATEFUL, condition)(EveryPow2) \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_IF_EVERY_N_SEC_IMPL(severity, condition, \
                                                    n_seconds)           \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATEFUL, condition)(EveryNSec, \
                                                              n_seconds) \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #else  // def NDEBUG
 #define ABSL_LOG_INTERNAL_DLOG_IF_EVERY_N_IMPL(severity, condition, n)   \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATEFUL, false && (condition))( \
-      EveryN, n) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      EveryN, n) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_IF_FIRST_N_IMPL(severity, condition, n)   \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATEFUL, false && (condition))( \
-      FirstN, n) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      FirstN, n) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_IF_EVERY_POW_2_IMPL(severity, condition)  \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATEFUL, false && (condition))( \
-      EveryPow2) ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      EveryPow2) ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 
 #define ABSL_LOG_INTERNAL_DLOG_IF_EVERY_N_SEC_IMPL(severity, condition,  \
                                                    n_seconds)            \
   ABSL_LOG_INTERNAL_CONDITION##severity(STATEFUL, false && (condition))( \
       EveryNSec, n_seconds)                                              \
-      ABSL_LOGGING_INTERNAL_LOG##severity.InternalStream()
+      ABSL_LOGGING_INTERNAL_DLOG##severity.InternalStream()
 #endif  // def NDEBUG
 
 #endif  // ABSL_LOG_INTERNAL_LOG_IMPL_H_
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/log_message.cc b/contrib/restricted/abseil-cpp/absl/log/internal/log_message.cc
index 10ac245373a0..4e9b08af649f 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/log_message.cc
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/log_message.cc
@@ -27,6 +27,7 @@
 #include <algorithm>
 #include <array>
 #include <atomic>
+#include <ios>
 #include <memory>
 #include <ostream>
 #include <string>
@@ -67,7 +68,14 @@ namespace log_internal {
 namespace {
 // message `logging.proto.Event`
 enum EventTag : uint8_t {
+  kFileName = 2,
+  kFileLine = 3,
+  kTimeNsecs = 4,
+  kSeverity = 5,
+  kThreadId = 6,
   kValue = 7,
+  kSequenceNumber = 9,
+  kThreadName = 10,
 };
 
 // message `logging.proto.Value`
@@ -100,6 +108,23 @@ bool PrintValue(absl::Span<char>& dst, absl::Span<const char> buf) {
   return true;
 }
 
+// See `logging.proto.Severity`
+int32_t ProtoSeverity(absl::LogSeverity severity, int verbose_level) {
+  switch (severity) {
+    case absl::LogSeverity::kInfo:
+      if (verbose_level == absl::LogEntry::kNoVerbosityLevel) return 800;
+      return 600 - verbose_level;
+    case absl::LogSeverity::kWarning:
+      return 900;
+    case absl::LogSeverity::kError:
+      return 950;
+    case absl::LogSeverity::kFatal:
+      return 1100;
+    default:
+      return 800;
+  }
+}
+
 absl::string_view Basename(absl::string_view filepath) {
 #ifdef _WIN32
   size_t path = filepath.find_last_of("/\\");
@@ -145,26 +170,37 @@ struct LogMessage::LogMessageData final {
 
   // A `logging.proto.Event` proto message is built into `encoded_buf`.
   std::array<char, kLogMessageBufferSize> encoded_buf;
-  // `encoded_remaining` is the suffix of `encoded_buf` that has not been filled
-  // yet.  If a datum to be encoded does not fit into `encoded_remaining` and
-  // cannot be truncated to fit, the size of `encoded_remaining` will be zeroed
-  // to prevent encoding of any further data.  Note that in this case its data()
-  // pointer will not point past the end of `encoded_buf`.
-  absl::Span<char> encoded_remaining;
+  // `encoded_remaining()` is the suffix of `encoded_buf` that has not been
+  // filled yet.  If a datum to be encoded does not fit into
+  // `encoded_remaining()` and cannot be truncated to fit, the size of
+  // `encoded_remaining()` will be zeroed to prevent encoding of any further
+  // data.  Note that in this case its `data()` pointer will not point past the
+  // end of `encoded_buf`.
+  // The first use of `encoded_remaining()` is our chance to record metadata
+  // after any modifications (e.g. by `AtLocation()`) but before any data have
+  // been recorded.  We want to record metadata before data so that data are
+  // preferentially truncated if we run out of buffer.
+  absl::Span<char>& encoded_remaining() {
+    if (encoded_remaining_actual_do_not_use_directly.data() == nullptr) {
+      encoded_remaining_actual_do_not_use_directly =
+          absl::MakeSpan(encoded_buf);
+      InitializeEncodingAndFormat();
+    }
+    return encoded_remaining_actual_do_not_use_directly;
+  }
+  absl::Span<char> encoded_remaining_actual_do_not_use_directly;
 
   // A formatted string message is built in `string_buf`.
   std::array<char, kLogMessageBufferSize> string_buf;
 
+  void InitializeEncodingAndFormat();
   void FinalizeEncodingAndFormat();
 };
 
 LogMessage::LogMessageData::LogMessageData(const char* file, int line,
                                            absl::LogSeverity severity,
                                            absl::Time timestamp)
-    : extra_sinks_only(false),
-      manipulated(nullptr),
-      // This `absl::MakeSpan` silences spurious -Wuninitialized from GCC:
-      encoded_remaining(absl::MakeSpan(encoded_buf)) {
+    : extra_sinks_only(false), manipulated(nullptr) {
   // Legacy defaults for LOG's ostream:
   manipulated.setf(std::ios_base::showbase | std::ios_base::boolalpha);
   entry.full_filename_ = file;
@@ -177,13 +213,25 @@ LogMessage::LogMessageData::LogMessageData(const char* file, int line,
   entry.tid_ = absl::base_internal::GetCachedTID();
 }
 
+void LogMessage::LogMessageData::InitializeEncodingAndFormat() {
+  EncodeStringTruncate(EventTag::kFileName, entry.source_filename(),
+                       &encoded_remaining());
+  EncodeVarint(EventTag::kFileLine, entry.source_line(), &encoded_remaining());
+  EncodeVarint(EventTag::kTimeNsecs, absl::ToUnixNanos(entry.timestamp()),
+               &encoded_remaining());
+  EncodeVarint(EventTag::kSeverity,
+               ProtoSeverity(entry.log_severity(), entry.verbosity()),
+               &encoded_remaining());
+  EncodeVarint(EventTag::kThreadId, entry.tid(), &encoded_remaining());
+}
+
 void LogMessage::LogMessageData::FinalizeEncodingAndFormat() {
-  // Note that `encoded_remaining` may have zero size without pointing past the
-  // end of `encoded_buf`, so the difference between `data()` pointers is used
-  // to compute the size of `encoded_data`.
+  // Note that `encoded_remaining()` may have zero size without pointing past
+  // the end of `encoded_buf`, so the difference between `data()` pointers is
+  // used to compute the size of `encoded_data`.
   absl::Span<const char> encoded_data(
       encoded_buf.data(),
-      static_cast<size_t>(encoded_remaining.data() - encoded_buf.data()));
+      static_cast<size_t>(encoded_remaining().data() - encoded_buf.data()));
   // `string_remaining` is the suffix of `string_buf` that has not been filled
   // yet.
   absl::Span<char> string_remaining(string_buf);
@@ -211,7 +259,6 @@ void LogMessage::LogMessageData::FinalizeEncodingAndFormat() {
         if (PrintValue(string_remaining, field.bytes_value())) continue;
         break;
     }
-    break;
   }
   auto chars_written =
       static_cast<size_t>(string_remaining.data() - string_buf.data());
@@ -413,7 +460,7 @@ void LogMessage::Flush() {
   data_->FinalizeEncodingAndFormat();
   data_->entry.encoding_ =
       absl::string_view(data_->encoded_buf.data(),
-                        static_cast<size_t>(data_->encoded_remaining.data() -
+                        static_cast<size_t>(data_->encoded_remaining().data() -
                                             data_->encoded_buf.data()));
   SendToLog();
 }
@@ -421,7 +468,7 @@ void LogMessage::Flush() {
 void LogMessage::SetFailQuietly() { data_->fail_quietly = true; }
 
 LogMessage::OstreamView::OstreamView(LogMessageData& message_data)
-    : data_(message_data), encoded_remaining_copy_(data_.encoded_remaining) {
+    : data_(message_data), encoded_remaining_copy_(data_.encoded_remaining()) {
   // This constructor sets the `streambuf` up so that streaming into an attached
   // ostream encodes string data in-place.  To do that, we write appropriate
   // headers into the buffer using a copy of the buffer view so that we can
@@ -444,8 +491,8 @@ LogMessage::OstreamView::~OstreamView() {
   if (!string_start_.data()) {
     // The second field header didn't fit.  Whether the first one did or not, we
     // shouldn't commit `encoded_remaining_copy_`, and we also need to zero the
-    // size of `data_->encoded_remaining` so that no more data are encoded.
-    data_.encoded_remaining.remove_suffix(data_.encoded_remaining.size());
+    // size of `data_->encoded_remaining()` so that no more data are encoded.
+    data_.encoded_remaining().remove_suffix(data_.encoded_remaining().size());
     return;
   }
   const absl::Span<const char> contents(pbase(),
@@ -454,7 +501,7 @@ LogMessage::OstreamView::~OstreamView() {
   encoded_remaining_copy_.remove_prefix(contents.size());
   EncodeMessageLength(string_start_, &encoded_remaining_copy_);
   EncodeMessageLength(message_start_, &encoded_remaining_copy_);
-  data_.encoded_remaining = encoded_remaining_copy_;
+  data_.encoded_remaining() = encoded_remaining_copy_;
 }
 
 std::ostream& LogMessage::OstreamView::stream() { return data_.manipulated; }
@@ -521,13 +568,13 @@ void LogMessage::LogBacktraceIfNeeded() {
   view.stream() << ") ";
 }
 
-// Encodes into `data_->encoded_remaining` a partial `logging.proto.Event`
+// Encodes into `data_->encoded_remaining()` a partial `logging.proto.Event`
 // containing the specified string data using a `Value` field appropriate to
 // `str_type`.  Truncates `str` if necessary, but emits nothing and marks the
 // buffer full if  even the field headers do not fit.
 template <LogMessage::StringType str_type>
 void LogMessage::CopyToEncodedBuffer(absl::string_view str) {
-  auto encoded_remaining_copy = data_->encoded_remaining;
+  auto encoded_remaining_copy = data_->encoded_remaining();
   auto start = EncodeMessageStart(
       EventTag::kValue, BufferSizeFor(WireType::kLengthDelimited) + str.size(),
       &encoded_remaining_copy);
@@ -540,11 +587,11 @@ void LogMessage::CopyToEncodedBuffer(absl::string_view str) {
                            str, &encoded_remaining_copy)) {
     // The string may have been truncated, but the field header fit.
     EncodeMessageLength(start, &encoded_remaining_copy);
-    data_->encoded_remaining = encoded_remaining_copy;
+    data_->encoded_remaining() = encoded_remaining_copy;
   } else {
-    // The field header(s) did not fit; zero `encoded_remaining` so we don't
+    // The field header(s) did not fit; zero `encoded_remaining()` so we don't
     // write anything else later.
-    data_->encoded_remaining.remove_suffix(data_->encoded_remaining.size());
+    data_->encoded_remaining().remove_suffix(data_->encoded_remaining().size());
   }
 }
 template void LogMessage::CopyToEncodedBuffer<LogMessage::StringType::kLiteral>(
@@ -553,7 +600,7 @@ template void LogMessage::CopyToEncodedBuffer<
     LogMessage::StringType::kNotLiteral>(absl::string_view str);
 template <LogMessage::StringType str_type>
 void LogMessage::CopyToEncodedBuffer(char ch, size_t num) {
-  auto encoded_remaining_copy = data_->encoded_remaining;
+  auto encoded_remaining_copy = data_->encoded_remaining();
   auto value_start = EncodeMessageStart(
       EventTag::kValue, BufferSizeFor(WireType::kLengthDelimited) + num,
       &encoded_remaining_copy);
@@ -566,11 +613,11 @@ void LogMessage::CopyToEncodedBuffer(char ch, size_t num) {
     log_internal::AppendTruncated(ch, num, encoded_remaining_copy);
     EncodeMessageLength(str_start, &encoded_remaining_copy);
     EncodeMessageLength(value_start, &encoded_remaining_copy);
-    data_->encoded_remaining = encoded_remaining_copy;
+    data_->encoded_remaining() = encoded_remaining_copy;
   } else {
-    // The field header(s) did not fit; zero `encoded_remaining` so we don't
+    // The field header(s) did not fit; zero `encoded_remaining()` so we don't
     // write anything else later.
-    data_->encoded_remaining.remove_suffix(data_->encoded_remaining.size());
+    data_->encoded_remaining().remove_suffix(data_->encoded_remaining().size());
   }
 }
 template void LogMessage::CopyToEncodedBuffer<LogMessage::StringType::kLiteral>(
@@ -578,6 +625,13 @@ template void LogMessage::CopyToEncodedBuffer<LogMessage::StringType::kLiteral>(
 template void LogMessage::CopyToEncodedBuffer<
     LogMessage::StringType::kNotLiteral>(char ch, size_t num);
 
+// We intentionally don't return from these destructors. Disable MSVC's warning
+// about the destructor never returning as we do so intentionally here.
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(push)
+#pragma warning(disable : 4722)
+#endif
+
 LogMessageFatal::LogMessageFatal(const char* file, int line)
     : LogMessage(file, line, absl::LogSeverity::kFatal) {}
 
@@ -587,19 +641,29 @@ LogMessageFatal::LogMessageFatal(const char* file, int line,
   *this << "Check failed: " << failure_msg << " ";
 }
 
-// ABSL_ATTRIBUTE_NORETURN doesn't seem to work on destructors with msvc, so
-// disable msvc's warning about the d'tor never returning.
-#if defined(_MSC_VER) && !defined(__clang__)
-#pragma warning(push)
-#pragma warning(disable : 4722)
-#endif
 LogMessageFatal::~LogMessageFatal() {
   Flush();
   FailWithoutStackTrace();
 }
-#if defined(_MSC_VER) && !defined(__clang__)
-#pragma warning(pop)
-#endif
+
+LogMessageDebugFatal::LogMessageDebugFatal(const char* file, int line)
+    : LogMessage(file, line, absl::LogSeverity::kFatal) {}
+
+LogMessageDebugFatal::~LogMessageDebugFatal() {
+  Flush();
+  FailWithoutStackTrace();
+}
+
+LogMessageQuietlyDebugFatal::LogMessageQuietlyDebugFatal(const char* file,
+                                                         int line)
+    : LogMessage(file, line, absl::LogSeverity::kFatal) {
+  SetFailQuietly();
+}
+
+LogMessageQuietlyDebugFatal::~LogMessageQuietlyDebugFatal() {
+  Flush();
+  FailQuietly();
+}
 
 LogMessageQuietlyFatal::LogMessageQuietlyFatal(const char* file, int line)
     : LogMessage(file, line, absl::LogSeverity::kFatal) {
@@ -608,17 +672,10 @@ LogMessageQuietlyFatal::LogMessageQuietlyFatal(const char* file, int line)
 
 LogMessageQuietlyFatal::LogMessageQuietlyFatal(const char* file, int line,
                                                absl::string_view failure_msg)
-    : LogMessage(file, line, absl::LogSeverity::kFatal) {
-  SetFailQuietly();
-  *this << "Check failed: " << failure_msg << " ";
+    : LogMessageQuietlyFatal(file, line) {
+    *this << "Check failed: " << failure_msg << " ";
 }
 
-// ABSL_ATTRIBUTE_NORETURN doesn't seem to work on destructors with msvc, so
-// disable msvc's warning about the d'tor never returning.
-#if defined(_MSC_VER) && !defined(__clang__)
-#pragma warning(push)
-#pragma warning(disable : 4722)
-#endif
 LogMessageQuietlyFatal::~LogMessageQuietlyFatal() {
   Flush();
   FailQuietly();
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/log_message.h b/contrib/restricted/abseil-cpp/absl/log/internal/log_message.h
index 4ecb8a149880..0c067da9ada7 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/log_message.h
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/log_message.h
@@ -187,11 +187,11 @@ class LogMessage {
  protected:
   // Call `abort()` or similar to perform `LOG(FATAL)` crash.  It is assumed
   // that the caller has already generated and written the trace as appropriate.
-  ABSL_ATTRIBUTE_NORETURN static void FailWithoutStackTrace();
+  [[noreturn]] static void FailWithoutStackTrace();
 
   // Similar to `FailWithoutStackTrace()`, but without `abort()`.  Terminates
   // the process with an error exit code.
-  ABSL_ATTRIBUTE_NORETURN static void FailQuietly();
+  [[noreturn]] static void FailQuietly();
 
   // Dispatches the completed `absl::LogEntry` to applicable `absl::LogSink`s.
   // This might as well be inlined into `~LogMessage` except that
@@ -354,15 +354,34 @@ class LogMessageFatal final : public LogMessage {
   LogMessageFatal(const char* file, int line) ABSL_ATTRIBUTE_COLD;
   LogMessageFatal(const char* file, int line,
                   absl::string_view failure_msg) ABSL_ATTRIBUTE_COLD;
-  ABSL_ATTRIBUTE_NORETURN ~LogMessageFatal();
+  [[noreturn]] ~LogMessageFatal();
 };
 
+// `LogMessageDebugFatal` ensures the process will exit in failure after logging
+// this message. It matches LogMessageFatal but is not [[noreturn]] as it's used
+// for DLOG(FATAL) variants.
+class LogMessageDebugFatal final : public LogMessage {
+ public:
+  LogMessageDebugFatal(const char* file, int line) ABSL_ATTRIBUTE_COLD;
+  ~LogMessageDebugFatal();
+};
+
+class LogMessageQuietlyDebugFatal final : public LogMessage {
+ public:
+  // DLOG(QFATAL) calls this instead of LogMessageQuietlyFatal to make sure the
+  // destructor is not [[noreturn]] even if this is always FATAL as this is only
+  // invoked when DLOG() is enabled.
+  LogMessageQuietlyDebugFatal(const char* file, int line) ABSL_ATTRIBUTE_COLD;
+  ~LogMessageQuietlyDebugFatal();
+};
+
+// Used for LOG(QFATAL) to make sure it's properly understood as [[noreturn]].
 class LogMessageQuietlyFatal final : public LogMessage {
  public:
   LogMessageQuietlyFatal(const char* file, int line) ABSL_ATTRIBUTE_COLD;
   LogMessageQuietlyFatal(const char* file, int line,
                          absl::string_view failure_msg) ABSL_ATTRIBUTE_COLD;
-  ABSL_ATTRIBUTE_NORETURN ~LogMessageQuietlyFatal();
+  [[noreturn]] ~LogMessageQuietlyFatal();
 };
 
 }  // namespace log_internal
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/nullstream.h b/contrib/restricted/abseil-cpp/absl/log/internal/nullstream.h
index 9266852eb98d..973e91ab6862 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/nullstream.h
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/nullstream.h
@@ -117,16 +117,7 @@ class NullStreamMaybeFatal final : public NullStream {
 class NullStreamFatal final : public NullStream {
  public:
   NullStreamFatal() = default;
-  // ABSL_ATTRIBUTE_NORETURN doesn't seem to work on destructors with msvc, so
-  // disable msvc's warning about the d'tor never returning.
-#if defined(_MSC_VER) && !defined(__clang__)
-#pragma warning(push)
-#pragma warning(disable : 4722)
-#endif
-  ABSL_ATTRIBUTE_NORETURN ~NullStreamFatal() { _exit(1); }
-#if defined(_MSC_VER) && !defined(__clang__)
-#pragma warning(pop)
-#endif
+  [[noreturn]] ~NullStreamFatal() { _exit(1); }
 };
 
 }  // namespace log_internal
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/strip.h b/contrib/restricted/abseil-cpp/absl/log/internal/strip.h
index f8d27869392e..3e5501040ca1 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/strip.h
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/strip.h
@@ -20,6 +20,7 @@
 #ifndef ABSL_LOG_INTERNAL_STRIP_H_
 #define ABSL_LOG_INTERNAL_STRIP_H_
 
+#include "absl/base/attributes.h"  // IWYU pragma: keep
 #include "absl/base/log_severity.h"
 #include "absl/log/internal/log_message.h"
 #include "absl/log/internal/nullstream.h"
@@ -29,6 +30,16 @@
 // of defines comes in three flavors: vanilla, plus two variants that strip some
 // logging in subtly different ways for subtly different reasons (see below).
 #if defined(STRIP_LOG) && STRIP_LOG
+
+// Attribute for marking variables used in implementation details of logging
+// macros as unused, but only when `STRIP_LOG` is defined.
+// With `STRIP_LOG` on, not marking them triggers `-Wunused-but-set-variable`,
+// With `STRIP_LOG` off, marking them triggers `-Wused-but-marked-unused`.
+//
+// TODO(b/290784225): Replace this macro with attribute [[maybe_unused]] when
+// Abseil stops supporting C++14.
+#define ABSL_LOG_INTERNAL_ATTRIBUTE_UNUSED_IF_STRIP_LOG ABSL_ATTRIBUTE_UNUSED
+
 #define ABSL_LOGGING_INTERNAL_LOG_INFO ::absl::log_internal::NullStream()
 #define ABSL_LOGGING_INTERNAL_LOG_WARNING ::absl::log_internal::NullStream()
 #define ABSL_LOGGING_INTERNAL_LOG_ERROR ::absl::log_internal::NullStream()
@@ -38,10 +49,21 @@
   ::absl::log_internal::NullStreamMaybeFatal(::absl::kLogDebugFatal)
 #define ABSL_LOGGING_INTERNAL_LOG_LEVEL(severity) \
   ::absl::log_internal::NullStreamMaybeFatal(absl_log_internal_severity)
+
+// Fatal `DLOG`s expand a little differently to avoid being `[[noreturn]]`.
+#define ABSL_LOGGING_INTERNAL_DLOG_FATAL \
+  ::absl::log_internal::NullStreamMaybeFatal(::absl::LogSeverity::kFatal)
+#define ABSL_LOGGING_INTERNAL_DLOG_QFATAL \
+  ::absl::log_internal::NullStreamMaybeFatal(::absl::LogSeverity::kFatal)
+
 #define ABSL_LOG_INTERNAL_CHECK(failure_message) ABSL_LOGGING_INTERNAL_LOG_FATAL
 #define ABSL_LOG_INTERNAL_QCHECK(failure_message) \
   ABSL_LOGGING_INTERNAL_LOG_QFATAL
+
 #else  // !defined(STRIP_LOG) || !STRIP_LOG
+
+#define ABSL_LOG_INTERNAL_ATTRIBUTE_UNUSED_IF_STRIP_LOG
+
 #define ABSL_LOGGING_INTERNAL_LOG_INFO \
   ::absl::log_internal::LogMessage(    \
       __FILE__, __LINE__, ::absl::log_internal::LogMessage::InfoTag{})
@@ -60,6 +82,13 @@
 #define ABSL_LOGGING_INTERNAL_LOG_LEVEL(severity)      \
   ::absl::log_internal::LogMessage(__FILE__, __LINE__, \
                                    absl_log_internal_severity)
+
+// Fatal `DLOG`s expand a little differently to avoid being `[[noreturn]]`.
+#define ABSL_LOGGING_INTERNAL_DLOG_FATAL \
+  ::absl::log_internal::LogMessageDebugFatal(__FILE__, __LINE__)
+#define ABSL_LOGGING_INTERNAL_DLOG_QFATAL \
+  ::absl::log_internal::LogMessageQuietlyDebugFatal(__FILE__, __LINE__)
+
 // These special cases dispatch to special-case constructors that allow us to
 // avoid an extra function call and shrink non-LTO binaries by a percent or so.
 #define ABSL_LOG_INTERNAL_CHECK(failure_message) \
@@ -69,4 +98,11 @@
                                                failure_message)
 #endif  // !defined(STRIP_LOG) || !STRIP_LOG
 
+// This part of a non-fatal `DLOG`s expands the same as `LOG`.
+#define ABSL_LOGGING_INTERNAL_DLOG_INFO ABSL_LOGGING_INTERNAL_LOG_INFO
+#define ABSL_LOGGING_INTERNAL_DLOG_WARNING ABSL_LOGGING_INTERNAL_LOG_WARNING
+#define ABSL_LOGGING_INTERNAL_DLOG_ERROR ABSL_LOGGING_INTERNAL_LOG_ERROR
+#define ABSL_LOGGING_INTERNAL_DLOG_DFATAL ABSL_LOGGING_INTERNAL_LOG_DFATAL
+#define ABSL_LOGGING_INTERNAL_DLOG_LEVEL ABSL_LOGGING_INTERNAL_LOG_LEVEL
+
 #endif  // ABSL_LOG_INTERNAL_STRIP_H_
diff --git a/contrib/restricted/abseil-cpp/absl/log/log.h b/contrib/restricted/abseil-cpp/absl/log/log.h
index b721b087ccc8..a4e1d1fe818e 100644
--- a/contrib/restricted/abseil-cpp/absl/log/log.h
+++ b/contrib/restricted/abseil-cpp/absl/log/log.h
@@ -198,7 +198,6 @@
 #define ABSL_LOG_LOG_H_
 
 #include "absl/log/internal/log_impl.h"
-#include "absl/log/vlog_is_on.h"  // IWYU pragma: export
 
 // LOG()
 //
@@ -234,6 +233,11 @@
 //
 // See vlog_is_on.h for further documentation, including the usage of the
 // --vmodule flag to log at different levels in different source files.
+//
+// `VLOG` does not produce any output when verbose logging is not enabled.
+// However, simply testing whether verbose logging is enabled can be expensive.
+// If you don't intend to enable verbose logging in non-debug builds, consider
+// using `DVLOG` instead.
 #define VLOG(severity) ABSL_LOG_INTERNAL_VLOG_IMPL(severity)
 
 // `DVLOG` behaves like `VLOG` in debug mode (i.e. `#ifndef NDEBUG`).
diff --git a/contrib/restricted/abseil-cpp/absl/log/log_sink.h b/contrib/restricted/abseil-cpp/absl/log/log_sink.h
index 9bfa6f86243a..2910070d51d5 100644
--- a/contrib/restricted/abseil-cpp/absl/log/log_sink.h
+++ b/contrib/restricted/abseil-cpp/absl/log/log_sink.h
@@ -32,15 +32,16 @@ ABSL_NAMESPACE_BEGIN
 // `absl::LogSink` is an interface which can be extended to intercept and
 // process particular messages (with `LOG.ToSinkOnly()` or
 // `LOG.ToSinkAlso()`) or all messages (if registered with
-// `absl::AddLogSink`).  Implementations must be thread-safe, and should take
-// care not to take any locks that might be held by the `LOG` caller.
+// `absl::AddLogSink`).  Implementations must not take any locks that might be
+// held by the `LOG` caller.
 class LogSink {
  public:
   virtual ~LogSink() = default;
 
   // LogSink::Send()
   //
-  // `Send` is called synchronously during the log statement.
+  // `Send` is called synchronously during the log statement.  `Send` must be
+  // thread-safe.
   //
   // It is safe to use `LOG` within an implementation of `Send`.  `ToSinkOnly`
   // and `ToSinkAlso` are safe in general but can be used to create an infinite
@@ -50,9 +51,15 @@ class LogSink {
   // LogSink::Flush()
   //
   // Sinks that buffer messages should override this method to flush the buffer
-  // and return.
+  // and return.  `Flush` must be thread-safe.
   virtual void Flush() {}
 
+ protected:
+  LogSink() = default;
+  // Implementations may be copyable and/or movable.
+  LogSink(const LogSink&) = default;
+  LogSink& operator=(const LogSink&) = default;
+
  private:
   // https://lld.llvm.org/missingkeyfunction.html#missing-key-function
   virtual void KeyFunction() const final;  // NOLINT(readability/inheritance)
diff --git a/contrib/restricted/abseil-cpp/absl/log/vlog_is_on.h b/contrib/restricted/abseil-cpp/absl/log/vlog_is_on.h
deleted file mode 100644
index 789865138033..000000000000
--- a/contrib/restricted/abseil-cpp/absl/log/vlog_is_on.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2022 The Abseil Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// -----------------------------------------------------------------------------
-// File: log/vlog_is_on.h
-// -----------------------------------------------------------------------------
-//
-// This header defines the `VLOG_IS_ON()` macro that controls the
-// variable-verbosity conditional logging.
-//
-// It's used by `VLOG` in log.h, or it can also be used directly like this:
-//
-//   if (VLOG_IS_ON(2)) {
-//     foo_server.RecomputeStatisticsExpensive();
-//     LOG(INFO) << foo_server.LastStatisticsAsString();
-//   }
-//
-// Each source file has an effective verbosity level that's a non-negative
-// integer computed from the `--vmodule` and `--v` flags.
-// `VLOG_IS_ON(n)` is true, and `VLOG(n)` logs, if that effective verbosity
-// level is greater than or equal to `n`.
-//
-// `--vmodule` takes a comma-delimited list of key=value pairs.  Each key is a
-// pattern matched against filenames, and the values give the effective severity
-// level applied to matching files.  '?' and '*' characters in patterns are
-// interpreted as single-character and zero-or-more-character wildcards.
-// Patterns including a slash character are matched against full pathnames,
-// while those without are matched against basenames only.  One suffix (i.e. the
-// last . and everything after it) is stripped from each filename prior to
-// matching, as is the special suffix "-inl".
-//
-// Files are matched against globs in `--vmodule` in order, and the first match
-// determines the verbosity level.
-//
-// Files which do not match any pattern in `--vmodule` use the value of `--v` as
-// their effective verbosity level.  The default is 0.
-//
-// SetVLOGLevel helper function is provided to do limited dynamic control over
-// V-logging by appending to `--vmodule`. Because these go at the beginning of
-// the list, they take priority over any globs previously added.
-//
-// Resetting --vmodule will override all previous modifications to `--vmodule`,
-// including via SetVLOGLevel.
-
-#ifndef ABSL_LOG_VLOG_IS_ON_H_
-#define ABSL_LOG_VLOG_IS_ON_H_
-
-#include "absl/log/absl_vlog_is_on.h"  // IWYU pragma: export
-
-// IWYU pragma: private, include "absl/log/log.h"
-
-// Each VLOG_IS_ON call site gets its own VLogSite that registers with the
-// global linked list of sites to asynchronously update its verbosity level on
-// changes to --v or --vmodule. The verbosity can also be set by manually
-// calling SetVLOGLevel.
-//
-// VLOG_IS_ON is not async signal safe, but it is guaranteed not to allocate
-// new memory.
-#define VLOG_IS_ON(verbose_level) ABSL_VLOG_IS_ON(verbose_level)
-
-#endif  // ABSL_LOG_VLOG_IS_ON_H_
diff --git a/contrib/restricted/abseil-cpp/absl/memory/ya.make b/contrib/restricted/abseil-cpp/absl/memory/ya.make
index bdd57c2b35e4..04e459b47e36 100644
--- a/contrib/restricted/abseil-cpp/absl/memory/ya.make
+++ b/contrib/restricted/abseil-cpp/absl/memory/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/abseil-cpp/absl/meta
diff --git a/contrib/restricted/abseil-cpp/absl/meta/type_traits.h b/contrib/restricted/abseil-cpp/absl/meta/type_traits.h
index cf71164b3861..ded55820a3fa 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/type_traits.h
+++ b/contrib/restricted/abseil-cpp/absl/meta/type_traits.h
@@ -37,11 +37,21 @@
 
 #include <cstddef>
 #include <functional>
+#include <string>
 #include <type_traits>
+#include <vector>
 
 #include "absl/base/attributes.h"
 #include "absl/base/config.h"
 
+#ifdef __cpp_lib_span
+#include <span>  // NOLINT(build/c++20)
+#endif
+
+#ifdef ABSL_HAVE_STD_STRING_VIEW
+#include <string_view>
+#endif
+
 // Defines the default alignment. `__STDCPP_DEFAULT_NEW_ALIGNMENT__` is a C++17
 // feature.
 #if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
@@ -152,8 +162,8 @@ template <typename... Ts>
 struct disjunction : std::false_type {};
 
 template <typename T, typename... Ts>
-struct disjunction<T, Ts...> :
-      std::conditional<T::value, T, disjunction<Ts...>>::type {};
+struct disjunction<T, Ts...>
+    : std::conditional<T::value, T, disjunction<Ts...>>::type {};
 
 template <typename T>
 struct disjunction<T> : T {};
@@ -279,27 +289,6 @@ using remove_extent_t = typename std::remove_extent<T>::type;
 template <typename T>
 using remove_all_extents_t = typename std::remove_all_extents<T>::type;
 
-ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
-namespace type_traits_internal {
-// This trick to retrieve a default alignment is necessary for our
-// implementation of aligned_storage_t to be consistent with any
-// implementation of std::aligned_storage.
-template <size_t Len, typename T = std::aligned_storage<Len>>
-struct default_alignment_of_aligned_storage;
-
-template <size_t Len, size_t Align>
-struct default_alignment_of_aligned_storage<
-    Len, std::aligned_storage<Len, Align>> {
-  static constexpr size_t value = Align;
-};
-}  // namespace type_traits_internal
-
-// TODO(b/260219225): std::aligned_storage(_t) is deprecated in C++23.
-template <size_t Len, size_t Align = type_traits_internal::
-                          default_alignment_of_aligned_storage<Len>::value>
-using aligned_storage_t = typename std::aligned_storage<Len, Align>::type;
-ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
-
 template <typename T>
 using decay_t = typename std::decay<T>::type;
 
@@ -315,22 +304,23 @@ using common_type_t = typename std::common_type<T...>::type;
 template <typename T>
 using underlying_type_t = typename std::underlying_type<T>::type;
 
-
 namespace type_traits_internal {
 
 #if (defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703L) || \
     (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
 // std::result_of is deprecated (C++17) or removed (C++20)
-template<typename> struct result_of;
-template<typename F, typename... Args>
+template <typename>
+struct result_of;
+template <typename F, typename... Args>
 struct result_of<F(Args...)> : std::invoke_result<F, Args...> {};
 #else
-template<typename F> using result_of = std::result_of<F>;
+template <typename F>
+using result_of = std::result_of<F>;
 #endif
 
 }  // namespace type_traits_internal
 
-template<typename F>
+template <typename F>
 using result_of_t = typename type_traits_internal::result_of<F>::type;
 
 namespace type_traits_internal {
@@ -463,20 +453,23 @@ namespace type_traits_internal {
 // Make the swap-related traits/function accessible from this namespace.
 using swap_internal::IsNothrowSwappable;
 using swap_internal::IsSwappable;
-using swap_internal::Swap;
 using swap_internal::StdSwapIsUnconstrained;
+using swap_internal::Swap;
 
 }  // namespace type_traits_internal
 
 // absl::is_trivially_relocatable<T>
 //
 // Detects whether a type is known to be "trivially relocatable" -- meaning it
-// can be relocated without invoking the constructor/destructor, using a form of
-// move elision.
+// can be relocated from one place to another as if by memcpy/memmove.
+// This implies that its object representation doesn't depend on its address,
+// and also none of its special member functions do anything strange.
 //
-// This trait is conservative, for backwards compatibility. If it's true then
-// the type is definitely trivially relocatable, but if it's false then the type
-// may or may not be.
+// This trait is conservative. If it's true then the type is definitely
+// trivially relocatable, but if it's false then the type may or may not be. For
+// example, std::vector<int> is trivially relocatable on every known STL
+// implementation, but absl::is_trivially_relocatable<std::vector<int>> remains
+// false.
 //
 // Example:
 //
@@ -501,22 +494,34 @@ using swap_internal::StdSwapIsUnconstrained;
 //
 // TODO(b/275003464): remove the opt-out once the bug is fixed.
 //
+// Starting with Xcode 15, the Apple compiler will falsely say a type
+// with a user-provided move constructor is trivially relocatable
+// (b/324278148). We will opt out without a version check, due to
+// the fluidity of Apple versions.
+//
+// TODO(b/324278148): If all versions we use have the bug fixed, then
+// remove the condition.
+//
+// Clang on all platforms fails to detect that a type with a user-provided
+// move-assignment operator is not trivially relocatable. So in fact we
+// opt out of Clang altogether, for now.
+//
+// TODO(b/325479096): Remove the opt-out once Clang's behavior is fixed.
+//
 // According to https://github.com/abseil/abseil-cpp/issues/1479, this does not
 // work with NVCC either.
-#if ABSL_HAVE_BUILTIN(__is_trivially_relocatable) &&                 \
-    !(defined(__clang__) && (defined(_WIN32) || defined(_WIN64))) && \
-    !defined(__NVCC__)
+#if ABSL_HAVE_BUILTIN(__is_trivially_relocatable) && \
+    (defined(__cpp_impl_trivially_relocatable) ||    \
+     (!defined(__clang__) && !defined(__APPLE__) && !defined(__NVCC__)))
 template <class T>
 struct is_trivially_relocatable
     : std::integral_constant<bool, __is_trivially_relocatable(T)> {};
 #else
 // Otherwise we use a fallback that detects only those types we can feasibly
-// detect. Any time that has trivial move-construction and destruction
-// operations is by definition trivially relocatable.
+// detect. Any type that is trivially copyable is by definition trivially
+// relocatable.
 template <class T>
-struct is_trivially_relocatable
-    : absl::conjunction<absl::is_trivially_move_constructible<T>,
-                        absl::is_trivially_destructible<T>> {};
+struct is_trivially_relocatable : std::is_trivially_copyable<T> {};
 #endif
 
 // absl::is_constant_evaluated()
@@ -558,6 +563,97 @@ constexpr bool is_constant_evaluated() noexcept {
 #endif
 }
 #endif  // ABSL_HAVE_CONSTANT_EVALUATED
+
+namespace type_traits_internal {
+
+// Detects if a class's definition has declared itself to be an owner by
+// declaring
+//   using absl_internal_is_view = std::true_type;
+// as a member.
+// Types that don't want either must either omit this declaration entirely, or
+// (if e.g. inheriting from a base class) define the member to something that
+// isn't a Boolean trait class, such as `void`.
+// Do not specialize or use this directly. It's an implementation detail.
+template <typename T, typename = void>
+struct IsOwnerImpl : std::false_type {
+  static_assert(std::is_same<T, absl::remove_cvref_t<T>>::value,
+                "type must lack qualifiers");
+};
+
+template <typename T>
+struct IsOwnerImpl<
+    T,
+    std::enable_if_t<std::is_class<typename T::absl_internal_is_view>::value>>
+    : absl::negation<typename T::absl_internal_is_view> {};
+
+// A trait to determine whether a type is an owner.
+// Do *not* depend on the correctness of this trait for correct code behavior.
+// It is only a safety feature and its value may change in the future.
+// Do not specialize this; instead, define the member trait inside your type so
+// that it can be auto-detected, and to prevent ODR violations.
+// If it ever becomes possible to detect [[gsl::Owner]], we should leverage it:
+// https://wg21.link/p1179
+template <typename T>
+struct IsOwner : IsOwnerImpl<T> {};
+
+template <typename T, typename Traits, typename Alloc>
+struct IsOwner<std::basic_string<T, Traits, Alloc>> : std::true_type {};
+
+template <typename T, typename Alloc>
+struct IsOwner<std::vector<T, Alloc>> : std::true_type {};
+
+// Detects if a class's definition has declared itself to be a view by declaring
+//   using absl_internal_is_view = std::true_type;
+// as a member.
+// Do not specialize or use this directly.
+template <typename T, typename = void>
+struct IsViewImpl : std::false_type {
+  static_assert(std::is_same<T, absl::remove_cvref_t<T>>::value,
+                "type must lack qualifiers");
+};
+
+template <typename T>
+struct IsViewImpl<
+    T,
+    std::enable_if_t<std::is_class<typename T::absl_internal_is_view>::value>>
+    : T::absl_internal_is_view {};
+
+// A trait to determine whether a type is a view.
+// Do *not* depend on the correctness of this trait for correct code behavior.
+// It is only a safety feature, and its value may change in the future.
+// Do not specialize this trait. Instead, define the member
+//   using absl_internal_is_view = std::true_type;
+// in your class to allow its detection while preventing ODR violations.
+// If it ever becomes possible to detect [[gsl::Pointer]], we should leverage
+// it: https://wg21.link/p1179
+template <typename T>
+struct IsView : std::integral_constant<bool, std::is_pointer<T>::value ||
+                                                 IsViewImpl<T>::value> {};
+
+#ifdef ABSL_HAVE_STD_STRING_VIEW
+template <typename Char, typename Traits>
+struct IsView<std::basic_string_view<Char, Traits>> : std::true_type {};
+#endif
+
+#ifdef __cpp_lib_span
+template <typename T>
+struct IsView<std::span<T>> : std::true_type {};
+#endif
+
+// Determines whether the assignment of the given types is lifetime-bound.
+// Do *not* depend on the correctness of this trait for correct code behavior.
+// It is only a safety feature and its value may change in the future.
+// If it ever becomes possible to detect [[clang::lifetimebound]] directly,
+// we should change the implementation to leverage that.
+// Until then, we consider an assignment from an "owner" (such as std::string)
+// to a "view" (such as std::string_view) to be a lifetime-bound assignment.
+template <typename T, typename U>
+using IsLifetimeBoundAssignment =
+    std::integral_constant<bool, IsView<absl::remove_cvref_t<T>>::value &&
+                                     IsOwner<absl::remove_cvref_t<U>>::value>;
+
+}  // namespace type_traits_internal
+
 ABSL_NAMESPACE_END
 }  // namespace absl
 
diff --git a/contrib/restricted/abseil-cpp/absl/meta/ya.make b/contrib/restricted/abseil-cpp/absl/meta/ya.make
index 9d5d65c4757f..038057a27b8a 100644
--- a/contrib/restricted/abseil-cpp/absl/meta/ya.make
+++ b/contrib/restricted/abseil-cpp/absl/meta/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/abseil-cpp/absl/base
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/int128.cc b/contrib/restricted/abseil-cpp/absl/numeric/int128.cc
index daa32b518338..5d6c68d1281a 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/int128.cc
+++ b/contrib/restricted/abseil-cpp/absl/numeric/int128.cc
@@ -29,9 +29,6 @@
 namespace absl {
 ABSL_NAMESPACE_BEGIN
 
-ABSL_DLL const uint128 kuint128max = MakeUint128(
-    std::numeric_limits<uint64_t>::max(), std::numeric_limits<uint64_t>::max());
-
 namespace {
 
 // Returns the 0-based position of the last set bit (i.e., most significant bit)
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/int128.h b/contrib/restricted/abseil-cpp/absl/numeric/int128.h
index 7530a7934106..5a067d17b3f4 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/int128.h
+++ b/contrib/restricted/abseil-cpp/absl/numeric/int128.h
@@ -38,6 +38,7 @@
 #include "absl/base/config.h"
 #include "absl/base/macros.h"
 #include "absl/base/port.h"
+#include "absl/types/compare.h"
 
 #if defined(_MSC_VER)
 // In very old versions of MSVC and when the /Zc:wchar_t flag is off, wchar_t is
@@ -244,11 +245,6 @@ class
 #endif  // byte order
 };
 
-// Prefer to use the constexpr `Uint128Max()`.
-//
-// TODO(absl-team) deprecate kuint128max once migration tool is released.
-ABSL_DLL extern const uint128 kuint128max;
-
 // allow uint128 to be logged
 std::ostream& operator<<(std::ostream& os, uint128 v);
 
@@ -274,7 +270,9 @@ class numeric_limits<absl::uint128> {
   static constexpr bool has_infinity = false;
   static constexpr bool has_quiet_NaN = false;
   static constexpr bool has_signaling_NaN = false;
+  ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
   static constexpr float_denorm_style has_denorm = denorm_absent;
+  ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
   static constexpr bool has_denorm_loss = false;
   static constexpr float_round_style round_style = round_toward_zero;
   static constexpr bool is_iec559 = false;
@@ -517,7 +515,9 @@ class numeric_limits<absl::int128> {
   static constexpr bool has_infinity = false;
   static constexpr bool has_quiet_NaN = false;
   static constexpr bool has_signaling_NaN = false;
+  ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
   static constexpr float_denorm_style has_denorm = denorm_absent;
+  ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
   static constexpr bool has_denorm_loss = false;
   static constexpr float_round_style round_style = round_toward_zero;
   static constexpr bool is_iec559 = false;
@@ -824,6 +824,36 @@ constexpr bool operator<=(uint128 lhs, uint128 rhs) { return !(rhs < lhs); }
 
 constexpr bool operator>=(uint128 lhs, uint128 rhs) { return !(lhs < rhs); }
 
+#ifdef __cpp_impl_three_way_comparison
+constexpr absl::strong_ordering operator<=>(uint128 lhs, uint128 rhs) {
+#if defined(ABSL_HAVE_INTRINSIC_INT128)
+  if (auto lhs_128 = static_cast<unsigned __int128>(lhs),
+      rhs_128 = static_cast<unsigned __int128>(rhs);
+      lhs_128 < rhs_128) {
+    return absl::strong_ordering::less;
+  } else if (lhs_128 > rhs_128) {
+    return absl::strong_ordering::greater;
+  } else {
+    return absl::strong_ordering::equal;
+  }
+#else
+  if (uint64_t lhs_high = Uint128High64(lhs), rhs_high = Uint128High64(rhs);
+      lhs_high < rhs_high) {
+    return absl::strong_ordering::less;
+  } else if (lhs_high > rhs_high) {
+    return absl::strong_ordering::greater;
+  } else if (uint64_t lhs_low = Uint128Low64(lhs), rhs_low = Uint128Low64(rhs);
+             lhs_low < rhs_low) {
+    return absl::strong_ordering::less;
+  } else if (lhs_low > rhs_low) {
+    return absl::strong_ordering::greater;
+  } else {
+    return absl::strong_ordering::equal;
+  }
+#endif
+}
+#endif
+
 // Unary operators.
 
 constexpr inline uint128 operator+(uint128 val) { return val; }
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/int128_have_intrinsic.inc b/contrib/restricted/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
index 6f1ac644141e..51e4b9d4852a 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
+++ b/contrib/restricted/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
@@ -220,6 +220,20 @@ constexpr bool operator>=(int128 lhs, int128 rhs) {
   return static_cast<__int128>(lhs) >= static_cast<__int128>(rhs);
 }
 
+#ifdef __cpp_impl_three_way_comparison
+constexpr absl::strong_ordering operator<=>(int128 lhs, int128 rhs) {
+  if (auto lhs_128 = static_cast<__int128>(lhs),
+      rhs_128 = static_cast<__int128>(rhs);
+      lhs_128 < rhs_128) {
+    return absl::strong_ordering::less;
+  } else if (lhs_128 > rhs_128) {
+    return absl::strong_ordering::greater;
+  } else {
+    return absl::strong_ordering::equal;
+  }
+}
+#endif
+
 // Unary operators.
 
 constexpr int128 operator-(int128 v) { return -static_cast<__int128>(v); }
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/int128_no_intrinsic.inc b/contrib/restricted/abseil-cpp/absl/numeric/int128_no_intrinsic.inc
index 6f5d83777c05..195b7452eabf 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/int128_no_intrinsic.inc
+++ b/contrib/restricted/abseil-cpp/absl/numeric/int128_no_intrinsic.inc
@@ -186,6 +186,24 @@ constexpr bool operator<=(int128 lhs, int128 rhs) { return !(lhs > rhs); }
 
 constexpr bool operator>=(int128 lhs, int128 rhs) { return !(lhs < rhs); }
 
+#ifdef __cpp_impl_three_way_comparison
+constexpr absl::strong_ordering operator<=>(int128 lhs, int128 rhs) {
+  if (int64_t lhs_high = Int128High64(lhs), rhs_high = Int128High64(rhs);
+      lhs_high < rhs_high) {
+    return absl::strong_ordering::less;
+  } else if (lhs_high > rhs_high) {
+    return absl::strong_ordering::greater;
+  } else if (uint64_t lhs_low = Uint128Low64(lhs), rhs_low = Uint128Low64(rhs);
+             lhs_low < rhs_low) {
+    return absl::strong_ordering::less;
+  } else if (lhs_low > rhs_low) {
+    return absl::strong_ordering::greater;
+  } else {
+    return absl::strong_ordering::equal;
+  }
+}
+#endif
+
 // Unary operators.
 
 constexpr int128 operator-(int128 v) {
diff --git a/contrib/restricted/abseil-cpp/absl/numeric/internal/bits.h b/contrib/restricted/abseil-cpp/absl/numeric/internal/bits.h
index bfef06bce1ff..0917464d6ad4 100644
--- a/contrib/restricted/abseil-cpp/absl/numeric/internal/bits.h
+++ b/contrib/restricted/abseil-cpp/absl/numeric/internal/bits.h
@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) {
 
 ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CLZ inline int
 CountLeadingZeroes16(uint16_t x) {
-#if ABSL_HAVE_BUILTIN(__builtin_clzs)
+#if ABSL_HAVE_BUILTIN(__builtin_clzg)
+  return x == 0 ? 16 : __builtin_clzg(x);
+#elif ABSL_HAVE_BUILTIN(__builtin_clzs)
   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
                 "__builtin_clzs does not take 16-bit arg");
   return x == 0 ? 16 : __builtin_clzs(x);
@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) {
 
 ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int
 CountTrailingZeroesNonzero16(uint16_t x) {
-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)
+#if ABSL_HAVE_BUILTIN(__builtin_ctzg)
+  return __builtin_ctzg(x);
+#elif ABSL_HAVE_BUILTIN(__builtin_ctzs)
   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
                 "__builtin_ctzs does not take 16-bit arg");
   return __builtin_ctzs(x);
diff --git a/contrib/restricted/abseil-cpp/absl/profiling/internal/periodic_sampler.h b/contrib/restricted/abseil-cpp/absl/profiling/internal/periodic_sampler.h
index 54f0af452b82..f5d847ab2546 100644
--- a/contrib/restricted/abseil-cpp/absl/profiling/internal/periodic_sampler.h
+++ b/contrib/restricted/abseil-cpp/absl/profiling/internal/periodic_sampler.h
@@ -172,7 +172,7 @@ inline bool PeriodicSamplerBase::Sample() noexcept {
 // Typical use case:
 //
 //   struct HashTablezTag {};
-//   thread_local PeriodicSampler sampler;
+//   thread_local PeriodicSampler<HashTablezTag, 100> sampler;
 //
 //   void HashTableSamplingLogic(...) {
 //     if (sampler.Sample()) {
diff --git a/contrib/restricted/abseil-cpp/absl/random/seed_sequences.h b/contrib/restricted/abseil-cpp/absl/random/seed_sequences.h
index c3af4b00a477..33970be5812a 100644
--- a/contrib/restricted/abseil-cpp/absl/random/seed_sequences.h
+++ b/contrib/restricted/abseil-cpp/absl/random/seed_sequences.h
@@ -29,9 +29,11 @@
 #include <random>
 
 #include "absl/base/config.h"
+#include "absl/base/nullability.h"
 #include "absl/random/internal/salted_seed_seq.h"
 #include "absl/random/internal/seed_material.h"
 #include "absl/random/seed_gen_exception.h"
+#include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 
 namespace absl {
diff --git a/contrib/restricted/abseil-cpp/absl/status/internal/statusor_internal.h b/contrib/restricted/abseil-cpp/absl/status/internal/statusor_internal.h
index 5be94903b7b8..67603156a49b 100644
--- a/contrib/restricted/abseil-cpp/absl/status/internal/statusor_internal.h
+++ b/contrib/restricted/abseil-cpp/absl/status/internal/statusor_internal.h
@@ -123,11 +123,70 @@ using IsForwardingAssignmentValid = absl::disjunction<
         std::is_same<absl::in_place_t, absl::remove_cvref_t<U>>,
         IsForwardingAssignmentAmbiguous<T, U>>>>;
 
+template <bool Value, typename T>
+using Equality = std::conditional_t<Value, T, absl::negation<T>>;
+
+template <bool Explicit, typename T, typename U, bool Lifetimebound>
+using IsConstructionValid = absl::conjunction<
+    Equality<Lifetimebound,
+             type_traits_internal::IsLifetimeBoundAssignment<T, U>>,
+    IsDirectInitializationValid<T, U&&>, std::is_constructible<T, U&&>,
+    Equality<!Explicit, std::is_convertible<U&&, T>>,
+    absl::disjunction<
+        std::is_same<T, absl::remove_cvref_t<U>>,
+        absl::conjunction<
+            std::conditional_t<
+                Explicit,
+                absl::negation<std::is_constructible<absl::Status, U&&>>,
+                absl::negation<std::is_convertible<U&&, absl::Status>>>,
+            absl::negation<
+                internal_statusor::HasConversionOperatorToStatusOr<T, U&&>>>>>;
+
+template <typename T, typename U, bool Lifetimebound>
+using IsAssignmentValid = absl::conjunction<
+    Equality<Lifetimebound,
+             type_traits_internal::IsLifetimeBoundAssignment<T, U>>,
+    std::is_constructible<T, U&&>, std::is_assignable<T&, U&&>,
+    absl::disjunction<
+        std::is_same<T, absl::remove_cvref_t<U>>,
+        absl::conjunction<
+            absl::negation<std::is_convertible<U&&, absl::Status>>,
+            absl::negation<HasConversionOperatorToStatusOr<T, U&&>>>>,
+    IsForwardingAssignmentValid<T, U&&>>;
+
+template <bool Explicit, typename T, typename U>
+using IsConstructionFromStatusValid = absl::conjunction<
+    absl::negation<std::is_same<absl::StatusOr<T>, absl::remove_cvref_t<U>>>,
+    absl::negation<std::is_same<T, absl::remove_cvref_t<U>>>,
+    absl::negation<std::is_same<absl::in_place_t, absl::remove_cvref_t<U>>>,
+    Equality<!Explicit, std::is_convertible<U, absl::Status>>,
+    std::is_constructible<absl::Status, U>,
+    absl::negation<HasConversionOperatorToStatusOr<T, U>>>;
+
+template <bool Explicit, typename T, typename U, bool Lifetimebound,
+          typename UQ>
+using IsConstructionFromStatusOrValid = absl::conjunction<
+    absl::negation<std::is_same<T, U>>,
+    Equality<Lifetimebound,
+             type_traits_internal::IsLifetimeBoundAssignment<T, U>>,
+    std::is_constructible<T, UQ>,
+    Equality<!Explicit, std::is_convertible<UQ, T>>,
+    absl::negation<IsConstructibleOrConvertibleFromStatusOr<T, U>>>;
+
+template <typename T, typename U, bool Lifetimebound>
+using IsStatusOrAssignmentValid = absl::conjunction<
+    absl::negation<std::is_same<T, absl::remove_cvref_t<U>>>,
+    Equality<Lifetimebound,
+             type_traits_internal::IsLifetimeBoundAssignment<T, U>>,
+    std::is_constructible<T, U>, std::is_assignable<T, U>,
+    absl::negation<IsConstructibleOrConvertibleOrAssignableFromStatusOr<
+        T, absl::remove_cvref_t<U>>>>;
+
 class Helper {
  public:
   // Move type-agnostic error handling to the .cc.
   static void HandleInvalidStatusCtorArg(absl::Nonnull<Status*>);
-  ABSL_ATTRIBUTE_NORETURN static void Crash(const absl::Status& status);
+  [[noreturn]] static void Crash(const absl::Status& status);
 };
 
 // Construct an instance of T in `p` through placement new, passing Args... to
@@ -379,7 +438,7 @@ struct MoveAssignBase<T, false> {
   MoveAssignBase& operator=(MoveAssignBase&&) = delete;
 };
 
-ABSL_ATTRIBUTE_NORETURN void ThrowBadStatusOrAccess(absl::Status status);
+[[noreturn]] void ThrowBadStatusOrAccess(absl::Status status);
 
 // Used to introduce jitter into the output of printing functions for
 // `StatusOr` (i.e. `AbslStringify` and `operator<<`).
diff --git a/contrib/restricted/abseil-cpp/absl/status/status.cc b/contrib/restricted/abseil-cpp/absl/status/status.cc
index 4dd5ae06ced2..745ab889227f 100644
--- a/contrib/restricted/abseil-cpp/absl/status/status.cc
+++ b/contrib/restricted/abseil-cpp/absl/status/status.cc
@@ -273,14 +273,12 @@ StatusCode ErrnoToStatusCode(int error_number) {
     case EFAULT:        // Bad address
     case EILSEQ:        // Illegal byte sequence
     case ENOPROTOOPT:   // Protocol not available
-    case ENOSTR:        // Not a STREAM
     case ENOTSOCK:      // Not a socket
     case ENOTTY:        // Inappropriate I/O control operation
     case EPROTOTYPE:    // Protocol wrong type for socket
     case ESPIPE:        // Invalid seek
       return StatusCode::kInvalidArgument;
     case ETIMEDOUT:  // Connection timed out
-    case ETIME:      // Timer expired
       return StatusCode::kDeadlineExceeded;
     case ENODEV:  // No such device
     case ENOENT:  // No such file or directory
@@ -339,9 +337,7 @@ StatusCode ErrnoToStatusCode(int error_number) {
     case EMLINK:   // Too many links
     case ENFILE:   // Too many open files in system
     case ENOBUFS:  // No buffer space available
-    case ENODATA:  // No message is available on the STREAM read queue
     case ENOMEM:   // Not enough space
-    case ENOSR:    // No STREAM resources
 #ifdef EUSERS
     case EUSERS:  // Too many users
 #endif
diff --git a/contrib/restricted/abseil-cpp/absl/status/status.h b/contrib/restricted/abseil-cpp/absl/status/status.h
index 9ce16db9619a..6cfe49f2dd77 100644
--- a/contrib/restricted/abseil-cpp/absl/status/status.h
+++ b/contrib/restricted/abseil-cpp/absl/status/status.h
@@ -452,7 +452,7 @@ class ABSL_ATTRIBUTE_TRIVIAL_ABI Status final {
 
   // The moved-from state is valid but unspecified.
   Status(Status&&) noexcept;
-  Status& operator=(Status&&);
+  Status& operator=(Status&&) noexcept;
 
   ~Status();
 
@@ -539,7 +539,7 @@ class ABSL_ATTRIBUTE_TRIVIAL_ABI Status final {
   // swap()
   //
   // Swap the contents of one status with another.
-  friend void swap(Status& a, Status& b);
+  friend void swap(Status& a, Status& b) noexcept;
 
   //----------------------------------------------------------------------------
   // Payload Management APIs
@@ -789,7 +789,7 @@ inline Status::Status(Status&& x) noexcept : Status(x.rep_) {
   x.rep_ = MovedFromRep();
 }
 
-inline Status& Status::operator=(Status&& x) {
+inline Status& Status::operator=(Status&& x) noexcept {
   uintptr_t old_rep = rep_;
   if (x.rep_ != old_rep) {
     rep_ = x.rep_;
@@ -852,7 +852,7 @@ inline void Status::IgnoreError() const {
   // no-op
 }
 
-inline void swap(absl::Status& a, absl::Status& b) {
+inline void swap(absl::Status& a, absl::Status& b) noexcept {
   using std::swap;
   swap(a.rep_, b.rep_);
 }
diff --git a/contrib/restricted/abseil-cpp/absl/status/statusor.h b/contrib/restricted/abseil-cpp/absl/status/statusor.h
index cd35e5b436b6..b1da45e6f0e9 100644
--- a/contrib/restricted/abseil-cpp/absl/status/statusor.h
+++ b/contrib/restricted/abseil-cpp/absl/status/statusor.h
@@ -236,57 +236,55 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   // is explicit if and only if the corresponding construction of `T` from `U`
   // is explicit. (This constructor inherits its explicitness from the
   // underlying constructor.)
-  template <
-      typename U,
-      absl::enable_if_t<
-          absl::conjunction<
-              absl::negation<std::is_same<T, U>>,
-              std::is_constructible<T, const U&>,
-              std::is_convertible<const U&, T>,
-              absl::negation<
-                  internal_statusor::IsConstructibleOrConvertibleFromStatusOr<
-                      T, U>>>::value,
-          int> = 0>
+  template <typename U, absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                false, T, U, false, const U&>::value,
+                            int> = 0>
   StatusOr(const StatusOr<U>& other)  // NOLINT
       : Base(static_cast<const typename StatusOr<U>::Base&>(other)) {}
-  template <
-      typename U,
-      absl::enable_if_t<
-          absl::conjunction<
-              absl::negation<std::is_same<T, U>>,
-              std::is_constructible<T, const U&>,
-              absl::negation<std::is_convertible<const U&, T>>,
-              absl::negation<
-                  internal_statusor::IsConstructibleOrConvertibleFromStatusOr<
-                      T, U>>>::value,
-          int> = 0>
+  template <typename U, absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                false, T, U, true, const U&>::value,
+                            int> = 0>
+  StatusOr(const StatusOr<U>& other ABSL_ATTRIBUTE_LIFETIME_BOUND)  // NOLINT
+      : Base(static_cast<const typename StatusOr<U>::Base&>(other)) {}
+  template <typename U, absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                true, T, U, false, const U&>::value,
+                            int> = 0>
   explicit StatusOr(const StatusOr<U>& other)
       : Base(static_cast<const typename StatusOr<U>::Base&>(other)) {}
+  template <typename U, absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                true, T, U, true, const U&>::value,
+                            int> = 0>
+  explicit StatusOr(const StatusOr<U>& other ABSL_ATTRIBUTE_LIFETIME_BOUND)
+      : Base(static_cast<const typename StatusOr<U>::Base&>(other)) {}
 
-  template <
-      typename U,
-      absl::enable_if_t<
-          absl::conjunction<
-              absl::negation<std::is_same<T, U>>, std::is_constructible<T, U&&>,
-              std::is_convertible<U&&, T>,
-              absl::negation<
-                  internal_statusor::IsConstructibleOrConvertibleFromStatusOr<
-                      T, U>>>::value,
-          int> = 0>
+  template <typename U, absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                false, T, U, false, U&&>::value,
+                            int> = 0>
   StatusOr(StatusOr<U>&& other)  // NOLINT
       : Base(static_cast<typename StatusOr<U>::Base&&>(other)) {}
-  template <
-      typename U,
-      absl::enable_if_t<
-          absl::conjunction<
-              absl::negation<std::is_same<T, U>>, std::is_constructible<T, U&&>,
-              absl::negation<std::is_convertible<U&&, T>>,
-              absl::negation<
-                  internal_statusor::IsConstructibleOrConvertibleFromStatusOr<
-                      T, U>>>::value,
-          int> = 0>
+  template <typename U, absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                false, T, U, true, U&&>::value,
+                            int> = 0>
+  StatusOr(StatusOr<U>&& other ABSL_ATTRIBUTE_LIFETIME_BOUND)  // NOLINT
+      : Base(static_cast<typename StatusOr<U>::Base&&>(other)) {}
+  template <typename U, absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                true, T, U, false, U&&>::value,
+                            int> = 0>
   explicit StatusOr(StatusOr<U>&& other)
       : Base(static_cast<typename StatusOr<U>::Base&&>(other)) {}
+  template <typename U, absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                true, T, U, true, U&&>::value,
+                            int> = 0>
+  explicit StatusOr(StatusOr<U>&& other ABSL_ATTRIBUTE_LIFETIME_BOUND)
+      : Base(static_cast<typename StatusOr<U>::Base&&>(other)) {}
 
   // Converting Assignment Operators
 
@@ -307,37 +305,38 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   // These overloads only apply if `absl::StatusOr<T>` is constructible and
   // assignable from `absl::StatusOr<U>` and `StatusOr<T>` cannot be directly
   // assigned from `StatusOr<U>`.
-  template <
-      typename U,
-      absl::enable_if_t<
-          absl::conjunction<
-              absl::negation<std::is_same<T, U>>,
-              std::is_constructible<T, const U&>,
-              std::is_assignable<T, const U&>,
-              absl::negation<
-                  internal_statusor::
-                      IsConstructibleOrConvertibleOrAssignableFromStatusOr<
-                          T, U>>>::value,
-          int> = 0>
+  template <typename U,
+            absl::enable_if_t<internal_statusor::IsStatusOrAssignmentValid<
+                                  T, const U&, false>::value,
+                              int> = 0>
   StatusOr& operator=(const StatusOr<U>& other) {
     this->Assign(other);
     return *this;
   }
-  template <
-      typename U,
-      absl::enable_if_t<
-          absl::conjunction<
-              absl::negation<std::is_same<T, U>>, std::is_constructible<T, U&&>,
-              std::is_assignable<T, U&&>,
-              absl::negation<
-                  internal_statusor::
-                      IsConstructibleOrConvertibleOrAssignableFromStatusOr<
-                          T, U>>>::value,
-          int> = 0>
+  template <typename U,
+            absl::enable_if_t<internal_statusor::IsStatusOrAssignmentValid<
+                                  T, const U&, true>::value,
+                              int> = 0>
+  StatusOr& operator=(const StatusOr<U>& other ABSL_ATTRIBUTE_LIFETIME_BOUND) {
+    this->Assign(other);
+    return *this;
+  }
+  template <typename U,
+            absl::enable_if_t<internal_statusor::IsStatusOrAssignmentValid<
+                                  T, U&&, false>::value,
+                              int> = 0>
   StatusOr& operator=(StatusOr<U>&& other) {
     this->Assign(std::move(other));
     return *this;
   }
+  template <typename U,
+            absl::enable_if_t<internal_statusor::IsStatusOrAssignmentValid<
+                                  T, U&&, true>::value,
+                              int> = 0>
+  StatusOr& operator=(StatusOr<U>&& other ABSL_ATTRIBUTE_LIFETIME_BOUND) {
+    this->Assign(std::move(other));
+    return *this;
+  }
 
   // Constructs a new `absl::StatusOr<T>` with a non-ok status. After calling
   // this constructor, `this->ok()` will be `false` and calls to `value()` will
@@ -350,46 +349,21 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   // REQUIRES: !Status(std::forward<U>(v)).ok(). This requirement is DCHECKed.
   // In optimized builds, passing absl::OkStatus() here will have the effect
   // of passing absl::StatusCode::kInternal as a fallback.
-  template <
-      typename U = absl::Status,
-      absl::enable_if_t<
-          absl::conjunction<
-              std::is_convertible<U&&, absl::Status>,
-              std::is_constructible<absl::Status, U&&>,
-              absl::negation<std::is_same<absl::decay_t<U>, absl::StatusOr<T>>>,
-              absl::negation<std::is_same<absl::decay_t<U>, T>>,
-              absl::negation<std::is_same<absl::decay_t<U>, absl::in_place_t>>,
-              absl::negation<internal_statusor::HasConversionOperatorToStatusOr<
-                  T, U&&>>>::value,
-          int> = 0>
+  template <typename U = absl::Status,
+            absl::enable_if_t<internal_statusor::IsConstructionFromStatusValid<
+                                  false, T, U>::value,
+                              int> = 0>
   StatusOr(U&& v) : Base(std::forward<U>(v)) {}
 
-  template <
-      typename U = absl::Status,
-      absl::enable_if_t<
-          absl::conjunction<
-              absl::negation<std::is_convertible<U&&, absl::Status>>,
-              std::is_constructible<absl::Status, U&&>,
-              absl::negation<std::is_same<absl::decay_t<U>, absl::StatusOr<T>>>,
-              absl::negation<std::is_same<absl::decay_t<U>, T>>,
-              absl::negation<std::is_same<absl::decay_t<U>, absl::in_place_t>>,
-              absl::negation<internal_statusor::HasConversionOperatorToStatusOr<
-                  T, U&&>>>::value,
-          int> = 0>
+  template <typename U = absl::Status,
+            absl::enable_if_t<internal_statusor::IsConstructionFromStatusValid<
+                                  true, T, U>::value,
+                              int> = 0>
   explicit StatusOr(U&& v) : Base(std::forward<U>(v)) {}
-
-  template <
-      typename U = absl::Status,
-      absl::enable_if_t<
-          absl::conjunction<
-              std::is_convertible<U&&, absl::Status>,
-              std::is_constructible<absl::Status, U&&>,
-              absl::negation<std::is_same<absl::decay_t<U>, absl::StatusOr<T>>>,
-              absl::negation<std::is_same<absl::decay_t<U>, T>>,
-              absl::negation<std::is_same<absl::decay_t<U>, absl::in_place_t>>,
-              absl::negation<internal_statusor::HasConversionOperatorToStatusOr<
-                  T, U&&>>>::value,
-          int> = 0>
+  template <typename U = absl::Status,
+            absl::enable_if_t<internal_statusor::IsConstructionFromStatusValid<
+                                  false, T, U>::value,
+                              int> = 0>
   StatusOr& operator=(U&& v) {
     this->AssignStatus(std::forward<U>(v));
     return *this;
@@ -411,21 +385,22 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   //    StatusOr<bool> s1 = true;  // s1.ok() && *s1 == true
   //    StatusOr<bool> s2 = false;  // s2.ok() && *s2 == false
   //    s1 = s2;  // ambiguous, `s1 = *s2` or `s1 = bool(s2)`?
-  template <
-      typename U = T,
-      typename = typename std::enable_if<absl::conjunction<
-          std::is_constructible<T, U&&>, std::is_assignable<T&, U&&>,
-          absl::disjunction<
-              std::is_same<absl::remove_cvref_t<U>, T>,
-              absl::conjunction<
-                  absl::negation<std::is_convertible<U&&, absl::Status>>,
-                  absl::negation<internal_statusor::
-                                     HasConversionOperatorToStatusOr<T, U&&>>>>,
-          internal_statusor::IsForwardingAssignmentValid<T, U&&>>::value>::type>
+  template <typename U = T,
+            typename std::enable_if<
+                internal_statusor::IsAssignmentValid<T, U, false>::value,
+                int>::type = 0>
   StatusOr& operator=(U&& v) {
     this->Assign(std::forward<U>(v));
     return *this;
   }
+  template <typename U = T,
+            typename std::enable_if<
+                internal_statusor::IsAssignmentValid<T, U, true>::value,
+                int>::type = 0>
+  StatusOr& operator=(U&& v ABSL_ATTRIBUTE_LIFETIME_BOUND) {
+    this->Assign(std::forward<U>(v));
+    return *this;
+  }
 
   // Constructs the inner value `T` in-place using the provided args, using the
   // `T(args...)` constructor.
@@ -442,40 +417,31 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   // This constructor is explicit if `U` is not convertible to `T`. To avoid
   // ambiguity, this constructor is disabled if `U` is a `StatusOr<J>`, where
   // `J` is convertible to `T`.
-  template <
-      typename U = T,
-      absl::enable_if_t<
-          absl::conjunction<
-              internal_statusor::IsDirectInitializationValid<T, U&&>,
-              std::is_constructible<T, U&&>, std::is_convertible<U&&, T>,
-              absl::disjunction<
-                  std::is_same<absl::remove_cvref_t<U>, T>,
-                  absl::conjunction<
-                      absl::negation<std::is_convertible<U&&, absl::Status>>,
-                      absl::negation<
-                          internal_statusor::HasConversionOperatorToStatusOr<
-                              T, U&&>>>>>::value,
-          int> = 0>
+  template <typename U = T,
+            absl::enable_if_t<internal_statusor::IsConstructionValid<
+                                  false, T, U, false>::value,
+                              int> = 0>
   StatusOr(U&& u)  // NOLINT
       : StatusOr(absl::in_place, std::forward<U>(u)) {}
+  template <typename U = T,
+            absl::enable_if_t<internal_statusor::IsConstructionValid<
+                                  false, T, U, true>::value,
+                              int> = 0>
+  StatusOr(U&& u ABSL_ATTRIBUTE_LIFETIME_BOUND)  // NOLINT
+      : StatusOr(absl::in_place, std::forward<U>(u)) {}
 
-  template <
-      typename U = T,
-      absl::enable_if_t<
-          absl::conjunction<
-              internal_statusor::IsDirectInitializationValid<T, U&&>,
-              absl::disjunction<
-                  std::is_same<absl::remove_cvref_t<U>, T>,
-                  absl::conjunction<
-                      absl::negation<std::is_constructible<absl::Status, U&&>>,
-                      absl::negation<
-                          internal_statusor::HasConversionOperatorToStatusOr<
-                              T, U&&>>>>,
-              std::is_constructible<T, U&&>,
-              absl::negation<std::is_convertible<U&&, T>>>::value,
-          int> = 0>
+  template <typename U = T,
+            absl::enable_if_t<internal_statusor::IsConstructionValid<
+                                  true, T, U, false>::value,
+                              int> = 0>
   explicit StatusOr(U&& u)  // NOLINT
       : StatusOr(absl::in_place, std::forward<U>(u)) {}
+  template <typename U = T,
+            absl::enable_if_t<
+                internal_statusor::IsConstructionValid<true, T, U, true>::value,
+                int> = 0>
+  explicit StatusOr(U&& u ABSL_ATTRIBUTE_LIFETIME_BOUND)  // NOLINT
+      : StatusOr(absl::in_place, std::forward<U>(u)) {}
 
   // StatusOr<T>::ok()
   //
diff --git a/contrib/restricted/abseil-cpp/absl/strings/ascii.cc b/contrib/restricted/abseil-cpp/absl/strings/ascii.cc
index 5460b2c6dce1..20a696a1f62c 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/ascii.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/ascii.cc
@@ -15,13 +15,14 @@
 #include "absl/strings/ascii.h"
 
 #include <climits>
-#include <cstdint>
+#include <cstddef>
 #include <cstring>
 #include <string>
-#include <type_traits>
 
+#include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/nullability.h"
+#include "absl/base/optimization.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
@@ -162,19 +163,6 @@ ABSL_DLL const char kToUpper[256] = {
 };
 // clang-format on
 
-template <class T>
-static constexpr T BroadcastByte(unsigned char value) {
-  static_assert(std::is_integral<T>::value && sizeof(T) <= sizeof(uint64_t) &&
-                    std::is_unsigned<T>::value,
-                "only unsigned integers up to 64-bit allowed");
-  T result = value;
-  constexpr size_t result_bit_width = sizeof(result) * CHAR_BIT;
-  result |= result << ((CHAR_BIT << 0) & (result_bit_width - 1));
-  result |= result << ((CHAR_BIT << 1) & (result_bit_width - 1));
-  result |= result << ((CHAR_BIT << 2) & (result_bit_width - 1));
-  return result;
-}
-
 // Returns whether `c` is in the a-z/A-Z range (w.r.t. `ToUpper`).
 // Implemented by:
 //  1. Pushing the a-z/A-Z range to [SCHAR_MIN, SCHAR_MIN + 26).
@@ -189,47 +177,10 @@ constexpr bool AsciiInAZRange(unsigned char c) {
   return static_cast<signed char>(u) < threshold;
 }
 
+// Force-inline so the compiler won't merge the short and long implementations.
 template <bool ToUpper>
-static constexpr char* PartialAsciiStrCaseFold(absl::Nonnull<char*> p,
-                                               absl::Nonnull<char*> end) {
-  using vec_t = size_t;
-  const size_t n = static_cast<size_t>(end - p);
-
-  // SWAR algorithm: http://0x80.pl/notesen/2016-01-06-swar-swap-case.html
-  constexpr char ch_a = ToUpper ? 'a' : 'A', ch_z = ToUpper ? 'z' : 'Z';
-  char* const swar_end = p + (n / sizeof(vec_t)) * sizeof(vec_t);
-  while (p < swar_end) {
-    vec_t v = vec_t();
-
-    // memcpy the vector, but constexpr
-    for (size_t i = 0; i < sizeof(vec_t); ++i) {
-      v |= static_cast<vec_t>(static_cast<unsigned char>(p[i]))
-           << (i * CHAR_BIT);
-    }
-
-    constexpr unsigned int msb = 1u << (CHAR_BIT - 1);
-    const vec_t v_msb = v & BroadcastByte<vec_t>(msb);
-    const vec_t v_nonascii_mask = (v_msb << 1) - (v_msb >> (CHAR_BIT - 1));
-    const vec_t v_nonascii = v & v_nonascii_mask;
-    const vec_t v_ascii = v & ~v_nonascii_mask;
-    const vec_t a = v_ascii + BroadcastByte<vec_t>(msb - ch_a - 0),
-                z = v_ascii + BroadcastByte<vec_t>(msb - ch_z - 1);
-    v = v_nonascii | (v_ascii ^ ((a ^ z) & BroadcastByte<vec_t>(msb)) >> 2);
-
-    // memcpy the vector, but constexpr
-    for (size_t i = 0; i < sizeof(vec_t); ++i) {
-      p[i] = static_cast<char>(v >> (i * CHAR_BIT));
-    }
-
-    p += sizeof(v);
-  }
-
-  return p;
-}
-
-template <bool ToUpper>
-static constexpr void AsciiStrCaseFold(absl::Nonnull<char*> p,
-                                       absl::Nonnull<char*> end) {
+ABSL_ATTRIBUTE_ALWAYS_INLINE inline constexpr void AsciiStrCaseFoldImpl(
+    absl::Nonnull<char*> p, size_t size) {
   // The upper- and lowercase versions of ASCII characters differ by only 1 bit.
   // When we need to flip the case, we can xor with this bit to achieve the
   // desired result. Note that the choice of 'a' and 'A' here is arbitrary. We
@@ -237,20 +188,32 @@ static constexpr void AsciiStrCaseFold(absl::Nonnull<char*> p,
   // have the same single bit difference.
   constexpr unsigned char kAsciiCaseBitFlip = 'a' ^ 'A';
 
-  using vec_t = size_t;
-  // TODO(b/316380338): When FDO becomes able to vectorize these,
-  // revert this manual optimization and just leave the naive loop.
-  if (static_cast<size_t>(end - p) >= sizeof(vec_t)) {
-    p = ascii_internal::PartialAsciiStrCaseFold<ToUpper>(p, end);
-  }
-  while (p < end) {
-    unsigned char v = static_cast<unsigned char>(*p);
+  for (size_t i = 0; i < size; ++i) {
+    unsigned char v = static_cast<unsigned char>(p[i]);
     v ^= AsciiInAZRange<ToUpper>(v) ? kAsciiCaseBitFlip : 0;
-    *p = static_cast<char>(v);
-    ++p;
+    p[i] = static_cast<char>(v);
   }
 }
 
+// The string size threshold for starting using the long string version.
+constexpr size_t kCaseFoldThreshold = 16;
+
+// No-inline so the compiler won't merge the short and long implementations.
+template <bool ToUpper>
+ABSL_ATTRIBUTE_NOINLINE constexpr void AsciiStrCaseFoldLong(
+    absl::Nonnull<char*> p, size_t size) {
+  ABSL_ASSUME(size >= kCaseFoldThreshold);
+  AsciiStrCaseFoldImpl<ToUpper>(p, size);
+}
+
+// Splitting to short and long strings to allow vectorization decisions
+// to be made separately in the long and short cases.
+template <bool ToUpper>
+constexpr void AsciiStrCaseFold(absl::Nonnull<char*> p, size_t size) {
+  size < kCaseFoldThreshold ? AsciiStrCaseFoldImpl<ToUpper>(p, size)
+                            : AsciiStrCaseFoldLong<ToUpper>(p, size);
+}
+
 static constexpr size_t ValidateAsciiCasefold() {
   constexpr size_t num_chars = 1 + CHAR_MAX - CHAR_MIN;
   size_t incorrect_index = 0;
@@ -259,8 +222,8 @@ static constexpr size_t ValidateAsciiCasefold() {
   for (unsigned int i = 0; i < num_chars; ++i) {
     uppered[i] = lowered[i] = static_cast<char>(i);
   }
-  AsciiStrCaseFold<false>(&lowered[0], &lowered[num_chars]);
-  AsciiStrCaseFold<true>(&uppered[0], &uppered[num_chars]);
+  AsciiStrCaseFold<false>(&lowered[0], num_chars);
+  AsciiStrCaseFold<true>(&uppered[0], num_chars);
   for (size_t i = 0; i < num_chars; ++i) {
     const char ch = static_cast<char>(i),
                ch_upper = ('a' <= ch && ch <= 'z' ? 'A' + (ch - 'a') : ch),
@@ -278,13 +241,11 @@ static_assert(ValidateAsciiCasefold() == 0, "error in case conversion");
 }  // namespace ascii_internal
 
 void AsciiStrToLower(absl::Nonnull<std::string*> s) {
-  char* p = &(*s)[0];  // Guaranteed to be valid for empty strings
-  return ascii_internal::AsciiStrCaseFold<false>(p, p + s->size());
+  return ascii_internal::AsciiStrCaseFold<false>(&(*s)[0], s->size());
 }
 
 void AsciiStrToUpper(absl::Nonnull<std::string*> s) {
-  char* p = &(*s)[0];  // Guaranteed to be valid for empty strings
-  return ascii_internal::AsciiStrCaseFold<true>(p, p + s->size());
+  return ascii_internal::AsciiStrCaseFold<true>(&(*s)[0], s->size());
 }
 
 void RemoveExtraAsciiWhitespace(absl::Nonnull<std::string*> str) {
diff --git a/contrib/restricted/abseil-cpp/absl/strings/cord.cc b/contrib/restricted/abseil-cpp/absl/strings/cord.cc
index f67326fdef3d..f0f4f31ac525 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/cord.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/cord.cc
@@ -75,7 +75,7 @@ using ::absl::cord_internal::kMinFlatLength;
 using ::absl::cord_internal::kInlinedVectorSize;
 using ::absl::cord_internal::kMaxBytesToCopy;
 
-static void DumpNode(absl::Nonnull<CordRep*> rep, bool include_data,
+static void DumpNode(absl::Nonnull<CordRep*> nonnull_rep, bool include_data,
                      absl::Nonnull<std::ostream*> os, int indent = 0);
 static bool VerifyNode(absl::Nonnull<CordRep*> root,
                        absl::Nonnull<CordRep*> start_node);
@@ -425,8 +425,8 @@ Cord& Cord::operator=(absl::string_view src) {
 // we keep it here to make diffs easier.
 void Cord::InlineRep::AppendArray(absl::string_view src,
                                   MethodIdentifier method) {
-  MaybeRemoveEmptyCrcNode();
   if (src.empty()) return;  // memcpy(_, nullptr, 0) is undefined.
+  MaybeRemoveEmptyCrcNode();
 
   size_t appended = 0;
   CordRep* rep = tree();
@@ -1062,6 +1062,15 @@ void CopyCordToString(const Cord& src, absl::Nonnull<std::string*> dst) {
   }
 }
 
+void AppendCordToString(const Cord& src, absl::Nonnull<std::string*> dst) {
+  const size_t cur_dst_size = dst->size();
+  const size_t new_dst_size = cur_dst_size + src.size();
+  absl::strings_internal::STLStringResizeUninitializedAmortized(dst,
+                                                                new_dst_size);
+  char* append_ptr = &(*dst)[cur_dst_size];
+  src.CopyToArrayImpl(append_ptr);
+}
+
 void Cord::CopyToArraySlowPath(absl::Nonnull<char*> dst) const {
   assert(contents_.is_tree());
   absl::string_view fragment;
@@ -1448,14 +1457,13 @@ absl::string_view Cord::FlattenSlowPath() {
   }
 }
 
-static void DumpNode(absl::Nonnull<CordRep*> rep, bool include_data,
+static void DumpNode(absl::Nonnull<CordRep*> nonnull_rep, bool include_data,
                      absl::Nonnull<std::ostream*> os, int indent) {
+  CordRep* rep = nonnull_rep;
   const int kIndentStep = 1;
-  absl::InlinedVector<CordRep*, kInlinedVectorSize> stack;
-  absl::InlinedVector<int, kInlinedVectorSize> indents;
   for (;;) {
-    *os << std::setw(3) << rep->refcount.Get();
-    *os << " " << std::setw(7) << rep->length;
+    *os << std::setw(3) << (rep == nullptr ? 0 : rep->refcount.Get());
+    *os << " " << std::setw(7) << (rep == nullptr ? 0 : rep->length);
     *os << " [";
     if (include_data) *os << static_cast<void*>(rep);
     *os << "]";
@@ -1477,26 +1485,23 @@ static void DumpNode(absl::Nonnull<CordRep*> rep, bool include_data,
       if (rep->IsExternal()) {
         *os << "EXTERNAL [";
         if (include_data)
-          *os << absl::CEscape(std::string(rep->external()->base, rep->length));
+          *os << absl::CEscape(
+              absl::string_view(rep->external()->base, rep->length));
         *os << "]\n";
       } else if (rep->IsFlat()) {
         *os << "FLAT cap=" << rep->flat()->Capacity() << " [";
         if (include_data)
-          *os << absl::CEscape(std::string(rep->flat()->Data(), rep->length));
+          *os << absl::CEscape(
+              absl::string_view(rep->flat()->Data(), rep->length));
         *os << "]\n";
       } else {
         CordRepBtree::Dump(rep, /*label=*/"", include_data, *os);
       }
     }
     if (leaf) {
-      if (stack.empty()) break;
-      rep = stack.back();
-      stack.pop_back();
-      indent = indents.back();
-      indents.pop_back();
+      break;
     }
   }
-  ABSL_INTERNAL_CHECK(indents.empty(), "");
 }
 
 static std::string ReportError(absl::Nonnull<CordRep*> root,
diff --git a/contrib/restricted/abseil-cpp/absl/strings/cord.h b/contrib/restricted/abseil-cpp/absl/strings/cord.h
index b3e556b6b4da..69aa8ef41f0c 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/cord.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/cord.h
@@ -75,6 +75,7 @@
 #include "absl/base/internal/per_thread_tls.h"
 #include "absl/base/macros.h"
 #include "absl/base/nullability.h"
+#include "absl/base/optimization.h"
 #include "absl/base/port.h"
 #include "absl/container/inlined_vector.h"
 #include "absl/crc/internal/crc_cord_state.h"
@@ -95,6 +96,7 @@
 #include "absl/strings/internal/resize_uninitialized.h"
 #include "absl/strings/internal/string_constant.h"
 #include "absl/strings/string_view.h"
+#include "absl/types/compare.h"
 #include "absl/types/optional.h"
 
 namespace absl {
@@ -104,6 +106,7 @@ class CordTestPeer;
 template <typename Releaser>
 Cord MakeCordFromExternal(absl::string_view, Releaser&&);
 void CopyCordToString(const Cord& src, absl::Nonnull<std::string*> dst);
+void AppendCordToString(const Cord& src, absl::Nonnull<std::string*> dst);
 
 // Cord memory accounting modes
 enum class CordMemoryAccounting {
@@ -420,6 +423,18 @@ class Cord {
   friend void CopyCordToString(const Cord& src,
                                absl::Nonnull<std::string*> dst);
 
+  // AppendCordToString()
+  //
+  // Appends the contents of a `src` Cord to a `*dst` string.
+  //
+  // This function optimizes the case of appending to a non-empty destination
+  // string. If `*dst` already has capacity to store the contents of the cord,
+  // this function does not invalidate pointers previously returned by
+  // `dst->data()`. If `*dst` is a new object, prefer to simply use the
+  // conversion operator to `std::string`.
+  friend void AppendCordToString(const Cord& src,
+                                 absl::Nonnull<std::string*> dst);
+
   class CharIterator;
 
   //----------------------------------------------------------------------------
@@ -757,7 +772,7 @@ class Cord {
 
   // Cord::Find()
   //
-  // Returns an iterator to the first occurrance of the substring `needle`.
+  // Returns an iterator to the first occurrence of the substring `needle`.
   //
   // If the substring `needle` does not occur, `Cord::char_end()` is returned.
   CharIterator Find(absl::string_view needle) const;
@@ -835,6 +850,38 @@ class Cord {
   friend bool operator==(const Cord& lhs, const Cord& rhs);
   friend bool operator==(const Cord& lhs, absl::string_view rhs);
 
+#ifdef __cpp_impl_three_way_comparison
+
+  // Cords support comparison with other Cords and string_views via operator<
+  // and others; here we provide a wrapper for the C++20 three-way comparison
+  // <=> operator.
+
+  static inline std::strong_ordering ConvertCompareResultToStrongOrdering(
+      int c) {
+    if (c == 0) {
+      return std::strong_ordering::equal;
+    } else if (c < 0) {
+      return std::strong_ordering::less;
+    } else {
+      return std::strong_ordering::greater;
+    }
+  }
+
+  friend inline std::strong_ordering operator<=>(const Cord& x, const Cord& y) {
+    return ConvertCompareResultToStrongOrdering(x.Compare(y));
+  }
+
+  friend inline std::strong_ordering operator<=>(const Cord& lhs,
+                                                 absl::string_view rhs) {
+    return ConvertCompareResultToStrongOrdering(lhs.Compare(rhs));
+  }
+
+  friend inline std::strong_ordering operator<=>(absl::string_view lhs,
+                                                 const Cord& rhs) {
+    return ConvertCompareResultToStrongOrdering(-rhs.Compare(lhs));
+  }
+#endif
+
   friend absl::Nullable<const CordzInfo*> GetCordzInfoForTesting(
       const Cord& cord);
 
@@ -1065,6 +1112,8 @@ class Cord {
       const;
 
   CharIterator FindImpl(CharIterator it, absl::string_view needle) const;
+
+  void CopyToArrayImpl(absl::Nonnull<char*> dst) const;
 };
 
 ABSL_NAMESPACE_END
@@ -1103,8 +1152,8 @@ absl::Nonnull<CordRep*> NewExternalRep(absl::string_view data,
 // Overload for function reference types that dispatches using a function
 // pointer because there are no `alignof()` or `sizeof()` a function reference.
 // NOLINTNEXTLINE - suppress clang-tidy raw pointer return.
-inline absl::Nonnull<CordRep*> NewExternalRep(absl::string_view data,
-                               void (&releaser)(absl::string_view)) {
+inline absl::Nonnull<CordRep*> NewExternalRep(
+    absl::string_view data, void (&releaser)(absl::string_view)) {
   return NewExternalRep(data, &releaser);
 }
 
@@ -1120,7 +1169,7 @@ Cord MakeCordFromExternal(absl::string_view data, Releaser&& releaser) {
   } else {
     using ReleaserType = absl::decay_t<Releaser>;
     cord_internal::InvokeReleaser(
-        cord_internal::Rank0{}, ReleaserType(std::forward<Releaser>(releaser)),
+        cord_internal::Rank1{}, ReleaserType(std::forward<Releaser>(releaser)),
         data);
   }
   return cord;
@@ -1170,7 +1219,8 @@ inline void Cord::InlineRep::Swap(absl::Nonnull<Cord::InlineRep*> rhs) {
   if (rhs == this) {
     return;
   }
-  std::swap(data_, rhs->data_);
+  using std::swap;
+  swap(data_, rhs->data_);
 }
 
 inline absl::Nullable<const char*> Cord::InlineRep::data() const {
@@ -1352,7 +1402,8 @@ inline size_t Cord::EstimatedMemoryUsage(
   return result;
 }
 
-inline absl::optional<absl::string_view> Cord::TryFlat() const {
+inline absl::optional<absl::string_view> Cord::TryFlat() const
+    ABSL_ATTRIBUTE_LIFETIME_BOUND {
   absl::cord_internal::CordRep* rep = contents_.tree();
   if (rep == nullptr) {
     return absl::string_view(contents_.data(), contents_.size());
@@ -1364,7 +1415,7 @@ inline absl::optional<absl::string_view> Cord::TryFlat() const {
   return absl::nullopt;
 }
 
-inline absl::string_view Cord::Flatten() {
+inline absl::string_view Cord::Flatten() ABSL_ATTRIBUTE_LIFETIME_BOUND {
   absl::cord_internal::CordRep* rep = contents_.tree();
   if (rep == nullptr) {
     return absl::string_view(contents_.data(), contents_.size());
@@ -1387,6 +1438,7 @@ inline void Cord::Prepend(absl::string_view src) {
 
 inline void Cord::Append(CordBuffer buffer) {
   if (ABSL_PREDICT_FALSE(buffer.length() == 0)) return;
+  contents_.MaybeRemoveEmptyCrcNode();
   absl::string_view short_value;
   if (CordRep* rep = buffer.ConsumeValue(short_value)) {
     contents_.AppendTree(rep, CordzUpdateTracker::kAppendCordBuffer);
@@ -1397,6 +1449,7 @@ inline void Cord::Append(CordBuffer buffer) {
 
 inline void Cord::Prepend(CordBuffer buffer) {
   if (ABSL_PREDICT_FALSE(buffer.length() == 0)) return;
+  contents_.MaybeRemoveEmptyCrcNode();
   absl::string_view short_value;
   if (CordRep* rep = buffer.ConsumeValue(short_value)) {
     contents_.PrependTree(rep, CordzUpdateTracker::kPrependCordBuffer);
@@ -1445,6 +1498,14 @@ inline bool Cord::StartsWith(absl::string_view rhs) const {
   return EqualsImpl(rhs, rhs_size);
 }
 
+inline void Cord::CopyToArrayImpl(absl::Nonnull<char*> dst) const {
+  if (!contents_.is_tree()) {
+    if (!empty()) contents_.CopyToArray(dst);
+  } else {
+    CopyToArraySlowPath(dst);
+  }
+}
+
 inline void Cord::ChunkIterator::InitTree(
     absl::Nonnull<cord_internal::CordRep*> tree) {
   tree = cord_internal::SkipCrcNode(tree);
diff --git a/contrib/restricted/abseil-cpp/absl/strings/escaping.cc b/contrib/restricted/abseil-cpp/absl/strings/escaping.cc
index 27d3d98c2848..4ffef94b63b2 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/escaping.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/escaping.cc
@@ -21,10 +21,12 @@
 #include <cstring>
 #include <limits>
 #include <string>
+#include <utility>
 
 #include "absl/base/config.h"
 #include "absl/base/internal/raw_logging.h"
 #include "absl/base/internal/unaligned_access.h"
+#include "absl/base/nullability.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/charset.h"
 #include "absl/strings/internal/escaping.h"
@@ -54,7 +56,8 @@ inline unsigned int hex_digit_to_int(char c) {
   return x & 0xf;
 }
 
-inline bool IsSurrogate(char32_t c, absl::string_view src, std::string* error) {
+inline bool IsSurrogate(char32_t c, absl::string_view src,
+                        absl::Nullable<std::string*> error) {
   if (c >= 0xD800 && c <= 0xDFFF) {
     if (error) {
       *error = absl::StrCat("invalid surrogate character (0xD800-DFFF): \\",
@@ -83,7 +86,9 @@ inline bool IsSurrogate(char32_t c, absl::string_view src, std::string* error) {
 //     UnescapeCEscapeSequences().
 // ----------------------------------------------------------------------
 bool CUnescapeInternal(absl::string_view source, bool leave_nulls_escaped,
-                       char* dest, ptrdiff_t* dest_len, std::string* error) {
+                       absl::Nonnull<char*> dest,
+                       absl::Nonnull<ptrdiff_t*> dest_len,
+                       absl::Nullable<std::string*> error) {
   char* d = dest;
   const char* p = source.data();
   const char* end = p + source.size();
@@ -290,7 +295,8 @@ bool CUnescapeInternal(absl::string_view source, bool leave_nulls_escaped,
 //    may be the same.
 // ----------------------------------------------------------------------
 bool CUnescapeInternal(absl::string_view source, bool leave_nulls_escaped,
-                       std::string* dest, std::string* error) {
+                       absl::Nonnull<std::string*> dest,
+                       absl::Nullable<std::string*> error) {
   strings_internal::STLStringResizeUninitialized(dest, source.size());
 
   ptrdiff_t dest_size;
@@ -407,7 +413,8 @@ inline size_t CEscapedLength(absl::string_view src) {
   return escaped_len;
 }
 
-void CEscapeAndAppendInternal(absl::string_view src, std::string* dest) {
+void CEscapeAndAppendInternal(absl::string_view src,
+                              absl::Nonnull<std::string*> dest) {
   size_t escaped_len = CEscapedLength(src);
   if (escaped_len == src.size()) {
     dest->append(src.data(), src.size());
@@ -464,9 +471,10 @@ void CEscapeAndAppendInternal(absl::string_view src, std::string* dest) {
 
 // Reverses the mapping in Base64EscapeInternal; see that method's
 // documentation for details of the mapping.
-bool Base64UnescapeInternal(const char* src_param, size_t szsrc, char* dest,
-                            size_t szdest, const signed char* unbase64,
-                            size_t* len) {
+bool Base64UnescapeInternal(absl::Nullable<const char*> src_param, size_t szsrc,
+                            absl::Nullable<char*> dest, size_t szdest,
+                            absl::Nonnull<const signed char*> unbase64,
+                            absl::Nonnull<size_t*> len) {
   static const char kPad64Equals = '=';
   static const char kPad64Dot = '.';
 
@@ -802,8 +810,9 @@ constexpr signed char kUnWebSafeBase64[] = {
 /* clang-format on */
 
 template <typename String>
-bool Base64UnescapeInternal(const char* src, size_t slen, String* dest,
-                            const signed char* unbase64) {
+bool Base64UnescapeInternal(absl::Nullable<const char*> src, size_t slen,
+                            absl::Nonnull<String*> dest,
+                            absl::Nonnull<const signed char*> unbase64) {
   // Determine the size of the output string.  Base64 encodes every 3 bytes into
   // 4 characters.  Any leftover chars are added directly for good measure.
   const size_t dest_len = 3 * (slen / 4) + (slen % 4);
@@ -847,13 +856,32 @@ constexpr char kHexValueLenient[256] = {
     0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
+constexpr signed char kHexValueStrict[256] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1,  // '0'..'9'
+    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,  // 'A'..'F'
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,  // 'a'..'f'
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+};
 /* clang-format on */
 
 // This is a templated function so that T can be either a char*
 // or a string.  This works because we use the [] operator to access
 // individual characters at a time.
 template <typename T>
-void HexStringToBytesInternal(const char* from, T to, size_t num) {
+void HexStringToBytesInternal(absl::Nullable<const char*> from, T to,
+                              size_t num) {
   for (size_t i = 0; i < num; i++) {
     to[i] = static_cast<char>(kHexValueLenient[from[i * 2] & 0xFF] << 4) +
             (kHexValueLenient[from[i * 2 + 1] & 0xFF]);
@@ -863,7 +891,8 @@ void HexStringToBytesInternal(const char* from, T to, size_t num) {
 // This is a templated function so that T can be either a char* or a
 // std::string.
 template <typename T>
-void BytesToHexStringInternal(const unsigned char* src, T dest, size_t num) {
+void BytesToHexStringInternal(absl::Nullable<const unsigned char*> src, T dest,
+                              size_t num) {
   auto dest_ptr = &dest[0];
   for (auto src_ptr = src; src_ptr != (src + num); ++src_ptr, dest_ptr += 2) {
     const char* hex_p = &numbers_internal::kHexTable[*src_ptr * 2];
@@ -878,8 +907,8 @@ void BytesToHexStringInternal(const unsigned char* src, T dest, size_t num) {
 //
 // See CUnescapeInternal() for implementation details.
 // ----------------------------------------------------------------------
-bool CUnescape(absl::string_view source, std::string* dest,
-               std::string* error) {
+bool CUnescape(absl::string_view source, absl::Nonnull<std::string*> dest,
+               absl::Nullable<std::string*> error) {
   return CUnescapeInternal(source, kUnescapeNulls, dest, error);
 }
 
@@ -901,21 +930,23 @@ std::string Utf8SafeCHexEscape(absl::string_view src) {
   return CEscapeInternal(src, true, true);
 }
 
-bool Base64Unescape(absl::string_view src, std::string* dest) {
+bool Base64Unescape(absl::string_view src, absl::Nonnull<std::string*> dest) {
   return Base64UnescapeInternal(src.data(), src.size(), dest, kUnBase64);
 }
 
-bool WebSafeBase64Unescape(absl::string_view src, std::string* dest) {
+bool WebSafeBase64Unescape(absl::string_view src,
+                           absl::Nonnull<std::string*> dest) {
   return Base64UnescapeInternal(src.data(), src.size(), dest, kUnWebSafeBase64);
 }
 
-void Base64Escape(absl::string_view src, std::string* dest) {
+void Base64Escape(absl::string_view src, absl::Nonnull<std::string*> dest) {
   strings_internal::Base64EscapeInternal(
       reinterpret_cast<const unsigned char*>(src.data()), src.size(), dest,
       true, strings_internal::kBase64Chars);
 }
 
-void WebSafeBase64Escape(absl::string_view src, std::string* dest) {
+void WebSafeBase64Escape(absl::string_view src,
+                         absl::Nonnull<std::string*> dest) {
   strings_internal::Base64EscapeInternal(
       reinterpret_cast<const unsigned char*>(src.data()), src.size(), dest,
       false, strings_internal::kWebSafeBase64Chars);
@@ -937,6 +968,32 @@ std::string WebSafeBase64Escape(absl::string_view src) {
   return dest;
 }
 
+bool HexStringToBytes(absl::string_view hex,
+                      absl::Nonnull<std::string*> bytes) {
+  std::string output;
+
+  size_t num_bytes = hex.size() / 2;
+  if (hex.size() != num_bytes * 2) {
+    return false;
+  }
+
+  absl::strings_internal::STLStringResizeUninitialized(&output, num_bytes);
+  auto hex_p = hex.cbegin();
+  for (std::string::iterator bin_p = output.begin(); bin_p != output.end();
+       ++bin_p) {
+    int h1 = absl::kHexValueStrict[static_cast<size_t>(*hex_p++)];
+    int h2 = absl::kHexValueStrict[static_cast<size_t>(*hex_p++)];
+    if (h1 == -1 || h2 == -1) {
+      output.resize(static_cast<size_t>(bin_p - output.begin()));
+      return false;
+    }
+    *bin_p = static_cast<char>((h1 << 4) + h2);
+  }
+
+  *bytes = std::move(output);
+  return true;
+}
+
 std::string HexStringToBytes(absl::string_view from) {
   std::string result;
   const auto num = from.size() / 2;
diff --git a/contrib/restricted/abseil-cpp/absl/strings/escaping.h b/contrib/restricted/abseil-cpp/absl/strings/escaping.h
index bf2a58980aa5..3f34fbfc1c59 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/escaping.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/escaping.h
@@ -27,7 +27,9 @@
 #include <string>
 #include <vector>
 
+#include "absl/base/attributes.h"
 #include "absl/base/macros.h"
+#include "absl/base/nullability.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
@@ -65,14 +67,16 @@ ABSL_NAMESPACE_BEGIN
 //
 //   std::string s = "foo\\rbar\\nbaz\\t";
 //   std::string unescaped_s;
-//   if (!absl::CUnescape(s, &unescaped_s) {
+//   if (!absl::CUnescape(s, &unescaped_s)) {
 //     ...
 //   }
 //   EXPECT_EQ(unescaped_s, "foo\rbar\nbaz\t");
-bool CUnescape(absl::string_view source, std::string* dest, std::string* error);
+bool CUnescape(absl::string_view source, absl::Nonnull<std::string*> dest,
+               absl::Nullable<std::string*> error);
 
 // Overload of `CUnescape()` with no error reporting.
-inline bool CUnescape(absl::string_view source, std::string* dest) {
+inline bool CUnescape(absl::string_view source,
+                      absl::Nonnull<std::string*> dest) {
   return CUnescape(source, dest, nullptr);
 }
 
@@ -122,7 +126,7 @@ std::string Utf8SafeCHexEscape(absl::string_view src);
 // Encodes a `src` string into a base64-encoded 'dest' string with padding
 // characters. This function conforms with RFC 4648 section 4 (base64) and RFC
 // 2045.
-void Base64Escape(absl::string_view src, std::string* dest);
+void Base64Escape(absl::string_view src, absl::Nonnull<std::string*> dest);
 std::string Base64Escape(absl::string_view src);
 
 // WebSafeBase64Escape()
@@ -130,7 +134,8 @@ std::string Base64Escape(absl::string_view src);
 // Encodes a `src` string into a base64 string, like Base64Escape() does, but
 // outputs '-' instead of '+' and '_' instead of '/', and does not pad 'dest'.
 // This function conforms with RFC 4648 section 5 (base64url).
-void WebSafeBase64Escape(absl::string_view src, std::string* dest);
+void WebSafeBase64Escape(absl::string_view src,
+                         absl::Nonnull<std::string*> dest);
 std::string WebSafeBase64Escape(absl::string_view src);
 
 // Base64Unescape()
@@ -140,7 +145,7 @@ std::string WebSafeBase64Escape(absl::string_view src);
 // `src` contains invalid characters, `dest` is cleared and returns `false`.
 // If padding is included (note that `Base64Escape()` does produce it), it must
 // be correct. In the padding, '=' and '.' are treated identically.
-bool Base64Unescape(absl::string_view src, std::string* dest);
+bool Base64Unescape(absl::string_view src, absl::Nonnull<std::string*> dest);
 
 // WebSafeBase64Unescape()
 //
@@ -149,12 +154,24 @@ bool Base64Unescape(absl::string_view src, std::string* dest);
 // invalid characters, `dest` is cleared and returns `false`. If padding is
 // included (note that `WebSafeBase64Escape()` does not produce it), it must be
 // correct. In the padding, '=' and '.' are treated identically.
-bool WebSafeBase64Unescape(absl::string_view src, std::string* dest);
+bool WebSafeBase64Unescape(absl::string_view src,
+                           absl::Nonnull<std::string*> dest);
+
+// HexStringToBytes()
+//
+// Converts the hexadecimal encoded data in `hex` into raw bytes in the `bytes`
+// output string.  If `hex` does not consist of valid hexadecimal data, this
+// function returns false and leaves `bytes` in an unspecified state. Returns
+// true on success.
+ABSL_MUST_USE_RESULT bool HexStringToBytes(absl::string_view hex,
+                                           absl::Nonnull<std::string*> bytes);
 
 // HexStringToBytes()
 //
 // Converts an ASCII hex string into bytes, returning binary data of length
-// `from.size()/2`.
+// `from.size()/2`. The input must be valid hexadecimal data, otherwise the
+// return value is unspecified.
+ABSL_DEPRECATED("Use the HexStringToBytes() that returns a bool")
 std::string HexStringToBytes(absl::string_view from);
 
 // BytesToHexString()
diff --git a/contrib/restricted/abseil-cpp/absl/strings/has_absl_stringify.h b/contrib/restricted/abseil-cpp/absl/strings/has_absl_stringify.h
index 274a7865d166..9af0191dc5d4 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/has_absl_stringify.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/has_absl_stringify.h
@@ -18,6 +18,7 @@
 #include <type_traits>
 #include <utility>
 
+#include "absl/base/config.h"
 #include "absl/strings/string_view.h"
 
 namespace absl {
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/charconv_bigint.h b/contrib/restricted/abseil-cpp/absl/strings/internal/charconv_bigint.h
index 5c0c375dbca4..cb297676631f 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/charconv_bigint.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/charconv_bigint.h
@@ -109,7 +109,17 @@ class BigUnsigned {
       size_ = (std::min)(size_ + word_shift, max_words);
       count %= 32;
       if (count == 0) {
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=warray-bounds
+// shows a lot of bogus -Warray-bounds warnings under GCC.
+// This is not the only one in Abseil.
+#if ABSL_INTERNAL_HAVE_MIN_GNUC_VERSION(14, 0)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
         std::copy_backward(words_, words_ + size_ - word_shift, words_ + size_);
+#if ABSL_INTERNAL_HAVE_MIN_GNUC_VERSION(14, 0)
+#pragma GCC diagnostic pop
+#endif
       } else {
         for (int i = (std::min)(size_, max_words - 1); i > word_shift; --i) {
           words_[i] = (words_[i - word_shift] << count) |
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/cord_internal.h b/contrib/restricted/abseil-cpp/absl/strings/internal/cord_internal.h
index 8744540e2a33..f0060f10156d 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/cord_internal.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/cord_internal.h
@@ -85,7 +85,7 @@ enum Constants {
 };
 
 // Emits a fatal error "Unexpected node type: xyz" and aborts the program.
-ABSL_ATTRIBUTE_NORETURN void LogFatalNodeType(CordRep* rep);
+[[noreturn]] void LogFatalNodeType(CordRep* rep);
 
 // Fast implementation of memmove for up to 15 bytes. This implementation is
 // safe for overlapping regions. If nullify_tail is true, the destination is
@@ -259,7 +259,7 @@ struct CordRep {
   // on the specific layout of these fields. Notably: the non-trivial field
   // `refcount` being preceded by `length`, and being tailed by POD data
   // members only.
-  // # LINT.IfChange
+  // LINT.IfChange
   size_t length;
   RefcountAndFlags refcount;
   // If tag < FLAT, it represents CordRepKind and indicates the type of node.
@@ -275,7 +275,7 @@ struct CordRep {
   // allocate room for these in the derived class, as not all compilers reuse
   // padding space from the base class (clang and gcc do, MSVC does not, etc)
   uint8_t storage[3];
-  // # LINT.ThenChange(cord_rep_btree.h:copy_raw)
+  // LINT.ThenChange(cord_rep_btree.h:copy_raw)
 
   // Returns true if this instance's tag matches the requested type.
   constexpr bool IsSubstring() const { return tag == SUBSTRING; }
@@ -352,18 +352,19 @@ struct CordRepExternal : public CordRep {
   static void Delete(CordRep* rep);
 };
 
-struct Rank1 {};
-struct Rank0 : Rank1 {};
+// Use go/ranked-overloads for dispatching.
+struct Rank0 {};
+struct Rank1 : Rank0 {};
 
 template <typename Releaser, typename = ::absl::base_internal::invoke_result_t<
                                  Releaser, absl::string_view>>
-void InvokeReleaser(Rank0, Releaser&& releaser, absl::string_view data) {
+void InvokeReleaser(Rank1, Releaser&& releaser, absl::string_view data) {
   ::absl::base_internal::invoke(std::forward<Releaser>(releaser), data);
 }
 
 template <typename Releaser,
           typename = ::absl::base_internal::invoke_result_t<Releaser>>
-void InvokeReleaser(Rank1, Releaser&& releaser, absl::string_view) {
+void InvokeReleaser(Rank0, Releaser&& releaser, absl::string_view) {
   ::absl::base_internal::invoke(std::forward<Releaser>(releaser));
 }
 
@@ -381,7 +382,7 @@ struct CordRepExternalImpl
   }
 
   ~CordRepExternalImpl() {
-    InvokeReleaser(Rank0{}, std::move(this->template get<0>()),
+    InvokeReleaser(Rank1{}, std::move(this->template get<0>()),
                    absl::string_view(base, length));
   }
 
@@ -398,7 +399,6 @@ inline CordRepSubstring* CordRepSubstring::Create(CordRep* child, size_t pos,
   assert(pos < child->length);
   assert(n <= child->length - pos);
 
-  // TODO(b/217376272): Harden internal logic.
   // Move to strategical places inside the Cord logic and make this an assert.
   if (ABSL_PREDICT_FALSE(!(child->IsExternal() || child->IsFlat()))) {
     LogFatalNodeType(child);
@@ -520,6 +520,7 @@ class InlineData {
 
   constexpr InlineData(const InlineData& rhs) noexcept;
   InlineData& operator=(const InlineData& rhs) noexcept;
+  friend void swap(InlineData& lhs, InlineData& rhs) noexcept;
 
   friend bool operator==(const InlineData& lhs, const InlineData& rhs) {
 #ifdef ABSL_INTERNAL_CORD_HAVE_SANITIZER
@@ -770,6 +771,12 @@ class InlineData {
       char data[kMaxInline + 1];
       AsTree as_tree;
     };
+
+    // TODO(b/145829486): see swap(InlineData, InlineData) for more info.
+    inline void SwapValue(Rep rhs, Rep& refrhs) {
+      memcpy(&refrhs, this, sizeof(*this));
+      memcpy(this, &rhs, sizeof(*this));
+    }
   };
 
   // Private implementation of `Compare()`
@@ -884,6 +891,19 @@ inline void CordRep::Unref(CordRep* rep) {
   }
 }
 
+inline void swap(InlineData& lhs, InlineData& rhs) noexcept {
+  lhs.unpoison();
+  rhs.unpoison();
+  // TODO(b/145829486): `std::swap(lhs.rep_, rhs.rep_)` results in bad codegen
+  // on clang, spilling the temporary swap value on the stack. Since `Rep` is
+  // trivial, we can make clang DTRT by calling a hand-rolled `SwapValue` where
+  // we pass `rhs` both by value (register allocated) and by reference. The IR
+  // then folds and inlines correctly into an optimized swap without spill.
+  lhs.rep_.SwapValue(rhs.rep_, rhs.rep_);
+  rhs.poison();
+  lhs.poison();
+}
+
 }  // namespace cord_internal
 
 ABSL_NAMESPACE_END
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/cord_rep_btree.h b/contrib/restricted/abseil-cpp/absl/strings/internal/cord_rep_btree.h
index be94b62ec8e7..ab259afe64a4 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/cord_rep_btree.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/cord_rep_btree.h
@@ -684,14 +684,14 @@ inline CordRepBtree* CordRepBtree::CopyRaw(size_t new_length) const {
   // except `refcount` is trivially copyable, and the compiler does not
   // efficiently coalesce member-wise copy of these members.
   // See https://gcc.godbolt.org/z/qY8zsca6z
-  // # LINT.IfChange(copy_raw)
+  // LINT.IfChange(copy_raw)
   tree->length = new_length;
   uint8_t* dst = &tree->tag;
   const uint8_t* src = &tag;
   const ptrdiff_t offset = src - reinterpret_cast<const uint8_t*>(this);
   memcpy(dst, src, sizeof(CordRepBtree) - static_cast<size_t>(offset));
   return tree;
-  // # LINT.ThenChange()
+  // LINT.ThenChange()
 }
 
 inline CordRepBtree* CordRepBtree::Copy() const {
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_functions.cc b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_functions.cc
index 20d314f03ccd..6033d046969d 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_functions.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_functions.cc
@@ -40,13 +40,15 @@ std::atomic<int> g_cordz_mean_interval(50000);
 // Special negative 'not initialized' per thread value for cordz_next_sample.
 static constexpr int64_t kInitCordzNextSample = -1;
 
-ABSL_CONST_INIT thread_local int64_t cordz_next_sample = kInitCordzNextSample;
+ABSL_CONST_INIT thread_local SamplingState cordz_next_sample = {
+    kInitCordzNextSample, 1};
 
 // kIntervalIfDisabled is the number of profile-eligible events need to occur
 // before the code will confirm that cordz is still disabled.
 constexpr int64_t kIntervalIfDisabled = 1 << 16;
 
-ABSL_ATTRIBUTE_NOINLINE bool cordz_should_profile_slow() {
+ABSL_ATTRIBUTE_NOINLINE int64_t
+cordz_should_profile_slow(SamplingState& state) {
 
   thread_local absl::profiling_internal::ExponentialBiased
       exponential_biased_generator;
@@ -55,30 +57,34 @@ ABSL_ATTRIBUTE_NOINLINE bool cordz_should_profile_slow() {
   // Check if we disabled profiling. If so, set the next sample to a "large"
   // number to minimize the overhead of the should_profile codepath.
   if (mean_interval <= 0) {
-    cordz_next_sample = kIntervalIfDisabled;
-    return false;
+    state = {kIntervalIfDisabled, kIntervalIfDisabled};
+    return 0;
   }
 
   // Check if we're always sampling.
   if (mean_interval == 1) {
-    cordz_next_sample = 1;
-    return true;
+    state = {1, 1};
+    return 1;
   }
 
-  if (cordz_next_sample <= 0) {
+  if (cordz_next_sample.next_sample <= 0) {
     // If first check on current thread, check cordz_should_profile()
     // again using the created (initial) stride in cordz_next_sample.
-    const bool initialized = cordz_next_sample != kInitCordzNextSample;
-    cordz_next_sample = exponential_biased_generator.GetStride(mean_interval);
-    return initialized || cordz_should_profile();
+    const bool initialized =
+        cordz_next_sample.next_sample != kInitCordzNextSample;
+    auto old_stride = state.sample_stride;
+    auto stride = exponential_biased_generator.GetStride(mean_interval);
+    state = {stride, stride};
+    bool should_sample = initialized || cordz_should_profile() > 0;
+    return should_sample ? old_stride : 0;
   }
 
-  --cordz_next_sample;
-  return false;
+  --state.next_sample;
+  return 0;
 }
 
 void cordz_set_next_sample_for_testing(int64_t next_sample) {
-  cordz_next_sample = next_sample;
+  cordz_next_sample = {next_sample, next_sample};
 }
 
 #endif  // ABSL_INTERNAL_CORDZ_ENABLED
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_functions.h b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_functions.h
index ed108bf1b443..84c185e4072f 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_functions.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_functions.h
@@ -41,23 +41,33 @@ void set_cordz_mean_interval(int32_t mean_interval);
 
 #ifdef ABSL_INTERNAL_CORDZ_ENABLED
 
+struct SamplingState {
+  int64_t next_sample;
+  int64_t sample_stride;
+};
+
 // cordz_next_sample is the number of events until the next sample event. If
 // the value is 1 or less, the code will check on the next event if cordz is
 // enabled, and if so, will sample the Cord. cordz is only enabled when we can
 // use thread locals.
-ABSL_CONST_INIT extern thread_local int64_t cordz_next_sample;
-
-// Determines if the next sample should be profiled. If it is, the value pointed
-// at by next_sample will be set with the interval until the next sample.
-bool cordz_should_profile_slow();
-
-// Returns true if the next cord should be sampled.
-inline bool cordz_should_profile() {
-  if (ABSL_PREDICT_TRUE(cordz_next_sample > 1)) {
-    cordz_next_sample--;
-    return false;
+ABSL_CONST_INIT extern thread_local SamplingState cordz_next_sample;
+
+// Determines if the next sample should be profiled.
+// Returns:
+//   0: Do not sample
+//  >0: Sample with the stride of the last sampling period
+int64_t cordz_should_profile_slow(SamplingState& state);
+
+// Determines if the next sample should be profiled.
+// Returns:
+//   0: Do not sample
+//  >0: Sample with the stride of the last sampling period
+inline int64_t cordz_should_profile() {
+  if (ABSL_PREDICT_TRUE(cordz_next_sample.next_sample > 1)) {
+    cordz_next_sample.next_sample--;
+    return 0;
   }
-  return cordz_should_profile_slow();
+  return cordz_should_profile_slow(cordz_next_sample);
 }
 
 // Sets the interval until the next sample (for testing only)
@@ -65,7 +75,7 @@ void cordz_set_next_sample_for_testing(int64_t next_sample);
 
 #else  // ABSL_INTERNAL_CORDZ_ENABLED
 
-inline bool cordz_should_profile() { return false; }
+inline int64_t cordz_should_profile() { return 0; }
 inline void cordz_set_next_sample_for_testing(int64_t) {}
 
 #endif  // ABSL_INTERNAL_CORDZ_ENABLED
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_handle.cc b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_handle.cc
index a7061dbe2253..53d5f529a7d1 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_handle.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_handle.cc
@@ -16,6 +16,7 @@
 #include <atomic>
 
 #include "absl/base/internal/raw_logging.h"  // For ABSL_RAW_CHECK
+#include "absl/base/no_destructor.h"
 #include "absl/synchronization/mutex.h"
 
 namespace absl {
@@ -43,33 +44,32 @@ struct Queue {
   }
 };
 
-static Queue* GlobalQueue() {
-  static Queue* global_queue = new Queue;
-  return global_queue;
+static Queue& GlobalQueue() {
+  static absl::NoDestructor<Queue> global_queue;
+  return *global_queue;
 }
 
 }  // namespace
 
 CordzHandle::CordzHandle(bool is_snapshot) : is_snapshot_(is_snapshot) {
-  Queue* global_queue = GlobalQueue();
+  Queue& global_queue = GlobalQueue();
   if (is_snapshot) {
-    MutexLock lock(&global_queue->mutex);
-    CordzHandle* dq_tail =
-        global_queue->dq_tail.load(std::memory_order_acquire);
+    MutexLock lock(&global_queue.mutex);
+    CordzHandle* dq_tail = global_queue.dq_tail.load(std::memory_order_acquire);
     if (dq_tail != nullptr) {
       dq_prev_ = dq_tail;
       dq_tail->dq_next_ = this;
     }
-    global_queue->dq_tail.store(this, std::memory_order_release);
+    global_queue.dq_tail.store(this, std::memory_order_release);
   }
 }
 
 CordzHandle::~CordzHandle() {
-  Queue* global_queue = GlobalQueue();
+  Queue& global_queue = GlobalQueue();
   if (is_snapshot_) {
     std::vector<CordzHandle*> to_delete;
     {
-      MutexLock lock(&global_queue->mutex);
+      MutexLock lock(&global_queue.mutex);
       CordzHandle* next = dq_next_;
       if (dq_prev_ == nullptr) {
         // We were head of the queue, delete every CordzHandle until we reach
@@ -85,7 +85,7 @@ CordzHandle::~CordzHandle() {
       if (next) {
         next->dq_prev_ = dq_prev_;
       } else {
-        global_queue->dq_tail.store(dq_prev_, std::memory_order_release);
+        global_queue.dq_tail.store(dq_prev_, std::memory_order_release);
       }
     }
     for (CordzHandle* handle : to_delete) {
@@ -95,20 +95,20 @@ CordzHandle::~CordzHandle() {
 }
 
 bool CordzHandle::SafeToDelete() const {
-  return is_snapshot_ || GlobalQueue()->IsEmpty();
+  return is_snapshot_ || GlobalQueue().IsEmpty();
 }
 
 void CordzHandle::Delete(CordzHandle* handle) {
   assert(handle);
   if (handle) {
-    Queue* const queue = GlobalQueue();
+    Queue& queue = GlobalQueue();
     if (!handle->SafeToDelete()) {
-      MutexLock lock(&queue->mutex);
-      CordzHandle* dq_tail = queue->dq_tail.load(std::memory_order_acquire);
+      MutexLock lock(&queue.mutex);
+      CordzHandle* dq_tail = queue.dq_tail.load(std::memory_order_acquire);
       if (dq_tail != nullptr) {
         handle->dq_prev_ = dq_tail;
         dq_tail->dq_next_ = handle;
-        queue->dq_tail.store(handle, std::memory_order_release);
+        queue.dq_tail.store(handle, std::memory_order_release);
         return;
       }
     }
@@ -118,9 +118,9 @@ void CordzHandle::Delete(CordzHandle* handle) {
 
 std::vector<const CordzHandle*> CordzHandle::DiagnosticsGetDeleteQueue() {
   std::vector<const CordzHandle*> handles;
-  Queue* global_queue = GlobalQueue();
-  MutexLock lock(&global_queue->mutex);
-  CordzHandle* dq_tail = global_queue->dq_tail.load(std::memory_order_acquire);
+  Queue& global_queue = GlobalQueue();
+  MutexLock lock(&global_queue.mutex);
+  CordzHandle* dq_tail = global_queue.dq_tail.load(std::memory_order_acquire);
   for (const CordzHandle* p = dq_tail; p; p = p->dq_prev_) {
     handles.push_back(p);
   }
@@ -133,9 +133,9 @@ bool CordzHandle::DiagnosticsHandleIsSafeToInspect(
   if (handle == nullptr) return true;
   if (handle->is_snapshot_) return false;
   bool snapshot_found = false;
-  Queue* global_queue = GlobalQueue();
-  MutexLock lock(&global_queue->mutex);
-  for (const CordzHandle* p = global_queue->dq_tail; p; p = p->dq_prev_) {
+  Queue& global_queue = GlobalQueue();
+  MutexLock lock(&global_queue.mutex);
+  for (const CordzHandle* p = global_queue.dq_tail; p; p = p->dq_prev_) {
     if (p == handle) return !snapshot_found;
     if (p == this) snapshot_found = true;
   }
@@ -150,8 +150,8 @@ CordzHandle::DiagnosticsGetSafeToInspectDeletedHandles() {
     return handles;
   }
 
-  Queue* global_queue = GlobalQueue();
-  MutexLock lock(&global_queue->mutex);
+  Queue& global_queue = GlobalQueue();
+  MutexLock lock(&global_queue.mutex);
   for (const CordzHandle* p = dq_next_; p != nullptr; p = p->dq_next_) {
     if (!p->is_snapshot()) {
       handles.push_back(p);
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_info.cc b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_info.cc
index b24c3da712f5..b7c7fed9fa27 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_info.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_info.cc
@@ -14,6 +14,8 @@
 
 #include "absl/strings/internal/cordz_info.h"
 
+#include <cstdint>
+
 #include "absl/base/config.h"
 #include "absl/base/internal/spinlock.h"
 #include "absl/container/inlined_vector.h"
@@ -247,10 +249,12 @@ CordzInfo* CordzInfo::Next(const CordzSnapshot& snapshot) const {
   return next;
 }
 
-void CordzInfo::TrackCord(InlineData& cord, MethodIdentifier method) {
+void CordzInfo::TrackCord(InlineData& cord, MethodIdentifier method,
+                          int64_t sampling_stride) {
   assert(cord.is_tree());
   assert(!cord.is_profiled());
-  CordzInfo* cordz_info = new CordzInfo(cord.as_tree(), nullptr, method);
+  CordzInfo* cordz_info =
+      new CordzInfo(cord.as_tree(), nullptr, method, sampling_stride);
   cord.set_cordz_info(cordz_info);
   cordz_info->Track();
 }
@@ -266,7 +270,8 @@ void CordzInfo::TrackCord(InlineData& cord, const InlineData& src,
   if (cordz_info != nullptr) cordz_info->Untrack();
 
   // Start new cord sample
-  cordz_info = new CordzInfo(cord.as_tree(), src.cordz_info(), method);
+  cordz_info = new CordzInfo(cord.as_tree(), src.cordz_info(), method,
+                             src.cordz_info()->sampling_stride());
   cord.set_cordz_info(cordz_info);
   cordz_info->Track();
 }
@@ -298,9 +303,8 @@ size_t CordzInfo::FillParentStack(const CordzInfo* src, void** stack) {
   return src->stack_depth_;
 }
 
-CordzInfo::CordzInfo(CordRep* rep,
-                     const CordzInfo* src,
-                     MethodIdentifier method)
+CordzInfo::CordzInfo(CordRep* rep, const CordzInfo* src,
+                     MethodIdentifier method, int64_t sampling_stride)
     : rep_(rep),
       stack_depth_(
           static_cast<size_t>(absl::GetStackTrace(stack_,
@@ -309,7 +313,8 @@ CordzInfo::CordzInfo(CordRep* rep,
       parent_stack_depth_(FillParentStack(src, parent_stack_)),
       method_(method),
       parent_method_(GetParentMethod(src)),
-      create_time_(absl::Now()) {
+      create_time_(absl::Now()),
+      sampling_stride_(sampling_stride) {
   update_tracker_.LossyAdd(method);
   if (src) {
     // Copy parent counters.
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_info.h b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_info.h
index 17eaa91c77de..2dc9d16def0d 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_info.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/cordz_info.h
@@ -60,7 +60,8 @@ class ABSL_LOCKABLE CordzInfo : public CordzHandle {
   // and/or deleted. `method` identifies the Cord public API method initiating
   // the cord to be sampled.
   // Requires `cord` to hold a tree, and `cord.cordz_info()` to be null.
-  static void TrackCord(InlineData& cord, MethodIdentifier method);
+  static void TrackCord(InlineData& cord, MethodIdentifier method,
+                        int64_t sampling_stride);
 
   // Identical to TrackCord(), except that this function fills the
   // `parent_stack` and `parent_method` properties of the returned CordzInfo
@@ -181,6 +182,8 @@ class ABSL_LOCKABLE CordzInfo : public CordzHandle {
   // or RemovePrefix.
   CordzStatistics GetCordzStatistics() const;
 
+  int64_t sampling_stride() const { return sampling_stride_; }
+
  private:
   using SpinLock = absl::base_internal::SpinLock;
   using SpinLockHolder = ::absl::base_internal::SpinLockHolder;
@@ -199,7 +202,7 @@ class ABSL_LOCKABLE CordzInfo : public CordzHandle {
   static constexpr size_t kMaxStackDepth = 64;
 
   explicit CordzInfo(CordRep* rep, const CordzInfo* src,
-                     MethodIdentifier method);
+                     MethodIdentifier method, int64_t weight);
   ~CordzInfo() override;
 
   // Sets `rep_` without holding a lock.
@@ -250,12 +253,14 @@ class ABSL_LOCKABLE CordzInfo : public CordzHandle {
   const MethodIdentifier parent_method_;
   CordzUpdateTracker update_tracker_;
   const absl::Time create_time_;
+  const int64_t sampling_stride_;
 };
 
 inline ABSL_ATTRIBUTE_ALWAYS_INLINE void CordzInfo::MaybeTrackCord(
     InlineData& cord, MethodIdentifier method) {
-  if (ABSL_PREDICT_FALSE(cordz_should_profile())) {
-    TrackCord(cord, method);
+  auto stride = cordz_should_profile();
+  if (ABSL_PREDICT_FALSE(stride > 0)) {
+    TrackCord(cord, method, stride);
   }
 }
 
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/escaping.cc b/contrib/restricted/abseil-cpp/absl/strings/internal/escaping.cc
index 56a4cbed03bb..d2abe6698413 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/escaping.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/escaping.cc
@@ -14,6 +14,8 @@
 
 #include "absl/strings/internal/escaping.h"
 
+#include <limits>
+
 #include "absl/base/internal/endian.h"
 #include "absl/base/internal/raw_logging.h"
 
@@ -31,12 +33,14 @@ ABSL_CONST_INIT const char kBase64Chars[] =
 ABSL_CONST_INIT const char kWebSafeBase64Chars[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 
-
 size_t CalculateBase64EscapedLenInternal(size_t input_len, bool do_padding) {
   // Base64 encodes three bytes of input at a time. If the input is not
   // divisible by three, we pad as appropriate.
   //
   // Base64 encodes each three bytes of input into four bytes of output.
+  constexpr size_t kMaxSize = (std::numeric_limits<size_t>::max() - 1) / 4 * 3;
+  ABSL_INTERNAL_CHECK(input_len <= kMaxSize,
+                      "CalculateBase64EscapedLenInternal() overflow");
   size_t len = (input_len / 3) * 4;
 
   // Since all base 64 input is an integral number of octets, only the following
@@ -66,7 +70,6 @@ size_t CalculateBase64EscapedLenInternal(size_t input_len, bool do_padding) {
     }
   }
 
-  assert(len >= input_len);  // make sure we didn't overflow
   return len;
 }
 
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/str_join_internal.h b/contrib/restricted/abseil-cpp/absl/strings/internal/str_join_internal.h
index d97d5033d8ee..3e730c7aabe4 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/str_join_internal.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/str_join_internal.h
@@ -31,16 +31,23 @@
 #ifndef ABSL_STRINGS_INTERNAL_STR_JOIN_INTERNAL_H_
 #define ABSL_STRINGS_INTERNAL_STR_JOIN_INTERNAL_H_
 
+#include <cstdint>
 #include <cstring>
+#include <initializer_list>
 #include <iterator>
+#include <limits>
 #include <memory>
 #include <string>
+#include <tuple>
 #include <type_traits>
 #include <utility>
 
+#include "absl/base/config.h"
+#include "absl/base/internal/raw_logging.h"
 #include "absl/strings/internal/ostringstream.h"
 #include "absl/strings/internal/resize_uninitialized.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
@@ -230,14 +237,19 @@ std::string JoinAlgorithm(Iterator start, Iterator end, absl::string_view s,
   if (start != end) {
     // Sums size
     auto&& start_value = *start;
-    size_t result_size = start_value.size();
+    // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+    // in memory strings to overflow a uint64_t.
+    uint64_t result_size = start_value.size();
     for (Iterator it = start; ++it != end;) {
       result_size += s.size();
       result_size += (*it).size();
     }
 
     if (result_size > 0) {
-      STLStringResizeUninitialized(&result, result_size);
+      constexpr uint64_t kMaxSize =
+          uint64_t{(std::numeric_limits<size_t>::max)()};
+      ABSL_INTERNAL_CHECK(result_size <= kMaxSize, "size_t overflow");
+      STLStringResizeUninitialized(&result, static_cast<size_t>(result_size));
 
       // Joins strings
       char* result_buf = &*result.begin();
@@ -310,6 +322,15 @@ std::string JoinRange(const Range& range, absl::string_view separator) {
   return JoinRange(begin(range), end(range), separator);
 }
 
+template <typename Tuple, std::size_t... I>
+std::string JoinTuple(const Tuple& value, absl::string_view separator,
+                      std::index_sequence<I...>) {
+  return JoinRange(
+      std::initializer_list<absl::string_view>{
+          static_cast<const AlphaNum&>(std::get<I>(value)).Piece()...},
+      separator);
+}
+
 }  // namespace strings_internal
 ABSL_NAMESPACE_END
 }  // namespace absl
diff --git a/contrib/restricted/abseil-cpp/absl/strings/internal/str_split_internal.h b/contrib/restricted/abseil-cpp/absl/strings/internal/str_split_internal.h
index 081ad85ad434..11ea96f2c12e 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/internal/str_split_internal.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/internal/str_split_internal.h
@@ -30,6 +30,7 @@
 #define ABSL_STRINGS_INTERNAL_STR_SPLIT_INTERNAL_H_
 
 #include <array>
+#include <cstddef>
 #include <initializer_list>
 #include <iterator>
 #include <tuple>
@@ -402,7 +403,10 @@ class Splitter {
           ar[index].size = it->size();
           ++it;
         } while (++index != ar.size() && !it.at_end());
-        v.insert(v.end(), ar.begin(), ar.begin() + index);
+        // We static_cast index to a signed type to work around overzealous
+        // compiler warnings about signedness.
+        v.insert(v.end(), ar.begin(),
+                 ar.begin() + static_cast<ptrdiff_t>(index));
       }
       return v;
     }
diff --git a/contrib/restricted/abseil-cpp/absl/strings/numbers.cc b/contrib/restricted/abseil-cpp/absl/strings/numbers.cc
index 882c3a8b85f9..b57d9e82e5b2 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/numbers.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/numbers.cc
@@ -20,9 +20,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cfloat>  // for DBL_DIG and FLT_DIG
-#include <climits>
 #include <cmath>   // for HUGE_VAL
-#include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
@@ -30,7 +28,6 @@
 #include <iterator>
 #include <limits>
 #include <system_error>  // NOLINT(build/c++11)
-#include <type_traits>
 #include <utility>
 
 #include "absl/base/attributes.h"
@@ -159,71 +156,28 @@ constexpr uint32_t kTwoZeroBytes = 0x0101 * '0';
 constexpr uint64_t kFourZeroBytes = 0x01010101 * '0';
 constexpr uint64_t kEightZeroBytes = 0x0101010101010101ull * '0';
 
-template <typename T>
-constexpr T Pow(T base, uint32_t n) {
-  // Exponentiation by squaring
-  return static_cast<T>((n > 1 ? Pow(base * base, n >> 1) : static_cast<T>(1)) *
-                        ((n & 1) ? base : static_cast<T>(1)));
-}
-
-// Given n, calculates C where the following holds for all 0 <= x < Pow(100, n):
-// x / Pow(10, n) == x * C / Pow(2, n * 10)
-// In other words, it allows us to divide by a power of 10 via a single
-// multiplication and bit shifts, assuming the input will be smaller than the
-// square of that power of 10.
-template <typename T>
-constexpr T ComputePowerOf100DivisionCoefficient(uint32_t n) {
-  if (n > 4) {
-    // This doesn't work for large powers of 100, due to overflow
-    abort();
-  }
-  T denom = 16 - 1;
-  T num = (denom + 1) - 10;
-  T gcd = 3;  // Greatest common divisor of numerator and denominator
-  denom = Pow(denom / gcd, n);
-  num = Pow(num / gcd, 9 * n);
-  T quotient = num / denom;
-  if (num % denom >= denom / 2) {
-    // Round up, since the remainder is more than half the denominator
-    ++quotient;
-  }
-  return quotient;
-}
-
-// * kDivisionBy10Mul / kDivisionBy10Div is a division by 10 for values from 0
-// to 99. It's also a division of a structure [k takes 2 bytes][m takes 2
-// bytes], then * kDivisionBy10Mul / kDivisionBy10Div will be [k / 10][m / 10].
-// It allows parallel division.
-constexpr uint64_t kDivisionBy10Mul =
-    ComputePowerOf100DivisionCoefficient<uint64_t>(1);
-static_assert(kDivisionBy10Mul == 103,
-              "division coefficient for 10 is incorrect");
+// * 103 / 1024 is a division by 10 for values from 0 to 99. It's also a
+// division of a structure [k takes 2 bytes][m takes 2 bytes], then * 103 / 1024
+// will be [k / 10][m / 10]. It allows parallel division.
+constexpr uint64_t kDivisionBy10Mul = 103u;
 constexpr uint64_t kDivisionBy10Div = 1 << 10;
 
-// * kDivisionBy100Mul / kDivisionBy100Div is a division by 100 for values from
-// 0 to 9999.
-constexpr uint64_t kDivisionBy100Mul =
-    ComputePowerOf100DivisionCoefficient<uint64_t>(2);
-static_assert(kDivisionBy100Mul == 10486,
-              "division coefficient for 100 is incorrect");
+// * 10486 / 1048576 is a division by 100 for values from 0 to 9999.
+constexpr uint64_t kDivisionBy100Mul = 10486u;
 constexpr uint64_t kDivisionBy100Div = 1 << 20;
 
-static_assert(ComputePowerOf100DivisionCoefficient<uint64_t>(3) == 1073742,
-              "division coefficient for 1000 is incorrect");
-
-// Same as `PrepareEightDigits`, but produces 2 digits for integers < 100.
-inline uint32_t PrepareTwoDigitsImpl(uint32_t i, bool reversed) {
-  assert(i < 100);
-  uint32_t div10 = (i * kDivisionBy10Mul) / kDivisionBy10Div;
-  uint32_t mod10 = i - 10u * div10;
-  return (div10 << (reversed ? 8 : 0)) + (mod10 << (reversed ? 0 : 8));
-}
-inline uint32_t PrepareTwoDigits(uint32_t i) {
-  return PrepareTwoDigitsImpl(i, false);
+// Encode functions write the ASCII output of input `n` to `out_str`.
+inline char* EncodeHundred(uint32_t n, absl::Nonnull<char*> out_str) {
+  int num_digits = static_cast<int>(n - 10) >> 8;
+  uint32_t div10 = (n * kDivisionBy10Mul) / kDivisionBy10Div;
+  uint32_t mod10 = n - 10u * div10;
+  uint32_t base = kTwoZeroBytes + div10 + (mod10 << 8);
+  base >>= num_digits & 8;
+  little_endian::Store16(out_str, static_cast<uint16_t>(base));
+  return out_str + 2 + num_digits;
 }
 
-// Same as `PrepareEightDigits`, but produces 4 digits for integers < 10000.
-inline uint32_t PrepareFourDigitsImpl(uint32_t n, bool reversed) {
+inline char* EncodeTenThousand(uint32_t n, absl::Nonnull<char*> out_str) {
   // We split lower 2 digits and upper 2 digits of n into 2 byte consecutive
   // blocks. 123 ->  [\0\1][\0\23]. We divide by 10 both blocks
   // (it's 1 division + zeroing upper bits), and compute modulo 10 as well "in
@@ -231,19 +185,22 @@ inline uint32_t PrepareFourDigitsImpl(uint32_t n, bool reversed) {
   // strip trailing zeros, add ASCII '0000' and return.
   uint32_t div100 = (n * kDivisionBy100Mul) / kDivisionBy100Div;
   uint32_t mod100 = n - 100ull * div100;
-  uint32_t hundreds =
-      (mod100 << (reversed ? 0 : 16)) + (div100 << (reversed ? 16 : 0));
+  uint32_t hundreds = (mod100 << 16) + div100;
   uint32_t tens = (hundreds * kDivisionBy10Mul) / kDivisionBy10Div;
   tens &= (0xFull << 16) | 0xFull;
-  tens = (tens << (reversed ? 8 : 0)) +
-         static_cast<uint32_t>((hundreds - 10ull * tens) << (reversed ? 0 : 8));
-  return tens;
-}
-inline uint32_t PrepareFourDigits(uint32_t n) {
-  return PrepareFourDigitsImpl(n, false);
-}
-inline uint32_t PrepareFourDigitsReversed(uint32_t n) {
-  return PrepareFourDigitsImpl(n, true);
+  tens += (hundreds - 10ull * tens) << 8;
+  ABSL_ASSUME(tens != 0);
+  // The result can contain trailing zero bits, we need to strip them to a first
+  // significant byte in a final representation. For example, for n = 123, we
+  // have tens to have representation \0\1\2\3. We do `& -8` to round
+  // to a multiple to 8 to strip zero bytes, not all zero bits.
+  // countr_zero to help.
+  // 0 minus 8 to make MSVC happy.
+  uint32_t zeroes = static_cast<uint32_t>(absl::countr_zero(tens)) & (0 - 8u);
+  tens += kFourZeroBytes;
+  tens >>= zeroes;
+  little_endian::Store32(out_str, tens);
+  return out_str + sizeof(tens) - zeroes / 8;
 }
 
 // Helper function to produce an ASCII representation of `i`.
@@ -259,309 +216,126 @@ inline uint32_t PrepareFourDigitsReversed(uint32_t n) {
 //  // Note two leading zeros:
 //  EXPECT_EQ(absl::string_view(ascii, 8), "00102030");
 //
-// If `Reversed` is set to true, the result becomes reversed to "03020100".
-//
 // Pre-condition: `i` must be less than 100000000.
-inline uint64_t PrepareEightDigitsImpl(uint32_t i, bool reversed) {
+inline uint64_t PrepareEightDigits(uint32_t i) {
   ABSL_ASSUME(i < 10000'0000);
   // Prepare 2 blocks of 4 digits "in parallel".
   uint32_t hi = i / 10000;
   uint32_t lo = i % 10000;
-  uint64_t merged = (uint64_t{hi} << (reversed ? 32 : 0)) |
-                    (uint64_t{lo} << (reversed ? 0 : 32));
+  uint64_t merged = hi | (uint64_t{lo} << 32);
   uint64_t div100 = ((merged * kDivisionBy100Mul) / kDivisionBy100Div) &
                     ((0x7Full << 32) | 0x7Full);
   uint64_t mod100 = merged - 100ull * div100;
-  uint64_t hundreds =
-      (mod100 << (reversed ? 0 : 16)) + (div100 << (reversed ? 16 : 0));
+  uint64_t hundreds = (mod100 << 16) + div100;
   uint64_t tens = (hundreds * kDivisionBy10Mul) / kDivisionBy10Div;
   tens &= (0xFull << 48) | (0xFull << 32) | (0xFull << 16) | 0xFull;
-  tens = (tens << (reversed ? 8 : 0)) +
-         ((hundreds - 10ull * tens) << (reversed ? 0 : 8));
+  tens += (hundreds - 10ull * tens) << 8;
   return tens;
 }
-inline uint64_t PrepareEightDigits(uint32_t i) {
-  return PrepareEightDigitsImpl(i, false);
-}
-inline uint64_t PrepareEightDigitsReversed(uint32_t i) {
-  return PrepareEightDigitsImpl(i, true);
-}
 
-template <typename T, typename BackwardIt>
-class FastUIntToStringConverter {
-  static_assert(
-      std::is_same<T, decltype(+std::declval<T>())>::value,
-      "to avoid code bloat, only instantiate this for int and larger types");
-  static_assert(std::is_unsigned<T>::value,
-                "this class is only for unsigned types");
-
- public:
-  // Outputs the given number backward (like with std::copy_backward),
-  // starting from the end of the string.
-  // The number of digits in the number must have been already measured and
-  // passed *exactly*, otherwise the behavior is undefined.
-  // (This is an optimization, as calculating the number of digits again would
-  // slow down the hot path.)
-  // Returns an iterator to the start of the suffix that was appended.
-  static BackwardIt FastIntToBufferBackward(T v, BackwardIt end) {
-    // THIS IS A HOT FUNCTION with a very deliberate structure to exploit branch
-    // prediction and shorten the critical path for smaller numbers.
-    // Do not move around the if/else blocks or attempt to simplify it
-    // without benchmarking any changes.
-
-    if (v < 10) {
-      goto AT_LEAST_1 /* NOTE: mandatory for the 0 case */;
-    }
-    if (v < 1000) {
-      goto AT_LEAST_10;
-    }
-    if (v < 10000000) {
-      goto AT_LEAST_1000;
-    }
-
-    if (v >= 100000000 / 10) {
-      if (v >= 10000000000000000 / 10) {
-        DoFastIntToBufferBackward<8>(v, end);
-      }
-      DoFastIntToBufferBackward<8>(v, end);
-    }
-
-    if (v >= 10000 / 10) {
-    AT_LEAST_1000:
-      DoFastIntToBufferBackward<4>(v, end);
-    }
-
-    if (v >= 100 / 10) {
-    AT_LEAST_10:
-      DoFastIntToBufferBackward<2>(v, end);
-    }
-
-    if (v >= 10 / 10) {
-    AT_LEAST_1:
-      end = DoFastIntToBufferBackward(v, end, std::integral_constant<int, 1>());
-    }
-    return end;
+inline ABSL_ATTRIBUTE_ALWAYS_INLINE absl::Nonnull<char*> EncodeFullU32(
+    uint32_t n, absl::Nonnull<char*> out_str) {
+  if (n < 10) {
+    *out_str = static_cast<char>('0' + n);
+    return out_str + 1;
   }
-
- private:
-  // Only assume pointers are contiguous for now. String and vector iterators
-  // could be special-cased as well, but there's no need for them here.
-  // With C++20 we can probably switch to std::contiguous_iterator_tag.
-  static constexpr bool kIsContiguousIterator =
-      std::is_pointer<BackwardIt>::value;
-
-  template <int Exponent>
-  static void DoFastIntToBufferBackward(T& v, BackwardIt& end) {
-    constexpr T kModulus = Pow<T>(10, Exponent);
-    T remainder = static_cast<T>(v % kModulus);
-    v = static_cast<T>(v / kModulus);
-    end = DoFastIntToBufferBackward(remainder, end,
-                                    std::integral_constant<int, Exponent>());
-  }
-
-  static BackwardIt DoFastIntToBufferBackward(const T&, BackwardIt end,
-                                              std::integral_constant<int, 0>) {
-    return end;
-  }
-
-  static BackwardIt DoFastIntToBufferBackward(T v, BackwardIt end,
-                                              std::integral_constant<int, 1>) {
-    *--end = static_cast<char>('0' + v);
-    return DoFastIntToBufferBackward(v, end, std::integral_constant<int, 0>());
-  }
-
-  static BackwardIt DoFastIntToBufferBackward(T v, BackwardIt end,
-                                              std::integral_constant<int, 4>) {
-    if (kIsContiguousIterator) {
-      const uint32_t digits =
-          PrepareFourDigits(static_cast<uint32_t>(v)) + kFourZeroBytes;
-      end -= sizeof(digits);
-      little_endian::Store32(&*end, digits);
-    } else {
-      uint32_t digits =
-          PrepareFourDigitsReversed(static_cast<uint32_t>(v)) + kFourZeroBytes;
-      for (size_t i = 0; i < sizeof(digits); ++i) {
-        *--end = static_cast<char>(digits);
-        digits >>= CHAR_BIT;
-      }
-    }
-    return end;
+  if (n < 100'000'000) {
+    uint64_t bottom = PrepareEightDigits(n);
+    ABSL_ASSUME(bottom != 0);
+    // 0 minus 8 to make MSVC happy.
+    uint32_t zeroes =
+        static_cast<uint32_t>(absl::countr_zero(bottom)) & (0 - 8u);
+    little_endian::Store64(out_str, (bottom + kEightZeroBytes) >> zeroes);
+    return out_str + sizeof(bottom) - zeroes / 8;
   }
-
-  static BackwardIt DoFastIntToBufferBackward(T v, BackwardIt end,
-                                              std::integral_constant<int, 8>) {
-    if (kIsContiguousIterator) {
-      const uint64_t digits =
-          PrepareEightDigits(static_cast<uint32_t>(v)) + kEightZeroBytes;
-      end -= sizeof(digits);
-      little_endian::Store64(&*end, digits);
-    } else {
-      uint64_t digits = PrepareEightDigitsReversed(static_cast<uint32_t>(v)) +
-                        kEightZeroBytes;
-      for (size_t i = 0; i < sizeof(digits); ++i) {
-        *--end = static_cast<char>(digits);
-        digits >>= CHAR_BIT;
-      }
-    }
-    return end;
-  }
-
-  template <int Digits>
-  static BackwardIt DoFastIntToBufferBackward(
-      T v, BackwardIt end, std::integral_constant<int, Digits>) {
-    constexpr int kLogModulus = Digits - Digits / 2;
-    constexpr T kModulus = Pow(static_cast<T>(10), kLogModulus);
-    bool is_safe_to_use_division_trick = Digits <= 8;
-    T quotient, remainder;
-    if (is_safe_to_use_division_trick) {
-      constexpr uint64_t kCoefficient =
-          ComputePowerOf100DivisionCoefficient<uint64_t>(kLogModulus);
-      quotient = (v * kCoefficient) >> (10 * kLogModulus);
-      remainder = v - quotient * kModulus;
-    } else {
-      quotient = v / kModulus;
-      remainder = v % kModulus;
-    }
-    end = DoFastIntToBufferBackward(remainder, end,
-                                    std::integral_constant<int, kLogModulus>());
-    return DoFastIntToBufferBackward(
-        quotient, end, std::integral_constant<int, Digits - kLogModulus>());
-  }
-};
-
-// Returns an iterator to the start of the suffix that was appended
-template <typename T, typename BackwardIt>
-std::enable_if_t<std::is_unsigned<T>::value, BackwardIt>
-DoFastIntToBufferBackward(T v, BackwardIt end, uint32_t digits) {
-  using PromotedT = std::decay_t<decltype(+v)>;
-  using Converter = FastUIntToStringConverter<PromotedT, BackwardIt>;
-  (void)digits;
-  return Converter().FastIntToBufferBackward(v, end);
+  uint32_t div08 = n / 100'000'000;
+  uint32_t mod08 = n % 100'000'000;
+  uint64_t bottom = PrepareEightDigits(mod08) + kEightZeroBytes;
+  out_str = EncodeHundred(div08, out_str);
+  little_endian::Store64(out_str, bottom);
+  return out_str + sizeof(bottom);
 }
 
-template <typename T, typename BackwardIt>
-std::enable_if_t<std::is_signed<T>::value, BackwardIt>
-DoFastIntToBufferBackward(T v, BackwardIt end, uint32_t digits) {
-  if (absl::numbers_internal::IsNegative(v)) {
-    // Store the minus sign *before* we produce the number itself, not after.
-    // This gets us a tail call.
-    end[-static_cast<ptrdiff_t>(digits) - 1] = '-';
+inline ABSL_ATTRIBUTE_ALWAYS_INLINE char* EncodeFullU64(uint64_t i,
+                                                        char* buffer) {
+  if (i <= std::numeric_limits<uint32_t>::max()) {
+    return EncodeFullU32(static_cast<uint32_t>(i), buffer);
   }
-  return DoFastIntToBufferBackward(
-      absl::numbers_internal::UnsignedAbsoluteValue(v), end, digits);
-}
-
-template <class T>
-std::enable_if_t<std::is_integral<T>::value, int>
-GetNumDigitsOrNegativeIfNegativeImpl(T v) {
-  const auto /* either bool or std::false_type */ is_negative =
-      absl::numbers_internal::IsNegative(v);
-  const int digits = static_cast<int>(absl::numbers_internal::Base10Digits(
-      absl::numbers_internal::UnsignedAbsoluteValue(v)));
-  return is_negative ? ~digits : digits;
+  uint32_t mod08;
+  if (i < 1'0000'0000'0000'0000ull) {
+    uint32_t div08 = static_cast<uint32_t>(i / 100'000'000ull);
+    mod08 =  static_cast<uint32_t>(i % 100'000'000ull);
+    buffer = EncodeFullU32(div08, buffer);
+  } else {
+    uint64_t div08 = i / 100'000'000ull;
+    mod08 =  static_cast<uint32_t>(i % 100'000'000ull);
+    uint32_t div016 = static_cast<uint32_t>(div08 / 100'000'000ull);
+    uint32_t div08mod08 = static_cast<uint32_t>(div08 % 100'000'000ull);
+    uint64_t mid_result = PrepareEightDigits(div08mod08) + kEightZeroBytes;
+    buffer = EncodeTenThousand(div016, buffer);
+    little_endian::Store64(buffer, mid_result);
+    buffer += sizeof(mid_result);
+  }
+  uint64_t mod_result = PrepareEightDigits(mod08) + kEightZeroBytes;
+  little_endian::Store64(buffer, mod_result);
+  return buffer + sizeof(mod_result);
 }
 
 }  // namespace
 
 void numbers_internal::PutTwoDigits(uint32_t i, absl::Nonnull<char*> buf) {
-  little_endian::Store16(
-      buf, static_cast<uint16_t>(PrepareTwoDigits(i) + kTwoZeroBytes));
+  assert(i < 100);
+  uint32_t base = kTwoZeroBytes;
+  uint32_t div10 = (i * kDivisionBy10Mul) / kDivisionBy10Div;
+  uint32_t mod10 = i - 10u * div10;
+  base += div10 + (mod10 << 8);
+  little_endian::Store16(buf, static_cast<uint16_t>(base));
 }
 
 absl::Nonnull<char*> numbers_internal::FastIntToBuffer(
-    uint32_t i, absl::Nonnull<char*> buffer) {
-  const uint32_t digits = absl::numbers_internal::Base10Digits(i);
-  buffer += digits;
-  *buffer = '\0';  // We're going backward, so store this first
-  FastIntToBufferBackward(i, buffer, digits);
-  return buffer;
+    uint32_t n, absl::Nonnull<char*> out_str) {
+  out_str = EncodeFullU32(n, out_str);
+  *out_str = '\0';
+  return out_str;
 }
 
 absl::Nonnull<char*> numbers_internal::FastIntToBuffer(
     int32_t i, absl::Nonnull<char*> buffer) {
-  buffer += static_cast<int>(i < 0);
-  uint32_t digits = absl::numbers_internal::Base10Digits(
-      absl::numbers_internal::UnsignedAbsoluteValue(i));
-  buffer += digits;
-  *buffer = '\0';  // We're going backward, so store this first
-  FastIntToBufferBackward(i, buffer, digits);
+  uint32_t u = static_cast<uint32_t>(i);
+  if (i < 0) {
+    *buffer++ = '-';
+    // We need to do the negation in modular (i.e., "unsigned")
+    // arithmetic; MSVC++ apparently warns for plain "-u", so
+    // we write the equivalent expression "0 - u" instead.
+    u = 0 - u;
+  }
+  buffer = EncodeFullU32(u, buffer);
+  *buffer = '\0';
   return buffer;
 }
 
 absl::Nonnull<char*> numbers_internal::FastIntToBuffer(
     uint64_t i, absl::Nonnull<char*> buffer) {
-  uint32_t digits = absl::numbers_internal::Base10Digits(i);
-  buffer += digits;
-  *buffer = '\0';  // We're going backward, so store this first
-  FastIntToBufferBackward(i, buffer, digits);
+  buffer = EncodeFullU64(i, buffer);
+  *buffer = '\0';
   return buffer;
 }
 
 absl::Nonnull<char*> numbers_internal::FastIntToBuffer(
     int64_t i, absl::Nonnull<char*> buffer) {
-  buffer += static_cast<int>(i < 0);
-  uint32_t digits = absl::numbers_internal::Base10Digits(
-      absl::numbers_internal::UnsignedAbsoluteValue(i));
-  buffer += digits;
-  *buffer = '\0';  // We're going backward, so store this first
-  FastIntToBufferBackward(i, buffer, digits);
+  uint64_t u = static_cast<uint64_t>(i);
+  if (i < 0) {
+    *buffer++ = '-';
+    // We need to do the negation in modular (i.e., "unsigned")
+    // arithmetic; MSVC++ apparently warns for plain "-u", so
+    // we write the equivalent expression "0 - u" instead.
+    u = 0 - u;
+  }
+  buffer = EncodeFullU64(u, buffer);
+  *buffer = '\0';
   return buffer;
 }
 
-absl::Nonnull<char*> numbers_internal::FastIntToBufferBackward(
-    uint32_t i, absl::Nonnull<char*> buffer_end, uint32_t exact_digit_count) {
-  return DoFastIntToBufferBackward(i, buffer_end, exact_digit_count);
-}
-
-absl::Nonnull<char*> numbers_internal::FastIntToBufferBackward(
-    int32_t i, absl::Nonnull<char*> buffer_end, uint32_t exact_digit_count) {
-  return DoFastIntToBufferBackward(i, buffer_end, exact_digit_count);
-}
-
-absl::Nonnull<char*> numbers_internal::FastIntToBufferBackward(
-    uint64_t i, absl::Nonnull<char*> buffer_end, uint32_t exact_digit_count) {
-  return DoFastIntToBufferBackward(i, buffer_end, exact_digit_count);
-}
-
-absl::Nonnull<char*> numbers_internal::FastIntToBufferBackward(
-    int64_t i, absl::Nonnull<char*> buffer_end, uint32_t exact_digit_count) {
-  return DoFastIntToBufferBackward(i, buffer_end, exact_digit_count);
-}
-
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(signed char v) {
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(unsigned char v) {
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(short v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(
-    unsigned short v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(int v) {
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(unsigned int v) {
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(long v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(
-    unsigned long v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(long long v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(
-    unsigned long long v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-
 // Given a 128-bit number expressed as a pair of uint64_t, high half first,
 // return that number multiplied by the given 32-bit value.  If the result is
 // too large to fit in a 128-bit number, divide it by 2 until it fits.
diff --git a/contrib/restricted/abseil-cpp/absl/strings/numbers.h b/contrib/restricted/abseil-cpp/absl/strings/numbers.h
index ad4e66b634ae..739dbb28f938 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/numbers.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/numbers.h
@@ -32,7 +32,6 @@
 #endif
 
 #include <cstddef>
-#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
@@ -40,12 +39,10 @@
 #include <string>
 #include <type_traits>
 
-#include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/internal/endian.h"
 #include "absl/base/macros.h"
 #include "absl/base/nullability.h"
-#include "absl/base/optimization.h"
 #include "absl/base/port.h"
 #include "absl/numeric/bits.h"
 #include "absl/numeric/int128.h"
@@ -161,96 +158,6 @@ bool safe_strtou128_base(absl::string_view text,
 static const int kFastToBufferSize = 32;
 static const int kSixDigitsToBufferSize = 16;
 
-template <class T>
-std::enable_if_t<!std::is_unsigned<T>::value, bool> IsNegative(const T& v) {
-  return v < T();
-}
-
-template <class T>
-std::enable_if_t<std::is_unsigned<T>::value, std::false_type> IsNegative(
-    const T&) {
-  // The integer is unsigned, so return a compile-time constant.
-  // This can help the optimizer avoid having to prove bool to be false later.
-  return std::false_type();
-}
-
-template <class T>
-std::enable_if_t<std::is_unsigned<std::decay_t<T>>::value, T&&>
-UnsignedAbsoluteValue(T&& v ABSL_ATTRIBUTE_LIFETIME_BOUND) {
-  // The value is unsigned; just return the original.
-  return std::forward<T>(v);
-}
-
-template <class T>
-ABSL_ATTRIBUTE_CONST_FUNCTION
-    std::enable_if_t<!std::is_unsigned<T>::value, std::make_unsigned_t<T>>
-    UnsignedAbsoluteValue(T v) {
-  using U = std::make_unsigned_t<T>;
-  return IsNegative(v) ? U() - static_cast<U>(v) : static_cast<U>(v);
-}
-
-// Returns the number of base-10 digits in the given number.
-// Note that this strictly counts digits. It does not count the sign.
-// The `initial_digits` parameter is the starting point, which is normally equal
-// to 1 because the number of digits in 0 is 1 (a special case).
-// However, callers may e.g. wish to change it to 2 to account for the sign.
-template <typename T>
-std::enable_if_t<std::is_unsigned<T>::value, uint32_t> Base10Digits(
-    T v, const uint32_t initial_digits = 1) {
-  uint32_t r = initial_digits;
-  // If code size becomes an issue, the 'if' stage can be removed for a minor
-  // performance loss.
-  for (;;) {
-    if (ABSL_PREDICT_TRUE(v < 10 * 10)) {
-      r += (v >= 10);
-      break;
-    }
-    if (ABSL_PREDICT_TRUE(v < 1000 * 10)) {
-      r += (v >= 1000) + 2;
-      break;
-    }
-    if (ABSL_PREDICT_TRUE(v < 100000 * 10)) {
-      r += (v >= 100000) + 4;
-      break;
-    }
-    r += 6;
-    v = static_cast<T>(v / 1000000);
-  }
-  return r;
-}
-
-template <typename T>
-std::enable_if_t<std::is_signed<T>::value, uint32_t> Base10Digits(
-    T v, uint32_t r = 1) {
-  // Branchlessly add 1 to account for a minus sign.
-  r += static_cast<uint32_t>(IsNegative(v));
-  return Base10Digits(UnsignedAbsoluteValue(v), r);
-}
-
-// These functions return the number of base-10 digits, but multiplied by -1 if
-// the input itself is negative. This is handy and efficient for later usage,
-// since the bitwise complement of the result becomes equal to the number of
-// characters required.
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    signed char v);
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned char v);
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    short v);  // NOLINT
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned short v);  // NOLINT
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(int v);
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned int v);
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    long v);  // NOLINT
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned long v);  // NOLINT
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    long long v);  // NOLINT
-ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned long long v);  // NOLINT
-
 // Helper function for fast formatting of floating-point values.
 // The result is the same as printf's "%g", a.k.a. "%.6g"; that is, six
 // significant digits are returned, trailing zeros are removed, and numbers
@@ -259,18 +166,24 @@ ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
 // Required buffer size is `kSixDigitsToBufferSize`.
 size_t SixDigitsToBuffer(double d, absl::Nonnull<char*> buffer);
 
-// All of these functions take an output buffer
+// WARNING: These functions may write more characters than necessary, because
+// they are intended for speed. All functions take an output buffer
 // as an argument and return a pointer to the last byte they wrote, which is the
 // terminating '\0'. At most `kFastToBufferSize` bytes are written.
-absl::Nonnull<char*> FastIntToBuffer(int32_t i, absl::Nonnull<char*> buffer);
-absl::Nonnull<char*> FastIntToBuffer(uint32_t i, absl::Nonnull<char*> buffer);
-absl::Nonnull<char*> FastIntToBuffer(int64_t i, absl::Nonnull<char*> buffer);
-absl::Nonnull<char*> FastIntToBuffer(uint64_t i, absl::Nonnull<char*> buffer);
+absl::Nonnull<char*> FastIntToBuffer(int32_t i, absl::Nonnull<char*> buffer)
+    ABSL_INTERNAL_NEED_MIN_SIZE(buffer, kFastToBufferSize);
+absl::Nonnull<char*> FastIntToBuffer(uint32_t n, absl::Nonnull<char*> out_str)
+    ABSL_INTERNAL_NEED_MIN_SIZE(out_str, kFastToBufferSize);
+absl::Nonnull<char*> FastIntToBuffer(int64_t i, absl::Nonnull<char*> buffer)
+    ABSL_INTERNAL_NEED_MIN_SIZE(buffer, kFastToBufferSize);
+absl::Nonnull<char*> FastIntToBuffer(uint64_t i, absl::Nonnull<char*> buffer)
+    ABSL_INTERNAL_NEED_MIN_SIZE(buffer, kFastToBufferSize);
 
 // For enums and integer types that are not an exact match for the types above,
 // use templates to call the appropriate one of the four overloads above.
 template <typename int_type>
-absl::Nonnull<char*> FastIntToBuffer(int_type i, absl::Nonnull<char*> buffer) {
+absl::Nonnull<char*> FastIntToBuffer(int_type i, absl::Nonnull<char*> buffer)
+    ABSL_INTERNAL_NEED_MIN_SIZE(buffer, kFastToBufferSize) {
   static_assert(sizeof(i) <= 64 / 8,
                 "FastIntToBuffer works only with 64-bit-or-less integers.");
   // TODO(jorg): This signed-ness check is used because it works correctly
@@ -294,58 +207,6 @@ absl::Nonnull<char*> FastIntToBuffer(int_type i, absl::Nonnull<char*> buffer) {
   }
 }
 
-// These functions do NOT add any null-terminator.
-// They return a pointer to the beginning of the written string.
-// The digit counts provided must *exactly* match the number of base-10 digits
-// in the number, or the behavior is undefined.
-// (i.e. do NOT count the minus sign, or over- or under-count the digits.)
-absl::Nonnull<char*> FastIntToBufferBackward(int32_t i,
-                                             absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count);
-absl::Nonnull<char*> FastIntToBufferBackward(uint32_t i,
-                                             absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count);
-absl::Nonnull<char*> FastIntToBufferBackward(int64_t i,
-                                             absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count);
-absl::Nonnull<char*> FastIntToBufferBackward(uint64_t i,
-                                             absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count);
-
-// For enums and integer types that are not an exact match for the types above,
-// use templates to call the appropriate one of the four overloads above.
-template <typename int_type>
-absl::Nonnull<char*> FastIntToBufferBackward(int_type i,
-                                             absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count) {
-  static_assert(
-      sizeof(i) <= 64 / 8,
-      "FastIntToBufferBackward works only with 64-bit-or-less integers.");
-  // This signed-ness check is used because it works correctly
-  // with enums, and it also serves to check that int_type is not a pointer.
-  // If one day something like std::is_signed<enum E> works, switch to it.
-  // These conditions are constexpr bools to suppress MSVC warning C4127.
-  constexpr bool kIsSigned = static_cast<int_type>(1) - 2 < 0;
-  constexpr bool kUse64Bit = sizeof(i) > 32 / 8;
-  if (kIsSigned) {
-    if (kUse64Bit) {
-      return FastIntToBufferBackward(static_cast<int64_t>(i), buffer_end,
-                                     exact_digit_count);
-    } else {
-      return FastIntToBufferBackward(static_cast<int32_t>(i), buffer_end,
-                                     exact_digit_count);
-    }
-  } else {
-    if (kUse64Bit) {
-      return FastIntToBufferBackward(static_cast<uint64_t>(i), buffer_end,
-                                     exact_digit_count);
-    } else {
-      return FastIntToBufferBackward(static_cast<uint32_t>(i), buffer_end,
-                                     exact_digit_count);
-    }
-  }
-}
-
 // Implementation of SimpleAtoi, generalized to support arbitrary base (used
 // with base different from 10 elsewhere in Abseil implementation).
 template <typename int_type>
diff --git a/contrib/restricted/abseil-cpp/absl/strings/str_cat.cc b/contrib/restricted/abseil-cpp/absl/strings/str_cat.cc
index 098ab18388ec..c51c13732d22 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/str_cat.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/str_cat.cc
@@ -20,19 +20,18 @@
 #include <cstdint>
 #include <cstring>
 #include <initializer_list>
+#include <limits>
 #include <string>
-#include <type_traits>
 
 #include "absl/base/config.h"
+#include "absl/base/internal/raw_logging.h"
 #include "absl/base/nullability.h"
 #include "absl/strings/internal/resize_uninitialized.h"
-#include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
 
 namespace absl {
 ABSL_NAMESPACE_BEGIN
 
-
 // ----------------------------------------------------------------------
 // StrCat()
 //    This merges the given strings or integers, with no delimiter. This
@@ -43,7 +42,8 @@ ABSL_NAMESPACE_BEGIN
 namespace {
 // Append is merely a version of memcpy that returns the address of the byte
 // after the area just overwritten.
-absl::Nonnull<char*> Append(absl::Nonnull<char*> out, const AlphaNum& x) {
+inline absl::Nonnull<char*> Append(absl::Nonnull<char*> out,
+                                   const AlphaNum& x) {
   // memcpy is allowed to overwrite arbitrary memory, so doing this after the
   // call would force an extra fetch of x.size().
   char* after = out + x.size();
@@ -53,12 +53,23 @@ absl::Nonnull<char*> Append(absl::Nonnull<char*> out, const AlphaNum& x) {
   return after;
 }
 
+inline void STLStringAppendUninitializedAmortized(std::string* dest,
+                                                  size_t to_append) {
+  strings_internal::AppendUninitializedTraits<std::string>::Append(dest,
+                                                                   to_append);
+}
 }  // namespace
 
 std::string StrCat(const AlphaNum& a, const AlphaNum& b) {
   std::string result;
-  absl::strings_internal::STLStringResizeUninitialized(&result,
-                                                       a.size() + b.size());
+  // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+  // in memory strings to overflow a uint64_t.
+  constexpr uint64_t kMaxSize = uint64_t{std::numeric_limits<size_t>::max()};
+  const uint64_t result_size =
+      static_cast<uint64_t>(a.size()) + static_cast<uint64_t>(b.size());
+  ABSL_INTERNAL_CHECK(result_size <= kMaxSize, "size_t overflow");
+  absl::strings_internal::STLStringResizeUninitialized(
+      &result, static_cast<size_t>(result_size));
   char* const begin = &result[0];
   char* out = begin;
   out = Append(out, a);
@@ -69,8 +80,15 @@ std::string StrCat(const AlphaNum& a, const AlphaNum& b) {
 
 std::string StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c) {
   std::string result;
+  // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+  // in memory strings to overflow a uint64_t.
+  constexpr uint64_t kMaxSize = uint64_t{std::numeric_limits<size_t>::max()};
+  const uint64_t result_size = static_cast<uint64_t>(a.size()) +
+                               static_cast<uint64_t>(b.size()) +
+                               static_cast<uint64_t>(c.size());
+  ABSL_INTERNAL_CHECK(result_size <= kMaxSize, "size_t overflow");
   strings_internal::STLStringResizeUninitialized(
-      &result, a.size() + b.size() + c.size());
+      &result, static_cast<size_t>(result_size));
   char* const begin = &result[0];
   char* out = begin;
   out = Append(out, a);
@@ -83,8 +101,16 @@ std::string StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c) {
 std::string StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c,
                    const AlphaNum& d) {
   std::string result;
+  // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+  // in memory strings to overflow a uint64_t.
+  constexpr uint64_t kMaxSize = uint64_t{std::numeric_limits<size_t>::max()};
+  const uint64_t result_size = static_cast<uint64_t>(a.size()) +
+                               static_cast<uint64_t>(b.size()) +
+                               static_cast<uint64_t>(c.size()) +
+                               static_cast<uint64_t>(d.size());
+  ABSL_INTERNAL_CHECK(result_size <= kMaxSize, "size_t overflow");
   strings_internal::STLStringResizeUninitialized(
-      &result, a.size() + b.size() + c.size() + d.size());
+      &result, static_cast<size_t>(result_size));
   char* const begin = &result[0];
   char* out = begin;
   out = Append(out, a);
@@ -98,135 +124,18 @@ std::string StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c,
 namespace strings_internal {
 
 // Do not call directly - these are not part of the public API.
-void STLStringAppendUninitializedAmortized(std::string* dest,
-                                           size_t to_append) {
-  strings_internal::AppendUninitializedTraits<std::string>::Append(dest,
-                                                                   to_append);
-}
-
-template <typename Integer>
-std::enable_if_t<std::is_integral<Integer>::value, std::string> IntegerToString(
-    Integer i) {
-  std::string str;
-  const auto /* either bool or std::false_type */ is_negative =
-      absl::numbers_internal::IsNegative(i);
-  const uint32_t digits = absl::numbers_internal::Base10Digits(
-      absl::numbers_internal::UnsignedAbsoluteValue(i));
-  absl::strings_internal::STLStringResizeUninitialized(
-      &str, digits + static_cast<uint32_t>(is_negative));
-  absl::numbers_internal::FastIntToBufferBackward(i, &str[str.size()], digits);
-  return str;
-}
-
-template <>
-std::string IntegerToString(long i) {  // NOLINT
-  if (sizeof(i) <= sizeof(int)) {
-    return IntegerToString(static_cast<int>(i));
-  } else {
-    return IntegerToString(static_cast<long long>(i));  // NOLINT
-  }
-}
-
-template <>
-std::string IntegerToString(unsigned long i) {  // NOLINT
-  if (sizeof(i) <= sizeof(unsigned int)) {
-    return IntegerToString(static_cast<unsigned int>(i));
-  } else {
-    return IntegerToString(static_cast<unsigned long long>(i));  // NOLINT
-  }
-}
-
-template <typename Float>
-std::enable_if_t<std::is_floating_point<Float>::value, std::string>
-FloatToString(Float f) {
-  std::string result;
-  strings_internal::STLStringResizeUninitialized(
-      &result, numbers_internal::kSixDigitsToBufferSize);
-  char* start = &result[0];
-  result.erase(numbers_internal::SixDigitsToBuffer(f, start));
-  return result;
-}
-
-std::string SingleArgStrCat(int x) { return IntegerToString(x); }
-std::string SingleArgStrCat(unsigned int x) { return IntegerToString(x); }
-// NOLINTNEXTLINE
-std::string SingleArgStrCat(long x) { return IntegerToString(x); }
-// NOLINTNEXTLINE
-std::string SingleArgStrCat(unsigned long x) { return IntegerToString(x); }
-// NOLINTNEXTLINE
-std::string SingleArgStrCat(long long x) { return IntegerToString(x); }
-// NOLINTNEXTLINE
-std::string SingleArgStrCat(unsigned long long x) { return IntegerToString(x); }
-std::string SingleArgStrCat(float x) { return FloatToString(x); }
-std::string SingleArgStrCat(double x) { return FloatToString(x); }
-
-template <class Integer>
-std::enable_if_t<std::is_integral<Integer>::value, void> AppendIntegerToString(
-    std::string& str, Integer i) {
-  const auto /* either bool or std::false_type */ is_negative =
-      absl::numbers_internal::IsNegative(i);
-  const uint32_t digits = absl::numbers_internal::Base10Digits(
-      absl::numbers_internal::UnsignedAbsoluteValue(i));
-  absl::strings_internal::STLStringAppendUninitializedAmortized(
-      &str, digits + static_cast<uint32_t>(is_negative));
-  absl::numbers_internal::FastIntToBufferBackward(i, &str[str.size()], digits);
-}
-
-template <>
-void AppendIntegerToString(std::string& str, long i) {  // NOLINT
-  if (sizeof(i) <= sizeof(int)) {
-    return AppendIntegerToString(str, static_cast<int>(i));
-  } else {
-    return AppendIntegerToString(str, static_cast<long long>(i));  // NOLINT
-  }
-}
-
-template <>
-void AppendIntegerToString(std::string& str,
-                           unsigned long i) {  // NOLINT
-  if (sizeof(i) <= sizeof(unsigned int)) {
-    return AppendIntegerToString(str, static_cast<unsigned int>(i));
-  } else {
-    return AppendIntegerToString(str,
-                                 static_cast<unsigned long long>(i));  // NOLINT
-  }
-}
-
-// `SingleArgStrAppend` overloads are defined here for the same reasons as with
-// `SingleArgStrCat` above.
-void SingleArgStrAppend(std::string& str, int x) {
-  return AppendIntegerToString(str, x);
-}
-
-void SingleArgStrAppend(std::string& str, unsigned int x) {
-  return AppendIntegerToString(str, x);
-}
-
-// NOLINTNEXTLINE
-void SingleArgStrAppend(std::string& str, long x) {
-  return AppendIntegerToString(str, x);
-}
-
-// NOLINTNEXTLINE
-void SingleArgStrAppend(std::string& str, unsigned long x) {
-  return AppendIntegerToString(str, x);
-}
-
-// NOLINTNEXTLINE
-void SingleArgStrAppend(std::string& str, long long x) {
-  return AppendIntegerToString(str, x);
-}
-
-// NOLINTNEXTLINE
-void SingleArgStrAppend(std::string& str, unsigned long long x) {
-  return AppendIntegerToString(str, x);
-}
-
 std::string CatPieces(std::initializer_list<absl::string_view> pieces) {
   std::string result;
-  size_t total_size = 0;
-  for (absl::string_view piece : pieces) total_size += piece.size();
-  strings_internal::STLStringResizeUninitialized(&result, total_size);
+  // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+  // in memory strings to overflow a uint64_t.
+  constexpr uint64_t kMaxSize = uint64_t{std::numeric_limits<size_t>::max()};
+  uint64_t total_size = 0;
+  for (absl::string_view piece : pieces) {
+    total_size += piece.size();
+  }
+  ABSL_INTERNAL_CHECK(total_size <= kMaxSize, "size_t overflow");
+  strings_internal::STLStringResizeUninitialized(
+      &result, static_cast<size_t>(total_size));
 
   char* const begin = &result[0];
   char* out = begin;
@@ -258,7 +167,7 @@ void AppendPieces(absl::Nonnull<std::string*> dest,
     ASSERT_NO_OVERLAP(*dest, piece);
     to_append += piece.size();
   }
-  strings_internal::STLStringAppendUninitializedAmortized(dest, to_append);
+  STLStringAppendUninitializedAmortized(dest, to_append);
 
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
@@ -277,7 +186,7 @@ void AppendPieces(absl::Nonnull<std::string*> dest,
 void StrAppend(absl::Nonnull<std::string*> dest, const AlphaNum& a) {
   ASSERT_NO_OVERLAP(*dest, a);
   std::string::size_type old_size = dest->size();
-  strings_internal::STLStringAppendUninitializedAmortized(dest, a.size());
+  STLStringAppendUninitializedAmortized(dest, a.size());
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
   out = Append(out, a);
@@ -289,8 +198,7 @@ void StrAppend(absl::Nonnull<std::string*> dest, const AlphaNum& a,
   ASSERT_NO_OVERLAP(*dest, a);
   ASSERT_NO_OVERLAP(*dest, b);
   std::string::size_type old_size = dest->size();
-  strings_internal::STLStringAppendUninitializedAmortized(dest,
-                                                          a.size() + b.size());
+  STLStringAppendUninitializedAmortized(dest, a.size() + b.size());
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
   out = Append(out, a);
@@ -304,8 +212,7 @@ void StrAppend(absl::Nonnull<std::string*> dest, const AlphaNum& a,
   ASSERT_NO_OVERLAP(*dest, b);
   ASSERT_NO_OVERLAP(*dest, c);
   std::string::size_type old_size = dest->size();
-  strings_internal::STLStringAppendUninitializedAmortized(
-      dest, a.size() + b.size() + c.size());
+  STLStringAppendUninitializedAmortized(dest, a.size() + b.size() + c.size());
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
   out = Append(out, a);
@@ -321,7 +228,7 @@ void StrAppend(absl::Nonnull<std::string*> dest, const AlphaNum& a,
   ASSERT_NO_OVERLAP(*dest, c);
   ASSERT_NO_OVERLAP(*dest, d);
   std::string::size_type old_size = dest->size();
-  strings_internal::STLStringAppendUninitializedAmortized(
+  STLStringAppendUninitializedAmortized(
       dest, a.size() + b.size() + c.size() + d.size());
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
diff --git a/contrib/restricted/abseil-cpp/absl/strings/str_cat.h b/contrib/restricted/abseil-cpp/absl/strings/str_cat.h
index 1b52a36f4c75..b98adc02486f 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/str_cat.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/str_cat.h
@@ -93,6 +93,8 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <initializer_list>
+#include <limits>
 #include <string>
 #include <type_traits>
 #include <utility>
@@ -312,6 +314,10 @@ class AlphaNum {
   // No bool ctor -- bools convert to an integral type.
   // A bool ctor would also convert incoming pointers (bletch).
 
+  // Prevent brace initialization
+  template <typename T>
+  AlphaNum(std::initializer_list<T>) = delete;  // NOLINT(runtime/explicit)
+
   AlphaNum(int x)  // NOLINT(runtime/explicit)
       : piece_(digits_, static_cast<size_t>(
                             numbers_internal::FastIntToBuffer(x, digits_) -
@@ -448,36 +454,77 @@ std::string CatPieces(std::initializer_list<absl::string_view> pieces);
 void AppendPieces(absl::Nonnull<std::string*> dest,
                   std::initializer_list<absl::string_view> pieces);
 
-void STLStringAppendUninitializedAmortized(std::string* dest, size_t to_append);
+template <typename Integer>
+std::string IntegerToString(Integer i) {
+  // Any integer (signed/unsigned) up to 64 bits can be formatted into a buffer
+  // with 22 bytes (including NULL at the end).
+  constexpr size_t kMaxDigits10 = 22;
+  std::string result;
+  strings_internal::STLStringResizeUninitialized(&result, kMaxDigits10);
+  char* start = &result[0];
+  // note: this can be optimized to not write last zero.
+  char* end = numbers_internal::FastIntToBuffer(i, start);
+  auto size = static_cast<size_t>(end - start);
+  assert((size < result.size()) &&
+         "StrCat(Integer) does not fit into kMaxDigits10");
+  result.erase(size);
+  return result;
+}
+template <typename Float>
+std::string FloatToString(Float f) {
+  std::string result;
+  strings_internal::STLStringResizeUninitialized(
+      &result, numbers_internal::kSixDigitsToBufferSize);
+  char* start = &result[0];
+  result.erase(numbers_internal::SixDigitsToBuffer(f, start));
+  return result;
+}
 
 // `SingleArgStrCat` overloads take built-in `int`, `long` and `long long` types
 // (signed / unsigned) to avoid ambiguity on the call side. If we used int32_t
 // and int64_t, then at least one of the three (`int` / `long` / `long long`)
 // would have been ambiguous when passed to `SingleArgStrCat`.
-std::string SingleArgStrCat(int x);
-std::string SingleArgStrCat(unsigned int x);
-std::string SingleArgStrCat(long x);                // NOLINT
-std::string SingleArgStrCat(unsigned long x);       // NOLINT
-std::string SingleArgStrCat(long long x);           // NOLINT
-std::string SingleArgStrCat(unsigned long long x);  // NOLINT
-std::string SingleArgStrCat(float x);
-std::string SingleArgStrCat(double x);
-
-// `SingleArgStrAppend` overloads are defined here for the same reasons as with
-// `SingleArgStrCat` above.
-void SingleArgStrAppend(std::string& str, int x);
-void SingleArgStrAppend(std::string& str, unsigned int x);
-void SingleArgStrAppend(std::string& str, long x);                // NOLINT
-void SingleArgStrAppend(std::string& str, unsigned long x);       // NOLINT
-void SingleArgStrAppend(std::string& str, long long x);           // NOLINT
-void SingleArgStrAppend(std::string& str, unsigned long long x);  // NOLINT
-
-template <typename T,
-          typename = std::enable_if_t<std::is_arithmetic<T>::value &&
-                                      !std::is_same<T, char>::value &&
-                                      !std::is_same<T, bool>::value>>
+inline std::string SingleArgStrCat(int x) { return IntegerToString(x); }
+inline std::string SingleArgStrCat(unsigned int x) {
+  return IntegerToString(x);
+}
+// NOLINTNEXTLINE
+inline std::string SingleArgStrCat(long x) { return IntegerToString(x); }
+// NOLINTNEXTLINE
+inline std::string SingleArgStrCat(unsigned long x) {
+  return IntegerToString(x);
+}
+// NOLINTNEXTLINE
+inline std::string SingleArgStrCat(long long x) { return IntegerToString(x); }
+// NOLINTNEXTLINE
+inline std::string SingleArgStrCat(unsigned long long x) {
+  return IntegerToString(x);
+}
+inline std::string SingleArgStrCat(float x) { return FloatToString(x); }
+inline std::string SingleArgStrCat(double x) { return FloatToString(x); }
+
+// As of September 2023, the SingleArgStrCat() optimization is only enabled for
+// libc++. The reasons for this are:
+// 1) The SSO size for libc++ is 23, while libstdc++ and MSSTL have an SSO size
+// of 15. Since IntegerToString unconditionally resizes the string to 22 bytes,
+// this causes both libstdc++ and MSSTL to allocate.
+// 2) strings_internal::STLStringResizeUninitialized() only has an
+// implementation that avoids initialization when using libc++. This isn't as
+// relevant as (1), and the cost should be benchmarked if (1) ever changes on
+// libstc++ or MSSTL.
+#ifdef _LIBCPP_VERSION
+#define ABSL_INTERNAL_STRCAT_ENABLE_FAST_CASE true
+#else
+#define ABSL_INTERNAL_STRCAT_ENABLE_FAST_CASE false
+#endif
+
+template <typename T, typename = std::enable_if_t<
+                          ABSL_INTERNAL_STRCAT_ENABLE_FAST_CASE &&
+                          std::is_arithmetic<T>{} && !std::is_same<T, char>{}>>
 using EnableIfFastCase = T;
 
+#undef ABSL_INTERNAL_STRCAT_ENABLE_FAST_CASE
+
 }  // namespace strings_internal
 
 ABSL_MUST_USE_RESULT inline std::string StrCat() { return std::string(); }
@@ -553,67 +600,6 @@ inline void StrAppend(absl::Nonnull<std::string*> dest, const AlphaNum& a,
              static_cast<const AlphaNum&>(args).Piece()...});
 }
 
-template <class String, class T>
-std::enable_if_t<
-    std::is_integral<absl::strings_internal::EnableIfFastCase<T>>::value, void>
-StrAppend(absl::Nonnull<String*> result, T i) {
-  return absl::strings_internal::SingleArgStrAppend(*result, i);
-}
-
-// This overload is only selected if all the parameters are numbers that can be
-// handled quickly.
-// Later we can look into how we can extend this to more general argument
-// mixtures without bloating codegen too much, or copying unnecessarily.
-template <typename String, typename... T>
-std::enable_if_t<
-    (sizeof...(T) > 1),
-    std::common_type_t<std::conditional_t<
-        true, void, absl::strings_internal::EnableIfFastCase<T>>...>>
-StrAppend(absl::Nonnull<String*> str, T... args) {
-  // Do not add unnecessary variables, logic, or even "free" lambdas here.
-  // They can add overhead for the compiler and/or at run time.
-  // Furthermore, assume this function will be inlined.
-  // This function is carefully tailored to be able to be largely optimized away
-  // so that it becomes near-equivalent to the caller handling each argument
-  // individually while minimizing register pressure, so that the compiler
-  // can inline it with minimal overhead.
-
-  // First, calculate the total length, so we can perform just a single resize.
-  // Save all the lengths for later.
-  size_t total_length = 0;
-  const ptrdiff_t lengths[] = {
-      absl::numbers_internal::GetNumDigitsOrNegativeIfNegative(args)...};
-  for (const ptrdiff_t possibly_negative_length : lengths) {
-    // Lengths are negative for negative numbers. Keep them for later use, but
-    // take their absolute values for calculating total lengths;
-    total_length += possibly_negative_length < 0
-                        ? static_cast<size_t>(-possibly_negative_length)
-                        : static_cast<size_t>(possibly_negative_length);
-  }
-
-  // Now reserve space for all the arguments.
-  const size_t old_size = str->size();
-  absl::strings_internal::STLStringAppendUninitializedAmortized(str,
-                                                                total_length);
-
-  // Finally, output each argument one-by-one, from left to right.
-  size_t i = 0;  // The current argument we're processing
-  ptrdiff_t n;   // The length of the current argument
-  typename String::pointer pos = &(*str)[old_size];
-  using SomeTrivialEmptyType = std::false_type;
-  const SomeTrivialEmptyType dummy;
-  // Ugly code due to the lack of C++17 fold expressions
-  const SomeTrivialEmptyType dummies[] = {
-      (/* Comma expressions are poor man's C++17 fold expression for C++14 */
-       (void)(n = lengths[i]),
-       (void)(n < 0 ? (void)(*pos++ = '-'), (n = ~n) : 0),
-       (void)absl::numbers_internal::FastIntToBufferBackward(
-           absl::numbers_internal::UnsignedAbsoluteValue(std::move(args)),
-           pos += n, static_cast<uint32_t>(n)),
-       (void)++i, dummy)...};
-  (void)dummies;  // Remove & migrate to fold expressions in C++17
-}
-
 // Helper function for the future StrCat default floating-point format, %.6g
 // This is fast.
 inline strings_internal::AlphaNumBuffer<
diff --git a/contrib/restricted/abseil-cpp/absl/strings/str_format.h b/contrib/restricted/abseil-cpp/absl/strings/str_format.h
index 66b6af585469..76904d32285f 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/str_format.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/str_format.h
@@ -181,7 +181,7 @@ class FormatCountCapture {
 // For a `FormatSpec` to be valid at compile-time, it must be provided as
 // either:
 //
-// * A `constexpr` literal or `absl::string_view`, which is how it most often
+// * A `constexpr` literal or `absl::string_view`, which is how it is most often
 //   used.
 // * A `ParsedFormat` instantiation, which ensures the format string is
 //   valid before use. (See below.)
diff --git a/contrib/restricted/abseil-cpp/absl/strings/str_join.h b/contrib/restricted/abseil-cpp/absl/strings/str_join.h
index 6a92c0f53ac3..8d7bc6ba79df 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/str_join.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/str_join.h
@@ -247,12 +247,20 @@ std::string StrJoin(const Range& range, absl::string_view separator,
   return strings_internal::JoinRange(range, separator, fmt);
 }
 
-template <typename T, typename Formatter>
+template <typename T, typename Formatter,
+          typename = typename std::enable_if<
+              !std::is_convertible<T, absl::string_view>::value>::type>
 std::string StrJoin(std::initializer_list<T> il, absl::string_view separator,
                     Formatter&& fmt) {
   return strings_internal::JoinRange(il, separator, fmt);
 }
 
+template <typename Formatter>
+inline std::string StrJoin(std::initializer_list<absl::string_view> il,
+                           absl::string_view separator, Formatter&& fmt) {
+  return strings_internal::JoinRange(il, separator, fmt);
+}
+
 template <typename... T, typename Formatter>
 std::string StrJoin(const std::tuple<T...>& value, absl::string_view separator,
                     Formatter&& fmt) {
@@ -269,16 +277,22 @@ std::string StrJoin(const Range& range, absl::string_view separator) {
   return strings_internal::JoinRange(range, separator);
 }
 
-template <typename T>
-std::string StrJoin(std::initializer_list<T> il,
-                    absl::string_view separator) {
+template <typename T, typename = typename std::enable_if<!std::is_convertible<
+                          T, absl::string_view>::value>::type>
+std::string StrJoin(std::initializer_list<T> il, absl::string_view separator) {
+  return strings_internal::JoinRange(il, separator);
+}
+
+inline std::string StrJoin(std::initializer_list<absl::string_view> il,
+                           absl::string_view separator) {
   return strings_internal::JoinRange(il, separator);
 }
 
 template <typename... T>
 std::string StrJoin(const std::tuple<T...>& value,
                     absl::string_view separator) {
-  return strings_internal::JoinAlgorithm(value, separator, AlphaNumFormatter());
+  return strings_internal::JoinTuple(value, separator,
+                                     std::index_sequence_for<T...>{});
 }
 
 ABSL_NAMESPACE_END
diff --git a/contrib/restricted/abseil-cpp/absl/strings/str_split.h b/contrib/restricted/abseil-cpp/absl/strings/str_split.h
index 87540278ade3..ba176fca3cec 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/str_split.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/str_split.h
@@ -456,7 +456,7 @@ using EnableSplitIfString =
 //   // Stores results in a std::set<std::string>, which also performs
 //   // de-duplication and orders the elements in ascending order.
 //   std::set<std::string> a = absl::StrSplit("b,a,c,a,b", ',');
-//   // v[0] == "a", v[1] == "b", v[2] = "c"
+//   // a[0] == "a", a[1] == "b", a[2] == "c"
 //
 //   // `StrSplit()` can be used within a range-based for loop, in which case
 //   // each element will be of type `absl::string_view`.
@@ -544,7 +544,7 @@ StrSplit(strings_internal::ConvertibleToStringView text, Delimiter d,
       typename strings_internal::SelectDelimiter<Delimiter>::type;
   return strings_internal::Splitter<DelimiterType, Predicate,
                                     absl::string_view>(
-      text.value(), DelimiterType(d), std::move(p));
+      text.value(), DelimiterType(std::move(d)), std::move(p));
 }
 
 template <typename Delimiter, typename Predicate, typename StringType,
diff --git a/contrib/restricted/abseil-cpp/absl/strings/string_view.h b/contrib/restricted/abseil-cpp/absl/strings/string_view.h
index 04ca0a38ae7a..ff7600144a7a 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/string_view.h
+++ b/contrib/restricted/abseil-cpp/absl/strings/string_view.h
@@ -159,7 +159,7 @@ ABSL_NAMESPACE_BEGIN
 //
 //   absl::string_view() == absl::string_view("", 0)
 //   absl::string_view(nullptr, 0) == absl::string_view("abcdef"+6, 0)
-class string_view {
+class ABSL_INTERNAL_ATTRIBUTE_VIEW string_view {
  public:
   using traits_type = std::char_traits<char>;
   using value_type = char;
@@ -173,6 +173,7 @@ class string_view {
   using reverse_iterator = const_reverse_iterator;
   using size_type = size_t;
   using difference_type = std::ptrdiff_t;
+  using absl_internal_is_view = std::true_type;
 
   static constexpr size_type npos = static_cast<size_type>(-1);
 
@@ -670,7 +671,7 @@ class string_view {
   }
 
   static constexpr size_type StrlenInternal(absl::Nonnull<const char*> str) {
-#if defined(_MSC_VER) && _MSC_VER >= 1910 && !defined(__clang__)
+#if defined(_MSC_VER) && !defined(__clang__)
     // MSVC 2017+ can evaluate this at compile-time.
     const char* begin = str;
     while (*str != '\0') ++str;
diff --git a/contrib/restricted/abseil-cpp/absl/strings/substitute.cc b/contrib/restricted/abseil-cpp/absl/strings/substitute.cc
index dd32c75f69d0..a71f565a1209 100644
--- a/contrib/restricted/abseil-cpp/absl/strings/substitute.cc
+++ b/contrib/restricted/abseil-cpp/absl/strings/substitute.cc
@@ -18,6 +18,7 @@
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <string>
 
 #include "absl/base/config.h"
@@ -84,6 +85,9 @@ void SubstituteAndAppendArray(
 
   // Build the string.
   size_t original_size = output->size();
+  ABSL_INTERNAL_CHECK(
+      size <= std::numeric_limits<size_t>::max() - original_size,
+      "size_t overflow");
   strings_internal::STLStringResizeUninitializedAmortized(output,
                                                           original_size + size);
   char* target = &(*output)[original_size];
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/internal/graphcycles.cc b/contrib/restricted/abseil-cpp/absl/synchronization/internal/graphcycles.cc
index 39b18482f3f1..129067c15158 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/internal/graphcycles.cc
@@ -211,7 +211,7 @@ class NodeSet {
   Vec<int32_t> table_;
   uint32_t occupied_;     // Count of non-empty slots (includes deleted slots)
 
-  static uint32_t Hash(int32_t a) { return static_cast<uint32_t>(a * 41); }
+  static uint32_t Hash(int32_t a) { return static_cast<uint32_t>(a) * 41; }
 
   // Return index for storing v.  May return an empty index or deleted index
   uint32_t FindIndex(int32_t v) const {
@@ -333,7 +333,7 @@ class PointerMap {
 
  private:
   // Number of buckets in hash table for pointer lookups.
-  static constexpr uint32_t kHashTableSize = 8171;  // should be prime
+  static constexpr uint32_t kHashTableSize = 262139;  // should be prime
 
   const Vec<Node*>* nodes_;
   std::array<int32_t, kHashTableSize> table_;
@@ -365,6 +365,14 @@ static Node* FindNode(GraphCycles::Rep* rep, GraphId id) {
   return (n->version == NodeVersion(id)) ? n : nullptr;
 }
 
+void GraphCycles::TestOnlyAddNodes(uint32_t n) {
+  uint32_t old_size = rep_->nodes_.size();
+  rep_->nodes_.resize(n);
+  for (auto i = old_size; i < n; ++i) {
+    rep_->nodes_[i] = nullptr;
+  }
+}
+
 GraphCycles::GraphCycles() {
   InitArenaIfNecessary();
   rep_ = new (base_internal::LowLevelAlloc::AllocWithArena(sizeof(Rep), arena))
@@ -373,6 +381,7 @@ GraphCycles::GraphCycles() {
 
 GraphCycles::~GraphCycles() {
   for (auto* node : rep_->nodes_) {
+    if (node == nullptr) { continue; }
     node->Node::~Node();
     base_internal::LowLevelAlloc::Free(node);
   }
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/internal/graphcycles.h b/contrib/restricted/abseil-cpp/absl/synchronization/internal/graphcycles.h
index ceba33e4de89..08f304bce1b6 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/internal/graphcycles.h
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/internal/graphcycles.h
@@ -126,6 +126,11 @@ class GraphCycles {
   // Expensive: should only be called from graphcycles_test.cc.
   bool CheckInvariants() const;
 
+  // Test-only method to add more nodes. The nodes will not be valid, and this
+  // method should only be used to test the behavior of the graph when it is
+  // very full.
+  void TestOnlyAddNodes(uint32_t n);
+
   // ----------------------------------------------------
   struct Rep;
  private:
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/mutex.h b/contrib/restricted/abseil-cpp/absl/synchronization/mutex.h
index d53a22bbd957..be3f1f56bb81 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/mutex.h
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/mutex.h
@@ -148,7 +148,7 @@ struct SynchWaitParams;
 //
 // See also `MutexLock`, below, for scoped `Mutex` acquisition.
 
-class ABSL_LOCKABLE Mutex {
+class ABSL_LOCKABLE ABSL_ATTRIBUTE_WARN_UNUSED Mutex {
  public:
   // Creates a `Mutex` that is not held by anyone. This constructor is
   // typically used for Mutexes allocated on the heap or the stack.
@@ -190,7 +190,7 @@ class ABSL_LOCKABLE Mutex {
   // If the mutex can be acquired without blocking, does so exclusively and
   // returns `true`. Otherwise, returns `false`. Returns `true` with high
   // probability if the `Mutex` was free.
-  bool TryLock() ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true);
+  ABSL_MUST_USE_RESULT bool TryLock() ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true);
 
   // Mutex::AssertHeld()
   //
@@ -255,7 +255,7 @@ class ABSL_LOCKABLE Mutex {
   // If the mutex can be acquired without blocking, acquires this mutex for
   // shared access and returns `true`. Otherwise, returns `false`. Returns
   // `true` with high probability if the `Mutex` was free or shared.
-  bool ReaderTryLock() ABSL_SHARED_TRYLOCK_FUNCTION(true);
+  ABSL_MUST_USE_RESULT bool ReaderTryLock() ABSL_SHARED_TRYLOCK_FUNCTION(true);
 
   // Mutex::AssertReaderHeld()
   //
@@ -281,7 +281,8 @@ class ABSL_LOCKABLE Mutex {
 
   void WriterUnlock() ABSL_UNLOCK_FUNCTION() { this->Unlock(); }
 
-  bool WriterTryLock() ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+  ABSL_MUST_USE_RESULT bool WriterTryLock()
+      ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
     return this->TryLock();
   }
 
diff --git a/contrib/restricted/abseil-cpp/absl/time/civil_time.h b/contrib/restricted/abseil-cpp/absl/time/civil_time.h
index 3e904a113d88..d198ebaec085 100644
--- a/contrib/restricted/abseil-cpp/absl/time/civil_time.h
+++ b/contrib/restricted/abseil-cpp/absl/time/civil_time.h
@@ -55,7 +55,7 @@
 // Example:
 //
 //   // Construct a civil-time object for a specific day
-//   const absl::CivilDay cd(1969, 07, 20);
+//   const absl::CivilDay cd(1969, 7, 20);
 //
 //   // Construct a civil-time object for a specific second
 //   const absl::CivilSecond cd(2018, 8, 1, 12, 0, 1);
@@ -65,7 +65,7 @@
 // Example:
 //
 //   // Valid in C++14
-//   constexpr absl::CivilDay cd(1969, 07, 20);
+//   constexpr absl::CivilDay cd(1969, 7, 20);
 
 #ifndef ABSL_TIME_CIVIL_TIME_H_
 #define ABSL_TIME_CIVIL_TIME_H_
diff --git a/contrib/restricted/abseil-cpp/absl/time/clock.cc b/contrib/restricted/abseil-cpp/absl/time/clock.cc
index aa74367b8a77..ecd539e5caa9 100644
--- a/contrib/restricted/abseil-cpp/absl/time/clock.cc
+++ b/contrib/restricted/abseil-cpp/absl/time/clock.cc
@@ -88,11 +88,25 @@ ABSL_NAMESPACE_END
 namespace absl {
 ABSL_NAMESPACE_BEGIN
 namespace time_internal {
+
+// On some processors, consecutive reads of the cycle counter may yield the
+// same value (weakly-increasing). In debug mode, clear the least significant
+// bits to discourage depending on a strictly-increasing Now() value.
+// In x86-64's debug mode, discourage depending on a strictly-increasing Now()
+// value.
+#if !defined(NDEBUG) && defined(__x86_64__)
+constexpr int64_t kCycleClockNowMask = ~int64_t{0xff};
+#else
+constexpr int64_t kCycleClockNowMask = ~int64_t{0};
+#endif
+
 // This is a friend wrapper around UnscaledCycleClock::Now()
 // (needed to access UnscaledCycleClock).
 class UnscaledCycleClockWrapperForGetCurrentTime {
  public:
-  static int64_t Now() { return base_internal::UnscaledCycleClock::Now(); }
+  static int64_t Now() {
+    return base_internal::UnscaledCycleClock::Now() & kCycleClockNowMask;
+  }
 };
 }  // namespace time_internal
 
diff --git a/contrib/restricted/abseil-cpp/absl/time/duration.cc b/contrib/restricted/abseil-cpp/absl/time/duration.cc
index bdb16e210923..8d0b66f825e9 100644
--- a/contrib/restricted/abseil-cpp/absl/time/duration.cc
+++ b/contrib/restricted/abseil-cpp/absl/time/duration.cc
@@ -219,7 +219,7 @@ struct SafeMultiply {
                  ? static_cast<uint128>(Uint128Low64(a) * Uint128Low64(b))
                  : a * b;
     }
-    return b == 0 ? b : (a > kuint128max / b) ? kuint128max : a * b;
+    return b == 0 ? b : (a > Uint128Max() / b) ? Uint128Max() : a * b;
   }
 };
 
@@ -280,33 +280,35 @@ inline bool IDivFastPath(const Duration num, const Duration den, int64_t* q,
   int64_t den_hi = time_internal::GetRepHi(den);
   uint32_t den_lo = time_internal::GetRepLo(den);
 
-  if (den_hi == 0 && den_lo == kTicksPerNanosecond) {
-    // Dividing by 1ns
-    if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000000000) {
-      *q = num_hi * 1000000000 + num_lo / kTicksPerNanosecond;
-      *rem = time_internal::MakeDuration(0, num_lo % den_lo);
-      return true;
-    }
-  } else if (den_hi == 0 && den_lo == 100 * kTicksPerNanosecond) {
-    // Dividing by 100ns (common when converting to Universal time)
-    if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 10000000) {
-      *q = num_hi * 10000000 + num_lo / (100 * kTicksPerNanosecond);
-      *rem = time_internal::MakeDuration(0, num_lo % den_lo);
-      return true;
-    }
-  } else if (den_hi == 0 && den_lo == 1000 * kTicksPerNanosecond) {
-    // Dividing by 1us
-    if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000000) {
-      *q = num_hi * 1000000 + num_lo / (1000 * kTicksPerNanosecond);
-      *rem = time_internal::MakeDuration(0, num_lo % den_lo);
-      return true;
-    }
-  } else if (den_hi == 0 && den_lo == 1000000 * kTicksPerNanosecond) {
-    // Dividing by 1ms
-    if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000) {
-      *q = num_hi * 1000 + num_lo / (1000000 * kTicksPerNanosecond);
-      *rem = time_internal::MakeDuration(0, num_lo % den_lo);
-      return true;
+  if (den_hi == 0) {
+    if (den_lo == kTicksPerNanosecond) {
+      // Dividing by 1ns
+      if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000000000) {
+        *q = num_hi * 1000000000 + num_lo / kTicksPerNanosecond;
+        *rem = time_internal::MakeDuration(0, num_lo % den_lo);
+        return true;
+      }
+    } else if (den_lo == 100 * kTicksPerNanosecond) {
+      // Dividing by 100ns (common when converting to Universal time)
+      if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 10000000) {
+        *q = num_hi * 10000000 + num_lo / (100 * kTicksPerNanosecond);
+        *rem = time_internal::MakeDuration(0, num_lo % den_lo);
+        return true;
+      }
+    } else if (den_lo == 1000 * kTicksPerNanosecond) {
+      // Dividing by 1us
+      if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000000) {
+        *q = num_hi * 1000000 + num_lo / (1000 * kTicksPerNanosecond);
+        *rem = time_internal::MakeDuration(0, num_lo % den_lo);
+        return true;
+      }
+    } else if (den_lo == 1000000 * kTicksPerNanosecond) {
+      // Dividing by 1ms
+      if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000) {
+        *q = num_hi * 1000 + num_lo / (1000000 * kTicksPerNanosecond);
+        *rem = time_internal::MakeDuration(0, num_lo % den_lo);
+        return true;
+      }
     }
   } else if (den_hi > 0 && den_lo == 0) {
     // Dividing by positive multiple of 1s
@@ -342,19 +344,10 @@ inline bool IDivFastPath(const Duration num, const Duration den, int64_t* q,
 
 }  // namespace
 
-namespace time_internal {
+namespace {
 
-// The 'satq' argument indicates whether the quotient should saturate at the
-// bounds of int64_t.  If it does saturate, the difference will spill over to
-// the remainder.  If it does not saturate, the remainder remain accurate,
-// but the returned quotient will over/underflow int64_t and should not be used.
-int64_t IDivDuration(bool satq, const Duration num, const Duration den,
+int64_t IDivSlowPath(bool satq, const Duration num, const Duration den,
                      Duration* rem) {
-  int64_t q = 0;
-  if (IDivFastPath(num, den, &q, rem)) {
-    return q;
-  }
-
   const bool num_neg = num < ZeroDuration();
   const bool den_neg = den < ZeroDuration();
   const bool quotient_neg = num_neg != den_neg;
@@ -391,7 +384,27 @@ int64_t IDivDuration(bool satq, const Duration num, const Duration den,
   return -static_cast<int64_t>(Uint128Low64(quotient128 - 1) & kint64max) - 1;
 }
 
-}  // namespace time_internal
+// The 'satq' argument indicates whether the quotient should saturate at the
+// bounds of int64_t.  If it does saturate, the difference will spill over to
+// the remainder.  If it does not saturate, the remainder remain accurate,
+// but the returned quotient will over/underflow int64_t and should not be used.
+ABSL_ATTRIBUTE_ALWAYS_INLINE inline int64_t IDivDurationImpl(bool satq,
+                                                             const Duration num,
+                                                             const Duration den,
+                                                             Duration* rem) {
+  int64_t q = 0;
+  if (IDivFastPath(num, den, &q, rem)) {
+    return q;
+  }
+  return IDivSlowPath(satq, num, den, rem);
+}
+
+}  // namespace
+
+int64_t IDivDuration(Duration num, Duration den, Duration* rem) {
+  return IDivDurationImpl(true, num, den,
+                          rem);  // trunc towards zero
+}
 
 //
 // Additive operators.
@@ -475,7 +488,7 @@ Duration& Duration::operator/=(double r) {
 }
 
 Duration& Duration::operator%=(Duration rhs) {
-  time_internal::IDivDuration(false, *this, rhs, this);
+  IDivDurationImpl(false, *this, rhs, this);
   return *this;
 }
 
@@ -501,9 +514,7 @@ double FDivDuration(Duration num, Duration den) {
 // Trunc/Floor/Ceil.
 //
 
-Duration Trunc(Duration d, Duration unit) {
-  return d - (d % unit);
-}
+Duration Trunc(Duration d, Duration unit) { return d - (d % unit); }
 
 Duration Floor(const Duration d, const Duration unit) {
   const absl::Duration td = Trunc(d, unit);
@@ -591,15 +602,9 @@ double ToDoubleMicroseconds(Duration d) {
 double ToDoubleMilliseconds(Duration d) {
   return FDivDuration(d, Milliseconds(1));
 }
-double ToDoubleSeconds(Duration d) {
-  return FDivDuration(d, Seconds(1));
-}
-double ToDoubleMinutes(Duration d) {
-  return FDivDuration(d, Minutes(1));
-}
-double ToDoubleHours(Duration d) {
-  return FDivDuration(d, Hours(1));
-}
+double ToDoubleSeconds(Duration d) { return FDivDuration(d, Seconds(1)); }
+double ToDoubleMinutes(Duration d) { return FDivDuration(d, Minutes(1)); }
+double ToDoubleHours(Duration d) { return FDivDuration(d, Hours(1)); }
 
 timespec ToTimespec(Duration d) {
   timespec ts;
diff --git a/contrib/restricted/abseil-cpp/absl/time/format.cc b/contrib/restricted/abseil-cpp/absl/time/format.cc
index 15a26b14f7e4..bd06f8fb3592 100644
--- a/contrib/restricted/abseil-cpp/absl/time/format.cc
+++ b/contrib/restricted/abseil-cpp/absl/time/format.cc
@@ -16,6 +16,7 @@
 
 #include <cctype>
 #include <cstdint>
+#include <utility>
 
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
@@ -136,7 +137,7 @@ bool ParseTime(absl::string_view format, absl::string_view input,
   if (b) {
     *time = Join(parts);
   } else if (err != nullptr) {
-    *err = error;
+    *err = std::move(error);
   }
   return b;
 }
diff --git a/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc b/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc
index d01461222e9e..b509402783d1 100644
--- a/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc
+++ b/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc
@@ -12,7 +12,7 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 
-#if defined(_WIN32) || defined(_WIN64)
+#if !defined(_CRT_SECURE_NO_WARNINGS) && defined(_WIN32)
 #define _CRT_SECURE_NO_WARNINGS 1
 #endif
 
diff --git a/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc b/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc
index f37c5b3042bc..e0d773b831fe 100644
--- a/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc
+++ b/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc
@@ -17,9 +17,6 @@
 
 #if defined(__ANDROID__)
 #include <sys/system_properties.h>
-#if defined(__ANDROID_API__) && __ANDROID_API__ >= 21
-#include <dlfcn.h>
-#endif
 #endif
 
 #if defined(__APPLE__)
@@ -66,32 +63,6 @@ namespace time_internal {
 namespace cctz {
 
 namespace {
-#if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 21
-// Android 'L' removes __system_property_get() from the NDK, however
-// it is still a hidden symbol in libc so we use dlsym() to access it.
-// See Chromium's base/sys_info_android.cc for a similar example.
-
-using property_get_func = int (*)(const char*, char*);
-
-property_get_func LoadSystemPropertyGet() {
-  int flag = RTLD_LAZY | RTLD_GLOBAL;
-#if defined(RTLD_NOLOAD)
-  flag |= RTLD_NOLOAD;  // libc.so should already be resident
-#endif
-  if (void* handle = dlopen("libc.so", flag)) {
-    void* sym = dlsym(handle, "__system_property_get");
-    dlclose(handle);
-    return reinterpret_cast<property_get_func>(sym);
-  }
-  return nullptr;
-}
-
-int __system_property_get(const char* name, char* value) {
-  static property_get_func system_property_get = LoadSystemPropertyGet();
-  return system_property_get ? system_property_get(name, value) : -1;
-}
-#endif
-
 #if defined(USE_WIN32_LOCAL_TIME_ZONE)
 // Calls the WinRT Calendar.GetTimeZone method to obtain the IANA ID of the
 // local time zone. Returns an empty vector in case of an error.
diff --git a/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/tzfile.h b/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/tzfile.h
index 114026d066c7..2be3bb8d98a8 100644
--- a/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/tzfile.h
+++ b/contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/tzfile.h
@@ -77,11 +77,11 @@ struct tzhead {
 ** time uses 8 rather than 4 chars,
 ** then a POSIX-TZ-environment-variable-style string for use in handling
 ** instants after the last transition time stored in the file
-** (with nothing between the newlines if there is no POSIX representation for
-** such instants).
+** (with nothing between the newlines if there is no POSIX.1-2017
+** representation for such instants).
 **
 ** If tz_version is '3' or greater, the above is extended as follows.
-** First, the POSIX TZ string's hour offset may range from -167
+** First, the TZ string's hour offset may range from -167
 ** through 167 as compared to the POSIX-required 0 through 24.
 ** Second, its DST start time may be January 1 at 00:00 and its stop
 ** time December 31 at 24:00 plus the difference between DST and
diff --git a/contrib/restricted/abseil-cpp/absl/time/time.h b/contrib/restricted/abseil-cpp/absl/time/time.h
index 37580805e2cf..15edbb4a6676 100644
--- a/contrib/restricted/abseil-cpp/absl/time/time.h
+++ b/contrib/restricted/abseil-cpp/absl/time/time.h
@@ -75,15 +75,22 @@
 struct timeval;
 #endif
 #include <chrono>  // NOLINT(build/c++11)
+
+#ifdef __cpp_lib_three_way_comparison
+#include <compare>
+#endif  // __cpp_lib_three_way_comparison
+
 #include <cmath>
 #include <cstdint>
 #include <ctime>
 #include <limits>
 #include <ostream>
+#include <ratio>  // NOLINT(build/c++11)
 #include <string>
 #include <type_traits>
 #include <utility>
 
+#include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/macros.h"
 #include "absl/strings/string_view.h"
@@ -98,7 +105,6 @@ class Time;      // Defined below
 class TimeZone;  // Defined below
 
 namespace time_internal {
-int64_t IDivDuration(bool satq, Duration num, Duration den, Duration* rem);
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixDuration(Duration d);
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Duration ToUnixDuration(Time t);
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t GetRepHi(Duration d);
@@ -306,6 +312,14 @@ class Duration {
 };
 
 // Relational Operators
+
+#ifdef __cpp_lib_three_way_comparison
+
+ABSL_ATTRIBUTE_CONST_FUNCTION constexpr std::strong_ordering operator<=>(
+    Duration lhs, Duration rhs);
+
+#endif  // __cpp_lib_three_way_comparison
+
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator<(Duration lhs,
                                                        Duration rhs);
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator>(Duration lhs,
@@ -338,30 +352,6 @@ ABSL_ATTRIBUTE_CONST_FUNCTION inline Duration operator-(Duration lhs,
   return lhs -= rhs;
 }
 
-// Multiplicative Operators
-// Integer operands must be representable as int64_t.
-template <typename T>
-ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator*(Duration lhs, T rhs) {
-  return lhs *= rhs;
-}
-template <typename T>
-ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator*(T lhs, Duration rhs) {
-  return rhs *= lhs;
-}
-template <typename T>
-ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator/(Duration lhs, T rhs) {
-  return lhs /= rhs;
-}
-ABSL_ATTRIBUTE_CONST_FUNCTION inline int64_t operator/(Duration lhs,
-                                                       Duration rhs) {
-  return time_internal::IDivDuration(true, lhs, rhs,
-                                     &lhs);  // trunc towards zero
-}
-ABSL_ATTRIBUTE_CONST_FUNCTION inline Duration operator%(Duration lhs,
-                                                        Duration rhs) {
-  return lhs %= rhs;
-}
-
 // IDivDuration()
 //
 // Divides a numerator `Duration` by a denominator `Duration`, returning the
@@ -390,10 +380,7 @@ ABSL_ATTRIBUTE_CONST_FUNCTION inline Duration operator%(Duration lhs,
 //   // Here, q would overflow int64_t, so rem accounts for the difference.
 //   int64_t q = absl::IDivDuration(a, b, &rem);
 //   // q == std::numeric_limits<int64_t>::max(), rem == a - b * q
-inline int64_t IDivDuration(Duration num, Duration den, Duration* rem) {
-  return time_internal::IDivDuration(true, num, den,
-                                     rem);  // trunc towards zero
-}
+int64_t IDivDuration(Duration num, Duration den, Duration* rem);
 
 // FDivDuration()
 //
@@ -409,6 +396,30 @@ inline int64_t IDivDuration(Duration num, Duration den, Duration* rem) {
 //   // d == 1.5
 ABSL_ATTRIBUTE_CONST_FUNCTION double FDivDuration(Duration num, Duration den);
 
+// Multiplicative Operators
+// Integer operands must be representable as int64_t.
+template <typename T>
+ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator*(Duration lhs, T rhs) {
+  return lhs *= rhs;
+}
+template <typename T>
+ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator*(T lhs, Duration rhs) {
+  return rhs *= lhs;
+}
+template <typename T>
+ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator/(Duration lhs, T rhs) {
+  return lhs /= rhs;
+}
+ABSL_ATTRIBUTE_CONST_FUNCTION inline int64_t operator/(Duration lhs,
+                                                       Duration rhs) {
+  return IDivDuration(lhs, rhs,
+                      &lhs);  // trunc towards zero
+}
+ABSL_ATTRIBUTE_CONST_FUNCTION inline Duration operator%(Duration lhs,
+                                                        Duration rhs) {
+  return lhs %= rhs;
+}
+
 // ZeroDuration()
 //
 // Returns a zero-length duration. This function behaves just like the default
@@ -841,6 +852,11 @@ class Time {
  private:
   friend constexpr Time time_internal::FromUnixDuration(Duration d);
   friend constexpr Duration time_internal::ToUnixDuration(Time t);
+
+#ifdef __cpp_lib_three_way_comparison
+  friend constexpr std::strong_ordering operator<=>(Time lhs, Time rhs);
+#endif  // __cpp_lib_three_way_comparison
+
   friend constexpr bool operator<(Time lhs, Time rhs);
   friend constexpr bool operator==(Time lhs, Time rhs);
   friend Duration operator-(Time lhs, Time rhs);
@@ -852,6 +868,15 @@ class Time {
 };
 
 // Relational Operators
+#ifdef __cpp_lib_three_way_comparison
+
+ABSL_ATTRIBUTE_CONST_FUNCTION constexpr std::strong_ordering operator<=>(
+    Time lhs, Time rhs) {
+  return lhs.rep_ <=> rhs.rep_;
+}
+
+#endif  // __cpp_lib_three_way_comparison
+
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator<(Time lhs, Time rhs) {
   return lhs.rep_ < rhs.rep_;
 }
@@ -1727,6 +1752,25 @@ ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator<(Duration lhs,
              : time_internal::GetRepLo(lhs) < time_internal::GetRepLo(rhs);
 }
 
+
+#ifdef __cpp_lib_three_way_comparison
+
+ABSL_ATTRIBUTE_CONST_FUNCTION constexpr std::strong_ordering operator<=>(
+    Duration lhs, Duration rhs) {
+  const int64_t lhs_hi = time_internal::GetRepHi(lhs);
+  const int64_t rhs_hi = time_internal::GetRepHi(rhs);
+  if (auto c = lhs_hi <=> rhs_hi; c != std::strong_ordering::equal) {
+    return c;
+  }
+  const uint32_t lhs_lo = time_internal::GetRepLo(lhs);
+  const uint32_t rhs_lo = time_internal::GetRepLo(rhs);
+  return (lhs_hi == (std::numeric_limits<int64_t>::min)())
+             ? (lhs_lo + 1) <=> (rhs_lo + 1)
+             : lhs_lo <=> rhs_lo;
+}
+
+#endif  // __cpp_lib_three_way_comparison
+
 ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator==(Duration lhs,
                                                         Duration rhs) {
   return time_internal::GetRepHi(lhs) == time_internal::GetRepHi(rhs) &&
diff --git a/contrib/restricted/abseil-cpp/absl/types/compare.h b/contrib/restricted/abseil-cpp/absl/types/compare.h
new file mode 100644
index 000000000000..72b7549b12a2
--- /dev/null
+++ b/contrib/restricted/abseil-cpp/absl/types/compare.h
@@ -0,0 +1,505 @@
+// Copyright 2018 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// compare.h
+// -----------------------------------------------------------------------------
+//
+// This header file defines the `absl::partial_ordering`, `absl::weak_ordering`,
+// and `absl::strong_ordering` types for storing the results of three way
+// comparisons.
+//
+// Example:
+//   absl::weak_ordering compare(const std::string& a, const std::string& b);
+//
+// These are C++11 compatible versions of the C++20 corresponding types
+// (`std::partial_ordering`, etc.) and are designed to be drop-in replacements
+// for code compliant with C++20.
+
+#ifndef ABSL_TYPES_COMPARE_H_
+#define ABSL_TYPES_COMPARE_H_
+
+#include "absl/base/config.h"
+
+#ifdef ABSL_USES_STD_ORDERING
+
+#include <compare>  // IWYU pragma: export
+#include <type_traits>
+
+#include "absl/meta/type_traits.h"
+
+#else
+
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <type_traits>
+
+#include "absl/base/attributes.h"
+#include "absl/base/macros.h"
+#include "absl/meta/type_traits.h"
+
+#endif
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+#ifdef ABSL_USES_STD_ORDERING
+
+using std::partial_ordering;
+using std::strong_ordering;
+using std::weak_ordering;
+
+#else
+
+namespace compare_internal {
+
+using value_type = int8_t;
+
+class OnlyLiteralZero {
+ public:
+#if ABSL_HAVE_ATTRIBUTE(enable_if) && !defined(__CUDACC__)
+  // On clang, we can avoid triggering modernize-use-nullptr by only enabling
+  // this overload when the value is a compile time integer constant equal to 0.
+  //
+  // In c++20, this could be a static_assert in a consteval function.
+  constexpr OnlyLiteralZero(int n)  // NOLINT
+      __attribute__((enable_if(n == 0, "Only literal `0` is allowed."))) {}
+#else  // ABSL_HAVE_ATTRIBUTE(enable_if)
+  // Accept only literal zero since it can be implicitly converted to a pointer
+  // to member type. nullptr constants will be caught by the other constructor
+  // which accepts a nullptr_t.
+  //
+  // This constructor is not used for clang since it triggers
+  // modernize-use-nullptr.
+  constexpr OnlyLiteralZero(int OnlyLiteralZero::*) noexcept {}  // NOLINT
+#endif
+
+  // Fails compilation when `nullptr` or integral type arguments other than
+  // `int` are passed. This constructor doesn't accept `int` because literal `0`
+  // has type `int`. Literal `0` arguments will be implicitly converted to
+  // `std::nullptr_t` and accepted by the above constructor, while other `int`
+  // arguments will fail to be converted and cause compilation failure.
+  template <typename T, typename = typename std::enable_if<
+                            std::is_same<T, std::nullptr_t>::value ||
+                            (std::is_integral<T>::value &&
+                             !std::is_same<T, int>::value)>::type>
+  OnlyLiteralZero(T) {  // NOLINT
+    static_assert(sizeof(T) < 0, "Only literal `0` is allowed.");
+  }
+};
+
+enum class eq : value_type {
+  equal = 0,
+  equivalent = equal,
+  nonequal = 1,
+  nonequivalent = nonequal,
+};
+
+enum class ord : value_type { less = -1, greater = 1 };
+
+enum class ncmp : value_type { unordered = -127 };
+
+// Define macros to allow for creation or emulation of C++17 inline variables
+// based on whether the feature is supported. Note: we can't use
+// ABSL_INTERNAL_INLINE_CONSTEXPR here because the variables here are of
+// incomplete types so they need to be defined after the types are complete.
+#ifdef __cpp_inline_variables
+
+// A no-op expansion that can be followed by a semicolon at class level.
+#define ABSL_COMPARE_INLINE_BASECLASS_DECL(name) static_assert(true, "")
+
+#define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) \
+  static const type name
+
+#define ABSL_COMPARE_INLINE_INIT(type, name, init) \
+  inline constexpr type type::name(init)
+
+#else  // __cpp_inline_variables
+
+#define ABSL_COMPARE_INLINE_BASECLASS_DECL(name) \
+  ABSL_CONST_INIT static const T name
+
+// A no-op expansion that can be followed by a semicolon at class level.
+#define ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) static_assert(true, "")
+
+#define ABSL_COMPARE_INLINE_INIT(type, name, init) \
+  template <typename T>                            \
+  const T compare_internal::type##_base<T>::name(init)
+
+#endif  // __cpp_inline_variables
+
+// These template base classes allow for defining the values of the constants
+// in the header file (for performance) without using inline variables (which
+// aren't available in C++11).
+template <typename T>
+struct partial_ordering_base {
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(less);
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(equivalent);
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(greater);
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(unordered);
+};
+
+template <typename T>
+struct weak_ordering_base {
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(less);
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(equivalent);
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(greater);
+};
+
+template <typename T>
+struct strong_ordering_base {
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(less);
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(equal);
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(equivalent);
+  ABSL_COMPARE_INLINE_BASECLASS_DECL(greater);
+};
+
+}  // namespace compare_internal
+
+class partial_ordering
+    : public compare_internal::partial_ordering_base<partial_ordering> {
+  explicit constexpr partial_ordering(compare_internal::eq v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  explicit constexpr partial_ordering(compare_internal::ord v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  explicit constexpr partial_ordering(compare_internal::ncmp v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  friend struct compare_internal::partial_ordering_base<partial_ordering>;
+
+  constexpr bool is_ordered() const noexcept {
+    return value_ !=
+           compare_internal::value_type(compare_internal::ncmp::unordered);
+  }
+
+ public:
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, less);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, equivalent);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, greater);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, unordered);
+
+  // Comparisons
+  friend constexpr bool operator==(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ == 0;
+  }
+  friend constexpr bool operator!=(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return !v.is_ordered() || v.value_ != 0;
+  }
+  friend constexpr bool operator<(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ < 0;
+  }
+  friend constexpr bool operator<=(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ <= 0;
+  }
+  friend constexpr bool operator>(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ > 0;
+  }
+  friend constexpr bool operator>=(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ >= 0;
+  }
+  friend constexpr bool operator==(compare_internal::OnlyLiteralZero,
+                                   partial_ordering v) noexcept {
+    return v.is_ordered() && 0 == v.value_;
+  }
+  friend constexpr bool operator!=(compare_internal::OnlyLiteralZero,
+                                   partial_ordering v) noexcept {
+    return !v.is_ordered() || 0 != v.value_;
+  }
+  friend constexpr bool operator<(compare_internal::OnlyLiteralZero,
+                                  partial_ordering v) noexcept {
+    return v.is_ordered() && 0 < v.value_;
+  }
+  friend constexpr bool operator<=(compare_internal::OnlyLiteralZero,
+                                   partial_ordering v) noexcept {
+    return v.is_ordered() && 0 <= v.value_;
+  }
+  friend constexpr bool operator>(compare_internal::OnlyLiteralZero,
+                                  partial_ordering v) noexcept {
+    return v.is_ordered() && 0 > v.value_;
+  }
+  friend constexpr bool operator>=(compare_internal::OnlyLiteralZero,
+                                   partial_ordering v) noexcept {
+    return v.is_ordered() && 0 >= v.value_;
+  }
+  friend constexpr bool operator==(partial_ordering v1,
+                                   partial_ordering v2) noexcept {
+    return v1.value_ == v2.value_;
+  }
+  friend constexpr bool operator!=(partial_ordering v1,
+                                   partial_ordering v2) noexcept {
+    return v1.value_ != v2.value_;
+  }
+
+ private:
+  compare_internal::value_type value_;
+};
+ABSL_COMPARE_INLINE_INIT(partial_ordering, less, compare_internal::ord::less);
+ABSL_COMPARE_INLINE_INIT(partial_ordering, equivalent,
+                         compare_internal::eq::equivalent);
+ABSL_COMPARE_INLINE_INIT(partial_ordering, greater,
+                         compare_internal::ord::greater);
+ABSL_COMPARE_INLINE_INIT(partial_ordering, unordered,
+                         compare_internal::ncmp::unordered);
+
+class weak_ordering
+    : public compare_internal::weak_ordering_base<weak_ordering> {
+  explicit constexpr weak_ordering(compare_internal::eq v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  explicit constexpr weak_ordering(compare_internal::ord v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  friend struct compare_internal::weak_ordering_base<weak_ordering>;
+
+ public:
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, less);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, equivalent);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, greater);
+
+  // Conversions
+  constexpr operator partial_ordering() const noexcept {  // NOLINT
+    return value_ == 0 ? partial_ordering::equivalent
+                       : (value_ < 0 ? partial_ordering::less
+                                     : partial_ordering::greater);
+  }
+  // Comparisons
+  friend constexpr bool operator==(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ == 0;
+  }
+  friend constexpr bool operator!=(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ != 0;
+  }
+  friend constexpr bool operator<(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ < 0;
+  }
+  friend constexpr bool operator<=(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ <= 0;
+  }
+  friend constexpr bool operator>(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ > 0;
+  }
+  friend constexpr bool operator>=(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ >= 0;
+  }
+  friend constexpr bool operator==(compare_internal::OnlyLiteralZero,
+                                   weak_ordering v) noexcept {
+    return 0 == v.value_;
+  }
+  friend constexpr bool operator!=(compare_internal::OnlyLiteralZero,
+                                   weak_ordering v) noexcept {
+    return 0 != v.value_;
+  }
+  friend constexpr bool operator<(compare_internal::OnlyLiteralZero,
+                                  weak_ordering v) noexcept {
+    return 0 < v.value_;
+  }
+  friend constexpr bool operator<=(compare_internal::OnlyLiteralZero,
+                                   weak_ordering v) noexcept {
+    return 0 <= v.value_;
+  }
+  friend constexpr bool operator>(compare_internal::OnlyLiteralZero,
+                                  weak_ordering v) noexcept {
+    return 0 > v.value_;
+  }
+  friend constexpr bool operator>=(compare_internal::OnlyLiteralZero,
+                                   weak_ordering v) noexcept {
+    return 0 >= v.value_;
+  }
+  friend constexpr bool operator==(weak_ordering v1,
+                                   weak_ordering v2) noexcept {
+    return v1.value_ == v2.value_;
+  }
+  friend constexpr bool operator!=(weak_ordering v1,
+                                   weak_ordering v2) noexcept {
+    return v1.value_ != v2.value_;
+  }
+
+ private:
+  compare_internal::value_type value_;
+};
+ABSL_COMPARE_INLINE_INIT(weak_ordering, less, compare_internal::ord::less);
+ABSL_COMPARE_INLINE_INIT(weak_ordering, equivalent,
+                         compare_internal::eq::equivalent);
+ABSL_COMPARE_INLINE_INIT(weak_ordering, greater,
+                         compare_internal::ord::greater);
+
+class strong_ordering
+    : public compare_internal::strong_ordering_base<strong_ordering> {
+  explicit constexpr strong_ordering(compare_internal::eq v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  explicit constexpr strong_ordering(compare_internal::ord v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  friend struct compare_internal::strong_ordering_base<strong_ordering>;
+
+ public:
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, less);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equal);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equivalent);
+  ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, greater);
+
+  // Conversions
+  constexpr operator partial_ordering() const noexcept {  // NOLINT
+    return value_ == 0 ? partial_ordering::equivalent
+                       : (value_ < 0 ? partial_ordering::less
+                                     : partial_ordering::greater);
+  }
+  constexpr operator weak_ordering() const noexcept {  // NOLINT
+    return value_ == 0
+               ? weak_ordering::equivalent
+               : (value_ < 0 ? weak_ordering::less : weak_ordering::greater);
+  }
+  // Comparisons
+  friend constexpr bool operator==(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ == 0;
+  }
+  friend constexpr bool operator!=(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ != 0;
+  }
+  friend constexpr bool operator<(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ < 0;
+  }
+  friend constexpr bool operator<=(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ <= 0;
+  }
+  friend constexpr bool operator>(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ > 0;
+  }
+  friend constexpr bool operator>=(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ >= 0;
+  }
+  friend constexpr bool operator==(compare_internal::OnlyLiteralZero,
+                                   strong_ordering v) noexcept {
+    return 0 == v.value_;
+  }
+  friend constexpr bool operator!=(compare_internal::OnlyLiteralZero,
+                                   strong_ordering v) noexcept {
+    return 0 != v.value_;
+  }
+  friend constexpr bool operator<(compare_internal::OnlyLiteralZero,
+                                  strong_ordering v) noexcept {
+    return 0 < v.value_;
+  }
+  friend constexpr bool operator<=(compare_internal::OnlyLiteralZero,
+                                   strong_ordering v) noexcept {
+    return 0 <= v.value_;
+  }
+  friend constexpr bool operator>(compare_internal::OnlyLiteralZero,
+                                  strong_ordering v) noexcept {
+    return 0 > v.value_;
+  }
+  friend constexpr bool operator>=(compare_internal::OnlyLiteralZero,
+                                   strong_ordering v) noexcept {
+    return 0 >= v.value_;
+  }
+  friend constexpr bool operator==(strong_ordering v1,
+                                   strong_ordering v2) noexcept {
+    return v1.value_ == v2.value_;
+  }
+  friend constexpr bool operator!=(strong_ordering v1,
+                                   strong_ordering v2) noexcept {
+    return v1.value_ != v2.value_;
+  }
+
+ private:
+  compare_internal::value_type value_;
+};
+ABSL_COMPARE_INLINE_INIT(strong_ordering, less, compare_internal::ord::less);
+ABSL_COMPARE_INLINE_INIT(strong_ordering, equal, compare_internal::eq::equal);
+ABSL_COMPARE_INLINE_INIT(strong_ordering, equivalent,
+                         compare_internal::eq::equivalent);
+ABSL_COMPARE_INLINE_INIT(strong_ordering, greater,
+                         compare_internal::ord::greater);
+
+#undef ABSL_COMPARE_INLINE_BASECLASS_DECL
+#undef ABSL_COMPARE_INLINE_SUBCLASS_DECL
+#undef ABSL_COMPARE_INLINE_INIT
+
+#endif  // ABSL_USES_STD_ORDERING
+
+namespace compare_internal {
+// We also provide these comparator adapter functions for internal absl use.
+
+// Helper functions to do a boolean comparison of two keys given a boolean
+// or three-way comparator.
+// SFINAE prevents implicit conversions to bool (such as from int).
+template <typename BoolT,
+          absl::enable_if_t<std::is_same<bool, BoolT>::value, int> = 0>
+constexpr bool compare_result_as_less_than(const BoolT r) { return r; }
+constexpr bool compare_result_as_less_than(const absl::weak_ordering r) {
+  return r < 0;
+}
+
+template <typename Compare, typename K, typename LK>
+constexpr bool do_less_than_comparison(const Compare &compare, const K &x,
+                                       const LK &y) {
+  return compare_result_as_less_than(compare(x, y));
+}
+
+// Helper functions to do a three-way comparison of two keys given a boolean or
+// three-way comparator.
+// SFINAE prevents implicit conversions to int (such as from bool).
+template <typename Int,
+          absl::enable_if_t<std::is_same<int, Int>::value, int> = 0>
+constexpr absl::weak_ordering compare_result_as_ordering(const Int c) {
+  return c < 0 ? absl::weak_ordering::less
+               : c == 0 ? absl::weak_ordering::equivalent
+                        : absl::weak_ordering::greater;
+}
+constexpr absl::weak_ordering compare_result_as_ordering(
+    const absl::weak_ordering c) {
+  return c;
+}
+
+template <
+    typename Compare, typename K, typename LK,
+    absl::enable_if_t<!std::is_same<bool, absl::result_of_t<Compare(
+                                              const K &, const LK &)>>::value,
+                      int> = 0>
+constexpr absl::weak_ordering do_three_way_comparison(const Compare &compare,
+                                                      const K &x, const LK &y) {
+  return compare_result_as_ordering(compare(x, y));
+}
+template <
+    typename Compare, typename K, typename LK,
+    absl::enable_if_t<std::is_same<bool, absl::result_of_t<Compare(
+                                             const K &, const LK &)>>::value,
+                      int> = 0>
+constexpr absl::weak_ordering do_three_way_comparison(const Compare &compare,
+                                                      const K &x, const LK &y) {
+  return compare(x, y) ? absl::weak_ordering::less
+                       : compare(y, x) ? absl::weak_ordering::greater
+                                       : absl::weak_ordering::equivalent;
+}
+
+}  // namespace compare_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_TYPES_COMPARE_H_
diff --git a/contrib/restricted/abseil-cpp/absl/types/internal/optional.h b/contrib/restricted/abseil-cpp/absl/types/internal/optional.h
index a96d260a432a..5731a5bcc903 100644
--- a/contrib/restricted/abseil-cpp/absl/types/internal/optional.h
+++ b/contrib/restricted/abseil-cpp/absl/types/internal/optional.h
@@ -81,7 +81,7 @@ class optional_data_dtor_base {
 
   template <typename... Args>
   constexpr explicit optional_data_dtor_base(in_place_t, Args&&... args)
-      : engaged_(true), data_(absl::forward<Args>(args)...) {}
+      : engaged_(true), data_(std::forward<Args>(args)...) {}
 
   ~optional_data_dtor_base() { destruct(); }
 };
@@ -110,7 +110,7 @@ class optional_data_dtor_base<T, true> {
 
   template <typename... Args>
   constexpr explicit optional_data_dtor_base(in_place_t, Args&&... args)
-      : engaged_(true), data_(absl::forward<Args>(args)...) {}
+      : engaged_(true), data_(std::forward<Args>(args)...) {}
 };
 
 template <typename T>
diff --git a/contrib/restricted/abseil-cpp/absl/types/internal/variant.h b/contrib/restricted/abseil-cpp/absl/types/internal/variant.h
index 263d7b094714..4cb15f2921df 100644
--- a/contrib/restricted/abseil-cpp/absl/types/internal/variant.h
+++ b/contrib/restricted/abseil-cpp/absl/types/internal/variant.h
@@ -26,6 +26,7 @@
 #include <stdexcept>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 
 #include "absl/base/config.h"
 #include "absl/base/internal/identity.h"
@@ -214,7 +215,7 @@ constexpr ReturnType call_with_indices(FunctionObject&& function) {
       std::is_same<ReturnType, decltype(std::declval<FunctionObject>()(
                                    SizeT<Indices>()...))>::value,
       "Not all visitation overloads have the same return type.");
-  return absl::forward<FunctionObject>(function)(SizeT<Indices>()...);
+  return std::forward<FunctionObject>(function)(SizeT<Indices>()...);
 }
 
 template <class ReturnType, class FunctionObject, std::size_t... BoundIndices>
@@ -272,27 +273,14 @@ struct UnreachableSwitchCase {
   template <class Op>
   [[noreturn]] static VisitIndicesResultT<Op, std::size_t> Run(
       Op&& /*ignored*/) {
-#if ABSL_HAVE_BUILTIN(__builtin_unreachable) || \
-    (defined(__GNUC__) && !defined(__clang__))
-    __builtin_unreachable();
-#elif defined(_MSC_VER)
-    __assume(false);
-#else
-    // Try to use assert of false being identified as an unreachable intrinsic.
-    // NOTE: We use assert directly to increase chances of exploiting an assume
-    //       intrinsic.
-    assert(false);  // NOLINT
-
-    // Hack to silence potential no return warning -- cause an infinite loop.
-    return Run(absl::forward<Op>(op));
-#endif  // Checks for __builtin_unreachable
+    ABSL_UNREACHABLE();
   }
 };
 
 template <class Op, std::size_t I>
 struct ReachableSwitchCase {
   static VisitIndicesResultT<Op, std::size_t> Run(Op&& op) {
-    return absl::base_internal::invoke(absl::forward<Op>(op), SizeT<I>());
+    return absl::base_internal::invoke(std::forward<Op>(op), SizeT<I>());
   }
 };
 
@@ -357,74 +345,74 @@ struct VisitIndicesSwitch {
   static VisitIndicesResultT<Op, std::size_t> Run(Op&& op, std::size_t i) {
     switch (i) {
       case 0:
-        return PickCase<Op, 0, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 0, EndIndex>::Run(std::forward<Op>(op));
       case 1:
-        return PickCase<Op, 1, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 1, EndIndex>::Run(std::forward<Op>(op));
       case 2:
-        return PickCase<Op, 2, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 2, EndIndex>::Run(std::forward<Op>(op));
       case 3:
-        return PickCase<Op, 3, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 3, EndIndex>::Run(std::forward<Op>(op));
       case 4:
-        return PickCase<Op, 4, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 4, EndIndex>::Run(std::forward<Op>(op));
       case 5:
-        return PickCase<Op, 5, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 5, EndIndex>::Run(std::forward<Op>(op));
       case 6:
-        return PickCase<Op, 6, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 6, EndIndex>::Run(std::forward<Op>(op));
       case 7:
-        return PickCase<Op, 7, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 7, EndIndex>::Run(std::forward<Op>(op));
       case 8:
-        return PickCase<Op, 8, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 8, EndIndex>::Run(std::forward<Op>(op));
       case 9:
-        return PickCase<Op, 9, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 9, EndIndex>::Run(std::forward<Op>(op));
       case 10:
-        return PickCase<Op, 10, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 10, EndIndex>::Run(std::forward<Op>(op));
       case 11:
-        return PickCase<Op, 11, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 11, EndIndex>::Run(std::forward<Op>(op));
       case 12:
-        return PickCase<Op, 12, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 12, EndIndex>::Run(std::forward<Op>(op));
       case 13:
-        return PickCase<Op, 13, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 13, EndIndex>::Run(std::forward<Op>(op));
       case 14:
-        return PickCase<Op, 14, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 14, EndIndex>::Run(std::forward<Op>(op));
       case 15:
-        return PickCase<Op, 15, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 15, EndIndex>::Run(std::forward<Op>(op));
       case 16:
-        return PickCase<Op, 16, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 16, EndIndex>::Run(std::forward<Op>(op));
       case 17:
-        return PickCase<Op, 17, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 17, EndIndex>::Run(std::forward<Op>(op));
       case 18:
-        return PickCase<Op, 18, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 18, EndIndex>::Run(std::forward<Op>(op));
       case 19:
-        return PickCase<Op, 19, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 19, EndIndex>::Run(std::forward<Op>(op));
       case 20:
-        return PickCase<Op, 20, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 20, EndIndex>::Run(std::forward<Op>(op));
       case 21:
-        return PickCase<Op, 21, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 21, EndIndex>::Run(std::forward<Op>(op));
       case 22:
-        return PickCase<Op, 22, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 22, EndIndex>::Run(std::forward<Op>(op));
       case 23:
-        return PickCase<Op, 23, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 23, EndIndex>::Run(std::forward<Op>(op));
       case 24:
-        return PickCase<Op, 24, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 24, EndIndex>::Run(std::forward<Op>(op));
       case 25:
-        return PickCase<Op, 25, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 25, EndIndex>::Run(std::forward<Op>(op));
       case 26:
-        return PickCase<Op, 26, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 26, EndIndex>::Run(std::forward<Op>(op));
       case 27:
-        return PickCase<Op, 27, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 27, EndIndex>::Run(std::forward<Op>(op));
       case 28:
-        return PickCase<Op, 28, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 28, EndIndex>::Run(std::forward<Op>(op));
       case 29:
-        return PickCase<Op, 29, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 29, EndIndex>::Run(std::forward<Op>(op));
       case 30:
-        return PickCase<Op, 30, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 30, EndIndex>::Run(std::forward<Op>(op));
       case 31:
-        return PickCase<Op, 31, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 31, EndIndex>::Run(std::forward<Op>(op));
       case 32:
-        return PickCase<Op, 32, EndIndex>::Run(absl::forward<Op>(op));
+        return PickCase<Op, 32, EndIndex>::Run(std::forward<Op>(op));
       default:
         ABSL_ASSERT(i == variant_npos);
-        return absl::base_internal::invoke(absl::forward<Op>(op), NPos());
+        return absl::base_internal::invoke(std::forward<Op>(op), NPos());
     }
   }
 };
@@ -437,7 +425,7 @@ struct VisitIndicesFallback {
         MakeVisitationMatrix<VisitIndicesResultT<Op, SizeT...>, Op,
                              index_sequence<(EndIndices + 1)...>,
                              index_sequence<>>::Run(),
-        (indices + 1)...)(absl::forward<Op>(op));
+        (indices + 1)...)(std::forward<Op>(op));
   }
 };
 
@@ -489,7 +477,7 @@ struct VisitIndicesVariadicImpl<absl::index_sequence<N...>, EndIndices...> {
     VisitIndicesResultT<Op, decltype(EndIndices)...> operator()(
         SizeT<I> /*index*/) && {
       return base_internal::invoke(
-          absl::forward<Op>(op),
+          std::forward<Op>(op),
           SizeT<UnflattenIndex<I, N, (EndIndices + 1)...>::value -
                 std::size_t{1}>()...);
     }
@@ -501,7 +489,7 @@ struct VisitIndicesVariadicImpl<absl::index_sequence<N...>, EndIndices...> {
   static VisitIndicesResultT<Op, decltype(EndIndices)...> Run(Op&& op,
                                                               SizeType... i) {
     return VisitIndicesSwitch<NumCasesOfSwitch<EndIndices...>::value>::Run(
-        FlattenedOp<Op>{absl::forward<Op>(op)},
+        FlattenedOp<Op>{std::forward<Op>(op)},
         FlattenIndices<(EndIndices + std::size_t{1})...>::Run(
             (i + std::size_t{1})...));
   }
@@ -612,7 +600,7 @@ struct VariantCoreAccess {
       TypedThrowBadVariantAccess<VariantAccessResult<I, Variant>>();
     }
 
-    return Access<I>(absl::forward<Variant>(self));
+    return Access<I>(std::forward<Variant>(self));
   }
 
   // The implementation of the move-assignment operation for a variant.
@@ -684,7 +672,7 @@ struct VariantCoreAccess {
 
     void operator()(SizeT<NewIndex::value> /*old_i*/
     ) const {
-      Access<NewIndex::value>(*left) = absl::forward<QualifiedNew>(other);
+      Access<NewIndex::value>(*left) = std::forward<QualifiedNew>(other);
     }
 
     template <std::size_t OldIndex>
@@ -695,13 +683,13 @@ struct VariantCoreAccess {
       if (std::is_nothrow_constructible<New, QualifiedNew>::value ||
           !std::is_nothrow_move_constructible<New>::value) {
         left->template emplace<NewIndex::value>(
-            absl::forward<QualifiedNew>(other));
+            std::forward<QualifiedNew>(other));
       } else {
         // the standard says "equivalent to
         // operator=(variant(std::forward<T>(t)))", but we use `emplace` here
         // because the variant's move assignment operator could be deleted.
         left->template emplace<NewIndex::value>(
-            New(absl::forward<QualifiedNew>(other)));
+            New(std::forward<QualifiedNew>(other)));
       }
     }
 
@@ -712,7 +700,7 @@ struct VariantCoreAccess {
   template <class Left, class QualifiedNew>
   static ConversionAssignVisitor<Left, QualifiedNew>
   MakeConversionAssignVisitor(Left* left, QualifiedNew&& qual) {
-    return {left, absl::forward<QualifiedNew>(qual)};
+    return {left, std::forward<QualifiedNew>(qual)};
   }
 
   // Backend for operations for `emplace()` which destructs `*self` then
@@ -723,7 +711,7 @@ struct VariantCoreAccess {
     Destroy(*self);
     using New = typename absl::variant_alternative<NewIndex, Self>::type;
     New* const result = ::new (static_cast<void*>(&self->state_))
-        New(absl::forward<Args>(args)...);
+        New(std::forward<Args>(args)...);
     self->index_ = NewIndex;
     return *result;
   }
@@ -919,9 +907,9 @@ struct PerformVisitation {
                                           Is, QualifiedVariants>...)>>::value,
         "All visitation overloads must have the same return type.");
     return absl::base_internal::invoke(
-        absl::forward<Op>(op),
+        std::forward<Op>(op),
         VariantCoreAccess::Access<Is>(
-            absl::forward<QualifiedVariants>(std::get<TupIs>(variant_tup)))...);
+            std::forward<QualifiedVariants>(std::get<TupIs>(variant_tup)))...);
   }
 
   template <std::size_t... TupIs, std::size_t... Is>
@@ -969,11 +957,11 @@ union Union<Head, Tail...> {
 
   template <class... P>
   explicit constexpr Union(EmplaceTag<0>, P&&... args)
-      : head(absl::forward<P>(args)...) {}
+      : head(std::forward<P>(args)...) {}
 
   template <std::size_t I, class... P>
   explicit constexpr Union(EmplaceTag<I>, P&&... args)
-      : tail(EmplaceTag<I - 1>{}, absl::forward<P>(args)...) {}
+      : tail(EmplaceTag<I - 1>{}, std::forward<P>(args)...) {}
 
   Head head;
   TailUnion tail;
@@ -1001,11 +989,11 @@ union DestructibleUnionImpl<Head, Tail...> {
 
   template <class... P>
   explicit constexpr DestructibleUnionImpl(EmplaceTag<0>, P&&... args)
-      : head(absl::forward<P>(args)...) {}
+      : head(std::forward<P>(args)...) {}
 
   template <std::size_t I, class... P>
   explicit constexpr DestructibleUnionImpl(EmplaceTag<I>, P&&... args)
-      : tail(EmplaceTag<I - 1>{}, absl::forward<P>(args)...) {}
+      : tail(EmplaceTag<I - 1>{}, std::forward<P>(args)...) {}
 
   ~DestructibleUnionImpl() {}
 
@@ -1036,7 +1024,7 @@ class VariantStateBase {
 
   template <std::size_t I, class... P>
   explicit constexpr VariantStateBase(EmplaceTag<I> tag, P&&... args)
-      : state_(tag, absl::forward<P>(args)...), index_(I) {}
+      : state_(tag, std::forward<P>(args)...), index_(I) {}
 
   explicit constexpr VariantStateBase(NoopConstructorTag)
       : state_(NoopConstructorTag()), index_(variant_npos) {}
@@ -1321,7 +1309,7 @@ class VariantMoveBaseNontrivial : protected VariantStateBaseDestructor<T...> {
       using Alternative =
           typename absl::variant_alternative<I, variant<T...>>::type;
       ::new (static_cast<void*>(&self->state_)) Alternative(
-          variant_internal::AccessUnion(absl::move(other->state_), i));
+          variant_internal::AccessUnion(std::move(other->state_), i));
     }
 
     void operator()(SizeT<absl::variant_npos> /*i*/) const {}
diff --git a/contrib/restricted/abseil-cpp/absl/types/optional.h b/contrib/restricted/abseil-cpp/absl/types/optional.h
index 395fe62f298b..cf7249cbe390 100644
--- a/contrib/restricted/abseil-cpp/absl/types/optional.h
+++ b/contrib/restricted/abseil-cpp/absl/types/optional.h
@@ -151,7 +151,7 @@ class optional : private optional_internal::optional_data<T>,
                 std::is_same<InPlaceT, in_place_t>,
                 std::is_constructible<T, Args&&...> >::value>* = nullptr>
   constexpr explicit optional(InPlaceT, Args&&... args)
-      : data_base(in_place_t(), absl::forward<Args>(args)...) {}
+      : data_base(in_place_t(), std::forward<Args>(args)...) {}
 
   // Constructs a non-empty `optional` direct-initialized value of type `T` from
   // the arguments of an initializer_list and `std::forward<Args>(args)...`.
@@ -162,8 +162,7 @@ class optional : private optional_internal::optional_data<T>,
                 T, std::initializer_list<U>&, Args&&...>::value>::type>
   constexpr explicit optional(in_place_t, std::initializer_list<U> il,
                               Args&&... args)
-      : data_base(in_place_t(), il, absl::forward<Args>(args)...) {
-  }
+      : data_base(in_place_t(), il, std::forward<Args>(args)...) {}
 
   // Value constructor (implicit)
   template <
@@ -176,21 +175,21 @@ class optional : private optional_internal::optional_data<T>,
                             std::is_convertible<U&&, T>,
                             std::is_constructible<T, U&&> >::value,
           bool>::type = false>
-  constexpr optional(U&& v) : data_base(in_place_t(), absl::forward<U>(v)) {}
+  constexpr optional(U&& v) : data_base(in_place_t(), std::forward<U>(v)) {}
 
   // Value constructor (explicit)
   template <
       typename U = T,
       typename std::enable_if<
           absl::conjunction<absl::negation<std::is_same<
-                                in_place_t, typename std::decay<U>::type>>,
+                                in_place_t, typename std::decay<U>::type> >,
                             absl::negation<std::is_same<
-                                optional<T>, typename std::decay<U>::type>>,
-                            absl::negation<std::is_convertible<U&&, T>>,
-                            std::is_constructible<T, U&&>>::value,
+                                optional<T>, typename std::decay<U>::type> >,
+                            absl::negation<std::is_convertible<U&&, T> >,
+                            std::is_constructible<T, U&&> >::value,
           bool>::type = false>
   explicit constexpr optional(U&& v)
-      : data_base(in_place_t(), absl::forward<U>(v)) {}
+      : data_base(in_place_t(), std::forward<U>(v)) {}
 
   // Converting copy constructor (implicit)
   template <typename U,
@@ -437,7 +436,7 @@ class optional : private optional_internal::optional_data<T>,
     return reference();
   }
   constexpr const T&& operator*() const&& ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return ABSL_HARDENING_ASSERT(this->engaged_), absl::move(reference());
+    return ABSL_HARDENING_ASSERT(this->engaged_), std::move(reference());
   }
   T&& operator*() && ABSL_ATTRIBUTE_LIFETIME_BOUND {
     ABSL_HARDENING_ASSERT(this->engaged_);
@@ -492,7 +491,7 @@ class optional : private optional_internal::optional_data<T>,
   }
   constexpr const T&& value()
       const&& ABSL_ATTRIBUTE_LIFETIME_BOUND {  // NOLINT(build/c++11)
-    return absl::move(
+    return std::move(
         static_cast<bool>(*this)
             ? reference()
             : (optional_internal::throw_bad_optional_access(), reference()));
@@ -511,9 +510,8 @@ class optional : private optional_internal::optional_data<T>,
                   "optional<T>::value_or: T must be copy constructible");
     static_assert(std::is_convertible<U&&, value_type>::value,
                   "optional<T>::value_or: U must be convertible to T");
-    return static_cast<bool>(*this)
-               ? **this
-               : static_cast<T>(absl::forward<U>(v));
+    return static_cast<bool>(*this) ? **this
+                                    : static_cast<T>(std::forward<U>(v));
   }
   template <typename U>
   T value_or(U&& v) && {  // NOLINT(build/c++11)
@@ -573,19 +571,18 @@ void swap(optional<T>& a, optional<T>& b) noexcept(noexcept(a.swap(b))) {
 //   static_assert(opt.value() == 1, "");
 template <typename T>
 constexpr optional<typename std::decay<T>::type> make_optional(T&& v) {
-  return optional<typename std::decay<T>::type>(absl::forward<T>(v));
+  return optional<typename std::decay<T>::type>(std::forward<T>(v));
 }
 
 template <typename T, typename... Args>
 constexpr optional<T> make_optional(Args&&... args) {
-  return optional<T>(in_place_t(), absl::forward<Args>(args)...);
+  return optional<T>(in_place_t(), std::forward<Args>(args)...);
 }
 
 template <typename T, typename U, typename... Args>
 constexpr optional<T> make_optional(std::initializer_list<U> il,
                                     Args&&... args) {
-  return optional<T>(in_place_t(), il,
-                     absl::forward<Args>(args)...);
+  return optional<T>(in_place_t(), il, std::forward<Args>(args)...);
 }
 
 // Relational operators [optional.relops]
diff --git a/contrib/restricted/abseil-cpp/absl/types/span.h b/contrib/restricted/abseil-cpp/absl/types/span.h
index 88cd75954084..a0f80272e996 100644
--- a/contrib/restricted/abseil-cpp/absl/types/span.h
+++ b/contrib/restricted/abseil-cpp/absl/types/span.h
@@ -43,7 +43,7 @@
 //    * A read-only `absl::Span<const T>` can be implicitly constructed from an
 //      initializer list.
 //    * `absl::Span` has no `bytes()`, `size_bytes()`, `as_bytes()`, or
-//      `as_mutable_bytes()` methods
+//      `as_writable_bytes()` methods
 //    * `absl::Span` has no static extent template parameter, nor constructors
 //      which exist only because of the static extent parameter.
 //    * `absl::Span` has an explicit mutable-reference constructor
@@ -151,7 +151,7 @@ ABSL_NAMESPACE_BEGIN
 //   int* my_array = new int[10];
 //   MyRoutine(absl::Span<const int>(my_array, 10));
 template <typename T>
-class Span {
+class ABSL_INTERNAL_ATTRIBUTE_VIEW Span {
  private:
   // Used to determine whether a Span can be constructed from a container of
   // type C.
@@ -185,6 +185,7 @@ class Span {
   using const_reverse_iterator = std::reverse_iterator<const_iterator>;
   using size_type = size_t;
   using difference_type = ptrdiff_t;
+  using absl_internal_is_view = std::true_type;
 
   static const size_type npos = ~(size_type(0));
 
diff --git a/contrib/restricted/abseil-cpp/absl/types/variant.h b/contrib/restricted/abseil-cpp/absl/types/variant.h
index ac93464bf8d0..56a7e05ee61d 100644
--- a/contrib/restricted/abseil-cpp/absl/types/variant.h
+++ b/contrib/restricted/abseil-cpp/absl/types/variant.h
@@ -303,11 +303,10 @@ constexpr T& get(variant<Types...>& v) {  // NOLINT
 }
 
 // Overload for getting a variant's rvalue by type.
-// Note: `absl::move()` is required to allow use of constexpr in C++11.
 template <class T, class... Types>
 constexpr T&& get(variant<Types...>&& v) {
   return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(absl::move(v));
+      variant_internal::IndexOf<T, Types...>::value>(std::move(v));
 }
 
 // Overload for getting a variant's const lvalue by type.
@@ -318,11 +317,10 @@ constexpr const T& get(const variant<Types...>& v) {
 }
 
 // Overload for getting a variant's const rvalue by type.
-// Note: `absl::move()` is required to allow use of constexpr in C++11.
 template <class T, class... Types>
 constexpr const T&& get(const variant<Types...>&& v) {
   return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(absl::move(v));
+      variant_internal::IndexOf<T, Types...>::value>(std::move(v));
 }
 
 // Overload for getting a variant's lvalue by index.
@@ -333,11 +331,10 @@ constexpr variant_alternative_t<I, variant<Types...>>& get(
 }
 
 // Overload for getting a variant's rvalue by index.
-// Note: `absl::move()` is required to allow use of constexpr in C++11.
 template <std::size_t I, class... Types>
 constexpr variant_alternative_t<I, variant<Types...>>&& get(
     variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(absl::move(v));
+  return variant_internal::VariantCoreAccess::CheckedAccess<I>(std::move(v));
 }
 
 // Overload for getting a variant's const lvalue by index.
@@ -348,11 +345,10 @@ constexpr const variant_alternative_t<I, variant<Types...>>& get(
 }
 
 // Overload for getting a variant's const rvalue by index.
-// Note: `absl::move()` is required to allow use of constexpr in C++11.
 template <std::size_t I, class... Types>
 constexpr const variant_alternative_t<I, variant<Types...>>&& get(
     const variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(absl::move(v));
+  return variant_internal::VariantCoreAccess::CheckedAccess<I>(std::move(v));
 }
 
 // get_if()
@@ -432,8 +428,8 @@ variant_internal::VisitResult<Visitor, Variants...> visit(Visitor&& vis,
   return variant_internal::
       VisitIndices<variant_size<absl::decay_t<Variants> >::value...>::Run(
           variant_internal::PerformVisitation<Visitor, Variants...>{
-              std::forward_as_tuple(absl::forward<Variants>(vars)...),
-              absl::forward<Visitor>(vis)},
+              std::forward_as_tuple(std::forward<Variants>(vars)...),
+              std::forward<Visitor>(vis)},
           vars.index()...);
 }
 
@@ -504,13 +500,12 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
       class T,
       std::size_t I = std::enable_if<
           variant_internal::IsNeitherSelfNorInPlace<variant,
-                                                    absl::decay_t<T>>::value,
-          variant_internal::IndexOfConstructedType<variant, T>>::type::value,
+                                                    absl::decay_t<T> >::value,
+          variant_internal::IndexOfConstructedType<variant, T> >::type::value,
       class Tj = absl::variant_alternative_t<I, variant>,
-      absl::enable_if_t<std::is_constructible<Tj, T>::value>* =
-          nullptr>
+      absl::enable_if_t<std::is_constructible<Tj, T>::value>* = nullptr>
   constexpr variant(T&& t) noexcept(std::is_nothrow_constructible<Tj, T>::value)
-      : Base(variant_internal::EmplaceTag<I>(), absl::forward<T>(t)) {}
+      : Base(variant_internal::EmplaceTag<I>(), std::forward<T>(t)) {}
 
   // Constructs a variant of an alternative type from the arguments through
   // direct-initialization.
@@ -524,7 +519,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   constexpr explicit variant(in_place_type_t<T>, Args&&... args)
       : Base(variant_internal::EmplaceTag<
                  variant_internal::UnambiguousIndexOf<variant, T>::value>(),
-             absl::forward<Args>(args)...) {}
+             std::forward<Args>(args)...) {}
 
   // Constructs a variant of an alternative type from an initializer list
   // and other arguments through direct-initialization.
@@ -539,7 +534,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
                              Args&&... args)
       : Base(variant_internal::EmplaceTag<
                  variant_internal::UnambiguousIndexOf<variant, T>::value>(),
-             il, absl::forward<Args>(args)...) {}
+             il, std::forward<Args>(args)...) {}
 
   // Constructs a variant of an alternative type from a provided index,
   // through value-initialization using the provided forwarded arguments.
@@ -548,7 +543,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
                 variant_internal::VariantAlternativeSfinaeT<I, variant>,
                 Args...>::value>::type* = nullptr>
   constexpr explicit variant(in_place_index_t<I>, Args&&... args)
-      : Base(variant_internal::EmplaceTag<I>(), absl::forward<Args>(args)...) {}
+      : Base(variant_internal::EmplaceTag<I>(), std::forward<Args>(args)...) {}
 
   // Constructs a variant of an alternative type from a provided index,
   // through value-initialization of an initializer list and the provided
@@ -560,7 +555,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   constexpr explicit variant(in_place_index_t<I>, std::initializer_list<U> il,
                              Args&&... args)
       : Base(variant_internal::EmplaceTag<I>(), il,
-             absl::forward<Args>(args)...) {}
+             std::forward<Args>(args)...) {}
 
   // Destructors
 
@@ -595,7 +590,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
           std::is_nothrow_constructible<Tj, T>::value) {
     variant_internal::VisitIndices<sizeof...(Tn) + 1>::Run(
         variant_internal::VariantCoreAccess::MakeConversionAssignVisitor(
-            this, absl::forward<T>(t)),
+            this, std::forward<T>(t)),
         index());
 
     return *this;
@@ -623,7 +618,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   T& emplace(Args&&... args) {
     return variant_internal::VariantCoreAccess::Replace<
         variant_internal::UnambiguousIndexOf<variant, T>::value>(
-        this, absl::forward<Args>(args)...);
+        this, std::forward<Args>(args)...);
   }
 
   // Constructs a value of the given alternative type T within the variant using
@@ -644,7 +639,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   T& emplace(std::initializer_list<U> il, Args&&... args) {
     return variant_internal::VariantCoreAccess::Replace<
         variant_internal::UnambiguousIndexOf<variant, T>::value>(
-        this, il, absl::forward<Args>(args)...);
+        this, il, std::forward<Args>(args)...);
   }
 
   // Destroys the current value of the variant (provided that
@@ -663,7 +658,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
                                       Args...>::value>::type* = nullptr>
   absl::variant_alternative_t<I, variant>& emplace(Args&&... args) {
     return variant_internal::VariantCoreAccess::Replace<I>(
-        this, absl::forward<Args>(args)...);
+        this, std::forward<Args>(args)...);
   }
 
   // Destroys the current value of the variant (provided that
@@ -681,7 +676,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   absl::variant_alternative_t<I, variant>& emplace(std::initializer_list<U> il,
                                                    Args&&... args) {
     return variant_internal::VariantCoreAccess::Replace<I>(
-        this, il, absl::forward<Args>(args)...);
+        this, il, std::forward<Args>(args)...);
   }
 
   // variant::valueless_by_exception()
diff --git a/contrib/restricted/abseil-cpp/absl/utility/utility.h b/contrib/restricted/abseil-cpp/absl/utility/utility.h
index fc0d1f65516a..ebbb49b7159a 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/utility.h
+++ b/contrib/restricted/abseil-cpp/absl/utility/utility.h
@@ -51,11 +51,14 @@ ABSL_NAMESPACE_BEGIN
 // abstractions for platforms that had not yet provided them. Those
 // platforms are no longer supported. New code should simply use the
 // the ones from std directly.
+using std::exchange;
+using std::forward;
 using std::index_sequence;
 using std::index_sequence_for;
 using std::integer_sequence;
 using std::make_index_sequence;
 using std::make_integer_sequence;
+using std::move;
 
 namespace utility_internal {
 
@@ -129,27 +132,6 @@ template <size_t I>
 void in_place_index(utility_internal::InPlaceIndexTag<I>) {}
 #endif  // ABSL_USES_STD_VARIANT
 
-// Constexpr move and forward
-
-// move()
-//
-// A constexpr version of `std::move()`, designed to be a drop-in replacement
-// for C++14's `std::move()`.
-template <typename T>
-constexpr absl::remove_reference_t<T>&& move(T&& t) noexcept {
-  return static_cast<absl::remove_reference_t<T>&&>(t);
-}
-
-// forward()
-//
-// A constexpr version of `std::forward()`, designed to be a drop-in replacement
-// for C++14's `std::forward()`.
-template <typename T>
-constexpr T&& forward(
-    absl::remove_reference_t<T>& t) noexcept {  // NOLINT(runtime/references)
-  return static_cast<T&&>(t);
-}
-
 namespace utility_internal {
 // Helper method for expanding tuple into a called method.
 template <typename Functor, typename Tuple, std::size_t... Indexes>
@@ -215,26 +197,6 @@ auto apply(Functor&& functor, Tuple&& t)
           typename std::remove_reference<Tuple>::type>::value>{});
 }
 
-// exchange
-//
-// Replaces the value of `obj` with `new_value` and returns the old value of
-// `obj`.  `absl::exchange` is designed to be a drop-in replacement for C++14's
-// `std::exchange`.
-//
-// Example:
-//
-//   Foo& operator=(Foo&& other) {
-//     ptr1_ = absl::exchange(other.ptr1_, nullptr);
-//     int1_ = absl::exchange(other.int1_, -1);
-//     return *this;
-//   }
-template <typename T, typename U = T>
-T exchange(T& obj, U&& new_value) {
-  T old_value = absl::move(obj);
-  obj = absl::forward<U>(new_value);
-  return old_value;
-}
-
 namespace utility_internal {
 template <typename T, typename Tuple, size_t... I>
 T make_from_tuple_impl(Tuple&& tup, absl::index_sequence<I...>) {
diff --git a/contrib/restricted/abseil-cpp/absl/utility/ya.make b/contrib/restricted/abseil-cpp/absl/utility/ya.make
index ac5695f0720e..467248d2799d 100644
--- a/contrib/restricted/abseil-cpp/absl/utility/ya.make
+++ b/contrib/restricted/abseil-cpp/absl/utility/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 NO_RUNTIME()
 
diff --git a/contrib/restricted/abseil-cpp/ya.make b/contrib/restricted/abseil-cpp/ya.make
index 384f80ac5f31..a9c4b4ba723b 100644
--- a/contrib/restricted/abseil-cpp/ya.make
+++ b/contrib/restricted/abseil-cpp/ya.make
@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs 22.11.
+# Generated by devtools/yamaker from nixpkgs 24.05.
 
 LIBRARY()
 
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/abseil-cpp/absl/algorithm

From c25bbb31fc5239bffc34abc7fa90bfc41b6d7324 Mon Sep 17 00:00:00 2001
From: robot-brewer <robot-brewer@yandex-team.com>
Date: Sun, 4 Aug 2024 19:59:25 +0300
Subject: [PATCH 038/104] Release lld16 #5

https://github.com/yandex/toolchain-registry/releases/tag/lld16-v5
eb1a4bebf65804fbe58d4209846f7b30a4549fd1
---
 build/mapping.conf.json       | 8 ++++++++
 build/platform/lld/lld16.json | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index c6e062b6be24..20ebdd49791f 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -119,12 +119,16 @@
         "5758120203": "https://devtools-registry.s3.yandex.net/5758120203",
         "6740818206": "https://devtools-registry.s3.yandex.net/6740818206",
         "6657744758": "https://devtools-registry.s3.yandex.net/6657744758",
+        "6782946027": "https://devtools-registry.s3.yandex.net/6782946027",
         "6740512126": "https://devtools-registry.s3.yandex.net/6740512126",
         "6657746696": "https://devtools-registry.s3.yandex.net/6657746696",
+        "6782783684": "https://devtools-registry.s3.yandex.net/6782783684",
         "6740582961": "https://devtools-registry.s3.yandex.net/6740582961",
         "6657765589": "https://devtools-registry.s3.yandex.net/6657765589",
+        "6782721573": "https://devtools-registry.s3.yandex.net/6782721573",
         "6740765286": "https://devtools-registry.s3.yandex.net/6740765286",
         "6657758332": "https://devtools-registry.s3.yandex.net/6657758332",
+        "6782718840": "https://devtools-registry.s3.yandex.net/6782718840",
         "360916612": "https://devtools-registry.s3.yandex.net/360916612",
         "4312064267": "https://devtools-registry.s3.yandex.net/4312064267",
         "4312063561": "https://devtools-registry.s3.yandex.net/4312063561",
@@ -850,12 +854,16 @@
         "5758120203": "bin-gdb-reloc-ya-linux-x86_64-b544ce3aae71e89238d6b1b85032a6b6f6412369",
         "6740818206": "bin-lld-16-optimized-darwin-arm64-30f81a61922d8f6d21a62ad26f7a3711ec368b9f",
         "6657744758": "bin-lld-16-optimized-darwin-arm64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
+        "6782946027": "bin-lld-16-optimized-darwin-arm64-e9ee8ec890c372b0d234bbdc8d711e991af44797",
         "6740512126": "bin-lld-16-optimized-darwin-x86_64-30f81a61922d8f6d21a62ad26f7a3711ec368b9f",
         "6657746696": "bin-lld-16-optimized-darwin-x86_64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
+        "6782783684": "bin-lld-16-optimized-darwin-x86_64-e9ee8ec890c372b0d234bbdc8d711e991af44797",
         "6740582961": "bin-lld-16-optimized-linux-aarch64-30f81a61922d8f6d21a62ad26f7a3711ec368b9f",
         "6657765589": "bin-lld-16-optimized-linux-aarch64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
+        "6782721573": "bin-lld-16-optimized-linux-aarch64-e9ee8ec890c372b0d234bbdc8d711e991af44797",
         "6740765286": "bin-lld-16-optimized-linux-x86_64-30f81a61922d8f6d21a62ad26f7a3711ec368b9f",
         "6657758332": "bin-lld-16-optimized-linux-x86_64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
+        "6782718840": "bin-lld-16-optimized-linux-x86_64-e9ee8ec890c372b0d234bbdc8d711e991af44797",
         "360916612": "binutils 2.26 for linux_ubuntu_10.04_lucid",
         "4312064267": "black_linter for linux",
         "4312063561": "black_linter for linux-aarch64",
diff --git a/build/platform/lld/lld16.json b/build/platform/lld/lld16.json
index d0cf6aa845b7..acae68da9d9c 100644
--- a/build/platform/lld/lld16.json
+++ b/build/platform/lld/lld16.json
@@ -1,16 +1,16 @@
 {
     "by_platform": {
         "darwin-arm64": {
-            "uri": "sbr:6740818206"
+            "uri": "sbr:6782946027"
         },
         "darwin-x86_64": {
-            "uri": "sbr:6740512126"
+            "uri": "sbr:6782783684"
         },
         "linux-aarch64": {
-            "uri": "sbr:6740582961"
+            "uri": "sbr:6782721573"
         },
         "linux-x86_64": {
-            "uri": "sbr:6740765286"
+            "uri": "sbr:6782718840"
         }
     }
 }

From 49da07626a782eea82f0f046ee7a7476568bcd9a Mon Sep 17 00:00:00 2001
From: robot-ratatosk <robot-ratatosk@yandex-team.com>
Date: Mon, 5 Aug 2024 02:31:40 +0300
Subject: [PATCH 039/104] New version of the tld SKIP_CHECK SKIP_REVIEW
 02a6763597c97f5fc185ac6ec39b01f7be184a66

---
 library/cpp/tld/tlds-alpha-by-domain.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/cpp/tld/tlds-alpha-by-domain.txt b/library/cpp/tld/tlds-alpha-by-domain.txt
index 267f7f13c18d..b57e79a3a705 100644
--- a/library/cpp/tld/tlds-alpha-by-domain.txt
+++ b/library/cpp/tld/tlds-alpha-by-domain.txt
@@ -1,4 +1,4 @@
-# Version 2024080100, Last Updated Thu Aug  1 07:07:01 2024 UTC
+# Version 2024080400, Last Updated Sun Aug  4 07:07:01 2024 UTC
 AAA
 AARP
 ABB

From 32ee8358ba1b662b03bea6e6df488580dc1460ef Mon Sep 17 00:00:00 2001
From: melkov <melkov@yandex-team.com>
Date: Mon, 5 Aug 2024 02:43:03 +0300
Subject: [PATCH 040/104] YT-22414: Remove MakeRange, MakeMutableRange
 88507df33d73cfbdf2c61c602f3c3bb51dd48ded

---
 library/cpp/yt/memory/range.h | 126 ----------------------------------
 1 file changed, 126 deletions(-)

diff --git a/library/cpp/yt/memory/range.h b/library/cpp/yt/memory/range.h
index 232de3baa1e1..932f7d93c2de 100644
--- a/library/cpp/yt/memory/range.h
+++ b/library/cpp/yt/memory/range.h
@@ -254,69 +254,6 @@ TRange(const google::protobuf::RepeatedPtrField<TPointed>& elements) -> TRange<c
 
 ////////////////////////////////////////////////////////////////////////////////
 
-//! Constructs a TRange from a pointer and length.
-template <class T>
-TRange<T> MakeRange(const T* data, size_t length)
-{
-    return TRange<T>(data, length);
-}
-
-//! Constructs a TRange from a native range.
-template <class T>
-TRange<T> MakeRange(const T* begin, const T* end)
-{
-    return TRange<T>(begin, end);
-}
-
-//! Constructs a TRange from a TCompactVector.
-template <class T, size_t N>
-TRange<T> MakeRange(const TCompactVector<T, N>& elements)
-{
-    return elements;
-}
-
-//! "Copy-constructor".
-template <class T>
-TRange<T> MakeRange(TRange<T> range)
-{
-    return range;
-}
-
-//! Constructs a TRange from an std::vector.
-template <class T>
-TRange<T> MakeRange(const std::vector<T>& elements)
-{
-    return elements;
-}
-
-//! Constructs a TRange from an std::array.
-template <class T, size_t N>
-TRange<T> MakeRange(const std::array<T, N>& elements)
-{
-    return elements;
-}
-
-//! Constructs a TRange from a C array.
-template <class T, size_t N>
-TRange<T> MakeRange(const T (& elements)[N])
-{
-    return TRange<T>(elements);
-}
-
-//! Constructs a TRange from RepeatedField.
-template <class T>
-TRange<T> MakeRange(const google::protobuf::RepeatedField<T>& elements)
-{
-    return TRange<T>(elements.data(), elements.size());
-}
-
-//! Constructs a TRange from RepeatedPtrField.
-template <class T>
-TRange<const T*> MakeRange(const google::protobuf::RepeatedPtrField<T>& elements)
-{
-    return TRange<const T*>(elements.data(), elements.size());
-}
-
 template <class U, class T>
 TRange<U> ReinterpretCastRange(TRange<T> range)
 {
@@ -485,69 +422,6 @@ TMutableRange(google::protobuf::RepeatedPtrField<TPointed>& elements) -> TMutabl
 
 ////////////////////////////////////////////////////////////////////////////////
 
-//! Constructs a TMutableRange from a pointer and length.
-template <class T>
-TMutableRange<T> MakeMutableRange(T* data, size_t length)
-{
-    return TMutableRange<T>(data, length);
-}
-
-//! Constructs a TMutableRange from a native range.
-template <class T>
-TMutableRange<T> MakeMutableRange(T* begin, T* end)
-{
-    return TMutableRange<T>(begin, end);
-}
-
-//! Constructs a TMutableRange from a TCompactVector.
-template <class T, size_t N>
-TMutableRange<T> MakeMutableRange(TCompactVector<T, N>& elements)
-{
-    return elements;
-}
-
-//! "Copy-constructor".
-template <class T>
-TMutableRange<T> MakeMutableRange(TMutableRange<T> range)
-{
-    return range;
-}
-
-//! Constructs a TMutableRange from an std::vector.
-template <class T>
-TMutableRange<T> MakeMutableRange(std::vector<T>& elements)
-{
-    return elements;
-}
-
-//! Constructs a TMutableRange from an std::array.
-template <class T, size_t N>
-TMutableRange<T> MakeMutableRange(std::array<T, N>& elements)
-{
-    return elements;
-}
-
-//! Constructs a TMutableRange from a C array.
-template <class T, size_t N>
-TMutableRange<T> MakeMutableRange(T (& elements)[N])
-{
-    return TMutableRange<T>(elements);
-}
-
-//! Constructs a TMutableRange from RepeatedField.
-template <class T>
-TMutableRange<T> MakeMutableRange(google::protobuf::RepeatedField<T>& elements)
-{
-    return TMutableRange<T>(elements.data(), elements.size());
-}
-
-//! Constructs a TMutableRange from RepeatedPtrField.
-template <class T>
-TMutableRange<T*> MakeMutableRange(google::protobuf::RepeatedPtrField<T>& elements)
-{
-    return TMutableRange<const T*>(elements.data(), elements.size());
-}
-
 template <class U, class T>
 TMutableRange<U> ReinterpretCastMutableRange(TMutableRange<T> range)
 {

From fc76ff4fa792ce08e58389b7ad3fe44560a3bddd Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Mon, 5 Aug 2024 06:23:29 +0300
Subject: [PATCH 041/104] Intermediate changes

---
 .../core/concurrency/unittests/async_looper_ut.cpp  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/yt/yt/core/concurrency/unittests/async_looper_ut.cpp b/yt/yt/core/concurrency/unittests/async_looper_ut.cpp
index ca9d9fe2d122..c9598dc4ab7c 100644
--- a/yt/yt/core/concurrency/unittests/async_looper_ut.cpp
+++ b/yt/yt/core/concurrency/unittests/async_looper_ut.cpp
@@ -56,6 +56,7 @@ TEST(TAsyncLooperTest, JustWorks)
     }
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, Restart)
@@ -101,6 +102,7 @@ TEST(TAsyncLooperTest, Restart)
     EXPECT_EQ(cleanStarts->load(), 2);
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, CancelAsyncStep)
@@ -133,6 +135,8 @@ TEST(TAsyncLooperTest, CancelAsyncStep)
     looper->Stop();
 
     EXPECT_TRUE(promise.IsCanceled());
+
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, CancelSyncStep)
@@ -165,6 +169,8 @@ TEST(TAsyncLooperTest, CancelSyncStep)
     looper->Stop();
 
     EXPECT_TRUE(promise.IsCanceled());
+
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, StopDuringAsyncStep)
@@ -297,6 +303,7 @@ TEST(TAsyncLooperTest, RestartDuringAsyncStep)
     }
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, RestartDuringAsyncStepWaitFor)
@@ -341,6 +348,7 @@ TEST(TAsyncLooperTest, RestartDuringAsyncStepWaitFor)
     }
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, StopDuringAsyncStepPreparation)
@@ -435,6 +443,7 @@ TEST(TAsyncLooperTest, RestartDuringAsyncStepPreparation1)
     }
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, RestartDuringAsyncStepPreparation2)
@@ -495,6 +504,7 @@ TEST(TAsyncLooperTest, RestartDuringAsyncStepPreparation2)
     EXPECT_EQ(syncCleanStarts->load(), 2);
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, StopDuringSyncStep)
@@ -629,6 +639,7 @@ TEST(TAsyncLooperTest, RestartDuringSyncStep)
     }
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, RestartDuringSyncStepWaitFor)
@@ -673,6 +684,7 @@ TEST(TAsyncLooperTest, RestartDuringSyncStepWaitFor)
     }
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 TEST(TAsyncLooperTest, NullFuture)
@@ -716,6 +728,7 @@ TEST(TAsyncLooperTest, NullFuture)
     }
 
     looper->Stop();
+    queue->Shutdown();
 }
 
 ////////////////////////////////////////////////////////////////////////////////

From 7569dda284b7c987f215fe1556e76e7a76fa585d Mon Sep 17 00:00:00 2001
From: spreis <spreis@yandex-team.com>
Date: Mon, 5 Aug 2024 06:25:07 +0300
Subject: [PATCH 042/104] Let cython use .c-files in text context since they
 are incuded into code, not compiled ea779c7e3927f545ed3a46007e2a9491b2248b99

---
 build/conf/python.conf | 64 +++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/build/conf/python.conf b/build/conf/python.conf
index 46df139ed480..30c545af7645 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -3,6 +3,42 @@ CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"} ${hide:C
 RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
 RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
 PYTHON_TYPE_FOR_CYTHON=PY2
+
+
+CYTHON_EMBEDED_FILES=\
+contrib/tools/cython/Cython/Utility/Buffer.c \
+contrib/tools/cython/Cython/Utility/Builtins.c \
+contrib/tools/cython/Cython/Utility/CMath.c \
+contrib/tools/cython/Cython/Utility/Capsule.c \
+contrib/tools/cython/Cython/Utility/CommonTypes.c \
+contrib/tools/cython/Cython/Utility/Complex.c \
+contrib/tools/cython/Cython/Utility/Coroutine.c \
+contrib/tools/cython/Cython/Utility/CythonFunction.c \
+contrib/tools/cython/Cython/Utility/Embed.c \
+contrib/tools/cython/Cython/Utility/Exceptions.c \
+contrib/tools/cython/Cython/Utility/ExtensionTypes.c \
+contrib/tools/cython/Cython/Utility/FunctionArguments.c \
+contrib/tools/cython/Cython/Utility/ImportExport.c \
+contrib/tools/cython/Cython/Utility/MemoryView_C.c \
+contrib/tools/cython/Cython/Utility/ModuleSetupCode.c \
+contrib/tools/cython/Cython/Utility/ObjectHandling.c \
+contrib/tools/cython/Cython/Utility/Optimize.c \
+contrib/tools/cython/Cython/Utility/Overflow.c \
+contrib/tools/cython/Cython/Utility/Printing.c \
+contrib/tools/cython/Cython/Utility/Profile.c \
+contrib/tools/cython/Cython/Utility/StringTools.c \
+contrib/tools/cython/Cython/Utility/TestUtilityLoader.c \
+contrib/tools/cython/Cython/Utility/TypeConversion.c
+
+macro _UNWRAP_TEXT_INPUTS(Files...) {
+    .CMD=${input;context=TEXT;hide:Files}
+}
+
+macro _UNWRAP_OUTPUT_INCLUDES(Files...) {
+    .CMD=${output_include;hide:Files}
+}
+
+
 CYTHON_OUTPUT_INCLUDES=\
 ${output_include;hide:"contrib/libs/python/Include/compile.h"} \
 ${output_include;hide:"contrib/libs/python/Include/frameobject.h"} \
@@ -13,36 +49,14 @@ ${output_include;hide:"contrib/libs/python/Include/pythread.h"} \
 ${output_include;hide:"contrib/libs/python/Include/structmember.h"} \
 ${output_include;hide:"contrib/libs/python/Include/traceback.h"} \
 ${output_include;hide:"contrib/tools/cython/generated_c_headers.h"} \
-${output_include;hide:"omp.h"}
+${output_include;hide:"omp.h"} \
+$_UNWRAP_OUTPUT_INCLUDES($CYTHON_EMBEDED_FILES)
 
 # tag:cython-specific
 CYTHON_CPP_OUTPUT_INCLUDES=${output_include;hide:"contrib/tools/cython/generated_cpp_headers.h"}
 
 # tag:cython-specific
-CYTHON_PREDEFINED_INCLUDES=\
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Buffer.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Builtins.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CMath.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Capsule.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CommonTypes.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Complex.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Coroutine.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CythonFunction.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Embed.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Exceptions.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ExtensionTypes.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/FunctionArguments.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ImportExport.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/MemoryView_C.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ModuleSetupCode.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ObjectHandling.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Optimize.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Overflow.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Printing.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Profile.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/StringTools.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/TestUtilityLoader.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/TypeConversion.c"}
+CYTHON_PREDEFINED_INCLUDES=$_UNWRAP_TEXT_INPUTS($CYTHON_EMBEDED_FILES)
 
 # tag:cython-specific
 CYTHON_PREDEFINED_INDUCED=\

From bce53150cdcc96594c071350dc134be6f81c22eb Mon Sep 17 00:00:00 2001
From: spreis <spreis@yandex-team.com>
Date: Mon, 5 Aug 2024 06:25:11 +0300
Subject: [PATCH 043/104] Let go properly link binries in PIC mode
 81668e85a416903e82cfa2a2223680f04a3343c7

---
 build/scripts/go_tool.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/scripts/go_tool.py b/build/scripts/go_tool.py
index 0d1dd78b2bff..f11b3b82dff2 100644
--- a/build/scripts/go_tool.py
+++ b/build/scripts/go_tool.py
@@ -497,9 +497,14 @@ def do_link_exe(args):
     if args.buildmode:
         cmd.append('-buildmode={}'.format(args.buildmode))
     elif args.mode in ('exe', 'test'):
-        cmd.append('-buildmode=exe')
+        mode = '-buildmode=exe'
         if 'ld.lld' in str(args):
-            extldflags.append('-Wl,-no-pie')
+            if '-fPIE' in str(args) or '-fPIC' in str(args):
+                # support explicit PIE
+                mode = '-buildmode=pie'
+            else:
+                extldflags.append('-Wl,-no-pie')
+        cmd.append(mode)
     elif args.mode == 'dll':
         cmd.append('-buildmode=c-shared')
     else:

From feaa798c9e6b0df5535f86d2ccc7c9f8d007ceda Mon Sep 17 00:00:00 2001
From: snermolaev <snermolaev@yandex-team.com>
Date: Mon, 5 Aug 2024 07:26:47 +0300
Subject: [PATCH 044/104] collect .proto files by PROTO_DESCRIPTIONS
 1b642fbbf446d68522225c9794b993dc4ba3760e

---
 build/conf/proto.conf                  | 13 +++++----
 build/scripts/collect_rawproto.py      | 37 ++++++++++++++++++++++++
 build/scripts/desc_rawproto_wrapper.py | 34 ++++++++++++++++++++++
 build/scripts/merge_files.py           |  4 +--
 build/scripts/merge_protosrc.py        | 39 ++++++++++++++++++++++++++
 5 files changed, 119 insertions(+), 8 deletions(-)
 create mode 100644 build/scripts/collect_rawproto.py
 create mode 100644 build/scripts/desc_rawproto_wrapper.py
 create mode 100644 build/scripts/merge_protosrc.py

diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 89870fbe19b6..6bacb350e0a2 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -639,12 +639,12 @@ macro LIST_PROTO(TO="files.proto", Files...) {
 }
 
 # tag:proto
-macro _PROTO_DESC_CMD(File) {
-    .CMD=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --descriptor_set_out=${output;suf=.desc:File} --include_source_info $_PROTOC_FLAGS ${input;rootrel:File} ${hide:PROTO_FAKEID}
+macro _PROTO_DESC_RAWPROTO_CMD(File) {
+    .CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${output;norel;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${input;rootrel:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}
 }
 
-_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $AUTO_INPUT ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
-_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL}  ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
+_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET ${ext=.desc:AUTO_INPUT} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/collect_rawproto.py"} --output ${output;suf=.protosrc:REALPRJNAME} ${rootrel;ext=.rawproto:AUTO_INPUT}
+_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL}  ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/merge_protosrc.py"} --output ${output;suf=.tar:REALPRJNAME} ${rootrel:PEERS}
 
 NEED_GOOGLE_PROTO_PEERDIRS=yes
 
@@ -807,7 +807,7 @@ multimodule PROTO_LIBRARY {
     module DESC_PROTO: _BARE_UNIT {
         .CMD=_PROTO_DESC_MERGE_CMD
         .SEM=IGNORED
-        .EXTS=.desc
+        .EXTS=.desc .rawproto
         .NODE_TYPE=Library
         .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
         .ALIASES=SRCS=_SRCS_NO_GLOBAL
@@ -817,6 +817,7 @@ multimodule PROTO_LIBRARY {
         DISABLE(_NEED_SBOM_INFO)
         MODULE_SUFFIX=.self.protodesc
         SET(MODULE_TYPE LIBRARY)
+        SET(_MODDIR_HASH ${hash:MODDIR})
 
         _EVLOG_CMDLINE=$_PROTO_DESC_CMDLINE
         _PROTO_CMDLINE=$_PROTO_DESC_CMDLINE
@@ -870,6 +871,6 @@ _CPP_PROTO_EVLOG_CMDLINE=$_CPP_PROTO_EVLOG_CMD($SRC)
 _CPP_VANILLA_PROTO_CMDLINE=$_CPP_VANILLA_PROTO_CMD($SRC)
 _JAVA_EVLOG_CMDLINE=$_JAVA_EVLOG_CMD($SRC)
 _JAVA_PROTO_CMDLINE=$_JAVA_PROTO_CMD($SRC)
-_PROTO_DESC_CMDLINE=$_PROTO_DESC_CMD($SRC)
+_PROTO_DESC_CMDLINE=$_PROTO_DESC_RAWPROTO_CMD($SRC)
 _PY_EVLOG_CMDLINE=$_PY_EVLOG_CMD($SRC)
 _PY_PROTO_CMDLINE=$_PY_PROTO_CMD($SRC)
diff --git a/build/scripts/collect_rawproto.py b/build/scripts/collect_rawproto.py
new file mode 100644
index 000000000000..92086b4f7734
--- /dev/null
+++ b/build/scripts/collect_rawproto.py
@@ -0,0 +1,37 @@
+import argparse
+import os
+import tarfile
+import stat
+import sys
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--output', required=True)
+    parser.add_argument('args', nargs='*')
+    return parser.parse_args()
+
+
+def main(args):
+    rawprotos = args.args
+    with tarfile.open(args.output, 'w') as fout:
+        for rawproto in sorted(os.path.normpath(r).replace('\\', '/') for r in rawprotos):
+            assert rawproto.endswith('.rawproto')
+            arcname = os.path.splitext(rawproto[:-len('.rawproto')])[0]
+            with open(rawproto, 'rb') as fin:
+                tarinfo = fout.gettarinfo(rawproto, arcname)
+                tarinfo.mode = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH if tarinfo.mode | stat.S_IXUSR else 0
+                tarinfo.mode = (
+                    tarinfo.mode | stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP | stat.S_IROTH
+                )
+                tarinfo.mtime = 0
+                tarinfo.uid = 0
+                tarinfo.gid = 0
+                tarinfo.uname = 'dummy'
+                tarinfo.gname = 'dummy'
+                fout.addfile(tarinfo, fin)
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(parse_args()))
diff --git a/build/scripts/desc_rawproto_wrapper.py b/build/scripts/desc_rawproto_wrapper.py
new file mode 100644
index 000000000000..94dd90fd3ff2
--- /dev/null
+++ b/build/scripts/desc_rawproto_wrapper.py
@@ -0,0 +1,34 @@
+import argparse
+import shutil
+import subprocess
+import sys
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--desc-output', required=True)
+    parser.add_argument('--rawproto-output', required=True)
+    parser.add_argument('--proto-file', required=True)
+    parser.add_argument('args', nargs='+')
+
+    return parser.parse_args()
+
+
+def main(args):
+    cmd = list(args.args)
+    cmd.append(f'--descriptor_set_out={args.desc_output}')
+    cmd.append(args.proto_file)
+
+    try:
+        subprocess.run(cmd, stdin=None, stderr=subprocess.STDOUT, text=True, check=True)
+    except subrocess.CalledProcessError as e:
+        sys.stderr.write(f'{e.cmd} returned non-zero exit code {e.returncode}.\n{e.output}\n')
+        return e.returncode
+
+    shutil.copyfile(args.proto_file, args.rawproto_output)
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(parse_args()))
diff --git a/build/scripts/merge_files.py b/build/scripts/merge_files.py
index d42d6a21392f..7d52a56f0f0b 100644
--- a/build/scripts/merge_files.py
+++ b/build/scripts/merge_files.py
@@ -2,7 +2,7 @@
 
 
 if __name__ == "__main__":
-    with open(sys.argv[1], "w") as f:
+    with open(sys.argv[1], "wb") as f:
         for appended in sys.argv[2:]:
-            with open(appended) as a:
+            with open(appended, "rb") as a:
                 f.write(a.read())
diff --git a/build/scripts/merge_protosrc.py b/build/scripts/merge_protosrc.py
new file mode 100644
index 000000000000..55e44c9063a4
--- /dev/null
+++ b/build/scripts/merge_protosrc.py
@@ -0,0 +1,39 @@
+import argparse
+import os
+import tarfile
+import sys
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--output', required=True)
+    parser.add_argument('args', nargs='+')
+    return parser.parse_args()
+
+
+def main(args):
+    peers = args.args
+
+    compression_mode = ''
+    if args.output.endswith(('.tar.gz', '.tgz')):
+        compression_mode = 'gz'
+    elif args.output.endswith('.bzip2'):
+        compression_mode = 'bz2'
+
+    files = set()
+    with tarfile.open(args.output, f'w:{compression_mode}') as dest:
+        for psrc in [p[:-len('.self.protodesc')]+'.protosrc' for p in peers if p.endswith('.self.protodesc')]:
+            with tarfile.open(psrc, 'r') as src:
+                for tarinfo in [m for m in src.getmembers() if m.name != '']:
+                    if tarinfo.name in files:
+                        continue
+                    files.add(tarinfo.name)
+                    if tarinfo.isdir():
+                        dest.addfile(tarinfo)
+                    else:
+                        dest.addfile(tarinfo, src.extractfile(tarinfo))
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(parse_args()))

From 95f0248d5a766eac88212c429966702dec272773 Mon Sep 17 00:00:00 2001
From: drbasic <drbasic@yandex-team.com>
Date: Mon, 5 Aug 2024 09:10:03 +0300
Subject: [PATCH 045/104] Add missed move assignment for TFileHandle
 3fbccc0ac152bfb68fd6ce1ede5a383ab34cce0c

---
 util/system/file.h      |  8 +++++++-
 util/system/file_ut.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/util/system/file.h b/util/system/file.h
index bf5791271dfc..57531fd8c9ec 100644
--- a/util/system/file.h
+++ b/util/system/file.h
@@ -61,7 +61,7 @@ enum SeekDir {
     sEnd = 2,
 };
 
-class TFileHandle: public TNonCopyable {
+class TFileHandle: TMoveOnly {
 public:
     constexpr TFileHandle() = default;
 
@@ -85,6 +85,12 @@ class TFileHandle: public TNonCopyable {
         Close();
     }
 
+    TFileHandle& operator=(TFileHandle&& other) noexcept {
+        Close();
+        Fd_ = other.Release();
+        return *this;
+    }
+
     bool Close() noexcept;
 
     inline FHANDLE Release() noexcept {
diff --git a/util/system/file_ut.cpp b/util/system/file_ut.cpp
index 941e6a50f3dd..2ee455411c3d 100644
--- a/util/system/file_ut.cpp
+++ b/util/system/file_ut.cpp
@@ -405,6 +405,30 @@ UNIT_ASSERT_VALUES_EQUAL(file.CountCache(0, 12345), -1);
 #endif
 }
 
+Y_UNIT_TEST_SUITE(TTestFileHandle) {
+    Y_UNIT_TEST(MoveAssignment) {
+        TTempFile tmp("tmp");
+        {
+            TFileHandle file1(tmp.Name(), OpenAlways | WrOnly);
+            file1.Write("1", 1);
+
+            TFileHandle file2;
+            file2 = std::move(file1);
+            Y_ENSURE(!file1.IsOpen());
+            Y_ENSURE(file2.IsOpen());
+
+            file2.Write("2", 1);
+        }
+
+        {
+            TFileHandle file(tmp.Name(), OpenExisting | RdOnly);
+            char buf[2];
+            Y_ENSURE(file.Read(buf, 2) == 2);
+            Y_ENSURE(TStringBuf(buf, 2) == "12");
+        }
+    }
+}
+
 Y_UNIT_TEST_SUITE(TTestDecodeOpenMode) {
     Y_UNIT_TEST(It) {
         UNIT_ASSERT_VALUES_EQUAL("0", DecodeOpenMode(0));

From 8ca35a5a3ec2486b6905e4f1e55ab10872752ab2 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Mon, 5 Aug 2024 09:59:58 +0300
Subject: [PATCH 046/104] Intermediate changes

---
 contrib/python/pure-eval/.dist-info/METADATA       | 14 ++++++--------
 contrib/python/pure-eval/README.md                 |  2 +-
 contrib/python/pure-eval/pure_eval/__init__.py     |  9 +++++++++
 .../pure-eval/pure_eval/my_getattr_static.py       |  6 ++++--
 contrib/python/pure-eval/pure_eval/utils.py        |  7 ++++++-
 contrib/python/pure-eval/pure_eval/version.py      |  2 +-
 contrib/python/pure-eval/ya.make                   |  2 +-
 7 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/contrib/python/pure-eval/.dist-info/METADATA b/contrib/python/pure-eval/.dist-info/METADATA
index 931f69c3484b..1f086de3a8ad 100644
--- a/contrib/python/pure-eval/.dist-info/METADATA
+++ b/contrib/python/pure-eval/.dist-info/METADATA
@@ -1,19 +1,19 @@
 Metadata-Version: 2.1
-Name: pure-eval
-Version: 0.2.2
+Name: pure_eval
+Version: 0.2.3
 Summary: Safely evaluate AST nodes without side effects
 Home-page: http://github.com/alexmojaki/pure_eval
 Author: Alex Hall
 Author-email: alex.mojaki@gmail.com
 License: MIT
-Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
@@ -23,7 +23,7 @@ Requires-Dist: pytest ; extra == 'tests'
 
 # `pure_eval`
 
-[![Build Status](https://travis-ci.org/alexmojaki/pure_eval.svg?branch=master)](https://travis-ci.org/alexmojaki/pure_eval) [![Coverage Status](https://coveralls.io/repos/github/alexmojaki/pure_eval/badge.svg?branch=master)](https://coveralls.io/github/alexmojaki/pure_eval?branch=master) [![Supports Python versions 3.5+](https://img.shields.io/pypi/pyversions/pure_eval.svg)](https://pypi.python.org/pypi/pure_eval)
+[![Build Status](https://travis-ci.org/alexmojaki/pure_eval.svg?branch=master)](https://travis-ci.org/alexmojaki/pure_eval) [![Coverage Status](https://coveralls.io/repos/github/alexmojaki/pure_eval/badge.svg?branch=master)](https://coveralls.io/github/alexmojaki/pure_eval?branch=master) [![Supports Python versions 3.7+](https://img.shields.io/pypi/pyversions/pure_eval.svg)](https://pypi.python.org/pypi/pure_eval)
 
 This is a Python package that lets you safely evaluate certain AST nodes without triggering arbitrary code that may have unwanted side effects.
 
@@ -225,5 +225,3 @@ d = {1: 2}
 y = 2
 d[x] = 2
 ```
-
-
diff --git a/contrib/python/pure-eval/README.md b/contrib/python/pure-eval/README.md
index a4edbfc0a57f..3506b3339888 100644
--- a/contrib/python/pure-eval/README.md
+++ b/contrib/python/pure-eval/README.md
@@ -1,6 +1,6 @@
 # `pure_eval`
 
-[![Build Status](https://travis-ci.org/alexmojaki/pure_eval.svg?branch=master)](https://travis-ci.org/alexmojaki/pure_eval) [![Coverage Status](https://coveralls.io/repos/github/alexmojaki/pure_eval/badge.svg?branch=master)](https://coveralls.io/github/alexmojaki/pure_eval?branch=master) [![Supports Python versions 3.5+](https://img.shields.io/pypi/pyversions/pure_eval.svg)](https://pypi.python.org/pypi/pure_eval)
+[![Build Status](https://travis-ci.org/alexmojaki/pure_eval.svg?branch=master)](https://travis-ci.org/alexmojaki/pure_eval) [![Coverage Status](https://coveralls.io/repos/github/alexmojaki/pure_eval/badge.svg?branch=master)](https://coveralls.io/github/alexmojaki/pure_eval?branch=master) [![Supports Python versions 3.7+](https://img.shields.io/pypi/pyversions/pure_eval.svg)](https://pypi.python.org/pypi/pure_eval)
 
 This is a Python package that lets you safely evaluate certain AST nodes without triggering arbitrary code that may have unwanted side effects.
 
diff --git a/contrib/python/pure-eval/pure_eval/__init__.py b/contrib/python/pure-eval/pure_eval/__init__.py
index 0040e318a6e0..ec4ba7350307 100644
--- a/contrib/python/pure-eval/pure_eval/__init__.py
+++ b/contrib/python/pure-eval/pure_eval/__init__.py
@@ -6,3 +6,12 @@
 except ImportError:
     # version.py is auto-generated with the git tag when building
     __version__ = "???"
+
+__all__ = [
+    "Evaluator",
+    "CannotEval",
+    "group_expressions",
+    "is_expression_interesting",
+    "getattr_static",
+    "__version__",
+]
diff --git a/contrib/python/pure-eval/pure_eval/my_getattr_static.py b/contrib/python/pure-eval/pure_eval/my_getattr_static.py
index c750b1acc3fa..5490b90adec9 100644
--- a/contrib/python/pure-eval/pure_eval/my_getattr_static.py
+++ b/contrib/python/pure-eval/pure_eval/my_getattr_static.py
@@ -79,8 +79,10 @@ def getattr_static(obj, attr):
     klass_result = _check_class(klass, attr)
 
     if instance_result is not _sentinel and klass_result is not _sentinel:
-        if (_check_class(type(klass_result), '__get__') is not _sentinel and
-                _check_class(type(klass_result), '__set__') is not _sentinel):
+        if _check_class(type(klass_result), "__get__") is not _sentinel and (
+            _check_class(type(klass_result), "__set__") is not _sentinel
+            or _check_class(type(klass_result), "__delete__") is not _sentinel
+        ):
             return _resolve_descriptor(klass_result, obj, klass)
 
     if instance_result is not _sentinel:
diff --git a/contrib/python/pure-eval/pure_eval/utils.py b/contrib/python/pure-eval/pure_eval/utils.py
index a8a37302daa0..19ead6585060 100644
--- a/contrib/python/pure-eval/pure_eval/utils.py
+++ b/contrib/python/pure-eval/pure_eval/utils.py
@@ -184,7 +184,12 @@ def copy_ast_without_context(x):
             if field != 'ctx'
             if hasattr(x, field)
         }
-        return type(x)(**kwargs)
+        a = type(x)(**kwargs)
+        if hasattr(a, 'ctx'):
+            # Python 3.13.0b2+ defaults to Load when we don't pass ctx
+            # https://github.com/python/cpython/pull/118871
+            del a.ctx
+        return a
     elif isinstance(x, list):
         return list(map(copy_ast_without_context, x))
     else:
diff --git a/contrib/python/pure-eval/pure_eval/version.py b/contrib/python/pure-eval/pure_eval/version.py
index 9dd16a34511a..db9cf742db5e 100644
--- a/contrib/python/pure-eval/pure_eval/version.py
+++ b/contrib/python/pure-eval/pure_eval/version.py
@@ -1 +1 @@
-__version__ = '0.2.2'
\ No newline at end of file
+__version__ = '0.2.3'
\ No newline at end of file
diff --git a/contrib/python/pure-eval/ya.make b/contrib/python/pure-eval/ya.make
index 9d3cdb4c6dab..b42f4018d61b 100644
--- a/contrib/python/pure-eval/ya.make
+++ b/contrib/python/pure-eval/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(0.2.2)
+VERSION(0.2.3)
 
 LICENSE(MIT)
 

From 25798d43c70543e50210ea8d8dcdf856eef416cb Mon Sep 17 00:00:00 2001
From: robot-ya-builder <robot-ya-builder@yandex-team.com>
Date: Mon, 5 Aug 2024 11:10:57 +0300
Subject: [PATCH 047/104] Automatic release build for test_tool, ya_bin, os_ya,
 os_test_tool

From hash: [21be7d7457955cef67f2d8ca9aa00abd30dd58f1](https://a.yandex-team.ru/arcadia/commit/21be7d7457955cef67f2d8ca9aa00abd30dd58f1)
From revision: [14560536](https://a.yandex-team.ru/arcadia/commit/rXXXXXX)
[CI flow](https://a.yandex-team.ru/projects/ya_make/ci/releases/flow?dir=devtools%2Fya&id=release-ya-bin2-ya-bin3-tts&version=452)
Flow triggered by user: [robot-ci](https://staff.yandex-team.ru/robot-ci)

Update tools: test_tool, ya_bin, os_ya, os_test_tool
d3d29b1a7cfcbc974883693c6a3b564f7eac41e1
---
 build/mapping.conf.json                      |  4 ++++
 build/platform/test_tool/host.ya.make.inc    | 10 +++++-----
 build/platform/test_tool/host_os.ya.make.inc | 10 +++++-----
 ya                                           | 20 ++++++++++----------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 20ebdd49791f..e4a928185829 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -351,6 +351,8 @@
         "6733663069": "https://devtools-registry.s3.yandex.net/6733663069",
         "6761602592": "https://devtools-registry.s3.yandex.net/6761602592",
         "6761604639": "https://devtools-registry.s3.yandex.net/6761604639",
+        "6806306613": "https://devtools-registry.s3.yandex.net/6806306613",
+        "6806306627": "https://devtools-registry.s3.yandex.net/6806306627",
         "5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
         "5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
         "5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -1086,6 +1088,8 @@
         "6733663069": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6761602592": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6761604639": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "6806306613": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "6806306627": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc
index 9f76ce6d3eed..ba5adea13db9 100644
--- a/build/platform/test_tool/host.ya.make.inc
+++ b/build/platform/test_tool/host.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603811)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306122)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603407)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806305772)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761604639)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306627)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603045)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806305594)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761604252)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306344)
 
 ENDIF()
diff --git a/build/platform/test_tool/host_os.ya.make.inc b/build/platform/test_tool/host_os.ya.make.inc
index b80ee3059ca8..43b926c1814a 100644
--- a/build/platform/test_tool/host_os.ya.make.inc
+++ b/build/platform/test_tool/host_os.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601964)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306169)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601833)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806305813)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761602592)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306613)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601614)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806305649)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761602256)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306371)
 
 ENDIF()
diff --git a/ya b/ya
index 57b5ea81ab66..70a92a438f57 100755
--- a/ya
+++ b/ya
@@ -39,33 +39,33 @@ REGISTRY_ENDPOINT = os.environ.get("YA_REGISTRY_ENDPOINT", "https://devtools-reg
 PLATFORM_MAP = {
     "data": {
         "darwin": {
-            "md5": "0fde66aa3d2eedca282b89f27dc498fb",
+            "md5": "cd778a12cd93b085137f3e30b25008ae",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606505"
+                f"{REGISTRY_ENDPOINT}/6806300256"
             ]
         },
         "darwin-arm64": {
-            "md5": "d87f182ed40f1be37c1c3b271c83669c",
+            "md5": "9cd59726b1d7ebad262faf6589c59de8",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606258"
+                f"{REGISTRY_ENDPOINT}/6806299955"
             ]
         },
         "linux-aarch64": {
-            "md5": "e3555221b30ffb2f992012fb0dd21587",
+            "md5": "1aa452b20c9c553f0e2d915b8096e5a1",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606102"
+                f"{REGISTRY_ENDPOINT}/6806299806"
             ]
         },
         "win32-clang-cl": {
-            "md5": "0dc634d2325ed6edc9d79f4daf61bca8",
+            "md5": "b3ec7606223ca2c88e448d5cd8b03b1d",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606645"
+                f"{REGISTRY_ENDPOINT}/6806300365"
             ]
         },
         "linux": {
-            "md5": "a1f742755f8fb41fe2dcc521bff6fe95",
+            "md5": "4fd058322f65a5f31887c1207ca4424e",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606901"
+                f"{REGISTRY_ENDPOINT}/6806300480"
             ]
         }
     }

From 151b1ad35c1c71f46ce31d487c0e4d415c58f54e Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Mon, 5 Aug 2024 11:18:14 +0300
Subject: [PATCH 048/104] Update contrib/libs/c-ares to 1.30.0
 98e3184a9a9a280bd65439e2e21a019576a65a9f

---
 build/sysincl/darwin.yml                      |     1 +
 contrib/libs/c-ares/CONTRIBUTING.md           |    10 +-
 contrib/libs/c-ares/DEVELOPER-NOTES.md        |    47 +
 contrib/libs/c-ares/LICENSE.md                |     3 +-
 contrib/libs/c-ares/README.md                 |   114 +-
 contrib/libs/c-ares/RELEASE-NOTES.md          |    54 +-
 contrib/libs/c-ares/SECURITY.md               |     2 +-
 contrib/libs/c-ares/include/ares.h            |    52 +-
 contrib/libs/c-ares/include/ares_dns_record.h |    19 +
 contrib/libs/c-ares/include/ares_version.h    |     6 +-
 contrib/libs/c-ares/src/lib/ares__buf.c       |    31 +-
 .../libs/c-ares/src/lib/ares__close_sockets.c |     2 +-
 contrib/libs/c-ares/src/lib/ares__htable.c    |    16 +-
 .../libs/c-ares/src/lib/ares__htable_vpvp.c   |   197 +
 .../libs/c-ares/src/lib/ares__htable_vpvp.h   |   128 +
 contrib/libs/c-ares/src/lib/ares__socket.c    |     6 -
 contrib/libs/c-ares/src/lib/ares__threads.c   |    26 +-
 contrib/libs/c-ares/src/lib/ares__timeval.c   |    89 +-
 contrib/libs/c-ares/src/lib/ares_destroy.c    |    17 +
 .../libs/c-ares/src/lib/ares_dns_mapping.c    |   125 +-
 contrib/libs/c-ares/src/lib/ares_dns_name.c   |     8 +-
 contrib/libs/c-ares/src/lib/ares_dns_parse.c  |    75 +
 .../libs/c-ares/src/lib/ares_dns_private.h    |    19 +-
 contrib/libs/c-ares/src/lib/ares_dns_record.c |    40 +-
 contrib/libs/c-ares/src/lib/ares_dns_write.c  |    71 +
 contrib/libs/c-ares/src/lib/ares_event.h      |    20 +-
 .../c-ares/src/lib/ares_event_configchg.c     |   576 +
 .../libs/c-ares/src/lib/ares_event_epoll.c    |     2 +-
 .../libs/c-ares/src/lib/ares_event_kqueue.c   |     2 +-
 contrib/libs/c-ares/src/lib/ares_event_poll.c |     6 +-
 .../libs/c-ares/src/lib/ares_event_select.c   |    12 +-
 .../libs/c-ares/src/lib/ares_event_thread.c   |    47 +-
 contrib/libs/c-ares/src/lib/ares_fds.c        |     2 +-
 .../libs/c-ares/src/lib/ares_getnameinfo.c    |    14 +-
 contrib/libs/c-ares/src/lib/ares_getsock.c    |     2 +-
 contrib/libs/c-ares/src/lib/ares_init.c       |    97 +-
 contrib/libs/c-ares/src/lib/ares_ipv6.h       |     9 +
 contrib/libs/c-ares/src/lib/ares_options.c    |    20 +-
 contrib/libs/c-ares/src/lib/ares_platform.c   | 21784 ++++++++--------
 contrib/libs/c-ares/src/lib/ares_private.h    |    84 +-
 contrib/libs/c-ares/src/lib/ares_process.c    |   130 +-
 contrib/libs/c-ares/src/lib/ares_qcache.c     |    27 +-
 contrib/libs/c-ares/src/lib/ares_rand.c       |     6 +-
 contrib/libs/c-ares/src/lib/ares_send.c       |    10 +-
 contrib/libs/c-ares/src/lib/ares_str.c        |    21 +
 contrib/libs/c-ares/src/lib/ares_str.h        |    13 +
 contrib/libs/c-ares/src/lib/ares_sysconfig.c  |    22 +-
 .../c-ares/src/lib/ares_sysconfig_files.c     |     7 +-
 .../libs/c-ares/src/lib/ares_sysconfig_mac.c  |   339 +
 contrib/libs/c-ares/src/lib/ares_timeout.c    |    62 +-
 .../libs/c-ares/src/lib/ares_update_servers.c |   169 +-
 .../c-ares/src/lib/thirdparty/apple/README.md |     4 +
 .../c-ares/src/lib/thirdparty/apple/dnsinfo.h |   128 +
 contrib/libs/c-ares/ya.make                   |     8 +-
 54 files changed, 13418 insertions(+), 11363 deletions(-)
 create mode 100644 contrib/libs/c-ares/DEVELOPER-NOTES.md
 create mode 100644 contrib/libs/c-ares/src/lib/ares__htable_vpvp.c
 create mode 100644 contrib/libs/c-ares/src/lib/ares__htable_vpvp.h
 create mode 100644 contrib/libs/c-ares/src/lib/ares_event_configchg.c
 create mode 100644 contrib/libs/c-ares/src/lib/ares_sysconfig_mac.c
 create mode 100644 contrib/libs/c-ares/src/lib/thirdparty/apple/README.md
 create mode 100644 contrib/libs/c-ares/src/lib/thirdparty/apple/dnsinfo.h

diff --git a/build/sysincl/darwin.yml b/build/sysincl/darwin.yml
index d751da135786..15b9092806e3 100644
--- a/build/sysincl/darwin.yml
+++ b/build/sysincl/darwin.yml
@@ -117,6 +117,7 @@
   - netinet/udp_var.h
   - netinet6/in6.h
   - nlist.h
+  - notify.h
   - objc/objc-sync.h
   - objc/runtime.h
   - os/availability.h
diff --git a/contrib/libs/c-ares/CONTRIBUTING.md b/contrib/libs/c-ares/CONTRIBUTING.md
index a3b5194c78ad..a984e430fd75 100644
--- a/contrib/libs/c-ares/CONTRIBUTING.md
+++ b/contrib/libs/c-ares/CONTRIBUTING.md
@@ -4,12 +4,6 @@ Contributing to c-ares
 To contribute patches to c-ares, please generate a GitHub pull request
 and follow these guidelines:
 
- - Check that the Travis builds are green for your pull request.
+ - Check that the CI/CD builds are green for your pull request.
  - Please update the test suite to add a test case for any new functionality.
- - Build the library with `./configure --enable-debug --enable-maintainer-mode` and
-   ensure there are no new warnings.
-
-To improve the chances of the c-ares maintainers responding to your request:
-
- - Also send an email to the mailing list at `c-ares@lists.haxx.se` describing your change.
- - To follow any associated discussion, please subscribe to the [mailing list](http://lists.haxx.se/listinfo/c-ares).
+ - Build the library on your own machine and ensure there are no new warnings.
diff --git a/contrib/libs/c-ares/DEVELOPER-NOTES.md b/contrib/libs/c-ares/DEVELOPER-NOTES.md
new file mode 100644
index 000000000000..c8a2f0b76240
--- /dev/null
+++ b/contrib/libs/c-ares/DEVELOPER-NOTES.md
@@ -0,0 +1,47 @@
+Developer Notes
+===============
+
+* The distributed `ares_build.h` in the official release tarballs is only
+  intended to be used on systems which can also not run the also distributed
+  `configure` or `CMake` scripts.  It is generated as a copy of
+  `ares_build.h.dist` as can be seen in the code repository.
+
+* If you check out from git on a non-`configure` or `CMake` platform, you must run
+  the appropriate `buildconf*` script to set up `ares_build.h` and other local
+  files before being able to compile the library.  There are pre-made makefiles
+  for a subset of such systems such as Watcom, NMake, and MinGW Makefiles. 
+
+* On systems capable of running the `configure` or `CMake` scripts, the process
+  will overwrite the distributed `ares_build.h` file with one that is suitable
+  and specific to the library being configured and built, this new file is
+  generated from the `ares_build.h.in` and `ares_build.h.cmake` template files.
+
+* If you intend to distribute an already compiled c-ares library you **MUST**
+  also distribute along with it the generated `ares_build.h` which has been
+  used to compile it. Otherwise, the library will be of no use for the users of
+  the library that you have built. It is **your** responsibility to provide this
+  file. No one at the c-ares project can know how you have built the library.
+  The generated file includes platform and configuration dependent info,
+  and must not be modified by anyone.
+
+* We support both the AutoTools `configure` based build system as well as the
+  `CMake` build system.  Any new code changes must work with both.
+
+* The files that get compiled and are present in the distribution are referenced
+  in the `Makefile.inc` in the current directory.  This file gets included in
+  every build system supported by c-ares so that the list of files doesn't need
+  to be maintained per build system.  Don't forget to reference new header files
+  otherwise they won't be included in the official release tarballs.
+
+* We cannot assume anything else but very basic C89 compiler features being
+  present. The lone exception is the requirement for 64bit integers which is
+  not a requirement for C89 compilers to support. Please do not use any extended
+  features released by later standards.
+
+* Newlines must remain unix-style for older compilers' sake.
+
+* Comments must be written in the old-style `/* unnested C-fashion */`
+
+* Try to keep line lengths below 80 columns and formatted as the existing code.
+  There is a `.clang-format` in the repository that can be used to run the
+  automated code formatter as such: `clang-format -i */*.c */*.h */*/*.c */*/*.h`
diff --git a/contrib/libs/c-ares/LICENSE.md b/contrib/libs/c-ares/LICENSE.md
index 134145428aae..e27bae933fc7 100644
--- a/contrib/libs/c-ares/LICENSE.md
+++ b/contrib/libs/c-ares/LICENSE.md
@@ -2,8 +2,7 @@
 
 MIT License
 
-
-Copyright (c) 1998 Massachusetts Institute of Technology
+Copyright (c) 1998 Massachusetts Institute of Technology  
 Copyright (c) 2007 - 2023 Daniel Stenberg with many contributors, see AUTHORS
 file.
 
diff --git a/contrib/libs/c-ares/README.md b/contrib/libs/c-ares/README.md
index 70aa67fce699..5e022a85c154 100644
--- a/contrib/libs/c-ares/README.md
+++ b/contrib/libs/c-ares/README.md
@@ -1,65 +1,101 @@
 # [![c-ares logo](https://c-ares.org/art/c-ares-logo.svg)](https://c-ares.org/)
 
 [![Build Status](https://api.cirrus-ci.com/github/c-ares/c-ares.svg?branch=main)](https://cirrus-ci.com/github/c-ares/c-ares)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/aevgc5914tm72pvs/branch/master?svg=true)](https://ci.appveyor.com/project/c-ares/c-ares/branch/master)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/aevgc5914tm72pvs/branch/main?svg=true)](https://ci.appveyor.com/project/c-ares/c-ares/branch/main)
 [![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/c-ares.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:c-ares)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=c-ares_c-ares&metric=bugs)](https://sonarcloud.io/summary/new_code?id=c-ares_c-ares)
 [![Coverity Scan Status](https://scan.coverity.com/projects/c-ares/badge.svg)](https://scan.coverity.com/projects/c-ares)
 
-This is c-ares, an asynchronous resolver library.  It is intended for
+## Overview
+[c-ares](https://c-ares.org) is a modern DNS (stub) resolver library, written in
+C. It provides interfaces for asynchronous queries while trying to abstract the
+intricacies of the underlying DNS protocol.  It was originally intended for
 applications which need to perform DNS queries without blocking, or need to
-perform multiple DNS queries in parallel.  The primary examples of such
-applications are servers which communicate with multiple clients and programs
-with graphical user interfaces.
+perform multiple DNS queries in parallel.
 
-The full source code is available in the ['c-ares' release archives](https://c-ares.org/download/),
-and in a git repository: https://github.com/c-ares/c-ares.  See the
-[INSTALL.md](INSTALL.md) file for build information.
+One of the goals of c-ares is to be a better DNS resolver than is provided by
+your system, regardless of which system you use.  We recommend using
+the c-ares library in all network applications even if the initial goal of
+asynchronous resolution is not necessary to your application.
 
-If you find bugs, correct flaws, have questions or have comments in general in
-regard to c-ares (or by all means the original ares too), get in touch with us
-on the c-ares mailing list: https://lists.haxx.se/listinfo/c-ares
+c-ares will build with any C89 compiler and is [MIT licensed](LICENSE.md),
+which makes it suitable for both free and commercial software. c-ares runs on
+Linux, FreeBSD, OpenBSD, MacOS, Solaris, AIX, Windows, Android, iOS and many
+more operating systems.
 
-c-ares is distributed under the MIT license.
+c-ares has a strong focus on security, implementing safe parsers and data
+builders used throughout the code, thus avoiding many of the common pitfalls
+of other C libraries.  Through automated testing with our extensive testing
+framework, c-ares is constantly validated with a range of static and dynamic
+analyzers, as well as being constantly fuzzed by [OSS Fuzz](https://github.com/google/oss-fuzz).
 
-You'll find all c-ares details and news here:
-        https://c-ares.org/
+While c-ares has been around for over 20 years, it has been actively maintained
+both in regards to the latest DNS RFCs as well as updated to follow the latest
+best practices in regards to C coding standards.
 
+## Code
 
-## Notes for c-ares hackers
+The full source code and revision history is available in our
+[GitHub  repository](https://github.com/c-ares/c-ares).  Our signed releases
+are available in the ['c-ares' release archives](https://c-ares.org/download/).
 
-* The distributed `ares_build.h` file is only intended to be used on systems
-  which can not run the also distributed configure script.
 
-* The distributed `ares_build.h` file is generated as a copy of `ares_build.h.dist`
-  when the c-ares source code distribution archive file is originally created.
+See the [INSTALL.md](INSTALL.md) file for build information.
 
-* If you check out from git on a non-configure platform, you must run the
-  appropriate `buildconf*` script to set up `ares_build.h` and other local files
-  before being able to compile the library.
+## Communication
 
-* On systems capable of running the `configure` script, the `configure` process
-  will overwrite the distributed `ares_build.h` file with one that is suitable
-  and specific to the library being configured and built, this new file is
-  generated from the `ares_build.h.in` template file.
+**Issues** and **Feature Requests** should be reported to our
+[GitHub Issues](https://github.com/c-ares/c-ares/issues) page.
 
-* If you intend to distribute an already compiled c-ares library you **MUST**
-  also distribute along with it the generated `ares_build.h` which has been
-  used to compile it. Otherwise, the library will be of no use for the users of
-  the library that you have built. It is **your** responsibility to provide this
-  file. No one at the c-ares project can know how you have built the library.
+**Discussions** around c-ares and its use, are held on
+[GitHub Discussions](https://github.com/c-ares/c-ares/discussions/categories/q-a)
+or the [Mailing List](https://lists.haxx.se/mailman/listinfo/c-ares).  Mailing
+List archive [here](https://lists.haxx.se/pipermail/c-ares/).
+Please, do not mail volunteers privately about c-ares.
 
-* File `ares_build.h` includes platform and configuration dependent info,
-  and must not be modified by anyone. Configure script generates it for you.
+**Security vulnerabilities** are treated according to our
+[Security Procedure](SECURITY.md), please email c-ares-security at
+ haxx.se if you suspect one.
 
-* We cannot assume anything else but very basic compiler features being
-  present. While c-ares requires an ANSI C compiler to build, some of the
-  earlier ANSI compilers clearly can't deal with some preprocessor operators.
 
-* Newlines must remain unix-style for older compilers' sake.
+## Release keys
 
-* Comments must be written in the old-style /* unnested C-fashion */
+Primary GPG keys for c-ares Releasers (some Releasers sign with subkeys):
 
-* Try to keep line lengths below 80 columns.
+* **Daniel Stenberg** <<daniel@haxx.se>>
+  `27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2`
+* **Brad House** <<brad@brad-house.com>>
+  `DA7D64E4C82C6294CB73A20E22E3D13B5411B7CA`
+
+To import the full set of trusted release keys (including subkeys possibly used
+to sign releases):
+
+```bash
+gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 # Daniel Stenberg
+gpg --keyserver hkps://keys.openpgp.org --recv-keys DA7D64E4C82C6294CB73A20E22E3D13B5411B7CA     # Brad House
+```
+
+### Verifying signatures
+
+For each release `c-ares-X.Y.Z.tar.gz` there is a corresponding
+`c-ares-X.Y.Z.tar.gz.asc` file which contains the detached signature for the
+release.
+
+After fetching all of the possible valid signing keys and loading into your
+keychain as per the prior section, you can simply run the command below on
+the downloaded package and detached signature:
+
+```bash
+% gpg -v --verify c-ares-1.29.0.tar.gz.asc c-ares-1.29.0.tar.gz
+gpg: enabled compatibility flags:
+gpg: Signature made Fri May 24 02:50:38 2024 EDT
+gpg:                using RSA key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
+gpg: using pgp trust model
+gpg: Good signature from "Daniel Stenberg <daniel@haxx.se>" [unknown]
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: 27ED EAF2 2F3A BCEB 50DB  9A12 5CC9 08FD B71E 12C2
+gpg: binary signature, digest algorithm SHA512, key algorithm rsa2048
+```
diff --git a/contrib/libs/c-ares/RELEASE-NOTES.md b/contrib/libs/c-ares/RELEASE-NOTES.md
index 3a9b9dd9c35f..7d30a3d4e755 100644
--- a/contrib/libs/c-ares/RELEASE-NOTES.md
+++ b/contrib/libs/c-ares/RELEASE-NOTES.md
@@ -1,49 +1,33 @@
-## c-ares version 1.28.1 - Mar 30 2024
+## c-ares version 1.30.0 - June 7 2024
 
-This release contains a fix for a single significant regression introduced
-in c-ares 1.28.0.
-
-* `ares_search()` and `ares_getaddrinfo()` resolution fails if no search domains
-  are specified. [Issue #737](https://github.com/c-ares/c-ares/issues/737)
-
-
-## c-ares version 1.28.0 - Mar 29 2024
-
-This is a feature and bugfix release.
+This is a maintenance and bugfix release.
 
 Features:
 
-* Emit warnings when deprecated c-ares functions are used.  This can be
-  disabled by passing a compiler definition of `CARES_NO_DEPRECATED`. [PR #732](https://github.com/c-ares/c-ares/pull/732)
-* Add function `ares_search_dnsrec()` to search for records using the new DNS
-  record data structures. [PR #719](https://github.com/c-ares/c-ares/pull/719)
-* Rework internals to pass around `ares_dns_record_t` instead of binary data,
-  this introduces new public functions of `ares_query_dnsrec()` and
-  `ares_send_dnsrec()`. [PR #730](https://github.com/c-ares/c-ares/pull/730)
+* Basic support for SIG RR record (RFC 2931 / RFC 2535) [PR #773](https://github.com/c-ares/c-ares/pull/773)
 
 Changes:
 
-* tests: when performing simulated queries, reduce timeouts to make tests run
-  faster
-* Replace configuration file parsers with memory-safe parser. [PR #725](https://github.com/c-ares/c-ares/pull/725)
-* Remove `acountry` completely, the manpage might still get installed otherwise. [Issue #718](https://github.com/c-ares/c-ares/pull/718)
+* Validation that DNS strings can only consist of printable ascii characters
+  otherwise will trigger a parse failure.
+  [75de16c](https://github.com/c-ares/c-ares/commit/75de16c) and
+  [40fb125](https://github.com/c-ares/c-ares/commit/40fb125)
+* Windows: use `GetTickCount64()` for a monotonic timer that does not wrap. [1dff8f6](https://github.com/c-ares/c-ares/commit/1dff8f6)
 
 Bugfixes:
 
-* CMake: don't overwrite global required libraries/definitions/includes which
-  could cause build errors for projects chain building c-ares. [Issue #729](https://github.com/c-ares/c-ares/issues/729)
-* On some platforms, `netinet6/in6.h` is not included by `netinet/in.h`
-  and needs to be included separately. [PR #728](https://github.com/c-ares/c-ares/pull/728)
-* Fix a potential memory leak in `ares_init()`. [Issue #724](https://github.com/c-ares/c-ares/issues/724)
-* Some platforms don't have the `isascii()` function.  Implement as a macro. [PR #721](https://github.com/c-ares/c-ares/pull/721)
-* CMake: Fix Chain building if CMAKE runtime paths not set
-* NDots configuration should allow a value of zero. [PR #735](https://github.com/c-ares/c-ares/pull/735)
+* QueryCache: Fix issue where purging on server changes wasn't working. [a6c8fe6](https://github.com/c-ares/c-ares/commit/a6c8fe6)
+* Windows: Fix Y2K38 issue by creating our own `ares_timeval_t` datatype. [PR #772](https://github.com/c-ares/c-ares/pull/772)
+* Fix packaging issue affecting MacOS due to a missing header. [55afad6](https://github.com/c-ares/c-ares/commit/55afad6)
+* MacOS: Fix UBSAN warnings that are likely meaningless due to alignment issues
+  in new MacOS config reader.
+* Android: arm 32bit build failure due to missing symbol. [d1722e6](https://github.com/c-ares/c-ares/commit/d1722e6)
 
-Thanks go to these friendly people for their efforts and contributions for this release:
+Thanks go to these friendly people for their efforts and contributions for this
+release:
 
 * Brad House (@bradh352)
-* Cristian Rodríguez (@crrodriguez)
 * Daniel Stenberg (@bagder)
-* Faraz (@farazrbx)
-* Faraz Fallahi (@fffaraz)
-* Oliver Welsh (@oliverwelsh)
+
+
+
diff --git a/contrib/libs/c-ares/SECURITY.md b/contrib/libs/c-ares/SECURITY.md
index 2a04a8dbcc35..0b66cc1146ad 100644
--- a/contrib/libs/c-ares/SECURITY.md
+++ b/contrib/libs/c-ares/SECURITY.md
@@ -43,7 +43,7 @@ announcement.
 
 - If the report is rejected, the team writes to the reporter to explain why.
 
-- If the report is accepted, the team writes to the reporter to let him/her
+- If the report is accepted, the team writes to the reporter to let them
   know it is accepted and that they are working on a fix.
 
 - The security team discusses the problem, works out a fix, considers the
diff --git a/contrib/libs/c-ares/include/ares.h b/contrib/libs/c-ares/include/ares.h
index 2bbdcc9ec28a..46cdf9fa8e5a 100644
--- a/contrib/libs/c-ares/include/ares.h
+++ b/contrib/libs/c-ares/include/ares.h
@@ -306,6 +306,9 @@ typedef enum {
 #define ARES_LIB_INIT_WIN32 (1 << 0)
 #define ARES_LIB_INIT_ALL   (ARES_LIB_INIT_WIN32)
 
+/* Server state callback flag values */
+#define ARES_SERV_STATE_UDP (1 << 0) /* Query used UDP */
+#define ARES_SERV_STATE_TCP (1 << 1) /* Query used TCP */
 
 /*
  * Typedef our socket type
@@ -444,6 +447,10 @@ typedef int (*ares_sock_config_callback)(ares_socket_t socket_fd, int type,
 typedef void (*ares_addrinfo_callback)(void *arg, int status, int timeouts,
                                        struct ares_addrinfo *res);
 
+typedef void (*ares_server_state_callback)(const char *server_string,
+                                           ares_bool_t success, int flags,
+                                           void *data);
+
 CARES_EXTERN int ares_library_init(int flags);
 
 CARES_EXTERN int ares_library_init_mem(int flags, void *(*amalloc)(size_t size),
@@ -466,16 +473,16 @@ CARES_EXTERN const char *ares_version(int *version);
 CARES_EXTERN             CARES_DEPRECATED_FOR(ares_init_options) int ares_init(
   ares_channel_t **channelptr);
 
-CARES_EXTERN int           ares_init_options(ares_channel_t           **channelptr,
-                                             const struct ares_options *options,
-                                             int                        optmask);
+CARES_EXTERN int  ares_init_options(ares_channel_t           **channelptr,
+                                    const struct ares_options *options,
+                                    int                        optmask);
 
-CARES_EXTERN int           ares_save_options(ares_channel_t      *channel,
-                                             struct ares_options *options, int *optmask);
+CARES_EXTERN int  ares_save_options(const ares_channel_t *channel,
+                                    struct ares_options *options, int *optmask);
 
-CARES_EXTERN void          ares_destroy_options(struct ares_options *options);
+CARES_EXTERN void ares_destroy_options(struct ares_options *options);
 
-CARES_EXTERN int           ares_dup(ares_channel_t **dest, ares_channel_t *src);
+CARES_EXTERN int  ares_dup(ares_channel_t **dest, const ares_channel_t *src);
 
 CARES_EXTERN ares_status_t ares_reinit(ares_channel_t *channel);
 
@@ -505,6 +512,11 @@ CARES_EXTERN void          ares_set_socket_callback(ares_channel_t           *ch
 CARES_EXTERN void          ares_set_socket_configure_callback(
            ares_channel_t *channel, ares_sock_config_callback callback, void *user_data);
 
+CARES_EXTERN void
+                  ares_set_server_state_callback(ares_channel_t            *channel,
+                                                 ares_server_state_callback callback,
+                                                 void                      *user_data);
+
 CARES_EXTERN int  ares_set_sortlist(ares_channel_t *channel,
                                     const char     *sortstr);
 
@@ -622,17 +634,17 @@ CARES_EXTERN void ares_getnameinfo(ares_channel_t        *channel,
 
 CARES_EXTERN      CARES_DEPRECATED_FOR(
   ARES_OPT_EVENT_THREAD or
-  ARES_OPT_SOCK_STATE_CB) int ares_fds(ares_channel_t *channel,
+  ARES_OPT_SOCK_STATE_CB) int ares_fds(const ares_channel_t *channel,
                                             fd_set *read_fds, fd_set *write_fds);
 
 CARES_EXTERN CARES_DEPRECATED_FOR(
   ARES_OPT_EVENT_THREAD or
-  ARES_OPT_SOCK_STATE_CB) int ares_getsock(ares_channel_t *channel,
+  ARES_OPT_SOCK_STATE_CB) int ares_getsock(const ares_channel_t *channel,
                                            ares_socket_t *socks, int numsocks);
 
-CARES_EXTERN struct timeval *ares_timeout(ares_channel_t *channel,
-                                          struct timeval *maxtv,
-                                          struct timeval *tv);
+CARES_EXTERN struct timeval *ares_timeout(const ares_channel_t *channel,
+                                          struct timeval       *maxtv,
+                                          struct timeval       *tv);
 
 CARES_EXTERN CARES_DEPRECATED_FOR(ares_process_fd) void ares_process(
   ares_channel_t *channel, fd_set *read_fds, fd_set *write_fds);
@@ -856,22 +868,24 @@ CARES_EXTERN CARES_DEPRECATED_FOR(ares_set_servers_csv) int ares_set_servers(
   ares_channel_t *channel, const struct ares_addr_node *servers);
 
 CARES_EXTERN
-  CARES_DEPRECATED_FOR(ares_set_servers_ports_csv) int ares_set_servers_ports(
-    ares_channel_t *channel, const struct ares_addr_port_node *servers);
+CARES_DEPRECATED_FOR(ares_set_servers_ports_csv)
+int                ares_set_servers_ports(ares_channel_t                   *channel,
+                                          const struct ares_addr_port_node *servers);
 
 /* Incoming string format: host[:port][,host[:port]]... */
 CARES_EXTERN int   ares_set_servers_csv(ares_channel_t *channel,
                                         const char     *servers);
 CARES_EXTERN int   ares_set_servers_ports_csv(ares_channel_t *channel,
                                               const char     *servers);
-CARES_EXTERN char *ares_get_servers_csv(ares_channel_t *channel);
+CARES_EXTERN char *ares_get_servers_csv(const ares_channel_t *channel);
 
 CARES_EXTERN CARES_DEPRECATED_FOR(ares_get_servers_csv) int ares_get_servers(
-  ares_channel_t *channel, struct ares_addr_node **servers);
+  const ares_channel_t *channel, struct ares_addr_node **servers);
 
 CARES_EXTERN
-  CARES_DEPRECATED_FOR(ares_get_servers_ports_csv) int ares_get_servers_ports(
-    ares_channel_t *channel, struct ares_addr_port_node **servers);
+CARES_DEPRECATED_FOR(ares_get_servers_csv)
+int                        ares_get_servers_ports(const ares_channel_t        *channel,
+                                                  struct ares_addr_port_node **servers);
 
 CARES_EXTERN const char   *ares_inet_ntop(int af, const void *src, char *dst,
                                           ares_socklen_t size);
@@ -905,7 +919,7 @@ CARES_EXTERN ares_status_t ares_queue_wait_empty(ares_channel_t *channel,
  *  \param[in] channel Initialized ares channel
  *  \return Number of active queries to servers
  */
-CARES_EXTERN size_t        ares_queue_active_queries(ares_channel_t *channel);
+CARES_EXTERN size_t ares_queue_active_queries(const ares_channel_t *channel);
 
 #ifdef __cplusplus
 }
diff --git a/contrib/libs/c-ares/include/ares_dns_record.h b/contrib/libs/c-ares/include/ares_dns_record.h
index 8d09bd0a4642..5533929f65f2 100644
--- a/contrib/libs/c-ares/include/ares_dns_record.h
+++ b/contrib/libs/c-ares/include/ares_dns_record.h
@@ -51,6 +51,7 @@ typedef enum {
   ARES_REC_TYPE_HINFO = 13,    /*!< Host information. */
   ARES_REC_TYPE_MX    = 15,    /*!< Mail routing information. */
   ARES_REC_TYPE_TXT   = 16,    /*!< Text strings. */
+  ARES_REC_TYPE_SIG   = 24,    /*!< RFC 2535 / RFC 2931. SIG Record */
   ARES_REC_TYPE_AAAA  = 28,    /*!< RFC 3596. Ip6 Address. */
   ARES_REC_TYPE_SRV   = 33,    /*!< RFC 2782. Server Selection. */
   ARES_REC_TYPE_NAPTR = 35,    /*!< RFC 3403. Naming Authority Pointer */
@@ -208,6 +209,24 @@ typedef enum {
   ARES_RR_MX_EXCHANGE = (ARES_REC_TYPE_MX * 100) + 2,
   /*! TXT Record. Data. Datatype: BINP */
   ARES_RR_TXT_DATA = (ARES_REC_TYPE_TXT * 100) + 1,
+  /*! SIG Record. Type Covered. Datatype: U16 */
+  ARES_RR_SIG_TYPE_COVERED = (ARES_REC_TYPE_SIG * 100) + 1,
+  /*! SIG Record. Algorithm. Datatype: U8 */
+  ARES_RR_SIG_ALGORITHM = (ARES_REC_TYPE_SIG * 100) + 2,
+  /*! SIG Record. Labels. Datatype: U8 */
+  ARES_RR_SIG_LABELS = (ARES_REC_TYPE_SIG * 100) + 3,
+  /*! SIG Record. Original TTL. Datatype: U32 */
+  ARES_RR_SIG_ORIGINAL_TTL = (ARES_REC_TYPE_SIG * 100) + 4,
+  /*! SIG Record. Signature Expiration. Datatype: U32 */
+  ARES_RR_SIG_EXPIRATION = (ARES_REC_TYPE_SIG * 100) + 5,
+  /*! SIG Record. Signature Inception. Datatype: U32 */
+  ARES_RR_SIG_INCEPTION = (ARES_REC_TYPE_SIG * 100) + 6,
+  /*! SIG Record. Key Tag. Datatype: U16 */
+  ARES_RR_SIG_KEY_TAG = (ARES_REC_TYPE_SIG * 100) + 7,
+  /*! SIG Record. Signers Name. Datatype: NAME */
+  ARES_RR_SIG_SIGNERS_NAME = (ARES_REC_TYPE_SIG * 100) + 8,
+  /*! SIG Record. Signature. Datatype: BIN */
+  ARES_RR_SIG_SIGNATURE = (ARES_REC_TYPE_SIG * 100) + 9,
   /*! AAAA Record. Address. Datatype: INADDR6 */
   ARES_RR_AAAA_ADDR = (ARES_REC_TYPE_AAAA * 100) + 1,
   /*! SRV Record. Priority. Datatype: U16 */
diff --git a/contrib/libs/c-ares/include/ares_version.h b/contrib/libs/c-ares/include/ares_version.h
index 0e94a98be8f2..e791568e6bd8 100644
--- a/contrib/libs/c-ares/include/ares_version.h
+++ b/contrib/libs/c-ares/include/ares_version.h
@@ -31,12 +31,12 @@
 #define ARES_COPYRIGHT "2004 - 2024 Daniel Stenberg, <daniel@haxx.se>."
 
 #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 28
-#define ARES_VERSION_PATCH 1
+#define ARES_VERSION_MINOR 30
+#define ARES_VERSION_PATCH 0
 #define ARES_VERSION                                        \
   ((ARES_VERSION_MAJOR << 16) | (ARES_VERSION_MINOR << 8) | \
    (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.28.1"
+#define ARES_VERSION_STR "1.30.0"
 
 #if (ARES_VERSION >= 0x010700)
 #  define CARES_HAVE_ARES_LIBRARY_INIT    1
diff --git a/contrib/libs/c-ares/src/lib/ares__buf.c b/contrib/libs/c-ares/src/lib/ares__buf.c
index 0663383df9e4..2203662fab53 100644
--- a/contrib/libs/c-ares/src/lib/ares__buf.c
+++ b/contrib/libs/c-ares/src/lib/ares__buf.c
@@ -941,9 +941,9 @@ ares_status_t ares__buf_set_position(ares__buf_t *buf, size_t idx)
   return ARES_SUCCESS;
 }
 
-ares_status_t ares__buf_parse_dns_binstr(ares__buf_t *buf, size_t remaining_len,
-                                         unsigned char **bin, size_t *bin_len,
-                                         ares_bool_t allow_multiple)
+static ares_status_t ares__buf_parse_dns_binstr_int(
+  ares__buf_t *buf, size_t remaining_len, unsigned char **bin, size_t *bin_len,
+  ares_bool_t allow_multiple, ares_bool_t validate_printable)
 {
   unsigned char len;
   ares_status_t status;
@@ -970,7 +970,17 @@ ares_status_t ares__buf_parse_dns_binstr(ares__buf_t *buf, size_t remaining_len,
     }
 
     if (len) {
-      /* XXX: Maybe we should scan to make sure it is printable? */
+      /* When used by the _str() parser, it really needs to be validated to
+       * be a valid printable ascii string.  Do that here */
+      if (validate_printable && ares__buf_len(buf) >= len) {
+        size_t      mylen;
+        const char *data = (const char *)ares__buf_peek(buf, &mylen);
+        if (!ares__str_isprint(data, len)) {
+          status = ARES_EBADSTR;
+          break;
+        }
+      }
+
       if (bin != NULL) {
         status = ares__buf_fetch_bytes_into_buf(buf, binbuf, len);
       } else {
@@ -1003,12 +1013,21 @@ ares_status_t ares__buf_parse_dns_binstr(ares__buf_t *buf, size_t remaining_len,
   return status;
 }
 
+ares_status_t ares__buf_parse_dns_binstr(ares__buf_t *buf, size_t remaining_len,
+                                         unsigned char **bin, size_t *bin_len,
+                                         ares_bool_t allow_multiple)
+{
+  return ares__buf_parse_dns_binstr_int(buf, remaining_len, bin, bin_len,
+                                        allow_multiple, ARES_FALSE);
+}
+
 ares_status_t ares__buf_parse_dns_str(ares__buf_t *buf, size_t remaining_len,
                                       char **str, ares_bool_t allow_multiple)
 {
   size_t len;
-  return ares__buf_parse_dns_binstr(buf, remaining_len, (unsigned char **)str,
-                                    &len, allow_multiple);
+
+  return ares__buf_parse_dns_binstr_int(
+    buf, remaining_len, (unsigned char **)str, &len, allow_multiple, ARES_TRUE);
 }
 
 ares_status_t ares__buf_append_num_dec(ares__buf_t *buf, size_t num, size_t len)
diff --git a/contrib/libs/c-ares/src/lib/ares__close_sockets.c b/contrib/libs/c-ares/src/lib/ares__close_sockets.c
index 13ecca8f5e46..03ba4abf89fb 100644
--- a/contrib/libs/c-ares/src/lib/ares__close_sockets.c
+++ b/contrib/libs/c-ares/src/lib/ares__close_sockets.c
@@ -34,7 +34,7 @@
 static void ares__requeue_queries(struct server_connection *conn)
 {
   struct query  *query;
-  struct timeval now = ares__tvnow();
+  ares_timeval_t now = ares__tvnow();
 
   while ((query = ares__llist_first_val(conn->queries_to_conn)) != NULL) {
     ares__requeue_query(query, &now);
diff --git a/contrib/libs/c-ares/src/lib/ares__htable.c b/contrib/libs/c-ares/src/lib/ares__htable.c
index 7aaf2d2089b2..f09c9ea2951d 100644
--- a/contrib/libs/c-ares/src/lib/ares__htable.c
+++ b/contrib/libs/c-ares/src/lib/ares__htable.c
@@ -142,14 +142,14 @@ const void **ares__htable_all_buckets(const ares__htable_t *htable, size_t *num)
   size_t       i;
 
   if (htable == NULL || num == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE */
   }
 
   *num = 0;
 
   out = ares_malloc_zero(sizeof(*out) * htable->num_keys);
   if (out == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE */
   }
 
   for (i = 0; i < htable->size; i++) {
@@ -197,7 +197,7 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
 
   /* Not a failure, just won't expand */
   if (old_size == ARES__HTABLE_MAX_BUCKETS) {
-    return ARES_TRUE;
+    return ARES_TRUE; /* LCOV_EXCL_LINE */
   }
 
   htable->size <<= 1;
@@ -207,7 +207,7 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
    * middle, we wouldn't be able to recover. */
   buckets = ares_malloc_zero(sizeof(*buckets) * htable->size);
   if (buckets == NULL) {
-    goto done;
+    goto done;  /* LCOV_EXCL_LINE */
   }
 
   /* The maximum number of new llists we'll need is the number of collisions
@@ -217,7 +217,7 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
     prealloc_llist =
       ares_malloc_zero(sizeof(*prealloc_llist) * prealloc_llist_len);
     if (prealloc_llist == NULL) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE */
     }
   }
   for (i = 0; i < prealloc_llist_len; i++) {
@@ -270,7 +270,7 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
       if (buckets[idx] == NULL) {
         /* Silence static analysis, this isn't possible but it doesn't know */
         if (prealloc_llist == NULL || prealloc_llist_len == 0) {
-          goto done;
+          goto done;  /* LCOV_EXCL_LINE */
         }
         buckets[idx] = prealloc_llist[prealloc_llist_len - 1];
         prealloc_llist_len--;
@@ -304,7 +304,7 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
 
   /* On failure, we need to restore the htable size */
   if (rv != ARES_TRUE) {
-    htable->size = old_size;
+    htable->size = old_size;  /* LCOV_EXCL_LINE */
   }
 
   return rv;
@@ -336,7 +336,7 @@ ares_bool_t ares__htable_insert(ares__htable_t *htable, void *bucket)
   if (htable->num_keys + 1 >
       (htable->size * ARES__HTABLE_EXPAND_PERCENT) / 100) {
     if (!ares__htable_expand(htable)) {
-      return ARES_FALSE;
+      return ARES_FALSE;  /* LCOV_EXCL_LINE */
     }
     /* If we expanded, need to calculate a new index */
     idx = HASH_IDX(htable, key);
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_vpvp.c b/contrib/libs/c-ares/src/lib/ares__htable_vpvp.c
new file mode 100644
index 000000000000..3558fa5a9b77
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/ares__htable_vpvp.c
@@ -0,0 +1,197 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#include "ares_setup.h"
+#include "ares.h"
+#include "ares_private.h"
+#include "ares__htable.h"
+#include "ares__htable_vpvp.h"
+
+struct ares__htable_vpvp {
+  ares__htable_vpvp_key_free_t free_key;
+  ares__htable_vpvp_val_free_t free_val;
+  ares__htable_t              *hash;
+};
+
+typedef struct {
+  void                *key;
+  void                *val;
+  ares__htable_vpvp_t *parent;
+} ares__htable_vpvp_bucket_t;
+
+void ares__htable_vpvp_destroy(ares__htable_vpvp_t *htable)
+{
+  if (htable == NULL) {
+    return;
+  }
+
+  ares__htable_destroy(htable->hash);
+  ares_free(htable);
+}
+
+static unsigned int hash_func(const void *key, unsigned int seed)
+{
+  return ares__htable_hash_FNV1a((const unsigned char *)&key, sizeof(key),
+                                 seed);
+}
+
+static const void *bucket_key(const void *bucket)
+{
+  const ares__htable_vpvp_bucket_t *arg = bucket;
+  return arg->key;
+}
+
+static void bucket_free(void *bucket)
+{
+  ares__htable_vpvp_bucket_t *arg = bucket;
+
+  if (arg->parent->free_key) {
+    arg->parent->free_key(arg->key);
+  }
+
+  if (arg->parent->free_val) {
+    arg->parent->free_val(arg->val);
+  }
+
+  ares_free(arg);
+}
+
+static ares_bool_t key_eq(const void *key1, const void *key2)
+{
+  if (key1 == key2) {
+    return ARES_TRUE;
+  }
+
+  return ARES_FALSE;
+}
+
+ares__htable_vpvp_t *
+  ares__htable_vpvp_create(ares__htable_vpvp_key_free_t key_free,
+                           ares__htable_vpvp_val_free_t val_free)
+{
+  ares__htable_vpvp_t *htable = ares_malloc(sizeof(*htable));
+  if (htable == NULL) {
+    goto fail;
+  }
+
+  htable->hash =
+    ares__htable_create(hash_func, bucket_key, bucket_free, key_eq);
+  if (htable->hash == NULL) {
+    goto fail;
+  }
+
+  htable->free_key = key_free;
+  htable->free_val = val_free;
+
+  return htable;
+
+fail:
+  if (htable) {
+    ares__htable_destroy(htable->hash);
+    ares_free(htable);
+  }
+  return NULL;
+}
+
+ares_bool_t ares__htable_vpvp_insert(ares__htable_vpvp_t *htable, void *key,
+                                     void *val)
+{
+  ares__htable_vpvp_bucket_t *bucket = NULL;
+
+  if (htable == NULL) {
+    goto fail;
+  }
+
+  bucket = ares_malloc(sizeof(*bucket));
+  if (bucket == NULL) {
+    goto fail;
+  }
+
+  bucket->parent = htable;
+  bucket->key    = key;
+  bucket->val    = val;
+
+  if (!ares__htable_insert(htable->hash, bucket)) {
+    goto fail;
+  }
+
+  return ARES_TRUE;
+
+fail:
+  if (bucket) {
+    ares_free(bucket);
+  }
+  return ARES_FALSE;
+}
+
+ares_bool_t ares__htable_vpvp_get(const ares__htable_vpvp_t *htable,
+                                  const void *key, void **val)
+{
+  ares__htable_vpvp_bucket_t *bucket = NULL;
+
+  if (val) {
+    *val = NULL;
+  }
+
+  if (htable == NULL) {
+    return ARES_FALSE;
+  }
+
+  bucket = ares__htable_get(htable->hash, key);
+  if (bucket == NULL) {
+    return ARES_FALSE;
+  }
+
+  if (val) {
+    *val = bucket->val;
+  }
+  return ARES_TRUE;
+}
+
+void *ares__htable_vpvp_get_direct(const ares__htable_vpvp_t *htable,
+                                   const void                *key)
+{
+  void *val = NULL;
+  ares__htable_vpvp_get(htable, key, &val);
+  return val;
+}
+
+ares_bool_t ares__htable_vpvp_remove(ares__htable_vpvp_t *htable,
+                                     const void          *key)
+{
+  if (htable == NULL) {
+    return ARES_FALSE;
+  }
+
+  return ares__htable_remove(htable->hash, key);
+}
+
+size_t ares__htable_vpvp_num_keys(const ares__htable_vpvp_t *htable)
+{
+  if (htable == NULL) {
+    return 0;
+  }
+  return ares__htable_num_keys(htable->hash);
+}
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_vpvp.h b/contrib/libs/c-ares/src/lib/ares__htable_vpvp.h
new file mode 100644
index 000000000000..1e0c750d862c
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/ares__htable_vpvp.h
@@ -0,0 +1,128 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef __ARES__HTABLE_VPVP_H
+#define __ARES__HTABLE_VPVP_H
+
+/*! \addtogroup ares__htable_vpvp HashTable with void pointer Key and void
+ * pointer Value
+ *
+ * This data structure wraps the base ares__htable data structure in order to
+ * split the key and value data types as size_t and void pointer, respectively.
+ *
+ * Average time complexity:
+ *  - Insert: O(1)
+ *  - Search: O(1)
+ *  - Delete: O(1)
+ *
+ * @{
+ */
+
+struct ares__htable_vpvp;
+
+/*! Opaque data type for size_t key, void pointer hash table implementation */
+typedef struct ares__htable_vpvp ares__htable_vpvp_t;
+
+/*! Callback to free key stored in hashtable
+ *
+ *  \param[in] key  user-supplied key
+ */
+typedef void (*ares__htable_vpvp_key_free_t)(void *key);
+
+/*! Callback to free value stored in hashtable
+ *
+ *  \param[in] val  user-supplied value
+ */
+typedef void (*ares__htable_vpvp_val_free_t)(void *val);
+
+/*! Destroy hashtable
+ *
+ *  \param[in] htable  Initialized hashtable
+ */
+void ares__htable_vpvp_destroy(ares__htable_vpvp_t *htable);
+
+/*! Create size_t key, void pointer value hash table
+ *
+ *  \param[in] key_free  Optional. Call back to free user-supplied key.  If
+ *                       NULL it is expected the caller will clean up any user
+ *                       supplied keys.
+ *  \param[in] val_free  Optional. Call back to free user-supplied value.  If
+ *                       NULL it is expected the caller will clean up any user
+ *                       supplied values.
+ */
+ares__htable_vpvp_t           *
+  ares__htable_vpvp_create(ares__htable_vpvp_key_free_t key_free,
+                                     ares__htable_vpvp_val_free_t val_free);
+
+/*! Insert key/value into hash table
+ *
+ *  \param[in] htable Initialized hash table
+ *  \param[in] key    key to associate with value
+ *  \param[in] val    value to store (takes ownership). May be NULL.
+ *  \return ARES_TRUE on success, ARES_FALSE on failure or out of memory
+ */
+ares_bool_t ares__htable_vpvp_insert(ares__htable_vpvp_t *htable, void *key,
+                                     void *val);
+
+/*! Retrieve value from hashtable based on key
+ *
+ *  \param[in]  htable  Initialized hash table
+ *  \param[in]  key     key to use to search
+ *  \param[out] val     Optional.  Pointer to store value.
+ *  \return ARES_TRUE on success, ARES_FALSE on failure
+ */
+ares_bool_t ares__htable_vpvp_get(const ares__htable_vpvp_t *htable,
+                                  const void *key, void **val);
+
+/*! Retrieve value from hashtable directly as return value.  Caveat to this
+ *  function over ares__htable_vpvp_get() is that if a NULL value is stored
+ *  you cannot determine if the key is not found or the value is NULL.
+ *
+ *  \param[in] htable  Initialized hash table
+ *  \param[in] key     key to use to search
+ *  \return value associated with key in hashtable or NULL
+ */
+void       *ares__htable_vpvp_get_direct(const ares__htable_vpvp_t *htable,
+                                         const void                *key);
+
+/*! Remove a value from the hashtable by key
+ *
+ *  \param[in] htable  Initialized hash table
+ *  \param[in] key     key to use to search
+ *  \return ARES_TRUE if found, ARES_FALSE if not
+ */
+ares_bool_t ares__htable_vpvp_remove(ares__htable_vpvp_t *htable,
+                                     const void          *key);
+
+/*! Retrieve the number of keys stored in the hash table
+ *
+ *  \param[in] htable  Initialized hash table
+ *  \return count
+ */
+size_t      ares__htable_vpvp_num_keys(const ares__htable_vpvp_t *htable);
+
+/*! @} */
+
+#endif /* __ARES__HTABLE_VPVP_H */
diff --git a/contrib/libs/c-ares/src/lib/ares__socket.c b/contrib/libs/c-ares/src/lib/ares__socket.c
index da03755a50db..d3990e7660e6 100644
--- a/contrib/libs/c-ares/src/lib/ares__socket.c
+++ b/contrib/libs/c-ares/src/lib/ares__socket.c
@@ -253,12 +253,6 @@ ares_status_t ares__open_connection(ares_channel_t      *channel,
   struct server_connection *conn;
   ares__llist_node_t       *node;
   int                       type = is_tcp ? SOCK_STREAM : SOCK_DGRAM;
-#ifdef __OpenBSD__
-  if ((is_tcp && server->tcp_port == 53) ||
-      (!is_tcp && server->udp_port == 53)) {
-    type |= SOCK_DNS;
-  }
-#endif
 
   switch (server->addr.family) {
     case AF_INET:
diff --git a/contrib/libs/c-ares/src/lib/ares__threads.c b/contrib/libs/c-ares/src/lib/ares__threads.c
index f6de8c698e37..53c81d41b287 100644
--- a/contrib/libs/c-ares/src/lib/ares__threads.c
+++ b/contrib/libs/c-ares/src/lib/ares__threads.c
@@ -537,12 +537,12 @@ void ares__channel_threading_destroy(ares_channel_t *channel)
   channel->cond_empty = NULL;
 }
 
-void ares__channel_lock(ares_channel_t *channel)
+void ares__channel_lock(const ares_channel_t *channel)
 {
   ares__thread_mutex_lock(channel->lock);
 }
 
-void ares__channel_unlock(ares_channel_t *channel)
+void ares__channel_unlock(const ares_channel_t *channel)
 {
   ares__thread_mutex_unlock(channel->lock);
 }
@@ -551,7 +551,7 @@ void ares__channel_unlock(ares_channel_t *channel)
 ares_status_t ares_queue_wait_empty(ares_channel_t *channel, int timeout_ms)
 {
   ares_status_t  status = ARES_SUCCESS;
-  struct timeval tout;
+  ares_timeval_t tout;
 
   if (!ares_threadsafety()) {
     return ARES_ENOTIMP;
@@ -562,9 +562,9 @@ ares_status_t ares_queue_wait_empty(ares_channel_t *channel, int timeout_ms)
   }
 
   if (timeout_ms >= 0) {
-    tout          = ares__tvnow();
-    tout.tv_sec  += timeout_ms / 1000;
-    tout.tv_usec += (timeout_ms % 1000) * 1000;
+    tout       = ares__tvnow();
+    tout.sec  += (ares_int64_t)(timeout_ms / 1000);
+    tout.usec += (unsigned int)(timeout_ms % 1000) * 1000;
   }
 
   ares__thread_mutex_lock(channel->lock);
@@ -572,19 +572,25 @@ ares_status_t ares_queue_wait_empty(ares_channel_t *channel, int timeout_ms)
     if (timeout_ms < 0) {
       ares__thread_cond_wait(channel->cond_empty, channel->lock);
     } else {
-      struct timeval tv_remaining;
-      struct timeval tv_now = ares__tvnow();
+      ares_timeval_t tv_remaining;
+      ares_timeval_t tv_now = ares__tvnow();
       unsigned long  tms;
 
       ares__timeval_remaining(&tv_remaining, &tv_now, &tout);
-      tms = (unsigned long)((tv_remaining.tv_sec * 1000) +
-                            (tv_remaining.tv_usec / 1000));
+      tms =
+        (unsigned long)((tv_remaining.sec * 1000) + (tv_remaining.usec / 1000));
       if (tms == 0) {
         status = ARES_ETIMEOUT;
       } else {
         status =
           ares__thread_cond_timedwait(channel->cond_empty, channel->lock, tms);
       }
+
+      /* If there was a timeout, don't loop.  Otherwise, make sure this wasn't
+       * a spurious wakeup by looping and checking the condition. */
+      if (status == ARES_ETIMEOUT) {
+        break;
+      }
     }
   }
   ares__thread_mutex_unlock(channel->lock);
diff --git a/contrib/libs/c-ares/src/lib/ares__timeval.c b/contrib/libs/c-ares/src/lib/ares__timeval.c
index 11996f9f11ea..fae5ad7e871a 100644
--- a/contrib/libs/c-ares/src/lib/ares__timeval.c
+++ b/contrib/libs/c-ares/src/lib/ares__timeval.c
@@ -30,79 +30,60 @@
 
 #if defined(WIN32) && !defined(MSDOS)
 
-struct timeval ares__tvnow(void)
+ares_timeval_t ares__tvnow(void)
 {
-  /*
-  ** GetTickCount() is available on _all_ Windows versions from W95 up
-  ** to nowadays. Returns milliseconds elapsed since last system boot,
-  ** increases monotonically and wraps once 49.7 days have elapsed.
-  */
-  struct timeval now;
-  DWORD          milliseconds = GetTickCount();
-  now.tv_sec                  = (long)milliseconds / 1000;
-  now.tv_usec                 = (long)(milliseconds % 1000) * 1000;
+  /* GetTickCount64() is available on Windows Vista and higher */
+  ares_timeval_t now;
+  ULONGLONG      milliseconds = GetTickCount64();
+
+  now.sec  = (ares_int64_t)milliseconds / 1000;
+  now.usec = (unsigned int)(milliseconds % 1000) * 1000;
   return now;
 }
 
 #elif defined(HAVE_CLOCK_GETTIME_MONOTONIC)
 
-struct timeval ares__tvnow(void)
+ares_timeval_t ares__tvnow(void)
 {
-  /*
-  ** clock_gettime() is granted to be increased monotonically when the
-  ** monotonic clock is queried. Time starting point is unspecified, it
-  ** could be the system start-up time, the Epoch, or something else,
-  ** in any case the time starting point does not change once that the
-  ** system has started up.
-  */
-  struct timeval  now;
+  /* clock_gettime() is guaranteed to be increased monotonically when the
+   * monotonic clock is queried. Time starting point is unspecified, it
+   * could be the system start-up time, the Epoch, or something else,
+   * in any case the time starting point does not change once that the
+   * system has started up. */
+  ares_timeval_t  now;
   struct timespec tsnow;
-  if (0 == clock_gettime(CLOCK_MONOTONIC, &tsnow)) {
-    now.tv_sec  = tsnow.tv_sec;
-    now.tv_usec = (int)(tsnow.tv_nsec / 1000);
-  }
-  /*
-  ** Even when the configure process has truly detected monotonic clock
-  ** availability, it might happen that it is not actually available at
-  ** run-time. When this occurs simply fallback to other time source.
-  */
-#  ifdef HAVE_GETTIMEOFDAY
-  else
-    (void)gettimeofday(&now, NULL); /* LCOV_EXCL_LINE */
-#  else
-  else {
-    now.tv_sec  = (long)time(NULL);
-    now.tv_usec = 0;
+
+  if (clock_gettime(CLOCK_MONOTONIC, &tsnow) == 0) {
+    now.sec  = (ares_int64_t)tsnow.tv_sec;
+    now.usec = (unsigned int)(tsnow.tv_nsec / 1000);
+  } else {
+    struct timeval tv;
+    (void)gettimeofday(&tv, NULL);
+    now.sec  = (ares_int64_t)tv.tv_sec;
+    now.usec = (unsigned int)tv.tv_usec;
   }
-#  endif
   return now;
 }
 
 #elif defined(HAVE_GETTIMEOFDAY)
 
-struct timeval ares__tvnow(void)
+ares_timeval_t ares__tvnow(void)
 {
-  /*
-  ** gettimeofday() is not granted to be increased monotonically, due to
-  ** clock drifting and external source time synchronization it can jump
-  ** forward or backward in time.
-  */
-  struct timeval now;
-  (void)gettimeofday(&now, NULL);
+  /* gettimeofday() is not granted to be increased monotonically, due to
+   * clock drifting and external source time synchronization it can jump
+   * forward or backward in time. */
+  ares_timeval_t now;
+  struct timeval tv;
+
+  (void)gettimeofday(&tv, NULL);
+  now.sec  = (ares_int64_t)tv.tv_sec;
+  now.usec = (unsigned int)tv.tv_usec;
+
   return now;
 }
 
 #else
 
-struct timeval ares__tvnow(void)
-{
-  /*
-  ** time() returns the value of time in seconds since the Epoch.
-  */
-  struct timeval now;
-  now.tv_sec  = (long)time(NULL);
-  now.tv_usec = 0;
-  return now;
-}
+#  error missing sub-second time retrieval function
 
 #endif
diff --git a/contrib/libs/c-ares/src/lib/ares_destroy.c b/contrib/libs/c-ares/src/lib/ares_destroy.c
index 6965b601e76e..672f8b061842 100644
--- a/contrib/libs/c-ares/src/lib/ares_destroy.c
+++ b/contrib/libs/c-ares/src/lib/ares_destroy.c
@@ -31,6 +31,7 @@
 
 #include "ares.h"
 #include "ares_private.h"
+#include "ares_event.h"
 
 void ares_destroy(ares_channel_t *channel)
 {
@@ -41,6 +42,22 @@ void ares_destroy(ares_channel_t *channel)
     return;
   }
 
+  /* Disable configuration change monitoring */
+  if (channel->optmask & ARES_OPT_EVENT_THREAD) {
+    ares_event_thread_t *e = channel->sock_state_cb_data;
+    if (e && e->configchg) {
+      ares_event_configchg_destroy(e->configchg);
+      e->configchg = NULL;
+    }
+  }
+
+  /* Wait for reinit thread to exit if there was one pending */
+  if (channel->reinit_thread != NULL) {
+    void *rv;
+    ares__thread_join(channel->reinit_thread, &rv);
+    channel->reinit_thread = NULL;
+  }
+
   /* Lock because callbacks will be triggered */
   ares__channel_lock(channel);
 
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_mapping.c b/contrib/libs/c-ares/src/lib/ares_dns_mapping.c
index 2b463fe83128..6c4362f000b7 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_mapping.c
+++ b/contrib/libs/c-ares/src/lib/ares_dns_mapping.c
@@ -93,6 +93,7 @@ ares_bool_t ares_dns_rec_type_isvalid(ares_dns_rec_type_t type,
     case ARES_REC_TYPE_HINFO:
     case ARES_REC_TYPE_MX:
     case ARES_REC_TYPE_TXT:
+    case ARES_REC_TYPE_SIG:
     case ARES_REC_TYPE_AAAA:
     case ARES_REC_TYPE_SRV:
     case ARES_REC_TYPE_NAPTR:
@@ -133,9 +134,18 @@ ares_bool_t ares_dns_rec_type_allow_name_compression(ares_dns_rec_type_t type)
   return ARES_FALSE;
 }
 
-ares_bool_t ares_dns_class_isvalid(ares_dns_class_t qclass,
-                                   ares_bool_t      is_query)
+ares_bool_t ares_dns_class_isvalid(ares_dns_class_t    qclass,
+                                   ares_dns_rec_type_t type,
+                                   ares_bool_t         is_query)
 {
+  /* If we don't understand the record type, we shouldn't validate the class
+   * as there are some instances like on RFC 2391 (SIG RR) the class is
+   * meaningless, but since we didn't support that record type, we didn't
+   * know it shouldn't be validated */
+  if (type == ARES_REC_TYPE_RAW_RR) {
+    return ARES_TRUE;
+  }
+
   switch (qclass) {
     case ARES_CLASS_IN:
     case ARES_CLASS_CHAOS:
@@ -143,7 +153,13 @@ ares_bool_t ares_dns_class_isvalid(ares_dns_class_t qclass,
     case ARES_CLASS_NONE:
       return ARES_TRUE;
     case ARES_CLASS_ANY:
-      return is_query ? ARES_TRUE : ARES_FALSE;
+      if (type == ARES_REC_TYPE_SIG) {
+        return ARES_TRUE;
+      }
+      if (is_query) {
+        return ARES_TRUE;
+      }
+      return ARES_FALSE;
   }
   return ARES_FALSE;
 }
@@ -191,6 +207,8 @@ const char *ares_dns_rec_type_tostr(ares_dns_rec_type_t type)
       return "MX";
     case ARES_REC_TYPE_TXT:
       return "TXT";
+    case ARES_REC_TYPE_SIG:
+      return "SIG";
     case ARES_REC_TYPE_AAAA:
       return "AAAA";
     case ARES_REC_TYPE_SRV:
@@ -305,6 +323,33 @@ const char *ares_dns_rr_key_tostr(ares_dns_rr_key_t key)
     case ARES_RR_TXT_DATA:
       return "DATA";
 
+    case ARES_RR_SIG_TYPE_COVERED:
+      return "TYPE_COVERED";
+
+    case ARES_RR_SIG_ALGORITHM:
+      return "ALGORITHM";
+
+    case ARES_RR_SIG_LABELS:
+      return "LABELS";
+
+    case ARES_RR_SIG_ORIGINAL_TTL:
+      return "ORIGINAL_TTL";
+
+    case ARES_RR_SIG_EXPIRATION:
+      return "EXPIRATION";
+
+    case ARES_RR_SIG_INCEPTION:
+      return "INCEPTION";
+
+    case ARES_RR_SIG_KEY_TAG:
+      return "KEY_TAG";
+
+    case ARES_RR_SIG_SIGNERS_NAME:
+      return "SIGNERS_NAME";
+
+    case ARES_RR_SIG_SIGNATURE:
+      return "SIGNATURE";
+
     case ARES_RR_SRV_PRIORITY:
       return "PRIORITY";
 
@@ -420,6 +465,7 @@ ares_dns_datatype_t ares_dns_rr_key_datatype(ares_dns_rr_key_t key)
     case ARES_RR_SOA_RNAME:
     case ARES_RR_PTR_DNAME:
     case ARES_RR_MX_EXCHANGE:
+    case ARES_RR_SIG_SIGNERS_NAME:
     case ARES_RR_SRV_TARGET:
     case ARES_RR_SVCB_TARGET:
     case ARES_RR_HTTPS_TARGET:
@@ -440,9 +486,14 @@ ares_dns_datatype_t ares_dns_rr_key_datatype(ares_dns_rr_key_t key)
     case ARES_RR_SOA_RETRY:
     case ARES_RR_SOA_EXPIRE:
     case ARES_RR_SOA_MINIMUM:
+    case ARES_RR_SIG_ORIGINAL_TTL:
+    case ARES_RR_SIG_EXPIRATION:
+    case ARES_RR_SIG_INCEPTION:
       return ARES_DATATYPE_U32;
 
     case ARES_RR_MX_PREFERENCE:
+    case ARES_RR_SIG_TYPE_COVERED:
+    case ARES_RR_SIG_KEY_TAG:
     case ARES_RR_SRV_PRIORITY:
     case ARES_RR_SRV_WEIGHT:
     case ARES_RR_SRV_PORT:
@@ -457,6 +508,8 @@ ares_dns_datatype_t ares_dns_rr_key_datatype(ares_dns_rr_key_t key)
     case ARES_RR_RAW_RR_TYPE:
       return ARES_DATATYPE_U16;
 
+    case ARES_RR_SIG_ALGORITHM:
+    case ARES_RR_SIG_LABELS:
     case ARES_RR_OPT_VERSION:
     case ARES_RR_TLSA_CERT_USAGE:
     case ARES_RR_TLSA_SELECTOR:
@@ -468,6 +521,7 @@ ares_dns_datatype_t ares_dns_rr_key_datatype(ares_dns_rr_key_t key)
     case ARES_RR_TXT_DATA:
       return ARES_DATATYPE_BINP;
 
+    case ARES_RR_SIG_SIGNATURE:
     case ARES_RR_TLSA_DATA:
     case ARES_RR_RAW_RR_DATA:
       return ARES_DATATYPE_BIN;
@@ -494,6 +548,15 @@ static const ares_dns_rr_key_t rr_hinfo_keys[] = { ARES_RR_HINFO_CPU,
                                                    ARES_RR_HINFO_OS };
 static const ares_dns_rr_key_t rr_mx_keys[]    = { ARES_RR_MX_PREFERENCE,
                                                    ARES_RR_MX_EXCHANGE };
+static const ares_dns_rr_key_t rr_sig_keys[]   = { ARES_RR_SIG_TYPE_COVERED,
+                                                   ARES_RR_SIG_ALGORITHM,
+                                                   ARES_RR_SIG_LABELS,
+                                                   ARES_RR_SIG_ORIGINAL_TTL,
+                                                   ARES_RR_SIG_EXPIRATION,
+                                                   ARES_RR_SIG_INCEPTION,
+                                                   ARES_RR_SIG_KEY_TAG,
+                                                   ARES_RR_SIG_SIGNERS_NAME,
+                                                   ARES_RR_SIG_SIGNATURE };
 static const ares_dns_rr_key_t rr_txt_keys[]   = { ARES_RR_TXT_DATA };
 static const ares_dns_rr_key_t rr_aaaa_keys[]  = { ARES_RR_AAAA_ADDR };
 static const ares_dns_rr_key_t rr_srv_keys[]   = {
@@ -560,6 +623,9 @@ const ares_dns_rr_key_t       *ares_dns_rr_get_keys(ares_dns_rec_type_t type,
     case ARES_REC_TYPE_TXT:
       *cnt = sizeof(rr_txt_keys) / sizeof(*rr_txt_keys);
       return rr_txt_keys;
+    case ARES_REC_TYPE_SIG:
+      *cnt = sizeof(rr_sig_keys) / sizeof(*rr_sig_keys);
+      return rr_sig_keys;
     case ARES_REC_TYPE_AAAA:
       *cnt = sizeof(rr_aaaa_keys) / sizeof(*rr_aaaa_keys);
       return rr_aaaa_keys;
@@ -606,12 +672,12 @@ ares_bool_t ares_dns_class_fromstr(ares_dns_class_t *qclass, const char *str)
     const char      *name;
     ares_dns_class_t qclass;
   } list[] = {
-    {"IN",    ARES_CLASS_IN    },
-    { "CH",   ARES_CLASS_CHAOS },
-    { "HS",   ARES_CLASS_HESOID},
-    { "NONE", ARES_CLASS_NONE  },
-    { "ANY",  ARES_CLASS_ANY   },
-    { NULL,   0                }
+    { "IN",   ARES_CLASS_IN     },
+    { "CH",   ARES_CLASS_CHAOS  },
+    { "HS",   ARES_CLASS_HESOID },
+    { "NONE", ARES_CLASS_NONE   },
+    { "ANY",  ARES_CLASS_ANY    },
+    { NULL,   0                 }
   };
 
   if (qclass == NULL || str == NULL) {
@@ -636,26 +702,27 @@ ares_bool_t ares_dns_rec_type_fromstr(ares_dns_rec_type_t *qtype,
     const char         *name;
     ares_dns_rec_type_t type;
   } list[] = {
-    {"A",       ARES_REC_TYPE_A     },
-    { "NS",     ARES_REC_TYPE_NS    },
-    { "CNAME",  ARES_REC_TYPE_CNAME },
-    { "SOA",    ARES_REC_TYPE_SOA   },
-    { "PTR",    ARES_REC_TYPE_PTR   },
-    { "HINFO",  ARES_REC_TYPE_HINFO },
-    { "MX",     ARES_REC_TYPE_MX    },
-    { "TXT",    ARES_REC_TYPE_TXT   },
-    { "AAAA",   ARES_REC_TYPE_AAAA  },
-    { "SRV",    ARES_REC_TYPE_SRV   },
-    { "NAPTR",  ARES_REC_TYPE_NAPTR },
-    { "OPT",    ARES_REC_TYPE_OPT   },
-    { "TLSA",   ARES_REC_TYPE_TLSA  },
-    { "SVCB",   ARES_REC_TYPE_SVCB  },
-    { "HTTPS",  ARES_REC_TYPE_HTTPS },
-    { "ANY",    ARES_REC_TYPE_ANY   },
-    { "URI",    ARES_REC_TYPE_URI   },
-    { "CAA",    ARES_REC_TYPE_CAA   },
-    { "RAW_RR", ARES_REC_TYPE_RAW_RR},
-    { NULL,     0                   }
+    { "A",      ARES_REC_TYPE_A      },
+    { "NS",     ARES_REC_TYPE_NS     },
+    { "CNAME",  ARES_REC_TYPE_CNAME  },
+    { "SOA",    ARES_REC_TYPE_SOA    },
+    { "PTR",    ARES_REC_TYPE_PTR    },
+    { "HINFO",  ARES_REC_TYPE_HINFO  },
+    { "MX",     ARES_REC_TYPE_MX     },
+    { "TXT",    ARES_REC_TYPE_TXT    },
+    { "SIG",    ARES_REC_TYPE_SIG    },
+    { "AAAA",   ARES_REC_TYPE_AAAA   },
+    { "SRV",    ARES_REC_TYPE_SRV    },
+    { "NAPTR",  ARES_REC_TYPE_NAPTR  },
+    { "OPT",    ARES_REC_TYPE_OPT    },
+    { "TLSA",   ARES_REC_TYPE_TLSA   },
+    { "SVCB",   ARES_REC_TYPE_SVCB   },
+    { "HTTPS",  ARES_REC_TYPE_HTTPS  },
+    { "ANY",    ARES_REC_TYPE_ANY    },
+    { "URI",    ARES_REC_TYPE_URI    },
+    { "CAA",    ARES_REC_TYPE_CAA    },
+    { "RAW_RR", ARES_REC_TYPE_RAW_RR },
+    { NULL,     0                    }
   };
 
   if (qtype == NULL || str == NULL) {
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_name.c b/contrib/libs/c-ares/src/lib/ares_dns_name.c
index f4085ab2cb9d..85e26cd25b57 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_name.c
+++ b/contrib/libs/c-ares/src/lib/ares_dns_name.c
@@ -362,6 +362,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
 {
   const ares_nameoffset_t *off = NULL;
   size_t                   name_len;
+  size_t                   orig_name_len;
   size_t                   pos = ares__buf_len(buf);
   ares_dns_labels_t        labels;
   char                     name_copy[512];
@@ -375,7 +376,8 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
 
   /* NOTE: due to possible escaping, name_copy buffer is > 256 to allow for
    *       this */
-  name_len = ares_strcpy(name_copy, name, sizeof(name_copy));
+  name_len      = ares_strcpy(name_copy, name, sizeof(name_copy));
+  orig_name_len = name_len;
 
   /* Find longest match */
   if (list != NULL) {
@@ -388,7 +390,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
   }
 
   /* Output labels */
-  if (off == NULL || off->name_len != name_len) {
+  if (off == NULL || off->name_len != orig_name_len) {
     size_t i;
 
     status = ares_split_dns_name(&labels, validate_hostname, name_copy);
@@ -432,7 +434,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
 
   /* Store pointer for future jumps as long as its not an exact match for
    * a prior entry */
-  if (list != NULL && (off == NULL || off->name_len != name_len) &&
+  if (list != NULL && (off == NULL || off->name_len != orig_name_len) &&
       name_len > 0) {
     status = ares__nameoffset_create(list, name /* not truncated copy! */, pos);
     if (status != ARES_SUCCESS) {
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_parse.c b/contrib/libs/c-ares/src/lib/ares_dns_parse.c
index 169fd5b63d7e..8b771ee1faf3 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_parse.c
+++ b/contrib/libs/c-ares/src/lib/ares_dns_parse.c
@@ -296,6 +296,74 @@ static ares_status_t ares_dns_parse_rr_txt(ares__buf_t *buf, ares_dns_rr_t *rr,
                                            ARES_RR_TXT_DATA);
 }
 
+static ares_status_t ares_dns_parse_rr_sig(ares__buf_t *buf, ares_dns_rr_t *rr,
+                                           size_t rdlength)
+{
+  ares_status_t  status;
+  size_t         orig_len = ares__buf_len(buf);
+  size_t         len;
+  unsigned char *data;
+
+  status = ares_dns_parse_and_set_be16(buf, rr, ARES_RR_SIG_TYPE_COVERED);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares_dns_parse_and_set_u8(buf, rr, ARES_RR_SIG_ALGORITHM);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares_dns_parse_and_set_u8(buf, rr, ARES_RR_SIG_LABELS);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares_dns_parse_and_set_be32(buf, rr, ARES_RR_SIG_ORIGINAL_TTL);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares_dns_parse_and_set_be32(buf, rr, ARES_RR_SIG_EXPIRATION);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares_dns_parse_and_set_be32(buf, rr, ARES_RR_SIG_INCEPTION);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares_dns_parse_and_set_be16(buf, rr, ARES_RR_SIG_KEY_TAG);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares_dns_parse_and_set_dns_name(buf, ARES_FALSE, rr,
+                                           ARES_RR_SIG_SIGNERS_NAME);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  len = ares_dns_rr_remaining_len(buf, orig_len, rdlength);
+  if (len == 0) {
+    return ARES_EBADRESP;
+  }
+
+  status = ares__buf_fetch_bytes_dup(buf, len, ARES_FALSE, &data);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares_dns_rr_set_bin_own(rr, ARES_RR_SIG_SIGNATURE, data, len);
+  if (status != ARES_SUCCESS) {
+    ares_free(data);
+    return status;
+  }
+
+  return ARES_SUCCESS;
+}
+
 static ares_status_t ares_dns_parse_rr_aaaa(ares__buf_t *buf, ares_dns_rr_t *rr,
                                             size_t rdlength)
 {
@@ -632,6 +700,11 @@ static ares_status_t ares_dns_parse_rr_uri(ares__buf_t *buf, ares_dns_rr_t *rr,
     return status;
   }
 
+  if (!ares__str_isprint(name, remaining_len)) {
+    ares_free(name);
+    return ARES_EBADRESP;
+  }
+
   status = ares_dns_rr_set_str_own(rr, ARES_RR_URI_TARGET, name);
   if (status != ARES_SUCCESS) {
     ares_free(name);
@@ -907,6 +980,8 @@ static ares_status_t
       return ares_dns_parse_rr_mx(buf, rr, rdlength);
     case ARES_REC_TYPE_TXT:
       return ares_dns_parse_rr_txt(buf, rr, rdlength);
+    case ARES_REC_TYPE_SIG:
+      return ares_dns_parse_rr_sig(buf, rr, rdlength);
     case ARES_REC_TYPE_AAAA:
       return ares_dns_parse_rr_aaaa(buf, rr, rdlength);
     case ARES_REC_TYPE_SRV:
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_private.h b/contrib/libs/c-ares/src/lib/ares_dns_private.h
index 3af4b3c9926e..e8e783d559ca 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_private.h
+++ b/contrib/libs/c-ares/src/lib/ares_dns_private.h
@@ -32,8 +32,9 @@ ares_bool_t ares_dns_rcode_isvalid(ares_dns_rcode_t rcode);
 ares_bool_t ares_dns_flags_arevalid(unsigned short flags);
 ares_bool_t ares_dns_rec_type_isvalid(ares_dns_rec_type_t type,
                                       ares_bool_t         is_query);
-ares_bool_t ares_dns_class_isvalid(ares_dns_class_t qclass,
-                                   ares_bool_t      is_query);
+ares_bool_t ares_dns_class_isvalid(ares_dns_class_t    qclass,
+                                   ares_dns_rec_type_t type,
+                                   ares_bool_t         is_query);
 ares_bool_t ares_dns_section_isvalid(ares_dns_section_t sect);
 ares_status_t ares_dns_rr_set_str_own(ares_dns_rr_t    *dns_rr,
                                       ares_dns_rr_key_t key, char *val);
@@ -123,6 +124,19 @@ typedef struct {
   size_t data_len;
 } ares__dns_txt_t;
 
+typedef struct {
+  unsigned short type_covered;
+  unsigned char  algorithm;
+  unsigned char  labels;
+  unsigned int   original_ttl;
+  unsigned int   expiration;
+  unsigned int   inception;
+  unsigned short key_tag;
+  char          *signers_name;
+  unsigned char *signature;
+  size_t         signature_len;
+} ares__dns_sig_t;
+
 typedef struct {
   struct ares_in6_addr addr;
 } ares__dns_aaaa_t;
@@ -216,6 +230,7 @@ struct ares_dns_rr {
     ares__dns_hinfo_t  hinfo;
     ares__dns_mx_t     mx;
     ares__dns_txt_t    txt;
+    ares__dns_sig_t    sig;
     ares__dns_aaaa_t   aaaa;
     ares__dns_srv_t    srv;
     ares__dns_naptr_t  naptr;
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_record.c b/contrib/libs/c-ares/src/lib/ares_dns_record.c
index ec7f7e734302..e6b7bf7fe1d9 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_record.c
+++ b/contrib/libs/c-ares/src/lib/ares_dns_record.c
@@ -148,6 +148,11 @@ static void ares__dns_rr_free(ares_dns_rr_t *rr)
       ares_free(rr->r.txt.data);
       break;
 
+    case ARES_REC_TYPE_SIG:
+      ares_free(rr->r.sig.signers_name);
+      ares_free(rr->r.sig.signature);
+      break;
+
     case ARES_REC_TYPE_SRV:
       ares_free(rr->r.srv.target);
       break;
@@ -245,7 +250,7 @@ ares_status_t ares_dns_record_query_add(ares_dns_record_t  *dnsrec,
 
   if (dnsrec == NULL || name == NULL ||
       !ares_dns_rec_type_isvalid(qtype, ARES_TRUE) ||
-      !ares_dns_class_isvalid(qclass, ARES_TRUE)) {
+      !ares_dns_class_isvalid(qclass, qtype, ARES_TRUE)) {
     return ARES_EFORMERR;
   }
 
@@ -412,7 +417,7 @@ ares_status_t ares_dns_record_rr_add(ares_dns_rr_t    **rr_out,
   if (dnsrec == NULL || name == NULL || rr_out == NULL ||
       !ares_dns_section_isvalid(sect) ||
       !ares_dns_rec_type_isvalid(type, ARES_FALSE) ||
-      !ares_dns_class_isvalid(rclass, ARES_FALSE)) {
+      !ares_dns_class_isvalid(rclass, type, ARES_FALSE)) {
     return ARES_EFORMERR;
   }
 
@@ -627,6 +632,37 @@ static void *ares_dns_rr_data_ptr(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
     case ARES_RR_MX_EXCHANGE:
       return &dns_rr->r.mx.exchange;
 
+    case ARES_RR_SIG_TYPE_COVERED:
+      return &dns_rr->r.sig.type_covered;
+
+    case ARES_RR_SIG_ALGORITHM:
+      return &dns_rr->r.sig.algorithm;
+
+    case ARES_RR_SIG_LABELS:
+      return &dns_rr->r.sig.labels;
+
+    case ARES_RR_SIG_ORIGINAL_TTL:
+      return &dns_rr->r.sig.original_ttl;
+
+    case ARES_RR_SIG_EXPIRATION:
+      return &dns_rr->r.sig.expiration;
+
+    case ARES_RR_SIG_INCEPTION:
+      return &dns_rr->r.sig.inception;
+
+    case ARES_RR_SIG_KEY_TAG:
+      return &dns_rr->r.sig.key_tag;
+
+    case ARES_RR_SIG_SIGNERS_NAME:
+      return &dns_rr->r.sig.signers_name;
+
+    case ARES_RR_SIG_SIGNATURE:
+      if (lenptr == NULL) {
+        return NULL;
+      }
+      *lenptr = &dns_rr->r.sig.signature_len;
+      return &dns_rr->r.sig.signature;
+
     case ARES_RR_TXT_DATA:
       if (lenptr == NULL) {
         return NULL;
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_write.c b/contrib/libs/c-ares/src/lib/ares_dns_write.c
index b49ec07bcb9b..1643f0810322 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_write.c
+++ b/contrib/libs/c-ares/src/lib/ares_dns_write.c
@@ -424,6 +424,74 @@ static ares_status_t ares_dns_write_rr_txt(ares__buf_t         *buf,
   return ares_dns_write_rr_binstrs(buf, rr, ARES_RR_TXT_DATA);
 }
 
+static ares_status_t ares_dns_write_rr_sig(ares__buf_t         *buf,
+                                           const ares_dns_rr_t *rr,
+                                           ares__llist_t      **namelist)
+{
+  ares_status_t        status;
+  const unsigned char *data;
+  size_t               len = 0;
+
+  (void)namelist;
+
+  /* TYPE COVERED */
+  status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SIG_TYPE_COVERED);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* ALGORITHM */
+  status = ares_dns_write_rr_u8(buf, rr, ARES_RR_SIG_ALGORITHM);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* LABELS */
+  status = ares_dns_write_rr_u8(buf, rr, ARES_RR_SIG_LABELS);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* ORIGINAL TTL */
+  status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_ORIGINAL_TTL);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* EXPIRATION */
+  status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_EXPIRATION);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* INCEPTION */
+  status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_INCEPTION);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* KEY TAG */
+  status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SIG_KEY_TAG);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* SIGNERS NAME */
+  status = ares_dns_write_rr_name(buf, rr, namelist, ARES_FALSE,
+                                  ARES_RR_SIG_SIGNERS_NAME);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* SIGNATURE -- binary, rest of buffer, required to be non-zero length */
+  data = ares_dns_rr_get_bin(rr, ARES_RR_SIG_SIGNATURE, &len);
+  if (data == NULL || len == 0) {
+    return ARES_EFORMERR;
+  }
+
+  return ares__buf_append(buf, data, len);
+}
+
 static ares_status_t ares_dns_write_rr_aaaa(ares__buf_t         *buf,
                                             const ares_dns_rr_t *rr,
                                             ares__llist_t      **namelist)
@@ -925,6 +993,9 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
       case ARES_REC_TYPE_TXT:
         status = ares_dns_write_rr_txt(buf, rr, namelistptr);
         break;
+      case ARES_REC_TYPE_SIG:
+        status = ares_dns_write_rr_sig(buf, rr, namelistptr);
+        break;
       case ARES_REC_TYPE_AAAA:
         status = ares_dns_write_rr_aaaa(buf, rr, namelistptr);
         break;
diff --git a/contrib/libs/c-ares/src/lib/ares_event.h b/contrib/libs/c-ares/src/lib/ares_event.h
index 23e9637924ba..f5d044d2a6ca 100644
--- a/contrib/libs/c-ares/src/lib/ares_event.h
+++ b/contrib/libs/c-ares/src/lib/ares_event.h
@@ -79,6 +79,14 @@ typedef struct {
   size_t (*wait)(ares_event_thread_t *e, unsigned long timeout_ms);
 } ares_event_sys_t;
 
+struct ares_event_configchg;
+typedef struct ares_event_configchg ares_event_configchg_t;
+
+ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
+                                        ares_event_thread_t     *e);
+
+void          ares_event_configchg_destroy(ares_event_configchg_t *configchg);
+
 struct ares_event_thread {
   /*! Whether the event thread should be online or not.  Checked on every wake
    *  event before sleeping. */
@@ -94,13 +102,18 @@ struct ares_event_thread {
    *  thread other than the event thread itself. The event thread will then
    *  be woken then process these updates itself */
   ares__llist_t          *ev_updates;
-  /*! Registered event handles. */
-  ares__htable_asvp_t    *ev_handles;
+  /*! Registered socket event handles */
+  ares__htable_asvp_t    *ev_sock_handles;
+  /*! Registered custom event handles. Typically used for external triggering.
+   */
+  ares__htable_vpvp_t    *ev_cust_handles;
   /*! Pointer to the event handle which is used to signal and wake the event
    *  thread itself.  This is needed to be able to do things like update the
    *  file descriptors being waited on and to wake the event subsystem during
    *  shutdown */
   ares_event_t           *ev_signal;
+  /*! Handle for configuration change monitoring */
+  ares_event_configchg_t *configchg;
   /* Event subsystem callbacks */
   const ares_event_sys_t *ev_sys;
   /* Event subsystem private data */
@@ -124,7 +137,8 @@ struct ares_event_thread {
  *                           Non-socket events cannot be removed, and must have
  *                           ARES_EVENT_FLAG_OTHER set.
  *  \param[in]  cb           Callback to call when
- *                           event is triggered. Required. Not allowed to be
+ *                           event is triggered. Required if flags is not
+ *                           ARES_EVENT_FLAG_NONE. Not allowed to be
  *                           changed, ignored on modification.
  *  \param[in]  fd           File descriptor/socket to monitor. May
  *                           be ARES_SOCKET_BAD if not monitoring file
diff --git a/contrib/libs/c-ares/src/lib/ares_event_configchg.c b/contrib/libs/c-ares/src/lib/ares_event_configchg.c
new file mode 100644
index 000000000000..c7bc9ffd58b4
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/ares_event_configchg.c
@@ -0,0 +1,576 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#include "ares_setup.h"
+#include "ares.h"
+#include "ares_private.h"
+#include "ares_event.h"
+
+#ifdef __ANDROID__
+
+ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
+                                        ares_event_thread_t     *e)
+{
+  /* No ability */
+  return ARES_ENOTIMP;
+}
+
+void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
+{
+  /* No-op */
+}
+
+#elif defined(__linux__)
+
+#  include <sys/inotify.h>
+
+struct ares_event_configchg {
+  int                  inotify_fd;
+  ares_event_thread_t *e;
+};
+
+void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
+{
+  if (configchg == NULL) {
+    return;
+  }
+
+  /* Tell event system to stop monitoring for changes.  This will cause the
+   * cleanup to be called */
+  ares_event_update(NULL, configchg->e, ARES_EVENT_FLAG_NONE, NULL,
+                    configchg->inotify_fd, NULL, NULL, NULL);
+}
+
+static void ares_event_configchg_free(void *data)
+{
+  ares_event_configchg_t *configchg = data;
+  if (configchg == NULL) {
+    return;
+  }
+
+  if (configchg->inotify_fd >= 0) {
+    close(configchg->inotify_fd);
+    configchg->inotify_fd = -1;
+  }
+
+  ares_free(configchg);
+}
+
+static void ares_event_configchg_cb(ares_event_thread_t *e, ares_socket_t fd,
+                                    void *data, ares_event_flags_t flags)
+{
+  const ares_event_configchg_t *configchg = data;
+
+  /* Some systems cannot read integer variables if they are not
+   * properly aligned. On other systems, incorrect alignment may
+   * decrease performance. Hence, the buffer used for reading from
+   * the inotify file descriptor should have the same alignment as
+   * struct inotify_event. */
+  unsigned char                 buf[4096]
+    __attribute__((aligned(__alignof__(struct inotify_event))));
+  const struct inotify_event *event;
+  ssize_t                     len;
+  ares_bool_t                 triggered = ARES_FALSE;
+
+  (void)fd;
+  (void)flags;
+
+  while (1) {
+    const unsigned char *ptr;
+
+    len = read(configchg->inotify_fd, buf, sizeof(buf));
+    if (len <= 0) {
+      break;
+    }
+
+    /* Loop over all events in the buffer. Says kernel will check the buffer
+     * size provided, so I assume it won't ever return partial events. */
+    for (ptr  = buf; ptr < buf + len;
+         ptr += sizeof(struct inotify_event) + event->len) {
+      event = (const struct inotify_event *)ptr;
+
+      if (event->len == 0 || ares_strlen(event->name) == 0) {
+        continue;
+      }
+
+      if (strcasecmp(event->name, "resolv.conf") == 0 ||
+          strcasecmp(event->name, "nsswitch.conf") == 0) {
+        triggered = ARES_TRUE;
+      }
+    }
+  }
+
+  /* Only process after all events are read.  No need to process more often as
+   * we don't want to reload the config back to back */
+  if (triggered) {
+    ares_reinit(e->channel);
+  }
+}
+
+ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
+                                        ares_event_thread_t     *e)
+{
+  ares_status_t           status = ARES_SUCCESS;
+  ares_event_configchg_t *c;
+
+  (void)e;
+
+  /* Not used by this implementation */
+  *configchg = NULL;
+
+  c = ares_malloc_zero(sizeof(*c));
+  if (c == NULL) {
+    return ARES_ENOMEM;
+  }
+
+  c->e          = e;
+  c->inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
+  if (c->inotify_fd == -1) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  /* We need to monitor /etc/resolv.conf, /etc/nsswitch.conf */
+  if (inotify_add_watch(c->inotify_fd, "/etc",
+                        IN_CREATE | IN_MODIFY | IN_MOVED_TO | IN_ONLYDIR) ==
+      -1) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  status =
+    ares_event_update(NULL, e, ARES_EVENT_FLAG_READ, ares_event_configchg_cb,
+                      c->inotify_fd, c, ares_event_configchg_free, NULL);
+
+done:
+  if (status != ARES_SUCCESS) {
+    ares_event_configchg_free(c);
+  } else {
+    *configchg = c;
+  }
+  return status;
+}
+
+#elif defined(_WIN32)
+
+#  include <winsock2.h>
+#  include <iphlpapi.h>
+#  include <stdio.h>
+#  include <windows.h>
+
+struct ares_event_configchg {
+  HANDLE               ifchg_hnd;
+  ares_event_thread_t *e;
+};
+
+void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
+{
+#  ifdef __WATCOMC__
+  /* Not supported */
+#  else
+  if (configchg == NULL) {
+    return;
+  }
+
+  if (configchg->ifchg_hnd != NULL) {
+    CancelMibChangeNotify2(configchg->ifchg_hnd);
+    configchg->ifchg_hnd = NULL;
+  }
+
+  ares_free(configchg);
+#  endif
+}
+
+#  ifndef __WATCOMC__
+static void ares_event_configchg_cb(PVOID                 CallerContext,
+                                    PMIB_IPINTERFACE_ROW  Row,
+                                    MIB_NOTIFICATION_TYPE NotificationType)
+{
+  ares_event_configchg_t *configchg = CallerContext;
+  (void)Row;
+  (void)NotificationType;
+  ares_reinit(configchg->e->channel);
+}
+#  endif
+
+
+ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
+                                        ares_event_thread_t     *e)
+{
+#  ifdef __WATCOMC__
+  return ARES_ENOTIMP;
+#  else
+  ares_status_t status = ARES_SUCCESS;
+
+  *configchg = ares_malloc_zero(sizeof(**configchg));
+  if (*configchg == NULL) {
+    return ARES_ENOMEM;
+  }
+
+  (*configchg)->e = e;
+
+  /* NOTE: If a user goes into the control panel and changes the network
+   *       adapter DNS addresses manually, this will NOT trigger a notification.
+   *       We've also tried listening on NotifyUnicastIpAddressChange(), but
+   *       that didn't get triggered either.
+   */
+
+  if (NotifyIpInterfaceChange(
+        AF_UNSPEC, (PIPINTERFACE_CHANGE_CALLBACK)ares_event_configchg_cb,
+        *configchg, FALSE, &(*configchg)->ifchg_hnd) != NO_ERROR) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+done:
+  if (status != ARES_SUCCESS) {
+    ares_event_configchg_destroy(*configchg);
+    *configchg = NULL;
+  }
+
+  return status;
+#  endif
+}
+
+#elif defined(__APPLE__)
+
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <notify.h>
+#  include <dlfcn.h>
+
+struct ares_event_configchg {
+  int fd;
+  int token;
+};
+
+void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
+{
+  (void)configchg;
+
+  /* Cleanup happens automatically */
+}
+
+static void ares_event_configchg_free(void *data)
+{
+  ares_event_configchg_t *configchg = data;
+  if (configchg == NULL) {
+    return;
+  }
+
+  if (configchg->fd >= 0) {
+    notify_cancel(configchg->token);
+    /* automatically closes fd */
+    configchg->fd = -1;
+  }
+
+  ares_free(configchg);
+}
+
+static void ares_event_configchg_cb(ares_event_thread_t *e, ares_socket_t fd,
+                                    void *data, ares_event_flags_t flags)
+{
+  ares_event_configchg_t *configchg = data;
+  ares_bool_t             triggered = ARES_FALSE;
+
+  (void)fd;
+  (void)flags;
+
+  while (1) {
+    int     t = 0;
+    ssize_t len;
+
+    len = read(configchg->fd, &t, sizeof(t));
+
+    if (len < (ssize_t)sizeof(t)) {
+      break;
+    }
+
+    /* Token is read in network byte order (yeah, docs don't mention this) */
+    t = (int)ntohl(t);
+
+    if (t != configchg->token) {
+      continue;
+    }
+
+    triggered = ARES_TRUE;
+  }
+
+  /* Only process after all events are read.  No need to process more often as
+   * we don't want to reload the config back to back */
+  if (triggered) {
+    ares_reinit(e->channel);
+  }
+}
+
+ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
+                                        ares_event_thread_t     *e)
+{
+  ares_status_t status                               = ARES_SUCCESS;
+  void         *handle                               = NULL;
+  const char *(*pdns_configuration_notify_key)(void) = NULL;
+  const char *notify_key                             = NULL;
+  int         flags;
+
+  *configchg = ares_malloc_zero(sizeof(**configchg));
+  if (*configchg == NULL) {
+    return ARES_ENOMEM;
+  }
+
+  /* Load symbol as it isn't normally public */
+  handle = dlopen("/usr/lib/libSystem.dylib", RTLD_LAZY | RTLD_NOLOAD);
+  if (handle == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  pdns_configuration_notify_key = dlsym(handle, "dns_configuration_notify_key");
+
+  if (pdns_configuration_notify_key == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  notify_key = pdns_configuration_notify_key();
+  if (notify_key == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  if (notify_register_file_descriptor(notify_key, &(*configchg)->fd, 0,
+                                      &(*configchg)->token) !=
+      NOTIFY_STATUS_OK) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  /* Set file descriptor to non-blocking */
+  flags = fcntl((*configchg)->fd, F_GETFL, 0);
+  fcntl((*configchg)->fd, F_SETFL, flags | O_NONBLOCK);
+
+  /* Register file descriptor with event subsystem */
+  status = ares_event_update(NULL, e, ARES_EVENT_FLAG_READ,
+                             ares_event_configchg_cb, (*configchg)->fd,
+                             *configchg, ares_event_configchg_free, NULL);
+
+done:
+  if (status != ARES_SUCCESS) {
+    ares_event_configchg_free(*configchg);
+    *configchg = NULL;
+  }
+
+  if (handle) {
+    dlclose(handle);
+  }
+
+  return status;
+}
+
+#elif defined(HAVE_STAT)
+#  ifdef HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#  endif
+#  ifdef HAVE_SYS_STAT_H
+#    include <sys/stat.h>
+#  endif
+
+typedef struct {
+  size_t size;
+  time_t mtime;
+} fileinfo_t;
+
+struct ares_event_configchg {
+  ares_bool_t           isup;
+  ares__thread_t       *thread;
+  ares__htable_strvp_t *filestat;
+  ares__thread_mutex_t *lock;
+  ares__thread_cond_t  *wake;
+  const char           *resolvconf_path;
+  ares_event_thread_t  *e;
+};
+
+static ares_status_t config_change_check(ares__htable_strvp_t *filestat,
+                                         const char           *resolvconf_path)
+{
+  size_t      i;
+  const char *configfiles[] = { resolvconf_path, "/etc/nsswitch.conf",
+                                "/etc/netsvc.conf", "/etc/svc.conf", NULL };
+  ares_bool_t changed       = ARES_FALSE;
+
+  for (i = 0; configfiles[i] != NULL; i++) {
+    fileinfo_t *fi = ares__htable_strvp_get_direct(filestat, configfiles[i]);
+    struct stat st;
+
+    if (stat(configfiles[i], &st) == 0) {
+      if (fi == NULL) {
+        fi = ares_malloc_zero(sizeof(*fi));
+        if (fi == NULL) {
+          return ARES_ENOMEM;
+        }
+        if (!ares__htable_strvp_insert(filestat, configfiles[i], fi)) {
+          ares_free(fi);
+          return ARES_ENOMEM;
+        }
+      }
+      if (fi->size != (size_t)st.st_size || fi->mtime != (time_t)st.st_mtime) {
+        changed = ARES_TRUE;
+      }
+      fi->size  = (size_t)st.st_size;
+      fi->mtime = (time_t)st.st_mtime;
+    } else if (fi != NULL) {
+      /* File no longer exists, remove */
+      ares__htable_strvp_remove(filestat, configfiles[i]);
+      changed = ARES_TRUE;
+    }
+  }
+
+  if (changed) {
+    return ARES_SUCCESS;
+  }
+  return ARES_ENOTFOUND;
+}
+
+static void *ares_event_configchg_thread(void *arg)
+{
+  ares_event_configchg_t *c = arg;
+
+  ares__thread_mutex_lock(c->lock);
+  while (c->isup) {
+    ares_status_t status;
+
+    if (ares__thread_cond_timedwait(c->wake, c->lock, 30000) != ARES_ETIMEOUT) {
+      continue;
+    }
+
+    /* make sure status didn't change even though we got a timeout */
+    if (!c->isup) {
+      break;
+    }
+
+    status = config_change_check(c->filestat, c->resolvconf_path);
+    if (status == ARES_SUCCESS) {
+      ares_reinit(c->e->channel);
+    }
+  }
+
+  ares__thread_mutex_unlock(c->lock);
+  return NULL;
+}
+
+ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
+                                        ares_event_thread_t     *e)
+{
+  ares_status_t           status = ARES_SUCCESS;
+  ares_event_configchg_t *c      = NULL;
+
+  *configchg = NULL;
+
+  c = ares_malloc_zero(sizeof(*c));
+  if (c == NULL) {
+    status = ARES_ENOMEM;
+    goto done;
+  }
+
+  c->e = e;
+
+  c->filestat = ares__htable_strvp_create(ares_free);
+  if (c->filestat == NULL) {
+    status = ARES_ENOMEM;
+    goto done;
+  }
+
+  c->wake = ares__thread_cond_create();
+  if (c->wake == NULL) {
+    status = ARES_ENOMEM;
+    goto done;
+  }
+
+  c->resolvconf_path = c->e->channel->resolvconf_path;
+  if (c->resolvconf_path == NULL) {
+    c->resolvconf_path = PATH_RESOLV_CONF;
+  }
+
+  status = config_change_check(c->filestat, c->resolvconf_path);
+  if (status == ARES_ENOMEM) {
+    goto done;
+  }
+
+  c->isup = ARES_TRUE;
+  status  = ares__thread_create(&c->thread, ares_event_configchg_thread, c);
+
+done:
+  if (status != ARES_SUCCESS) {
+    ares_event_configchg_destroy(c);
+  } else {
+    *configchg = c;
+  }
+  return status;
+}
+
+void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
+{
+  if (configchg == NULL) {
+    return;
+  }
+
+  if (configchg->lock) {
+    ares__thread_mutex_lock(configchg->lock);
+  }
+
+  configchg->isup = ARES_FALSE;
+  if (configchg->wake) {
+    ares__thread_cond_signal(configchg->wake);
+  }
+
+  if (configchg->lock) {
+    ares__thread_mutex_unlock(configchg->lock);
+  }
+
+  if (configchg->thread) {
+    void *rv = NULL;
+    ares__thread_join(configchg->thread, &rv);
+  }
+
+  ares__thread_mutex_destroy(configchg->lock);
+  ares__thread_cond_destroy(configchg->wake);
+  ares__htable_strvp_destroy(configchg->filestat);
+  ares_free(configchg);
+}
+
+#else
+
+ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
+                                        ares_event_thread_t     *e)
+{
+  /* No ability */
+  return ARES_ENOTIMP;
+}
+
+void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
+{
+  /* No-op */
+}
+
+#endif
diff --git a/contrib/libs/c-ares/src/lib/ares_event_epoll.c b/contrib/libs/c-ares/src/lib/ares_event_epoll.c
index 9d3c097f8e43..78cbbc368c8e 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_epoll.c
+++ b/contrib/libs/c-ares/src/lib/ares_event_epoll.c
@@ -167,7 +167,7 @@ static size_t ares_evsys_epoll_wait(ares_event_thread_t *e,
     ares_event_t      *ev;
     ares_event_flags_t flags = 0;
 
-    ev = ares__htable_asvp_get_direct(e->ev_handles,
+    ev = ares__htable_asvp_get_direct(e->ev_sock_handles,
                                       (ares_socket_t)events[i].data.fd);
     if (ev == NULL || ev->cb == NULL) {
       continue;
diff --git a/contrib/libs/c-ares/src/lib/ares_event_kqueue.c b/contrib/libs/c-ares/src/lib/ares_event_kqueue.c
index 944c4b003bc5..7e2c60abf518 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_kqueue.c
+++ b/contrib/libs/c-ares/src/lib/ares_event_kqueue.c
@@ -218,7 +218,7 @@ static size_t ares_evsys_kqueue_wait(ares_event_thread_t *e,
     ares_event_t      *ev;
     ares_event_flags_t flags = 0;
 
-    ev = ares__htable_asvp_get_direct(e->ev_handles,
+    ev = ares__htable_asvp_get_direct(e->ev_sock_handles,
                                       (ares_socket_t)events[i].ident);
     if (ev == NULL || ev->cb == NULL) {
       continue;
diff --git a/contrib/libs/c-ares/src/lib/ares_event_poll.c b/contrib/libs/c-ares/src/lib/ares_event_poll.c
index 33b1d6dfd58e..a06c6e3fc410 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_poll.c
+++ b/contrib/libs/c-ares/src/lib/ares_event_poll.c
@@ -69,7 +69,7 @@ static size_t ares_evsys_poll_wait(ares_event_thread_t *e,
                                    unsigned long        timeout_ms)
 {
   size_t         num_fds = 0;
-  ares_socket_t *fdlist  = ares__htable_asvp_keys(e->ev_handles, &num_fds);
+  ares_socket_t *fdlist  = ares__htable_asvp_keys(e->ev_sock_handles, &num_fds);
   struct pollfd *pollfd  = NULL;
   int            rv;
   size_t         cnt = 0;
@@ -82,7 +82,7 @@ static size_t ares_evsys_poll_wait(ares_event_thread_t *e,
     }
     for (i = 0; i < num_fds; i++) {
       const ares_event_t *ev =
-        ares__htable_asvp_get_direct(e->ev_handles, fdlist[i]);
+        ares__htable_asvp_get_direct(e->ev_sock_handles, fdlist[i]);
       pollfd[i].fd = ev->fd;
       if (ev->flags & ARES_EVENT_FLAG_READ) {
         pollfd[i].events |= POLLIN;
@@ -109,7 +109,7 @@ static size_t ares_evsys_poll_wait(ares_event_thread_t *e,
 
     cnt++;
 
-    ev = ares__htable_asvp_get_direct(e->ev_handles, pollfd[i].fd);
+    ev = ares__htable_asvp_get_direct(e->ev_sock_handles, pollfd[i].fd);
     if (ev == NULL || ev->cb == NULL) {
       continue;
     }
diff --git a/contrib/libs/c-ares/src/lib/ares_event_select.c b/contrib/libs/c-ares/src/lib/ares_event_select.c
index 4823e808f10d..57a4271ea7da 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_select.c
+++ b/contrib/libs/c-ares/src/lib/ares_event_select.c
@@ -23,6 +23,12 @@
  *
  * SPDX-License-Identifier: MIT
  */
+
+/* Some systems might default to something low like 256 (NetBSD), lets define
+ * this to assist.  Really, no one should be using select, but lets be safe
+ * anyhow */
+#define FD_SETSIZE 4096
+
 #include "ares_setup.h"
 #include "ares.h"
 #include "ares_private.h"
@@ -71,7 +77,7 @@ static size_t ares_evsys_select_wait(ares_event_thread_t *e,
                                      unsigned long        timeout_ms)
 {
   size_t          num_fds = 0;
-  ares_socket_t  *fdlist  = ares__htable_asvp_keys(e->ev_handles, &num_fds);
+  ares_socket_t  *fdlist = ares__htable_asvp_keys(e->ev_sock_handles, &num_fds);
   int             rv;
   size_t          cnt = 0;
   size_t          i;
@@ -86,7 +92,7 @@ static size_t ares_evsys_select_wait(ares_event_thread_t *e,
 
   for (i = 0; i < num_fds; i++) {
     const ares_event_t *ev =
-      ares__htable_asvp_get_direct(e->ev_handles, fdlist[i]);
+      ares__htable_asvp_get_direct(e->ev_sock_handles, fdlist[i]);
     if (ev->flags & ARES_EVENT_FLAG_READ) {
       FD_SET(ev->fd, &read_fds);
     }
@@ -110,7 +116,7 @@ static size_t ares_evsys_select_wait(ares_event_thread_t *e,
       ares_event_t      *ev;
       ares_event_flags_t flags = 0;
 
-      ev = ares__htable_asvp_get_direct(e->ev_handles, fdlist[i]);
+      ev = ares__htable_asvp_get_direct(e->ev_sock_handles, fdlist[i]);
       if (ev == NULL || ev->cb == NULL) {
         continue;
       }
diff --git a/contrib/libs/c-ares/src/lib/ares_event_thread.c b/contrib/libs/c-ares/src/lib/ares_event_thread.c
index 6dd7b502a357..d9d904f29ba9 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_thread.c
+++ b/contrib/libs/c-ares/src/lib/ares_event_thread.c
@@ -89,7 +89,12 @@ ares_status_t ares_event_update(ares_event_t **event, ares_event_thread_t *e,
 {
   ares_event_t *ev = NULL;
 
-  if (e == NULL || cb == NULL) {
+  if (e == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  /* Callback must be specified if not a removal event. */
+  if (flags != ARES_EVENT_FLAG_NONE && cb == NULL) {
     return ARES_EFORMERR;
   }
 
@@ -211,8 +216,13 @@ static void ares_event_process_updates(ares_event_thread_t *e)
    * list */
   while ((node = ares__llist_node_first(e->ev_updates)) != NULL) {
     ares_event_t *newev = ares__llist_node_claim(node);
-    ares_event_t *oldev =
-      ares__htable_asvp_get_direct(e->ev_handles, newev->fd);
+    ares_event_t *oldev;
+
+    if (newev->fd == ARES_SOCKET_BAD) {
+      oldev = ares__htable_vpvp_get_direct(e->ev_cust_handles, newev->data);
+    } else {
+      oldev = ares__htable_asvp_get_direct(e->ev_sock_handles, newev->fd);
+    }
 
     /* Adding new */
     if (oldev == NULL) {
@@ -225,7 +235,11 @@ static void ares_event_process_updates(ares_event_thread_t *e)
         newev->e = NULL;
         ares_event_destroy_cb(newev);
       } else {
-        ares__htable_asvp_insert(e->ev_handles, newev->fd, newev);
+        if (newev->fd == ARES_SOCKET_BAD) {
+          ares__htable_vpvp_insert(e->ev_cust_handles, newev->data, newev);
+        } else {
+          ares__htable_asvp_insert(e->ev_sock_handles, newev->fd, newev);
+        }
       }
       continue;
     }
@@ -234,7 +248,11 @@ static void ares_event_process_updates(ares_event_thread_t *e)
     if (newev->flags == ARES_EVENT_FLAG_NONE) {
       /* the callback for the removal will call e->ev_sys->event_del(e, event)
        */
-      ares__htable_asvp_remove(e->ev_handles, newev->fd);
+      if (newev->fd == ARES_SOCKET_BAD) {
+        ares__htable_vpvp_remove(e->ev_cust_handles, newev->data);
+      } else {
+        ares__htable_asvp_remove(e->ev_sock_handles, newev->fd);
+      }
       ares_free(newev);
       continue;
     }
@@ -306,10 +324,13 @@ static void ares_event_thread_destroy_int(ares_event_thread_t *e)
   ares__llist_destroy(e->ev_updates);
   e->ev_updates = NULL;
 
-  ares__htable_asvp_destroy(e->ev_handles);
-  e->ev_handles = NULL;
+  ares__htable_asvp_destroy(e->ev_sock_handles);
+  e->ev_sock_handles = NULL;
+
+  ares__htable_vpvp_destroy(e->ev_cust_handles);
+  e->ev_cust_handles = NULL;
 
-  if (e->ev_sys->destroy) {
+  if (e->ev_sys && e->ev_sys->destroy) {
     e->ev_sys->destroy(e);
   }
 
@@ -409,8 +430,14 @@ ares_status_t ares_event_thread_init(ares_channel_t *channel)
     return ARES_ENOMEM;
   }
 
-  e->ev_handles = ares__htable_asvp_create(ares_event_destroy_cb);
-  if (e->ev_handles == NULL) {
+  e->ev_sock_handles = ares__htable_asvp_create(ares_event_destroy_cb);
+  if (e->ev_sock_handles == NULL) {
+    ares_event_thread_destroy_int(e);
+    return ARES_ENOMEM;
+  }
+
+  e->ev_cust_handles = ares__htable_vpvp_create(NULL, ares_event_destroy_cb);
+  if (e->ev_cust_handles == NULL) {
     ares_event_thread_destroy_int(e);
     return ARES_ENOMEM;
   }
diff --git a/contrib/libs/c-ares/src/lib/ares_fds.c b/contrib/libs/c-ares/src/lib/ares_fds.c
index e726d4f01287..e39823304a70 100644
--- a/contrib/libs/c-ares/src/lib/ares_fds.c
+++ b/contrib/libs/c-ares/src/lib/ares_fds.c
@@ -30,7 +30,7 @@
 #include "ares.h"
 #include "ares_private.h"
 
-int ares_fds(ares_channel_t *channel, fd_set *read_fds, fd_set *write_fds)
+int ares_fds(const ares_channel_t *channel, fd_set *read_fds, fd_set *write_fds)
 {
   ares_socket_t       nfds;
   ares__slist_node_t *snode;
diff --git a/contrib/libs/c-ares/src/lib/ares_getnameinfo.c b/contrib/libs/c-ares/src/lib/ares_getnameinfo.c
index 8889e9eec6fe..d4cf58ea5165 100644
--- a/contrib/libs/c-ares/src/lib/ares_getnameinfo.c
+++ b/contrib/libs/c-ares/src/lib/ares_getnameinfo.c
@@ -98,11 +98,12 @@ static void  ares_getnameinfo_int(ares_channel_t        *channel,
   unsigned int               flags = (unsigned int)flags_int;
 
   /* Validate socket address family and length */
-  if ((sa->sa_family == AF_INET) && (salen == sizeof(struct sockaddr_in))) {
+  if (sa && sa->sa_family == AF_INET &&
+      salen >= (ares_socklen_t)sizeof(struct sockaddr_in)) {
     addr = CARES_INADDR_CAST(struct sockaddr_in *, sa);
     port = addr->sin_port;
-  } else if ((sa->sa_family == AF_INET6) &&
-             (salen == sizeof(struct sockaddr_in6))) {
+  } else if (sa && sa->sa_family == AF_INET6 &&
+             salen >= (ares_socklen_t)sizeof(struct sockaddr_in6)) {
     addr6 = CARES_INADDR_CAST(struct sockaddr_in6 *, sa);
     port  = addr6->sin6_port;
   } else {
@@ -142,7 +143,7 @@ static void  ares_getnameinfo_int(ares_channel_t        *channel,
         callback(arg, ARES_EBADFLAGS, 0, NULL, NULL);
         return;
       }
-      if (salen == sizeof(struct sockaddr_in6)) {
+      if (sa->sa_family == AF_INET6) {
         ares_inet_ntop(AF_INET6, &addr6->sin6_addr, ipbuf, IPBUFSIZ);
         /* If the system supports scope IDs, use it */
 #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
@@ -158,9 +159,8 @@ static void  ares_getnameinfo_int(ares_channel_t        *channel,
       }
       callback(arg, ARES_SUCCESS, 0, ipbuf, service);
       return;
-    }
-    /* This is where a DNS lookup becomes necessary */
-    else {
+    } else {
+      /* This is where a DNS lookup becomes necessary */
       niquery = ares_malloc(sizeof(struct nameinfo_query));
       if (!niquery) {
         callback(arg, ARES_ENOMEM, 0, NULL, NULL);
diff --git a/contrib/libs/c-ares/src/lib/ares_getsock.c b/contrib/libs/c-ares/src/lib/ares_getsock.c
index 0353bad6391e..b64c075572de 100644
--- a/contrib/libs/c-ares/src/lib/ares_getsock.c
+++ b/contrib/libs/c-ares/src/lib/ares_getsock.c
@@ -29,7 +29,7 @@
 #include "ares.h"
 #include "ares_private.h"
 
-int ares_getsock(ares_channel_t *channel, ares_socket_t *socks,
+int ares_getsock(const ares_channel_t *channel, ares_socket_t *socks,
                  int numsocks) /* size of the 'socks' array */
 {
   ares__slist_node_t *snode;
diff --git a/contrib/libs/c-ares/src/lib/ares_init.c b/contrib/libs/c-ares/src/lib/ares_init.c
index 27147fa64d05..c8b4c3456411 100644
--- a/contrib/libs/c-ares/src/lib/ares_init.c
+++ b/contrib/libs/c-ares/src/lib/ares_init.c
@@ -65,6 +65,7 @@
 #include "ares_inet_net_pton.h"
 #include "ares_platform.h"
 #include "ares_private.h"
+#include "ares_event.h"
 
 #ifdef WATT32
 #  undef WIN32 /* Redefined in MingW/MSVC headers */
@@ -81,17 +82,17 @@ static int ares_query_timeout_cmp_cb(const void *arg1, const void *arg2)
   const struct query *q1 = arg1;
   const struct query *q2 = arg2;
 
-  if (q1->timeout.tv_sec > q2->timeout.tv_sec) {
+  if (q1->timeout.sec > q2->timeout.sec) {
     return 1;
   }
-  if (q1->timeout.tv_sec < q2->timeout.tv_sec) {
+  if (q1->timeout.sec < q2->timeout.sec) {
     return -1;
   }
 
-  if (q1->timeout.tv_usec > q2->timeout.tv_usec) {
+  if (q1->timeout.usec > q2->timeout.usec) {
     return 1;
   }
-  if (q1->timeout.tv_usec < q2->timeout.tv_usec) {
+  if (q1->timeout.usec < q2->timeout.usec) {
     return -1;
   }
 
@@ -379,10 +380,21 @@ int ares_init_options(ares_channel_t           **channelptr,
 
   /* Initialize the event thread */
   if (channel->optmask & ARES_OPT_EVENT_THREAD) {
+    ares_event_thread_t *e = NULL;
+
     status = ares_event_thread_init(channel);
     if (status != ARES_SUCCESS) {
       goto done;
     }
+
+    /* Initialize monitor for configuration changes.  In some rare cases,
+     * ARES_ENOTIMP may occur (OpenWatcom), ignore this. */
+    e      = channel->sock_state_cb_data;
+    status = ares_event_configchg_init(&e->configchg, e);
+    if (status != ARES_SUCCESS && status != ARES_ENOTIMP) {
+      goto done;
+    }
+    status = ARES_SUCCESS;
   }
 
 done:
@@ -395,35 +407,78 @@ int ares_init_options(ares_channel_t           **channelptr,
   return ARES_SUCCESS;
 }
 
-ares_status_t ares_reinit(ares_channel_t *channel)
+static void *ares_reinit_thread(void *arg)
 {
-  ares_status_t status;
-
-  if (channel == NULL) {
-    return ARES_EFORMERR;
-  }
-
-  ares__channel_lock(channel);
+  ares_channel_t *channel = arg;
+  ares_status_t   status;
 
+  /* ares__init_by_sysconfig() will lock when applying the config, but not
+   * when retrieving. */
   status = ares__init_by_sysconfig(channel);
   if (status != ARES_SUCCESS) {
     DEBUGF(fprintf(stderr, "Error: init_by_sysconfig failed: %s\n",
                    ares_strerror(status)));
   }
 
+  ares__channel_lock(channel);
+
   /* Flush cached queries on reinit */
-  if (channel->qcache) {
+  if (status == ARES_SUCCESS && channel->qcache) {
     ares__qcache_flush(channel->qcache);
   }
 
+  channel->reinit_pending = ARES_FALSE;
   ares__channel_unlock(channel);
 
+  return NULL;
+}
+
+ares_status_t ares_reinit(ares_channel_t *channel)
+{
+  ares_status_t status = ARES_SUCCESS;
+
+  if (channel == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  ares__channel_lock(channel);
+
+  /* If a reinit is already in process, lets not do it again */
+  if (channel->reinit_pending) {
+    ares__channel_unlock(channel);
+    return ARES_SUCCESS;
+  }
+  channel->reinit_pending = ARES_TRUE;
+  ares__channel_unlock(channel);
+
+  if (ares_threadsafety()) {
+    /* clean up the prior reinit process's thread.  We know the thread isn't
+     * running since reinit_pending was false */
+    if (channel->reinit_thread != NULL) {
+      void *rv;
+      ares__thread_join(channel->reinit_thread, &rv);
+      channel->reinit_thread = NULL;
+    }
+
+    /* Spawn a new thread */
+    status =
+      ares__thread_create(&channel->reinit_thread, ares_reinit_thread, channel);
+    if (status != ARES_SUCCESS) {
+      ares__channel_lock(channel);
+      channel->reinit_pending = ARES_FALSE;
+      ares__channel_unlock(channel);
+    }
+  } else {
+    /* Threading support not available, call directly */
+    ares_reinit_thread(channel);
+  }
+
   return status;
 }
 
 /* ares_dup() duplicates a channel handle with all its options and returns a
    new channel handle */
-int ares_dup(ares_channel_t **dest, ares_channel_t *src)
+int ares_dup(ares_channel_t **dest, const ares_channel_t *src)
 {
   struct ares_options opts;
   ares_status_t       rc;
@@ -456,12 +511,14 @@ int ares_dup(ares_channel_t **dest, ares_channel_t *src)
 
   /* Now clone the options that ares_save_options() doesn't support, but are
    * user-provided */
-  (*dest)->sock_create_cb      = src->sock_create_cb;
-  (*dest)->sock_create_cb_data = src->sock_create_cb_data;
-  (*dest)->sock_config_cb      = src->sock_config_cb;
-  (*dest)->sock_config_cb_data = src->sock_config_cb_data;
-  (*dest)->sock_funcs          = src->sock_funcs;
-  (*dest)->sock_func_cb_data   = src->sock_func_cb_data;
+  (*dest)->sock_create_cb       = src->sock_create_cb;
+  (*dest)->sock_create_cb_data  = src->sock_create_cb_data;
+  (*dest)->sock_config_cb       = src->sock_config_cb;
+  (*dest)->sock_config_cb_data  = src->sock_config_cb_data;
+  (*dest)->sock_funcs           = src->sock_funcs;
+  (*dest)->sock_func_cb_data    = src->sock_func_cb_data;
+  (*dest)->server_state_cb      = src->server_state_cb;
+  (*dest)->server_state_cb_data = src->server_state_cb_data;
 
   ares_strcpy((*dest)->local_dev_name, src->local_dev_name,
               sizeof((*dest)->local_dev_name));
diff --git a/contrib/libs/c-ares/src/lib/ares_ipv6.h b/contrib/libs/c-ares/src/lib/ares_ipv6.h
index 28d7851ff3f0..e7e0b6d3a5e6 100644
--- a/contrib/libs/c-ares/src/lib/ares_ipv6.h
+++ b/contrib/libs/c-ares/src/lib/ares_ipv6.h
@@ -31,6 +31,15 @@
 #  include <netinet6/in6.h>
 #endif
 
+#if defined(USE_WINSOCK)
+#  if defined(HAVE_IPHLPAPI_H)
+#    include <iphlpapi.h>
+#  endif
+#  if defined(HAVE_NETIOAPI_H)
+#    include <netioapi.h>
+#  endif
+#endif
+
 #ifndef HAVE_PF_INET6
 #  define PF_INET6 AF_INET6
 #endif
diff --git a/contrib/libs/c-ares/src/lib/ares_options.c b/contrib/libs/c-ares/src/lib/ares_options.c
index 4306242cb27a..6f50f2e49813 100644
--- a/contrib/libs/c-ares/src/lib/ares_options.c
+++ b/contrib/libs/c-ares/src/lib/ares_options.c
@@ -53,8 +53,8 @@ void ares_destroy_options(struct ares_options *options)
   ares_free(options->hosts_path);
 }
 
-static struct in_addr *ares_save_opt_servers(ares_channel_t *channel,
-                                             int            *nservers)
+static struct in_addr *ares_save_opt_servers(const ares_channel_t *channel,
+                                             int                  *nservers)
 {
   ares__slist_node_t *snode;
   struct in_addr     *out =
@@ -82,8 +82,8 @@ static struct in_addr *ares_save_opt_servers(ares_channel_t *channel,
 }
 
 /* Save options from initialized channel */
-int ares_save_options(ares_channel_t *channel, struct ares_options *options,
-                      int *optmask)
+int ares_save_options(const ares_channel_t *channel,
+                      struct ares_options *options, int *optmask)
 {
   size_t i;
 
@@ -231,10 +231,8 @@ int ares_save_options(ares_channel_t *channel, struct ares_options *options,
 
   /* Set options for server failover behavior */
   if (channel->optmask & ARES_OPT_SERVER_FAILOVER) {
-    options->server_failover_opts.retry_chance =
-      channel->server_retry_chance;
-    options->server_failover_opts.retry_delay =
-      channel->server_retry_delay;
+    options->server_failover_opts.retry_chance = channel->server_retry_chance;
+    options->server_failover_opts.retry_delay  = channel->server_retry_delay;
   }
 
   *optmask = (int)channel->optmask;
@@ -484,10 +482,8 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
 
   /* Set fields for server failover behavior */
   if (optmask & ARES_OPT_SERVER_FAILOVER) {
-    channel->server_retry_chance =
-      options->server_failover_opts.retry_chance;
-    channel->server_retry_delay =
-      options->server_failover_opts.retry_delay;
+    channel->server_retry_chance = options->server_failover_opts.retry_chance;
+    channel->server_retry_delay  = options->server_failover_opts.retry_delay;
   }
 
   channel->optmask = (unsigned int)optmask;
diff --git a/contrib/libs/c-ares/src/lib/ares_platform.c b/contrib/libs/c-ares/src/lib/ares_platform.c
index 0727ae001c84..58a50198713d 100644
--- a/contrib/libs/c-ares/src/lib/ares_platform.c
+++ b/contrib/libs/c-ares/src/lib/ares_platform.c
@@ -101,10901 +101,10901 @@ struct pvt_servent {
 
 static struct pvt_servent IANAports[] = {
 #  ifdef USE_IANA_WELL_KNOWN_PORTS
-  {"tcpmux",           { NULL }, 1,     "tcp" },
-  { "tcpmux",          { NULL }, 1,     "udp" },
-  { "compressnet",     { NULL }, 2,     "tcp" },
-  { "compressnet",     { NULL }, 2,     "udp" },
-  { "compressnet",     { NULL }, 3,     "tcp" },
-  { "compressnet",     { NULL }, 3,     "udp" },
-  { "rje",             { NULL }, 5,     "tcp" },
-  { "rje",             { NULL }, 5,     "udp" },
-  { "echo",            { NULL }, 7,     "tcp" },
-  { "echo",            { NULL }, 7,     "udp" },
-  { "discard",         { NULL }, 9,     "tcp" },
-  { "discard",         { NULL }, 9,     "udp" },
-  { "discard",         { NULL }, 9,     "sctp"},
-  { "discard",         { NULL }, 9,     "dccp"},
-  { "systat",          { NULL }, 11,    "tcp" },
-  { "systat",          { NULL }, 11,    "udp" },
-  { "daytime",         { NULL }, 13,    "tcp" },
-  { "daytime",         { NULL }, 13,    "udp" },
-  { "qotd",            { NULL }, 17,    "tcp" },
-  { "qotd",            { NULL }, 17,    "udp" },
-  { "msp",             { NULL }, 18,    "tcp" },
-  { "msp",             { NULL }, 18,    "udp" },
-  { "chargen",         { NULL }, 19,    "tcp" },
-  { "chargen",         { NULL }, 19,    "udp" },
-  { "ftp-data",        { NULL }, 20,    "tcp" },
-  { "ftp-data",        { NULL }, 20,    "udp" },
-  { "ftp-data",        { NULL }, 20,    "sctp"},
-  { "ftp",             { NULL }, 21,    "tcp" },
-  { "ftp",             { NULL }, 21,    "udp" },
-  { "ftp",             { NULL }, 21,    "sctp"},
-  { "ssh",             { NULL }, 22,    "tcp" },
-  { "ssh",             { NULL }, 22,    "udp" },
-  { "ssh",             { NULL }, 22,    "sctp"},
-  { "telnet",          { NULL }, 23,    "tcp" },
-  { "telnet",          { NULL }, 23,    "udp" },
-  { "smtp",            { NULL }, 25,    "tcp" },
-  { "smtp",            { NULL }, 25,    "udp" },
-  { "nsw-fe",          { NULL }, 27,    "tcp" },
-  { "nsw-fe",          { NULL }, 27,    "udp" },
-  { "msg-icp",         { NULL }, 29,    "tcp" },
-  { "msg-icp",         { NULL }, 29,    "udp" },
-  { "msg-auth",        { NULL }, 31,    "tcp" },
-  { "msg-auth",        { NULL }, 31,    "udp" },
-  { "dsp",             { NULL }, 33,    "tcp" },
-  { "dsp",             { NULL }, 33,    "udp" },
-  { "time",            { NULL }, 37,    "tcp" },
-  { "time",            { NULL }, 37,    "udp" },
-  { "rap",             { NULL }, 38,    "tcp" },
-  { "rap",             { NULL }, 38,    "udp" },
-  { "rlp",             { NULL }, 39,    "tcp" },
-  { "rlp",             { NULL }, 39,    "udp" },
-  { "graphics",        { NULL }, 41,    "tcp" },
-  { "graphics",        { NULL }, 41,    "udp" },
-  { "name",            { NULL }, 42,    "tcp" },
-  { "name",            { NULL }, 42,    "udp" },
-  { "nameserver",      { NULL }, 42,    "tcp" },
-  { "nameserver",      { NULL }, 42,    "udp" },
-  { "nicname",         { NULL }, 43,    "tcp" },
-  { "nicname",         { NULL }, 43,    "udp" },
-  { "mpm-flags",       { NULL }, 44,    "tcp" },
-  { "mpm-flags",       { NULL }, 44,    "udp" },
-  { "mpm",             { NULL }, 45,    "tcp" },
-  { "mpm",             { NULL }, 45,    "udp" },
-  { "mpm-snd",         { NULL }, 46,    "tcp" },
-  { "mpm-snd",         { NULL }, 46,    "udp" },
-  { "ni-ftp",          { NULL }, 47,    "tcp" },
-  { "ni-ftp",          { NULL }, 47,    "udp" },
-  { "auditd",          { NULL }, 48,    "tcp" },
-  { "auditd",          { NULL }, 48,    "udp" },
-  { "tacacs",          { NULL }, 49,    "tcp" },
-  { "tacacs",          { NULL }, 49,    "udp" },
-  { "re-mail-ck",      { NULL }, 50,    "tcp" },
-  { "re-mail-ck",      { NULL }, 50,    "udp" },
-  { "la-maint",        { NULL }, 51,    "tcp" },
-  { "la-maint",        { NULL }, 51,    "udp" },
-  { "xns-time",        { NULL }, 52,    "tcp" },
-  { "xns-time",        { NULL }, 52,    "udp" },
-  { "domain",          { NULL }, 53,    "tcp" },
-  { "domain",          { NULL }, 53,    "udp" },
-  { "xns-ch",          { NULL }, 54,    "tcp" },
-  { "xns-ch",          { NULL }, 54,    "udp" },
-  { "isi-gl",          { NULL }, 55,    "tcp" },
-  { "isi-gl",          { NULL }, 55,    "udp" },
-  { "xns-auth",        { NULL }, 56,    "tcp" },
-  { "xns-auth",        { NULL }, 56,    "udp" },
-  { "xns-mail",        { NULL }, 58,    "tcp" },
-  { "xns-mail",        { NULL }, 58,    "udp" },
-  { "ni-mail",         { NULL }, 61,    "tcp" },
-  { "ni-mail",         { NULL }, 61,    "udp" },
-  { "acas",            { NULL }, 62,    "tcp" },
-  { "acas",            { NULL }, 62,    "udp" },
-  { "whois++",         { NULL }, 63,    "tcp" },
-  { "whois++",         { NULL }, 63,    "udp" },
-  { "covia",           { NULL }, 64,    "tcp" },
-  { "covia",           { NULL }, 64,    "udp" },
-  { "tacacs-ds",       { NULL }, 65,    "tcp" },
-  { "tacacs-ds",       { NULL }, 65,    "udp" },
-  { "sql*net",         { NULL }, 66,    "tcp" },
-  { "sql*net",         { NULL }, 66,    "udp" },
-  { "bootps",          { NULL }, 67,    "tcp" },
-  { "bootps",          { NULL }, 67,    "udp" },
-  { "bootpc",          { NULL }, 68,    "tcp" },
-  { "bootpc",          { NULL }, 68,    "udp" },
-  { "tftp",            { NULL }, 69,    "tcp" },
-  { "tftp",            { NULL }, 69,    "udp" },
-  { "gopher",          { NULL }, 70,    "tcp" },
-  { "gopher",          { NULL }, 70,    "udp" },
-  { "netrjs-1",        { NULL }, 71,    "tcp" },
-  { "netrjs-1",        { NULL }, 71,    "udp" },
-  { "netrjs-2",        { NULL }, 72,    "tcp" },
-  { "netrjs-2",        { NULL }, 72,    "udp" },
-  { "netrjs-3",        { NULL }, 73,    "tcp" },
-  { "netrjs-3",        { NULL }, 73,    "udp" },
-  { "netrjs-4",        { NULL }, 74,    "tcp" },
-  { "netrjs-4",        { NULL }, 74,    "udp" },
-  { "deos",            { NULL }, 76,    "tcp" },
-  { "deos",            { NULL }, 76,    "udp" },
-  { "vettcp",          { NULL }, 78,    "tcp" },
-  { "vettcp",          { NULL }, 78,    "udp" },
-  { "finger",          { NULL }, 79,    "tcp" },
-  { "finger",          { NULL }, 79,    "udp" },
-  { "http",            { NULL }, 80,    "tcp" },
-  { "http",            { NULL }, 80,    "udp" },
-  { "www",             { NULL }, 80,    "tcp" },
-  { "www",             { NULL }, 80,    "udp" },
-  { "www-http",        { NULL }, 80,    "tcp" },
-  { "www-http",        { NULL }, 80,    "udp" },
-  { "http",            { NULL }, 80,    "sctp"},
-  { "xfer",            { NULL }, 82,    "tcp" },
-  { "xfer",            { NULL }, 82,    "udp" },
-  { "mit-ml-dev",      { NULL }, 83,    "tcp" },
-  { "mit-ml-dev",      { NULL }, 83,    "udp" },
-  { "ctf",             { NULL }, 84,    "tcp" },
-  { "ctf",             { NULL }, 84,    "udp" },
-  { "mit-ml-dev",      { NULL }, 85,    "tcp" },
-  { "mit-ml-dev",      { NULL }, 85,    "udp" },
-  { "mfcobol",         { NULL }, 86,    "tcp" },
-  { "mfcobol",         { NULL }, 86,    "udp" },
-  { "kerberos",        { NULL }, 88,    "tcp" },
-  { "kerberos",        { NULL }, 88,    "udp" },
-  { "su-mit-tg",       { NULL }, 89,    "tcp" },
-  { "su-mit-tg",       { NULL }, 89,    "udp" },
-  { "dnsix",           { NULL }, 90,    "tcp" },
-  { "dnsix",           { NULL }, 90,    "udp" },
-  { "mit-dov",         { NULL }, 91,    "tcp" },
-  { "mit-dov",         { NULL }, 91,    "udp" },
-  { "npp",             { NULL }, 92,    "tcp" },
-  { "npp",             { NULL }, 92,    "udp" },
-  { "dcp",             { NULL }, 93,    "tcp" },
-  { "dcp",             { NULL }, 93,    "udp" },
-  { "objcall",         { NULL }, 94,    "tcp" },
-  { "objcall",         { NULL }, 94,    "udp" },
-  { "supdup",          { NULL }, 95,    "tcp" },
-  { "supdup",          { NULL }, 95,    "udp" },
-  { "dixie",           { NULL }, 96,    "tcp" },
-  { "dixie",           { NULL }, 96,    "udp" },
-  { "swift-rvf",       { NULL }, 97,    "tcp" },
-  { "swift-rvf",       { NULL }, 97,    "udp" },
-  { "tacnews",         { NULL }, 98,    "tcp" },
-  { "tacnews",         { NULL }, 98,    "udp" },
-  { "metagram",        { NULL }, 99,    "tcp" },
-  { "metagram",        { NULL }, 99,    "udp" },
-  { "newacct",         { NULL }, 100,   "tcp" },
-  { "hostname",        { NULL }, 101,   "tcp" },
-  { "hostname",        { NULL }, 101,   "udp" },
-  { "iso-tsap",        { NULL }, 102,   "tcp" },
-  { "iso-tsap",        { NULL }, 102,   "udp" },
-  { "gppitnp",         { NULL }, 103,   "tcp" },
-  { "gppitnp",         { NULL }, 103,   "udp" },
-  { "acr-nema",        { NULL }, 104,   "tcp" },
-  { "acr-nema",        { NULL }, 104,   "udp" },
-  { "cso",             { NULL }, 105,   "tcp" },
-  { "cso",             { NULL }, 105,   "udp" },
-  { "csnet-ns",        { NULL }, 105,   "tcp" },
-  { "csnet-ns",        { NULL }, 105,   "udp" },
-  { "3com-tsmux",      { NULL }, 106,   "tcp" },
-  { "3com-tsmux",      { NULL }, 106,   "udp" },
-  { "rtelnet",         { NULL }, 107,   "tcp" },
-  { "rtelnet",         { NULL }, 107,   "udp" },
-  { "snagas",          { NULL }, 108,   "tcp" },
-  { "snagas",          { NULL }, 108,   "udp" },
-  { "pop2",            { NULL }, 109,   "tcp" },
-  { "pop2",            { NULL }, 109,   "udp" },
-  { "pop3",            { NULL }, 110,   "tcp" },
-  { "pop3",            { NULL }, 110,   "udp" },
-  { "sunrpc",          { NULL }, 111,   "tcp" },
-  { "sunrpc",          { NULL }, 111,   "udp" },
-  { "mcidas",          { NULL }, 112,   "tcp" },
-  { "mcidas",          { NULL }, 112,   "udp" },
-  { "ident",           { NULL }, 113,   "tcp" },
-  { "auth",            { NULL }, 113,   "tcp" },
-  { "auth",            { NULL }, 113,   "udp" },
-  { "sftp",            { NULL }, 115,   "tcp" },
-  { "sftp",            { NULL }, 115,   "udp" },
-  { "ansanotify",      { NULL }, 116,   "tcp" },
-  { "ansanotify",      { NULL }, 116,   "udp" },
-  { "uucp-path",       { NULL }, 117,   "tcp" },
-  { "uucp-path",       { NULL }, 117,   "udp" },
-  { "sqlserv",         { NULL }, 118,   "tcp" },
-  { "sqlserv",         { NULL }, 118,   "udp" },
-  { "nntp",            { NULL }, 119,   "tcp" },
-  { "nntp",            { NULL }, 119,   "udp" },
-  { "cfdptkt",         { NULL }, 120,   "tcp" },
-  { "cfdptkt",         { NULL }, 120,   "udp" },
-  { "erpc",            { NULL }, 121,   "tcp" },
-  { "erpc",            { NULL }, 121,   "udp" },
-  { "smakynet",        { NULL }, 122,   "tcp" },
-  { "smakynet",        { NULL }, 122,   "udp" },
-  { "ntp",             { NULL }, 123,   "tcp" },
-  { "ntp",             { NULL }, 123,   "udp" },
-  { "ansatrader",      { NULL }, 124,   "tcp" },
-  { "ansatrader",      { NULL }, 124,   "udp" },
-  { "locus-map",       { NULL }, 125,   "tcp" },
-  { "locus-map",       { NULL }, 125,   "udp" },
-  { "nxedit",          { NULL }, 126,   "tcp" },
-  { "nxedit",          { NULL }, 126,   "udp" },
-  { "locus-con",       { NULL }, 127,   "tcp" },
-  { "locus-con",       { NULL }, 127,   "udp" },
-  { "gss-xlicen",      { NULL }, 128,   "tcp" },
-  { "gss-xlicen",      { NULL }, 128,   "udp" },
-  { "pwdgen",          { NULL }, 129,   "tcp" },
-  { "pwdgen",          { NULL }, 129,   "udp" },
-  { "cisco-fna",       { NULL }, 130,   "tcp" },
-  { "cisco-fna",       { NULL }, 130,   "udp" },
-  { "cisco-tna",       { NULL }, 131,   "tcp" },
-  { "cisco-tna",       { NULL }, 131,   "udp" },
-  { "cisco-sys",       { NULL }, 132,   "tcp" },
-  { "cisco-sys",       { NULL }, 132,   "udp" },
-  { "statsrv",         { NULL }, 133,   "tcp" },
-  { "statsrv",         { NULL }, 133,   "udp" },
-  { "ingres-net",      { NULL }, 134,   "tcp" },
-  { "ingres-net",      { NULL }, 134,   "udp" },
-  { "epmap",           { NULL }, 135,   "tcp" },
-  { "epmap",           { NULL }, 135,   "udp" },
-  { "profile",         { NULL }, 136,   "tcp" },
-  { "profile",         { NULL }, 136,   "udp" },
-  { "netbios-ns",      { NULL }, 137,   "tcp" },
-  { "netbios-ns",      { NULL }, 137,   "udp" },
-  { "netbios-dgm",     { NULL }, 138,   "tcp" },
-  { "netbios-dgm",     { NULL }, 138,   "udp" },
-  { "netbios-ssn",     { NULL }, 139,   "tcp" },
-  { "netbios-ssn",     { NULL }, 139,   "udp" },
-  { "emfis-data",      { NULL }, 140,   "tcp" },
-  { "emfis-data",      { NULL }, 140,   "udp" },
-  { "emfis-cntl",      { NULL }, 141,   "tcp" },
-  { "emfis-cntl",      { NULL }, 141,   "udp" },
-  { "bl-idm",          { NULL }, 142,   "tcp" },
-  { "bl-idm",          { NULL }, 142,   "udp" },
-  { "imap",            { NULL }, 143,   "tcp" },
-  { "imap",            { NULL }, 143,   "udp" },
-  { "uma",             { NULL }, 144,   "tcp" },
-  { "uma",             { NULL }, 144,   "udp" },
-  { "uaac",            { NULL }, 145,   "tcp" },
-  { "uaac",            { NULL }, 145,   "udp" },
-  { "iso-tp0",         { NULL }, 146,   "tcp" },
-  { "iso-tp0",         { NULL }, 146,   "udp" },
-  { "iso-ip",          { NULL }, 147,   "tcp" },
-  { "iso-ip",          { NULL }, 147,   "udp" },
-  { "jargon",          { NULL }, 148,   "tcp" },
-  { "jargon",          { NULL }, 148,   "udp" },
-  { "aed-512",         { NULL }, 149,   "tcp" },
-  { "aed-512",         { NULL }, 149,   "udp" },
-  { "sql-net",         { NULL }, 150,   "tcp" },
-  { "sql-net",         { NULL }, 150,   "udp" },
-  { "hems",            { NULL }, 151,   "tcp" },
-  { "hems",            { NULL }, 151,   "udp" },
-  { "bftp",            { NULL }, 152,   "tcp" },
-  { "bftp",            { NULL }, 152,   "udp" },
-  { "sgmp",            { NULL }, 153,   "tcp" },
-  { "sgmp",            { NULL }, 153,   "udp" },
-  { "netsc-prod",      { NULL }, 154,   "tcp" },
-  { "netsc-prod",      { NULL }, 154,   "udp" },
-  { "netsc-dev",       { NULL }, 155,   "tcp" },
-  { "netsc-dev",       { NULL }, 155,   "udp" },
-  { "sqlsrv",          { NULL }, 156,   "tcp" },
-  { "sqlsrv",          { NULL }, 156,   "udp" },
-  { "knet-cmp",        { NULL }, 157,   "tcp" },
-  { "knet-cmp",        { NULL }, 157,   "udp" },
-  { "pcmail-srv",      { NULL }, 158,   "tcp" },
-  { "pcmail-srv",      { NULL }, 158,   "udp" },
-  { "nss-routing",     { NULL }, 159,   "tcp" },
-  { "nss-routing",     { NULL }, 159,   "udp" },
-  { "sgmp-traps",      { NULL }, 160,   "tcp" },
-  { "sgmp-traps",      { NULL }, 160,   "udp" },
-  { "snmp",            { NULL }, 161,   "tcp" },
-  { "snmp",            { NULL }, 161,   "udp" },
-  { "snmptrap",        { NULL }, 162,   "tcp" },
-  { "snmptrap",        { NULL }, 162,   "udp" },
-  { "cmip-man",        { NULL }, 163,   "tcp" },
-  { "cmip-man",        { NULL }, 163,   "udp" },
-  { "cmip-agent",      { NULL }, 164,   "tcp" },
-  { "cmip-agent",      { NULL }, 164,   "udp" },
-  { "xns-courier",     { NULL }, 165,   "tcp" },
-  { "xns-courier",     { NULL }, 165,   "udp" },
-  { "s-net",           { NULL }, 166,   "tcp" },
-  { "s-net",           { NULL }, 166,   "udp" },
-  { "namp",            { NULL }, 167,   "tcp" },
-  { "namp",            { NULL }, 167,   "udp" },
-  { "rsvd",            { NULL }, 168,   "tcp" },
-  { "rsvd",            { NULL }, 168,   "udp" },
-  { "send",            { NULL }, 169,   "tcp" },
-  { "send",            { NULL }, 169,   "udp" },
-  { "print-srv",       { NULL }, 170,   "tcp" },
-  { "print-srv",       { NULL }, 170,   "udp" },
-  { "multiplex",       { NULL }, 171,   "tcp" },
-  { "multiplex",       { NULL }, 171,   "udp" },
-  { "cl/1",            { NULL }, 172,   "tcp" },
-  { "cl/1",            { NULL }, 172,   "udp" },
-  { "xyplex-mux",      { NULL }, 173,   "tcp" },
-  { "xyplex-mux",      { NULL }, 173,   "udp" },
-  { "mailq",           { NULL }, 174,   "tcp" },
-  { "mailq",           { NULL }, 174,   "udp" },
-  { "vmnet",           { NULL }, 175,   "tcp" },
-  { "vmnet",           { NULL }, 175,   "udp" },
-  { "genrad-mux",      { NULL }, 176,   "tcp" },
-  { "genrad-mux",      { NULL }, 176,   "udp" },
-  { "xdmcp",           { NULL }, 177,   "tcp" },
-  { "xdmcp",           { NULL }, 177,   "udp" },
-  { "nextstep",        { NULL }, 178,   "tcp" },
-  { "nextstep",        { NULL }, 178,   "udp" },
-  { "bgp",             { NULL }, 179,   "tcp" },
-  { "bgp",             { NULL }, 179,   "udp" },
-  { "bgp",             { NULL }, 179,   "sctp"},
-  { "ris",             { NULL }, 180,   "tcp" },
-  { "ris",             { NULL }, 180,   "udp" },
-  { "unify",           { NULL }, 181,   "tcp" },
-  { "unify",           { NULL }, 181,   "udp" },
-  { "audit",           { NULL }, 182,   "tcp" },
-  { "audit",           { NULL }, 182,   "udp" },
-  { "ocbinder",        { NULL }, 183,   "tcp" },
-  { "ocbinder",        { NULL }, 183,   "udp" },
-  { "ocserver",        { NULL }, 184,   "tcp" },
-  { "ocserver",        { NULL }, 184,   "udp" },
-  { "remote-kis",      { NULL }, 185,   "tcp" },
-  { "remote-kis",      { NULL }, 185,   "udp" },
-  { "kis",             { NULL }, 186,   "tcp" },
-  { "kis",             { NULL }, 186,   "udp" },
-  { "aci",             { NULL }, 187,   "tcp" },
-  { "aci",             { NULL }, 187,   "udp" },
-  { "mumps",           { NULL }, 188,   "tcp" },
-  { "mumps",           { NULL }, 188,   "udp" },
-  { "qft",             { NULL }, 189,   "tcp" },
-  { "qft",             { NULL }, 189,   "udp" },
-  { "gacp",            { NULL }, 190,   "tcp" },
-  { "gacp",            { NULL }, 190,   "udp" },
-  { "prospero",        { NULL }, 191,   "tcp" },
-  { "prospero",        { NULL }, 191,   "udp" },
-  { "osu-nms",         { NULL }, 192,   "tcp" },
-  { "osu-nms",         { NULL }, 192,   "udp" },
-  { "srmp",            { NULL }, 193,   "tcp" },
-  { "srmp",            { NULL }, 193,   "udp" },
-  { "irc",             { NULL }, 194,   "tcp" },
-  { "irc",             { NULL }, 194,   "udp" },
-  { "dn6-nlm-aud",     { NULL }, 195,   "tcp" },
-  { "dn6-nlm-aud",     { NULL }, 195,   "udp" },
-  { "dn6-smm-red",     { NULL }, 196,   "tcp" },
-  { "dn6-smm-red",     { NULL }, 196,   "udp" },
-  { "dls",             { NULL }, 197,   "tcp" },
-  { "dls",             { NULL }, 197,   "udp" },
-  { "dls-mon",         { NULL }, 198,   "tcp" },
-  { "dls-mon",         { NULL }, 198,   "udp" },
-  { "smux",            { NULL }, 199,   "tcp" },
-  { "smux",            { NULL }, 199,   "udp" },
-  { "src",             { NULL }, 200,   "tcp" },
-  { "src",             { NULL }, 200,   "udp" },
-  { "at-rtmp",         { NULL }, 201,   "tcp" },
-  { "at-rtmp",         { NULL }, 201,   "udp" },
-  { "at-nbp",          { NULL }, 202,   "tcp" },
-  { "at-nbp",          { NULL }, 202,   "udp" },
-  { "at-3",            { NULL }, 203,   "tcp" },
-  { "at-3",            { NULL }, 203,   "udp" },
-  { "at-echo",         { NULL }, 204,   "tcp" },
-  { "at-echo",         { NULL }, 204,   "udp" },
-  { "at-5",            { NULL }, 205,   "tcp" },
-  { "at-5",            { NULL }, 205,   "udp" },
-  { "at-zis",          { NULL }, 206,   "tcp" },
-  { "at-zis",          { NULL }, 206,   "udp" },
-  { "at-7",            { NULL }, 207,   "tcp" },
-  { "at-7",            { NULL }, 207,   "udp" },
-  { "at-8",            { NULL }, 208,   "tcp" },
-  { "at-8",            { NULL }, 208,   "udp" },
-  { "qmtp",            { NULL }, 209,   "tcp" },
-  { "qmtp",            { NULL }, 209,   "udp" },
-  { "z39.50",          { NULL }, 210,   "tcp" },
-  { "z39.50",          { NULL }, 210,   "udp" },
-  { "914c/g",          { NULL }, 211,   "tcp" },
-  { "914c/g",          { NULL }, 211,   "udp" },
-  { "anet",            { NULL }, 212,   "tcp" },
-  { "anet",            { NULL }, 212,   "udp" },
-  { "ipx",             { NULL }, 213,   "tcp" },
-  { "ipx",             { NULL }, 213,   "udp" },
-  { "vmpwscs",         { NULL }, 214,   "tcp" },
-  { "vmpwscs",         { NULL }, 214,   "udp" },
-  { "softpc",          { NULL }, 215,   "tcp" },
-  { "softpc",          { NULL }, 215,   "udp" },
-  { "CAIlic",          { NULL }, 216,   "tcp" },
-  { "CAIlic",          { NULL }, 216,   "udp" },
-  { "dbase",           { NULL }, 217,   "tcp" },
-  { "dbase",           { NULL }, 217,   "udp" },
-  { "mpp",             { NULL }, 218,   "tcp" },
-  { "mpp",             { NULL }, 218,   "udp" },
-  { "uarps",           { NULL }, 219,   "tcp" },
-  { "uarps",           { NULL }, 219,   "udp" },
-  { "imap3",           { NULL }, 220,   "tcp" },
-  { "imap3",           { NULL }, 220,   "udp" },
-  { "fln-spx",         { NULL }, 221,   "tcp" },
-  { "fln-spx",         { NULL }, 221,   "udp" },
-  { "rsh-spx",         { NULL }, 222,   "tcp" },
-  { "rsh-spx",         { NULL }, 222,   "udp" },
-  { "cdc",             { NULL }, 223,   "tcp" },
-  { "cdc",             { NULL }, 223,   "udp" },
-  { "masqdialer",      { NULL }, 224,   "tcp" },
-  { "masqdialer",      { NULL }, 224,   "udp" },
-  { "direct",          { NULL }, 242,   "tcp" },
-  { "direct",          { NULL }, 242,   "udp" },
-  { "sur-meas",        { NULL }, 243,   "tcp" },
-  { "sur-meas",        { NULL }, 243,   "udp" },
-  { "inbusiness",      { NULL }, 244,   "tcp" },
-  { "inbusiness",      { NULL }, 244,   "udp" },
-  { "link",            { NULL }, 245,   "tcp" },
-  { "link",            { NULL }, 245,   "udp" },
-  { "dsp3270",         { NULL }, 246,   "tcp" },
-  { "dsp3270",         { NULL }, 246,   "udp" },
-  { "subntbcst_tftp",  { NULL }, 247,   "tcp" },
-  { "subntbcst_tftp",  { NULL }, 247,   "udp" },
-  { "bhfhs",           { NULL }, 248,   "tcp" },
-  { "bhfhs",           { NULL }, 248,   "udp" },
-  { "rap",             { NULL }, 256,   "tcp" },
-  { "rap",             { NULL }, 256,   "udp" },
-  { "set",             { NULL }, 257,   "tcp" },
-  { "set",             { NULL }, 257,   "udp" },
-  { "esro-gen",        { NULL }, 259,   "tcp" },
-  { "esro-gen",        { NULL }, 259,   "udp" },
-  { "openport",        { NULL }, 260,   "tcp" },
-  { "openport",        { NULL }, 260,   "udp" },
-  { "nsiiops",         { NULL }, 261,   "tcp" },
-  { "nsiiops",         { NULL }, 261,   "udp" },
-  { "arcisdms",        { NULL }, 262,   "tcp" },
-  { "arcisdms",        { NULL }, 262,   "udp" },
-  { "hdap",            { NULL }, 263,   "tcp" },
-  { "hdap",            { NULL }, 263,   "udp" },
-  { "bgmp",            { NULL }, 264,   "tcp" },
-  { "bgmp",            { NULL }, 264,   "udp" },
-  { "x-bone-ctl",      { NULL }, 265,   "tcp" },
-  { "x-bone-ctl",      { NULL }, 265,   "udp" },
-  { "sst",             { NULL }, 266,   "tcp" },
-  { "sst",             { NULL }, 266,   "udp" },
-  { "td-service",      { NULL }, 267,   "tcp" },
-  { "td-service",      { NULL }, 267,   "udp" },
-  { "td-replica",      { NULL }, 268,   "tcp" },
-  { "td-replica",      { NULL }, 268,   "udp" },
-  { "manet",           { NULL }, 269,   "tcp" },
-  { "manet",           { NULL }, 269,   "udp" },
-  { "gist",            { NULL }, 270,   "udp" },
-  { "http-mgmt",       { NULL }, 280,   "tcp" },
-  { "http-mgmt",       { NULL }, 280,   "udp" },
-  { "personal-link",   { NULL }, 281,   "tcp" },
-  { "personal-link",   { NULL }, 281,   "udp" },
-  { "cableport-ax",    { NULL }, 282,   "tcp" },
-  { "cableport-ax",    { NULL }, 282,   "udp" },
-  { "rescap",          { NULL }, 283,   "tcp" },
-  { "rescap",          { NULL }, 283,   "udp" },
-  { "corerjd",         { NULL }, 284,   "tcp" },
-  { "corerjd",         { NULL }, 284,   "udp" },
-  { "fxp",             { NULL }, 286,   "tcp" },
-  { "fxp",             { NULL }, 286,   "udp" },
-  { "k-block",         { NULL }, 287,   "tcp" },
-  { "k-block",         { NULL }, 287,   "udp" },
-  { "novastorbakcup",  { NULL }, 308,   "tcp" },
-  { "novastorbakcup",  { NULL }, 308,   "udp" },
-  { "entrusttime",     { NULL }, 309,   "tcp" },
-  { "entrusttime",     { NULL }, 309,   "udp" },
-  { "bhmds",           { NULL }, 310,   "tcp" },
-  { "bhmds",           { NULL }, 310,   "udp" },
-  { "asip-webadmin",   { NULL }, 311,   "tcp" },
-  { "asip-webadmin",   { NULL }, 311,   "udp" },
-  { "vslmp",           { NULL }, 312,   "tcp" },
-  { "vslmp",           { NULL }, 312,   "udp" },
-  { "magenta-logic",   { NULL }, 313,   "tcp" },
-  { "magenta-logic",   { NULL }, 313,   "udp" },
-  { "opalis-robot",    { NULL }, 314,   "tcp" },
-  { "opalis-robot",    { NULL }, 314,   "udp" },
-  { "dpsi",            { NULL }, 315,   "tcp" },
-  { "dpsi",            { NULL }, 315,   "udp" },
-  { "decauth",         { NULL }, 316,   "tcp" },
-  { "decauth",         { NULL }, 316,   "udp" },
-  { "zannet",          { NULL }, 317,   "tcp" },
-  { "zannet",          { NULL }, 317,   "udp" },
-  { "pkix-timestamp",  { NULL }, 318,   "tcp" },
-  { "pkix-timestamp",  { NULL }, 318,   "udp" },
-  { "ptp-event",       { NULL }, 319,   "tcp" },
-  { "ptp-event",       { NULL }, 319,   "udp" },
-  { "ptp-general",     { NULL }, 320,   "tcp" },
-  { "ptp-general",     { NULL }, 320,   "udp" },
-  { "pip",             { NULL }, 321,   "tcp" },
-  { "pip",             { NULL }, 321,   "udp" },
-  { "rtsps",           { NULL }, 322,   "tcp" },
-  { "rtsps",           { NULL }, 322,   "udp" },
-  { "texar",           { NULL }, 333,   "tcp" },
-  { "texar",           { NULL }, 333,   "udp" },
-  { "pdap",            { NULL }, 344,   "tcp" },
-  { "pdap",            { NULL }, 344,   "udp" },
-  { "pawserv",         { NULL }, 345,   "tcp" },
-  { "pawserv",         { NULL }, 345,   "udp" },
-  { "zserv",           { NULL }, 346,   "tcp" },
-  { "zserv",           { NULL }, 346,   "udp" },
-  { "fatserv",         { NULL }, 347,   "tcp" },
-  { "fatserv",         { NULL }, 347,   "udp" },
-  { "csi-sgwp",        { NULL }, 348,   "tcp" },
-  { "csi-sgwp",        { NULL }, 348,   "udp" },
-  { "mftp",            { NULL }, 349,   "tcp" },
-  { "mftp",            { NULL }, 349,   "udp" },
-  { "matip-type-a",    { NULL }, 350,   "tcp" },
-  { "matip-type-a",    { NULL }, 350,   "udp" },
-  { "matip-type-b",    { NULL }, 351,   "tcp" },
-  { "matip-type-b",    { NULL }, 351,   "udp" },
-  { "bhoetty",         { NULL }, 351,   "tcp" },
-  { "bhoetty",         { NULL }, 351,   "udp" },
-  { "dtag-ste-sb",     { NULL }, 352,   "tcp" },
-  { "dtag-ste-sb",     { NULL }, 352,   "udp" },
-  { "bhoedap4",        { NULL }, 352,   "tcp" },
-  { "bhoedap4",        { NULL }, 352,   "udp" },
-  { "ndsauth",         { NULL }, 353,   "tcp" },
-  { "ndsauth",         { NULL }, 353,   "udp" },
-  { "bh611",           { NULL }, 354,   "tcp" },
-  { "bh611",           { NULL }, 354,   "udp" },
-  { "datex-asn",       { NULL }, 355,   "tcp" },
-  { "datex-asn",       { NULL }, 355,   "udp" },
-  { "cloanto-net-1",   { NULL }, 356,   "tcp" },
-  { "cloanto-net-1",   { NULL }, 356,   "udp" },
-  { "bhevent",         { NULL }, 357,   "tcp" },
-  { "bhevent",         { NULL }, 357,   "udp" },
-  { "shrinkwrap",      { NULL }, 358,   "tcp" },
-  { "shrinkwrap",      { NULL }, 358,   "udp" },
-  { "nsrmp",           { NULL }, 359,   "tcp" },
-  { "nsrmp",           { NULL }, 359,   "udp" },
-  { "scoi2odialog",    { NULL }, 360,   "tcp" },
-  { "scoi2odialog",    { NULL }, 360,   "udp" },
-  { "semantix",        { NULL }, 361,   "tcp" },
-  { "semantix",        { NULL }, 361,   "udp" },
-  { "srssend",         { NULL }, 362,   "tcp" },
-  { "srssend",         { NULL }, 362,   "udp" },
-  { "rsvp_tunnel",     { NULL }, 363,   "tcp" },
-  { "rsvp_tunnel",     { NULL }, 363,   "udp" },
-  { "aurora-cmgr",     { NULL }, 364,   "tcp" },
-  { "aurora-cmgr",     { NULL }, 364,   "udp" },
-  { "dtk",             { NULL }, 365,   "tcp" },
-  { "dtk",             { NULL }, 365,   "udp" },
-  { "odmr",            { NULL }, 366,   "tcp" },
-  { "odmr",            { NULL }, 366,   "udp" },
-  { "mortgageware",    { NULL }, 367,   "tcp" },
-  { "mortgageware",    { NULL }, 367,   "udp" },
-  { "qbikgdp",         { NULL }, 368,   "tcp" },
-  { "qbikgdp",         { NULL }, 368,   "udp" },
-  { "rpc2portmap",     { NULL }, 369,   "tcp" },
-  { "rpc2portmap",     { NULL }, 369,   "udp" },
-  { "codaauth2",       { NULL }, 370,   "tcp" },
-  { "codaauth2",       { NULL }, 370,   "udp" },
-  { "clearcase",       { NULL }, 371,   "tcp" },
-  { "clearcase",       { NULL }, 371,   "udp" },
-  { "ulistproc",       { NULL }, 372,   "tcp" },
-  { "ulistproc",       { NULL }, 372,   "udp" },
-  { "legent-1",        { NULL }, 373,   "tcp" },
-  { "legent-1",        { NULL }, 373,   "udp" },
-  { "legent-2",        { NULL }, 374,   "tcp" },
-  { "legent-2",        { NULL }, 374,   "udp" },
-  { "hassle",          { NULL }, 375,   "tcp" },
-  { "hassle",          { NULL }, 375,   "udp" },
-  { "nip",             { NULL }, 376,   "tcp" },
-  { "nip",             { NULL }, 376,   "udp" },
-  { "tnETOS",          { NULL }, 377,   "tcp" },
-  { "tnETOS",          { NULL }, 377,   "udp" },
-  { "dsETOS",          { NULL }, 378,   "tcp" },
-  { "dsETOS",          { NULL }, 378,   "udp" },
-  { "is99c",           { NULL }, 379,   "tcp" },
-  { "is99c",           { NULL }, 379,   "udp" },
-  { "is99s",           { NULL }, 380,   "tcp" },
-  { "is99s",           { NULL }, 380,   "udp" },
-  { "hp-collector",    { NULL }, 381,   "tcp" },
-  { "hp-collector",    { NULL }, 381,   "udp" },
-  { "hp-managed-node", { NULL }, 382,   "tcp" },
-  { "hp-managed-node", { NULL }, 382,   "udp" },
-  { "hp-alarm-mgr",    { NULL }, 383,   "tcp" },
-  { "hp-alarm-mgr",    { NULL }, 383,   "udp" },
-  { "arns",            { NULL }, 384,   "tcp" },
-  { "arns",            { NULL }, 384,   "udp" },
-  { "ibm-app",         { NULL }, 385,   "tcp" },
-  { "ibm-app",         { NULL }, 385,   "udp" },
-  { "asa",             { NULL }, 386,   "tcp" },
-  { "asa",             { NULL }, 386,   "udp" },
-  { "aurp",            { NULL }, 387,   "tcp" },
-  { "aurp",            { NULL }, 387,   "udp" },
-  { "unidata-ldm",     { NULL }, 388,   "tcp" },
-  { "unidata-ldm",     { NULL }, 388,   "udp" },
-  { "ldap",            { NULL }, 389,   "tcp" },
-  { "ldap",            { NULL }, 389,   "udp" },
-  { "uis",             { NULL }, 390,   "tcp" },
-  { "uis",             { NULL }, 390,   "udp" },
-  { "synotics-relay",  { NULL }, 391,   "tcp" },
-  { "synotics-relay",  { NULL }, 391,   "udp" },
-  { "synotics-broker", { NULL }, 392,   "tcp" },
-  { "synotics-broker", { NULL }, 392,   "udp" },
-  { "meta5",           { NULL }, 393,   "tcp" },
-  { "meta5",           { NULL }, 393,   "udp" },
-  { "embl-ndt",        { NULL }, 394,   "tcp" },
-  { "embl-ndt",        { NULL }, 394,   "udp" },
-  { "netcp",           { NULL }, 395,   "tcp" },
-  { "netcp",           { NULL }, 395,   "udp" },
-  { "netware-ip",      { NULL }, 396,   "tcp" },
-  { "netware-ip",      { NULL }, 396,   "udp" },
-  { "mptn",            { NULL }, 397,   "tcp" },
-  { "mptn",            { NULL }, 397,   "udp" },
-  { "kryptolan",       { NULL }, 398,   "tcp" },
-  { "kryptolan",       { NULL }, 398,   "udp" },
-  { "iso-tsap-c2",     { NULL }, 399,   "tcp" },
-  { "iso-tsap-c2",     { NULL }, 399,   "udp" },
-  { "osb-sd",          { NULL }, 400,   "tcp" },
-  { "osb-sd",          { NULL }, 400,   "udp" },
-  { "ups",             { NULL }, 401,   "tcp" },
-  { "ups",             { NULL }, 401,   "udp" },
-  { "genie",           { NULL }, 402,   "tcp" },
-  { "genie",           { NULL }, 402,   "udp" },
-  { "decap",           { NULL }, 403,   "tcp" },
-  { "decap",           { NULL }, 403,   "udp" },
-  { "nced",            { NULL }, 404,   "tcp" },
-  { "nced",            { NULL }, 404,   "udp" },
-  { "ncld",            { NULL }, 405,   "tcp" },
-  { "ncld",            { NULL }, 405,   "udp" },
-  { "imsp",            { NULL }, 406,   "tcp" },
-  { "imsp",            { NULL }, 406,   "udp" },
-  { "timbuktu",        { NULL }, 407,   "tcp" },
-  { "timbuktu",        { NULL }, 407,   "udp" },
-  { "prm-sm",          { NULL }, 408,   "tcp" },
-  { "prm-sm",          { NULL }, 408,   "udp" },
-  { "prm-nm",          { NULL }, 409,   "tcp" },
-  { "prm-nm",          { NULL }, 409,   "udp" },
-  { "decladebug",      { NULL }, 410,   "tcp" },
-  { "decladebug",      { NULL }, 410,   "udp" },
-  { "rmt",             { NULL }, 411,   "tcp" },
-  { "rmt",             { NULL }, 411,   "udp" },
-  { "synoptics-trap",  { NULL }, 412,   "tcp" },
-  { "synoptics-trap",  { NULL }, 412,   "udp" },
-  { "smsp",            { NULL }, 413,   "tcp" },
-  { "smsp",            { NULL }, 413,   "udp" },
-  { "infoseek",        { NULL }, 414,   "tcp" },
-  { "infoseek",        { NULL }, 414,   "udp" },
-  { "bnet",            { NULL }, 415,   "tcp" },
-  { "bnet",            { NULL }, 415,   "udp" },
-  { "silverplatter",   { NULL }, 416,   "tcp" },
-  { "silverplatter",   { NULL }, 416,   "udp" },
-  { "onmux",           { NULL }, 417,   "tcp" },
-  { "onmux",           { NULL }, 417,   "udp" },
-  { "hyper-g",         { NULL }, 418,   "tcp" },
-  { "hyper-g",         { NULL }, 418,   "udp" },
-  { "ariel1",          { NULL }, 419,   "tcp" },
-  { "ariel1",          { NULL }, 419,   "udp" },
-  { "smpte",           { NULL }, 420,   "tcp" },
-  { "smpte",           { NULL }, 420,   "udp" },
-  { "ariel2",          { NULL }, 421,   "tcp" },
-  { "ariel2",          { NULL }, 421,   "udp" },
-  { "ariel3",          { NULL }, 422,   "tcp" },
-  { "ariel3",          { NULL }, 422,   "udp" },
-  { "opc-job-start",   { NULL }, 423,   "tcp" },
-  { "opc-job-start",   { NULL }, 423,   "udp" },
-  { "opc-job-track",   { NULL }, 424,   "tcp" },
-  { "opc-job-track",   { NULL }, 424,   "udp" },
-  { "icad-el",         { NULL }, 425,   "tcp" },
-  { "icad-el",         { NULL }, 425,   "udp" },
-  { "smartsdp",        { NULL }, 426,   "tcp" },
-  { "smartsdp",        { NULL }, 426,   "udp" },
-  { "svrloc",          { NULL }, 427,   "tcp" },
-  { "svrloc",          { NULL }, 427,   "udp" },
-  { "ocs_cmu",         { NULL }, 428,   "tcp" },
-  { "ocs_cmu",         { NULL }, 428,   "udp" },
-  { "ocs_amu",         { NULL }, 429,   "tcp" },
-  { "ocs_amu",         { NULL }, 429,   "udp" },
-  { "utmpsd",          { NULL }, 430,   "tcp" },
-  { "utmpsd",          { NULL }, 430,   "udp" },
-  { "utmpcd",          { NULL }, 431,   "tcp" },
-  { "utmpcd",          { NULL }, 431,   "udp" },
-  { "iasd",            { NULL }, 432,   "tcp" },
-  { "iasd",            { NULL }, 432,   "udp" },
-  { "nnsp",            { NULL }, 433,   "tcp" },
-  { "nnsp",            { NULL }, 433,   "udp" },
-  { "mobileip-agent",  { NULL }, 434,   "tcp" },
-  { "mobileip-agent",  { NULL }, 434,   "udp" },
-  { "mobilip-mn",      { NULL }, 435,   "tcp" },
-  { "mobilip-mn",      { NULL }, 435,   "udp" },
-  { "dna-cml",         { NULL }, 436,   "tcp" },
-  { "dna-cml",         { NULL }, 436,   "udp" },
-  { "comscm",          { NULL }, 437,   "tcp" },
-  { "comscm",          { NULL }, 437,   "udp" },
-  { "dsfgw",           { NULL }, 438,   "tcp" },
-  { "dsfgw",           { NULL }, 438,   "udp" },
-  { "dasp",            { NULL }, 439,   "tcp" },
-  { "dasp",            { NULL }, 439,   "udp" },
-  { "sgcp",            { NULL }, 440,   "tcp" },
-  { "sgcp",            { NULL }, 440,   "udp" },
-  { "decvms-sysmgt",   { NULL }, 441,   "tcp" },
-  { "decvms-sysmgt",   { NULL }, 441,   "udp" },
-  { "cvc_hostd",       { NULL }, 442,   "tcp" },
-  { "cvc_hostd",       { NULL }, 442,   "udp" },
-  { "https",           { NULL }, 443,   "tcp" },
-  { "https",           { NULL }, 443,   "udp" },
-  { "https",           { NULL }, 443,   "sctp"},
-  { "snpp",            { NULL }, 444,   "tcp" },
-  { "snpp",            { NULL }, 444,   "udp" },
-  { "microsoft-ds",    { NULL }, 445,   "tcp" },
-  { "microsoft-ds",    { NULL }, 445,   "udp" },
-  { "ddm-rdb",         { NULL }, 446,   "tcp" },
-  { "ddm-rdb",         { NULL }, 446,   "udp" },
-  { "ddm-dfm",         { NULL }, 447,   "tcp" },
-  { "ddm-dfm",         { NULL }, 447,   "udp" },
-  { "ddm-ssl",         { NULL }, 448,   "tcp" },
-  { "ddm-ssl",         { NULL }, 448,   "udp" },
-  { "as-servermap",    { NULL }, 449,   "tcp" },
-  { "as-servermap",    { NULL }, 449,   "udp" },
-  { "tserver",         { NULL }, 450,   "tcp" },
-  { "tserver",         { NULL }, 450,   "udp" },
-  { "sfs-smp-net",     { NULL }, 451,   "tcp" },
-  { "sfs-smp-net",     { NULL }, 451,   "udp" },
-  { "sfs-config",      { NULL }, 452,   "tcp" },
-  { "sfs-config",      { NULL }, 452,   "udp" },
-  { "creativeserver",  { NULL }, 453,   "tcp" },
-  { "creativeserver",  { NULL }, 453,   "udp" },
-  { "contentserver",   { NULL }, 454,   "tcp" },
-  { "contentserver",   { NULL }, 454,   "udp" },
-  { "creativepartnr",  { NULL }, 455,   "tcp" },
-  { "creativepartnr",  { NULL }, 455,   "udp" },
-  { "macon-tcp",       { NULL }, 456,   "tcp" },
-  { "macon-udp",       { NULL }, 456,   "udp" },
-  { "scohelp",         { NULL }, 457,   "tcp" },
-  { "scohelp",         { NULL }, 457,   "udp" },
-  { "appleqtc",        { NULL }, 458,   "tcp" },
-  { "appleqtc",        { NULL }, 458,   "udp" },
-  { "ampr-rcmd",       { NULL }, 459,   "tcp" },
-  { "ampr-rcmd",       { NULL }, 459,   "udp" },
-  { "skronk",          { NULL }, 460,   "tcp" },
-  { "skronk",          { NULL }, 460,   "udp" },
-  { "datasurfsrv",     { NULL }, 461,   "tcp" },
-  { "datasurfsrv",     { NULL }, 461,   "udp" },
-  { "datasurfsrvsec",  { NULL }, 462,   "tcp" },
-  { "datasurfsrvsec",  { NULL }, 462,   "udp" },
-  { "alpes",           { NULL }, 463,   "tcp" },
-  { "alpes",           { NULL }, 463,   "udp" },
-  { "kpasswd",         { NULL }, 464,   "tcp" },
-  { "kpasswd",         { NULL }, 464,   "udp" },
-  { "urd",             { NULL }, 465,   "tcp" },
-  { "igmpv3lite",      { NULL }, 465,   "udp" },
-  { "digital-vrc",     { NULL }, 466,   "tcp" },
-  { "digital-vrc",     { NULL }, 466,   "udp" },
-  { "mylex-mapd",      { NULL }, 467,   "tcp" },
-  { "mylex-mapd",      { NULL }, 467,   "udp" },
-  { "photuris",        { NULL }, 468,   "tcp" },
-  { "photuris",        { NULL }, 468,   "udp" },
-  { "rcp",             { NULL }, 469,   "tcp" },
-  { "rcp",             { NULL }, 469,   "udp" },
-  { "scx-proxy",       { NULL }, 470,   "tcp" },
-  { "scx-proxy",       { NULL }, 470,   "udp" },
-  { "mondex",          { NULL }, 471,   "tcp" },
-  { "mondex",          { NULL }, 471,   "udp" },
-  { "ljk-login",       { NULL }, 472,   "tcp" },
-  { "ljk-login",       { NULL }, 472,   "udp" },
-  { "hybrid-pop",      { NULL }, 473,   "tcp" },
-  { "hybrid-pop",      { NULL }, 473,   "udp" },
-  { "tn-tl-w1",        { NULL }, 474,   "tcp" },
-  { "tn-tl-w2",        { NULL }, 474,   "udp" },
-  { "tcpnethaspsrv",   { NULL }, 475,   "tcp" },
-  { "tcpnethaspsrv",   { NULL }, 475,   "udp" },
-  { "tn-tl-fd1",       { NULL }, 476,   "tcp" },
-  { "tn-tl-fd1",       { NULL }, 476,   "udp" },
-  { "ss7ns",           { NULL }, 477,   "tcp" },
-  { "ss7ns",           { NULL }, 477,   "udp" },
-  { "spsc",            { NULL }, 478,   "tcp" },
-  { "spsc",            { NULL }, 478,   "udp" },
-  { "iafserver",       { NULL }, 479,   "tcp" },
-  { "iafserver",       { NULL }, 479,   "udp" },
-  { "iafdbase",        { NULL }, 480,   "tcp" },
-  { "iafdbase",        { NULL }, 480,   "udp" },
-  { "ph",              { NULL }, 481,   "tcp" },
-  { "ph",              { NULL }, 481,   "udp" },
-  { "bgs-nsi",         { NULL }, 482,   "tcp" },
-  { "bgs-nsi",         { NULL }, 482,   "udp" },
-  { "ulpnet",          { NULL }, 483,   "tcp" },
-  { "ulpnet",          { NULL }, 483,   "udp" },
-  { "integra-sme",     { NULL }, 484,   "tcp" },
-  { "integra-sme",     { NULL }, 484,   "udp" },
-  { "powerburst",      { NULL }, 485,   "tcp" },
-  { "powerburst",      { NULL }, 485,   "udp" },
-  { "avian",           { NULL }, 486,   "tcp" },
-  { "avian",           { NULL }, 486,   "udp" },
-  { "saft",            { NULL }, 487,   "tcp" },
-  { "saft",            { NULL }, 487,   "udp" },
-  { "gss-http",        { NULL }, 488,   "tcp" },
-  { "gss-http",        { NULL }, 488,   "udp" },
-  { "nest-protocol",   { NULL }, 489,   "tcp" },
-  { "nest-protocol",   { NULL }, 489,   "udp" },
-  { "micom-pfs",       { NULL }, 490,   "tcp" },
-  { "micom-pfs",       { NULL }, 490,   "udp" },
-  { "go-login",        { NULL }, 491,   "tcp" },
-  { "go-login",        { NULL }, 491,   "udp" },
-  { "ticf-1",          { NULL }, 492,   "tcp" },
-  { "ticf-1",          { NULL }, 492,   "udp" },
-  { "ticf-2",          { NULL }, 493,   "tcp" },
-  { "ticf-2",          { NULL }, 493,   "udp" },
-  { "pov-ray",         { NULL }, 494,   "tcp" },
-  { "pov-ray",         { NULL }, 494,   "udp" },
-  { "intecourier",     { NULL }, 495,   "tcp" },
-  { "intecourier",     { NULL }, 495,   "udp" },
-  { "pim-rp-disc",     { NULL }, 496,   "tcp" },
-  { "pim-rp-disc",     { NULL }, 496,   "udp" },
-  { "dantz",           { NULL }, 497,   "tcp" },
-  { "dantz",           { NULL }, 497,   "udp" },
-  { "siam",            { NULL }, 498,   "tcp" },
-  { "siam",            { NULL }, 498,   "udp" },
-  { "iso-ill",         { NULL }, 499,   "tcp" },
-  { "iso-ill",         { NULL }, 499,   "udp" },
-  { "isakmp",          { NULL }, 500,   "tcp" },
-  { "isakmp",          { NULL }, 500,   "udp" },
-  { "stmf",            { NULL }, 501,   "tcp" },
-  { "stmf",            { NULL }, 501,   "udp" },
-  { "asa-appl-proto",  { NULL }, 502,   "tcp" },
-  { "asa-appl-proto",  { NULL }, 502,   "udp" },
-  { "intrinsa",        { NULL }, 503,   "tcp" },
-  { "intrinsa",        { NULL }, 503,   "udp" },
-  { "citadel",         { NULL }, 504,   "tcp" },
-  { "citadel",         { NULL }, 504,   "udp" },
-  { "mailbox-lm",      { NULL }, 505,   "tcp" },
-  { "mailbox-lm",      { NULL }, 505,   "udp" },
-  { "ohimsrv",         { NULL }, 506,   "tcp" },
-  { "ohimsrv",         { NULL }, 506,   "udp" },
-  { "crs",             { NULL }, 507,   "tcp" },
-  { "crs",             { NULL }, 507,   "udp" },
-  { "xvttp",           { NULL }, 508,   "tcp" },
-  { "xvttp",           { NULL }, 508,   "udp" },
-  { "snare",           { NULL }, 509,   "tcp" },
-  { "snare",           { NULL }, 509,   "udp" },
-  { "fcp",             { NULL }, 510,   "tcp" },
-  { "fcp",             { NULL }, 510,   "udp" },
-  { "passgo",          { NULL }, 511,   "tcp" },
-  { "passgo",          { NULL }, 511,   "udp" },
-  { "exec",            { NULL }, 512,   "tcp" },
-  { "comsat",          { NULL }, 512,   "udp" },
-  { "biff",            { NULL }, 512,   "udp" },
-  { "login",           { NULL }, 513,   "tcp" },
-  { "who",             { NULL }, 513,   "udp" },
-  { "shell",           { NULL }, 514,   "tcp" },
-  { "syslog",          { NULL }, 514,   "udp" },
-  { "printer",         { NULL }, 515,   "tcp" },
-  { "printer",         { NULL }, 515,   "udp" },
-  { "videotex",        { NULL }, 516,   "tcp" },
-  { "videotex",        { NULL }, 516,   "udp" },
-  { "talk",            { NULL }, 517,   "tcp" },
-  { "talk",            { NULL }, 517,   "udp" },
-  { "ntalk",           { NULL }, 518,   "tcp" },
-  { "ntalk",           { NULL }, 518,   "udp" },
-  { "utime",           { NULL }, 519,   "tcp" },
-  { "utime",           { NULL }, 519,   "udp" },
-  { "efs",             { NULL }, 520,   "tcp" },
-  { "router",          { NULL }, 520,   "udp" },
-  { "ripng",           { NULL }, 521,   "tcp" },
-  { "ripng",           { NULL }, 521,   "udp" },
-  { "ulp",             { NULL }, 522,   "tcp" },
-  { "ulp",             { NULL }, 522,   "udp" },
-  { "ibm-db2",         { NULL }, 523,   "tcp" },
-  { "ibm-db2",         { NULL }, 523,   "udp" },
-  { "ncp",             { NULL }, 524,   "tcp" },
-  { "ncp",             { NULL }, 524,   "udp" },
-  { "timed",           { NULL }, 525,   "tcp" },
-  { "timed",           { NULL }, 525,   "udp" },
-  { "tempo",           { NULL }, 526,   "tcp" },
-  { "tempo",           { NULL }, 526,   "udp" },
-  { "stx",             { NULL }, 527,   "tcp" },
-  { "stx",             { NULL }, 527,   "udp" },
-  { "custix",          { NULL }, 528,   "tcp" },
-  { "custix",          { NULL }, 528,   "udp" },
-  { "irc-serv",        { NULL }, 529,   "tcp" },
-  { "irc-serv",        { NULL }, 529,   "udp" },
-  { "courier",         { NULL }, 530,   "tcp" },
-  { "courier",         { NULL }, 530,   "udp" },
-  { "conference",      { NULL }, 531,   "tcp" },
-  { "conference",      { NULL }, 531,   "udp" },
-  { "netnews",         { NULL }, 532,   "tcp" },
-  { "netnews",         { NULL }, 532,   "udp" },
-  { "netwall",         { NULL }, 533,   "tcp" },
-  { "netwall",         { NULL }, 533,   "udp" },
-  { "windream",        { NULL }, 534,   "tcp" },
-  { "windream",        { NULL }, 534,   "udp" },
-  { "iiop",            { NULL }, 535,   "tcp" },
-  { "iiop",            { NULL }, 535,   "udp" },
-  { "opalis-rdv",      { NULL }, 536,   "tcp" },
-  { "opalis-rdv",      { NULL }, 536,   "udp" },
-  { "nmsp",            { NULL }, 537,   "tcp" },
-  { "nmsp",            { NULL }, 537,   "udp" },
-  { "gdomap",          { NULL }, 538,   "tcp" },
-  { "gdomap",          { NULL }, 538,   "udp" },
-  { "apertus-ldp",     { NULL }, 539,   "tcp" },
-  { "apertus-ldp",     { NULL }, 539,   "udp" },
-  { "uucp",            { NULL }, 540,   "tcp" },
-  { "uucp",            { NULL }, 540,   "udp" },
-  { "uucp-rlogin",     { NULL }, 541,   "tcp" },
-  { "uucp-rlogin",     { NULL }, 541,   "udp" },
-  { "commerce",        { NULL }, 542,   "tcp" },
-  { "commerce",        { NULL }, 542,   "udp" },
-  { "klogin",          { NULL }, 543,   "tcp" },
-  { "klogin",          { NULL }, 543,   "udp" },
-  { "kshell",          { NULL }, 544,   "tcp" },
-  { "kshell",          { NULL }, 544,   "udp" },
-  { "appleqtcsrvr",    { NULL }, 545,   "tcp" },
-  { "appleqtcsrvr",    { NULL }, 545,   "udp" },
-  { "dhcpv6-client",   { NULL }, 546,   "tcp" },
-  { "dhcpv6-client",   { NULL }, 546,   "udp" },
-  { "dhcpv6-server",   { NULL }, 547,   "tcp" },
-  { "dhcpv6-server",   { NULL }, 547,   "udp" },
-  { "afpovertcp",      { NULL }, 548,   "tcp" },
-  { "afpovertcp",      { NULL }, 548,   "udp" },
-  { "idfp",            { NULL }, 549,   "tcp" },
-  { "idfp",            { NULL }, 549,   "udp" },
-  { "new-rwho",        { NULL }, 550,   "tcp" },
-  { "new-rwho",        { NULL }, 550,   "udp" },
-  { "cybercash",       { NULL }, 551,   "tcp" },
-  { "cybercash",       { NULL }, 551,   "udp" },
-  { "devshr-nts",      { NULL }, 552,   "tcp" },
-  { "devshr-nts",      { NULL }, 552,   "udp" },
-  { "pirp",            { NULL }, 553,   "tcp" },
-  { "pirp",            { NULL }, 553,   "udp" },
-  { "rtsp",            { NULL }, 554,   "tcp" },
-  { "rtsp",            { NULL }, 554,   "udp" },
-  { "dsf",             { NULL }, 555,   "tcp" },
-  { "dsf",             { NULL }, 555,   "udp" },
-  { "remotefs",        { NULL }, 556,   "tcp" },
-  { "remotefs",        { NULL }, 556,   "udp" },
-  { "openvms-sysipc",  { NULL }, 557,   "tcp" },
-  { "openvms-sysipc",  { NULL }, 557,   "udp" },
-  { "sdnskmp",         { NULL }, 558,   "tcp" },
-  { "sdnskmp",         { NULL }, 558,   "udp" },
-  { "teedtap",         { NULL }, 559,   "tcp" },
-  { "teedtap",         { NULL }, 559,   "udp" },
-  { "rmonitor",        { NULL }, 560,   "tcp" },
-  { "rmonitor",        { NULL }, 560,   "udp" },
-  { "monitor",         { NULL }, 561,   "tcp" },
-  { "monitor",         { NULL }, 561,   "udp" },
-  { "chshell",         { NULL }, 562,   "tcp" },
-  { "chshell",         { NULL }, 562,   "udp" },
-  { "nntps",           { NULL }, 563,   "tcp" },
-  { "nntps",           { NULL }, 563,   "udp" },
-  { "9pfs",            { NULL }, 564,   "tcp" },
-  { "9pfs",            { NULL }, 564,   "udp" },
-  { "whoami",          { NULL }, 565,   "tcp" },
-  { "whoami",          { NULL }, 565,   "udp" },
-  { "streettalk",      { NULL }, 566,   "tcp" },
-  { "streettalk",      { NULL }, 566,   "udp" },
-  { "banyan-rpc",      { NULL }, 567,   "tcp" },
-  { "banyan-rpc",      { NULL }, 567,   "udp" },
-  { "ms-shuttle",      { NULL }, 568,   "tcp" },
-  { "ms-shuttle",      { NULL }, 568,   "udp" },
-  { "ms-rome",         { NULL }, 569,   "tcp" },
-  { "ms-rome",         { NULL }, 569,   "udp" },
-  { "meter",           { NULL }, 570,   "tcp" },
-  { "meter",           { NULL }, 570,   "udp" },
-  { "meter",           { NULL }, 571,   "tcp" },
-  { "meter",           { NULL }, 571,   "udp" },
-  { "sonar",           { NULL }, 572,   "tcp" },
-  { "sonar",           { NULL }, 572,   "udp" },
-  { "banyan-vip",      { NULL }, 573,   "tcp" },
-  { "banyan-vip",      { NULL }, 573,   "udp" },
-  { "ftp-agent",       { NULL }, 574,   "tcp" },
-  { "ftp-agent",       { NULL }, 574,   "udp" },
-  { "vemmi",           { NULL }, 575,   "tcp" },
-  { "vemmi",           { NULL }, 575,   "udp" },
-  { "ipcd",            { NULL }, 576,   "tcp" },
-  { "ipcd",            { NULL }, 576,   "udp" },
-  { "vnas",            { NULL }, 577,   "tcp" },
-  { "vnas",            { NULL }, 577,   "udp" },
-  { "ipdd",            { NULL }, 578,   "tcp" },
-  { "ipdd",            { NULL }, 578,   "udp" },
-  { "decbsrv",         { NULL }, 579,   "tcp" },
-  { "decbsrv",         { NULL }, 579,   "udp" },
-  { "sntp-heartbeat",  { NULL }, 580,   "tcp" },
-  { "sntp-heartbeat",  { NULL }, 580,   "udp" },
-  { "bdp",             { NULL }, 581,   "tcp" },
-  { "bdp",             { NULL }, 581,   "udp" },
-  { "scc-security",    { NULL }, 582,   "tcp" },
-  { "scc-security",    { NULL }, 582,   "udp" },
-  { "philips-vc",      { NULL }, 583,   "tcp" },
-  { "philips-vc",      { NULL }, 583,   "udp" },
-  { "keyserver",       { NULL }, 584,   "tcp" },
-  { "keyserver",       { NULL }, 584,   "udp" },
-  { "password-chg",    { NULL }, 586,   "tcp" },
-  { "password-chg",    { NULL }, 586,   "udp" },
-  { "submission",      { NULL }, 587,   "tcp" },
-  { "submission",      { NULL }, 587,   "udp" },
-  { "cal",             { NULL }, 588,   "tcp" },
-  { "cal",             { NULL }, 588,   "udp" },
-  { "eyelink",         { NULL }, 589,   "tcp" },
-  { "eyelink",         { NULL }, 589,   "udp" },
-  { "tns-cml",         { NULL }, 590,   "tcp" },
-  { "tns-cml",         { NULL }, 590,   "udp" },
-  { "http-alt",        { NULL }, 591,   "tcp" },
-  { "http-alt",        { NULL }, 591,   "udp" },
-  { "eudora-set",      { NULL }, 592,   "tcp" },
-  { "eudora-set",      { NULL }, 592,   "udp" },
-  { "http-rpc-epmap",  { NULL }, 593,   "tcp" },
-  { "http-rpc-epmap",  { NULL }, 593,   "udp" },
-  { "tpip",            { NULL }, 594,   "tcp" },
-  { "tpip",            { NULL }, 594,   "udp" },
-  { "cab-protocol",    { NULL }, 595,   "tcp" },
-  { "cab-protocol",    { NULL }, 595,   "udp" },
-  { "smsd",            { NULL }, 596,   "tcp" },
-  { "smsd",            { NULL }, 596,   "udp" },
-  { "ptcnameservice",  { NULL }, 597,   "tcp" },
-  { "ptcnameservice",  { NULL }, 597,   "udp" },
-  { "sco-websrvrmg3",  { NULL }, 598,   "tcp" },
-  { "sco-websrvrmg3",  { NULL }, 598,   "udp" },
-  { "acp",             { NULL }, 599,   "tcp" },
-  { "acp",             { NULL }, 599,   "udp" },
-  { "ipcserver",       { NULL }, 600,   "tcp" },
-  { "ipcserver",       { NULL }, 600,   "udp" },
-  { "syslog-conn",     { NULL }, 601,   "tcp" },
-  { "syslog-conn",     { NULL }, 601,   "udp" },
-  { "xmlrpc-beep",     { NULL }, 602,   "tcp" },
-  { "xmlrpc-beep",     { NULL }, 602,   "udp" },
-  { "idxp",            { NULL }, 603,   "tcp" },
-  { "idxp",            { NULL }, 603,   "udp" },
-  { "tunnel",          { NULL }, 604,   "tcp" },
-  { "tunnel",          { NULL }, 604,   "udp" },
-  { "soap-beep",       { NULL }, 605,   "tcp" },
-  { "soap-beep",       { NULL }, 605,   "udp" },
-  { "urm",             { NULL }, 606,   "tcp" },
-  { "urm",             { NULL }, 606,   "udp" },
-  { "nqs",             { NULL }, 607,   "tcp" },
-  { "nqs",             { NULL }, 607,   "udp" },
-  { "sift-uft",        { NULL }, 608,   "tcp" },
-  { "sift-uft",        { NULL }, 608,   "udp" },
-  { "npmp-trap",       { NULL }, 609,   "tcp" },
-  { "npmp-trap",       { NULL }, 609,   "udp" },
-  { "npmp-local",      { NULL }, 610,   "tcp" },
-  { "npmp-local",      { NULL }, 610,   "udp" },
-  { "npmp-gui",        { NULL }, 611,   "tcp" },
-  { "npmp-gui",        { NULL }, 611,   "udp" },
-  { "hmmp-ind",        { NULL }, 612,   "tcp" },
-  { "hmmp-ind",        { NULL }, 612,   "udp" },
-  { "hmmp-op",         { NULL }, 613,   "tcp" },
-  { "hmmp-op",         { NULL }, 613,   "udp" },
-  { "sshell",          { NULL }, 614,   "tcp" },
-  { "sshell",          { NULL }, 614,   "udp" },
-  { "sco-inetmgr",     { NULL }, 615,   "tcp" },
-  { "sco-inetmgr",     { NULL }, 615,   "udp" },
-  { "sco-sysmgr",      { NULL }, 616,   "tcp" },
-  { "sco-sysmgr",      { NULL }, 616,   "udp" },
-  { "sco-dtmgr",       { NULL }, 617,   "tcp" },
-  { "sco-dtmgr",       { NULL }, 617,   "udp" },
-  { "dei-icda",        { NULL }, 618,   "tcp" },
-  { "dei-icda",        { NULL }, 618,   "udp" },
-  { "compaq-evm",      { NULL }, 619,   "tcp" },
-  { "compaq-evm",      { NULL }, 619,   "udp" },
-  { "sco-websrvrmgr",  { NULL }, 620,   "tcp" },
-  { "sco-websrvrmgr",  { NULL }, 620,   "udp" },
-  { "escp-ip",         { NULL }, 621,   "tcp" },
-  { "escp-ip",         { NULL }, 621,   "udp" },
-  { "collaborator",    { NULL }, 622,   "tcp" },
-  { "collaborator",    { NULL }, 622,   "udp" },
-  { "oob-ws-http",     { NULL }, 623,   "tcp" },
-  { "asf-rmcp",        { NULL }, 623,   "udp" },
-  { "cryptoadmin",     { NULL }, 624,   "tcp" },
-  { "cryptoadmin",     { NULL }, 624,   "udp" },
-  { "dec_dlm",         { NULL }, 625,   "tcp" },
-  { "dec_dlm",         { NULL }, 625,   "udp" },
-  { "asia",            { NULL }, 626,   "tcp" },
-  { "asia",            { NULL }, 626,   "udp" },
-  { "passgo-tivoli",   { NULL }, 627,   "tcp" },
-  { "passgo-tivoli",   { NULL }, 627,   "udp" },
-  { "qmqp",            { NULL }, 628,   "tcp" },
-  { "qmqp",            { NULL }, 628,   "udp" },
-  { "3com-amp3",       { NULL }, 629,   "tcp" },
-  { "3com-amp3",       { NULL }, 629,   "udp" },
-  { "rda",             { NULL }, 630,   "tcp" },
-  { "rda",             { NULL }, 630,   "udp" },
-  { "ipp",             { NULL }, 631,   "tcp" },
-  { "ipp",             { NULL }, 631,   "udp" },
-  { "bmpp",            { NULL }, 632,   "tcp" },
-  { "bmpp",            { NULL }, 632,   "udp" },
-  { "servstat",        { NULL }, 633,   "tcp" },
-  { "servstat",        { NULL }, 633,   "udp" },
-  { "ginad",           { NULL }, 634,   "tcp" },
-  { "ginad",           { NULL }, 634,   "udp" },
-  { "rlzdbase",        { NULL }, 635,   "tcp" },
-  { "rlzdbase",        { NULL }, 635,   "udp" },
-  { "ldaps",           { NULL }, 636,   "tcp" },
-  { "ldaps",           { NULL }, 636,   "udp" },
-  { "lanserver",       { NULL }, 637,   "tcp" },
-  { "lanserver",       { NULL }, 637,   "udp" },
-  { "mcns-sec",        { NULL }, 638,   "tcp" },
-  { "mcns-sec",        { NULL }, 638,   "udp" },
-  { "msdp",            { NULL }, 639,   "tcp" },
-  { "msdp",            { NULL }, 639,   "udp" },
-  { "entrust-sps",     { NULL }, 640,   "tcp" },
-  { "entrust-sps",     { NULL }, 640,   "udp" },
-  { "repcmd",          { NULL }, 641,   "tcp" },
-  { "repcmd",          { NULL }, 641,   "udp" },
-  { "esro-emsdp",      { NULL }, 642,   "tcp" },
-  { "esro-emsdp",      { NULL }, 642,   "udp" },
-  { "sanity",          { NULL }, 643,   "tcp" },
-  { "sanity",          { NULL }, 643,   "udp" },
-  { "dwr",             { NULL }, 644,   "tcp" },
-  { "dwr",             { NULL }, 644,   "udp" },
-  { "pssc",            { NULL }, 645,   "tcp" },
-  { "pssc",            { NULL }, 645,   "udp" },
-  { "ldp",             { NULL }, 646,   "tcp" },
-  { "ldp",             { NULL }, 646,   "udp" },
-  { "dhcp-failover",   { NULL }, 647,   "tcp" },
-  { "dhcp-failover",   { NULL }, 647,   "udp" },
-  { "rrp",             { NULL }, 648,   "tcp" },
-  { "rrp",             { NULL }, 648,   "udp" },
-  { "cadview-3d",      { NULL }, 649,   "tcp" },
-  { "cadview-3d",      { NULL }, 649,   "udp" },
-  { "obex",            { NULL }, 650,   "tcp" },
-  { "obex",            { NULL }, 650,   "udp" },
-  { "ieee-mms",        { NULL }, 651,   "tcp" },
-  { "ieee-mms",        { NULL }, 651,   "udp" },
-  { "hello-port",      { NULL }, 652,   "tcp" },
-  { "hello-port",      { NULL }, 652,   "udp" },
-  { "repscmd",         { NULL }, 653,   "tcp" },
-  { "repscmd",         { NULL }, 653,   "udp" },
-  { "aodv",            { NULL }, 654,   "tcp" },
-  { "aodv",            { NULL }, 654,   "udp" },
-  { "tinc",            { NULL }, 655,   "tcp" },
-  { "tinc",            { NULL }, 655,   "udp" },
-  { "spmp",            { NULL }, 656,   "tcp" },
-  { "spmp",            { NULL }, 656,   "udp" },
-  { "rmc",             { NULL }, 657,   "tcp" },
-  { "rmc",             { NULL }, 657,   "udp" },
-  { "tenfold",         { NULL }, 658,   "tcp" },
-  { "tenfold",         { NULL }, 658,   "udp" },
-  { "mac-srvr-admin",  { NULL }, 660,   "tcp" },
-  { "mac-srvr-admin",  { NULL }, 660,   "udp" },
-  { "hap",             { NULL }, 661,   "tcp" },
-  { "hap",             { NULL }, 661,   "udp" },
-  { "pftp",            { NULL }, 662,   "tcp" },
-  { "pftp",            { NULL }, 662,   "udp" },
-  { "purenoise",       { NULL }, 663,   "tcp" },
-  { "purenoise",       { NULL }, 663,   "udp" },
-  { "oob-ws-https",    { NULL }, 664,   "tcp" },
-  { "asf-secure-rmcp", { NULL }, 664,   "udp" },
-  { "sun-dr",          { NULL }, 665,   "tcp" },
-  { "sun-dr",          { NULL }, 665,   "udp" },
-  { "mdqs",            { NULL }, 666,   "tcp" },
-  { "mdqs",            { NULL }, 666,   "udp" },
-  { "doom",            { NULL }, 666,   "tcp" },
-  { "doom",            { NULL }, 666,   "udp" },
-  { "disclose",        { NULL }, 667,   "tcp" },
-  { "disclose",        { NULL }, 667,   "udp" },
-  { "mecomm",          { NULL }, 668,   "tcp" },
-  { "mecomm",          { NULL }, 668,   "udp" },
-  { "meregister",      { NULL }, 669,   "tcp" },
-  { "meregister",      { NULL }, 669,   "udp" },
-  { "vacdsm-sws",      { NULL }, 670,   "tcp" },
-  { "vacdsm-sws",      { NULL }, 670,   "udp" },
-  { "vacdsm-app",      { NULL }, 671,   "tcp" },
-  { "vacdsm-app",      { NULL }, 671,   "udp" },
-  { "vpps-qua",        { NULL }, 672,   "tcp" },
-  { "vpps-qua",        { NULL }, 672,   "udp" },
-  { "cimplex",         { NULL }, 673,   "tcp" },
-  { "cimplex",         { NULL }, 673,   "udp" },
-  { "acap",            { NULL }, 674,   "tcp" },
-  { "acap",            { NULL }, 674,   "udp" },
-  { "dctp",            { NULL }, 675,   "tcp" },
-  { "dctp",            { NULL }, 675,   "udp" },
-  { "vpps-via",        { NULL }, 676,   "tcp" },
-  { "vpps-via",        { NULL }, 676,   "udp" },
-  { "vpp",             { NULL }, 677,   "tcp" },
-  { "vpp",             { NULL }, 677,   "udp" },
-  { "ggf-ncp",         { NULL }, 678,   "tcp" },
-  { "ggf-ncp",         { NULL }, 678,   "udp" },
-  { "mrm",             { NULL }, 679,   "tcp" },
-  { "mrm",             { NULL }, 679,   "udp" },
-  { "entrust-aaas",    { NULL }, 680,   "tcp" },
-  { "entrust-aaas",    { NULL }, 680,   "udp" },
-  { "entrust-aams",    { NULL }, 681,   "tcp" },
-  { "entrust-aams",    { NULL }, 681,   "udp" },
-  { "xfr",             { NULL }, 682,   "tcp" },
-  { "xfr",             { NULL }, 682,   "udp" },
-  { "corba-iiop",      { NULL }, 683,   "tcp" },
-  { "corba-iiop",      { NULL }, 683,   "udp" },
-  { "corba-iiop-ssl",  { NULL }, 684,   "tcp" },
-  { "corba-iiop-ssl",  { NULL }, 684,   "udp" },
-  { "mdc-portmapper",  { NULL }, 685,   "tcp" },
-  { "mdc-portmapper",  { NULL }, 685,   "udp" },
-  { "hcp-wismar",      { NULL }, 686,   "tcp" },
-  { "hcp-wismar",      { NULL }, 686,   "udp" },
-  { "asipregistry",    { NULL }, 687,   "tcp" },
-  { "asipregistry",    { NULL }, 687,   "udp" },
-  { "realm-rusd",      { NULL }, 688,   "tcp" },
-  { "realm-rusd",      { NULL }, 688,   "udp" },
-  { "nmap",            { NULL }, 689,   "tcp" },
-  { "nmap",            { NULL }, 689,   "udp" },
-  { "vatp",            { NULL }, 690,   "tcp" },
-  { "vatp",            { NULL }, 690,   "udp" },
-  { "msexch-routing",  { NULL }, 691,   "tcp" },
-  { "msexch-routing",  { NULL }, 691,   "udp" },
-  { "hyperwave-isp",   { NULL }, 692,   "tcp" },
-  { "hyperwave-isp",   { NULL }, 692,   "udp" },
-  { "connendp",        { NULL }, 693,   "tcp" },
-  { "connendp",        { NULL }, 693,   "udp" },
-  { "ha-cluster",      { NULL }, 694,   "tcp" },
-  { "ha-cluster",      { NULL }, 694,   "udp" },
-  { "ieee-mms-ssl",    { NULL }, 695,   "tcp" },
-  { "ieee-mms-ssl",    { NULL }, 695,   "udp" },
-  { "rushd",           { NULL }, 696,   "tcp" },
-  { "rushd",           { NULL }, 696,   "udp" },
-  { "uuidgen",         { NULL }, 697,   "tcp" },
-  { "uuidgen",         { NULL }, 697,   "udp" },
-  { "olsr",            { NULL }, 698,   "tcp" },
-  { "olsr",            { NULL }, 698,   "udp" },
-  { "accessnetwork",   { NULL }, 699,   "tcp" },
-  { "accessnetwork",   { NULL }, 699,   "udp" },
-  { "epp",             { NULL }, 700,   "tcp" },
-  { "epp",             { NULL }, 700,   "udp" },
-  { "lmp",             { NULL }, 701,   "tcp" },
-  { "lmp",             { NULL }, 701,   "udp" },
-  { "iris-beep",       { NULL }, 702,   "tcp" },
-  { "iris-beep",       { NULL }, 702,   "udp" },
-  { "elcsd",           { NULL }, 704,   "tcp" },
-  { "elcsd",           { NULL }, 704,   "udp" },
-  { "agentx",          { NULL }, 705,   "tcp" },
-  { "agentx",          { NULL }, 705,   "udp" },
-  { "silc",            { NULL }, 706,   "tcp" },
-  { "silc",            { NULL }, 706,   "udp" },
-  { "borland-dsj",     { NULL }, 707,   "tcp" },
-  { "borland-dsj",     { NULL }, 707,   "udp" },
-  { "entrust-kmsh",    { NULL }, 709,   "tcp" },
-  { "entrust-kmsh",    { NULL }, 709,   "udp" },
-  { "entrust-ash",     { NULL }, 710,   "tcp" },
-  { "entrust-ash",     { NULL }, 710,   "udp" },
-  { "cisco-tdp",       { NULL }, 711,   "tcp" },
-  { "cisco-tdp",       { NULL }, 711,   "udp" },
-  { "tbrpf",           { NULL }, 712,   "tcp" },
-  { "tbrpf",           { NULL }, 712,   "udp" },
-  { "iris-xpc",        { NULL }, 713,   "tcp" },
-  { "iris-xpc",        { NULL }, 713,   "udp" },
-  { "iris-xpcs",       { NULL }, 714,   "tcp" },
-  { "iris-xpcs",       { NULL }, 714,   "udp" },
-  { "iris-lwz",        { NULL }, 715,   "tcp" },
-  { "iris-lwz",        { NULL }, 715,   "udp" },
-  { "pana",            { NULL }, 716,   "udp" },
-  { "netviewdm1",      { NULL }, 729,   "tcp" },
-  { "netviewdm1",      { NULL }, 729,   "udp" },
-  { "netviewdm2",      { NULL }, 730,   "tcp" },
-  { "netviewdm2",      { NULL }, 730,   "udp" },
-  { "netviewdm3",      { NULL }, 731,   "tcp" },
-  { "netviewdm3",      { NULL }, 731,   "udp" },
-  { "netgw",           { NULL }, 741,   "tcp" },
-  { "netgw",           { NULL }, 741,   "udp" },
-  { "netrcs",          { NULL }, 742,   "tcp" },
-  { "netrcs",          { NULL }, 742,   "udp" },
-  { "flexlm",          { NULL }, 744,   "tcp" },
-  { "flexlm",          { NULL }, 744,   "udp" },
-  { "fujitsu-dev",     { NULL }, 747,   "tcp" },
-  { "fujitsu-dev",     { NULL }, 747,   "udp" },
-  { "ris-cm",          { NULL }, 748,   "tcp" },
-  { "ris-cm",          { NULL }, 748,   "udp" },
-  { "kerberos-adm",    { NULL }, 749,   "tcp" },
-  { "kerberos-adm",    { NULL }, 749,   "udp" },
-  { "rfile",           { NULL }, 750,   "tcp" },
-  { "loadav",          { NULL }, 750,   "udp" },
-  { "kerberos-iv",     { NULL }, 750,   "udp" },
-  { "pump",            { NULL }, 751,   "tcp" },
-  { "pump",            { NULL }, 751,   "udp" },
-  { "qrh",             { NULL }, 752,   "tcp" },
-  { "qrh",             { NULL }, 752,   "udp" },
-  { "rrh",             { NULL }, 753,   "tcp" },
-  { "rrh",             { NULL }, 753,   "udp" },
-  { "tell",            { NULL }, 754,   "tcp" },
-  { "tell",            { NULL }, 754,   "udp" },
-  { "nlogin",          { NULL }, 758,   "tcp" },
-  { "nlogin",          { NULL }, 758,   "udp" },
-  { "con",             { NULL }, 759,   "tcp" },
-  { "con",             { NULL }, 759,   "udp" },
-  { "ns",              { NULL }, 760,   "tcp" },
-  { "ns",              { NULL }, 760,   "udp" },
-  { "rxe",             { NULL }, 761,   "tcp" },
-  { "rxe",             { NULL }, 761,   "udp" },
-  { "quotad",          { NULL }, 762,   "tcp" },
-  { "quotad",          { NULL }, 762,   "udp" },
-  { "cycleserv",       { NULL }, 763,   "tcp" },
-  { "cycleserv",       { NULL }, 763,   "udp" },
-  { "omserv",          { NULL }, 764,   "tcp" },
-  { "omserv",          { NULL }, 764,   "udp" },
-  { "webster",         { NULL }, 765,   "tcp" },
-  { "webster",         { NULL }, 765,   "udp" },
-  { "phonebook",       { NULL }, 767,   "tcp" },
-  { "phonebook",       { NULL }, 767,   "udp" },
-  { "vid",             { NULL }, 769,   "tcp" },
-  { "vid",             { NULL }, 769,   "udp" },
-  { "cadlock",         { NULL }, 770,   "tcp" },
-  { "cadlock",         { NULL }, 770,   "udp" },
-  { "rtip",            { NULL }, 771,   "tcp" },
-  { "rtip",            { NULL }, 771,   "udp" },
-  { "cycleserv2",      { NULL }, 772,   "tcp" },
-  { "cycleserv2",      { NULL }, 772,   "udp" },
-  { "submit",          { NULL }, 773,   "tcp" },
-  { "notify",          { NULL }, 773,   "udp" },
-  { "rpasswd",         { NULL }, 774,   "tcp" },
-  { "acmaint_dbd",     { NULL }, 774,   "udp" },
-  { "entomb",          { NULL }, 775,   "tcp" },
-  { "acmaint_transd",  { NULL }, 775,   "udp" },
-  { "wpages",          { NULL }, 776,   "tcp" },
-  { "wpages",          { NULL }, 776,   "udp" },
-  { "multiling-http",  { NULL }, 777,   "tcp" },
-  { "multiling-http",  { NULL }, 777,   "udp" },
-  { "wpgs",            { NULL }, 780,   "tcp" },
-  { "wpgs",            { NULL }, 780,   "udp" },
-  { "mdbs_daemon",     { NULL }, 800,   "tcp" },
-  { "mdbs_daemon",     { NULL }, 800,   "udp" },
-  { "device",          { NULL }, 801,   "tcp" },
-  { "device",          { NULL }, 801,   "udp" },
-  { "fcp-udp",         { NULL }, 810,   "tcp" },
-  { "fcp-udp",         { NULL }, 810,   "udp" },
-  { "itm-mcell-s",     { NULL }, 828,   "tcp" },
-  { "itm-mcell-s",     { NULL }, 828,   "udp" },
-  { "pkix-3-ca-ra",    { NULL }, 829,   "tcp" },
-  { "pkix-3-ca-ra",    { NULL }, 829,   "udp" },
-  { "netconf-ssh",     { NULL }, 830,   "tcp" },
-  { "netconf-ssh",     { NULL }, 830,   "udp" },
-  { "netconf-beep",    { NULL }, 831,   "tcp" },
-  { "netconf-beep",    { NULL }, 831,   "udp" },
-  { "netconfsoaphttp", { NULL }, 832,   "tcp" },
-  { "netconfsoaphttp", { NULL }, 832,   "udp" },
-  { "netconfsoapbeep", { NULL }, 833,   "tcp" },
-  { "netconfsoapbeep", { NULL }, 833,   "udp" },
-  { "dhcp-failover2",  { NULL }, 847,   "tcp" },
-  { "dhcp-failover2",  { NULL }, 847,   "udp" },
-  { "gdoi",            { NULL }, 848,   "tcp" },
-  { "gdoi",            { NULL }, 848,   "udp" },
-  { "iscsi",           { NULL }, 860,   "tcp" },
-  { "iscsi",           { NULL }, 860,   "udp" },
-  { "owamp-control",   { NULL }, 861,   "tcp" },
-  { "owamp-control",   { NULL }, 861,   "udp" },
-  { "twamp-control",   { NULL }, 862,   "tcp" },
-  { "twamp-control",   { NULL }, 862,   "udp" },
-  { "rsync",           { NULL }, 873,   "tcp" },
-  { "rsync",           { NULL }, 873,   "udp" },
-  { "iclcnet-locate",  { NULL }, 886,   "tcp" },
-  { "iclcnet-locate",  { NULL }, 886,   "udp" },
-  { "iclcnet_svinfo",  { NULL }, 887,   "tcp" },
-  { "iclcnet_svinfo",  { NULL }, 887,   "udp" },
-  { "accessbuilder",   { NULL }, 888,   "tcp" },
-  { "accessbuilder",   { NULL }, 888,   "udp" },
-  { "cddbp",           { NULL }, 888,   "tcp" },
-  { "omginitialrefs",  { NULL }, 900,   "tcp" },
-  { "omginitialrefs",  { NULL }, 900,   "udp" },
-  { "smpnameres",      { NULL }, 901,   "tcp" },
-  { "smpnameres",      { NULL }, 901,   "udp" },
-  { "ideafarm-door",   { NULL }, 902,   "tcp" },
-  { "ideafarm-door",   { NULL }, 902,   "udp" },
-  { "ideafarm-panic",  { NULL }, 903,   "tcp" },
-  { "ideafarm-panic",  { NULL }, 903,   "udp" },
-  { "kink",            { NULL }, 910,   "tcp" },
-  { "kink",            { NULL }, 910,   "udp" },
-  { "xact-backup",     { NULL }, 911,   "tcp" },
-  { "xact-backup",     { NULL }, 911,   "udp" },
-  { "apex-mesh",       { NULL }, 912,   "tcp" },
-  { "apex-mesh",       { NULL }, 912,   "udp" },
-  { "apex-edge",       { NULL }, 913,   "tcp" },
-  { "apex-edge",       { NULL }, 913,   "udp" },
-  { "ftps-data",       { NULL }, 989,   "tcp" },
-  { "ftps-data",       { NULL }, 989,   "udp" },
-  { "ftps",            { NULL }, 990,   "tcp" },
-  { "ftps",            { NULL }, 990,   "udp" },
-  { "nas",             { NULL }, 991,   "tcp" },
-  { "nas",             { NULL }, 991,   "udp" },
-  { "telnets",         { NULL }, 992,   "tcp" },
-  { "telnets",         { NULL }, 992,   "udp" },
-  { "imaps",           { NULL }, 993,   "tcp" },
-  { "imaps",           { NULL }, 993,   "udp" },
-  { "ircs",            { NULL }, 994,   "tcp" },
-  { "ircs",            { NULL }, 994,   "udp" },
-  { "pop3s",           { NULL }, 995,   "tcp" },
-  { "pop3s",           { NULL }, 995,   "udp" },
-  { "vsinet",          { NULL }, 996,   "tcp" },
-  { "vsinet",          { NULL }, 996,   "udp" },
-  { "maitrd",          { NULL }, 997,   "tcp" },
-  { "maitrd",          { NULL }, 997,   "udp" },
-  { "busboy",          { NULL }, 998,   "tcp" },
-  { "puparp",          { NULL }, 998,   "udp" },
-  { "garcon",          { NULL }, 999,   "tcp" },
-  { "applix",          { NULL }, 999,   "udp" },
-  { "puprouter",       { NULL }, 999,   "tcp" },
-  { "puprouter",       { NULL }, 999,   "udp" },
-  { "cadlock2",        { NULL }, 1000,  "tcp" },
-  { "cadlock2",        { NULL }, 1000,  "udp" },
-  { "surf",            { NULL }, 1010,  "tcp" },
-  { "surf",            { NULL }, 1010,  "udp" },
-  { "exp1",            { NULL }, 1021,  "tcp" },
-  { "exp1",            { NULL }, 1021,  "udp" },
-  { "exp2",            { NULL }, 1022,  "tcp" },
-  { "exp2",            { NULL }, 1022,  "udp" },
+  { "tcpmux",          { NULL }, 1,     "tcp"  },
+  { "tcpmux",          { NULL }, 1,     "udp"  },
+  { "compressnet",     { NULL }, 2,     "tcp"  },
+  { "compressnet",     { NULL }, 2,     "udp"  },
+  { "compressnet",     { NULL }, 3,     "tcp"  },
+  { "compressnet",     { NULL }, 3,     "udp"  },
+  { "rje",             { NULL }, 5,     "tcp"  },
+  { "rje",             { NULL }, 5,     "udp"  },
+  { "echo",            { NULL }, 7,     "tcp"  },
+  { "echo",            { NULL }, 7,     "udp"  },
+  { "discard",         { NULL }, 9,     "tcp"  },
+  { "discard",         { NULL }, 9,     "udp"  },
+  { "discard",         { NULL }, 9,     "sctp" },
+  { "discard",         { NULL }, 9,     "dccp" },
+  { "systat",          { NULL }, 11,    "tcp"  },
+  { "systat",          { NULL }, 11,    "udp"  },
+  { "daytime",         { NULL }, 13,    "tcp"  },
+  { "daytime",         { NULL }, 13,    "udp"  },
+  { "qotd",            { NULL }, 17,    "tcp"  },
+  { "qotd",            { NULL }, 17,    "udp"  },
+  { "msp",             { NULL }, 18,    "tcp"  },
+  { "msp",             { NULL }, 18,    "udp"  },
+  { "chargen",         { NULL }, 19,    "tcp"  },
+  { "chargen",         { NULL }, 19,    "udp"  },
+  { "ftp-data",        { NULL }, 20,    "tcp"  },
+  { "ftp-data",        { NULL }, 20,    "udp"  },
+  { "ftp-data",        { NULL }, 20,    "sctp" },
+  { "ftp",             { NULL }, 21,    "tcp"  },
+  { "ftp",             { NULL }, 21,    "udp"  },
+  { "ftp",             { NULL }, 21,    "sctp" },
+  { "ssh",             { NULL }, 22,    "tcp"  },
+  { "ssh",             { NULL }, 22,    "udp"  },
+  { "ssh",             { NULL }, 22,    "sctp" },
+  { "telnet",          { NULL }, 23,    "tcp"  },
+  { "telnet",          { NULL }, 23,    "udp"  },
+  { "smtp",            { NULL }, 25,    "tcp"  },
+  { "smtp",            { NULL }, 25,    "udp"  },
+  { "nsw-fe",          { NULL }, 27,    "tcp"  },
+  { "nsw-fe",          { NULL }, 27,    "udp"  },
+  { "msg-icp",         { NULL }, 29,    "tcp"  },
+  { "msg-icp",         { NULL }, 29,    "udp"  },
+  { "msg-auth",        { NULL }, 31,    "tcp"  },
+  { "msg-auth",        { NULL }, 31,    "udp"  },
+  { "dsp",             { NULL }, 33,    "tcp"  },
+  { "dsp",             { NULL }, 33,    "udp"  },
+  { "time",            { NULL }, 37,    "tcp"  },
+  { "time",            { NULL }, 37,    "udp"  },
+  { "rap",             { NULL }, 38,    "tcp"  },
+  { "rap",             { NULL }, 38,    "udp"  },
+  { "rlp",             { NULL }, 39,    "tcp"  },
+  { "rlp",             { NULL }, 39,    "udp"  },
+  { "graphics",        { NULL }, 41,    "tcp"  },
+  { "graphics",        { NULL }, 41,    "udp"  },
+  { "name",            { NULL }, 42,    "tcp"  },
+  { "name",            { NULL }, 42,    "udp"  },
+  { "nameserver",      { NULL }, 42,    "tcp"  },
+  { "nameserver",      { NULL }, 42,    "udp"  },
+  { "nicname",         { NULL }, 43,    "tcp"  },
+  { "nicname",         { NULL }, 43,    "udp"  },
+  { "mpm-flags",       { NULL }, 44,    "tcp"  },
+  { "mpm-flags",       { NULL }, 44,    "udp"  },
+  { "mpm",             { NULL }, 45,    "tcp"  },
+  { "mpm",             { NULL }, 45,    "udp"  },
+  { "mpm-snd",         { NULL }, 46,    "tcp"  },
+  { "mpm-snd",         { NULL }, 46,    "udp"  },
+  { "ni-ftp",          { NULL }, 47,    "tcp"  },
+  { "ni-ftp",          { NULL }, 47,    "udp"  },
+  { "auditd",          { NULL }, 48,    "tcp"  },
+  { "auditd",          { NULL }, 48,    "udp"  },
+  { "tacacs",          { NULL }, 49,    "tcp"  },
+  { "tacacs",          { NULL }, 49,    "udp"  },
+  { "re-mail-ck",      { NULL }, 50,    "tcp"  },
+  { "re-mail-ck",      { NULL }, 50,    "udp"  },
+  { "la-maint",        { NULL }, 51,    "tcp"  },
+  { "la-maint",        { NULL }, 51,    "udp"  },
+  { "xns-time",        { NULL }, 52,    "tcp"  },
+  { "xns-time",        { NULL }, 52,    "udp"  },
+  { "domain",          { NULL }, 53,    "tcp"  },
+  { "domain",          { NULL }, 53,    "udp"  },
+  { "xns-ch",          { NULL }, 54,    "tcp"  },
+  { "xns-ch",          { NULL }, 54,    "udp"  },
+  { "isi-gl",          { NULL }, 55,    "tcp"  },
+  { "isi-gl",          { NULL }, 55,    "udp"  },
+  { "xns-auth",        { NULL }, 56,    "tcp"  },
+  { "xns-auth",        { NULL }, 56,    "udp"  },
+  { "xns-mail",        { NULL }, 58,    "tcp"  },
+  { "xns-mail",        { NULL }, 58,    "udp"  },
+  { "ni-mail",         { NULL }, 61,    "tcp"  },
+  { "ni-mail",         { NULL }, 61,    "udp"  },
+  { "acas",            { NULL }, 62,    "tcp"  },
+  { "acas",            { NULL }, 62,    "udp"  },
+  { "whois++",         { NULL }, 63,    "tcp"  },
+  { "whois++",         { NULL }, 63,    "udp"  },
+  { "covia",           { NULL }, 64,    "tcp"  },
+  { "covia",           { NULL }, 64,    "udp"  },
+  { "tacacs-ds",       { NULL }, 65,    "tcp"  },
+  { "tacacs-ds",       { NULL }, 65,    "udp"  },
+  { "sql*net",         { NULL }, 66,    "tcp"  },
+  { "sql*net",         { NULL }, 66,    "udp"  },
+  { "bootps",          { NULL }, 67,    "tcp"  },
+  { "bootps",          { NULL }, 67,    "udp"  },
+  { "bootpc",          { NULL }, 68,    "tcp"  },
+  { "bootpc",          { NULL }, 68,    "udp"  },
+  { "tftp",            { NULL }, 69,    "tcp"  },
+  { "tftp",            { NULL }, 69,    "udp"  },
+  { "gopher",          { NULL }, 70,    "tcp"  },
+  { "gopher",          { NULL }, 70,    "udp"  },
+  { "netrjs-1",        { NULL }, 71,    "tcp"  },
+  { "netrjs-1",        { NULL }, 71,    "udp"  },
+  { "netrjs-2",        { NULL }, 72,    "tcp"  },
+  { "netrjs-2",        { NULL }, 72,    "udp"  },
+  { "netrjs-3",        { NULL }, 73,    "tcp"  },
+  { "netrjs-3",        { NULL }, 73,    "udp"  },
+  { "netrjs-4",        { NULL }, 74,    "tcp"  },
+  { "netrjs-4",        { NULL }, 74,    "udp"  },
+  { "deos",            { NULL }, 76,    "tcp"  },
+  { "deos",            { NULL }, 76,    "udp"  },
+  { "vettcp",          { NULL }, 78,    "tcp"  },
+  { "vettcp",          { NULL }, 78,    "udp"  },
+  { "finger",          { NULL }, 79,    "tcp"  },
+  { "finger",          { NULL }, 79,    "udp"  },
+  { "http",            { NULL }, 80,    "tcp"  },
+  { "http",            { NULL }, 80,    "udp"  },
+  { "www",             { NULL }, 80,    "tcp"  },
+  { "www",             { NULL }, 80,    "udp"  },
+  { "www-http",        { NULL }, 80,    "tcp"  },
+  { "www-http",        { NULL }, 80,    "udp"  },
+  { "http",            { NULL }, 80,    "sctp" },
+  { "xfer",            { NULL }, 82,    "tcp"  },
+  { "xfer",            { NULL }, 82,    "udp"  },
+  { "mit-ml-dev",      { NULL }, 83,    "tcp"  },
+  { "mit-ml-dev",      { NULL }, 83,    "udp"  },
+  { "ctf",             { NULL }, 84,    "tcp"  },
+  { "ctf",             { NULL }, 84,    "udp"  },
+  { "mit-ml-dev",      { NULL }, 85,    "tcp"  },
+  { "mit-ml-dev",      { NULL }, 85,    "udp"  },
+  { "mfcobol",         { NULL }, 86,    "tcp"  },
+  { "mfcobol",         { NULL }, 86,    "udp"  },
+  { "kerberos",        { NULL }, 88,    "tcp"  },
+  { "kerberos",        { NULL }, 88,    "udp"  },
+  { "su-mit-tg",       { NULL }, 89,    "tcp"  },
+  { "su-mit-tg",       { NULL }, 89,    "udp"  },
+  { "dnsix",           { NULL }, 90,    "tcp"  },
+  { "dnsix",           { NULL }, 90,    "udp"  },
+  { "mit-dov",         { NULL }, 91,    "tcp"  },
+  { "mit-dov",         { NULL }, 91,    "udp"  },
+  { "npp",             { NULL }, 92,    "tcp"  },
+  { "npp",             { NULL }, 92,    "udp"  },
+  { "dcp",             { NULL }, 93,    "tcp"  },
+  { "dcp",             { NULL }, 93,    "udp"  },
+  { "objcall",         { NULL }, 94,    "tcp"  },
+  { "objcall",         { NULL }, 94,    "udp"  },
+  { "supdup",          { NULL }, 95,    "tcp"  },
+  { "supdup",          { NULL }, 95,    "udp"  },
+  { "dixie",           { NULL }, 96,    "tcp"  },
+  { "dixie",           { NULL }, 96,    "udp"  },
+  { "swift-rvf",       { NULL }, 97,    "tcp"  },
+  { "swift-rvf",       { NULL }, 97,    "udp"  },
+  { "tacnews",         { NULL }, 98,    "tcp"  },
+  { "tacnews",         { NULL }, 98,    "udp"  },
+  { "metagram",        { NULL }, 99,    "tcp"  },
+  { "metagram",        { NULL }, 99,    "udp"  },
+  { "newacct",         { NULL }, 100,   "tcp"  },
+  { "hostname",        { NULL }, 101,   "tcp"  },
+  { "hostname",        { NULL }, 101,   "udp"  },
+  { "iso-tsap",        { NULL }, 102,   "tcp"  },
+  { "iso-tsap",        { NULL }, 102,   "udp"  },
+  { "gppitnp",         { NULL }, 103,   "tcp"  },
+  { "gppitnp",         { NULL }, 103,   "udp"  },
+  { "acr-nema",        { NULL }, 104,   "tcp"  },
+  { "acr-nema",        { NULL }, 104,   "udp"  },
+  { "cso",             { NULL }, 105,   "tcp"  },
+  { "cso",             { NULL }, 105,   "udp"  },
+  { "csnet-ns",        { NULL }, 105,   "tcp"  },
+  { "csnet-ns",        { NULL }, 105,   "udp"  },
+  { "3com-tsmux",      { NULL }, 106,   "tcp"  },
+  { "3com-tsmux",      { NULL }, 106,   "udp"  },
+  { "rtelnet",         { NULL }, 107,   "tcp"  },
+  { "rtelnet",         { NULL }, 107,   "udp"  },
+  { "snagas",          { NULL }, 108,   "tcp"  },
+  { "snagas",          { NULL }, 108,   "udp"  },
+  { "pop2",            { NULL }, 109,   "tcp"  },
+  { "pop2",            { NULL }, 109,   "udp"  },
+  { "pop3",            { NULL }, 110,   "tcp"  },
+  { "pop3",            { NULL }, 110,   "udp"  },
+  { "sunrpc",          { NULL }, 111,   "tcp"  },
+  { "sunrpc",          { NULL }, 111,   "udp"  },
+  { "mcidas",          { NULL }, 112,   "tcp"  },
+  { "mcidas",          { NULL }, 112,   "udp"  },
+  { "ident",           { NULL }, 113,   "tcp"  },
+  { "auth",            { NULL }, 113,   "tcp"  },
+  { "auth",            { NULL }, 113,   "udp"  },
+  { "sftp",            { NULL }, 115,   "tcp"  },
+  { "sftp",            { NULL }, 115,   "udp"  },
+  { "ansanotify",      { NULL }, 116,   "tcp"  },
+  { "ansanotify",      { NULL }, 116,   "udp"  },
+  { "uucp-path",       { NULL }, 117,   "tcp"  },
+  { "uucp-path",       { NULL }, 117,   "udp"  },
+  { "sqlserv",         { NULL }, 118,   "tcp"  },
+  { "sqlserv",         { NULL }, 118,   "udp"  },
+  { "nntp",            { NULL }, 119,   "tcp"  },
+  { "nntp",            { NULL }, 119,   "udp"  },
+  { "cfdptkt",         { NULL }, 120,   "tcp"  },
+  { "cfdptkt",         { NULL }, 120,   "udp"  },
+  { "erpc",            { NULL }, 121,   "tcp"  },
+  { "erpc",            { NULL }, 121,   "udp"  },
+  { "smakynet",        { NULL }, 122,   "tcp"  },
+  { "smakynet",        { NULL }, 122,   "udp"  },
+  { "ntp",             { NULL }, 123,   "tcp"  },
+  { "ntp",             { NULL }, 123,   "udp"  },
+  { "ansatrader",      { NULL }, 124,   "tcp"  },
+  { "ansatrader",      { NULL }, 124,   "udp"  },
+  { "locus-map",       { NULL }, 125,   "tcp"  },
+  { "locus-map",       { NULL }, 125,   "udp"  },
+  { "nxedit",          { NULL }, 126,   "tcp"  },
+  { "nxedit",          { NULL }, 126,   "udp"  },
+  { "locus-con",       { NULL }, 127,   "tcp"  },
+  { "locus-con",       { NULL }, 127,   "udp"  },
+  { "gss-xlicen",      { NULL }, 128,   "tcp"  },
+  { "gss-xlicen",      { NULL }, 128,   "udp"  },
+  { "pwdgen",          { NULL }, 129,   "tcp"  },
+  { "pwdgen",          { NULL }, 129,   "udp"  },
+  { "cisco-fna",       { NULL }, 130,   "tcp"  },
+  { "cisco-fna",       { NULL }, 130,   "udp"  },
+  { "cisco-tna",       { NULL }, 131,   "tcp"  },
+  { "cisco-tna",       { NULL }, 131,   "udp"  },
+  { "cisco-sys",       { NULL }, 132,   "tcp"  },
+  { "cisco-sys",       { NULL }, 132,   "udp"  },
+  { "statsrv",         { NULL }, 133,   "tcp"  },
+  { "statsrv",         { NULL }, 133,   "udp"  },
+  { "ingres-net",      { NULL }, 134,   "tcp"  },
+  { "ingres-net",      { NULL }, 134,   "udp"  },
+  { "epmap",           { NULL }, 135,   "tcp"  },
+  { "epmap",           { NULL }, 135,   "udp"  },
+  { "profile",         { NULL }, 136,   "tcp"  },
+  { "profile",         { NULL }, 136,   "udp"  },
+  { "netbios-ns",      { NULL }, 137,   "tcp"  },
+  { "netbios-ns",      { NULL }, 137,   "udp"  },
+  { "netbios-dgm",     { NULL }, 138,   "tcp"  },
+  { "netbios-dgm",     { NULL }, 138,   "udp"  },
+  { "netbios-ssn",     { NULL }, 139,   "tcp"  },
+  { "netbios-ssn",     { NULL }, 139,   "udp"  },
+  { "emfis-data",      { NULL }, 140,   "tcp"  },
+  { "emfis-data",      { NULL }, 140,   "udp"  },
+  { "emfis-cntl",      { NULL }, 141,   "tcp"  },
+  { "emfis-cntl",      { NULL }, 141,   "udp"  },
+  { "bl-idm",          { NULL }, 142,   "tcp"  },
+  { "bl-idm",          { NULL }, 142,   "udp"  },
+  { "imap",            { NULL }, 143,   "tcp"  },
+  { "imap",            { NULL }, 143,   "udp"  },
+  { "uma",             { NULL }, 144,   "tcp"  },
+  { "uma",             { NULL }, 144,   "udp"  },
+  { "uaac",            { NULL }, 145,   "tcp"  },
+  { "uaac",            { NULL }, 145,   "udp"  },
+  { "iso-tp0",         { NULL }, 146,   "tcp"  },
+  { "iso-tp0",         { NULL }, 146,   "udp"  },
+  { "iso-ip",          { NULL }, 147,   "tcp"  },
+  { "iso-ip",          { NULL }, 147,   "udp"  },
+  { "jargon",          { NULL }, 148,   "tcp"  },
+  { "jargon",          { NULL }, 148,   "udp"  },
+  { "aed-512",         { NULL }, 149,   "tcp"  },
+  { "aed-512",         { NULL }, 149,   "udp"  },
+  { "sql-net",         { NULL }, 150,   "tcp"  },
+  { "sql-net",         { NULL }, 150,   "udp"  },
+  { "hems",            { NULL }, 151,   "tcp"  },
+  { "hems",            { NULL }, 151,   "udp"  },
+  { "bftp",            { NULL }, 152,   "tcp"  },
+  { "bftp",            { NULL }, 152,   "udp"  },
+  { "sgmp",            { NULL }, 153,   "tcp"  },
+  { "sgmp",            { NULL }, 153,   "udp"  },
+  { "netsc-prod",      { NULL }, 154,   "tcp"  },
+  { "netsc-prod",      { NULL }, 154,   "udp"  },
+  { "netsc-dev",       { NULL }, 155,   "tcp"  },
+  { "netsc-dev",       { NULL }, 155,   "udp"  },
+  { "sqlsrv",          { NULL }, 156,   "tcp"  },
+  { "sqlsrv",          { NULL }, 156,   "udp"  },
+  { "knet-cmp",        { NULL }, 157,   "tcp"  },
+  { "knet-cmp",        { NULL }, 157,   "udp"  },
+  { "pcmail-srv",      { NULL }, 158,   "tcp"  },
+  { "pcmail-srv",      { NULL }, 158,   "udp"  },
+  { "nss-routing",     { NULL }, 159,   "tcp"  },
+  { "nss-routing",     { NULL }, 159,   "udp"  },
+  { "sgmp-traps",      { NULL }, 160,   "tcp"  },
+  { "sgmp-traps",      { NULL }, 160,   "udp"  },
+  { "snmp",            { NULL }, 161,   "tcp"  },
+  { "snmp",            { NULL }, 161,   "udp"  },
+  { "snmptrap",        { NULL }, 162,   "tcp"  },
+  { "snmptrap",        { NULL }, 162,   "udp"  },
+  { "cmip-man",        { NULL }, 163,   "tcp"  },
+  { "cmip-man",        { NULL }, 163,   "udp"  },
+  { "cmip-agent",      { NULL }, 164,   "tcp"  },
+  { "cmip-agent",      { NULL }, 164,   "udp"  },
+  { "xns-courier",     { NULL }, 165,   "tcp"  },
+  { "xns-courier",     { NULL }, 165,   "udp"  },
+  { "s-net",           { NULL }, 166,   "tcp"  },
+  { "s-net",           { NULL }, 166,   "udp"  },
+  { "namp",            { NULL }, 167,   "tcp"  },
+  { "namp",            { NULL }, 167,   "udp"  },
+  { "rsvd",            { NULL }, 168,   "tcp"  },
+  { "rsvd",            { NULL }, 168,   "udp"  },
+  { "send",            { NULL }, 169,   "tcp"  },
+  { "send",            { NULL }, 169,   "udp"  },
+  { "print-srv",       { NULL }, 170,   "tcp"  },
+  { "print-srv",       { NULL }, 170,   "udp"  },
+  { "multiplex",       { NULL }, 171,   "tcp"  },
+  { "multiplex",       { NULL }, 171,   "udp"  },
+  { "cl/1",            { NULL }, 172,   "tcp"  },
+  { "cl/1",            { NULL }, 172,   "udp"  },
+  { "xyplex-mux",      { NULL }, 173,   "tcp"  },
+  { "xyplex-mux",      { NULL }, 173,   "udp"  },
+  { "mailq",           { NULL }, 174,   "tcp"  },
+  { "mailq",           { NULL }, 174,   "udp"  },
+  { "vmnet",           { NULL }, 175,   "tcp"  },
+  { "vmnet",           { NULL }, 175,   "udp"  },
+  { "genrad-mux",      { NULL }, 176,   "tcp"  },
+  { "genrad-mux",      { NULL }, 176,   "udp"  },
+  { "xdmcp",           { NULL }, 177,   "tcp"  },
+  { "xdmcp",           { NULL }, 177,   "udp"  },
+  { "nextstep",        { NULL }, 178,   "tcp"  },
+  { "nextstep",        { NULL }, 178,   "udp"  },
+  { "bgp",             { NULL }, 179,   "tcp"  },
+  { "bgp",             { NULL }, 179,   "udp"  },
+  { "bgp",             { NULL }, 179,   "sctp" },
+  { "ris",             { NULL }, 180,   "tcp"  },
+  { "ris",             { NULL }, 180,   "udp"  },
+  { "unify",           { NULL }, 181,   "tcp"  },
+  { "unify",           { NULL }, 181,   "udp"  },
+  { "audit",           { NULL }, 182,   "tcp"  },
+  { "audit",           { NULL }, 182,   "udp"  },
+  { "ocbinder",        { NULL }, 183,   "tcp"  },
+  { "ocbinder",        { NULL }, 183,   "udp"  },
+  { "ocserver",        { NULL }, 184,   "tcp"  },
+  { "ocserver",        { NULL }, 184,   "udp"  },
+  { "remote-kis",      { NULL }, 185,   "tcp"  },
+  { "remote-kis",      { NULL }, 185,   "udp"  },
+  { "kis",             { NULL }, 186,   "tcp"  },
+  { "kis",             { NULL }, 186,   "udp"  },
+  { "aci",             { NULL }, 187,   "tcp"  },
+  { "aci",             { NULL }, 187,   "udp"  },
+  { "mumps",           { NULL }, 188,   "tcp"  },
+  { "mumps",           { NULL }, 188,   "udp"  },
+  { "qft",             { NULL }, 189,   "tcp"  },
+  { "qft",             { NULL }, 189,   "udp"  },
+  { "gacp",            { NULL }, 190,   "tcp"  },
+  { "gacp",            { NULL }, 190,   "udp"  },
+  { "prospero",        { NULL }, 191,   "tcp"  },
+  { "prospero",        { NULL }, 191,   "udp"  },
+  { "osu-nms",         { NULL }, 192,   "tcp"  },
+  { "osu-nms",         { NULL }, 192,   "udp"  },
+  { "srmp",            { NULL }, 193,   "tcp"  },
+  { "srmp",            { NULL }, 193,   "udp"  },
+  { "irc",             { NULL }, 194,   "tcp"  },
+  { "irc",             { NULL }, 194,   "udp"  },
+  { "dn6-nlm-aud",     { NULL }, 195,   "tcp"  },
+  { "dn6-nlm-aud",     { NULL }, 195,   "udp"  },
+  { "dn6-smm-red",     { NULL }, 196,   "tcp"  },
+  { "dn6-smm-red",     { NULL }, 196,   "udp"  },
+  { "dls",             { NULL }, 197,   "tcp"  },
+  { "dls",             { NULL }, 197,   "udp"  },
+  { "dls-mon",         { NULL }, 198,   "tcp"  },
+  { "dls-mon",         { NULL }, 198,   "udp"  },
+  { "smux",            { NULL }, 199,   "tcp"  },
+  { "smux",            { NULL }, 199,   "udp"  },
+  { "src",             { NULL }, 200,   "tcp"  },
+  { "src",             { NULL }, 200,   "udp"  },
+  { "at-rtmp",         { NULL }, 201,   "tcp"  },
+  { "at-rtmp",         { NULL }, 201,   "udp"  },
+  { "at-nbp",          { NULL }, 202,   "tcp"  },
+  { "at-nbp",          { NULL }, 202,   "udp"  },
+  { "at-3",            { NULL }, 203,   "tcp"  },
+  { "at-3",            { NULL }, 203,   "udp"  },
+  { "at-echo",         { NULL }, 204,   "tcp"  },
+  { "at-echo",         { NULL }, 204,   "udp"  },
+  { "at-5",            { NULL }, 205,   "tcp"  },
+  { "at-5",            { NULL }, 205,   "udp"  },
+  { "at-zis",          { NULL }, 206,   "tcp"  },
+  { "at-zis",          { NULL }, 206,   "udp"  },
+  { "at-7",            { NULL }, 207,   "tcp"  },
+  { "at-7",            { NULL }, 207,   "udp"  },
+  { "at-8",            { NULL }, 208,   "tcp"  },
+  { "at-8",            { NULL }, 208,   "udp"  },
+  { "qmtp",            { NULL }, 209,   "tcp"  },
+  { "qmtp",            { NULL }, 209,   "udp"  },
+  { "z39.50",          { NULL }, 210,   "tcp"  },
+  { "z39.50",          { NULL }, 210,   "udp"  },
+  { "914c/g",          { NULL }, 211,   "tcp"  },
+  { "914c/g",          { NULL }, 211,   "udp"  },
+  { "anet",            { NULL }, 212,   "tcp"  },
+  { "anet",            { NULL }, 212,   "udp"  },
+  { "ipx",             { NULL }, 213,   "tcp"  },
+  { "ipx",             { NULL }, 213,   "udp"  },
+  { "vmpwscs",         { NULL }, 214,   "tcp"  },
+  { "vmpwscs",         { NULL }, 214,   "udp"  },
+  { "softpc",          { NULL }, 215,   "tcp"  },
+  { "softpc",          { NULL }, 215,   "udp"  },
+  { "CAIlic",          { NULL }, 216,   "tcp"  },
+  { "CAIlic",          { NULL }, 216,   "udp"  },
+  { "dbase",           { NULL }, 217,   "tcp"  },
+  { "dbase",           { NULL }, 217,   "udp"  },
+  { "mpp",             { NULL }, 218,   "tcp"  },
+  { "mpp",             { NULL }, 218,   "udp"  },
+  { "uarps",           { NULL }, 219,   "tcp"  },
+  { "uarps",           { NULL }, 219,   "udp"  },
+  { "imap3",           { NULL }, 220,   "tcp"  },
+  { "imap3",           { NULL }, 220,   "udp"  },
+  { "fln-spx",         { NULL }, 221,   "tcp"  },
+  { "fln-spx",         { NULL }, 221,   "udp"  },
+  { "rsh-spx",         { NULL }, 222,   "tcp"  },
+  { "rsh-spx",         { NULL }, 222,   "udp"  },
+  { "cdc",             { NULL }, 223,   "tcp"  },
+  { "cdc",             { NULL }, 223,   "udp"  },
+  { "masqdialer",      { NULL }, 224,   "tcp"  },
+  { "masqdialer",      { NULL }, 224,   "udp"  },
+  { "direct",          { NULL }, 242,   "tcp"  },
+  { "direct",          { NULL }, 242,   "udp"  },
+  { "sur-meas",        { NULL }, 243,   "tcp"  },
+  { "sur-meas",        { NULL }, 243,   "udp"  },
+  { "inbusiness",      { NULL }, 244,   "tcp"  },
+  { "inbusiness",      { NULL }, 244,   "udp"  },
+  { "link",            { NULL }, 245,   "tcp"  },
+  { "link",            { NULL }, 245,   "udp"  },
+  { "dsp3270",         { NULL }, 246,   "tcp"  },
+  { "dsp3270",         { NULL }, 246,   "udp"  },
+  { "subntbcst_tftp",  { NULL }, 247,   "tcp"  },
+  { "subntbcst_tftp",  { NULL }, 247,   "udp"  },
+  { "bhfhs",           { NULL }, 248,   "tcp"  },
+  { "bhfhs",           { NULL }, 248,   "udp"  },
+  { "rap",             { NULL }, 256,   "tcp"  },
+  { "rap",             { NULL }, 256,   "udp"  },
+  { "set",             { NULL }, 257,   "tcp"  },
+  { "set",             { NULL }, 257,   "udp"  },
+  { "esro-gen",        { NULL }, 259,   "tcp"  },
+  { "esro-gen",        { NULL }, 259,   "udp"  },
+  { "openport",        { NULL }, 260,   "tcp"  },
+  { "openport",        { NULL }, 260,   "udp"  },
+  { "nsiiops",         { NULL }, 261,   "tcp"  },
+  { "nsiiops",         { NULL }, 261,   "udp"  },
+  { "arcisdms",        { NULL }, 262,   "tcp"  },
+  { "arcisdms",        { NULL }, 262,   "udp"  },
+  { "hdap",            { NULL }, 263,   "tcp"  },
+  { "hdap",            { NULL }, 263,   "udp"  },
+  { "bgmp",            { NULL }, 264,   "tcp"  },
+  { "bgmp",            { NULL }, 264,   "udp"  },
+  { "x-bone-ctl",      { NULL }, 265,   "tcp"  },
+  { "x-bone-ctl",      { NULL }, 265,   "udp"  },
+  { "sst",             { NULL }, 266,   "tcp"  },
+  { "sst",             { NULL }, 266,   "udp"  },
+  { "td-service",      { NULL }, 267,   "tcp"  },
+  { "td-service",      { NULL }, 267,   "udp"  },
+  { "td-replica",      { NULL }, 268,   "tcp"  },
+  { "td-replica",      { NULL }, 268,   "udp"  },
+  { "manet",           { NULL }, 269,   "tcp"  },
+  { "manet",           { NULL }, 269,   "udp"  },
+  { "gist",            { NULL }, 270,   "udp"  },
+  { "http-mgmt",       { NULL }, 280,   "tcp"  },
+  { "http-mgmt",       { NULL }, 280,   "udp"  },
+  { "personal-link",   { NULL }, 281,   "tcp"  },
+  { "personal-link",   { NULL }, 281,   "udp"  },
+  { "cableport-ax",    { NULL }, 282,   "tcp"  },
+  { "cableport-ax",    { NULL }, 282,   "udp"  },
+  { "rescap",          { NULL }, 283,   "tcp"  },
+  { "rescap",          { NULL }, 283,   "udp"  },
+  { "corerjd",         { NULL }, 284,   "tcp"  },
+  { "corerjd",         { NULL }, 284,   "udp"  },
+  { "fxp",             { NULL }, 286,   "tcp"  },
+  { "fxp",             { NULL }, 286,   "udp"  },
+  { "k-block",         { NULL }, 287,   "tcp"  },
+  { "k-block",         { NULL }, 287,   "udp"  },
+  { "novastorbakcup",  { NULL }, 308,   "tcp"  },
+  { "novastorbakcup",  { NULL }, 308,   "udp"  },
+  { "entrusttime",     { NULL }, 309,   "tcp"  },
+  { "entrusttime",     { NULL }, 309,   "udp"  },
+  { "bhmds",           { NULL }, 310,   "tcp"  },
+  { "bhmds",           { NULL }, 310,   "udp"  },
+  { "asip-webadmin",   { NULL }, 311,   "tcp"  },
+  { "asip-webadmin",   { NULL }, 311,   "udp"  },
+  { "vslmp",           { NULL }, 312,   "tcp"  },
+  { "vslmp",           { NULL }, 312,   "udp"  },
+  { "magenta-logic",   { NULL }, 313,   "tcp"  },
+  { "magenta-logic",   { NULL }, 313,   "udp"  },
+  { "opalis-robot",    { NULL }, 314,   "tcp"  },
+  { "opalis-robot",    { NULL }, 314,   "udp"  },
+  { "dpsi",            { NULL }, 315,   "tcp"  },
+  { "dpsi",            { NULL }, 315,   "udp"  },
+  { "decauth",         { NULL }, 316,   "tcp"  },
+  { "decauth",         { NULL }, 316,   "udp"  },
+  { "zannet",          { NULL }, 317,   "tcp"  },
+  { "zannet",          { NULL }, 317,   "udp"  },
+  { "pkix-timestamp",  { NULL }, 318,   "tcp"  },
+  { "pkix-timestamp",  { NULL }, 318,   "udp"  },
+  { "ptp-event",       { NULL }, 319,   "tcp"  },
+  { "ptp-event",       { NULL }, 319,   "udp"  },
+  { "ptp-general",     { NULL }, 320,   "tcp"  },
+  { "ptp-general",     { NULL }, 320,   "udp"  },
+  { "pip",             { NULL }, 321,   "tcp"  },
+  { "pip",             { NULL }, 321,   "udp"  },
+  { "rtsps",           { NULL }, 322,   "tcp"  },
+  { "rtsps",           { NULL }, 322,   "udp"  },
+  { "texar",           { NULL }, 333,   "tcp"  },
+  { "texar",           { NULL }, 333,   "udp"  },
+  { "pdap",            { NULL }, 344,   "tcp"  },
+  { "pdap",            { NULL }, 344,   "udp"  },
+  { "pawserv",         { NULL }, 345,   "tcp"  },
+  { "pawserv",         { NULL }, 345,   "udp"  },
+  { "zserv",           { NULL }, 346,   "tcp"  },
+  { "zserv",           { NULL }, 346,   "udp"  },
+  { "fatserv",         { NULL }, 347,   "tcp"  },
+  { "fatserv",         { NULL }, 347,   "udp"  },
+  { "csi-sgwp",        { NULL }, 348,   "tcp"  },
+  { "csi-sgwp",        { NULL }, 348,   "udp"  },
+  { "mftp",            { NULL }, 349,   "tcp"  },
+  { "mftp",            { NULL }, 349,   "udp"  },
+  { "matip-type-a",    { NULL }, 350,   "tcp"  },
+  { "matip-type-a",    { NULL }, 350,   "udp"  },
+  { "matip-type-b",    { NULL }, 351,   "tcp"  },
+  { "matip-type-b",    { NULL }, 351,   "udp"  },
+  { "bhoetty",         { NULL }, 351,   "tcp"  },
+  { "bhoetty",         { NULL }, 351,   "udp"  },
+  { "dtag-ste-sb",     { NULL }, 352,   "tcp"  },
+  { "dtag-ste-sb",     { NULL }, 352,   "udp"  },
+  { "bhoedap4",        { NULL }, 352,   "tcp"  },
+  { "bhoedap4",        { NULL }, 352,   "udp"  },
+  { "ndsauth",         { NULL }, 353,   "tcp"  },
+  { "ndsauth",         { NULL }, 353,   "udp"  },
+  { "bh611",           { NULL }, 354,   "tcp"  },
+  { "bh611",           { NULL }, 354,   "udp"  },
+  { "datex-asn",       { NULL }, 355,   "tcp"  },
+  { "datex-asn",       { NULL }, 355,   "udp"  },
+  { "cloanto-net-1",   { NULL }, 356,   "tcp"  },
+  { "cloanto-net-1",   { NULL }, 356,   "udp"  },
+  { "bhevent",         { NULL }, 357,   "tcp"  },
+  { "bhevent",         { NULL }, 357,   "udp"  },
+  { "shrinkwrap",      { NULL }, 358,   "tcp"  },
+  { "shrinkwrap",      { NULL }, 358,   "udp"  },
+  { "nsrmp",           { NULL }, 359,   "tcp"  },
+  { "nsrmp",           { NULL }, 359,   "udp"  },
+  { "scoi2odialog",    { NULL }, 360,   "tcp"  },
+  { "scoi2odialog",    { NULL }, 360,   "udp"  },
+  { "semantix",        { NULL }, 361,   "tcp"  },
+  { "semantix",        { NULL }, 361,   "udp"  },
+  { "srssend",         { NULL }, 362,   "tcp"  },
+  { "srssend",         { NULL }, 362,   "udp"  },
+  { "rsvp_tunnel",     { NULL }, 363,   "tcp"  },
+  { "rsvp_tunnel",     { NULL }, 363,   "udp"  },
+  { "aurora-cmgr",     { NULL }, 364,   "tcp"  },
+  { "aurora-cmgr",     { NULL }, 364,   "udp"  },
+  { "dtk",             { NULL }, 365,   "tcp"  },
+  { "dtk",             { NULL }, 365,   "udp"  },
+  { "odmr",            { NULL }, 366,   "tcp"  },
+  { "odmr",            { NULL }, 366,   "udp"  },
+  { "mortgageware",    { NULL }, 367,   "tcp"  },
+  { "mortgageware",    { NULL }, 367,   "udp"  },
+  { "qbikgdp",         { NULL }, 368,   "tcp"  },
+  { "qbikgdp",         { NULL }, 368,   "udp"  },
+  { "rpc2portmap",     { NULL }, 369,   "tcp"  },
+  { "rpc2portmap",     { NULL }, 369,   "udp"  },
+  { "codaauth2",       { NULL }, 370,   "tcp"  },
+  { "codaauth2",       { NULL }, 370,   "udp"  },
+  { "clearcase",       { NULL }, 371,   "tcp"  },
+  { "clearcase",       { NULL }, 371,   "udp"  },
+  { "ulistproc",       { NULL }, 372,   "tcp"  },
+  { "ulistproc",       { NULL }, 372,   "udp"  },
+  { "legent-1",        { NULL }, 373,   "tcp"  },
+  { "legent-1",        { NULL }, 373,   "udp"  },
+  { "legent-2",        { NULL }, 374,   "tcp"  },
+  { "legent-2",        { NULL }, 374,   "udp"  },
+  { "hassle",          { NULL }, 375,   "tcp"  },
+  { "hassle",          { NULL }, 375,   "udp"  },
+  { "nip",             { NULL }, 376,   "tcp"  },
+  { "nip",             { NULL }, 376,   "udp"  },
+  { "tnETOS",          { NULL }, 377,   "tcp"  },
+  { "tnETOS",          { NULL }, 377,   "udp"  },
+  { "dsETOS",          { NULL }, 378,   "tcp"  },
+  { "dsETOS",          { NULL }, 378,   "udp"  },
+  { "is99c",           { NULL }, 379,   "tcp"  },
+  { "is99c",           { NULL }, 379,   "udp"  },
+  { "is99s",           { NULL }, 380,   "tcp"  },
+  { "is99s",           { NULL }, 380,   "udp"  },
+  { "hp-collector",    { NULL }, 381,   "tcp"  },
+  { "hp-collector",    { NULL }, 381,   "udp"  },
+  { "hp-managed-node", { NULL }, 382,   "tcp"  },
+  { "hp-managed-node", { NULL }, 382,   "udp"  },
+  { "hp-alarm-mgr",    { NULL }, 383,   "tcp"  },
+  { "hp-alarm-mgr",    { NULL }, 383,   "udp"  },
+  { "arns",            { NULL }, 384,   "tcp"  },
+  { "arns",            { NULL }, 384,   "udp"  },
+  { "ibm-app",         { NULL }, 385,   "tcp"  },
+  { "ibm-app",         { NULL }, 385,   "udp"  },
+  { "asa",             { NULL }, 386,   "tcp"  },
+  { "asa",             { NULL }, 386,   "udp"  },
+  { "aurp",            { NULL }, 387,   "tcp"  },
+  { "aurp",            { NULL }, 387,   "udp"  },
+  { "unidata-ldm",     { NULL }, 388,   "tcp"  },
+  { "unidata-ldm",     { NULL }, 388,   "udp"  },
+  { "ldap",            { NULL }, 389,   "tcp"  },
+  { "ldap",            { NULL }, 389,   "udp"  },
+  { "uis",             { NULL }, 390,   "tcp"  },
+  { "uis",             { NULL }, 390,   "udp"  },
+  { "synotics-relay",  { NULL }, 391,   "tcp"  },
+  { "synotics-relay",  { NULL }, 391,   "udp"  },
+  { "synotics-broker", { NULL }, 392,   "tcp"  },
+  { "synotics-broker", { NULL }, 392,   "udp"  },
+  { "meta5",           { NULL }, 393,   "tcp"  },
+  { "meta5",           { NULL }, 393,   "udp"  },
+  { "embl-ndt",        { NULL }, 394,   "tcp"  },
+  { "embl-ndt",        { NULL }, 394,   "udp"  },
+  { "netcp",           { NULL }, 395,   "tcp"  },
+  { "netcp",           { NULL }, 395,   "udp"  },
+  { "netware-ip",      { NULL }, 396,   "tcp"  },
+  { "netware-ip",      { NULL }, 396,   "udp"  },
+  { "mptn",            { NULL }, 397,   "tcp"  },
+  { "mptn",            { NULL }, 397,   "udp"  },
+  { "kryptolan",       { NULL }, 398,   "tcp"  },
+  { "kryptolan",       { NULL }, 398,   "udp"  },
+  { "iso-tsap-c2",     { NULL }, 399,   "tcp"  },
+  { "iso-tsap-c2",     { NULL }, 399,   "udp"  },
+  { "osb-sd",          { NULL }, 400,   "tcp"  },
+  { "osb-sd",          { NULL }, 400,   "udp"  },
+  { "ups",             { NULL }, 401,   "tcp"  },
+  { "ups",             { NULL }, 401,   "udp"  },
+  { "genie",           { NULL }, 402,   "tcp"  },
+  { "genie",           { NULL }, 402,   "udp"  },
+  { "decap",           { NULL }, 403,   "tcp"  },
+  { "decap",           { NULL }, 403,   "udp"  },
+  { "nced",            { NULL }, 404,   "tcp"  },
+  { "nced",            { NULL }, 404,   "udp"  },
+  { "ncld",            { NULL }, 405,   "tcp"  },
+  { "ncld",            { NULL }, 405,   "udp"  },
+  { "imsp",            { NULL }, 406,   "tcp"  },
+  { "imsp",            { NULL }, 406,   "udp"  },
+  { "timbuktu",        { NULL }, 407,   "tcp"  },
+  { "timbuktu",        { NULL }, 407,   "udp"  },
+  { "prm-sm",          { NULL }, 408,   "tcp"  },
+  { "prm-sm",          { NULL }, 408,   "udp"  },
+  { "prm-nm",          { NULL }, 409,   "tcp"  },
+  { "prm-nm",          { NULL }, 409,   "udp"  },
+  { "decladebug",      { NULL }, 410,   "tcp"  },
+  { "decladebug",      { NULL }, 410,   "udp"  },
+  { "rmt",             { NULL }, 411,   "tcp"  },
+  { "rmt",             { NULL }, 411,   "udp"  },
+  { "synoptics-trap",  { NULL }, 412,   "tcp"  },
+  { "synoptics-trap",  { NULL }, 412,   "udp"  },
+  { "smsp",            { NULL }, 413,   "tcp"  },
+  { "smsp",            { NULL }, 413,   "udp"  },
+  { "infoseek",        { NULL }, 414,   "tcp"  },
+  { "infoseek",        { NULL }, 414,   "udp"  },
+  { "bnet",            { NULL }, 415,   "tcp"  },
+  { "bnet",            { NULL }, 415,   "udp"  },
+  { "silverplatter",   { NULL }, 416,   "tcp"  },
+  { "silverplatter",   { NULL }, 416,   "udp"  },
+  { "onmux",           { NULL }, 417,   "tcp"  },
+  { "onmux",           { NULL }, 417,   "udp"  },
+  { "hyper-g",         { NULL }, 418,   "tcp"  },
+  { "hyper-g",         { NULL }, 418,   "udp"  },
+  { "ariel1",          { NULL }, 419,   "tcp"  },
+  { "ariel1",          { NULL }, 419,   "udp"  },
+  { "smpte",           { NULL }, 420,   "tcp"  },
+  { "smpte",           { NULL }, 420,   "udp"  },
+  { "ariel2",          { NULL }, 421,   "tcp"  },
+  { "ariel2",          { NULL }, 421,   "udp"  },
+  { "ariel3",          { NULL }, 422,   "tcp"  },
+  { "ariel3",          { NULL }, 422,   "udp"  },
+  { "opc-job-start",   { NULL }, 423,   "tcp"  },
+  { "opc-job-start",   { NULL }, 423,   "udp"  },
+  { "opc-job-track",   { NULL }, 424,   "tcp"  },
+  { "opc-job-track",   { NULL }, 424,   "udp"  },
+  { "icad-el",         { NULL }, 425,   "tcp"  },
+  { "icad-el",         { NULL }, 425,   "udp"  },
+  { "smartsdp",        { NULL }, 426,   "tcp"  },
+  { "smartsdp",        { NULL }, 426,   "udp"  },
+  { "svrloc",          { NULL }, 427,   "tcp"  },
+  { "svrloc",          { NULL }, 427,   "udp"  },
+  { "ocs_cmu",         { NULL }, 428,   "tcp"  },
+  { "ocs_cmu",         { NULL }, 428,   "udp"  },
+  { "ocs_amu",         { NULL }, 429,   "tcp"  },
+  { "ocs_amu",         { NULL }, 429,   "udp"  },
+  { "utmpsd",          { NULL }, 430,   "tcp"  },
+  { "utmpsd",          { NULL }, 430,   "udp"  },
+  { "utmpcd",          { NULL }, 431,   "tcp"  },
+  { "utmpcd",          { NULL }, 431,   "udp"  },
+  { "iasd",            { NULL }, 432,   "tcp"  },
+  { "iasd",            { NULL }, 432,   "udp"  },
+  { "nnsp",            { NULL }, 433,   "tcp"  },
+  { "nnsp",            { NULL }, 433,   "udp"  },
+  { "mobileip-agent",  { NULL }, 434,   "tcp"  },
+  { "mobileip-agent",  { NULL }, 434,   "udp"  },
+  { "mobilip-mn",      { NULL }, 435,   "tcp"  },
+  { "mobilip-mn",      { NULL }, 435,   "udp"  },
+  { "dna-cml",         { NULL }, 436,   "tcp"  },
+  { "dna-cml",         { NULL }, 436,   "udp"  },
+  { "comscm",          { NULL }, 437,   "tcp"  },
+  { "comscm",          { NULL }, 437,   "udp"  },
+  { "dsfgw",           { NULL }, 438,   "tcp"  },
+  { "dsfgw",           { NULL }, 438,   "udp"  },
+  { "dasp",            { NULL }, 439,   "tcp"  },
+  { "dasp",            { NULL }, 439,   "udp"  },
+  { "sgcp",            { NULL }, 440,   "tcp"  },
+  { "sgcp",            { NULL }, 440,   "udp"  },
+  { "decvms-sysmgt",   { NULL }, 441,   "tcp"  },
+  { "decvms-sysmgt",   { NULL }, 441,   "udp"  },
+  { "cvc_hostd",       { NULL }, 442,   "tcp"  },
+  { "cvc_hostd",       { NULL }, 442,   "udp"  },
+  { "https",           { NULL }, 443,   "tcp"  },
+  { "https",           { NULL }, 443,   "udp"  },
+  { "https",           { NULL }, 443,   "sctp" },
+  { "snpp",            { NULL }, 444,   "tcp"  },
+  { "snpp",            { NULL }, 444,   "udp"  },
+  { "microsoft-ds",    { NULL }, 445,   "tcp"  },
+  { "microsoft-ds",    { NULL }, 445,   "udp"  },
+  { "ddm-rdb",         { NULL }, 446,   "tcp"  },
+  { "ddm-rdb",         { NULL }, 446,   "udp"  },
+  { "ddm-dfm",         { NULL }, 447,   "tcp"  },
+  { "ddm-dfm",         { NULL }, 447,   "udp"  },
+  { "ddm-ssl",         { NULL }, 448,   "tcp"  },
+  { "ddm-ssl",         { NULL }, 448,   "udp"  },
+  { "as-servermap",    { NULL }, 449,   "tcp"  },
+  { "as-servermap",    { NULL }, 449,   "udp"  },
+  { "tserver",         { NULL }, 450,   "tcp"  },
+  { "tserver",         { NULL }, 450,   "udp"  },
+  { "sfs-smp-net",     { NULL }, 451,   "tcp"  },
+  { "sfs-smp-net",     { NULL }, 451,   "udp"  },
+  { "sfs-config",      { NULL }, 452,   "tcp"  },
+  { "sfs-config",      { NULL }, 452,   "udp"  },
+  { "creativeserver",  { NULL }, 453,   "tcp"  },
+  { "creativeserver",  { NULL }, 453,   "udp"  },
+  { "contentserver",   { NULL }, 454,   "tcp"  },
+  { "contentserver",   { NULL }, 454,   "udp"  },
+  { "creativepartnr",  { NULL }, 455,   "tcp"  },
+  { "creativepartnr",  { NULL }, 455,   "udp"  },
+  { "macon-tcp",       { NULL }, 456,   "tcp"  },
+  { "macon-udp",       { NULL }, 456,   "udp"  },
+  { "scohelp",         { NULL }, 457,   "tcp"  },
+  { "scohelp",         { NULL }, 457,   "udp"  },
+  { "appleqtc",        { NULL }, 458,   "tcp"  },
+  { "appleqtc",        { NULL }, 458,   "udp"  },
+  { "ampr-rcmd",       { NULL }, 459,   "tcp"  },
+  { "ampr-rcmd",       { NULL }, 459,   "udp"  },
+  { "skronk",          { NULL }, 460,   "tcp"  },
+  { "skronk",          { NULL }, 460,   "udp"  },
+  { "datasurfsrv",     { NULL }, 461,   "tcp"  },
+  { "datasurfsrv",     { NULL }, 461,   "udp"  },
+  { "datasurfsrvsec",  { NULL }, 462,   "tcp"  },
+  { "datasurfsrvsec",  { NULL }, 462,   "udp"  },
+  { "alpes",           { NULL }, 463,   "tcp"  },
+  { "alpes",           { NULL }, 463,   "udp"  },
+  { "kpasswd",         { NULL }, 464,   "tcp"  },
+  { "kpasswd",         { NULL }, 464,   "udp"  },
+  { "urd",             { NULL }, 465,   "tcp"  },
+  { "igmpv3lite",      { NULL }, 465,   "udp"  },
+  { "digital-vrc",     { NULL }, 466,   "tcp"  },
+  { "digital-vrc",     { NULL }, 466,   "udp"  },
+  { "mylex-mapd",      { NULL }, 467,   "tcp"  },
+  { "mylex-mapd",      { NULL }, 467,   "udp"  },
+  { "photuris",        { NULL }, 468,   "tcp"  },
+  { "photuris",        { NULL }, 468,   "udp"  },
+  { "rcp",             { NULL }, 469,   "tcp"  },
+  { "rcp",             { NULL }, 469,   "udp"  },
+  { "scx-proxy",       { NULL }, 470,   "tcp"  },
+  { "scx-proxy",       { NULL }, 470,   "udp"  },
+  { "mondex",          { NULL }, 471,   "tcp"  },
+  { "mondex",          { NULL }, 471,   "udp"  },
+  { "ljk-login",       { NULL }, 472,   "tcp"  },
+  { "ljk-login",       { NULL }, 472,   "udp"  },
+  { "hybrid-pop",      { NULL }, 473,   "tcp"  },
+  { "hybrid-pop",      { NULL }, 473,   "udp"  },
+  { "tn-tl-w1",        { NULL }, 474,   "tcp"  },
+  { "tn-tl-w2",        { NULL }, 474,   "udp"  },
+  { "tcpnethaspsrv",   { NULL }, 475,   "tcp"  },
+  { "tcpnethaspsrv",   { NULL }, 475,   "udp"  },
+  { "tn-tl-fd1",       { NULL }, 476,   "tcp"  },
+  { "tn-tl-fd1",       { NULL }, 476,   "udp"  },
+  { "ss7ns",           { NULL }, 477,   "tcp"  },
+  { "ss7ns",           { NULL }, 477,   "udp"  },
+  { "spsc",            { NULL }, 478,   "tcp"  },
+  { "spsc",            { NULL }, 478,   "udp"  },
+  { "iafserver",       { NULL }, 479,   "tcp"  },
+  { "iafserver",       { NULL }, 479,   "udp"  },
+  { "iafdbase",        { NULL }, 480,   "tcp"  },
+  { "iafdbase",        { NULL }, 480,   "udp"  },
+  { "ph",              { NULL }, 481,   "tcp"  },
+  { "ph",              { NULL }, 481,   "udp"  },
+  { "bgs-nsi",         { NULL }, 482,   "tcp"  },
+  { "bgs-nsi",         { NULL }, 482,   "udp"  },
+  { "ulpnet",          { NULL }, 483,   "tcp"  },
+  { "ulpnet",          { NULL }, 483,   "udp"  },
+  { "integra-sme",     { NULL }, 484,   "tcp"  },
+  { "integra-sme",     { NULL }, 484,   "udp"  },
+  { "powerburst",      { NULL }, 485,   "tcp"  },
+  { "powerburst",      { NULL }, 485,   "udp"  },
+  { "avian",           { NULL }, 486,   "tcp"  },
+  { "avian",           { NULL }, 486,   "udp"  },
+  { "saft",            { NULL }, 487,   "tcp"  },
+  { "saft",            { NULL }, 487,   "udp"  },
+  { "gss-http",        { NULL }, 488,   "tcp"  },
+  { "gss-http",        { NULL }, 488,   "udp"  },
+  { "nest-protocol",   { NULL }, 489,   "tcp"  },
+  { "nest-protocol",   { NULL }, 489,   "udp"  },
+  { "micom-pfs",       { NULL }, 490,   "tcp"  },
+  { "micom-pfs",       { NULL }, 490,   "udp"  },
+  { "go-login",        { NULL }, 491,   "tcp"  },
+  { "go-login",        { NULL }, 491,   "udp"  },
+  { "ticf-1",          { NULL }, 492,   "tcp"  },
+  { "ticf-1",          { NULL }, 492,   "udp"  },
+  { "ticf-2",          { NULL }, 493,   "tcp"  },
+  { "ticf-2",          { NULL }, 493,   "udp"  },
+  { "pov-ray",         { NULL }, 494,   "tcp"  },
+  { "pov-ray",         { NULL }, 494,   "udp"  },
+  { "intecourier",     { NULL }, 495,   "tcp"  },
+  { "intecourier",     { NULL }, 495,   "udp"  },
+  { "pim-rp-disc",     { NULL }, 496,   "tcp"  },
+  { "pim-rp-disc",     { NULL }, 496,   "udp"  },
+  { "dantz",           { NULL }, 497,   "tcp"  },
+  { "dantz",           { NULL }, 497,   "udp"  },
+  { "siam",            { NULL }, 498,   "tcp"  },
+  { "siam",            { NULL }, 498,   "udp"  },
+  { "iso-ill",         { NULL }, 499,   "tcp"  },
+  { "iso-ill",         { NULL }, 499,   "udp"  },
+  { "isakmp",          { NULL }, 500,   "tcp"  },
+  { "isakmp",          { NULL }, 500,   "udp"  },
+  { "stmf",            { NULL }, 501,   "tcp"  },
+  { "stmf",            { NULL }, 501,   "udp"  },
+  { "asa-appl-proto",  { NULL }, 502,   "tcp"  },
+  { "asa-appl-proto",  { NULL }, 502,   "udp"  },
+  { "intrinsa",        { NULL }, 503,   "tcp"  },
+  { "intrinsa",        { NULL }, 503,   "udp"  },
+  { "citadel",         { NULL }, 504,   "tcp"  },
+  { "citadel",         { NULL }, 504,   "udp"  },
+  { "mailbox-lm",      { NULL }, 505,   "tcp"  },
+  { "mailbox-lm",      { NULL }, 505,   "udp"  },
+  { "ohimsrv",         { NULL }, 506,   "tcp"  },
+  { "ohimsrv",         { NULL }, 506,   "udp"  },
+  { "crs",             { NULL }, 507,   "tcp"  },
+  { "crs",             { NULL }, 507,   "udp"  },
+  { "xvttp",           { NULL }, 508,   "tcp"  },
+  { "xvttp",           { NULL }, 508,   "udp"  },
+  { "snare",           { NULL }, 509,   "tcp"  },
+  { "snare",           { NULL }, 509,   "udp"  },
+  { "fcp",             { NULL }, 510,   "tcp"  },
+  { "fcp",             { NULL }, 510,   "udp"  },
+  { "passgo",          { NULL }, 511,   "tcp"  },
+  { "passgo",          { NULL }, 511,   "udp"  },
+  { "exec",            { NULL }, 512,   "tcp"  },
+  { "comsat",          { NULL }, 512,   "udp"  },
+  { "biff",            { NULL }, 512,   "udp"  },
+  { "login",           { NULL }, 513,   "tcp"  },
+  { "who",             { NULL }, 513,   "udp"  },
+  { "shell",           { NULL }, 514,   "tcp"  },
+  { "syslog",          { NULL }, 514,   "udp"  },
+  { "printer",         { NULL }, 515,   "tcp"  },
+  { "printer",         { NULL }, 515,   "udp"  },
+  { "videotex",        { NULL }, 516,   "tcp"  },
+  { "videotex",        { NULL }, 516,   "udp"  },
+  { "talk",            { NULL }, 517,   "tcp"  },
+  { "talk",            { NULL }, 517,   "udp"  },
+  { "ntalk",           { NULL }, 518,   "tcp"  },
+  { "ntalk",           { NULL }, 518,   "udp"  },
+  { "utime",           { NULL }, 519,   "tcp"  },
+  { "utime",           { NULL }, 519,   "udp"  },
+  { "efs",             { NULL }, 520,   "tcp"  },
+  { "router",          { NULL }, 520,   "udp"  },
+  { "ripng",           { NULL }, 521,   "tcp"  },
+  { "ripng",           { NULL }, 521,   "udp"  },
+  { "ulp",             { NULL }, 522,   "tcp"  },
+  { "ulp",             { NULL }, 522,   "udp"  },
+  { "ibm-db2",         { NULL }, 523,   "tcp"  },
+  { "ibm-db2",         { NULL }, 523,   "udp"  },
+  { "ncp",             { NULL }, 524,   "tcp"  },
+  { "ncp",             { NULL }, 524,   "udp"  },
+  { "timed",           { NULL }, 525,   "tcp"  },
+  { "timed",           { NULL }, 525,   "udp"  },
+  { "tempo",           { NULL }, 526,   "tcp"  },
+  { "tempo",           { NULL }, 526,   "udp"  },
+  { "stx",             { NULL }, 527,   "tcp"  },
+  { "stx",             { NULL }, 527,   "udp"  },
+  { "custix",          { NULL }, 528,   "tcp"  },
+  { "custix",          { NULL }, 528,   "udp"  },
+  { "irc-serv",        { NULL }, 529,   "tcp"  },
+  { "irc-serv",        { NULL }, 529,   "udp"  },
+  { "courier",         { NULL }, 530,   "tcp"  },
+  { "courier",         { NULL }, 530,   "udp"  },
+  { "conference",      { NULL }, 531,   "tcp"  },
+  { "conference",      { NULL }, 531,   "udp"  },
+  { "netnews",         { NULL }, 532,   "tcp"  },
+  { "netnews",         { NULL }, 532,   "udp"  },
+  { "netwall",         { NULL }, 533,   "tcp"  },
+  { "netwall",         { NULL }, 533,   "udp"  },
+  { "windream",        { NULL }, 534,   "tcp"  },
+  { "windream",        { NULL }, 534,   "udp"  },
+  { "iiop",            { NULL }, 535,   "tcp"  },
+  { "iiop",            { NULL }, 535,   "udp"  },
+  { "opalis-rdv",      { NULL }, 536,   "tcp"  },
+  { "opalis-rdv",      { NULL }, 536,   "udp"  },
+  { "nmsp",            { NULL }, 537,   "tcp"  },
+  { "nmsp",            { NULL }, 537,   "udp"  },
+  { "gdomap",          { NULL }, 538,   "tcp"  },
+  { "gdomap",          { NULL }, 538,   "udp"  },
+  { "apertus-ldp",     { NULL }, 539,   "tcp"  },
+  { "apertus-ldp",     { NULL }, 539,   "udp"  },
+  { "uucp",            { NULL }, 540,   "tcp"  },
+  { "uucp",            { NULL }, 540,   "udp"  },
+  { "uucp-rlogin",     { NULL }, 541,   "tcp"  },
+  { "uucp-rlogin",     { NULL }, 541,   "udp"  },
+  { "commerce",        { NULL }, 542,   "tcp"  },
+  { "commerce",        { NULL }, 542,   "udp"  },
+  { "klogin",          { NULL }, 543,   "tcp"  },
+  { "klogin",          { NULL }, 543,   "udp"  },
+  { "kshell",          { NULL }, 544,   "tcp"  },
+  { "kshell",          { NULL }, 544,   "udp"  },
+  { "appleqtcsrvr",    { NULL }, 545,   "tcp"  },
+  { "appleqtcsrvr",    { NULL }, 545,   "udp"  },
+  { "dhcpv6-client",   { NULL }, 546,   "tcp"  },
+  { "dhcpv6-client",   { NULL }, 546,   "udp"  },
+  { "dhcpv6-server",   { NULL }, 547,   "tcp"  },
+  { "dhcpv6-server",   { NULL }, 547,   "udp"  },
+  { "afpovertcp",      { NULL }, 548,   "tcp"  },
+  { "afpovertcp",      { NULL }, 548,   "udp"  },
+  { "idfp",            { NULL }, 549,   "tcp"  },
+  { "idfp",            { NULL }, 549,   "udp"  },
+  { "new-rwho",        { NULL }, 550,   "tcp"  },
+  { "new-rwho",        { NULL }, 550,   "udp"  },
+  { "cybercash",       { NULL }, 551,   "tcp"  },
+  { "cybercash",       { NULL }, 551,   "udp"  },
+  { "devshr-nts",      { NULL }, 552,   "tcp"  },
+  { "devshr-nts",      { NULL }, 552,   "udp"  },
+  { "pirp",            { NULL }, 553,   "tcp"  },
+  { "pirp",            { NULL }, 553,   "udp"  },
+  { "rtsp",            { NULL }, 554,   "tcp"  },
+  { "rtsp",            { NULL }, 554,   "udp"  },
+  { "dsf",             { NULL }, 555,   "tcp"  },
+  { "dsf",             { NULL }, 555,   "udp"  },
+  { "remotefs",        { NULL }, 556,   "tcp"  },
+  { "remotefs",        { NULL }, 556,   "udp"  },
+  { "openvms-sysipc",  { NULL }, 557,   "tcp"  },
+  { "openvms-sysipc",  { NULL }, 557,   "udp"  },
+  { "sdnskmp",         { NULL }, 558,   "tcp"  },
+  { "sdnskmp",         { NULL }, 558,   "udp"  },
+  { "teedtap",         { NULL }, 559,   "tcp"  },
+  { "teedtap",         { NULL }, 559,   "udp"  },
+  { "rmonitor",        { NULL }, 560,   "tcp"  },
+  { "rmonitor",        { NULL }, 560,   "udp"  },
+  { "monitor",         { NULL }, 561,   "tcp"  },
+  { "monitor",         { NULL }, 561,   "udp"  },
+  { "chshell",         { NULL }, 562,   "tcp"  },
+  { "chshell",         { NULL }, 562,   "udp"  },
+  { "nntps",           { NULL }, 563,   "tcp"  },
+  { "nntps",           { NULL }, 563,   "udp"  },
+  { "9pfs",            { NULL }, 564,   "tcp"  },
+  { "9pfs",            { NULL }, 564,   "udp"  },
+  { "whoami",          { NULL }, 565,   "tcp"  },
+  { "whoami",          { NULL }, 565,   "udp"  },
+  { "streettalk",      { NULL }, 566,   "tcp"  },
+  { "streettalk",      { NULL }, 566,   "udp"  },
+  { "banyan-rpc",      { NULL }, 567,   "tcp"  },
+  { "banyan-rpc",      { NULL }, 567,   "udp"  },
+  { "ms-shuttle",      { NULL }, 568,   "tcp"  },
+  { "ms-shuttle",      { NULL }, 568,   "udp"  },
+  { "ms-rome",         { NULL }, 569,   "tcp"  },
+  { "ms-rome",         { NULL }, 569,   "udp"  },
+  { "meter",           { NULL }, 570,   "tcp"  },
+  { "meter",           { NULL }, 570,   "udp"  },
+  { "meter",           { NULL }, 571,   "tcp"  },
+  { "meter",           { NULL }, 571,   "udp"  },
+  { "sonar",           { NULL }, 572,   "tcp"  },
+  { "sonar",           { NULL }, 572,   "udp"  },
+  { "banyan-vip",      { NULL }, 573,   "tcp"  },
+  { "banyan-vip",      { NULL }, 573,   "udp"  },
+  { "ftp-agent",       { NULL }, 574,   "tcp"  },
+  { "ftp-agent",       { NULL }, 574,   "udp"  },
+  { "vemmi",           { NULL }, 575,   "tcp"  },
+  { "vemmi",           { NULL }, 575,   "udp"  },
+  { "ipcd",            { NULL }, 576,   "tcp"  },
+  { "ipcd",            { NULL }, 576,   "udp"  },
+  { "vnas",            { NULL }, 577,   "tcp"  },
+  { "vnas",            { NULL }, 577,   "udp"  },
+  { "ipdd",            { NULL }, 578,   "tcp"  },
+  { "ipdd",            { NULL }, 578,   "udp"  },
+  { "decbsrv",         { NULL }, 579,   "tcp"  },
+  { "decbsrv",         { NULL }, 579,   "udp"  },
+  { "sntp-heartbeat",  { NULL }, 580,   "tcp"  },
+  { "sntp-heartbeat",  { NULL }, 580,   "udp"  },
+  { "bdp",             { NULL }, 581,   "tcp"  },
+  { "bdp",             { NULL }, 581,   "udp"  },
+  { "scc-security",    { NULL }, 582,   "tcp"  },
+  { "scc-security",    { NULL }, 582,   "udp"  },
+  { "philips-vc",      { NULL }, 583,   "tcp"  },
+  { "philips-vc",      { NULL }, 583,   "udp"  },
+  { "keyserver",       { NULL }, 584,   "tcp"  },
+  { "keyserver",       { NULL }, 584,   "udp"  },
+  { "password-chg",    { NULL }, 586,   "tcp"  },
+  { "password-chg",    { NULL }, 586,   "udp"  },
+  { "submission",      { NULL }, 587,   "tcp"  },
+  { "submission",      { NULL }, 587,   "udp"  },
+  { "cal",             { NULL }, 588,   "tcp"  },
+  { "cal",             { NULL }, 588,   "udp"  },
+  { "eyelink",         { NULL }, 589,   "tcp"  },
+  { "eyelink",         { NULL }, 589,   "udp"  },
+  { "tns-cml",         { NULL }, 590,   "tcp"  },
+  { "tns-cml",         { NULL }, 590,   "udp"  },
+  { "http-alt",        { NULL }, 591,   "tcp"  },
+  { "http-alt",        { NULL }, 591,   "udp"  },
+  { "eudora-set",      { NULL }, 592,   "tcp"  },
+  { "eudora-set",      { NULL }, 592,   "udp"  },
+  { "http-rpc-epmap",  { NULL }, 593,   "tcp"  },
+  { "http-rpc-epmap",  { NULL }, 593,   "udp"  },
+  { "tpip",            { NULL }, 594,   "tcp"  },
+  { "tpip",            { NULL }, 594,   "udp"  },
+  { "cab-protocol",    { NULL }, 595,   "tcp"  },
+  { "cab-protocol",    { NULL }, 595,   "udp"  },
+  { "smsd",            { NULL }, 596,   "tcp"  },
+  { "smsd",            { NULL }, 596,   "udp"  },
+  { "ptcnameservice",  { NULL }, 597,   "tcp"  },
+  { "ptcnameservice",  { NULL }, 597,   "udp"  },
+  { "sco-websrvrmg3",  { NULL }, 598,   "tcp"  },
+  { "sco-websrvrmg3",  { NULL }, 598,   "udp"  },
+  { "acp",             { NULL }, 599,   "tcp"  },
+  { "acp",             { NULL }, 599,   "udp"  },
+  { "ipcserver",       { NULL }, 600,   "tcp"  },
+  { "ipcserver",       { NULL }, 600,   "udp"  },
+  { "syslog-conn",     { NULL }, 601,   "tcp"  },
+  { "syslog-conn",     { NULL }, 601,   "udp"  },
+  { "xmlrpc-beep",     { NULL }, 602,   "tcp"  },
+  { "xmlrpc-beep",     { NULL }, 602,   "udp"  },
+  { "idxp",            { NULL }, 603,   "tcp"  },
+  { "idxp",            { NULL }, 603,   "udp"  },
+  { "tunnel",          { NULL }, 604,   "tcp"  },
+  { "tunnel",          { NULL }, 604,   "udp"  },
+  { "soap-beep",       { NULL }, 605,   "tcp"  },
+  { "soap-beep",       { NULL }, 605,   "udp"  },
+  { "urm",             { NULL }, 606,   "tcp"  },
+  { "urm",             { NULL }, 606,   "udp"  },
+  { "nqs",             { NULL }, 607,   "tcp"  },
+  { "nqs",             { NULL }, 607,   "udp"  },
+  { "sift-uft",        { NULL }, 608,   "tcp"  },
+  { "sift-uft",        { NULL }, 608,   "udp"  },
+  { "npmp-trap",       { NULL }, 609,   "tcp"  },
+  { "npmp-trap",       { NULL }, 609,   "udp"  },
+  { "npmp-local",      { NULL }, 610,   "tcp"  },
+  { "npmp-local",      { NULL }, 610,   "udp"  },
+  { "npmp-gui",        { NULL }, 611,   "tcp"  },
+  { "npmp-gui",        { NULL }, 611,   "udp"  },
+  { "hmmp-ind",        { NULL }, 612,   "tcp"  },
+  { "hmmp-ind",        { NULL }, 612,   "udp"  },
+  { "hmmp-op",         { NULL }, 613,   "tcp"  },
+  { "hmmp-op",         { NULL }, 613,   "udp"  },
+  { "sshell",          { NULL }, 614,   "tcp"  },
+  { "sshell",          { NULL }, 614,   "udp"  },
+  { "sco-inetmgr",     { NULL }, 615,   "tcp"  },
+  { "sco-inetmgr",     { NULL }, 615,   "udp"  },
+  { "sco-sysmgr",      { NULL }, 616,   "tcp"  },
+  { "sco-sysmgr",      { NULL }, 616,   "udp"  },
+  { "sco-dtmgr",       { NULL }, 617,   "tcp"  },
+  { "sco-dtmgr",       { NULL }, 617,   "udp"  },
+  { "dei-icda",        { NULL }, 618,   "tcp"  },
+  { "dei-icda",        { NULL }, 618,   "udp"  },
+  { "compaq-evm",      { NULL }, 619,   "tcp"  },
+  { "compaq-evm",      { NULL }, 619,   "udp"  },
+  { "sco-websrvrmgr",  { NULL }, 620,   "tcp"  },
+  { "sco-websrvrmgr",  { NULL }, 620,   "udp"  },
+  { "escp-ip",         { NULL }, 621,   "tcp"  },
+  { "escp-ip",         { NULL }, 621,   "udp"  },
+  { "collaborator",    { NULL }, 622,   "tcp"  },
+  { "collaborator",    { NULL }, 622,   "udp"  },
+  { "oob-ws-http",     { NULL }, 623,   "tcp"  },
+  { "asf-rmcp",        { NULL }, 623,   "udp"  },
+  { "cryptoadmin",     { NULL }, 624,   "tcp"  },
+  { "cryptoadmin",     { NULL }, 624,   "udp"  },
+  { "dec_dlm",         { NULL }, 625,   "tcp"  },
+  { "dec_dlm",         { NULL }, 625,   "udp"  },
+  { "asia",            { NULL }, 626,   "tcp"  },
+  { "asia",            { NULL }, 626,   "udp"  },
+  { "passgo-tivoli",   { NULL }, 627,   "tcp"  },
+  { "passgo-tivoli",   { NULL }, 627,   "udp"  },
+  { "qmqp",            { NULL }, 628,   "tcp"  },
+  { "qmqp",            { NULL }, 628,   "udp"  },
+  { "3com-amp3",       { NULL }, 629,   "tcp"  },
+  { "3com-amp3",       { NULL }, 629,   "udp"  },
+  { "rda",             { NULL }, 630,   "tcp"  },
+  { "rda",             { NULL }, 630,   "udp"  },
+  { "ipp",             { NULL }, 631,   "tcp"  },
+  { "ipp",             { NULL }, 631,   "udp"  },
+  { "bmpp",            { NULL }, 632,   "tcp"  },
+  { "bmpp",            { NULL }, 632,   "udp"  },
+  { "servstat",        { NULL }, 633,   "tcp"  },
+  { "servstat",        { NULL }, 633,   "udp"  },
+  { "ginad",           { NULL }, 634,   "tcp"  },
+  { "ginad",           { NULL }, 634,   "udp"  },
+  { "rlzdbase",        { NULL }, 635,   "tcp"  },
+  { "rlzdbase",        { NULL }, 635,   "udp"  },
+  { "ldaps",           { NULL }, 636,   "tcp"  },
+  { "ldaps",           { NULL }, 636,   "udp"  },
+  { "lanserver",       { NULL }, 637,   "tcp"  },
+  { "lanserver",       { NULL }, 637,   "udp"  },
+  { "mcns-sec",        { NULL }, 638,   "tcp"  },
+  { "mcns-sec",        { NULL }, 638,   "udp"  },
+  { "msdp",            { NULL }, 639,   "tcp"  },
+  { "msdp",            { NULL }, 639,   "udp"  },
+  { "entrust-sps",     { NULL }, 640,   "tcp"  },
+  { "entrust-sps",     { NULL }, 640,   "udp"  },
+  { "repcmd",          { NULL }, 641,   "tcp"  },
+  { "repcmd",          { NULL }, 641,   "udp"  },
+  { "esro-emsdp",      { NULL }, 642,   "tcp"  },
+  { "esro-emsdp",      { NULL }, 642,   "udp"  },
+  { "sanity",          { NULL }, 643,   "tcp"  },
+  { "sanity",          { NULL }, 643,   "udp"  },
+  { "dwr",             { NULL }, 644,   "tcp"  },
+  { "dwr",             { NULL }, 644,   "udp"  },
+  { "pssc",            { NULL }, 645,   "tcp"  },
+  { "pssc",            { NULL }, 645,   "udp"  },
+  { "ldp",             { NULL }, 646,   "tcp"  },
+  { "ldp",             { NULL }, 646,   "udp"  },
+  { "dhcp-failover",   { NULL }, 647,   "tcp"  },
+  { "dhcp-failover",   { NULL }, 647,   "udp"  },
+  { "rrp",             { NULL }, 648,   "tcp"  },
+  { "rrp",             { NULL }, 648,   "udp"  },
+  { "cadview-3d",      { NULL }, 649,   "tcp"  },
+  { "cadview-3d",      { NULL }, 649,   "udp"  },
+  { "obex",            { NULL }, 650,   "tcp"  },
+  { "obex",            { NULL }, 650,   "udp"  },
+  { "ieee-mms",        { NULL }, 651,   "tcp"  },
+  { "ieee-mms",        { NULL }, 651,   "udp"  },
+  { "hello-port",      { NULL }, 652,   "tcp"  },
+  { "hello-port",      { NULL }, 652,   "udp"  },
+  { "repscmd",         { NULL }, 653,   "tcp"  },
+  { "repscmd",         { NULL }, 653,   "udp"  },
+  { "aodv",            { NULL }, 654,   "tcp"  },
+  { "aodv",            { NULL }, 654,   "udp"  },
+  { "tinc",            { NULL }, 655,   "tcp"  },
+  { "tinc",            { NULL }, 655,   "udp"  },
+  { "spmp",            { NULL }, 656,   "tcp"  },
+  { "spmp",            { NULL }, 656,   "udp"  },
+  { "rmc",             { NULL }, 657,   "tcp"  },
+  { "rmc",             { NULL }, 657,   "udp"  },
+  { "tenfold",         { NULL }, 658,   "tcp"  },
+  { "tenfold",         { NULL }, 658,   "udp"  },
+  { "mac-srvr-admin",  { NULL }, 660,   "tcp"  },
+  { "mac-srvr-admin",  { NULL }, 660,   "udp"  },
+  { "hap",             { NULL }, 661,   "tcp"  },
+  { "hap",             { NULL }, 661,   "udp"  },
+  { "pftp",            { NULL }, 662,   "tcp"  },
+  { "pftp",            { NULL }, 662,   "udp"  },
+  { "purenoise",       { NULL }, 663,   "tcp"  },
+  { "purenoise",       { NULL }, 663,   "udp"  },
+  { "oob-ws-https",    { NULL }, 664,   "tcp"  },
+  { "asf-secure-rmcp", { NULL }, 664,   "udp"  },
+  { "sun-dr",          { NULL }, 665,   "tcp"  },
+  { "sun-dr",          { NULL }, 665,   "udp"  },
+  { "mdqs",            { NULL }, 666,   "tcp"  },
+  { "mdqs",            { NULL }, 666,   "udp"  },
+  { "doom",            { NULL }, 666,   "tcp"  },
+  { "doom",            { NULL }, 666,   "udp"  },
+  { "disclose",        { NULL }, 667,   "tcp"  },
+  { "disclose",        { NULL }, 667,   "udp"  },
+  { "mecomm",          { NULL }, 668,   "tcp"  },
+  { "mecomm",          { NULL }, 668,   "udp"  },
+  { "meregister",      { NULL }, 669,   "tcp"  },
+  { "meregister",      { NULL }, 669,   "udp"  },
+  { "vacdsm-sws",      { NULL }, 670,   "tcp"  },
+  { "vacdsm-sws",      { NULL }, 670,   "udp"  },
+  { "vacdsm-app",      { NULL }, 671,   "tcp"  },
+  { "vacdsm-app",      { NULL }, 671,   "udp"  },
+  { "vpps-qua",        { NULL }, 672,   "tcp"  },
+  { "vpps-qua",        { NULL }, 672,   "udp"  },
+  { "cimplex",         { NULL }, 673,   "tcp"  },
+  { "cimplex",         { NULL }, 673,   "udp"  },
+  { "acap",            { NULL }, 674,   "tcp"  },
+  { "acap",            { NULL }, 674,   "udp"  },
+  { "dctp",            { NULL }, 675,   "tcp"  },
+  { "dctp",            { NULL }, 675,   "udp"  },
+  { "vpps-via",        { NULL }, 676,   "tcp"  },
+  { "vpps-via",        { NULL }, 676,   "udp"  },
+  { "vpp",             { NULL }, 677,   "tcp"  },
+  { "vpp",             { NULL }, 677,   "udp"  },
+  { "ggf-ncp",         { NULL }, 678,   "tcp"  },
+  { "ggf-ncp",         { NULL }, 678,   "udp"  },
+  { "mrm",             { NULL }, 679,   "tcp"  },
+  { "mrm",             { NULL }, 679,   "udp"  },
+  { "entrust-aaas",    { NULL }, 680,   "tcp"  },
+  { "entrust-aaas",    { NULL }, 680,   "udp"  },
+  { "entrust-aams",    { NULL }, 681,   "tcp"  },
+  { "entrust-aams",    { NULL }, 681,   "udp"  },
+  { "xfr",             { NULL }, 682,   "tcp"  },
+  { "xfr",             { NULL }, 682,   "udp"  },
+  { "corba-iiop",      { NULL }, 683,   "tcp"  },
+  { "corba-iiop",      { NULL }, 683,   "udp"  },
+  { "corba-iiop-ssl",  { NULL }, 684,   "tcp"  },
+  { "corba-iiop-ssl",  { NULL }, 684,   "udp"  },
+  { "mdc-portmapper",  { NULL }, 685,   "tcp"  },
+  { "mdc-portmapper",  { NULL }, 685,   "udp"  },
+  { "hcp-wismar",      { NULL }, 686,   "tcp"  },
+  { "hcp-wismar",      { NULL }, 686,   "udp"  },
+  { "asipregistry",    { NULL }, 687,   "tcp"  },
+  { "asipregistry",    { NULL }, 687,   "udp"  },
+  { "realm-rusd",      { NULL }, 688,   "tcp"  },
+  { "realm-rusd",      { NULL }, 688,   "udp"  },
+  { "nmap",            { NULL }, 689,   "tcp"  },
+  { "nmap",            { NULL }, 689,   "udp"  },
+  { "vatp",            { NULL }, 690,   "tcp"  },
+  { "vatp",            { NULL }, 690,   "udp"  },
+  { "msexch-routing",  { NULL }, 691,   "tcp"  },
+  { "msexch-routing",  { NULL }, 691,   "udp"  },
+  { "hyperwave-isp",   { NULL }, 692,   "tcp"  },
+  { "hyperwave-isp",   { NULL }, 692,   "udp"  },
+  { "connendp",        { NULL }, 693,   "tcp"  },
+  { "connendp",        { NULL }, 693,   "udp"  },
+  { "ha-cluster",      { NULL }, 694,   "tcp"  },
+  { "ha-cluster",      { NULL }, 694,   "udp"  },
+  { "ieee-mms-ssl",    { NULL }, 695,   "tcp"  },
+  { "ieee-mms-ssl",    { NULL }, 695,   "udp"  },
+  { "rushd",           { NULL }, 696,   "tcp"  },
+  { "rushd",           { NULL }, 696,   "udp"  },
+  { "uuidgen",         { NULL }, 697,   "tcp"  },
+  { "uuidgen",         { NULL }, 697,   "udp"  },
+  { "olsr",            { NULL }, 698,   "tcp"  },
+  { "olsr",            { NULL }, 698,   "udp"  },
+  { "accessnetwork",   { NULL }, 699,   "tcp"  },
+  { "accessnetwork",   { NULL }, 699,   "udp"  },
+  { "epp",             { NULL }, 700,   "tcp"  },
+  { "epp",             { NULL }, 700,   "udp"  },
+  { "lmp",             { NULL }, 701,   "tcp"  },
+  { "lmp",             { NULL }, 701,   "udp"  },
+  { "iris-beep",       { NULL }, 702,   "tcp"  },
+  { "iris-beep",       { NULL }, 702,   "udp"  },
+  { "elcsd",           { NULL }, 704,   "tcp"  },
+  { "elcsd",           { NULL }, 704,   "udp"  },
+  { "agentx",          { NULL }, 705,   "tcp"  },
+  { "agentx",          { NULL }, 705,   "udp"  },
+  { "silc",            { NULL }, 706,   "tcp"  },
+  { "silc",            { NULL }, 706,   "udp"  },
+  { "borland-dsj",     { NULL }, 707,   "tcp"  },
+  { "borland-dsj",     { NULL }, 707,   "udp"  },
+  { "entrust-kmsh",    { NULL }, 709,   "tcp"  },
+  { "entrust-kmsh",    { NULL }, 709,   "udp"  },
+  { "entrust-ash",     { NULL }, 710,   "tcp"  },
+  { "entrust-ash",     { NULL }, 710,   "udp"  },
+  { "cisco-tdp",       { NULL }, 711,   "tcp"  },
+  { "cisco-tdp",       { NULL }, 711,   "udp"  },
+  { "tbrpf",           { NULL }, 712,   "tcp"  },
+  { "tbrpf",           { NULL }, 712,   "udp"  },
+  { "iris-xpc",        { NULL }, 713,   "tcp"  },
+  { "iris-xpc",        { NULL }, 713,   "udp"  },
+  { "iris-xpcs",       { NULL }, 714,   "tcp"  },
+  { "iris-xpcs",       { NULL }, 714,   "udp"  },
+  { "iris-lwz",        { NULL }, 715,   "tcp"  },
+  { "iris-lwz",        { NULL }, 715,   "udp"  },
+  { "pana",            { NULL }, 716,   "udp"  },
+  { "netviewdm1",      { NULL }, 729,   "tcp"  },
+  { "netviewdm1",      { NULL }, 729,   "udp"  },
+  { "netviewdm2",      { NULL }, 730,   "tcp"  },
+  { "netviewdm2",      { NULL }, 730,   "udp"  },
+  { "netviewdm3",      { NULL }, 731,   "tcp"  },
+  { "netviewdm3",      { NULL }, 731,   "udp"  },
+  { "netgw",           { NULL }, 741,   "tcp"  },
+  { "netgw",           { NULL }, 741,   "udp"  },
+  { "netrcs",          { NULL }, 742,   "tcp"  },
+  { "netrcs",          { NULL }, 742,   "udp"  },
+  { "flexlm",          { NULL }, 744,   "tcp"  },
+  { "flexlm",          { NULL }, 744,   "udp"  },
+  { "fujitsu-dev",     { NULL }, 747,   "tcp"  },
+  { "fujitsu-dev",     { NULL }, 747,   "udp"  },
+  { "ris-cm",          { NULL }, 748,   "tcp"  },
+  { "ris-cm",          { NULL }, 748,   "udp"  },
+  { "kerberos-adm",    { NULL }, 749,   "tcp"  },
+  { "kerberos-adm",    { NULL }, 749,   "udp"  },
+  { "rfile",           { NULL }, 750,   "tcp"  },
+  { "loadav",          { NULL }, 750,   "udp"  },
+  { "kerberos-iv",     { NULL }, 750,   "udp"  },
+  { "pump",            { NULL }, 751,   "tcp"  },
+  { "pump",            { NULL }, 751,   "udp"  },
+  { "qrh",             { NULL }, 752,   "tcp"  },
+  { "qrh",             { NULL }, 752,   "udp"  },
+  { "rrh",             { NULL }, 753,   "tcp"  },
+  { "rrh",             { NULL }, 753,   "udp"  },
+  { "tell",            { NULL }, 754,   "tcp"  },
+  { "tell",            { NULL }, 754,   "udp"  },
+  { "nlogin",          { NULL }, 758,   "tcp"  },
+  { "nlogin",          { NULL }, 758,   "udp"  },
+  { "con",             { NULL }, 759,   "tcp"  },
+  { "con",             { NULL }, 759,   "udp"  },
+  { "ns",              { NULL }, 760,   "tcp"  },
+  { "ns",              { NULL }, 760,   "udp"  },
+  { "rxe",             { NULL }, 761,   "tcp"  },
+  { "rxe",             { NULL }, 761,   "udp"  },
+  { "quotad",          { NULL }, 762,   "tcp"  },
+  { "quotad",          { NULL }, 762,   "udp"  },
+  { "cycleserv",       { NULL }, 763,   "tcp"  },
+  { "cycleserv",       { NULL }, 763,   "udp"  },
+  { "omserv",          { NULL }, 764,   "tcp"  },
+  { "omserv",          { NULL }, 764,   "udp"  },
+  { "webster",         { NULL }, 765,   "tcp"  },
+  { "webster",         { NULL }, 765,   "udp"  },
+  { "phonebook",       { NULL }, 767,   "tcp"  },
+  { "phonebook",       { NULL }, 767,   "udp"  },
+  { "vid",             { NULL }, 769,   "tcp"  },
+  { "vid",             { NULL }, 769,   "udp"  },
+  { "cadlock",         { NULL }, 770,   "tcp"  },
+  { "cadlock",         { NULL }, 770,   "udp"  },
+  { "rtip",            { NULL }, 771,   "tcp"  },
+  { "rtip",            { NULL }, 771,   "udp"  },
+  { "cycleserv2",      { NULL }, 772,   "tcp"  },
+  { "cycleserv2",      { NULL }, 772,   "udp"  },
+  { "submit",          { NULL }, 773,   "tcp"  },
+  { "notify",          { NULL }, 773,   "udp"  },
+  { "rpasswd",         { NULL }, 774,   "tcp"  },
+  { "acmaint_dbd",     { NULL }, 774,   "udp"  },
+  { "entomb",          { NULL }, 775,   "tcp"  },
+  { "acmaint_transd",  { NULL }, 775,   "udp"  },
+  { "wpages",          { NULL }, 776,   "tcp"  },
+  { "wpages",          { NULL }, 776,   "udp"  },
+  { "multiling-http",  { NULL }, 777,   "tcp"  },
+  { "multiling-http",  { NULL }, 777,   "udp"  },
+  { "wpgs",            { NULL }, 780,   "tcp"  },
+  { "wpgs",            { NULL }, 780,   "udp"  },
+  { "mdbs_daemon",     { NULL }, 800,   "tcp"  },
+  { "mdbs_daemon",     { NULL }, 800,   "udp"  },
+  { "device",          { NULL }, 801,   "tcp"  },
+  { "device",          { NULL }, 801,   "udp"  },
+  { "fcp-udp",         { NULL }, 810,   "tcp"  },
+  { "fcp-udp",         { NULL }, 810,   "udp"  },
+  { "itm-mcell-s",     { NULL }, 828,   "tcp"  },
+  { "itm-mcell-s",     { NULL }, 828,   "udp"  },
+  { "pkix-3-ca-ra",    { NULL }, 829,   "tcp"  },
+  { "pkix-3-ca-ra",    { NULL }, 829,   "udp"  },
+  { "netconf-ssh",     { NULL }, 830,   "tcp"  },
+  { "netconf-ssh",     { NULL }, 830,   "udp"  },
+  { "netconf-beep",    { NULL }, 831,   "tcp"  },
+  { "netconf-beep",    { NULL }, 831,   "udp"  },
+  { "netconfsoaphttp", { NULL }, 832,   "tcp"  },
+  { "netconfsoaphttp", { NULL }, 832,   "udp"  },
+  { "netconfsoapbeep", { NULL }, 833,   "tcp"  },
+  { "netconfsoapbeep", { NULL }, 833,   "udp"  },
+  { "dhcp-failover2",  { NULL }, 847,   "tcp"  },
+  { "dhcp-failover2",  { NULL }, 847,   "udp"  },
+  { "gdoi",            { NULL }, 848,   "tcp"  },
+  { "gdoi",            { NULL }, 848,   "udp"  },
+  { "iscsi",           { NULL }, 860,   "tcp"  },
+  { "iscsi",           { NULL }, 860,   "udp"  },
+  { "owamp-control",   { NULL }, 861,   "tcp"  },
+  { "owamp-control",   { NULL }, 861,   "udp"  },
+  { "twamp-control",   { NULL }, 862,   "tcp"  },
+  { "twamp-control",   { NULL }, 862,   "udp"  },
+  { "rsync",           { NULL }, 873,   "tcp"  },
+  { "rsync",           { NULL }, 873,   "udp"  },
+  { "iclcnet-locate",  { NULL }, 886,   "tcp"  },
+  { "iclcnet-locate",  { NULL }, 886,   "udp"  },
+  { "iclcnet_svinfo",  { NULL }, 887,   "tcp"  },
+  { "iclcnet_svinfo",  { NULL }, 887,   "udp"  },
+  { "accessbuilder",   { NULL }, 888,   "tcp"  },
+  { "accessbuilder",   { NULL }, 888,   "udp"  },
+  { "cddbp",           { NULL }, 888,   "tcp"  },
+  { "omginitialrefs",  { NULL }, 900,   "tcp"  },
+  { "omginitialrefs",  { NULL }, 900,   "udp"  },
+  { "smpnameres",      { NULL }, 901,   "tcp"  },
+  { "smpnameres",      { NULL }, 901,   "udp"  },
+  { "ideafarm-door",   { NULL }, 902,   "tcp"  },
+  { "ideafarm-door",   { NULL }, 902,   "udp"  },
+  { "ideafarm-panic",  { NULL }, 903,   "tcp"  },
+  { "ideafarm-panic",  { NULL }, 903,   "udp"  },
+  { "kink",            { NULL }, 910,   "tcp"  },
+  { "kink",            { NULL }, 910,   "udp"  },
+  { "xact-backup",     { NULL }, 911,   "tcp"  },
+  { "xact-backup",     { NULL }, 911,   "udp"  },
+  { "apex-mesh",       { NULL }, 912,   "tcp"  },
+  { "apex-mesh",       { NULL }, 912,   "udp"  },
+  { "apex-edge",       { NULL }, 913,   "tcp"  },
+  { "apex-edge",       { NULL }, 913,   "udp"  },
+  { "ftps-data",       { NULL }, 989,   "tcp"  },
+  { "ftps-data",       { NULL }, 989,   "udp"  },
+  { "ftps",            { NULL }, 990,   "tcp"  },
+  { "ftps",            { NULL }, 990,   "udp"  },
+  { "nas",             { NULL }, 991,   "tcp"  },
+  { "nas",             { NULL }, 991,   "udp"  },
+  { "telnets",         { NULL }, 992,   "tcp"  },
+  { "telnets",         { NULL }, 992,   "udp"  },
+  { "imaps",           { NULL }, 993,   "tcp"  },
+  { "imaps",           { NULL }, 993,   "udp"  },
+  { "ircs",            { NULL }, 994,   "tcp"  },
+  { "ircs",            { NULL }, 994,   "udp"  },
+  { "pop3s",           { NULL }, 995,   "tcp"  },
+  { "pop3s",           { NULL }, 995,   "udp"  },
+  { "vsinet",          { NULL }, 996,   "tcp"  },
+  { "vsinet",          { NULL }, 996,   "udp"  },
+  { "maitrd",          { NULL }, 997,   "tcp"  },
+  { "maitrd",          { NULL }, 997,   "udp"  },
+  { "busboy",          { NULL }, 998,   "tcp"  },
+  { "puparp",          { NULL }, 998,   "udp"  },
+  { "garcon",          { NULL }, 999,   "tcp"  },
+  { "applix",          { NULL }, 999,   "udp"  },
+  { "puprouter",       { NULL }, 999,   "tcp"  },
+  { "puprouter",       { NULL }, 999,   "udp"  },
+  { "cadlock2",        { NULL }, 1000,  "tcp"  },
+  { "cadlock2",        { NULL }, 1000,  "udp"  },
+  { "surf",            { NULL }, 1010,  "tcp"  },
+  { "surf",            { NULL }, 1010,  "udp"  },
+  { "exp1",            { NULL }, 1021,  "tcp"  },
+  { "exp1",            { NULL }, 1021,  "udp"  },
+  { "exp2",            { NULL }, 1022,  "tcp"  },
+  { "exp2",            { NULL }, 1022,  "udp"  },
 #  endif  /* USE_IANA_WELL_KNOWN_PORTS */
 #  ifdef USE_IANA_REGISTERED_PORTS
-  { "blackjack",       { NULL }, 1025,  "tcp" },
-  { "blackjack",       { NULL }, 1025,  "udp" },
-  { "cap",             { NULL }, 1026,  "tcp" },
-  { "cap",             { NULL }, 1026,  "udp" },
-  { "solid-mux",       { NULL }, 1029,  "tcp" },
-  { "solid-mux",       { NULL }, 1029,  "udp" },
-  { "iad1",            { NULL }, 1030,  "tcp" },
-  { "iad1",            { NULL }, 1030,  "udp" },
-  { "iad2",            { NULL }, 1031,  "tcp" },
-  { "iad2",            { NULL }, 1031,  "udp" },
-  { "iad3",            { NULL }, 1032,  "tcp" },
-  { "iad3",            { NULL }, 1032,  "udp" },
-  { "netinfo-local",   { NULL }, 1033,  "tcp" },
-  { "netinfo-local",   { NULL }, 1033,  "udp" },
-  { "activesync",      { NULL }, 1034,  "tcp" },
-  { "activesync",      { NULL }, 1034,  "udp" },
-  { "mxxrlogin",       { NULL }, 1035,  "tcp" },
-  { "mxxrlogin",       { NULL }, 1035,  "udp" },
-  { "nsstp",           { NULL }, 1036,  "tcp" },
-  { "nsstp",           { NULL }, 1036,  "udp" },
-  { "ams",             { NULL }, 1037,  "tcp" },
-  { "ams",             { NULL }, 1037,  "udp" },
-  { "mtqp",            { NULL }, 1038,  "tcp" },
-  { "mtqp",            { NULL }, 1038,  "udp" },
-  { "sbl",             { NULL }, 1039,  "tcp" },
-  { "sbl",             { NULL }, 1039,  "udp" },
-  { "netarx",          { NULL }, 1040,  "tcp" },
-  { "netarx",          { NULL }, 1040,  "udp" },
-  { "danf-ak2",        { NULL }, 1041,  "tcp" },
-  { "danf-ak2",        { NULL }, 1041,  "udp" },
-  { "afrog",           { NULL }, 1042,  "tcp" },
-  { "afrog",           { NULL }, 1042,  "udp" },
-  { "boinc-client",    { NULL }, 1043,  "tcp" },
-  { "boinc-client",    { NULL }, 1043,  "udp" },
-  { "dcutility",       { NULL }, 1044,  "tcp" },
-  { "dcutility",       { NULL }, 1044,  "udp" },
-  { "fpitp",           { NULL }, 1045,  "tcp" },
-  { "fpitp",           { NULL }, 1045,  "udp" },
-  { "wfremotertm",     { NULL }, 1046,  "tcp" },
-  { "wfremotertm",     { NULL }, 1046,  "udp" },
-  { "neod1",           { NULL }, 1047,  "tcp" },
-  { "neod1",           { NULL }, 1047,  "udp" },
-  { "neod2",           { NULL }, 1048,  "tcp" },
-  { "neod2",           { NULL }, 1048,  "udp" },
-  { "td-postman",      { NULL }, 1049,  "tcp" },
-  { "td-postman",      { NULL }, 1049,  "udp" },
-  { "cma",             { NULL }, 1050,  "tcp" },
-  { "cma",             { NULL }, 1050,  "udp" },
-  { "optima-vnet",     { NULL }, 1051,  "tcp" },
-  { "optima-vnet",     { NULL }, 1051,  "udp" },
-  { "ddt",             { NULL }, 1052,  "tcp" },
-  { "ddt",             { NULL }, 1052,  "udp" },
-  { "remote-as",       { NULL }, 1053,  "tcp" },
-  { "remote-as",       { NULL }, 1053,  "udp" },
-  { "brvread",         { NULL }, 1054,  "tcp" },
-  { "brvread",         { NULL }, 1054,  "udp" },
-  { "ansyslmd",        { NULL }, 1055,  "tcp" },
-  { "ansyslmd",        { NULL }, 1055,  "udp" },
-  { "vfo",             { NULL }, 1056,  "tcp" },
-  { "vfo",             { NULL }, 1056,  "udp" },
-  { "startron",        { NULL }, 1057,  "tcp" },
-  { "startron",        { NULL }, 1057,  "udp" },
-  { "nim",             { NULL }, 1058,  "tcp" },
-  { "nim",             { NULL }, 1058,  "udp" },
-  { "nimreg",          { NULL }, 1059,  "tcp" },
-  { "nimreg",          { NULL }, 1059,  "udp" },
-  { "polestar",        { NULL }, 1060,  "tcp" },
-  { "polestar",        { NULL }, 1060,  "udp" },
-  { "kiosk",           { NULL }, 1061,  "tcp" },
-  { "kiosk",           { NULL }, 1061,  "udp" },
-  { "veracity",        { NULL }, 1062,  "tcp" },
-  { "veracity",        { NULL }, 1062,  "udp" },
-  { "kyoceranetdev",   { NULL }, 1063,  "tcp" },
-  { "kyoceranetdev",   { NULL }, 1063,  "udp" },
-  { "jstel",           { NULL }, 1064,  "tcp" },
-  { "jstel",           { NULL }, 1064,  "udp" },
-  { "syscomlan",       { NULL }, 1065,  "tcp" },
-  { "syscomlan",       { NULL }, 1065,  "udp" },
-  { "fpo-fns",         { NULL }, 1066,  "tcp" },
-  { "fpo-fns",         { NULL }, 1066,  "udp" },
-  { "instl_boots",     { NULL }, 1067,  "tcp" },
-  { "instl_boots",     { NULL }, 1067,  "udp" },
-  { "instl_bootc",     { NULL }, 1068,  "tcp" },
-  { "instl_bootc",     { NULL }, 1068,  "udp" },
-  { "cognex-insight",  { NULL }, 1069,  "tcp" },
-  { "cognex-insight",  { NULL }, 1069,  "udp" },
-  { "gmrupdateserv",   { NULL }, 1070,  "tcp" },
-  { "gmrupdateserv",   { NULL }, 1070,  "udp" },
-  { "bsquare-voip",    { NULL }, 1071,  "tcp" },
-  { "bsquare-voip",    { NULL }, 1071,  "udp" },
-  { "cardax",          { NULL }, 1072,  "tcp" },
-  { "cardax",          { NULL }, 1072,  "udp" },
-  { "bridgecontrol",   { NULL }, 1073,  "tcp" },
-  { "bridgecontrol",   { NULL }, 1073,  "udp" },
-  { "warmspotMgmt",    { NULL }, 1074,  "tcp" },
-  { "warmspotMgmt",    { NULL }, 1074,  "udp" },
-  { "rdrmshc",         { NULL }, 1075,  "tcp" },
-  { "rdrmshc",         { NULL }, 1075,  "udp" },
-  { "dab-sti-c",       { NULL }, 1076,  "tcp" },
-  { "dab-sti-c",       { NULL }, 1076,  "udp" },
-  { "imgames",         { NULL }, 1077,  "tcp" },
-  { "imgames",         { NULL }, 1077,  "udp" },
-  { "avocent-proxy",   { NULL }, 1078,  "tcp" },
-  { "avocent-proxy",   { NULL }, 1078,  "udp" },
-  { "asprovatalk",     { NULL }, 1079,  "tcp" },
-  { "asprovatalk",     { NULL }, 1079,  "udp" },
-  { "socks",           { NULL }, 1080,  "tcp" },
-  { "socks",           { NULL }, 1080,  "udp" },
-  { "pvuniwien",       { NULL }, 1081,  "tcp" },
-  { "pvuniwien",       { NULL }, 1081,  "udp" },
-  { "amt-esd-prot",    { NULL }, 1082,  "tcp" },
-  { "amt-esd-prot",    { NULL }, 1082,  "udp" },
-  { "ansoft-lm-1",     { NULL }, 1083,  "tcp" },
-  { "ansoft-lm-1",     { NULL }, 1083,  "udp" },
-  { "ansoft-lm-2",     { NULL }, 1084,  "tcp" },
-  { "ansoft-lm-2",     { NULL }, 1084,  "udp" },
-  { "webobjects",      { NULL }, 1085,  "tcp" },
-  { "webobjects",      { NULL }, 1085,  "udp" },
-  { "cplscrambler-lg", { NULL }, 1086,  "tcp" },
-  { "cplscrambler-lg", { NULL }, 1086,  "udp" },
-  { "cplscrambler-in", { NULL }, 1087,  "tcp" },
-  { "cplscrambler-in", { NULL }, 1087,  "udp" },
-  { "cplscrambler-al", { NULL }, 1088,  "tcp" },
-  { "cplscrambler-al", { NULL }, 1088,  "udp" },
-  { "ff-annunc",       { NULL }, 1089,  "tcp" },
-  { "ff-annunc",       { NULL }, 1089,  "udp" },
-  { "ff-fms",          { NULL }, 1090,  "tcp" },
-  { "ff-fms",          { NULL }, 1090,  "udp" },
-  { "ff-sm",           { NULL }, 1091,  "tcp" },
-  { "ff-sm",           { NULL }, 1091,  "udp" },
-  { "obrpd",           { NULL }, 1092,  "tcp" },
-  { "obrpd",           { NULL }, 1092,  "udp" },
-  { "proofd",          { NULL }, 1093,  "tcp" },
-  { "proofd",          { NULL }, 1093,  "udp" },
-  { "rootd",           { NULL }, 1094,  "tcp" },
-  { "rootd",           { NULL }, 1094,  "udp" },
-  { "nicelink",        { NULL }, 1095,  "tcp" },
-  { "nicelink",        { NULL }, 1095,  "udp" },
-  { "cnrprotocol",     { NULL }, 1096,  "tcp" },
-  { "cnrprotocol",     { NULL }, 1096,  "udp" },
-  { "sunclustermgr",   { NULL }, 1097,  "tcp" },
-  { "sunclustermgr",   { NULL }, 1097,  "udp" },
-  { "rmiactivation",   { NULL }, 1098,  "tcp" },
-  { "rmiactivation",   { NULL }, 1098,  "udp" },
-  { "rmiregistry",     { NULL }, 1099,  "tcp" },
-  { "rmiregistry",     { NULL }, 1099,  "udp" },
-  { "mctp",            { NULL }, 1100,  "tcp" },
-  { "mctp",            { NULL }, 1100,  "udp" },
-  { "pt2-discover",    { NULL }, 1101,  "tcp" },
-  { "pt2-discover",    { NULL }, 1101,  "udp" },
-  { "adobeserver-1",   { NULL }, 1102,  "tcp" },
-  { "adobeserver-1",   { NULL }, 1102,  "udp" },
-  { "adobeserver-2",   { NULL }, 1103,  "tcp" },
-  { "adobeserver-2",   { NULL }, 1103,  "udp" },
-  { "xrl",             { NULL }, 1104,  "tcp" },
-  { "xrl",             { NULL }, 1104,  "udp" },
-  { "ftranhc",         { NULL }, 1105,  "tcp" },
-  { "ftranhc",         { NULL }, 1105,  "udp" },
-  { "isoipsigport-1",  { NULL }, 1106,  "tcp" },
-  { "isoipsigport-1",  { NULL }, 1106,  "udp" },
-  { "isoipsigport-2",  { NULL }, 1107,  "tcp" },
-  { "isoipsigport-2",  { NULL }, 1107,  "udp" },
-  { "ratio-adp",       { NULL }, 1108,  "tcp" },
-  { "ratio-adp",       { NULL }, 1108,  "udp" },
-  { "webadmstart",     { NULL }, 1110,  "tcp" },
-  { "nfsd-keepalive",  { NULL }, 1110,  "udp" },
-  { "lmsocialserver",  { NULL }, 1111,  "tcp" },
-  { "lmsocialserver",  { NULL }, 1111,  "udp" },
-  { "icp",             { NULL }, 1112,  "tcp" },
-  { "icp",             { NULL }, 1112,  "udp" },
-  { "ltp-deepspace",   { NULL }, 1113,  "tcp" },
-  { "ltp-deepspace",   { NULL }, 1113,  "udp" },
-  { "mini-sql",        { NULL }, 1114,  "tcp" },
-  { "mini-sql",        { NULL }, 1114,  "udp" },
-  { "ardus-trns",      { NULL }, 1115,  "tcp" },
-  { "ardus-trns",      { NULL }, 1115,  "udp" },
-  { "ardus-cntl",      { NULL }, 1116,  "tcp" },
-  { "ardus-cntl",      { NULL }, 1116,  "udp" },
-  { "ardus-mtrns",     { NULL }, 1117,  "tcp" },
-  { "ardus-mtrns",     { NULL }, 1117,  "udp" },
-  { "sacred",          { NULL }, 1118,  "tcp" },
-  { "sacred",          { NULL }, 1118,  "udp" },
-  { "bnetgame",        { NULL }, 1119,  "tcp" },
-  { "bnetgame",        { NULL }, 1119,  "udp" },
-  { "bnetfile",        { NULL }, 1120,  "tcp" },
-  { "bnetfile",        { NULL }, 1120,  "udp" },
-  { "rmpp",            { NULL }, 1121,  "tcp" },
-  { "rmpp",            { NULL }, 1121,  "udp" },
-  { "availant-mgr",    { NULL }, 1122,  "tcp" },
-  { "availant-mgr",    { NULL }, 1122,  "udp" },
-  { "murray",          { NULL }, 1123,  "tcp" },
-  { "murray",          { NULL }, 1123,  "udp" },
-  { "hpvmmcontrol",    { NULL }, 1124,  "tcp" },
-  { "hpvmmcontrol",    { NULL }, 1124,  "udp" },
-  { "hpvmmagent",      { NULL }, 1125,  "tcp" },
-  { "hpvmmagent",      { NULL }, 1125,  "udp" },
-  { "hpvmmdata",       { NULL }, 1126,  "tcp" },
-  { "hpvmmdata",       { NULL }, 1126,  "udp" },
-  { "kwdb-commn",      { NULL }, 1127,  "tcp" },
-  { "kwdb-commn",      { NULL }, 1127,  "udp" },
-  { "saphostctrl",     { NULL }, 1128,  "tcp" },
-  { "saphostctrl",     { NULL }, 1128,  "udp" },
-  { "saphostctrls",    { NULL }, 1129,  "tcp" },
-  { "saphostctrls",    { NULL }, 1129,  "udp" },
-  { "casp",            { NULL }, 1130,  "tcp" },
-  { "casp",            { NULL }, 1130,  "udp" },
-  { "caspssl",         { NULL }, 1131,  "tcp" },
-  { "caspssl",         { NULL }, 1131,  "udp" },
-  { "kvm-via-ip",      { NULL }, 1132,  "tcp" },
-  { "kvm-via-ip",      { NULL }, 1132,  "udp" },
-  { "dfn",             { NULL }, 1133,  "tcp" },
-  { "dfn",             { NULL }, 1133,  "udp" },
-  { "aplx",            { NULL }, 1134,  "tcp" },
-  { "aplx",            { NULL }, 1134,  "udp" },
-  { "omnivision",      { NULL }, 1135,  "tcp" },
-  { "omnivision",      { NULL }, 1135,  "udp" },
-  { "hhb-gateway",     { NULL }, 1136,  "tcp" },
-  { "hhb-gateway",     { NULL }, 1136,  "udp" },
-  { "trim",            { NULL }, 1137,  "tcp" },
-  { "trim",            { NULL }, 1137,  "udp" },
-  { "encrypted_admin", { NULL }, 1138,  "tcp" },
-  { "encrypted_admin", { NULL }, 1138,  "udp" },
-  { "evm",             { NULL }, 1139,  "tcp" },
-  { "evm",             { NULL }, 1139,  "udp" },
-  { "autonoc",         { NULL }, 1140,  "tcp" },
-  { "autonoc",         { NULL }, 1140,  "udp" },
-  { "mxomss",          { NULL }, 1141,  "tcp" },
-  { "mxomss",          { NULL }, 1141,  "udp" },
-  { "edtools",         { NULL }, 1142,  "tcp" },
-  { "edtools",         { NULL }, 1142,  "udp" },
-  { "imyx",            { NULL }, 1143,  "tcp" },
-  { "imyx",            { NULL }, 1143,  "udp" },
-  { "fuscript",        { NULL }, 1144,  "tcp" },
-  { "fuscript",        { NULL }, 1144,  "udp" },
-  { "x9-icue",         { NULL }, 1145,  "tcp" },
-  { "x9-icue",         { NULL }, 1145,  "udp" },
-  { "audit-transfer",  { NULL }, 1146,  "tcp" },
-  { "audit-transfer",  { NULL }, 1146,  "udp" },
-  { "capioverlan",     { NULL }, 1147,  "tcp" },
-  { "capioverlan",     { NULL }, 1147,  "udp" },
-  { "elfiq-repl",      { NULL }, 1148,  "tcp" },
-  { "elfiq-repl",      { NULL }, 1148,  "udp" },
-  { "bvtsonar",        { NULL }, 1149,  "tcp" },
-  { "bvtsonar",        { NULL }, 1149,  "udp" },
-  { "blaze",           { NULL }, 1150,  "tcp" },
-  { "blaze",           { NULL }, 1150,  "udp" },
-  { "unizensus",       { NULL }, 1151,  "tcp" },
-  { "unizensus",       { NULL }, 1151,  "udp" },
-  { "winpoplanmess",   { NULL }, 1152,  "tcp" },
-  { "winpoplanmess",   { NULL }, 1152,  "udp" },
-  { "c1222-acse",      { NULL }, 1153,  "tcp" },
-  { "c1222-acse",      { NULL }, 1153,  "udp" },
-  { "resacommunity",   { NULL }, 1154,  "tcp" },
-  { "resacommunity",   { NULL }, 1154,  "udp" },
-  { "nfa",             { NULL }, 1155,  "tcp" },
-  { "nfa",             { NULL }, 1155,  "udp" },
-  { "iascontrol-oms",  { NULL }, 1156,  "tcp" },
-  { "iascontrol-oms",  { NULL }, 1156,  "udp" },
-  { "iascontrol",      { NULL }, 1157,  "tcp" },
-  { "iascontrol",      { NULL }, 1157,  "udp" },
-  { "dbcontrol-oms",   { NULL }, 1158,  "tcp" },
-  { "dbcontrol-oms",   { NULL }, 1158,  "udp" },
-  { "oracle-oms",      { NULL }, 1159,  "tcp" },
-  { "oracle-oms",      { NULL }, 1159,  "udp" },
-  { "olsv",            { NULL }, 1160,  "tcp" },
-  { "olsv",            { NULL }, 1160,  "udp" },
-  { "health-polling",  { NULL }, 1161,  "tcp" },
-  { "health-polling",  { NULL }, 1161,  "udp" },
-  { "health-trap",     { NULL }, 1162,  "tcp" },
-  { "health-trap",     { NULL }, 1162,  "udp" },
-  { "sddp",            { NULL }, 1163,  "tcp" },
-  { "sddp",            { NULL }, 1163,  "udp" },
-  { "qsm-proxy",       { NULL }, 1164,  "tcp" },
-  { "qsm-proxy",       { NULL }, 1164,  "udp" },
-  { "qsm-gui",         { NULL }, 1165,  "tcp" },
-  { "qsm-gui",         { NULL }, 1165,  "udp" },
-  { "qsm-remote",      { NULL }, 1166,  "tcp" },
-  { "qsm-remote",      { NULL }, 1166,  "udp" },
-  { "cisco-ipsla",     { NULL }, 1167,  "tcp" },
-  { "cisco-ipsla",     { NULL }, 1167,  "udp" },
-  { "cisco-ipsla",     { NULL }, 1167,  "sctp"},
-  { "vchat",           { NULL }, 1168,  "tcp" },
-  { "vchat",           { NULL }, 1168,  "udp" },
-  { "tripwire",        { NULL }, 1169,  "tcp" },
-  { "tripwire",        { NULL }, 1169,  "udp" },
-  { "atc-lm",          { NULL }, 1170,  "tcp" },
-  { "atc-lm",          { NULL }, 1170,  "udp" },
-  { "atc-appserver",   { NULL }, 1171,  "tcp" },
-  { "atc-appserver",   { NULL }, 1171,  "udp" },
-  { "dnap",            { NULL }, 1172,  "tcp" },
-  { "dnap",            { NULL }, 1172,  "udp" },
-  { "d-cinema-rrp",    { NULL }, 1173,  "tcp" },
-  { "d-cinema-rrp",    { NULL }, 1173,  "udp" },
-  { "fnet-remote-ui",  { NULL }, 1174,  "tcp" },
-  { "fnet-remote-ui",  { NULL }, 1174,  "udp" },
-  { "dossier",         { NULL }, 1175,  "tcp" },
-  { "dossier",         { NULL }, 1175,  "udp" },
-  { "indigo-server",   { NULL }, 1176,  "tcp" },
-  { "indigo-server",   { NULL }, 1176,  "udp" },
-  { "dkmessenger",     { NULL }, 1177,  "tcp" },
-  { "dkmessenger",     { NULL }, 1177,  "udp" },
-  { "sgi-storman",     { NULL }, 1178,  "tcp" },
-  { "sgi-storman",     { NULL }, 1178,  "udp" },
-  { "b2n",             { NULL }, 1179,  "tcp" },
-  { "b2n",             { NULL }, 1179,  "udp" },
-  { "mc-client",       { NULL }, 1180,  "tcp" },
-  { "mc-client",       { NULL }, 1180,  "udp" },
-  { "3comnetman",      { NULL }, 1181,  "tcp" },
-  { "3comnetman",      { NULL }, 1181,  "udp" },
-  { "accelenet",       { NULL }, 1182,  "tcp" },
-  { "accelenet-data",  { NULL }, 1182,  "udp" },
-  { "llsurfup-http",   { NULL }, 1183,  "tcp" },
-  { "llsurfup-http",   { NULL }, 1183,  "udp" },
-  { "llsurfup-https",  { NULL }, 1184,  "tcp" },
-  { "llsurfup-https",  { NULL }, 1184,  "udp" },
-  { "catchpole",       { NULL }, 1185,  "tcp" },
-  { "catchpole",       { NULL }, 1185,  "udp" },
-  { "mysql-cluster",   { NULL }, 1186,  "tcp" },
-  { "mysql-cluster",   { NULL }, 1186,  "udp" },
-  { "alias",           { NULL }, 1187,  "tcp" },
-  { "alias",           { NULL }, 1187,  "udp" },
-  { "hp-webadmin",     { NULL }, 1188,  "tcp" },
-  { "hp-webadmin",     { NULL }, 1188,  "udp" },
-  { "unet",            { NULL }, 1189,  "tcp" },
-  { "unet",            { NULL }, 1189,  "udp" },
-  { "commlinx-avl",    { NULL }, 1190,  "tcp" },
-  { "commlinx-avl",    { NULL }, 1190,  "udp" },
-  { "gpfs",            { NULL }, 1191,  "tcp" },
-  { "gpfs",            { NULL }, 1191,  "udp" },
-  { "caids-sensor",    { NULL }, 1192,  "tcp" },
-  { "caids-sensor",    { NULL }, 1192,  "udp" },
-  { "fiveacross",      { NULL }, 1193,  "tcp" },
-  { "fiveacross",      { NULL }, 1193,  "udp" },
-  { "openvpn",         { NULL }, 1194,  "tcp" },
-  { "openvpn",         { NULL }, 1194,  "udp" },
-  { "rsf-1",           { NULL }, 1195,  "tcp" },
-  { "rsf-1",           { NULL }, 1195,  "udp" },
-  { "netmagic",        { NULL }, 1196,  "tcp" },
-  { "netmagic",        { NULL }, 1196,  "udp" },
-  { "carrius-rshell",  { NULL }, 1197,  "tcp" },
-  { "carrius-rshell",  { NULL }, 1197,  "udp" },
-  { "cajo-discovery",  { NULL }, 1198,  "tcp" },
-  { "cajo-discovery",  { NULL }, 1198,  "udp" },
-  { "dmidi",           { NULL }, 1199,  "tcp" },
-  { "dmidi",           { NULL }, 1199,  "udp" },
-  { "scol",            { NULL }, 1200,  "tcp" },
-  { "scol",            { NULL }, 1200,  "udp" },
-  { "nucleus-sand",    { NULL }, 1201,  "tcp" },
-  { "nucleus-sand",    { NULL }, 1201,  "udp" },
-  { "caiccipc",        { NULL }, 1202,  "tcp" },
-  { "caiccipc",        { NULL }, 1202,  "udp" },
-  { "ssslic-mgr",      { NULL }, 1203,  "tcp" },
-  { "ssslic-mgr",      { NULL }, 1203,  "udp" },
-  { "ssslog-mgr",      { NULL }, 1204,  "tcp" },
-  { "ssslog-mgr",      { NULL }, 1204,  "udp" },
-  { "accord-mgc",      { NULL }, 1205,  "tcp" },
-  { "accord-mgc",      { NULL }, 1205,  "udp" },
-  { "anthony-data",    { NULL }, 1206,  "tcp" },
-  { "anthony-data",    { NULL }, 1206,  "udp" },
-  { "metasage",        { NULL }, 1207,  "tcp" },
-  { "metasage",        { NULL }, 1207,  "udp" },
-  { "seagull-ais",     { NULL }, 1208,  "tcp" },
-  { "seagull-ais",     { NULL }, 1208,  "udp" },
-  { "ipcd3",           { NULL }, 1209,  "tcp" },
-  { "ipcd3",           { NULL }, 1209,  "udp" },
-  { "eoss",            { NULL }, 1210,  "tcp" },
-  { "eoss",            { NULL }, 1210,  "udp" },
-  { "groove-dpp",      { NULL }, 1211,  "tcp" },
-  { "groove-dpp",      { NULL }, 1211,  "udp" },
-  { "lupa",            { NULL }, 1212,  "tcp" },
-  { "lupa",            { NULL }, 1212,  "udp" },
-  { "mpc-lifenet",     { NULL }, 1213,  "tcp" },
-  { "mpc-lifenet",     { NULL }, 1213,  "udp" },
-  { "kazaa",           { NULL }, 1214,  "tcp" },
-  { "kazaa",           { NULL }, 1214,  "udp" },
-  { "scanstat-1",      { NULL }, 1215,  "tcp" },
-  { "scanstat-1",      { NULL }, 1215,  "udp" },
-  { "etebac5",         { NULL }, 1216,  "tcp" },
-  { "etebac5",         { NULL }, 1216,  "udp" },
-  { "hpss-ndapi",      { NULL }, 1217,  "tcp" },
-  { "hpss-ndapi",      { NULL }, 1217,  "udp" },
-  { "aeroflight-ads",  { NULL }, 1218,  "tcp" },
-  { "aeroflight-ads",  { NULL }, 1218,  "udp" },
-  { "aeroflight-ret",  { NULL }, 1219,  "tcp" },
-  { "aeroflight-ret",  { NULL }, 1219,  "udp" },
-  { "qt-serveradmin",  { NULL }, 1220,  "tcp" },
-  { "qt-serveradmin",  { NULL }, 1220,  "udp" },
-  { "sweetware-apps",  { NULL }, 1221,  "tcp" },
-  { "sweetware-apps",  { NULL }, 1221,  "udp" },
-  { "nerv",            { NULL }, 1222,  "tcp" },
-  { "nerv",            { NULL }, 1222,  "udp" },
-  { "tgp",             { NULL }, 1223,  "tcp" },
-  { "tgp",             { NULL }, 1223,  "udp" },
-  { "vpnz",            { NULL }, 1224,  "tcp" },
-  { "vpnz",            { NULL }, 1224,  "udp" },
-  { "slinkysearch",    { NULL }, 1225,  "tcp" },
-  { "slinkysearch",    { NULL }, 1225,  "udp" },
-  { "stgxfws",         { NULL }, 1226,  "tcp" },
-  { "stgxfws",         { NULL }, 1226,  "udp" },
-  { "dns2go",          { NULL }, 1227,  "tcp" },
-  { "dns2go",          { NULL }, 1227,  "udp" },
-  { "florence",        { NULL }, 1228,  "tcp" },
-  { "florence",        { NULL }, 1228,  "udp" },
-  { "zented",          { NULL }, 1229,  "tcp" },
-  { "zented",          { NULL }, 1229,  "udp" },
-  { "periscope",       { NULL }, 1230,  "tcp" },
-  { "periscope",       { NULL }, 1230,  "udp" },
-  { "menandmice-lpm",  { NULL }, 1231,  "tcp" },
-  { "menandmice-lpm",  { NULL }, 1231,  "udp" },
-  { "univ-appserver",  { NULL }, 1233,  "tcp" },
-  { "univ-appserver",  { NULL }, 1233,  "udp" },
-  { "search-agent",    { NULL }, 1234,  "tcp" },
-  { "search-agent",    { NULL }, 1234,  "udp" },
-  { "mosaicsyssvc1",   { NULL }, 1235,  "tcp" },
-  { "mosaicsyssvc1",   { NULL }, 1235,  "udp" },
-  { "bvcontrol",       { NULL }, 1236,  "tcp" },
-  { "bvcontrol",       { NULL }, 1236,  "udp" },
-  { "tsdos390",        { NULL }, 1237,  "tcp" },
-  { "tsdos390",        { NULL }, 1237,  "udp" },
-  { "hacl-qs",         { NULL }, 1238,  "tcp" },
-  { "hacl-qs",         { NULL }, 1238,  "udp" },
-  { "nmsd",            { NULL }, 1239,  "tcp" },
-  { "nmsd",            { NULL }, 1239,  "udp" },
-  { "instantia",       { NULL }, 1240,  "tcp" },
-  { "instantia",       { NULL }, 1240,  "udp" },
-  { "nessus",          { NULL }, 1241,  "tcp" },
-  { "nessus",          { NULL }, 1241,  "udp" },
-  { "nmasoverip",      { NULL }, 1242,  "tcp" },
-  { "nmasoverip",      { NULL }, 1242,  "udp" },
-  { "serialgateway",   { NULL }, 1243,  "tcp" },
-  { "serialgateway",   { NULL }, 1243,  "udp" },
-  { "isbconference1",  { NULL }, 1244,  "tcp" },
-  { "isbconference1",  { NULL }, 1244,  "udp" },
-  { "isbconference2",  { NULL }, 1245,  "tcp" },
-  { "isbconference2",  { NULL }, 1245,  "udp" },
-  { "payrouter",       { NULL }, 1246,  "tcp" },
-  { "payrouter",       { NULL }, 1246,  "udp" },
-  { "visionpyramid",   { NULL }, 1247,  "tcp" },
-  { "visionpyramid",   { NULL }, 1247,  "udp" },
-  { "hermes",          { NULL }, 1248,  "tcp" },
-  { "hermes",          { NULL }, 1248,  "udp" },
-  { "mesavistaco",     { NULL }, 1249,  "tcp" },
-  { "mesavistaco",     { NULL }, 1249,  "udp" },
-  { "swldy-sias",      { NULL }, 1250,  "tcp" },
-  { "swldy-sias",      { NULL }, 1250,  "udp" },
-  { "servergraph",     { NULL }, 1251,  "tcp" },
-  { "servergraph",     { NULL }, 1251,  "udp" },
-  { "bspne-pcc",       { NULL }, 1252,  "tcp" },
-  { "bspne-pcc",       { NULL }, 1252,  "udp" },
-  { "q55-pcc",         { NULL }, 1253,  "tcp" },
-  { "q55-pcc",         { NULL }, 1253,  "udp" },
-  { "de-noc",          { NULL }, 1254,  "tcp" },
-  { "de-noc",          { NULL }, 1254,  "udp" },
-  { "de-cache-query",  { NULL }, 1255,  "tcp" },
-  { "de-cache-query",  { NULL }, 1255,  "udp" },
-  { "de-server",       { NULL }, 1256,  "tcp" },
-  { "de-server",       { NULL }, 1256,  "udp" },
-  { "shockwave2",      { NULL }, 1257,  "tcp" },
-  { "shockwave2",      { NULL }, 1257,  "udp" },
-  { "opennl",          { NULL }, 1258,  "tcp" },
-  { "opennl",          { NULL }, 1258,  "udp" },
-  { "opennl-voice",    { NULL }, 1259,  "tcp" },
-  { "opennl-voice",    { NULL }, 1259,  "udp" },
-  { "ibm-ssd",         { NULL }, 1260,  "tcp" },
-  { "ibm-ssd",         { NULL }, 1260,  "udp" },
-  { "mpshrsv",         { NULL }, 1261,  "tcp" },
-  { "mpshrsv",         { NULL }, 1261,  "udp" },
-  { "qnts-orb",        { NULL }, 1262,  "tcp" },
-  { "qnts-orb",        { NULL }, 1262,  "udp" },
-  { "dka",             { NULL }, 1263,  "tcp" },
-  { "dka",             { NULL }, 1263,  "udp" },
-  { "prat",            { NULL }, 1264,  "tcp" },
-  { "prat",            { NULL }, 1264,  "udp" },
-  { "dssiapi",         { NULL }, 1265,  "tcp" },
-  { "dssiapi",         { NULL }, 1265,  "udp" },
-  { "dellpwrappks",    { NULL }, 1266,  "tcp" },
-  { "dellpwrappks",    { NULL }, 1266,  "udp" },
-  { "epc",             { NULL }, 1267,  "tcp" },
-  { "epc",             { NULL }, 1267,  "udp" },
-  { "propel-msgsys",   { NULL }, 1268,  "tcp" },
-  { "propel-msgsys",   { NULL }, 1268,  "udp" },
-  { "watilapp",        { NULL }, 1269,  "tcp" },
-  { "watilapp",        { NULL }, 1269,  "udp" },
-  { "opsmgr",          { NULL }, 1270,  "tcp" },
-  { "opsmgr",          { NULL }, 1270,  "udp" },
-  { "excw",            { NULL }, 1271,  "tcp" },
-  { "excw",            { NULL }, 1271,  "udp" },
-  { "cspmlockmgr",     { NULL }, 1272,  "tcp" },
-  { "cspmlockmgr",     { NULL }, 1272,  "udp" },
-  { "emc-gateway",     { NULL }, 1273,  "tcp" },
-  { "emc-gateway",     { NULL }, 1273,  "udp" },
-  { "t1distproc",      { NULL }, 1274,  "tcp" },
-  { "t1distproc",      { NULL }, 1274,  "udp" },
-  { "ivcollector",     { NULL }, 1275,  "tcp" },
-  { "ivcollector",     { NULL }, 1275,  "udp" },
-  { "ivmanager",       { NULL }, 1276,  "tcp" },
-  { "ivmanager",       { NULL }, 1276,  "udp" },
-  { "miva-mqs",        { NULL }, 1277,  "tcp" },
-  { "miva-mqs",        { NULL }, 1277,  "udp" },
-  { "dellwebadmin-1",  { NULL }, 1278,  "tcp" },
-  { "dellwebadmin-1",  { NULL }, 1278,  "udp" },
-  { "dellwebadmin-2",  { NULL }, 1279,  "tcp" },
-  { "dellwebadmin-2",  { NULL }, 1279,  "udp" },
-  { "pictrography",    { NULL }, 1280,  "tcp" },
-  { "pictrography",    { NULL }, 1280,  "udp" },
-  { "healthd",         { NULL }, 1281,  "tcp" },
-  { "healthd",         { NULL }, 1281,  "udp" },
-  { "emperion",        { NULL }, 1282,  "tcp" },
-  { "emperion",        { NULL }, 1282,  "udp" },
-  { "productinfo",     { NULL }, 1283,  "tcp" },
-  { "productinfo",     { NULL }, 1283,  "udp" },
-  { "iee-qfx",         { NULL }, 1284,  "tcp" },
-  { "iee-qfx",         { NULL }, 1284,  "udp" },
-  { "neoiface",        { NULL }, 1285,  "tcp" },
-  { "neoiface",        { NULL }, 1285,  "udp" },
-  { "netuitive",       { NULL }, 1286,  "tcp" },
-  { "netuitive",       { NULL }, 1286,  "udp" },
-  { "routematch",      { NULL }, 1287,  "tcp" },
-  { "routematch",      { NULL }, 1287,  "udp" },
-  { "navbuddy",        { NULL }, 1288,  "tcp" },
-  { "navbuddy",        { NULL }, 1288,  "udp" },
-  { "jwalkserver",     { NULL }, 1289,  "tcp" },
-  { "jwalkserver",     { NULL }, 1289,  "udp" },
-  { "winjaserver",     { NULL }, 1290,  "tcp" },
-  { "winjaserver",     { NULL }, 1290,  "udp" },
-  { "seagulllms",      { NULL }, 1291,  "tcp" },
-  { "seagulllms",      { NULL }, 1291,  "udp" },
-  { "dsdn",            { NULL }, 1292,  "tcp" },
-  { "dsdn",            { NULL }, 1292,  "udp" },
-  { "pkt-krb-ipsec",   { NULL }, 1293,  "tcp" },
-  { "pkt-krb-ipsec",   { NULL }, 1293,  "udp" },
-  { "cmmdriver",       { NULL }, 1294,  "tcp" },
-  { "cmmdriver",       { NULL }, 1294,  "udp" },
-  { "ehtp",            { NULL }, 1295,  "tcp" },
-  { "ehtp",            { NULL }, 1295,  "udp" },
-  { "dproxy",          { NULL }, 1296,  "tcp" },
-  { "dproxy",          { NULL }, 1296,  "udp" },
-  { "sdproxy",         { NULL }, 1297,  "tcp" },
-  { "sdproxy",         { NULL }, 1297,  "udp" },
-  { "lpcp",            { NULL }, 1298,  "tcp" },
-  { "lpcp",            { NULL }, 1298,  "udp" },
-  { "hp-sci",          { NULL }, 1299,  "tcp" },
-  { "hp-sci",          { NULL }, 1299,  "udp" },
-  { "h323hostcallsc",  { NULL }, 1300,  "tcp" },
-  { "h323hostcallsc",  { NULL }, 1300,  "udp" },
-  { "ci3-software-1",  { NULL }, 1301,  "tcp" },
-  { "ci3-software-1",  { NULL }, 1301,  "udp" },
-  { "ci3-software-2",  { NULL }, 1302,  "tcp" },
-  { "ci3-software-2",  { NULL }, 1302,  "udp" },
-  { "sftsrv",          { NULL }, 1303,  "tcp" },
-  { "sftsrv",          { NULL }, 1303,  "udp" },
-  { "boomerang",       { NULL }, 1304,  "tcp" },
-  { "boomerang",       { NULL }, 1304,  "udp" },
-  { "pe-mike",         { NULL }, 1305,  "tcp" },
-  { "pe-mike",         { NULL }, 1305,  "udp" },
-  { "re-conn-proto",   { NULL }, 1306,  "tcp" },
-  { "re-conn-proto",   { NULL }, 1306,  "udp" },
-  { "pacmand",         { NULL }, 1307,  "tcp" },
-  { "pacmand",         { NULL }, 1307,  "udp" },
-  { "odsi",            { NULL }, 1308,  "tcp" },
-  { "odsi",            { NULL }, 1308,  "udp" },
-  { "jtag-server",     { NULL }, 1309,  "tcp" },
-  { "jtag-server",     { NULL }, 1309,  "udp" },
-  { "husky",           { NULL }, 1310,  "tcp" },
-  { "husky",           { NULL }, 1310,  "udp" },
-  { "rxmon",           { NULL }, 1311,  "tcp" },
-  { "rxmon",           { NULL }, 1311,  "udp" },
-  { "sti-envision",    { NULL }, 1312,  "tcp" },
-  { "sti-envision",    { NULL }, 1312,  "udp" },
-  { "bmc_patroldb",    { NULL }, 1313,  "tcp" },
-  { "bmc_patroldb",    { NULL }, 1313,  "udp" },
-  { "pdps",            { NULL }, 1314,  "tcp" },
-  { "pdps",            { NULL }, 1314,  "udp" },
-  { "els",             { NULL }, 1315,  "tcp" },
-  { "els",             { NULL }, 1315,  "udp" },
-  { "exbit-escp",      { NULL }, 1316,  "tcp" },
-  { "exbit-escp",      { NULL }, 1316,  "udp" },
-  { "vrts-ipcserver",  { NULL }, 1317,  "tcp" },
-  { "vrts-ipcserver",  { NULL }, 1317,  "udp" },
-  { "krb5gatekeeper",  { NULL }, 1318,  "tcp" },
-  { "krb5gatekeeper",  { NULL }, 1318,  "udp" },
-  { "amx-icsp",        { NULL }, 1319,  "tcp" },
-  { "amx-icsp",        { NULL }, 1319,  "udp" },
-  { "amx-axbnet",      { NULL }, 1320,  "tcp" },
-  { "amx-axbnet",      { NULL }, 1320,  "udp" },
-  { "pip",             { NULL }, 1321,  "tcp" },
-  { "pip",             { NULL }, 1321,  "udp" },
-  { "novation",        { NULL }, 1322,  "tcp" },
-  { "novation",        { NULL }, 1322,  "udp" },
-  { "brcd",            { NULL }, 1323,  "tcp" },
-  { "brcd",            { NULL }, 1323,  "udp" },
-  { "delta-mcp",       { NULL }, 1324,  "tcp" },
-  { "delta-mcp",       { NULL }, 1324,  "udp" },
-  { "dx-instrument",   { NULL }, 1325,  "tcp" },
-  { "dx-instrument",   { NULL }, 1325,  "udp" },
-  { "wimsic",          { NULL }, 1326,  "tcp" },
-  { "wimsic",          { NULL }, 1326,  "udp" },
-  { "ultrex",          { NULL }, 1327,  "tcp" },
-  { "ultrex",          { NULL }, 1327,  "udp" },
-  { "ewall",           { NULL }, 1328,  "tcp" },
-  { "ewall",           { NULL }, 1328,  "udp" },
-  { "netdb-export",    { NULL }, 1329,  "tcp" },
-  { "netdb-export",    { NULL }, 1329,  "udp" },
-  { "streetperfect",   { NULL }, 1330,  "tcp" },
-  { "streetperfect",   { NULL }, 1330,  "udp" },
-  { "intersan",        { NULL }, 1331,  "tcp" },
-  { "intersan",        { NULL }, 1331,  "udp" },
-  { "pcia-rxp-b",      { NULL }, 1332,  "tcp" },
-  { "pcia-rxp-b",      { NULL }, 1332,  "udp" },
-  { "passwrd-policy",  { NULL }, 1333,  "tcp" },
-  { "passwrd-policy",  { NULL }, 1333,  "udp" },
-  { "writesrv",        { NULL }, 1334,  "tcp" },
-  { "writesrv",        { NULL }, 1334,  "udp" },
-  { "digital-notary",  { NULL }, 1335,  "tcp" },
-  { "digital-notary",  { NULL }, 1335,  "udp" },
-  { "ischat",          { NULL }, 1336,  "tcp" },
-  { "ischat",          { NULL }, 1336,  "udp" },
-  { "menandmice-dns",  { NULL }, 1337,  "tcp" },
-  { "menandmice-dns",  { NULL }, 1337,  "udp" },
-  { "wmc-log-svc",     { NULL }, 1338,  "tcp" },
-  { "wmc-log-svc",     { NULL }, 1338,  "udp" },
-  { "kjtsiteserver",   { NULL }, 1339,  "tcp" },
-  { "kjtsiteserver",   { NULL }, 1339,  "udp" },
-  { "naap",            { NULL }, 1340,  "tcp" },
-  { "naap",            { NULL }, 1340,  "udp" },
-  { "qubes",           { NULL }, 1341,  "tcp" },
-  { "qubes",           { NULL }, 1341,  "udp" },
-  { "esbroker",        { NULL }, 1342,  "tcp" },
-  { "esbroker",        { NULL }, 1342,  "udp" },
-  { "re101",           { NULL }, 1343,  "tcp" },
-  { "re101",           { NULL }, 1343,  "udp" },
-  { "icap",            { NULL }, 1344,  "tcp" },
-  { "icap",            { NULL }, 1344,  "udp" },
-  { "vpjp",            { NULL }, 1345,  "tcp" },
-  { "vpjp",            { NULL }, 1345,  "udp" },
-  { "alta-ana-lm",     { NULL }, 1346,  "tcp" },
-  { "alta-ana-lm",     { NULL }, 1346,  "udp" },
-  { "bbn-mmc",         { NULL }, 1347,  "tcp" },
-  { "bbn-mmc",         { NULL }, 1347,  "udp" },
-  { "bbn-mmx",         { NULL }, 1348,  "tcp" },
-  { "bbn-mmx",         { NULL }, 1348,  "udp" },
-  { "sbook",           { NULL }, 1349,  "tcp" },
-  { "sbook",           { NULL }, 1349,  "udp" },
-  { "editbench",       { NULL }, 1350,  "tcp" },
-  { "editbench",       { NULL }, 1350,  "udp" },
-  { "equationbuilder", { NULL }, 1351,  "tcp" },
-  { "equationbuilder", { NULL }, 1351,  "udp" },
-  { "lotusnote",       { NULL }, 1352,  "tcp" },
-  { "lotusnote",       { NULL }, 1352,  "udp" },
-  { "relief",          { NULL }, 1353,  "tcp" },
-  { "relief",          { NULL }, 1353,  "udp" },
-  { "XSIP-network",    { NULL }, 1354,  "tcp" },
-  { "XSIP-network",    { NULL }, 1354,  "udp" },
-  { "intuitive-edge",  { NULL }, 1355,  "tcp" },
-  { "intuitive-edge",  { NULL }, 1355,  "udp" },
-  { "cuillamartin",    { NULL }, 1356,  "tcp" },
-  { "cuillamartin",    { NULL }, 1356,  "udp" },
-  { "pegboard",        { NULL }, 1357,  "tcp" },
-  { "pegboard",        { NULL }, 1357,  "udp" },
-  { "connlcli",        { NULL }, 1358,  "tcp" },
-  { "connlcli",        { NULL }, 1358,  "udp" },
-  { "ftsrv",           { NULL }, 1359,  "tcp" },
-  { "ftsrv",           { NULL }, 1359,  "udp" },
-  { "mimer",           { NULL }, 1360,  "tcp" },
-  { "mimer",           { NULL }, 1360,  "udp" },
-  { "linx",            { NULL }, 1361,  "tcp" },
-  { "linx",            { NULL }, 1361,  "udp" },
-  { "timeflies",       { NULL }, 1362,  "tcp" },
-  { "timeflies",       { NULL }, 1362,  "udp" },
-  { "ndm-requester",   { NULL }, 1363,  "tcp" },
-  { "ndm-requester",   { NULL }, 1363,  "udp" },
-  { "ndm-server",      { NULL }, 1364,  "tcp" },
-  { "ndm-server",      { NULL }, 1364,  "udp" },
-  { "adapt-sna",       { NULL }, 1365,  "tcp" },
-  { "adapt-sna",       { NULL }, 1365,  "udp" },
-  { "netware-csp",     { NULL }, 1366,  "tcp" },
-  { "netware-csp",     { NULL }, 1366,  "udp" },
-  { "dcs",             { NULL }, 1367,  "tcp" },
-  { "dcs",             { NULL }, 1367,  "udp" },
-  { "screencast",      { NULL }, 1368,  "tcp" },
-  { "screencast",      { NULL }, 1368,  "udp" },
-  { "gv-us",           { NULL }, 1369,  "tcp" },
-  { "gv-us",           { NULL }, 1369,  "udp" },
-  { "us-gv",           { NULL }, 1370,  "tcp" },
-  { "us-gv",           { NULL }, 1370,  "udp" },
-  { "fc-cli",          { NULL }, 1371,  "tcp" },
-  { "fc-cli",          { NULL }, 1371,  "udp" },
-  { "fc-ser",          { NULL }, 1372,  "tcp" },
-  { "fc-ser",          { NULL }, 1372,  "udp" },
-  { "chromagrafx",     { NULL }, 1373,  "tcp" },
-  { "chromagrafx",     { NULL }, 1373,  "udp" },
-  { "molly",           { NULL }, 1374,  "tcp" },
-  { "molly",           { NULL }, 1374,  "udp" },
-  { "bytex",           { NULL }, 1375,  "tcp" },
-  { "bytex",           { NULL }, 1375,  "udp" },
-  { "ibm-pps",         { NULL }, 1376,  "tcp" },
-  { "ibm-pps",         { NULL }, 1376,  "udp" },
-  { "cichlid",         { NULL }, 1377,  "tcp" },
-  { "cichlid",         { NULL }, 1377,  "udp" },
-  { "elan",            { NULL }, 1378,  "tcp" },
-  { "elan",            { NULL }, 1378,  "udp" },
-  { "dbreporter",      { NULL }, 1379,  "tcp" },
-  { "dbreporter",      { NULL }, 1379,  "udp" },
-  { "telesis-licman",  { NULL }, 1380,  "tcp" },
-  { "telesis-licman",  { NULL }, 1380,  "udp" },
-  { "apple-licman",    { NULL }, 1381,  "tcp" },
-  { "apple-licman",    { NULL }, 1381,  "udp" },
-  { "udt_os",          { NULL }, 1382,  "tcp" },
-  { "udt_os",          { NULL }, 1382,  "udp" },
-  { "gwha",            { NULL }, 1383,  "tcp" },
-  { "gwha",            { NULL }, 1383,  "udp" },
-  { "os-licman",       { NULL }, 1384,  "tcp" },
-  { "os-licman",       { NULL }, 1384,  "udp" },
-  { "atex_elmd",       { NULL }, 1385,  "tcp" },
-  { "atex_elmd",       { NULL }, 1385,  "udp" },
-  { "checksum",        { NULL }, 1386,  "tcp" },
-  { "checksum",        { NULL }, 1386,  "udp" },
-  { "cadsi-lm",        { NULL }, 1387,  "tcp" },
-  { "cadsi-lm",        { NULL }, 1387,  "udp" },
-  { "objective-dbc",   { NULL }, 1388,  "tcp" },
-  { "objective-dbc",   { NULL }, 1388,  "udp" },
-  { "iclpv-dm",        { NULL }, 1389,  "tcp" },
-  { "iclpv-dm",        { NULL }, 1389,  "udp" },
-  { "iclpv-sc",        { NULL }, 1390,  "tcp" },
-  { "iclpv-sc",        { NULL }, 1390,  "udp" },
-  { "iclpv-sas",       { NULL }, 1391,  "tcp" },
-  { "iclpv-sas",       { NULL }, 1391,  "udp" },
-  { "iclpv-pm",        { NULL }, 1392,  "tcp" },
-  { "iclpv-pm",        { NULL }, 1392,  "udp" },
-  { "iclpv-nls",       { NULL }, 1393,  "tcp" },
-  { "iclpv-nls",       { NULL }, 1393,  "udp" },
-  { "iclpv-nlc",       { NULL }, 1394,  "tcp" },
-  { "iclpv-nlc",       { NULL }, 1394,  "udp" },
-  { "iclpv-wsm",       { NULL }, 1395,  "tcp" },
-  { "iclpv-wsm",       { NULL }, 1395,  "udp" },
-  { "dvl-activemail",  { NULL }, 1396,  "tcp" },
-  { "dvl-activemail",  { NULL }, 1396,  "udp" },
-  { "audio-activmail", { NULL }, 1397,  "tcp" },
-  { "audio-activmail", { NULL }, 1397,  "udp" },
-  { "video-activmail", { NULL }, 1398,  "tcp" },
-  { "video-activmail", { NULL }, 1398,  "udp" },
-  { "cadkey-licman",   { NULL }, 1399,  "tcp" },
-  { "cadkey-licman",   { NULL }, 1399,  "udp" },
-  { "cadkey-tablet",   { NULL }, 1400,  "tcp" },
-  { "cadkey-tablet",   { NULL }, 1400,  "udp" },
-  { "goldleaf-licman", { NULL }, 1401,  "tcp" },
-  { "goldleaf-licman", { NULL }, 1401,  "udp" },
-  { "prm-sm-np",       { NULL }, 1402,  "tcp" },
-  { "prm-sm-np",       { NULL }, 1402,  "udp" },
-  { "prm-nm-np",       { NULL }, 1403,  "tcp" },
-  { "prm-nm-np",       { NULL }, 1403,  "udp" },
-  { "igi-lm",          { NULL }, 1404,  "tcp" },
-  { "igi-lm",          { NULL }, 1404,  "udp" },
-  { "ibm-res",         { NULL }, 1405,  "tcp" },
-  { "ibm-res",         { NULL }, 1405,  "udp" },
-  { "netlabs-lm",      { NULL }, 1406,  "tcp" },
-  { "netlabs-lm",      { NULL }, 1406,  "udp" },
-  { "dbsa-lm",         { NULL }, 1407,  "tcp" },
-  { "dbsa-lm",         { NULL }, 1407,  "udp" },
-  { "sophia-lm",       { NULL }, 1408,  "tcp" },
-  { "sophia-lm",       { NULL }, 1408,  "udp" },
-  { "here-lm",         { NULL }, 1409,  "tcp" },
-  { "here-lm",         { NULL }, 1409,  "udp" },
-  { "hiq",             { NULL }, 1410,  "tcp" },
-  { "hiq",             { NULL }, 1410,  "udp" },
-  { "af",              { NULL }, 1411,  "tcp" },
-  { "af",              { NULL }, 1411,  "udp" },
-  { "innosys",         { NULL }, 1412,  "tcp" },
-  { "innosys",         { NULL }, 1412,  "udp" },
-  { "innosys-acl",     { NULL }, 1413,  "tcp" },
-  { "innosys-acl",     { NULL }, 1413,  "udp" },
-  { "ibm-mqseries",    { NULL }, 1414,  "tcp" },
-  { "ibm-mqseries",    { NULL }, 1414,  "udp" },
-  { "dbstar",          { NULL }, 1415,  "tcp" },
-  { "dbstar",          { NULL }, 1415,  "udp" },
-  { "novell-lu6.2",    { NULL }, 1416,  "tcp" },
-  { "novell-lu6.2",    { NULL }, 1416,  "udp" },
-  { "timbuktu-srv1",   { NULL }, 1417,  "tcp" },
-  { "timbuktu-srv1",   { NULL }, 1417,  "udp" },
-  { "timbuktu-srv2",   { NULL }, 1418,  "tcp" },
-  { "timbuktu-srv2",   { NULL }, 1418,  "udp" },
-  { "timbuktu-srv3",   { NULL }, 1419,  "tcp" },
-  { "timbuktu-srv3",   { NULL }, 1419,  "udp" },
-  { "timbuktu-srv4",   { NULL }, 1420,  "tcp" },
-  { "timbuktu-srv4",   { NULL }, 1420,  "udp" },
-  { "gandalf-lm",      { NULL }, 1421,  "tcp" },
-  { "gandalf-lm",      { NULL }, 1421,  "udp" },
-  { "autodesk-lm",     { NULL }, 1422,  "tcp" },
-  { "autodesk-lm",     { NULL }, 1422,  "udp" },
-  { "essbase",         { NULL }, 1423,  "tcp" },
-  { "essbase",         { NULL }, 1423,  "udp" },
-  { "hybrid",          { NULL }, 1424,  "tcp" },
-  { "hybrid",          { NULL }, 1424,  "udp" },
-  { "zion-lm",         { NULL }, 1425,  "tcp" },
-  { "zion-lm",         { NULL }, 1425,  "udp" },
-  { "sais",            { NULL }, 1426,  "tcp" },
-  { "sais",            { NULL }, 1426,  "udp" },
-  { "mloadd",          { NULL }, 1427,  "tcp" },
-  { "mloadd",          { NULL }, 1427,  "udp" },
-  { "informatik-lm",   { NULL }, 1428,  "tcp" },
-  { "informatik-lm",   { NULL }, 1428,  "udp" },
-  { "nms",             { NULL }, 1429,  "tcp" },
-  { "nms",             { NULL }, 1429,  "udp" },
-  { "tpdu",            { NULL }, 1430,  "tcp" },
-  { "tpdu",            { NULL }, 1430,  "udp" },
-  { "rgtp",            { NULL }, 1431,  "tcp" },
-  { "rgtp",            { NULL }, 1431,  "udp" },
-  { "blueberry-lm",    { NULL }, 1432,  "tcp" },
-  { "blueberry-lm",    { NULL }, 1432,  "udp" },
-  { "ms-sql-s",        { NULL }, 1433,  "tcp" },
-  { "ms-sql-s",        { NULL }, 1433,  "udp" },
-  { "ms-sql-m",        { NULL }, 1434,  "tcp" },
-  { "ms-sql-m",        { NULL }, 1434,  "udp" },
-  { "ibm-cics",        { NULL }, 1435,  "tcp" },
-  { "ibm-cics",        { NULL }, 1435,  "udp" },
-  { "saism",           { NULL }, 1436,  "tcp" },
-  { "saism",           { NULL }, 1436,  "udp" },
-  { "tabula",          { NULL }, 1437,  "tcp" },
-  { "tabula",          { NULL }, 1437,  "udp" },
-  { "eicon-server",    { NULL }, 1438,  "tcp" },
-  { "eicon-server",    { NULL }, 1438,  "udp" },
-  { "eicon-x25",       { NULL }, 1439,  "tcp" },
-  { "eicon-x25",       { NULL }, 1439,  "udp" },
-  { "eicon-slp",       { NULL }, 1440,  "tcp" },
-  { "eicon-slp",       { NULL }, 1440,  "udp" },
-  { "cadis-1",         { NULL }, 1441,  "tcp" },
-  { "cadis-1",         { NULL }, 1441,  "udp" },
-  { "cadis-2",         { NULL }, 1442,  "tcp" },
-  { "cadis-2",         { NULL }, 1442,  "udp" },
-  { "ies-lm",          { NULL }, 1443,  "tcp" },
-  { "ies-lm",          { NULL }, 1443,  "udp" },
-  { "marcam-lm",       { NULL }, 1444,  "tcp" },
-  { "marcam-lm",       { NULL }, 1444,  "udp" },
-  { "proxima-lm",      { NULL }, 1445,  "tcp" },
-  { "proxima-lm",      { NULL }, 1445,  "udp" },
-  { "ora-lm",          { NULL }, 1446,  "tcp" },
-  { "ora-lm",          { NULL }, 1446,  "udp" },
-  { "apri-lm",         { NULL }, 1447,  "tcp" },
-  { "apri-lm",         { NULL }, 1447,  "udp" },
-  { "oc-lm",           { NULL }, 1448,  "tcp" },
-  { "oc-lm",           { NULL }, 1448,  "udp" },
-  { "peport",          { NULL }, 1449,  "tcp" },
-  { "peport",          { NULL }, 1449,  "udp" },
-  { "dwf",             { NULL }, 1450,  "tcp" },
-  { "dwf",             { NULL }, 1450,  "udp" },
-  { "infoman",         { NULL }, 1451,  "tcp" },
-  { "infoman",         { NULL }, 1451,  "udp" },
-  { "gtegsc-lm",       { NULL }, 1452,  "tcp" },
-  { "gtegsc-lm",       { NULL }, 1452,  "udp" },
-  { "genie-lm",        { NULL }, 1453,  "tcp" },
-  { "genie-lm",        { NULL }, 1453,  "udp" },
-  { "interhdl_elmd",   { NULL }, 1454,  "tcp" },
-  { "interhdl_elmd",   { NULL }, 1454,  "udp" },
-  { "esl-lm",          { NULL }, 1455,  "tcp" },
-  { "esl-lm",          { NULL }, 1455,  "udp" },
-  { "dca",             { NULL }, 1456,  "tcp" },
-  { "dca",             { NULL }, 1456,  "udp" },
-  { "valisys-lm",      { NULL }, 1457,  "tcp" },
-  { "valisys-lm",      { NULL }, 1457,  "udp" },
-  { "nrcabq-lm",       { NULL }, 1458,  "tcp" },
-  { "nrcabq-lm",       { NULL }, 1458,  "udp" },
-  { "proshare1",       { NULL }, 1459,  "tcp" },
-  { "proshare1",       { NULL }, 1459,  "udp" },
-  { "proshare2",       { NULL }, 1460,  "tcp" },
-  { "proshare2",       { NULL }, 1460,  "udp" },
-  { "ibm_wrless_lan",  { NULL }, 1461,  "tcp" },
-  { "ibm_wrless_lan",  { NULL }, 1461,  "udp" },
-  { "world-lm",        { NULL }, 1462,  "tcp" },
-  { "world-lm",        { NULL }, 1462,  "udp" },
-  { "nucleus",         { NULL }, 1463,  "tcp" },
-  { "nucleus",         { NULL }, 1463,  "udp" },
-  { "msl_lmd",         { NULL }, 1464,  "tcp" },
-  { "msl_lmd",         { NULL }, 1464,  "udp" },
-  { "pipes",           { NULL }, 1465,  "tcp" },
-  { "pipes",           { NULL }, 1465,  "udp" },
-  { "oceansoft-lm",    { NULL }, 1466,  "tcp" },
-  { "oceansoft-lm",    { NULL }, 1466,  "udp" },
-  { "csdmbase",        { NULL }, 1467,  "tcp" },
-  { "csdmbase",        { NULL }, 1467,  "udp" },
-  { "csdm",            { NULL }, 1468,  "tcp" },
-  { "csdm",            { NULL }, 1468,  "udp" },
-  { "aal-lm",          { NULL }, 1469,  "tcp" },
-  { "aal-lm",          { NULL }, 1469,  "udp" },
-  { "uaiact",          { NULL }, 1470,  "tcp" },
-  { "uaiact",          { NULL }, 1470,  "udp" },
-  { "csdmbase",        { NULL }, 1471,  "tcp" },
-  { "csdmbase",        { NULL }, 1471,  "udp" },
-  { "csdm",            { NULL }, 1472,  "tcp" },
-  { "csdm",            { NULL }, 1472,  "udp" },
-  { "openmath",        { NULL }, 1473,  "tcp" },
-  { "openmath",        { NULL }, 1473,  "udp" },
-  { "telefinder",      { NULL }, 1474,  "tcp" },
-  { "telefinder",      { NULL }, 1474,  "udp" },
-  { "taligent-lm",     { NULL }, 1475,  "tcp" },
-  { "taligent-lm",     { NULL }, 1475,  "udp" },
-  { "clvm-cfg",        { NULL }, 1476,  "tcp" },
-  { "clvm-cfg",        { NULL }, 1476,  "udp" },
-  { "ms-sna-server",   { NULL }, 1477,  "tcp" },
-  { "ms-sna-server",   { NULL }, 1477,  "udp" },
-  { "ms-sna-base",     { NULL }, 1478,  "tcp" },
-  { "ms-sna-base",     { NULL }, 1478,  "udp" },
-  { "dberegister",     { NULL }, 1479,  "tcp" },
-  { "dberegister",     { NULL }, 1479,  "udp" },
-  { "pacerforum",      { NULL }, 1480,  "tcp" },
-  { "pacerforum",      { NULL }, 1480,  "udp" },
-  { "airs",            { NULL }, 1481,  "tcp" },
-  { "airs",            { NULL }, 1481,  "udp" },
-  { "miteksys-lm",     { NULL }, 1482,  "tcp" },
-  { "miteksys-lm",     { NULL }, 1482,  "udp" },
-  { "afs",             { NULL }, 1483,  "tcp" },
-  { "afs",             { NULL }, 1483,  "udp" },
-  { "confluent",       { NULL }, 1484,  "tcp" },
-  { "confluent",       { NULL }, 1484,  "udp" },
-  { "lansource",       { NULL }, 1485,  "tcp" },
-  { "lansource",       { NULL }, 1485,  "udp" },
-  { "nms_topo_serv",   { NULL }, 1486,  "tcp" },
-  { "nms_topo_serv",   { NULL }, 1486,  "udp" },
-  { "localinfosrvr",   { NULL }, 1487,  "tcp" },
-  { "localinfosrvr",   { NULL }, 1487,  "udp" },
-  { "docstor",         { NULL }, 1488,  "tcp" },
-  { "docstor",         { NULL }, 1488,  "udp" },
-  { "dmdocbroker",     { NULL }, 1489,  "tcp" },
-  { "dmdocbroker",     { NULL }, 1489,  "udp" },
-  { "insitu-conf",     { NULL }, 1490,  "tcp" },
-  { "insitu-conf",     { NULL }, 1490,  "udp" },
-  { "stone-design-1",  { NULL }, 1492,  "tcp" },
-  { "stone-design-1",  { NULL }, 1492,  "udp" },
-  { "netmap_lm",       { NULL }, 1493,  "tcp" },
-  { "netmap_lm",       { NULL }, 1493,  "udp" },
-  { "ica",             { NULL }, 1494,  "tcp" },
-  { "ica",             { NULL }, 1494,  "udp" },
-  { "cvc",             { NULL }, 1495,  "tcp" },
-  { "cvc",             { NULL }, 1495,  "udp" },
-  { "liberty-lm",      { NULL }, 1496,  "tcp" },
-  { "liberty-lm",      { NULL }, 1496,  "udp" },
-  { "rfx-lm",          { NULL }, 1497,  "tcp" },
-  { "rfx-lm",          { NULL }, 1497,  "udp" },
-  { "sybase-sqlany",   { NULL }, 1498,  "tcp" },
-  { "sybase-sqlany",   { NULL }, 1498,  "udp" },
-  { "fhc",             { NULL }, 1499,  "tcp" },
-  { "fhc",             { NULL }, 1499,  "udp" },
-  { "vlsi-lm",         { NULL }, 1500,  "tcp" },
-  { "vlsi-lm",         { NULL }, 1500,  "udp" },
-  { "saiscm",          { NULL }, 1501,  "tcp" },
-  { "saiscm",          { NULL }, 1501,  "udp" },
-  { "shivadiscovery",  { NULL }, 1502,  "tcp" },
-  { "shivadiscovery",  { NULL }, 1502,  "udp" },
-  { "imtc-mcs",        { NULL }, 1503,  "tcp" },
-  { "imtc-mcs",        { NULL }, 1503,  "udp" },
-  { "evb-elm",         { NULL }, 1504,  "tcp" },
-  { "evb-elm",         { NULL }, 1504,  "udp" },
-  { "funkproxy",       { NULL }, 1505,  "tcp" },
-  { "funkproxy",       { NULL }, 1505,  "udp" },
-  { "utcd",            { NULL }, 1506,  "tcp" },
-  { "utcd",            { NULL }, 1506,  "udp" },
-  { "symplex",         { NULL }, 1507,  "tcp" },
-  { "symplex",         { NULL }, 1507,  "udp" },
-  { "diagmond",        { NULL }, 1508,  "tcp" },
-  { "diagmond",        { NULL }, 1508,  "udp" },
-  { "robcad-lm",       { NULL }, 1509,  "tcp" },
-  { "robcad-lm",       { NULL }, 1509,  "udp" },
-  { "mvx-lm",          { NULL }, 1510,  "tcp" },
-  { "mvx-lm",          { NULL }, 1510,  "udp" },
-  { "3l-l1",           { NULL }, 1511,  "tcp" },
-  { "3l-l1",           { NULL }, 1511,  "udp" },
-  { "wins",            { NULL }, 1512,  "tcp" },
-  { "wins",            { NULL }, 1512,  "udp" },
-  { "fujitsu-dtc",     { NULL }, 1513,  "tcp" },
-  { "fujitsu-dtc",     { NULL }, 1513,  "udp" },
-  { "fujitsu-dtcns",   { NULL }, 1514,  "tcp" },
-  { "fujitsu-dtcns",   { NULL }, 1514,  "udp" },
-  { "ifor-protocol",   { NULL }, 1515,  "tcp" },
-  { "ifor-protocol",   { NULL }, 1515,  "udp" },
-  { "vpad",            { NULL }, 1516,  "tcp" },
-  { "vpad",            { NULL }, 1516,  "udp" },
-  { "vpac",            { NULL }, 1517,  "tcp" },
-  { "vpac",            { NULL }, 1517,  "udp" },
-  { "vpvd",            { NULL }, 1518,  "tcp" },
-  { "vpvd",            { NULL }, 1518,  "udp" },
-  { "vpvc",            { NULL }, 1519,  "tcp" },
-  { "vpvc",            { NULL }, 1519,  "udp" },
-  { "atm-zip-office",  { NULL }, 1520,  "tcp" },
-  { "atm-zip-office",  { NULL }, 1520,  "udp" },
-  { "ncube-lm",        { NULL }, 1521,  "tcp" },
-  { "ncube-lm",        { NULL }, 1521,  "udp" },
-  { "ricardo-lm",      { NULL }, 1522,  "tcp" },
-  { "ricardo-lm",      { NULL }, 1522,  "udp" },
-  { "cichild-lm",      { NULL }, 1523,  "tcp" },
-  { "cichild-lm",      { NULL }, 1523,  "udp" },
-  { "ingreslock",      { NULL }, 1524,  "tcp" },
-  { "ingreslock",      { NULL }, 1524,  "udp" },
-  { "orasrv",          { NULL }, 1525,  "tcp" },
-  { "orasrv",          { NULL }, 1525,  "udp" },
-  { "prospero-np",     { NULL }, 1525,  "tcp" },
-  { "prospero-np",     { NULL }, 1525,  "udp" },
-  { "pdap-np",         { NULL }, 1526,  "tcp" },
-  { "pdap-np",         { NULL }, 1526,  "udp" },
-  { "tlisrv",          { NULL }, 1527,  "tcp" },
-  { "tlisrv",          { NULL }, 1527,  "udp" },
-  { "coauthor",        { NULL }, 1529,  "tcp" },
-  { "coauthor",        { NULL }, 1529,  "udp" },
-  { "rap-service",     { NULL }, 1530,  "tcp" },
-  { "rap-service",     { NULL }, 1530,  "udp" },
-  { "rap-listen",      { NULL }, 1531,  "tcp" },
-  { "rap-listen",      { NULL }, 1531,  "udp" },
-  { "miroconnect",     { NULL }, 1532,  "tcp" },
-  { "miroconnect",     { NULL }, 1532,  "udp" },
-  { "virtual-places",  { NULL }, 1533,  "tcp" },
-  { "virtual-places",  { NULL }, 1533,  "udp" },
-  { "micromuse-lm",    { NULL }, 1534,  "tcp" },
-  { "micromuse-lm",    { NULL }, 1534,  "udp" },
-  { "ampr-info",       { NULL }, 1535,  "tcp" },
-  { "ampr-info",       { NULL }, 1535,  "udp" },
-  { "ampr-inter",      { NULL }, 1536,  "tcp" },
-  { "ampr-inter",      { NULL }, 1536,  "udp" },
-  { "sdsc-lm",         { NULL }, 1537,  "tcp" },
-  { "sdsc-lm",         { NULL }, 1537,  "udp" },
-  { "3ds-lm",          { NULL }, 1538,  "tcp" },
-  { "3ds-lm",          { NULL }, 1538,  "udp" },
-  { "intellistor-lm",  { NULL }, 1539,  "tcp" },
-  { "intellistor-lm",  { NULL }, 1539,  "udp" },
-  { "rds",             { NULL }, 1540,  "tcp" },
-  { "rds",             { NULL }, 1540,  "udp" },
-  { "rds2",            { NULL }, 1541,  "tcp" },
-  { "rds2",            { NULL }, 1541,  "udp" },
-  { "gridgen-elmd",    { NULL }, 1542,  "tcp" },
-  { "gridgen-elmd",    { NULL }, 1542,  "udp" },
-  { "simba-cs",        { NULL }, 1543,  "tcp" },
-  { "simba-cs",        { NULL }, 1543,  "udp" },
-  { "aspeclmd",        { NULL }, 1544,  "tcp" },
-  { "aspeclmd",        { NULL }, 1544,  "udp" },
-  { "vistium-share",   { NULL }, 1545,  "tcp" },
-  { "vistium-share",   { NULL }, 1545,  "udp" },
-  { "abbaccuray",      { NULL }, 1546,  "tcp" },
-  { "abbaccuray",      { NULL }, 1546,  "udp" },
-  { "laplink",         { NULL }, 1547,  "tcp" },
-  { "laplink",         { NULL }, 1547,  "udp" },
-  { "axon-lm",         { NULL }, 1548,  "tcp" },
-  { "axon-lm",         { NULL }, 1548,  "udp" },
-  { "shivahose",       { NULL }, 1549,  "tcp" },
-  { "shivasound",      { NULL }, 1549,  "udp" },
-  { "3m-image-lm",     { NULL }, 1550,  "tcp" },
-  { "3m-image-lm",     { NULL }, 1550,  "udp" },
-  { "hecmtl-db",       { NULL }, 1551,  "tcp" },
-  { "hecmtl-db",       { NULL }, 1551,  "udp" },
-  { "pciarray",        { NULL }, 1552,  "tcp" },
-  { "pciarray",        { NULL }, 1552,  "udp" },
-  { "sna-cs",          { NULL }, 1553,  "tcp" },
-  { "sna-cs",          { NULL }, 1553,  "udp" },
-  { "caci-lm",         { NULL }, 1554,  "tcp" },
-  { "caci-lm",         { NULL }, 1554,  "udp" },
-  { "livelan",         { NULL }, 1555,  "tcp" },
-  { "livelan",         { NULL }, 1555,  "udp" },
-  { "veritas_pbx",     { NULL }, 1556,  "tcp" },
-  { "veritas_pbx",     { NULL }, 1556,  "udp" },
-  { "arbortext-lm",    { NULL }, 1557,  "tcp" },
-  { "arbortext-lm",    { NULL }, 1557,  "udp" },
-  { "xingmpeg",        { NULL }, 1558,  "tcp" },
-  { "xingmpeg",        { NULL }, 1558,  "udp" },
-  { "web2host",        { NULL }, 1559,  "tcp" },
-  { "web2host",        { NULL }, 1559,  "udp" },
-  { "asci-val",        { NULL }, 1560,  "tcp" },
-  { "asci-val",        { NULL }, 1560,  "udp" },
-  { "facilityview",    { NULL }, 1561,  "tcp" },
-  { "facilityview",    { NULL }, 1561,  "udp" },
-  { "pconnectmgr",     { NULL }, 1562,  "tcp" },
-  { "pconnectmgr",     { NULL }, 1562,  "udp" },
-  { "cadabra-lm",      { NULL }, 1563,  "tcp" },
-  { "cadabra-lm",      { NULL }, 1563,  "udp" },
-  { "pay-per-view",    { NULL }, 1564,  "tcp" },
-  { "pay-per-view",    { NULL }, 1564,  "udp" },
-  { "winddlb",         { NULL }, 1565,  "tcp" },
-  { "winddlb",         { NULL }, 1565,  "udp" },
-  { "corelvideo",      { NULL }, 1566,  "tcp" },
-  { "corelvideo",      { NULL }, 1566,  "udp" },
-  { "jlicelmd",        { NULL }, 1567,  "tcp" },
-  { "jlicelmd",        { NULL }, 1567,  "udp" },
-  { "tsspmap",         { NULL }, 1568,  "tcp" },
-  { "tsspmap",         { NULL }, 1568,  "udp" },
-  { "ets",             { NULL }, 1569,  "tcp" },
-  { "ets",             { NULL }, 1569,  "udp" },
-  { "orbixd",          { NULL }, 1570,  "tcp" },
-  { "orbixd",          { NULL }, 1570,  "udp" },
-  { "rdb-dbs-disp",    { NULL }, 1571,  "tcp" },
-  { "rdb-dbs-disp",    { NULL }, 1571,  "udp" },
-  { "chip-lm",         { NULL }, 1572,  "tcp" },
-  { "chip-lm",         { NULL }, 1572,  "udp" },
-  { "itscomm-ns",      { NULL }, 1573,  "tcp" },
-  { "itscomm-ns",      { NULL }, 1573,  "udp" },
-  { "mvel-lm",         { NULL }, 1574,  "tcp" },
-  { "mvel-lm",         { NULL }, 1574,  "udp" },
-  { "oraclenames",     { NULL }, 1575,  "tcp" },
-  { "oraclenames",     { NULL }, 1575,  "udp" },
-  { "moldflow-lm",     { NULL }, 1576,  "tcp" },
-  { "moldflow-lm",     { NULL }, 1576,  "udp" },
-  { "hypercube-lm",    { NULL }, 1577,  "tcp" },
-  { "hypercube-lm",    { NULL }, 1577,  "udp" },
-  { "jacobus-lm",      { NULL }, 1578,  "tcp" },
-  { "jacobus-lm",      { NULL }, 1578,  "udp" },
-  { "ioc-sea-lm",      { NULL }, 1579,  "tcp" },
-  { "ioc-sea-lm",      { NULL }, 1579,  "udp" },
-  { "tn-tl-r1",        { NULL }, 1580,  "tcp" },
-  { "tn-tl-r2",        { NULL }, 1580,  "udp" },
-  { "mil-2045-47001",  { NULL }, 1581,  "tcp" },
-  { "mil-2045-47001",  { NULL }, 1581,  "udp" },
-  { "msims",           { NULL }, 1582,  "tcp" },
-  { "msims",           { NULL }, 1582,  "udp" },
-  { "simbaexpress",    { NULL }, 1583,  "tcp" },
-  { "simbaexpress",    { NULL }, 1583,  "udp" },
-  { "tn-tl-fd2",       { NULL }, 1584,  "tcp" },
-  { "tn-tl-fd2",       { NULL }, 1584,  "udp" },
-  { "intv",            { NULL }, 1585,  "tcp" },
-  { "intv",            { NULL }, 1585,  "udp" },
-  { "ibm-abtact",      { NULL }, 1586,  "tcp" },
-  { "ibm-abtact",      { NULL }, 1586,  "udp" },
-  { "pra_elmd",        { NULL }, 1587,  "tcp" },
-  { "pra_elmd",        { NULL }, 1587,  "udp" },
-  { "triquest-lm",     { NULL }, 1588,  "tcp" },
-  { "triquest-lm",     { NULL }, 1588,  "udp" },
-  { "vqp",             { NULL }, 1589,  "tcp" },
-  { "vqp",             { NULL }, 1589,  "udp" },
-  { "gemini-lm",       { NULL }, 1590,  "tcp" },
-  { "gemini-lm",       { NULL }, 1590,  "udp" },
-  { "ncpm-pm",         { NULL }, 1591,  "tcp" },
-  { "ncpm-pm",         { NULL }, 1591,  "udp" },
-  { "commonspace",     { NULL }, 1592,  "tcp" },
-  { "commonspace",     { NULL }, 1592,  "udp" },
-  { "mainsoft-lm",     { NULL }, 1593,  "tcp" },
-  { "mainsoft-lm",     { NULL }, 1593,  "udp" },
-  { "sixtrak",         { NULL }, 1594,  "tcp" },
-  { "sixtrak",         { NULL }, 1594,  "udp" },
-  { "radio",           { NULL }, 1595,  "tcp" },
-  { "radio",           { NULL }, 1595,  "udp" },
-  { "radio-sm",        { NULL }, 1596,  "tcp" },
-  { "radio-bc",        { NULL }, 1596,  "udp" },
-  { "orbplus-iiop",    { NULL }, 1597,  "tcp" },
-  { "orbplus-iiop",    { NULL }, 1597,  "udp" },
-  { "picknfs",         { NULL }, 1598,  "tcp" },
-  { "picknfs",         { NULL }, 1598,  "udp" },
-  { "simbaservices",   { NULL }, 1599,  "tcp" },
-  { "simbaservices",   { NULL }, 1599,  "udp" },
-  { "issd",            { NULL }, 1600,  "tcp" },
-  { "issd",            { NULL }, 1600,  "udp" },
-  { "aas",             { NULL }, 1601,  "tcp" },
-  { "aas",             { NULL }, 1601,  "udp" },
-  { "inspect",         { NULL }, 1602,  "tcp" },
-  { "inspect",         { NULL }, 1602,  "udp" },
-  { "picodbc",         { NULL }, 1603,  "tcp" },
-  { "picodbc",         { NULL }, 1603,  "udp" },
-  { "icabrowser",      { NULL }, 1604,  "tcp" },
-  { "icabrowser",      { NULL }, 1604,  "udp" },
-  { "slp",             { NULL }, 1605,  "tcp" },
-  { "slp",             { NULL }, 1605,  "udp" },
-  { "slm-api",         { NULL }, 1606,  "tcp" },
-  { "slm-api",         { NULL }, 1606,  "udp" },
-  { "stt",             { NULL }, 1607,  "tcp" },
-  { "stt",             { NULL }, 1607,  "udp" },
-  { "smart-lm",        { NULL }, 1608,  "tcp" },
-  { "smart-lm",        { NULL }, 1608,  "udp" },
-  { "isysg-lm",        { NULL }, 1609,  "tcp" },
-  { "isysg-lm",        { NULL }, 1609,  "udp" },
-  { "taurus-wh",       { NULL }, 1610,  "tcp" },
-  { "taurus-wh",       { NULL }, 1610,  "udp" },
-  { "ill",             { NULL }, 1611,  "tcp" },
-  { "ill",             { NULL }, 1611,  "udp" },
-  { "netbill-trans",   { NULL }, 1612,  "tcp" },
-  { "netbill-trans",   { NULL }, 1612,  "udp" },
-  { "netbill-keyrep",  { NULL }, 1613,  "tcp" },
-  { "netbill-keyrep",  { NULL }, 1613,  "udp" },
-  { "netbill-cred",    { NULL }, 1614,  "tcp" },
-  { "netbill-cred",    { NULL }, 1614,  "udp" },
-  { "netbill-auth",    { NULL }, 1615,  "tcp" },
-  { "netbill-auth",    { NULL }, 1615,  "udp" },
-  { "netbill-prod",    { NULL }, 1616,  "tcp" },
-  { "netbill-prod",    { NULL }, 1616,  "udp" },
-  { "nimrod-agent",    { NULL }, 1617,  "tcp" },
-  { "nimrod-agent",    { NULL }, 1617,  "udp" },
-  { "skytelnet",       { NULL }, 1618,  "tcp" },
-  { "skytelnet",       { NULL }, 1618,  "udp" },
-  { "xs-openstorage",  { NULL }, 1619,  "tcp" },
-  { "xs-openstorage",  { NULL }, 1619,  "udp" },
-  { "faxportwinport",  { NULL }, 1620,  "tcp" },
-  { "faxportwinport",  { NULL }, 1620,  "udp" },
-  { "softdataphone",   { NULL }, 1621,  "tcp" },
-  { "softdataphone",   { NULL }, 1621,  "udp" },
-  { "ontime",          { NULL }, 1622,  "tcp" },
-  { "ontime",          { NULL }, 1622,  "udp" },
-  { "jaleosnd",        { NULL }, 1623,  "tcp" },
-  { "jaleosnd",        { NULL }, 1623,  "udp" },
-  { "udp-sr-port",     { NULL }, 1624,  "tcp" },
-  { "udp-sr-port",     { NULL }, 1624,  "udp" },
-  { "svs-omagent",     { NULL }, 1625,  "tcp" },
-  { "svs-omagent",     { NULL }, 1625,  "udp" },
-  { "shockwave",       { NULL }, 1626,  "tcp" },
-  { "shockwave",       { NULL }, 1626,  "udp" },
-  { "t128-gateway",    { NULL }, 1627,  "tcp" },
-  { "t128-gateway",    { NULL }, 1627,  "udp" },
-  { "lontalk-norm",    { NULL }, 1628,  "tcp" },
-  { "lontalk-norm",    { NULL }, 1628,  "udp" },
-  { "lontalk-urgnt",   { NULL }, 1629,  "tcp" },
-  { "lontalk-urgnt",   { NULL }, 1629,  "udp" },
-  { "oraclenet8cman",  { NULL }, 1630,  "tcp" },
-  { "oraclenet8cman",  { NULL }, 1630,  "udp" },
-  { "visitview",       { NULL }, 1631,  "tcp" },
-  { "visitview",       { NULL }, 1631,  "udp" },
-  { "pammratc",        { NULL }, 1632,  "tcp" },
-  { "pammratc",        { NULL }, 1632,  "udp" },
-  { "pammrpc",         { NULL }, 1633,  "tcp" },
-  { "pammrpc",         { NULL }, 1633,  "udp" },
-  { "loaprobe",        { NULL }, 1634,  "tcp" },
-  { "loaprobe",        { NULL }, 1634,  "udp" },
-  { "edb-server1",     { NULL }, 1635,  "tcp" },
-  { "edb-server1",     { NULL }, 1635,  "udp" },
-  { "isdc",            { NULL }, 1636,  "tcp" },
-  { "isdc",            { NULL }, 1636,  "udp" },
-  { "islc",            { NULL }, 1637,  "tcp" },
-  { "islc",            { NULL }, 1637,  "udp" },
-  { "ismc",            { NULL }, 1638,  "tcp" },
-  { "ismc",            { NULL }, 1638,  "udp" },
-  { "cert-initiator",  { NULL }, 1639,  "tcp" },
-  { "cert-initiator",  { NULL }, 1639,  "udp" },
-  { "cert-responder",  { NULL }, 1640,  "tcp" },
-  { "cert-responder",  { NULL }, 1640,  "udp" },
-  { "invision",        { NULL }, 1641,  "tcp" },
-  { "invision",        { NULL }, 1641,  "udp" },
-  { "isis-am",         { NULL }, 1642,  "tcp" },
-  { "isis-am",         { NULL }, 1642,  "udp" },
-  { "isis-ambc",       { NULL }, 1643,  "tcp" },
-  { "isis-ambc",       { NULL }, 1643,  "udp" },
-  { "saiseh",          { NULL }, 1644,  "tcp" },
-  { "sightline",       { NULL }, 1645,  "tcp" },
-  { "sightline",       { NULL }, 1645,  "udp" },
-  { "sa-msg-port",     { NULL }, 1646,  "tcp" },
-  { "sa-msg-port",     { NULL }, 1646,  "udp" },
-  { "rsap",            { NULL }, 1647,  "tcp" },
-  { "rsap",            { NULL }, 1647,  "udp" },
-  { "concurrent-lm",   { NULL }, 1648,  "tcp" },
-  { "concurrent-lm",   { NULL }, 1648,  "udp" },
-  { "kermit",          { NULL }, 1649,  "tcp" },
-  { "kermit",          { NULL }, 1649,  "udp" },
-  { "nkd",             { NULL }, 1650,  "tcp" },
-  { "nkd",             { NULL }, 1650,  "udp" },
-  { "shiva_confsrvr",  { NULL }, 1651,  "tcp" },
-  { "shiva_confsrvr",  { NULL }, 1651,  "udp" },
-  { "xnmp",            { NULL }, 1652,  "tcp" },
-  { "xnmp",            { NULL }, 1652,  "udp" },
-  { "alphatech-lm",    { NULL }, 1653,  "tcp" },
-  { "alphatech-lm",    { NULL }, 1653,  "udp" },
-  { "stargatealerts",  { NULL }, 1654,  "tcp" },
-  { "stargatealerts",  { NULL }, 1654,  "udp" },
-  { "dec-mbadmin",     { NULL }, 1655,  "tcp" },
-  { "dec-mbadmin",     { NULL }, 1655,  "udp" },
-  { "dec-mbadmin-h",   { NULL }, 1656,  "tcp" },
-  { "dec-mbadmin-h",   { NULL }, 1656,  "udp" },
-  { "fujitsu-mmpdc",   { NULL }, 1657,  "tcp" },
-  { "fujitsu-mmpdc",   { NULL }, 1657,  "udp" },
-  { "sixnetudr",       { NULL }, 1658,  "tcp" },
-  { "sixnetudr",       { NULL }, 1658,  "udp" },
-  { "sg-lm",           { NULL }, 1659,  "tcp" },
-  { "sg-lm",           { NULL }, 1659,  "udp" },
-  { "skip-mc-gikreq",  { NULL }, 1660,  "tcp" },
-  { "skip-mc-gikreq",  { NULL }, 1660,  "udp" },
-  { "netview-aix-1",   { NULL }, 1661,  "tcp" },
-  { "netview-aix-1",   { NULL }, 1661,  "udp" },
-  { "netview-aix-2",   { NULL }, 1662,  "tcp" },
-  { "netview-aix-2",   { NULL }, 1662,  "udp" },
-  { "netview-aix-3",   { NULL }, 1663,  "tcp" },
-  { "netview-aix-3",   { NULL }, 1663,  "udp" },
-  { "netview-aix-4",   { NULL }, 1664,  "tcp" },
-  { "netview-aix-4",   { NULL }, 1664,  "udp" },
-  { "netview-aix-5",   { NULL }, 1665,  "tcp" },
-  { "netview-aix-5",   { NULL }, 1665,  "udp" },
-  { "netview-aix-6",   { NULL }, 1666,  "tcp" },
-  { "netview-aix-6",   { NULL }, 1666,  "udp" },
-  { "netview-aix-7",   { NULL }, 1667,  "tcp" },
-  { "netview-aix-7",   { NULL }, 1667,  "udp" },
-  { "netview-aix-8",   { NULL }, 1668,  "tcp" },
-  { "netview-aix-8",   { NULL }, 1668,  "udp" },
-  { "netview-aix-9",   { NULL }, 1669,  "tcp" },
-  { "netview-aix-9",   { NULL }, 1669,  "udp" },
-  { "netview-aix-10",  { NULL }, 1670,  "tcp" },
-  { "netview-aix-10",  { NULL }, 1670,  "udp" },
-  { "netview-aix-11",  { NULL }, 1671,  "tcp" },
-  { "netview-aix-11",  { NULL }, 1671,  "udp" },
-  { "netview-aix-12",  { NULL }, 1672,  "tcp" },
-  { "netview-aix-12",  { NULL }, 1672,  "udp" },
-  { "proshare-mc-1",   { NULL }, 1673,  "tcp" },
-  { "proshare-mc-1",   { NULL }, 1673,  "udp" },
-  { "proshare-mc-2",   { NULL }, 1674,  "tcp" },
-  { "proshare-mc-2",   { NULL }, 1674,  "udp" },
-  { "pdp",             { NULL }, 1675,  "tcp" },
-  { "pdp",             { NULL }, 1675,  "udp" },
-  { "netcomm1",        { NULL }, 1676,  "tcp" },
-  { "netcomm2",        { NULL }, 1676,  "udp" },
-  { "groupwise",       { NULL }, 1677,  "tcp" },
-  { "groupwise",       { NULL }, 1677,  "udp" },
-  { "prolink",         { NULL }, 1678,  "tcp" },
-  { "prolink",         { NULL }, 1678,  "udp" },
-  { "darcorp-lm",      { NULL }, 1679,  "tcp" },
-  { "darcorp-lm",      { NULL }, 1679,  "udp" },
-  { "microcom-sbp",    { NULL }, 1680,  "tcp" },
-  { "microcom-sbp",    { NULL }, 1680,  "udp" },
-  { "sd-elmd",         { NULL }, 1681,  "tcp" },
-  { "sd-elmd",         { NULL }, 1681,  "udp" },
-  { "lanyon-lantern",  { NULL }, 1682,  "tcp" },
-  { "lanyon-lantern",  { NULL }, 1682,  "udp" },
-  { "ncpm-hip",        { NULL }, 1683,  "tcp" },
-  { "ncpm-hip",        { NULL }, 1683,  "udp" },
-  { "snaresecure",     { NULL }, 1684,  "tcp" },
-  { "snaresecure",     { NULL }, 1684,  "udp" },
-  { "n2nremote",       { NULL }, 1685,  "tcp" },
-  { "n2nremote",       { NULL }, 1685,  "udp" },
-  { "cvmon",           { NULL }, 1686,  "tcp" },
-  { "cvmon",           { NULL }, 1686,  "udp" },
-  { "nsjtp-ctrl",      { NULL }, 1687,  "tcp" },
-  { "nsjtp-ctrl",      { NULL }, 1687,  "udp" },
-  { "nsjtp-data",      { NULL }, 1688,  "tcp" },
-  { "nsjtp-data",      { NULL }, 1688,  "udp" },
-  { "firefox",         { NULL }, 1689,  "tcp" },
-  { "firefox",         { NULL }, 1689,  "udp" },
-  { "ng-umds",         { NULL }, 1690,  "tcp" },
-  { "ng-umds",         { NULL }, 1690,  "udp" },
-  { "empire-empuma",   { NULL }, 1691,  "tcp" },
-  { "empire-empuma",   { NULL }, 1691,  "udp" },
-  { "sstsys-lm",       { NULL }, 1692,  "tcp" },
-  { "sstsys-lm",       { NULL }, 1692,  "udp" },
-  { "rrirtr",          { NULL }, 1693,  "tcp" },
-  { "rrirtr",          { NULL }, 1693,  "udp" },
-  { "rrimwm",          { NULL }, 1694,  "tcp" },
-  { "rrimwm",          { NULL }, 1694,  "udp" },
-  { "rrilwm",          { NULL }, 1695,  "tcp" },
-  { "rrilwm",          { NULL }, 1695,  "udp" },
-  { "rrifmm",          { NULL }, 1696,  "tcp" },
-  { "rrifmm",          { NULL }, 1696,  "udp" },
-  { "rrisat",          { NULL }, 1697,  "tcp" },
-  { "rrisat",          { NULL }, 1697,  "udp" },
-  { "rsvp-encap-1",    { NULL }, 1698,  "tcp" },
-  { "rsvp-encap-1",    { NULL }, 1698,  "udp" },
-  { "rsvp-encap-2",    { NULL }, 1699,  "tcp" },
-  { "rsvp-encap-2",    { NULL }, 1699,  "udp" },
-  { "mps-raft",        { NULL }, 1700,  "tcp" },
-  { "mps-raft",        { NULL }, 1700,  "udp" },
-  { "l2f",             { NULL }, 1701,  "tcp" },
-  { "l2f",             { NULL }, 1701,  "udp" },
-  { "l2tp",            { NULL }, 1701,  "tcp" },
-  { "l2tp",            { NULL }, 1701,  "udp" },
-  { "deskshare",       { NULL }, 1702,  "tcp" },
-  { "deskshare",       { NULL }, 1702,  "udp" },
-  { "hb-engine",       { NULL }, 1703,  "tcp" },
-  { "hb-engine",       { NULL }, 1703,  "udp" },
-  { "bcs-broker",      { NULL }, 1704,  "tcp" },
-  { "bcs-broker",      { NULL }, 1704,  "udp" },
-  { "slingshot",       { NULL }, 1705,  "tcp" },
-  { "slingshot",       { NULL }, 1705,  "udp" },
-  { "jetform",         { NULL }, 1706,  "tcp" },
-  { "jetform",         { NULL }, 1706,  "udp" },
-  { "vdmplay",         { NULL }, 1707,  "tcp" },
-  { "vdmplay",         { NULL }, 1707,  "udp" },
-  { "gat-lmd",         { NULL }, 1708,  "tcp" },
-  { "gat-lmd",         { NULL }, 1708,  "udp" },
-  { "centra",          { NULL }, 1709,  "tcp" },
-  { "centra",          { NULL }, 1709,  "udp" },
-  { "impera",          { NULL }, 1710,  "tcp" },
-  { "impera",          { NULL }, 1710,  "udp" },
-  { "pptconference",   { NULL }, 1711,  "tcp" },
-  { "pptconference",   { NULL }, 1711,  "udp" },
-  { "registrar",       { NULL }, 1712,  "tcp" },
-  { "registrar",       { NULL }, 1712,  "udp" },
-  { "conferencetalk",  { NULL }, 1713,  "tcp" },
-  { "conferencetalk",  { NULL }, 1713,  "udp" },
-  { "sesi-lm",         { NULL }, 1714,  "tcp" },
-  { "sesi-lm",         { NULL }, 1714,  "udp" },
-  { "houdini-lm",      { NULL }, 1715,  "tcp" },
-  { "houdini-lm",      { NULL }, 1715,  "udp" },
-  { "xmsg",            { NULL }, 1716,  "tcp" },
-  { "xmsg",            { NULL }, 1716,  "udp" },
-  { "fj-hdnet",        { NULL }, 1717,  "tcp" },
-  { "fj-hdnet",        { NULL }, 1717,  "udp" },
-  { "h323gatedisc",    { NULL }, 1718,  "tcp" },
-  { "h323gatedisc",    { NULL }, 1718,  "udp" },
-  { "h323gatestat",    { NULL }, 1719,  "tcp" },
-  { "h323gatestat",    { NULL }, 1719,  "udp" },
-  { "h323hostcall",    { NULL }, 1720,  "tcp" },
-  { "h323hostcall",    { NULL }, 1720,  "udp" },
-  { "caicci",          { NULL }, 1721,  "tcp" },
-  { "caicci",          { NULL }, 1721,  "udp" },
-  { "hks-lm",          { NULL }, 1722,  "tcp" },
-  { "hks-lm",          { NULL }, 1722,  "udp" },
-  { "pptp",            { NULL }, 1723,  "tcp" },
-  { "pptp",            { NULL }, 1723,  "udp" },
-  { "csbphonemaster",  { NULL }, 1724,  "tcp" },
-  { "csbphonemaster",  { NULL }, 1724,  "udp" },
-  { "iden-ralp",       { NULL }, 1725,  "tcp" },
-  { "iden-ralp",       { NULL }, 1725,  "udp" },
-  { "iberiagames",     { NULL }, 1726,  "tcp" },
-  { "iberiagames",     { NULL }, 1726,  "udp" },
-  { "winddx",          { NULL }, 1727,  "tcp" },
-  { "winddx",          { NULL }, 1727,  "udp" },
-  { "telindus",        { NULL }, 1728,  "tcp" },
-  { "telindus",        { NULL }, 1728,  "udp" },
-  { "citynl",          { NULL }, 1729,  "tcp" },
-  { "citynl",          { NULL }, 1729,  "udp" },
-  { "roketz",          { NULL }, 1730,  "tcp" },
-  { "roketz",          { NULL }, 1730,  "udp" },
-  { "msiccp",          { NULL }, 1731,  "tcp" },
-  { "msiccp",          { NULL }, 1731,  "udp" },
-  { "proxim",          { NULL }, 1732,  "tcp" },
-  { "proxim",          { NULL }, 1732,  "udp" },
-  { "siipat",          { NULL }, 1733,  "tcp" },
-  { "siipat",          { NULL }, 1733,  "udp" },
-  { "cambertx-lm",     { NULL }, 1734,  "tcp" },
-  { "cambertx-lm",     { NULL }, 1734,  "udp" },
-  { "privatechat",     { NULL }, 1735,  "tcp" },
-  { "privatechat",     { NULL }, 1735,  "udp" },
-  { "street-stream",   { NULL }, 1736,  "tcp" },
-  { "street-stream",   { NULL }, 1736,  "udp" },
-  { "ultimad",         { NULL }, 1737,  "tcp" },
-  { "ultimad",         { NULL }, 1737,  "udp" },
-  { "gamegen1",        { NULL }, 1738,  "tcp" },
-  { "gamegen1",        { NULL }, 1738,  "udp" },
-  { "webaccess",       { NULL }, 1739,  "tcp" },
-  { "webaccess",       { NULL }, 1739,  "udp" },
-  { "encore",          { NULL }, 1740,  "tcp" },
-  { "encore",          { NULL }, 1740,  "udp" },
-  { "cisco-net-mgmt",  { NULL }, 1741,  "tcp" },
-  { "cisco-net-mgmt",  { NULL }, 1741,  "udp" },
-  { "3Com-nsd",        { NULL }, 1742,  "tcp" },
-  { "3Com-nsd",        { NULL }, 1742,  "udp" },
-  { "cinegrfx-lm",     { NULL }, 1743,  "tcp" },
-  { "cinegrfx-lm",     { NULL }, 1743,  "udp" },
-  { "ncpm-ft",         { NULL }, 1744,  "tcp" },
-  { "ncpm-ft",         { NULL }, 1744,  "udp" },
-  { "remote-winsock",  { NULL }, 1745,  "tcp" },
-  { "remote-winsock",  { NULL }, 1745,  "udp" },
-  { "ftrapid-1",       { NULL }, 1746,  "tcp" },
-  { "ftrapid-1",       { NULL }, 1746,  "udp" },
-  { "ftrapid-2",       { NULL }, 1747,  "tcp" },
-  { "ftrapid-2",       { NULL }, 1747,  "udp" },
-  { "oracle-em1",      { NULL }, 1748,  "tcp" },
-  { "oracle-em1",      { NULL }, 1748,  "udp" },
-  { "aspen-services",  { NULL }, 1749,  "tcp" },
-  { "aspen-services",  { NULL }, 1749,  "udp" },
-  { "sslp",            { NULL }, 1750,  "tcp" },
-  { "sslp",            { NULL }, 1750,  "udp" },
-  { "swiftnet",        { NULL }, 1751,  "tcp" },
-  { "swiftnet",        { NULL }, 1751,  "udp" },
-  { "lofr-lm",         { NULL }, 1752,  "tcp" },
-  { "lofr-lm",         { NULL }, 1752,  "udp" },
-  { "oracle-em2",      { NULL }, 1754,  "tcp" },
-  { "oracle-em2",      { NULL }, 1754,  "udp" },
-  { "ms-streaming",    { NULL }, 1755,  "tcp" },
-  { "ms-streaming",    { NULL }, 1755,  "udp" },
-  { "capfast-lmd",     { NULL }, 1756,  "tcp" },
-  { "capfast-lmd",     { NULL }, 1756,  "udp" },
-  { "cnhrp",           { NULL }, 1757,  "tcp" },
-  { "cnhrp",           { NULL }, 1757,  "udp" },
-  { "tftp-mcast",      { NULL }, 1758,  "tcp" },
-  { "tftp-mcast",      { NULL }, 1758,  "udp" },
-  { "spss-lm",         { NULL }, 1759,  "tcp" },
-  { "spss-lm",         { NULL }, 1759,  "udp" },
-  { "www-ldap-gw",     { NULL }, 1760,  "tcp" },
-  { "www-ldap-gw",     { NULL }, 1760,  "udp" },
-  { "cft-0",           { NULL }, 1761,  "tcp" },
-  { "cft-0",           { NULL }, 1761,  "udp" },
-  { "cft-1",           { NULL }, 1762,  "tcp" },
-  { "cft-1",           { NULL }, 1762,  "udp" },
-  { "cft-2",           { NULL }, 1763,  "tcp" },
-  { "cft-2",           { NULL }, 1763,  "udp" },
-  { "cft-3",           { NULL }, 1764,  "tcp" },
-  { "cft-3",           { NULL }, 1764,  "udp" },
-  { "cft-4",           { NULL }, 1765,  "tcp" },
-  { "cft-4",           { NULL }, 1765,  "udp" },
-  { "cft-5",           { NULL }, 1766,  "tcp" },
-  { "cft-5",           { NULL }, 1766,  "udp" },
-  { "cft-6",           { NULL }, 1767,  "tcp" },
-  { "cft-6",           { NULL }, 1767,  "udp" },
-  { "cft-7",           { NULL }, 1768,  "tcp" },
-  { "cft-7",           { NULL }, 1768,  "udp" },
-  { "bmc-net-adm",     { NULL }, 1769,  "tcp" },
-  { "bmc-net-adm",     { NULL }, 1769,  "udp" },
-  { "bmc-net-svc",     { NULL }, 1770,  "tcp" },
-  { "bmc-net-svc",     { NULL }, 1770,  "udp" },
-  { "vaultbase",       { NULL }, 1771,  "tcp" },
-  { "vaultbase",       { NULL }, 1771,  "udp" },
-  { "essweb-gw",       { NULL }, 1772,  "tcp" },
-  { "essweb-gw",       { NULL }, 1772,  "udp" },
-  { "kmscontrol",      { NULL }, 1773,  "tcp" },
-  { "kmscontrol",      { NULL }, 1773,  "udp" },
-  { "global-dtserv",   { NULL }, 1774,  "tcp" },
-  { "global-dtserv",   { NULL }, 1774,  "udp" },
-  { "femis",           { NULL }, 1776,  "tcp" },
-  { "femis",           { NULL }, 1776,  "udp" },
-  { "powerguardian",   { NULL }, 1777,  "tcp" },
-  { "powerguardian",   { NULL }, 1777,  "udp" },
-  { "prodigy-intrnet", { NULL }, 1778,  "tcp" },
-  { "prodigy-intrnet", { NULL }, 1778,  "udp" },
-  { "pharmasoft",      { NULL }, 1779,  "tcp" },
-  { "pharmasoft",      { NULL }, 1779,  "udp" },
-  { "dpkeyserv",       { NULL }, 1780,  "tcp" },
-  { "dpkeyserv",       { NULL }, 1780,  "udp" },
-  { "answersoft-lm",   { NULL }, 1781,  "tcp" },
-  { "answersoft-lm",   { NULL }, 1781,  "udp" },
-  { "hp-hcip",         { NULL }, 1782,  "tcp" },
-  { "hp-hcip",         { NULL }, 1782,  "udp" },
-  { "finle-lm",        { NULL }, 1784,  "tcp" },
-  { "finle-lm",        { NULL }, 1784,  "udp" },
-  { "windlm",          { NULL }, 1785,  "tcp" },
-  { "windlm",          { NULL }, 1785,  "udp" },
-  { "funk-logger",     { NULL }, 1786,  "tcp" },
-  { "funk-logger",     { NULL }, 1786,  "udp" },
-  { "funk-license",    { NULL }, 1787,  "tcp" },
-  { "funk-license",    { NULL }, 1787,  "udp" },
-  { "psmond",          { NULL }, 1788,  "tcp" },
-  { "psmond",          { NULL }, 1788,  "udp" },
-  { "hello",           { NULL }, 1789,  "tcp" },
-  { "hello",           { NULL }, 1789,  "udp" },
-  { "nmsp",            { NULL }, 1790,  "tcp" },
-  { "nmsp",            { NULL }, 1790,  "udp" },
-  { "ea1",             { NULL }, 1791,  "tcp" },
-  { "ea1",             { NULL }, 1791,  "udp" },
-  { "ibm-dt-2",        { NULL }, 1792,  "tcp" },
-  { "ibm-dt-2",        { NULL }, 1792,  "udp" },
-  { "rsc-robot",       { NULL }, 1793,  "tcp" },
-  { "rsc-robot",       { NULL }, 1793,  "udp" },
-  { "cera-bcm",        { NULL }, 1794,  "tcp" },
-  { "cera-bcm",        { NULL }, 1794,  "udp" },
-  { "dpi-proxy",       { NULL }, 1795,  "tcp" },
-  { "dpi-proxy",       { NULL }, 1795,  "udp" },
-  { "vocaltec-admin",  { NULL }, 1796,  "tcp" },
-  { "vocaltec-admin",  { NULL }, 1796,  "udp" },
-  { "uma",             { NULL }, 1797,  "tcp" },
-  { "uma",             { NULL }, 1797,  "udp" },
-  { "etp",             { NULL }, 1798,  "tcp" },
-  { "etp",             { NULL }, 1798,  "udp" },
-  { "netrisk",         { NULL }, 1799,  "tcp" },
-  { "netrisk",         { NULL }, 1799,  "udp" },
-  { "ansys-lm",        { NULL }, 1800,  "tcp" },
-  { "ansys-lm",        { NULL }, 1800,  "udp" },
-  { "msmq",            { NULL }, 1801,  "tcp" },
-  { "msmq",            { NULL }, 1801,  "udp" },
-  { "concomp1",        { NULL }, 1802,  "tcp" },
-  { "concomp1",        { NULL }, 1802,  "udp" },
-  { "hp-hcip-gwy",     { NULL }, 1803,  "tcp" },
-  { "hp-hcip-gwy",     { NULL }, 1803,  "udp" },
-  { "enl",             { NULL }, 1804,  "tcp" },
-  { "enl",             { NULL }, 1804,  "udp" },
-  { "enl-name",        { NULL }, 1805,  "tcp" },
-  { "enl-name",        { NULL }, 1805,  "udp" },
-  { "musiconline",     { NULL }, 1806,  "tcp" },
-  { "musiconline",     { NULL }, 1806,  "udp" },
-  { "fhsp",            { NULL }, 1807,  "tcp" },
-  { "fhsp",            { NULL }, 1807,  "udp" },
-  { "oracle-vp2",      { NULL }, 1808,  "tcp" },
-  { "oracle-vp2",      { NULL }, 1808,  "udp" },
-  { "oracle-vp1",      { NULL }, 1809,  "tcp" },
-  { "oracle-vp1",      { NULL }, 1809,  "udp" },
-  { "jerand-lm",       { NULL }, 1810,  "tcp" },
-  { "jerand-lm",       { NULL }, 1810,  "udp" },
-  { "scientia-sdb",    { NULL }, 1811,  "tcp" },
-  { "scientia-sdb",    { NULL }, 1811,  "udp" },
-  { "radius",          { NULL }, 1812,  "tcp" },
-  { "radius",          { NULL }, 1812,  "udp" },
-  { "radius-acct",     { NULL }, 1813,  "tcp" },
-  { "radius-acct",     { NULL }, 1813,  "udp" },
-  { "tdp-suite",       { NULL }, 1814,  "tcp" },
-  { "tdp-suite",       { NULL }, 1814,  "udp" },
-  { "mmpft",           { NULL }, 1815,  "tcp" },
-  { "mmpft",           { NULL }, 1815,  "udp" },
-  { "harp",            { NULL }, 1816,  "tcp" },
-  { "harp",            { NULL }, 1816,  "udp" },
-  { "rkb-oscs",        { NULL }, 1817,  "tcp" },
-  { "rkb-oscs",        { NULL }, 1817,  "udp" },
-  { "etftp",           { NULL }, 1818,  "tcp" },
-  { "etftp",           { NULL }, 1818,  "udp" },
-  { "plato-lm",        { NULL }, 1819,  "tcp" },
-  { "plato-lm",        { NULL }, 1819,  "udp" },
-  { "mcagent",         { NULL }, 1820,  "tcp" },
-  { "mcagent",         { NULL }, 1820,  "udp" },
-  { "donnyworld",      { NULL }, 1821,  "tcp" },
-  { "donnyworld",      { NULL }, 1821,  "udp" },
-  { "es-elmd",         { NULL }, 1822,  "tcp" },
-  { "es-elmd",         { NULL }, 1822,  "udp" },
-  { "unisys-lm",       { NULL }, 1823,  "tcp" },
-  { "unisys-lm",       { NULL }, 1823,  "udp" },
-  { "metrics-pas",     { NULL }, 1824,  "tcp" },
-  { "metrics-pas",     { NULL }, 1824,  "udp" },
-  { "direcpc-video",   { NULL }, 1825,  "tcp" },
-  { "direcpc-video",   { NULL }, 1825,  "udp" },
-  { "ardt",            { NULL }, 1826,  "tcp" },
-  { "ardt",            { NULL }, 1826,  "udp" },
-  { "asi",             { NULL }, 1827,  "tcp" },
-  { "asi",             { NULL }, 1827,  "udp" },
-  { "itm-mcell-u",     { NULL }, 1828,  "tcp" },
-  { "itm-mcell-u",     { NULL }, 1828,  "udp" },
-  { "optika-emedia",   { NULL }, 1829,  "tcp" },
-  { "optika-emedia",   { NULL }, 1829,  "udp" },
-  { "net8-cman",       { NULL }, 1830,  "tcp" },
-  { "net8-cman",       { NULL }, 1830,  "udp" },
-  { "myrtle",          { NULL }, 1831,  "tcp" },
-  { "myrtle",          { NULL }, 1831,  "udp" },
-  { "tht-treasure",    { NULL }, 1832,  "tcp" },
-  { "tht-treasure",    { NULL }, 1832,  "udp" },
-  { "udpradio",        { NULL }, 1833,  "tcp" },
-  { "udpradio",        { NULL }, 1833,  "udp" },
-  { "ardusuni",        { NULL }, 1834,  "tcp" },
-  { "ardusuni",        { NULL }, 1834,  "udp" },
-  { "ardusmul",        { NULL }, 1835,  "tcp" },
-  { "ardusmul",        { NULL }, 1835,  "udp" },
-  { "ste-smsc",        { NULL }, 1836,  "tcp" },
-  { "ste-smsc",        { NULL }, 1836,  "udp" },
-  { "csoft1",          { NULL }, 1837,  "tcp" },
-  { "csoft1",          { NULL }, 1837,  "udp" },
-  { "talnet",          { NULL }, 1838,  "tcp" },
-  { "talnet",          { NULL }, 1838,  "udp" },
-  { "netopia-vo1",     { NULL }, 1839,  "tcp" },
-  { "netopia-vo1",     { NULL }, 1839,  "udp" },
-  { "netopia-vo2",     { NULL }, 1840,  "tcp" },
-  { "netopia-vo2",     { NULL }, 1840,  "udp" },
-  { "netopia-vo3",     { NULL }, 1841,  "tcp" },
-  { "netopia-vo3",     { NULL }, 1841,  "udp" },
-  { "netopia-vo4",     { NULL }, 1842,  "tcp" },
-  { "netopia-vo4",     { NULL }, 1842,  "udp" },
-  { "netopia-vo5",     { NULL }, 1843,  "tcp" },
-  { "netopia-vo5",     { NULL }, 1843,  "udp" },
-  { "direcpc-dll",     { NULL }, 1844,  "tcp" },
-  { "direcpc-dll",     { NULL }, 1844,  "udp" },
-  { "altalink",        { NULL }, 1845,  "tcp" },
-  { "altalink",        { NULL }, 1845,  "udp" },
-  { "tunstall-pnc",    { NULL }, 1846,  "tcp" },
-  { "tunstall-pnc",    { NULL }, 1846,  "udp" },
-  { "slp-notify",      { NULL }, 1847,  "tcp" },
-  { "slp-notify",      { NULL }, 1847,  "udp" },
-  { "fjdocdist",       { NULL }, 1848,  "tcp" },
-  { "fjdocdist",       { NULL }, 1848,  "udp" },
-  { "alpha-sms",       { NULL }, 1849,  "tcp" },
-  { "alpha-sms",       { NULL }, 1849,  "udp" },
-  { "gsi",             { NULL }, 1850,  "tcp" },
-  { "gsi",             { NULL }, 1850,  "udp" },
-  { "ctcd",            { NULL }, 1851,  "tcp" },
-  { "ctcd",            { NULL }, 1851,  "udp" },
-  { "virtual-time",    { NULL }, 1852,  "tcp" },
-  { "virtual-time",    { NULL }, 1852,  "udp" },
-  { "vids-avtp",       { NULL }, 1853,  "tcp" },
-  { "vids-avtp",       { NULL }, 1853,  "udp" },
-  { "buddy-draw",      { NULL }, 1854,  "tcp" },
-  { "buddy-draw",      { NULL }, 1854,  "udp" },
-  { "fiorano-rtrsvc",  { NULL }, 1855,  "tcp" },
-  { "fiorano-rtrsvc",  { NULL }, 1855,  "udp" },
-  { "fiorano-msgsvc",  { NULL }, 1856,  "tcp" },
-  { "fiorano-msgsvc",  { NULL }, 1856,  "udp" },
-  { "datacaptor",      { NULL }, 1857,  "tcp" },
-  { "datacaptor",      { NULL }, 1857,  "udp" },
-  { "privateark",      { NULL }, 1858,  "tcp" },
-  { "privateark",      { NULL }, 1858,  "udp" },
-  { "gammafetchsvr",   { NULL }, 1859,  "tcp" },
-  { "gammafetchsvr",   { NULL }, 1859,  "udp" },
-  { "sunscalar-svc",   { NULL }, 1860,  "tcp" },
-  { "sunscalar-svc",   { NULL }, 1860,  "udp" },
-  { "lecroy-vicp",     { NULL }, 1861,  "tcp" },
-  { "lecroy-vicp",     { NULL }, 1861,  "udp" },
-  { "mysql-cm-agent",  { NULL }, 1862,  "tcp" },
-  { "mysql-cm-agent",  { NULL }, 1862,  "udp" },
-  { "msnp",            { NULL }, 1863,  "tcp" },
-  { "msnp",            { NULL }, 1863,  "udp" },
-  { "paradym-31port",  { NULL }, 1864,  "tcp" },
-  { "paradym-31port",  { NULL }, 1864,  "udp" },
-  { "entp",            { NULL }, 1865,  "tcp" },
-  { "entp",            { NULL }, 1865,  "udp" },
-  { "swrmi",           { NULL }, 1866,  "tcp" },
-  { "swrmi",           { NULL }, 1866,  "udp" },
-  { "udrive",          { NULL }, 1867,  "tcp" },
-  { "udrive",          { NULL }, 1867,  "udp" },
-  { "viziblebrowser",  { NULL }, 1868,  "tcp" },
-  { "viziblebrowser",  { NULL }, 1868,  "udp" },
-  { "transact",        { NULL }, 1869,  "tcp" },
-  { "transact",        { NULL }, 1869,  "udp" },
-  { "sunscalar-dns",   { NULL }, 1870,  "tcp" },
-  { "sunscalar-dns",   { NULL }, 1870,  "udp" },
-  { "canocentral0",    { NULL }, 1871,  "tcp" },
-  { "canocentral0",    { NULL }, 1871,  "udp" },
-  { "canocentral1",    { NULL }, 1872,  "tcp" },
-  { "canocentral1",    { NULL }, 1872,  "udp" },
-  { "fjmpjps",         { NULL }, 1873,  "tcp" },
-  { "fjmpjps",         { NULL }, 1873,  "udp" },
-  { "fjswapsnp",       { NULL }, 1874,  "tcp" },
-  { "fjswapsnp",       { NULL }, 1874,  "udp" },
-  { "westell-stats",   { NULL }, 1875,  "tcp" },
-  { "westell-stats",   { NULL }, 1875,  "udp" },
-  { "ewcappsrv",       { NULL }, 1876,  "tcp" },
-  { "ewcappsrv",       { NULL }, 1876,  "udp" },
-  { "hp-webqosdb",     { NULL }, 1877,  "tcp" },
-  { "hp-webqosdb",     { NULL }, 1877,  "udp" },
-  { "drmsmc",          { NULL }, 1878,  "tcp" },
-  { "drmsmc",          { NULL }, 1878,  "udp" },
-  { "nettgain-nms",    { NULL }, 1879,  "tcp" },
-  { "nettgain-nms",    { NULL }, 1879,  "udp" },
-  { "vsat-control",    { NULL }, 1880,  "tcp" },
-  { "vsat-control",    { NULL }, 1880,  "udp" },
-  { "ibm-mqseries2",   { NULL }, 1881,  "tcp" },
-  { "ibm-mqseries2",   { NULL }, 1881,  "udp" },
-  { "ecsqdmn",         { NULL }, 1882,  "tcp" },
-  { "ecsqdmn",         { NULL }, 1882,  "udp" },
-  { "ibm-mqisdp",      { NULL }, 1883,  "tcp" },
-  { "ibm-mqisdp",      { NULL }, 1883,  "udp" },
-  { "idmaps",          { NULL }, 1884,  "tcp" },
-  { "idmaps",          { NULL }, 1884,  "udp" },
-  { "vrtstrapserver",  { NULL }, 1885,  "tcp" },
-  { "vrtstrapserver",  { NULL }, 1885,  "udp" },
-  { "leoip",           { NULL }, 1886,  "tcp" },
-  { "leoip",           { NULL }, 1886,  "udp" },
-  { "filex-lport",     { NULL }, 1887,  "tcp" },
-  { "filex-lport",     { NULL }, 1887,  "udp" },
-  { "ncconfig",        { NULL }, 1888,  "tcp" },
-  { "ncconfig",        { NULL }, 1888,  "udp" },
-  { "unify-adapter",   { NULL }, 1889,  "tcp" },
-  { "unify-adapter",   { NULL }, 1889,  "udp" },
-  { "wilkenlistener",  { NULL }, 1890,  "tcp" },
-  { "wilkenlistener",  { NULL }, 1890,  "udp" },
-  { "childkey-notif",  { NULL }, 1891,  "tcp" },
-  { "childkey-notif",  { NULL }, 1891,  "udp" },
-  { "childkey-ctrl",   { NULL }, 1892,  "tcp" },
-  { "childkey-ctrl",   { NULL }, 1892,  "udp" },
-  { "elad",            { NULL }, 1893,  "tcp" },
-  { "elad",            { NULL }, 1893,  "udp" },
-  { "o2server-port",   { NULL }, 1894,  "tcp" },
-  { "o2server-port",   { NULL }, 1894,  "udp" },
-  { "b-novative-ls",   { NULL }, 1896,  "tcp" },
-  { "b-novative-ls",   { NULL }, 1896,  "udp" },
-  { "metaagent",       { NULL }, 1897,  "tcp" },
-  { "metaagent",       { NULL }, 1897,  "udp" },
-  { "cymtec-port",     { NULL }, 1898,  "tcp" },
-  { "cymtec-port",     { NULL }, 1898,  "udp" },
-  { "mc2studios",      { NULL }, 1899,  "tcp" },
-  { "mc2studios",      { NULL }, 1899,  "udp" },
-  { "ssdp",            { NULL }, 1900,  "tcp" },
-  { "ssdp",            { NULL }, 1900,  "udp" },
-  { "fjicl-tep-a",     { NULL }, 1901,  "tcp" },
-  { "fjicl-tep-a",     { NULL }, 1901,  "udp" },
-  { "fjicl-tep-b",     { NULL }, 1902,  "tcp" },
-  { "fjicl-tep-b",     { NULL }, 1902,  "udp" },
-  { "linkname",        { NULL }, 1903,  "tcp" },
-  { "linkname",        { NULL }, 1903,  "udp" },
-  { "fjicl-tep-c",     { NULL }, 1904,  "tcp" },
-  { "fjicl-tep-c",     { NULL }, 1904,  "udp" },
-  { "sugp",            { NULL }, 1905,  "tcp" },
-  { "sugp",            { NULL }, 1905,  "udp" },
-  { "tpmd",            { NULL }, 1906,  "tcp" },
-  { "tpmd",            { NULL }, 1906,  "udp" },
-  { "intrastar",       { NULL }, 1907,  "tcp" },
-  { "intrastar",       { NULL }, 1907,  "udp" },
-  { "dawn",            { NULL }, 1908,  "tcp" },
-  { "dawn",            { NULL }, 1908,  "udp" },
-  { "global-wlink",    { NULL }, 1909,  "tcp" },
-  { "global-wlink",    { NULL }, 1909,  "udp" },
-  { "ultrabac",        { NULL }, 1910,  "tcp" },
-  { "ultrabac",        { NULL }, 1910,  "udp" },
-  { "mtp",             { NULL }, 1911,  "tcp" },
-  { "mtp",             { NULL }, 1911,  "udp" },
-  { "rhp-iibp",        { NULL }, 1912,  "tcp" },
-  { "rhp-iibp",        { NULL }, 1912,  "udp" },
-  { "armadp",          { NULL }, 1913,  "tcp" },
-  { "armadp",          { NULL }, 1913,  "udp" },
-  { "elm-momentum",    { NULL }, 1914,  "tcp" },
-  { "elm-momentum",    { NULL }, 1914,  "udp" },
-  { "facelink",        { NULL }, 1915,  "tcp" },
-  { "facelink",        { NULL }, 1915,  "udp" },
-  { "persona",         { NULL }, 1916,  "tcp" },
-  { "persona",         { NULL }, 1916,  "udp" },
-  { "noagent",         { NULL }, 1917,  "tcp" },
-  { "noagent",         { NULL }, 1917,  "udp" },
-  { "can-nds",         { NULL }, 1918,  "tcp" },
-  { "can-nds",         { NULL }, 1918,  "udp" },
-  { "can-dch",         { NULL }, 1919,  "tcp" },
-  { "can-dch",         { NULL }, 1919,  "udp" },
-  { "can-ferret",      { NULL }, 1920,  "tcp" },
-  { "can-ferret",      { NULL }, 1920,  "udp" },
-  { "noadmin",         { NULL }, 1921,  "tcp" },
-  { "noadmin",         { NULL }, 1921,  "udp" },
-  { "tapestry",        { NULL }, 1922,  "tcp" },
-  { "tapestry",        { NULL }, 1922,  "udp" },
-  { "spice",           { NULL }, 1923,  "tcp" },
-  { "spice",           { NULL }, 1923,  "udp" },
-  { "xiip",            { NULL }, 1924,  "tcp" },
-  { "xiip",            { NULL }, 1924,  "udp" },
-  { "discovery-port",  { NULL }, 1925,  "tcp" },
-  { "discovery-port",  { NULL }, 1925,  "udp" },
-  { "egs",             { NULL }, 1926,  "tcp" },
-  { "egs",             { NULL }, 1926,  "udp" },
-  { "videte-cipc",     { NULL }, 1927,  "tcp" },
-  { "videte-cipc",     { NULL }, 1927,  "udp" },
-  { "emsd-port",       { NULL }, 1928,  "tcp" },
-  { "emsd-port",       { NULL }, 1928,  "udp" },
-  { "bandwiz-system",  { NULL }, 1929,  "tcp" },
-  { "bandwiz-system",  { NULL }, 1929,  "udp" },
-  { "driveappserver",  { NULL }, 1930,  "tcp" },
-  { "driveappserver",  { NULL }, 1930,  "udp" },
-  { "amdsched",        { NULL }, 1931,  "tcp" },
-  { "amdsched",        { NULL }, 1931,  "udp" },
-  { "ctt-broker",      { NULL }, 1932,  "tcp" },
-  { "ctt-broker",      { NULL }, 1932,  "udp" },
-  { "xmapi",           { NULL }, 1933,  "tcp" },
-  { "xmapi",           { NULL }, 1933,  "udp" },
-  { "xaapi",           { NULL }, 1934,  "tcp" },
-  { "xaapi",           { NULL }, 1934,  "udp" },
-  { "macromedia-fcs",  { NULL }, 1935,  "tcp" },
-  { "macromedia-fcs",  { NULL }, 1935,  "udp" },
-  { "jetcmeserver",    { NULL }, 1936,  "tcp" },
-  { "jetcmeserver",    { NULL }, 1936,  "udp" },
-  { "jwserver",        { NULL }, 1937,  "tcp" },
-  { "jwserver",        { NULL }, 1937,  "udp" },
-  { "jwclient",        { NULL }, 1938,  "tcp" },
-  { "jwclient",        { NULL }, 1938,  "udp" },
-  { "jvserver",        { NULL }, 1939,  "tcp" },
-  { "jvserver",        { NULL }, 1939,  "udp" },
-  { "jvclient",        { NULL }, 1940,  "tcp" },
-  { "jvclient",        { NULL }, 1940,  "udp" },
-  { "dic-aida",        { NULL }, 1941,  "tcp" },
-  { "dic-aida",        { NULL }, 1941,  "udp" },
-  { "res",             { NULL }, 1942,  "tcp" },
-  { "res",             { NULL }, 1942,  "udp" },
-  { "beeyond-media",   { NULL }, 1943,  "tcp" },
-  { "beeyond-media",   { NULL }, 1943,  "udp" },
-  { "close-combat",    { NULL }, 1944,  "tcp" },
-  { "close-combat",    { NULL }, 1944,  "udp" },
-  { "dialogic-elmd",   { NULL }, 1945,  "tcp" },
-  { "dialogic-elmd",   { NULL }, 1945,  "udp" },
-  { "tekpls",          { NULL }, 1946,  "tcp" },
-  { "tekpls",          { NULL }, 1946,  "udp" },
-  { "sentinelsrm",     { NULL }, 1947,  "tcp" },
-  { "sentinelsrm",     { NULL }, 1947,  "udp" },
-  { "eye2eye",         { NULL }, 1948,  "tcp" },
-  { "eye2eye",         { NULL }, 1948,  "udp" },
-  { "ismaeasdaqlive",  { NULL }, 1949,  "tcp" },
-  { "ismaeasdaqlive",  { NULL }, 1949,  "udp" },
-  { "ismaeasdaqtest",  { NULL }, 1950,  "tcp" },
-  { "ismaeasdaqtest",  { NULL }, 1950,  "udp" },
-  { "bcs-lmserver",    { NULL }, 1951,  "tcp" },
-  { "bcs-lmserver",    { NULL }, 1951,  "udp" },
-  { "mpnjsc",          { NULL }, 1952,  "tcp" },
-  { "mpnjsc",          { NULL }, 1952,  "udp" },
-  { "rapidbase",       { NULL }, 1953,  "tcp" },
-  { "rapidbase",       { NULL }, 1953,  "udp" },
-  { "abr-api",         { NULL }, 1954,  "tcp" },
-  { "abr-api",         { NULL }, 1954,  "udp" },
-  { "abr-secure",      { NULL }, 1955,  "tcp" },
-  { "abr-secure",      { NULL }, 1955,  "udp" },
-  { "vrtl-vmf-ds",     { NULL }, 1956,  "tcp" },
-  { "vrtl-vmf-ds",     { NULL }, 1956,  "udp" },
-  { "unix-status",     { NULL }, 1957,  "tcp" },
-  { "unix-status",     { NULL }, 1957,  "udp" },
-  { "dxadmind",        { NULL }, 1958,  "tcp" },
-  { "dxadmind",        { NULL }, 1958,  "udp" },
-  { "simp-all",        { NULL }, 1959,  "tcp" },
-  { "simp-all",        { NULL }, 1959,  "udp" },
-  { "nasmanager",      { NULL }, 1960,  "tcp" },
-  { "nasmanager",      { NULL }, 1960,  "udp" },
-  { "bts-appserver",   { NULL }, 1961,  "tcp" },
-  { "bts-appserver",   { NULL }, 1961,  "udp" },
-  { "biap-mp",         { NULL }, 1962,  "tcp" },
-  { "biap-mp",         { NULL }, 1962,  "udp" },
-  { "webmachine",      { NULL }, 1963,  "tcp" },
-  { "webmachine",      { NULL }, 1963,  "udp" },
-  { "solid-e-engine",  { NULL }, 1964,  "tcp" },
-  { "solid-e-engine",  { NULL }, 1964,  "udp" },
-  { "tivoli-npm",      { NULL }, 1965,  "tcp" },
-  { "tivoli-npm",      { NULL }, 1965,  "udp" },
-  { "slush",           { NULL }, 1966,  "tcp" },
-  { "slush",           { NULL }, 1966,  "udp" },
-  { "sns-quote",       { NULL }, 1967,  "tcp" },
-  { "sns-quote",       { NULL }, 1967,  "udp" },
-  { "lipsinc",         { NULL }, 1968,  "tcp" },
-  { "lipsinc",         { NULL }, 1968,  "udp" },
-  { "lipsinc1",        { NULL }, 1969,  "tcp" },
-  { "lipsinc1",        { NULL }, 1969,  "udp" },
-  { "netop-rc",        { NULL }, 1970,  "tcp" },
-  { "netop-rc",        { NULL }, 1970,  "udp" },
-  { "netop-school",    { NULL }, 1971,  "tcp" },
-  { "netop-school",    { NULL }, 1971,  "udp" },
-  { "intersys-cache",  { NULL }, 1972,  "tcp" },
-  { "intersys-cache",  { NULL }, 1972,  "udp" },
-  { "dlsrap",          { NULL }, 1973,  "tcp" },
-  { "dlsrap",          { NULL }, 1973,  "udp" },
-  { "drp",             { NULL }, 1974,  "tcp" },
-  { "drp",             { NULL }, 1974,  "udp" },
-  { "tcoflashagent",   { NULL }, 1975,  "tcp" },
-  { "tcoflashagent",   { NULL }, 1975,  "udp" },
-  { "tcoregagent",     { NULL }, 1976,  "tcp" },
-  { "tcoregagent",     { NULL }, 1976,  "udp" },
-  { "tcoaddressbook",  { NULL }, 1977,  "tcp" },
-  { "tcoaddressbook",  { NULL }, 1977,  "udp" },
-  { "unisql",          { NULL }, 1978,  "tcp" },
-  { "unisql",          { NULL }, 1978,  "udp" },
-  { "unisql-java",     { NULL }, 1979,  "tcp" },
-  { "unisql-java",     { NULL }, 1979,  "udp" },
-  { "pearldoc-xact",   { NULL }, 1980,  "tcp" },
-  { "pearldoc-xact",   { NULL }, 1980,  "udp" },
-  { "p2pq",            { NULL }, 1981,  "tcp" },
-  { "p2pq",            { NULL }, 1981,  "udp" },
-  { "estamp",          { NULL }, 1982,  "tcp" },
-  { "estamp",          { NULL }, 1982,  "udp" },
-  { "lhtp",            { NULL }, 1983,  "tcp" },
-  { "lhtp",            { NULL }, 1983,  "udp" },
-  { "bb",              { NULL }, 1984,  "tcp" },
-  { "bb",              { NULL }, 1984,  "udp" },
-  { "hsrp",            { NULL }, 1985,  "tcp" },
-  { "hsrp",            { NULL }, 1985,  "udp" },
-  { "licensedaemon",   { NULL }, 1986,  "tcp" },
-  { "licensedaemon",   { NULL }, 1986,  "udp" },
-  { "tr-rsrb-p1",      { NULL }, 1987,  "tcp" },
-  { "tr-rsrb-p1",      { NULL }, 1987,  "udp" },
-  { "tr-rsrb-p2",      { NULL }, 1988,  "tcp" },
-  { "tr-rsrb-p2",      { NULL }, 1988,  "udp" },
-  { "tr-rsrb-p3",      { NULL }, 1989,  "tcp" },
-  { "tr-rsrb-p3",      { NULL }, 1989,  "udp" },
-  { "mshnet",          { NULL }, 1989,  "tcp" },
-  { "mshnet",          { NULL }, 1989,  "udp" },
-  { "stun-p1",         { NULL }, 1990,  "tcp" },
-  { "stun-p1",         { NULL }, 1990,  "udp" },
-  { "stun-p2",         { NULL }, 1991,  "tcp" },
-  { "stun-p2",         { NULL }, 1991,  "udp" },
-  { "stun-p3",         { NULL }, 1992,  "tcp" },
-  { "stun-p3",         { NULL }, 1992,  "udp" },
-  { "ipsendmsg",       { NULL }, 1992,  "tcp" },
-  { "ipsendmsg",       { NULL }, 1992,  "udp" },
-  { "snmp-tcp-port",   { NULL }, 1993,  "tcp" },
-  { "snmp-tcp-port",   { NULL }, 1993,  "udp" },
-  { "stun-port",       { NULL }, 1994,  "tcp" },
-  { "stun-port",       { NULL }, 1994,  "udp" },
-  { "perf-port",       { NULL }, 1995,  "tcp" },
-  { "perf-port",       { NULL }, 1995,  "udp" },
-  { "tr-rsrb-port",    { NULL }, 1996,  "tcp" },
-  { "tr-rsrb-port",    { NULL }, 1996,  "udp" },
-  { "gdp-port",        { NULL }, 1997,  "tcp" },
-  { "gdp-port",        { NULL }, 1997,  "udp" },
-  { "x25-svc-port",    { NULL }, 1998,  "tcp" },
-  { "x25-svc-port",    { NULL }, 1998,  "udp" },
-  { "tcp-id-port",     { NULL }, 1999,  "tcp" },
-  { "tcp-id-port",     { NULL }, 1999,  "udp" },
-  { "cisco-sccp",      { NULL }, 2000,  "tcp" },
-  { "cisco-sccp",      { NULL }, 2000,  "udp" },
-  { "dc",              { NULL }, 2001,  "tcp" },
-  { "wizard",          { NULL }, 2001,  "udp" },
-  { "globe",           { NULL }, 2002,  "tcp" },
-  { "globe",           { NULL }, 2002,  "udp" },
-  { "brutus",          { NULL }, 2003,  "tcp" },
-  { "brutus",          { NULL }, 2003,  "udp" },
-  { "mailbox",         { NULL }, 2004,  "tcp" },
-  { "emce",            { NULL }, 2004,  "udp" },
-  { "berknet",         { NULL }, 2005,  "tcp" },
-  { "oracle",          { NULL }, 2005,  "udp" },
-  { "invokator",       { NULL }, 2006,  "tcp" },
-  { "raid-cd",         { NULL }, 2006,  "udp" },
-  { "dectalk",         { NULL }, 2007,  "tcp" },
-  { "raid-am",         { NULL }, 2007,  "udp" },
-  { "conf",            { NULL }, 2008,  "tcp" },
-  { "terminaldb",      { NULL }, 2008,  "udp" },
-  { "news",            { NULL }, 2009,  "tcp" },
-  { "whosockami",      { NULL }, 2009,  "udp" },
-  { "search",          { NULL }, 2010,  "tcp" },
-  { "pipe_server",     { NULL }, 2010,  "udp" },
-  { "raid-cc",         { NULL }, 2011,  "tcp" },
-  { "servserv",        { NULL }, 2011,  "udp" },
-  { "ttyinfo",         { NULL }, 2012,  "tcp" },
-  { "raid-ac",         { NULL }, 2012,  "udp" },
-  { "raid-am",         { NULL }, 2013,  "tcp" },
-  { "raid-cd",         { NULL }, 2013,  "udp" },
-  { "troff",           { NULL }, 2014,  "tcp" },
-  { "raid-sf",         { NULL }, 2014,  "udp" },
-  { "cypress",         { NULL }, 2015,  "tcp" },
-  { "raid-cs",         { NULL }, 2015,  "udp" },
-  { "bootserver",      { NULL }, 2016,  "tcp" },
-  { "bootserver",      { NULL }, 2016,  "udp" },
-  { "cypress-stat",    { NULL }, 2017,  "tcp" },
-  { "bootclient",      { NULL }, 2017,  "udp" },
-  { "terminaldb",      { NULL }, 2018,  "tcp" },
-  { "rellpack",        { NULL }, 2018,  "udp" },
-  { "whosockami",      { NULL }, 2019,  "tcp" },
-  { "about",           { NULL }, 2019,  "udp" },
-  { "xinupageserver",  { NULL }, 2020,  "tcp" },
-  { "xinupageserver",  { NULL }, 2020,  "udp" },
-  { "servexec",        { NULL }, 2021,  "tcp" },
-  { "xinuexpansion1",  { NULL }, 2021,  "udp" },
-  { "down",            { NULL }, 2022,  "tcp" },
-  { "xinuexpansion2",  { NULL }, 2022,  "udp" },
-  { "xinuexpansion3",  { NULL }, 2023,  "tcp" },
-  { "xinuexpansion3",  { NULL }, 2023,  "udp" },
-  { "xinuexpansion4",  { NULL }, 2024,  "tcp" },
-  { "xinuexpansion4",  { NULL }, 2024,  "udp" },
-  { "ellpack",         { NULL }, 2025,  "tcp" },
-  { "xribs",           { NULL }, 2025,  "udp" },
-  { "scrabble",        { NULL }, 2026,  "tcp" },
-  { "scrabble",        { NULL }, 2026,  "udp" },
-  { "shadowserver",    { NULL }, 2027,  "tcp" },
-  { "shadowserver",    { NULL }, 2027,  "udp" },
-  { "submitserver",    { NULL }, 2028,  "tcp" },
-  { "submitserver",    { NULL }, 2028,  "udp" },
-  { "hsrpv6",          { NULL }, 2029,  "tcp" },
-  { "hsrpv6",          { NULL }, 2029,  "udp" },
-  { "device2",         { NULL }, 2030,  "tcp" },
-  { "device2",         { NULL }, 2030,  "udp" },
-  { "mobrien-chat",    { NULL }, 2031,  "tcp" },
-  { "mobrien-chat",    { NULL }, 2031,  "udp" },
-  { "blackboard",      { NULL }, 2032,  "tcp" },
-  { "blackboard",      { NULL }, 2032,  "udp" },
-  { "glogger",         { NULL }, 2033,  "tcp" },
-  { "glogger",         { NULL }, 2033,  "udp" },
-  { "scoremgr",        { NULL }, 2034,  "tcp" },
-  { "scoremgr",        { NULL }, 2034,  "udp" },
-  { "imsldoc",         { NULL }, 2035,  "tcp" },
-  { "imsldoc",         { NULL }, 2035,  "udp" },
-  { "e-dpnet",         { NULL }, 2036,  "tcp" },
-  { "e-dpnet",         { NULL }, 2036,  "udp" },
-  { "applus",          { NULL }, 2037,  "tcp" },
-  { "applus",          { NULL }, 2037,  "udp" },
-  { "objectmanager",   { NULL }, 2038,  "tcp" },
-  { "objectmanager",   { NULL }, 2038,  "udp" },
-  { "prizma",          { NULL }, 2039,  "tcp" },
-  { "prizma",          { NULL }, 2039,  "udp" },
-  { "lam",             { NULL }, 2040,  "tcp" },
-  { "lam",             { NULL }, 2040,  "udp" },
-  { "interbase",       { NULL }, 2041,  "tcp" },
-  { "interbase",       { NULL }, 2041,  "udp" },
-  { "isis",            { NULL }, 2042,  "tcp" },
-  { "isis",            { NULL }, 2042,  "udp" },
-  { "isis-bcast",      { NULL }, 2043,  "tcp" },
-  { "isis-bcast",      { NULL }, 2043,  "udp" },
-  { "rimsl",           { NULL }, 2044,  "tcp" },
-  { "rimsl",           { NULL }, 2044,  "udp" },
-  { "cdfunc",          { NULL }, 2045,  "tcp" },
-  { "cdfunc",          { NULL }, 2045,  "udp" },
-  { "sdfunc",          { NULL }, 2046,  "tcp" },
-  { "sdfunc",          { NULL }, 2046,  "udp" },
-  { "dls",             { NULL }, 2047,  "tcp" },
-  { "dls",             { NULL }, 2047,  "udp" },
-  { "dls-monitor",     { NULL }, 2048,  "tcp" },
-  { "dls-monitor",     { NULL }, 2048,  "udp" },
-  { "shilp",           { NULL }, 2049,  "tcp" },
-  { "shilp",           { NULL }, 2049,  "udp" },
-  { "nfs",             { NULL }, 2049,  "tcp" },
-  { "nfs",             { NULL }, 2049,  "udp" },
-  { "nfs",             { NULL }, 2049,  "sctp"},
-  { "av-emb-config",   { NULL }, 2050,  "tcp" },
-  { "av-emb-config",   { NULL }, 2050,  "udp" },
-  { "epnsdp",          { NULL }, 2051,  "tcp" },
-  { "epnsdp",          { NULL }, 2051,  "udp" },
-  { "clearvisn",       { NULL }, 2052,  "tcp" },
-  { "clearvisn",       { NULL }, 2052,  "udp" },
-  { "lot105-ds-upd",   { NULL }, 2053,  "tcp" },
-  { "lot105-ds-upd",   { NULL }, 2053,  "udp" },
-  { "weblogin",        { NULL }, 2054,  "tcp" },
-  { "weblogin",        { NULL }, 2054,  "udp" },
-  { "iop",             { NULL }, 2055,  "tcp" },
-  { "iop",             { NULL }, 2055,  "udp" },
-  { "omnisky",         { NULL }, 2056,  "tcp" },
-  { "omnisky",         { NULL }, 2056,  "udp" },
-  { "rich-cp",         { NULL }, 2057,  "tcp" },
-  { "rich-cp",         { NULL }, 2057,  "udp" },
-  { "newwavesearch",   { NULL }, 2058,  "tcp" },
-  { "newwavesearch",   { NULL }, 2058,  "udp" },
-  { "bmc-messaging",   { NULL }, 2059,  "tcp" },
-  { "bmc-messaging",   { NULL }, 2059,  "udp" },
-  { "teleniumdaemon",  { NULL }, 2060,  "tcp" },
-  { "teleniumdaemon",  { NULL }, 2060,  "udp" },
-  { "netmount",        { NULL }, 2061,  "tcp" },
-  { "netmount",        { NULL }, 2061,  "udp" },
-  { "icg-swp",         { NULL }, 2062,  "tcp" },
-  { "icg-swp",         { NULL }, 2062,  "udp" },
-  { "icg-bridge",      { NULL }, 2063,  "tcp" },
-  { "icg-bridge",      { NULL }, 2063,  "udp" },
-  { "icg-iprelay",     { NULL }, 2064,  "tcp" },
-  { "icg-iprelay",     { NULL }, 2064,  "udp" },
-  { "dlsrpn",          { NULL }, 2065,  "tcp" },
-  { "dlsrpn",          { NULL }, 2065,  "udp" },
-  { "aura",            { NULL }, 2066,  "tcp" },
-  { "aura",            { NULL }, 2066,  "udp" },
-  { "dlswpn",          { NULL }, 2067,  "tcp" },
-  { "dlswpn",          { NULL }, 2067,  "udp" },
-  { "avauthsrvprtcl",  { NULL }, 2068,  "tcp" },
-  { "avauthsrvprtcl",  { NULL }, 2068,  "udp" },
-  { "event-port",      { NULL }, 2069,  "tcp" },
-  { "event-port",      { NULL }, 2069,  "udp" },
-  { "ah-esp-encap",    { NULL }, 2070,  "tcp" },
-  { "ah-esp-encap",    { NULL }, 2070,  "udp" },
-  { "acp-port",        { NULL }, 2071,  "tcp" },
-  { "acp-port",        { NULL }, 2071,  "udp" },
-  { "msync",           { NULL }, 2072,  "tcp" },
-  { "msync",           { NULL }, 2072,  "udp" },
-  { "gxs-data-port",   { NULL }, 2073,  "tcp" },
-  { "gxs-data-port",   { NULL }, 2073,  "udp" },
-  { "vrtl-vmf-sa",     { NULL }, 2074,  "tcp" },
-  { "vrtl-vmf-sa",     { NULL }, 2074,  "udp" },
-  { "newlixengine",    { NULL }, 2075,  "tcp" },
-  { "newlixengine",    { NULL }, 2075,  "udp" },
-  { "newlixconfig",    { NULL }, 2076,  "tcp" },
-  { "newlixconfig",    { NULL }, 2076,  "udp" },
-  { "tsrmagt",         { NULL }, 2077,  "tcp" },
-  { "tsrmagt",         { NULL }, 2077,  "udp" },
-  { "tpcsrvr",         { NULL }, 2078,  "tcp" },
-  { "tpcsrvr",         { NULL }, 2078,  "udp" },
-  { "idware-router",   { NULL }, 2079,  "tcp" },
-  { "idware-router",   { NULL }, 2079,  "udp" },
-  { "autodesk-nlm",    { NULL }, 2080,  "tcp" },
-  { "autodesk-nlm",    { NULL }, 2080,  "udp" },
-  { "kme-trap-port",   { NULL }, 2081,  "tcp" },
-  { "kme-trap-port",   { NULL }, 2081,  "udp" },
-  { "infowave",        { NULL }, 2082,  "tcp" },
-  { "infowave",        { NULL }, 2082,  "udp" },
-  { "radsec",          { NULL }, 2083,  "tcp" },
-  { "radsec",          { NULL }, 2083,  "udp" },
-  { "sunclustergeo",   { NULL }, 2084,  "tcp" },
-  { "sunclustergeo",   { NULL }, 2084,  "udp" },
-  { "ada-cip",         { NULL }, 2085,  "tcp" },
-  { "ada-cip",         { NULL }, 2085,  "udp" },
-  { "gnunet",          { NULL }, 2086,  "tcp" },
-  { "gnunet",          { NULL }, 2086,  "udp" },
-  { "eli",             { NULL }, 2087,  "tcp" },
-  { "eli",             { NULL }, 2087,  "udp" },
-  { "ip-blf",          { NULL }, 2088,  "tcp" },
-  { "ip-blf",          { NULL }, 2088,  "udp" },
-  { "sep",             { NULL }, 2089,  "tcp" },
-  { "sep",             { NULL }, 2089,  "udp" },
-  { "lrp",             { NULL }, 2090,  "tcp" },
-  { "lrp",             { NULL }, 2090,  "udp" },
-  { "prp",             { NULL }, 2091,  "tcp" },
-  { "prp",             { NULL }, 2091,  "udp" },
-  { "descent3",        { NULL }, 2092,  "tcp" },
-  { "descent3",        { NULL }, 2092,  "udp" },
-  { "nbx-cc",          { NULL }, 2093,  "tcp" },
-  { "nbx-cc",          { NULL }, 2093,  "udp" },
-  { "nbx-au",          { NULL }, 2094,  "tcp" },
-  { "nbx-au",          { NULL }, 2094,  "udp" },
-  { "nbx-ser",         { NULL }, 2095,  "tcp" },
-  { "nbx-ser",         { NULL }, 2095,  "udp" },
-  { "nbx-dir",         { NULL }, 2096,  "tcp" },
-  { "nbx-dir",         { NULL }, 2096,  "udp" },
-  { "jetformpreview",  { NULL }, 2097,  "tcp" },
-  { "jetformpreview",  { NULL }, 2097,  "udp" },
-  { "dialog-port",     { NULL }, 2098,  "tcp" },
-  { "dialog-port",     { NULL }, 2098,  "udp" },
-  { "h2250-annex-g",   { NULL }, 2099,  "tcp" },
-  { "h2250-annex-g",   { NULL }, 2099,  "udp" },
-  { "amiganetfs",      { NULL }, 2100,  "tcp" },
-  { "amiganetfs",      { NULL }, 2100,  "udp" },
-  { "rtcm-sc104",      { NULL }, 2101,  "tcp" },
-  { "rtcm-sc104",      { NULL }, 2101,  "udp" },
-  { "zephyr-srv",      { NULL }, 2102,  "tcp" },
-  { "zephyr-srv",      { NULL }, 2102,  "udp" },
-  { "zephyr-clt",      { NULL }, 2103,  "tcp" },
-  { "zephyr-clt",      { NULL }, 2103,  "udp" },
-  { "zephyr-hm",       { NULL }, 2104,  "tcp" },
-  { "zephyr-hm",       { NULL }, 2104,  "udp" },
-  { "minipay",         { NULL }, 2105,  "tcp" },
-  { "minipay",         { NULL }, 2105,  "udp" },
-  { "mzap",            { NULL }, 2106,  "tcp" },
-  { "mzap",            { NULL }, 2106,  "udp" },
-  { "bintec-admin",    { NULL }, 2107,  "tcp" },
-  { "bintec-admin",    { NULL }, 2107,  "udp" },
-  { "comcam",          { NULL }, 2108,  "tcp" },
-  { "comcam",          { NULL }, 2108,  "udp" },
-  { "ergolight",       { NULL }, 2109,  "tcp" },
-  { "ergolight",       { NULL }, 2109,  "udp" },
-  { "umsp",            { NULL }, 2110,  "tcp" },
-  { "umsp",            { NULL }, 2110,  "udp" },
-  { "dsatp",           { NULL }, 2111,  "tcp" },
-  { "dsatp",           { NULL }, 2111,  "udp" },
-  { "idonix-metanet",  { NULL }, 2112,  "tcp" },
-  { "idonix-metanet",  { NULL }, 2112,  "udp" },
-  { "hsl-storm",       { NULL }, 2113,  "tcp" },
-  { "hsl-storm",       { NULL }, 2113,  "udp" },
-  { "newheights",      { NULL }, 2114,  "tcp" },
-  { "newheights",      { NULL }, 2114,  "udp" },
-  { "kdm",             { NULL }, 2115,  "tcp" },
-  { "kdm",             { NULL }, 2115,  "udp" },
-  { "ccowcmr",         { NULL }, 2116,  "tcp" },
-  { "ccowcmr",         { NULL }, 2116,  "udp" },
-  { "mentaclient",     { NULL }, 2117,  "tcp" },
-  { "mentaclient",     { NULL }, 2117,  "udp" },
-  { "mentaserver",     { NULL }, 2118,  "tcp" },
-  { "mentaserver",     { NULL }, 2118,  "udp" },
-  { "gsigatekeeper",   { NULL }, 2119,  "tcp" },
-  { "gsigatekeeper",   { NULL }, 2119,  "udp" },
-  { "qencp",           { NULL }, 2120,  "tcp" },
-  { "qencp",           { NULL }, 2120,  "udp" },
-  { "scientia-ssdb",   { NULL }, 2121,  "tcp" },
-  { "scientia-ssdb",   { NULL }, 2121,  "udp" },
-  { "caupc-remote",    { NULL }, 2122,  "tcp" },
-  { "caupc-remote",    { NULL }, 2122,  "udp" },
-  { "gtp-control",     { NULL }, 2123,  "tcp" },
-  { "gtp-control",     { NULL }, 2123,  "udp" },
-  { "elatelink",       { NULL }, 2124,  "tcp" },
-  { "elatelink",       { NULL }, 2124,  "udp" },
-  { "lockstep",        { NULL }, 2125,  "tcp" },
-  { "lockstep",        { NULL }, 2125,  "udp" },
-  { "pktcable-cops",   { NULL }, 2126,  "tcp" },
-  { "pktcable-cops",   { NULL }, 2126,  "udp" },
-  { "index-pc-wb",     { NULL }, 2127,  "tcp" },
-  { "index-pc-wb",     { NULL }, 2127,  "udp" },
-  { "net-steward",     { NULL }, 2128,  "tcp" },
-  { "net-steward",     { NULL }, 2128,  "udp" },
-  { "cs-live",         { NULL }, 2129,  "tcp" },
-  { "cs-live",         { NULL }, 2129,  "udp" },
-  { "xds",             { NULL }, 2130,  "tcp" },
-  { "xds",             { NULL }, 2130,  "udp" },
-  { "avantageb2b",     { NULL }, 2131,  "tcp" },
-  { "avantageb2b",     { NULL }, 2131,  "udp" },
-  { "solera-epmap",    { NULL }, 2132,  "tcp" },
-  { "solera-epmap",    { NULL }, 2132,  "udp" },
-  { "zymed-zpp",       { NULL }, 2133,  "tcp" },
-  { "zymed-zpp",       { NULL }, 2133,  "udp" },
-  { "avenue",          { NULL }, 2134,  "tcp" },
-  { "avenue",          { NULL }, 2134,  "udp" },
-  { "gris",            { NULL }, 2135,  "tcp" },
-  { "gris",            { NULL }, 2135,  "udp" },
-  { "appworxsrv",      { NULL }, 2136,  "tcp" },
-  { "appworxsrv",      { NULL }, 2136,  "udp" },
-  { "connect",         { NULL }, 2137,  "tcp" },
-  { "connect",         { NULL }, 2137,  "udp" },
-  { "unbind-cluster",  { NULL }, 2138,  "tcp" },
-  { "unbind-cluster",  { NULL }, 2138,  "udp" },
-  { "ias-auth",        { NULL }, 2139,  "tcp" },
-  { "ias-auth",        { NULL }, 2139,  "udp" },
-  { "ias-reg",         { NULL }, 2140,  "tcp" },
-  { "ias-reg",         { NULL }, 2140,  "udp" },
-  { "ias-admind",      { NULL }, 2141,  "tcp" },
-  { "ias-admind",      { NULL }, 2141,  "udp" },
-  { "tdmoip",          { NULL }, 2142,  "tcp" },
-  { "tdmoip",          { NULL }, 2142,  "udp" },
-  { "lv-jc",           { NULL }, 2143,  "tcp" },
-  { "lv-jc",           { NULL }, 2143,  "udp" },
-  { "lv-ffx",          { NULL }, 2144,  "tcp" },
-  { "lv-ffx",          { NULL }, 2144,  "udp" },
-  { "lv-pici",         { NULL }, 2145,  "tcp" },
-  { "lv-pici",         { NULL }, 2145,  "udp" },
-  { "lv-not",          { NULL }, 2146,  "tcp" },
-  { "lv-not",          { NULL }, 2146,  "udp" },
-  { "lv-auth",         { NULL }, 2147,  "tcp" },
-  { "lv-auth",         { NULL }, 2147,  "udp" },
-  { "veritas-ucl",     { NULL }, 2148,  "tcp" },
-  { "veritas-ucl",     { NULL }, 2148,  "udp" },
-  { "acptsys",         { NULL }, 2149,  "tcp" },
-  { "acptsys",         { NULL }, 2149,  "udp" },
-  { "dynamic3d",       { NULL }, 2150,  "tcp" },
-  { "dynamic3d",       { NULL }, 2150,  "udp" },
-  { "docent",          { NULL }, 2151,  "tcp" },
-  { "docent",          { NULL }, 2151,  "udp" },
-  { "gtp-user",        { NULL }, 2152,  "tcp" },
-  { "gtp-user",        { NULL }, 2152,  "udp" },
-  { "ctlptc",          { NULL }, 2153,  "tcp" },
-  { "ctlptc",          { NULL }, 2153,  "udp" },
-  { "stdptc",          { NULL }, 2154,  "tcp" },
-  { "stdptc",          { NULL }, 2154,  "udp" },
-  { "brdptc",          { NULL }, 2155,  "tcp" },
-  { "brdptc",          { NULL }, 2155,  "udp" },
-  { "trp",             { NULL }, 2156,  "tcp" },
-  { "trp",             { NULL }, 2156,  "udp" },
-  { "xnds",            { NULL }, 2157,  "tcp" },
-  { "xnds",            { NULL }, 2157,  "udp" },
-  { "touchnetplus",    { NULL }, 2158,  "tcp" },
-  { "touchnetplus",    { NULL }, 2158,  "udp" },
-  { "gdbremote",       { NULL }, 2159,  "tcp" },
-  { "gdbremote",       { NULL }, 2159,  "udp" },
-  { "apc-2160",        { NULL }, 2160,  "tcp" },
-  { "apc-2160",        { NULL }, 2160,  "udp" },
-  { "apc-2161",        { NULL }, 2161,  "tcp" },
-  { "apc-2161",        { NULL }, 2161,  "udp" },
-  { "navisphere",      { NULL }, 2162,  "tcp" },
-  { "navisphere",      { NULL }, 2162,  "udp" },
-  { "navisphere-sec",  { NULL }, 2163,  "tcp" },
-  { "navisphere-sec",  { NULL }, 2163,  "udp" },
-  { "ddns-v3",         { NULL }, 2164,  "tcp" },
-  { "ddns-v3",         { NULL }, 2164,  "udp" },
-  { "x-bone-api",      { NULL }, 2165,  "tcp" },
-  { "x-bone-api",      { NULL }, 2165,  "udp" },
-  { "iwserver",        { NULL }, 2166,  "tcp" },
-  { "iwserver",        { NULL }, 2166,  "udp" },
-  { "raw-serial",      { NULL }, 2167,  "tcp" },
-  { "raw-serial",      { NULL }, 2167,  "udp" },
-  { "easy-soft-mux",   { NULL }, 2168,  "tcp" },
-  { "easy-soft-mux",   { NULL }, 2168,  "udp" },
-  { "brain",           { NULL }, 2169,  "tcp" },
-  { "brain",           { NULL }, 2169,  "udp" },
-  { "eyetv",           { NULL }, 2170,  "tcp" },
-  { "eyetv",           { NULL }, 2170,  "udp" },
-  { "msfw-storage",    { NULL }, 2171,  "tcp" },
-  { "msfw-storage",    { NULL }, 2171,  "udp" },
-  { "msfw-s-storage",  { NULL }, 2172,  "tcp" },
-  { "msfw-s-storage",  { NULL }, 2172,  "udp" },
-  { "msfw-replica",    { NULL }, 2173,  "tcp" },
-  { "msfw-replica",    { NULL }, 2173,  "udp" },
-  { "msfw-array",      { NULL }, 2174,  "tcp" },
-  { "msfw-array",      { NULL }, 2174,  "udp" },
-  { "airsync",         { NULL }, 2175,  "tcp" },
-  { "airsync",         { NULL }, 2175,  "udp" },
-  { "rapi",            { NULL }, 2176,  "tcp" },
-  { "rapi",            { NULL }, 2176,  "udp" },
-  { "qwave",           { NULL }, 2177,  "tcp" },
-  { "qwave",           { NULL }, 2177,  "udp" },
-  { "bitspeer",        { NULL }, 2178,  "tcp" },
-  { "bitspeer",        { NULL }, 2178,  "udp" },
-  { "vmrdp",           { NULL }, 2179,  "tcp" },
-  { "vmrdp",           { NULL }, 2179,  "udp" },
-  { "mc-gt-srv",       { NULL }, 2180,  "tcp" },
-  { "mc-gt-srv",       { NULL }, 2180,  "udp" },
-  { "eforward",        { NULL }, 2181,  "tcp" },
-  { "eforward",        { NULL }, 2181,  "udp" },
-  { "cgn-stat",        { NULL }, 2182,  "tcp" },
-  { "cgn-stat",        { NULL }, 2182,  "udp" },
-  { "cgn-config",      { NULL }, 2183,  "tcp" },
-  { "cgn-config",      { NULL }, 2183,  "udp" },
-  { "nvd",             { NULL }, 2184,  "tcp" },
-  { "nvd",             { NULL }, 2184,  "udp" },
-  { "onbase-dds",      { NULL }, 2185,  "tcp" },
-  { "onbase-dds",      { NULL }, 2185,  "udp" },
-  { "gtaua",           { NULL }, 2186,  "tcp" },
-  { "gtaua",           { NULL }, 2186,  "udp" },
-  { "ssmc",            { NULL }, 2187,  "tcp" },
-  { "ssmd",            { NULL }, 2187,  "udp" },
-  { "tivoconnect",     { NULL }, 2190,  "tcp" },
-  { "tivoconnect",     { NULL }, 2190,  "udp" },
-  { "tvbus",           { NULL }, 2191,  "tcp" },
-  { "tvbus",           { NULL }, 2191,  "udp" },
-  { "asdis",           { NULL }, 2192,  "tcp" },
-  { "asdis",           { NULL }, 2192,  "udp" },
-  { "drwcs",           { NULL }, 2193,  "tcp" },
-  { "drwcs",           { NULL }, 2193,  "udp" },
-  { "mnp-exchange",    { NULL }, 2197,  "tcp" },
-  { "mnp-exchange",    { NULL }, 2197,  "udp" },
-  { "onehome-remote",  { NULL }, 2198,  "tcp" },
-  { "onehome-remote",  { NULL }, 2198,  "udp" },
-  { "onehome-help",    { NULL }, 2199,  "tcp" },
-  { "onehome-help",    { NULL }, 2199,  "udp" },
-  { "ici",             { NULL }, 2200,  "tcp" },
-  { "ici",             { NULL }, 2200,  "udp" },
-  { "ats",             { NULL }, 2201,  "tcp" },
-  { "ats",             { NULL }, 2201,  "udp" },
-  { "imtc-map",        { NULL }, 2202,  "tcp" },
-  { "imtc-map",        { NULL }, 2202,  "udp" },
-  { "b2-runtime",      { NULL }, 2203,  "tcp" },
-  { "b2-runtime",      { NULL }, 2203,  "udp" },
-  { "b2-license",      { NULL }, 2204,  "tcp" },
-  { "b2-license",      { NULL }, 2204,  "udp" },
-  { "jps",             { NULL }, 2205,  "tcp" },
-  { "jps",             { NULL }, 2205,  "udp" },
-  { "hpocbus",         { NULL }, 2206,  "tcp" },
-  { "hpocbus",         { NULL }, 2206,  "udp" },
-  { "hpssd",           { NULL }, 2207,  "tcp" },
-  { "hpssd",           { NULL }, 2207,  "udp" },
-  { "hpiod",           { NULL }, 2208,  "tcp" },
-  { "hpiod",           { NULL }, 2208,  "udp" },
-  { "rimf-ps",         { NULL }, 2209,  "tcp" },
-  { "rimf-ps",         { NULL }, 2209,  "udp" },
-  { "noaaport",        { NULL }, 2210,  "tcp" },
-  { "noaaport",        { NULL }, 2210,  "udp" },
-  { "emwin",           { NULL }, 2211,  "tcp" },
-  { "emwin",           { NULL }, 2211,  "udp" },
-  { "leecoposserver",  { NULL }, 2212,  "tcp" },
-  { "leecoposserver",  { NULL }, 2212,  "udp" },
-  { "kali",            { NULL }, 2213,  "tcp" },
-  { "kali",            { NULL }, 2213,  "udp" },
-  { "rpi",             { NULL }, 2214,  "tcp" },
-  { "rpi",             { NULL }, 2214,  "udp" },
-  { "ipcore",          { NULL }, 2215,  "tcp" },
-  { "ipcore",          { NULL }, 2215,  "udp" },
-  { "vtu-comms",       { NULL }, 2216,  "tcp" },
-  { "vtu-comms",       { NULL }, 2216,  "udp" },
-  { "gotodevice",      { NULL }, 2217,  "tcp" },
-  { "gotodevice",      { NULL }, 2217,  "udp" },
-  { "bounzza",         { NULL }, 2218,  "tcp" },
-  { "bounzza",         { NULL }, 2218,  "udp" },
-  { "netiq-ncap",      { NULL }, 2219,  "tcp" },
-  { "netiq-ncap",      { NULL }, 2219,  "udp" },
-  { "netiq",           { NULL }, 2220,  "tcp" },
-  { "netiq",           { NULL }, 2220,  "udp" },
-  { "rockwell-csp1",   { NULL }, 2221,  "tcp" },
-  { "rockwell-csp1",   { NULL }, 2221,  "udp" },
-  { "EtherNet/IP-1",   { NULL }, 2222,  "tcp" },
-  { "EtherNet/IP-1",   { NULL }, 2222,  "udp" },
-  { "rockwell-csp2",   { NULL }, 2223,  "tcp" },
-  { "rockwell-csp2",   { NULL }, 2223,  "udp" },
-  { "efi-mg",          { NULL }, 2224,  "tcp" },
-  { "efi-mg",          { NULL }, 2224,  "udp" },
-  { "rcip-itu",        { NULL }, 2225,  "tcp" },
-  { "rcip-itu",        { NULL }, 2225,  "sctp"},
-  { "di-drm",          { NULL }, 2226,  "tcp" },
-  { "di-drm",          { NULL }, 2226,  "udp" },
-  { "di-msg",          { NULL }, 2227,  "tcp" },
-  { "di-msg",          { NULL }, 2227,  "udp" },
-  { "ehome-ms",        { NULL }, 2228,  "tcp" },
-  { "ehome-ms",        { NULL }, 2228,  "udp" },
-  { "datalens",        { NULL }, 2229,  "tcp" },
-  { "datalens",        { NULL }, 2229,  "udp" },
-  { "queueadm",        { NULL }, 2230,  "tcp" },
-  { "queueadm",        { NULL }, 2230,  "udp" },
-  { "wimaxasncp",      { NULL }, 2231,  "tcp" },
-  { "wimaxasncp",      { NULL }, 2231,  "udp" },
-  { "ivs-video",       { NULL }, 2232,  "tcp" },
-  { "ivs-video",       { NULL }, 2232,  "udp" },
-  { "infocrypt",       { NULL }, 2233,  "tcp" },
-  { "infocrypt",       { NULL }, 2233,  "udp" },
-  { "directplay",      { NULL }, 2234,  "tcp" },
-  { "directplay",      { NULL }, 2234,  "udp" },
-  { "sercomm-wlink",   { NULL }, 2235,  "tcp" },
-  { "sercomm-wlink",   { NULL }, 2235,  "udp" },
-  { "nani",            { NULL }, 2236,  "tcp" },
-  { "nani",            { NULL }, 2236,  "udp" },
-  { "optech-port1-lm", { NULL }, 2237,  "tcp" },
-  { "optech-port1-lm", { NULL }, 2237,  "udp" },
-  { "aviva-sna",       { NULL }, 2238,  "tcp" },
-  { "aviva-sna",       { NULL }, 2238,  "udp" },
-  { "imagequery",      { NULL }, 2239,  "tcp" },
-  { "imagequery",      { NULL }, 2239,  "udp" },
-  { "recipe",          { NULL }, 2240,  "tcp" },
-  { "recipe",          { NULL }, 2240,  "udp" },
-  { "ivsd",            { NULL }, 2241,  "tcp" },
-  { "ivsd",            { NULL }, 2241,  "udp" },
-  { "foliocorp",       { NULL }, 2242,  "tcp" },
-  { "foliocorp",       { NULL }, 2242,  "udp" },
-  { "magicom",         { NULL }, 2243,  "tcp" },
-  { "magicom",         { NULL }, 2243,  "udp" },
-  { "nmsserver",       { NULL }, 2244,  "tcp" },
-  { "nmsserver",       { NULL }, 2244,  "udp" },
-  { "hao",             { NULL }, 2245,  "tcp" },
-  { "hao",             { NULL }, 2245,  "udp" },
-  { "pc-mta-addrmap",  { NULL }, 2246,  "tcp" },
-  { "pc-mta-addrmap",  { NULL }, 2246,  "udp" },
-  { "antidotemgrsvr",  { NULL }, 2247,  "tcp" },
-  { "antidotemgrsvr",  { NULL }, 2247,  "udp" },
-  { "ums",             { NULL }, 2248,  "tcp" },
-  { "ums",             { NULL }, 2248,  "udp" },
-  { "rfmp",            { NULL }, 2249,  "tcp" },
-  { "rfmp",            { NULL }, 2249,  "udp" },
-  { "remote-collab",   { NULL }, 2250,  "tcp" },
-  { "remote-collab",   { NULL }, 2250,  "udp" },
-  { "dif-port",        { NULL }, 2251,  "tcp" },
-  { "dif-port",        { NULL }, 2251,  "udp" },
-  { "njenet-ssl",      { NULL }, 2252,  "tcp" },
-  { "njenet-ssl",      { NULL }, 2252,  "udp" },
-  { "dtv-chan-req",    { NULL }, 2253,  "tcp" },
-  { "dtv-chan-req",    { NULL }, 2253,  "udp" },
-  { "seispoc",         { NULL }, 2254,  "tcp" },
-  { "seispoc",         { NULL }, 2254,  "udp" },
-  { "vrtp",            { NULL }, 2255,  "tcp" },
-  { "vrtp",            { NULL }, 2255,  "udp" },
-  { "pcc-mfp",         { NULL }, 2256,  "tcp" },
-  { "pcc-mfp",         { NULL }, 2256,  "udp" },
-  { "simple-tx-rx",    { NULL }, 2257,  "tcp" },
-  { "simple-tx-rx",    { NULL }, 2257,  "udp" },
-  { "rcts",            { NULL }, 2258,  "tcp" },
-  { "rcts",            { NULL }, 2258,  "udp" },
-  { "acd-pm",          { NULL }, 2259,  "tcp" },
-  { "acd-pm",          { NULL }, 2259,  "udp" },
-  { "apc-2260",        { NULL }, 2260,  "tcp" },
-  { "apc-2260",        { NULL }, 2260,  "udp" },
-  { "comotionmaster",  { NULL }, 2261,  "tcp" },
-  { "comotionmaster",  { NULL }, 2261,  "udp" },
-  { "comotionback",    { NULL }, 2262,  "tcp" },
-  { "comotionback",    { NULL }, 2262,  "udp" },
-  { "ecwcfg",          { NULL }, 2263,  "tcp" },
-  { "ecwcfg",          { NULL }, 2263,  "udp" },
-  { "apx500api-1",     { NULL }, 2264,  "tcp" },
-  { "apx500api-1",     { NULL }, 2264,  "udp" },
-  { "apx500api-2",     { NULL }, 2265,  "tcp" },
-  { "apx500api-2",     { NULL }, 2265,  "udp" },
-  { "mfserver",        { NULL }, 2266,  "tcp" },
-  { "mfserver",        { NULL }, 2266,  "udp" },
-  { "ontobroker",      { NULL }, 2267,  "tcp" },
-  { "ontobroker",      { NULL }, 2267,  "udp" },
-  { "amt",             { NULL }, 2268,  "tcp" },
-  { "amt",             { NULL }, 2268,  "udp" },
-  { "mikey",           { NULL }, 2269,  "tcp" },
-  { "mikey",           { NULL }, 2269,  "udp" },
-  { "starschool",      { NULL }, 2270,  "tcp" },
-  { "starschool",      { NULL }, 2270,  "udp" },
-  { "mmcals",          { NULL }, 2271,  "tcp" },
-  { "mmcals",          { NULL }, 2271,  "udp" },
-  { "mmcal",           { NULL }, 2272,  "tcp" },
-  { "mmcal",           { NULL }, 2272,  "udp" },
-  { "mysql-im",        { NULL }, 2273,  "tcp" },
-  { "mysql-im",        { NULL }, 2273,  "udp" },
-  { "pcttunnell",      { NULL }, 2274,  "tcp" },
-  { "pcttunnell",      { NULL }, 2274,  "udp" },
-  { "ibridge-data",    { NULL }, 2275,  "tcp" },
-  { "ibridge-data",    { NULL }, 2275,  "udp" },
-  { "ibridge-mgmt",    { NULL }, 2276,  "tcp" },
-  { "ibridge-mgmt",    { NULL }, 2276,  "udp" },
-  { "bluectrlproxy",   { NULL }, 2277,  "tcp" },
-  { "bluectrlproxy",   { NULL }, 2277,  "udp" },
-  { "s3db",            { NULL }, 2278,  "tcp" },
-  { "s3db",            { NULL }, 2278,  "udp" },
-  { "xmquery",         { NULL }, 2279,  "tcp" },
-  { "xmquery",         { NULL }, 2279,  "udp" },
-  { "lnvpoller",       { NULL }, 2280,  "tcp" },
-  { "lnvpoller",       { NULL }, 2280,  "udp" },
-  { "lnvconsole",      { NULL }, 2281,  "tcp" },
-  { "lnvconsole",      { NULL }, 2281,  "udp" },
-  { "lnvalarm",        { NULL }, 2282,  "tcp" },
-  { "lnvalarm",        { NULL }, 2282,  "udp" },
-  { "lnvstatus",       { NULL }, 2283,  "tcp" },
-  { "lnvstatus",       { NULL }, 2283,  "udp" },
-  { "lnvmaps",         { NULL }, 2284,  "tcp" },
-  { "lnvmaps",         { NULL }, 2284,  "udp" },
-  { "lnvmailmon",      { NULL }, 2285,  "tcp" },
-  { "lnvmailmon",      { NULL }, 2285,  "udp" },
-  { "nas-metering",    { NULL }, 2286,  "tcp" },
-  { "nas-metering",    { NULL }, 2286,  "udp" },
-  { "dna",             { NULL }, 2287,  "tcp" },
-  { "dna",             { NULL }, 2287,  "udp" },
-  { "netml",           { NULL }, 2288,  "tcp" },
-  { "netml",           { NULL }, 2288,  "udp" },
-  { "dict-lookup",     { NULL }, 2289,  "tcp" },
-  { "dict-lookup",     { NULL }, 2289,  "udp" },
-  { "sonus-logging",   { NULL }, 2290,  "tcp" },
-  { "sonus-logging",   { NULL }, 2290,  "udp" },
-  { "eapsp",           { NULL }, 2291,  "tcp" },
-  { "eapsp",           { NULL }, 2291,  "udp" },
-  { "mib-streaming",   { NULL }, 2292,  "tcp" },
-  { "mib-streaming",   { NULL }, 2292,  "udp" },
-  { "npdbgmngr",       { NULL }, 2293,  "tcp" },
-  { "npdbgmngr",       { NULL }, 2293,  "udp" },
-  { "konshus-lm",      { NULL }, 2294,  "tcp" },
-  { "konshus-lm",      { NULL }, 2294,  "udp" },
-  { "advant-lm",       { NULL }, 2295,  "tcp" },
-  { "advant-lm",       { NULL }, 2295,  "udp" },
-  { "theta-lm",        { NULL }, 2296,  "tcp" },
-  { "theta-lm",        { NULL }, 2296,  "udp" },
-  { "d2k-datamover1",  { NULL }, 2297,  "tcp" },
-  { "d2k-datamover1",  { NULL }, 2297,  "udp" },
-  { "d2k-datamover2",  { NULL }, 2298,  "tcp" },
-  { "d2k-datamover2",  { NULL }, 2298,  "udp" },
-  { "pc-telecommute",  { NULL }, 2299,  "tcp" },
-  { "pc-telecommute",  { NULL }, 2299,  "udp" },
-  { "cvmmon",          { NULL }, 2300,  "tcp" },
-  { "cvmmon",          { NULL }, 2300,  "udp" },
-  { "cpq-wbem",        { NULL }, 2301,  "tcp" },
-  { "cpq-wbem",        { NULL }, 2301,  "udp" },
-  { "binderysupport",  { NULL }, 2302,  "tcp" },
-  { "binderysupport",  { NULL }, 2302,  "udp" },
-  { "proxy-gateway",   { NULL }, 2303,  "tcp" },
-  { "proxy-gateway",   { NULL }, 2303,  "udp" },
-  { "attachmate-uts",  { NULL }, 2304,  "tcp" },
-  { "attachmate-uts",  { NULL }, 2304,  "udp" },
-  { "mt-scaleserver",  { NULL }, 2305,  "tcp" },
-  { "mt-scaleserver",  { NULL }, 2305,  "udp" },
-  { "tappi-boxnet",    { NULL }, 2306,  "tcp" },
-  { "tappi-boxnet",    { NULL }, 2306,  "udp" },
-  { "pehelp",          { NULL }, 2307,  "tcp" },
-  { "pehelp",          { NULL }, 2307,  "udp" },
-  { "sdhelp",          { NULL }, 2308,  "tcp" },
-  { "sdhelp",          { NULL }, 2308,  "udp" },
-  { "sdserver",        { NULL }, 2309,  "tcp" },
-  { "sdserver",        { NULL }, 2309,  "udp" },
-  { "sdclient",        { NULL }, 2310,  "tcp" },
-  { "sdclient",        { NULL }, 2310,  "udp" },
-  { "messageservice",  { NULL }, 2311,  "tcp" },
-  { "messageservice",  { NULL }, 2311,  "udp" },
-  { "wanscaler",       { NULL }, 2312,  "tcp" },
-  { "wanscaler",       { NULL }, 2312,  "udp" },
-  { "iapp",            { NULL }, 2313,  "tcp" },
-  { "iapp",            { NULL }, 2313,  "udp" },
-  { "cr-websystems",   { NULL }, 2314,  "tcp" },
-  { "cr-websystems",   { NULL }, 2314,  "udp" },
-  { "precise-sft",     { NULL }, 2315,  "tcp" },
-  { "precise-sft",     { NULL }, 2315,  "udp" },
-  { "sent-lm",         { NULL }, 2316,  "tcp" },
-  { "sent-lm",         { NULL }, 2316,  "udp" },
-  { "attachmate-g32",  { NULL }, 2317,  "tcp" },
-  { "attachmate-g32",  { NULL }, 2317,  "udp" },
-  { "cadencecontrol",  { NULL }, 2318,  "tcp" },
-  { "cadencecontrol",  { NULL }, 2318,  "udp" },
-  { "infolibria",      { NULL }, 2319,  "tcp" },
-  { "infolibria",      { NULL }, 2319,  "udp" },
-  { "siebel-ns",       { NULL }, 2320,  "tcp" },
-  { "siebel-ns",       { NULL }, 2320,  "udp" },
-  { "rdlap",           { NULL }, 2321,  "tcp" },
-  { "rdlap",           { NULL }, 2321,  "udp" },
-  { "ofsd",            { NULL }, 2322,  "tcp" },
-  { "ofsd",            { NULL }, 2322,  "udp" },
-  { "3d-nfsd",         { NULL }, 2323,  "tcp" },
-  { "3d-nfsd",         { NULL }, 2323,  "udp" },
-  { "cosmocall",       { NULL }, 2324,  "tcp" },
-  { "cosmocall",       { NULL }, 2324,  "udp" },
-  { "ansysli",         { NULL }, 2325,  "tcp" },
-  { "ansysli",         { NULL }, 2325,  "udp" },
-  { "idcp",            { NULL }, 2326,  "tcp" },
-  { "idcp",            { NULL }, 2326,  "udp" },
-  { "xingcsm",         { NULL }, 2327,  "tcp" },
-  { "xingcsm",         { NULL }, 2327,  "udp" },
-  { "netrix-sftm",     { NULL }, 2328,  "tcp" },
-  { "netrix-sftm",     { NULL }, 2328,  "udp" },
-  { "nvd",             { NULL }, 2329,  "tcp" },
-  { "nvd",             { NULL }, 2329,  "udp" },
-  { "tscchat",         { NULL }, 2330,  "tcp" },
-  { "tscchat",         { NULL }, 2330,  "udp" },
-  { "agentview",       { NULL }, 2331,  "tcp" },
-  { "agentview",       { NULL }, 2331,  "udp" },
-  { "rcc-host",        { NULL }, 2332,  "tcp" },
-  { "rcc-host",        { NULL }, 2332,  "udp" },
-  { "snapp",           { NULL }, 2333,  "tcp" },
-  { "snapp",           { NULL }, 2333,  "udp" },
-  { "ace-client",      { NULL }, 2334,  "tcp" },
-  { "ace-client",      { NULL }, 2334,  "udp" },
-  { "ace-proxy",       { NULL }, 2335,  "tcp" },
-  { "ace-proxy",       { NULL }, 2335,  "udp" },
-  { "appleugcontrol",  { NULL }, 2336,  "tcp" },
-  { "appleugcontrol",  { NULL }, 2336,  "udp" },
-  { "ideesrv",         { NULL }, 2337,  "tcp" },
-  { "ideesrv",         { NULL }, 2337,  "udp" },
-  { "norton-lambert",  { NULL }, 2338,  "tcp" },
-  { "norton-lambert",  { NULL }, 2338,  "udp" },
-  { "3com-webview",    { NULL }, 2339,  "tcp" },
-  { "3com-webview",    { NULL }, 2339,  "udp" },
-  { "wrs_registry",    { NULL }, 2340,  "tcp" },
-  { "wrs_registry",    { NULL }, 2340,  "udp" },
-  { "xiostatus",       { NULL }, 2341,  "tcp" },
-  { "xiostatus",       { NULL }, 2341,  "udp" },
-  { "manage-exec",     { NULL }, 2342,  "tcp" },
-  { "manage-exec",     { NULL }, 2342,  "udp" },
-  { "nati-logos",      { NULL }, 2343,  "tcp" },
-  { "nati-logos",      { NULL }, 2343,  "udp" },
-  { "fcmsys",          { NULL }, 2344,  "tcp" },
-  { "fcmsys",          { NULL }, 2344,  "udp" },
-  { "dbm",             { NULL }, 2345,  "tcp" },
-  { "dbm",             { NULL }, 2345,  "udp" },
-  { "redstorm_join",   { NULL }, 2346,  "tcp" },
-  { "redstorm_join",   { NULL }, 2346,  "udp" },
-  { "redstorm_find",   { NULL }, 2347,  "tcp" },
-  { "redstorm_find",   { NULL }, 2347,  "udp" },
-  { "redstorm_info",   { NULL }, 2348,  "tcp" },
-  { "redstorm_info",   { NULL }, 2348,  "udp" },
-  { "redstorm_diag",   { NULL }, 2349,  "tcp" },
-  { "redstorm_diag",   { NULL }, 2349,  "udp" },
-  { "psbserver",       { NULL }, 2350,  "tcp" },
-  { "psbserver",       { NULL }, 2350,  "udp" },
-  { "psrserver",       { NULL }, 2351,  "tcp" },
-  { "psrserver",       { NULL }, 2351,  "udp" },
-  { "pslserver",       { NULL }, 2352,  "tcp" },
-  { "pslserver",       { NULL }, 2352,  "udp" },
-  { "pspserver",       { NULL }, 2353,  "tcp" },
-  { "pspserver",       { NULL }, 2353,  "udp" },
-  { "psprserver",      { NULL }, 2354,  "tcp" },
-  { "psprserver",      { NULL }, 2354,  "udp" },
-  { "psdbserver",      { NULL }, 2355,  "tcp" },
-  { "psdbserver",      { NULL }, 2355,  "udp" },
-  { "gxtelmd",         { NULL }, 2356,  "tcp" },
-  { "gxtelmd",         { NULL }, 2356,  "udp" },
-  { "unihub-server",   { NULL }, 2357,  "tcp" },
-  { "unihub-server",   { NULL }, 2357,  "udp" },
-  { "futrix",          { NULL }, 2358,  "tcp" },
-  { "futrix",          { NULL }, 2358,  "udp" },
-  { "flukeserver",     { NULL }, 2359,  "tcp" },
-  { "flukeserver",     { NULL }, 2359,  "udp" },
-  { "nexstorindltd",   { NULL }, 2360,  "tcp" },
-  { "nexstorindltd",   { NULL }, 2360,  "udp" },
-  { "tl1",             { NULL }, 2361,  "tcp" },
-  { "tl1",             { NULL }, 2361,  "udp" },
-  { "digiman",         { NULL }, 2362,  "tcp" },
-  { "digiman",         { NULL }, 2362,  "udp" },
-  { "mediacntrlnfsd",  { NULL }, 2363,  "tcp" },
-  { "mediacntrlnfsd",  { NULL }, 2363,  "udp" },
-  { "oi-2000",         { NULL }, 2364,  "tcp" },
-  { "oi-2000",         { NULL }, 2364,  "udp" },
-  { "dbref",           { NULL }, 2365,  "tcp" },
-  { "dbref",           { NULL }, 2365,  "udp" },
-  { "qip-login",       { NULL }, 2366,  "tcp" },
-  { "qip-login",       { NULL }, 2366,  "udp" },
-  { "service-ctrl",    { NULL }, 2367,  "tcp" },
-  { "service-ctrl",    { NULL }, 2367,  "udp" },
-  { "opentable",       { NULL }, 2368,  "tcp" },
-  { "opentable",       { NULL }, 2368,  "udp" },
-  { "l3-hbmon",        { NULL }, 2370,  "tcp" },
-  { "l3-hbmon",        { NULL }, 2370,  "udp" },
-  { "worldwire",       { NULL }, 2371,  "tcp" },
-  { "worldwire",       { NULL }, 2371,  "udp" },
-  { "lanmessenger",    { NULL }, 2372,  "tcp" },
-  { "lanmessenger",    { NULL }, 2372,  "udp" },
-  { "remographlm",     { NULL }, 2373,  "tcp" },
-  { "hydra",           { NULL }, 2374,  "tcp" },
-  { "compaq-https",    { NULL }, 2381,  "tcp" },
-  { "compaq-https",    { NULL }, 2381,  "udp" },
-  { "ms-olap3",        { NULL }, 2382,  "tcp" },
-  { "ms-olap3",        { NULL }, 2382,  "udp" },
-  { "ms-olap4",        { NULL }, 2383,  "tcp" },
-  { "ms-olap4",        { NULL }, 2383,  "udp" },
-  { "sd-request",      { NULL }, 2384,  "tcp" },
-  { "sd-capacity",     { NULL }, 2384,  "udp" },
-  { "sd-data",         { NULL }, 2385,  "tcp" },
-  { "sd-data",         { NULL }, 2385,  "udp" },
-  { "virtualtape",     { NULL }, 2386,  "tcp" },
-  { "virtualtape",     { NULL }, 2386,  "udp" },
-  { "vsamredirector",  { NULL }, 2387,  "tcp" },
-  { "vsamredirector",  { NULL }, 2387,  "udp" },
-  { "mynahautostart",  { NULL }, 2388,  "tcp" },
-  { "mynahautostart",  { NULL }, 2388,  "udp" },
-  { "ovsessionmgr",    { NULL }, 2389,  "tcp" },
-  { "ovsessionmgr",    { NULL }, 2389,  "udp" },
-  { "rsmtp",           { NULL }, 2390,  "tcp" },
-  { "rsmtp",           { NULL }, 2390,  "udp" },
-  { "3com-net-mgmt",   { NULL }, 2391,  "tcp" },
-  { "3com-net-mgmt",   { NULL }, 2391,  "udp" },
-  { "tacticalauth",    { NULL }, 2392,  "tcp" },
-  { "tacticalauth",    { NULL }, 2392,  "udp" },
-  { "ms-olap1",        { NULL }, 2393,  "tcp" },
-  { "ms-olap1",        { NULL }, 2393,  "udp" },
-  { "ms-olap2",        { NULL }, 2394,  "tcp" },
-  { "ms-olap2",        { NULL }, 2394,  "udp" },
-  { "lan900_remote",   { NULL }, 2395,  "tcp" },
-  { "lan900_remote",   { NULL }, 2395,  "udp" },
-  { "wusage",          { NULL }, 2396,  "tcp" },
-  { "wusage",          { NULL }, 2396,  "udp" },
-  { "ncl",             { NULL }, 2397,  "tcp" },
-  { "ncl",             { NULL }, 2397,  "udp" },
-  { "orbiter",         { NULL }, 2398,  "tcp" },
-  { "orbiter",         { NULL }, 2398,  "udp" },
-  { "fmpro-fdal",      { NULL }, 2399,  "tcp" },
-  { "fmpro-fdal",      { NULL }, 2399,  "udp" },
-  { "opequus-server",  { NULL }, 2400,  "tcp" },
-  { "opequus-server",  { NULL }, 2400,  "udp" },
-  { "cvspserver",      { NULL }, 2401,  "tcp" },
-  { "cvspserver",      { NULL }, 2401,  "udp" },
-  { "taskmaster2000",  { NULL }, 2402,  "tcp" },
-  { "taskmaster2000",  { NULL }, 2402,  "udp" },
-  { "taskmaster2000",  { NULL }, 2403,  "tcp" },
-  { "taskmaster2000",  { NULL }, 2403,  "udp" },
-  { "iec-104",         { NULL }, 2404,  "tcp" },
-  { "iec-104",         { NULL }, 2404,  "udp" },
-  { "trc-netpoll",     { NULL }, 2405,  "tcp" },
-  { "trc-netpoll",     { NULL }, 2405,  "udp" },
-  { "jediserver",      { NULL }, 2406,  "tcp" },
-  { "jediserver",      { NULL }, 2406,  "udp" },
-  { "orion",           { NULL }, 2407,  "tcp" },
-  { "orion",           { NULL }, 2407,  "udp" },
-  { "optimanet",       { NULL }, 2408,  "tcp" },
-  { "optimanet",       { NULL }, 2408,  "udp" },
-  { "sns-protocol",    { NULL }, 2409,  "tcp" },
-  { "sns-protocol",    { NULL }, 2409,  "udp" },
-  { "vrts-registry",   { NULL }, 2410,  "tcp" },
-  { "vrts-registry",   { NULL }, 2410,  "udp" },
-  { "netwave-ap-mgmt", { NULL }, 2411,  "tcp" },
-  { "netwave-ap-mgmt", { NULL }, 2411,  "udp" },
-  { "cdn",             { NULL }, 2412,  "tcp" },
-  { "cdn",             { NULL }, 2412,  "udp" },
-  { "orion-rmi-reg",   { NULL }, 2413,  "tcp" },
-  { "orion-rmi-reg",   { NULL }, 2413,  "udp" },
-  { "beeyond",         { NULL }, 2414,  "tcp" },
-  { "beeyond",         { NULL }, 2414,  "udp" },
-  { "codima-rtp",      { NULL }, 2415,  "tcp" },
-  { "codima-rtp",      { NULL }, 2415,  "udp" },
-  { "rmtserver",       { NULL }, 2416,  "tcp" },
-  { "rmtserver",       { NULL }, 2416,  "udp" },
-  { "composit-server", { NULL }, 2417,  "tcp" },
-  { "composit-server", { NULL }, 2417,  "udp" },
-  { "cas",             { NULL }, 2418,  "tcp" },
-  { "cas",             { NULL }, 2418,  "udp" },
-  { "attachmate-s2s",  { NULL }, 2419,  "tcp" },
-  { "attachmate-s2s",  { NULL }, 2419,  "udp" },
-  { "dslremote-mgmt",  { NULL }, 2420,  "tcp" },
-  { "dslremote-mgmt",  { NULL }, 2420,  "udp" },
-  { "g-talk",          { NULL }, 2421,  "tcp" },
-  { "g-talk",          { NULL }, 2421,  "udp" },
-  { "crmsbits",        { NULL }, 2422,  "tcp" },
-  { "crmsbits",        { NULL }, 2422,  "udp" },
-  { "rnrp",            { NULL }, 2423,  "tcp" },
-  { "rnrp",            { NULL }, 2423,  "udp" },
-  { "kofax-svr",       { NULL }, 2424,  "tcp" },
-  { "kofax-svr",       { NULL }, 2424,  "udp" },
-  { "fjitsuappmgr",    { NULL }, 2425,  "tcp" },
-  { "fjitsuappmgr",    { NULL }, 2425,  "udp" },
-  { "mgcp-gateway",    { NULL }, 2427,  "tcp" },
-  { "mgcp-gateway",    { NULL }, 2427,  "udp" },
-  { "ott",             { NULL }, 2428,  "tcp" },
-  { "ott",             { NULL }, 2428,  "udp" },
-  { "ft-role",         { NULL }, 2429,  "tcp" },
-  { "ft-role",         { NULL }, 2429,  "udp" },
-  { "venus",           { NULL }, 2430,  "tcp" },
-  { "venus",           { NULL }, 2430,  "udp" },
-  { "venus-se",        { NULL }, 2431,  "tcp" },
-  { "venus-se",        { NULL }, 2431,  "udp" },
-  { "codasrv",         { NULL }, 2432,  "tcp" },
-  { "codasrv",         { NULL }, 2432,  "udp" },
-  { "codasrv-se",      { NULL }, 2433,  "tcp" },
-  { "codasrv-se",      { NULL }, 2433,  "udp" },
-  { "pxc-epmap",       { NULL }, 2434,  "tcp" },
-  { "pxc-epmap",       { NULL }, 2434,  "udp" },
-  { "optilogic",       { NULL }, 2435,  "tcp" },
-  { "optilogic",       { NULL }, 2435,  "udp" },
-  { "topx",            { NULL }, 2436,  "tcp" },
-  { "topx",            { NULL }, 2436,  "udp" },
-  { "unicontrol",      { NULL }, 2437,  "tcp" },
-  { "unicontrol",      { NULL }, 2437,  "udp" },
-  { "msp",             { NULL }, 2438,  "tcp" },
-  { "msp",             { NULL }, 2438,  "udp" },
-  { "sybasedbsynch",   { NULL }, 2439,  "tcp" },
-  { "sybasedbsynch",   { NULL }, 2439,  "udp" },
-  { "spearway",        { NULL }, 2440,  "tcp" },
-  { "spearway",        { NULL }, 2440,  "udp" },
-  { "pvsw-inet",       { NULL }, 2441,  "tcp" },
-  { "pvsw-inet",       { NULL }, 2441,  "udp" },
-  { "netangel",        { NULL }, 2442,  "tcp" },
-  { "netangel",        { NULL }, 2442,  "udp" },
-  { "powerclientcsf",  { NULL }, 2443,  "tcp" },
-  { "powerclientcsf",  { NULL }, 2443,  "udp" },
-  { "btpp2sectrans",   { NULL }, 2444,  "tcp" },
-  { "btpp2sectrans",   { NULL }, 2444,  "udp" },
-  { "dtn1",            { NULL }, 2445,  "tcp" },
-  { "dtn1",            { NULL }, 2445,  "udp" },
-  { "bues_service",    { NULL }, 2446,  "tcp" },
-  { "bues_service",    { NULL }, 2446,  "udp" },
-  { "ovwdb",           { NULL }, 2447,  "tcp" },
-  { "ovwdb",           { NULL }, 2447,  "udp" },
-  { "hpppssvr",        { NULL }, 2448,  "tcp" },
-  { "hpppssvr",        { NULL }, 2448,  "udp" },
-  { "ratl",            { NULL }, 2449,  "tcp" },
-  { "ratl",            { NULL }, 2449,  "udp" },
-  { "netadmin",        { NULL }, 2450,  "tcp" },
-  { "netadmin",        { NULL }, 2450,  "udp" },
-  { "netchat",         { NULL }, 2451,  "tcp" },
-  { "netchat",         { NULL }, 2451,  "udp" },
-  { "snifferclient",   { NULL }, 2452,  "tcp" },
-  { "snifferclient",   { NULL }, 2452,  "udp" },
-  { "madge-ltd",       { NULL }, 2453,  "tcp" },
-  { "madge-ltd",       { NULL }, 2453,  "udp" },
-  { "indx-dds",        { NULL }, 2454,  "tcp" },
-  { "indx-dds",        { NULL }, 2454,  "udp" },
-  { "wago-io-system",  { NULL }, 2455,  "tcp" },
-  { "wago-io-system",  { NULL }, 2455,  "udp" },
-  { "altav-remmgt",    { NULL }, 2456,  "tcp" },
-  { "altav-remmgt",    { NULL }, 2456,  "udp" },
-  { "rapido-ip",       { NULL }, 2457,  "tcp" },
-  { "rapido-ip",       { NULL }, 2457,  "udp" },
-  { "griffin",         { NULL }, 2458,  "tcp" },
-  { "griffin",         { NULL }, 2458,  "udp" },
-  { "community",       { NULL }, 2459,  "tcp" },
-  { "community",       { NULL }, 2459,  "udp" },
-  { "ms-theater",      { NULL }, 2460,  "tcp" },
-  { "ms-theater",      { NULL }, 2460,  "udp" },
-  { "qadmifoper",      { NULL }, 2461,  "tcp" },
-  { "qadmifoper",      { NULL }, 2461,  "udp" },
-  { "qadmifevent",     { NULL }, 2462,  "tcp" },
-  { "qadmifevent",     { NULL }, 2462,  "udp" },
-  { "lsi-raid-mgmt",   { NULL }, 2463,  "tcp" },
-  { "lsi-raid-mgmt",   { NULL }, 2463,  "udp" },
-  { "direcpc-si",      { NULL }, 2464,  "tcp" },
-  { "direcpc-si",      { NULL }, 2464,  "udp" },
-  { "lbm",             { NULL }, 2465,  "tcp" },
-  { "lbm",             { NULL }, 2465,  "udp" },
-  { "lbf",             { NULL }, 2466,  "tcp" },
-  { "lbf",             { NULL }, 2466,  "udp" },
-  { "high-criteria",   { NULL }, 2467,  "tcp" },
-  { "high-criteria",   { NULL }, 2467,  "udp" },
-  { "qip-msgd",        { NULL }, 2468,  "tcp" },
-  { "qip-msgd",        { NULL }, 2468,  "udp" },
-  { "mti-tcs-comm",    { NULL }, 2469,  "tcp" },
-  { "mti-tcs-comm",    { NULL }, 2469,  "udp" },
-  { "taskman-port",    { NULL }, 2470,  "tcp" },
-  { "taskman-port",    { NULL }, 2470,  "udp" },
-  { "seaodbc",         { NULL }, 2471,  "tcp" },
-  { "seaodbc",         { NULL }, 2471,  "udp" },
-  { "c3",              { NULL }, 2472,  "tcp" },
-  { "c3",              { NULL }, 2472,  "udp" },
-  { "aker-cdp",        { NULL }, 2473,  "tcp" },
-  { "aker-cdp",        { NULL }, 2473,  "udp" },
-  { "vitalanalysis",   { NULL }, 2474,  "tcp" },
-  { "vitalanalysis",   { NULL }, 2474,  "udp" },
-  { "ace-server",      { NULL }, 2475,  "tcp" },
-  { "ace-server",      { NULL }, 2475,  "udp" },
-  { "ace-svr-prop",    { NULL }, 2476,  "tcp" },
-  { "ace-svr-prop",    { NULL }, 2476,  "udp" },
-  { "ssm-cvs",         { NULL }, 2477,  "tcp" },
-  { "ssm-cvs",         { NULL }, 2477,  "udp" },
-  { "ssm-cssps",       { NULL }, 2478,  "tcp" },
-  { "ssm-cssps",       { NULL }, 2478,  "udp" },
-  { "ssm-els",         { NULL }, 2479,  "tcp" },
-  { "ssm-els",         { NULL }, 2479,  "udp" },
-  { "powerexchange",   { NULL }, 2480,  "tcp" },
-  { "powerexchange",   { NULL }, 2480,  "udp" },
-  { "giop",            { NULL }, 2481,  "tcp" },
-  { "giop",            { NULL }, 2481,  "udp" },
-  { "giop-ssl",        { NULL }, 2482,  "tcp" },
-  { "giop-ssl",        { NULL }, 2482,  "udp" },
-  { "ttc",             { NULL }, 2483,  "tcp" },
-  { "ttc",             { NULL }, 2483,  "udp" },
-  { "ttc-ssl",         { NULL }, 2484,  "tcp" },
-  { "ttc-ssl",         { NULL }, 2484,  "udp" },
-  { "netobjects1",     { NULL }, 2485,  "tcp" },
-  { "netobjects1",     { NULL }, 2485,  "udp" },
-  { "netobjects2",     { NULL }, 2486,  "tcp" },
-  { "netobjects2",     { NULL }, 2486,  "udp" },
-  { "pns",             { NULL }, 2487,  "tcp" },
-  { "pns",             { NULL }, 2487,  "udp" },
-  { "moy-corp",        { NULL }, 2488,  "tcp" },
-  { "moy-corp",        { NULL }, 2488,  "udp" },
-  { "tsilb",           { NULL }, 2489,  "tcp" },
-  { "tsilb",           { NULL }, 2489,  "udp" },
-  { "qip-qdhcp",       { NULL }, 2490,  "tcp" },
-  { "qip-qdhcp",       { NULL }, 2490,  "udp" },
-  { "conclave-cpp",    { NULL }, 2491,  "tcp" },
-  { "conclave-cpp",    { NULL }, 2491,  "udp" },
-  { "groove",          { NULL }, 2492,  "tcp" },
-  { "groove",          { NULL }, 2492,  "udp" },
-  { "talarian-mqs",    { NULL }, 2493,  "tcp" },
-  { "talarian-mqs",    { NULL }, 2493,  "udp" },
-  { "bmc-ar",          { NULL }, 2494,  "tcp" },
-  { "bmc-ar",          { NULL }, 2494,  "udp" },
-  { "fast-rem-serv",   { NULL }, 2495,  "tcp" },
-  { "fast-rem-serv",   { NULL }, 2495,  "udp" },
-  { "dirgis",          { NULL }, 2496,  "tcp" },
-  { "dirgis",          { NULL }, 2496,  "udp" },
-  { "quaddb",          { NULL }, 2497,  "tcp" },
-  { "quaddb",          { NULL }, 2497,  "udp" },
-  { "odn-castraq",     { NULL }, 2498,  "tcp" },
-  { "odn-castraq",     { NULL }, 2498,  "udp" },
-  { "unicontrol",      { NULL }, 2499,  "tcp" },
-  { "unicontrol",      { NULL }, 2499,  "udp" },
-  { "rtsserv",         { NULL }, 2500,  "tcp" },
-  { "rtsserv",         { NULL }, 2500,  "udp" },
-  { "rtsclient",       { NULL }, 2501,  "tcp" },
-  { "rtsclient",       { NULL }, 2501,  "udp" },
-  { "kentrox-prot",    { NULL }, 2502,  "tcp" },
-  { "kentrox-prot",    { NULL }, 2502,  "udp" },
-  { "nms-dpnss",       { NULL }, 2503,  "tcp" },
-  { "nms-dpnss",       { NULL }, 2503,  "udp" },
-  { "wlbs",            { NULL }, 2504,  "tcp" },
-  { "wlbs",            { NULL }, 2504,  "udp" },
-  { "ppcontrol",       { NULL }, 2505,  "tcp" },
-  { "ppcontrol",       { NULL }, 2505,  "udp" },
-  { "jbroker",         { NULL }, 2506,  "tcp" },
-  { "jbroker",         { NULL }, 2506,  "udp" },
-  { "spock",           { NULL }, 2507,  "tcp" },
-  { "spock",           { NULL }, 2507,  "udp" },
-  { "jdatastore",      { NULL }, 2508,  "tcp" },
-  { "jdatastore",      { NULL }, 2508,  "udp" },
-  { "fjmpss",          { NULL }, 2509,  "tcp" },
-  { "fjmpss",          { NULL }, 2509,  "udp" },
-  { "fjappmgrbulk",    { NULL }, 2510,  "tcp" },
-  { "fjappmgrbulk",    { NULL }, 2510,  "udp" },
-  { "metastorm",       { NULL }, 2511,  "tcp" },
-  { "metastorm",       { NULL }, 2511,  "udp" },
-  { "citrixima",       { NULL }, 2512,  "tcp" },
-  { "citrixima",       { NULL }, 2512,  "udp" },
-  { "citrixadmin",     { NULL }, 2513,  "tcp" },
-  { "citrixadmin",     { NULL }, 2513,  "udp" },
-  { "facsys-ntp",      { NULL }, 2514,  "tcp" },
-  { "facsys-ntp",      { NULL }, 2514,  "udp" },
-  { "facsys-router",   { NULL }, 2515,  "tcp" },
-  { "facsys-router",   { NULL }, 2515,  "udp" },
-  { "maincontrol",     { NULL }, 2516,  "tcp" },
-  { "maincontrol",     { NULL }, 2516,  "udp" },
-  { "call-sig-trans",  { NULL }, 2517,  "tcp" },
-  { "call-sig-trans",  { NULL }, 2517,  "udp" },
-  { "willy",           { NULL }, 2518,  "tcp" },
-  { "willy",           { NULL }, 2518,  "udp" },
-  { "globmsgsvc",      { NULL }, 2519,  "tcp" },
-  { "globmsgsvc",      { NULL }, 2519,  "udp" },
-  { "pvsw",            { NULL }, 2520,  "tcp" },
-  { "pvsw",            { NULL }, 2520,  "udp" },
-  { "adaptecmgr",      { NULL }, 2521,  "tcp" },
-  { "adaptecmgr",      { NULL }, 2521,  "udp" },
-  { "windb",           { NULL }, 2522,  "tcp" },
-  { "windb",           { NULL }, 2522,  "udp" },
-  { "qke-llc-v3",      { NULL }, 2523,  "tcp" },
-  { "qke-llc-v3",      { NULL }, 2523,  "udp" },
-  { "optiwave-lm",     { NULL }, 2524,  "tcp" },
-  { "optiwave-lm",     { NULL }, 2524,  "udp" },
-  { "ms-v-worlds",     { NULL }, 2525,  "tcp" },
-  { "ms-v-worlds",     { NULL }, 2525,  "udp" },
-  { "ema-sent-lm",     { NULL }, 2526,  "tcp" },
-  { "ema-sent-lm",     { NULL }, 2526,  "udp" },
-  { "iqserver",        { NULL }, 2527,  "tcp" },
-  { "iqserver",        { NULL }, 2527,  "udp" },
-  { "ncr_ccl",         { NULL }, 2528,  "tcp" },
-  { "ncr_ccl",         { NULL }, 2528,  "udp" },
-  { "utsftp",          { NULL }, 2529,  "tcp" },
-  { "utsftp",          { NULL }, 2529,  "udp" },
-  { "vrcommerce",      { NULL }, 2530,  "tcp" },
-  { "vrcommerce",      { NULL }, 2530,  "udp" },
-  { "ito-e-gui",       { NULL }, 2531,  "tcp" },
-  { "ito-e-gui",       { NULL }, 2531,  "udp" },
-  { "ovtopmd",         { NULL }, 2532,  "tcp" },
-  { "ovtopmd",         { NULL }, 2532,  "udp" },
-  { "snifferserver",   { NULL }, 2533,  "tcp" },
-  { "snifferserver",   { NULL }, 2533,  "udp" },
-  { "combox-web-acc",  { NULL }, 2534,  "tcp" },
-  { "combox-web-acc",  { NULL }, 2534,  "udp" },
-  { "madcap",          { NULL }, 2535,  "tcp" },
-  { "madcap",          { NULL }, 2535,  "udp" },
-  { "btpp2audctr1",    { NULL }, 2536,  "tcp" },
-  { "btpp2audctr1",    { NULL }, 2536,  "udp" },
-  { "upgrade",         { NULL }, 2537,  "tcp" },
-  { "upgrade",         { NULL }, 2537,  "udp" },
-  { "vnwk-prapi",      { NULL }, 2538,  "tcp" },
-  { "vnwk-prapi",      { NULL }, 2538,  "udp" },
-  { "vsiadmin",        { NULL }, 2539,  "tcp" },
-  { "vsiadmin",        { NULL }, 2539,  "udp" },
-  { "lonworks",        { NULL }, 2540,  "tcp" },
-  { "lonworks",        { NULL }, 2540,  "udp" },
-  { "lonworks2",       { NULL }, 2541,  "tcp" },
-  { "lonworks2",       { NULL }, 2541,  "udp" },
-  { "udrawgraph",      { NULL }, 2542,  "tcp" },
-  { "udrawgraph",      { NULL }, 2542,  "udp" },
-  { "reftek",          { NULL }, 2543,  "tcp" },
-  { "reftek",          { NULL }, 2543,  "udp" },
-  { "novell-zen",      { NULL }, 2544,  "tcp" },
-  { "novell-zen",      { NULL }, 2544,  "udp" },
-  { "sis-emt",         { NULL }, 2545,  "tcp" },
-  { "sis-emt",         { NULL }, 2545,  "udp" },
-  { "vytalvaultbrtp",  { NULL }, 2546,  "tcp" },
-  { "vytalvaultbrtp",  { NULL }, 2546,  "udp" },
-  { "vytalvaultvsmp",  { NULL }, 2547,  "tcp" },
-  { "vytalvaultvsmp",  { NULL }, 2547,  "udp" },
-  { "vytalvaultpipe",  { NULL }, 2548,  "tcp" },
-  { "vytalvaultpipe",  { NULL }, 2548,  "udp" },
-  { "ipass",           { NULL }, 2549,  "tcp" },
-  { "ipass",           { NULL }, 2549,  "udp" },
-  { "ads",             { NULL }, 2550,  "tcp" },
-  { "ads",             { NULL }, 2550,  "udp" },
-  { "isg-uda-server",  { NULL }, 2551,  "tcp" },
-  { "isg-uda-server",  { NULL }, 2551,  "udp" },
-  { "call-logging",    { NULL }, 2552,  "tcp" },
-  { "call-logging",    { NULL }, 2552,  "udp" },
-  { "efidiningport",   { NULL }, 2553,  "tcp" },
-  { "efidiningport",   { NULL }, 2553,  "udp" },
-  { "vcnet-link-v10",  { NULL }, 2554,  "tcp" },
-  { "vcnet-link-v10",  { NULL }, 2554,  "udp" },
-  { "compaq-wcp",      { NULL }, 2555,  "tcp" },
-  { "compaq-wcp",      { NULL }, 2555,  "udp" },
-  { "nicetec-nmsvc",   { NULL }, 2556,  "tcp" },
-  { "nicetec-nmsvc",   { NULL }, 2556,  "udp" },
-  { "nicetec-mgmt",    { NULL }, 2557,  "tcp" },
-  { "nicetec-mgmt",    { NULL }, 2557,  "udp" },
-  { "pclemultimedia",  { NULL }, 2558,  "tcp" },
-  { "pclemultimedia",  { NULL }, 2558,  "udp" },
-  { "lstp",            { NULL }, 2559,  "tcp" },
-  { "lstp",            { NULL }, 2559,  "udp" },
-  { "labrat",          { NULL }, 2560,  "tcp" },
-  { "labrat",          { NULL }, 2560,  "udp" },
-  { "mosaixcc",        { NULL }, 2561,  "tcp" },
-  { "mosaixcc",        { NULL }, 2561,  "udp" },
-  { "delibo",          { NULL }, 2562,  "tcp" },
-  { "delibo",          { NULL }, 2562,  "udp" },
-  { "cti-redwood",     { NULL }, 2563,  "tcp" },
-  { "cti-redwood",     { NULL }, 2563,  "udp" },
-  { "hp-3000-telnet",  { NULL }, 2564,  "tcp" },
-  { "coord-svr",       { NULL }, 2565,  "tcp" },
-  { "coord-svr",       { NULL }, 2565,  "udp" },
-  { "pcs-pcw",         { NULL }, 2566,  "tcp" },
-  { "pcs-pcw",         { NULL }, 2566,  "udp" },
-  { "clp",             { NULL }, 2567,  "tcp" },
-  { "clp",             { NULL }, 2567,  "udp" },
-  { "spamtrap",        { NULL }, 2568,  "tcp" },
-  { "spamtrap",        { NULL }, 2568,  "udp" },
-  { "sonuscallsig",    { NULL }, 2569,  "tcp" },
-  { "sonuscallsig",    { NULL }, 2569,  "udp" },
-  { "hs-port",         { NULL }, 2570,  "tcp" },
-  { "hs-port",         { NULL }, 2570,  "udp" },
-  { "cecsvc",          { NULL }, 2571,  "tcp" },
-  { "cecsvc",          { NULL }, 2571,  "udp" },
-  { "ibp",             { NULL }, 2572,  "tcp" },
-  { "ibp",             { NULL }, 2572,  "udp" },
-  { "trustestablish",  { NULL }, 2573,  "tcp" },
-  { "trustestablish",  { NULL }, 2573,  "udp" },
-  { "blockade-bpsp",   { NULL }, 2574,  "tcp" },
-  { "blockade-bpsp",   { NULL }, 2574,  "udp" },
-  { "hl7",             { NULL }, 2575,  "tcp" },
-  { "hl7",             { NULL }, 2575,  "udp" },
-  { "tclprodebugger",  { NULL }, 2576,  "tcp" },
-  { "tclprodebugger",  { NULL }, 2576,  "udp" },
-  { "scipticslsrvr",   { NULL }, 2577,  "tcp" },
-  { "scipticslsrvr",   { NULL }, 2577,  "udp" },
-  { "rvs-isdn-dcp",    { NULL }, 2578,  "tcp" },
-  { "rvs-isdn-dcp",    { NULL }, 2578,  "udp" },
-  { "mpfoncl",         { NULL }, 2579,  "tcp" },
-  { "mpfoncl",         { NULL }, 2579,  "udp" },
-  { "tributary",       { NULL }, 2580,  "tcp" },
-  { "tributary",       { NULL }, 2580,  "udp" },
-  { "argis-te",        { NULL }, 2581,  "tcp" },
-  { "argis-te",        { NULL }, 2581,  "udp" },
-  { "argis-ds",        { NULL }, 2582,  "tcp" },
-  { "argis-ds",        { NULL }, 2582,  "udp" },
-  { "mon",             { NULL }, 2583,  "tcp" },
-  { "mon",             { NULL }, 2583,  "udp" },
-  { "cyaserv",         { NULL }, 2584,  "tcp" },
-  { "cyaserv",         { NULL }, 2584,  "udp" },
-  { "netx-server",     { NULL }, 2585,  "tcp" },
-  { "netx-server",     { NULL }, 2585,  "udp" },
-  { "netx-agent",      { NULL }, 2586,  "tcp" },
-  { "netx-agent",      { NULL }, 2586,  "udp" },
-  { "masc",            { NULL }, 2587,  "tcp" },
-  { "masc",            { NULL }, 2587,  "udp" },
-  { "privilege",       { NULL }, 2588,  "tcp" },
-  { "privilege",       { NULL }, 2588,  "udp" },
-  { "quartus-tcl",     { NULL }, 2589,  "tcp" },
-  { "quartus-tcl",     { NULL }, 2589,  "udp" },
-  { "idotdist",        { NULL }, 2590,  "tcp" },
-  { "idotdist",        { NULL }, 2590,  "udp" },
-  { "maytagshuffle",   { NULL }, 2591,  "tcp" },
-  { "maytagshuffle",   { NULL }, 2591,  "udp" },
-  { "netrek",          { NULL }, 2592,  "tcp" },
-  { "netrek",          { NULL }, 2592,  "udp" },
-  { "mns-mail",        { NULL }, 2593,  "tcp" },
-  { "mns-mail",        { NULL }, 2593,  "udp" },
-  { "dts",             { NULL }, 2594,  "tcp" },
-  { "dts",             { NULL }, 2594,  "udp" },
-  { "worldfusion1",    { NULL }, 2595,  "tcp" },
-  { "worldfusion1",    { NULL }, 2595,  "udp" },
-  { "worldfusion2",    { NULL }, 2596,  "tcp" },
-  { "worldfusion2",    { NULL }, 2596,  "udp" },
-  { "homesteadglory",  { NULL }, 2597,  "tcp" },
-  { "homesteadglory",  { NULL }, 2597,  "udp" },
-  { "citriximaclient", { NULL }, 2598,  "tcp" },
-  { "citriximaclient", { NULL }, 2598,  "udp" },
-  { "snapd",           { NULL }, 2599,  "tcp" },
-  { "snapd",           { NULL }, 2599,  "udp" },
-  { "hpstgmgr",        { NULL }, 2600,  "tcp" },
-  { "hpstgmgr",        { NULL }, 2600,  "udp" },
-  { "discp-client",    { NULL }, 2601,  "tcp" },
-  { "discp-client",    { NULL }, 2601,  "udp" },
-  { "discp-server",    { NULL }, 2602,  "tcp" },
-  { "discp-server",    { NULL }, 2602,  "udp" },
-  { "servicemeter",    { NULL }, 2603,  "tcp" },
-  { "servicemeter",    { NULL }, 2603,  "udp" },
-  { "nsc-ccs",         { NULL }, 2604,  "tcp" },
-  { "nsc-ccs",         { NULL }, 2604,  "udp" },
-  { "nsc-posa",        { NULL }, 2605,  "tcp" },
-  { "nsc-posa",        { NULL }, 2605,  "udp" },
-  { "netmon",          { NULL }, 2606,  "tcp" },
-  { "netmon",          { NULL }, 2606,  "udp" },
-  { "connection",      { NULL }, 2607,  "tcp" },
-  { "connection",      { NULL }, 2607,  "udp" },
-  { "wag-service",     { NULL }, 2608,  "tcp" },
-  { "wag-service",     { NULL }, 2608,  "udp" },
-  { "system-monitor",  { NULL }, 2609,  "tcp" },
-  { "system-monitor",  { NULL }, 2609,  "udp" },
-  { "versa-tek",       { NULL }, 2610,  "tcp" },
-  { "versa-tek",       { NULL }, 2610,  "udp" },
-  { "lionhead",        { NULL }, 2611,  "tcp" },
-  { "lionhead",        { NULL }, 2611,  "udp" },
-  { "qpasa-agent",     { NULL }, 2612,  "tcp" },
-  { "qpasa-agent",     { NULL }, 2612,  "udp" },
-  { "smntubootstrap",  { NULL }, 2613,  "tcp" },
-  { "smntubootstrap",  { NULL }, 2613,  "udp" },
-  { "neveroffline",    { NULL }, 2614,  "tcp" },
-  { "neveroffline",    { NULL }, 2614,  "udp" },
-  { "firepower",       { NULL }, 2615,  "tcp" },
-  { "firepower",       { NULL }, 2615,  "udp" },
-  { "appswitch-emp",   { NULL }, 2616,  "tcp" },
-  { "appswitch-emp",   { NULL }, 2616,  "udp" },
-  { "cmadmin",         { NULL }, 2617,  "tcp" },
-  { "cmadmin",         { NULL }, 2617,  "udp" },
-  { "priority-e-com",  { NULL }, 2618,  "tcp" },
-  { "priority-e-com",  { NULL }, 2618,  "udp" },
-  { "bruce",           { NULL }, 2619,  "tcp" },
-  { "bruce",           { NULL }, 2619,  "udp" },
-  { "lpsrecommender",  { NULL }, 2620,  "tcp" },
-  { "lpsrecommender",  { NULL }, 2620,  "udp" },
-  { "miles-apart",     { NULL }, 2621,  "tcp" },
-  { "miles-apart",     { NULL }, 2621,  "udp" },
-  { "metricadbc",      { NULL }, 2622,  "tcp" },
-  { "metricadbc",      { NULL }, 2622,  "udp" },
-  { "lmdp",            { NULL }, 2623,  "tcp" },
-  { "lmdp",            { NULL }, 2623,  "udp" },
-  { "aria",            { NULL }, 2624,  "tcp" },
-  { "aria",            { NULL }, 2624,  "udp" },
-  { "blwnkl-port",     { NULL }, 2625,  "tcp" },
-  { "blwnkl-port",     { NULL }, 2625,  "udp" },
-  { "gbjd816",         { NULL }, 2626,  "tcp" },
-  { "gbjd816",         { NULL }, 2626,  "udp" },
-  { "moshebeeri",      { NULL }, 2627,  "tcp" },
-  { "moshebeeri",      { NULL }, 2627,  "udp" },
-  { "dict",            { NULL }, 2628,  "tcp" },
-  { "dict",            { NULL }, 2628,  "udp" },
-  { "sitaraserver",    { NULL }, 2629,  "tcp" },
-  { "sitaraserver",    { NULL }, 2629,  "udp" },
-  { "sitaramgmt",      { NULL }, 2630,  "tcp" },
-  { "sitaramgmt",      { NULL }, 2630,  "udp" },
-  { "sitaradir",       { NULL }, 2631,  "tcp" },
-  { "sitaradir",       { NULL }, 2631,  "udp" },
-  { "irdg-post",       { NULL }, 2632,  "tcp" },
-  { "irdg-post",       { NULL }, 2632,  "udp" },
-  { "interintelli",    { NULL }, 2633,  "tcp" },
-  { "interintelli",    { NULL }, 2633,  "udp" },
-  { "pk-electronics",  { NULL }, 2634,  "tcp" },
-  { "pk-electronics",  { NULL }, 2634,  "udp" },
-  { "backburner",      { NULL }, 2635,  "tcp" },
-  { "backburner",      { NULL }, 2635,  "udp" },
-  { "solve",           { NULL }, 2636,  "tcp" },
-  { "solve",           { NULL }, 2636,  "udp" },
-  { "imdocsvc",        { NULL }, 2637,  "tcp" },
-  { "imdocsvc",        { NULL }, 2637,  "udp" },
-  { "sybaseanywhere",  { NULL }, 2638,  "tcp" },
-  { "sybaseanywhere",  { NULL }, 2638,  "udp" },
-  { "aminet",          { NULL }, 2639,  "tcp" },
-  { "aminet",          { NULL }, 2639,  "udp" },
-  { "sai_sentlm",      { NULL }, 2640,  "tcp" },
-  { "sai_sentlm",      { NULL }, 2640,  "udp" },
-  { "hdl-srv",         { NULL }, 2641,  "tcp" },
-  { "hdl-srv",         { NULL }, 2641,  "udp" },
-  { "tragic",          { NULL }, 2642,  "tcp" },
-  { "tragic",          { NULL }, 2642,  "udp" },
-  { "gte-samp",        { NULL }, 2643,  "tcp" },
-  { "gte-samp",        { NULL }, 2643,  "udp" },
-  { "travsoft-ipx-t",  { NULL }, 2644,  "tcp" },
-  { "travsoft-ipx-t",  { NULL }, 2644,  "udp" },
-  { "novell-ipx-cmd",  { NULL }, 2645,  "tcp" },
-  { "novell-ipx-cmd",  { NULL }, 2645,  "udp" },
-  { "and-lm",          { NULL }, 2646,  "tcp" },
-  { "and-lm",          { NULL }, 2646,  "udp" },
-  { "syncserver",      { NULL }, 2647,  "tcp" },
-  { "syncserver",      { NULL }, 2647,  "udp" },
-  { "upsnotifyprot",   { NULL }, 2648,  "tcp" },
-  { "upsnotifyprot",   { NULL }, 2648,  "udp" },
-  { "vpsipport",       { NULL }, 2649,  "tcp" },
-  { "vpsipport",       { NULL }, 2649,  "udp" },
-  { "eristwoguns",     { NULL }, 2650,  "tcp" },
-  { "eristwoguns",     { NULL }, 2650,  "udp" },
-  { "ebinsite",        { NULL }, 2651,  "tcp" },
-  { "ebinsite",        { NULL }, 2651,  "udp" },
-  { "interpathpanel",  { NULL }, 2652,  "tcp" },
-  { "interpathpanel",  { NULL }, 2652,  "udp" },
-  { "sonus",           { NULL }, 2653,  "tcp" },
-  { "sonus",           { NULL }, 2653,  "udp" },
-  { "corel_vncadmin",  { NULL }, 2654,  "tcp" },
-  { "corel_vncadmin",  { NULL }, 2654,  "udp" },
-  { "unglue",          { NULL }, 2655,  "tcp" },
-  { "unglue",          { NULL }, 2655,  "udp" },
-  { "kana",            { NULL }, 2656,  "tcp" },
-  { "kana",            { NULL }, 2656,  "udp" },
-  { "sns-dispatcher",  { NULL }, 2657,  "tcp" },
-  { "sns-dispatcher",  { NULL }, 2657,  "udp" },
-  { "sns-admin",       { NULL }, 2658,  "tcp" },
-  { "sns-admin",       { NULL }, 2658,  "udp" },
-  { "sns-query",       { NULL }, 2659,  "tcp" },
-  { "sns-query",       { NULL }, 2659,  "udp" },
-  { "gcmonitor",       { NULL }, 2660,  "tcp" },
-  { "gcmonitor",       { NULL }, 2660,  "udp" },
-  { "olhost",          { NULL }, 2661,  "tcp" },
-  { "olhost",          { NULL }, 2661,  "udp" },
-  { "bintec-capi",     { NULL }, 2662,  "tcp" },
-  { "bintec-capi",     { NULL }, 2662,  "udp" },
-  { "bintec-tapi",     { NULL }, 2663,  "tcp" },
-  { "bintec-tapi",     { NULL }, 2663,  "udp" },
-  { "patrol-mq-gm",    { NULL }, 2664,  "tcp" },
-  { "patrol-mq-gm",    { NULL }, 2664,  "udp" },
-  { "patrol-mq-nm",    { NULL }, 2665,  "tcp" },
-  { "patrol-mq-nm",    { NULL }, 2665,  "udp" },
-  { "extensis",        { NULL }, 2666,  "tcp" },
-  { "extensis",        { NULL }, 2666,  "udp" },
-  { "alarm-clock-s",   { NULL }, 2667,  "tcp" },
-  { "alarm-clock-s",   { NULL }, 2667,  "udp" },
-  { "alarm-clock-c",   { NULL }, 2668,  "tcp" },
-  { "alarm-clock-c",   { NULL }, 2668,  "udp" },
-  { "toad",            { NULL }, 2669,  "tcp" },
-  { "toad",            { NULL }, 2669,  "udp" },
-  { "tve-announce",    { NULL }, 2670,  "tcp" },
-  { "tve-announce",    { NULL }, 2670,  "udp" },
-  { "newlixreg",       { NULL }, 2671,  "tcp" },
-  { "newlixreg",       { NULL }, 2671,  "udp" },
-  { "nhserver",        { NULL }, 2672,  "tcp" },
-  { "nhserver",        { NULL }, 2672,  "udp" },
-  { "firstcall42",     { NULL }, 2673,  "tcp" },
-  { "firstcall42",     { NULL }, 2673,  "udp" },
-  { "ewnn",            { NULL }, 2674,  "tcp" },
-  { "ewnn",            { NULL }, 2674,  "udp" },
-  { "ttc-etap",        { NULL }, 2675,  "tcp" },
-  { "ttc-etap",        { NULL }, 2675,  "udp" },
-  { "simslink",        { NULL }, 2676,  "tcp" },
-  { "simslink",        { NULL }, 2676,  "udp" },
-  { "gadgetgate1way",  { NULL }, 2677,  "tcp" },
-  { "gadgetgate1way",  { NULL }, 2677,  "udp" },
-  { "gadgetgate2way",  { NULL }, 2678,  "tcp" },
-  { "gadgetgate2way",  { NULL }, 2678,  "udp" },
-  { "syncserverssl",   { NULL }, 2679,  "tcp" },
-  { "syncserverssl",   { NULL }, 2679,  "udp" },
-  { "pxc-sapxom",      { NULL }, 2680,  "tcp" },
-  { "pxc-sapxom",      { NULL }, 2680,  "udp" },
-  { "mpnjsomb",        { NULL }, 2681,  "tcp" },
-  { "mpnjsomb",        { NULL }, 2681,  "udp" },
-  { "ncdloadbalance",  { NULL }, 2683,  "tcp" },
-  { "ncdloadbalance",  { NULL }, 2683,  "udp" },
-  { "mpnjsosv",        { NULL }, 2684,  "tcp" },
-  { "mpnjsosv",        { NULL }, 2684,  "udp" },
-  { "mpnjsocl",        { NULL }, 2685,  "tcp" },
-  { "mpnjsocl",        { NULL }, 2685,  "udp" },
-  { "mpnjsomg",        { NULL }, 2686,  "tcp" },
-  { "mpnjsomg",        { NULL }, 2686,  "udp" },
-  { "pq-lic-mgmt",     { NULL }, 2687,  "tcp" },
-  { "pq-lic-mgmt",     { NULL }, 2687,  "udp" },
-  { "md-cg-http",      { NULL }, 2688,  "tcp" },
-  { "md-cg-http",      { NULL }, 2688,  "udp" },
-  { "fastlynx",        { NULL }, 2689,  "tcp" },
-  { "fastlynx",        { NULL }, 2689,  "udp" },
-  { "hp-nnm-data",     { NULL }, 2690,  "tcp" },
-  { "hp-nnm-data",     { NULL }, 2690,  "udp" },
-  { "itinternet",      { NULL }, 2691,  "tcp" },
-  { "itinternet",      { NULL }, 2691,  "udp" },
-  { "admins-lms",      { NULL }, 2692,  "tcp" },
-  { "admins-lms",      { NULL }, 2692,  "udp" },
-  { "pwrsevent",       { NULL }, 2694,  "tcp" },
-  { "pwrsevent",       { NULL }, 2694,  "udp" },
-  { "vspread",         { NULL }, 2695,  "tcp" },
-  { "vspread",         { NULL }, 2695,  "udp" },
-  { "unifyadmin",      { NULL }, 2696,  "tcp" },
-  { "unifyadmin",      { NULL }, 2696,  "udp" },
-  { "oce-snmp-trap",   { NULL }, 2697,  "tcp" },
-  { "oce-snmp-trap",   { NULL }, 2697,  "udp" },
-  { "mck-ivpip",       { NULL }, 2698,  "tcp" },
-  { "mck-ivpip",       { NULL }, 2698,  "udp" },
-  { "csoft-plusclnt",  { NULL }, 2699,  "tcp" },
-  { "csoft-plusclnt",  { NULL }, 2699,  "udp" },
-  { "tqdata",          { NULL }, 2700,  "tcp" },
-  { "tqdata",          { NULL }, 2700,  "udp" },
-  { "sms-rcinfo",      { NULL }, 2701,  "tcp" },
-  { "sms-rcinfo",      { NULL }, 2701,  "udp" },
-  { "sms-xfer",        { NULL }, 2702,  "tcp" },
-  { "sms-xfer",        { NULL }, 2702,  "udp" },
-  { "sms-chat",        { NULL }, 2703,  "tcp" },
-  { "sms-chat",        { NULL }, 2703,  "udp" },
-  { "sms-remctrl",     { NULL }, 2704,  "tcp" },
-  { "sms-remctrl",     { NULL }, 2704,  "udp" },
-  { "sds-admin",       { NULL }, 2705,  "tcp" },
-  { "sds-admin",       { NULL }, 2705,  "udp" },
-  { "ncdmirroring",    { NULL }, 2706,  "tcp" },
-  { "ncdmirroring",    { NULL }, 2706,  "udp" },
-  { "emcsymapiport",   { NULL }, 2707,  "tcp" },
-  { "emcsymapiport",   { NULL }, 2707,  "udp" },
-  { "banyan-net",      { NULL }, 2708,  "tcp" },
-  { "banyan-net",      { NULL }, 2708,  "udp" },
-  { "supermon",        { NULL }, 2709,  "tcp" },
-  { "supermon",        { NULL }, 2709,  "udp" },
-  { "sso-service",     { NULL }, 2710,  "tcp" },
-  { "sso-service",     { NULL }, 2710,  "udp" },
-  { "sso-control",     { NULL }, 2711,  "tcp" },
-  { "sso-control",     { NULL }, 2711,  "udp" },
-  { "aocp",            { NULL }, 2712,  "tcp" },
-  { "aocp",            { NULL }, 2712,  "udp" },
-  { "raventbs",        { NULL }, 2713,  "tcp" },
-  { "raventbs",        { NULL }, 2713,  "udp" },
-  { "raventdm",        { NULL }, 2714,  "tcp" },
-  { "raventdm",        { NULL }, 2714,  "udp" },
-  { "hpstgmgr2",       { NULL }, 2715,  "tcp" },
-  { "hpstgmgr2",       { NULL }, 2715,  "udp" },
-  { "inova-ip-disco",  { NULL }, 2716,  "tcp" },
-  { "inova-ip-disco",  { NULL }, 2716,  "udp" },
-  { "pn-requester",    { NULL }, 2717,  "tcp" },
-  { "pn-requester",    { NULL }, 2717,  "udp" },
-  { "pn-requester2",   { NULL }, 2718,  "tcp" },
-  { "pn-requester2",   { NULL }, 2718,  "udp" },
-  { "scan-change",     { NULL }, 2719,  "tcp" },
-  { "scan-change",     { NULL }, 2719,  "udp" },
-  { "wkars",           { NULL }, 2720,  "tcp" },
-  { "wkars",           { NULL }, 2720,  "udp" },
-  { "smart-diagnose",  { NULL }, 2721,  "tcp" },
-  { "smart-diagnose",  { NULL }, 2721,  "udp" },
-  { "proactivesrvr",   { NULL }, 2722,  "tcp" },
-  { "proactivesrvr",   { NULL }, 2722,  "udp" },
-  { "watchdog-nt",     { NULL }, 2723,  "tcp" },
-  { "watchdog-nt",     { NULL }, 2723,  "udp" },
-  { "qotps",           { NULL }, 2724,  "tcp" },
-  { "qotps",           { NULL }, 2724,  "udp" },
-  { "msolap-ptp2",     { NULL }, 2725,  "tcp" },
-  { "msolap-ptp2",     { NULL }, 2725,  "udp" },
-  { "tams",            { NULL }, 2726,  "tcp" },
-  { "tams",            { NULL }, 2726,  "udp" },
-  { "mgcp-callagent",  { NULL }, 2727,  "tcp" },
-  { "mgcp-callagent",  { NULL }, 2727,  "udp" },
-  { "sqdr",            { NULL }, 2728,  "tcp" },
-  { "sqdr",            { NULL }, 2728,  "udp" },
-  { "tcim-control",    { NULL }, 2729,  "tcp" },
-  { "tcim-control",    { NULL }, 2729,  "udp" },
-  { "nec-raidplus",    { NULL }, 2730,  "tcp" },
-  { "nec-raidplus",    { NULL }, 2730,  "udp" },
-  { "fyre-messanger",  { NULL }, 2731,  "tcp" },
-  { "fyre-messanger",  { NULL }, 2731,  "udp" },
-  { "g5m",             { NULL }, 2732,  "tcp" },
-  { "g5m",             { NULL }, 2732,  "udp" },
-  { "signet-ctf",      { NULL }, 2733,  "tcp" },
-  { "signet-ctf",      { NULL }, 2733,  "udp" },
-  { "ccs-software",    { NULL }, 2734,  "tcp" },
-  { "ccs-software",    { NULL }, 2734,  "udp" },
-  { "netiq-mc",        { NULL }, 2735,  "tcp" },
-  { "netiq-mc",        { NULL }, 2735,  "udp" },
-  { "radwiz-nms-srv",  { NULL }, 2736,  "tcp" },
-  { "radwiz-nms-srv",  { NULL }, 2736,  "udp" },
-  { "srp-feedback",    { NULL }, 2737,  "tcp" },
-  { "srp-feedback",    { NULL }, 2737,  "udp" },
-  { "ndl-tcp-ois-gw",  { NULL }, 2738,  "tcp" },
-  { "ndl-tcp-ois-gw",  { NULL }, 2738,  "udp" },
-  { "tn-timing",       { NULL }, 2739,  "tcp" },
-  { "tn-timing",       { NULL }, 2739,  "udp" },
-  { "alarm",           { NULL }, 2740,  "tcp" },
-  { "alarm",           { NULL }, 2740,  "udp" },
-  { "tsb",             { NULL }, 2741,  "tcp" },
-  { "tsb",             { NULL }, 2741,  "udp" },
-  { "tsb2",            { NULL }, 2742,  "tcp" },
-  { "tsb2",            { NULL }, 2742,  "udp" },
-  { "murx",            { NULL }, 2743,  "tcp" },
-  { "murx",            { NULL }, 2743,  "udp" },
-  { "honyaku",         { NULL }, 2744,  "tcp" },
-  { "honyaku",         { NULL }, 2744,  "udp" },
-  { "urbisnet",        { NULL }, 2745,  "tcp" },
-  { "urbisnet",        { NULL }, 2745,  "udp" },
-  { "cpudpencap",      { NULL }, 2746,  "tcp" },
-  { "cpudpencap",      { NULL }, 2746,  "udp" },
-  { "fjippol-swrly",   { NULL }, 2747,  "tcp" },
-  { "fjippol-swrly",   { NULL }, 2747,  "udp" },
-  { "fjippol-polsvr",  { NULL }, 2748,  "tcp" },
-  { "fjippol-polsvr",  { NULL }, 2748,  "udp" },
-  { "fjippol-cnsl",    { NULL }, 2749,  "tcp" },
-  { "fjippol-cnsl",    { NULL }, 2749,  "udp" },
-  { "fjippol-port1",   { NULL }, 2750,  "tcp" },
-  { "fjippol-port1",   { NULL }, 2750,  "udp" },
-  { "fjippol-port2",   { NULL }, 2751,  "tcp" },
-  { "fjippol-port2",   { NULL }, 2751,  "udp" },
-  { "rsisysaccess",    { NULL }, 2752,  "tcp" },
-  { "rsisysaccess",    { NULL }, 2752,  "udp" },
-  { "de-spot",         { NULL }, 2753,  "tcp" },
-  { "de-spot",         { NULL }, 2753,  "udp" },
-  { "apollo-cc",       { NULL }, 2754,  "tcp" },
-  { "apollo-cc",       { NULL }, 2754,  "udp" },
-  { "expresspay",      { NULL }, 2755,  "tcp" },
-  { "expresspay",      { NULL }, 2755,  "udp" },
-  { "simplement-tie",  { NULL }, 2756,  "tcp" },
-  { "simplement-tie",  { NULL }, 2756,  "udp" },
-  { "cnrp",            { NULL }, 2757,  "tcp" },
-  { "cnrp",            { NULL }, 2757,  "udp" },
-  { "apollo-status",   { NULL }, 2758,  "tcp" },
-  { "apollo-status",   { NULL }, 2758,  "udp" },
-  { "apollo-gms",      { NULL }, 2759,  "tcp" },
-  { "apollo-gms",      { NULL }, 2759,  "udp" },
-  { "sabams",          { NULL }, 2760,  "tcp" },
-  { "sabams",          { NULL }, 2760,  "udp" },
-  { "dicom-iscl",      { NULL }, 2761,  "tcp" },
-  { "dicom-iscl",      { NULL }, 2761,  "udp" },
-  { "dicom-tls",       { NULL }, 2762,  "tcp" },
-  { "dicom-tls",       { NULL }, 2762,  "udp" },
-  { "desktop-dna",     { NULL }, 2763,  "tcp" },
-  { "desktop-dna",     { NULL }, 2763,  "udp" },
-  { "data-insurance",  { NULL }, 2764,  "tcp" },
-  { "data-insurance",  { NULL }, 2764,  "udp" },
-  { "qip-audup",       { NULL }, 2765,  "tcp" },
-  { "qip-audup",       { NULL }, 2765,  "udp" },
-  { "compaq-scp",      { NULL }, 2766,  "tcp" },
-  { "compaq-scp",      { NULL }, 2766,  "udp" },
-  { "uadtc",           { NULL }, 2767,  "tcp" },
-  { "uadtc",           { NULL }, 2767,  "udp" },
-  { "uacs",            { NULL }, 2768,  "tcp" },
-  { "uacs",            { NULL }, 2768,  "udp" },
-  { "exce",            { NULL }, 2769,  "tcp" },
-  { "exce",            { NULL }, 2769,  "udp" },
-  { "veronica",        { NULL }, 2770,  "tcp" },
-  { "veronica",        { NULL }, 2770,  "udp" },
-  { "vergencecm",      { NULL }, 2771,  "tcp" },
-  { "vergencecm",      { NULL }, 2771,  "udp" },
-  { "auris",           { NULL }, 2772,  "tcp" },
-  { "auris",           { NULL }, 2772,  "udp" },
-  { "rbakcup1",        { NULL }, 2773,  "tcp" },
-  { "rbakcup1",        { NULL }, 2773,  "udp" },
-  { "rbakcup2",        { NULL }, 2774,  "tcp" },
-  { "rbakcup2",        { NULL }, 2774,  "udp" },
-  { "smpp",            { NULL }, 2775,  "tcp" },
-  { "smpp",            { NULL }, 2775,  "udp" },
-  { "ridgeway1",       { NULL }, 2776,  "tcp" },
-  { "ridgeway1",       { NULL }, 2776,  "udp" },
-  { "ridgeway2",       { NULL }, 2777,  "tcp" },
-  { "ridgeway2",       { NULL }, 2777,  "udp" },
-  { "gwen-sonya",      { NULL }, 2778,  "tcp" },
-  { "gwen-sonya",      { NULL }, 2778,  "udp" },
-  { "lbc-sync",        { NULL }, 2779,  "tcp" },
-  { "lbc-sync",        { NULL }, 2779,  "udp" },
-  { "lbc-control",     { NULL }, 2780,  "tcp" },
-  { "lbc-control",     { NULL }, 2780,  "udp" },
-  { "whosells",        { NULL }, 2781,  "tcp" },
-  { "whosells",        { NULL }, 2781,  "udp" },
-  { "everydayrc",      { NULL }, 2782,  "tcp" },
-  { "everydayrc",      { NULL }, 2782,  "udp" },
-  { "aises",           { NULL }, 2783,  "tcp" },
-  { "aises",           { NULL }, 2783,  "udp" },
-  { "www-dev",         { NULL }, 2784,  "tcp" },
-  { "www-dev",         { NULL }, 2784,  "udp" },
-  { "aic-np",          { NULL }, 2785,  "tcp" },
-  { "aic-np",          { NULL }, 2785,  "udp" },
-  { "aic-oncrpc",      { NULL }, 2786,  "tcp" },
-  { "aic-oncrpc",      { NULL }, 2786,  "udp" },
-  { "piccolo",         { NULL }, 2787,  "tcp" },
-  { "piccolo",         { NULL }, 2787,  "udp" },
-  { "fryeserv",        { NULL }, 2788,  "tcp" },
-  { "fryeserv",        { NULL }, 2788,  "udp" },
-  { "media-agent",     { NULL }, 2789,  "tcp" },
-  { "media-agent",     { NULL }, 2789,  "udp" },
-  { "plgproxy",        { NULL }, 2790,  "tcp" },
-  { "plgproxy",        { NULL }, 2790,  "udp" },
-  { "mtport-regist",   { NULL }, 2791,  "tcp" },
-  { "mtport-regist",   { NULL }, 2791,  "udp" },
-  { "f5-globalsite",   { NULL }, 2792,  "tcp" },
-  { "f5-globalsite",   { NULL }, 2792,  "udp" },
-  { "initlsmsad",      { NULL }, 2793,  "tcp" },
-  { "initlsmsad",      { NULL }, 2793,  "udp" },
-  { "livestats",       { NULL }, 2795,  "tcp" },
-  { "livestats",       { NULL }, 2795,  "udp" },
-  { "ac-tech",         { NULL }, 2796,  "tcp" },
-  { "ac-tech",         { NULL }, 2796,  "udp" },
-  { "esp-encap",       { NULL }, 2797,  "tcp" },
-  { "esp-encap",       { NULL }, 2797,  "udp" },
-  { "tmesis-upshot",   { NULL }, 2798,  "tcp" },
-  { "tmesis-upshot",   { NULL }, 2798,  "udp" },
-  { "icon-discover",   { NULL }, 2799,  "tcp" },
-  { "icon-discover",   { NULL }, 2799,  "udp" },
-  { "acc-raid",        { NULL }, 2800,  "tcp" },
-  { "acc-raid",        { NULL }, 2800,  "udp" },
-  { "igcp",            { NULL }, 2801,  "tcp" },
-  { "igcp",            { NULL }, 2801,  "udp" },
-  { "veritas-tcp1",    { NULL }, 2802,  "tcp" },
-  { "veritas-udp1",    { NULL }, 2802,  "udp" },
-  { "btprjctrl",       { NULL }, 2803,  "tcp" },
-  { "btprjctrl",       { NULL }, 2803,  "udp" },
-  { "dvr-esm",         { NULL }, 2804,  "tcp" },
-  { "dvr-esm",         { NULL }, 2804,  "udp" },
-  { "wta-wsp-s",       { NULL }, 2805,  "tcp" },
-  { "wta-wsp-s",       { NULL }, 2805,  "udp" },
-  { "cspuni",          { NULL }, 2806,  "tcp" },
-  { "cspuni",          { NULL }, 2806,  "udp" },
-  { "cspmulti",        { NULL }, 2807,  "tcp" },
-  { "cspmulti",        { NULL }, 2807,  "udp" },
-  { "j-lan-p",         { NULL }, 2808,  "tcp" },
-  { "j-lan-p",         { NULL }, 2808,  "udp" },
-  { "corbaloc",        { NULL }, 2809,  "tcp" },
-  { "corbaloc",        { NULL }, 2809,  "udp" },
-  { "netsteward",      { NULL }, 2810,  "tcp" },
-  { "netsteward",      { NULL }, 2810,  "udp" },
-  { "gsiftp",          { NULL }, 2811,  "tcp" },
-  { "gsiftp",          { NULL }, 2811,  "udp" },
-  { "atmtcp",          { NULL }, 2812,  "tcp" },
-  { "atmtcp",          { NULL }, 2812,  "udp" },
-  { "llm-pass",        { NULL }, 2813,  "tcp" },
-  { "llm-pass",        { NULL }, 2813,  "udp" },
-  { "llm-csv",         { NULL }, 2814,  "tcp" },
-  { "llm-csv",         { NULL }, 2814,  "udp" },
-  { "lbc-measure",     { NULL }, 2815,  "tcp" },
-  { "lbc-measure",     { NULL }, 2815,  "udp" },
-  { "lbc-watchdog",    { NULL }, 2816,  "tcp" },
-  { "lbc-watchdog",    { NULL }, 2816,  "udp" },
-  { "nmsigport",       { NULL }, 2817,  "tcp" },
-  { "nmsigport",       { NULL }, 2817,  "udp" },
-  { "rmlnk",           { NULL }, 2818,  "tcp" },
-  { "rmlnk",           { NULL }, 2818,  "udp" },
-  { "fc-faultnotify",  { NULL }, 2819,  "tcp" },
-  { "fc-faultnotify",  { NULL }, 2819,  "udp" },
-  { "univision",       { NULL }, 2820,  "tcp" },
-  { "univision",       { NULL }, 2820,  "udp" },
-  { "vrts-at-port",    { NULL }, 2821,  "tcp" },
-  { "vrts-at-port",    { NULL }, 2821,  "udp" },
-  { "ka0wuc",          { NULL }, 2822,  "tcp" },
-  { "ka0wuc",          { NULL }, 2822,  "udp" },
-  { "cqg-netlan",      { NULL }, 2823,  "tcp" },
-  { "cqg-netlan",      { NULL }, 2823,  "udp" },
-  { "cqg-netlan-1",    { NULL }, 2824,  "tcp" },
-  { "cqg-netlan-1",    { NULL }, 2824,  "udp" },
-  { "slc-systemlog",   { NULL }, 2826,  "tcp" },
-  { "slc-systemlog",   { NULL }, 2826,  "udp" },
-  { "slc-ctrlrloops",  { NULL }, 2827,  "tcp" },
-  { "slc-ctrlrloops",  { NULL }, 2827,  "udp" },
-  { "itm-lm",          { NULL }, 2828,  "tcp" },
-  { "itm-lm",          { NULL }, 2828,  "udp" },
-  { "silkp1",          { NULL }, 2829,  "tcp" },
-  { "silkp1",          { NULL }, 2829,  "udp" },
-  { "silkp2",          { NULL }, 2830,  "tcp" },
-  { "silkp2",          { NULL }, 2830,  "udp" },
-  { "silkp3",          { NULL }, 2831,  "tcp" },
-  { "silkp3",          { NULL }, 2831,  "udp" },
-  { "silkp4",          { NULL }, 2832,  "tcp" },
-  { "silkp4",          { NULL }, 2832,  "udp" },
-  { "glishd",          { NULL }, 2833,  "tcp" },
-  { "glishd",          { NULL }, 2833,  "udp" },
-  { "evtp",            { NULL }, 2834,  "tcp" },
-  { "evtp",            { NULL }, 2834,  "udp" },
-  { "evtp-data",       { NULL }, 2835,  "tcp" },
-  { "evtp-data",       { NULL }, 2835,  "udp" },
-  { "catalyst",        { NULL }, 2836,  "tcp" },
-  { "catalyst",        { NULL }, 2836,  "udp" },
-  { "repliweb",        { NULL }, 2837,  "tcp" },
-  { "repliweb",        { NULL }, 2837,  "udp" },
-  { "starbot",         { NULL }, 2838,  "tcp" },
-  { "starbot",         { NULL }, 2838,  "udp" },
-  { "nmsigport",       { NULL }, 2839,  "tcp" },
-  { "nmsigport",       { NULL }, 2839,  "udp" },
-  { "l3-exprt",        { NULL }, 2840,  "tcp" },
-  { "l3-exprt",        { NULL }, 2840,  "udp" },
-  { "l3-ranger",       { NULL }, 2841,  "tcp" },
-  { "l3-ranger",       { NULL }, 2841,  "udp" },
-  { "l3-hawk",         { NULL }, 2842,  "tcp" },
-  { "l3-hawk",         { NULL }, 2842,  "udp" },
-  { "pdnet",           { NULL }, 2843,  "tcp" },
-  { "pdnet",           { NULL }, 2843,  "udp" },
-  { "bpcp-poll",       { NULL }, 2844,  "tcp" },
-  { "bpcp-poll",       { NULL }, 2844,  "udp" },
-  { "bpcp-trap",       { NULL }, 2845,  "tcp" },
-  { "bpcp-trap",       { NULL }, 2845,  "udp" },
-  { "aimpp-hello",     { NULL }, 2846,  "tcp" },
-  { "aimpp-hello",     { NULL }, 2846,  "udp" },
-  { "aimpp-port-req",  { NULL }, 2847,  "tcp" },
-  { "aimpp-port-req",  { NULL }, 2847,  "udp" },
-  { "amt-blc-port",    { NULL }, 2848,  "tcp" },
-  { "amt-blc-port",    { NULL }, 2848,  "udp" },
-  { "fxp",             { NULL }, 2849,  "tcp" },
-  { "fxp",             { NULL }, 2849,  "udp" },
-  { "metaconsole",     { NULL }, 2850,  "tcp" },
-  { "metaconsole",     { NULL }, 2850,  "udp" },
-  { "webemshttp",      { NULL }, 2851,  "tcp" },
-  { "webemshttp",      { NULL }, 2851,  "udp" },
-  { "bears-01",        { NULL }, 2852,  "tcp" },
-  { "bears-01",        { NULL }, 2852,  "udp" },
-  { "ispipes",         { NULL }, 2853,  "tcp" },
-  { "ispipes",         { NULL }, 2853,  "udp" },
-  { "infomover",       { NULL }, 2854,  "tcp" },
-  { "infomover",       { NULL }, 2854,  "udp" },
-  { "msrp",            { NULL }, 2855,  "tcp" },
-  { "msrp",            { NULL }, 2855,  "udp" },
-  { "cesdinv",         { NULL }, 2856,  "tcp" },
-  { "cesdinv",         { NULL }, 2856,  "udp" },
-  { "simctlp",         { NULL }, 2857,  "tcp" },
-  { "simctlp",         { NULL }, 2857,  "udp" },
-  { "ecnp",            { NULL }, 2858,  "tcp" },
-  { "ecnp",            { NULL }, 2858,  "udp" },
-  { "activememory",    { NULL }, 2859,  "tcp" },
-  { "activememory",    { NULL }, 2859,  "udp" },
-  { "dialpad-voice1",  { NULL }, 2860,  "tcp" },
-  { "dialpad-voice1",  { NULL }, 2860,  "udp" },
-  { "dialpad-voice2",  { NULL }, 2861,  "tcp" },
-  { "dialpad-voice2",  { NULL }, 2861,  "udp" },
-  { "ttg-protocol",    { NULL }, 2862,  "tcp" },
-  { "ttg-protocol",    { NULL }, 2862,  "udp" },
-  { "sonardata",       { NULL }, 2863,  "tcp" },
-  { "sonardata",       { NULL }, 2863,  "udp" },
-  { "astromed-main",   { NULL }, 2864,  "tcp" },
-  { "astromed-main",   { NULL }, 2864,  "udp" },
-  { "pit-vpn",         { NULL }, 2865,  "tcp" },
-  { "pit-vpn",         { NULL }, 2865,  "udp" },
-  { "iwlistener",      { NULL }, 2866,  "tcp" },
-  { "iwlistener",      { NULL }, 2866,  "udp" },
-  { "esps-portal",     { NULL }, 2867,  "tcp" },
-  { "esps-portal",     { NULL }, 2867,  "udp" },
-  { "npep-messaging",  { NULL }, 2868,  "tcp" },
-  { "npep-messaging",  { NULL }, 2868,  "udp" },
-  { "icslap",          { NULL }, 2869,  "tcp" },
-  { "icslap",          { NULL }, 2869,  "udp" },
-  { "daishi",          { NULL }, 2870,  "tcp" },
-  { "daishi",          { NULL }, 2870,  "udp" },
-  { "msi-selectplay",  { NULL }, 2871,  "tcp" },
-  { "msi-selectplay",  { NULL }, 2871,  "udp" },
-  { "radix",           { NULL }, 2872,  "tcp" },
-  { "radix",           { NULL }, 2872,  "udp" },
-  { "dxmessagebase1",  { NULL }, 2874,  "tcp" },
-  { "dxmessagebase1",  { NULL }, 2874,  "udp" },
-  { "dxmessagebase2",  { NULL }, 2875,  "tcp" },
-  { "dxmessagebase2",  { NULL }, 2875,  "udp" },
-  { "sps-tunnel",      { NULL }, 2876,  "tcp" },
-  { "sps-tunnel",      { NULL }, 2876,  "udp" },
-  { "bluelance",       { NULL }, 2877,  "tcp" },
-  { "bluelance",       { NULL }, 2877,  "udp" },
-  { "aap",             { NULL }, 2878,  "tcp" },
-  { "aap",             { NULL }, 2878,  "udp" },
-  { "ucentric-ds",     { NULL }, 2879,  "tcp" },
-  { "ucentric-ds",     { NULL }, 2879,  "udp" },
-  { "synapse",         { NULL }, 2880,  "tcp" },
-  { "synapse",         { NULL }, 2880,  "udp" },
-  { "ndsp",            { NULL }, 2881,  "tcp" },
-  { "ndsp",            { NULL }, 2881,  "udp" },
-  { "ndtp",            { NULL }, 2882,  "tcp" },
-  { "ndtp",            { NULL }, 2882,  "udp" },
-  { "ndnp",            { NULL }, 2883,  "tcp" },
-  { "ndnp",            { NULL }, 2883,  "udp" },
-  { "flashmsg",        { NULL }, 2884,  "tcp" },
-  { "flashmsg",        { NULL }, 2884,  "udp" },
-  { "topflow",         { NULL }, 2885,  "tcp" },
-  { "topflow",         { NULL }, 2885,  "udp" },
-  { "responselogic",   { NULL }, 2886,  "tcp" },
-  { "responselogic",   { NULL }, 2886,  "udp" },
-  { "aironetddp",      { NULL }, 2887,  "tcp" },
-  { "aironetddp",      { NULL }, 2887,  "udp" },
-  { "spcsdlobby",      { NULL }, 2888,  "tcp" },
-  { "spcsdlobby",      { NULL }, 2888,  "udp" },
-  { "rsom",            { NULL }, 2889,  "tcp" },
-  { "rsom",            { NULL }, 2889,  "udp" },
-  { "cspclmulti",      { NULL }, 2890,  "tcp" },
-  { "cspclmulti",      { NULL }, 2890,  "udp" },
-  { "cinegrfx-elmd",   { NULL }, 2891,  "tcp" },
-  { "cinegrfx-elmd",   { NULL }, 2891,  "udp" },
-  { "snifferdata",     { NULL }, 2892,  "tcp" },
-  { "snifferdata",     { NULL }, 2892,  "udp" },
-  { "vseconnector",    { NULL }, 2893,  "tcp" },
-  { "vseconnector",    { NULL }, 2893,  "udp" },
-  { "abacus-remote",   { NULL }, 2894,  "tcp" },
-  { "abacus-remote",   { NULL }, 2894,  "udp" },
-  { "natuslink",       { NULL }, 2895,  "tcp" },
-  { "natuslink",       { NULL }, 2895,  "udp" },
-  { "ecovisiong6-1",   { NULL }, 2896,  "tcp" },
-  { "ecovisiong6-1",   { NULL }, 2896,  "udp" },
-  { "citrix-rtmp",     { NULL }, 2897,  "tcp" },
-  { "citrix-rtmp",     { NULL }, 2897,  "udp" },
-  { "appliance-cfg",   { NULL }, 2898,  "tcp" },
-  { "appliance-cfg",   { NULL }, 2898,  "udp" },
-  { "powergemplus",    { NULL }, 2899,  "tcp" },
-  { "powergemplus",    { NULL }, 2899,  "udp" },
-  { "quicksuite",      { NULL }, 2900,  "tcp" },
-  { "quicksuite",      { NULL }, 2900,  "udp" },
-  { "allstorcns",      { NULL }, 2901,  "tcp" },
-  { "allstorcns",      { NULL }, 2901,  "udp" },
-  { "netaspi",         { NULL }, 2902,  "tcp" },
-  { "netaspi",         { NULL }, 2902,  "udp" },
-  { "suitcase",        { NULL }, 2903,  "tcp" },
-  { "suitcase",        { NULL }, 2903,  "udp" },
-  { "m2ua",            { NULL }, 2904,  "tcp" },
-  { "m2ua",            { NULL }, 2904,  "udp" },
-  { "m2ua",            { NULL }, 2904,  "sctp"},
-  { "m3ua",            { NULL }, 2905,  "tcp" },
-  { "m3ua",            { NULL }, 2905,  "sctp"},
-  { "caller9",         { NULL }, 2906,  "tcp" },
-  { "caller9",         { NULL }, 2906,  "udp" },
-  { "webmethods-b2b",  { NULL }, 2907,  "tcp" },
-  { "webmethods-b2b",  { NULL }, 2907,  "udp" },
-  { "mao",             { NULL }, 2908,  "tcp" },
-  { "mao",             { NULL }, 2908,  "udp" },
-  { "funk-dialout",    { NULL }, 2909,  "tcp" },
-  { "funk-dialout",    { NULL }, 2909,  "udp" },
-  { "tdaccess",        { NULL }, 2910,  "tcp" },
-  { "tdaccess",        { NULL }, 2910,  "udp" },
-  { "blockade",        { NULL }, 2911,  "tcp" },
-  { "blockade",        { NULL }, 2911,  "udp" },
-  { "epicon",          { NULL }, 2912,  "tcp" },
-  { "epicon",          { NULL }, 2912,  "udp" },
-  { "boosterware",     { NULL }, 2913,  "tcp" },
-  { "boosterware",     { NULL }, 2913,  "udp" },
-  { "gamelobby",       { NULL }, 2914,  "tcp" },
-  { "gamelobby",       { NULL }, 2914,  "udp" },
-  { "tksocket",        { NULL }, 2915,  "tcp" },
-  { "tksocket",        { NULL }, 2915,  "udp" },
-  { "elvin_server",    { NULL }, 2916,  "tcp" },
-  { "elvin_server",    { NULL }, 2916,  "udp" },
-  { "elvin_client",    { NULL }, 2917,  "tcp" },
-  { "elvin_client",    { NULL }, 2917,  "udp" },
-  { "kastenchasepad",  { NULL }, 2918,  "tcp" },
-  { "kastenchasepad",  { NULL }, 2918,  "udp" },
-  { "roboer",          { NULL }, 2919,  "tcp" },
-  { "roboer",          { NULL }, 2919,  "udp" },
-  { "roboeda",         { NULL }, 2920,  "tcp" },
-  { "roboeda",         { NULL }, 2920,  "udp" },
-  { "cesdcdman",       { NULL }, 2921,  "tcp" },
-  { "cesdcdman",       { NULL }, 2921,  "udp" },
-  { "cesdcdtrn",       { NULL }, 2922,  "tcp" },
-  { "cesdcdtrn",       { NULL }, 2922,  "udp" },
-  { "wta-wsp-wtp-s",   { NULL }, 2923,  "tcp" },
-  { "wta-wsp-wtp-s",   { NULL }, 2923,  "udp" },
-  { "precise-vip",     { NULL }, 2924,  "tcp" },
-  { "precise-vip",     { NULL }, 2924,  "udp" },
-  { "mobile-file-dl",  { NULL }, 2926,  "tcp" },
-  { "mobile-file-dl",  { NULL }, 2926,  "udp" },
-  { "unimobilectrl",   { NULL }, 2927,  "tcp" },
-  { "unimobilectrl",   { NULL }, 2927,  "udp" },
-  { "redstone-cpss",   { NULL }, 2928,  "tcp" },
-  { "redstone-cpss",   { NULL }, 2928,  "udp" },
-  { "amx-webadmin",    { NULL }, 2929,  "tcp" },
-  { "amx-webadmin",    { NULL }, 2929,  "udp" },
-  { "amx-weblinx",     { NULL }, 2930,  "tcp" },
-  { "amx-weblinx",     { NULL }, 2930,  "udp" },
-  { "circle-x",        { NULL }, 2931,  "tcp" },
-  { "circle-x",        { NULL }, 2931,  "udp" },
-  { "incp",            { NULL }, 2932,  "tcp" },
-  { "incp",            { NULL }, 2932,  "udp" },
-  { "4-tieropmgw",     { NULL }, 2933,  "tcp" },
-  { "4-tieropmgw",     { NULL }, 2933,  "udp" },
-  { "4-tieropmcli",    { NULL }, 2934,  "tcp" },
-  { "4-tieropmcli",    { NULL }, 2934,  "udp" },
-  { "qtp",             { NULL }, 2935,  "tcp" },
-  { "qtp",             { NULL }, 2935,  "udp" },
-  { "otpatch",         { NULL }, 2936,  "tcp" },
-  { "otpatch",         { NULL }, 2936,  "udp" },
-  { "pnaconsult-lm",   { NULL }, 2937,  "tcp" },
-  { "pnaconsult-lm",   { NULL }, 2937,  "udp" },
-  { "sm-pas-1",        { NULL }, 2938,  "tcp" },
-  { "sm-pas-1",        { NULL }, 2938,  "udp" },
-  { "sm-pas-2",        { NULL }, 2939,  "tcp" },
-  { "sm-pas-2",        { NULL }, 2939,  "udp" },
-  { "sm-pas-3",        { NULL }, 2940,  "tcp" },
-  { "sm-pas-3",        { NULL }, 2940,  "udp" },
-  { "sm-pas-4",        { NULL }, 2941,  "tcp" },
-  { "sm-pas-4",        { NULL }, 2941,  "udp" },
-  { "sm-pas-5",        { NULL }, 2942,  "tcp" },
-  { "sm-pas-5",        { NULL }, 2942,  "udp" },
-  { "ttnrepository",   { NULL }, 2943,  "tcp" },
-  { "ttnrepository",   { NULL }, 2943,  "udp" },
-  { "megaco-h248",     { NULL }, 2944,  "tcp" },
-  { "megaco-h248",     { NULL }, 2944,  "udp" },
-  { "megaco-h248",     { NULL }, 2944,  "sctp"},
-  { "h248-binary",     { NULL }, 2945,  "tcp" },
-  { "h248-binary",     { NULL }, 2945,  "udp" },
-  { "h248-binary",     { NULL }, 2945,  "sctp"},
-  { "fjsvmpor",        { NULL }, 2946,  "tcp" },
-  { "fjsvmpor",        { NULL }, 2946,  "udp" },
-  { "gpsd",            { NULL }, 2947,  "tcp" },
-  { "gpsd",            { NULL }, 2947,  "udp" },
-  { "wap-push",        { NULL }, 2948,  "tcp" },
-  { "wap-push",        { NULL }, 2948,  "udp" },
-  { "wap-pushsecure",  { NULL }, 2949,  "tcp" },
-  { "wap-pushsecure",  { NULL }, 2949,  "udp" },
-  { "esip",            { NULL }, 2950,  "tcp" },
-  { "esip",            { NULL }, 2950,  "udp" },
-  { "ottp",            { NULL }, 2951,  "tcp" },
-  { "ottp",            { NULL }, 2951,  "udp" },
-  { "mpfwsas",         { NULL }, 2952,  "tcp" },
-  { "mpfwsas",         { NULL }, 2952,  "udp" },
-  { "ovalarmsrv",      { NULL }, 2953,  "tcp" },
-  { "ovalarmsrv",      { NULL }, 2953,  "udp" },
-  { "ovalarmsrv-cmd",  { NULL }, 2954,  "tcp" },
-  { "ovalarmsrv-cmd",  { NULL }, 2954,  "udp" },
-  { "csnotify",        { NULL }, 2955,  "tcp" },
-  { "csnotify",        { NULL }, 2955,  "udp" },
-  { "ovrimosdbman",    { NULL }, 2956,  "tcp" },
-  { "ovrimosdbman",    { NULL }, 2956,  "udp" },
-  { "jmact5",          { NULL }, 2957,  "tcp" },
-  { "jmact5",          { NULL }, 2957,  "udp" },
-  { "jmact6",          { NULL }, 2958,  "tcp" },
-  { "jmact6",          { NULL }, 2958,  "udp" },
-  { "rmopagt",         { NULL }, 2959,  "tcp" },
-  { "rmopagt",         { NULL }, 2959,  "udp" },
-  { "dfoxserver",      { NULL }, 2960,  "tcp" },
-  { "dfoxserver",      { NULL }, 2960,  "udp" },
-  { "boldsoft-lm",     { NULL }, 2961,  "tcp" },
-  { "boldsoft-lm",     { NULL }, 2961,  "udp" },
-  { "iph-policy-cli",  { NULL }, 2962,  "tcp" },
-  { "iph-policy-cli",  { NULL }, 2962,  "udp" },
-  { "iph-policy-adm",  { NULL }, 2963,  "tcp" },
-  { "iph-policy-adm",  { NULL }, 2963,  "udp" },
-  { "bullant-srap",    { NULL }, 2964,  "tcp" },
-  { "bullant-srap",    { NULL }, 2964,  "udp" },
-  { "bullant-rap",     { NULL }, 2965,  "tcp" },
-  { "bullant-rap",     { NULL }, 2965,  "udp" },
-  { "idp-infotrieve",  { NULL }, 2966,  "tcp" },
-  { "idp-infotrieve",  { NULL }, 2966,  "udp" },
-  { "ssc-agent",       { NULL }, 2967,  "tcp" },
-  { "ssc-agent",       { NULL }, 2967,  "udp" },
-  { "enpp",            { NULL }, 2968,  "tcp" },
-  { "enpp",            { NULL }, 2968,  "udp" },
-  { "essp",            { NULL }, 2969,  "tcp" },
-  { "essp",            { NULL }, 2969,  "udp" },
-  { "index-net",       { NULL }, 2970,  "tcp" },
-  { "index-net",       { NULL }, 2970,  "udp" },
-  { "netclip",         { NULL }, 2971,  "tcp" },
-  { "netclip",         { NULL }, 2971,  "udp" },
-  { "pmsm-webrctl",    { NULL }, 2972,  "tcp" },
-  { "pmsm-webrctl",    { NULL }, 2972,  "udp" },
-  { "svnetworks",      { NULL }, 2973,  "tcp" },
-  { "svnetworks",      { NULL }, 2973,  "udp" },
-  { "signal",          { NULL }, 2974,  "tcp" },
-  { "signal",          { NULL }, 2974,  "udp" },
-  { "fjmpcm",          { NULL }, 2975,  "tcp" },
-  { "fjmpcm",          { NULL }, 2975,  "udp" },
-  { "cns-srv-port",    { NULL }, 2976,  "tcp" },
-  { "cns-srv-port",    { NULL }, 2976,  "udp" },
-  { "ttc-etap-ns",     { NULL }, 2977,  "tcp" },
-  { "ttc-etap-ns",     { NULL }, 2977,  "udp" },
-  { "ttc-etap-ds",     { NULL }, 2978,  "tcp" },
-  { "ttc-etap-ds",     { NULL }, 2978,  "udp" },
-  { "h263-video",      { NULL }, 2979,  "tcp" },
-  { "h263-video",      { NULL }, 2979,  "udp" },
-  { "wimd",            { NULL }, 2980,  "tcp" },
-  { "wimd",            { NULL }, 2980,  "udp" },
-  { "mylxamport",      { NULL }, 2981,  "tcp" },
-  { "mylxamport",      { NULL }, 2981,  "udp" },
-  { "iwb-whiteboard",  { NULL }, 2982,  "tcp" },
-  { "iwb-whiteboard",  { NULL }, 2982,  "udp" },
-  { "netplan",         { NULL }, 2983,  "tcp" },
-  { "netplan",         { NULL }, 2983,  "udp" },
-  { "hpidsadmin",      { NULL }, 2984,  "tcp" },
-  { "hpidsadmin",      { NULL }, 2984,  "udp" },
-  { "hpidsagent",      { NULL }, 2985,  "tcp" },
-  { "hpidsagent",      { NULL }, 2985,  "udp" },
-  { "stonefalls",      { NULL }, 2986,  "tcp" },
-  { "stonefalls",      { NULL }, 2986,  "udp" },
-  { "identify",        { NULL }, 2987,  "tcp" },
-  { "identify",        { NULL }, 2987,  "udp" },
-  { "hippad",          { NULL }, 2988,  "tcp" },
-  { "hippad",          { NULL }, 2988,  "udp" },
-  { "zarkov",          { NULL }, 2989,  "tcp" },
-  { "zarkov",          { NULL }, 2989,  "udp" },
-  { "boscap",          { NULL }, 2990,  "tcp" },
-  { "boscap",          { NULL }, 2990,  "udp" },
-  { "wkstn-mon",       { NULL }, 2991,  "tcp" },
-  { "wkstn-mon",       { NULL }, 2991,  "udp" },
-  { "avenyo",          { NULL }, 2992,  "tcp" },
-  { "avenyo",          { NULL }, 2992,  "udp" },
-  { "veritas-vis1",    { NULL }, 2993,  "tcp" },
-  { "veritas-vis1",    { NULL }, 2993,  "udp" },
-  { "veritas-vis2",    { NULL }, 2994,  "tcp" },
-  { "veritas-vis2",    { NULL }, 2994,  "udp" },
-  { "idrs",            { NULL }, 2995,  "tcp" },
-  { "idrs",            { NULL }, 2995,  "udp" },
-  { "vsixml",          { NULL }, 2996,  "tcp" },
-  { "vsixml",          { NULL }, 2996,  "udp" },
-  { "rebol",           { NULL }, 2997,  "tcp" },
-  { "rebol",           { NULL }, 2997,  "udp" },
-  { "realsecure",      { NULL }, 2998,  "tcp" },
-  { "realsecure",      { NULL }, 2998,  "udp" },
-  { "remoteware-un",   { NULL }, 2999,  "tcp" },
-  { "remoteware-un",   { NULL }, 2999,  "udp" },
-  { "hbci",            { NULL }, 3000,  "tcp" },
-  { "hbci",            { NULL }, 3000,  "udp" },
-  { "remoteware-cl",   { NULL }, 3000,  "tcp" },
-  { "remoteware-cl",   { NULL }, 3000,  "udp" },
-  { "exlm-agent",      { NULL }, 3002,  "tcp" },
-  { "exlm-agent",      { NULL }, 3002,  "udp" },
-  { "remoteware-srv",  { NULL }, 3002,  "tcp" },
-  { "remoteware-srv",  { NULL }, 3002,  "udp" },
-  { "cgms",            { NULL }, 3003,  "tcp" },
-  { "cgms",            { NULL }, 3003,  "udp" },
-  { "csoftragent",     { NULL }, 3004,  "tcp" },
-  { "csoftragent",     { NULL }, 3004,  "udp" },
-  { "geniuslm",        { NULL }, 3005,  "tcp" },
-  { "geniuslm",        { NULL }, 3005,  "udp" },
-  { "ii-admin",        { NULL }, 3006,  "tcp" },
-  { "ii-admin",        { NULL }, 3006,  "udp" },
-  { "lotusmtap",       { NULL }, 3007,  "tcp" },
-  { "lotusmtap",       { NULL }, 3007,  "udp" },
-  { "midnight-tech",   { NULL }, 3008,  "tcp" },
-  { "midnight-tech",   { NULL }, 3008,  "udp" },
-  { "pxc-ntfy",        { NULL }, 3009,  "tcp" },
-  { "pxc-ntfy",        { NULL }, 3009,  "udp" },
-  { "gw",              { NULL }, 3010,  "tcp" },
-  { "ping-pong",       { NULL }, 3010,  "udp" },
-  { "trusted-web",     { NULL }, 3011,  "tcp" },
-  { "trusted-web",     { NULL }, 3011,  "udp" },
-  { "twsdss",          { NULL }, 3012,  "tcp" },
-  { "twsdss",          { NULL }, 3012,  "udp" },
-  { "gilatskysurfer",  { NULL }, 3013,  "tcp" },
-  { "gilatskysurfer",  { NULL }, 3013,  "udp" },
-  { "broker_service",  { NULL }, 3014,  "tcp" },
-  { "broker_service",  { NULL }, 3014,  "udp" },
-  { "nati-dstp",       { NULL }, 3015,  "tcp" },
-  { "nati-dstp",       { NULL }, 3015,  "udp" },
-  { "notify_srvr",     { NULL }, 3016,  "tcp" },
-  { "notify_srvr",     { NULL }, 3016,  "udp" },
-  { "event_listener",  { NULL }, 3017,  "tcp" },
-  { "event_listener",  { NULL }, 3017,  "udp" },
-  { "srvc_registry",   { NULL }, 3018,  "tcp" },
-  { "srvc_registry",   { NULL }, 3018,  "udp" },
-  { "resource_mgr",    { NULL }, 3019,  "tcp" },
-  { "resource_mgr",    { NULL }, 3019,  "udp" },
-  { "cifs",            { NULL }, 3020,  "tcp" },
-  { "cifs",            { NULL }, 3020,  "udp" },
-  { "agriserver",      { NULL }, 3021,  "tcp" },
-  { "agriserver",      { NULL }, 3021,  "udp" },
-  { "csregagent",      { NULL }, 3022,  "tcp" },
-  { "csregagent",      { NULL }, 3022,  "udp" },
-  { "magicnotes",      { NULL }, 3023,  "tcp" },
-  { "magicnotes",      { NULL }, 3023,  "udp" },
-  { "nds_sso",         { NULL }, 3024,  "tcp" },
-  { "nds_sso",         { NULL }, 3024,  "udp" },
-  { "arepa-raft",      { NULL }, 3025,  "tcp" },
-  { "arepa-raft",      { NULL }, 3025,  "udp" },
-  { "agri-gateway",    { NULL }, 3026,  "tcp" },
-  { "agri-gateway",    { NULL }, 3026,  "udp" },
-  { "LiebDevMgmt_C",   { NULL }, 3027,  "tcp" },
-  { "LiebDevMgmt_C",   { NULL }, 3027,  "udp" },
-  { "LiebDevMgmt_DM",  { NULL }, 3028,  "tcp" },
-  { "LiebDevMgmt_DM",  { NULL }, 3028,  "udp" },
-  { "LiebDevMgmt_A",   { NULL }, 3029,  "tcp" },
-  { "LiebDevMgmt_A",   { NULL }, 3029,  "udp" },
-  { "arepa-cas",       { NULL }, 3030,  "tcp" },
-  { "arepa-cas",       { NULL }, 3030,  "udp" },
-  { "eppc",            { NULL }, 3031,  "tcp" },
-  { "eppc",            { NULL }, 3031,  "udp" },
-  { "redwood-chat",    { NULL }, 3032,  "tcp" },
-  { "redwood-chat",    { NULL }, 3032,  "udp" },
-  { "pdb",             { NULL }, 3033,  "tcp" },
-  { "pdb",             { NULL }, 3033,  "udp" },
-  { "osmosis-aeea",    { NULL }, 3034,  "tcp" },
-  { "osmosis-aeea",    { NULL }, 3034,  "udp" },
-  { "fjsv-gssagt",     { NULL }, 3035,  "tcp" },
-  { "fjsv-gssagt",     { NULL }, 3035,  "udp" },
-  { "hagel-dump",      { NULL }, 3036,  "tcp" },
-  { "hagel-dump",      { NULL }, 3036,  "udp" },
-  { "hp-san-mgmt",     { NULL }, 3037,  "tcp" },
-  { "hp-san-mgmt",     { NULL }, 3037,  "udp" },
-  { "santak-ups",      { NULL }, 3038,  "tcp" },
-  { "santak-ups",      { NULL }, 3038,  "udp" },
-  { "cogitate",        { NULL }, 3039,  "tcp" },
-  { "cogitate",        { NULL }, 3039,  "udp" },
-  { "tomato-springs",  { NULL }, 3040,  "tcp" },
-  { "tomato-springs",  { NULL }, 3040,  "udp" },
-  { "di-traceware",    { NULL }, 3041,  "tcp" },
-  { "di-traceware",    { NULL }, 3041,  "udp" },
-  { "journee",         { NULL }, 3042,  "tcp" },
-  { "journee",         { NULL }, 3042,  "udp" },
-  { "brp",             { NULL }, 3043,  "tcp" },
-  { "brp",             { NULL }, 3043,  "udp" },
-  { "epp",             { NULL }, 3044,  "tcp" },
-  { "epp",             { NULL }, 3044,  "udp" },
-  { "responsenet",     { NULL }, 3045,  "tcp" },
-  { "responsenet",     { NULL }, 3045,  "udp" },
-  { "di-ase",          { NULL }, 3046,  "tcp" },
-  { "di-ase",          { NULL }, 3046,  "udp" },
-  { "hlserver",        { NULL }, 3047,  "tcp" },
-  { "hlserver",        { NULL }, 3047,  "udp" },
-  { "pctrader",        { NULL }, 3048,  "tcp" },
-  { "pctrader",        { NULL }, 3048,  "udp" },
-  { "nsws",            { NULL }, 3049,  "tcp" },
-  { "nsws",            { NULL }, 3049,  "udp" },
-  { "gds_db",          { NULL }, 3050,  "tcp" },
-  { "gds_db",          { NULL }, 3050,  "udp" },
-  { "galaxy-server",   { NULL }, 3051,  "tcp" },
-  { "galaxy-server",   { NULL }, 3051,  "udp" },
-  { "apc-3052",        { NULL }, 3052,  "tcp" },
-  { "apc-3052",        { NULL }, 3052,  "udp" },
-  { "dsom-server",     { NULL }, 3053,  "tcp" },
-  { "dsom-server",     { NULL }, 3053,  "udp" },
-  { "amt-cnf-prot",    { NULL }, 3054,  "tcp" },
-  { "amt-cnf-prot",    { NULL }, 3054,  "udp" },
-  { "policyserver",    { NULL }, 3055,  "tcp" },
-  { "policyserver",    { NULL }, 3055,  "udp" },
-  { "cdl-server",      { NULL }, 3056,  "tcp" },
-  { "cdl-server",      { NULL }, 3056,  "udp" },
-  { "goahead-fldup",   { NULL }, 3057,  "tcp" },
-  { "goahead-fldup",   { NULL }, 3057,  "udp" },
-  { "videobeans",      { NULL }, 3058,  "tcp" },
-  { "videobeans",      { NULL }, 3058,  "udp" },
-  { "qsoft",           { NULL }, 3059,  "tcp" },
-  { "qsoft",           { NULL }, 3059,  "udp" },
-  { "interserver",     { NULL }, 3060,  "tcp" },
-  { "interserver",     { NULL }, 3060,  "udp" },
-  { "cautcpd",         { NULL }, 3061,  "tcp" },
-  { "cautcpd",         { NULL }, 3061,  "udp" },
-  { "ncacn-ip-tcp",    { NULL }, 3062,  "tcp" },
-  { "ncacn-ip-tcp",    { NULL }, 3062,  "udp" },
-  { "ncadg-ip-udp",    { NULL }, 3063,  "tcp" },
-  { "ncadg-ip-udp",    { NULL }, 3063,  "udp" },
-  { "rprt",            { NULL }, 3064,  "tcp" },
-  { "rprt",            { NULL }, 3064,  "udp" },
-  { "slinterbase",     { NULL }, 3065,  "tcp" },
-  { "slinterbase",     { NULL }, 3065,  "udp" },
-  { "netattachsdmp",   { NULL }, 3066,  "tcp" },
-  { "netattachsdmp",   { NULL }, 3066,  "udp" },
-  { "fjhpjp",          { NULL }, 3067,  "tcp" },
-  { "fjhpjp",          { NULL }, 3067,  "udp" },
-  { "ls3bcast",        { NULL }, 3068,  "tcp" },
-  { "ls3bcast",        { NULL }, 3068,  "udp" },
-  { "ls3",             { NULL }, 3069,  "tcp" },
-  { "ls3",             { NULL }, 3069,  "udp" },
-  { "mgxswitch",       { NULL }, 3070,  "tcp" },
-  { "mgxswitch",       { NULL }, 3070,  "udp" },
-  { "csd-mgmt-port",   { NULL }, 3071,  "tcp" },
-  { "csd-mgmt-port",   { NULL }, 3071,  "udp" },
-  { "csd-monitor",     { NULL }, 3072,  "tcp" },
-  { "csd-monitor",     { NULL }, 3072,  "udp" },
-  { "vcrp",            { NULL }, 3073,  "tcp" },
-  { "vcrp",            { NULL }, 3073,  "udp" },
-  { "xbox",            { NULL }, 3074,  "tcp" },
-  { "xbox",            { NULL }, 3074,  "udp" },
-  { "orbix-locator",   { NULL }, 3075,  "tcp" },
-  { "orbix-locator",   { NULL }, 3075,  "udp" },
-  { "orbix-config",    { NULL }, 3076,  "tcp" },
-  { "orbix-config",    { NULL }, 3076,  "udp" },
-  { "orbix-loc-ssl",   { NULL }, 3077,  "tcp" },
-  { "orbix-loc-ssl",   { NULL }, 3077,  "udp" },
-  { "orbix-cfg-ssl",   { NULL }, 3078,  "tcp" },
-  { "orbix-cfg-ssl",   { NULL }, 3078,  "udp" },
-  { "lv-frontpanel",   { NULL }, 3079,  "tcp" },
-  { "lv-frontpanel",   { NULL }, 3079,  "udp" },
-  { "stm_pproc",       { NULL }, 3080,  "tcp" },
-  { "stm_pproc",       { NULL }, 3080,  "udp" },
-  { "tl1-lv",          { NULL }, 3081,  "tcp" },
-  { "tl1-lv",          { NULL }, 3081,  "udp" },
-  { "tl1-raw",         { NULL }, 3082,  "tcp" },
-  { "tl1-raw",         { NULL }, 3082,  "udp" },
-  { "tl1-telnet",      { NULL }, 3083,  "tcp" },
-  { "tl1-telnet",      { NULL }, 3083,  "udp" },
-  { "itm-mccs",        { NULL }, 3084,  "tcp" },
-  { "itm-mccs",        { NULL }, 3084,  "udp" },
-  { "pcihreq",         { NULL }, 3085,  "tcp" },
-  { "pcihreq",         { NULL }, 3085,  "udp" },
-  { "jdl-dbkitchen",   { NULL }, 3086,  "tcp" },
-  { "jdl-dbkitchen",   { NULL }, 3086,  "udp" },
-  { "asoki-sma",       { NULL }, 3087,  "tcp" },
-  { "asoki-sma",       { NULL }, 3087,  "udp" },
-  { "xdtp",            { NULL }, 3088,  "tcp" },
-  { "xdtp",            { NULL }, 3088,  "udp" },
-  { "ptk-alink",       { NULL }, 3089,  "tcp" },
-  { "ptk-alink",       { NULL }, 3089,  "udp" },
-  { "stss",            { NULL }, 3090,  "tcp" },
-  { "stss",            { NULL }, 3090,  "udp" },
-  { "1ci-smcs",        { NULL }, 3091,  "tcp" },
-  { "1ci-smcs",        { NULL }, 3091,  "udp" },
-  { "rapidmq-center",  { NULL }, 3093,  "tcp" },
-  { "rapidmq-center",  { NULL }, 3093,  "udp" },
-  { "rapidmq-reg",     { NULL }, 3094,  "tcp" },
-  { "rapidmq-reg",     { NULL }, 3094,  "udp" },
-  { "panasas",         { NULL }, 3095,  "tcp" },
-  { "panasas",         { NULL }, 3095,  "udp" },
-  { "ndl-aps",         { NULL }, 3096,  "tcp" },
-  { "ndl-aps",         { NULL }, 3096,  "udp" },
-  { "itu-bicc-stc",    { NULL }, 3097,  "sctp"},
-  { "umm-port",        { NULL }, 3098,  "tcp" },
-  { "umm-port",        { NULL }, 3098,  "udp" },
-  { "chmd",            { NULL }, 3099,  "tcp" },
-  { "chmd",            { NULL }, 3099,  "udp" },
-  { "opcon-xps",       { NULL }, 3100,  "tcp" },
-  { "opcon-xps",       { NULL }, 3100,  "udp" },
-  { "hp-pxpib",        { NULL }, 3101,  "tcp" },
-  { "hp-pxpib",        { NULL }, 3101,  "udp" },
-  { "slslavemon",      { NULL }, 3102,  "tcp" },
-  { "slslavemon",      { NULL }, 3102,  "udp" },
-  { "autocuesmi",      { NULL }, 3103,  "tcp" },
-  { "autocuesmi",      { NULL }, 3103,  "udp" },
-  { "autocuelog",      { NULL }, 3104,  "tcp" },
-  { "autocuetime",     { NULL }, 3104,  "udp" },
-  { "cardbox",         { NULL }, 3105,  "tcp" },
-  { "cardbox",         { NULL }, 3105,  "udp" },
-  { "cardbox-http",    { NULL }, 3106,  "tcp" },
-  { "cardbox-http",    { NULL }, 3106,  "udp" },
-  { "business",        { NULL }, 3107,  "tcp" },
-  { "business",        { NULL }, 3107,  "udp" },
-  { "geolocate",       { NULL }, 3108,  "tcp" },
-  { "geolocate",       { NULL }, 3108,  "udp" },
-  { "personnel",       { NULL }, 3109,  "tcp" },
-  { "personnel",       { NULL }, 3109,  "udp" },
-  { "sim-control",     { NULL }, 3110,  "tcp" },
-  { "sim-control",     { NULL }, 3110,  "udp" },
-  { "wsynch",          { NULL }, 3111,  "tcp" },
-  { "wsynch",          { NULL }, 3111,  "udp" },
-  { "ksysguard",       { NULL }, 3112,  "tcp" },
-  { "ksysguard",       { NULL }, 3112,  "udp" },
-  { "cs-auth-svr",     { NULL }, 3113,  "tcp" },
-  { "cs-auth-svr",     { NULL }, 3113,  "udp" },
-  { "ccmad",           { NULL }, 3114,  "tcp" },
-  { "ccmad",           { NULL }, 3114,  "udp" },
-  { "mctet-master",    { NULL }, 3115,  "tcp" },
-  { "mctet-master",    { NULL }, 3115,  "udp" },
-  { "mctet-gateway",   { NULL }, 3116,  "tcp" },
-  { "mctet-gateway",   { NULL }, 3116,  "udp" },
-  { "mctet-jserv",     { NULL }, 3117,  "tcp" },
-  { "mctet-jserv",     { NULL }, 3117,  "udp" },
-  { "pkagent",         { NULL }, 3118,  "tcp" },
-  { "pkagent",         { NULL }, 3118,  "udp" },
-  { "d2000kernel",     { NULL }, 3119,  "tcp" },
-  { "d2000kernel",     { NULL }, 3119,  "udp" },
-  { "d2000webserver",  { NULL }, 3120,  "tcp" },
-  { "d2000webserver",  { NULL }, 3120,  "udp" },
-  { "vtr-emulator",    { NULL }, 3122,  "tcp" },
-  { "vtr-emulator",    { NULL }, 3122,  "udp" },
-  { "edix",            { NULL }, 3123,  "tcp" },
-  { "edix",            { NULL }, 3123,  "udp" },
-  { "beacon-port",     { NULL }, 3124,  "tcp" },
-  { "beacon-port",     { NULL }, 3124,  "udp" },
-  { "a13-an",          { NULL }, 3125,  "tcp" },
-  { "a13-an",          { NULL }, 3125,  "udp" },
-  { "ctx-bridge",      { NULL }, 3127,  "tcp" },
-  { "ctx-bridge",      { NULL }, 3127,  "udp" },
-  { "ndl-aas",         { NULL }, 3128,  "tcp" },
-  { "ndl-aas",         { NULL }, 3128,  "udp" },
-  { "netport-id",      { NULL }, 3129,  "tcp" },
-  { "netport-id",      { NULL }, 3129,  "udp" },
-  { "icpv2",           { NULL }, 3130,  "tcp" },
-  { "icpv2",           { NULL }, 3130,  "udp" },
-  { "netbookmark",     { NULL }, 3131,  "tcp" },
-  { "netbookmark",     { NULL }, 3131,  "udp" },
-  { "ms-rule-engine",  { NULL }, 3132,  "tcp" },
-  { "ms-rule-engine",  { NULL }, 3132,  "udp" },
-  { "prism-deploy",    { NULL }, 3133,  "tcp" },
-  { "prism-deploy",    { NULL }, 3133,  "udp" },
-  { "ecp",             { NULL }, 3134,  "tcp" },
-  { "ecp",             { NULL }, 3134,  "udp" },
-  { "peerbook-port",   { NULL }, 3135,  "tcp" },
-  { "peerbook-port",   { NULL }, 3135,  "udp" },
-  { "grubd",           { NULL }, 3136,  "tcp" },
-  { "grubd",           { NULL }, 3136,  "udp" },
-  { "rtnt-1",          { NULL }, 3137,  "tcp" },
-  { "rtnt-1",          { NULL }, 3137,  "udp" },
-  { "rtnt-2",          { NULL }, 3138,  "tcp" },
-  { "rtnt-2",          { NULL }, 3138,  "udp" },
-  { "incognitorv",     { NULL }, 3139,  "tcp" },
-  { "incognitorv",     { NULL }, 3139,  "udp" },
-  { "ariliamulti",     { NULL }, 3140,  "tcp" },
-  { "ariliamulti",     { NULL }, 3140,  "udp" },
-  { "vmodem",          { NULL }, 3141,  "tcp" },
-  { "vmodem",          { NULL }, 3141,  "udp" },
-  { "rdc-wh-eos",      { NULL }, 3142,  "tcp" },
-  { "rdc-wh-eos",      { NULL }, 3142,  "udp" },
-  { "seaview",         { NULL }, 3143,  "tcp" },
-  { "seaview",         { NULL }, 3143,  "udp" },
-  { "tarantella",      { NULL }, 3144,  "tcp" },
-  { "tarantella",      { NULL }, 3144,  "udp" },
-  { "csi-lfap",        { NULL }, 3145,  "tcp" },
-  { "csi-lfap",        { NULL }, 3145,  "udp" },
-  { "bears-02",        { NULL }, 3146,  "tcp" },
-  { "bears-02",        { NULL }, 3146,  "udp" },
-  { "rfio",            { NULL }, 3147,  "tcp" },
-  { "rfio",            { NULL }, 3147,  "udp" },
-  { "nm-game-admin",   { NULL }, 3148,  "tcp" },
-  { "nm-game-admin",   { NULL }, 3148,  "udp" },
-  { "nm-game-server",  { NULL }, 3149,  "tcp" },
-  { "nm-game-server",  { NULL }, 3149,  "udp" },
-  { "nm-asses-admin",  { NULL }, 3150,  "tcp" },
-  { "nm-asses-admin",  { NULL }, 3150,  "udp" },
-  { "nm-assessor",     { NULL }, 3151,  "tcp" },
-  { "nm-assessor",     { NULL }, 3151,  "udp" },
-  { "feitianrockey",   { NULL }, 3152,  "tcp" },
-  { "feitianrockey",   { NULL }, 3152,  "udp" },
-  { "s8-client-port",  { NULL }, 3153,  "tcp" },
-  { "s8-client-port",  { NULL }, 3153,  "udp" },
-  { "ccmrmi",          { NULL }, 3154,  "tcp" },
-  { "ccmrmi",          { NULL }, 3154,  "udp" },
-  { "jpegmpeg",        { NULL }, 3155,  "tcp" },
-  { "jpegmpeg",        { NULL }, 3155,  "udp" },
-  { "indura",          { NULL }, 3156,  "tcp" },
-  { "indura",          { NULL }, 3156,  "udp" },
-  { "e3consultants",   { NULL }, 3157,  "tcp" },
-  { "e3consultants",   { NULL }, 3157,  "udp" },
-  { "stvp",            { NULL }, 3158,  "tcp" },
-  { "stvp",            { NULL }, 3158,  "udp" },
-  { "navegaweb-port",  { NULL }, 3159,  "tcp" },
-  { "navegaweb-port",  { NULL }, 3159,  "udp" },
-  { "tip-app-server",  { NULL }, 3160,  "tcp" },
-  { "tip-app-server",  { NULL }, 3160,  "udp" },
-  { "doc1lm",          { NULL }, 3161,  "tcp" },
-  { "doc1lm",          { NULL }, 3161,  "udp" },
-  { "sflm",            { NULL }, 3162,  "tcp" },
-  { "sflm",            { NULL }, 3162,  "udp" },
-  { "res-sap",         { NULL }, 3163,  "tcp" },
-  { "res-sap",         { NULL }, 3163,  "udp" },
-  { "imprs",           { NULL }, 3164,  "tcp" },
-  { "imprs",           { NULL }, 3164,  "udp" },
-  { "newgenpay",       { NULL }, 3165,  "tcp" },
-  { "newgenpay",       { NULL }, 3165,  "udp" },
-  { "sossecollector",  { NULL }, 3166,  "tcp" },
-  { "sossecollector",  { NULL }, 3166,  "udp" },
-  { "nowcontact",      { NULL }, 3167,  "tcp" },
-  { "nowcontact",      { NULL }, 3167,  "udp" },
-  { "poweronnud",      { NULL }, 3168,  "tcp" },
-  { "poweronnud",      { NULL }, 3168,  "udp" },
-  { "serverview-as",   { NULL }, 3169,  "tcp" },
-  { "serverview-as",   { NULL }, 3169,  "udp" },
-  { "serverview-asn",  { NULL }, 3170,  "tcp" },
-  { "serverview-asn",  { NULL }, 3170,  "udp" },
-  { "serverview-gf",   { NULL }, 3171,  "tcp" },
-  { "serverview-gf",   { NULL }, 3171,  "udp" },
-  { "serverview-rm",   { NULL }, 3172,  "tcp" },
-  { "serverview-rm",   { NULL }, 3172,  "udp" },
-  { "serverview-icc",  { NULL }, 3173,  "tcp" },
-  { "serverview-icc",  { NULL }, 3173,  "udp" },
-  { "armi-server",     { NULL }, 3174,  "tcp" },
-  { "armi-server",     { NULL }, 3174,  "udp" },
-  { "t1-e1-over-ip",   { NULL }, 3175,  "tcp" },
-  { "t1-e1-over-ip",   { NULL }, 3175,  "udp" },
-  { "ars-master",      { NULL }, 3176,  "tcp" },
-  { "ars-master",      { NULL }, 3176,  "udp" },
-  { "phonex-port",     { NULL }, 3177,  "tcp" },
-  { "phonex-port",     { NULL }, 3177,  "udp" },
-  { "radclientport",   { NULL }, 3178,  "tcp" },
-  { "radclientport",   { NULL }, 3178,  "udp" },
-  { "h2gf-w-2m",       { NULL }, 3179,  "tcp" },
-  { "h2gf-w-2m",       { NULL }, 3179,  "udp" },
-  { "mc-brk-srv",      { NULL }, 3180,  "tcp" },
-  { "mc-brk-srv",      { NULL }, 3180,  "udp" },
-  { "bmcpatrolagent",  { NULL }, 3181,  "tcp" },
-  { "bmcpatrolagent",  { NULL }, 3181,  "udp" },
-  { "bmcpatrolrnvu",   { NULL }, 3182,  "tcp" },
-  { "bmcpatrolrnvu",   { NULL }, 3182,  "udp" },
-  { "cops-tls",        { NULL }, 3183,  "tcp" },
-  { "cops-tls",        { NULL }, 3183,  "udp" },
-  { "apogeex-port",    { NULL }, 3184,  "tcp" },
-  { "apogeex-port",    { NULL }, 3184,  "udp" },
-  { "smpppd",          { NULL }, 3185,  "tcp" },
-  { "smpppd",          { NULL }, 3185,  "udp" },
-  { "iiw-port",        { NULL }, 3186,  "tcp" },
-  { "iiw-port",        { NULL }, 3186,  "udp" },
-  { "odi-port",        { NULL }, 3187,  "tcp" },
-  { "odi-port",        { NULL }, 3187,  "udp" },
-  { "brcm-comm-port",  { NULL }, 3188,  "tcp" },
-  { "brcm-comm-port",  { NULL }, 3188,  "udp" },
-  { "pcle-infex",      { NULL }, 3189,  "tcp" },
-  { "pcle-infex",      { NULL }, 3189,  "udp" },
-  { "csvr-proxy",      { NULL }, 3190,  "tcp" },
-  { "csvr-proxy",      { NULL }, 3190,  "udp" },
-  { "csvr-sslproxy",   { NULL }, 3191,  "tcp" },
-  { "csvr-sslproxy",   { NULL }, 3191,  "udp" },
-  { "firemonrcc",      { NULL }, 3192,  "tcp" },
-  { "firemonrcc",      { NULL }, 3192,  "udp" },
-  { "spandataport",    { NULL }, 3193,  "tcp" },
-  { "spandataport",    { NULL }, 3193,  "udp" },
-  { "magbind",         { NULL }, 3194,  "tcp" },
-  { "magbind",         { NULL }, 3194,  "udp" },
-  { "ncu-1",           { NULL }, 3195,  "tcp" },
-  { "ncu-1",           { NULL }, 3195,  "udp" },
-  { "ncu-2",           { NULL }, 3196,  "tcp" },
-  { "ncu-2",           { NULL }, 3196,  "udp" },
-  { "embrace-dp-s",    { NULL }, 3197,  "tcp" },
-  { "embrace-dp-s",    { NULL }, 3197,  "udp" },
-  { "embrace-dp-c",    { NULL }, 3198,  "tcp" },
-  { "embrace-dp-c",    { NULL }, 3198,  "udp" },
-  { "dmod-workspace",  { NULL }, 3199,  "tcp" },
-  { "dmod-workspace",  { NULL }, 3199,  "udp" },
-  { "tick-port",       { NULL }, 3200,  "tcp" },
-  { "tick-port",       { NULL }, 3200,  "udp" },
-  { "cpq-tasksmart",   { NULL }, 3201,  "tcp" },
-  { "cpq-tasksmart",   { NULL }, 3201,  "udp" },
-  { "intraintra",      { NULL }, 3202,  "tcp" },
-  { "intraintra",      { NULL }, 3202,  "udp" },
-  { "netwatcher-mon",  { NULL }, 3203,  "tcp" },
-  { "netwatcher-mon",  { NULL }, 3203,  "udp" },
-  { "netwatcher-db",   { NULL }, 3204,  "tcp" },
-  { "netwatcher-db",   { NULL }, 3204,  "udp" },
-  { "isns",            { NULL }, 3205,  "tcp" },
-  { "isns",            { NULL }, 3205,  "udp" },
-  { "ironmail",        { NULL }, 3206,  "tcp" },
-  { "ironmail",        { NULL }, 3206,  "udp" },
-  { "vx-auth-port",    { NULL }, 3207,  "tcp" },
-  { "vx-auth-port",    { NULL }, 3207,  "udp" },
-  { "pfu-prcallback",  { NULL }, 3208,  "tcp" },
-  { "pfu-prcallback",  { NULL }, 3208,  "udp" },
-  { "netwkpathengine", { NULL }, 3209,  "tcp" },
-  { "netwkpathengine", { NULL }, 3209,  "udp" },
-  { "flamenco-proxy",  { NULL }, 3210,  "tcp" },
-  { "flamenco-proxy",  { NULL }, 3210,  "udp" },
-  { "avsecuremgmt",    { NULL }, 3211,  "tcp" },
-  { "avsecuremgmt",    { NULL }, 3211,  "udp" },
-  { "surveyinst",      { NULL }, 3212,  "tcp" },
-  { "surveyinst",      { NULL }, 3212,  "udp" },
-  { "neon24x7",        { NULL }, 3213,  "tcp" },
-  { "neon24x7",        { NULL }, 3213,  "udp" },
-  { "jmq-daemon-1",    { NULL }, 3214,  "tcp" },
-  { "jmq-daemon-1",    { NULL }, 3214,  "udp" },
-  { "jmq-daemon-2",    { NULL }, 3215,  "tcp" },
-  { "jmq-daemon-2",    { NULL }, 3215,  "udp" },
-  { "ferrari-foam",    { NULL }, 3216,  "tcp" },
-  { "ferrari-foam",    { NULL }, 3216,  "udp" },
-  { "unite",           { NULL }, 3217,  "tcp" },
-  { "unite",           { NULL }, 3217,  "udp" },
-  { "smartpackets",    { NULL }, 3218,  "tcp" },
-  { "smartpackets",    { NULL }, 3218,  "udp" },
-  { "wms-messenger",   { NULL }, 3219,  "tcp" },
-  { "wms-messenger",   { NULL }, 3219,  "udp" },
-  { "xnm-ssl",         { NULL }, 3220,  "tcp" },
-  { "xnm-ssl",         { NULL }, 3220,  "udp" },
-  { "xnm-clear-text",  { NULL }, 3221,  "tcp" },
-  { "xnm-clear-text",  { NULL }, 3221,  "udp" },
-  { "glbp",            { NULL }, 3222,  "tcp" },
-  { "glbp",            { NULL }, 3222,  "udp" },
-  { "digivote",        { NULL }, 3223,  "tcp" },
-  { "digivote",        { NULL }, 3223,  "udp" },
-  { "aes-discovery",   { NULL }, 3224,  "tcp" },
-  { "aes-discovery",   { NULL }, 3224,  "udp" },
-  { "fcip-port",       { NULL }, 3225,  "tcp" },
-  { "fcip-port",       { NULL }, 3225,  "udp" },
-  { "isi-irp",         { NULL }, 3226,  "tcp" },
-  { "isi-irp",         { NULL }, 3226,  "udp" },
-  { "dwnmshttp",       { NULL }, 3227,  "tcp" },
-  { "dwnmshttp",       { NULL }, 3227,  "udp" },
-  { "dwmsgserver",     { NULL }, 3228,  "tcp" },
-  { "dwmsgserver",     { NULL }, 3228,  "udp" },
-  { "global-cd-port",  { NULL }, 3229,  "tcp" },
-  { "global-cd-port",  { NULL }, 3229,  "udp" },
-  { "sftdst-port",     { NULL }, 3230,  "tcp" },
-  { "sftdst-port",     { NULL }, 3230,  "udp" },
-  { "vidigo",          { NULL }, 3231,  "tcp" },
-  { "vidigo",          { NULL }, 3231,  "udp" },
-  { "mdtp",            { NULL }, 3232,  "tcp" },
-  { "mdtp",            { NULL }, 3232,  "udp" },
-  { "whisker",         { NULL }, 3233,  "tcp" },
-  { "whisker",         { NULL }, 3233,  "udp" },
-  { "alchemy",         { NULL }, 3234,  "tcp" },
-  { "alchemy",         { NULL }, 3234,  "udp" },
-  { "mdap-port",       { NULL }, 3235,  "tcp" },
-  { "mdap-port",       { NULL }, 3235,  "udp" },
-  { "apparenet-ts",    { NULL }, 3236,  "tcp" },
-  { "apparenet-ts",    { NULL }, 3236,  "udp" },
-  { "apparenet-tps",   { NULL }, 3237,  "tcp" },
-  { "apparenet-tps",   { NULL }, 3237,  "udp" },
-  { "apparenet-as",    { NULL }, 3238,  "tcp" },
-  { "apparenet-as",    { NULL }, 3238,  "udp" },
-  { "apparenet-ui",    { NULL }, 3239,  "tcp" },
-  { "apparenet-ui",    { NULL }, 3239,  "udp" },
-  { "triomotion",      { NULL }, 3240,  "tcp" },
-  { "triomotion",      { NULL }, 3240,  "udp" },
-  { "sysorb",          { NULL }, 3241,  "tcp" },
-  { "sysorb",          { NULL }, 3241,  "udp" },
-  { "sdp-id-port",     { NULL }, 3242,  "tcp" },
-  { "sdp-id-port",     { NULL }, 3242,  "udp" },
-  { "timelot",         { NULL }, 3243,  "tcp" },
-  { "timelot",         { NULL }, 3243,  "udp" },
-  { "onesaf",          { NULL }, 3244,  "tcp" },
-  { "onesaf",          { NULL }, 3244,  "udp" },
-  { "vieo-fe",         { NULL }, 3245,  "tcp" },
-  { "vieo-fe",         { NULL }, 3245,  "udp" },
-  { "dvt-system",      { NULL }, 3246,  "tcp" },
-  { "dvt-system",      { NULL }, 3246,  "udp" },
-  { "dvt-data",        { NULL }, 3247,  "tcp" },
-  { "dvt-data",        { NULL }, 3247,  "udp" },
-  { "procos-lm",       { NULL }, 3248,  "tcp" },
-  { "procos-lm",       { NULL }, 3248,  "udp" },
-  { "ssp",             { NULL }, 3249,  "tcp" },
-  { "ssp",             { NULL }, 3249,  "udp" },
-  { "hicp",            { NULL }, 3250,  "tcp" },
-  { "hicp",            { NULL }, 3250,  "udp" },
-  { "sysscanner",      { NULL }, 3251,  "tcp" },
-  { "sysscanner",      { NULL }, 3251,  "udp" },
-  { "dhe",             { NULL }, 3252,  "tcp" },
-  { "dhe",             { NULL }, 3252,  "udp" },
-  { "pda-data",        { NULL }, 3253,  "tcp" },
-  { "pda-data",        { NULL }, 3253,  "udp" },
-  { "pda-sys",         { NULL }, 3254,  "tcp" },
-  { "pda-sys",         { NULL }, 3254,  "udp" },
-  { "semaphore",       { NULL }, 3255,  "tcp" },
-  { "semaphore",       { NULL }, 3255,  "udp" },
-  { "cpqrpm-agent",    { NULL }, 3256,  "tcp" },
-  { "cpqrpm-agent",    { NULL }, 3256,  "udp" },
-  { "cpqrpm-server",   { NULL }, 3257,  "tcp" },
-  { "cpqrpm-server",   { NULL }, 3257,  "udp" },
-  { "ivecon-port",     { NULL }, 3258,  "tcp" },
-  { "ivecon-port",     { NULL }, 3258,  "udp" },
-  { "epncdp2",         { NULL }, 3259,  "tcp" },
-  { "epncdp2",         { NULL }, 3259,  "udp" },
-  { "iscsi-target",    { NULL }, 3260,  "tcp" },
-  { "iscsi-target",    { NULL }, 3260,  "udp" },
-  { "winshadow",       { NULL }, 3261,  "tcp" },
-  { "winshadow",       { NULL }, 3261,  "udp" },
-  { "necp",            { NULL }, 3262,  "tcp" },
-  { "necp",            { NULL }, 3262,  "udp" },
-  { "ecolor-imager",   { NULL }, 3263,  "tcp" },
-  { "ecolor-imager",   { NULL }, 3263,  "udp" },
-  { "ccmail",          { NULL }, 3264,  "tcp" },
-  { "ccmail",          { NULL }, 3264,  "udp" },
-  { "altav-tunnel",    { NULL }, 3265,  "tcp" },
-  { "altav-tunnel",    { NULL }, 3265,  "udp" },
-  { "ns-cfg-server",   { NULL }, 3266,  "tcp" },
-  { "ns-cfg-server",   { NULL }, 3266,  "udp" },
-  { "ibm-dial-out",    { NULL }, 3267,  "tcp" },
-  { "ibm-dial-out",    { NULL }, 3267,  "udp" },
-  { "msft-gc",         { NULL }, 3268,  "tcp" },
-  { "msft-gc",         { NULL }, 3268,  "udp" },
-  { "msft-gc-ssl",     { NULL }, 3269,  "tcp" },
-  { "msft-gc-ssl",     { NULL }, 3269,  "udp" },
-  { "verismart",       { NULL }, 3270,  "tcp" },
-  { "verismart",       { NULL }, 3270,  "udp" },
-  { "csoft-prev",      { NULL }, 3271,  "tcp" },
-  { "csoft-prev",      { NULL }, 3271,  "udp" },
-  { "user-manager",    { NULL }, 3272,  "tcp" },
-  { "user-manager",    { NULL }, 3272,  "udp" },
-  { "sxmp",            { NULL }, 3273,  "tcp" },
-  { "sxmp",            { NULL }, 3273,  "udp" },
-  { "ordinox-server",  { NULL }, 3274,  "tcp" },
-  { "ordinox-server",  { NULL }, 3274,  "udp" },
-  { "samd",            { NULL }, 3275,  "tcp" },
-  { "samd",            { NULL }, 3275,  "udp" },
-  { "maxim-asics",     { NULL }, 3276,  "tcp" },
-  { "maxim-asics",     { NULL }, 3276,  "udp" },
-  { "awg-proxy",       { NULL }, 3277,  "tcp" },
-  { "awg-proxy",       { NULL }, 3277,  "udp" },
-  { "lkcmserver",      { NULL }, 3278,  "tcp" },
-  { "lkcmserver",      { NULL }, 3278,  "udp" },
-  { "admind",          { NULL }, 3279,  "tcp" },
-  { "admind",          { NULL }, 3279,  "udp" },
-  { "vs-server",       { NULL }, 3280,  "tcp" },
-  { "vs-server",       { NULL }, 3280,  "udp" },
-  { "sysopt",          { NULL }, 3281,  "tcp" },
-  { "sysopt",          { NULL }, 3281,  "udp" },
-  { "datusorb",        { NULL }, 3282,  "tcp" },
-  { "datusorb",        { NULL }, 3282,  "udp" },
-  { "net-assistant",   { NULL }, 3283,  "tcp" },
-  { "net-assistant",   { NULL }, 3283,  "udp" },
-  { "4talk",           { NULL }, 3284,  "tcp" },
-  { "4talk",           { NULL }, 3284,  "udp" },
-  { "plato",           { NULL }, 3285,  "tcp" },
-  { "plato",           { NULL }, 3285,  "udp" },
-  { "e-net",           { NULL }, 3286,  "tcp" },
-  { "e-net",           { NULL }, 3286,  "udp" },
-  { "directvdata",     { NULL }, 3287,  "tcp" },
-  { "directvdata",     { NULL }, 3287,  "udp" },
-  { "cops",            { NULL }, 3288,  "tcp" },
-  { "cops",            { NULL }, 3288,  "udp" },
-  { "enpc",            { NULL }, 3289,  "tcp" },
-  { "enpc",            { NULL }, 3289,  "udp" },
-  { "caps-lm",         { NULL }, 3290,  "tcp" },
-  { "caps-lm",         { NULL }, 3290,  "udp" },
-  { "sah-lm",          { NULL }, 3291,  "tcp" },
-  { "sah-lm",          { NULL }, 3291,  "udp" },
-  { "cart-o-rama",     { NULL }, 3292,  "tcp" },
-  { "cart-o-rama",     { NULL }, 3292,  "udp" },
-  { "fg-fps",          { NULL }, 3293,  "tcp" },
-  { "fg-fps",          { NULL }, 3293,  "udp" },
-  { "fg-gip",          { NULL }, 3294,  "tcp" },
-  { "fg-gip",          { NULL }, 3294,  "udp" },
-  { "dyniplookup",     { NULL }, 3295,  "tcp" },
-  { "dyniplookup",     { NULL }, 3295,  "udp" },
-  { "rib-slm",         { NULL }, 3296,  "tcp" },
-  { "rib-slm",         { NULL }, 3296,  "udp" },
-  { "cytel-lm",        { NULL }, 3297,  "tcp" },
-  { "cytel-lm",        { NULL }, 3297,  "udp" },
-  { "deskview",        { NULL }, 3298,  "tcp" },
-  { "deskview",        { NULL }, 3298,  "udp" },
-  { "pdrncs",          { NULL }, 3299,  "tcp" },
-  { "pdrncs",          { NULL }, 3299,  "udp" },
-  { "mcs-fastmail",    { NULL }, 3302,  "tcp" },
-  { "mcs-fastmail",    { NULL }, 3302,  "udp" },
-  { "opsession-clnt",  { NULL }, 3303,  "tcp" },
-  { "opsession-clnt",  { NULL }, 3303,  "udp" },
-  { "opsession-srvr",  { NULL }, 3304,  "tcp" },
-  { "opsession-srvr",  { NULL }, 3304,  "udp" },
-  { "odette-ftp",      { NULL }, 3305,  "tcp" },
-  { "odette-ftp",      { NULL }, 3305,  "udp" },
-  { "mysql",           { NULL }, 3306,  "tcp" },
-  { "mysql",           { NULL }, 3306,  "udp" },
-  { "opsession-prxy",  { NULL }, 3307,  "tcp" },
-  { "opsession-prxy",  { NULL }, 3307,  "udp" },
-  { "tns-server",      { NULL }, 3308,  "tcp" },
-  { "tns-server",      { NULL }, 3308,  "udp" },
-  { "tns-adv",         { NULL }, 3309,  "tcp" },
-  { "tns-adv",         { NULL }, 3309,  "udp" },
-  { "dyna-access",     { NULL }, 3310,  "tcp" },
-  { "dyna-access",     { NULL }, 3310,  "udp" },
-  { "mcns-tel-ret",    { NULL }, 3311,  "tcp" },
-  { "mcns-tel-ret",    { NULL }, 3311,  "udp" },
-  { "appman-server",   { NULL }, 3312,  "tcp" },
-  { "appman-server",   { NULL }, 3312,  "udp" },
-  { "uorb",            { NULL }, 3313,  "tcp" },
-  { "uorb",            { NULL }, 3313,  "udp" },
-  { "uohost",          { NULL }, 3314,  "tcp" },
-  { "uohost",          { NULL }, 3314,  "udp" },
-  { "cdid",            { NULL }, 3315,  "tcp" },
-  { "cdid",            { NULL }, 3315,  "udp" },
-  { "aicc-cmi",        { NULL }, 3316,  "tcp" },
-  { "aicc-cmi",        { NULL }, 3316,  "udp" },
-  { "vsaiport",        { NULL }, 3317,  "tcp" },
-  { "vsaiport",        { NULL }, 3317,  "udp" },
-  { "ssrip",           { NULL }, 3318,  "tcp" },
-  { "ssrip",           { NULL }, 3318,  "udp" },
-  { "sdt-lmd",         { NULL }, 3319,  "tcp" },
-  { "sdt-lmd",         { NULL }, 3319,  "udp" },
-  { "officelink2000",  { NULL }, 3320,  "tcp" },
-  { "officelink2000",  { NULL }, 3320,  "udp" },
-  { "vnsstr",          { NULL }, 3321,  "tcp" },
-  { "vnsstr",          { NULL }, 3321,  "udp" },
-  { "sftu",            { NULL }, 3326,  "tcp" },
-  { "sftu",            { NULL }, 3326,  "udp" },
-  { "bbars",           { NULL }, 3327,  "tcp" },
-  { "bbars",           { NULL }, 3327,  "udp" },
-  { "egptlm",          { NULL }, 3328,  "tcp" },
-  { "egptlm",          { NULL }, 3328,  "udp" },
-  { "hp-device-disc",  { NULL }, 3329,  "tcp" },
-  { "hp-device-disc",  { NULL }, 3329,  "udp" },
-  { "mcs-calypsoicf",  { NULL }, 3330,  "tcp" },
-  { "mcs-calypsoicf",  { NULL }, 3330,  "udp" },
-  { "mcs-messaging",   { NULL }, 3331,  "tcp" },
-  { "mcs-messaging",   { NULL }, 3331,  "udp" },
-  { "mcs-mailsvr",     { NULL }, 3332,  "tcp" },
-  { "mcs-mailsvr",     { NULL }, 3332,  "udp" },
-  { "dec-notes",       { NULL }, 3333,  "tcp" },
-  { "dec-notes",       { NULL }, 3333,  "udp" },
-  { "directv-web",     { NULL }, 3334,  "tcp" },
-  { "directv-web",     { NULL }, 3334,  "udp" },
-  { "directv-soft",    { NULL }, 3335,  "tcp" },
-  { "directv-soft",    { NULL }, 3335,  "udp" },
-  { "directv-tick",    { NULL }, 3336,  "tcp" },
-  { "directv-tick",    { NULL }, 3336,  "udp" },
-  { "directv-catlg",   { NULL }, 3337,  "tcp" },
-  { "directv-catlg",   { NULL }, 3337,  "udp" },
-  { "anet-b",          { NULL }, 3338,  "tcp" },
-  { "anet-b",          { NULL }, 3338,  "udp" },
-  { "anet-l",          { NULL }, 3339,  "tcp" },
-  { "anet-l",          { NULL }, 3339,  "udp" },
-  { "anet-m",          { NULL }, 3340,  "tcp" },
-  { "anet-m",          { NULL }, 3340,  "udp" },
-  { "anet-h",          { NULL }, 3341,  "tcp" },
-  { "anet-h",          { NULL }, 3341,  "udp" },
-  { "webtie",          { NULL }, 3342,  "tcp" },
-  { "webtie",          { NULL }, 3342,  "udp" },
-  { "ms-cluster-net",  { NULL }, 3343,  "tcp" },
-  { "ms-cluster-net",  { NULL }, 3343,  "udp" },
-  { "bnt-manager",     { NULL }, 3344,  "tcp" },
-  { "bnt-manager",     { NULL }, 3344,  "udp" },
-  { "influence",       { NULL }, 3345,  "tcp" },
-  { "influence",       { NULL }, 3345,  "udp" },
-  { "trnsprntproxy",   { NULL }, 3346,  "tcp" },
-  { "trnsprntproxy",   { NULL }, 3346,  "udp" },
-  { "phoenix-rpc",     { NULL }, 3347,  "tcp" },
-  { "phoenix-rpc",     { NULL }, 3347,  "udp" },
-  { "pangolin-laser",  { NULL }, 3348,  "tcp" },
-  { "pangolin-laser",  { NULL }, 3348,  "udp" },
-  { "chevinservices",  { NULL }, 3349,  "tcp" },
-  { "chevinservices",  { NULL }, 3349,  "udp" },
-  { "findviatv",       { NULL }, 3350,  "tcp" },
-  { "findviatv",       { NULL }, 3350,  "udp" },
-  { "btrieve",         { NULL }, 3351,  "tcp" },
-  { "btrieve",         { NULL }, 3351,  "udp" },
-  { "ssql",            { NULL }, 3352,  "tcp" },
-  { "ssql",            { NULL }, 3352,  "udp" },
-  { "fatpipe",         { NULL }, 3353,  "tcp" },
-  { "fatpipe",         { NULL }, 3353,  "udp" },
-  { "suitjd",          { NULL }, 3354,  "tcp" },
-  { "suitjd",          { NULL }, 3354,  "udp" },
-  { "ordinox-dbase",   { NULL }, 3355,  "tcp" },
-  { "ordinox-dbase",   { NULL }, 3355,  "udp" },
-  { "upnotifyps",      { NULL }, 3356,  "tcp" },
-  { "upnotifyps",      { NULL }, 3356,  "udp" },
-  { "adtech-test",     { NULL }, 3357,  "tcp" },
-  { "adtech-test",     { NULL }, 3357,  "udp" },
-  { "mpsysrmsvr",      { NULL }, 3358,  "tcp" },
-  { "mpsysrmsvr",      { NULL }, 3358,  "udp" },
-  { "wg-netforce",     { NULL }, 3359,  "tcp" },
-  { "wg-netforce",     { NULL }, 3359,  "udp" },
-  { "kv-server",       { NULL }, 3360,  "tcp" },
-  { "kv-server",       { NULL }, 3360,  "udp" },
-  { "kv-agent",        { NULL }, 3361,  "tcp" },
-  { "kv-agent",        { NULL }, 3361,  "udp" },
-  { "dj-ilm",          { NULL }, 3362,  "tcp" },
-  { "dj-ilm",          { NULL }, 3362,  "udp" },
-  { "nati-vi-server",  { NULL }, 3363,  "tcp" },
-  { "nati-vi-server",  { NULL }, 3363,  "udp" },
-  { "creativeserver",  { NULL }, 3364,  "tcp" },
-  { "creativeserver",  { NULL }, 3364,  "udp" },
-  { "contentserver",   { NULL }, 3365,  "tcp" },
-  { "contentserver",   { NULL }, 3365,  "udp" },
-  { "creativepartnr",  { NULL }, 3366,  "tcp" },
-  { "creativepartnr",  { NULL }, 3366,  "udp" },
-  { "tip2",            { NULL }, 3372,  "tcp" },
-  { "tip2",            { NULL }, 3372,  "udp" },
-  { "lavenir-lm",      { NULL }, 3373,  "tcp" },
-  { "lavenir-lm",      { NULL }, 3373,  "udp" },
-  { "cluster-disc",    { NULL }, 3374,  "tcp" },
-  { "cluster-disc",    { NULL }, 3374,  "udp" },
-  { "vsnm-agent",      { NULL }, 3375,  "tcp" },
-  { "vsnm-agent",      { NULL }, 3375,  "udp" },
-  { "cdbroker",        { NULL }, 3376,  "tcp" },
-  { "cdbroker",        { NULL }, 3376,  "udp" },
-  { "cogsys-lm",       { NULL }, 3377,  "tcp" },
-  { "cogsys-lm",       { NULL }, 3377,  "udp" },
-  { "wsicopy",         { NULL }, 3378,  "tcp" },
-  { "wsicopy",         { NULL }, 3378,  "udp" },
-  { "socorfs",         { NULL }, 3379,  "tcp" },
-  { "socorfs",         { NULL }, 3379,  "udp" },
-  { "sns-channels",    { NULL }, 3380,  "tcp" },
-  { "sns-channels",    { NULL }, 3380,  "udp" },
-  { "geneous",         { NULL }, 3381,  "tcp" },
-  { "geneous",         { NULL }, 3381,  "udp" },
-  { "fujitsu-neat",    { NULL }, 3382,  "tcp" },
-  { "fujitsu-neat",    { NULL }, 3382,  "udp" },
-  { "esp-lm",          { NULL }, 3383,  "tcp" },
-  { "esp-lm",          { NULL }, 3383,  "udp" },
-  { "hp-clic",         { NULL }, 3384,  "tcp" },
-  { "hp-clic",         { NULL }, 3384,  "udp" },
-  { "qnxnetman",       { NULL }, 3385,  "tcp" },
-  { "qnxnetman",       { NULL }, 3385,  "udp" },
-  { "gprs-data",       { NULL }, 3386,  "tcp" },
-  { "gprs-sig",        { NULL }, 3386,  "udp" },
-  { "backroomnet",     { NULL }, 3387,  "tcp" },
-  { "backroomnet",     { NULL }, 3387,  "udp" },
-  { "cbserver",        { NULL }, 3388,  "tcp" },
-  { "cbserver",        { NULL }, 3388,  "udp" },
-  { "ms-wbt-server",   { NULL }, 3389,  "tcp" },
-  { "ms-wbt-server",   { NULL }, 3389,  "udp" },
-  { "dsc",             { NULL }, 3390,  "tcp" },
-  { "dsc",             { NULL }, 3390,  "udp" },
-  { "savant",          { NULL }, 3391,  "tcp" },
-  { "savant",          { NULL }, 3391,  "udp" },
-  { "efi-lm",          { NULL }, 3392,  "tcp" },
-  { "efi-lm",          { NULL }, 3392,  "udp" },
-  { "d2k-tapestry1",   { NULL }, 3393,  "tcp" },
-  { "d2k-tapestry1",   { NULL }, 3393,  "udp" },
-  { "d2k-tapestry2",   { NULL }, 3394,  "tcp" },
-  { "d2k-tapestry2",   { NULL }, 3394,  "udp" },
-  { "dyna-lm",         { NULL }, 3395,  "tcp" },
-  { "dyna-lm",         { NULL }, 3395,  "udp" },
-  { "printer_agent",   { NULL }, 3396,  "tcp" },
-  { "printer_agent",   { NULL }, 3396,  "udp" },
-  { "cloanto-lm",      { NULL }, 3397,  "tcp" },
-  { "cloanto-lm",      { NULL }, 3397,  "udp" },
-  { "mercantile",      { NULL }, 3398,  "tcp" },
-  { "mercantile",      { NULL }, 3398,  "udp" },
-  { "csms",            { NULL }, 3399,  "tcp" },
-  { "csms",            { NULL }, 3399,  "udp" },
-  { "csms2",           { NULL }, 3400,  "tcp" },
-  { "csms2",           { NULL }, 3400,  "udp" },
-  { "filecast",        { NULL }, 3401,  "tcp" },
-  { "filecast",        { NULL }, 3401,  "udp" },
-  { "fxaengine-net",   { NULL }, 3402,  "tcp" },
-  { "fxaengine-net",   { NULL }, 3402,  "udp" },
-  { "nokia-ann-ch1",   { NULL }, 3405,  "tcp" },
-  { "nokia-ann-ch1",   { NULL }, 3405,  "udp" },
-  { "nokia-ann-ch2",   { NULL }, 3406,  "tcp" },
-  { "nokia-ann-ch2",   { NULL }, 3406,  "udp" },
-  { "ldap-admin",      { NULL }, 3407,  "tcp" },
-  { "ldap-admin",      { NULL }, 3407,  "udp" },
-  { "BESApi",          { NULL }, 3408,  "tcp" },
-  { "BESApi",          { NULL }, 3408,  "udp" },
-  { "networklens",     { NULL }, 3409,  "tcp" },
-  { "networklens",     { NULL }, 3409,  "udp" },
-  { "networklenss",    { NULL }, 3410,  "tcp" },
-  { "networklenss",    { NULL }, 3410,  "udp" },
-  { "biolink-auth",    { NULL }, 3411,  "tcp" },
-  { "biolink-auth",    { NULL }, 3411,  "udp" },
-  { "xmlblaster",      { NULL }, 3412,  "tcp" },
-  { "xmlblaster",      { NULL }, 3412,  "udp" },
-  { "svnet",           { NULL }, 3413,  "tcp" },
-  { "svnet",           { NULL }, 3413,  "udp" },
-  { "wip-port",        { NULL }, 3414,  "tcp" },
-  { "wip-port",        { NULL }, 3414,  "udp" },
-  { "bcinameservice",  { NULL }, 3415,  "tcp" },
-  { "bcinameservice",  { NULL }, 3415,  "udp" },
-  { "commandport",     { NULL }, 3416,  "tcp" },
-  { "commandport",     { NULL }, 3416,  "udp" },
-  { "csvr",            { NULL }, 3417,  "tcp" },
-  { "csvr",            { NULL }, 3417,  "udp" },
-  { "rnmap",           { NULL }, 3418,  "tcp" },
-  { "rnmap",           { NULL }, 3418,  "udp" },
-  { "softaudit",       { NULL }, 3419,  "tcp" },
-  { "softaudit",       { NULL }, 3419,  "udp" },
-  { "ifcp-port",       { NULL }, 3420,  "tcp" },
-  { "ifcp-port",       { NULL }, 3420,  "udp" },
-  { "bmap",            { NULL }, 3421,  "tcp" },
-  { "bmap",            { NULL }, 3421,  "udp" },
-  { "rusb-sys-port",   { NULL }, 3422,  "tcp" },
-  { "rusb-sys-port",   { NULL }, 3422,  "udp" },
-  { "xtrm",            { NULL }, 3423,  "tcp" },
-  { "xtrm",            { NULL }, 3423,  "udp" },
-  { "xtrms",           { NULL }, 3424,  "tcp" },
-  { "xtrms",           { NULL }, 3424,  "udp" },
-  { "agps-port",       { NULL }, 3425,  "tcp" },
-  { "agps-port",       { NULL }, 3425,  "udp" },
-  { "arkivio",         { NULL }, 3426,  "tcp" },
-  { "arkivio",         { NULL }, 3426,  "udp" },
-  { "websphere-snmp",  { NULL }, 3427,  "tcp" },
-  { "websphere-snmp",  { NULL }, 3427,  "udp" },
-  { "twcss",           { NULL }, 3428,  "tcp" },
-  { "twcss",           { NULL }, 3428,  "udp" },
-  { "gcsp",            { NULL }, 3429,  "tcp" },
-  { "gcsp",            { NULL }, 3429,  "udp" },
-  { "ssdispatch",      { NULL }, 3430,  "tcp" },
-  { "ssdispatch",      { NULL }, 3430,  "udp" },
-  { "ndl-als",         { NULL }, 3431,  "tcp" },
-  { "ndl-als",         { NULL }, 3431,  "udp" },
-  { "osdcp",           { NULL }, 3432,  "tcp" },
-  { "osdcp",           { NULL }, 3432,  "udp" },
-  { "alta-smp",        { NULL }, 3433,  "tcp" },
-  { "alta-smp",        { NULL }, 3433,  "udp" },
-  { "opencm",          { NULL }, 3434,  "tcp" },
-  { "opencm",          { NULL }, 3434,  "udp" },
-  { "pacom",           { NULL }, 3435,  "tcp" },
-  { "pacom",           { NULL }, 3435,  "udp" },
-  { "gc-config",       { NULL }, 3436,  "tcp" },
-  { "gc-config",       { NULL }, 3436,  "udp" },
-  { "autocueds",       { NULL }, 3437,  "tcp" },
-  { "autocueds",       { NULL }, 3437,  "udp" },
-  { "spiral-admin",    { NULL }, 3438,  "tcp" },
-  { "spiral-admin",    { NULL }, 3438,  "udp" },
-  { "hri-port",        { NULL }, 3439,  "tcp" },
-  { "hri-port",        { NULL }, 3439,  "udp" },
-  { "ans-console",     { NULL }, 3440,  "tcp" },
-  { "ans-console",     { NULL }, 3440,  "udp" },
-  { "connect-client",  { NULL }, 3441,  "tcp" },
-  { "connect-client",  { NULL }, 3441,  "udp" },
-  { "connect-server",  { NULL }, 3442,  "tcp" },
-  { "connect-server",  { NULL }, 3442,  "udp" },
-  { "ov-nnm-websrv",   { NULL }, 3443,  "tcp" },
-  { "ov-nnm-websrv",   { NULL }, 3443,  "udp" },
-  { "denali-server",   { NULL }, 3444,  "tcp" },
-  { "denali-server",   { NULL }, 3444,  "udp" },
-  { "monp",            { NULL }, 3445,  "tcp" },
-  { "monp",            { NULL }, 3445,  "udp" },
-  { "3comfaxrpc",      { NULL }, 3446,  "tcp" },
-  { "3comfaxrpc",      { NULL }, 3446,  "udp" },
-  { "directnet",       { NULL }, 3447,  "tcp" },
-  { "directnet",       { NULL }, 3447,  "udp" },
-  { "dnc-port",        { NULL }, 3448,  "tcp" },
-  { "dnc-port",        { NULL }, 3448,  "udp" },
-  { "hotu-chat",       { NULL }, 3449,  "tcp" },
-  { "hotu-chat",       { NULL }, 3449,  "udp" },
-  { "castorproxy",     { NULL }, 3450,  "tcp" },
-  { "castorproxy",     { NULL }, 3450,  "udp" },
-  { "asam",            { NULL }, 3451,  "tcp" },
-  { "asam",            { NULL }, 3451,  "udp" },
-  { "sabp-signal",     { NULL }, 3452,  "tcp" },
-  { "sabp-signal",     { NULL }, 3452,  "udp" },
-  { "pscupd",          { NULL }, 3453,  "tcp" },
-  { "pscupd",          { NULL }, 3453,  "udp" },
-  { "mira",            { NULL }, 3454,  "tcp" },
-  { "prsvp",           { NULL }, 3455,  "tcp" },
-  { "prsvp",           { NULL }, 3455,  "udp" },
-  { "vat",             { NULL }, 3456,  "tcp" },
-  { "vat",             { NULL }, 3456,  "udp" },
-  { "vat-control",     { NULL }, 3457,  "tcp" },
-  { "vat-control",     { NULL }, 3457,  "udp" },
-  { "d3winosfi",       { NULL }, 3458,  "tcp" },
-  { "d3winosfi",       { NULL }, 3458,  "udp" },
-  { "integral",        { NULL }, 3459,  "tcp" },
-  { "integral",        { NULL }, 3459,  "udp" },
-  { "edm-manager",     { NULL }, 3460,  "tcp" },
-  { "edm-manager",     { NULL }, 3460,  "udp" },
-  { "edm-stager",      { NULL }, 3461,  "tcp" },
-  { "edm-stager",      { NULL }, 3461,  "udp" },
-  { "edm-std-notify",  { NULL }, 3462,  "tcp" },
-  { "edm-std-notify",  { NULL }, 3462,  "udp" },
-  { "edm-adm-notify",  { NULL }, 3463,  "tcp" },
-  { "edm-adm-notify",  { NULL }, 3463,  "udp" },
-  { "edm-mgr-sync",    { NULL }, 3464,  "tcp" },
-  { "edm-mgr-sync",    { NULL }, 3464,  "udp" },
-  { "edm-mgr-cntrl",   { NULL }, 3465,  "tcp" },
-  { "edm-mgr-cntrl",   { NULL }, 3465,  "udp" },
-  { "workflow",        { NULL }, 3466,  "tcp" },
-  { "workflow",        { NULL }, 3466,  "udp" },
-  { "rcst",            { NULL }, 3467,  "tcp" },
-  { "rcst",            { NULL }, 3467,  "udp" },
-  { "ttcmremotectrl",  { NULL }, 3468,  "tcp" },
-  { "ttcmremotectrl",  { NULL }, 3468,  "udp" },
-  { "pluribus",        { NULL }, 3469,  "tcp" },
-  { "pluribus",        { NULL }, 3469,  "udp" },
-  { "jt400",           { NULL }, 3470,  "tcp" },
-  { "jt400",           { NULL }, 3470,  "udp" },
-  { "jt400-ssl",       { NULL }, 3471,  "tcp" },
-  { "jt400-ssl",       { NULL }, 3471,  "udp" },
-  { "jaugsremotec-1",  { NULL }, 3472,  "tcp" },
-  { "jaugsremotec-1",  { NULL }, 3472,  "udp" },
-  { "jaugsremotec-2",  { NULL }, 3473,  "tcp" },
-  { "jaugsremotec-2",  { NULL }, 3473,  "udp" },
-  { "ttntspauto",      { NULL }, 3474,  "tcp" },
-  { "ttntspauto",      { NULL }, 3474,  "udp" },
-  { "genisar-port",    { NULL }, 3475,  "tcp" },
-  { "genisar-port",    { NULL }, 3475,  "udp" },
-  { "nppmp",           { NULL }, 3476,  "tcp" },
-  { "nppmp",           { NULL }, 3476,  "udp" },
-  { "ecomm",           { NULL }, 3477,  "tcp" },
-  { "ecomm",           { NULL }, 3477,  "udp" },
-  { "stun",            { NULL }, 3478,  "tcp" },
-  { "stun",            { NULL }, 3478,  "udp" },
-  { "turn",            { NULL }, 3478,  "tcp" },
-  { "turn",            { NULL }, 3478,  "udp" },
-  { "stun-behavior",   { NULL }, 3478,  "tcp" },
-  { "stun-behavior",   { NULL }, 3478,  "udp" },
-  { "twrpc",           { NULL }, 3479,  "tcp" },
-  { "twrpc",           { NULL }, 3479,  "udp" },
-  { "plethora",        { NULL }, 3480,  "tcp" },
-  { "plethora",        { NULL }, 3480,  "udp" },
-  { "cleanerliverc",   { NULL }, 3481,  "tcp" },
-  { "cleanerliverc",   { NULL }, 3481,  "udp" },
-  { "vulture",         { NULL }, 3482,  "tcp" },
-  { "vulture",         { NULL }, 3482,  "udp" },
-  { "slim-devices",    { NULL }, 3483,  "tcp" },
-  { "slim-devices",    { NULL }, 3483,  "udp" },
-  { "gbs-stp",         { NULL }, 3484,  "tcp" },
-  { "gbs-stp",         { NULL }, 3484,  "udp" },
-  { "celatalk",        { NULL }, 3485,  "tcp" },
-  { "celatalk",        { NULL }, 3485,  "udp" },
-  { "ifsf-hb-port",    { NULL }, 3486,  "tcp" },
-  { "ifsf-hb-port",    { NULL }, 3486,  "udp" },
-  { "ltctcp",          { NULL }, 3487,  "tcp" },
-  { "ltcudp",          { NULL }, 3487,  "udp" },
-  { "fs-rh-srv",       { NULL }, 3488,  "tcp" },
-  { "fs-rh-srv",       { NULL }, 3488,  "udp" },
-  { "dtp-dia",         { NULL }, 3489,  "tcp" },
-  { "dtp-dia",         { NULL }, 3489,  "udp" },
-  { "colubris",        { NULL }, 3490,  "tcp" },
-  { "colubris",        { NULL }, 3490,  "udp" },
-  { "swr-port",        { NULL }, 3491,  "tcp" },
-  { "swr-port",        { NULL }, 3491,  "udp" },
-  { "tvdumtray-port",  { NULL }, 3492,  "tcp" },
-  { "tvdumtray-port",  { NULL }, 3492,  "udp" },
-  { "nut",             { NULL }, 3493,  "tcp" },
-  { "nut",             { NULL }, 3493,  "udp" },
-  { "ibm3494",         { NULL }, 3494,  "tcp" },
-  { "ibm3494",         { NULL }, 3494,  "udp" },
-  { "seclayer-tcp",    { NULL }, 3495,  "tcp" },
-  { "seclayer-tcp",    { NULL }, 3495,  "udp" },
-  { "seclayer-tls",    { NULL }, 3496,  "tcp" },
-  { "seclayer-tls",    { NULL }, 3496,  "udp" },
-  { "ipether232port",  { NULL }, 3497,  "tcp" },
-  { "ipether232port",  { NULL }, 3497,  "udp" },
-  { "dashpas-port",    { NULL }, 3498,  "tcp" },
-  { "dashpas-port",    { NULL }, 3498,  "udp" },
-  { "sccip-media",     { NULL }, 3499,  "tcp" },
-  { "sccip-media",     { NULL }, 3499,  "udp" },
-  { "rtmp-port",       { NULL }, 3500,  "tcp" },
-  { "rtmp-port",       { NULL }, 3500,  "udp" },
-  { "isoft-p2p",       { NULL }, 3501,  "tcp" },
-  { "isoft-p2p",       { NULL }, 3501,  "udp" },
-  { "avinstalldisc",   { NULL }, 3502,  "tcp" },
-  { "avinstalldisc",   { NULL }, 3502,  "udp" },
-  { "lsp-ping",        { NULL }, 3503,  "tcp" },
-  { "lsp-ping",        { NULL }, 3503,  "udp" },
-  { "ironstorm",       { NULL }, 3504,  "tcp" },
-  { "ironstorm",       { NULL }, 3504,  "udp" },
-  { "ccmcomm",         { NULL }, 3505,  "tcp" },
-  { "ccmcomm",         { NULL }, 3505,  "udp" },
-  { "apc-3506",        { NULL }, 3506,  "tcp" },
-  { "apc-3506",        { NULL }, 3506,  "udp" },
-  { "nesh-broker",     { NULL }, 3507,  "tcp" },
-  { "nesh-broker",     { NULL }, 3507,  "udp" },
-  { "interactionweb",  { NULL }, 3508,  "tcp" },
-  { "interactionweb",  { NULL }, 3508,  "udp" },
-  { "vt-ssl",          { NULL }, 3509,  "tcp" },
-  { "vt-ssl",          { NULL }, 3509,  "udp" },
-  { "xss-port",        { NULL }, 3510,  "tcp" },
-  { "xss-port",        { NULL }, 3510,  "udp" },
-  { "webmail-2",       { NULL }, 3511,  "tcp" },
-  { "webmail-2",       { NULL }, 3511,  "udp" },
-  { "aztec",           { NULL }, 3512,  "tcp" },
-  { "aztec",           { NULL }, 3512,  "udp" },
-  { "arcpd",           { NULL }, 3513,  "tcp" },
-  { "arcpd",           { NULL }, 3513,  "udp" },
-  { "must-p2p",        { NULL }, 3514,  "tcp" },
-  { "must-p2p",        { NULL }, 3514,  "udp" },
-  { "must-backplane",  { NULL }, 3515,  "tcp" },
-  { "must-backplane",  { NULL }, 3515,  "udp" },
-  { "smartcard-port",  { NULL }, 3516,  "tcp" },
-  { "smartcard-port",  { NULL }, 3516,  "udp" },
-  { "802-11-iapp",     { NULL }, 3517,  "tcp" },
-  { "802-11-iapp",     { NULL }, 3517,  "udp" },
-  { "artifact-msg",    { NULL }, 3518,  "tcp" },
-  { "artifact-msg",    { NULL }, 3518,  "udp" },
-  { "nvmsgd",          { NULL }, 3519,  "tcp" },
-  { "galileo",         { NULL }, 3519,  "udp" },
-  { "galileolog",      { NULL }, 3520,  "tcp" },
-  { "galileolog",      { NULL }, 3520,  "udp" },
-  { "mc3ss",           { NULL }, 3521,  "tcp" },
-  { "mc3ss",           { NULL }, 3521,  "udp" },
-  { "nssocketport",    { NULL }, 3522,  "tcp" },
-  { "nssocketport",    { NULL }, 3522,  "udp" },
-  { "odeumservlink",   { NULL }, 3523,  "tcp" },
-  { "odeumservlink",   { NULL }, 3523,  "udp" },
-  { "ecmport",         { NULL }, 3524,  "tcp" },
-  { "ecmport",         { NULL }, 3524,  "udp" },
-  { "eisport",         { NULL }, 3525,  "tcp" },
-  { "eisport",         { NULL }, 3525,  "udp" },
-  { "starquiz-port",   { NULL }, 3526,  "tcp" },
-  { "starquiz-port",   { NULL }, 3526,  "udp" },
-  { "beserver-msg-q",  { NULL }, 3527,  "tcp" },
-  { "beserver-msg-q",  { NULL }, 3527,  "udp" },
-  { "jboss-iiop",      { NULL }, 3528,  "tcp" },
-  { "jboss-iiop",      { NULL }, 3528,  "udp" },
-  { "jboss-iiop-ssl",  { NULL }, 3529,  "tcp" },
-  { "jboss-iiop-ssl",  { NULL }, 3529,  "udp" },
-  { "gf",              { NULL }, 3530,  "tcp" },
-  { "gf",              { NULL }, 3530,  "udp" },
-  { "joltid",          { NULL }, 3531,  "tcp" },
-  { "joltid",          { NULL }, 3531,  "udp" },
-  { "raven-rmp",       { NULL }, 3532,  "tcp" },
-  { "raven-rmp",       { NULL }, 3532,  "udp" },
-  { "raven-rdp",       { NULL }, 3533,  "tcp" },
-  { "raven-rdp",       { NULL }, 3533,  "udp" },
-  { "urld-port",       { NULL }, 3534,  "tcp" },
-  { "urld-port",       { NULL }, 3534,  "udp" },
-  { "ms-la",           { NULL }, 3535,  "tcp" },
-  { "ms-la",           { NULL }, 3535,  "udp" },
-  { "snac",            { NULL }, 3536,  "tcp" },
-  { "snac",            { NULL }, 3536,  "udp" },
-  { "ni-visa-remote",  { NULL }, 3537,  "tcp" },
-  { "ni-visa-remote",  { NULL }, 3537,  "udp" },
-  { "ibm-diradm",      { NULL }, 3538,  "tcp" },
-  { "ibm-diradm",      { NULL }, 3538,  "udp" },
-  { "ibm-diradm-ssl",  { NULL }, 3539,  "tcp" },
-  { "ibm-diradm-ssl",  { NULL }, 3539,  "udp" },
-  { "pnrp-port",       { NULL }, 3540,  "tcp" },
-  { "pnrp-port",       { NULL }, 3540,  "udp" },
-  { "voispeed-port",   { NULL }, 3541,  "tcp" },
-  { "voispeed-port",   { NULL }, 3541,  "udp" },
-  { "hacl-monitor",    { NULL }, 3542,  "tcp" },
-  { "hacl-monitor",    { NULL }, 3542,  "udp" },
-  { "qftest-lookup",   { NULL }, 3543,  "tcp" },
-  { "qftest-lookup",   { NULL }, 3543,  "udp" },
-  { "teredo",          { NULL }, 3544,  "tcp" },
-  { "teredo",          { NULL }, 3544,  "udp" },
-  { "camac",           { NULL }, 3545,  "tcp" },
-  { "camac",           { NULL }, 3545,  "udp" },
-  { "symantec-sim",    { NULL }, 3547,  "tcp" },
-  { "symantec-sim",    { NULL }, 3547,  "udp" },
-  { "interworld",      { NULL }, 3548,  "tcp" },
-  { "interworld",      { NULL }, 3548,  "udp" },
-  { "tellumat-nms",    { NULL }, 3549,  "tcp" },
-  { "tellumat-nms",    { NULL }, 3549,  "udp" },
-  { "ssmpp",           { NULL }, 3550,  "tcp" },
-  { "ssmpp",           { NULL }, 3550,  "udp" },
-  { "apcupsd",         { NULL }, 3551,  "tcp" },
-  { "apcupsd",         { NULL }, 3551,  "udp" },
-  { "taserver",        { NULL }, 3552,  "tcp" },
-  { "taserver",        { NULL }, 3552,  "udp" },
-  { "rbr-discovery",   { NULL }, 3553,  "tcp" },
-  { "rbr-discovery",   { NULL }, 3553,  "udp" },
-  { "questnotify",     { NULL }, 3554,  "tcp" },
-  { "questnotify",     { NULL }, 3554,  "udp" },
-  { "razor",           { NULL }, 3555,  "tcp" },
-  { "razor",           { NULL }, 3555,  "udp" },
-  { "sky-transport",   { NULL }, 3556,  "tcp" },
-  { "sky-transport",   { NULL }, 3556,  "udp" },
-  { "personalos-001",  { NULL }, 3557,  "tcp" },
-  { "personalos-001",  { NULL }, 3557,  "udp" },
-  { "mcp-port",        { NULL }, 3558,  "tcp" },
-  { "mcp-port",        { NULL }, 3558,  "udp" },
-  { "cctv-port",       { NULL }, 3559,  "tcp" },
-  { "cctv-port",       { NULL }, 3559,  "udp" },
-  { "iniserve-port",   { NULL }, 3560,  "tcp" },
-  { "iniserve-port",   { NULL }, 3560,  "udp" },
-  { "bmc-onekey",      { NULL }, 3561,  "tcp" },
-  { "bmc-onekey",      { NULL }, 3561,  "udp" },
-  { "sdbproxy",        { NULL }, 3562,  "tcp" },
-  { "sdbproxy",        { NULL }, 3562,  "udp" },
-  { "watcomdebug",     { NULL }, 3563,  "tcp" },
-  { "watcomdebug",     { NULL }, 3563,  "udp" },
-  { "esimport",        { NULL }, 3564,  "tcp" },
-  { "esimport",        { NULL }, 3564,  "udp" },
-  { "m2pa",            { NULL }, 3565,  "tcp" },
-  { "m2pa",            { NULL }, 3565,  "sctp"},
-  { "quest-data-hub",  { NULL }, 3566,  "tcp" },
-  { "oap",             { NULL }, 3567,  "tcp" },
-  { "oap",             { NULL }, 3567,  "udp" },
-  { "oap-s",           { NULL }, 3568,  "tcp" },
-  { "oap-s",           { NULL }, 3568,  "udp" },
-  { "mbg-ctrl",        { NULL }, 3569,  "tcp" },
-  { "mbg-ctrl",        { NULL }, 3569,  "udp" },
-  { "mccwebsvr-port",  { NULL }, 3570,  "tcp" },
-  { "mccwebsvr-port",  { NULL }, 3570,  "udp" },
-  { "megardsvr-port",  { NULL }, 3571,  "tcp" },
-  { "megardsvr-port",  { NULL }, 3571,  "udp" },
-  { "megaregsvrport",  { NULL }, 3572,  "tcp" },
-  { "megaregsvrport",  { NULL }, 3572,  "udp" },
-  { "tag-ups-1",       { NULL }, 3573,  "tcp" },
-  { "tag-ups-1",       { NULL }, 3573,  "udp" },
-  { "dmaf-server",     { NULL }, 3574,  "tcp" },
-  { "dmaf-caster",     { NULL }, 3574,  "udp" },
-  { "ccm-port",        { NULL }, 3575,  "tcp" },
-  { "ccm-port",        { NULL }, 3575,  "udp" },
-  { "cmc-port",        { NULL }, 3576,  "tcp" },
-  { "cmc-port",        { NULL }, 3576,  "udp" },
-  { "config-port",     { NULL }, 3577,  "tcp" },
-  { "config-port",     { NULL }, 3577,  "udp" },
-  { "data-port",       { NULL }, 3578,  "tcp" },
-  { "data-port",       { NULL }, 3578,  "udp" },
-  { "ttat3lb",         { NULL }, 3579,  "tcp" },
-  { "ttat3lb",         { NULL }, 3579,  "udp" },
-  { "nati-svrloc",     { NULL }, 3580,  "tcp" },
-  { "nati-svrloc",     { NULL }, 3580,  "udp" },
-  { "kfxaclicensing",  { NULL }, 3581,  "tcp" },
-  { "kfxaclicensing",  { NULL }, 3581,  "udp" },
-  { "press",           { NULL }, 3582,  "tcp" },
-  { "press",           { NULL }, 3582,  "udp" },
-  { "canex-watch",     { NULL }, 3583,  "tcp" },
-  { "canex-watch",     { NULL }, 3583,  "udp" },
-  { "u-dbap",          { NULL }, 3584,  "tcp" },
-  { "u-dbap",          { NULL }, 3584,  "udp" },
-  { "emprise-lls",     { NULL }, 3585,  "tcp" },
-  { "emprise-lls",     { NULL }, 3585,  "udp" },
-  { "emprise-lsc",     { NULL }, 3586,  "tcp" },
-  { "emprise-lsc",     { NULL }, 3586,  "udp" },
-  { "p2pgroup",        { NULL }, 3587,  "tcp" },
-  { "p2pgroup",        { NULL }, 3587,  "udp" },
-  { "sentinel",        { NULL }, 3588,  "tcp" },
-  { "sentinel",        { NULL }, 3588,  "udp" },
-  { "isomair",         { NULL }, 3589,  "tcp" },
-  { "isomair",         { NULL }, 3589,  "udp" },
-  { "wv-csp-sms",      { NULL }, 3590,  "tcp" },
-  { "wv-csp-sms",      { NULL }, 3590,  "udp" },
-  { "gtrack-server",   { NULL }, 3591,  "tcp" },
-  { "gtrack-server",   { NULL }, 3591,  "udp" },
-  { "gtrack-ne",       { NULL }, 3592,  "tcp" },
-  { "gtrack-ne",       { NULL }, 3592,  "udp" },
-  { "bpmd",            { NULL }, 3593,  "tcp" },
-  { "bpmd",            { NULL }, 3593,  "udp" },
-  { "mediaspace",      { NULL }, 3594,  "tcp" },
-  { "mediaspace",      { NULL }, 3594,  "udp" },
-  { "shareapp",        { NULL }, 3595,  "tcp" },
-  { "shareapp",        { NULL }, 3595,  "udp" },
-  { "iw-mmogame",      { NULL }, 3596,  "tcp" },
-  { "iw-mmogame",      { NULL }, 3596,  "udp" },
-  { "a14",             { NULL }, 3597,  "tcp" },
-  { "a14",             { NULL }, 3597,  "udp" },
-  { "a15",             { NULL }, 3598,  "tcp" },
-  { "a15",             { NULL }, 3598,  "udp" },
-  { "quasar-server",   { NULL }, 3599,  "tcp" },
-  { "quasar-server",   { NULL }, 3599,  "udp" },
-  { "trap-daemon",     { NULL }, 3600,  "tcp" },
-  { "trap-daemon",     { NULL }, 3600,  "udp" },
-  { "visinet-gui",     { NULL }, 3601,  "tcp" },
-  { "visinet-gui",     { NULL }, 3601,  "udp" },
-  { "infiniswitchcl",  { NULL }, 3602,  "tcp" },
-  { "infiniswitchcl",  { NULL }, 3602,  "udp" },
-  { "int-rcv-cntrl",   { NULL }, 3603,  "tcp" },
-  { "int-rcv-cntrl",   { NULL }, 3603,  "udp" },
-  { "bmc-jmx-port",    { NULL }, 3604,  "tcp" },
-  { "bmc-jmx-port",    { NULL }, 3604,  "udp" },
-  { "comcam-io",       { NULL }, 3605,  "tcp" },
-  { "comcam-io",       { NULL }, 3605,  "udp" },
-  { "splitlock",       { NULL }, 3606,  "tcp" },
-  { "splitlock",       { NULL }, 3606,  "udp" },
-  { "precise-i3",      { NULL }, 3607,  "tcp" },
-  { "precise-i3",      { NULL }, 3607,  "udp" },
-  { "trendchip-dcp",   { NULL }, 3608,  "tcp" },
-  { "trendchip-dcp",   { NULL }, 3608,  "udp" },
-  { "cpdi-pidas-cm",   { NULL }, 3609,  "tcp" },
-  { "cpdi-pidas-cm",   { NULL }, 3609,  "udp" },
-  { "echonet",         { NULL }, 3610,  "tcp" },
-  { "echonet",         { NULL }, 3610,  "udp" },
-  { "six-degrees",     { NULL }, 3611,  "tcp" },
-  { "six-degrees",     { NULL }, 3611,  "udp" },
-  { "hp-dataprotect",  { NULL }, 3612,  "tcp" },
-  { "hp-dataprotect",  { NULL }, 3612,  "udp" },
-  { "alaris-disc",     { NULL }, 3613,  "tcp" },
-  { "alaris-disc",     { NULL }, 3613,  "udp" },
-  { "sigma-port",      { NULL }, 3614,  "tcp" },
-  { "sigma-port",      { NULL }, 3614,  "udp" },
-  { "start-network",   { NULL }, 3615,  "tcp" },
-  { "start-network",   { NULL }, 3615,  "udp" },
-  { "cd3o-protocol",   { NULL }, 3616,  "tcp" },
-  { "cd3o-protocol",   { NULL }, 3616,  "udp" },
-  { "sharp-server",    { NULL }, 3617,  "tcp" },
-  { "sharp-server",    { NULL }, 3617,  "udp" },
-  { "aairnet-1",       { NULL }, 3618,  "tcp" },
-  { "aairnet-1",       { NULL }, 3618,  "udp" },
-  { "aairnet-2",       { NULL }, 3619,  "tcp" },
-  { "aairnet-2",       { NULL }, 3619,  "udp" },
-  { "ep-pcp",          { NULL }, 3620,  "tcp" },
-  { "ep-pcp",          { NULL }, 3620,  "udp" },
-  { "ep-nsp",          { NULL }, 3621,  "tcp" },
-  { "ep-nsp",          { NULL }, 3621,  "udp" },
-  { "ff-lr-port",      { NULL }, 3622,  "tcp" },
-  { "ff-lr-port",      { NULL }, 3622,  "udp" },
-  { "haipe-discover",  { NULL }, 3623,  "tcp" },
-  { "haipe-discover",  { NULL }, 3623,  "udp" },
-  { "dist-upgrade",    { NULL }, 3624,  "tcp" },
-  { "dist-upgrade",    { NULL }, 3624,  "udp" },
-  { "volley",          { NULL }, 3625,  "tcp" },
-  { "volley",          { NULL }, 3625,  "udp" },
-  { "bvcdaemon-port",  { NULL }, 3626,  "tcp" },
-  { "bvcdaemon-port",  { NULL }, 3626,  "udp" },
-  { "jamserverport",   { NULL }, 3627,  "tcp" },
-  { "jamserverport",   { NULL }, 3627,  "udp" },
-  { "ept-machine",     { NULL }, 3628,  "tcp" },
-  { "ept-machine",     { NULL }, 3628,  "udp" },
-  { "escvpnet",        { NULL }, 3629,  "tcp" },
-  { "escvpnet",        { NULL }, 3629,  "udp" },
-  { "cs-remote-db",    { NULL }, 3630,  "tcp" },
-  { "cs-remote-db",    { NULL }, 3630,  "udp" },
-  { "cs-services",     { NULL }, 3631,  "tcp" },
-  { "cs-services",     { NULL }, 3631,  "udp" },
-  { "distcc",          { NULL }, 3632,  "tcp" },
-  { "distcc",          { NULL }, 3632,  "udp" },
-  { "wacp",            { NULL }, 3633,  "tcp" },
-  { "wacp",            { NULL }, 3633,  "udp" },
-  { "hlibmgr",         { NULL }, 3634,  "tcp" },
-  { "hlibmgr",         { NULL }, 3634,  "udp" },
-  { "sdo",             { NULL }, 3635,  "tcp" },
-  { "sdo",             { NULL }, 3635,  "udp" },
-  { "servistaitsm",    { NULL }, 3636,  "tcp" },
-  { "servistaitsm",    { NULL }, 3636,  "udp" },
-  { "scservp",         { NULL }, 3637,  "tcp" },
-  { "scservp",         { NULL }, 3637,  "udp" },
-  { "ehp-backup",      { NULL }, 3638,  "tcp" },
-  { "ehp-backup",      { NULL }, 3638,  "udp" },
-  { "xap-ha",          { NULL }, 3639,  "tcp" },
-  { "xap-ha",          { NULL }, 3639,  "udp" },
-  { "netplay-port1",   { NULL }, 3640,  "tcp" },
-  { "netplay-port1",   { NULL }, 3640,  "udp" },
-  { "netplay-port2",   { NULL }, 3641,  "tcp" },
-  { "netplay-port2",   { NULL }, 3641,  "udp" },
-  { "juxml-port",      { NULL }, 3642,  "tcp" },
-  { "juxml-port",      { NULL }, 3642,  "udp" },
-  { "audiojuggler",    { NULL }, 3643,  "tcp" },
-  { "audiojuggler",    { NULL }, 3643,  "udp" },
-  { "ssowatch",        { NULL }, 3644,  "tcp" },
-  { "ssowatch",        { NULL }, 3644,  "udp" },
-  { "cyc",             { NULL }, 3645,  "tcp" },
-  { "cyc",             { NULL }, 3645,  "udp" },
-  { "xss-srv-port",    { NULL }, 3646,  "tcp" },
-  { "xss-srv-port",    { NULL }, 3646,  "udp" },
-  { "splitlock-gw",    { NULL }, 3647,  "tcp" },
-  { "splitlock-gw",    { NULL }, 3647,  "udp" },
-  { "fjcp",            { NULL }, 3648,  "tcp" },
-  { "fjcp",            { NULL }, 3648,  "udp" },
-  { "nmmp",            { NULL }, 3649,  "tcp" },
-  { "nmmp",            { NULL }, 3649,  "udp" },
-  { "prismiq-plugin",  { NULL }, 3650,  "tcp" },
-  { "prismiq-plugin",  { NULL }, 3650,  "udp" },
-  { "xrpc-registry",   { NULL }, 3651,  "tcp" },
-  { "xrpc-registry",   { NULL }, 3651,  "udp" },
-  { "vxcrnbuport",     { NULL }, 3652,  "tcp" },
-  { "vxcrnbuport",     { NULL }, 3652,  "udp" },
-  { "tsp",             { NULL }, 3653,  "tcp" },
-  { "tsp",             { NULL }, 3653,  "udp" },
-  { "vaprtm",          { NULL }, 3654,  "tcp" },
-  { "vaprtm",          { NULL }, 3654,  "udp" },
-  { "abatemgr",        { NULL }, 3655,  "tcp" },
-  { "abatemgr",        { NULL }, 3655,  "udp" },
-  { "abatjss",         { NULL }, 3656,  "tcp" },
-  { "abatjss",         { NULL }, 3656,  "udp" },
-  { "immedianet-bcn",  { NULL }, 3657,  "tcp" },
-  { "immedianet-bcn",  { NULL }, 3657,  "udp" },
-  { "ps-ams",          { NULL }, 3658,  "tcp" },
-  { "ps-ams",          { NULL }, 3658,  "udp" },
-  { "apple-sasl",      { NULL }, 3659,  "tcp" },
-  { "apple-sasl",      { NULL }, 3659,  "udp" },
-  { "can-nds-ssl",     { NULL }, 3660,  "tcp" },
-  { "can-nds-ssl",     { NULL }, 3660,  "udp" },
-  { "can-ferret-ssl",  { NULL }, 3661,  "tcp" },
-  { "can-ferret-ssl",  { NULL }, 3661,  "udp" },
-  { "pserver",         { NULL }, 3662,  "tcp" },
-  { "pserver",         { NULL }, 3662,  "udp" },
-  { "dtp",             { NULL }, 3663,  "tcp" },
-  { "dtp",             { NULL }, 3663,  "udp" },
-  { "ups-engine",      { NULL }, 3664,  "tcp" },
-  { "ups-engine",      { NULL }, 3664,  "udp" },
-  { "ent-engine",      { NULL }, 3665,  "tcp" },
-  { "ent-engine",      { NULL }, 3665,  "udp" },
-  { "eserver-pap",     { NULL }, 3666,  "tcp" },
-  { "eserver-pap",     { NULL }, 3666,  "udp" },
-  { "infoexch",        { NULL }, 3667,  "tcp" },
-  { "infoexch",        { NULL }, 3667,  "udp" },
-  { "dell-rm-port",    { NULL }, 3668,  "tcp" },
-  { "dell-rm-port",    { NULL }, 3668,  "udp" },
-  { "casanswmgmt",     { NULL }, 3669,  "tcp" },
-  { "casanswmgmt",     { NULL }, 3669,  "udp" },
-  { "smile",           { NULL }, 3670,  "tcp" },
-  { "smile",           { NULL }, 3670,  "udp" },
-  { "efcp",            { NULL }, 3671,  "tcp" },
-  { "efcp",            { NULL }, 3671,  "udp" },
-  { "lispworks-orb",   { NULL }, 3672,  "tcp" },
-  { "lispworks-orb",   { NULL }, 3672,  "udp" },
-  { "mediavault-gui",  { NULL }, 3673,  "tcp" },
-  { "mediavault-gui",  { NULL }, 3673,  "udp" },
-  { "wininstall-ipc",  { NULL }, 3674,  "tcp" },
-  { "wininstall-ipc",  { NULL }, 3674,  "udp" },
-  { "calltrax",        { NULL }, 3675,  "tcp" },
-  { "calltrax",        { NULL }, 3675,  "udp" },
-  { "va-pacbase",      { NULL }, 3676,  "tcp" },
-  { "va-pacbase",      { NULL }, 3676,  "udp" },
-  { "roverlog",        { NULL }, 3677,  "tcp" },
-  { "roverlog",        { NULL }, 3677,  "udp" },
-  { "ipr-dglt",        { NULL }, 3678,  "tcp" },
-  { "ipr-dglt",        { NULL }, 3678,  "udp" },
-  { "newton-dock",     { NULL }, 3679,  "tcp" },
-  { "newton-dock",     { NULL }, 3679,  "udp" },
-  { "npds-tracker",    { NULL }, 3680,  "tcp" },
-  { "npds-tracker",    { NULL }, 3680,  "udp" },
-  { "bts-x73",         { NULL }, 3681,  "tcp" },
-  { "bts-x73",         { NULL }, 3681,  "udp" },
-  { "cas-mapi",        { NULL }, 3682,  "tcp" },
-  { "cas-mapi",        { NULL }, 3682,  "udp" },
-  { "bmc-ea",          { NULL }, 3683,  "tcp" },
-  { "bmc-ea",          { NULL }, 3683,  "udp" },
-  { "faxstfx-port",    { NULL }, 3684,  "tcp" },
-  { "faxstfx-port",    { NULL }, 3684,  "udp" },
-  { "dsx-agent",       { NULL }, 3685,  "tcp" },
-  { "dsx-agent",       { NULL }, 3685,  "udp" },
-  { "tnmpv2",          { NULL }, 3686,  "tcp" },
-  { "tnmpv2",          { NULL }, 3686,  "udp" },
-  { "simple-push",     { NULL }, 3687,  "tcp" },
-  { "simple-push",     { NULL }, 3687,  "udp" },
-  { "simple-push-s",   { NULL }, 3688,  "tcp" },
-  { "simple-push-s",   { NULL }, 3688,  "udp" },
-  { "daap",            { NULL }, 3689,  "tcp" },
-  { "daap",            { NULL }, 3689,  "udp" },
-  { "svn",             { NULL }, 3690,  "tcp" },
-  { "svn",             { NULL }, 3690,  "udp" },
-  { "magaya-network",  { NULL }, 3691,  "tcp" },
-  { "magaya-network",  { NULL }, 3691,  "udp" },
-  { "intelsync",       { NULL }, 3692,  "tcp" },
-  { "intelsync",       { NULL }, 3692,  "udp" },
-  { "bmc-data-coll",   { NULL }, 3695,  "tcp" },
-  { "bmc-data-coll",   { NULL }, 3695,  "udp" },
-  { "telnetcpcd",      { NULL }, 3696,  "tcp" },
-  { "telnetcpcd",      { NULL }, 3696,  "udp" },
-  { "nw-license",      { NULL }, 3697,  "tcp" },
-  { "nw-license",      { NULL }, 3697,  "udp" },
-  { "sagectlpanel",    { NULL }, 3698,  "tcp" },
-  { "sagectlpanel",    { NULL }, 3698,  "udp" },
-  { "kpn-icw",         { NULL }, 3699,  "tcp" },
-  { "kpn-icw",         { NULL }, 3699,  "udp" },
-  { "lrs-paging",      { NULL }, 3700,  "tcp" },
-  { "lrs-paging",      { NULL }, 3700,  "udp" },
-  { "netcelera",       { NULL }, 3701,  "tcp" },
-  { "netcelera",       { NULL }, 3701,  "udp" },
-  { "ws-discovery",    { NULL }, 3702,  "tcp" },
-  { "ws-discovery",    { NULL }, 3702,  "udp" },
-  { "adobeserver-3",   { NULL }, 3703,  "tcp" },
-  { "adobeserver-3",   { NULL }, 3703,  "udp" },
-  { "adobeserver-4",   { NULL }, 3704,  "tcp" },
-  { "adobeserver-4",   { NULL }, 3704,  "udp" },
-  { "adobeserver-5",   { NULL }, 3705,  "tcp" },
-  { "adobeserver-5",   { NULL }, 3705,  "udp" },
-  { "rt-event",        { NULL }, 3706,  "tcp" },
-  { "rt-event",        { NULL }, 3706,  "udp" },
-  { "rt-event-s",      { NULL }, 3707,  "tcp" },
-  { "rt-event-s",      { NULL }, 3707,  "udp" },
-  { "sun-as-iiops",    { NULL }, 3708,  "tcp" },
-  { "sun-as-iiops",    { NULL }, 3708,  "udp" },
-  { "ca-idms",         { NULL }, 3709,  "tcp" },
-  { "ca-idms",         { NULL }, 3709,  "udp" },
-  { "portgate-auth",   { NULL }, 3710,  "tcp" },
-  { "portgate-auth",   { NULL }, 3710,  "udp" },
-  { "edb-server2",     { NULL }, 3711,  "tcp" },
-  { "edb-server2",     { NULL }, 3711,  "udp" },
-  { "sentinel-ent",    { NULL }, 3712,  "tcp" },
-  { "sentinel-ent",    { NULL }, 3712,  "udp" },
-  { "tftps",           { NULL }, 3713,  "tcp" },
-  { "tftps",           { NULL }, 3713,  "udp" },
-  { "delos-dms",       { NULL }, 3714,  "tcp" },
-  { "delos-dms",       { NULL }, 3714,  "udp" },
-  { "anoto-rendezv",   { NULL }, 3715,  "tcp" },
-  { "anoto-rendezv",   { NULL }, 3715,  "udp" },
-  { "wv-csp-sms-cir",  { NULL }, 3716,  "tcp" },
-  { "wv-csp-sms-cir",  { NULL }, 3716,  "udp" },
-  { "wv-csp-udp-cir",  { NULL }, 3717,  "tcp" },
-  { "wv-csp-udp-cir",  { NULL }, 3717,  "udp" },
-  { "opus-services",   { NULL }, 3718,  "tcp" },
-  { "opus-services",   { NULL }, 3718,  "udp" },
-  { "itelserverport",  { NULL }, 3719,  "tcp" },
-  { "itelserverport",  { NULL }, 3719,  "udp" },
-  { "ufastro-instr",   { NULL }, 3720,  "tcp" },
-  { "ufastro-instr",   { NULL }, 3720,  "udp" },
-  { "xsync",           { NULL }, 3721,  "tcp" },
-  { "xsync",           { NULL }, 3721,  "udp" },
-  { "xserveraid",      { NULL }, 3722,  "tcp" },
-  { "xserveraid",      { NULL }, 3722,  "udp" },
-  { "sychrond",        { NULL }, 3723,  "tcp" },
-  { "sychrond",        { NULL }, 3723,  "udp" },
-  { "blizwow",         { NULL }, 3724,  "tcp" },
-  { "blizwow",         { NULL }, 3724,  "udp" },
-  { "na-er-tip",       { NULL }, 3725,  "tcp" },
-  { "na-er-tip",       { NULL }, 3725,  "udp" },
-  { "array-manager",   { NULL }, 3726,  "tcp" },
-  { "array-manager",   { NULL }, 3726,  "udp" },
-  { "e-mdu",           { NULL }, 3727,  "tcp" },
-  { "e-mdu",           { NULL }, 3727,  "udp" },
-  { "e-woa",           { NULL }, 3728,  "tcp" },
-  { "e-woa",           { NULL }, 3728,  "udp" },
-  { "fksp-audit",      { NULL }, 3729,  "tcp" },
-  { "fksp-audit",      { NULL }, 3729,  "udp" },
-  { "client-ctrl",     { NULL }, 3730,  "tcp" },
-  { "client-ctrl",     { NULL }, 3730,  "udp" },
-  { "smap",            { NULL }, 3731,  "tcp" },
-  { "smap",            { NULL }, 3731,  "udp" },
-  { "m-wnn",           { NULL }, 3732,  "tcp" },
-  { "m-wnn",           { NULL }, 3732,  "udp" },
-  { "multip-msg",      { NULL }, 3733,  "tcp" },
-  { "multip-msg",      { NULL }, 3733,  "udp" },
-  { "synel-data",      { NULL }, 3734,  "tcp" },
-  { "synel-data",      { NULL }, 3734,  "udp" },
-  { "pwdis",           { NULL }, 3735,  "tcp" },
-  { "pwdis",           { NULL }, 3735,  "udp" },
-  { "rs-rmi",          { NULL }, 3736,  "tcp" },
-  { "rs-rmi",          { NULL }, 3736,  "udp" },
-  { "xpanel",          { NULL }, 3737,  "tcp" },
-  { "versatalk",       { NULL }, 3738,  "tcp" },
-  { "versatalk",       { NULL }, 3738,  "udp" },
-  { "launchbird-lm",   { NULL }, 3739,  "tcp" },
-  { "launchbird-lm",   { NULL }, 3739,  "udp" },
-  { "heartbeat",       { NULL }, 3740,  "tcp" },
-  { "heartbeat",       { NULL }, 3740,  "udp" },
-  { "wysdma",          { NULL }, 3741,  "tcp" },
-  { "wysdma",          { NULL }, 3741,  "udp" },
-  { "cst-port",        { NULL }, 3742,  "tcp" },
-  { "cst-port",        { NULL }, 3742,  "udp" },
-  { "ipcs-command",    { NULL }, 3743,  "tcp" },
-  { "ipcs-command",    { NULL }, 3743,  "udp" },
-  { "sasg",            { NULL }, 3744,  "tcp" },
-  { "sasg",            { NULL }, 3744,  "udp" },
-  { "gw-call-port",    { NULL }, 3745,  "tcp" },
-  { "gw-call-port",    { NULL }, 3745,  "udp" },
-  { "linktest",        { NULL }, 3746,  "tcp" },
-  { "linktest",        { NULL }, 3746,  "udp" },
-  { "linktest-s",      { NULL }, 3747,  "tcp" },
-  { "linktest-s",      { NULL }, 3747,  "udp" },
-  { "webdata",         { NULL }, 3748,  "tcp" },
-  { "webdata",         { NULL }, 3748,  "udp" },
-  { "cimtrak",         { NULL }, 3749,  "tcp" },
-  { "cimtrak",         { NULL }, 3749,  "udp" },
-  { "cbos-ip-port",    { NULL }, 3750,  "tcp" },
-  { "cbos-ip-port",    { NULL }, 3750,  "udp" },
-  { "gprs-cube",       { NULL }, 3751,  "tcp" },
-  { "gprs-cube",       { NULL }, 3751,  "udp" },
-  { "vipremoteagent",  { NULL }, 3752,  "tcp" },
-  { "vipremoteagent",  { NULL }, 3752,  "udp" },
-  { "nattyserver",     { NULL }, 3753,  "tcp" },
-  { "nattyserver",     { NULL }, 3753,  "udp" },
-  { "timestenbroker",  { NULL }, 3754,  "tcp" },
-  { "timestenbroker",  { NULL }, 3754,  "udp" },
-  { "sas-remote-hlp",  { NULL }, 3755,  "tcp" },
-  { "sas-remote-hlp",  { NULL }, 3755,  "udp" },
-  { "canon-capt",      { NULL }, 3756,  "tcp" },
-  { "canon-capt",      { NULL }, 3756,  "udp" },
-  { "grf-port",        { NULL }, 3757,  "tcp" },
-  { "grf-port",        { NULL }, 3757,  "udp" },
-  { "apw-registry",    { NULL }, 3758,  "tcp" },
-  { "apw-registry",    { NULL }, 3758,  "udp" },
-  { "exapt-lmgr",      { NULL }, 3759,  "tcp" },
-  { "exapt-lmgr",      { NULL }, 3759,  "udp" },
-  { "adtempusclient",  { NULL }, 3760,  "tcp" },
-  { "adtempusclient",  { NULL }, 3760,  "udp" },
-  { "gsakmp",          { NULL }, 3761,  "tcp" },
-  { "gsakmp",          { NULL }, 3761,  "udp" },
-  { "gbs-smp",         { NULL }, 3762,  "tcp" },
-  { "gbs-smp",         { NULL }, 3762,  "udp" },
-  { "xo-wave",         { NULL }, 3763,  "tcp" },
-  { "xo-wave",         { NULL }, 3763,  "udp" },
-  { "mni-prot-rout",   { NULL }, 3764,  "tcp" },
-  { "mni-prot-rout",   { NULL }, 3764,  "udp" },
-  { "rtraceroute",     { NULL }, 3765,  "tcp" },
-  { "rtraceroute",     { NULL }, 3765,  "udp" },
-  { "listmgr-port",    { NULL }, 3767,  "tcp" },
-  { "listmgr-port",    { NULL }, 3767,  "udp" },
-  { "rblcheckd",       { NULL }, 3768,  "tcp" },
-  { "rblcheckd",       { NULL }, 3768,  "udp" },
-  { "haipe-otnk",      { NULL }, 3769,  "tcp" },
-  { "haipe-otnk",      { NULL }, 3769,  "udp" },
-  { "cindycollab",     { NULL }, 3770,  "tcp" },
-  { "cindycollab",     { NULL }, 3770,  "udp" },
-  { "paging-port",     { NULL }, 3771,  "tcp" },
-  { "paging-port",     { NULL }, 3771,  "udp" },
-  { "ctp",             { NULL }, 3772,  "tcp" },
-  { "ctp",             { NULL }, 3772,  "udp" },
-  { "ctdhercules",     { NULL }, 3773,  "tcp" },
-  { "ctdhercules",     { NULL }, 3773,  "udp" },
-  { "zicom",           { NULL }, 3774,  "tcp" },
-  { "zicom",           { NULL }, 3774,  "udp" },
-  { "ispmmgr",         { NULL }, 3775,  "tcp" },
-  { "ispmmgr",         { NULL }, 3775,  "udp" },
-  { "dvcprov-port",    { NULL }, 3776,  "tcp" },
-  { "dvcprov-port",    { NULL }, 3776,  "udp" },
-  { "jibe-eb",         { NULL }, 3777,  "tcp" },
-  { "jibe-eb",         { NULL }, 3777,  "udp" },
-  { "c-h-it-port",     { NULL }, 3778,  "tcp" },
-  { "c-h-it-port",     { NULL }, 3778,  "udp" },
-  { "cognima",         { NULL }, 3779,  "tcp" },
-  { "cognima",         { NULL }, 3779,  "udp" },
-  { "nnp",             { NULL }, 3780,  "tcp" },
-  { "nnp",             { NULL }, 3780,  "udp" },
-  { "abcvoice-port",   { NULL }, 3781,  "tcp" },
-  { "abcvoice-port",   { NULL }, 3781,  "udp" },
-  { "iso-tp0s",        { NULL }, 3782,  "tcp" },
-  { "iso-tp0s",        { NULL }, 3782,  "udp" },
-  { "bim-pem",         { NULL }, 3783,  "tcp" },
-  { "bim-pem",         { NULL }, 3783,  "udp" },
-  { "bfd-control",     { NULL }, 3784,  "tcp" },
-  { "bfd-control",     { NULL }, 3784,  "udp" },
-  { "bfd-echo",        { NULL }, 3785,  "tcp" },
-  { "bfd-echo",        { NULL }, 3785,  "udp" },
-  { "upstriggervsw",   { NULL }, 3786,  "tcp" },
-  { "upstriggervsw",   { NULL }, 3786,  "udp" },
-  { "fintrx",          { NULL }, 3787,  "tcp" },
-  { "fintrx",          { NULL }, 3787,  "udp" },
-  { "isrp-port",       { NULL }, 3788,  "tcp" },
-  { "isrp-port",       { NULL }, 3788,  "udp" },
-  { "remotedeploy",    { NULL }, 3789,  "tcp" },
-  { "remotedeploy",    { NULL }, 3789,  "udp" },
-  { "quickbooksrds",   { NULL }, 3790,  "tcp" },
-  { "quickbooksrds",   { NULL }, 3790,  "udp" },
-  { "tvnetworkvideo",  { NULL }, 3791,  "tcp" },
-  { "tvnetworkvideo",  { NULL }, 3791,  "udp" },
-  { "sitewatch",       { NULL }, 3792,  "tcp" },
-  { "sitewatch",       { NULL }, 3792,  "udp" },
-  { "dcsoftware",      { NULL }, 3793,  "tcp" },
-  { "dcsoftware",      { NULL }, 3793,  "udp" },
-  { "jaus",            { NULL }, 3794,  "tcp" },
-  { "jaus",            { NULL }, 3794,  "udp" },
-  { "myblast",         { NULL }, 3795,  "tcp" },
-  { "myblast",         { NULL }, 3795,  "udp" },
-  { "spw-dialer",      { NULL }, 3796,  "tcp" },
-  { "spw-dialer",      { NULL }, 3796,  "udp" },
-  { "idps",            { NULL }, 3797,  "tcp" },
-  { "idps",            { NULL }, 3797,  "udp" },
-  { "minilock",        { NULL }, 3798,  "tcp" },
-  { "minilock",        { NULL }, 3798,  "udp" },
-  { "radius-dynauth",  { NULL }, 3799,  "tcp" },
-  { "radius-dynauth",  { NULL }, 3799,  "udp" },
-  { "pwgpsi",          { NULL }, 3800,  "tcp" },
-  { "pwgpsi",          { NULL }, 3800,  "udp" },
-  { "ibm-mgr",         { NULL }, 3801,  "tcp" },
-  { "ibm-mgr",         { NULL }, 3801,  "udp" },
-  { "vhd",             { NULL }, 3802,  "tcp" },
-  { "vhd",             { NULL }, 3802,  "udp" },
-  { "soniqsync",       { NULL }, 3803,  "tcp" },
-  { "soniqsync",       { NULL }, 3803,  "udp" },
-  { "iqnet-port",      { NULL }, 3804,  "tcp" },
-  { "iqnet-port",      { NULL }, 3804,  "udp" },
-  { "tcpdataserver",   { NULL }, 3805,  "tcp" },
-  { "tcpdataserver",   { NULL }, 3805,  "udp" },
-  { "wsmlb",           { NULL }, 3806,  "tcp" },
-  { "wsmlb",           { NULL }, 3806,  "udp" },
-  { "spugna",          { NULL }, 3807,  "tcp" },
-  { "spugna",          { NULL }, 3807,  "udp" },
-  { "sun-as-iiops-ca", { NULL }, 3808,  "tcp" },
-  { "sun-as-iiops-ca", { NULL }, 3808,  "udp" },
-  { "apocd",           { NULL }, 3809,  "tcp" },
-  { "apocd",           { NULL }, 3809,  "udp" },
-  { "wlanauth",        { NULL }, 3810,  "tcp" },
-  { "wlanauth",        { NULL }, 3810,  "udp" },
-  { "amp",             { NULL }, 3811,  "tcp" },
-  { "amp",             { NULL }, 3811,  "udp" },
-  { "neto-wol-server", { NULL }, 3812,  "tcp" },
-  { "neto-wol-server", { NULL }, 3812,  "udp" },
-  { "rap-ip",          { NULL }, 3813,  "tcp" },
-  { "rap-ip",          { NULL }, 3813,  "udp" },
-  { "neto-dcs",        { NULL }, 3814,  "tcp" },
-  { "neto-dcs",        { NULL }, 3814,  "udp" },
-  { "lansurveyorxml",  { NULL }, 3815,  "tcp" },
-  { "lansurveyorxml",  { NULL }, 3815,  "udp" },
-  { "sunlps-http",     { NULL }, 3816,  "tcp" },
-  { "sunlps-http",     { NULL }, 3816,  "udp" },
-  { "tapeware",        { NULL }, 3817,  "tcp" },
-  { "tapeware",        { NULL }, 3817,  "udp" },
-  { "crinis-hb",       { NULL }, 3818,  "tcp" },
-  { "crinis-hb",       { NULL }, 3818,  "udp" },
-  { "epl-slp",         { NULL }, 3819,  "tcp" },
-  { "epl-slp",         { NULL }, 3819,  "udp" },
-  { "scp",             { NULL }, 3820,  "tcp" },
-  { "scp",             { NULL }, 3820,  "udp" },
-  { "pmcp",            { NULL }, 3821,  "tcp" },
-  { "pmcp",            { NULL }, 3821,  "udp" },
-  { "acp-discovery",   { NULL }, 3822,  "tcp" },
-  { "acp-discovery",   { NULL }, 3822,  "udp" },
-  { "acp-conduit",     { NULL }, 3823,  "tcp" },
-  { "acp-conduit",     { NULL }, 3823,  "udp" },
-  { "acp-policy",      { NULL }, 3824,  "tcp" },
-  { "acp-policy",      { NULL }, 3824,  "udp" },
-  { "ffserver",        { NULL }, 3825,  "tcp" },
-  { "ffserver",        { NULL }, 3825,  "udp" },
-  { "wormux",          { NULL }, 3826,  "tcp" },
-  { "wormux",          { NULL }, 3826,  "udp" },
-  { "netmpi",          { NULL }, 3827,  "tcp" },
-  { "netmpi",          { NULL }, 3827,  "udp" },
-  { "neteh",           { NULL }, 3828,  "tcp" },
-  { "neteh",           { NULL }, 3828,  "udp" },
-  { "neteh-ext",       { NULL }, 3829,  "tcp" },
-  { "neteh-ext",       { NULL }, 3829,  "udp" },
-  { "cernsysmgmtagt",  { NULL }, 3830,  "tcp" },
-  { "cernsysmgmtagt",  { NULL }, 3830,  "udp" },
-  { "dvapps",          { NULL }, 3831,  "tcp" },
-  { "dvapps",          { NULL }, 3831,  "udp" },
-  { "xxnetserver",     { NULL }, 3832,  "tcp" },
-  { "xxnetserver",     { NULL }, 3832,  "udp" },
-  { "aipn-auth",       { NULL }, 3833,  "tcp" },
-  { "aipn-auth",       { NULL }, 3833,  "udp" },
-  { "spectardata",     { NULL }, 3834,  "tcp" },
-  { "spectardata",     { NULL }, 3834,  "udp" },
-  { "spectardb",       { NULL }, 3835,  "tcp" },
-  { "spectardb",       { NULL }, 3835,  "udp" },
-  { "markem-dcp",      { NULL }, 3836,  "tcp" },
-  { "markem-dcp",      { NULL }, 3836,  "udp" },
-  { "mkm-discovery",   { NULL }, 3837,  "tcp" },
-  { "mkm-discovery",   { NULL }, 3837,  "udp" },
-  { "sos",             { NULL }, 3838,  "tcp" },
-  { "sos",             { NULL }, 3838,  "udp" },
-  { "amx-rms",         { NULL }, 3839,  "tcp" },
-  { "amx-rms",         { NULL }, 3839,  "udp" },
-  { "flirtmitmir",     { NULL }, 3840,  "tcp" },
-  { "flirtmitmir",     { NULL }, 3840,  "udp" },
-  { "zfirm-shiprush3", { NULL }, 3841,  "tcp" },
-  { "zfirm-shiprush3", { NULL }, 3841,  "udp" },
-  { "nhci",            { NULL }, 3842,  "tcp" },
-  { "nhci",            { NULL }, 3842,  "udp" },
-  { "quest-agent",     { NULL }, 3843,  "tcp" },
-  { "quest-agent",     { NULL }, 3843,  "udp" },
-  { "rnm",             { NULL }, 3844,  "tcp" },
-  { "rnm",             { NULL }, 3844,  "udp" },
-  { "v-one-spp",       { NULL }, 3845,  "tcp" },
-  { "v-one-spp",       { NULL }, 3845,  "udp" },
-  { "an-pcp",          { NULL }, 3846,  "tcp" },
-  { "an-pcp",          { NULL }, 3846,  "udp" },
-  { "msfw-control",    { NULL }, 3847,  "tcp" },
-  { "msfw-control",    { NULL }, 3847,  "udp" },
-  { "item",            { NULL }, 3848,  "tcp" },
-  { "item",            { NULL }, 3848,  "udp" },
-  { "spw-dnspreload",  { NULL }, 3849,  "tcp" },
-  { "spw-dnspreload",  { NULL }, 3849,  "udp" },
-  { "qtms-bootstrap",  { NULL }, 3850,  "tcp" },
-  { "qtms-bootstrap",  { NULL }, 3850,  "udp" },
-  { "spectraport",     { NULL }, 3851,  "tcp" },
-  { "spectraport",     { NULL }, 3851,  "udp" },
-  { "sse-app-config",  { NULL }, 3852,  "tcp" },
-  { "sse-app-config",  { NULL }, 3852,  "udp" },
-  { "sscan",           { NULL }, 3853,  "tcp" },
-  { "sscan",           { NULL }, 3853,  "udp" },
-  { "stryker-com",     { NULL }, 3854,  "tcp" },
-  { "stryker-com",     { NULL }, 3854,  "udp" },
-  { "opentrac",        { NULL }, 3855,  "tcp" },
-  { "opentrac",        { NULL }, 3855,  "udp" },
-  { "informer",        { NULL }, 3856,  "tcp" },
-  { "informer",        { NULL }, 3856,  "udp" },
-  { "trap-port",       { NULL }, 3857,  "tcp" },
-  { "trap-port",       { NULL }, 3857,  "udp" },
-  { "trap-port-mom",   { NULL }, 3858,  "tcp" },
-  { "trap-port-mom",   { NULL }, 3858,  "udp" },
-  { "nav-port",        { NULL }, 3859,  "tcp" },
-  { "nav-port",        { NULL }, 3859,  "udp" },
-  { "sasp",            { NULL }, 3860,  "tcp" },
-  { "sasp",            { NULL }, 3860,  "udp" },
-  { "winshadow-hd",    { NULL }, 3861,  "tcp" },
-  { "winshadow-hd",    { NULL }, 3861,  "udp" },
-  { "giga-pocket",     { NULL }, 3862,  "tcp" },
-  { "giga-pocket",     { NULL }, 3862,  "udp" },
-  { "asap-tcp",        { NULL }, 3863,  "tcp" },
-  { "asap-udp",        { NULL }, 3863,  "udp" },
-  { "asap-sctp",       { NULL }, 3863,  "sctp"},
-  { "asap-tcp-tls",    { NULL }, 3864,  "tcp" },
-  { "asap-sctp-tls",   { NULL }, 3864,  "sctp"},
-  { "xpl",             { NULL }, 3865,  "tcp" },
-  { "xpl",             { NULL }, 3865,  "udp" },
-  { "dzdaemon",        { NULL }, 3866,  "tcp" },
-  { "dzdaemon",        { NULL }, 3866,  "udp" },
-  { "dzoglserver",     { NULL }, 3867,  "tcp" },
-  { "dzoglserver",     { NULL }, 3867,  "udp" },
-  { "diameter",        { NULL }, 3868,  "tcp" },
-  { "diameter",        { NULL }, 3868,  "sctp"},
-  { "ovsam-mgmt",      { NULL }, 3869,  "tcp" },
-  { "ovsam-mgmt",      { NULL }, 3869,  "udp" },
-  { "ovsam-d-agent",   { NULL }, 3870,  "tcp" },
-  { "ovsam-d-agent",   { NULL }, 3870,  "udp" },
-  { "avocent-adsap",   { NULL }, 3871,  "tcp" },
-  { "avocent-adsap",   { NULL }, 3871,  "udp" },
-  { "oem-agent",       { NULL }, 3872,  "tcp" },
-  { "oem-agent",       { NULL }, 3872,  "udp" },
-  { "fagordnc",        { NULL }, 3873,  "tcp" },
-  { "fagordnc",        { NULL }, 3873,  "udp" },
-  { "sixxsconfig",     { NULL }, 3874,  "tcp" },
-  { "sixxsconfig",     { NULL }, 3874,  "udp" },
-  { "pnbscada",        { NULL }, 3875,  "tcp" },
-  { "pnbscada",        { NULL }, 3875,  "udp" },
-  { "dl_agent",        { NULL }, 3876,  "tcp" },
-  { "dl_agent",        { NULL }, 3876,  "udp" },
-  { "xmpcr-interface", { NULL }, 3877,  "tcp" },
-  { "xmpcr-interface", { NULL }, 3877,  "udp" },
-  { "fotogcad",        { NULL }, 3878,  "tcp" },
-  { "fotogcad",        { NULL }, 3878,  "udp" },
-  { "appss-lm",        { NULL }, 3879,  "tcp" },
-  { "appss-lm",        { NULL }, 3879,  "udp" },
-  { "igrs",            { NULL }, 3880,  "tcp" },
-  { "igrs",            { NULL }, 3880,  "udp" },
-  { "idac",            { NULL }, 3881,  "tcp" },
-  { "idac",            { NULL }, 3881,  "udp" },
-  { "msdts1",          { NULL }, 3882,  "tcp" },
-  { "msdts1",          { NULL }, 3882,  "udp" },
-  { "vrpn",            { NULL }, 3883,  "tcp" },
-  { "vrpn",            { NULL }, 3883,  "udp" },
-  { "softrack-meter",  { NULL }, 3884,  "tcp" },
-  { "softrack-meter",  { NULL }, 3884,  "udp" },
-  { "topflow-ssl",     { NULL }, 3885,  "tcp" },
-  { "topflow-ssl",     { NULL }, 3885,  "udp" },
-  { "nei-management",  { NULL }, 3886,  "tcp" },
-  { "nei-management",  { NULL }, 3886,  "udp" },
-  { "ciphire-data",    { NULL }, 3887,  "tcp" },
-  { "ciphire-data",    { NULL }, 3887,  "udp" },
-  { "ciphire-serv",    { NULL }, 3888,  "tcp" },
-  { "ciphire-serv",    { NULL }, 3888,  "udp" },
-  { "dandv-tester",    { NULL }, 3889,  "tcp" },
-  { "dandv-tester",    { NULL }, 3889,  "udp" },
-  { "ndsconnect",      { NULL }, 3890,  "tcp" },
-  { "ndsconnect",      { NULL }, 3890,  "udp" },
-  { "rtc-pm-port",     { NULL }, 3891,  "tcp" },
-  { "rtc-pm-port",     { NULL }, 3891,  "udp" },
-  { "pcc-image-port",  { NULL }, 3892,  "tcp" },
-  { "pcc-image-port",  { NULL }, 3892,  "udp" },
-  { "cgi-starapi",     { NULL }, 3893,  "tcp" },
-  { "cgi-starapi",     { NULL }, 3893,  "udp" },
-  { "syam-agent",      { NULL }, 3894,  "tcp" },
-  { "syam-agent",      { NULL }, 3894,  "udp" },
-  { "syam-smc",        { NULL }, 3895,  "tcp" },
-  { "syam-smc",        { NULL }, 3895,  "udp" },
-  { "sdo-tls",         { NULL }, 3896,  "tcp" },
-  { "sdo-tls",         { NULL }, 3896,  "udp" },
-  { "sdo-ssh",         { NULL }, 3897,  "tcp" },
-  { "sdo-ssh",         { NULL }, 3897,  "udp" },
-  { "senip",           { NULL }, 3898,  "tcp" },
-  { "senip",           { NULL }, 3898,  "udp" },
-  { "itv-control",     { NULL }, 3899,  "tcp" },
-  { "itv-control",     { NULL }, 3899,  "udp" },
-  { "udt_os",          { NULL }, 3900,  "tcp" },
-  { "udt_os",          { NULL }, 3900,  "udp" },
-  { "nimsh",           { NULL }, 3901,  "tcp" },
-  { "nimsh",           { NULL }, 3901,  "udp" },
-  { "nimaux",          { NULL }, 3902,  "tcp" },
-  { "nimaux",          { NULL }, 3902,  "udp" },
-  { "charsetmgr",      { NULL }, 3903,  "tcp" },
-  { "charsetmgr",      { NULL }, 3903,  "udp" },
-  { "omnilink-port",   { NULL }, 3904,  "tcp" },
-  { "omnilink-port",   { NULL }, 3904,  "udp" },
-  { "mupdate",         { NULL }, 3905,  "tcp" },
-  { "mupdate",         { NULL }, 3905,  "udp" },
-  { "topovista-data",  { NULL }, 3906,  "tcp" },
-  { "topovista-data",  { NULL }, 3906,  "udp" },
-  { "imoguia-port",    { NULL }, 3907,  "tcp" },
-  { "imoguia-port",    { NULL }, 3907,  "udp" },
-  { "hppronetman",     { NULL }, 3908,  "tcp" },
-  { "hppronetman",     { NULL }, 3908,  "udp" },
-  { "surfcontrolcpa",  { NULL }, 3909,  "tcp" },
-  { "surfcontrolcpa",  { NULL }, 3909,  "udp" },
-  { "prnrequest",      { NULL }, 3910,  "tcp" },
-  { "prnrequest",      { NULL }, 3910,  "udp" },
-  { "prnstatus",       { NULL }, 3911,  "tcp" },
-  { "prnstatus",       { NULL }, 3911,  "udp" },
-  { "gbmt-stars",      { NULL }, 3912,  "tcp" },
-  { "gbmt-stars",      { NULL }, 3912,  "udp" },
-  { "listcrt-port",    { NULL }, 3913,  "tcp" },
-  { "listcrt-port",    { NULL }, 3913,  "udp" },
-  { "listcrt-port-2",  { NULL }, 3914,  "tcp" },
-  { "listcrt-port-2",  { NULL }, 3914,  "udp" },
-  { "agcat",           { NULL }, 3915,  "tcp" },
-  { "agcat",           { NULL }, 3915,  "udp" },
-  { "wysdmc",          { NULL }, 3916,  "tcp" },
-  { "wysdmc",          { NULL }, 3916,  "udp" },
-  { "aftmux",          { NULL }, 3917,  "tcp" },
-  { "aftmux",          { NULL }, 3917,  "udp" },
-  { "pktcablemmcops",  { NULL }, 3918,  "tcp" },
-  { "pktcablemmcops",  { NULL }, 3918,  "udp" },
-  { "hyperip",         { NULL }, 3919,  "tcp" },
-  { "hyperip",         { NULL }, 3919,  "udp" },
-  { "exasoftport1",    { NULL }, 3920,  "tcp" },
-  { "exasoftport1",    { NULL }, 3920,  "udp" },
-  { "herodotus-net",   { NULL }, 3921,  "tcp" },
-  { "herodotus-net",   { NULL }, 3921,  "udp" },
-  { "sor-update",      { NULL }, 3922,  "tcp" },
-  { "sor-update",      { NULL }, 3922,  "udp" },
-  { "symb-sb-port",    { NULL }, 3923,  "tcp" },
-  { "symb-sb-port",    { NULL }, 3923,  "udp" },
-  { "mpl-gprs-port",   { NULL }, 3924,  "tcp" },
-  { "mpl-gprs-port",   { NULL }, 3924,  "udp" },
-  { "zmp",             { NULL }, 3925,  "tcp" },
-  { "zmp",             { NULL }, 3925,  "udp" },
-  { "winport",         { NULL }, 3926,  "tcp" },
-  { "winport",         { NULL }, 3926,  "udp" },
-  { "natdataservice",  { NULL }, 3927,  "tcp" },
-  { "natdataservice",  { NULL }, 3927,  "udp" },
-  { "netboot-pxe",     { NULL }, 3928,  "tcp" },
-  { "netboot-pxe",     { NULL }, 3928,  "udp" },
-  { "smauth-port",     { NULL }, 3929,  "tcp" },
-  { "smauth-port",     { NULL }, 3929,  "udp" },
-  { "syam-webserver",  { NULL }, 3930,  "tcp" },
-  { "syam-webserver",  { NULL }, 3930,  "udp" },
-  { "msr-plugin-port", { NULL }, 3931,  "tcp" },
-  { "msr-plugin-port", { NULL }, 3931,  "udp" },
-  { "dyn-site",        { NULL }, 3932,  "tcp" },
-  { "dyn-site",        { NULL }, 3932,  "udp" },
-  { "plbserve-port",   { NULL }, 3933,  "tcp" },
-  { "plbserve-port",   { NULL }, 3933,  "udp" },
-  { "sunfm-port",      { NULL }, 3934,  "tcp" },
-  { "sunfm-port",      { NULL }, 3934,  "udp" },
-  { "sdp-portmapper",  { NULL }, 3935,  "tcp" },
-  { "sdp-portmapper",  { NULL }, 3935,  "udp" },
-  { "mailprox",        { NULL }, 3936,  "tcp" },
-  { "mailprox",        { NULL }, 3936,  "udp" },
-  { "dvbservdsc",      { NULL }, 3937,  "tcp" },
-  { "dvbservdsc",      { NULL }, 3937,  "udp" },
-  { "dbcontrol_agent", { NULL }, 3938,  "tcp" },
-  { "dbcontrol_agent", { NULL }, 3938,  "udp" },
-  { "aamp",            { NULL }, 3939,  "tcp" },
-  { "aamp",            { NULL }, 3939,  "udp" },
-  { "xecp-node",       { NULL }, 3940,  "tcp" },
-  { "xecp-node",       { NULL }, 3940,  "udp" },
-  { "homeportal-web",  { NULL }, 3941,  "tcp" },
-  { "homeportal-web",  { NULL }, 3941,  "udp" },
-  { "srdp",            { NULL }, 3942,  "tcp" },
-  { "srdp",            { NULL }, 3942,  "udp" },
-  { "tig",             { NULL }, 3943,  "tcp" },
-  { "tig",             { NULL }, 3943,  "udp" },
-  { "sops",            { NULL }, 3944,  "tcp" },
-  { "sops",            { NULL }, 3944,  "udp" },
-  { "emcads",          { NULL }, 3945,  "tcp" },
-  { "emcads",          { NULL }, 3945,  "udp" },
-  { "backupedge",      { NULL }, 3946,  "tcp" },
-  { "backupedge",      { NULL }, 3946,  "udp" },
-  { "ccp",             { NULL }, 3947,  "tcp" },
-  { "ccp",             { NULL }, 3947,  "udp" },
-  { "apdap",           { NULL }, 3948,  "tcp" },
-  { "apdap",           { NULL }, 3948,  "udp" },
-  { "drip",            { NULL }, 3949,  "tcp" },
-  { "drip",            { NULL }, 3949,  "udp" },
-  { "namemunge",       { NULL }, 3950,  "tcp" },
-  { "namemunge",       { NULL }, 3950,  "udp" },
-  { "pwgippfax",       { NULL }, 3951,  "tcp" },
-  { "pwgippfax",       { NULL }, 3951,  "udp" },
-  { "i3-sessionmgr",   { NULL }, 3952,  "tcp" },
-  { "i3-sessionmgr",   { NULL }, 3952,  "udp" },
-  { "xmlink-connect",  { NULL }, 3953,  "tcp" },
-  { "xmlink-connect",  { NULL }, 3953,  "udp" },
-  { "adrep",           { NULL }, 3954,  "tcp" },
-  { "adrep",           { NULL }, 3954,  "udp" },
-  { "p2pcommunity",    { NULL }, 3955,  "tcp" },
-  { "p2pcommunity",    { NULL }, 3955,  "udp" },
-  { "gvcp",            { NULL }, 3956,  "tcp" },
-  { "gvcp",            { NULL }, 3956,  "udp" },
-  { "mqe-broker",      { NULL }, 3957,  "tcp" },
-  { "mqe-broker",      { NULL }, 3957,  "udp" },
-  { "mqe-agent",       { NULL }, 3958,  "tcp" },
-  { "mqe-agent",       { NULL }, 3958,  "udp" },
-  { "treehopper",      { NULL }, 3959,  "tcp" },
-  { "treehopper",      { NULL }, 3959,  "udp" },
-  { "bess",            { NULL }, 3960,  "tcp" },
-  { "bess",            { NULL }, 3960,  "udp" },
-  { "proaxess",        { NULL }, 3961,  "tcp" },
-  { "proaxess",        { NULL }, 3961,  "udp" },
-  { "sbi-agent",       { NULL }, 3962,  "tcp" },
-  { "sbi-agent",       { NULL }, 3962,  "udp" },
-  { "thrp",            { NULL }, 3963,  "tcp" },
-  { "thrp",            { NULL }, 3963,  "udp" },
-  { "sasggprs",        { NULL }, 3964,  "tcp" },
-  { "sasggprs",        { NULL }, 3964,  "udp" },
-  { "ati-ip-to-ncpe",  { NULL }, 3965,  "tcp" },
-  { "ati-ip-to-ncpe",  { NULL }, 3965,  "udp" },
-  { "bflckmgr",        { NULL }, 3966,  "tcp" },
-  { "bflckmgr",        { NULL }, 3966,  "udp" },
-  { "ppsms",           { NULL }, 3967,  "tcp" },
-  { "ppsms",           { NULL }, 3967,  "udp" },
-  { "ianywhere-dbns",  { NULL }, 3968,  "tcp" },
-  { "ianywhere-dbns",  { NULL }, 3968,  "udp" },
-  { "landmarks",       { NULL }, 3969,  "tcp" },
-  { "landmarks",       { NULL }, 3969,  "udp" },
-  { "lanrevagent",     { NULL }, 3970,  "tcp" },
-  { "lanrevagent",     { NULL }, 3970,  "udp" },
-  { "lanrevserver",    { NULL }, 3971,  "tcp" },
-  { "lanrevserver",    { NULL }, 3971,  "udp" },
-  { "iconp",           { NULL }, 3972,  "tcp" },
-  { "iconp",           { NULL }, 3972,  "udp" },
-  { "progistics",      { NULL }, 3973,  "tcp" },
-  { "progistics",      { NULL }, 3973,  "udp" },
-  { "citysearch",      { NULL }, 3974,  "tcp" },
-  { "citysearch",      { NULL }, 3974,  "udp" },
-  { "airshot",         { NULL }, 3975,  "tcp" },
-  { "airshot",         { NULL }, 3975,  "udp" },
-  { "opswagent",       { NULL }, 3976,  "tcp" },
-  { "opswagent",       { NULL }, 3976,  "udp" },
-  { "opswmanager",     { NULL }, 3977,  "tcp" },
-  { "opswmanager",     { NULL }, 3977,  "udp" },
-  { "secure-cfg-svr",  { NULL }, 3978,  "tcp" },
-  { "secure-cfg-svr",  { NULL }, 3978,  "udp" },
-  { "smwan",           { NULL }, 3979,  "tcp" },
-  { "smwan",           { NULL }, 3979,  "udp" },
-  { "acms",            { NULL }, 3980,  "tcp" },
-  { "acms",            { NULL }, 3980,  "udp" },
-  { "starfish",        { NULL }, 3981,  "tcp" },
-  { "starfish",        { NULL }, 3981,  "udp" },
-  { "eis",             { NULL }, 3982,  "tcp" },
-  { "eis",             { NULL }, 3982,  "udp" },
-  { "eisp",            { NULL }, 3983,  "tcp" },
-  { "eisp",            { NULL }, 3983,  "udp" },
-  { "mapper-nodemgr",  { NULL }, 3984,  "tcp" },
-  { "mapper-nodemgr",  { NULL }, 3984,  "udp" },
-  { "mapper-mapethd",  { NULL }, 3985,  "tcp" },
-  { "mapper-mapethd",  { NULL }, 3985,  "udp" },
-  { "mapper-ws_ethd",  { NULL }, 3986,  "tcp" },
-  { "mapper-ws_ethd",  { NULL }, 3986,  "udp" },
-  { "centerline",      { NULL }, 3987,  "tcp" },
-  { "centerline",      { NULL }, 3987,  "udp" },
-  { "dcs-config",      { NULL }, 3988,  "tcp" },
-  { "dcs-config",      { NULL }, 3988,  "udp" },
-  { "bv-queryengine",  { NULL }, 3989,  "tcp" },
-  { "bv-queryengine",  { NULL }, 3989,  "udp" },
-  { "bv-is",           { NULL }, 3990,  "tcp" },
-  { "bv-is",           { NULL }, 3990,  "udp" },
-  { "bv-smcsrv",       { NULL }, 3991,  "tcp" },
-  { "bv-smcsrv",       { NULL }, 3991,  "udp" },
-  { "bv-ds",           { NULL }, 3992,  "tcp" },
-  { "bv-ds",           { NULL }, 3992,  "udp" },
-  { "bv-agent",        { NULL }, 3993,  "tcp" },
-  { "bv-agent",        { NULL }, 3993,  "udp" },
-  { "iss-mgmt-ssl",    { NULL }, 3995,  "tcp" },
-  { "iss-mgmt-ssl",    { NULL }, 3995,  "udp" },
-  { "abcsoftware",     { NULL }, 3996,  "tcp" },
-  { "abcsoftware",     { NULL }, 3996,  "udp" },
-  { "agentsease-db",   { NULL }, 3997,  "tcp" },
-  { "agentsease-db",   { NULL }, 3997,  "udp" },
-  { "dnx",             { NULL }, 3998,  "tcp" },
-  { "dnx",             { NULL }, 3998,  "udp" },
-  { "nvcnet",          { NULL }, 3999,  "tcp" },
-  { "nvcnet",          { NULL }, 3999,  "udp" },
-  { "terabase",        { NULL }, 4000,  "tcp" },
-  { "terabase",        { NULL }, 4000,  "udp" },
-  { "newoak",          { NULL }, 4001,  "tcp" },
-  { "newoak",          { NULL }, 4001,  "udp" },
-  { "pxc-spvr-ft",     { NULL }, 4002,  "tcp" },
-  { "pxc-spvr-ft",     { NULL }, 4002,  "udp" },
-  { "pxc-splr-ft",     { NULL }, 4003,  "tcp" },
-  { "pxc-splr-ft",     { NULL }, 4003,  "udp" },
-  { "pxc-roid",        { NULL }, 4004,  "tcp" },
-  { "pxc-roid",        { NULL }, 4004,  "udp" },
-  { "pxc-pin",         { NULL }, 4005,  "tcp" },
-  { "pxc-pin",         { NULL }, 4005,  "udp" },
-  { "pxc-spvr",        { NULL }, 4006,  "tcp" },
-  { "pxc-spvr",        { NULL }, 4006,  "udp" },
-  { "pxc-splr",        { NULL }, 4007,  "tcp" },
-  { "pxc-splr",        { NULL }, 4007,  "udp" },
-  { "netcheque",       { NULL }, 4008,  "tcp" },
-  { "netcheque",       { NULL }, 4008,  "udp" },
-  { "chimera-hwm",     { NULL }, 4009,  "tcp" },
-  { "chimera-hwm",     { NULL }, 4009,  "udp" },
-  { "samsung-unidex",  { NULL }, 4010,  "tcp" },
-  { "samsung-unidex",  { NULL }, 4010,  "udp" },
-  { "altserviceboot",  { NULL }, 4011,  "tcp" },
-  { "altserviceboot",  { NULL }, 4011,  "udp" },
-  { "pda-gate",        { NULL }, 4012,  "tcp" },
-  { "pda-gate",        { NULL }, 4012,  "udp" },
-  { "acl-manager",     { NULL }, 4013,  "tcp" },
-  { "acl-manager",     { NULL }, 4013,  "udp" },
-  { "taiclock",        { NULL }, 4014,  "tcp" },
-  { "taiclock",        { NULL }, 4014,  "udp" },
-  { "talarian-mcast1", { NULL }, 4015,  "tcp" },
-  { "talarian-mcast1", { NULL }, 4015,  "udp" },
-  { "talarian-mcast2", { NULL }, 4016,  "tcp" },
-  { "talarian-mcast2", { NULL }, 4016,  "udp" },
-  { "talarian-mcast3", { NULL }, 4017,  "tcp" },
-  { "talarian-mcast3", { NULL }, 4017,  "udp" },
-  { "talarian-mcast4", { NULL }, 4018,  "tcp" },
-  { "talarian-mcast4", { NULL }, 4018,  "udp" },
-  { "talarian-mcast5", { NULL }, 4019,  "tcp" },
-  { "talarian-mcast5", { NULL }, 4019,  "udp" },
-  { "trap",            { NULL }, 4020,  "tcp" },
-  { "trap",            { NULL }, 4020,  "udp" },
-  { "nexus-portal",    { NULL }, 4021,  "tcp" },
-  { "nexus-portal",    { NULL }, 4021,  "udp" },
-  { "dnox",            { NULL }, 4022,  "tcp" },
-  { "dnox",            { NULL }, 4022,  "udp" },
-  { "esnm-zoning",     { NULL }, 4023,  "tcp" },
-  { "esnm-zoning",     { NULL }, 4023,  "udp" },
-  { "tnp1-port",       { NULL }, 4024,  "tcp" },
-  { "tnp1-port",       { NULL }, 4024,  "udp" },
-  { "partimage",       { NULL }, 4025,  "tcp" },
-  { "partimage",       { NULL }, 4025,  "udp" },
-  { "as-debug",        { NULL }, 4026,  "tcp" },
-  { "as-debug",        { NULL }, 4026,  "udp" },
-  { "bxp",             { NULL }, 4027,  "tcp" },
-  { "bxp",             { NULL }, 4027,  "udp" },
-  { "dtserver-port",   { NULL }, 4028,  "tcp" },
-  { "dtserver-port",   { NULL }, 4028,  "udp" },
-  { "ip-qsig",         { NULL }, 4029,  "tcp" },
-  { "ip-qsig",         { NULL }, 4029,  "udp" },
-  { "jdmn-port",       { NULL }, 4030,  "tcp" },
-  { "jdmn-port",       { NULL }, 4030,  "udp" },
-  { "suucp",           { NULL }, 4031,  "tcp" },
-  { "suucp",           { NULL }, 4031,  "udp" },
-  { "vrts-auth-port",  { NULL }, 4032,  "tcp" },
-  { "vrts-auth-port",  { NULL }, 4032,  "udp" },
-  { "sanavigator",     { NULL }, 4033,  "tcp" },
-  { "sanavigator",     { NULL }, 4033,  "udp" },
-  { "ubxd",            { NULL }, 4034,  "tcp" },
-  { "ubxd",            { NULL }, 4034,  "udp" },
-  { "wap-push-http",   { NULL }, 4035,  "tcp" },
-  { "wap-push-http",   { NULL }, 4035,  "udp" },
-  { "wap-push-https",  { NULL }, 4036,  "tcp" },
-  { "wap-push-https",  { NULL }, 4036,  "udp" },
-  { "ravehd",          { NULL }, 4037,  "tcp" },
-  { "ravehd",          { NULL }, 4037,  "udp" },
-  { "fazzt-ptp",       { NULL }, 4038,  "tcp" },
-  { "fazzt-ptp",       { NULL }, 4038,  "udp" },
-  { "fazzt-admin",     { NULL }, 4039,  "tcp" },
-  { "fazzt-admin",     { NULL }, 4039,  "udp" },
-  { "yo-main",         { NULL }, 4040,  "tcp" },
-  { "yo-main",         { NULL }, 4040,  "udp" },
-  { "houston",         { NULL }, 4041,  "tcp" },
-  { "houston",         { NULL }, 4041,  "udp" },
-  { "ldxp",            { NULL }, 4042,  "tcp" },
-  { "ldxp",            { NULL }, 4042,  "udp" },
-  { "nirp",            { NULL }, 4043,  "tcp" },
-  { "nirp",            { NULL }, 4043,  "udp" },
-  { "ltp",             { NULL }, 4044,  "tcp" },
-  { "ltp",             { NULL }, 4044,  "udp" },
-  { "npp",             { NULL }, 4045,  "tcp" },
-  { "npp",             { NULL }, 4045,  "udp" },
-  { "acp-proto",       { NULL }, 4046,  "tcp" },
-  { "acp-proto",       { NULL }, 4046,  "udp" },
-  { "ctp-state",       { NULL }, 4047,  "tcp" },
-  { "ctp-state",       { NULL }, 4047,  "udp" },
-  { "wafs",            { NULL }, 4049,  "tcp" },
-  { "wafs",            { NULL }, 4049,  "udp" },
-  { "cisco-wafs",      { NULL }, 4050,  "tcp" },
-  { "cisco-wafs",      { NULL }, 4050,  "udp" },
-  { "cppdp",           { NULL }, 4051,  "tcp" },
-  { "cppdp",           { NULL }, 4051,  "udp" },
-  { "interact",        { NULL }, 4052,  "tcp" },
-  { "interact",        { NULL }, 4052,  "udp" },
-  { "ccu-comm-1",      { NULL }, 4053,  "tcp" },
-  { "ccu-comm-1",      { NULL }, 4053,  "udp" },
-  { "ccu-comm-2",      { NULL }, 4054,  "tcp" },
-  { "ccu-comm-2",      { NULL }, 4054,  "udp" },
-  { "ccu-comm-3",      { NULL }, 4055,  "tcp" },
-  { "ccu-comm-3",      { NULL }, 4055,  "udp" },
-  { "lms",             { NULL }, 4056,  "tcp" },
-  { "lms",             { NULL }, 4056,  "udp" },
-  { "wfm",             { NULL }, 4057,  "tcp" },
-  { "wfm",             { NULL }, 4057,  "udp" },
-  { "kingfisher",      { NULL }, 4058,  "tcp" },
-  { "kingfisher",      { NULL }, 4058,  "udp" },
-  { "dlms-cosem",      { NULL }, 4059,  "tcp" },
-  { "dlms-cosem",      { NULL }, 4059,  "udp" },
-  { "dsmeter_iatc",    { NULL }, 4060,  "tcp" },
-  { "dsmeter_iatc",    { NULL }, 4060,  "udp" },
-  { "ice-location",    { NULL }, 4061,  "tcp" },
-  { "ice-location",    { NULL }, 4061,  "udp" },
-  { "ice-slocation",   { NULL }, 4062,  "tcp" },
-  { "ice-slocation",   { NULL }, 4062,  "udp" },
-  { "ice-router",      { NULL }, 4063,  "tcp" },
-  { "ice-router",      { NULL }, 4063,  "udp" },
-  { "ice-srouter",     { NULL }, 4064,  "tcp" },
-  { "ice-srouter",     { NULL }, 4064,  "udp" },
-  { "avanti_cdp",      { NULL }, 4065,  "tcp" },
-  { "avanti_cdp",      { NULL }, 4065,  "udp" },
-  { "pmas",            { NULL }, 4066,  "tcp" },
-  { "pmas",            { NULL }, 4066,  "udp" },
-  { "idp",             { NULL }, 4067,  "tcp" },
-  { "idp",             { NULL }, 4067,  "udp" },
-  { "ipfltbcst",       { NULL }, 4068,  "tcp" },
-  { "ipfltbcst",       { NULL }, 4068,  "udp" },
-  { "minger",          { NULL }, 4069,  "tcp" },
-  { "minger",          { NULL }, 4069,  "udp" },
-  { "tripe",           { NULL }, 4070,  "tcp" },
-  { "tripe",           { NULL }, 4070,  "udp" },
-  { "aibkup",          { NULL }, 4071,  "tcp" },
-  { "aibkup",          { NULL }, 4071,  "udp" },
-  { "zieto-sock",      { NULL }, 4072,  "tcp" },
-  { "zieto-sock",      { NULL }, 4072,  "udp" },
-  { "iRAPP",           { NULL }, 4073,  "tcp" },
-  { "iRAPP",           { NULL }, 4073,  "udp" },
-  { "cequint-cityid",  { NULL }, 4074,  "tcp" },
-  { "cequint-cityid",  { NULL }, 4074,  "udp" },
-  { "perimlan",        { NULL }, 4075,  "tcp" },
-  { "perimlan",        { NULL }, 4075,  "udp" },
-  { "seraph",          { NULL }, 4076,  "tcp" },
-  { "seraph",          { NULL }, 4076,  "udp" },
-  { "ascomalarm",      { NULL }, 4077,  "udp" },
-  { "cssp",            { NULL }, 4078,  "tcp" },
-  { "santools",        { NULL }, 4079,  "tcp" },
-  { "santools",        { NULL }, 4079,  "udp" },
-  { "lorica-in",       { NULL }, 4080,  "tcp" },
-  { "lorica-in",       { NULL }, 4080,  "udp" },
-  { "lorica-in-sec",   { NULL }, 4081,  "tcp" },
-  { "lorica-in-sec",   { NULL }, 4081,  "udp" },
-  { "lorica-out",      { NULL }, 4082,  "tcp" },
-  { "lorica-out",      { NULL }, 4082,  "udp" },
-  { "lorica-out-sec",  { NULL }, 4083,  "tcp" },
-  { "lorica-out-sec",  { NULL }, 4083,  "udp" },
-  { "fortisphere-vm",  { NULL }, 4084,  "udp" },
-  { "ezmessagesrv",    { NULL }, 4085,  "tcp" },
-  { "ftsync",          { NULL }, 4086,  "udp" },
-  { "applusservice",   { NULL }, 4087,  "tcp" },
-  { "npsp",            { NULL }, 4088,  "tcp" },
-  { "opencore",        { NULL }, 4089,  "tcp" },
-  { "opencore",        { NULL }, 4089,  "udp" },
-  { "omasgport",       { NULL }, 4090,  "tcp" },
-  { "omasgport",       { NULL }, 4090,  "udp" },
-  { "ewinstaller",     { NULL }, 4091,  "tcp" },
-  { "ewinstaller",     { NULL }, 4091,  "udp" },
-  { "ewdgs",           { NULL }, 4092,  "tcp" },
-  { "ewdgs",           { NULL }, 4092,  "udp" },
-  { "pvxpluscs",       { NULL }, 4093,  "tcp" },
-  { "pvxpluscs",       { NULL }, 4093,  "udp" },
-  { "sysrqd",          { NULL }, 4094,  "tcp" },
-  { "sysrqd",          { NULL }, 4094,  "udp" },
-  { "xtgui",           { NULL }, 4095,  "tcp" },
-  { "xtgui",           { NULL }, 4095,  "udp" },
-  { "bre",             { NULL }, 4096,  "tcp" },
-  { "bre",             { NULL }, 4096,  "udp" },
-  { "patrolview",      { NULL }, 4097,  "tcp" },
-  { "patrolview",      { NULL }, 4097,  "udp" },
-  { "drmsfsd",         { NULL }, 4098,  "tcp" },
-  { "drmsfsd",         { NULL }, 4098,  "udp" },
-  { "dpcp",            { NULL }, 4099,  "tcp" },
-  { "dpcp",            { NULL }, 4099,  "udp" },
-  { "igo-incognito",   { NULL }, 4100,  "tcp" },
-  { "igo-incognito",   { NULL }, 4100,  "udp" },
-  { "brlp-0",          { NULL }, 4101,  "tcp" },
-  { "brlp-0",          { NULL }, 4101,  "udp" },
-  { "brlp-1",          { NULL }, 4102,  "tcp" },
-  { "brlp-1",          { NULL }, 4102,  "udp" },
-  { "brlp-2",          { NULL }, 4103,  "tcp" },
-  { "brlp-2",          { NULL }, 4103,  "udp" },
-  { "brlp-3",          { NULL }, 4104,  "tcp" },
-  { "brlp-3",          { NULL }, 4104,  "udp" },
-  { "shofarplayer",    { NULL }, 4105,  "tcp" },
-  { "shofarplayer",    { NULL }, 4105,  "udp" },
-  { "synchronite",     { NULL }, 4106,  "tcp" },
-  { "synchronite",     { NULL }, 4106,  "udp" },
-  { "j-ac",            { NULL }, 4107,  "tcp" },
-  { "j-ac",            { NULL }, 4107,  "udp" },
-  { "accel",           { NULL }, 4108,  "tcp" },
-  { "accel",           { NULL }, 4108,  "udp" },
-  { "izm",             { NULL }, 4109,  "tcp" },
-  { "izm",             { NULL }, 4109,  "udp" },
-  { "g2tag",           { NULL }, 4110,  "tcp" },
-  { "g2tag",           { NULL }, 4110,  "udp" },
-  { "xgrid",           { NULL }, 4111,  "tcp" },
-  { "xgrid",           { NULL }, 4111,  "udp" },
-  { "apple-vpns-rp",   { NULL }, 4112,  "tcp" },
-  { "apple-vpns-rp",   { NULL }, 4112,  "udp" },
-  { "aipn-reg",        { NULL }, 4113,  "tcp" },
-  { "aipn-reg",        { NULL }, 4113,  "udp" },
-  { "jomamqmonitor",   { NULL }, 4114,  "tcp" },
-  { "jomamqmonitor",   { NULL }, 4114,  "udp" },
-  { "cds",             { NULL }, 4115,  "tcp" },
-  { "cds",             { NULL }, 4115,  "udp" },
-  { "smartcard-tls",   { NULL }, 4116,  "tcp" },
-  { "smartcard-tls",   { NULL }, 4116,  "udp" },
-  { "hillrserv",       { NULL }, 4117,  "tcp" },
-  { "hillrserv",       { NULL }, 4117,  "udp" },
-  { "netscript",       { NULL }, 4118,  "tcp" },
-  { "netscript",       { NULL }, 4118,  "udp" },
-  { "assuria-slm",     { NULL }, 4119,  "tcp" },
-  { "assuria-slm",     { NULL }, 4119,  "udp" },
-  { "e-builder",       { NULL }, 4121,  "tcp" },
-  { "e-builder",       { NULL }, 4121,  "udp" },
-  { "fprams",          { NULL }, 4122,  "tcp" },
-  { "fprams",          { NULL }, 4122,  "udp" },
-  { "z-wave",          { NULL }, 4123,  "tcp" },
-  { "z-wave",          { NULL }, 4123,  "udp" },
-  { "tigv2",           { NULL }, 4124,  "tcp" },
-  { "tigv2",           { NULL }, 4124,  "udp" },
-  { "opsview-envoy",   { NULL }, 4125,  "tcp" },
-  { "opsview-envoy",   { NULL }, 4125,  "udp" },
-  { "ddrepl",          { NULL }, 4126,  "tcp" },
-  { "ddrepl",          { NULL }, 4126,  "udp" },
-  { "unikeypro",       { NULL }, 4127,  "tcp" },
-  { "unikeypro",       { NULL }, 4127,  "udp" },
-  { "nufw",            { NULL }, 4128,  "tcp" },
-  { "nufw",            { NULL }, 4128,  "udp" },
-  { "nuauth",          { NULL }, 4129,  "tcp" },
-  { "nuauth",          { NULL }, 4129,  "udp" },
-  { "fronet",          { NULL }, 4130,  "tcp" },
-  { "fronet",          { NULL }, 4130,  "udp" },
-  { "stars",           { NULL }, 4131,  "tcp" },
-  { "stars",           { NULL }, 4131,  "udp" },
-  { "nuts_dem",        { NULL }, 4132,  "tcp" },
-  { "nuts_dem",        { NULL }, 4132,  "udp" },
-  { "nuts_bootp",      { NULL }, 4133,  "tcp" },
-  { "nuts_bootp",      { NULL }, 4133,  "udp" },
-  { "nifty-hmi",       { NULL }, 4134,  "tcp" },
-  { "nifty-hmi",       { NULL }, 4134,  "udp" },
-  { "cl-db-attach",    { NULL }, 4135,  "tcp" },
-  { "cl-db-attach",    { NULL }, 4135,  "udp" },
-  { "cl-db-request",   { NULL }, 4136,  "tcp" },
-  { "cl-db-request",   { NULL }, 4136,  "udp" },
-  { "cl-db-remote",    { NULL }, 4137,  "tcp" },
-  { "cl-db-remote",    { NULL }, 4137,  "udp" },
-  { "nettest",         { NULL }, 4138,  "tcp" },
-  { "nettest",         { NULL }, 4138,  "udp" },
-  { "thrtx",           { NULL }, 4139,  "tcp" },
-  { "thrtx",           { NULL }, 4139,  "udp" },
-  { "cedros_fds",      { NULL }, 4140,  "tcp" },
-  { "cedros_fds",      { NULL }, 4140,  "udp" },
-  { "oirtgsvc",        { NULL }, 4141,  "tcp" },
-  { "oirtgsvc",        { NULL }, 4141,  "udp" },
-  { "oidocsvc",        { NULL }, 4142,  "tcp" },
-  { "oidocsvc",        { NULL }, 4142,  "udp" },
-  { "oidsr",           { NULL }, 4143,  "tcp" },
-  { "oidsr",           { NULL }, 4143,  "udp" },
-  { "vvr-control",     { NULL }, 4145,  "tcp" },
-  { "vvr-control",     { NULL }, 4145,  "udp" },
-  { "tgcconnect",      { NULL }, 4146,  "tcp" },
-  { "tgcconnect",      { NULL }, 4146,  "udp" },
-  { "vrxpservman",     { NULL }, 4147,  "tcp" },
-  { "vrxpservman",     { NULL }, 4147,  "udp" },
-  { "hhb-handheld",    { NULL }, 4148,  "tcp" },
-  { "hhb-handheld",    { NULL }, 4148,  "udp" },
-  { "agslb",           { NULL }, 4149,  "tcp" },
-  { "agslb",           { NULL }, 4149,  "udp" },
-  { "PowerAlert-nsa",  { NULL }, 4150,  "tcp" },
-  { "PowerAlert-nsa",  { NULL }, 4150,  "udp" },
-  { "menandmice_noh",  { NULL }, 4151,  "tcp" },
-  { "menandmice_noh",  { NULL }, 4151,  "udp" },
-  { "idig_mux",        { NULL }, 4152,  "tcp" },
-  { "idig_mux",        { NULL }, 4152,  "udp" },
-  { "mbl-battd",       { NULL }, 4153,  "tcp" },
-  { "mbl-battd",       { NULL }, 4153,  "udp" },
-  { "atlinks",         { NULL }, 4154,  "tcp" },
-  { "atlinks",         { NULL }, 4154,  "udp" },
-  { "bzr",             { NULL }, 4155,  "tcp" },
-  { "bzr",             { NULL }, 4155,  "udp" },
-  { "stat-results",    { NULL }, 4156,  "tcp" },
-  { "stat-results",    { NULL }, 4156,  "udp" },
-  { "stat-scanner",    { NULL }, 4157,  "tcp" },
-  { "stat-scanner",    { NULL }, 4157,  "udp" },
-  { "stat-cc",         { NULL }, 4158,  "tcp" },
-  { "stat-cc",         { NULL }, 4158,  "udp" },
-  { "nss",             { NULL }, 4159,  "tcp" },
-  { "nss",             { NULL }, 4159,  "udp" },
-  { "jini-discovery",  { NULL }, 4160,  "tcp" },
-  { "jini-discovery",  { NULL }, 4160,  "udp" },
-  { "omscontact",      { NULL }, 4161,  "tcp" },
-  { "omscontact",      { NULL }, 4161,  "udp" },
-  { "omstopology",     { NULL }, 4162,  "tcp" },
-  { "omstopology",     { NULL }, 4162,  "udp" },
-  { "silverpeakpeer",  { NULL }, 4163,  "tcp" },
-  { "silverpeakpeer",  { NULL }, 4163,  "udp" },
-  { "silverpeakcomm",  { NULL }, 4164,  "tcp" },
-  { "silverpeakcomm",  { NULL }, 4164,  "udp" },
-  { "altcp",           { NULL }, 4165,  "tcp" },
-  { "altcp",           { NULL }, 4165,  "udp" },
-  { "joost",           { NULL }, 4166,  "tcp" },
-  { "joost",           { NULL }, 4166,  "udp" },
-  { "ddgn",            { NULL }, 4167,  "tcp" },
-  { "ddgn",            { NULL }, 4167,  "udp" },
-  { "pslicser",        { NULL }, 4168,  "tcp" },
-  { "pslicser",        { NULL }, 4168,  "udp" },
-  { "iadt",            { NULL }, 4169,  "tcp" },
-  { "iadt-disc",       { NULL }, 4169,  "udp" },
-  { "d-cinema-csp",    { NULL }, 4170,  "tcp" },
-  { "ml-svnet",        { NULL }, 4171,  "tcp" },
-  { "pcoip",           { NULL }, 4172,  "tcp" },
-  { "pcoip",           { NULL }, 4172,  "udp" },
-  { "smcluster",       { NULL }, 4174,  "tcp" },
-  { "bccp",            { NULL }, 4175,  "tcp" },
-  { "tl-ipcproxy",     { NULL }, 4176,  "tcp" },
-  { "wello",           { NULL }, 4177,  "tcp" },
-  { "wello",           { NULL }, 4177,  "udp" },
-  { "storman",         { NULL }, 4178,  "tcp" },
-  { "storman",         { NULL }, 4178,  "udp" },
-  { "MaxumSP",         { NULL }, 4179,  "tcp" },
-  { "MaxumSP",         { NULL }, 4179,  "udp" },
-  { "httpx",           { NULL }, 4180,  "tcp" },
-  { "httpx",           { NULL }, 4180,  "udp" },
-  { "macbak",          { NULL }, 4181,  "tcp" },
-  { "macbak",          { NULL }, 4181,  "udp" },
-  { "pcptcpservice",   { NULL }, 4182,  "tcp" },
-  { "pcptcpservice",   { NULL }, 4182,  "udp" },
-  { "gmmp",            { NULL }, 4183,  "tcp" },
-  { "gmmp",            { NULL }, 4183,  "udp" },
-  { "universe_suite",  { NULL }, 4184,  "tcp" },
-  { "universe_suite",  { NULL }, 4184,  "udp" },
-  { "wcpp",            { NULL }, 4185,  "tcp" },
-  { "wcpp",            { NULL }, 4185,  "udp" },
-  { "boxbackupstore",  { NULL }, 4186,  "tcp" },
-  { "csc_proxy",       { NULL }, 4187,  "tcp" },
-  { "vatata",          { NULL }, 4188,  "tcp" },
-  { "vatata",          { NULL }, 4188,  "udp" },
-  { "pcep",            { NULL }, 4189,  "tcp" },
-  { "sieve",           { NULL }, 4190,  "tcp" },
-  { "dsmipv6",         { NULL }, 4191,  "udp" },
-  { "azeti",           { NULL }, 4192,  "tcp" },
-  { "azeti-bd",        { NULL }, 4192,  "udp" },
-  { "pvxplusio",       { NULL }, 4193,  "tcp" },
-  { "eims-admin",      { NULL }, 4199,  "tcp" },
-  { "eims-admin",      { NULL }, 4199,  "udp" },
-  { "corelccam",       { NULL }, 4300,  "tcp" },
-  { "corelccam",       { NULL }, 4300,  "udp" },
-  { "d-data",          { NULL }, 4301,  "tcp" },
-  { "d-data",          { NULL }, 4301,  "udp" },
-  { "d-data-control",  { NULL }, 4302,  "tcp" },
-  { "d-data-control",  { NULL }, 4302,  "udp" },
-  { "srcp",            { NULL }, 4303,  "tcp" },
-  { "srcp",            { NULL }, 4303,  "udp" },
-  { "owserver",        { NULL }, 4304,  "tcp" },
-  { "owserver",        { NULL }, 4304,  "udp" },
-  { "batman",          { NULL }, 4305,  "tcp" },
-  { "batman",          { NULL }, 4305,  "udp" },
-  { "pinghgl",         { NULL }, 4306,  "tcp" },
-  { "pinghgl",         { NULL }, 4306,  "udp" },
-  { "visicron-vs",     { NULL }, 4307,  "tcp" },
-  { "visicron-vs",     { NULL }, 4307,  "udp" },
-  { "compx-lockview",  { NULL }, 4308,  "tcp" },
-  { "compx-lockview",  { NULL }, 4308,  "udp" },
-  { "dserver",         { NULL }, 4309,  "tcp" },
-  { "dserver",         { NULL }, 4309,  "udp" },
-  { "mirrtex",         { NULL }, 4310,  "tcp" },
-  { "mirrtex",         { NULL }, 4310,  "udp" },
-  { "p6ssmc",          { NULL }, 4311,  "tcp" },
-  { "pscl-mgt",        { NULL }, 4312,  "tcp" },
-  { "perrla",          { NULL }, 4313,  "tcp" },
-  { "fdt-rcatp",       { NULL }, 4320,  "tcp" },
-  { "fdt-rcatp",       { NULL }, 4320,  "udp" },
-  { "rwhois",          { NULL }, 4321,  "tcp" },
-  { "rwhois",          { NULL }, 4321,  "udp" },
-  { "trim-event",      { NULL }, 4322,  "tcp" },
-  { "trim-event",      { NULL }, 4322,  "udp" },
-  { "trim-ice",        { NULL }, 4323,  "tcp" },
-  { "trim-ice",        { NULL }, 4323,  "udp" },
-  { "balour",          { NULL }, 4324,  "tcp" },
-  { "balour",          { NULL }, 4324,  "udp" },
-  { "geognosisman",    { NULL }, 4325,  "tcp" },
-  { "geognosisman",    { NULL }, 4325,  "udp" },
-  { "geognosis",       { NULL }, 4326,  "tcp" },
-  { "geognosis",       { NULL }, 4326,  "udp" },
-  { "jaxer-web",       { NULL }, 4327,  "tcp" },
-  { "jaxer-web",       { NULL }, 4327,  "udp" },
-  { "jaxer-manager",   { NULL }, 4328,  "tcp" },
-  { "jaxer-manager",   { NULL }, 4328,  "udp" },
-  { "publiqare-sync",  { NULL }, 4329,  "tcp" },
-  { "gaia",            { NULL }, 4340,  "tcp" },
-  { "gaia",            { NULL }, 4340,  "udp" },
-  { "lisp-data",       { NULL }, 4341,  "tcp" },
-  { "lisp-data",       { NULL }, 4341,  "udp" },
-  { "lisp-cons",       { NULL }, 4342,  "tcp" },
-  { "lisp-control",    { NULL }, 4342,  "udp" },
-  { "unicall",         { NULL }, 4343,  "tcp" },
-  { "unicall",         { NULL }, 4343,  "udp" },
-  { "vinainstall",     { NULL }, 4344,  "tcp" },
-  { "vinainstall",     { NULL }, 4344,  "udp" },
-  { "m4-network-as",   { NULL }, 4345,  "tcp" },
-  { "m4-network-as",   { NULL }, 4345,  "udp" },
-  { "elanlm",          { NULL }, 4346,  "tcp" },
-  { "elanlm",          { NULL }, 4346,  "udp" },
-  { "lansurveyor",     { NULL }, 4347,  "tcp" },
-  { "lansurveyor",     { NULL }, 4347,  "udp" },
-  { "itose",           { NULL }, 4348,  "tcp" },
-  { "itose",           { NULL }, 4348,  "udp" },
-  { "fsportmap",       { NULL }, 4349,  "tcp" },
-  { "fsportmap",       { NULL }, 4349,  "udp" },
-  { "net-device",      { NULL }, 4350,  "tcp" },
-  { "net-device",      { NULL }, 4350,  "udp" },
-  { "plcy-net-svcs",   { NULL }, 4351,  "tcp" },
-  { "plcy-net-svcs",   { NULL }, 4351,  "udp" },
-  { "pjlink",          { NULL }, 4352,  "tcp" },
-  { "pjlink",          { NULL }, 4352,  "udp" },
-  { "f5-iquery",       { NULL }, 4353,  "tcp" },
-  { "f5-iquery",       { NULL }, 4353,  "udp" },
-  { "qsnet-trans",     { NULL }, 4354,  "tcp" },
-  { "qsnet-trans",     { NULL }, 4354,  "udp" },
-  { "qsnet-workst",    { NULL }, 4355,  "tcp" },
-  { "qsnet-workst",    { NULL }, 4355,  "udp" },
-  { "qsnet-assist",    { NULL }, 4356,  "tcp" },
-  { "qsnet-assist",    { NULL }, 4356,  "udp" },
-  { "qsnet-cond",      { NULL }, 4357,  "tcp" },
-  { "qsnet-cond",      { NULL }, 4357,  "udp" },
-  { "qsnet-nucl",      { NULL }, 4358,  "tcp" },
-  { "qsnet-nucl",      { NULL }, 4358,  "udp" },
-  { "omabcastltkm",    { NULL }, 4359,  "tcp" },
-  { "omabcastltkm",    { NULL }, 4359,  "udp" },
-  { "matrix_vnet",     { NULL }, 4360,  "tcp" },
-  { "nacnl",           { NULL }, 4361,  "udp" },
-  { "afore-vdp-disc",  { NULL }, 4362,  "udp" },
-  { "wxbrief",         { NULL }, 4368,  "tcp" },
-  { "wxbrief",         { NULL }, 4368,  "udp" },
-  { "epmd",            { NULL }, 4369,  "tcp" },
-  { "epmd",            { NULL }, 4369,  "udp" },
-  { "elpro_tunnel",    { NULL }, 4370,  "tcp" },
-  { "elpro_tunnel",    { NULL }, 4370,  "udp" },
-  { "l2c-control",     { NULL }, 4371,  "tcp" },
-  { "l2c-disc",        { NULL }, 4371,  "udp" },
-  { "l2c-data",        { NULL }, 4372,  "tcp" },
-  { "l2c-data",        { NULL }, 4372,  "udp" },
-  { "remctl",          { NULL }, 4373,  "tcp" },
-  { "remctl",          { NULL }, 4373,  "udp" },
-  { "psi-ptt",         { NULL }, 4374,  "tcp" },
-  { "tolteces",        { NULL }, 4375,  "tcp" },
-  { "tolteces",        { NULL }, 4375,  "udp" },
-  { "bip",             { NULL }, 4376,  "tcp" },
-  { "bip",             { NULL }, 4376,  "udp" },
-  { "cp-spxsvr",       { NULL }, 4377,  "tcp" },
-  { "cp-spxsvr",       { NULL }, 4377,  "udp" },
-  { "cp-spxdpy",       { NULL }, 4378,  "tcp" },
-  { "cp-spxdpy",       { NULL }, 4378,  "udp" },
-  { "ctdb",            { NULL }, 4379,  "tcp" },
-  { "ctdb",            { NULL }, 4379,  "udp" },
-  { "xandros-cms",     { NULL }, 4389,  "tcp" },
-  { "xandros-cms",     { NULL }, 4389,  "udp" },
-  { "wiegand",         { NULL }, 4390,  "tcp" },
-  { "wiegand",         { NULL }, 4390,  "udp" },
-  { "apwi-imserver",   { NULL }, 4391,  "tcp" },
-  { "apwi-rxserver",   { NULL }, 4392,  "tcp" },
-  { "apwi-rxspooler",  { NULL }, 4393,  "tcp" },
-  { "apwi-disc",       { NULL }, 4394,  "udp" },
-  { "omnivisionesx",   { NULL }, 4395,  "tcp" },
-  { "omnivisionesx",   { NULL }, 4395,  "udp" },
-  { "fly",             { NULL }, 4396,  "tcp" },
-  { "ds-srv",          { NULL }, 4400,  "tcp" },
-  { "ds-srv",          { NULL }, 4400,  "udp" },
-  { "ds-srvr",         { NULL }, 4401,  "tcp" },
-  { "ds-srvr",         { NULL }, 4401,  "udp" },
-  { "ds-clnt",         { NULL }, 4402,  "tcp" },
-  { "ds-clnt",         { NULL }, 4402,  "udp" },
-  { "ds-user",         { NULL }, 4403,  "tcp" },
-  { "ds-user",         { NULL }, 4403,  "udp" },
-  { "ds-admin",        { NULL }, 4404,  "tcp" },
-  { "ds-admin",        { NULL }, 4404,  "udp" },
-  { "ds-mail",         { NULL }, 4405,  "tcp" },
-  { "ds-mail",         { NULL }, 4405,  "udp" },
-  { "ds-slp",          { NULL }, 4406,  "tcp" },
-  { "ds-slp",          { NULL }, 4406,  "udp" },
-  { "nacagent",        { NULL }, 4407,  "tcp" },
-  { "slscc",           { NULL }, 4408,  "tcp" },
-  { "netcabinet-com",  { NULL }, 4409,  "tcp" },
-  { "itwo-server",     { NULL }, 4410,  "tcp" },
-  { "netrockey6",      { NULL }, 4425,  "tcp" },
-  { "netrockey6",      { NULL }, 4425,  "udp" },
-  { "beacon-port-2",   { NULL }, 4426,  "tcp" },
-  { "beacon-port-2",   { NULL }, 4426,  "udp" },
-  { "drizzle",         { NULL }, 4427,  "tcp" },
-  { "omviserver",      { NULL }, 4428,  "tcp" },
-  { "omviagent",       { NULL }, 4429,  "tcp" },
-  { "rsqlserver",      { NULL }, 4430,  "tcp" },
-  { "rsqlserver",      { NULL }, 4430,  "udp" },
-  { "wspipe",          { NULL }, 4431,  "tcp" },
-  { "netblox",         { NULL }, 4441,  "udp" },
-  { "saris",           { NULL }, 4442,  "tcp" },
-  { "saris",           { NULL }, 4442,  "udp" },
-  { "pharos",          { NULL }, 4443,  "tcp" },
-  { "pharos",          { NULL }, 4443,  "udp" },
-  { "krb524",          { NULL }, 4444,  "tcp" },
-  { "krb524",          { NULL }, 4444,  "udp" },
-  { "nv-video",        { NULL }, 4444,  "tcp" },
-  { "nv-video",        { NULL }, 4444,  "udp" },
-  { "upnotifyp",       { NULL }, 4445,  "tcp" },
-  { "upnotifyp",       { NULL }, 4445,  "udp" },
-  { "n1-fwp",          { NULL }, 4446,  "tcp" },
-  { "n1-fwp",          { NULL }, 4446,  "udp" },
-  { "n1-rmgmt",        { NULL }, 4447,  "tcp" },
-  { "n1-rmgmt",        { NULL }, 4447,  "udp" },
-  { "asc-slmd",        { NULL }, 4448,  "tcp" },
-  { "asc-slmd",        { NULL }, 4448,  "udp" },
-  { "privatewire",     { NULL }, 4449,  "tcp" },
-  { "privatewire",     { NULL }, 4449,  "udp" },
-  { "camp",            { NULL }, 4450,  "tcp" },
-  { "camp",            { NULL }, 4450,  "udp" },
-  { "ctisystemmsg",    { NULL }, 4451,  "tcp" },
-  { "ctisystemmsg",    { NULL }, 4451,  "udp" },
-  { "ctiprogramload",  { NULL }, 4452,  "tcp" },
-  { "ctiprogramload",  { NULL }, 4452,  "udp" },
-  { "nssalertmgr",     { NULL }, 4453,  "tcp" },
-  { "nssalertmgr",     { NULL }, 4453,  "udp" },
-  { "nssagentmgr",     { NULL }, 4454,  "tcp" },
-  { "nssagentmgr",     { NULL }, 4454,  "udp" },
-  { "prchat-user",     { NULL }, 4455,  "tcp" },
-  { "prchat-user",     { NULL }, 4455,  "udp" },
-  { "prchat-server",   { NULL }, 4456,  "tcp" },
-  { "prchat-server",   { NULL }, 4456,  "udp" },
-  { "prRegister",      { NULL }, 4457,  "tcp" },
-  { "prRegister",      { NULL }, 4457,  "udp" },
-  { "mcp",             { NULL }, 4458,  "tcp" },
-  { "mcp",             { NULL }, 4458,  "udp" },
-  { "hpssmgmt",        { NULL }, 4484,  "tcp" },
-  { "hpssmgmt",        { NULL }, 4484,  "udp" },
-  { "assyst-dr",       { NULL }, 4485,  "tcp" },
-  { "icms",            { NULL }, 4486,  "tcp" },
-  { "icms",            { NULL }, 4486,  "udp" },
-  { "prex-tcp",        { NULL }, 4487,  "tcp" },
-  { "awacs-ice",       { NULL }, 4488,  "tcp" },
-  { "awacs-ice",       { NULL }, 4488,  "udp" },
-  { "ipsec-nat-t",     { NULL }, 4500,  "tcp" },
-  { "ipsec-nat-t",     { NULL }, 4500,  "udp" },
-  { "ehs",             { NULL }, 4535,  "tcp" },
-  { "ehs",             { NULL }, 4535,  "udp" },
-  { "ehs-ssl",         { NULL }, 4536,  "tcp" },
-  { "ehs-ssl",         { NULL }, 4536,  "udp" },
-  { "wssauthsvc",      { NULL }, 4537,  "tcp" },
-  { "wssauthsvc",      { NULL }, 4537,  "udp" },
-  { "swx-gate",        { NULL }, 4538,  "tcp" },
-  { "swx-gate",        { NULL }, 4538,  "udp" },
-  { "worldscores",     { NULL }, 4545,  "tcp" },
-  { "worldscores",     { NULL }, 4545,  "udp" },
-  { "sf-lm",           { NULL }, 4546,  "tcp" },
-  { "sf-lm",           { NULL }, 4546,  "udp" },
-  { "lanner-lm",       { NULL }, 4547,  "tcp" },
-  { "lanner-lm",       { NULL }, 4547,  "udp" },
-  { "synchromesh",     { NULL }, 4548,  "tcp" },
-  { "synchromesh",     { NULL }, 4548,  "udp" },
-  { "aegate",          { NULL }, 4549,  "tcp" },
-  { "aegate",          { NULL }, 4549,  "udp" },
-  { "gds-adppiw-db",   { NULL }, 4550,  "tcp" },
-  { "gds-adppiw-db",   { NULL }, 4550,  "udp" },
-  { "ieee-mih",        { NULL }, 4551,  "tcp" },
-  { "ieee-mih",        { NULL }, 4551,  "udp" },
-  { "menandmice-mon",  { NULL }, 4552,  "tcp" },
-  { "menandmice-mon",  { NULL }, 4552,  "udp" },
-  { "icshostsvc",      { NULL }, 4553,  "tcp" },
-  { "msfrs",           { NULL }, 4554,  "tcp" },
-  { "msfrs",           { NULL }, 4554,  "udp" },
-  { "rsip",            { NULL }, 4555,  "tcp" },
-  { "rsip",            { NULL }, 4555,  "udp" },
-  { "dtn-bundle-tcp",  { NULL }, 4556,  "tcp" },
-  { "dtn-bundle-udp",  { NULL }, 4556,  "udp" },
-  { "mtcevrunqss",     { NULL }, 4557,  "udp" },
-  { "mtcevrunqman",    { NULL }, 4558,  "udp" },
-  { "hylafax",         { NULL }, 4559,  "tcp" },
-  { "hylafax",         { NULL }, 4559,  "udp" },
-  { "kwtc",            { NULL }, 4566,  "tcp" },
-  { "kwtc",            { NULL }, 4566,  "udp" },
-  { "tram",            { NULL }, 4567,  "tcp" },
-  { "tram",            { NULL }, 4567,  "udp" },
-  { "bmc-reporting",   { NULL }, 4568,  "tcp" },
-  { "bmc-reporting",   { NULL }, 4568,  "udp" },
-  { "iax",             { NULL }, 4569,  "tcp" },
-  { "iax",             { NULL }, 4569,  "udp" },
-  { "rid",             { NULL }, 4590,  "tcp" },
-  { "l3t-at-an",       { NULL }, 4591,  "tcp" },
-  { "l3t-at-an",       { NULL }, 4591,  "udp" },
-  { "hrpd-ith-at-an",  { NULL }, 4592,  "udp" },
-  { "ipt-anri-anri",   { NULL }, 4593,  "tcp" },
-  { "ipt-anri-anri",   { NULL }, 4593,  "udp" },
-  { "ias-session",     { NULL }, 4594,  "tcp" },
-  { "ias-session",     { NULL }, 4594,  "udp" },
-  { "ias-paging",      { NULL }, 4595,  "tcp" },
-  { "ias-paging",      { NULL }, 4595,  "udp" },
-  { "ias-neighbor",    { NULL }, 4596,  "tcp" },
-  { "ias-neighbor",    { NULL }, 4596,  "udp" },
-  { "a21-an-1xbs",     { NULL }, 4597,  "tcp" },
-  { "a21-an-1xbs",     { NULL }, 4597,  "udp" },
-  { "a16-an-an",       { NULL }, 4598,  "tcp" },
-  { "a16-an-an",       { NULL }, 4598,  "udp" },
-  { "a17-an-an",       { NULL }, 4599,  "tcp" },
-  { "a17-an-an",       { NULL }, 4599,  "udp" },
-  { "piranha1",        { NULL }, 4600,  "tcp" },
-  { "piranha1",        { NULL }, 4600,  "udp" },
-  { "piranha2",        { NULL }, 4601,  "tcp" },
-  { "piranha2",        { NULL }, 4601,  "udp" },
-  { "mtsserver",       { NULL }, 4602,  "tcp" },
-  { "menandmice-upg",  { NULL }, 4603,  "tcp" },
-  { "playsta2-app",    { NULL }, 4658,  "tcp" },
-  { "playsta2-app",    { NULL }, 4658,  "udp" },
-  { "playsta2-lob",    { NULL }, 4659,  "tcp" },
-  { "playsta2-lob",    { NULL }, 4659,  "udp" },
-  { "smaclmgr",        { NULL }, 4660,  "tcp" },
-  { "smaclmgr",        { NULL }, 4660,  "udp" },
-  { "kar2ouche",       { NULL }, 4661,  "tcp" },
-  { "kar2ouche",       { NULL }, 4661,  "udp" },
-  { "oms",             { NULL }, 4662,  "tcp" },
-  { "oms",             { NULL }, 4662,  "udp" },
-  { "noteit",          { NULL }, 4663,  "tcp" },
-  { "noteit",          { NULL }, 4663,  "udp" },
-  { "ems",             { NULL }, 4664,  "tcp" },
-  { "ems",             { NULL }, 4664,  "udp" },
-  { "contclientms",    { NULL }, 4665,  "tcp" },
-  { "contclientms",    { NULL }, 4665,  "udp" },
-  { "eportcomm",       { NULL }, 4666,  "tcp" },
-  { "eportcomm",       { NULL }, 4666,  "udp" },
-  { "mmacomm",         { NULL }, 4667,  "tcp" },
-  { "mmacomm",         { NULL }, 4667,  "udp" },
-  { "mmaeds",          { NULL }, 4668,  "tcp" },
-  { "mmaeds",          { NULL }, 4668,  "udp" },
-  { "eportcommdata",   { NULL }, 4669,  "tcp" },
-  { "eportcommdata",   { NULL }, 4669,  "udp" },
-  { "light",           { NULL }, 4670,  "tcp" },
-  { "light",           { NULL }, 4670,  "udp" },
-  { "acter",           { NULL }, 4671,  "tcp" },
-  { "acter",           { NULL }, 4671,  "udp" },
-  { "rfa",             { NULL }, 4672,  "tcp" },
-  { "rfa",             { NULL }, 4672,  "udp" },
-  { "cxws",            { NULL }, 4673,  "tcp" },
-  { "cxws",            { NULL }, 4673,  "udp" },
-  { "appiq-mgmt",      { NULL }, 4674,  "tcp" },
-  { "appiq-mgmt",      { NULL }, 4674,  "udp" },
-  { "dhct-status",     { NULL }, 4675,  "tcp" },
-  { "dhct-status",     { NULL }, 4675,  "udp" },
-  { "dhct-alerts",     { NULL }, 4676,  "tcp" },
-  { "dhct-alerts",     { NULL }, 4676,  "udp" },
-  { "bcs",             { NULL }, 4677,  "tcp" },
-  { "bcs",             { NULL }, 4677,  "udp" },
-  { "traversal",       { NULL }, 4678,  "tcp" },
-  { "traversal",       { NULL }, 4678,  "udp" },
-  { "mgesupervision",  { NULL }, 4679,  "tcp" },
-  { "mgesupervision",  { NULL }, 4679,  "udp" },
-  { "mgemanagement",   { NULL }, 4680,  "tcp" },
-  { "mgemanagement",   { NULL }, 4680,  "udp" },
-  { "parliant",        { NULL }, 4681,  "tcp" },
-  { "parliant",        { NULL }, 4681,  "udp" },
-  { "finisar",         { NULL }, 4682,  "tcp" },
-  { "finisar",         { NULL }, 4682,  "udp" },
-  { "spike",           { NULL }, 4683,  "tcp" },
-  { "spike",           { NULL }, 4683,  "udp" },
-  { "rfid-rp1",        { NULL }, 4684,  "tcp" },
-  { "rfid-rp1",        { NULL }, 4684,  "udp" },
-  { "autopac",         { NULL }, 4685,  "tcp" },
-  { "autopac",         { NULL }, 4685,  "udp" },
-  { "msp-os",          { NULL }, 4686,  "tcp" },
-  { "msp-os",          { NULL }, 4686,  "udp" },
-  { "nst",             { NULL }, 4687,  "tcp" },
-  { "nst",             { NULL }, 4687,  "udp" },
-  { "mobile-p2p",      { NULL }, 4688,  "tcp" },
-  { "mobile-p2p",      { NULL }, 4688,  "udp" },
-  { "altovacentral",   { NULL }, 4689,  "tcp" },
-  { "altovacentral",   { NULL }, 4689,  "udp" },
-  { "prelude",         { NULL }, 4690,  "tcp" },
-  { "prelude",         { NULL }, 4690,  "udp" },
-  { "mtn",             { NULL }, 4691,  "tcp" },
-  { "mtn",             { NULL }, 4691,  "udp" },
-  { "conspiracy",      { NULL }, 4692,  "tcp" },
-  { "conspiracy",      { NULL }, 4692,  "udp" },
-  { "netxms-agent",    { NULL }, 4700,  "tcp" },
-  { "netxms-agent",    { NULL }, 4700,  "udp" },
-  { "netxms-mgmt",     { NULL }, 4701,  "tcp" },
-  { "netxms-mgmt",     { NULL }, 4701,  "udp" },
-  { "netxms-sync",     { NULL }, 4702,  "tcp" },
-  { "netxms-sync",     { NULL }, 4702,  "udp" },
-  { "npqes-test",      { NULL }, 4703,  "tcp" },
-  { "assuria-ins",     { NULL }, 4704,  "tcp" },
-  { "truckstar",       { NULL }, 4725,  "tcp" },
-  { "truckstar",       { NULL }, 4725,  "udp" },
-  { "a26-fap-fgw",     { NULL }, 4726,  "udp" },
-  { "fcis",            { NULL }, 4727,  "tcp" },
-  { "fcis-disc",       { NULL }, 4727,  "udp" },
-  { "capmux",          { NULL }, 4728,  "tcp" },
-  { "capmux",          { NULL }, 4728,  "udp" },
-  { "gsmtap",          { NULL }, 4729,  "udp" },
-  { "gearman",         { NULL }, 4730,  "tcp" },
-  { "gearman",         { NULL }, 4730,  "udp" },
-  { "remcap",          { NULL }, 4731,  "tcp" },
-  { "ohmtrigger",      { NULL }, 4732,  "udp" },
-  { "resorcs",         { NULL }, 4733,  "tcp" },
-  { "ipdr-sp",         { NULL }, 4737,  "tcp" },
-  { "ipdr-sp",         { NULL }, 4737,  "udp" },
-  { "solera-lpn",      { NULL }, 4738,  "tcp" },
-  { "solera-lpn",      { NULL }, 4738,  "udp" },
-  { "ipfix",           { NULL }, 4739,  "tcp" },
-  { "ipfix",           { NULL }, 4739,  "udp" },
-  { "ipfix",           { NULL }, 4739,  "sctp"},
-  { "ipfixs",          { NULL }, 4740,  "tcp" },
-  { "ipfixs",          { NULL }, 4740,  "sctp"},
-  { "ipfixs",          { NULL }, 4740,  "udp" },
-  { "lumimgrd",        { NULL }, 4741,  "tcp" },
-  { "lumimgrd",        { NULL }, 4741,  "udp" },
-  { "sicct",           { NULL }, 4742,  "tcp" },
-  { "sicct-sdp",       { NULL }, 4742,  "udp" },
-  { "openhpid",        { NULL }, 4743,  "tcp" },
-  { "openhpid",        { NULL }, 4743,  "udp" },
-  { "ifsp",            { NULL }, 4744,  "tcp" },
-  { "ifsp",            { NULL }, 4744,  "udp" },
-  { "fmp",             { NULL }, 4745,  "tcp" },
-  { "fmp",             { NULL }, 4745,  "udp" },
-  { "profilemac",      { NULL }, 4749,  "tcp" },
-  { "profilemac",      { NULL }, 4749,  "udp" },
-  { "ssad",            { NULL }, 4750,  "tcp" },
-  { "ssad",            { NULL }, 4750,  "udp" },
-  { "spocp",           { NULL }, 4751,  "tcp" },
-  { "spocp",           { NULL }, 4751,  "udp" },
-  { "snap",            { NULL }, 4752,  "tcp" },
-  { "snap",            { NULL }, 4752,  "udp" },
-  { "bfd-multi-ctl",   { NULL }, 4784,  "tcp" },
-  { "bfd-multi-ctl",   { NULL }, 4784,  "udp" },
-  { "cncp",            { NULL }, 4785,  "udp" },
-  { "smart-install",   { NULL }, 4786,  "tcp" },
-  { "sia-ctrl-plane",  { NULL }, 4787,  "tcp" },
-  { "iims",            { NULL }, 4800,  "tcp" },
-  { "iims",            { NULL }, 4800,  "udp" },
-  { "iwec",            { NULL }, 4801,  "tcp" },
-  { "iwec",            { NULL }, 4801,  "udp" },
-  { "ilss",            { NULL }, 4802,  "tcp" },
-  { "ilss",            { NULL }, 4802,  "udp" },
-  { "notateit",        { NULL }, 4803,  "tcp" },
-  { "notateit-disc",   { NULL }, 4803,  "udp" },
-  { "aja-ntv4-disc",   { NULL }, 4804,  "udp" },
-  { "htcp",            { NULL }, 4827,  "tcp" },
-  { "htcp",            { NULL }, 4827,  "udp" },
-  { "varadero-0",      { NULL }, 4837,  "tcp" },
-  { "varadero-0",      { NULL }, 4837,  "udp" },
-  { "varadero-1",      { NULL }, 4838,  "tcp" },
-  { "varadero-1",      { NULL }, 4838,  "udp" },
-  { "varadero-2",      { NULL }, 4839,  "tcp" },
-  { "varadero-2",      { NULL }, 4839,  "udp" },
-  { "opcua-tcp",       { NULL }, 4840,  "tcp" },
-  { "opcua-udp",       { NULL }, 4840,  "udp" },
-  { "quosa",           { NULL }, 4841,  "tcp" },
-  { "quosa",           { NULL }, 4841,  "udp" },
-  { "gw-asv",          { NULL }, 4842,  "tcp" },
-  { "gw-asv",          { NULL }, 4842,  "udp" },
-  { "opcua-tls",       { NULL }, 4843,  "tcp" },
-  { "opcua-tls",       { NULL }, 4843,  "udp" },
-  { "gw-log",          { NULL }, 4844,  "tcp" },
-  { "gw-log",          { NULL }, 4844,  "udp" },
-  { "wcr-remlib",      { NULL }, 4845,  "tcp" },
-  { "wcr-remlib",      { NULL }, 4845,  "udp" },
-  { "contamac_icm",    { NULL }, 4846,  "tcp" },
-  { "contamac_icm",    { NULL }, 4846,  "udp" },
-  { "wfc",             { NULL }, 4847,  "tcp" },
-  { "wfc",             { NULL }, 4847,  "udp" },
-  { "appserv-http",    { NULL }, 4848,  "tcp" },
-  { "appserv-http",    { NULL }, 4848,  "udp" },
-  { "appserv-https",   { NULL }, 4849,  "tcp" },
-  { "appserv-https",   { NULL }, 4849,  "udp" },
-  { "sun-as-nodeagt",  { NULL }, 4850,  "tcp" },
-  { "sun-as-nodeagt",  { NULL }, 4850,  "udp" },
-  { "derby-repli",     { NULL }, 4851,  "tcp" },
-  { "derby-repli",     { NULL }, 4851,  "udp" },
-  { "unify-debug",     { NULL }, 4867,  "tcp" },
-  { "unify-debug",     { NULL }, 4867,  "udp" },
-  { "phrelay",         { NULL }, 4868,  "tcp" },
-  { "phrelay",         { NULL }, 4868,  "udp" },
-  { "phrelaydbg",      { NULL }, 4869,  "tcp" },
-  { "phrelaydbg",      { NULL }, 4869,  "udp" },
-  { "cc-tracking",     { NULL }, 4870,  "tcp" },
-  { "cc-tracking",     { NULL }, 4870,  "udp" },
-  { "wired",           { NULL }, 4871,  "tcp" },
-  { "wired",           { NULL }, 4871,  "udp" },
-  { "tritium-can",     { NULL }, 4876,  "tcp" },
-  { "tritium-can",     { NULL }, 4876,  "udp" },
-  { "lmcs",            { NULL }, 4877,  "tcp" },
-  { "lmcs",            { NULL }, 4877,  "udp" },
-  { "inst-discovery",  { NULL }, 4878,  "udp" },
-  { "wsdl-event",      { NULL }, 4879,  "tcp" },
-  { "hislip",          { NULL }, 4880,  "tcp" },
-  { "socp-t",          { NULL }, 4881,  "udp" },
-  { "socp-c",          { NULL }, 4882,  "udp" },
-  { "wmlserver",       { NULL }, 4883,  "tcp" },
-  { "hivestor",        { NULL }, 4884,  "tcp" },
-  { "hivestor",        { NULL }, 4884,  "udp" },
-  { "abbs",            { NULL }, 4885,  "tcp" },
-  { "abbs",            { NULL }, 4885,  "udp" },
-  { "lyskom",          { NULL }, 4894,  "tcp" },
-  { "lyskom",          { NULL }, 4894,  "udp" },
-  { "radmin-port",     { NULL }, 4899,  "tcp" },
-  { "radmin-port",     { NULL }, 4899,  "udp" },
-  { "hfcs",            { NULL }, 4900,  "tcp" },
-  { "hfcs",            { NULL }, 4900,  "udp" },
-  { "flr_agent",       { NULL }, 4901,  "tcp" },
-  { "magiccontrol",    { NULL }, 4902,  "tcp" },
-  { "lutap",           { NULL }, 4912,  "tcp" },
-  { "lutcp",           { NULL }, 4913,  "tcp" },
-  { "bones",           { NULL }, 4914,  "tcp" },
-  { "bones",           { NULL }, 4914,  "udp" },
-  { "frcs",            { NULL }, 4915,  "tcp" },
-  { "atsc-mh-ssc",     { NULL }, 4937,  "udp" },
-  { "eq-office-4940",  { NULL }, 4940,  "tcp" },
-  { "eq-office-4940",  { NULL }, 4940,  "udp" },
-  { "eq-office-4941",  { NULL }, 4941,  "tcp" },
-  { "eq-office-4941",  { NULL }, 4941,  "udp" },
-  { "eq-office-4942",  { NULL }, 4942,  "tcp" },
-  { "eq-office-4942",  { NULL }, 4942,  "udp" },
-  { "munin",           { NULL }, 4949,  "tcp" },
-  { "munin",           { NULL }, 4949,  "udp" },
-  { "sybasesrvmon",    { NULL }, 4950,  "tcp" },
-  { "sybasesrvmon",    { NULL }, 4950,  "udp" },
-  { "pwgwims",         { NULL }, 4951,  "tcp" },
-  { "pwgwims",         { NULL }, 4951,  "udp" },
-  { "sagxtsds",        { NULL }, 4952,  "tcp" },
-  { "sagxtsds",        { NULL }, 4952,  "udp" },
-  { "dbsyncarbiter",   { NULL }, 4953,  "tcp" },
-  { "ccss-qmm",        { NULL }, 4969,  "tcp" },
-  { "ccss-qmm",        { NULL }, 4969,  "udp" },
-  { "ccss-qsm",        { NULL }, 4970,  "tcp" },
-  { "ccss-qsm",        { NULL }, 4970,  "udp" },
-  { "webyast",         { NULL }, 4984,  "tcp" },
-  { "gerhcs",          { NULL }, 4985,  "tcp" },
-  { "mrip",            { NULL }, 4986,  "tcp" },
-  { "mrip",            { NULL }, 4986,  "udp" },
-  { "smar-se-port1",   { NULL }, 4987,  "tcp" },
-  { "smar-se-port1",   { NULL }, 4987,  "udp" },
-  { "smar-se-port2",   { NULL }, 4988,  "tcp" },
-  { "smar-se-port2",   { NULL }, 4988,  "udp" },
-  { "parallel",        { NULL }, 4989,  "tcp" },
-  { "parallel",        { NULL }, 4989,  "udp" },
-  { "busycal",         { NULL }, 4990,  "tcp" },
-  { "busycal",         { NULL }, 4990,  "udp" },
-  { "vrt",             { NULL }, 4991,  "tcp" },
-  { "vrt",             { NULL }, 4991,  "udp" },
-  { "hfcs-manager",    { NULL }, 4999,  "tcp" },
-  { "hfcs-manager",    { NULL }, 4999,  "udp" },
-  { "commplex-main",   { NULL }, 5000,  "tcp" },
-  { "commplex-main",   { NULL }, 5000,  "udp" },
-  { "commplex-link",   { NULL }, 5001,  "tcp" },
-  { "commplex-link",   { NULL }, 5001,  "udp" },
-  { "rfe",             { NULL }, 5002,  "tcp" },
-  { "rfe",             { NULL }, 5002,  "udp" },
-  { "fmpro-internal",  { NULL }, 5003,  "tcp" },
-  { "fmpro-internal",  { NULL }, 5003,  "udp" },
-  { "avt-profile-1",   { NULL }, 5004,  "tcp" },
-  { "avt-profile-1",   { NULL }, 5004,  "udp" },
-  { "avt-profile-1",   { NULL }, 5004,  "dccp"},
-  { "avt-profile-2",   { NULL }, 5005,  "tcp" },
-  { "avt-profile-2",   { NULL }, 5005,  "udp" },
-  { "avt-profile-2",   { NULL }, 5005,  "dccp"},
-  { "wsm-server",      { NULL }, 5006,  "tcp" },
-  { "wsm-server",      { NULL }, 5006,  "udp" },
-  { "wsm-server-ssl",  { NULL }, 5007,  "tcp" },
-  { "wsm-server-ssl",  { NULL }, 5007,  "udp" },
-  { "synapsis-edge",   { NULL }, 5008,  "tcp" },
-  { "synapsis-edge",   { NULL }, 5008,  "udp" },
-  { "winfs",           { NULL }, 5009,  "tcp" },
-  { "winfs",           { NULL }, 5009,  "udp" },
-  { "telelpathstart",  { NULL }, 5010,  "tcp" },
-  { "telelpathstart",  { NULL }, 5010,  "udp" },
-  { "telelpathattack", { NULL }, 5011,  "tcp" },
-  { "telelpathattack", { NULL }, 5011,  "udp" },
-  { "nsp",             { NULL }, 5012,  "tcp" },
-  { "nsp",             { NULL }, 5012,  "udp" },
-  { "fmpro-v6",        { NULL }, 5013,  "tcp" },
-  { "fmpro-v6",        { NULL }, 5013,  "udp" },
-  { "onpsocket",       { NULL }, 5014,  "udp" },
-  { "fmwp",            { NULL }, 5015,  "tcp" },
-  { "zenginkyo-1",     { NULL }, 5020,  "tcp" },
-  { "zenginkyo-1",     { NULL }, 5020,  "udp" },
-  { "zenginkyo-2",     { NULL }, 5021,  "tcp" },
-  { "zenginkyo-2",     { NULL }, 5021,  "udp" },
-  { "mice",            { NULL }, 5022,  "tcp" },
-  { "mice",            { NULL }, 5022,  "udp" },
-  { "htuilsrv",        { NULL }, 5023,  "tcp" },
-  { "htuilsrv",        { NULL }, 5023,  "udp" },
-  { "scpi-telnet",     { NULL }, 5024,  "tcp" },
-  { "scpi-telnet",     { NULL }, 5024,  "udp" },
-  { "scpi-raw",        { NULL }, 5025,  "tcp" },
-  { "scpi-raw",        { NULL }, 5025,  "udp" },
-  { "strexec-d",       { NULL }, 5026,  "tcp" },
-  { "strexec-d",       { NULL }, 5026,  "udp" },
-  { "strexec-s",       { NULL }, 5027,  "tcp" },
-  { "strexec-s",       { NULL }, 5027,  "udp" },
-  { "qvr",             { NULL }, 5028,  "tcp" },
-  { "infobright",      { NULL }, 5029,  "tcp" },
-  { "infobright",      { NULL }, 5029,  "udp" },
-  { "surfpass",        { NULL }, 5030,  "tcp" },
-  { "surfpass",        { NULL }, 5030,  "udp" },
-  { "dmp",             { NULL }, 5031,  "udp" },
-  { "asnaacceler8db",  { NULL }, 5042,  "tcp" },
-  { "asnaacceler8db",  { NULL }, 5042,  "udp" },
-  { "swxadmin",        { NULL }, 5043,  "tcp" },
-  { "swxadmin",        { NULL }, 5043,  "udp" },
-  { "lxi-evntsvc",     { NULL }, 5044,  "tcp" },
-  { "lxi-evntsvc",     { NULL }, 5044,  "udp" },
-  { "osp",             { NULL }, 5045,  "tcp" },
-  { "vpm-udp",         { NULL }, 5046,  "udp" },
-  { "iscape",          { NULL }, 5047,  "udp" },
-  { "texai",           { NULL }, 5048,  "tcp" },
-  { "ivocalize",       { NULL }, 5049,  "tcp" },
-  { "ivocalize",       { NULL }, 5049,  "udp" },
-  { "mmcc",            { NULL }, 5050,  "tcp" },
-  { "mmcc",            { NULL }, 5050,  "udp" },
-  { "ita-agent",       { NULL }, 5051,  "tcp" },
-  { "ita-agent",       { NULL }, 5051,  "udp" },
-  { "ita-manager",     { NULL }, 5052,  "tcp" },
-  { "ita-manager",     { NULL }, 5052,  "udp" },
-  { "rlm",             { NULL }, 5053,  "tcp" },
-  { "rlm-admin",       { NULL }, 5054,  "tcp" },
-  { "unot",            { NULL }, 5055,  "tcp" },
-  { "unot",            { NULL }, 5055,  "udp" },
-  { "intecom-ps1",     { NULL }, 5056,  "tcp" },
-  { "intecom-ps1",     { NULL }, 5056,  "udp" },
-  { "intecom-ps2",     { NULL }, 5057,  "tcp" },
-  { "intecom-ps2",     { NULL }, 5057,  "udp" },
-  { "locus-disc",      { NULL }, 5058,  "udp" },
-  { "sds",             { NULL }, 5059,  "tcp" },
-  { "sds",             { NULL }, 5059,  "udp" },
-  { "sip",             { NULL }, 5060,  "tcp" },
-  { "sip",             { NULL }, 5060,  "udp" },
-  { "sip-tls",         { NULL }, 5061,  "tcp" },
-  { "sip-tls",         { NULL }, 5061,  "udp" },
-  { "na-localise",     { NULL }, 5062,  "tcp" },
-  { "na-localise",     { NULL }, 5062,  "udp" },
-  { "csrpc",           { NULL }, 5063,  "tcp" },
-  { "ca-1",            { NULL }, 5064,  "tcp" },
-  { "ca-1",            { NULL }, 5064,  "udp" },
-  { "ca-2",            { NULL }, 5065,  "tcp" },
-  { "ca-2",            { NULL }, 5065,  "udp" },
-  { "stanag-5066",     { NULL }, 5066,  "tcp" },
-  { "stanag-5066",     { NULL }, 5066,  "udp" },
-  { "authentx",        { NULL }, 5067,  "tcp" },
-  { "authentx",        { NULL }, 5067,  "udp" },
-  { "bitforestsrv",    { NULL }, 5068,  "tcp" },
-  { "i-net-2000-npr",  { NULL }, 5069,  "tcp" },
-  { "i-net-2000-npr",  { NULL }, 5069,  "udp" },
-  { "vtsas",           { NULL }, 5070,  "tcp" },
-  { "vtsas",           { NULL }, 5070,  "udp" },
-  { "powerschool",     { NULL }, 5071,  "tcp" },
-  { "powerschool",     { NULL }, 5071,  "udp" },
-  { "ayiya",           { NULL }, 5072,  "tcp" },
-  { "ayiya",           { NULL }, 5072,  "udp" },
-  { "tag-pm",          { NULL }, 5073,  "tcp" },
-  { "tag-pm",          { NULL }, 5073,  "udp" },
-  { "alesquery",       { NULL }, 5074,  "tcp" },
-  { "alesquery",       { NULL }, 5074,  "udp" },
-  { "cp-spxrpts",      { NULL }, 5079,  "udp" },
-  { "onscreen",        { NULL }, 5080,  "tcp" },
-  { "onscreen",        { NULL }, 5080,  "udp" },
-  { "sdl-ets",         { NULL }, 5081,  "tcp" },
-  { "sdl-ets",         { NULL }, 5081,  "udp" },
-  { "qcp",             { NULL }, 5082,  "tcp" },
-  { "qcp",             { NULL }, 5082,  "udp" },
-  { "qfp",             { NULL }, 5083,  "tcp" },
-  { "qfp",             { NULL }, 5083,  "udp" },
-  { "llrp",            { NULL }, 5084,  "tcp" },
-  { "llrp",            { NULL }, 5084,  "udp" },
-  { "encrypted-llrp",  { NULL }, 5085,  "tcp" },
-  { "encrypted-llrp",  { NULL }, 5085,  "udp" },
-  { "aprigo-cs",       { NULL }, 5086,  "tcp" },
-  { "car",             { NULL }, 5090,  "sctp"},
-  { "cxtp",            { NULL }, 5091,  "sctp"},
-  { "magpie",          { NULL }, 5092,  "udp" },
-  { "sentinel-lm",     { NULL }, 5093,  "tcp" },
-  { "sentinel-lm",     { NULL }, 5093,  "udp" },
-  { "hart-ip",         { NULL }, 5094,  "tcp" },
-  { "hart-ip",         { NULL }, 5094,  "udp" },
-  { "sentlm-srv2srv",  { NULL }, 5099,  "tcp" },
-  { "sentlm-srv2srv",  { NULL }, 5099,  "udp" },
-  { "socalia",         { NULL }, 5100,  "tcp" },
-  { "socalia",         { NULL }, 5100,  "udp" },
-  { "talarian-tcp",    { NULL }, 5101,  "tcp" },
-  { "talarian-udp",    { NULL }, 5101,  "udp" },
-  { "oms-nonsecure",   { NULL }, 5102,  "tcp" },
-  { "oms-nonsecure",   { NULL }, 5102,  "udp" },
-  { "actifio-c2c",     { NULL }, 5103,  "tcp" },
-  { "tinymessage",     { NULL }, 5104,  "udp" },
-  { "hughes-ap",       { NULL }, 5105,  "udp" },
-  { "taep-as-svc",     { NULL }, 5111,  "tcp" },
-  { "taep-as-svc",     { NULL }, 5111,  "udp" },
-  { "pm-cmdsvr",       { NULL }, 5112,  "tcp" },
-  { "pm-cmdsvr",       { NULL }, 5112,  "udp" },
-  { "ev-services",     { NULL }, 5114,  "tcp" },
-  { "autobuild",       { NULL }, 5115,  "tcp" },
-  { "emb-proj-cmd",    { NULL }, 5116,  "udp" },
-  { "gradecam",        { NULL }, 5117,  "tcp" },
-  { "nbt-pc",          { NULL }, 5133,  "tcp" },
-  { "nbt-pc",          { NULL }, 5133,  "udp" },
-  { "ppactivation",    { NULL }, 5134,  "tcp" },
-  { "erp-scale",       { NULL }, 5135,  "tcp" },
-  { "minotaur-sa",     { NULL }, 5136,  "udp" },
-  { "ctsd",            { NULL }, 5137,  "tcp" },
-  { "ctsd",            { NULL }, 5137,  "udp" },
-  { "rmonitor_secure", { NULL }, 5145,  "tcp" },
-  { "rmonitor_secure", { NULL }, 5145,  "udp" },
-  { "social-alarm",    { NULL }, 5146,  "tcp" },
-  { "atmp",            { NULL }, 5150,  "tcp" },
-  { "atmp",            { NULL }, 5150,  "udp" },
-  { "esri_sde",        { NULL }, 5151,  "tcp" },
-  { "esri_sde",        { NULL }, 5151,  "udp" },
-  { "sde-discovery",   { NULL }, 5152,  "tcp" },
-  { "sde-discovery",   { NULL }, 5152,  "udp" },
-  { "toruxserver",     { NULL }, 5153,  "tcp" },
-  { "bzflag",          { NULL }, 5154,  "tcp" },
-  { "bzflag",          { NULL }, 5154,  "udp" },
-  { "asctrl-agent",    { NULL }, 5155,  "tcp" },
-  { "asctrl-agent",    { NULL }, 5155,  "udp" },
-  { "rugameonline",    { NULL }, 5156,  "tcp" },
-  { "mediat",          { NULL }, 5157,  "tcp" },
-  { "snmpssh",         { NULL }, 5161,  "tcp" },
-  { "snmpssh-trap",    { NULL }, 5162,  "tcp" },
-  { "sbackup",         { NULL }, 5163,  "tcp" },
-  { "vpa",             { NULL }, 5164,  "tcp" },
-  { "vpa-disc",        { NULL }, 5164,  "udp" },
-  { "ife_icorp",       { NULL }, 5165,  "tcp" },
-  { "ife_icorp",       { NULL }, 5165,  "udp" },
-  { "winpcs",          { NULL }, 5166,  "tcp" },
-  { "winpcs",          { NULL }, 5166,  "udp" },
-  { "scte104",         { NULL }, 5167,  "tcp" },
-  { "scte104",         { NULL }, 5167,  "udp" },
-  { "scte30",          { NULL }, 5168,  "tcp" },
-  { "scte30",          { NULL }, 5168,  "udp" },
-  { "aol",             { NULL }, 5190,  "tcp" },
-  { "aol",             { NULL }, 5190,  "udp" },
-  { "aol-1",           { NULL }, 5191,  "tcp" },
-  { "aol-1",           { NULL }, 5191,  "udp" },
-  { "aol-2",           { NULL }, 5192,  "tcp" },
-  { "aol-2",           { NULL }, 5192,  "udp" },
-  { "aol-3",           { NULL }, 5193,  "tcp" },
-  { "aol-3",           { NULL }, 5193,  "udp" },
-  { "cpscomm",         { NULL }, 5194,  "tcp" },
-  { "targus-getdata",  { NULL }, 5200,  "tcp" },
-  { "targus-getdata",  { NULL }, 5200,  "udp" },
-  { "targus-getdata1", { NULL }, 5201,  "tcp" },
-  { "targus-getdata1", { NULL }, 5201,  "udp" },
-  { "targus-getdata2", { NULL }, 5202,  "tcp" },
-  { "targus-getdata2", { NULL }, 5202,  "udp" },
-  { "targus-getdata3", { NULL }, 5203,  "tcp" },
-  { "targus-getdata3", { NULL }, 5203,  "udp" },
-  { "3exmp",           { NULL }, 5221,  "tcp" },
-  { "xmpp-client",     { NULL }, 5222,  "tcp" },
-  { "hpvirtgrp",       { NULL }, 5223,  "tcp" },
-  { "hpvirtgrp",       { NULL }, 5223,  "udp" },
-  { "hpvirtctrl",      { NULL }, 5224,  "tcp" },
-  { "hpvirtctrl",      { NULL }, 5224,  "udp" },
-  { "hp-server",       { NULL }, 5225,  "tcp" },
-  { "hp-server",       { NULL }, 5225,  "udp" },
-  { "hp-status",       { NULL }, 5226,  "tcp" },
-  { "hp-status",       { NULL }, 5226,  "udp" },
-  { "perfd",           { NULL }, 5227,  "tcp" },
-  { "perfd",           { NULL }, 5227,  "udp" },
-  { "hpvroom",         { NULL }, 5228,  "tcp" },
-  { "csedaemon",       { NULL }, 5232,  "tcp" },
-  { "enfs",            { NULL }, 5233,  "tcp" },
-  { "eenet",           { NULL }, 5234,  "tcp" },
-  { "eenet",           { NULL }, 5234,  "udp" },
-  { "galaxy-network",  { NULL }, 5235,  "tcp" },
-  { "galaxy-network",  { NULL }, 5235,  "udp" },
-  { "padl2sim",        { NULL }, 5236,  "tcp" },
-  { "padl2sim",        { NULL }, 5236,  "udp" },
-  { "mnet-discovery",  { NULL }, 5237,  "tcp" },
-  { "mnet-discovery",  { NULL }, 5237,  "udp" },
-  { "downtools",       { NULL }, 5245,  "tcp" },
-  { "downtools-disc",  { NULL }, 5245,  "udp" },
-  { "capwap-control",  { NULL }, 5246,  "udp" },
-  { "capwap-data",     { NULL }, 5247,  "udp" },
-  { "caacws",          { NULL }, 5248,  "tcp" },
-  { "caacws",          { NULL }, 5248,  "udp" },
-  { "caaclang2",       { NULL }, 5249,  "tcp" },
-  { "caaclang2",       { NULL }, 5249,  "udp" },
-  { "soagateway",      { NULL }, 5250,  "tcp" },
-  { "soagateway",      { NULL }, 5250,  "udp" },
-  { "caevms",          { NULL }, 5251,  "tcp" },
-  { "caevms",          { NULL }, 5251,  "udp" },
-  { "movaz-ssc",       { NULL }, 5252,  "tcp" },
-  { "movaz-ssc",       { NULL }, 5252,  "udp" },
-  { "kpdp",            { NULL }, 5253,  "tcp" },
-  { "3com-njack-1",    { NULL }, 5264,  "tcp" },
-  { "3com-njack-1",    { NULL }, 5264,  "udp" },
-  { "3com-njack-2",    { NULL }, 5265,  "tcp" },
-  { "3com-njack-2",    { NULL }, 5265,  "udp" },
-  { "xmpp-server",     { NULL }, 5269,  "tcp" },
-  { "xmp",             { NULL }, 5270,  "tcp" },
-  { "xmp",             { NULL }, 5270,  "udp" },
-  { "cuelink",         { NULL }, 5271,  "tcp" },
-  { "cuelink-disc",    { NULL }, 5271,  "udp" },
-  { "pk",              { NULL }, 5272,  "tcp" },
-  { "pk",              { NULL }, 5272,  "udp" },
-  { "xmpp-bosh",       { NULL }, 5280,  "tcp" },
-  { "undo-lm",         { NULL }, 5281,  "tcp" },
-  { "transmit-port",   { NULL }, 5282,  "tcp" },
-  { "transmit-port",   { NULL }, 5282,  "udp" },
-  { "presence",        { NULL }, 5298,  "tcp" },
-  { "presence",        { NULL }, 5298,  "udp" },
-  { "nlg-data",        { NULL }, 5299,  "tcp" },
-  { "nlg-data",        { NULL }, 5299,  "udp" },
-  { "hacl-hb",         { NULL }, 5300,  "tcp" },
-  { "hacl-hb",         { NULL }, 5300,  "udp" },
-  { "hacl-gs",         { NULL }, 5301,  "tcp" },
-  { "hacl-gs",         { NULL }, 5301,  "udp" },
-  { "hacl-cfg",        { NULL }, 5302,  "tcp" },
-  { "hacl-cfg",        { NULL }, 5302,  "udp" },
-  { "hacl-probe",      { NULL }, 5303,  "tcp" },
-  { "hacl-probe",      { NULL }, 5303,  "udp" },
-  { "hacl-local",      { NULL }, 5304,  "tcp" },
-  { "hacl-local",      { NULL }, 5304,  "udp" },
-  { "hacl-test",       { NULL }, 5305,  "tcp" },
-  { "hacl-test",       { NULL }, 5305,  "udp" },
-  { "sun-mc-grp",      { NULL }, 5306,  "tcp" },
-  { "sun-mc-grp",      { NULL }, 5306,  "udp" },
-  { "sco-aip",         { NULL }, 5307,  "tcp" },
-  { "sco-aip",         { NULL }, 5307,  "udp" },
-  { "cfengine",        { NULL }, 5308,  "tcp" },
-  { "cfengine",        { NULL }, 5308,  "udp" },
-  { "jprinter",        { NULL }, 5309,  "tcp" },
-  { "jprinter",        { NULL }, 5309,  "udp" },
-  { "outlaws",         { NULL }, 5310,  "tcp" },
-  { "outlaws",         { NULL }, 5310,  "udp" },
-  { "permabit-cs",     { NULL }, 5312,  "tcp" },
-  { "permabit-cs",     { NULL }, 5312,  "udp" },
-  { "rrdp",            { NULL }, 5313,  "tcp" },
-  { "rrdp",            { NULL }, 5313,  "udp" },
-  { "opalis-rbt-ipc",  { NULL }, 5314,  "tcp" },
-  { "opalis-rbt-ipc",  { NULL }, 5314,  "udp" },
-  { "hacl-poll",       { NULL }, 5315,  "tcp" },
-  { "hacl-poll",       { NULL }, 5315,  "udp" },
-  { "hpdevms",         { NULL }, 5316,  "tcp" },
-  { "hpdevms",         { NULL }, 5316,  "udp" },
-  { "bsfserver-zn",    { NULL }, 5320,  "tcp" },
-  { "bsfsvr-zn-ssl",   { NULL }, 5321,  "tcp" },
-  { "kfserver",        { NULL }, 5343,  "tcp" },
-  { "kfserver",        { NULL }, 5343,  "udp" },
-  { "xkotodrcp",       { NULL }, 5344,  "tcp" },
-  { "xkotodrcp",       { NULL }, 5344,  "udp" },
-  { "stuns",           { NULL }, 5349,  "tcp" },
-  { "stuns",           { NULL }, 5349,  "udp" },
-  { "turns",           { NULL }, 5349,  "tcp" },
-  { "turns",           { NULL }, 5349,  "udp" },
-  { "stun-behaviors",  { NULL }, 5349,  "tcp" },
-  { "stun-behaviors",  { NULL }, 5349,  "udp" },
-  { "nat-pmp-status",  { NULL }, 5350,  "tcp" },
-  { "nat-pmp-status",  { NULL }, 5350,  "udp" },
-  { "nat-pmp",         { NULL }, 5351,  "tcp" },
-  { "nat-pmp",         { NULL }, 5351,  "udp" },
-  { "dns-llq",         { NULL }, 5352,  "tcp" },
-  { "dns-llq",         { NULL }, 5352,  "udp" },
-  { "mdns",            { NULL }, 5353,  "tcp" },
-  { "mdns",            { NULL }, 5353,  "udp" },
-  { "mdnsresponder",   { NULL }, 5354,  "tcp" },
-  { "mdnsresponder",   { NULL }, 5354,  "udp" },
-  { "llmnr",           { NULL }, 5355,  "tcp" },
-  { "llmnr",           { NULL }, 5355,  "udp" },
-  { "ms-smlbiz",       { NULL }, 5356,  "tcp" },
-  { "ms-smlbiz",       { NULL }, 5356,  "udp" },
-  { "wsdapi",          { NULL }, 5357,  "tcp" },
-  { "wsdapi",          { NULL }, 5357,  "udp" },
-  { "wsdapi-s",        { NULL }, 5358,  "tcp" },
-  { "wsdapi-s",        { NULL }, 5358,  "udp" },
-  { "ms-alerter",      { NULL }, 5359,  "tcp" },
-  { "ms-alerter",      { NULL }, 5359,  "udp" },
-  { "ms-sideshow",     { NULL }, 5360,  "tcp" },
-  { "ms-sideshow",     { NULL }, 5360,  "udp" },
-  { "ms-s-sideshow",   { NULL }, 5361,  "tcp" },
-  { "ms-s-sideshow",   { NULL }, 5361,  "udp" },
-  { "serverwsd2",      { NULL }, 5362,  "tcp" },
-  { "serverwsd2",      { NULL }, 5362,  "udp" },
-  { "net-projection",  { NULL }, 5363,  "tcp" },
-  { "net-projection",  { NULL }, 5363,  "udp" },
-  { "stresstester",    { NULL }, 5397,  "tcp" },
-  { "stresstester",    { NULL }, 5397,  "udp" },
-  { "elektron-admin",  { NULL }, 5398,  "tcp" },
-  { "elektron-admin",  { NULL }, 5398,  "udp" },
-  { "securitychase",   { NULL }, 5399,  "tcp" },
-  { "securitychase",   { NULL }, 5399,  "udp" },
-  { "excerpt",         { NULL }, 5400,  "tcp" },
-  { "excerpt",         { NULL }, 5400,  "udp" },
-  { "excerpts",        { NULL }, 5401,  "tcp" },
-  { "excerpts",        { NULL }, 5401,  "udp" },
-  { "mftp",            { NULL }, 5402,  "tcp" },
-  { "mftp",            { NULL }, 5402,  "udp" },
-  { "hpoms-ci-lstn",   { NULL }, 5403,  "tcp" },
-  { "hpoms-ci-lstn",   { NULL }, 5403,  "udp" },
-  { "hpoms-dps-lstn",  { NULL }, 5404,  "tcp" },
-  { "hpoms-dps-lstn",  { NULL }, 5404,  "udp" },
-  { "netsupport",      { NULL }, 5405,  "tcp" },
-  { "netsupport",      { NULL }, 5405,  "udp" },
-  { "systemics-sox",   { NULL }, 5406,  "tcp" },
-  { "systemics-sox",   { NULL }, 5406,  "udp" },
-  { "foresyte-clear",  { NULL }, 5407,  "tcp" },
-  { "foresyte-clear",  { NULL }, 5407,  "udp" },
-  { "foresyte-sec",    { NULL }, 5408,  "tcp" },
-  { "foresyte-sec",    { NULL }, 5408,  "udp" },
-  { "salient-dtasrv",  { NULL }, 5409,  "tcp" },
-  { "salient-dtasrv",  { NULL }, 5409,  "udp" },
-  { "salient-usrmgr",  { NULL }, 5410,  "tcp" },
-  { "salient-usrmgr",  { NULL }, 5410,  "udp" },
-  { "actnet",          { NULL }, 5411,  "tcp" },
-  { "actnet",          { NULL }, 5411,  "udp" },
-  { "continuus",       { NULL }, 5412,  "tcp" },
-  { "continuus",       { NULL }, 5412,  "udp" },
-  { "wwiotalk",        { NULL }, 5413,  "tcp" },
-  { "wwiotalk",        { NULL }, 5413,  "udp" },
-  { "statusd",         { NULL }, 5414,  "tcp" },
-  { "statusd",         { NULL }, 5414,  "udp" },
-  { "ns-server",       { NULL }, 5415,  "tcp" },
-  { "ns-server",       { NULL }, 5415,  "udp" },
-  { "sns-gateway",     { NULL }, 5416,  "tcp" },
-  { "sns-gateway",     { NULL }, 5416,  "udp" },
-  { "sns-agent",       { NULL }, 5417,  "tcp" },
-  { "sns-agent",       { NULL }, 5417,  "udp" },
-  { "mcntp",           { NULL }, 5418,  "tcp" },
-  { "mcntp",           { NULL }, 5418,  "udp" },
-  { "dj-ice",          { NULL }, 5419,  "tcp" },
-  { "dj-ice",          { NULL }, 5419,  "udp" },
-  { "cylink-c",        { NULL }, 5420,  "tcp" },
-  { "cylink-c",        { NULL }, 5420,  "udp" },
-  { "netsupport2",     { NULL }, 5421,  "tcp" },
-  { "netsupport2",     { NULL }, 5421,  "udp" },
-  { "salient-mux",     { NULL }, 5422,  "tcp" },
-  { "salient-mux",     { NULL }, 5422,  "udp" },
-  { "virtualuser",     { NULL }, 5423,  "tcp" },
-  { "virtualuser",     { NULL }, 5423,  "udp" },
-  { "beyond-remote",   { NULL }, 5424,  "tcp" },
-  { "beyond-remote",   { NULL }, 5424,  "udp" },
-  { "br-channel",      { NULL }, 5425,  "tcp" },
-  { "br-channel",      { NULL }, 5425,  "udp" },
-  { "devbasic",        { NULL }, 5426,  "tcp" },
-  { "devbasic",        { NULL }, 5426,  "udp" },
-  { "sco-peer-tta",    { NULL }, 5427,  "tcp" },
-  { "sco-peer-tta",    { NULL }, 5427,  "udp" },
-  { "telaconsole",     { NULL }, 5428,  "tcp" },
-  { "telaconsole",     { NULL }, 5428,  "udp" },
-  { "base",            { NULL }, 5429,  "tcp" },
-  { "base",            { NULL }, 5429,  "udp" },
-  { "radec-corp",      { NULL }, 5430,  "tcp" },
-  { "radec-corp",      { NULL }, 5430,  "udp" },
-  { "park-agent",      { NULL }, 5431,  "tcp" },
-  { "park-agent",      { NULL }, 5431,  "udp" },
-  { "postgresql",      { NULL }, 5432,  "tcp" },
-  { "postgresql",      { NULL }, 5432,  "udp" },
-  { "pyrrho",          { NULL }, 5433,  "tcp" },
-  { "pyrrho",          { NULL }, 5433,  "udp" },
-  { "sgi-arrayd",      { NULL }, 5434,  "tcp" },
-  { "sgi-arrayd",      { NULL }, 5434,  "udp" },
-  { "sceanics",        { NULL }, 5435,  "tcp" },
-  { "sceanics",        { NULL }, 5435,  "udp" },
-  { "pmip6-cntl",      { NULL }, 5436,  "udp" },
-  { "pmip6-data",      { NULL }, 5437,  "udp" },
-  { "spss",            { NULL }, 5443,  "tcp" },
-  { "spss",            { NULL }, 5443,  "udp" },
-  { "surebox",         { NULL }, 5453,  "tcp" },
-  { "surebox",         { NULL }, 5453,  "udp" },
-  { "apc-5454",        { NULL }, 5454,  "tcp" },
-  { "apc-5454",        { NULL }, 5454,  "udp" },
-  { "apc-5455",        { NULL }, 5455,  "tcp" },
-  { "apc-5455",        { NULL }, 5455,  "udp" },
-  { "apc-5456",        { NULL }, 5456,  "tcp" },
-  { "apc-5456",        { NULL }, 5456,  "udp" },
-  { "silkmeter",       { NULL }, 5461,  "tcp" },
-  { "silkmeter",       { NULL }, 5461,  "udp" },
-  { "ttl-publisher",   { NULL }, 5462,  "tcp" },
-  { "ttl-publisher",   { NULL }, 5462,  "udp" },
-  { "ttlpriceproxy",   { NULL }, 5463,  "tcp" },
-  { "ttlpriceproxy",   { NULL }, 5463,  "udp" },
-  { "quailnet",        { NULL }, 5464,  "tcp" },
-  { "quailnet",        { NULL }, 5464,  "udp" },
-  { "netops-broker",   { NULL }, 5465,  "tcp" },
-  { "netops-broker",   { NULL }, 5465,  "udp" },
-  { "fcp-addr-srvr1",  { NULL }, 5500,  "tcp" },
-  { "fcp-addr-srvr1",  { NULL }, 5500,  "udp" },
-  { "fcp-addr-srvr2",  { NULL }, 5501,  "tcp" },
-  { "fcp-addr-srvr2",  { NULL }, 5501,  "udp" },
-  { "fcp-srvr-inst1",  { NULL }, 5502,  "tcp" },
-  { "fcp-srvr-inst1",  { NULL }, 5502,  "udp" },
-  { "fcp-srvr-inst2",  { NULL }, 5503,  "tcp" },
-  { "fcp-srvr-inst2",  { NULL }, 5503,  "udp" },
-  { "fcp-cics-gw1",    { NULL }, 5504,  "tcp" },
-  { "fcp-cics-gw1",    { NULL }, 5504,  "udp" },
-  { "checkoutdb",      { NULL }, 5505,  "tcp" },
-  { "checkoutdb",      { NULL }, 5505,  "udp" },
-  { "amc",             { NULL }, 5506,  "tcp" },
-  { "amc",             { NULL }, 5506,  "udp" },
-  { "sgi-eventmond",   { NULL }, 5553,  "tcp" },
-  { "sgi-eventmond",   { NULL }, 5553,  "udp" },
-  { "sgi-esphttp",     { NULL }, 5554,  "tcp" },
-  { "sgi-esphttp",     { NULL }, 5554,  "udp" },
-  { "personal-agent",  { NULL }, 5555,  "tcp" },
-  { "personal-agent",  { NULL }, 5555,  "udp" },
-  { "freeciv",         { NULL }, 5556,  "tcp" },
-  { "freeciv",         { NULL }, 5556,  "udp" },
-  { "farenet",         { NULL }, 5557,  "tcp" },
-  { "westec-connect",  { NULL }, 5566,  "tcp" },
-  { "m-oap",           { NULL }, 5567,  "tcp" },
-  { "m-oap",           { NULL }, 5567,  "udp" },
-  { "sdt",             { NULL }, 5568,  "tcp" },
-  { "sdt",             { NULL }, 5568,  "udp" },
-  { "sdmmp",           { NULL }, 5573,  "tcp" },
-  { "sdmmp",           { NULL }, 5573,  "udp" },
-  { "lsi-bobcat",      { NULL }, 5574,  "tcp" },
-  { "ora-oap",         { NULL }, 5575,  "tcp" },
-  { "fdtracks",        { NULL }, 5579,  "tcp" },
-  { "tmosms0",         { NULL }, 5580,  "tcp" },
-  { "tmosms0",         { NULL }, 5580,  "udp" },
-  { "tmosms1",         { NULL }, 5581,  "tcp" },
-  { "tmosms1",         { NULL }, 5581,  "udp" },
-  { "fac-restore",     { NULL }, 5582,  "tcp" },
-  { "fac-restore",     { NULL }, 5582,  "udp" },
-  { "tmo-icon-sync",   { NULL }, 5583,  "tcp" },
-  { "tmo-icon-sync",   { NULL }, 5583,  "udp" },
-  { "bis-web",         { NULL }, 5584,  "tcp" },
-  { "bis-web",         { NULL }, 5584,  "udp" },
-  { "bis-sync",        { NULL }, 5585,  "tcp" },
-  { "bis-sync",        { NULL }, 5585,  "udp" },
-  { "ininmessaging",   { NULL }, 5597,  "tcp" },
-  { "ininmessaging",   { NULL }, 5597,  "udp" },
-  { "mctfeed",         { NULL }, 5598,  "tcp" },
-  { "mctfeed",         { NULL }, 5598,  "udp" },
-  { "esinstall",       { NULL }, 5599,  "tcp" },
-  { "esinstall",       { NULL }, 5599,  "udp" },
-  { "esmmanager",      { NULL }, 5600,  "tcp" },
-  { "esmmanager",      { NULL }, 5600,  "udp" },
-  { "esmagent",        { NULL }, 5601,  "tcp" },
-  { "esmagent",        { NULL }, 5601,  "udp" },
-  { "a1-msc",          { NULL }, 5602,  "tcp" },
-  { "a1-msc",          { NULL }, 5602,  "udp" },
-  { "a1-bs",           { NULL }, 5603,  "tcp" },
-  { "a1-bs",           { NULL }, 5603,  "udp" },
-  { "a3-sdunode",      { NULL }, 5604,  "tcp" },
-  { "a3-sdunode",      { NULL }, 5604,  "udp" },
-  { "a4-sdunode",      { NULL }, 5605,  "tcp" },
-  { "a4-sdunode",      { NULL }, 5605,  "udp" },
-  { "ninaf",           { NULL }, 5627,  "tcp" },
-  { "ninaf",           { NULL }, 5627,  "udp" },
-  { "htrust",          { NULL }, 5628,  "tcp" },
-  { "htrust",          { NULL }, 5628,  "udp" },
-  { "symantec-sfdb",   { NULL }, 5629,  "tcp" },
-  { "symantec-sfdb",   { NULL }, 5629,  "udp" },
-  { "precise-comm",    { NULL }, 5630,  "tcp" },
-  { "precise-comm",    { NULL }, 5630,  "udp" },
-  { "pcanywheredata",  { NULL }, 5631,  "tcp" },
-  { "pcanywheredata",  { NULL }, 5631,  "udp" },
-  { "pcanywherestat",  { NULL }, 5632,  "tcp" },
-  { "pcanywherestat",  { NULL }, 5632,  "udp" },
-  { "beorl",           { NULL }, 5633,  "tcp" },
-  { "beorl",           { NULL }, 5633,  "udp" },
-  { "xprtld",          { NULL }, 5634,  "tcp" },
-  { "xprtld",          { NULL }, 5634,  "udp" },
-  { "sfmsso",          { NULL }, 5635,  "tcp" },
-  { "sfm-db-server",   { NULL }, 5636,  "tcp" },
-  { "cssc",            { NULL }, 5637,  "tcp" },
-  { "amqps",           { NULL }, 5671,  "tcp" },
-  { "amqps",           { NULL }, 5671,  "udp" },
-  { "amqp",            { NULL }, 5672,  "tcp" },
-  { "amqp",            { NULL }, 5672,  "udp" },
-  { "amqp",            { NULL }, 5672,  "sctp"},
-  { "jms",             { NULL }, 5673,  "tcp" },
-  { "jms",             { NULL }, 5673,  "udp" },
-  { "hyperscsi-port",  { NULL }, 5674,  "tcp" },
-  { "hyperscsi-port",  { NULL }, 5674,  "udp" },
-  { "v5ua",            { NULL }, 5675,  "tcp" },
-  { "v5ua",            { NULL }, 5675,  "udp" },
-  { "v5ua",            { NULL }, 5675,  "sctp"},
-  { "raadmin",         { NULL }, 5676,  "tcp" },
-  { "raadmin",         { NULL }, 5676,  "udp" },
-  { "questdb2-lnchr",  { NULL }, 5677,  "tcp" },
-  { "questdb2-lnchr",  { NULL }, 5677,  "udp" },
-  { "rrac",            { NULL }, 5678,  "tcp" },
-  { "rrac",            { NULL }, 5678,  "udp" },
-  { "dccm",            { NULL }, 5679,  "tcp" },
-  { "dccm",            { NULL }, 5679,  "udp" },
-  { "auriga-router",   { NULL }, 5680,  "tcp" },
-  { "auriga-router",   { NULL }, 5680,  "udp" },
-  { "ncxcp",           { NULL }, 5681,  "tcp" },
-  { "ncxcp",           { NULL }, 5681,  "udp" },
-  { "brightcore",      { NULL }, 5682,  "udp" },
-  { "ggz",             { NULL }, 5688,  "tcp" },
-  { "ggz",             { NULL }, 5688,  "udp" },
-  { "qmvideo",         { NULL }, 5689,  "tcp" },
-  { "qmvideo",         { NULL }, 5689,  "udp" },
-  { "proshareaudio",   { NULL }, 5713,  "tcp" },
-  { "proshareaudio",   { NULL }, 5713,  "udp" },
-  { "prosharevideo",   { NULL }, 5714,  "tcp" },
-  { "prosharevideo",   { NULL }, 5714,  "udp" },
-  { "prosharedata",    { NULL }, 5715,  "tcp" },
-  { "prosharedata",    { NULL }, 5715,  "udp" },
-  { "prosharerequest", { NULL }, 5716,  "tcp" },
-  { "prosharerequest", { NULL }, 5716,  "udp" },
-  { "prosharenotify",  { NULL }, 5717,  "tcp" },
-  { "prosharenotify",  { NULL }, 5717,  "udp" },
-  { "dpm",             { NULL }, 5718,  "tcp" },
-  { "dpm",             { NULL }, 5718,  "udp" },
-  { "dpm-agent",       { NULL }, 5719,  "tcp" },
-  { "dpm-agent",       { NULL }, 5719,  "udp" },
-  { "ms-licensing",    { NULL }, 5720,  "tcp" },
-  { "ms-licensing",    { NULL }, 5720,  "udp" },
-  { "dtpt",            { NULL }, 5721,  "tcp" },
-  { "dtpt",            { NULL }, 5721,  "udp" },
-  { "msdfsr",          { NULL }, 5722,  "tcp" },
-  { "msdfsr",          { NULL }, 5722,  "udp" },
-  { "omhs",            { NULL }, 5723,  "tcp" },
-  { "omhs",            { NULL }, 5723,  "udp" },
-  { "omsdk",           { NULL }, 5724,  "tcp" },
-  { "omsdk",           { NULL }, 5724,  "udp" },
-  { "ms-ilm",          { NULL }, 5725,  "tcp" },
-  { "ms-ilm-sts",      { NULL }, 5726,  "tcp" },
-  { "asgenf",          { NULL }, 5727,  "tcp" },
-  { "io-dist-data",    { NULL }, 5728,  "tcp" },
-  { "io-dist-group",   { NULL }, 5728,  "udp" },
-  { "openmail",        { NULL }, 5729,  "tcp" },
-  { "openmail",        { NULL }, 5729,  "udp" },
-  { "unieng",          { NULL }, 5730,  "tcp" },
-  { "unieng",          { NULL }, 5730,  "udp" },
-  { "ida-discover1",   { NULL }, 5741,  "tcp" },
-  { "ida-discover1",   { NULL }, 5741,  "udp" },
-  { "ida-discover2",   { NULL }, 5742,  "tcp" },
-  { "ida-discover2",   { NULL }, 5742,  "udp" },
-  { "watchdoc-pod",    { NULL }, 5743,  "tcp" },
-  { "watchdoc-pod",    { NULL }, 5743,  "udp" },
-  { "watchdoc",        { NULL }, 5744,  "tcp" },
-  { "watchdoc",        { NULL }, 5744,  "udp" },
-  { "fcopy-server",    { NULL }, 5745,  "tcp" },
-  { "fcopy-server",    { NULL }, 5745,  "udp" },
-  { "fcopys-server",   { NULL }, 5746,  "tcp" },
-  { "fcopys-server",   { NULL }, 5746,  "udp" },
-  { "tunatic",         { NULL }, 5747,  "tcp" },
-  { "tunatic",         { NULL }, 5747,  "udp" },
-  { "tunalyzer",       { NULL }, 5748,  "tcp" },
-  { "tunalyzer",       { NULL }, 5748,  "udp" },
-  { "rscd",            { NULL }, 5750,  "tcp" },
-  { "rscd",            { NULL }, 5750,  "udp" },
-  { "openmailg",       { NULL }, 5755,  "tcp" },
-  { "openmailg",       { NULL }, 5755,  "udp" },
-  { "x500ms",          { NULL }, 5757,  "tcp" },
-  { "x500ms",          { NULL }, 5757,  "udp" },
-  { "openmailns",      { NULL }, 5766,  "tcp" },
-  { "openmailns",      { NULL }, 5766,  "udp" },
-  { "s-openmail",      { NULL }, 5767,  "tcp" },
-  { "s-openmail",      { NULL }, 5767,  "udp" },
-  { "openmailpxy",     { NULL }, 5768,  "tcp" },
-  { "openmailpxy",     { NULL }, 5768,  "udp" },
-  { "spramsca",        { NULL }, 5769,  "tcp" },
-  { "spramsca",        { NULL }, 5769,  "udp" },
-  { "spramsd",         { NULL }, 5770,  "tcp" },
-  { "spramsd",         { NULL }, 5770,  "udp" },
-  { "netagent",        { NULL }, 5771,  "tcp" },
-  { "netagent",        { NULL }, 5771,  "udp" },
-  { "dali-port",       { NULL }, 5777,  "tcp" },
-  { "dali-port",       { NULL }, 5777,  "udp" },
-  { "vts-rpc",         { NULL }, 5780,  "tcp" },
-  { "3par-evts",       { NULL }, 5781,  "tcp" },
-  { "3par-evts",       { NULL }, 5781,  "udp" },
-  { "3par-mgmt",       { NULL }, 5782,  "tcp" },
-  { "3par-mgmt",       { NULL }, 5782,  "udp" },
-  { "3par-mgmt-ssl",   { NULL }, 5783,  "tcp" },
-  { "3par-mgmt-ssl",   { NULL }, 5783,  "udp" },
-  { "ibar",            { NULL }, 5784,  "udp" },
-  { "3par-rcopy",      { NULL }, 5785,  "tcp" },
-  { "3par-rcopy",      { NULL }, 5785,  "udp" },
-  { "cisco-redu",      { NULL }, 5786,  "udp" },
-  { "waascluster",     { NULL }, 5787,  "udp" },
-  { "xtreamx",         { NULL }, 5793,  "tcp" },
-  { "xtreamx",         { NULL }, 5793,  "udp" },
-  { "spdp",            { NULL }, 5794,  "udp" },
-  { "icmpd",           { NULL }, 5813,  "tcp" },
-  { "icmpd",           { NULL }, 5813,  "udp" },
-  { "spt-automation",  { NULL }, 5814,  "tcp" },
-  { "spt-automation",  { NULL }, 5814,  "udp" },
-  { "wherehoo",        { NULL }, 5859,  "tcp" },
-  { "wherehoo",        { NULL }, 5859,  "udp" },
-  { "ppsuitemsg",      { NULL }, 5863,  "tcp" },
-  { "ppsuitemsg",      { NULL }, 5863,  "udp" },
-  { "rfb",             { NULL }, 5900,  "tcp" },
-  { "rfb",             { NULL }, 5900,  "udp" },
-  { "cm",              { NULL }, 5910,  "tcp" },
-  { "cm",              { NULL }, 5910,  "udp" },
-  { "cpdlc",           { NULL }, 5911,  "tcp" },
-  { "cpdlc",           { NULL }, 5911,  "udp" },
-  { "fis",             { NULL }, 5912,  "tcp" },
-  { "fis",             { NULL }, 5912,  "udp" },
-  { "ads-c",           { NULL }, 5913,  "tcp" },
-  { "ads-c",           { NULL }, 5913,  "udp" },
-  { "indy",            { NULL }, 5963,  "tcp" },
-  { "indy",            { NULL }, 5963,  "udp" },
-  { "mppolicy-v5",     { NULL }, 5968,  "tcp" },
-  { "mppolicy-v5",     { NULL }, 5968,  "udp" },
-  { "mppolicy-mgr",    { NULL }, 5969,  "tcp" },
-  { "mppolicy-mgr",    { NULL }, 5969,  "udp" },
-  { "couchdb",         { NULL }, 5984,  "tcp" },
-  { "couchdb",         { NULL }, 5984,  "udp" },
-  { "wsman",           { NULL }, 5985,  "tcp" },
-  { "wsman",           { NULL }, 5985,  "udp" },
-  { "wsmans",          { NULL }, 5986,  "tcp" },
-  { "wsmans",          { NULL }, 5986,  "udp" },
-  { "wbem-rmi",        { NULL }, 5987,  "tcp" },
-  { "wbem-rmi",        { NULL }, 5987,  "udp" },
-  { "wbem-http",       { NULL }, 5988,  "tcp" },
-  { "wbem-http",       { NULL }, 5988,  "udp" },
-  { "wbem-https",      { NULL }, 5989,  "tcp" },
-  { "wbem-https",      { NULL }, 5989,  "udp" },
-  { "wbem-exp-https",  { NULL }, 5990,  "tcp" },
-  { "wbem-exp-https",  { NULL }, 5990,  "udp" },
-  { "nuxsl",           { NULL }, 5991,  "tcp" },
-  { "nuxsl",           { NULL }, 5991,  "udp" },
-  { "consul-insight",  { NULL }, 5992,  "tcp" },
-  { "consul-insight",  { NULL }, 5992,  "udp" },
-  { "cvsup",           { NULL }, 5999,  "tcp" },
-  { "cvsup",           { NULL }, 5999,  "udp" },
-  { "ndl-ahp-svc",     { NULL }, 6064,  "tcp" },
-  { "ndl-ahp-svc",     { NULL }, 6064,  "udp" },
-  { "winpharaoh",      { NULL }, 6065,  "tcp" },
-  { "winpharaoh",      { NULL }, 6065,  "udp" },
-  { "ewctsp",          { NULL }, 6066,  "tcp" },
-  { "ewctsp",          { NULL }, 6066,  "udp" },
-  { "gsmp",            { NULL }, 6068,  "tcp" },
-  { "gsmp",            { NULL }, 6068,  "udp" },
-  { "trip",            { NULL }, 6069,  "tcp" },
-  { "trip",            { NULL }, 6069,  "udp" },
-  { "messageasap",     { NULL }, 6070,  "tcp" },
-  { "messageasap",     { NULL }, 6070,  "udp" },
-  { "ssdtp",           { NULL }, 6071,  "tcp" },
-  { "ssdtp",           { NULL }, 6071,  "udp" },
-  { "diagnose-proc",   { NULL }, 6072,  "tcp" },
-  { "diagnose-proc",   { NULL }, 6072,  "udp" },
-  { "directplay8",     { NULL }, 6073,  "tcp" },
-  { "directplay8",     { NULL }, 6073,  "udp" },
-  { "max",             { NULL }, 6074,  "tcp" },
-  { "max",             { NULL }, 6074,  "udp" },
-  { "dpm-acm",         { NULL }, 6075,  "tcp" },
-  { "miami-bcast",     { NULL }, 6083,  "udp" },
-  { "p2p-sip",         { NULL }, 6084,  "tcp" },
-  { "konspire2b",      { NULL }, 6085,  "tcp" },
-  { "konspire2b",      { NULL }, 6085,  "udp" },
-  { "pdtp",            { NULL }, 6086,  "tcp" },
-  { "pdtp",            { NULL }, 6086,  "udp" },
-  { "ldss",            { NULL }, 6087,  "tcp" },
-  { "ldss",            { NULL }, 6087,  "udp" },
-  { "raxa-mgmt",       { NULL }, 6099,  "tcp" },
-  { "synchronet-db",   { NULL }, 6100,  "tcp" },
-  { "synchronet-db",   { NULL }, 6100,  "udp" },
-  { "synchronet-rtc",  { NULL }, 6101,  "tcp" },
-  { "synchronet-rtc",  { NULL }, 6101,  "udp" },
-  { "synchronet-upd",  { NULL }, 6102,  "tcp" },
-  { "synchronet-upd",  { NULL }, 6102,  "udp" },
-  { "rets",            { NULL }, 6103,  "tcp" },
-  { "rets",            { NULL }, 6103,  "udp" },
-  { "dbdb",            { NULL }, 6104,  "tcp" },
-  { "dbdb",            { NULL }, 6104,  "udp" },
-  { "primaserver",     { NULL }, 6105,  "tcp" },
-  { "primaserver",     { NULL }, 6105,  "udp" },
-  { "mpsserver",       { NULL }, 6106,  "tcp" },
-  { "mpsserver",       { NULL }, 6106,  "udp" },
-  { "etc-control",     { NULL }, 6107,  "tcp" },
-  { "etc-control",     { NULL }, 6107,  "udp" },
-  { "sercomm-scadmin", { NULL }, 6108,  "tcp" },
-  { "sercomm-scadmin", { NULL }, 6108,  "udp" },
-  { "globecast-id",    { NULL }, 6109,  "tcp" },
-  { "globecast-id",    { NULL }, 6109,  "udp" },
-  { "softcm",          { NULL }, 6110,  "tcp" },
-  { "softcm",          { NULL }, 6110,  "udp" },
-  { "spc",             { NULL }, 6111,  "tcp" },
-  { "spc",             { NULL }, 6111,  "udp" },
-  { "dtspcd",          { NULL }, 6112,  "tcp" },
-  { "dtspcd",          { NULL }, 6112,  "udp" },
-  { "dayliteserver",   { NULL }, 6113,  "tcp" },
-  { "wrspice",         { NULL }, 6114,  "tcp" },
-  { "xic",             { NULL }, 6115,  "tcp" },
-  { "xtlserv",         { NULL }, 6116,  "tcp" },
-  { "daylitetouch",    { NULL }, 6117,  "tcp" },
-  { "spdy",            { NULL }, 6121,  "tcp" },
-  { "bex-webadmin",    { NULL }, 6122,  "tcp" },
-  { "bex-webadmin",    { NULL }, 6122,  "udp" },
-  { "backup-express",  { NULL }, 6123,  "tcp" },
-  { "backup-express",  { NULL }, 6123,  "udp" },
-  { "pnbs",            { NULL }, 6124,  "tcp" },
-  { "pnbs",            { NULL }, 6124,  "udp" },
-  { "nbt-wol",         { NULL }, 6133,  "tcp" },
-  { "nbt-wol",         { NULL }, 6133,  "udp" },
-  { "pulsonixnls",     { NULL }, 6140,  "tcp" },
-  { "pulsonixnls",     { NULL }, 6140,  "udp" },
-  { "meta-corp",       { NULL }, 6141,  "tcp" },
-  { "meta-corp",       { NULL }, 6141,  "udp" },
-  { "aspentec-lm",     { NULL }, 6142,  "tcp" },
-  { "aspentec-lm",     { NULL }, 6142,  "udp" },
-  { "watershed-lm",    { NULL }, 6143,  "tcp" },
-  { "watershed-lm",    { NULL }, 6143,  "udp" },
-  { "statsci1-lm",     { NULL }, 6144,  "tcp" },
-  { "statsci1-lm",     { NULL }, 6144,  "udp" },
-  { "statsci2-lm",     { NULL }, 6145,  "tcp" },
-  { "statsci2-lm",     { NULL }, 6145,  "udp" },
-  { "lonewolf-lm",     { NULL }, 6146,  "tcp" },
-  { "lonewolf-lm",     { NULL }, 6146,  "udp" },
-  { "montage-lm",      { NULL }, 6147,  "tcp" },
-  { "montage-lm",      { NULL }, 6147,  "udp" },
-  { "ricardo-lm",      { NULL }, 6148,  "tcp" },
-  { "ricardo-lm",      { NULL }, 6148,  "udp" },
-  { "tal-pod",         { NULL }, 6149,  "tcp" },
-  { "tal-pod",         { NULL }, 6149,  "udp" },
-  { "efb-aci",         { NULL }, 6159,  "tcp" },
-  { "patrol-ism",      { NULL }, 6161,  "tcp" },
-  { "patrol-ism",      { NULL }, 6161,  "udp" },
-  { "patrol-coll",     { NULL }, 6162,  "tcp" },
-  { "patrol-coll",     { NULL }, 6162,  "udp" },
-  { "pscribe",         { NULL }, 6163,  "tcp" },
-  { "pscribe",         { NULL }, 6163,  "udp" },
-  { "lm-x",            { NULL }, 6200,  "tcp" },
-  { "lm-x",            { NULL }, 6200,  "udp" },
-  { "radmind",         { NULL }, 6222,  "tcp" },
-  { "radmind",         { NULL }, 6222,  "udp" },
-  { "jeol-nsdtp-1",    { NULL }, 6241,  "tcp" },
-  { "jeol-nsddp-1",    { NULL }, 6241,  "udp" },
-  { "jeol-nsdtp-2",    { NULL }, 6242,  "tcp" },
-  { "jeol-nsddp-2",    { NULL }, 6242,  "udp" },
-  { "jeol-nsdtp-3",    { NULL }, 6243,  "tcp" },
-  { "jeol-nsddp-3",    { NULL }, 6243,  "udp" },
-  { "jeol-nsdtp-4",    { NULL }, 6244,  "tcp" },
-  { "jeol-nsddp-4",    { NULL }, 6244,  "udp" },
-  { "tl1-raw-ssl",     { NULL }, 6251,  "tcp" },
-  { "tl1-raw-ssl",     { NULL }, 6251,  "udp" },
-  { "tl1-ssh",         { NULL }, 6252,  "tcp" },
-  { "tl1-ssh",         { NULL }, 6252,  "udp" },
-  { "crip",            { NULL }, 6253,  "tcp" },
-  { "crip",            { NULL }, 6253,  "udp" },
-  { "gld",             { NULL }, 6267,  "tcp" },
-  { "grid",            { NULL }, 6268,  "tcp" },
-  { "grid",            { NULL }, 6268,  "udp" },
-  { "grid-alt",        { NULL }, 6269,  "tcp" },
-  { "grid-alt",        { NULL }, 6269,  "udp" },
-  { "bmc-grx",         { NULL }, 6300,  "tcp" },
-  { "bmc-grx",         { NULL }, 6300,  "udp" },
-  { "bmc_ctd_ldap",    { NULL }, 6301,  "tcp" },
-  { "bmc_ctd_ldap",    { NULL }, 6301,  "udp" },
-  { "ufmp",            { NULL }, 6306,  "tcp" },
-  { "ufmp",            { NULL }, 6306,  "udp" },
-  { "scup",            { NULL }, 6315,  "tcp" },
-  { "scup-disc",       { NULL }, 6315,  "udp" },
-  { "abb-escp",        { NULL }, 6316,  "tcp" },
-  { "abb-escp",        { NULL }, 6316,  "udp" },
-  { "repsvc",          { NULL }, 6320,  "tcp" },
-  { "repsvc",          { NULL }, 6320,  "udp" },
-  { "emp-server1",     { NULL }, 6321,  "tcp" },
-  { "emp-server1",     { NULL }, 6321,  "udp" },
-  { "emp-server2",     { NULL }, 6322,  "tcp" },
-  { "emp-server2",     { NULL }, 6322,  "udp" },
-  { "sflow",           { NULL }, 6343,  "tcp" },
-  { "sflow",           { NULL }, 6343,  "udp" },
-  { "gnutella-svc",    { NULL }, 6346,  "tcp" },
-  { "gnutella-svc",    { NULL }, 6346,  "udp" },
-  { "gnutella-rtr",    { NULL }, 6347,  "tcp" },
-  { "gnutella-rtr",    { NULL }, 6347,  "udp" },
-  { "adap",            { NULL }, 6350,  "tcp" },
-  { "adap",            { NULL }, 6350,  "udp" },
-  { "pmcs",            { NULL }, 6355,  "tcp" },
-  { "pmcs",            { NULL }, 6355,  "udp" },
-  { "metaedit-mu",     { NULL }, 6360,  "tcp" },
-  { "metaedit-mu",     { NULL }, 6360,  "udp" },
-  { "metaedit-se",     { NULL }, 6370,  "tcp" },
-  { "metaedit-se",     { NULL }, 6370,  "udp" },
-  { "metatude-mds",    { NULL }, 6382,  "tcp" },
-  { "metatude-mds",    { NULL }, 6382,  "udp" },
-  { "clariion-evr01",  { NULL }, 6389,  "tcp" },
-  { "clariion-evr01",  { NULL }, 6389,  "udp" },
-  { "metaedit-ws",     { NULL }, 6390,  "tcp" },
-  { "metaedit-ws",     { NULL }, 6390,  "udp" },
-  { "faxcomservice",   { NULL }, 6417,  "tcp" },
-  { "faxcomservice",   { NULL }, 6417,  "udp" },
-  { "syserverremote",  { NULL }, 6418,  "tcp" },
-  { "svdrp",           { NULL }, 6419,  "tcp" },
-  { "nim-vdrshell",    { NULL }, 6420,  "tcp" },
-  { "nim-vdrshell",    { NULL }, 6420,  "udp" },
-  { "nim-wan",         { NULL }, 6421,  "tcp" },
-  { "nim-wan",         { NULL }, 6421,  "udp" },
-  { "pgbouncer",       { NULL }, 6432,  "tcp" },
-  { "sun-sr-https",    { NULL }, 6443,  "tcp" },
-  { "sun-sr-https",    { NULL }, 6443,  "udp" },
-  { "sge_qmaster",     { NULL }, 6444,  "tcp" },
-  { "sge_qmaster",     { NULL }, 6444,  "udp" },
-  { "sge_execd",       { NULL }, 6445,  "tcp" },
-  { "sge_execd",       { NULL }, 6445,  "udp" },
-  { "mysql-proxy",     { NULL }, 6446,  "tcp" },
-  { "mysql-proxy",     { NULL }, 6446,  "udp" },
-  { "skip-cert-recv",  { NULL }, 6455,  "tcp" },
-  { "skip-cert-send",  { NULL }, 6456,  "udp" },
-  { "lvision-lm",      { NULL }, 6471,  "tcp" },
-  { "lvision-lm",      { NULL }, 6471,  "udp" },
-  { "sun-sr-http",     { NULL }, 6480,  "tcp" },
-  { "sun-sr-http",     { NULL }, 6480,  "udp" },
-  { "servicetags",     { NULL }, 6481,  "tcp" },
-  { "servicetags",     { NULL }, 6481,  "udp" },
-  { "ldoms-mgmt",      { NULL }, 6482,  "tcp" },
-  { "ldoms-mgmt",      { NULL }, 6482,  "udp" },
-  { "SunVTS-RMI",      { NULL }, 6483,  "tcp" },
-  { "SunVTS-RMI",      { NULL }, 6483,  "udp" },
-  { "sun-sr-jms",      { NULL }, 6484,  "tcp" },
-  { "sun-sr-jms",      { NULL }, 6484,  "udp" },
-  { "sun-sr-iiop",     { NULL }, 6485,  "tcp" },
-  { "sun-sr-iiop",     { NULL }, 6485,  "udp" },
-  { "sun-sr-iiops",    { NULL }, 6486,  "tcp" },
-  { "sun-sr-iiops",    { NULL }, 6486,  "udp" },
-  { "sun-sr-iiop-aut", { NULL }, 6487,  "tcp" },
-  { "sun-sr-iiop-aut", { NULL }, 6487,  "udp" },
-  { "sun-sr-jmx",      { NULL }, 6488,  "tcp" },
-  { "sun-sr-jmx",      { NULL }, 6488,  "udp" },
-  { "sun-sr-admin",    { NULL }, 6489,  "tcp" },
-  { "sun-sr-admin",    { NULL }, 6489,  "udp" },
-  { "boks",            { NULL }, 6500,  "tcp" },
-  { "boks",            { NULL }, 6500,  "udp" },
-  { "boks_servc",      { NULL }, 6501,  "tcp" },
-  { "boks_servc",      { NULL }, 6501,  "udp" },
-  { "boks_servm",      { NULL }, 6502,  "tcp" },
-  { "boks_servm",      { NULL }, 6502,  "udp" },
-  { "boks_clntd",      { NULL }, 6503,  "tcp" },
-  { "boks_clntd",      { NULL }, 6503,  "udp" },
-  { "badm_priv",       { NULL }, 6505,  "tcp" },
-  { "badm_priv",       { NULL }, 6505,  "udp" },
-  { "badm_pub",        { NULL }, 6506,  "tcp" },
-  { "badm_pub",        { NULL }, 6506,  "udp" },
-  { "bdir_priv",       { NULL }, 6507,  "tcp" },
-  { "bdir_priv",       { NULL }, 6507,  "udp" },
-  { "bdir_pub",        { NULL }, 6508,  "tcp" },
-  { "bdir_pub",        { NULL }, 6508,  "udp" },
-  { "mgcs-mfp-port",   { NULL }, 6509,  "tcp" },
-  { "mgcs-mfp-port",   { NULL }, 6509,  "udp" },
-  { "mcer-port",       { NULL }, 6510,  "tcp" },
-  { "mcer-port",       { NULL }, 6510,  "udp" },
-  { "netconf-tls",     { NULL }, 6513,  "tcp" },
-  { "syslog-tls",      { NULL }, 6514,  "tcp" },
-  { "syslog-tls",      { NULL }, 6514,  "udp" },
-  { "syslog-tls",      { NULL }, 6514,  "dccp"},
-  { "elipse-rec",      { NULL }, 6515,  "tcp" },
-  { "elipse-rec",      { NULL }, 6515,  "udp" },
-  { "lds-distrib",     { NULL }, 6543,  "tcp" },
-  { "lds-distrib",     { NULL }, 6543,  "udp" },
-  { "lds-dump",        { NULL }, 6544,  "tcp" },
-  { "lds-dump",        { NULL }, 6544,  "udp" },
-  { "apc-6547",        { NULL }, 6547,  "tcp" },
-  { "apc-6547",        { NULL }, 6547,  "udp" },
-  { "apc-6548",        { NULL }, 6548,  "tcp" },
-  { "apc-6548",        { NULL }, 6548,  "udp" },
-  { "apc-6549",        { NULL }, 6549,  "tcp" },
-  { "apc-6549",        { NULL }, 6549,  "udp" },
-  { "fg-sysupdate",    { NULL }, 6550,  "tcp" },
-  { "fg-sysupdate",    { NULL }, 6550,  "udp" },
-  { "sum",             { NULL }, 6551,  "tcp" },
-  { "sum",             { NULL }, 6551,  "udp" },
-  { "xdsxdm",          { NULL }, 6558,  "tcp" },
-  { "xdsxdm",          { NULL }, 6558,  "udp" },
-  { "sane-port",       { NULL }, 6566,  "tcp" },
-  { "sane-port",       { NULL }, 6566,  "udp" },
-  { "esp",             { NULL }, 6567,  "tcp" },
-  { "esp",             { NULL }, 6567,  "udp" },
-  { "canit_store",     { NULL }, 6568,  "tcp" },
-  { "rp-reputation",   { NULL }, 6568,  "udp" },
-  { "affiliate",       { NULL }, 6579,  "tcp" },
-  { "affiliate",       { NULL }, 6579,  "udp" },
-  { "parsec-master",   { NULL }, 6580,  "tcp" },
-  { "parsec-master",   { NULL }, 6580,  "udp" },
-  { "parsec-peer",     { NULL }, 6581,  "tcp" },
-  { "parsec-peer",     { NULL }, 6581,  "udp" },
-  { "parsec-game",     { NULL }, 6582,  "tcp" },
-  { "parsec-game",     { NULL }, 6582,  "udp" },
-  { "joaJewelSuite",   { NULL }, 6583,  "tcp" },
-  { "joaJewelSuite",   { NULL }, 6583,  "udp" },
-  { "mshvlm",          { NULL }, 6600,  "tcp" },
-  { "mstmg-sstp",      { NULL }, 6601,  "tcp" },
-  { "wsscomfrmwk",     { NULL }, 6602,  "tcp" },
-  { "odette-ftps",     { NULL }, 6619,  "tcp" },
-  { "odette-ftps",     { NULL }, 6619,  "udp" },
-  { "kftp-data",       { NULL }, 6620,  "tcp" },
-  { "kftp-data",       { NULL }, 6620,  "udp" },
-  { "kftp",            { NULL }, 6621,  "tcp" },
-  { "kftp",            { NULL }, 6621,  "udp" },
-  { "mcftp",           { NULL }, 6622,  "tcp" },
-  { "mcftp",           { NULL }, 6622,  "udp" },
-  { "ktelnet",         { NULL }, 6623,  "tcp" },
-  { "ktelnet",         { NULL }, 6623,  "udp" },
-  { "datascaler-db",   { NULL }, 6624,  "tcp" },
-  { "datascaler-ctl",  { NULL }, 6625,  "tcp" },
-  { "wago-service",    { NULL }, 6626,  "tcp" },
-  { "wago-service",    { NULL }, 6626,  "udp" },
-  { "nexgen",          { NULL }, 6627,  "tcp" },
-  { "nexgen",          { NULL }, 6627,  "udp" },
-  { "afesc-mc",        { NULL }, 6628,  "tcp" },
-  { "afesc-mc",        { NULL }, 6628,  "udp" },
-  { "mxodbc-connect",  { NULL }, 6632,  "tcp" },
-  { "pcs-sf-ui-man",   { NULL }, 6655,  "tcp" },
-  { "emgmsg",          { NULL }, 6656,  "tcp" },
-  { "palcom-disc",     { NULL }, 6657,  "udp" },
-  { "vocaltec-gold",   { NULL }, 6670,  "tcp" },
-  { "vocaltec-gold",   { NULL }, 6670,  "udp" },
-  { "p4p-portal",      { NULL }, 6671,  "tcp" },
-  { "p4p-portal",      { NULL }, 6671,  "udp" },
-  { "vision_server",   { NULL }, 6672,  "tcp" },
-  { "vision_server",   { NULL }, 6672,  "udp" },
-  { "vision_elmd",     { NULL }, 6673,  "tcp" },
-  { "vision_elmd",     { NULL }, 6673,  "udp" },
-  { "vfbp",            { NULL }, 6678,  "tcp" },
-  { "vfbp-disc",       { NULL }, 6678,  "udp" },
-  { "osaut",           { NULL }, 6679,  "tcp" },
-  { "osaut",           { NULL }, 6679,  "udp" },
-  { "clever-ctrace",   { NULL }, 6687,  "tcp" },
-  { "clever-tcpip",    { NULL }, 6688,  "tcp" },
-  { "tsa",             { NULL }, 6689,  "tcp" },
-  { "tsa",             { NULL }, 6689,  "udp" },
-  { "babel",           { NULL }, 6697,  "udp" },
-  { "kti-icad-srvr",   { NULL }, 6701,  "tcp" },
-  { "kti-icad-srvr",   { NULL }, 6701,  "udp" },
-  { "e-design-net",    { NULL }, 6702,  "tcp" },
-  { "e-design-net",    { NULL }, 6702,  "udp" },
-  { "e-design-web",    { NULL }, 6703,  "tcp" },
-  { "e-design-web",    { NULL }, 6703,  "udp" },
-  { "frc-hp",          { NULL }, 6704,  "sctp"},
-  { "frc-mp",          { NULL }, 6705,  "sctp"},
-  { "frc-lp",          { NULL }, 6706,  "sctp"},
-  { "ibprotocol",      { NULL }, 6714,  "tcp" },
-  { "ibprotocol",      { NULL }, 6714,  "udp" },
-  { "fibotrader-com",  { NULL }, 6715,  "tcp" },
-  { "fibotrader-com",  { NULL }, 6715,  "udp" },
-  { "bmc-perf-agent",  { NULL }, 6767,  "tcp" },
-  { "bmc-perf-agent",  { NULL }, 6767,  "udp" },
-  { "bmc-perf-mgrd",   { NULL }, 6768,  "tcp" },
-  { "bmc-perf-mgrd",   { NULL }, 6768,  "udp" },
-  { "adi-gxp-srvprt",  { NULL }, 6769,  "tcp" },
-  { "adi-gxp-srvprt",  { NULL }, 6769,  "udp" },
-  { "plysrv-http",     { NULL }, 6770,  "tcp" },
-  { "plysrv-http",     { NULL }, 6770,  "udp" },
-  { "plysrv-https",    { NULL }, 6771,  "tcp" },
-  { "plysrv-https",    { NULL }, 6771,  "udp" },
-  { "dgpf-exchg",      { NULL }, 6785,  "tcp" },
-  { "dgpf-exchg",      { NULL }, 6785,  "udp" },
-  { "smc-jmx",         { NULL }, 6786,  "tcp" },
-  { "smc-jmx",         { NULL }, 6786,  "udp" },
-  { "smc-admin",       { NULL }, 6787,  "tcp" },
-  { "smc-admin",       { NULL }, 6787,  "udp" },
-  { "smc-http",        { NULL }, 6788,  "tcp" },
-  { "smc-http",        { NULL }, 6788,  "udp" },
-  { "smc-https",       { NULL }, 6789,  "tcp" },
-  { "smc-https",       { NULL }, 6789,  "udp" },
-  { "hnmp",            { NULL }, 6790,  "tcp" },
-  { "hnmp",            { NULL }, 6790,  "udp" },
-  { "hnm",             { NULL }, 6791,  "tcp" },
-  { "hnm",             { NULL }, 6791,  "udp" },
-  { "acnet",           { NULL }, 6801,  "tcp" },
-  { "acnet",           { NULL }, 6801,  "udp" },
-  { "pentbox-sim",     { NULL }, 6817,  "tcp" },
-  { "ambit-lm",        { NULL }, 6831,  "tcp" },
-  { "ambit-lm",        { NULL }, 6831,  "udp" },
-  { "netmo-default",   { NULL }, 6841,  "tcp" },
-  { "netmo-default",   { NULL }, 6841,  "udp" },
-  { "netmo-http",      { NULL }, 6842,  "tcp" },
-  { "netmo-http",      { NULL }, 6842,  "udp" },
-  { "iccrushmore",     { NULL }, 6850,  "tcp" },
-  { "iccrushmore",     { NULL }, 6850,  "udp" },
-  { "acctopus-cc",     { NULL }, 6868,  "tcp" },
-  { "acctopus-st",     { NULL }, 6868,  "udp" },
-  { "muse",            { NULL }, 6888,  "tcp" },
-  { "muse",            { NULL }, 6888,  "udp" },
-  { "jetstream",       { NULL }, 6901,  "tcp" },
-  { "xsmsvc",          { NULL }, 6936,  "tcp" },
-  { "xsmsvc",          { NULL }, 6936,  "udp" },
-  { "bioserver",       { NULL }, 6946,  "tcp" },
-  { "bioserver",       { NULL }, 6946,  "udp" },
-  { "otlp",            { NULL }, 6951,  "tcp" },
-  { "otlp",            { NULL }, 6951,  "udp" },
-  { "jmact3",          { NULL }, 6961,  "tcp" },
-  { "jmact3",          { NULL }, 6961,  "udp" },
-  { "jmevt2",          { NULL }, 6962,  "tcp" },
-  { "jmevt2",          { NULL }, 6962,  "udp" },
-  { "swismgr1",        { NULL }, 6963,  "tcp" },
-  { "swismgr1",        { NULL }, 6963,  "udp" },
-  { "swismgr2",        { NULL }, 6964,  "tcp" },
-  { "swismgr2",        { NULL }, 6964,  "udp" },
-  { "swistrap",        { NULL }, 6965,  "tcp" },
-  { "swistrap",        { NULL }, 6965,  "udp" },
-  { "swispol",         { NULL }, 6966,  "tcp" },
-  { "swispol",         { NULL }, 6966,  "udp" },
-  { "acmsoda",         { NULL }, 6969,  "tcp" },
-  { "acmsoda",         { NULL }, 6969,  "udp" },
-  { "MobilitySrv",     { NULL }, 6997,  "tcp" },
-  { "MobilitySrv",     { NULL }, 6997,  "udp" },
-  { "iatp-highpri",    { NULL }, 6998,  "tcp" },
-  { "iatp-highpri",    { NULL }, 6998,  "udp" },
-  { "iatp-normalpri",  { NULL }, 6999,  "tcp" },
-  { "iatp-normalpri",  { NULL }, 6999,  "udp" },
-  { "afs3-fileserver", { NULL }, 7000,  "tcp" },
-  { "afs3-fileserver", { NULL }, 7000,  "udp" },
-  { "afs3-callback",   { NULL }, 7001,  "tcp" },
-  { "afs3-callback",   { NULL }, 7001,  "udp" },
-  { "afs3-prserver",   { NULL }, 7002,  "tcp" },
-  { "afs3-prserver",   { NULL }, 7002,  "udp" },
-  { "afs3-vlserver",   { NULL }, 7003,  "tcp" },
-  { "afs3-vlserver",   { NULL }, 7003,  "udp" },
-  { "afs3-kaserver",   { NULL }, 7004,  "tcp" },
-  { "afs3-kaserver",   { NULL }, 7004,  "udp" },
-  { "afs3-volser",     { NULL }, 7005,  "tcp" },
-  { "afs3-volser",     { NULL }, 7005,  "udp" },
-  { "afs3-errors",     { NULL }, 7006,  "tcp" },
-  { "afs3-errors",     { NULL }, 7006,  "udp" },
-  { "afs3-bos",        { NULL }, 7007,  "tcp" },
-  { "afs3-bos",        { NULL }, 7007,  "udp" },
-  { "afs3-update",     { NULL }, 7008,  "tcp" },
-  { "afs3-update",     { NULL }, 7008,  "udp" },
-  { "afs3-rmtsys",     { NULL }, 7009,  "tcp" },
-  { "afs3-rmtsys",     { NULL }, 7009,  "udp" },
-  { "ups-onlinet",     { NULL }, 7010,  "tcp" },
-  { "ups-onlinet",     { NULL }, 7010,  "udp" },
-  { "talon-disc",      { NULL }, 7011,  "tcp" },
-  { "talon-disc",      { NULL }, 7011,  "udp" },
-  { "talon-engine",    { NULL }, 7012,  "tcp" },
-  { "talon-engine",    { NULL }, 7012,  "udp" },
-  { "microtalon-dis",  { NULL }, 7013,  "tcp" },
-  { "microtalon-dis",  { NULL }, 7013,  "udp" },
-  { "microtalon-com",  { NULL }, 7014,  "tcp" },
-  { "microtalon-com",  { NULL }, 7014,  "udp" },
-  { "talon-webserver", { NULL }, 7015,  "tcp" },
-  { "talon-webserver", { NULL }, 7015,  "udp" },
-  { "dpserve",         { NULL }, 7020,  "tcp" },
-  { "dpserve",         { NULL }, 7020,  "udp" },
-  { "dpserveadmin",    { NULL }, 7021,  "tcp" },
-  { "dpserveadmin",    { NULL }, 7021,  "udp" },
-  { "ctdp",            { NULL }, 7022,  "tcp" },
-  { "ctdp",            { NULL }, 7022,  "udp" },
-  { "ct2nmcs",         { NULL }, 7023,  "tcp" },
-  { "ct2nmcs",         { NULL }, 7023,  "udp" },
-  { "vmsvc",           { NULL }, 7024,  "tcp" },
-  { "vmsvc",           { NULL }, 7024,  "udp" },
-  { "vmsvc-2",         { NULL }, 7025,  "tcp" },
-  { "vmsvc-2",         { NULL }, 7025,  "udp" },
-  { "op-probe",        { NULL }, 7030,  "tcp" },
-  { "op-probe",        { NULL }, 7030,  "udp" },
-  { "arcp",            { NULL }, 7070,  "tcp" },
-  { "arcp",            { NULL }, 7070,  "udp" },
-  { "iwg1",            { NULL }, 7071,  "tcp" },
-  { "iwg1",            { NULL }, 7071,  "udp" },
-  { "empowerid",       { NULL }, 7080,  "tcp" },
-  { "empowerid",       { NULL }, 7080,  "udp" },
-  { "lazy-ptop",       { NULL }, 7099,  "tcp" },
-  { "lazy-ptop",       { NULL }, 7099,  "udp" },
-  { "font-service",    { NULL }, 7100,  "tcp" },
-  { "font-service",    { NULL }, 7100,  "udp" },
-  { "elcn",            { NULL }, 7101,  "tcp" },
-  { "elcn",            { NULL }, 7101,  "udp" },
-  { "aes-x170",        { NULL }, 7107,  "udp" },
-  { "virprot-lm",      { NULL }, 7121,  "tcp" },
-  { "virprot-lm",      { NULL }, 7121,  "udp" },
-  { "scenidm",         { NULL }, 7128,  "tcp" },
-  { "scenidm",         { NULL }, 7128,  "udp" },
-  { "scenccs",         { NULL }, 7129,  "tcp" },
-  { "scenccs",         { NULL }, 7129,  "udp" },
-  { "cabsm-comm",      { NULL }, 7161,  "tcp" },
-  { "cabsm-comm",      { NULL }, 7161,  "udp" },
-  { "caistoragemgr",   { NULL }, 7162,  "tcp" },
-  { "caistoragemgr",   { NULL }, 7162,  "udp" },
-  { "cacsambroker",    { NULL }, 7163,  "tcp" },
-  { "cacsambroker",    { NULL }, 7163,  "udp" },
-  { "fsr",             { NULL }, 7164,  "tcp" },
-  { "fsr",             { NULL }, 7164,  "udp" },
-  { "doc-server",      { NULL }, 7165,  "tcp" },
-  { "doc-server",      { NULL }, 7165,  "udp" },
-  { "aruba-server",    { NULL }, 7166,  "tcp" },
-  { "aruba-server",    { NULL }, 7166,  "udp" },
-  { "casrmagent",      { NULL }, 7167,  "tcp" },
-  { "cnckadserver",    { NULL }, 7168,  "tcp" },
-  { "ccag-pib",        { NULL }, 7169,  "tcp" },
-  { "ccag-pib",        { NULL }, 7169,  "udp" },
-  { "nsrp",            { NULL }, 7170,  "tcp" },
-  { "nsrp",            { NULL }, 7170,  "udp" },
-  { "drm-production",  { NULL }, 7171,  "tcp" },
-  { "drm-production",  { NULL }, 7171,  "udp" },
-  { "zsecure",         { NULL }, 7173,  "tcp" },
-  { "clutild",         { NULL }, 7174,  "tcp" },
-  { "clutild",         { NULL }, 7174,  "udp" },
-  { "fodms",           { NULL }, 7200,  "tcp" },
-  { "fodms",           { NULL }, 7200,  "udp" },
-  { "dlip",            { NULL }, 7201,  "tcp" },
-  { "dlip",            { NULL }, 7201,  "udp" },
-  { "ramp",            { NULL }, 7227,  "tcp" },
-  { "ramp",            { NULL }, 7227,  "udp" },
-  { "citrixupp",       { NULL }, 7228,  "tcp" },
-  { "citrixuppg",      { NULL }, 7229,  "tcp" },
-  { "pads",            { NULL }, 7237,  "tcp" },
-  { "cnap",            { NULL }, 7262,  "tcp" },
-  { "cnap",            { NULL }, 7262,  "udp" },
-  { "watchme-7272",    { NULL }, 7272,  "tcp" },
-  { "watchme-7272",    { NULL }, 7272,  "udp" },
-  { "oma-rlp",         { NULL }, 7273,  "tcp" },
-  { "oma-rlp",         { NULL }, 7273,  "udp" },
-  { "oma-rlp-s",       { NULL }, 7274,  "tcp" },
-  { "oma-rlp-s",       { NULL }, 7274,  "udp" },
-  { "oma-ulp",         { NULL }, 7275,  "tcp" },
-  { "oma-ulp",         { NULL }, 7275,  "udp" },
-  { "oma-ilp",         { NULL }, 7276,  "tcp" },
-  { "oma-ilp",         { NULL }, 7276,  "udp" },
-  { "oma-ilp-s",       { NULL }, 7277,  "tcp" },
-  { "oma-ilp-s",       { NULL }, 7277,  "udp" },
-  { "oma-dcdocbs",     { NULL }, 7278,  "tcp" },
-  { "oma-dcdocbs",     { NULL }, 7278,  "udp" },
-  { "ctxlic",          { NULL }, 7279,  "tcp" },
-  { "ctxlic",          { NULL }, 7279,  "udp" },
-  { "itactionserver1", { NULL }, 7280,  "tcp" },
-  { "itactionserver1", { NULL }, 7280,  "udp" },
-  { "itactionserver2", { NULL }, 7281,  "tcp" },
-  { "itactionserver2", { NULL }, 7281,  "udp" },
-  { "mzca-action",     { NULL }, 7282,  "tcp" },
-  { "mzca-alert",      { NULL }, 7282,  "udp" },
-  { "lcm-server",      { NULL }, 7365,  "tcp" },
-  { "lcm-server",      { NULL }, 7365,  "udp" },
-  { "mindfilesys",     { NULL }, 7391,  "tcp" },
-  { "mindfilesys",     { NULL }, 7391,  "udp" },
-  { "mrssrendezvous",  { NULL }, 7392,  "tcp" },
-  { "mrssrendezvous",  { NULL }, 7392,  "udp" },
-  { "nfoldman",        { NULL }, 7393,  "tcp" },
-  { "nfoldman",        { NULL }, 7393,  "udp" },
-  { "fse",             { NULL }, 7394,  "tcp" },
-  { "fse",             { NULL }, 7394,  "udp" },
-  { "winqedit",        { NULL }, 7395,  "tcp" },
-  { "winqedit",        { NULL }, 7395,  "udp" },
-  { "hexarc",          { NULL }, 7397,  "tcp" },
-  { "hexarc",          { NULL }, 7397,  "udp" },
-  { "rtps-discovery",  { NULL }, 7400,  "tcp" },
-  { "rtps-discovery",  { NULL }, 7400,  "udp" },
-  { "rtps-dd-ut",      { NULL }, 7401,  "tcp" },
-  { "rtps-dd-ut",      { NULL }, 7401,  "udp" },
-  { "rtps-dd-mt",      { NULL }, 7402,  "tcp" },
-  { "rtps-dd-mt",      { NULL }, 7402,  "udp" },
-  { "ionixnetmon",     { NULL }, 7410,  "tcp" },
-  { "ionixnetmon",     { NULL }, 7410,  "udp" },
-  { "mtportmon",       { NULL }, 7421,  "tcp" },
-  { "mtportmon",       { NULL }, 7421,  "udp" },
-  { "pmdmgr",          { NULL }, 7426,  "tcp" },
-  { "pmdmgr",          { NULL }, 7426,  "udp" },
-  { "oveadmgr",        { NULL }, 7427,  "tcp" },
-  { "oveadmgr",        { NULL }, 7427,  "udp" },
-  { "ovladmgr",        { NULL }, 7428,  "tcp" },
-  { "ovladmgr",        { NULL }, 7428,  "udp" },
-  { "opi-sock",        { NULL }, 7429,  "tcp" },
-  { "opi-sock",        { NULL }, 7429,  "udp" },
-  { "xmpv7",           { NULL }, 7430,  "tcp" },
-  { "xmpv7",           { NULL }, 7430,  "udp" },
-  { "pmd",             { NULL }, 7431,  "tcp" },
-  { "pmd",             { NULL }, 7431,  "udp" },
-  { "faximum",         { NULL }, 7437,  "tcp" },
-  { "faximum",         { NULL }, 7437,  "udp" },
-  { "oracleas-https",  { NULL }, 7443,  "tcp" },
-  { "oracleas-https",  { NULL }, 7443,  "udp" },
-  { "rise",            { NULL }, 7473,  "tcp" },
-  { "rise",            { NULL }, 7473,  "udp" },
-  { "telops-lmd",      { NULL }, 7491,  "tcp" },
-  { "telops-lmd",      { NULL }, 7491,  "udp" },
-  { "silhouette",      { NULL }, 7500,  "tcp" },
-  { "silhouette",      { NULL }, 7500,  "udp" },
-  { "ovbus",           { NULL }, 7501,  "tcp" },
-  { "ovbus",           { NULL }, 7501,  "udp" },
-  { "acplt",           { NULL }, 7509,  "tcp" },
-  { "ovhpas",          { NULL }, 7510,  "tcp" },
-  { "ovhpas",          { NULL }, 7510,  "udp" },
-  { "pafec-lm",        { NULL }, 7511,  "tcp" },
-  { "pafec-lm",        { NULL }, 7511,  "udp" },
-  { "saratoga",        { NULL }, 7542,  "tcp" },
-  { "saratoga",        { NULL }, 7542,  "udp" },
-  { "atul",            { NULL }, 7543,  "tcp" },
-  { "atul",            { NULL }, 7543,  "udp" },
-  { "nta-ds",          { NULL }, 7544,  "tcp" },
-  { "nta-ds",          { NULL }, 7544,  "udp" },
-  { "nta-us",          { NULL }, 7545,  "tcp" },
-  { "nta-us",          { NULL }, 7545,  "udp" },
-  { "cfs",             { NULL }, 7546,  "tcp" },
-  { "cfs",             { NULL }, 7546,  "udp" },
-  { "cwmp",            { NULL }, 7547,  "tcp" },
-  { "cwmp",            { NULL }, 7547,  "udp" },
-  { "tidp",            { NULL }, 7548,  "tcp" },
-  { "tidp",            { NULL }, 7548,  "udp" },
-  { "nls-tl",          { NULL }, 7549,  "tcp" },
-  { "nls-tl",          { NULL }, 7549,  "udp" },
-  { "sncp",            { NULL }, 7560,  "tcp" },
-  { "sncp",            { NULL }, 7560,  "udp" },
-  { "cfw",             { NULL }, 7563,  "tcp" },
-  { "vsi-omega",       { NULL }, 7566,  "tcp" },
-  { "vsi-omega",       { NULL }, 7566,  "udp" },
-  { "dell-eql-asm",    { NULL }, 7569,  "tcp" },
-  { "aries-kfinder",   { NULL }, 7570,  "tcp" },
-  { "aries-kfinder",   { NULL }, 7570,  "udp" },
-  { "sun-lm",          { NULL }, 7588,  "tcp" },
-  { "sun-lm",          { NULL }, 7588,  "udp" },
-  { "indi",            { NULL }, 7624,  "tcp" },
-  { "indi",            { NULL }, 7624,  "udp" },
-  { "simco",           { NULL }, 7626,  "tcp" },
-  { "simco",           { NULL }, 7626,  "sctp"},
-  { "soap-http",       { NULL }, 7627,  "tcp" },
-  { "soap-http",       { NULL }, 7627,  "udp" },
-  { "zen-pawn",        { NULL }, 7628,  "tcp" },
-  { "zen-pawn",        { NULL }, 7628,  "udp" },
-  { "xdas",            { NULL }, 7629,  "tcp" },
-  { "xdas",            { NULL }, 7629,  "udp" },
-  { "hawk",            { NULL }, 7630,  "tcp" },
-  { "tesla-sys-msg",   { NULL }, 7631,  "tcp" },
-  { "pmdfmgt",         { NULL }, 7633,  "tcp" },
-  { "pmdfmgt",         { NULL }, 7633,  "udp" },
-  { "cuseeme",         { NULL }, 7648,  "tcp" },
-  { "cuseeme",         { NULL }, 7648,  "udp" },
-  { "imqstomp",        { NULL }, 7672,  "tcp" },
-  { "imqstomps",       { NULL }, 7673,  "tcp" },
-  { "imqtunnels",      { NULL }, 7674,  "tcp" },
-  { "imqtunnels",      { NULL }, 7674,  "udp" },
-  { "imqtunnel",       { NULL }, 7675,  "tcp" },
-  { "imqtunnel",       { NULL }, 7675,  "udp" },
-  { "imqbrokerd",      { NULL }, 7676,  "tcp" },
-  { "imqbrokerd",      { NULL }, 7676,  "udp" },
-  { "sun-user-https",  { NULL }, 7677,  "tcp" },
-  { "sun-user-https",  { NULL }, 7677,  "udp" },
-  { "pando-pub",       { NULL }, 7680,  "tcp" },
-  { "pando-pub",       { NULL }, 7680,  "udp" },
-  { "collaber",        { NULL }, 7689,  "tcp" },
-  { "collaber",        { NULL }, 7689,  "udp" },
-  { "klio",            { NULL }, 7697,  "tcp" },
-  { "klio",            { NULL }, 7697,  "udp" },
-  { "em7-secom",       { NULL }, 7700,  "tcp" },
-  { "sync-em7",        { NULL }, 7707,  "tcp" },
-  { "sync-em7",        { NULL }, 7707,  "udp" },
-  { "scinet",          { NULL }, 7708,  "tcp" },
-  { "scinet",          { NULL }, 7708,  "udp" },
-  { "medimageportal",  { NULL }, 7720,  "tcp" },
-  { "medimageportal",  { NULL }, 7720,  "udp" },
-  { "nsdeepfreezectl", { NULL }, 7724,  "tcp" },
-  { "nsdeepfreezectl", { NULL }, 7724,  "udp" },
-  { "nitrogen",        { NULL }, 7725,  "tcp" },
-  { "nitrogen",        { NULL }, 7725,  "udp" },
-  { "freezexservice",  { NULL }, 7726,  "tcp" },
-  { "freezexservice",  { NULL }, 7726,  "udp" },
-  { "trident-data",    { NULL }, 7727,  "tcp" },
-  { "trident-data",    { NULL }, 7727,  "udp" },
-  { "smip",            { NULL }, 7734,  "tcp" },
-  { "smip",            { NULL }, 7734,  "udp" },
-  { "aiagent",         { NULL }, 7738,  "tcp" },
-  { "aiagent",         { NULL }, 7738,  "udp" },
-  { "scriptview",      { NULL }, 7741,  "tcp" },
-  { "scriptview",      { NULL }, 7741,  "udp" },
-  { "msss",            { NULL }, 7742,  "tcp" },
-  { "sstp-1",          { NULL }, 7743,  "tcp" },
-  { "sstp-1",          { NULL }, 7743,  "udp" },
-  { "raqmon-pdu",      { NULL }, 7744,  "tcp" },
-  { "raqmon-pdu",      { NULL }, 7744,  "udp" },
-  { "prgp",            { NULL }, 7747,  "tcp" },
-  { "prgp",            { NULL }, 7747,  "udp" },
-  { "cbt",             { NULL }, 7777,  "tcp" },
-  { "cbt",             { NULL }, 7777,  "udp" },
-  { "interwise",       { NULL }, 7778,  "tcp" },
-  { "interwise",       { NULL }, 7778,  "udp" },
-  { "vstat",           { NULL }, 7779,  "tcp" },
-  { "vstat",           { NULL }, 7779,  "udp" },
-  { "accu-lmgr",       { NULL }, 7781,  "tcp" },
-  { "accu-lmgr",       { NULL }, 7781,  "udp" },
-  { "minivend",        { NULL }, 7786,  "tcp" },
-  { "minivend",        { NULL }, 7786,  "udp" },
-  { "popup-reminders", { NULL }, 7787,  "tcp" },
-  { "popup-reminders", { NULL }, 7787,  "udp" },
-  { "office-tools",    { NULL }, 7789,  "tcp" },
-  { "office-tools",    { NULL }, 7789,  "udp" },
-  { "q3ade",           { NULL }, 7794,  "tcp" },
-  { "q3ade",           { NULL }, 7794,  "udp" },
-  { "pnet-conn",       { NULL }, 7797,  "tcp" },
-  { "pnet-conn",       { NULL }, 7797,  "udp" },
-  { "pnet-enc",        { NULL }, 7798,  "tcp" },
-  { "pnet-enc",        { NULL }, 7798,  "udp" },
-  { "altbsdp",         { NULL }, 7799,  "tcp" },
-  { "altbsdp",         { NULL }, 7799,  "udp" },
-  { "asr",             { NULL }, 7800,  "tcp" },
-  { "asr",             { NULL }, 7800,  "udp" },
-  { "ssp-client",      { NULL }, 7801,  "tcp" },
-  { "ssp-client",      { NULL }, 7801,  "udp" },
-  { "rbt-wanopt",      { NULL }, 7810,  "tcp" },
-  { "rbt-wanopt",      { NULL }, 7810,  "udp" },
-  { "apc-7845",        { NULL }, 7845,  "tcp" },
-  { "apc-7845",        { NULL }, 7845,  "udp" },
-  { "apc-7846",        { NULL }, 7846,  "tcp" },
-  { "apc-7846",        { NULL }, 7846,  "udp" },
-  { "mobileanalyzer",  { NULL }, 7869,  "tcp" },
-  { "rbt-smc",         { NULL }, 7870,  "tcp" },
-  { "pss",             { NULL }, 7880,  "tcp" },
-  { "pss",             { NULL }, 7880,  "udp" },
-  { "ubroker",         { NULL }, 7887,  "tcp" },
-  { "ubroker",         { NULL }, 7887,  "udp" },
-  { "mevent",          { NULL }, 7900,  "tcp" },
-  { "mevent",          { NULL }, 7900,  "udp" },
-  { "tnos-sp",         { NULL }, 7901,  "tcp" },
-  { "tnos-sp",         { NULL }, 7901,  "udp" },
-  { "tnos-dp",         { NULL }, 7902,  "tcp" },
-  { "tnos-dp",         { NULL }, 7902,  "udp" },
-  { "tnos-dps",        { NULL }, 7903,  "tcp" },
-  { "tnos-dps",        { NULL }, 7903,  "udp" },
-  { "qo-secure",       { NULL }, 7913,  "tcp" },
-  { "qo-secure",       { NULL }, 7913,  "udp" },
-  { "t2-drm",          { NULL }, 7932,  "tcp" },
-  { "t2-drm",          { NULL }, 7932,  "udp" },
-  { "t2-brm",          { NULL }, 7933,  "tcp" },
-  { "t2-brm",          { NULL }, 7933,  "udp" },
-  { "supercell",       { NULL }, 7967,  "tcp" },
-  { "supercell",       { NULL }, 7967,  "udp" },
-  { "micromuse-ncps",  { NULL }, 7979,  "tcp" },
-  { "micromuse-ncps",  { NULL }, 7979,  "udp" },
-  { "quest-vista",     { NULL }, 7980,  "tcp" },
-  { "quest-vista",     { NULL }, 7980,  "udp" },
-  { "sossd-collect",   { NULL }, 7981,  "tcp" },
-  { "sossd-agent",     { NULL }, 7982,  "tcp" },
-  { "sossd-disc",      { NULL }, 7982,  "udp" },
-  { "pushns",          { NULL }, 7997,  "tcp" },
-  { "usicontentpush",  { NULL }, 7998,  "udp" },
-  { "irdmi2",          { NULL }, 7999,  "tcp" },
-  { "irdmi2",          { NULL }, 7999,  "udp" },
-  { "irdmi",           { NULL }, 8000,  "tcp" },
-  { "irdmi",           { NULL }, 8000,  "udp" },
-  { "vcom-tunnel",     { NULL }, 8001,  "tcp" },
-  { "vcom-tunnel",     { NULL }, 8001,  "udp" },
-  { "teradataordbms",  { NULL }, 8002,  "tcp" },
-  { "teradataordbms",  { NULL }, 8002,  "udp" },
-  { "mcreport",        { NULL }, 8003,  "tcp" },
-  { "mcreport",        { NULL }, 8003,  "udp" },
-  { "mxi",             { NULL }, 8005,  "tcp" },
-  { "mxi",             { NULL }, 8005,  "udp" },
-  { "http-alt",        { NULL }, 8008,  "tcp" },
-  { "http-alt",        { NULL }, 8008,  "udp" },
-  { "qbdb",            { NULL }, 8019,  "tcp" },
-  { "qbdb",            { NULL }, 8019,  "udp" },
-  { "intu-ec-svcdisc", { NULL }, 8020,  "tcp" },
-  { "intu-ec-svcdisc", { NULL }, 8020,  "udp" },
-  { "intu-ec-client",  { NULL }, 8021,  "tcp" },
-  { "intu-ec-client",  { NULL }, 8021,  "udp" },
-  { "oa-system",       { NULL }, 8022,  "tcp" },
-  { "oa-system",       { NULL }, 8022,  "udp" },
-  { "ca-audit-da",     { NULL }, 8025,  "tcp" },
-  { "ca-audit-da",     { NULL }, 8025,  "udp" },
-  { "ca-audit-ds",     { NULL }, 8026,  "tcp" },
-  { "ca-audit-ds",     { NULL }, 8026,  "udp" },
-  { "pro-ed",          { NULL }, 8032,  "tcp" },
-  { "pro-ed",          { NULL }, 8032,  "udp" },
-  { "mindprint",       { NULL }, 8033,  "tcp" },
-  { "mindprint",       { NULL }, 8033,  "udp" },
-  { "vantronix-mgmt",  { NULL }, 8034,  "tcp" },
-  { "vantronix-mgmt",  { NULL }, 8034,  "udp" },
-  { "ampify",          { NULL }, 8040,  "tcp" },
-  { "ampify",          { NULL }, 8040,  "udp" },
-  { "fs-agent",        { NULL }, 8042,  "tcp" },
-  { "fs-server",       { NULL }, 8043,  "tcp" },
-  { "fs-mgmt",         { NULL }, 8044,  "tcp" },
-  { "senomix01",       { NULL }, 8052,  "tcp" },
-  { "senomix01",       { NULL }, 8052,  "udp" },
-  { "senomix02",       { NULL }, 8053,  "tcp" },
-  { "senomix02",       { NULL }, 8053,  "udp" },
-  { "senomix03",       { NULL }, 8054,  "tcp" },
-  { "senomix03",       { NULL }, 8054,  "udp" },
-  { "senomix04",       { NULL }, 8055,  "tcp" },
-  { "senomix04",       { NULL }, 8055,  "udp" },
-  { "senomix05",       { NULL }, 8056,  "tcp" },
-  { "senomix05",       { NULL }, 8056,  "udp" },
-  { "senomix06",       { NULL }, 8057,  "tcp" },
-  { "senomix06",       { NULL }, 8057,  "udp" },
-  { "senomix07",       { NULL }, 8058,  "tcp" },
-  { "senomix07",       { NULL }, 8058,  "udp" },
-  { "senomix08",       { NULL }, 8059,  "tcp" },
-  { "senomix08",       { NULL }, 8059,  "udp" },
-  { "gadugadu",        { NULL }, 8074,  "tcp" },
-  { "gadugadu",        { NULL }, 8074,  "udp" },
-  { "http-alt",        { NULL }, 8080,  "tcp" },
-  { "http-alt",        { NULL }, 8080,  "udp" },
-  { "sunproxyadmin",   { NULL }, 8081,  "tcp" },
-  { "sunproxyadmin",   { NULL }, 8081,  "udp" },
-  { "us-cli",          { NULL }, 8082,  "tcp" },
-  { "us-cli",          { NULL }, 8082,  "udp" },
-  { "us-srv",          { NULL }, 8083,  "tcp" },
-  { "us-srv",          { NULL }, 8083,  "udp" },
-  { "d-s-n",           { NULL }, 8086,  "tcp" },
-  { "d-s-n",           { NULL }, 8086,  "udp" },
-  { "simplifymedia",   { NULL }, 8087,  "tcp" },
-  { "simplifymedia",   { NULL }, 8087,  "udp" },
-  { "radan-http",      { NULL }, 8088,  "tcp" },
-  { "radan-http",      { NULL }, 8088,  "udp" },
-  { "jamlink",         { NULL }, 8091,  "tcp" },
-  { "sac",             { NULL }, 8097,  "tcp" },
-  { "sac",             { NULL }, 8097,  "udp" },
-  { "xprint-server",   { NULL }, 8100,  "tcp" },
-  { "xprint-server",   { NULL }, 8100,  "udp" },
-  { "ldoms-migr",      { NULL }, 8101,  "tcp" },
-  { "mtl8000-matrix",  { NULL }, 8115,  "tcp" },
-  { "mtl8000-matrix",  { NULL }, 8115,  "udp" },
-  { "cp-cluster",      { NULL }, 8116,  "tcp" },
-  { "cp-cluster",      { NULL }, 8116,  "udp" },
-  { "privoxy",         { NULL }, 8118,  "tcp" },
-  { "privoxy",         { NULL }, 8118,  "udp" },
-  { "apollo-data",     { NULL }, 8121,  "tcp" },
-  { "apollo-data",     { NULL }, 8121,  "udp" },
-  { "apollo-admin",    { NULL }, 8122,  "tcp" },
-  { "apollo-admin",    { NULL }, 8122,  "udp" },
-  { "paycash-online",  { NULL }, 8128,  "tcp" },
-  { "paycash-online",  { NULL }, 8128,  "udp" },
-  { "paycash-wbp",     { NULL }, 8129,  "tcp" },
-  { "paycash-wbp",     { NULL }, 8129,  "udp" },
-  { "indigo-vrmi",     { NULL }, 8130,  "tcp" },
-  { "indigo-vrmi",     { NULL }, 8130,  "udp" },
-  { "indigo-vbcp",     { NULL }, 8131,  "tcp" },
-  { "indigo-vbcp",     { NULL }, 8131,  "udp" },
-  { "dbabble",         { NULL }, 8132,  "tcp" },
-  { "dbabble",         { NULL }, 8132,  "udp" },
-  { "isdd",            { NULL }, 8148,  "tcp" },
-  { "isdd",            { NULL }, 8148,  "udp" },
-  { "patrol",          { NULL }, 8160,  "tcp" },
-  { "patrol",          { NULL }, 8160,  "udp" },
-  { "patrol-snmp",     { NULL }, 8161,  "tcp" },
-  { "patrol-snmp",     { NULL }, 8161,  "udp" },
-  { "vmware-fdm",      { NULL }, 8182,  "tcp" },
-  { "vmware-fdm",      { NULL }, 8182,  "udp" },
-  { "proremote",       { NULL }, 8183,  "tcp" },
-  { "itach",           { NULL }, 8184,  "tcp" },
-  { "itach",           { NULL }, 8184,  "udp" },
-  { "spytechphone",    { NULL }, 8192,  "tcp" },
-  { "spytechphone",    { NULL }, 8192,  "udp" },
-  { "blp1",            { NULL }, 8194,  "tcp" },
-  { "blp1",            { NULL }, 8194,  "udp" },
-  { "blp2",            { NULL }, 8195,  "tcp" },
-  { "blp2",            { NULL }, 8195,  "udp" },
-  { "vvr-data",        { NULL }, 8199,  "tcp" },
-  { "vvr-data",        { NULL }, 8199,  "udp" },
-  { "trivnet1",        { NULL }, 8200,  "tcp" },
-  { "trivnet1",        { NULL }, 8200,  "udp" },
-  { "trivnet2",        { NULL }, 8201,  "tcp" },
-  { "trivnet2",        { NULL }, 8201,  "udp" },
-  { "lm-perfworks",    { NULL }, 8204,  "tcp" },
-  { "lm-perfworks",    { NULL }, 8204,  "udp" },
-  { "lm-instmgr",      { NULL }, 8205,  "tcp" },
-  { "lm-instmgr",      { NULL }, 8205,  "udp" },
-  { "lm-dta",          { NULL }, 8206,  "tcp" },
-  { "lm-dta",          { NULL }, 8206,  "udp" },
-  { "lm-sserver",      { NULL }, 8207,  "tcp" },
-  { "lm-sserver",      { NULL }, 8207,  "udp" },
-  { "lm-webwatcher",   { NULL }, 8208,  "tcp" },
-  { "lm-webwatcher",   { NULL }, 8208,  "udp" },
-  { "rexecj",          { NULL }, 8230,  "tcp" },
-  { "rexecj",          { NULL }, 8230,  "udp" },
-  { "synapse-nhttps",  { NULL }, 8243,  "tcp" },
-  { "synapse-nhttps",  { NULL }, 8243,  "udp" },
-  { "pando-sec",       { NULL }, 8276,  "tcp" },
-  { "pando-sec",       { NULL }, 8276,  "udp" },
-  { "synapse-nhttp",   { NULL }, 8280,  "tcp" },
-  { "synapse-nhttp",   { NULL }, 8280,  "udp" },
-  { "blp3",            { NULL }, 8292,  "tcp" },
-  { "blp3",            { NULL }, 8292,  "udp" },
-  { "hiperscan-id",    { NULL }, 8293,  "tcp" },
-  { "blp4",            { NULL }, 8294,  "tcp" },
-  { "blp4",            { NULL }, 8294,  "udp" },
-  { "tmi",             { NULL }, 8300,  "tcp" },
-  { "tmi",             { NULL }, 8300,  "udp" },
-  { "amberon",         { NULL }, 8301,  "tcp" },
-  { "amberon",         { NULL }, 8301,  "udp" },
-  { "tnp-discover",    { NULL }, 8320,  "tcp" },
-  { "tnp-discover",    { NULL }, 8320,  "udp" },
-  { "tnp",             { NULL }, 8321,  "tcp" },
-  { "tnp",             { NULL }, 8321,  "udp" },
-  { "server-find",     { NULL }, 8351,  "tcp" },
-  { "server-find",     { NULL }, 8351,  "udp" },
-  { "cruise-enum",     { NULL }, 8376,  "tcp" },
-  { "cruise-enum",     { NULL }, 8376,  "udp" },
-  { "cruise-swroute",  { NULL }, 8377,  "tcp" },
-  { "cruise-swroute",  { NULL }, 8377,  "udp" },
-  { "cruise-config",   { NULL }, 8378,  "tcp" },
-  { "cruise-config",   { NULL }, 8378,  "udp" },
-  { "cruise-diags",    { NULL }, 8379,  "tcp" },
-  { "cruise-diags",    { NULL }, 8379,  "udp" },
-  { "cruise-update",   { NULL }, 8380,  "tcp" },
-  { "cruise-update",   { NULL }, 8380,  "udp" },
-  { "m2mservices",     { NULL }, 8383,  "tcp" },
-  { "m2mservices",     { NULL }, 8383,  "udp" },
-  { "cvd",             { NULL }, 8400,  "tcp" },
-  { "cvd",             { NULL }, 8400,  "udp" },
-  { "sabarsd",         { NULL }, 8401,  "tcp" },
-  { "sabarsd",         { NULL }, 8401,  "udp" },
-  { "abarsd",          { NULL }, 8402,  "tcp" },
-  { "abarsd",          { NULL }, 8402,  "udp" },
-  { "admind",          { NULL }, 8403,  "tcp" },
-  { "admind",          { NULL }, 8403,  "udp" },
-  { "svcloud",         { NULL }, 8404,  "tcp" },
-  { "svbackup",        { NULL }, 8405,  "tcp" },
-  { "espeech",         { NULL }, 8416,  "tcp" },
-  { "espeech",         { NULL }, 8416,  "udp" },
-  { "espeech-rtp",     { NULL }, 8417,  "tcp" },
-  { "espeech-rtp",     { NULL }, 8417,  "udp" },
-  { "cybro-a-bus",     { NULL }, 8442,  "tcp" },
-  { "cybro-a-bus",     { NULL }, 8442,  "udp" },
-  { "pcsync-https",    { NULL }, 8443,  "tcp" },
-  { "pcsync-https",    { NULL }, 8443,  "udp" },
-  { "pcsync-http",     { NULL }, 8444,  "tcp" },
-  { "pcsync-http",     { NULL }, 8444,  "udp" },
-  { "npmp",            { NULL }, 8450,  "tcp" },
-  { "npmp",            { NULL }, 8450,  "udp" },
-  { "cisco-avp",       { NULL }, 8470,  "tcp" },
-  { "pim-port",        { NULL }, 8471,  "tcp" },
-  { "pim-port",        { NULL }, 8471,  "sctp"},
-  { "otv",             { NULL }, 8472,  "tcp" },
-  { "otv",             { NULL }, 8472,  "udp" },
-  { "vp2p",            { NULL }, 8473,  "tcp" },
-  { "vp2p",            { NULL }, 8473,  "udp" },
-  { "noteshare",       { NULL }, 8474,  "tcp" },
-  { "noteshare",       { NULL }, 8474,  "udp" },
-  { "fmtp",            { NULL }, 8500,  "tcp" },
-  { "fmtp",            { NULL }, 8500,  "udp" },
-  { "rtsp-alt",        { NULL }, 8554,  "tcp" },
-  { "rtsp-alt",        { NULL }, 8554,  "udp" },
-  { "d-fence",         { NULL }, 8555,  "tcp" },
-  { "d-fence",         { NULL }, 8555,  "udp" },
-  { "oap-admin",       { NULL }, 8567,  "tcp" },
-  { "oap-admin",       { NULL }, 8567,  "udp" },
-  { "asterix",         { NULL }, 8600,  "tcp" },
-  { "asterix",         { NULL }, 8600,  "udp" },
-  { "canon-mfnp",      { NULL }, 8610,  "tcp" },
-  { "canon-mfnp",      { NULL }, 8610,  "udp" },
-  { "canon-bjnp1",     { NULL }, 8611,  "tcp" },
-  { "canon-bjnp1",     { NULL }, 8611,  "udp" },
-  { "canon-bjnp2",     { NULL }, 8612,  "tcp" },
-  { "canon-bjnp2",     { NULL }, 8612,  "udp" },
-  { "canon-bjnp3",     { NULL }, 8613,  "tcp" },
-  { "canon-bjnp3",     { NULL }, 8613,  "udp" },
-  { "canon-bjnp4",     { NULL }, 8614,  "tcp" },
-  { "canon-bjnp4",     { NULL }, 8614,  "udp" },
-  { "sun-as-jmxrmi",   { NULL }, 8686,  "tcp" },
-  { "sun-as-jmxrmi",   { NULL }, 8686,  "udp" },
-  { "vnyx",            { NULL }, 8699,  "tcp" },
-  { "vnyx",            { NULL }, 8699,  "udp" },
-  { "dtp-net",         { NULL }, 8732,  "udp" },
-  { "ibus",            { NULL }, 8733,  "tcp" },
-  { "ibus",            { NULL }, 8733,  "udp" },
-  { "mc-appserver",    { NULL }, 8763,  "tcp" },
-  { "mc-appserver",    { NULL }, 8763,  "udp" },
-  { "openqueue",       { NULL }, 8764,  "tcp" },
-  { "openqueue",       { NULL }, 8764,  "udp" },
-  { "ultraseek-http",  { NULL }, 8765,  "tcp" },
-  { "ultraseek-http",  { NULL }, 8765,  "udp" },
-  { "dpap",            { NULL }, 8770,  "tcp" },
-  { "dpap",            { NULL }, 8770,  "udp" },
-  { "msgclnt",         { NULL }, 8786,  "tcp" },
-  { "msgclnt",         { NULL }, 8786,  "udp" },
-  { "msgsrvr",         { NULL }, 8787,  "tcp" },
-  { "msgsrvr",         { NULL }, 8787,  "udp" },
-  { "sunwebadmin",     { NULL }, 8800,  "tcp" },
-  { "sunwebadmin",     { NULL }, 8800,  "udp" },
-  { "truecm",          { NULL }, 8804,  "tcp" },
-  { "truecm",          { NULL }, 8804,  "udp" },
-  { "dxspider",        { NULL }, 8873,  "tcp" },
-  { "dxspider",        { NULL }, 8873,  "udp" },
-  { "cddbp-alt",       { NULL }, 8880,  "tcp" },
-  { "cddbp-alt",       { NULL }, 8880,  "udp" },
-  { "secure-mqtt",     { NULL }, 8883,  "tcp" },
-  { "secure-mqtt",     { NULL }, 8883,  "udp" },
-  { "ddi-tcp-1",       { NULL }, 8888,  "tcp" },
-  { "ddi-udp-1",       { NULL }, 8888,  "udp" },
-  { "ddi-tcp-2",       { NULL }, 8889,  "tcp" },
-  { "ddi-udp-2",       { NULL }, 8889,  "udp" },
-  { "ddi-tcp-3",       { NULL }, 8890,  "tcp" },
-  { "ddi-udp-3",       { NULL }, 8890,  "udp" },
-  { "ddi-tcp-4",       { NULL }, 8891,  "tcp" },
-  { "ddi-udp-4",       { NULL }, 8891,  "udp" },
-  { "ddi-tcp-5",       { NULL }, 8892,  "tcp" },
-  { "ddi-udp-5",       { NULL }, 8892,  "udp" },
-  { "ddi-tcp-6",       { NULL }, 8893,  "tcp" },
-  { "ddi-udp-6",       { NULL }, 8893,  "udp" },
-  { "ddi-tcp-7",       { NULL }, 8894,  "tcp" },
-  { "ddi-udp-7",       { NULL }, 8894,  "udp" },
-  { "ospf-lite",       { NULL }, 8899,  "tcp" },
-  { "ospf-lite",       { NULL }, 8899,  "udp" },
-  { "jmb-cds1",        { NULL }, 8900,  "tcp" },
-  { "jmb-cds1",        { NULL }, 8900,  "udp" },
-  { "jmb-cds2",        { NULL }, 8901,  "tcp" },
-  { "jmb-cds2",        { NULL }, 8901,  "udp" },
-  { "manyone-http",    { NULL }, 8910,  "tcp" },
-  { "manyone-http",    { NULL }, 8910,  "udp" },
-  { "manyone-xml",     { NULL }, 8911,  "tcp" },
-  { "manyone-xml",     { NULL }, 8911,  "udp" },
-  { "wcbackup",        { NULL }, 8912,  "tcp" },
-  { "wcbackup",        { NULL }, 8912,  "udp" },
-  { "dragonfly",       { NULL }, 8913,  "tcp" },
-  { "dragonfly",       { NULL }, 8913,  "udp" },
-  { "twds",            { NULL }, 8937,  "tcp" },
-  { "cumulus-admin",   { NULL }, 8954,  "tcp" },
-  { "cumulus-admin",   { NULL }, 8954,  "udp" },
-  { "sunwebadmins",    { NULL }, 8989,  "tcp" },
-  { "sunwebadmins",    { NULL }, 8989,  "udp" },
-  { "http-wmap",       { NULL }, 8990,  "tcp" },
-  { "http-wmap",       { NULL }, 8990,  "udp" },
-  { "https-wmap",      { NULL }, 8991,  "tcp" },
-  { "https-wmap",      { NULL }, 8991,  "udp" },
-  { "bctp",            { NULL }, 8999,  "tcp" },
-  { "bctp",            { NULL }, 8999,  "udp" },
-  { "cslistener",      { NULL }, 9000,  "tcp" },
-  { "cslistener",      { NULL }, 9000,  "udp" },
-  { "etlservicemgr",   { NULL }, 9001,  "tcp" },
-  { "etlservicemgr",   { NULL }, 9001,  "udp" },
-  { "dynamid",         { NULL }, 9002,  "tcp" },
-  { "dynamid",         { NULL }, 9002,  "udp" },
-  { "ogs-client",      { NULL }, 9007,  "udp" },
-  { "ogs-server",      { NULL }, 9008,  "tcp" },
-  { "pichat",          { NULL }, 9009,  "tcp" },
-  { "pichat",          { NULL }, 9009,  "udp" },
-  { "sdr",             { NULL }, 9010,  "tcp" },
-  { "tambora",         { NULL }, 9020,  "tcp" },
-  { "tambora",         { NULL }, 9020,  "udp" },
-  { "panagolin-ident", { NULL }, 9021,  "tcp" },
-  { "panagolin-ident", { NULL }, 9021,  "udp" },
-  { "paragent",        { NULL }, 9022,  "tcp" },
-  { "paragent",        { NULL }, 9022,  "udp" },
-  { "swa-1",           { NULL }, 9023,  "tcp" },
-  { "swa-1",           { NULL }, 9023,  "udp" },
-  { "swa-2",           { NULL }, 9024,  "tcp" },
-  { "swa-2",           { NULL }, 9024,  "udp" },
-  { "swa-3",           { NULL }, 9025,  "tcp" },
-  { "swa-3",           { NULL }, 9025,  "udp" },
-  { "swa-4",           { NULL }, 9026,  "tcp" },
-  { "swa-4",           { NULL }, 9026,  "udp" },
-  { "versiera",        { NULL }, 9050,  "tcp" },
-  { "fio-cmgmt",       { NULL }, 9051,  "tcp" },
-  { "glrpc",           { NULL }, 9080,  "tcp" },
-  { "glrpc",           { NULL }, 9080,  "udp" },
-  { "lcs-ap",          { NULL }, 9082,  "sctp"},
-  { "emc-pp-mgmtsvc",  { NULL }, 9083,  "tcp" },
-  { "aurora",          { NULL }, 9084,  "tcp" },
-  { "aurora",          { NULL }, 9084,  "udp" },
-  { "aurora",          { NULL }, 9084,  "sctp"},
-  { "ibm-rsyscon",     { NULL }, 9085,  "tcp" },
-  { "ibm-rsyscon",     { NULL }, 9085,  "udp" },
-  { "net2display",     { NULL }, 9086,  "tcp" },
-  { "net2display",     { NULL }, 9086,  "udp" },
-  { "classic",         { NULL }, 9087,  "tcp" },
-  { "classic",         { NULL }, 9087,  "udp" },
-  { "sqlexec",         { NULL }, 9088,  "tcp" },
-  { "sqlexec",         { NULL }, 9088,  "udp" },
-  { "sqlexec-ssl",     { NULL }, 9089,  "tcp" },
-  { "sqlexec-ssl",     { NULL }, 9089,  "udp" },
-  { "websm",           { NULL }, 9090,  "tcp" },
-  { "websm",           { NULL }, 9090,  "udp" },
-  { "xmltec-xmlmail",  { NULL }, 9091,  "tcp" },
-  { "xmltec-xmlmail",  { NULL }, 9091,  "udp" },
-  { "XmlIpcRegSvc",    { NULL }, 9092,  "tcp" },
-  { "XmlIpcRegSvc",    { NULL }, 9092,  "udp" },
-  { "hp-pdl-datastr",  { NULL }, 9100,  "tcp" },
-  { "hp-pdl-datastr",  { NULL }, 9100,  "udp" },
-  { "pdl-datastream",  { NULL }, 9100,  "tcp" },
-  { "pdl-datastream",  { NULL }, 9100,  "udp" },
-  { "bacula-dir",      { NULL }, 9101,  "tcp" },
-  { "bacula-dir",      { NULL }, 9101,  "udp" },
-  { "bacula-fd",       { NULL }, 9102,  "tcp" },
-  { "bacula-fd",       { NULL }, 9102,  "udp" },
-  { "bacula-sd",       { NULL }, 9103,  "tcp" },
-  { "bacula-sd",       { NULL }, 9103,  "udp" },
-  { "peerwire",        { NULL }, 9104,  "tcp" },
-  { "peerwire",        { NULL }, 9104,  "udp" },
-  { "xadmin",          { NULL }, 9105,  "tcp" },
-  { "xadmin",          { NULL }, 9105,  "udp" },
-  { "astergate",       { NULL }, 9106,  "tcp" },
-  { "astergate-disc",  { NULL }, 9106,  "udp" },
-  { "astergatefax",    { NULL }, 9107,  "tcp" },
-  { "mxit",            { NULL }, 9119,  "tcp" },
-  { "mxit",            { NULL }, 9119,  "udp" },
-  { "dddp",            { NULL }, 9131,  "tcp" },
-  { "dddp",            { NULL }, 9131,  "udp" },
-  { "apani1",          { NULL }, 9160,  "tcp" },
-  { "apani1",          { NULL }, 9160,  "udp" },
-  { "apani2",          { NULL }, 9161,  "tcp" },
-  { "apani2",          { NULL }, 9161,  "udp" },
-  { "apani3",          { NULL }, 9162,  "tcp" },
-  { "apani3",          { NULL }, 9162,  "udp" },
-  { "apani4",          { NULL }, 9163,  "tcp" },
-  { "apani4",          { NULL }, 9163,  "udp" },
-  { "apani5",          { NULL }, 9164,  "tcp" },
-  { "apani5",          { NULL }, 9164,  "udp" },
-  { "sun-as-jpda",     { NULL }, 9191,  "tcp" },
-  { "sun-as-jpda",     { NULL }, 9191,  "udp" },
-  { "wap-wsp",         { NULL }, 9200,  "tcp" },
-  { "wap-wsp",         { NULL }, 9200,  "udp" },
-  { "wap-wsp-wtp",     { NULL }, 9201,  "tcp" },
-  { "wap-wsp-wtp",     { NULL }, 9201,  "udp" },
-  { "wap-wsp-s",       { NULL }, 9202,  "tcp" },
-  { "wap-wsp-s",       { NULL }, 9202,  "udp" },
-  { "wap-wsp-wtp-s",   { NULL }, 9203,  "tcp" },
-  { "wap-wsp-wtp-s",   { NULL }, 9203,  "udp" },
-  { "wap-vcard",       { NULL }, 9204,  "tcp" },
-  { "wap-vcard",       { NULL }, 9204,  "udp" },
-  { "wap-vcal",        { NULL }, 9205,  "tcp" },
-  { "wap-vcal",        { NULL }, 9205,  "udp" },
-  { "wap-vcard-s",     { NULL }, 9206,  "tcp" },
-  { "wap-vcard-s",     { NULL }, 9206,  "udp" },
-  { "wap-vcal-s",      { NULL }, 9207,  "tcp" },
-  { "wap-vcal-s",      { NULL }, 9207,  "udp" },
-  { "rjcdb-vcards",    { NULL }, 9208,  "tcp" },
-  { "rjcdb-vcards",    { NULL }, 9208,  "udp" },
-  { "almobile-system", { NULL }, 9209,  "tcp" },
-  { "almobile-system", { NULL }, 9209,  "udp" },
-  { "oma-mlp",         { NULL }, 9210,  "tcp" },
-  { "oma-mlp",         { NULL }, 9210,  "udp" },
-  { "oma-mlp-s",       { NULL }, 9211,  "tcp" },
-  { "oma-mlp-s",       { NULL }, 9211,  "udp" },
-  { "serverviewdbms",  { NULL }, 9212,  "tcp" },
-  { "serverviewdbms",  { NULL }, 9212,  "udp" },
-  { "serverstart",     { NULL }, 9213,  "tcp" },
-  { "serverstart",     { NULL }, 9213,  "udp" },
-  { "ipdcesgbs",       { NULL }, 9214,  "tcp" },
-  { "ipdcesgbs",       { NULL }, 9214,  "udp" },
-  { "insis",           { NULL }, 9215,  "tcp" },
-  { "insis",           { NULL }, 9215,  "udp" },
-  { "acme",            { NULL }, 9216,  "tcp" },
-  { "acme",            { NULL }, 9216,  "udp" },
-  { "fsc-port",        { NULL }, 9217,  "tcp" },
-  { "fsc-port",        { NULL }, 9217,  "udp" },
-  { "teamcoherence",   { NULL }, 9222,  "tcp" },
-  { "teamcoherence",   { NULL }, 9222,  "udp" },
-  { "mon",             { NULL }, 9255,  "tcp" },
-  { "mon",             { NULL }, 9255,  "udp" },
-  { "pegasus",         { NULL }, 9278,  "tcp" },
-  { "pegasus",         { NULL }, 9278,  "udp" },
-  { "pegasus-ctl",     { NULL }, 9279,  "tcp" },
-  { "pegasus-ctl",     { NULL }, 9279,  "udp" },
-  { "pgps",            { NULL }, 9280,  "tcp" },
-  { "pgps",            { NULL }, 9280,  "udp" },
-  { "swtp-port1",      { NULL }, 9281,  "tcp" },
-  { "swtp-port1",      { NULL }, 9281,  "udp" },
-  { "swtp-port2",      { NULL }, 9282,  "tcp" },
-  { "swtp-port2",      { NULL }, 9282,  "udp" },
-  { "callwaveiam",     { NULL }, 9283,  "tcp" },
-  { "callwaveiam",     { NULL }, 9283,  "udp" },
-  { "visd",            { NULL }, 9284,  "tcp" },
-  { "visd",            { NULL }, 9284,  "udp" },
-  { "n2h2server",      { NULL }, 9285,  "tcp" },
-  { "n2h2server",      { NULL }, 9285,  "udp" },
-  { "n2receive",       { NULL }, 9286,  "udp" },
-  { "cumulus",         { NULL }, 9287,  "tcp" },
-  { "cumulus",         { NULL }, 9287,  "udp" },
-  { "armtechdaemon",   { NULL }, 9292,  "tcp" },
-  { "armtechdaemon",   { NULL }, 9292,  "udp" },
-  { "storview",        { NULL }, 9293,  "tcp" },
-  { "storview",        { NULL }, 9293,  "udp" },
-  { "armcenterhttp",   { NULL }, 9294,  "tcp" },
-  { "armcenterhttp",   { NULL }, 9294,  "udp" },
-  { "armcenterhttps",  { NULL }, 9295,  "tcp" },
-  { "armcenterhttps",  { NULL }, 9295,  "udp" },
-  { "vrace",           { NULL }, 9300,  "tcp" },
-  { "vrace",           { NULL }, 9300,  "udp" },
-  { "sphinxql",        { NULL }, 9306,  "tcp" },
-  { "sphinxapi",       { NULL }, 9312,  "tcp" },
-  { "secure-ts",       { NULL }, 9318,  "tcp" },
-  { "secure-ts",       { NULL }, 9318,  "udp" },
-  { "guibase",         { NULL }, 9321,  "tcp" },
-  { "guibase",         { NULL }, 9321,  "udp" },
-  { "mpidcmgr",        { NULL }, 9343,  "tcp" },
-  { "mpidcmgr",        { NULL }, 9343,  "udp" },
-  { "mphlpdmc",        { NULL }, 9344,  "tcp" },
-  { "mphlpdmc",        { NULL }, 9344,  "udp" },
-  { "ctechlicensing",  { NULL }, 9346,  "tcp" },
-  { "ctechlicensing",  { NULL }, 9346,  "udp" },
-  { "fjdmimgr",        { NULL }, 9374,  "tcp" },
-  { "fjdmimgr",        { NULL }, 9374,  "udp" },
-  { "boxp",            { NULL }, 9380,  "tcp" },
-  { "boxp",            { NULL }, 9380,  "udp" },
-  { "d2dconfig",       { NULL }, 9387,  "tcp" },
-  { "d2ddatatrans",    { NULL }, 9388,  "tcp" },
-  { "adws",            { NULL }, 9389,  "tcp" },
-  { "otp",             { NULL }, 9390,  "tcp" },
-  { "fjinvmgr",        { NULL }, 9396,  "tcp" },
-  { "fjinvmgr",        { NULL }, 9396,  "udp" },
-  { "mpidcagt",        { NULL }, 9397,  "tcp" },
-  { "mpidcagt",        { NULL }, 9397,  "udp" },
-  { "sec-t4net-srv",   { NULL }, 9400,  "tcp" },
-  { "sec-t4net-srv",   { NULL }, 9400,  "udp" },
-  { "sec-t4net-clt",   { NULL }, 9401,  "tcp" },
-  { "sec-t4net-clt",   { NULL }, 9401,  "udp" },
-  { "sec-pc2fax-srv",  { NULL }, 9402,  "tcp" },
-  { "sec-pc2fax-srv",  { NULL }, 9402,  "udp" },
-  { "git",             { NULL }, 9418,  "tcp" },
-  { "git",             { NULL }, 9418,  "udp" },
-  { "tungsten-https",  { NULL }, 9443,  "tcp" },
-  { "tungsten-https",  { NULL }, 9443,  "udp" },
-  { "wso2esb-console", { NULL }, 9444,  "tcp" },
-  { "wso2esb-console", { NULL }, 9444,  "udp" },
-  { "sntlkeyssrvr",    { NULL }, 9450,  "tcp" },
-  { "sntlkeyssrvr",    { NULL }, 9450,  "udp" },
-  { "ismserver",       { NULL }, 9500,  "tcp" },
-  { "ismserver",       { NULL }, 9500,  "udp" },
-  { "sma-spw",         { NULL }, 9522,  "udp" },
-  { "mngsuite",        { NULL }, 9535,  "tcp" },
-  { "mngsuite",        { NULL }, 9535,  "udp" },
-  { "laes-bf",         { NULL }, 9536,  "tcp" },
-  { "laes-bf",         { NULL }, 9536,  "udp" },
-  { "trispen-sra",     { NULL }, 9555,  "tcp" },
-  { "trispen-sra",     { NULL }, 9555,  "udp" },
-  { "ldgateway",       { NULL }, 9592,  "tcp" },
-  { "ldgateway",       { NULL }, 9592,  "udp" },
-  { "cba8",            { NULL }, 9593,  "tcp" },
-  { "cba8",            { NULL }, 9593,  "udp" },
-  { "msgsys",          { NULL }, 9594,  "tcp" },
-  { "msgsys",          { NULL }, 9594,  "udp" },
-  { "pds",             { NULL }, 9595,  "tcp" },
-  { "pds",             { NULL }, 9595,  "udp" },
-  { "mercury-disc",    { NULL }, 9596,  "tcp" },
-  { "mercury-disc",    { NULL }, 9596,  "udp" },
-  { "pd-admin",        { NULL }, 9597,  "tcp" },
-  { "pd-admin",        { NULL }, 9597,  "udp" },
-  { "vscp",            { NULL }, 9598,  "tcp" },
-  { "vscp",            { NULL }, 9598,  "udp" },
-  { "robix",           { NULL }, 9599,  "tcp" },
-  { "robix",           { NULL }, 9599,  "udp" },
-  { "micromuse-ncpw",  { NULL }, 9600,  "tcp" },
-  { "micromuse-ncpw",  { NULL }, 9600,  "udp" },
-  { "streamcomm-ds",   { NULL }, 9612,  "tcp" },
-  { "streamcomm-ds",   { NULL }, 9612,  "udp" },
-  { "iadt-tls",        { NULL }, 9614,  "tcp" },
-  { "erunbook_agent",  { NULL }, 9616,  "tcp" },
-  { "erunbook_server", { NULL }, 9617,  "tcp" },
-  { "condor",          { NULL }, 9618,  "tcp" },
-  { "condor",          { NULL }, 9618,  "udp" },
-  { "odbcpathway",     { NULL }, 9628,  "tcp" },
-  { "odbcpathway",     { NULL }, 9628,  "udp" },
-  { "uniport",         { NULL }, 9629,  "tcp" },
-  { "uniport",         { NULL }, 9629,  "udp" },
-  { "peoctlr",         { NULL }, 9630,  "tcp" },
-  { "peocoll",         { NULL }, 9631,  "tcp" },
-  { "mc-comm",         { NULL }, 9632,  "udp" },
-  { "pqsflows",        { NULL }, 9640,  "tcp" },
-  { "xmms2",           { NULL }, 9667,  "tcp" },
-  { "xmms2",           { NULL }, 9667,  "udp" },
-  { "tec5-sdctp",      { NULL }, 9668,  "tcp" },
-  { "tec5-sdctp",      { NULL }, 9668,  "udp" },
-  { "client-wakeup",   { NULL }, 9694,  "tcp" },
-  { "client-wakeup",   { NULL }, 9694,  "udp" },
-  { "ccnx",            { NULL }, 9695,  "tcp" },
-  { "ccnx",            { NULL }, 9695,  "udp" },
-  { "board-roar",      { NULL }, 9700,  "tcp" },
-  { "board-roar",      { NULL }, 9700,  "udp" },
-  { "l5nas-parchan",   { NULL }, 9747,  "tcp" },
-  { "l5nas-parchan",   { NULL }, 9747,  "udp" },
-  { "board-voip",      { NULL }, 9750,  "tcp" },
-  { "board-voip",      { NULL }, 9750,  "udp" },
-  { "rasadv",          { NULL }, 9753,  "tcp" },
-  { "rasadv",          { NULL }, 9753,  "udp" },
-  { "tungsten-http",   { NULL }, 9762,  "tcp" },
-  { "tungsten-http",   { NULL }, 9762,  "udp" },
-  { "davsrc",          { NULL }, 9800,  "tcp" },
-  { "davsrc",          { NULL }, 9800,  "udp" },
-  { "sstp-2",          { NULL }, 9801,  "tcp" },
-  { "sstp-2",          { NULL }, 9801,  "udp" },
-  { "davsrcs",         { NULL }, 9802,  "tcp" },
-  { "davsrcs",         { NULL }, 9802,  "udp" },
-  { "sapv1",           { NULL }, 9875,  "tcp" },
-  { "sapv1",           { NULL }, 9875,  "udp" },
-  { "sd",              { NULL }, 9876,  "tcp" },
-  { "sd",              { NULL }, 9876,  "udp" },
-  { "cyborg-systems",  { NULL }, 9888,  "tcp" },
-  { "cyborg-systems",  { NULL }, 9888,  "udp" },
-  { "gt-proxy",        { NULL }, 9889,  "tcp" },
-  { "gt-proxy",        { NULL }, 9889,  "udp" },
-  { "monkeycom",       { NULL }, 9898,  "tcp" },
-  { "monkeycom",       { NULL }, 9898,  "udp" },
-  { "sctp-tunneling",  { NULL }, 9899,  "tcp" },
-  { "sctp-tunneling",  { NULL }, 9899,  "udp" },
-  { "iua",             { NULL }, 9900,  "tcp" },
-  { "iua",             { NULL }, 9900,  "udp" },
-  { "iua",             { NULL }, 9900,  "sctp"},
-  { "enrp",            { NULL }, 9901,  "udp" },
-  { "enrp-sctp",       { NULL }, 9901,  "sctp"},
-  { "enrp-sctp-tls",   { NULL }, 9902,  "sctp"},
-  { "domaintime",      { NULL }, 9909,  "tcp" },
-  { "domaintime",      { NULL }, 9909,  "udp" },
-  { "sype-transport",  { NULL }, 9911,  "tcp" },
-  { "sype-transport",  { NULL }, 9911,  "udp" },
-  { "apc-9950",        { NULL }, 9950,  "tcp" },
-  { "apc-9950",        { NULL }, 9950,  "udp" },
-  { "apc-9951",        { NULL }, 9951,  "tcp" },
-  { "apc-9951",        { NULL }, 9951,  "udp" },
-  { "apc-9952",        { NULL }, 9952,  "tcp" },
-  { "apc-9952",        { NULL }, 9952,  "udp" },
-  { "acis",            { NULL }, 9953,  "tcp" },
-  { "acis",            { NULL }, 9953,  "udp" },
-  { "odnsp",           { NULL }, 9966,  "tcp" },
-  { "odnsp",           { NULL }, 9966,  "udp" },
-  { "dsm-scm-target",  { NULL }, 9987,  "tcp" },
-  { "dsm-scm-target",  { NULL }, 9987,  "udp" },
-  { "nsesrvr",         { NULL }, 9988,  "tcp" },
-  { "osm-appsrvr",     { NULL }, 9990,  "tcp" },
-  { "osm-appsrvr",     { NULL }, 9990,  "udp" },
-  { "osm-oev",         { NULL }, 9991,  "tcp" },
-  { "osm-oev",         { NULL }, 9991,  "udp" },
-  { "palace-1",        { NULL }, 9992,  "tcp" },
-  { "palace-1",        { NULL }, 9992,  "udp" },
-  { "palace-2",        { NULL }, 9993,  "tcp" },
-  { "palace-2",        { NULL }, 9993,  "udp" },
-  { "palace-3",        { NULL }, 9994,  "tcp" },
-  { "palace-3",        { NULL }, 9994,  "udp" },
-  { "palace-4",        { NULL }, 9995,  "tcp" },
-  { "palace-4",        { NULL }, 9995,  "udp" },
-  { "palace-5",        { NULL }, 9996,  "tcp" },
-  { "palace-5",        { NULL }, 9996,  "udp" },
-  { "palace-6",        { NULL }, 9997,  "tcp" },
-  { "palace-6",        { NULL }, 9997,  "udp" },
-  { "distinct32",      { NULL }, 9998,  "tcp" },
-  { "distinct32",      { NULL }, 9998,  "udp" },
-  { "distinct",        { NULL }, 9999,  "tcp" },
-  { "distinct",        { NULL }, 9999,  "udp" },
-  { "ndmp",            { NULL }, 10000, "tcp" },
-  { "ndmp",            { NULL }, 10000, "udp" },
-  { "scp-config",      { NULL }, 10001, "tcp" },
-  { "scp-config",      { NULL }, 10001, "udp" },
-  { "documentum",      { NULL }, 10002, "tcp" },
-  { "documentum",      { NULL }, 10002, "udp" },
-  { "documentum_s",    { NULL }, 10003, "tcp" },
-  { "documentum_s",    { NULL }, 10003, "udp" },
-  { "emcrmirccd",      { NULL }, 10004, "tcp" },
-  { "emcrmird",        { NULL }, 10005, "tcp" },
-  { "mvs-capacity",    { NULL }, 10007, "tcp" },
-  { "mvs-capacity",    { NULL }, 10007, "udp" },
-  { "octopus",         { NULL }, 10008, "tcp" },
-  { "octopus",         { NULL }, 10008, "udp" },
-  { "swdtp-sv",        { NULL }, 10009, "tcp" },
-  { "swdtp-sv",        { NULL }, 10009, "udp" },
-  { "rxapi",           { NULL }, 10010, "tcp" },
-  { "zabbix-agent",    { NULL }, 10050, "tcp" },
-  { "zabbix-agent",    { NULL }, 10050, "udp" },
-  { "zabbix-trapper",  { NULL }, 10051, "tcp" },
-  { "zabbix-trapper",  { NULL }, 10051, "udp" },
-  { "qptlmd",          { NULL }, 10055, "tcp" },
-  { "amanda",          { NULL }, 10080, "tcp" },
-  { "amanda",          { NULL }, 10080, "udp" },
-  { "famdc",           { NULL }, 10081, "tcp" },
-  { "famdc",           { NULL }, 10081, "udp" },
-  { "itap-ddtp",       { NULL }, 10100, "tcp" },
-  { "itap-ddtp",       { NULL }, 10100, "udp" },
-  { "ezmeeting-2",     { NULL }, 10101, "tcp" },
-  { "ezmeeting-2",     { NULL }, 10101, "udp" },
-  { "ezproxy-2",       { NULL }, 10102, "tcp" },
-  { "ezproxy-2",       { NULL }, 10102, "udp" },
-  { "ezrelay",         { NULL }, 10103, "tcp" },
-  { "ezrelay",         { NULL }, 10103, "udp" },
-  { "swdtp",           { NULL }, 10104, "tcp" },
-  { "swdtp",           { NULL }, 10104, "udp" },
-  { "bctp-server",     { NULL }, 10107, "tcp" },
-  { "bctp-server",     { NULL }, 10107, "udp" },
-  { "nmea-0183",       { NULL }, 10110, "tcp" },
-  { "nmea-0183",       { NULL }, 10110, "udp" },
-  { "netiq-endpoint",  { NULL }, 10113, "tcp" },
-  { "netiq-endpoint",  { NULL }, 10113, "udp" },
-  { "netiq-qcheck",    { NULL }, 10114, "tcp" },
-  { "netiq-qcheck",    { NULL }, 10114, "udp" },
-  { "netiq-endpt",     { NULL }, 10115, "tcp" },
-  { "netiq-endpt",     { NULL }, 10115, "udp" },
-  { "netiq-voipa",     { NULL }, 10116, "tcp" },
-  { "netiq-voipa",     { NULL }, 10116, "udp" },
-  { "iqrm",            { NULL }, 10117, "tcp" },
-  { "iqrm",            { NULL }, 10117, "udp" },
-  { "bmc-perf-sd",     { NULL }, 10128, "tcp" },
-  { "bmc-perf-sd",     { NULL }, 10128, "udp" },
-  { "bmc-gms",         { NULL }, 10129, "tcp" },
-  { "qb-db-server",    { NULL }, 10160, "tcp" },
-  { "qb-db-server",    { NULL }, 10160, "udp" },
-  { "snmptls",         { NULL }, 10161, "tcp" },
-  { "snmpdtls",        { NULL }, 10161, "udp" },
-  { "snmptls-trap",    { NULL }, 10162, "tcp" },
-  { "snmpdtls-trap",   { NULL }, 10162, "udp" },
-  { "trisoap",         { NULL }, 10200, "tcp" },
-  { "trisoap",         { NULL }, 10200, "udp" },
-  { "rsms",            { NULL }, 10201, "tcp" },
-  { "rscs",            { NULL }, 10201, "udp" },
-  { "apollo-relay",    { NULL }, 10252, "tcp" },
-  { "apollo-relay",    { NULL }, 10252, "udp" },
-  { "axis-wimp-port",  { NULL }, 10260, "tcp" },
-  { "axis-wimp-port",  { NULL }, 10260, "udp" },
-  { "blocks",          { NULL }, 10288, "tcp" },
-  { "blocks",          { NULL }, 10288, "udp" },
-  { "cosir",           { NULL }, 10321, "tcp" },
-  { "hip-nat-t",       { NULL }, 10500, "udp" },
-  { "MOS-lower",       { NULL }, 10540, "tcp" },
-  { "MOS-lower",       { NULL }, 10540, "udp" },
-  { "MOS-upper",       { NULL }, 10541, "tcp" },
-  { "MOS-upper",       { NULL }, 10541, "udp" },
-  { "MOS-aux",         { NULL }, 10542, "tcp" },
-  { "MOS-aux",         { NULL }, 10542, "udp" },
-  { "MOS-soap",        { NULL }, 10543, "tcp" },
-  { "MOS-soap",        { NULL }, 10543, "udp" },
-  { "MOS-soap-opt",    { NULL }, 10544, "tcp" },
-  { "MOS-soap-opt",    { NULL }, 10544, "udp" },
-  { "gap",             { NULL }, 10800, "tcp" },
-  { "gap",             { NULL }, 10800, "udp" },
-  { "lpdg",            { NULL }, 10805, "tcp" },
-  { "lpdg",            { NULL }, 10805, "udp" },
-  { "nbd",             { NULL }, 10809, "tcp" },
-  { "nmc-disc",        { NULL }, 10810, "udp" },
-  { "helix",           { NULL }, 10860, "tcp" },
-  { "helix",           { NULL }, 10860, "udp" },
-  { "rmiaux",          { NULL }, 10990, "tcp" },
-  { "rmiaux",          { NULL }, 10990, "udp" },
-  { "irisa",           { NULL }, 11000, "tcp" },
-  { "irisa",           { NULL }, 11000, "udp" },
-  { "metasys",         { NULL }, 11001, "tcp" },
-  { "metasys",         { NULL }, 11001, "udp" },
-  { "netapp-icmgmt",   { NULL }, 11104, "tcp" },
-  { "netapp-icdata",   { NULL }, 11105, "tcp" },
-  { "sgi-lk",          { NULL }, 11106, "tcp" },
-  { "sgi-lk",          { NULL }, 11106, "udp" },
-  { "vce",             { NULL }, 11111, "tcp" },
-  { "vce",             { NULL }, 11111, "udp" },
-  { "dicom",           { NULL }, 11112, "tcp" },
-  { "dicom",           { NULL }, 11112, "udp" },
-  { "suncacao-snmp",   { NULL }, 11161, "tcp" },
-  { "suncacao-snmp",   { NULL }, 11161, "udp" },
-  { "suncacao-jmxmp",  { NULL }, 11162, "tcp" },
-  { "suncacao-jmxmp",  { NULL }, 11162, "udp" },
-  { "suncacao-rmi",    { NULL }, 11163, "tcp" },
-  { "suncacao-rmi",    { NULL }, 11163, "udp" },
-  { "suncacao-csa",    { NULL }, 11164, "tcp" },
-  { "suncacao-csa",    { NULL }, 11164, "udp" },
-  { "suncacao-websvc", { NULL }, 11165, "tcp" },
-  { "suncacao-websvc", { NULL }, 11165, "udp" },
-  { "snss",            { NULL }, 11171, "udp" },
-  { "oemcacao-jmxmp",  { NULL }, 11172, "tcp" },
-  { "oemcacao-rmi",    { NULL }, 11174, "tcp" },
-  { "oemcacao-websvc", { NULL }, 11175, "tcp" },
-  { "smsqp",           { NULL }, 11201, "tcp" },
-  { "smsqp",           { NULL }, 11201, "udp" },
-  { "wifree",          { NULL }, 11208, "tcp" },
-  { "wifree",          { NULL }, 11208, "udp" },
-  { "memcache",        { NULL }, 11211, "tcp" },
-  { "memcache",        { NULL }, 11211, "udp" },
-  { "imip",            { NULL }, 11319, "tcp" },
-  { "imip",            { NULL }, 11319, "udp" },
-  { "imip-channels",   { NULL }, 11320, "tcp" },
-  { "imip-channels",   { NULL }, 11320, "udp" },
-  { "arena-server",    { NULL }, 11321, "tcp" },
-  { "arena-server",    { NULL }, 11321, "udp" },
-  { "atm-uhas",        { NULL }, 11367, "tcp" },
-  { "atm-uhas",        { NULL }, 11367, "udp" },
-  { "hkp",             { NULL }, 11371, "tcp" },
-  { "hkp",             { NULL }, 11371, "udp" },
-  { "asgcypresstcps",  { NULL }, 11489, "tcp" },
-  { "tempest-port",    { NULL }, 11600, "tcp" },
-  { "tempest-port",    { NULL }, 11600, "udp" },
-  { "h323callsigalt",  { NULL }, 11720, "tcp" },
-  { "h323callsigalt",  { NULL }, 11720, "udp" },
-  { "intrepid-ssl",    { NULL }, 11751, "tcp" },
-  { "intrepid-ssl",    { NULL }, 11751, "udp" },
-  { "xoraya",          { NULL }, 11876, "tcp" },
-  { "xoraya",          { NULL }, 11876, "udp" },
-  { "x2e-disc",        { NULL }, 11877, "udp" },
-  { "sysinfo-sp",      { NULL }, 11967, "tcp" },
-  { "sysinfo-sp",      { NULL }, 11967, "udp" },
-  { "wmereceiving",    { NULL }, 11997, "sctp"},
-  { "wmedistribution", { NULL }, 11998, "sctp"},
-  { "wmereporting",    { NULL }, 11999, "sctp"},
-  { "entextxid",       { NULL }, 12000, "tcp" },
-  { "entextxid",       { NULL }, 12000, "udp" },
-  { "entextnetwk",     { NULL }, 12001, "tcp" },
-  { "entextnetwk",     { NULL }, 12001, "udp" },
-  { "entexthigh",      { NULL }, 12002, "tcp" },
-  { "entexthigh",      { NULL }, 12002, "udp" },
-  { "entextmed",       { NULL }, 12003, "tcp" },
-  { "entextmed",       { NULL }, 12003, "udp" },
-  { "entextlow",       { NULL }, 12004, "tcp" },
-  { "entextlow",       { NULL }, 12004, "udp" },
-  { "dbisamserver1",   { NULL }, 12005, "tcp" },
-  { "dbisamserver1",   { NULL }, 12005, "udp" },
-  { "dbisamserver2",   { NULL }, 12006, "tcp" },
-  { "dbisamserver2",   { NULL }, 12006, "udp" },
-  { "accuracer",       { NULL }, 12007, "tcp" },
-  { "accuracer",       { NULL }, 12007, "udp" },
-  { "accuracer-dbms",  { NULL }, 12008, "tcp" },
-  { "accuracer-dbms",  { NULL }, 12008, "udp" },
-  { "edbsrvr",         { NULL }, 12010, "tcp" },
-  { "vipera",          { NULL }, 12012, "tcp" },
-  { "vipera",          { NULL }, 12012, "udp" },
-  { "vipera-ssl",      { NULL }, 12013, "tcp" },
-  { "vipera-ssl",      { NULL }, 12013, "udp" },
-  { "rets-ssl",        { NULL }, 12109, "tcp" },
-  { "rets-ssl",        { NULL }, 12109, "udp" },
-  { "nupaper-ss",      { NULL }, 12121, "tcp" },
-  { "nupaper-ss",      { NULL }, 12121, "udp" },
-  { "cawas",           { NULL }, 12168, "tcp" },
-  { "cawas",           { NULL }, 12168, "udp" },
-  { "hivep",           { NULL }, 12172, "tcp" },
-  { "hivep",           { NULL }, 12172, "udp" },
-  { "linogridengine",  { NULL }, 12300, "tcp" },
-  { "linogridengine",  { NULL }, 12300, "udp" },
-  { "warehouse-sss",   { NULL }, 12321, "tcp" },
-  { "warehouse-sss",   { NULL }, 12321, "udp" },
-  { "warehouse",       { NULL }, 12322, "tcp" },
-  { "warehouse",       { NULL }, 12322, "udp" },
-  { "italk",           { NULL }, 12345, "tcp" },
-  { "italk",           { NULL }, 12345, "udp" },
-  { "tsaf",            { NULL }, 12753, "tcp" },
-  { "tsaf",            { NULL }, 12753, "udp" },
-  { "i-zipqd",         { NULL }, 13160, "tcp" },
-  { "i-zipqd",         { NULL }, 13160, "udp" },
-  { "bcslogc",         { NULL }, 13216, "tcp" },
-  { "bcslogc",         { NULL }, 13216, "udp" },
-  { "rs-pias",         { NULL }, 13217, "tcp" },
-  { "rs-pias",         { NULL }, 13217, "udp" },
-  { "emc-vcas-tcp",    { NULL }, 13218, "tcp" },
-  { "emc-vcas-udp",    { NULL }, 13218, "udp" },
-  { "powwow-client",   { NULL }, 13223, "tcp" },
-  { "powwow-client",   { NULL }, 13223, "udp" },
-  { "powwow-server",   { NULL }, 13224, "tcp" },
-  { "powwow-server",   { NULL }, 13224, "udp" },
-  { "doip-data",       { NULL }, 13400, "tcp" },
-  { "doip-disc",       { NULL }, 13400, "udp" },
-  { "bprd",            { NULL }, 13720, "tcp" },
-  { "bprd",            { NULL }, 13720, "udp" },
-  { "bpdbm",           { NULL }, 13721, "tcp" },
-  { "bpdbm",           { NULL }, 13721, "udp" },
-  { "bpjava-msvc",     { NULL }, 13722, "tcp" },
-  { "bpjava-msvc",     { NULL }, 13722, "udp" },
-  { "vnetd",           { NULL }, 13724, "tcp" },
-  { "vnetd",           { NULL }, 13724, "udp" },
-  { "bpcd",            { NULL }, 13782, "tcp" },
-  { "bpcd",            { NULL }, 13782, "udp" },
-  { "vopied",          { NULL }, 13783, "tcp" },
-  { "vopied",          { NULL }, 13783, "udp" },
-  { "nbdb",            { NULL }, 13785, "tcp" },
-  { "nbdb",            { NULL }, 13785, "udp" },
-  { "nomdb",           { NULL }, 13786, "tcp" },
-  { "nomdb",           { NULL }, 13786, "udp" },
-  { "dsmcc-config",    { NULL }, 13818, "tcp" },
-  { "dsmcc-config",    { NULL }, 13818, "udp" },
-  { "dsmcc-session",   { NULL }, 13819, "tcp" },
-  { "dsmcc-session",   { NULL }, 13819, "udp" },
-  { "dsmcc-passthru",  { NULL }, 13820, "tcp" },
-  { "dsmcc-passthru",  { NULL }, 13820, "udp" },
-  { "dsmcc-download",  { NULL }, 13821, "tcp" },
-  { "dsmcc-download",  { NULL }, 13821, "udp" },
-  { "dsmcc-ccp",       { NULL }, 13822, "tcp" },
-  { "dsmcc-ccp",       { NULL }, 13822, "udp" },
-  { "bmdss",           { NULL }, 13823, "tcp" },
-  { "dta-systems",     { NULL }, 13929, "tcp" },
-  { "dta-systems",     { NULL }, 13929, "udp" },
-  { "medevolve",       { NULL }, 13930, "tcp" },
-  { "scotty-ft",       { NULL }, 14000, "tcp" },
-  { "scotty-ft",       { NULL }, 14000, "udp" },
-  { "sua",             { NULL }, 14001, "tcp" },
-  { "sua",             { NULL }, 14001, "udp" },
-  { "sua",             { NULL }, 14001, "sctp"},
-  { "sage-best-com1",  { NULL }, 14033, "tcp" },
-  { "sage-best-com1",  { NULL }, 14033, "udp" },
-  { "sage-best-com2",  { NULL }, 14034, "tcp" },
-  { "sage-best-com2",  { NULL }, 14034, "udp" },
-  { "vcs-app",         { NULL }, 14141, "tcp" },
-  { "vcs-app",         { NULL }, 14141, "udp" },
-  { "icpp",            { NULL }, 14142, "tcp" },
-  { "icpp",            { NULL }, 14142, "udp" },
-  { "gcm-app",         { NULL }, 14145, "tcp" },
-  { "gcm-app",         { NULL }, 14145, "udp" },
-  { "vrts-tdd",        { NULL }, 14149, "tcp" },
-  { "vrts-tdd",        { NULL }, 14149, "udp" },
-  { "vcscmd",          { NULL }, 14150, "tcp" },
-  { "vad",             { NULL }, 14154, "tcp" },
-  { "vad",             { NULL }, 14154, "udp" },
-  { "cps",             { NULL }, 14250, "tcp" },
-  { "cps",             { NULL }, 14250, "udp" },
-  { "ca-web-update",   { NULL }, 14414, "tcp" },
-  { "ca-web-update",   { NULL }, 14414, "udp" },
-  { "hde-lcesrvr-1",   { NULL }, 14936, "tcp" },
-  { "hde-lcesrvr-1",   { NULL }, 14936, "udp" },
-  { "hde-lcesrvr-2",   { NULL }, 14937, "tcp" },
-  { "hde-lcesrvr-2",   { NULL }, 14937, "udp" },
-  { "hydap",           { NULL }, 15000, "tcp" },
-  { "hydap",           { NULL }, 15000, "udp" },
-  { "xpilot",          { NULL }, 15345, "tcp" },
-  { "xpilot",          { NULL }, 15345, "udp" },
-  { "3link",           { NULL }, 15363, "tcp" },
-  { "3link",           { NULL }, 15363, "udp" },
-  { "cisco-snat",      { NULL }, 15555, "tcp" },
-  { "cisco-snat",      { NULL }, 15555, "udp" },
-  { "bex-xr",          { NULL }, 15660, "tcp" },
-  { "bex-xr",          { NULL }, 15660, "udp" },
-  { "ptp",             { NULL }, 15740, "tcp" },
-  { "ptp",             { NULL }, 15740, "udp" },
-  { "2ping",           { NULL }, 15998, "udp" },
-  { "programmar",      { NULL }, 15999, "tcp" },
-  { "fmsas",           { NULL }, 16000, "tcp" },
-  { "fmsascon",        { NULL }, 16001, "tcp" },
-  { "gsms",            { NULL }, 16002, "tcp" },
-  { "alfin",           { NULL }, 16003, "udp" },
-  { "jwpc",            { NULL }, 16020, "tcp" },
-  { "jwpc-bin",        { NULL }, 16021, "tcp" },
-  { "sun-sea-port",    { NULL }, 16161, "tcp" },
-  { "sun-sea-port",    { NULL }, 16161, "udp" },
-  { "solaris-audit",   { NULL }, 16162, "tcp" },
-  { "etb4j",           { NULL }, 16309, "tcp" },
-  { "etb4j",           { NULL }, 16309, "udp" },
-  { "pduncs",          { NULL }, 16310, "tcp" },
-  { "pduncs",          { NULL }, 16310, "udp" },
-  { "pdefmns",         { NULL }, 16311, "tcp" },
-  { "pdefmns",         { NULL }, 16311, "udp" },
-  { "netserialext1",   { NULL }, 16360, "tcp" },
-  { "netserialext1",   { NULL }, 16360, "udp" },
-  { "netserialext2",   { NULL }, 16361, "tcp" },
-  { "netserialext2",   { NULL }, 16361, "udp" },
-  { "netserialext3",   { NULL }, 16367, "tcp" },
-  { "netserialext3",   { NULL }, 16367, "udp" },
-  { "netserialext4",   { NULL }, 16368, "tcp" },
-  { "netserialext4",   { NULL }, 16368, "udp" },
-  { "connected",       { NULL }, 16384, "tcp" },
-  { "connected",       { NULL }, 16384, "udp" },
-  { "xoms",            { NULL }, 16619, "tcp" },
-  { "newbay-snc-mc",   { NULL }, 16900, "tcp" },
-  { "newbay-snc-mc",   { NULL }, 16900, "udp" },
-  { "sgcip",           { NULL }, 16950, "tcp" },
-  { "sgcip",           { NULL }, 16950, "udp" },
-  { "intel-rci-mp",    { NULL }, 16991, "tcp" },
-  { "intel-rci-mp",    { NULL }, 16991, "udp" },
-  { "amt-soap-http",   { NULL }, 16992, "tcp" },
-  { "amt-soap-http",   { NULL }, 16992, "udp" },
-  { "amt-soap-https",  { NULL }, 16993, "tcp" },
-  { "amt-soap-https",  { NULL }, 16993, "udp" },
-  { "amt-redir-tcp",   { NULL }, 16994, "tcp" },
-  { "amt-redir-tcp",   { NULL }, 16994, "udp" },
-  { "amt-redir-tls",   { NULL }, 16995, "tcp" },
-  { "amt-redir-tls",   { NULL }, 16995, "udp" },
-  { "isode-dua",       { NULL }, 17007, "tcp" },
-  { "isode-dua",       { NULL }, 17007, "udp" },
-  { "soundsvirtual",   { NULL }, 17185, "tcp" },
-  { "soundsvirtual",   { NULL }, 17185, "udp" },
-  { "chipper",         { NULL }, 17219, "tcp" },
-  { "chipper",         { NULL }, 17219, "udp" },
-  { "integrius-stp",   { NULL }, 17234, "tcp" },
-  { "integrius-stp",   { NULL }, 17234, "udp" },
-  { "ssh-mgmt",        { NULL }, 17235, "tcp" },
-  { "ssh-mgmt",        { NULL }, 17235, "udp" },
-  { "db-lsp",          { NULL }, 17500, "tcp" },
-  { "db-lsp-disc",     { NULL }, 17500, "udp" },
-  { "ea",              { NULL }, 17729, "tcp" },
-  { "ea",              { NULL }, 17729, "udp" },
-  { "zep",             { NULL }, 17754, "tcp" },
-  { "zep",             { NULL }, 17754, "udp" },
-  { "zigbee-ip",       { NULL }, 17755, "tcp" },
-  { "zigbee-ip",       { NULL }, 17755, "udp" },
-  { "zigbee-ips",      { NULL }, 17756, "tcp" },
-  { "zigbee-ips",      { NULL }, 17756, "udp" },
-  { "sw-orion",        { NULL }, 17777, "tcp" },
-  { "biimenu",         { NULL }, 18000, "tcp" },
-  { "biimenu",         { NULL }, 18000, "udp" },
-  { "radpdf",          { NULL }, 18104, "tcp" },
-  { "racf",            { NULL }, 18136, "tcp" },
-  { "opsec-cvp",       { NULL }, 18181, "tcp" },
-  { "opsec-cvp",       { NULL }, 18181, "udp" },
-  { "opsec-ufp",       { NULL }, 18182, "tcp" },
-  { "opsec-ufp",       { NULL }, 18182, "udp" },
-  { "opsec-sam",       { NULL }, 18183, "tcp" },
-  { "opsec-sam",       { NULL }, 18183, "udp" },
-  { "opsec-lea",       { NULL }, 18184, "tcp" },
-  { "opsec-lea",       { NULL }, 18184, "udp" },
-  { "opsec-omi",       { NULL }, 18185, "tcp" },
-  { "opsec-omi",       { NULL }, 18185, "udp" },
-  { "ohsc",            { NULL }, 18186, "tcp" },
-  { "ohsc",            { NULL }, 18186, "udp" },
-  { "opsec-ela",       { NULL }, 18187, "tcp" },
-  { "opsec-ela",       { NULL }, 18187, "udp" },
-  { "checkpoint-rtm",  { NULL }, 18241, "tcp" },
-  { "checkpoint-rtm",  { NULL }, 18241, "udp" },
-  { "gv-pf",           { NULL }, 18262, "tcp" },
-  { "gv-pf",           { NULL }, 18262, "udp" },
-  { "ac-cluster",      { NULL }, 18463, "tcp" },
-  { "ac-cluster",      { NULL }, 18463, "udp" },
-  { "rds-ib",          { NULL }, 18634, "tcp" },
-  { "rds-ib",          { NULL }, 18634, "udp" },
-  { "rds-ip",          { NULL }, 18635, "tcp" },
-  { "rds-ip",          { NULL }, 18635, "udp" },
-  { "ique",            { NULL }, 18769, "tcp" },
-  { "ique",            { NULL }, 18769, "udp" },
-  { "infotos",         { NULL }, 18881, "tcp" },
-  { "infotos",         { NULL }, 18881, "udp" },
-  { "apc-necmp",       { NULL }, 18888, "tcp" },
-  { "apc-necmp",       { NULL }, 18888, "udp" },
-  { "igrid",           { NULL }, 19000, "tcp" },
-  { "igrid",           { NULL }, 19000, "udp" },
-  { "j-link",          { NULL }, 19020, "tcp" },
-  { "opsec-uaa",       { NULL }, 19191, "tcp" },
-  { "opsec-uaa",       { NULL }, 19191, "udp" },
-  { "ua-secureagent",  { NULL }, 19194, "tcp" },
-  { "ua-secureagent",  { NULL }, 19194, "udp" },
-  { "keysrvr",         { NULL }, 19283, "tcp" },
-  { "keysrvr",         { NULL }, 19283, "udp" },
-  { "keyshadow",       { NULL }, 19315, "tcp" },
-  { "keyshadow",       { NULL }, 19315, "udp" },
-  { "mtrgtrans",       { NULL }, 19398, "tcp" },
-  { "mtrgtrans",       { NULL }, 19398, "udp" },
-  { "hp-sco",          { NULL }, 19410, "tcp" },
-  { "hp-sco",          { NULL }, 19410, "udp" },
-  { "hp-sca",          { NULL }, 19411, "tcp" },
-  { "hp-sca",          { NULL }, 19411, "udp" },
-  { "hp-sessmon",      { NULL }, 19412, "tcp" },
-  { "hp-sessmon",      { NULL }, 19412, "udp" },
-  { "fxuptp",          { NULL }, 19539, "tcp" },
-  { "fxuptp",          { NULL }, 19539, "udp" },
-  { "sxuptp",          { NULL }, 19540, "tcp" },
-  { "sxuptp",          { NULL }, 19540, "udp" },
-  { "jcp",             { NULL }, 19541, "tcp" },
-  { "jcp",             { NULL }, 19541, "udp" },
-  { "iec-104-sec",     { NULL }, 19998, "tcp" },
-  { "dnp-sec",         { NULL }, 19999, "tcp" },
-  { "dnp-sec",         { NULL }, 19999, "udp" },
-  { "dnp",             { NULL }, 20000, "tcp" },
-  { "dnp",             { NULL }, 20000, "udp" },
-  { "microsan",        { NULL }, 20001, "tcp" },
-  { "microsan",        { NULL }, 20001, "udp" },
-  { "commtact-http",   { NULL }, 20002, "tcp" },
-  { "commtact-http",   { NULL }, 20002, "udp" },
-  { "commtact-https",  { NULL }, 20003, "tcp" },
-  { "commtact-https",  { NULL }, 20003, "udp" },
-  { "openwebnet",      { NULL }, 20005, "tcp" },
-  { "openwebnet",      { NULL }, 20005, "udp" },
-  { "ss-idi-disc",     { NULL }, 20012, "udp" },
-  { "ss-idi",          { NULL }, 20013, "tcp" },
-  { "opendeploy",      { NULL }, 20014, "tcp" },
-  { "opendeploy",      { NULL }, 20014, "udp" },
-  { "nburn_id",        { NULL }, 20034, "tcp" },
-  { "nburn_id",        { NULL }, 20034, "udp" },
-  { "tmophl7mts",      { NULL }, 20046, "tcp" },
-  { "tmophl7mts",      { NULL }, 20046, "udp" },
-  { "mountd",          { NULL }, 20048, "tcp" },
-  { "mountd",          { NULL }, 20048, "udp" },
-  { "nfsrdma",         { NULL }, 20049, "tcp" },
-  { "nfsrdma",         { NULL }, 20049, "udp" },
-  { "nfsrdma",         { NULL }, 20049, "sctp"},
-  { "tolfab",          { NULL }, 20167, "tcp" },
-  { "tolfab",          { NULL }, 20167, "udp" },
-  { "ipdtp-port",      { NULL }, 20202, "tcp" },
-  { "ipdtp-port",      { NULL }, 20202, "udp" },
-  { "ipulse-ics",      { NULL }, 20222, "tcp" },
-  { "ipulse-ics",      { NULL }, 20222, "udp" },
-  { "emwavemsg",       { NULL }, 20480, "tcp" },
-  { "emwavemsg",       { NULL }, 20480, "udp" },
-  { "track",           { NULL }, 20670, "tcp" },
-  { "track",           { NULL }, 20670, "udp" },
-  { "athand-mmp",      { NULL }, 20999, "tcp" },
-  { "athand-mmp",      { NULL }, 20999, "udp" },
-  { "irtrans",         { NULL }, 21000, "tcp" },
-  { "irtrans",         { NULL }, 21000, "udp" },
-  { "dfserver",        { NULL }, 21554, "tcp" },
-  { "dfserver",        { NULL }, 21554, "udp" },
-  { "vofr-gateway",    { NULL }, 21590, "tcp" },
-  { "vofr-gateway",    { NULL }, 21590, "udp" },
-  { "tvpm",            { NULL }, 21800, "tcp" },
-  { "tvpm",            { NULL }, 21800, "udp" },
-  { "webphone",        { NULL }, 21845, "tcp" },
-  { "webphone",        { NULL }, 21845, "udp" },
-  { "netspeak-is",     { NULL }, 21846, "tcp" },
-  { "netspeak-is",     { NULL }, 21846, "udp" },
-  { "netspeak-cs",     { NULL }, 21847, "tcp" },
-  { "netspeak-cs",     { NULL }, 21847, "udp" },
-  { "netspeak-acd",    { NULL }, 21848, "tcp" },
-  { "netspeak-acd",    { NULL }, 21848, "udp" },
-  { "netspeak-cps",    { NULL }, 21849, "tcp" },
-  { "netspeak-cps",    { NULL }, 21849, "udp" },
-  { "snapenetio",      { NULL }, 22000, "tcp" },
-  { "snapenetio",      { NULL }, 22000, "udp" },
-  { "optocontrol",     { NULL }, 22001, "tcp" },
-  { "optocontrol",     { NULL }, 22001, "udp" },
-  { "optohost002",     { NULL }, 22002, "tcp" },
-  { "optohost002",     { NULL }, 22002, "udp" },
-  { "optohost003",     { NULL }, 22003, "tcp" },
-  { "optohost003",     { NULL }, 22003, "udp" },
-  { "optohost004",     { NULL }, 22004, "tcp" },
-  { "optohost004",     { NULL }, 22004, "udp" },
-  { "optohost004",     { NULL }, 22005, "tcp" },
-  { "optohost004",     { NULL }, 22005, "udp" },
-  { "dcap",            { NULL }, 22125, "tcp" },
-  { "gsidcap",         { NULL }, 22128, "tcp" },
-  { "wnn6",            { NULL }, 22273, "tcp" },
-  { "wnn6",            { NULL }, 22273, "udp" },
-  { "cis",             { NULL }, 22305, "tcp" },
-  { "cis",             { NULL }, 22305, "udp" },
-  { "cis-secure",      { NULL }, 22343, "tcp" },
-  { "cis-secure",      { NULL }, 22343, "udp" },
-  { "WibuKey",         { NULL }, 22347, "tcp" },
-  { "WibuKey",         { NULL }, 22347, "udp" },
-  { "CodeMeter",       { NULL }, 22350, "tcp" },
-  { "CodeMeter",       { NULL }, 22350, "udp" },
-  { "vocaltec-wconf",  { NULL }, 22555, "tcp" },
-  { "vocaltec-phone",  { NULL }, 22555, "udp" },
-  { "talikaserver",    { NULL }, 22763, "tcp" },
-  { "talikaserver",    { NULL }, 22763, "udp" },
-  { "aws-brf",         { NULL }, 22800, "tcp" },
-  { "aws-brf",         { NULL }, 22800, "udp" },
-  { "brf-gw",          { NULL }, 22951, "tcp" },
-  { "brf-gw",          { NULL }, 22951, "udp" },
-  { "inovaport1",      { NULL }, 23000, "tcp" },
-  { "inovaport1",      { NULL }, 23000, "udp" },
-  { "inovaport2",      { NULL }, 23001, "tcp" },
-  { "inovaport2",      { NULL }, 23001, "udp" },
-  { "inovaport3",      { NULL }, 23002, "tcp" },
-  { "inovaport3",      { NULL }, 23002, "udp" },
-  { "inovaport4",      { NULL }, 23003, "tcp" },
-  { "inovaport4",      { NULL }, 23003, "udp" },
-  { "inovaport5",      { NULL }, 23004, "tcp" },
-  { "inovaport5",      { NULL }, 23004, "udp" },
-  { "inovaport6",      { NULL }, 23005, "tcp" },
-  { "inovaport6",      { NULL }, 23005, "udp" },
-  { "s102",            { NULL }, 23272, "udp" },
-  { "elxmgmt",         { NULL }, 23333, "tcp" },
-  { "elxmgmt",         { NULL }, 23333, "udp" },
-  { "novar-dbase",     { NULL }, 23400, "tcp" },
-  { "novar-dbase",     { NULL }, 23400, "udp" },
-  { "novar-alarm",     { NULL }, 23401, "tcp" },
-  { "novar-alarm",     { NULL }, 23401, "udp" },
-  { "novar-global",    { NULL }, 23402, "tcp" },
-  { "novar-global",    { NULL }, 23402, "udp" },
-  { "aequus",          { NULL }, 23456, "tcp" },
-  { "aequus-alt",      { NULL }, 23457, "tcp" },
-  { "med-ltp",         { NULL }, 24000, "tcp" },
-  { "med-ltp",         { NULL }, 24000, "udp" },
-  { "med-fsp-rx",      { NULL }, 24001, "tcp" },
-  { "med-fsp-rx",      { NULL }, 24001, "udp" },
-  { "med-fsp-tx",      { NULL }, 24002, "tcp" },
-  { "med-fsp-tx",      { NULL }, 24002, "udp" },
-  { "med-supp",        { NULL }, 24003, "tcp" },
-  { "med-supp",        { NULL }, 24003, "udp" },
-  { "med-ovw",         { NULL }, 24004, "tcp" },
-  { "med-ovw",         { NULL }, 24004, "udp" },
-  { "med-ci",          { NULL }, 24005, "tcp" },
-  { "med-ci",          { NULL }, 24005, "udp" },
-  { "med-net-svc",     { NULL }, 24006, "tcp" },
-  { "med-net-svc",     { NULL }, 24006, "udp" },
-  { "filesphere",      { NULL }, 24242, "tcp" },
-  { "filesphere",      { NULL }, 24242, "udp" },
-  { "vista-4gl",       { NULL }, 24249, "tcp" },
-  { "vista-4gl",       { NULL }, 24249, "udp" },
-  { "ild",             { NULL }, 24321, "tcp" },
-  { "ild",             { NULL }, 24321, "udp" },
-  { "intel_rci",       { NULL }, 24386, "tcp" },
-  { "intel_rci",       { NULL }, 24386, "udp" },
-  { "tonidods",        { NULL }, 24465, "tcp" },
-  { "tonidods",        { NULL }, 24465, "udp" },
-  { "binkp",           { NULL }, 24554, "tcp" },
-  { "binkp",           { NULL }, 24554, "udp" },
-  { "canditv",         { NULL }, 24676, "tcp" },
-  { "canditv",         { NULL }, 24676, "udp" },
-  { "flashfiler",      { NULL }, 24677, "tcp" },
-  { "flashfiler",      { NULL }, 24677, "udp" },
-  { "proactivate",     { NULL }, 24678, "tcp" },
-  { "proactivate",     { NULL }, 24678, "udp" },
-  { "tcc-http",        { NULL }, 24680, "tcp" },
-  { "tcc-http",        { NULL }, 24680, "udp" },
-  { "cslg",            { NULL }, 24754, "tcp" },
-  { "find",            { NULL }, 24922, "tcp" },
-  { "find",            { NULL }, 24922, "udp" },
-  { "icl-twobase1",    { NULL }, 25000, "tcp" },
-  { "icl-twobase1",    { NULL }, 25000, "udp" },
-  { "icl-twobase2",    { NULL }, 25001, "tcp" },
-  { "icl-twobase2",    { NULL }, 25001, "udp" },
-  { "icl-twobase3",    { NULL }, 25002, "tcp" },
-  { "icl-twobase3",    { NULL }, 25002, "udp" },
-  { "icl-twobase4",    { NULL }, 25003, "tcp" },
-  { "icl-twobase4",    { NULL }, 25003, "udp" },
-  { "icl-twobase5",    { NULL }, 25004, "tcp" },
-  { "icl-twobase5",    { NULL }, 25004, "udp" },
-  { "icl-twobase6",    { NULL }, 25005, "tcp" },
-  { "icl-twobase6",    { NULL }, 25005, "udp" },
-  { "icl-twobase7",    { NULL }, 25006, "tcp" },
-  { "icl-twobase7",    { NULL }, 25006, "udp" },
-  { "icl-twobase8",    { NULL }, 25007, "tcp" },
-  { "icl-twobase8",    { NULL }, 25007, "udp" },
-  { "icl-twobase9",    { NULL }, 25008, "tcp" },
-  { "icl-twobase9",    { NULL }, 25008, "udp" },
-  { "icl-twobase10",   { NULL }, 25009, "tcp" },
-  { "icl-twobase10",   { NULL }, 25009, "udp" },
-  { "rna",             { NULL }, 25471, "sctp"},
-  { "sauterdongle",    { NULL }, 25576, "tcp" },
-  { "vocaltec-hos",    { NULL }, 25793, "tcp" },
-  { "vocaltec-hos",    { NULL }, 25793, "udp" },
-  { "tasp-net",        { NULL }, 25900, "tcp" },
-  { "tasp-net",        { NULL }, 25900, "udp" },
-  { "niobserver",      { NULL }, 25901, "tcp" },
-  { "niobserver",      { NULL }, 25901, "udp" },
-  { "nilinkanalyst",   { NULL }, 25902, "tcp" },
-  { "nilinkanalyst",   { NULL }, 25902, "udp" },
-  { "niprobe",         { NULL }, 25903, "tcp" },
-  { "niprobe",         { NULL }, 25903, "udp" },
-  { "quake",           { NULL }, 26000, "tcp" },
-  { "quake",           { NULL }, 26000, "udp" },
-  { "scscp",           { NULL }, 26133, "tcp" },
-  { "scscp",           { NULL }, 26133, "udp" },
-  { "wnn6-ds",         { NULL }, 26208, "tcp" },
-  { "wnn6-ds",         { NULL }, 26208, "udp" },
-  { "ezproxy",         { NULL }, 26260, "tcp" },
-  { "ezproxy",         { NULL }, 26260, "udp" },
-  { "ezmeeting",       { NULL }, 26261, "tcp" },
-  { "ezmeeting",       { NULL }, 26261, "udp" },
-  { "k3software-svr",  { NULL }, 26262, "tcp" },
-  { "k3software-svr",  { NULL }, 26262, "udp" },
-  { "k3software-cli",  { NULL }, 26263, "tcp" },
-  { "k3software-cli",  { NULL }, 26263, "udp" },
-  { "exoline-tcp",     { NULL }, 26486, "tcp" },
-  { "exoline-udp",     { NULL }, 26486, "udp" },
-  { "exoconfig",       { NULL }, 26487, "tcp" },
-  { "exoconfig",       { NULL }, 26487, "udp" },
-  { "exonet",          { NULL }, 26489, "tcp" },
-  { "exonet",          { NULL }, 26489, "udp" },
-  { "imagepump",       { NULL }, 27345, "tcp" },
-  { "imagepump",       { NULL }, 27345, "udp" },
-  { "jesmsjc",         { NULL }, 27442, "tcp" },
-  { "jesmsjc",         { NULL }, 27442, "udp" },
-  { "kopek-httphead",  { NULL }, 27504, "tcp" },
-  { "kopek-httphead",  { NULL }, 27504, "udp" },
-  { "ars-vista",       { NULL }, 27782, "tcp" },
-  { "ars-vista",       { NULL }, 27782, "udp" },
-  { "tw-auth-key",     { NULL }, 27999, "tcp" },
-  { "tw-auth-key",     { NULL }, 27999, "udp" },
-  { "nxlmd",           { NULL }, 28000, "tcp" },
-  { "nxlmd",           { NULL }, 28000, "udp" },
-  { "pqsp",            { NULL }, 28001, "tcp" },
-  { "siemensgsm",      { NULL }, 28240, "tcp" },
-  { "siemensgsm",      { NULL }, 28240, "udp" },
-  { "sgsap",           { NULL }, 29118, "sctp"},
-  { "otmp",            { NULL }, 29167, "tcp" },
-  { "otmp",            { NULL }, 29167, "udp" },
-  { "sbcap",           { NULL }, 29168, "sctp"},
-  { "iuhsctpassoc",    { NULL }, 29169, "sctp"},
-  { "pago-services1",  { NULL }, 30001, "tcp" },
-  { "pago-services1",  { NULL }, 30001, "udp" },
-  { "pago-services2",  { NULL }, 30002, "tcp" },
-  { "pago-services2",  { NULL }, 30002, "udp" },
-  { "kingdomsonline",  { NULL }, 30260, "tcp" },
-  { "kingdomsonline",  { NULL }, 30260, "udp" },
-  { "ovobs",           { NULL }, 30999, "tcp" },
-  { "ovobs",           { NULL }, 30999, "udp" },
-  { "autotrac-acp",    { NULL }, 31020, "tcp" },
-  { "yawn",            { NULL }, 31029, "udp" },
-  { "xqosd",           { NULL }, 31416, "tcp" },
-  { "xqosd",           { NULL }, 31416, "udp" },
-  { "tetrinet",        { NULL }, 31457, "tcp" },
-  { "tetrinet",        { NULL }, 31457, "udp" },
-  { "lm-mon",          { NULL }, 31620, "tcp" },
-  { "lm-mon",          { NULL }, 31620, "udp" },
-  { "dsx_monitor",     { NULL }, 31685, "tcp" },
-  { "gamesmith-port",  { NULL }, 31765, "tcp" },
-  { "gamesmith-port",  { NULL }, 31765, "udp" },
-  { "iceedcp_tx",      { NULL }, 31948, "tcp" },
-  { "iceedcp_tx",      { NULL }, 31948, "udp" },
-  { "iceedcp_rx",      { NULL }, 31949, "tcp" },
-  { "iceedcp_rx",      { NULL }, 31949, "udp" },
-  { "iracinghelper",   { NULL }, 32034, "tcp" },
-  { "iracinghelper",   { NULL }, 32034, "udp" },
-  { "t1distproc60",    { NULL }, 32249, "tcp" },
-  { "t1distproc60",    { NULL }, 32249, "udp" },
-  { "apm-link",        { NULL }, 32483, "tcp" },
-  { "apm-link",        { NULL }, 32483, "udp" },
-  { "sec-ntb-clnt",    { NULL }, 32635, "tcp" },
-  { "sec-ntb-clnt",    { NULL }, 32635, "udp" },
-  { "DMExpress",       { NULL }, 32636, "tcp" },
-  { "DMExpress",       { NULL }, 32636, "udp" },
-  { "filenet-powsrm",  { NULL }, 32767, "tcp" },
-  { "filenet-powsrm",  { NULL }, 32767, "udp" },
-  { "filenet-tms",     { NULL }, 32768, "tcp" },
-  { "filenet-tms",     { NULL }, 32768, "udp" },
-  { "filenet-rpc",     { NULL }, 32769, "tcp" },
-  { "filenet-rpc",     { NULL }, 32769, "udp" },
-  { "filenet-nch",     { NULL }, 32770, "tcp" },
-  { "filenet-nch",     { NULL }, 32770, "udp" },
-  { "filenet-rmi",     { NULL }, 32771, "tcp" },
-  { "filenet-rmi",     { NULL }, 32771, "udp" },
-  { "filenet-pa",      { NULL }, 32772, "tcp" },
-  { "filenet-pa",      { NULL }, 32772, "udp" },
-  { "filenet-cm",      { NULL }, 32773, "tcp" },
-  { "filenet-cm",      { NULL }, 32773, "udp" },
-  { "filenet-re",      { NULL }, 32774, "tcp" },
-  { "filenet-re",      { NULL }, 32774, "udp" },
-  { "filenet-pch",     { NULL }, 32775, "tcp" },
-  { "filenet-pch",     { NULL }, 32775, "udp" },
-  { "filenet-peior",   { NULL }, 32776, "tcp" },
-  { "filenet-peior",   { NULL }, 32776, "udp" },
-  { "filenet-obrok",   { NULL }, 32777, "tcp" },
-  { "filenet-obrok",   { NULL }, 32777, "udp" },
-  { "mlsn",            { NULL }, 32801, "tcp" },
-  { "mlsn",            { NULL }, 32801, "udp" },
-  { "retp",            { NULL }, 32811, "tcp" },
-  { "idmgratm",        { NULL }, 32896, "tcp" },
-  { "idmgratm",        { NULL }, 32896, "udp" },
-  { "aurora-balaena",  { NULL }, 33123, "tcp" },
-  { "aurora-balaena",  { NULL }, 33123, "udp" },
-  { "diamondport",     { NULL }, 33331, "tcp" },
-  { "diamondport",     { NULL }, 33331, "udp" },
-  { "dgi-serv",        { NULL }, 33333, "tcp" },
-  { "traceroute",      { NULL }, 33434, "tcp" },
-  { "traceroute",      { NULL }, 33434, "udp" },
-  { "snip-slave",      { NULL }, 33656, "tcp" },
-  { "snip-slave",      { NULL }, 33656, "udp" },
-  { "turbonote-2",     { NULL }, 34249, "tcp" },
-  { "turbonote-2",     { NULL }, 34249, "udp" },
-  { "p-net-local",     { NULL }, 34378, "tcp" },
-  { "p-net-local",     { NULL }, 34378, "udp" },
-  { "p-net-remote",    { NULL }, 34379, "tcp" },
-  { "p-net-remote",    { NULL }, 34379, "udp" },
-  { "dhanalakshmi",    { NULL }, 34567, "tcp" },
-  { "profinet-rt",     { NULL }, 34962, "tcp" },
-  { "profinet-rt",     { NULL }, 34962, "udp" },
-  { "profinet-rtm",    { NULL }, 34963, "tcp" },
-  { "profinet-rtm",    { NULL }, 34963, "udp" },
-  { "profinet-cm",     { NULL }, 34964, "tcp" },
-  { "profinet-cm",     { NULL }, 34964, "udp" },
-  { "ethercat",        { NULL }, 34980, "tcp" },
-  { "ethercat",        { NULL }, 34980, "udp" },
-  { "allpeers",        { NULL }, 36001, "tcp" },
-  { "allpeers",        { NULL }, 36001, "udp" },
-  { "s1-control",      { NULL }, 36412, "sctp"},
-  { "x2-control",      { NULL }, 36422, "sctp"},
-  { "m2ap",            { NULL }, 36443, "sctp"},
-  { "m3ap",            { NULL }, 36444, "sctp"},
-  { "kastenxpipe",     { NULL }, 36865, "tcp" },
-  { "kastenxpipe",     { NULL }, 36865, "udp" },
-  { "neckar",          { NULL }, 37475, "tcp" },
-  { "neckar",          { NULL }, 37475, "udp" },
-  { "unisys-eportal",  { NULL }, 37654, "tcp" },
-  { "unisys-eportal",  { NULL }, 37654, "udp" },
-  { "galaxy7-data",    { NULL }, 38201, "tcp" },
-  { "galaxy7-data",    { NULL }, 38201, "udp" },
-  { "fairview",        { NULL }, 38202, "tcp" },
-  { "fairview",        { NULL }, 38202, "udp" },
-  { "agpolicy",        { NULL }, 38203, "tcp" },
-  { "agpolicy",        { NULL }, 38203, "udp" },
-  { "turbonote-1",     { NULL }, 39681, "tcp" },
-  { "turbonote-1",     { NULL }, 39681, "udp" },
-  { "safetynetp",      { NULL }, 40000, "tcp" },
-  { "safetynetp",      { NULL }, 40000, "udp" },
-  { "cscp",            { NULL }, 40841, "tcp" },
-  { "cscp",            { NULL }, 40841, "udp" },
-  { "csccredir",       { NULL }, 40842, "tcp" },
-  { "csccredir",       { NULL }, 40842, "udp" },
-  { "csccfirewall",    { NULL }, 40843, "tcp" },
-  { "csccfirewall",    { NULL }, 40843, "udp" },
-  { "ortec-disc",      { NULL }, 40853, "udp" },
-  { "fs-qos",          { NULL }, 41111, "tcp" },
-  { "fs-qos",          { NULL }, 41111, "udp" },
-  { "tentacle",        { NULL }, 41121, "tcp" },
-  { "crestron-cip",    { NULL }, 41794, "tcp" },
-  { "crestron-cip",    { NULL }, 41794, "udp" },
-  { "crestron-ctp",    { NULL }, 41795, "tcp" },
-  { "crestron-ctp",    { NULL }, 41795, "udp" },
-  { "candp",           { NULL }, 42508, "tcp" },
-  { "candp",           { NULL }, 42508, "udp" },
-  { "candrp",          { NULL }, 42509, "tcp" },
-  { "candrp",          { NULL }, 42509, "udp" },
-  { "caerpc",          { NULL }, 42510, "tcp" },
-  { "caerpc",          { NULL }, 42510, "udp" },
-  { "reachout",        { NULL }, 43188, "tcp" },
-  { "reachout",        { NULL }, 43188, "udp" },
-  { "ndm-agent-port",  { NULL }, 43189, "tcp" },
-  { "ndm-agent-port",  { NULL }, 43189, "udp" },
-  { "ip-provision",    { NULL }, 43190, "tcp" },
-  { "ip-provision",    { NULL }, 43190, "udp" },
-  { "noit-transport",  { NULL }, 43191, "tcp" },
-  { "ew-mgmt",         { NULL }, 43440, "tcp" },
-  { "ew-disc-cmd",     { NULL }, 43440, "udp" },
-  { "ciscocsdb",       { NULL }, 43441, "tcp" },
-  { "ciscocsdb",       { NULL }, 43441, "udp" },
-  { "pmcd",            { NULL }, 44321, "tcp" },
-  { "pmcd",            { NULL }, 44321, "udp" },
-  { "pmcdproxy",       { NULL }, 44322, "tcp" },
-  { "pmcdproxy",       { NULL }, 44322, "udp" },
-  { "pcp",             { NULL }, 44323, "udp" },
-  { "rbr-debug",       { NULL }, 44553, "tcp" },
-  { "rbr-debug",       { NULL }, 44553, "udp" },
-  { "EtherNet/IP-2",   { NULL }, 44818, "tcp" },
-  { "EtherNet/IP-2",   { NULL }, 44818, "udp" },
-  { "invision-ag",     { NULL }, 45054, "tcp" },
-  { "invision-ag",     { NULL }, 45054, "udp" },
-  { "eba",             { NULL }, 45678, "tcp" },
-  { "eba",             { NULL }, 45678, "udp" },
-  { "qdb2service",     { NULL }, 45825, "tcp" },
-  { "qdb2service",     { NULL }, 45825, "udp" },
-  { "ssr-servermgr",   { NULL }, 45966, "tcp" },
-  { "ssr-servermgr",   { NULL }, 45966, "udp" },
-  { "mediabox",        { NULL }, 46999, "tcp" },
-  { "mediabox",        { NULL }, 46999, "udp" },
-  { "mbus",            { NULL }, 47000, "tcp" },
-  { "mbus",            { NULL }, 47000, "udp" },
-  { "winrm",           { NULL }, 47001, "tcp" },
-  { "dbbrowse",        { NULL }, 47557, "tcp" },
-  { "dbbrowse",        { NULL }, 47557, "udp" },
-  { "directplaysrvr",  { NULL }, 47624, "tcp" },
-  { "directplaysrvr",  { NULL }, 47624, "udp" },
-  { "ap",              { NULL }, 47806, "tcp" },
-  { "ap",              { NULL }, 47806, "udp" },
-  { "bacnet",          { NULL }, 47808, "tcp" },
-  { "bacnet",          { NULL }, 47808, "udp" },
-  { "nimcontroller",   { NULL }, 48000, "tcp" },
-  { "nimcontroller",   { NULL }, 48000, "udp" },
-  { "nimspooler",      { NULL }, 48001, "tcp" },
-  { "nimspooler",      { NULL }, 48001, "udp" },
-  { "nimhub",          { NULL }, 48002, "tcp" },
-  { "nimhub",          { NULL }, 48002, "udp" },
-  { "nimgtw",          { NULL }, 48003, "tcp" },
-  { "nimgtw",          { NULL }, 48003, "udp" },
-  { "nimbusdb",        { NULL }, 48004, "tcp" },
-  { "nimbusdbctrl",    { NULL }, 48005, "tcp" },
-  { "3gpp-cbsp",       { NULL }, 48049, "tcp" },
-  { "isnetserv",       { NULL }, 48128, "tcp" },
-  { "isnetserv",       { NULL }, 48128, "udp" },
-  { "blp5",            { NULL }, 48129, "tcp" },
-  { "blp5",            { NULL }, 48129, "udp" },
-  { "com-bardac-dw",   { NULL }, 48556, "tcp" },
-  { "com-bardac-dw",   { NULL }, 48556, "udp" },
-  { "iqobject",        { NULL }, 48619, "tcp" },
-  { "iqobject",        { NULL }, 48619, "udp" },
+  { "blackjack",       { NULL }, 1025,  "tcp"  },
+  { "blackjack",       { NULL }, 1025,  "udp"  },
+  { "cap",             { NULL }, 1026,  "tcp"  },
+  { "cap",             { NULL }, 1026,  "udp"  },
+  { "solid-mux",       { NULL }, 1029,  "tcp"  },
+  { "solid-mux",       { NULL }, 1029,  "udp"  },
+  { "iad1",            { NULL }, 1030,  "tcp"  },
+  { "iad1",            { NULL }, 1030,  "udp"  },
+  { "iad2",            { NULL }, 1031,  "tcp"  },
+  { "iad2",            { NULL }, 1031,  "udp"  },
+  { "iad3",            { NULL }, 1032,  "tcp"  },
+  { "iad3",            { NULL }, 1032,  "udp"  },
+  { "netinfo-local",   { NULL }, 1033,  "tcp"  },
+  { "netinfo-local",   { NULL }, 1033,  "udp"  },
+  { "activesync",      { NULL }, 1034,  "tcp"  },
+  { "activesync",      { NULL }, 1034,  "udp"  },
+  { "mxxrlogin",       { NULL }, 1035,  "tcp"  },
+  { "mxxrlogin",       { NULL }, 1035,  "udp"  },
+  { "nsstp",           { NULL }, 1036,  "tcp"  },
+  { "nsstp",           { NULL }, 1036,  "udp"  },
+  { "ams",             { NULL }, 1037,  "tcp"  },
+  { "ams",             { NULL }, 1037,  "udp"  },
+  { "mtqp",            { NULL }, 1038,  "tcp"  },
+  { "mtqp",            { NULL }, 1038,  "udp"  },
+  { "sbl",             { NULL }, 1039,  "tcp"  },
+  { "sbl",             { NULL }, 1039,  "udp"  },
+  { "netarx",          { NULL }, 1040,  "tcp"  },
+  { "netarx",          { NULL }, 1040,  "udp"  },
+  { "danf-ak2",        { NULL }, 1041,  "tcp"  },
+  { "danf-ak2",        { NULL }, 1041,  "udp"  },
+  { "afrog",           { NULL }, 1042,  "tcp"  },
+  { "afrog",           { NULL }, 1042,  "udp"  },
+  { "boinc-client",    { NULL }, 1043,  "tcp"  },
+  { "boinc-client",    { NULL }, 1043,  "udp"  },
+  { "dcutility",       { NULL }, 1044,  "tcp"  },
+  { "dcutility",       { NULL }, 1044,  "udp"  },
+  { "fpitp",           { NULL }, 1045,  "tcp"  },
+  { "fpitp",           { NULL }, 1045,  "udp"  },
+  { "wfremotertm",     { NULL }, 1046,  "tcp"  },
+  { "wfremotertm",     { NULL }, 1046,  "udp"  },
+  { "neod1",           { NULL }, 1047,  "tcp"  },
+  { "neod1",           { NULL }, 1047,  "udp"  },
+  { "neod2",           { NULL }, 1048,  "tcp"  },
+  { "neod2",           { NULL }, 1048,  "udp"  },
+  { "td-postman",      { NULL }, 1049,  "tcp"  },
+  { "td-postman",      { NULL }, 1049,  "udp"  },
+  { "cma",             { NULL }, 1050,  "tcp"  },
+  { "cma",             { NULL }, 1050,  "udp"  },
+  { "optima-vnet",     { NULL }, 1051,  "tcp"  },
+  { "optima-vnet",     { NULL }, 1051,  "udp"  },
+  { "ddt",             { NULL }, 1052,  "tcp"  },
+  { "ddt",             { NULL }, 1052,  "udp"  },
+  { "remote-as",       { NULL }, 1053,  "tcp"  },
+  { "remote-as",       { NULL }, 1053,  "udp"  },
+  { "brvread",         { NULL }, 1054,  "tcp"  },
+  { "brvread",         { NULL }, 1054,  "udp"  },
+  { "ansyslmd",        { NULL }, 1055,  "tcp"  },
+  { "ansyslmd",        { NULL }, 1055,  "udp"  },
+  { "vfo",             { NULL }, 1056,  "tcp"  },
+  { "vfo",             { NULL }, 1056,  "udp"  },
+  { "startron",        { NULL }, 1057,  "tcp"  },
+  { "startron",        { NULL }, 1057,  "udp"  },
+  { "nim",             { NULL }, 1058,  "tcp"  },
+  { "nim",             { NULL }, 1058,  "udp"  },
+  { "nimreg",          { NULL }, 1059,  "tcp"  },
+  { "nimreg",          { NULL }, 1059,  "udp"  },
+  { "polestar",        { NULL }, 1060,  "tcp"  },
+  { "polestar",        { NULL }, 1060,  "udp"  },
+  { "kiosk",           { NULL }, 1061,  "tcp"  },
+  { "kiosk",           { NULL }, 1061,  "udp"  },
+  { "veracity",        { NULL }, 1062,  "tcp"  },
+  { "veracity",        { NULL }, 1062,  "udp"  },
+  { "kyoceranetdev",   { NULL }, 1063,  "tcp"  },
+  { "kyoceranetdev",   { NULL }, 1063,  "udp"  },
+  { "jstel",           { NULL }, 1064,  "tcp"  },
+  { "jstel",           { NULL }, 1064,  "udp"  },
+  { "syscomlan",       { NULL }, 1065,  "tcp"  },
+  { "syscomlan",       { NULL }, 1065,  "udp"  },
+  { "fpo-fns",         { NULL }, 1066,  "tcp"  },
+  { "fpo-fns",         { NULL }, 1066,  "udp"  },
+  { "instl_boots",     { NULL }, 1067,  "tcp"  },
+  { "instl_boots",     { NULL }, 1067,  "udp"  },
+  { "instl_bootc",     { NULL }, 1068,  "tcp"  },
+  { "instl_bootc",     { NULL }, 1068,  "udp"  },
+  { "cognex-insight",  { NULL }, 1069,  "tcp"  },
+  { "cognex-insight",  { NULL }, 1069,  "udp"  },
+  { "gmrupdateserv",   { NULL }, 1070,  "tcp"  },
+  { "gmrupdateserv",   { NULL }, 1070,  "udp"  },
+  { "bsquare-voip",    { NULL }, 1071,  "tcp"  },
+  { "bsquare-voip",    { NULL }, 1071,  "udp"  },
+  { "cardax",          { NULL }, 1072,  "tcp"  },
+  { "cardax",          { NULL }, 1072,  "udp"  },
+  { "bridgecontrol",   { NULL }, 1073,  "tcp"  },
+  { "bridgecontrol",   { NULL }, 1073,  "udp"  },
+  { "warmspotMgmt",    { NULL }, 1074,  "tcp"  },
+  { "warmspotMgmt",    { NULL }, 1074,  "udp"  },
+  { "rdrmshc",         { NULL }, 1075,  "tcp"  },
+  { "rdrmshc",         { NULL }, 1075,  "udp"  },
+  { "dab-sti-c",       { NULL }, 1076,  "tcp"  },
+  { "dab-sti-c",       { NULL }, 1076,  "udp"  },
+  { "imgames",         { NULL }, 1077,  "tcp"  },
+  { "imgames",         { NULL }, 1077,  "udp"  },
+  { "avocent-proxy",   { NULL }, 1078,  "tcp"  },
+  { "avocent-proxy",   { NULL }, 1078,  "udp"  },
+  { "asprovatalk",     { NULL }, 1079,  "tcp"  },
+  { "asprovatalk",     { NULL }, 1079,  "udp"  },
+  { "socks",           { NULL }, 1080,  "tcp"  },
+  { "socks",           { NULL }, 1080,  "udp"  },
+  { "pvuniwien",       { NULL }, 1081,  "tcp"  },
+  { "pvuniwien",       { NULL }, 1081,  "udp"  },
+  { "amt-esd-prot",    { NULL }, 1082,  "tcp"  },
+  { "amt-esd-prot",    { NULL }, 1082,  "udp"  },
+  { "ansoft-lm-1",     { NULL }, 1083,  "tcp"  },
+  { "ansoft-lm-1",     { NULL }, 1083,  "udp"  },
+  { "ansoft-lm-2",     { NULL }, 1084,  "tcp"  },
+  { "ansoft-lm-2",     { NULL }, 1084,  "udp"  },
+  { "webobjects",      { NULL }, 1085,  "tcp"  },
+  { "webobjects",      { NULL }, 1085,  "udp"  },
+  { "cplscrambler-lg", { NULL }, 1086,  "tcp"  },
+  { "cplscrambler-lg", { NULL }, 1086,  "udp"  },
+  { "cplscrambler-in", { NULL }, 1087,  "tcp"  },
+  { "cplscrambler-in", { NULL }, 1087,  "udp"  },
+  { "cplscrambler-al", { NULL }, 1088,  "tcp"  },
+  { "cplscrambler-al", { NULL }, 1088,  "udp"  },
+  { "ff-annunc",       { NULL }, 1089,  "tcp"  },
+  { "ff-annunc",       { NULL }, 1089,  "udp"  },
+  { "ff-fms",          { NULL }, 1090,  "tcp"  },
+  { "ff-fms",          { NULL }, 1090,  "udp"  },
+  { "ff-sm",           { NULL }, 1091,  "tcp"  },
+  { "ff-sm",           { NULL }, 1091,  "udp"  },
+  { "obrpd",           { NULL }, 1092,  "tcp"  },
+  { "obrpd",           { NULL }, 1092,  "udp"  },
+  { "proofd",          { NULL }, 1093,  "tcp"  },
+  { "proofd",          { NULL }, 1093,  "udp"  },
+  { "rootd",           { NULL }, 1094,  "tcp"  },
+  { "rootd",           { NULL }, 1094,  "udp"  },
+  { "nicelink",        { NULL }, 1095,  "tcp"  },
+  { "nicelink",        { NULL }, 1095,  "udp"  },
+  { "cnrprotocol",     { NULL }, 1096,  "tcp"  },
+  { "cnrprotocol",     { NULL }, 1096,  "udp"  },
+  { "sunclustermgr",   { NULL }, 1097,  "tcp"  },
+  { "sunclustermgr",   { NULL }, 1097,  "udp"  },
+  { "rmiactivation",   { NULL }, 1098,  "tcp"  },
+  { "rmiactivation",   { NULL }, 1098,  "udp"  },
+  { "rmiregistry",     { NULL }, 1099,  "tcp"  },
+  { "rmiregistry",     { NULL }, 1099,  "udp"  },
+  { "mctp",            { NULL }, 1100,  "tcp"  },
+  { "mctp",            { NULL }, 1100,  "udp"  },
+  { "pt2-discover",    { NULL }, 1101,  "tcp"  },
+  { "pt2-discover",    { NULL }, 1101,  "udp"  },
+  { "adobeserver-1",   { NULL }, 1102,  "tcp"  },
+  { "adobeserver-1",   { NULL }, 1102,  "udp"  },
+  { "adobeserver-2",   { NULL }, 1103,  "tcp"  },
+  { "adobeserver-2",   { NULL }, 1103,  "udp"  },
+  { "xrl",             { NULL }, 1104,  "tcp"  },
+  { "xrl",             { NULL }, 1104,  "udp"  },
+  { "ftranhc",         { NULL }, 1105,  "tcp"  },
+  { "ftranhc",         { NULL }, 1105,  "udp"  },
+  { "isoipsigport-1",  { NULL }, 1106,  "tcp"  },
+  { "isoipsigport-1",  { NULL }, 1106,  "udp"  },
+  { "isoipsigport-2",  { NULL }, 1107,  "tcp"  },
+  { "isoipsigport-2",  { NULL }, 1107,  "udp"  },
+  { "ratio-adp",       { NULL }, 1108,  "tcp"  },
+  { "ratio-adp",       { NULL }, 1108,  "udp"  },
+  { "webadmstart",     { NULL }, 1110,  "tcp"  },
+  { "nfsd-keepalive",  { NULL }, 1110,  "udp"  },
+  { "lmsocialserver",  { NULL }, 1111,  "tcp"  },
+  { "lmsocialserver",  { NULL }, 1111,  "udp"  },
+  { "icp",             { NULL }, 1112,  "tcp"  },
+  { "icp",             { NULL }, 1112,  "udp"  },
+  { "ltp-deepspace",   { NULL }, 1113,  "tcp"  },
+  { "ltp-deepspace",   { NULL }, 1113,  "udp"  },
+  { "mini-sql",        { NULL }, 1114,  "tcp"  },
+  { "mini-sql",        { NULL }, 1114,  "udp"  },
+  { "ardus-trns",      { NULL }, 1115,  "tcp"  },
+  { "ardus-trns",      { NULL }, 1115,  "udp"  },
+  { "ardus-cntl",      { NULL }, 1116,  "tcp"  },
+  { "ardus-cntl",      { NULL }, 1116,  "udp"  },
+  { "ardus-mtrns",     { NULL }, 1117,  "tcp"  },
+  { "ardus-mtrns",     { NULL }, 1117,  "udp"  },
+  { "sacred",          { NULL }, 1118,  "tcp"  },
+  { "sacred",          { NULL }, 1118,  "udp"  },
+  { "bnetgame",        { NULL }, 1119,  "tcp"  },
+  { "bnetgame",        { NULL }, 1119,  "udp"  },
+  { "bnetfile",        { NULL }, 1120,  "tcp"  },
+  { "bnetfile",        { NULL }, 1120,  "udp"  },
+  { "rmpp",            { NULL }, 1121,  "tcp"  },
+  { "rmpp",            { NULL }, 1121,  "udp"  },
+  { "availant-mgr",    { NULL }, 1122,  "tcp"  },
+  { "availant-mgr",    { NULL }, 1122,  "udp"  },
+  { "murray",          { NULL }, 1123,  "tcp"  },
+  { "murray",          { NULL }, 1123,  "udp"  },
+  { "hpvmmcontrol",    { NULL }, 1124,  "tcp"  },
+  { "hpvmmcontrol",    { NULL }, 1124,  "udp"  },
+  { "hpvmmagent",      { NULL }, 1125,  "tcp"  },
+  { "hpvmmagent",      { NULL }, 1125,  "udp"  },
+  { "hpvmmdata",       { NULL }, 1126,  "tcp"  },
+  { "hpvmmdata",       { NULL }, 1126,  "udp"  },
+  { "kwdb-commn",      { NULL }, 1127,  "tcp"  },
+  { "kwdb-commn",      { NULL }, 1127,  "udp"  },
+  { "saphostctrl",     { NULL }, 1128,  "tcp"  },
+  { "saphostctrl",     { NULL }, 1128,  "udp"  },
+  { "saphostctrls",    { NULL }, 1129,  "tcp"  },
+  { "saphostctrls",    { NULL }, 1129,  "udp"  },
+  { "casp",            { NULL }, 1130,  "tcp"  },
+  { "casp",            { NULL }, 1130,  "udp"  },
+  { "caspssl",         { NULL }, 1131,  "tcp"  },
+  { "caspssl",         { NULL }, 1131,  "udp"  },
+  { "kvm-via-ip",      { NULL }, 1132,  "tcp"  },
+  { "kvm-via-ip",      { NULL }, 1132,  "udp"  },
+  { "dfn",             { NULL }, 1133,  "tcp"  },
+  { "dfn",             { NULL }, 1133,  "udp"  },
+  { "aplx",            { NULL }, 1134,  "tcp"  },
+  { "aplx",            { NULL }, 1134,  "udp"  },
+  { "omnivision",      { NULL }, 1135,  "tcp"  },
+  { "omnivision",      { NULL }, 1135,  "udp"  },
+  { "hhb-gateway",     { NULL }, 1136,  "tcp"  },
+  { "hhb-gateway",     { NULL }, 1136,  "udp"  },
+  { "trim",            { NULL }, 1137,  "tcp"  },
+  { "trim",            { NULL }, 1137,  "udp"  },
+  { "encrypted_admin", { NULL }, 1138,  "tcp"  },
+  { "encrypted_admin", { NULL }, 1138,  "udp"  },
+  { "evm",             { NULL }, 1139,  "tcp"  },
+  { "evm",             { NULL }, 1139,  "udp"  },
+  { "autonoc",         { NULL }, 1140,  "tcp"  },
+  { "autonoc",         { NULL }, 1140,  "udp"  },
+  { "mxomss",          { NULL }, 1141,  "tcp"  },
+  { "mxomss",          { NULL }, 1141,  "udp"  },
+  { "edtools",         { NULL }, 1142,  "tcp"  },
+  { "edtools",         { NULL }, 1142,  "udp"  },
+  { "imyx",            { NULL }, 1143,  "tcp"  },
+  { "imyx",            { NULL }, 1143,  "udp"  },
+  { "fuscript",        { NULL }, 1144,  "tcp"  },
+  { "fuscript",        { NULL }, 1144,  "udp"  },
+  { "x9-icue",         { NULL }, 1145,  "tcp"  },
+  { "x9-icue",         { NULL }, 1145,  "udp"  },
+  { "audit-transfer",  { NULL }, 1146,  "tcp"  },
+  { "audit-transfer",  { NULL }, 1146,  "udp"  },
+  { "capioverlan",     { NULL }, 1147,  "tcp"  },
+  { "capioverlan",     { NULL }, 1147,  "udp"  },
+  { "elfiq-repl",      { NULL }, 1148,  "tcp"  },
+  { "elfiq-repl",      { NULL }, 1148,  "udp"  },
+  { "bvtsonar",        { NULL }, 1149,  "tcp"  },
+  { "bvtsonar",        { NULL }, 1149,  "udp"  },
+  { "blaze",           { NULL }, 1150,  "tcp"  },
+  { "blaze",           { NULL }, 1150,  "udp"  },
+  { "unizensus",       { NULL }, 1151,  "tcp"  },
+  { "unizensus",       { NULL }, 1151,  "udp"  },
+  { "winpoplanmess",   { NULL }, 1152,  "tcp"  },
+  { "winpoplanmess",   { NULL }, 1152,  "udp"  },
+  { "c1222-acse",      { NULL }, 1153,  "tcp"  },
+  { "c1222-acse",      { NULL }, 1153,  "udp"  },
+  { "resacommunity",   { NULL }, 1154,  "tcp"  },
+  { "resacommunity",   { NULL }, 1154,  "udp"  },
+  { "nfa",             { NULL }, 1155,  "tcp"  },
+  { "nfa",             { NULL }, 1155,  "udp"  },
+  { "iascontrol-oms",  { NULL }, 1156,  "tcp"  },
+  { "iascontrol-oms",  { NULL }, 1156,  "udp"  },
+  { "iascontrol",      { NULL }, 1157,  "tcp"  },
+  { "iascontrol",      { NULL }, 1157,  "udp"  },
+  { "dbcontrol-oms",   { NULL }, 1158,  "tcp"  },
+  { "dbcontrol-oms",   { NULL }, 1158,  "udp"  },
+  { "oracle-oms",      { NULL }, 1159,  "tcp"  },
+  { "oracle-oms",      { NULL }, 1159,  "udp"  },
+  { "olsv",            { NULL }, 1160,  "tcp"  },
+  { "olsv",            { NULL }, 1160,  "udp"  },
+  { "health-polling",  { NULL }, 1161,  "tcp"  },
+  { "health-polling",  { NULL }, 1161,  "udp"  },
+  { "health-trap",     { NULL }, 1162,  "tcp"  },
+  { "health-trap",     { NULL }, 1162,  "udp"  },
+  { "sddp",            { NULL }, 1163,  "tcp"  },
+  { "sddp",            { NULL }, 1163,  "udp"  },
+  { "qsm-proxy",       { NULL }, 1164,  "tcp"  },
+  { "qsm-proxy",       { NULL }, 1164,  "udp"  },
+  { "qsm-gui",         { NULL }, 1165,  "tcp"  },
+  { "qsm-gui",         { NULL }, 1165,  "udp"  },
+  { "qsm-remote",      { NULL }, 1166,  "tcp"  },
+  { "qsm-remote",      { NULL }, 1166,  "udp"  },
+  { "cisco-ipsla",     { NULL }, 1167,  "tcp"  },
+  { "cisco-ipsla",     { NULL }, 1167,  "udp"  },
+  { "cisco-ipsla",     { NULL }, 1167,  "sctp" },
+  { "vchat",           { NULL }, 1168,  "tcp"  },
+  { "vchat",           { NULL }, 1168,  "udp"  },
+  { "tripwire",        { NULL }, 1169,  "tcp"  },
+  { "tripwire",        { NULL }, 1169,  "udp"  },
+  { "atc-lm",          { NULL }, 1170,  "tcp"  },
+  { "atc-lm",          { NULL }, 1170,  "udp"  },
+  { "atc-appserver",   { NULL }, 1171,  "tcp"  },
+  { "atc-appserver",   { NULL }, 1171,  "udp"  },
+  { "dnap",            { NULL }, 1172,  "tcp"  },
+  { "dnap",            { NULL }, 1172,  "udp"  },
+  { "d-cinema-rrp",    { NULL }, 1173,  "tcp"  },
+  { "d-cinema-rrp",    { NULL }, 1173,  "udp"  },
+  { "fnet-remote-ui",  { NULL }, 1174,  "tcp"  },
+  { "fnet-remote-ui",  { NULL }, 1174,  "udp"  },
+  { "dossier",         { NULL }, 1175,  "tcp"  },
+  { "dossier",         { NULL }, 1175,  "udp"  },
+  { "indigo-server",   { NULL }, 1176,  "tcp"  },
+  { "indigo-server",   { NULL }, 1176,  "udp"  },
+  { "dkmessenger",     { NULL }, 1177,  "tcp"  },
+  { "dkmessenger",     { NULL }, 1177,  "udp"  },
+  { "sgi-storman",     { NULL }, 1178,  "tcp"  },
+  { "sgi-storman",     { NULL }, 1178,  "udp"  },
+  { "b2n",             { NULL }, 1179,  "tcp"  },
+  { "b2n",             { NULL }, 1179,  "udp"  },
+  { "mc-client",       { NULL }, 1180,  "tcp"  },
+  { "mc-client",       { NULL }, 1180,  "udp"  },
+  { "3comnetman",      { NULL }, 1181,  "tcp"  },
+  { "3comnetman",      { NULL }, 1181,  "udp"  },
+  { "accelenet",       { NULL }, 1182,  "tcp"  },
+  { "accelenet-data",  { NULL }, 1182,  "udp"  },
+  { "llsurfup-http",   { NULL }, 1183,  "tcp"  },
+  { "llsurfup-http",   { NULL }, 1183,  "udp"  },
+  { "llsurfup-https",  { NULL }, 1184,  "tcp"  },
+  { "llsurfup-https",  { NULL }, 1184,  "udp"  },
+  { "catchpole",       { NULL }, 1185,  "tcp"  },
+  { "catchpole",       { NULL }, 1185,  "udp"  },
+  { "mysql-cluster",   { NULL }, 1186,  "tcp"  },
+  { "mysql-cluster",   { NULL }, 1186,  "udp"  },
+  { "alias",           { NULL }, 1187,  "tcp"  },
+  { "alias",           { NULL }, 1187,  "udp"  },
+  { "hp-webadmin",     { NULL }, 1188,  "tcp"  },
+  { "hp-webadmin",     { NULL }, 1188,  "udp"  },
+  { "unet",            { NULL }, 1189,  "tcp"  },
+  { "unet",            { NULL }, 1189,  "udp"  },
+  { "commlinx-avl",    { NULL }, 1190,  "tcp"  },
+  { "commlinx-avl",    { NULL }, 1190,  "udp"  },
+  { "gpfs",            { NULL }, 1191,  "tcp"  },
+  { "gpfs",            { NULL }, 1191,  "udp"  },
+  { "caids-sensor",    { NULL }, 1192,  "tcp"  },
+  { "caids-sensor",    { NULL }, 1192,  "udp"  },
+  { "fiveacross",      { NULL }, 1193,  "tcp"  },
+  { "fiveacross",      { NULL }, 1193,  "udp"  },
+  { "openvpn",         { NULL }, 1194,  "tcp"  },
+  { "openvpn",         { NULL }, 1194,  "udp"  },
+  { "rsf-1",           { NULL }, 1195,  "tcp"  },
+  { "rsf-1",           { NULL }, 1195,  "udp"  },
+  { "netmagic",        { NULL }, 1196,  "tcp"  },
+  { "netmagic",        { NULL }, 1196,  "udp"  },
+  { "carrius-rshell",  { NULL }, 1197,  "tcp"  },
+  { "carrius-rshell",  { NULL }, 1197,  "udp"  },
+  { "cajo-discovery",  { NULL }, 1198,  "tcp"  },
+  { "cajo-discovery",  { NULL }, 1198,  "udp"  },
+  { "dmidi",           { NULL }, 1199,  "tcp"  },
+  { "dmidi",           { NULL }, 1199,  "udp"  },
+  { "scol",            { NULL }, 1200,  "tcp"  },
+  { "scol",            { NULL }, 1200,  "udp"  },
+  { "nucleus-sand",    { NULL }, 1201,  "tcp"  },
+  { "nucleus-sand",    { NULL }, 1201,  "udp"  },
+  { "caiccipc",        { NULL }, 1202,  "tcp"  },
+  { "caiccipc",        { NULL }, 1202,  "udp"  },
+  { "ssslic-mgr",      { NULL }, 1203,  "tcp"  },
+  { "ssslic-mgr",      { NULL }, 1203,  "udp"  },
+  { "ssslog-mgr",      { NULL }, 1204,  "tcp"  },
+  { "ssslog-mgr",      { NULL }, 1204,  "udp"  },
+  { "accord-mgc",      { NULL }, 1205,  "tcp"  },
+  { "accord-mgc",      { NULL }, 1205,  "udp"  },
+  { "anthony-data",    { NULL }, 1206,  "tcp"  },
+  { "anthony-data",    { NULL }, 1206,  "udp"  },
+  { "metasage",        { NULL }, 1207,  "tcp"  },
+  { "metasage",        { NULL }, 1207,  "udp"  },
+  { "seagull-ais",     { NULL }, 1208,  "tcp"  },
+  { "seagull-ais",     { NULL }, 1208,  "udp"  },
+  { "ipcd3",           { NULL }, 1209,  "tcp"  },
+  { "ipcd3",           { NULL }, 1209,  "udp"  },
+  { "eoss",            { NULL }, 1210,  "tcp"  },
+  { "eoss",            { NULL }, 1210,  "udp"  },
+  { "groove-dpp",      { NULL }, 1211,  "tcp"  },
+  { "groove-dpp",      { NULL }, 1211,  "udp"  },
+  { "lupa",            { NULL }, 1212,  "tcp"  },
+  { "lupa",            { NULL }, 1212,  "udp"  },
+  { "mpc-lifenet",     { NULL }, 1213,  "tcp"  },
+  { "mpc-lifenet",     { NULL }, 1213,  "udp"  },
+  { "kazaa",           { NULL }, 1214,  "tcp"  },
+  { "kazaa",           { NULL }, 1214,  "udp"  },
+  { "scanstat-1",      { NULL }, 1215,  "tcp"  },
+  { "scanstat-1",      { NULL }, 1215,  "udp"  },
+  { "etebac5",         { NULL }, 1216,  "tcp"  },
+  { "etebac5",         { NULL }, 1216,  "udp"  },
+  { "hpss-ndapi",      { NULL }, 1217,  "tcp"  },
+  { "hpss-ndapi",      { NULL }, 1217,  "udp"  },
+  { "aeroflight-ads",  { NULL }, 1218,  "tcp"  },
+  { "aeroflight-ads",  { NULL }, 1218,  "udp"  },
+  { "aeroflight-ret",  { NULL }, 1219,  "tcp"  },
+  { "aeroflight-ret",  { NULL }, 1219,  "udp"  },
+  { "qt-serveradmin",  { NULL }, 1220,  "tcp"  },
+  { "qt-serveradmin",  { NULL }, 1220,  "udp"  },
+  { "sweetware-apps",  { NULL }, 1221,  "tcp"  },
+  { "sweetware-apps",  { NULL }, 1221,  "udp"  },
+  { "nerv",            { NULL }, 1222,  "tcp"  },
+  { "nerv",            { NULL }, 1222,  "udp"  },
+  { "tgp",             { NULL }, 1223,  "tcp"  },
+  { "tgp",             { NULL }, 1223,  "udp"  },
+  { "vpnz",            { NULL }, 1224,  "tcp"  },
+  { "vpnz",            { NULL }, 1224,  "udp"  },
+  { "slinkysearch",    { NULL }, 1225,  "tcp"  },
+  { "slinkysearch",    { NULL }, 1225,  "udp"  },
+  { "stgxfws",         { NULL }, 1226,  "tcp"  },
+  { "stgxfws",         { NULL }, 1226,  "udp"  },
+  { "dns2go",          { NULL }, 1227,  "tcp"  },
+  { "dns2go",          { NULL }, 1227,  "udp"  },
+  { "florence",        { NULL }, 1228,  "tcp"  },
+  { "florence",        { NULL }, 1228,  "udp"  },
+  { "zented",          { NULL }, 1229,  "tcp"  },
+  { "zented",          { NULL }, 1229,  "udp"  },
+  { "periscope",       { NULL }, 1230,  "tcp"  },
+  { "periscope",       { NULL }, 1230,  "udp"  },
+  { "menandmice-lpm",  { NULL }, 1231,  "tcp"  },
+  { "menandmice-lpm",  { NULL }, 1231,  "udp"  },
+  { "univ-appserver",  { NULL }, 1233,  "tcp"  },
+  { "univ-appserver",  { NULL }, 1233,  "udp"  },
+  { "search-agent",    { NULL }, 1234,  "tcp"  },
+  { "search-agent",    { NULL }, 1234,  "udp"  },
+  { "mosaicsyssvc1",   { NULL }, 1235,  "tcp"  },
+  { "mosaicsyssvc1",   { NULL }, 1235,  "udp"  },
+  { "bvcontrol",       { NULL }, 1236,  "tcp"  },
+  { "bvcontrol",       { NULL }, 1236,  "udp"  },
+  { "tsdos390",        { NULL }, 1237,  "tcp"  },
+  { "tsdos390",        { NULL }, 1237,  "udp"  },
+  { "hacl-qs",         { NULL }, 1238,  "tcp"  },
+  { "hacl-qs",         { NULL }, 1238,  "udp"  },
+  { "nmsd",            { NULL }, 1239,  "tcp"  },
+  { "nmsd",            { NULL }, 1239,  "udp"  },
+  { "instantia",       { NULL }, 1240,  "tcp"  },
+  { "instantia",       { NULL }, 1240,  "udp"  },
+  { "nessus",          { NULL }, 1241,  "tcp"  },
+  { "nessus",          { NULL }, 1241,  "udp"  },
+  { "nmasoverip",      { NULL }, 1242,  "tcp"  },
+  { "nmasoverip",      { NULL }, 1242,  "udp"  },
+  { "serialgateway",   { NULL }, 1243,  "tcp"  },
+  { "serialgateway",   { NULL }, 1243,  "udp"  },
+  { "isbconference1",  { NULL }, 1244,  "tcp"  },
+  { "isbconference1",  { NULL }, 1244,  "udp"  },
+  { "isbconference2",  { NULL }, 1245,  "tcp"  },
+  { "isbconference2",  { NULL }, 1245,  "udp"  },
+  { "payrouter",       { NULL }, 1246,  "tcp"  },
+  { "payrouter",       { NULL }, 1246,  "udp"  },
+  { "visionpyramid",   { NULL }, 1247,  "tcp"  },
+  { "visionpyramid",   { NULL }, 1247,  "udp"  },
+  { "hermes",          { NULL }, 1248,  "tcp"  },
+  { "hermes",          { NULL }, 1248,  "udp"  },
+  { "mesavistaco",     { NULL }, 1249,  "tcp"  },
+  { "mesavistaco",     { NULL }, 1249,  "udp"  },
+  { "swldy-sias",      { NULL }, 1250,  "tcp"  },
+  { "swldy-sias",      { NULL }, 1250,  "udp"  },
+  { "servergraph",     { NULL }, 1251,  "tcp"  },
+  { "servergraph",     { NULL }, 1251,  "udp"  },
+  { "bspne-pcc",       { NULL }, 1252,  "tcp"  },
+  { "bspne-pcc",       { NULL }, 1252,  "udp"  },
+  { "q55-pcc",         { NULL }, 1253,  "tcp"  },
+  { "q55-pcc",         { NULL }, 1253,  "udp"  },
+  { "de-noc",          { NULL }, 1254,  "tcp"  },
+  { "de-noc",          { NULL }, 1254,  "udp"  },
+  { "de-cache-query",  { NULL }, 1255,  "tcp"  },
+  { "de-cache-query",  { NULL }, 1255,  "udp"  },
+  { "de-server",       { NULL }, 1256,  "tcp"  },
+  { "de-server",       { NULL }, 1256,  "udp"  },
+  { "shockwave2",      { NULL }, 1257,  "tcp"  },
+  { "shockwave2",      { NULL }, 1257,  "udp"  },
+  { "opennl",          { NULL }, 1258,  "tcp"  },
+  { "opennl",          { NULL }, 1258,  "udp"  },
+  { "opennl-voice",    { NULL }, 1259,  "tcp"  },
+  { "opennl-voice",    { NULL }, 1259,  "udp"  },
+  { "ibm-ssd",         { NULL }, 1260,  "tcp"  },
+  { "ibm-ssd",         { NULL }, 1260,  "udp"  },
+  { "mpshrsv",         { NULL }, 1261,  "tcp"  },
+  { "mpshrsv",         { NULL }, 1261,  "udp"  },
+  { "qnts-orb",        { NULL }, 1262,  "tcp"  },
+  { "qnts-orb",        { NULL }, 1262,  "udp"  },
+  { "dka",             { NULL }, 1263,  "tcp"  },
+  { "dka",             { NULL }, 1263,  "udp"  },
+  { "prat",            { NULL }, 1264,  "tcp"  },
+  { "prat",            { NULL }, 1264,  "udp"  },
+  { "dssiapi",         { NULL }, 1265,  "tcp"  },
+  { "dssiapi",         { NULL }, 1265,  "udp"  },
+  { "dellpwrappks",    { NULL }, 1266,  "tcp"  },
+  { "dellpwrappks",    { NULL }, 1266,  "udp"  },
+  { "epc",             { NULL }, 1267,  "tcp"  },
+  { "epc",             { NULL }, 1267,  "udp"  },
+  { "propel-msgsys",   { NULL }, 1268,  "tcp"  },
+  { "propel-msgsys",   { NULL }, 1268,  "udp"  },
+  { "watilapp",        { NULL }, 1269,  "tcp"  },
+  { "watilapp",        { NULL }, 1269,  "udp"  },
+  { "opsmgr",          { NULL }, 1270,  "tcp"  },
+  { "opsmgr",          { NULL }, 1270,  "udp"  },
+  { "excw",            { NULL }, 1271,  "tcp"  },
+  { "excw",            { NULL }, 1271,  "udp"  },
+  { "cspmlockmgr",     { NULL }, 1272,  "tcp"  },
+  { "cspmlockmgr",     { NULL }, 1272,  "udp"  },
+  { "emc-gateway",     { NULL }, 1273,  "tcp"  },
+  { "emc-gateway",     { NULL }, 1273,  "udp"  },
+  { "t1distproc",      { NULL }, 1274,  "tcp"  },
+  { "t1distproc",      { NULL }, 1274,  "udp"  },
+  { "ivcollector",     { NULL }, 1275,  "tcp"  },
+  { "ivcollector",     { NULL }, 1275,  "udp"  },
+  { "ivmanager",       { NULL }, 1276,  "tcp"  },
+  { "ivmanager",       { NULL }, 1276,  "udp"  },
+  { "miva-mqs",        { NULL }, 1277,  "tcp"  },
+  { "miva-mqs",        { NULL }, 1277,  "udp"  },
+  { "dellwebadmin-1",  { NULL }, 1278,  "tcp"  },
+  { "dellwebadmin-1",  { NULL }, 1278,  "udp"  },
+  { "dellwebadmin-2",  { NULL }, 1279,  "tcp"  },
+  { "dellwebadmin-2",  { NULL }, 1279,  "udp"  },
+  { "pictrography",    { NULL }, 1280,  "tcp"  },
+  { "pictrography",    { NULL }, 1280,  "udp"  },
+  { "healthd",         { NULL }, 1281,  "tcp"  },
+  { "healthd",         { NULL }, 1281,  "udp"  },
+  { "emperion",        { NULL }, 1282,  "tcp"  },
+  { "emperion",        { NULL }, 1282,  "udp"  },
+  { "productinfo",     { NULL }, 1283,  "tcp"  },
+  { "productinfo",     { NULL }, 1283,  "udp"  },
+  { "iee-qfx",         { NULL }, 1284,  "tcp"  },
+  { "iee-qfx",         { NULL }, 1284,  "udp"  },
+  { "neoiface",        { NULL }, 1285,  "tcp"  },
+  { "neoiface",        { NULL }, 1285,  "udp"  },
+  { "netuitive",       { NULL }, 1286,  "tcp"  },
+  { "netuitive",       { NULL }, 1286,  "udp"  },
+  { "routematch",      { NULL }, 1287,  "tcp"  },
+  { "routematch",      { NULL }, 1287,  "udp"  },
+  { "navbuddy",        { NULL }, 1288,  "tcp"  },
+  { "navbuddy",        { NULL }, 1288,  "udp"  },
+  { "jwalkserver",     { NULL }, 1289,  "tcp"  },
+  { "jwalkserver",     { NULL }, 1289,  "udp"  },
+  { "winjaserver",     { NULL }, 1290,  "tcp"  },
+  { "winjaserver",     { NULL }, 1290,  "udp"  },
+  { "seagulllms",      { NULL }, 1291,  "tcp"  },
+  { "seagulllms",      { NULL }, 1291,  "udp"  },
+  { "dsdn",            { NULL }, 1292,  "tcp"  },
+  { "dsdn",            { NULL }, 1292,  "udp"  },
+  { "pkt-krb-ipsec",   { NULL }, 1293,  "tcp"  },
+  { "pkt-krb-ipsec",   { NULL }, 1293,  "udp"  },
+  { "cmmdriver",       { NULL }, 1294,  "tcp"  },
+  { "cmmdriver",       { NULL }, 1294,  "udp"  },
+  { "ehtp",            { NULL }, 1295,  "tcp"  },
+  { "ehtp",            { NULL }, 1295,  "udp"  },
+  { "dproxy",          { NULL }, 1296,  "tcp"  },
+  { "dproxy",          { NULL }, 1296,  "udp"  },
+  { "sdproxy",         { NULL }, 1297,  "tcp"  },
+  { "sdproxy",         { NULL }, 1297,  "udp"  },
+  { "lpcp",            { NULL }, 1298,  "tcp"  },
+  { "lpcp",            { NULL }, 1298,  "udp"  },
+  { "hp-sci",          { NULL }, 1299,  "tcp"  },
+  { "hp-sci",          { NULL }, 1299,  "udp"  },
+  { "h323hostcallsc",  { NULL }, 1300,  "tcp"  },
+  { "h323hostcallsc",  { NULL }, 1300,  "udp"  },
+  { "ci3-software-1",  { NULL }, 1301,  "tcp"  },
+  { "ci3-software-1",  { NULL }, 1301,  "udp"  },
+  { "ci3-software-2",  { NULL }, 1302,  "tcp"  },
+  { "ci3-software-2",  { NULL }, 1302,  "udp"  },
+  { "sftsrv",          { NULL }, 1303,  "tcp"  },
+  { "sftsrv",          { NULL }, 1303,  "udp"  },
+  { "boomerang",       { NULL }, 1304,  "tcp"  },
+  { "boomerang",       { NULL }, 1304,  "udp"  },
+  { "pe-mike",         { NULL }, 1305,  "tcp"  },
+  { "pe-mike",         { NULL }, 1305,  "udp"  },
+  { "re-conn-proto",   { NULL }, 1306,  "tcp"  },
+  { "re-conn-proto",   { NULL }, 1306,  "udp"  },
+  { "pacmand",         { NULL }, 1307,  "tcp"  },
+  { "pacmand",         { NULL }, 1307,  "udp"  },
+  { "odsi",            { NULL }, 1308,  "tcp"  },
+  { "odsi",            { NULL }, 1308,  "udp"  },
+  { "jtag-server",     { NULL }, 1309,  "tcp"  },
+  { "jtag-server",     { NULL }, 1309,  "udp"  },
+  { "husky",           { NULL }, 1310,  "tcp"  },
+  { "husky",           { NULL }, 1310,  "udp"  },
+  { "rxmon",           { NULL }, 1311,  "tcp"  },
+  { "rxmon",           { NULL }, 1311,  "udp"  },
+  { "sti-envision",    { NULL }, 1312,  "tcp"  },
+  { "sti-envision",    { NULL }, 1312,  "udp"  },
+  { "bmc_patroldb",    { NULL }, 1313,  "tcp"  },
+  { "bmc_patroldb",    { NULL }, 1313,  "udp"  },
+  { "pdps",            { NULL }, 1314,  "tcp"  },
+  { "pdps",            { NULL }, 1314,  "udp"  },
+  { "els",             { NULL }, 1315,  "tcp"  },
+  { "els",             { NULL }, 1315,  "udp"  },
+  { "exbit-escp",      { NULL }, 1316,  "tcp"  },
+  { "exbit-escp",      { NULL }, 1316,  "udp"  },
+  { "vrts-ipcserver",  { NULL }, 1317,  "tcp"  },
+  { "vrts-ipcserver",  { NULL }, 1317,  "udp"  },
+  { "krb5gatekeeper",  { NULL }, 1318,  "tcp"  },
+  { "krb5gatekeeper",  { NULL }, 1318,  "udp"  },
+  { "amx-icsp",        { NULL }, 1319,  "tcp"  },
+  { "amx-icsp",        { NULL }, 1319,  "udp"  },
+  { "amx-axbnet",      { NULL }, 1320,  "tcp"  },
+  { "amx-axbnet",      { NULL }, 1320,  "udp"  },
+  { "pip",             { NULL }, 1321,  "tcp"  },
+  { "pip",             { NULL }, 1321,  "udp"  },
+  { "novation",        { NULL }, 1322,  "tcp"  },
+  { "novation",        { NULL }, 1322,  "udp"  },
+  { "brcd",            { NULL }, 1323,  "tcp"  },
+  { "brcd",            { NULL }, 1323,  "udp"  },
+  { "delta-mcp",       { NULL }, 1324,  "tcp"  },
+  { "delta-mcp",       { NULL }, 1324,  "udp"  },
+  { "dx-instrument",   { NULL }, 1325,  "tcp"  },
+  { "dx-instrument",   { NULL }, 1325,  "udp"  },
+  { "wimsic",          { NULL }, 1326,  "tcp"  },
+  { "wimsic",          { NULL }, 1326,  "udp"  },
+  { "ultrex",          { NULL }, 1327,  "tcp"  },
+  { "ultrex",          { NULL }, 1327,  "udp"  },
+  { "ewall",           { NULL }, 1328,  "tcp"  },
+  { "ewall",           { NULL }, 1328,  "udp"  },
+  { "netdb-export",    { NULL }, 1329,  "tcp"  },
+  { "netdb-export",    { NULL }, 1329,  "udp"  },
+  { "streetperfect",   { NULL }, 1330,  "tcp"  },
+  { "streetperfect",   { NULL }, 1330,  "udp"  },
+  { "intersan",        { NULL }, 1331,  "tcp"  },
+  { "intersan",        { NULL }, 1331,  "udp"  },
+  { "pcia-rxp-b",      { NULL }, 1332,  "tcp"  },
+  { "pcia-rxp-b",      { NULL }, 1332,  "udp"  },
+  { "passwrd-policy",  { NULL }, 1333,  "tcp"  },
+  { "passwrd-policy",  { NULL }, 1333,  "udp"  },
+  { "writesrv",        { NULL }, 1334,  "tcp"  },
+  { "writesrv",        { NULL }, 1334,  "udp"  },
+  { "digital-notary",  { NULL }, 1335,  "tcp"  },
+  { "digital-notary",  { NULL }, 1335,  "udp"  },
+  { "ischat",          { NULL }, 1336,  "tcp"  },
+  { "ischat",          { NULL }, 1336,  "udp"  },
+  { "menandmice-dns",  { NULL }, 1337,  "tcp"  },
+  { "menandmice-dns",  { NULL }, 1337,  "udp"  },
+  { "wmc-log-svc",     { NULL }, 1338,  "tcp"  },
+  { "wmc-log-svc",     { NULL }, 1338,  "udp"  },
+  { "kjtsiteserver",   { NULL }, 1339,  "tcp"  },
+  { "kjtsiteserver",   { NULL }, 1339,  "udp"  },
+  { "naap",            { NULL }, 1340,  "tcp"  },
+  { "naap",            { NULL }, 1340,  "udp"  },
+  { "qubes",           { NULL }, 1341,  "tcp"  },
+  { "qubes",           { NULL }, 1341,  "udp"  },
+  { "esbroker",        { NULL }, 1342,  "tcp"  },
+  { "esbroker",        { NULL }, 1342,  "udp"  },
+  { "re101",           { NULL }, 1343,  "tcp"  },
+  { "re101",           { NULL }, 1343,  "udp"  },
+  { "icap",            { NULL }, 1344,  "tcp"  },
+  { "icap",            { NULL }, 1344,  "udp"  },
+  { "vpjp",            { NULL }, 1345,  "tcp"  },
+  { "vpjp",            { NULL }, 1345,  "udp"  },
+  { "alta-ana-lm",     { NULL }, 1346,  "tcp"  },
+  { "alta-ana-lm",     { NULL }, 1346,  "udp"  },
+  { "bbn-mmc",         { NULL }, 1347,  "tcp"  },
+  { "bbn-mmc",         { NULL }, 1347,  "udp"  },
+  { "bbn-mmx",         { NULL }, 1348,  "tcp"  },
+  { "bbn-mmx",         { NULL }, 1348,  "udp"  },
+  { "sbook",           { NULL }, 1349,  "tcp"  },
+  { "sbook",           { NULL }, 1349,  "udp"  },
+  { "editbench",       { NULL }, 1350,  "tcp"  },
+  { "editbench",       { NULL }, 1350,  "udp"  },
+  { "equationbuilder", { NULL }, 1351,  "tcp"  },
+  { "equationbuilder", { NULL }, 1351,  "udp"  },
+  { "lotusnote",       { NULL }, 1352,  "tcp"  },
+  { "lotusnote",       { NULL }, 1352,  "udp"  },
+  { "relief",          { NULL }, 1353,  "tcp"  },
+  { "relief",          { NULL }, 1353,  "udp"  },
+  { "XSIP-network",    { NULL }, 1354,  "tcp"  },
+  { "XSIP-network",    { NULL }, 1354,  "udp"  },
+  { "intuitive-edge",  { NULL }, 1355,  "tcp"  },
+  { "intuitive-edge",  { NULL }, 1355,  "udp"  },
+  { "cuillamartin",    { NULL }, 1356,  "tcp"  },
+  { "cuillamartin",    { NULL }, 1356,  "udp"  },
+  { "pegboard",        { NULL }, 1357,  "tcp"  },
+  { "pegboard",        { NULL }, 1357,  "udp"  },
+  { "connlcli",        { NULL }, 1358,  "tcp"  },
+  { "connlcli",        { NULL }, 1358,  "udp"  },
+  { "ftsrv",           { NULL }, 1359,  "tcp"  },
+  { "ftsrv",           { NULL }, 1359,  "udp"  },
+  { "mimer",           { NULL }, 1360,  "tcp"  },
+  { "mimer",           { NULL }, 1360,  "udp"  },
+  { "linx",            { NULL }, 1361,  "tcp"  },
+  { "linx",            { NULL }, 1361,  "udp"  },
+  { "timeflies",       { NULL }, 1362,  "tcp"  },
+  { "timeflies",       { NULL }, 1362,  "udp"  },
+  { "ndm-requester",   { NULL }, 1363,  "tcp"  },
+  { "ndm-requester",   { NULL }, 1363,  "udp"  },
+  { "ndm-server",      { NULL }, 1364,  "tcp"  },
+  { "ndm-server",      { NULL }, 1364,  "udp"  },
+  { "adapt-sna",       { NULL }, 1365,  "tcp"  },
+  { "adapt-sna",       { NULL }, 1365,  "udp"  },
+  { "netware-csp",     { NULL }, 1366,  "tcp"  },
+  { "netware-csp",     { NULL }, 1366,  "udp"  },
+  { "dcs",             { NULL }, 1367,  "tcp"  },
+  { "dcs",             { NULL }, 1367,  "udp"  },
+  { "screencast",      { NULL }, 1368,  "tcp"  },
+  { "screencast",      { NULL }, 1368,  "udp"  },
+  { "gv-us",           { NULL }, 1369,  "tcp"  },
+  { "gv-us",           { NULL }, 1369,  "udp"  },
+  { "us-gv",           { NULL }, 1370,  "tcp"  },
+  { "us-gv",           { NULL }, 1370,  "udp"  },
+  { "fc-cli",          { NULL }, 1371,  "tcp"  },
+  { "fc-cli",          { NULL }, 1371,  "udp"  },
+  { "fc-ser",          { NULL }, 1372,  "tcp"  },
+  { "fc-ser",          { NULL }, 1372,  "udp"  },
+  { "chromagrafx",     { NULL }, 1373,  "tcp"  },
+  { "chromagrafx",     { NULL }, 1373,  "udp"  },
+  { "molly",           { NULL }, 1374,  "tcp"  },
+  { "molly",           { NULL }, 1374,  "udp"  },
+  { "bytex",           { NULL }, 1375,  "tcp"  },
+  { "bytex",           { NULL }, 1375,  "udp"  },
+  { "ibm-pps",         { NULL }, 1376,  "tcp"  },
+  { "ibm-pps",         { NULL }, 1376,  "udp"  },
+  { "cichlid",         { NULL }, 1377,  "tcp"  },
+  { "cichlid",         { NULL }, 1377,  "udp"  },
+  { "elan",            { NULL }, 1378,  "tcp"  },
+  { "elan",            { NULL }, 1378,  "udp"  },
+  { "dbreporter",      { NULL }, 1379,  "tcp"  },
+  { "dbreporter",      { NULL }, 1379,  "udp"  },
+  { "telesis-licman",  { NULL }, 1380,  "tcp"  },
+  { "telesis-licman",  { NULL }, 1380,  "udp"  },
+  { "apple-licman",    { NULL }, 1381,  "tcp"  },
+  { "apple-licman",    { NULL }, 1381,  "udp"  },
+  { "udt_os",          { NULL }, 1382,  "tcp"  },
+  { "udt_os",          { NULL }, 1382,  "udp"  },
+  { "gwha",            { NULL }, 1383,  "tcp"  },
+  { "gwha",            { NULL }, 1383,  "udp"  },
+  { "os-licman",       { NULL }, 1384,  "tcp"  },
+  { "os-licman",       { NULL }, 1384,  "udp"  },
+  { "atex_elmd",       { NULL }, 1385,  "tcp"  },
+  { "atex_elmd",       { NULL }, 1385,  "udp"  },
+  { "checksum",        { NULL }, 1386,  "tcp"  },
+  { "checksum",        { NULL }, 1386,  "udp"  },
+  { "cadsi-lm",        { NULL }, 1387,  "tcp"  },
+  { "cadsi-lm",        { NULL }, 1387,  "udp"  },
+  { "objective-dbc",   { NULL }, 1388,  "tcp"  },
+  { "objective-dbc",   { NULL }, 1388,  "udp"  },
+  { "iclpv-dm",        { NULL }, 1389,  "tcp"  },
+  { "iclpv-dm",        { NULL }, 1389,  "udp"  },
+  { "iclpv-sc",        { NULL }, 1390,  "tcp"  },
+  { "iclpv-sc",        { NULL }, 1390,  "udp"  },
+  { "iclpv-sas",       { NULL }, 1391,  "tcp"  },
+  { "iclpv-sas",       { NULL }, 1391,  "udp"  },
+  { "iclpv-pm",        { NULL }, 1392,  "tcp"  },
+  { "iclpv-pm",        { NULL }, 1392,  "udp"  },
+  { "iclpv-nls",       { NULL }, 1393,  "tcp"  },
+  { "iclpv-nls",       { NULL }, 1393,  "udp"  },
+  { "iclpv-nlc",       { NULL }, 1394,  "tcp"  },
+  { "iclpv-nlc",       { NULL }, 1394,  "udp"  },
+  { "iclpv-wsm",       { NULL }, 1395,  "tcp"  },
+  { "iclpv-wsm",       { NULL }, 1395,  "udp"  },
+  { "dvl-activemail",  { NULL }, 1396,  "tcp"  },
+  { "dvl-activemail",  { NULL }, 1396,  "udp"  },
+  { "audio-activmail", { NULL }, 1397,  "tcp"  },
+  { "audio-activmail", { NULL }, 1397,  "udp"  },
+  { "video-activmail", { NULL }, 1398,  "tcp"  },
+  { "video-activmail", { NULL }, 1398,  "udp"  },
+  { "cadkey-licman",   { NULL }, 1399,  "tcp"  },
+  { "cadkey-licman",   { NULL }, 1399,  "udp"  },
+  { "cadkey-tablet",   { NULL }, 1400,  "tcp"  },
+  { "cadkey-tablet",   { NULL }, 1400,  "udp"  },
+  { "goldleaf-licman", { NULL }, 1401,  "tcp"  },
+  { "goldleaf-licman", { NULL }, 1401,  "udp"  },
+  { "prm-sm-np",       { NULL }, 1402,  "tcp"  },
+  { "prm-sm-np",       { NULL }, 1402,  "udp"  },
+  { "prm-nm-np",       { NULL }, 1403,  "tcp"  },
+  { "prm-nm-np",       { NULL }, 1403,  "udp"  },
+  { "igi-lm",          { NULL }, 1404,  "tcp"  },
+  { "igi-lm",          { NULL }, 1404,  "udp"  },
+  { "ibm-res",         { NULL }, 1405,  "tcp"  },
+  { "ibm-res",         { NULL }, 1405,  "udp"  },
+  { "netlabs-lm",      { NULL }, 1406,  "tcp"  },
+  { "netlabs-lm",      { NULL }, 1406,  "udp"  },
+  { "dbsa-lm",         { NULL }, 1407,  "tcp"  },
+  { "dbsa-lm",         { NULL }, 1407,  "udp"  },
+  { "sophia-lm",       { NULL }, 1408,  "tcp"  },
+  { "sophia-lm",       { NULL }, 1408,  "udp"  },
+  { "here-lm",         { NULL }, 1409,  "tcp"  },
+  { "here-lm",         { NULL }, 1409,  "udp"  },
+  { "hiq",             { NULL }, 1410,  "tcp"  },
+  { "hiq",             { NULL }, 1410,  "udp"  },
+  { "af",              { NULL }, 1411,  "tcp"  },
+  { "af",              { NULL }, 1411,  "udp"  },
+  { "innosys",         { NULL }, 1412,  "tcp"  },
+  { "innosys",         { NULL }, 1412,  "udp"  },
+  { "innosys-acl",     { NULL }, 1413,  "tcp"  },
+  { "innosys-acl",     { NULL }, 1413,  "udp"  },
+  { "ibm-mqseries",    { NULL }, 1414,  "tcp"  },
+  { "ibm-mqseries",    { NULL }, 1414,  "udp"  },
+  { "dbstar",          { NULL }, 1415,  "tcp"  },
+  { "dbstar",          { NULL }, 1415,  "udp"  },
+  { "novell-lu6.2",    { NULL }, 1416,  "tcp"  },
+  { "novell-lu6.2",    { NULL }, 1416,  "udp"  },
+  { "timbuktu-srv1",   { NULL }, 1417,  "tcp"  },
+  { "timbuktu-srv1",   { NULL }, 1417,  "udp"  },
+  { "timbuktu-srv2",   { NULL }, 1418,  "tcp"  },
+  { "timbuktu-srv2",   { NULL }, 1418,  "udp"  },
+  { "timbuktu-srv3",   { NULL }, 1419,  "tcp"  },
+  { "timbuktu-srv3",   { NULL }, 1419,  "udp"  },
+  { "timbuktu-srv4",   { NULL }, 1420,  "tcp"  },
+  { "timbuktu-srv4",   { NULL }, 1420,  "udp"  },
+  { "gandalf-lm",      { NULL }, 1421,  "tcp"  },
+  { "gandalf-lm",      { NULL }, 1421,  "udp"  },
+  { "autodesk-lm",     { NULL }, 1422,  "tcp"  },
+  { "autodesk-lm",     { NULL }, 1422,  "udp"  },
+  { "essbase",         { NULL }, 1423,  "tcp"  },
+  { "essbase",         { NULL }, 1423,  "udp"  },
+  { "hybrid",          { NULL }, 1424,  "tcp"  },
+  { "hybrid",          { NULL }, 1424,  "udp"  },
+  { "zion-lm",         { NULL }, 1425,  "tcp"  },
+  { "zion-lm",         { NULL }, 1425,  "udp"  },
+  { "sais",            { NULL }, 1426,  "tcp"  },
+  { "sais",            { NULL }, 1426,  "udp"  },
+  { "mloadd",          { NULL }, 1427,  "tcp"  },
+  { "mloadd",          { NULL }, 1427,  "udp"  },
+  { "informatik-lm",   { NULL }, 1428,  "tcp"  },
+  { "informatik-lm",   { NULL }, 1428,  "udp"  },
+  { "nms",             { NULL }, 1429,  "tcp"  },
+  { "nms",             { NULL }, 1429,  "udp"  },
+  { "tpdu",            { NULL }, 1430,  "tcp"  },
+  { "tpdu",            { NULL }, 1430,  "udp"  },
+  { "rgtp",            { NULL }, 1431,  "tcp"  },
+  { "rgtp",            { NULL }, 1431,  "udp"  },
+  { "blueberry-lm",    { NULL }, 1432,  "tcp"  },
+  { "blueberry-lm",    { NULL }, 1432,  "udp"  },
+  { "ms-sql-s",        { NULL }, 1433,  "tcp"  },
+  { "ms-sql-s",        { NULL }, 1433,  "udp"  },
+  { "ms-sql-m",        { NULL }, 1434,  "tcp"  },
+  { "ms-sql-m",        { NULL }, 1434,  "udp"  },
+  { "ibm-cics",        { NULL }, 1435,  "tcp"  },
+  { "ibm-cics",        { NULL }, 1435,  "udp"  },
+  { "saism",           { NULL }, 1436,  "tcp"  },
+  { "saism",           { NULL }, 1436,  "udp"  },
+  { "tabula",          { NULL }, 1437,  "tcp"  },
+  { "tabula",          { NULL }, 1437,  "udp"  },
+  { "eicon-server",    { NULL }, 1438,  "tcp"  },
+  { "eicon-server",    { NULL }, 1438,  "udp"  },
+  { "eicon-x25",       { NULL }, 1439,  "tcp"  },
+  { "eicon-x25",       { NULL }, 1439,  "udp"  },
+  { "eicon-slp",       { NULL }, 1440,  "tcp"  },
+  { "eicon-slp",       { NULL }, 1440,  "udp"  },
+  { "cadis-1",         { NULL }, 1441,  "tcp"  },
+  { "cadis-1",         { NULL }, 1441,  "udp"  },
+  { "cadis-2",         { NULL }, 1442,  "tcp"  },
+  { "cadis-2",         { NULL }, 1442,  "udp"  },
+  { "ies-lm",          { NULL }, 1443,  "tcp"  },
+  { "ies-lm",          { NULL }, 1443,  "udp"  },
+  { "marcam-lm",       { NULL }, 1444,  "tcp"  },
+  { "marcam-lm",       { NULL }, 1444,  "udp"  },
+  { "proxima-lm",      { NULL }, 1445,  "tcp"  },
+  { "proxima-lm",      { NULL }, 1445,  "udp"  },
+  { "ora-lm",          { NULL }, 1446,  "tcp"  },
+  { "ora-lm",          { NULL }, 1446,  "udp"  },
+  { "apri-lm",         { NULL }, 1447,  "tcp"  },
+  { "apri-lm",         { NULL }, 1447,  "udp"  },
+  { "oc-lm",           { NULL }, 1448,  "tcp"  },
+  { "oc-lm",           { NULL }, 1448,  "udp"  },
+  { "peport",          { NULL }, 1449,  "tcp"  },
+  { "peport",          { NULL }, 1449,  "udp"  },
+  { "dwf",             { NULL }, 1450,  "tcp"  },
+  { "dwf",             { NULL }, 1450,  "udp"  },
+  { "infoman",         { NULL }, 1451,  "tcp"  },
+  { "infoman",         { NULL }, 1451,  "udp"  },
+  { "gtegsc-lm",       { NULL }, 1452,  "tcp"  },
+  { "gtegsc-lm",       { NULL }, 1452,  "udp"  },
+  { "genie-lm",        { NULL }, 1453,  "tcp"  },
+  { "genie-lm",        { NULL }, 1453,  "udp"  },
+  { "interhdl_elmd",   { NULL }, 1454,  "tcp"  },
+  { "interhdl_elmd",   { NULL }, 1454,  "udp"  },
+  { "esl-lm",          { NULL }, 1455,  "tcp"  },
+  { "esl-lm",          { NULL }, 1455,  "udp"  },
+  { "dca",             { NULL }, 1456,  "tcp"  },
+  { "dca",             { NULL }, 1456,  "udp"  },
+  { "valisys-lm",      { NULL }, 1457,  "tcp"  },
+  { "valisys-lm",      { NULL }, 1457,  "udp"  },
+  { "nrcabq-lm",       { NULL }, 1458,  "tcp"  },
+  { "nrcabq-lm",       { NULL }, 1458,  "udp"  },
+  { "proshare1",       { NULL }, 1459,  "tcp"  },
+  { "proshare1",       { NULL }, 1459,  "udp"  },
+  { "proshare2",       { NULL }, 1460,  "tcp"  },
+  { "proshare2",       { NULL }, 1460,  "udp"  },
+  { "ibm_wrless_lan",  { NULL }, 1461,  "tcp"  },
+  { "ibm_wrless_lan",  { NULL }, 1461,  "udp"  },
+  { "world-lm",        { NULL }, 1462,  "tcp"  },
+  { "world-lm",        { NULL }, 1462,  "udp"  },
+  { "nucleus",         { NULL }, 1463,  "tcp"  },
+  { "nucleus",         { NULL }, 1463,  "udp"  },
+  { "msl_lmd",         { NULL }, 1464,  "tcp"  },
+  { "msl_lmd",         { NULL }, 1464,  "udp"  },
+  { "pipes",           { NULL }, 1465,  "tcp"  },
+  { "pipes",           { NULL }, 1465,  "udp"  },
+  { "oceansoft-lm",    { NULL }, 1466,  "tcp"  },
+  { "oceansoft-lm",    { NULL }, 1466,  "udp"  },
+  { "csdmbase",        { NULL }, 1467,  "tcp"  },
+  { "csdmbase",        { NULL }, 1467,  "udp"  },
+  { "csdm",            { NULL }, 1468,  "tcp"  },
+  { "csdm",            { NULL }, 1468,  "udp"  },
+  { "aal-lm",          { NULL }, 1469,  "tcp"  },
+  { "aal-lm",          { NULL }, 1469,  "udp"  },
+  { "uaiact",          { NULL }, 1470,  "tcp"  },
+  { "uaiact",          { NULL }, 1470,  "udp"  },
+  { "csdmbase",        { NULL }, 1471,  "tcp"  },
+  { "csdmbase",        { NULL }, 1471,  "udp"  },
+  { "csdm",            { NULL }, 1472,  "tcp"  },
+  { "csdm",            { NULL }, 1472,  "udp"  },
+  { "openmath",        { NULL }, 1473,  "tcp"  },
+  { "openmath",        { NULL }, 1473,  "udp"  },
+  { "telefinder",      { NULL }, 1474,  "tcp"  },
+  { "telefinder",      { NULL }, 1474,  "udp"  },
+  { "taligent-lm",     { NULL }, 1475,  "tcp"  },
+  { "taligent-lm",     { NULL }, 1475,  "udp"  },
+  { "clvm-cfg",        { NULL }, 1476,  "tcp"  },
+  { "clvm-cfg",        { NULL }, 1476,  "udp"  },
+  { "ms-sna-server",   { NULL }, 1477,  "tcp"  },
+  { "ms-sna-server",   { NULL }, 1477,  "udp"  },
+  { "ms-sna-base",     { NULL }, 1478,  "tcp"  },
+  { "ms-sna-base",     { NULL }, 1478,  "udp"  },
+  { "dberegister",     { NULL }, 1479,  "tcp"  },
+  { "dberegister",     { NULL }, 1479,  "udp"  },
+  { "pacerforum",      { NULL }, 1480,  "tcp"  },
+  { "pacerforum",      { NULL }, 1480,  "udp"  },
+  { "airs",            { NULL }, 1481,  "tcp"  },
+  { "airs",            { NULL }, 1481,  "udp"  },
+  { "miteksys-lm",     { NULL }, 1482,  "tcp"  },
+  { "miteksys-lm",     { NULL }, 1482,  "udp"  },
+  { "afs",             { NULL }, 1483,  "tcp"  },
+  { "afs",             { NULL }, 1483,  "udp"  },
+  { "confluent",       { NULL }, 1484,  "tcp"  },
+  { "confluent",       { NULL }, 1484,  "udp"  },
+  { "lansource",       { NULL }, 1485,  "tcp"  },
+  { "lansource",       { NULL }, 1485,  "udp"  },
+  { "nms_topo_serv",   { NULL }, 1486,  "tcp"  },
+  { "nms_topo_serv",   { NULL }, 1486,  "udp"  },
+  { "localinfosrvr",   { NULL }, 1487,  "tcp"  },
+  { "localinfosrvr",   { NULL }, 1487,  "udp"  },
+  { "docstor",         { NULL }, 1488,  "tcp"  },
+  { "docstor",         { NULL }, 1488,  "udp"  },
+  { "dmdocbroker",     { NULL }, 1489,  "tcp"  },
+  { "dmdocbroker",     { NULL }, 1489,  "udp"  },
+  { "insitu-conf",     { NULL }, 1490,  "tcp"  },
+  { "insitu-conf",     { NULL }, 1490,  "udp"  },
+  { "stone-design-1",  { NULL }, 1492,  "tcp"  },
+  { "stone-design-1",  { NULL }, 1492,  "udp"  },
+  { "netmap_lm",       { NULL }, 1493,  "tcp"  },
+  { "netmap_lm",       { NULL }, 1493,  "udp"  },
+  { "ica",             { NULL }, 1494,  "tcp"  },
+  { "ica",             { NULL }, 1494,  "udp"  },
+  { "cvc",             { NULL }, 1495,  "tcp"  },
+  { "cvc",             { NULL }, 1495,  "udp"  },
+  { "liberty-lm",      { NULL }, 1496,  "tcp"  },
+  { "liberty-lm",      { NULL }, 1496,  "udp"  },
+  { "rfx-lm",          { NULL }, 1497,  "tcp"  },
+  { "rfx-lm",          { NULL }, 1497,  "udp"  },
+  { "sybase-sqlany",   { NULL }, 1498,  "tcp"  },
+  { "sybase-sqlany",   { NULL }, 1498,  "udp"  },
+  { "fhc",             { NULL }, 1499,  "tcp"  },
+  { "fhc",             { NULL }, 1499,  "udp"  },
+  { "vlsi-lm",         { NULL }, 1500,  "tcp"  },
+  { "vlsi-lm",         { NULL }, 1500,  "udp"  },
+  { "saiscm",          { NULL }, 1501,  "tcp"  },
+  { "saiscm",          { NULL }, 1501,  "udp"  },
+  { "shivadiscovery",  { NULL }, 1502,  "tcp"  },
+  { "shivadiscovery",  { NULL }, 1502,  "udp"  },
+  { "imtc-mcs",        { NULL }, 1503,  "tcp"  },
+  { "imtc-mcs",        { NULL }, 1503,  "udp"  },
+  { "evb-elm",         { NULL }, 1504,  "tcp"  },
+  { "evb-elm",         { NULL }, 1504,  "udp"  },
+  { "funkproxy",       { NULL }, 1505,  "tcp"  },
+  { "funkproxy",       { NULL }, 1505,  "udp"  },
+  { "utcd",            { NULL }, 1506,  "tcp"  },
+  { "utcd",            { NULL }, 1506,  "udp"  },
+  { "symplex",         { NULL }, 1507,  "tcp"  },
+  { "symplex",         { NULL }, 1507,  "udp"  },
+  { "diagmond",        { NULL }, 1508,  "tcp"  },
+  { "diagmond",        { NULL }, 1508,  "udp"  },
+  { "robcad-lm",       { NULL }, 1509,  "tcp"  },
+  { "robcad-lm",       { NULL }, 1509,  "udp"  },
+  { "mvx-lm",          { NULL }, 1510,  "tcp"  },
+  { "mvx-lm",          { NULL }, 1510,  "udp"  },
+  { "3l-l1",           { NULL }, 1511,  "tcp"  },
+  { "3l-l1",           { NULL }, 1511,  "udp"  },
+  { "wins",            { NULL }, 1512,  "tcp"  },
+  { "wins",            { NULL }, 1512,  "udp"  },
+  { "fujitsu-dtc",     { NULL }, 1513,  "tcp"  },
+  { "fujitsu-dtc",     { NULL }, 1513,  "udp"  },
+  { "fujitsu-dtcns",   { NULL }, 1514,  "tcp"  },
+  { "fujitsu-dtcns",   { NULL }, 1514,  "udp"  },
+  { "ifor-protocol",   { NULL }, 1515,  "tcp"  },
+  { "ifor-protocol",   { NULL }, 1515,  "udp"  },
+  { "vpad",            { NULL }, 1516,  "tcp"  },
+  { "vpad",            { NULL }, 1516,  "udp"  },
+  { "vpac",            { NULL }, 1517,  "tcp"  },
+  { "vpac",            { NULL }, 1517,  "udp"  },
+  { "vpvd",            { NULL }, 1518,  "tcp"  },
+  { "vpvd",            { NULL }, 1518,  "udp"  },
+  { "vpvc",            { NULL }, 1519,  "tcp"  },
+  { "vpvc",            { NULL }, 1519,  "udp"  },
+  { "atm-zip-office",  { NULL }, 1520,  "tcp"  },
+  { "atm-zip-office",  { NULL }, 1520,  "udp"  },
+  { "ncube-lm",        { NULL }, 1521,  "tcp"  },
+  { "ncube-lm",        { NULL }, 1521,  "udp"  },
+  { "ricardo-lm",      { NULL }, 1522,  "tcp"  },
+  { "ricardo-lm",      { NULL }, 1522,  "udp"  },
+  { "cichild-lm",      { NULL }, 1523,  "tcp"  },
+  { "cichild-lm",      { NULL }, 1523,  "udp"  },
+  { "ingreslock",      { NULL }, 1524,  "tcp"  },
+  { "ingreslock",      { NULL }, 1524,  "udp"  },
+  { "orasrv",          { NULL }, 1525,  "tcp"  },
+  { "orasrv",          { NULL }, 1525,  "udp"  },
+  { "prospero-np",     { NULL }, 1525,  "tcp"  },
+  { "prospero-np",     { NULL }, 1525,  "udp"  },
+  { "pdap-np",         { NULL }, 1526,  "tcp"  },
+  { "pdap-np",         { NULL }, 1526,  "udp"  },
+  { "tlisrv",          { NULL }, 1527,  "tcp"  },
+  { "tlisrv",          { NULL }, 1527,  "udp"  },
+  { "coauthor",        { NULL }, 1529,  "tcp"  },
+  { "coauthor",        { NULL }, 1529,  "udp"  },
+  { "rap-service",     { NULL }, 1530,  "tcp"  },
+  { "rap-service",     { NULL }, 1530,  "udp"  },
+  { "rap-listen",      { NULL }, 1531,  "tcp"  },
+  { "rap-listen",      { NULL }, 1531,  "udp"  },
+  { "miroconnect",     { NULL }, 1532,  "tcp"  },
+  { "miroconnect",     { NULL }, 1532,  "udp"  },
+  { "virtual-places",  { NULL }, 1533,  "tcp"  },
+  { "virtual-places",  { NULL }, 1533,  "udp"  },
+  { "micromuse-lm",    { NULL }, 1534,  "tcp"  },
+  { "micromuse-lm",    { NULL }, 1534,  "udp"  },
+  { "ampr-info",       { NULL }, 1535,  "tcp"  },
+  { "ampr-info",       { NULL }, 1535,  "udp"  },
+  { "ampr-inter",      { NULL }, 1536,  "tcp"  },
+  { "ampr-inter",      { NULL }, 1536,  "udp"  },
+  { "sdsc-lm",         { NULL }, 1537,  "tcp"  },
+  { "sdsc-lm",         { NULL }, 1537,  "udp"  },
+  { "3ds-lm",          { NULL }, 1538,  "tcp"  },
+  { "3ds-lm",          { NULL }, 1538,  "udp"  },
+  { "intellistor-lm",  { NULL }, 1539,  "tcp"  },
+  { "intellistor-lm",  { NULL }, 1539,  "udp"  },
+  { "rds",             { NULL }, 1540,  "tcp"  },
+  { "rds",             { NULL }, 1540,  "udp"  },
+  { "rds2",            { NULL }, 1541,  "tcp"  },
+  { "rds2",            { NULL }, 1541,  "udp"  },
+  { "gridgen-elmd",    { NULL }, 1542,  "tcp"  },
+  { "gridgen-elmd",    { NULL }, 1542,  "udp"  },
+  { "simba-cs",        { NULL }, 1543,  "tcp"  },
+  { "simba-cs",        { NULL }, 1543,  "udp"  },
+  { "aspeclmd",        { NULL }, 1544,  "tcp"  },
+  { "aspeclmd",        { NULL }, 1544,  "udp"  },
+  { "vistium-share",   { NULL }, 1545,  "tcp"  },
+  { "vistium-share",   { NULL }, 1545,  "udp"  },
+  { "abbaccuray",      { NULL }, 1546,  "tcp"  },
+  { "abbaccuray",      { NULL }, 1546,  "udp"  },
+  { "laplink",         { NULL }, 1547,  "tcp"  },
+  { "laplink",         { NULL }, 1547,  "udp"  },
+  { "axon-lm",         { NULL }, 1548,  "tcp"  },
+  { "axon-lm",         { NULL }, 1548,  "udp"  },
+  { "shivahose",       { NULL }, 1549,  "tcp"  },
+  { "shivasound",      { NULL }, 1549,  "udp"  },
+  { "3m-image-lm",     { NULL }, 1550,  "tcp"  },
+  { "3m-image-lm",     { NULL }, 1550,  "udp"  },
+  { "hecmtl-db",       { NULL }, 1551,  "tcp"  },
+  { "hecmtl-db",       { NULL }, 1551,  "udp"  },
+  { "pciarray",        { NULL }, 1552,  "tcp"  },
+  { "pciarray",        { NULL }, 1552,  "udp"  },
+  { "sna-cs",          { NULL }, 1553,  "tcp"  },
+  { "sna-cs",          { NULL }, 1553,  "udp"  },
+  { "caci-lm",         { NULL }, 1554,  "tcp"  },
+  { "caci-lm",         { NULL }, 1554,  "udp"  },
+  { "livelan",         { NULL }, 1555,  "tcp"  },
+  { "livelan",         { NULL }, 1555,  "udp"  },
+  { "veritas_pbx",     { NULL }, 1556,  "tcp"  },
+  { "veritas_pbx",     { NULL }, 1556,  "udp"  },
+  { "arbortext-lm",    { NULL }, 1557,  "tcp"  },
+  { "arbortext-lm",    { NULL }, 1557,  "udp"  },
+  { "xingmpeg",        { NULL }, 1558,  "tcp"  },
+  { "xingmpeg",        { NULL }, 1558,  "udp"  },
+  { "web2host",        { NULL }, 1559,  "tcp"  },
+  { "web2host",        { NULL }, 1559,  "udp"  },
+  { "asci-val",        { NULL }, 1560,  "tcp"  },
+  { "asci-val",        { NULL }, 1560,  "udp"  },
+  { "facilityview",    { NULL }, 1561,  "tcp"  },
+  { "facilityview",    { NULL }, 1561,  "udp"  },
+  { "pconnectmgr",     { NULL }, 1562,  "tcp"  },
+  { "pconnectmgr",     { NULL }, 1562,  "udp"  },
+  { "cadabra-lm",      { NULL }, 1563,  "tcp"  },
+  { "cadabra-lm",      { NULL }, 1563,  "udp"  },
+  { "pay-per-view",    { NULL }, 1564,  "tcp"  },
+  { "pay-per-view",    { NULL }, 1564,  "udp"  },
+  { "winddlb",         { NULL }, 1565,  "tcp"  },
+  { "winddlb",         { NULL }, 1565,  "udp"  },
+  { "corelvideo",      { NULL }, 1566,  "tcp"  },
+  { "corelvideo",      { NULL }, 1566,  "udp"  },
+  { "jlicelmd",        { NULL }, 1567,  "tcp"  },
+  { "jlicelmd",        { NULL }, 1567,  "udp"  },
+  { "tsspmap",         { NULL }, 1568,  "tcp"  },
+  { "tsspmap",         { NULL }, 1568,  "udp"  },
+  { "ets",             { NULL }, 1569,  "tcp"  },
+  { "ets",             { NULL }, 1569,  "udp"  },
+  { "orbixd",          { NULL }, 1570,  "tcp"  },
+  { "orbixd",          { NULL }, 1570,  "udp"  },
+  { "rdb-dbs-disp",    { NULL }, 1571,  "tcp"  },
+  { "rdb-dbs-disp",    { NULL }, 1571,  "udp"  },
+  { "chip-lm",         { NULL }, 1572,  "tcp"  },
+  { "chip-lm",         { NULL }, 1572,  "udp"  },
+  { "itscomm-ns",      { NULL }, 1573,  "tcp"  },
+  { "itscomm-ns",      { NULL }, 1573,  "udp"  },
+  { "mvel-lm",         { NULL }, 1574,  "tcp"  },
+  { "mvel-lm",         { NULL }, 1574,  "udp"  },
+  { "oraclenames",     { NULL }, 1575,  "tcp"  },
+  { "oraclenames",     { NULL }, 1575,  "udp"  },
+  { "moldflow-lm",     { NULL }, 1576,  "tcp"  },
+  { "moldflow-lm",     { NULL }, 1576,  "udp"  },
+  { "hypercube-lm",    { NULL }, 1577,  "tcp"  },
+  { "hypercube-lm",    { NULL }, 1577,  "udp"  },
+  { "jacobus-lm",      { NULL }, 1578,  "tcp"  },
+  { "jacobus-lm",      { NULL }, 1578,  "udp"  },
+  { "ioc-sea-lm",      { NULL }, 1579,  "tcp"  },
+  { "ioc-sea-lm",      { NULL }, 1579,  "udp"  },
+  { "tn-tl-r1",        { NULL }, 1580,  "tcp"  },
+  { "tn-tl-r2",        { NULL }, 1580,  "udp"  },
+  { "mil-2045-47001",  { NULL }, 1581,  "tcp"  },
+  { "mil-2045-47001",  { NULL }, 1581,  "udp"  },
+  { "msims",           { NULL }, 1582,  "tcp"  },
+  { "msims",           { NULL }, 1582,  "udp"  },
+  { "simbaexpress",    { NULL }, 1583,  "tcp"  },
+  { "simbaexpress",    { NULL }, 1583,  "udp"  },
+  { "tn-tl-fd2",       { NULL }, 1584,  "tcp"  },
+  { "tn-tl-fd2",       { NULL }, 1584,  "udp"  },
+  { "intv",            { NULL }, 1585,  "tcp"  },
+  { "intv",            { NULL }, 1585,  "udp"  },
+  { "ibm-abtact",      { NULL }, 1586,  "tcp"  },
+  { "ibm-abtact",      { NULL }, 1586,  "udp"  },
+  { "pra_elmd",        { NULL }, 1587,  "tcp"  },
+  { "pra_elmd",        { NULL }, 1587,  "udp"  },
+  { "triquest-lm",     { NULL }, 1588,  "tcp"  },
+  { "triquest-lm",     { NULL }, 1588,  "udp"  },
+  { "vqp",             { NULL }, 1589,  "tcp"  },
+  { "vqp",             { NULL }, 1589,  "udp"  },
+  { "gemini-lm",       { NULL }, 1590,  "tcp"  },
+  { "gemini-lm",       { NULL }, 1590,  "udp"  },
+  { "ncpm-pm",         { NULL }, 1591,  "tcp"  },
+  { "ncpm-pm",         { NULL }, 1591,  "udp"  },
+  { "commonspace",     { NULL }, 1592,  "tcp"  },
+  { "commonspace",     { NULL }, 1592,  "udp"  },
+  { "mainsoft-lm",     { NULL }, 1593,  "tcp"  },
+  { "mainsoft-lm",     { NULL }, 1593,  "udp"  },
+  { "sixtrak",         { NULL }, 1594,  "tcp"  },
+  { "sixtrak",         { NULL }, 1594,  "udp"  },
+  { "radio",           { NULL }, 1595,  "tcp"  },
+  { "radio",           { NULL }, 1595,  "udp"  },
+  { "radio-sm",        { NULL }, 1596,  "tcp"  },
+  { "radio-bc",        { NULL }, 1596,  "udp"  },
+  { "orbplus-iiop",    { NULL }, 1597,  "tcp"  },
+  { "orbplus-iiop",    { NULL }, 1597,  "udp"  },
+  { "picknfs",         { NULL }, 1598,  "tcp"  },
+  { "picknfs",         { NULL }, 1598,  "udp"  },
+  { "simbaservices",   { NULL }, 1599,  "tcp"  },
+  { "simbaservices",   { NULL }, 1599,  "udp"  },
+  { "issd",            { NULL }, 1600,  "tcp"  },
+  { "issd",            { NULL }, 1600,  "udp"  },
+  { "aas",             { NULL }, 1601,  "tcp"  },
+  { "aas",             { NULL }, 1601,  "udp"  },
+  { "inspect",         { NULL }, 1602,  "tcp"  },
+  { "inspect",         { NULL }, 1602,  "udp"  },
+  { "picodbc",         { NULL }, 1603,  "tcp"  },
+  { "picodbc",         { NULL }, 1603,  "udp"  },
+  { "icabrowser",      { NULL }, 1604,  "tcp"  },
+  { "icabrowser",      { NULL }, 1604,  "udp"  },
+  { "slp",             { NULL }, 1605,  "tcp"  },
+  { "slp",             { NULL }, 1605,  "udp"  },
+  { "slm-api",         { NULL }, 1606,  "tcp"  },
+  { "slm-api",         { NULL }, 1606,  "udp"  },
+  { "stt",             { NULL }, 1607,  "tcp"  },
+  { "stt",             { NULL }, 1607,  "udp"  },
+  { "smart-lm",        { NULL }, 1608,  "tcp"  },
+  { "smart-lm",        { NULL }, 1608,  "udp"  },
+  { "isysg-lm",        { NULL }, 1609,  "tcp"  },
+  { "isysg-lm",        { NULL }, 1609,  "udp"  },
+  { "taurus-wh",       { NULL }, 1610,  "tcp"  },
+  { "taurus-wh",       { NULL }, 1610,  "udp"  },
+  { "ill",             { NULL }, 1611,  "tcp"  },
+  { "ill",             { NULL }, 1611,  "udp"  },
+  { "netbill-trans",   { NULL }, 1612,  "tcp"  },
+  { "netbill-trans",   { NULL }, 1612,  "udp"  },
+  { "netbill-keyrep",  { NULL }, 1613,  "tcp"  },
+  { "netbill-keyrep",  { NULL }, 1613,  "udp"  },
+  { "netbill-cred",    { NULL }, 1614,  "tcp"  },
+  { "netbill-cred",    { NULL }, 1614,  "udp"  },
+  { "netbill-auth",    { NULL }, 1615,  "tcp"  },
+  { "netbill-auth",    { NULL }, 1615,  "udp"  },
+  { "netbill-prod",    { NULL }, 1616,  "tcp"  },
+  { "netbill-prod",    { NULL }, 1616,  "udp"  },
+  { "nimrod-agent",    { NULL }, 1617,  "tcp"  },
+  { "nimrod-agent",    { NULL }, 1617,  "udp"  },
+  { "skytelnet",       { NULL }, 1618,  "tcp"  },
+  { "skytelnet",       { NULL }, 1618,  "udp"  },
+  { "xs-openstorage",  { NULL }, 1619,  "tcp"  },
+  { "xs-openstorage",  { NULL }, 1619,  "udp"  },
+  { "faxportwinport",  { NULL }, 1620,  "tcp"  },
+  { "faxportwinport",  { NULL }, 1620,  "udp"  },
+  { "softdataphone",   { NULL }, 1621,  "tcp"  },
+  { "softdataphone",   { NULL }, 1621,  "udp"  },
+  { "ontime",          { NULL }, 1622,  "tcp"  },
+  { "ontime",          { NULL }, 1622,  "udp"  },
+  { "jaleosnd",        { NULL }, 1623,  "tcp"  },
+  { "jaleosnd",        { NULL }, 1623,  "udp"  },
+  { "udp-sr-port",     { NULL }, 1624,  "tcp"  },
+  { "udp-sr-port",     { NULL }, 1624,  "udp"  },
+  { "svs-omagent",     { NULL }, 1625,  "tcp"  },
+  { "svs-omagent",     { NULL }, 1625,  "udp"  },
+  { "shockwave",       { NULL }, 1626,  "tcp"  },
+  { "shockwave",       { NULL }, 1626,  "udp"  },
+  { "t128-gateway",    { NULL }, 1627,  "tcp"  },
+  { "t128-gateway",    { NULL }, 1627,  "udp"  },
+  { "lontalk-norm",    { NULL }, 1628,  "tcp"  },
+  { "lontalk-norm",    { NULL }, 1628,  "udp"  },
+  { "lontalk-urgnt",   { NULL }, 1629,  "tcp"  },
+  { "lontalk-urgnt",   { NULL }, 1629,  "udp"  },
+  { "oraclenet8cman",  { NULL }, 1630,  "tcp"  },
+  { "oraclenet8cman",  { NULL }, 1630,  "udp"  },
+  { "visitview",       { NULL }, 1631,  "tcp"  },
+  { "visitview",       { NULL }, 1631,  "udp"  },
+  { "pammratc",        { NULL }, 1632,  "tcp"  },
+  { "pammratc",        { NULL }, 1632,  "udp"  },
+  { "pammrpc",         { NULL }, 1633,  "tcp"  },
+  { "pammrpc",         { NULL }, 1633,  "udp"  },
+  { "loaprobe",        { NULL }, 1634,  "tcp"  },
+  { "loaprobe",        { NULL }, 1634,  "udp"  },
+  { "edb-server1",     { NULL }, 1635,  "tcp"  },
+  { "edb-server1",     { NULL }, 1635,  "udp"  },
+  { "isdc",            { NULL }, 1636,  "tcp"  },
+  { "isdc",            { NULL }, 1636,  "udp"  },
+  { "islc",            { NULL }, 1637,  "tcp"  },
+  { "islc",            { NULL }, 1637,  "udp"  },
+  { "ismc",            { NULL }, 1638,  "tcp"  },
+  { "ismc",            { NULL }, 1638,  "udp"  },
+  { "cert-initiator",  { NULL }, 1639,  "tcp"  },
+  { "cert-initiator",  { NULL }, 1639,  "udp"  },
+  { "cert-responder",  { NULL }, 1640,  "tcp"  },
+  { "cert-responder",  { NULL }, 1640,  "udp"  },
+  { "invision",        { NULL }, 1641,  "tcp"  },
+  { "invision",        { NULL }, 1641,  "udp"  },
+  { "isis-am",         { NULL }, 1642,  "tcp"  },
+  { "isis-am",         { NULL }, 1642,  "udp"  },
+  { "isis-ambc",       { NULL }, 1643,  "tcp"  },
+  { "isis-ambc",       { NULL }, 1643,  "udp"  },
+  { "saiseh",          { NULL }, 1644,  "tcp"  },
+  { "sightline",       { NULL }, 1645,  "tcp"  },
+  { "sightline",       { NULL }, 1645,  "udp"  },
+  { "sa-msg-port",     { NULL }, 1646,  "tcp"  },
+  { "sa-msg-port",     { NULL }, 1646,  "udp"  },
+  { "rsap",            { NULL }, 1647,  "tcp"  },
+  { "rsap",            { NULL }, 1647,  "udp"  },
+  { "concurrent-lm",   { NULL }, 1648,  "tcp"  },
+  { "concurrent-lm",   { NULL }, 1648,  "udp"  },
+  { "kermit",          { NULL }, 1649,  "tcp"  },
+  { "kermit",          { NULL }, 1649,  "udp"  },
+  { "nkd",             { NULL }, 1650,  "tcp"  },
+  { "nkd",             { NULL }, 1650,  "udp"  },
+  { "shiva_confsrvr",  { NULL }, 1651,  "tcp"  },
+  { "shiva_confsrvr",  { NULL }, 1651,  "udp"  },
+  { "xnmp",            { NULL }, 1652,  "tcp"  },
+  { "xnmp",            { NULL }, 1652,  "udp"  },
+  { "alphatech-lm",    { NULL }, 1653,  "tcp"  },
+  { "alphatech-lm",    { NULL }, 1653,  "udp"  },
+  { "stargatealerts",  { NULL }, 1654,  "tcp"  },
+  { "stargatealerts",  { NULL }, 1654,  "udp"  },
+  { "dec-mbadmin",     { NULL }, 1655,  "tcp"  },
+  { "dec-mbadmin",     { NULL }, 1655,  "udp"  },
+  { "dec-mbadmin-h",   { NULL }, 1656,  "tcp"  },
+  { "dec-mbadmin-h",   { NULL }, 1656,  "udp"  },
+  { "fujitsu-mmpdc",   { NULL }, 1657,  "tcp"  },
+  { "fujitsu-mmpdc",   { NULL }, 1657,  "udp"  },
+  { "sixnetudr",       { NULL }, 1658,  "tcp"  },
+  { "sixnetudr",       { NULL }, 1658,  "udp"  },
+  { "sg-lm",           { NULL }, 1659,  "tcp"  },
+  { "sg-lm",           { NULL }, 1659,  "udp"  },
+  { "skip-mc-gikreq",  { NULL }, 1660,  "tcp"  },
+  { "skip-mc-gikreq",  { NULL }, 1660,  "udp"  },
+  { "netview-aix-1",   { NULL }, 1661,  "tcp"  },
+  { "netview-aix-1",   { NULL }, 1661,  "udp"  },
+  { "netview-aix-2",   { NULL }, 1662,  "tcp"  },
+  { "netview-aix-2",   { NULL }, 1662,  "udp"  },
+  { "netview-aix-3",   { NULL }, 1663,  "tcp"  },
+  { "netview-aix-3",   { NULL }, 1663,  "udp"  },
+  { "netview-aix-4",   { NULL }, 1664,  "tcp"  },
+  { "netview-aix-4",   { NULL }, 1664,  "udp"  },
+  { "netview-aix-5",   { NULL }, 1665,  "tcp"  },
+  { "netview-aix-5",   { NULL }, 1665,  "udp"  },
+  { "netview-aix-6",   { NULL }, 1666,  "tcp"  },
+  { "netview-aix-6",   { NULL }, 1666,  "udp"  },
+  { "netview-aix-7",   { NULL }, 1667,  "tcp"  },
+  { "netview-aix-7",   { NULL }, 1667,  "udp"  },
+  { "netview-aix-8",   { NULL }, 1668,  "tcp"  },
+  { "netview-aix-8",   { NULL }, 1668,  "udp"  },
+  { "netview-aix-9",   { NULL }, 1669,  "tcp"  },
+  { "netview-aix-9",   { NULL }, 1669,  "udp"  },
+  { "netview-aix-10",  { NULL }, 1670,  "tcp"  },
+  { "netview-aix-10",  { NULL }, 1670,  "udp"  },
+  { "netview-aix-11",  { NULL }, 1671,  "tcp"  },
+  { "netview-aix-11",  { NULL }, 1671,  "udp"  },
+  { "netview-aix-12",  { NULL }, 1672,  "tcp"  },
+  { "netview-aix-12",  { NULL }, 1672,  "udp"  },
+  { "proshare-mc-1",   { NULL }, 1673,  "tcp"  },
+  { "proshare-mc-1",   { NULL }, 1673,  "udp"  },
+  { "proshare-mc-2",   { NULL }, 1674,  "tcp"  },
+  { "proshare-mc-2",   { NULL }, 1674,  "udp"  },
+  { "pdp",             { NULL }, 1675,  "tcp"  },
+  { "pdp",             { NULL }, 1675,  "udp"  },
+  { "netcomm1",        { NULL }, 1676,  "tcp"  },
+  { "netcomm2",        { NULL }, 1676,  "udp"  },
+  { "groupwise",       { NULL }, 1677,  "tcp"  },
+  { "groupwise",       { NULL }, 1677,  "udp"  },
+  { "prolink",         { NULL }, 1678,  "tcp"  },
+  { "prolink",         { NULL }, 1678,  "udp"  },
+  { "darcorp-lm",      { NULL }, 1679,  "tcp"  },
+  { "darcorp-lm",      { NULL }, 1679,  "udp"  },
+  { "microcom-sbp",    { NULL }, 1680,  "tcp"  },
+  { "microcom-sbp",    { NULL }, 1680,  "udp"  },
+  { "sd-elmd",         { NULL }, 1681,  "tcp"  },
+  { "sd-elmd",         { NULL }, 1681,  "udp"  },
+  { "lanyon-lantern",  { NULL }, 1682,  "tcp"  },
+  { "lanyon-lantern",  { NULL }, 1682,  "udp"  },
+  { "ncpm-hip",        { NULL }, 1683,  "tcp"  },
+  { "ncpm-hip",        { NULL }, 1683,  "udp"  },
+  { "snaresecure",     { NULL }, 1684,  "tcp"  },
+  { "snaresecure",     { NULL }, 1684,  "udp"  },
+  { "n2nremote",       { NULL }, 1685,  "tcp"  },
+  { "n2nremote",       { NULL }, 1685,  "udp"  },
+  { "cvmon",           { NULL }, 1686,  "tcp"  },
+  { "cvmon",           { NULL }, 1686,  "udp"  },
+  { "nsjtp-ctrl",      { NULL }, 1687,  "tcp"  },
+  { "nsjtp-ctrl",      { NULL }, 1687,  "udp"  },
+  { "nsjtp-data",      { NULL }, 1688,  "tcp"  },
+  { "nsjtp-data",      { NULL }, 1688,  "udp"  },
+  { "firefox",         { NULL }, 1689,  "tcp"  },
+  { "firefox",         { NULL }, 1689,  "udp"  },
+  { "ng-umds",         { NULL }, 1690,  "tcp"  },
+  { "ng-umds",         { NULL }, 1690,  "udp"  },
+  { "empire-empuma",   { NULL }, 1691,  "tcp"  },
+  { "empire-empuma",   { NULL }, 1691,  "udp"  },
+  { "sstsys-lm",       { NULL }, 1692,  "tcp"  },
+  { "sstsys-lm",       { NULL }, 1692,  "udp"  },
+  { "rrirtr",          { NULL }, 1693,  "tcp"  },
+  { "rrirtr",          { NULL }, 1693,  "udp"  },
+  { "rrimwm",          { NULL }, 1694,  "tcp"  },
+  { "rrimwm",          { NULL }, 1694,  "udp"  },
+  { "rrilwm",          { NULL }, 1695,  "tcp"  },
+  { "rrilwm",          { NULL }, 1695,  "udp"  },
+  { "rrifmm",          { NULL }, 1696,  "tcp"  },
+  { "rrifmm",          { NULL }, 1696,  "udp"  },
+  { "rrisat",          { NULL }, 1697,  "tcp"  },
+  { "rrisat",          { NULL }, 1697,  "udp"  },
+  { "rsvp-encap-1",    { NULL }, 1698,  "tcp"  },
+  { "rsvp-encap-1",    { NULL }, 1698,  "udp"  },
+  { "rsvp-encap-2",    { NULL }, 1699,  "tcp"  },
+  { "rsvp-encap-2",    { NULL }, 1699,  "udp"  },
+  { "mps-raft",        { NULL }, 1700,  "tcp"  },
+  { "mps-raft",        { NULL }, 1700,  "udp"  },
+  { "l2f",             { NULL }, 1701,  "tcp"  },
+  { "l2f",             { NULL }, 1701,  "udp"  },
+  { "l2tp",            { NULL }, 1701,  "tcp"  },
+  { "l2tp",            { NULL }, 1701,  "udp"  },
+  { "deskshare",       { NULL }, 1702,  "tcp"  },
+  { "deskshare",       { NULL }, 1702,  "udp"  },
+  { "hb-engine",       { NULL }, 1703,  "tcp"  },
+  { "hb-engine",       { NULL }, 1703,  "udp"  },
+  { "bcs-broker",      { NULL }, 1704,  "tcp"  },
+  { "bcs-broker",      { NULL }, 1704,  "udp"  },
+  { "slingshot",       { NULL }, 1705,  "tcp"  },
+  { "slingshot",       { NULL }, 1705,  "udp"  },
+  { "jetform",         { NULL }, 1706,  "tcp"  },
+  { "jetform",         { NULL }, 1706,  "udp"  },
+  { "vdmplay",         { NULL }, 1707,  "tcp"  },
+  { "vdmplay",         { NULL }, 1707,  "udp"  },
+  { "gat-lmd",         { NULL }, 1708,  "tcp"  },
+  { "gat-lmd",         { NULL }, 1708,  "udp"  },
+  { "centra",          { NULL }, 1709,  "tcp"  },
+  { "centra",          { NULL }, 1709,  "udp"  },
+  { "impera",          { NULL }, 1710,  "tcp"  },
+  { "impera",          { NULL }, 1710,  "udp"  },
+  { "pptconference",   { NULL }, 1711,  "tcp"  },
+  { "pptconference",   { NULL }, 1711,  "udp"  },
+  { "registrar",       { NULL }, 1712,  "tcp"  },
+  { "registrar",       { NULL }, 1712,  "udp"  },
+  { "conferencetalk",  { NULL }, 1713,  "tcp"  },
+  { "conferencetalk",  { NULL }, 1713,  "udp"  },
+  { "sesi-lm",         { NULL }, 1714,  "tcp"  },
+  { "sesi-lm",         { NULL }, 1714,  "udp"  },
+  { "houdini-lm",      { NULL }, 1715,  "tcp"  },
+  { "houdini-lm",      { NULL }, 1715,  "udp"  },
+  { "xmsg",            { NULL }, 1716,  "tcp"  },
+  { "xmsg",            { NULL }, 1716,  "udp"  },
+  { "fj-hdnet",        { NULL }, 1717,  "tcp"  },
+  { "fj-hdnet",        { NULL }, 1717,  "udp"  },
+  { "h323gatedisc",    { NULL }, 1718,  "tcp"  },
+  { "h323gatedisc",    { NULL }, 1718,  "udp"  },
+  { "h323gatestat",    { NULL }, 1719,  "tcp"  },
+  { "h323gatestat",    { NULL }, 1719,  "udp"  },
+  { "h323hostcall",    { NULL }, 1720,  "tcp"  },
+  { "h323hostcall",    { NULL }, 1720,  "udp"  },
+  { "caicci",          { NULL }, 1721,  "tcp"  },
+  { "caicci",          { NULL }, 1721,  "udp"  },
+  { "hks-lm",          { NULL }, 1722,  "tcp"  },
+  { "hks-lm",          { NULL }, 1722,  "udp"  },
+  { "pptp",            { NULL }, 1723,  "tcp"  },
+  { "pptp",            { NULL }, 1723,  "udp"  },
+  { "csbphonemaster",  { NULL }, 1724,  "tcp"  },
+  { "csbphonemaster",  { NULL }, 1724,  "udp"  },
+  { "iden-ralp",       { NULL }, 1725,  "tcp"  },
+  { "iden-ralp",       { NULL }, 1725,  "udp"  },
+  { "iberiagames",     { NULL }, 1726,  "tcp"  },
+  { "iberiagames",     { NULL }, 1726,  "udp"  },
+  { "winddx",          { NULL }, 1727,  "tcp"  },
+  { "winddx",          { NULL }, 1727,  "udp"  },
+  { "telindus",        { NULL }, 1728,  "tcp"  },
+  { "telindus",        { NULL }, 1728,  "udp"  },
+  { "citynl",          { NULL }, 1729,  "tcp"  },
+  { "citynl",          { NULL }, 1729,  "udp"  },
+  { "roketz",          { NULL }, 1730,  "tcp"  },
+  { "roketz",          { NULL }, 1730,  "udp"  },
+  { "msiccp",          { NULL }, 1731,  "tcp"  },
+  { "msiccp",          { NULL }, 1731,  "udp"  },
+  { "proxim",          { NULL }, 1732,  "tcp"  },
+  { "proxim",          { NULL }, 1732,  "udp"  },
+  { "siipat",          { NULL }, 1733,  "tcp"  },
+  { "siipat",          { NULL }, 1733,  "udp"  },
+  { "cambertx-lm",     { NULL }, 1734,  "tcp"  },
+  { "cambertx-lm",     { NULL }, 1734,  "udp"  },
+  { "privatechat",     { NULL }, 1735,  "tcp"  },
+  { "privatechat",     { NULL }, 1735,  "udp"  },
+  { "street-stream",   { NULL }, 1736,  "tcp"  },
+  { "street-stream",   { NULL }, 1736,  "udp"  },
+  { "ultimad",         { NULL }, 1737,  "tcp"  },
+  { "ultimad",         { NULL }, 1737,  "udp"  },
+  { "gamegen1",        { NULL }, 1738,  "tcp"  },
+  { "gamegen1",        { NULL }, 1738,  "udp"  },
+  { "webaccess",       { NULL }, 1739,  "tcp"  },
+  { "webaccess",       { NULL }, 1739,  "udp"  },
+  { "encore",          { NULL }, 1740,  "tcp"  },
+  { "encore",          { NULL }, 1740,  "udp"  },
+  { "cisco-net-mgmt",  { NULL }, 1741,  "tcp"  },
+  { "cisco-net-mgmt",  { NULL }, 1741,  "udp"  },
+  { "3Com-nsd",        { NULL }, 1742,  "tcp"  },
+  { "3Com-nsd",        { NULL }, 1742,  "udp"  },
+  { "cinegrfx-lm",     { NULL }, 1743,  "tcp"  },
+  { "cinegrfx-lm",     { NULL }, 1743,  "udp"  },
+  { "ncpm-ft",         { NULL }, 1744,  "tcp"  },
+  { "ncpm-ft",         { NULL }, 1744,  "udp"  },
+  { "remote-winsock",  { NULL }, 1745,  "tcp"  },
+  { "remote-winsock",  { NULL }, 1745,  "udp"  },
+  { "ftrapid-1",       { NULL }, 1746,  "tcp"  },
+  { "ftrapid-1",       { NULL }, 1746,  "udp"  },
+  { "ftrapid-2",       { NULL }, 1747,  "tcp"  },
+  { "ftrapid-2",       { NULL }, 1747,  "udp"  },
+  { "oracle-em1",      { NULL }, 1748,  "tcp"  },
+  { "oracle-em1",      { NULL }, 1748,  "udp"  },
+  { "aspen-services",  { NULL }, 1749,  "tcp"  },
+  { "aspen-services",  { NULL }, 1749,  "udp"  },
+  { "sslp",            { NULL }, 1750,  "tcp"  },
+  { "sslp",            { NULL }, 1750,  "udp"  },
+  { "swiftnet",        { NULL }, 1751,  "tcp"  },
+  { "swiftnet",        { NULL }, 1751,  "udp"  },
+  { "lofr-lm",         { NULL }, 1752,  "tcp"  },
+  { "lofr-lm",         { NULL }, 1752,  "udp"  },
+  { "oracle-em2",      { NULL }, 1754,  "tcp"  },
+  { "oracle-em2",      { NULL }, 1754,  "udp"  },
+  { "ms-streaming",    { NULL }, 1755,  "tcp"  },
+  { "ms-streaming",    { NULL }, 1755,  "udp"  },
+  { "capfast-lmd",     { NULL }, 1756,  "tcp"  },
+  { "capfast-lmd",     { NULL }, 1756,  "udp"  },
+  { "cnhrp",           { NULL }, 1757,  "tcp"  },
+  { "cnhrp",           { NULL }, 1757,  "udp"  },
+  { "tftp-mcast",      { NULL }, 1758,  "tcp"  },
+  { "tftp-mcast",      { NULL }, 1758,  "udp"  },
+  { "spss-lm",         { NULL }, 1759,  "tcp"  },
+  { "spss-lm",         { NULL }, 1759,  "udp"  },
+  { "www-ldap-gw",     { NULL }, 1760,  "tcp"  },
+  { "www-ldap-gw",     { NULL }, 1760,  "udp"  },
+  { "cft-0",           { NULL }, 1761,  "tcp"  },
+  { "cft-0",           { NULL }, 1761,  "udp"  },
+  { "cft-1",           { NULL }, 1762,  "tcp"  },
+  { "cft-1",           { NULL }, 1762,  "udp"  },
+  { "cft-2",           { NULL }, 1763,  "tcp"  },
+  { "cft-2",           { NULL }, 1763,  "udp"  },
+  { "cft-3",           { NULL }, 1764,  "tcp"  },
+  { "cft-3",           { NULL }, 1764,  "udp"  },
+  { "cft-4",           { NULL }, 1765,  "tcp"  },
+  { "cft-4",           { NULL }, 1765,  "udp"  },
+  { "cft-5",           { NULL }, 1766,  "tcp"  },
+  { "cft-5",           { NULL }, 1766,  "udp"  },
+  { "cft-6",           { NULL }, 1767,  "tcp"  },
+  { "cft-6",           { NULL }, 1767,  "udp"  },
+  { "cft-7",           { NULL }, 1768,  "tcp"  },
+  { "cft-7",           { NULL }, 1768,  "udp"  },
+  { "bmc-net-adm",     { NULL }, 1769,  "tcp"  },
+  { "bmc-net-adm",     { NULL }, 1769,  "udp"  },
+  { "bmc-net-svc",     { NULL }, 1770,  "tcp"  },
+  { "bmc-net-svc",     { NULL }, 1770,  "udp"  },
+  { "vaultbase",       { NULL }, 1771,  "tcp"  },
+  { "vaultbase",       { NULL }, 1771,  "udp"  },
+  { "essweb-gw",       { NULL }, 1772,  "tcp"  },
+  { "essweb-gw",       { NULL }, 1772,  "udp"  },
+  { "kmscontrol",      { NULL }, 1773,  "tcp"  },
+  { "kmscontrol",      { NULL }, 1773,  "udp"  },
+  { "global-dtserv",   { NULL }, 1774,  "tcp"  },
+  { "global-dtserv",   { NULL }, 1774,  "udp"  },
+  { "femis",           { NULL }, 1776,  "tcp"  },
+  { "femis",           { NULL }, 1776,  "udp"  },
+  { "powerguardian",   { NULL }, 1777,  "tcp"  },
+  { "powerguardian",   { NULL }, 1777,  "udp"  },
+  { "prodigy-intrnet", { NULL }, 1778,  "tcp"  },
+  { "prodigy-intrnet", { NULL }, 1778,  "udp"  },
+  { "pharmasoft",      { NULL }, 1779,  "tcp"  },
+  { "pharmasoft",      { NULL }, 1779,  "udp"  },
+  { "dpkeyserv",       { NULL }, 1780,  "tcp"  },
+  { "dpkeyserv",       { NULL }, 1780,  "udp"  },
+  { "answersoft-lm",   { NULL }, 1781,  "tcp"  },
+  { "answersoft-lm",   { NULL }, 1781,  "udp"  },
+  { "hp-hcip",         { NULL }, 1782,  "tcp"  },
+  { "hp-hcip",         { NULL }, 1782,  "udp"  },
+  { "finle-lm",        { NULL }, 1784,  "tcp"  },
+  { "finle-lm",        { NULL }, 1784,  "udp"  },
+  { "windlm",          { NULL }, 1785,  "tcp"  },
+  { "windlm",          { NULL }, 1785,  "udp"  },
+  { "funk-logger",     { NULL }, 1786,  "tcp"  },
+  { "funk-logger",     { NULL }, 1786,  "udp"  },
+  { "funk-license",    { NULL }, 1787,  "tcp"  },
+  { "funk-license",    { NULL }, 1787,  "udp"  },
+  { "psmond",          { NULL }, 1788,  "tcp"  },
+  { "psmond",          { NULL }, 1788,  "udp"  },
+  { "hello",           { NULL }, 1789,  "tcp"  },
+  { "hello",           { NULL }, 1789,  "udp"  },
+  { "nmsp",            { NULL }, 1790,  "tcp"  },
+  { "nmsp",            { NULL }, 1790,  "udp"  },
+  { "ea1",             { NULL }, 1791,  "tcp"  },
+  { "ea1",             { NULL }, 1791,  "udp"  },
+  { "ibm-dt-2",        { NULL }, 1792,  "tcp"  },
+  { "ibm-dt-2",        { NULL }, 1792,  "udp"  },
+  { "rsc-robot",       { NULL }, 1793,  "tcp"  },
+  { "rsc-robot",       { NULL }, 1793,  "udp"  },
+  { "cera-bcm",        { NULL }, 1794,  "tcp"  },
+  { "cera-bcm",        { NULL }, 1794,  "udp"  },
+  { "dpi-proxy",       { NULL }, 1795,  "tcp"  },
+  { "dpi-proxy",       { NULL }, 1795,  "udp"  },
+  { "vocaltec-admin",  { NULL }, 1796,  "tcp"  },
+  { "vocaltec-admin",  { NULL }, 1796,  "udp"  },
+  { "uma",             { NULL }, 1797,  "tcp"  },
+  { "uma",             { NULL }, 1797,  "udp"  },
+  { "etp",             { NULL }, 1798,  "tcp"  },
+  { "etp",             { NULL }, 1798,  "udp"  },
+  { "netrisk",         { NULL }, 1799,  "tcp"  },
+  { "netrisk",         { NULL }, 1799,  "udp"  },
+  { "ansys-lm",        { NULL }, 1800,  "tcp"  },
+  { "ansys-lm",        { NULL }, 1800,  "udp"  },
+  { "msmq",            { NULL }, 1801,  "tcp"  },
+  { "msmq",            { NULL }, 1801,  "udp"  },
+  { "concomp1",        { NULL }, 1802,  "tcp"  },
+  { "concomp1",        { NULL }, 1802,  "udp"  },
+  { "hp-hcip-gwy",     { NULL }, 1803,  "tcp"  },
+  { "hp-hcip-gwy",     { NULL }, 1803,  "udp"  },
+  { "enl",             { NULL }, 1804,  "tcp"  },
+  { "enl",             { NULL }, 1804,  "udp"  },
+  { "enl-name",        { NULL }, 1805,  "tcp"  },
+  { "enl-name",        { NULL }, 1805,  "udp"  },
+  { "musiconline",     { NULL }, 1806,  "tcp"  },
+  { "musiconline",     { NULL }, 1806,  "udp"  },
+  { "fhsp",            { NULL }, 1807,  "tcp"  },
+  { "fhsp",            { NULL }, 1807,  "udp"  },
+  { "oracle-vp2",      { NULL }, 1808,  "tcp"  },
+  { "oracle-vp2",      { NULL }, 1808,  "udp"  },
+  { "oracle-vp1",      { NULL }, 1809,  "tcp"  },
+  { "oracle-vp1",      { NULL }, 1809,  "udp"  },
+  { "jerand-lm",       { NULL }, 1810,  "tcp"  },
+  { "jerand-lm",       { NULL }, 1810,  "udp"  },
+  { "scientia-sdb",    { NULL }, 1811,  "tcp"  },
+  { "scientia-sdb",    { NULL }, 1811,  "udp"  },
+  { "radius",          { NULL }, 1812,  "tcp"  },
+  { "radius",          { NULL }, 1812,  "udp"  },
+  { "radius-acct",     { NULL }, 1813,  "tcp"  },
+  { "radius-acct",     { NULL }, 1813,  "udp"  },
+  { "tdp-suite",       { NULL }, 1814,  "tcp"  },
+  { "tdp-suite",       { NULL }, 1814,  "udp"  },
+  { "mmpft",           { NULL }, 1815,  "tcp"  },
+  { "mmpft",           { NULL }, 1815,  "udp"  },
+  { "harp",            { NULL }, 1816,  "tcp"  },
+  { "harp",            { NULL }, 1816,  "udp"  },
+  { "rkb-oscs",        { NULL }, 1817,  "tcp"  },
+  { "rkb-oscs",        { NULL }, 1817,  "udp"  },
+  { "etftp",           { NULL }, 1818,  "tcp"  },
+  { "etftp",           { NULL }, 1818,  "udp"  },
+  { "plato-lm",        { NULL }, 1819,  "tcp"  },
+  { "plato-lm",        { NULL }, 1819,  "udp"  },
+  { "mcagent",         { NULL }, 1820,  "tcp"  },
+  { "mcagent",         { NULL }, 1820,  "udp"  },
+  { "donnyworld",      { NULL }, 1821,  "tcp"  },
+  { "donnyworld",      { NULL }, 1821,  "udp"  },
+  { "es-elmd",         { NULL }, 1822,  "tcp"  },
+  { "es-elmd",         { NULL }, 1822,  "udp"  },
+  { "unisys-lm",       { NULL }, 1823,  "tcp"  },
+  { "unisys-lm",       { NULL }, 1823,  "udp"  },
+  { "metrics-pas",     { NULL }, 1824,  "tcp"  },
+  { "metrics-pas",     { NULL }, 1824,  "udp"  },
+  { "direcpc-video",   { NULL }, 1825,  "tcp"  },
+  { "direcpc-video",   { NULL }, 1825,  "udp"  },
+  { "ardt",            { NULL }, 1826,  "tcp"  },
+  { "ardt",            { NULL }, 1826,  "udp"  },
+  { "asi",             { NULL }, 1827,  "tcp"  },
+  { "asi",             { NULL }, 1827,  "udp"  },
+  { "itm-mcell-u",     { NULL }, 1828,  "tcp"  },
+  { "itm-mcell-u",     { NULL }, 1828,  "udp"  },
+  { "optika-emedia",   { NULL }, 1829,  "tcp"  },
+  { "optika-emedia",   { NULL }, 1829,  "udp"  },
+  { "net8-cman",       { NULL }, 1830,  "tcp"  },
+  { "net8-cman",       { NULL }, 1830,  "udp"  },
+  { "myrtle",          { NULL }, 1831,  "tcp"  },
+  { "myrtle",          { NULL }, 1831,  "udp"  },
+  { "tht-treasure",    { NULL }, 1832,  "tcp"  },
+  { "tht-treasure",    { NULL }, 1832,  "udp"  },
+  { "udpradio",        { NULL }, 1833,  "tcp"  },
+  { "udpradio",        { NULL }, 1833,  "udp"  },
+  { "ardusuni",        { NULL }, 1834,  "tcp"  },
+  { "ardusuni",        { NULL }, 1834,  "udp"  },
+  { "ardusmul",        { NULL }, 1835,  "tcp"  },
+  { "ardusmul",        { NULL }, 1835,  "udp"  },
+  { "ste-smsc",        { NULL }, 1836,  "tcp"  },
+  { "ste-smsc",        { NULL }, 1836,  "udp"  },
+  { "csoft1",          { NULL }, 1837,  "tcp"  },
+  { "csoft1",          { NULL }, 1837,  "udp"  },
+  { "talnet",          { NULL }, 1838,  "tcp"  },
+  { "talnet",          { NULL }, 1838,  "udp"  },
+  { "netopia-vo1",     { NULL }, 1839,  "tcp"  },
+  { "netopia-vo1",     { NULL }, 1839,  "udp"  },
+  { "netopia-vo2",     { NULL }, 1840,  "tcp"  },
+  { "netopia-vo2",     { NULL }, 1840,  "udp"  },
+  { "netopia-vo3",     { NULL }, 1841,  "tcp"  },
+  { "netopia-vo3",     { NULL }, 1841,  "udp"  },
+  { "netopia-vo4",     { NULL }, 1842,  "tcp"  },
+  { "netopia-vo4",     { NULL }, 1842,  "udp"  },
+  { "netopia-vo5",     { NULL }, 1843,  "tcp"  },
+  { "netopia-vo5",     { NULL }, 1843,  "udp"  },
+  { "direcpc-dll",     { NULL }, 1844,  "tcp"  },
+  { "direcpc-dll",     { NULL }, 1844,  "udp"  },
+  { "altalink",        { NULL }, 1845,  "tcp"  },
+  { "altalink",        { NULL }, 1845,  "udp"  },
+  { "tunstall-pnc",    { NULL }, 1846,  "tcp"  },
+  { "tunstall-pnc",    { NULL }, 1846,  "udp"  },
+  { "slp-notify",      { NULL }, 1847,  "tcp"  },
+  { "slp-notify",      { NULL }, 1847,  "udp"  },
+  { "fjdocdist",       { NULL }, 1848,  "tcp"  },
+  { "fjdocdist",       { NULL }, 1848,  "udp"  },
+  { "alpha-sms",       { NULL }, 1849,  "tcp"  },
+  { "alpha-sms",       { NULL }, 1849,  "udp"  },
+  { "gsi",             { NULL }, 1850,  "tcp"  },
+  { "gsi",             { NULL }, 1850,  "udp"  },
+  { "ctcd",            { NULL }, 1851,  "tcp"  },
+  { "ctcd",            { NULL }, 1851,  "udp"  },
+  { "virtual-time",    { NULL }, 1852,  "tcp"  },
+  { "virtual-time",    { NULL }, 1852,  "udp"  },
+  { "vids-avtp",       { NULL }, 1853,  "tcp"  },
+  { "vids-avtp",       { NULL }, 1853,  "udp"  },
+  { "buddy-draw",      { NULL }, 1854,  "tcp"  },
+  { "buddy-draw",      { NULL }, 1854,  "udp"  },
+  { "fiorano-rtrsvc",  { NULL }, 1855,  "tcp"  },
+  { "fiorano-rtrsvc",  { NULL }, 1855,  "udp"  },
+  { "fiorano-msgsvc",  { NULL }, 1856,  "tcp"  },
+  { "fiorano-msgsvc",  { NULL }, 1856,  "udp"  },
+  { "datacaptor",      { NULL }, 1857,  "tcp"  },
+  { "datacaptor",      { NULL }, 1857,  "udp"  },
+  { "privateark",      { NULL }, 1858,  "tcp"  },
+  { "privateark",      { NULL }, 1858,  "udp"  },
+  { "gammafetchsvr",   { NULL }, 1859,  "tcp"  },
+  { "gammafetchsvr",   { NULL }, 1859,  "udp"  },
+  { "sunscalar-svc",   { NULL }, 1860,  "tcp"  },
+  { "sunscalar-svc",   { NULL }, 1860,  "udp"  },
+  { "lecroy-vicp",     { NULL }, 1861,  "tcp"  },
+  { "lecroy-vicp",     { NULL }, 1861,  "udp"  },
+  { "mysql-cm-agent",  { NULL }, 1862,  "tcp"  },
+  { "mysql-cm-agent",  { NULL }, 1862,  "udp"  },
+  { "msnp",            { NULL }, 1863,  "tcp"  },
+  { "msnp",            { NULL }, 1863,  "udp"  },
+  { "paradym-31port",  { NULL }, 1864,  "tcp"  },
+  { "paradym-31port",  { NULL }, 1864,  "udp"  },
+  { "entp",            { NULL }, 1865,  "tcp"  },
+  { "entp",            { NULL }, 1865,  "udp"  },
+  { "swrmi",           { NULL }, 1866,  "tcp"  },
+  { "swrmi",           { NULL }, 1866,  "udp"  },
+  { "udrive",          { NULL }, 1867,  "tcp"  },
+  { "udrive",          { NULL }, 1867,  "udp"  },
+  { "viziblebrowser",  { NULL }, 1868,  "tcp"  },
+  { "viziblebrowser",  { NULL }, 1868,  "udp"  },
+  { "transact",        { NULL }, 1869,  "tcp"  },
+  { "transact",        { NULL }, 1869,  "udp"  },
+  { "sunscalar-dns",   { NULL }, 1870,  "tcp"  },
+  { "sunscalar-dns",   { NULL }, 1870,  "udp"  },
+  { "canocentral0",    { NULL }, 1871,  "tcp"  },
+  { "canocentral0",    { NULL }, 1871,  "udp"  },
+  { "canocentral1",    { NULL }, 1872,  "tcp"  },
+  { "canocentral1",    { NULL }, 1872,  "udp"  },
+  { "fjmpjps",         { NULL }, 1873,  "tcp"  },
+  { "fjmpjps",         { NULL }, 1873,  "udp"  },
+  { "fjswapsnp",       { NULL }, 1874,  "tcp"  },
+  { "fjswapsnp",       { NULL }, 1874,  "udp"  },
+  { "westell-stats",   { NULL }, 1875,  "tcp"  },
+  { "westell-stats",   { NULL }, 1875,  "udp"  },
+  { "ewcappsrv",       { NULL }, 1876,  "tcp"  },
+  { "ewcappsrv",       { NULL }, 1876,  "udp"  },
+  { "hp-webqosdb",     { NULL }, 1877,  "tcp"  },
+  { "hp-webqosdb",     { NULL }, 1877,  "udp"  },
+  { "drmsmc",          { NULL }, 1878,  "tcp"  },
+  { "drmsmc",          { NULL }, 1878,  "udp"  },
+  { "nettgain-nms",    { NULL }, 1879,  "tcp"  },
+  { "nettgain-nms",    { NULL }, 1879,  "udp"  },
+  { "vsat-control",    { NULL }, 1880,  "tcp"  },
+  { "vsat-control",    { NULL }, 1880,  "udp"  },
+  { "ibm-mqseries2",   { NULL }, 1881,  "tcp"  },
+  { "ibm-mqseries2",   { NULL }, 1881,  "udp"  },
+  { "ecsqdmn",         { NULL }, 1882,  "tcp"  },
+  { "ecsqdmn",         { NULL }, 1882,  "udp"  },
+  { "ibm-mqisdp",      { NULL }, 1883,  "tcp"  },
+  { "ibm-mqisdp",      { NULL }, 1883,  "udp"  },
+  { "idmaps",          { NULL }, 1884,  "tcp"  },
+  { "idmaps",          { NULL }, 1884,  "udp"  },
+  { "vrtstrapserver",  { NULL }, 1885,  "tcp"  },
+  { "vrtstrapserver",  { NULL }, 1885,  "udp"  },
+  { "leoip",           { NULL }, 1886,  "tcp"  },
+  { "leoip",           { NULL }, 1886,  "udp"  },
+  { "filex-lport",     { NULL }, 1887,  "tcp"  },
+  { "filex-lport",     { NULL }, 1887,  "udp"  },
+  { "ncconfig",        { NULL }, 1888,  "tcp"  },
+  { "ncconfig",        { NULL }, 1888,  "udp"  },
+  { "unify-adapter",   { NULL }, 1889,  "tcp"  },
+  { "unify-adapter",   { NULL }, 1889,  "udp"  },
+  { "wilkenlistener",  { NULL }, 1890,  "tcp"  },
+  { "wilkenlistener",  { NULL }, 1890,  "udp"  },
+  { "childkey-notif",  { NULL }, 1891,  "tcp"  },
+  { "childkey-notif",  { NULL }, 1891,  "udp"  },
+  { "childkey-ctrl",   { NULL }, 1892,  "tcp"  },
+  { "childkey-ctrl",   { NULL }, 1892,  "udp"  },
+  { "elad",            { NULL }, 1893,  "tcp"  },
+  { "elad",            { NULL }, 1893,  "udp"  },
+  { "o2server-port",   { NULL }, 1894,  "tcp"  },
+  { "o2server-port",   { NULL }, 1894,  "udp"  },
+  { "b-novative-ls",   { NULL }, 1896,  "tcp"  },
+  { "b-novative-ls",   { NULL }, 1896,  "udp"  },
+  { "metaagent",       { NULL }, 1897,  "tcp"  },
+  { "metaagent",       { NULL }, 1897,  "udp"  },
+  { "cymtec-port",     { NULL }, 1898,  "tcp"  },
+  { "cymtec-port",     { NULL }, 1898,  "udp"  },
+  { "mc2studios",      { NULL }, 1899,  "tcp"  },
+  { "mc2studios",      { NULL }, 1899,  "udp"  },
+  { "ssdp",            { NULL }, 1900,  "tcp"  },
+  { "ssdp",            { NULL }, 1900,  "udp"  },
+  { "fjicl-tep-a",     { NULL }, 1901,  "tcp"  },
+  { "fjicl-tep-a",     { NULL }, 1901,  "udp"  },
+  { "fjicl-tep-b",     { NULL }, 1902,  "tcp"  },
+  { "fjicl-tep-b",     { NULL }, 1902,  "udp"  },
+  { "linkname",        { NULL }, 1903,  "tcp"  },
+  { "linkname",        { NULL }, 1903,  "udp"  },
+  { "fjicl-tep-c",     { NULL }, 1904,  "tcp"  },
+  { "fjicl-tep-c",     { NULL }, 1904,  "udp"  },
+  { "sugp",            { NULL }, 1905,  "tcp"  },
+  { "sugp",            { NULL }, 1905,  "udp"  },
+  { "tpmd",            { NULL }, 1906,  "tcp"  },
+  { "tpmd",            { NULL }, 1906,  "udp"  },
+  { "intrastar",       { NULL }, 1907,  "tcp"  },
+  { "intrastar",       { NULL }, 1907,  "udp"  },
+  { "dawn",            { NULL }, 1908,  "tcp"  },
+  { "dawn",            { NULL }, 1908,  "udp"  },
+  { "global-wlink",    { NULL }, 1909,  "tcp"  },
+  { "global-wlink",    { NULL }, 1909,  "udp"  },
+  { "ultrabac",        { NULL }, 1910,  "tcp"  },
+  { "ultrabac",        { NULL }, 1910,  "udp"  },
+  { "mtp",             { NULL }, 1911,  "tcp"  },
+  { "mtp",             { NULL }, 1911,  "udp"  },
+  { "rhp-iibp",        { NULL }, 1912,  "tcp"  },
+  { "rhp-iibp",        { NULL }, 1912,  "udp"  },
+  { "armadp",          { NULL }, 1913,  "tcp"  },
+  { "armadp",          { NULL }, 1913,  "udp"  },
+  { "elm-momentum",    { NULL }, 1914,  "tcp"  },
+  { "elm-momentum",    { NULL }, 1914,  "udp"  },
+  { "facelink",        { NULL }, 1915,  "tcp"  },
+  { "facelink",        { NULL }, 1915,  "udp"  },
+  { "persona",         { NULL }, 1916,  "tcp"  },
+  { "persona",         { NULL }, 1916,  "udp"  },
+  { "noagent",         { NULL }, 1917,  "tcp"  },
+  { "noagent",         { NULL }, 1917,  "udp"  },
+  { "can-nds",         { NULL }, 1918,  "tcp"  },
+  { "can-nds",         { NULL }, 1918,  "udp"  },
+  { "can-dch",         { NULL }, 1919,  "tcp"  },
+  { "can-dch",         { NULL }, 1919,  "udp"  },
+  { "can-ferret",      { NULL }, 1920,  "tcp"  },
+  { "can-ferret",      { NULL }, 1920,  "udp"  },
+  { "noadmin",         { NULL }, 1921,  "tcp"  },
+  { "noadmin",         { NULL }, 1921,  "udp"  },
+  { "tapestry",        { NULL }, 1922,  "tcp"  },
+  { "tapestry",        { NULL }, 1922,  "udp"  },
+  { "spice",           { NULL }, 1923,  "tcp"  },
+  { "spice",           { NULL }, 1923,  "udp"  },
+  { "xiip",            { NULL }, 1924,  "tcp"  },
+  { "xiip",            { NULL }, 1924,  "udp"  },
+  { "discovery-port",  { NULL }, 1925,  "tcp"  },
+  { "discovery-port",  { NULL }, 1925,  "udp"  },
+  { "egs",             { NULL }, 1926,  "tcp"  },
+  { "egs",             { NULL }, 1926,  "udp"  },
+  { "videte-cipc",     { NULL }, 1927,  "tcp"  },
+  { "videte-cipc",     { NULL }, 1927,  "udp"  },
+  { "emsd-port",       { NULL }, 1928,  "tcp"  },
+  { "emsd-port",       { NULL }, 1928,  "udp"  },
+  { "bandwiz-system",  { NULL }, 1929,  "tcp"  },
+  { "bandwiz-system",  { NULL }, 1929,  "udp"  },
+  { "driveappserver",  { NULL }, 1930,  "tcp"  },
+  { "driveappserver",  { NULL }, 1930,  "udp"  },
+  { "amdsched",        { NULL }, 1931,  "tcp"  },
+  { "amdsched",        { NULL }, 1931,  "udp"  },
+  { "ctt-broker",      { NULL }, 1932,  "tcp"  },
+  { "ctt-broker",      { NULL }, 1932,  "udp"  },
+  { "xmapi",           { NULL }, 1933,  "tcp"  },
+  { "xmapi",           { NULL }, 1933,  "udp"  },
+  { "xaapi",           { NULL }, 1934,  "tcp"  },
+  { "xaapi",           { NULL }, 1934,  "udp"  },
+  { "macromedia-fcs",  { NULL }, 1935,  "tcp"  },
+  { "macromedia-fcs",  { NULL }, 1935,  "udp"  },
+  { "jetcmeserver",    { NULL }, 1936,  "tcp"  },
+  { "jetcmeserver",    { NULL }, 1936,  "udp"  },
+  { "jwserver",        { NULL }, 1937,  "tcp"  },
+  { "jwserver",        { NULL }, 1937,  "udp"  },
+  { "jwclient",        { NULL }, 1938,  "tcp"  },
+  { "jwclient",        { NULL }, 1938,  "udp"  },
+  { "jvserver",        { NULL }, 1939,  "tcp"  },
+  { "jvserver",        { NULL }, 1939,  "udp"  },
+  { "jvclient",        { NULL }, 1940,  "tcp"  },
+  { "jvclient",        { NULL }, 1940,  "udp"  },
+  { "dic-aida",        { NULL }, 1941,  "tcp"  },
+  { "dic-aida",        { NULL }, 1941,  "udp"  },
+  { "res",             { NULL }, 1942,  "tcp"  },
+  { "res",             { NULL }, 1942,  "udp"  },
+  { "beeyond-media",   { NULL }, 1943,  "tcp"  },
+  { "beeyond-media",   { NULL }, 1943,  "udp"  },
+  { "close-combat",    { NULL }, 1944,  "tcp"  },
+  { "close-combat",    { NULL }, 1944,  "udp"  },
+  { "dialogic-elmd",   { NULL }, 1945,  "tcp"  },
+  { "dialogic-elmd",   { NULL }, 1945,  "udp"  },
+  { "tekpls",          { NULL }, 1946,  "tcp"  },
+  { "tekpls",          { NULL }, 1946,  "udp"  },
+  { "sentinelsrm",     { NULL }, 1947,  "tcp"  },
+  { "sentinelsrm",     { NULL }, 1947,  "udp"  },
+  { "eye2eye",         { NULL }, 1948,  "tcp"  },
+  { "eye2eye",         { NULL }, 1948,  "udp"  },
+  { "ismaeasdaqlive",  { NULL }, 1949,  "tcp"  },
+  { "ismaeasdaqlive",  { NULL }, 1949,  "udp"  },
+  { "ismaeasdaqtest",  { NULL }, 1950,  "tcp"  },
+  { "ismaeasdaqtest",  { NULL }, 1950,  "udp"  },
+  { "bcs-lmserver",    { NULL }, 1951,  "tcp"  },
+  { "bcs-lmserver",    { NULL }, 1951,  "udp"  },
+  { "mpnjsc",          { NULL }, 1952,  "tcp"  },
+  { "mpnjsc",          { NULL }, 1952,  "udp"  },
+  { "rapidbase",       { NULL }, 1953,  "tcp"  },
+  { "rapidbase",       { NULL }, 1953,  "udp"  },
+  { "abr-api",         { NULL }, 1954,  "tcp"  },
+  { "abr-api",         { NULL }, 1954,  "udp"  },
+  { "abr-secure",      { NULL }, 1955,  "tcp"  },
+  { "abr-secure",      { NULL }, 1955,  "udp"  },
+  { "vrtl-vmf-ds",     { NULL }, 1956,  "tcp"  },
+  { "vrtl-vmf-ds",     { NULL }, 1956,  "udp"  },
+  { "unix-status",     { NULL }, 1957,  "tcp"  },
+  { "unix-status",     { NULL }, 1957,  "udp"  },
+  { "dxadmind",        { NULL }, 1958,  "tcp"  },
+  { "dxadmind",        { NULL }, 1958,  "udp"  },
+  { "simp-all",        { NULL }, 1959,  "tcp"  },
+  { "simp-all",        { NULL }, 1959,  "udp"  },
+  { "nasmanager",      { NULL }, 1960,  "tcp"  },
+  { "nasmanager",      { NULL }, 1960,  "udp"  },
+  { "bts-appserver",   { NULL }, 1961,  "tcp"  },
+  { "bts-appserver",   { NULL }, 1961,  "udp"  },
+  { "biap-mp",         { NULL }, 1962,  "tcp"  },
+  { "biap-mp",         { NULL }, 1962,  "udp"  },
+  { "webmachine",      { NULL }, 1963,  "tcp"  },
+  { "webmachine",      { NULL }, 1963,  "udp"  },
+  { "solid-e-engine",  { NULL }, 1964,  "tcp"  },
+  { "solid-e-engine",  { NULL }, 1964,  "udp"  },
+  { "tivoli-npm",      { NULL }, 1965,  "tcp"  },
+  { "tivoli-npm",      { NULL }, 1965,  "udp"  },
+  { "slush",           { NULL }, 1966,  "tcp"  },
+  { "slush",           { NULL }, 1966,  "udp"  },
+  { "sns-quote",       { NULL }, 1967,  "tcp"  },
+  { "sns-quote",       { NULL }, 1967,  "udp"  },
+  { "lipsinc",         { NULL }, 1968,  "tcp"  },
+  { "lipsinc",         { NULL }, 1968,  "udp"  },
+  { "lipsinc1",        { NULL }, 1969,  "tcp"  },
+  { "lipsinc1",        { NULL }, 1969,  "udp"  },
+  { "netop-rc",        { NULL }, 1970,  "tcp"  },
+  { "netop-rc",        { NULL }, 1970,  "udp"  },
+  { "netop-school",    { NULL }, 1971,  "tcp"  },
+  { "netop-school",    { NULL }, 1971,  "udp"  },
+  { "intersys-cache",  { NULL }, 1972,  "tcp"  },
+  { "intersys-cache",  { NULL }, 1972,  "udp"  },
+  { "dlsrap",          { NULL }, 1973,  "tcp"  },
+  { "dlsrap",          { NULL }, 1973,  "udp"  },
+  { "drp",             { NULL }, 1974,  "tcp"  },
+  { "drp",             { NULL }, 1974,  "udp"  },
+  { "tcoflashagent",   { NULL }, 1975,  "tcp"  },
+  { "tcoflashagent",   { NULL }, 1975,  "udp"  },
+  { "tcoregagent",     { NULL }, 1976,  "tcp"  },
+  { "tcoregagent",     { NULL }, 1976,  "udp"  },
+  { "tcoaddressbook",  { NULL }, 1977,  "tcp"  },
+  { "tcoaddressbook",  { NULL }, 1977,  "udp"  },
+  { "unisql",          { NULL }, 1978,  "tcp"  },
+  { "unisql",          { NULL }, 1978,  "udp"  },
+  { "unisql-java",     { NULL }, 1979,  "tcp"  },
+  { "unisql-java",     { NULL }, 1979,  "udp"  },
+  { "pearldoc-xact",   { NULL }, 1980,  "tcp"  },
+  { "pearldoc-xact",   { NULL }, 1980,  "udp"  },
+  { "p2pq",            { NULL }, 1981,  "tcp"  },
+  { "p2pq",            { NULL }, 1981,  "udp"  },
+  { "estamp",          { NULL }, 1982,  "tcp"  },
+  { "estamp",          { NULL }, 1982,  "udp"  },
+  { "lhtp",            { NULL }, 1983,  "tcp"  },
+  { "lhtp",            { NULL }, 1983,  "udp"  },
+  { "bb",              { NULL }, 1984,  "tcp"  },
+  { "bb",              { NULL }, 1984,  "udp"  },
+  { "hsrp",            { NULL }, 1985,  "tcp"  },
+  { "hsrp",            { NULL }, 1985,  "udp"  },
+  { "licensedaemon",   { NULL }, 1986,  "tcp"  },
+  { "licensedaemon",   { NULL }, 1986,  "udp"  },
+  { "tr-rsrb-p1",      { NULL }, 1987,  "tcp"  },
+  { "tr-rsrb-p1",      { NULL }, 1987,  "udp"  },
+  { "tr-rsrb-p2",      { NULL }, 1988,  "tcp"  },
+  { "tr-rsrb-p2",      { NULL }, 1988,  "udp"  },
+  { "tr-rsrb-p3",      { NULL }, 1989,  "tcp"  },
+  { "tr-rsrb-p3",      { NULL }, 1989,  "udp"  },
+  { "mshnet",          { NULL }, 1989,  "tcp"  },
+  { "mshnet",          { NULL }, 1989,  "udp"  },
+  { "stun-p1",         { NULL }, 1990,  "tcp"  },
+  { "stun-p1",         { NULL }, 1990,  "udp"  },
+  { "stun-p2",         { NULL }, 1991,  "tcp"  },
+  { "stun-p2",         { NULL }, 1991,  "udp"  },
+  { "stun-p3",         { NULL }, 1992,  "tcp"  },
+  { "stun-p3",         { NULL }, 1992,  "udp"  },
+  { "ipsendmsg",       { NULL }, 1992,  "tcp"  },
+  { "ipsendmsg",       { NULL }, 1992,  "udp"  },
+  { "snmp-tcp-port",   { NULL }, 1993,  "tcp"  },
+  { "snmp-tcp-port",   { NULL }, 1993,  "udp"  },
+  { "stun-port",       { NULL }, 1994,  "tcp"  },
+  { "stun-port",       { NULL }, 1994,  "udp"  },
+  { "perf-port",       { NULL }, 1995,  "tcp"  },
+  { "perf-port",       { NULL }, 1995,  "udp"  },
+  { "tr-rsrb-port",    { NULL }, 1996,  "tcp"  },
+  { "tr-rsrb-port",    { NULL }, 1996,  "udp"  },
+  { "gdp-port",        { NULL }, 1997,  "tcp"  },
+  { "gdp-port",        { NULL }, 1997,  "udp"  },
+  { "x25-svc-port",    { NULL }, 1998,  "tcp"  },
+  { "x25-svc-port",    { NULL }, 1998,  "udp"  },
+  { "tcp-id-port",     { NULL }, 1999,  "tcp"  },
+  { "tcp-id-port",     { NULL }, 1999,  "udp"  },
+  { "cisco-sccp",      { NULL }, 2000,  "tcp"  },
+  { "cisco-sccp",      { NULL }, 2000,  "udp"  },
+  { "dc",              { NULL }, 2001,  "tcp"  },
+  { "wizard",          { NULL }, 2001,  "udp"  },
+  { "globe",           { NULL }, 2002,  "tcp"  },
+  { "globe",           { NULL }, 2002,  "udp"  },
+  { "brutus",          { NULL }, 2003,  "tcp"  },
+  { "brutus",          { NULL }, 2003,  "udp"  },
+  { "mailbox",         { NULL }, 2004,  "tcp"  },
+  { "emce",            { NULL }, 2004,  "udp"  },
+  { "berknet",         { NULL }, 2005,  "tcp"  },
+  { "oracle",          { NULL }, 2005,  "udp"  },
+  { "invokator",       { NULL }, 2006,  "tcp"  },
+  { "raid-cd",         { NULL }, 2006,  "udp"  },
+  { "dectalk",         { NULL }, 2007,  "tcp"  },
+  { "raid-am",         { NULL }, 2007,  "udp"  },
+  { "conf",            { NULL }, 2008,  "tcp"  },
+  { "terminaldb",      { NULL }, 2008,  "udp"  },
+  { "news",            { NULL }, 2009,  "tcp"  },
+  { "whosockami",      { NULL }, 2009,  "udp"  },
+  { "search",          { NULL }, 2010,  "tcp"  },
+  { "pipe_server",     { NULL }, 2010,  "udp"  },
+  { "raid-cc",         { NULL }, 2011,  "tcp"  },
+  { "servserv",        { NULL }, 2011,  "udp"  },
+  { "ttyinfo",         { NULL }, 2012,  "tcp"  },
+  { "raid-ac",         { NULL }, 2012,  "udp"  },
+  { "raid-am",         { NULL }, 2013,  "tcp"  },
+  { "raid-cd",         { NULL }, 2013,  "udp"  },
+  { "troff",           { NULL }, 2014,  "tcp"  },
+  { "raid-sf",         { NULL }, 2014,  "udp"  },
+  { "cypress",         { NULL }, 2015,  "tcp"  },
+  { "raid-cs",         { NULL }, 2015,  "udp"  },
+  { "bootserver",      { NULL }, 2016,  "tcp"  },
+  { "bootserver",      { NULL }, 2016,  "udp"  },
+  { "cypress-stat",    { NULL }, 2017,  "tcp"  },
+  { "bootclient",      { NULL }, 2017,  "udp"  },
+  { "terminaldb",      { NULL }, 2018,  "tcp"  },
+  { "rellpack",        { NULL }, 2018,  "udp"  },
+  { "whosockami",      { NULL }, 2019,  "tcp"  },
+  { "about",           { NULL }, 2019,  "udp"  },
+  { "xinupageserver",  { NULL }, 2020,  "tcp"  },
+  { "xinupageserver",  { NULL }, 2020,  "udp"  },
+  { "servexec",        { NULL }, 2021,  "tcp"  },
+  { "xinuexpansion1",  { NULL }, 2021,  "udp"  },
+  { "down",            { NULL }, 2022,  "tcp"  },
+  { "xinuexpansion2",  { NULL }, 2022,  "udp"  },
+  { "xinuexpansion3",  { NULL }, 2023,  "tcp"  },
+  { "xinuexpansion3",  { NULL }, 2023,  "udp"  },
+  { "xinuexpansion4",  { NULL }, 2024,  "tcp"  },
+  { "xinuexpansion4",  { NULL }, 2024,  "udp"  },
+  { "ellpack",         { NULL }, 2025,  "tcp"  },
+  { "xribs",           { NULL }, 2025,  "udp"  },
+  { "scrabble",        { NULL }, 2026,  "tcp"  },
+  { "scrabble",        { NULL }, 2026,  "udp"  },
+  { "shadowserver",    { NULL }, 2027,  "tcp"  },
+  { "shadowserver",    { NULL }, 2027,  "udp"  },
+  { "submitserver",    { NULL }, 2028,  "tcp"  },
+  { "submitserver",    { NULL }, 2028,  "udp"  },
+  { "hsrpv6",          { NULL }, 2029,  "tcp"  },
+  { "hsrpv6",          { NULL }, 2029,  "udp"  },
+  { "device2",         { NULL }, 2030,  "tcp"  },
+  { "device2",         { NULL }, 2030,  "udp"  },
+  { "mobrien-chat",    { NULL }, 2031,  "tcp"  },
+  { "mobrien-chat",    { NULL }, 2031,  "udp"  },
+  { "blackboard",      { NULL }, 2032,  "tcp"  },
+  { "blackboard",      { NULL }, 2032,  "udp"  },
+  { "glogger",         { NULL }, 2033,  "tcp"  },
+  { "glogger",         { NULL }, 2033,  "udp"  },
+  { "scoremgr",        { NULL }, 2034,  "tcp"  },
+  { "scoremgr",        { NULL }, 2034,  "udp"  },
+  { "imsldoc",         { NULL }, 2035,  "tcp"  },
+  { "imsldoc",         { NULL }, 2035,  "udp"  },
+  { "e-dpnet",         { NULL }, 2036,  "tcp"  },
+  { "e-dpnet",         { NULL }, 2036,  "udp"  },
+  { "applus",          { NULL }, 2037,  "tcp"  },
+  { "applus",          { NULL }, 2037,  "udp"  },
+  { "objectmanager",   { NULL }, 2038,  "tcp"  },
+  { "objectmanager",   { NULL }, 2038,  "udp"  },
+  { "prizma",          { NULL }, 2039,  "tcp"  },
+  { "prizma",          { NULL }, 2039,  "udp"  },
+  { "lam",             { NULL }, 2040,  "tcp"  },
+  { "lam",             { NULL }, 2040,  "udp"  },
+  { "interbase",       { NULL }, 2041,  "tcp"  },
+  { "interbase",       { NULL }, 2041,  "udp"  },
+  { "isis",            { NULL }, 2042,  "tcp"  },
+  { "isis",            { NULL }, 2042,  "udp"  },
+  { "isis-bcast",      { NULL }, 2043,  "tcp"  },
+  { "isis-bcast",      { NULL }, 2043,  "udp"  },
+  { "rimsl",           { NULL }, 2044,  "tcp"  },
+  { "rimsl",           { NULL }, 2044,  "udp"  },
+  { "cdfunc",          { NULL }, 2045,  "tcp"  },
+  { "cdfunc",          { NULL }, 2045,  "udp"  },
+  { "sdfunc",          { NULL }, 2046,  "tcp"  },
+  { "sdfunc",          { NULL }, 2046,  "udp"  },
+  { "dls",             { NULL }, 2047,  "tcp"  },
+  { "dls",             { NULL }, 2047,  "udp"  },
+  { "dls-monitor",     { NULL }, 2048,  "tcp"  },
+  { "dls-monitor",     { NULL }, 2048,  "udp"  },
+  { "shilp",           { NULL }, 2049,  "tcp"  },
+  { "shilp",           { NULL }, 2049,  "udp"  },
+  { "nfs",             { NULL }, 2049,  "tcp"  },
+  { "nfs",             { NULL }, 2049,  "udp"  },
+  { "nfs",             { NULL }, 2049,  "sctp" },
+  { "av-emb-config",   { NULL }, 2050,  "tcp"  },
+  { "av-emb-config",   { NULL }, 2050,  "udp"  },
+  { "epnsdp",          { NULL }, 2051,  "tcp"  },
+  { "epnsdp",          { NULL }, 2051,  "udp"  },
+  { "clearvisn",       { NULL }, 2052,  "tcp"  },
+  { "clearvisn",       { NULL }, 2052,  "udp"  },
+  { "lot105-ds-upd",   { NULL }, 2053,  "tcp"  },
+  { "lot105-ds-upd",   { NULL }, 2053,  "udp"  },
+  { "weblogin",        { NULL }, 2054,  "tcp"  },
+  { "weblogin",        { NULL }, 2054,  "udp"  },
+  { "iop",             { NULL }, 2055,  "tcp"  },
+  { "iop",             { NULL }, 2055,  "udp"  },
+  { "omnisky",         { NULL }, 2056,  "tcp"  },
+  { "omnisky",         { NULL }, 2056,  "udp"  },
+  { "rich-cp",         { NULL }, 2057,  "tcp"  },
+  { "rich-cp",         { NULL }, 2057,  "udp"  },
+  { "newwavesearch",   { NULL }, 2058,  "tcp"  },
+  { "newwavesearch",   { NULL }, 2058,  "udp"  },
+  { "bmc-messaging",   { NULL }, 2059,  "tcp"  },
+  { "bmc-messaging",   { NULL }, 2059,  "udp"  },
+  { "teleniumdaemon",  { NULL }, 2060,  "tcp"  },
+  { "teleniumdaemon",  { NULL }, 2060,  "udp"  },
+  { "netmount",        { NULL }, 2061,  "tcp"  },
+  { "netmount",        { NULL }, 2061,  "udp"  },
+  { "icg-swp",         { NULL }, 2062,  "tcp"  },
+  { "icg-swp",         { NULL }, 2062,  "udp"  },
+  { "icg-bridge",      { NULL }, 2063,  "tcp"  },
+  { "icg-bridge",      { NULL }, 2063,  "udp"  },
+  { "icg-iprelay",     { NULL }, 2064,  "tcp"  },
+  { "icg-iprelay",     { NULL }, 2064,  "udp"  },
+  { "dlsrpn",          { NULL }, 2065,  "tcp"  },
+  { "dlsrpn",          { NULL }, 2065,  "udp"  },
+  { "aura",            { NULL }, 2066,  "tcp"  },
+  { "aura",            { NULL }, 2066,  "udp"  },
+  { "dlswpn",          { NULL }, 2067,  "tcp"  },
+  { "dlswpn",          { NULL }, 2067,  "udp"  },
+  { "avauthsrvprtcl",  { NULL }, 2068,  "tcp"  },
+  { "avauthsrvprtcl",  { NULL }, 2068,  "udp"  },
+  { "event-port",      { NULL }, 2069,  "tcp"  },
+  { "event-port",      { NULL }, 2069,  "udp"  },
+  { "ah-esp-encap",    { NULL }, 2070,  "tcp"  },
+  { "ah-esp-encap",    { NULL }, 2070,  "udp"  },
+  { "acp-port",        { NULL }, 2071,  "tcp"  },
+  { "acp-port",        { NULL }, 2071,  "udp"  },
+  { "msync",           { NULL }, 2072,  "tcp"  },
+  { "msync",           { NULL }, 2072,  "udp"  },
+  { "gxs-data-port",   { NULL }, 2073,  "tcp"  },
+  { "gxs-data-port",   { NULL }, 2073,  "udp"  },
+  { "vrtl-vmf-sa",     { NULL }, 2074,  "tcp"  },
+  { "vrtl-vmf-sa",     { NULL }, 2074,  "udp"  },
+  { "newlixengine",    { NULL }, 2075,  "tcp"  },
+  { "newlixengine",    { NULL }, 2075,  "udp"  },
+  { "newlixconfig",    { NULL }, 2076,  "tcp"  },
+  { "newlixconfig",    { NULL }, 2076,  "udp"  },
+  { "tsrmagt",         { NULL }, 2077,  "tcp"  },
+  { "tsrmagt",         { NULL }, 2077,  "udp"  },
+  { "tpcsrvr",         { NULL }, 2078,  "tcp"  },
+  { "tpcsrvr",         { NULL }, 2078,  "udp"  },
+  { "idware-router",   { NULL }, 2079,  "tcp"  },
+  { "idware-router",   { NULL }, 2079,  "udp"  },
+  { "autodesk-nlm",    { NULL }, 2080,  "tcp"  },
+  { "autodesk-nlm",    { NULL }, 2080,  "udp"  },
+  { "kme-trap-port",   { NULL }, 2081,  "tcp"  },
+  { "kme-trap-port",   { NULL }, 2081,  "udp"  },
+  { "infowave",        { NULL }, 2082,  "tcp"  },
+  { "infowave",        { NULL }, 2082,  "udp"  },
+  { "radsec",          { NULL }, 2083,  "tcp"  },
+  { "radsec",          { NULL }, 2083,  "udp"  },
+  { "sunclustergeo",   { NULL }, 2084,  "tcp"  },
+  { "sunclustergeo",   { NULL }, 2084,  "udp"  },
+  { "ada-cip",         { NULL }, 2085,  "tcp"  },
+  { "ada-cip",         { NULL }, 2085,  "udp"  },
+  { "gnunet",          { NULL }, 2086,  "tcp"  },
+  { "gnunet",          { NULL }, 2086,  "udp"  },
+  { "eli",             { NULL }, 2087,  "tcp"  },
+  { "eli",             { NULL }, 2087,  "udp"  },
+  { "ip-blf",          { NULL }, 2088,  "tcp"  },
+  { "ip-blf",          { NULL }, 2088,  "udp"  },
+  { "sep",             { NULL }, 2089,  "tcp"  },
+  { "sep",             { NULL }, 2089,  "udp"  },
+  { "lrp",             { NULL }, 2090,  "tcp"  },
+  { "lrp",             { NULL }, 2090,  "udp"  },
+  { "prp",             { NULL }, 2091,  "tcp"  },
+  { "prp",             { NULL }, 2091,  "udp"  },
+  { "descent3",        { NULL }, 2092,  "tcp"  },
+  { "descent3",        { NULL }, 2092,  "udp"  },
+  { "nbx-cc",          { NULL }, 2093,  "tcp"  },
+  { "nbx-cc",          { NULL }, 2093,  "udp"  },
+  { "nbx-au",          { NULL }, 2094,  "tcp"  },
+  { "nbx-au",          { NULL }, 2094,  "udp"  },
+  { "nbx-ser",         { NULL }, 2095,  "tcp"  },
+  { "nbx-ser",         { NULL }, 2095,  "udp"  },
+  { "nbx-dir",         { NULL }, 2096,  "tcp"  },
+  { "nbx-dir",         { NULL }, 2096,  "udp"  },
+  { "jetformpreview",  { NULL }, 2097,  "tcp"  },
+  { "jetformpreview",  { NULL }, 2097,  "udp"  },
+  { "dialog-port",     { NULL }, 2098,  "tcp"  },
+  { "dialog-port",     { NULL }, 2098,  "udp"  },
+  { "h2250-annex-g",   { NULL }, 2099,  "tcp"  },
+  { "h2250-annex-g",   { NULL }, 2099,  "udp"  },
+  { "amiganetfs",      { NULL }, 2100,  "tcp"  },
+  { "amiganetfs",      { NULL }, 2100,  "udp"  },
+  { "rtcm-sc104",      { NULL }, 2101,  "tcp"  },
+  { "rtcm-sc104",      { NULL }, 2101,  "udp"  },
+  { "zephyr-srv",      { NULL }, 2102,  "tcp"  },
+  { "zephyr-srv",      { NULL }, 2102,  "udp"  },
+  { "zephyr-clt",      { NULL }, 2103,  "tcp"  },
+  { "zephyr-clt",      { NULL }, 2103,  "udp"  },
+  { "zephyr-hm",       { NULL }, 2104,  "tcp"  },
+  { "zephyr-hm",       { NULL }, 2104,  "udp"  },
+  { "minipay",         { NULL }, 2105,  "tcp"  },
+  { "minipay",         { NULL }, 2105,  "udp"  },
+  { "mzap",            { NULL }, 2106,  "tcp"  },
+  { "mzap",            { NULL }, 2106,  "udp"  },
+  { "bintec-admin",    { NULL }, 2107,  "tcp"  },
+  { "bintec-admin",    { NULL }, 2107,  "udp"  },
+  { "comcam",          { NULL }, 2108,  "tcp"  },
+  { "comcam",          { NULL }, 2108,  "udp"  },
+  { "ergolight",       { NULL }, 2109,  "tcp"  },
+  { "ergolight",       { NULL }, 2109,  "udp"  },
+  { "umsp",            { NULL }, 2110,  "tcp"  },
+  { "umsp",            { NULL }, 2110,  "udp"  },
+  { "dsatp",           { NULL }, 2111,  "tcp"  },
+  { "dsatp",           { NULL }, 2111,  "udp"  },
+  { "idonix-metanet",  { NULL }, 2112,  "tcp"  },
+  { "idonix-metanet",  { NULL }, 2112,  "udp"  },
+  { "hsl-storm",       { NULL }, 2113,  "tcp"  },
+  { "hsl-storm",       { NULL }, 2113,  "udp"  },
+  { "newheights",      { NULL }, 2114,  "tcp"  },
+  { "newheights",      { NULL }, 2114,  "udp"  },
+  { "kdm",             { NULL }, 2115,  "tcp"  },
+  { "kdm",             { NULL }, 2115,  "udp"  },
+  { "ccowcmr",         { NULL }, 2116,  "tcp"  },
+  { "ccowcmr",         { NULL }, 2116,  "udp"  },
+  { "mentaclient",     { NULL }, 2117,  "tcp"  },
+  { "mentaclient",     { NULL }, 2117,  "udp"  },
+  { "mentaserver",     { NULL }, 2118,  "tcp"  },
+  { "mentaserver",     { NULL }, 2118,  "udp"  },
+  { "gsigatekeeper",   { NULL }, 2119,  "tcp"  },
+  { "gsigatekeeper",   { NULL }, 2119,  "udp"  },
+  { "qencp",           { NULL }, 2120,  "tcp"  },
+  { "qencp",           { NULL }, 2120,  "udp"  },
+  { "scientia-ssdb",   { NULL }, 2121,  "tcp"  },
+  { "scientia-ssdb",   { NULL }, 2121,  "udp"  },
+  { "caupc-remote",    { NULL }, 2122,  "tcp"  },
+  { "caupc-remote",    { NULL }, 2122,  "udp"  },
+  { "gtp-control",     { NULL }, 2123,  "tcp"  },
+  { "gtp-control",     { NULL }, 2123,  "udp"  },
+  { "elatelink",       { NULL }, 2124,  "tcp"  },
+  { "elatelink",       { NULL }, 2124,  "udp"  },
+  { "lockstep",        { NULL }, 2125,  "tcp"  },
+  { "lockstep",        { NULL }, 2125,  "udp"  },
+  { "pktcable-cops",   { NULL }, 2126,  "tcp"  },
+  { "pktcable-cops",   { NULL }, 2126,  "udp"  },
+  { "index-pc-wb",     { NULL }, 2127,  "tcp"  },
+  { "index-pc-wb",     { NULL }, 2127,  "udp"  },
+  { "net-steward",     { NULL }, 2128,  "tcp"  },
+  { "net-steward",     { NULL }, 2128,  "udp"  },
+  { "cs-live",         { NULL }, 2129,  "tcp"  },
+  { "cs-live",         { NULL }, 2129,  "udp"  },
+  { "xds",             { NULL }, 2130,  "tcp"  },
+  { "xds",             { NULL }, 2130,  "udp"  },
+  { "avantageb2b",     { NULL }, 2131,  "tcp"  },
+  { "avantageb2b",     { NULL }, 2131,  "udp"  },
+  { "solera-epmap",    { NULL }, 2132,  "tcp"  },
+  { "solera-epmap",    { NULL }, 2132,  "udp"  },
+  { "zymed-zpp",       { NULL }, 2133,  "tcp"  },
+  { "zymed-zpp",       { NULL }, 2133,  "udp"  },
+  { "avenue",          { NULL }, 2134,  "tcp"  },
+  { "avenue",          { NULL }, 2134,  "udp"  },
+  { "gris",            { NULL }, 2135,  "tcp"  },
+  { "gris",            { NULL }, 2135,  "udp"  },
+  { "appworxsrv",      { NULL }, 2136,  "tcp"  },
+  { "appworxsrv",      { NULL }, 2136,  "udp"  },
+  { "connect",         { NULL }, 2137,  "tcp"  },
+  { "connect",         { NULL }, 2137,  "udp"  },
+  { "unbind-cluster",  { NULL }, 2138,  "tcp"  },
+  { "unbind-cluster",  { NULL }, 2138,  "udp"  },
+  { "ias-auth",        { NULL }, 2139,  "tcp"  },
+  { "ias-auth",        { NULL }, 2139,  "udp"  },
+  { "ias-reg",         { NULL }, 2140,  "tcp"  },
+  { "ias-reg",         { NULL }, 2140,  "udp"  },
+  { "ias-admind",      { NULL }, 2141,  "tcp"  },
+  { "ias-admind",      { NULL }, 2141,  "udp"  },
+  { "tdmoip",          { NULL }, 2142,  "tcp"  },
+  { "tdmoip",          { NULL }, 2142,  "udp"  },
+  { "lv-jc",           { NULL }, 2143,  "tcp"  },
+  { "lv-jc",           { NULL }, 2143,  "udp"  },
+  { "lv-ffx",          { NULL }, 2144,  "tcp"  },
+  { "lv-ffx",          { NULL }, 2144,  "udp"  },
+  { "lv-pici",         { NULL }, 2145,  "tcp"  },
+  { "lv-pici",         { NULL }, 2145,  "udp"  },
+  { "lv-not",          { NULL }, 2146,  "tcp"  },
+  { "lv-not",          { NULL }, 2146,  "udp"  },
+  { "lv-auth",         { NULL }, 2147,  "tcp"  },
+  { "lv-auth",         { NULL }, 2147,  "udp"  },
+  { "veritas-ucl",     { NULL }, 2148,  "tcp"  },
+  { "veritas-ucl",     { NULL }, 2148,  "udp"  },
+  { "acptsys",         { NULL }, 2149,  "tcp"  },
+  { "acptsys",         { NULL }, 2149,  "udp"  },
+  { "dynamic3d",       { NULL }, 2150,  "tcp"  },
+  { "dynamic3d",       { NULL }, 2150,  "udp"  },
+  { "docent",          { NULL }, 2151,  "tcp"  },
+  { "docent",          { NULL }, 2151,  "udp"  },
+  { "gtp-user",        { NULL }, 2152,  "tcp"  },
+  { "gtp-user",        { NULL }, 2152,  "udp"  },
+  { "ctlptc",          { NULL }, 2153,  "tcp"  },
+  { "ctlptc",          { NULL }, 2153,  "udp"  },
+  { "stdptc",          { NULL }, 2154,  "tcp"  },
+  { "stdptc",          { NULL }, 2154,  "udp"  },
+  { "brdptc",          { NULL }, 2155,  "tcp"  },
+  { "brdptc",          { NULL }, 2155,  "udp"  },
+  { "trp",             { NULL }, 2156,  "tcp"  },
+  { "trp",             { NULL }, 2156,  "udp"  },
+  { "xnds",            { NULL }, 2157,  "tcp"  },
+  { "xnds",            { NULL }, 2157,  "udp"  },
+  { "touchnetplus",    { NULL }, 2158,  "tcp"  },
+  { "touchnetplus",    { NULL }, 2158,  "udp"  },
+  { "gdbremote",       { NULL }, 2159,  "tcp"  },
+  { "gdbremote",       { NULL }, 2159,  "udp"  },
+  { "apc-2160",        { NULL }, 2160,  "tcp"  },
+  { "apc-2160",        { NULL }, 2160,  "udp"  },
+  { "apc-2161",        { NULL }, 2161,  "tcp"  },
+  { "apc-2161",        { NULL }, 2161,  "udp"  },
+  { "navisphere",      { NULL }, 2162,  "tcp"  },
+  { "navisphere",      { NULL }, 2162,  "udp"  },
+  { "navisphere-sec",  { NULL }, 2163,  "tcp"  },
+  { "navisphere-sec",  { NULL }, 2163,  "udp"  },
+  { "ddns-v3",         { NULL }, 2164,  "tcp"  },
+  { "ddns-v3",         { NULL }, 2164,  "udp"  },
+  { "x-bone-api",      { NULL }, 2165,  "tcp"  },
+  { "x-bone-api",      { NULL }, 2165,  "udp"  },
+  { "iwserver",        { NULL }, 2166,  "tcp"  },
+  { "iwserver",        { NULL }, 2166,  "udp"  },
+  { "raw-serial",      { NULL }, 2167,  "tcp"  },
+  { "raw-serial",      { NULL }, 2167,  "udp"  },
+  { "easy-soft-mux",   { NULL }, 2168,  "tcp"  },
+  { "easy-soft-mux",   { NULL }, 2168,  "udp"  },
+  { "brain",           { NULL }, 2169,  "tcp"  },
+  { "brain",           { NULL }, 2169,  "udp"  },
+  { "eyetv",           { NULL }, 2170,  "tcp"  },
+  { "eyetv",           { NULL }, 2170,  "udp"  },
+  { "msfw-storage",    { NULL }, 2171,  "tcp"  },
+  { "msfw-storage",    { NULL }, 2171,  "udp"  },
+  { "msfw-s-storage",  { NULL }, 2172,  "tcp"  },
+  { "msfw-s-storage",  { NULL }, 2172,  "udp"  },
+  { "msfw-replica",    { NULL }, 2173,  "tcp"  },
+  { "msfw-replica",    { NULL }, 2173,  "udp"  },
+  { "msfw-array",      { NULL }, 2174,  "tcp"  },
+  { "msfw-array",      { NULL }, 2174,  "udp"  },
+  { "airsync",         { NULL }, 2175,  "tcp"  },
+  { "airsync",         { NULL }, 2175,  "udp"  },
+  { "rapi",            { NULL }, 2176,  "tcp"  },
+  { "rapi",            { NULL }, 2176,  "udp"  },
+  { "qwave",           { NULL }, 2177,  "tcp"  },
+  { "qwave",           { NULL }, 2177,  "udp"  },
+  { "bitspeer",        { NULL }, 2178,  "tcp"  },
+  { "bitspeer",        { NULL }, 2178,  "udp"  },
+  { "vmrdp",           { NULL }, 2179,  "tcp"  },
+  { "vmrdp",           { NULL }, 2179,  "udp"  },
+  { "mc-gt-srv",       { NULL }, 2180,  "tcp"  },
+  { "mc-gt-srv",       { NULL }, 2180,  "udp"  },
+  { "eforward",        { NULL }, 2181,  "tcp"  },
+  { "eforward",        { NULL }, 2181,  "udp"  },
+  { "cgn-stat",        { NULL }, 2182,  "tcp"  },
+  { "cgn-stat",        { NULL }, 2182,  "udp"  },
+  { "cgn-config",      { NULL }, 2183,  "tcp"  },
+  { "cgn-config",      { NULL }, 2183,  "udp"  },
+  { "nvd",             { NULL }, 2184,  "tcp"  },
+  { "nvd",             { NULL }, 2184,  "udp"  },
+  { "onbase-dds",      { NULL }, 2185,  "tcp"  },
+  { "onbase-dds",      { NULL }, 2185,  "udp"  },
+  { "gtaua",           { NULL }, 2186,  "tcp"  },
+  { "gtaua",           { NULL }, 2186,  "udp"  },
+  { "ssmc",            { NULL }, 2187,  "tcp"  },
+  { "ssmd",            { NULL }, 2187,  "udp"  },
+  { "tivoconnect",     { NULL }, 2190,  "tcp"  },
+  { "tivoconnect",     { NULL }, 2190,  "udp"  },
+  { "tvbus",           { NULL }, 2191,  "tcp"  },
+  { "tvbus",           { NULL }, 2191,  "udp"  },
+  { "asdis",           { NULL }, 2192,  "tcp"  },
+  { "asdis",           { NULL }, 2192,  "udp"  },
+  { "drwcs",           { NULL }, 2193,  "tcp"  },
+  { "drwcs",           { NULL }, 2193,  "udp"  },
+  { "mnp-exchange",    { NULL }, 2197,  "tcp"  },
+  { "mnp-exchange",    { NULL }, 2197,  "udp"  },
+  { "onehome-remote",  { NULL }, 2198,  "tcp"  },
+  { "onehome-remote",  { NULL }, 2198,  "udp"  },
+  { "onehome-help",    { NULL }, 2199,  "tcp"  },
+  { "onehome-help",    { NULL }, 2199,  "udp"  },
+  { "ici",             { NULL }, 2200,  "tcp"  },
+  { "ici",             { NULL }, 2200,  "udp"  },
+  { "ats",             { NULL }, 2201,  "tcp"  },
+  { "ats",             { NULL }, 2201,  "udp"  },
+  { "imtc-map",        { NULL }, 2202,  "tcp"  },
+  { "imtc-map",        { NULL }, 2202,  "udp"  },
+  { "b2-runtime",      { NULL }, 2203,  "tcp"  },
+  { "b2-runtime",      { NULL }, 2203,  "udp"  },
+  { "b2-license",      { NULL }, 2204,  "tcp"  },
+  { "b2-license",      { NULL }, 2204,  "udp"  },
+  { "jps",             { NULL }, 2205,  "tcp"  },
+  { "jps",             { NULL }, 2205,  "udp"  },
+  { "hpocbus",         { NULL }, 2206,  "tcp"  },
+  { "hpocbus",         { NULL }, 2206,  "udp"  },
+  { "hpssd",           { NULL }, 2207,  "tcp"  },
+  { "hpssd",           { NULL }, 2207,  "udp"  },
+  { "hpiod",           { NULL }, 2208,  "tcp"  },
+  { "hpiod",           { NULL }, 2208,  "udp"  },
+  { "rimf-ps",         { NULL }, 2209,  "tcp"  },
+  { "rimf-ps",         { NULL }, 2209,  "udp"  },
+  { "noaaport",        { NULL }, 2210,  "tcp"  },
+  { "noaaport",        { NULL }, 2210,  "udp"  },
+  { "emwin",           { NULL }, 2211,  "tcp"  },
+  { "emwin",           { NULL }, 2211,  "udp"  },
+  { "leecoposserver",  { NULL }, 2212,  "tcp"  },
+  { "leecoposserver",  { NULL }, 2212,  "udp"  },
+  { "kali",            { NULL }, 2213,  "tcp"  },
+  { "kali",            { NULL }, 2213,  "udp"  },
+  { "rpi",             { NULL }, 2214,  "tcp"  },
+  { "rpi",             { NULL }, 2214,  "udp"  },
+  { "ipcore",          { NULL }, 2215,  "tcp"  },
+  { "ipcore",          { NULL }, 2215,  "udp"  },
+  { "vtu-comms",       { NULL }, 2216,  "tcp"  },
+  { "vtu-comms",       { NULL }, 2216,  "udp"  },
+  { "gotodevice",      { NULL }, 2217,  "tcp"  },
+  { "gotodevice",      { NULL }, 2217,  "udp"  },
+  { "bounzza",         { NULL }, 2218,  "tcp"  },
+  { "bounzza",         { NULL }, 2218,  "udp"  },
+  { "netiq-ncap",      { NULL }, 2219,  "tcp"  },
+  { "netiq-ncap",      { NULL }, 2219,  "udp"  },
+  { "netiq",           { NULL }, 2220,  "tcp"  },
+  { "netiq",           { NULL }, 2220,  "udp"  },
+  { "rockwell-csp1",   { NULL }, 2221,  "tcp"  },
+  { "rockwell-csp1",   { NULL }, 2221,  "udp"  },
+  { "EtherNet/IP-1",   { NULL }, 2222,  "tcp"  },
+  { "EtherNet/IP-1",   { NULL }, 2222,  "udp"  },
+  { "rockwell-csp2",   { NULL }, 2223,  "tcp"  },
+  { "rockwell-csp2",   { NULL }, 2223,  "udp"  },
+  { "efi-mg",          { NULL }, 2224,  "tcp"  },
+  { "efi-mg",          { NULL }, 2224,  "udp"  },
+  { "rcip-itu",        { NULL }, 2225,  "tcp"  },
+  { "rcip-itu",        { NULL }, 2225,  "sctp" },
+  { "di-drm",          { NULL }, 2226,  "tcp"  },
+  { "di-drm",          { NULL }, 2226,  "udp"  },
+  { "di-msg",          { NULL }, 2227,  "tcp"  },
+  { "di-msg",          { NULL }, 2227,  "udp"  },
+  { "ehome-ms",        { NULL }, 2228,  "tcp"  },
+  { "ehome-ms",        { NULL }, 2228,  "udp"  },
+  { "datalens",        { NULL }, 2229,  "tcp"  },
+  { "datalens",        { NULL }, 2229,  "udp"  },
+  { "queueadm",        { NULL }, 2230,  "tcp"  },
+  { "queueadm",        { NULL }, 2230,  "udp"  },
+  { "wimaxasncp",      { NULL }, 2231,  "tcp"  },
+  { "wimaxasncp",      { NULL }, 2231,  "udp"  },
+  { "ivs-video",       { NULL }, 2232,  "tcp"  },
+  { "ivs-video",       { NULL }, 2232,  "udp"  },
+  { "infocrypt",       { NULL }, 2233,  "tcp"  },
+  { "infocrypt",       { NULL }, 2233,  "udp"  },
+  { "directplay",      { NULL }, 2234,  "tcp"  },
+  { "directplay",      { NULL }, 2234,  "udp"  },
+  { "sercomm-wlink",   { NULL }, 2235,  "tcp"  },
+  { "sercomm-wlink",   { NULL }, 2235,  "udp"  },
+  { "nani",            { NULL }, 2236,  "tcp"  },
+  { "nani",            { NULL }, 2236,  "udp"  },
+  { "optech-port1-lm", { NULL }, 2237,  "tcp"  },
+  { "optech-port1-lm", { NULL }, 2237,  "udp"  },
+  { "aviva-sna",       { NULL }, 2238,  "tcp"  },
+  { "aviva-sna",       { NULL }, 2238,  "udp"  },
+  { "imagequery",      { NULL }, 2239,  "tcp"  },
+  { "imagequery",      { NULL }, 2239,  "udp"  },
+  { "recipe",          { NULL }, 2240,  "tcp"  },
+  { "recipe",          { NULL }, 2240,  "udp"  },
+  { "ivsd",            { NULL }, 2241,  "tcp"  },
+  { "ivsd",            { NULL }, 2241,  "udp"  },
+  { "foliocorp",       { NULL }, 2242,  "tcp"  },
+  { "foliocorp",       { NULL }, 2242,  "udp"  },
+  { "magicom",         { NULL }, 2243,  "tcp"  },
+  { "magicom",         { NULL }, 2243,  "udp"  },
+  { "nmsserver",       { NULL }, 2244,  "tcp"  },
+  { "nmsserver",       { NULL }, 2244,  "udp"  },
+  { "hao",             { NULL }, 2245,  "tcp"  },
+  { "hao",             { NULL }, 2245,  "udp"  },
+  { "pc-mta-addrmap",  { NULL }, 2246,  "tcp"  },
+  { "pc-mta-addrmap",  { NULL }, 2246,  "udp"  },
+  { "antidotemgrsvr",  { NULL }, 2247,  "tcp"  },
+  { "antidotemgrsvr",  { NULL }, 2247,  "udp"  },
+  { "ums",             { NULL }, 2248,  "tcp"  },
+  { "ums",             { NULL }, 2248,  "udp"  },
+  { "rfmp",            { NULL }, 2249,  "tcp"  },
+  { "rfmp",            { NULL }, 2249,  "udp"  },
+  { "remote-collab",   { NULL }, 2250,  "tcp"  },
+  { "remote-collab",   { NULL }, 2250,  "udp"  },
+  { "dif-port",        { NULL }, 2251,  "tcp"  },
+  { "dif-port",        { NULL }, 2251,  "udp"  },
+  { "njenet-ssl",      { NULL }, 2252,  "tcp"  },
+  { "njenet-ssl",      { NULL }, 2252,  "udp"  },
+  { "dtv-chan-req",    { NULL }, 2253,  "tcp"  },
+  { "dtv-chan-req",    { NULL }, 2253,  "udp"  },
+  { "seispoc",         { NULL }, 2254,  "tcp"  },
+  { "seispoc",         { NULL }, 2254,  "udp"  },
+  { "vrtp",            { NULL }, 2255,  "tcp"  },
+  { "vrtp",            { NULL }, 2255,  "udp"  },
+  { "pcc-mfp",         { NULL }, 2256,  "tcp"  },
+  { "pcc-mfp",         { NULL }, 2256,  "udp"  },
+  { "simple-tx-rx",    { NULL }, 2257,  "tcp"  },
+  { "simple-tx-rx",    { NULL }, 2257,  "udp"  },
+  { "rcts",            { NULL }, 2258,  "tcp"  },
+  { "rcts",            { NULL }, 2258,  "udp"  },
+  { "acd-pm",          { NULL }, 2259,  "tcp"  },
+  { "acd-pm",          { NULL }, 2259,  "udp"  },
+  { "apc-2260",        { NULL }, 2260,  "tcp"  },
+  { "apc-2260",        { NULL }, 2260,  "udp"  },
+  { "comotionmaster",  { NULL }, 2261,  "tcp"  },
+  { "comotionmaster",  { NULL }, 2261,  "udp"  },
+  { "comotionback",    { NULL }, 2262,  "tcp"  },
+  { "comotionback",    { NULL }, 2262,  "udp"  },
+  { "ecwcfg",          { NULL }, 2263,  "tcp"  },
+  { "ecwcfg",          { NULL }, 2263,  "udp"  },
+  { "apx500api-1",     { NULL }, 2264,  "tcp"  },
+  { "apx500api-1",     { NULL }, 2264,  "udp"  },
+  { "apx500api-2",     { NULL }, 2265,  "tcp"  },
+  { "apx500api-2",     { NULL }, 2265,  "udp"  },
+  { "mfserver",        { NULL }, 2266,  "tcp"  },
+  { "mfserver",        { NULL }, 2266,  "udp"  },
+  { "ontobroker",      { NULL }, 2267,  "tcp"  },
+  { "ontobroker",      { NULL }, 2267,  "udp"  },
+  { "amt",             { NULL }, 2268,  "tcp"  },
+  { "amt",             { NULL }, 2268,  "udp"  },
+  { "mikey",           { NULL }, 2269,  "tcp"  },
+  { "mikey",           { NULL }, 2269,  "udp"  },
+  { "starschool",      { NULL }, 2270,  "tcp"  },
+  { "starschool",      { NULL }, 2270,  "udp"  },
+  { "mmcals",          { NULL }, 2271,  "tcp"  },
+  { "mmcals",          { NULL }, 2271,  "udp"  },
+  { "mmcal",           { NULL }, 2272,  "tcp"  },
+  { "mmcal",           { NULL }, 2272,  "udp"  },
+  { "mysql-im",        { NULL }, 2273,  "tcp"  },
+  { "mysql-im",        { NULL }, 2273,  "udp"  },
+  { "pcttunnell",      { NULL }, 2274,  "tcp"  },
+  { "pcttunnell",      { NULL }, 2274,  "udp"  },
+  { "ibridge-data",    { NULL }, 2275,  "tcp"  },
+  { "ibridge-data",    { NULL }, 2275,  "udp"  },
+  { "ibridge-mgmt",    { NULL }, 2276,  "tcp"  },
+  { "ibridge-mgmt",    { NULL }, 2276,  "udp"  },
+  { "bluectrlproxy",   { NULL }, 2277,  "tcp"  },
+  { "bluectrlproxy",   { NULL }, 2277,  "udp"  },
+  { "s3db",            { NULL }, 2278,  "tcp"  },
+  { "s3db",            { NULL }, 2278,  "udp"  },
+  { "xmquery",         { NULL }, 2279,  "tcp"  },
+  { "xmquery",         { NULL }, 2279,  "udp"  },
+  { "lnvpoller",       { NULL }, 2280,  "tcp"  },
+  { "lnvpoller",       { NULL }, 2280,  "udp"  },
+  { "lnvconsole",      { NULL }, 2281,  "tcp"  },
+  { "lnvconsole",      { NULL }, 2281,  "udp"  },
+  { "lnvalarm",        { NULL }, 2282,  "tcp"  },
+  { "lnvalarm",        { NULL }, 2282,  "udp"  },
+  { "lnvstatus",       { NULL }, 2283,  "tcp"  },
+  { "lnvstatus",       { NULL }, 2283,  "udp"  },
+  { "lnvmaps",         { NULL }, 2284,  "tcp"  },
+  { "lnvmaps",         { NULL }, 2284,  "udp"  },
+  { "lnvmailmon",      { NULL }, 2285,  "tcp"  },
+  { "lnvmailmon",      { NULL }, 2285,  "udp"  },
+  { "nas-metering",    { NULL }, 2286,  "tcp"  },
+  { "nas-metering",    { NULL }, 2286,  "udp"  },
+  { "dna",             { NULL }, 2287,  "tcp"  },
+  { "dna",             { NULL }, 2287,  "udp"  },
+  { "netml",           { NULL }, 2288,  "tcp"  },
+  { "netml",           { NULL }, 2288,  "udp"  },
+  { "dict-lookup",     { NULL }, 2289,  "tcp"  },
+  { "dict-lookup",     { NULL }, 2289,  "udp"  },
+  { "sonus-logging",   { NULL }, 2290,  "tcp"  },
+  { "sonus-logging",   { NULL }, 2290,  "udp"  },
+  { "eapsp",           { NULL }, 2291,  "tcp"  },
+  { "eapsp",           { NULL }, 2291,  "udp"  },
+  { "mib-streaming",   { NULL }, 2292,  "tcp"  },
+  { "mib-streaming",   { NULL }, 2292,  "udp"  },
+  { "npdbgmngr",       { NULL }, 2293,  "tcp"  },
+  { "npdbgmngr",       { NULL }, 2293,  "udp"  },
+  { "konshus-lm",      { NULL }, 2294,  "tcp"  },
+  { "konshus-lm",      { NULL }, 2294,  "udp"  },
+  { "advant-lm",       { NULL }, 2295,  "tcp"  },
+  { "advant-lm",       { NULL }, 2295,  "udp"  },
+  { "theta-lm",        { NULL }, 2296,  "tcp"  },
+  { "theta-lm",        { NULL }, 2296,  "udp"  },
+  { "d2k-datamover1",  { NULL }, 2297,  "tcp"  },
+  { "d2k-datamover1",  { NULL }, 2297,  "udp"  },
+  { "d2k-datamover2",  { NULL }, 2298,  "tcp"  },
+  { "d2k-datamover2",  { NULL }, 2298,  "udp"  },
+  { "pc-telecommute",  { NULL }, 2299,  "tcp"  },
+  { "pc-telecommute",  { NULL }, 2299,  "udp"  },
+  { "cvmmon",          { NULL }, 2300,  "tcp"  },
+  { "cvmmon",          { NULL }, 2300,  "udp"  },
+  { "cpq-wbem",        { NULL }, 2301,  "tcp"  },
+  { "cpq-wbem",        { NULL }, 2301,  "udp"  },
+  { "binderysupport",  { NULL }, 2302,  "tcp"  },
+  { "binderysupport",  { NULL }, 2302,  "udp"  },
+  { "proxy-gateway",   { NULL }, 2303,  "tcp"  },
+  { "proxy-gateway",   { NULL }, 2303,  "udp"  },
+  { "attachmate-uts",  { NULL }, 2304,  "tcp"  },
+  { "attachmate-uts",  { NULL }, 2304,  "udp"  },
+  { "mt-scaleserver",  { NULL }, 2305,  "tcp"  },
+  { "mt-scaleserver",  { NULL }, 2305,  "udp"  },
+  { "tappi-boxnet",    { NULL }, 2306,  "tcp"  },
+  { "tappi-boxnet",    { NULL }, 2306,  "udp"  },
+  { "pehelp",          { NULL }, 2307,  "tcp"  },
+  { "pehelp",          { NULL }, 2307,  "udp"  },
+  { "sdhelp",          { NULL }, 2308,  "tcp"  },
+  { "sdhelp",          { NULL }, 2308,  "udp"  },
+  { "sdserver",        { NULL }, 2309,  "tcp"  },
+  { "sdserver",        { NULL }, 2309,  "udp"  },
+  { "sdclient",        { NULL }, 2310,  "tcp"  },
+  { "sdclient",        { NULL }, 2310,  "udp"  },
+  { "messageservice",  { NULL }, 2311,  "tcp"  },
+  { "messageservice",  { NULL }, 2311,  "udp"  },
+  { "wanscaler",       { NULL }, 2312,  "tcp"  },
+  { "wanscaler",       { NULL }, 2312,  "udp"  },
+  { "iapp",            { NULL }, 2313,  "tcp"  },
+  { "iapp",            { NULL }, 2313,  "udp"  },
+  { "cr-websystems",   { NULL }, 2314,  "tcp"  },
+  { "cr-websystems",   { NULL }, 2314,  "udp"  },
+  { "precise-sft",     { NULL }, 2315,  "tcp"  },
+  { "precise-sft",     { NULL }, 2315,  "udp"  },
+  { "sent-lm",         { NULL }, 2316,  "tcp"  },
+  { "sent-lm",         { NULL }, 2316,  "udp"  },
+  { "attachmate-g32",  { NULL }, 2317,  "tcp"  },
+  { "attachmate-g32",  { NULL }, 2317,  "udp"  },
+  { "cadencecontrol",  { NULL }, 2318,  "tcp"  },
+  { "cadencecontrol",  { NULL }, 2318,  "udp"  },
+  { "infolibria",      { NULL }, 2319,  "tcp"  },
+  { "infolibria",      { NULL }, 2319,  "udp"  },
+  { "siebel-ns",       { NULL }, 2320,  "tcp"  },
+  { "siebel-ns",       { NULL }, 2320,  "udp"  },
+  { "rdlap",           { NULL }, 2321,  "tcp"  },
+  { "rdlap",           { NULL }, 2321,  "udp"  },
+  { "ofsd",            { NULL }, 2322,  "tcp"  },
+  { "ofsd",            { NULL }, 2322,  "udp"  },
+  { "3d-nfsd",         { NULL }, 2323,  "tcp"  },
+  { "3d-nfsd",         { NULL }, 2323,  "udp"  },
+  { "cosmocall",       { NULL }, 2324,  "tcp"  },
+  { "cosmocall",       { NULL }, 2324,  "udp"  },
+  { "ansysli",         { NULL }, 2325,  "tcp"  },
+  { "ansysli",         { NULL }, 2325,  "udp"  },
+  { "idcp",            { NULL }, 2326,  "tcp"  },
+  { "idcp",            { NULL }, 2326,  "udp"  },
+  { "xingcsm",         { NULL }, 2327,  "tcp"  },
+  { "xingcsm",         { NULL }, 2327,  "udp"  },
+  { "netrix-sftm",     { NULL }, 2328,  "tcp"  },
+  { "netrix-sftm",     { NULL }, 2328,  "udp"  },
+  { "nvd",             { NULL }, 2329,  "tcp"  },
+  { "nvd",             { NULL }, 2329,  "udp"  },
+  { "tscchat",         { NULL }, 2330,  "tcp"  },
+  { "tscchat",         { NULL }, 2330,  "udp"  },
+  { "agentview",       { NULL }, 2331,  "tcp"  },
+  { "agentview",       { NULL }, 2331,  "udp"  },
+  { "rcc-host",        { NULL }, 2332,  "tcp"  },
+  { "rcc-host",        { NULL }, 2332,  "udp"  },
+  { "snapp",           { NULL }, 2333,  "tcp"  },
+  { "snapp",           { NULL }, 2333,  "udp"  },
+  { "ace-client",      { NULL }, 2334,  "tcp"  },
+  { "ace-client",      { NULL }, 2334,  "udp"  },
+  { "ace-proxy",       { NULL }, 2335,  "tcp"  },
+  { "ace-proxy",       { NULL }, 2335,  "udp"  },
+  { "appleugcontrol",  { NULL }, 2336,  "tcp"  },
+  { "appleugcontrol",  { NULL }, 2336,  "udp"  },
+  { "ideesrv",         { NULL }, 2337,  "tcp"  },
+  { "ideesrv",         { NULL }, 2337,  "udp"  },
+  { "norton-lambert",  { NULL }, 2338,  "tcp"  },
+  { "norton-lambert",  { NULL }, 2338,  "udp"  },
+  { "3com-webview",    { NULL }, 2339,  "tcp"  },
+  { "3com-webview",    { NULL }, 2339,  "udp"  },
+  { "wrs_registry",    { NULL }, 2340,  "tcp"  },
+  { "wrs_registry",    { NULL }, 2340,  "udp"  },
+  { "xiostatus",       { NULL }, 2341,  "tcp"  },
+  { "xiostatus",       { NULL }, 2341,  "udp"  },
+  { "manage-exec",     { NULL }, 2342,  "tcp"  },
+  { "manage-exec",     { NULL }, 2342,  "udp"  },
+  { "nati-logos",      { NULL }, 2343,  "tcp"  },
+  { "nati-logos",      { NULL }, 2343,  "udp"  },
+  { "fcmsys",          { NULL }, 2344,  "tcp"  },
+  { "fcmsys",          { NULL }, 2344,  "udp"  },
+  { "dbm",             { NULL }, 2345,  "tcp"  },
+  { "dbm",             { NULL }, 2345,  "udp"  },
+  { "redstorm_join",   { NULL }, 2346,  "tcp"  },
+  { "redstorm_join",   { NULL }, 2346,  "udp"  },
+  { "redstorm_find",   { NULL }, 2347,  "tcp"  },
+  { "redstorm_find",   { NULL }, 2347,  "udp"  },
+  { "redstorm_info",   { NULL }, 2348,  "tcp"  },
+  { "redstorm_info",   { NULL }, 2348,  "udp"  },
+  { "redstorm_diag",   { NULL }, 2349,  "tcp"  },
+  { "redstorm_diag",   { NULL }, 2349,  "udp"  },
+  { "psbserver",       { NULL }, 2350,  "tcp"  },
+  { "psbserver",       { NULL }, 2350,  "udp"  },
+  { "psrserver",       { NULL }, 2351,  "tcp"  },
+  { "psrserver",       { NULL }, 2351,  "udp"  },
+  { "pslserver",       { NULL }, 2352,  "tcp"  },
+  { "pslserver",       { NULL }, 2352,  "udp"  },
+  { "pspserver",       { NULL }, 2353,  "tcp"  },
+  { "pspserver",       { NULL }, 2353,  "udp"  },
+  { "psprserver",      { NULL }, 2354,  "tcp"  },
+  { "psprserver",      { NULL }, 2354,  "udp"  },
+  { "psdbserver",      { NULL }, 2355,  "tcp"  },
+  { "psdbserver",      { NULL }, 2355,  "udp"  },
+  { "gxtelmd",         { NULL }, 2356,  "tcp"  },
+  { "gxtelmd",         { NULL }, 2356,  "udp"  },
+  { "unihub-server",   { NULL }, 2357,  "tcp"  },
+  { "unihub-server",   { NULL }, 2357,  "udp"  },
+  { "futrix",          { NULL }, 2358,  "tcp"  },
+  { "futrix",          { NULL }, 2358,  "udp"  },
+  { "flukeserver",     { NULL }, 2359,  "tcp"  },
+  { "flukeserver",     { NULL }, 2359,  "udp"  },
+  { "nexstorindltd",   { NULL }, 2360,  "tcp"  },
+  { "nexstorindltd",   { NULL }, 2360,  "udp"  },
+  { "tl1",             { NULL }, 2361,  "tcp"  },
+  { "tl1",             { NULL }, 2361,  "udp"  },
+  { "digiman",         { NULL }, 2362,  "tcp"  },
+  { "digiman",         { NULL }, 2362,  "udp"  },
+  { "mediacntrlnfsd",  { NULL }, 2363,  "tcp"  },
+  { "mediacntrlnfsd",  { NULL }, 2363,  "udp"  },
+  { "oi-2000",         { NULL }, 2364,  "tcp"  },
+  { "oi-2000",         { NULL }, 2364,  "udp"  },
+  { "dbref",           { NULL }, 2365,  "tcp"  },
+  { "dbref",           { NULL }, 2365,  "udp"  },
+  { "qip-login",       { NULL }, 2366,  "tcp"  },
+  { "qip-login",       { NULL }, 2366,  "udp"  },
+  { "service-ctrl",    { NULL }, 2367,  "tcp"  },
+  { "service-ctrl",    { NULL }, 2367,  "udp"  },
+  { "opentable",       { NULL }, 2368,  "tcp"  },
+  { "opentable",       { NULL }, 2368,  "udp"  },
+  { "l3-hbmon",        { NULL }, 2370,  "tcp"  },
+  { "l3-hbmon",        { NULL }, 2370,  "udp"  },
+  { "worldwire",       { NULL }, 2371,  "tcp"  },
+  { "worldwire",       { NULL }, 2371,  "udp"  },
+  { "lanmessenger",    { NULL }, 2372,  "tcp"  },
+  { "lanmessenger",    { NULL }, 2372,  "udp"  },
+  { "remographlm",     { NULL }, 2373,  "tcp"  },
+  { "hydra",           { NULL }, 2374,  "tcp"  },
+  { "compaq-https",    { NULL }, 2381,  "tcp"  },
+  { "compaq-https",    { NULL }, 2381,  "udp"  },
+  { "ms-olap3",        { NULL }, 2382,  "tcp"  },
+  { "ms-olap3",        { NULL }, 2382,  "udp"  },
+  { "ms-olap4",        { NULL }, 2383,  "tcp"  },
+  { "ms-olap4",        { NULL }, 2383,  "udp"  },
+  { "sd-request",      { NULL }, 2384,  "tcp"  },
+  { "sd-capacity",     { NULL }, 2384,  "udp"  },
+  { "sd-data",         { NULL }, 2385,  "tcp"  },
+  { "sd-data",         { NULL }, 2385,  "udp"  },
+  { "virtualtape",     { NULL }, 2386,  "tcp"  },
+  { "virtualtape",     { NULL }, 2386,  "udp"  },
+  { "vsamredirector",  { NULL }, 2387,  "tcp"  },
+  { "vsamredirector",  { NULL }, 2387,  "udp"  },
+  { "mynahautostart",  { NULL }, 2388,  "tcp"  },
+  { "mynahautostart",  { NULL }, 2388,  "udp"  },
+  { "ovsessionmgr",    { NULL }, 2389,  "tcp"  },
+  { "ovsessionmgr",    { NULL }, 2389,  "udp"  },
+  { "rsmtp",           { NULL }, 2390,  "tcp"  },
+  { "rsmtp",           { NULL }, 2390,  "udp"  },
+  { "3com-net-mgmt",   { NULL }, 2391,  "tcp"  },
+  { "3com-net-mgmt",   { NULL }, 2391,  "udp"  },
+  { "tacticalauth",    { NULL }, 2392,  "tcp"  },
+  { "tacticalauth",    { NULL }, 2392,  "udp"  },
+  { "ms-olap1",        { NULL }, 2393,  "tcp"  },
+  { "ms-olap1",        { NULL }, 2393,  "udp"  },
+  { "ms-olap2",        { NULL }, 2394,  "tcp"  },
+  { "ms-olap2",        { NULL }, 2394,  "udp"  },
+  { "lan900_remote",   { NULL }, 2395,  "tcp"  },
+  { "lan900_remote",   { NULL }, 2395,  "udp"  },
+  { "wusage",          { NULL }, 2396,  "tcp"  },
+  { "wusage",          { NULL }, 2396,  "udp"  },
+  { "ncl",             { NULL }, 2397,  "tcp"  },
+  { "ncl",             { NULL }, 2397,  "udp"  },
+  { "orbiter",         { NULL }, 2398,  "tcp"  },
+  { "orbiter",         { NULL }, 2398,  "udp"  },
+  { "fmpro-fdal",      { NULL }, 2399,  "tcp"  },
+  { "fmpro-fdal",      { NULL }, 2399,  "udp"  },
+  { "opequus-server",  { NULL }, 2400,  "tcp"  },
+  { "opequus-server",  { NULL }, 2400,  "udp"  },
+  { "cvspserver",      { NULL }, 2401,  "tcp"  },
+  { "cvspserver",      { NULL }, 2401,  "udp"  },
+  { "taskmaster2000",  { NULL }, 2402,  "tcp"  },
+  { "taskmaster2000",  { NULL }, 2402,  "udp"  },
+  { "taskmaster2000",  { NULL }, 2403,  "tcp"  },
+  { "taskmaster2000",  { NULL }, 2403,  "udp"  },
+  { "iec-104",         { NULL }, 2404,  "tcp"  },
+  { "iec-104",         { NULL }, 2404,  "udp"  },
+  { "trc-netpoll",     { NULL }, 2405,  "tcp"  },
+  { "trc-netpoll",     { NULL }, 2405,  "udp"  },
+  { "jediserver",      { NULL }, 2406,  "tcp"  },
+  { "jediserver",      { NULL }, 2406,  "udp"  },
+  { "orion",           { NULL }, 2407,  "tcp"  },
+  { "orion",           { NULL }, 2407,  "udp"  },
+  { "optimanet",       { NULL }, 2408,  "tcp"  },
+  { "optimanet",       { NULL }, 2408,  "udp"  },
+  { "sns-protocol",    { NULL }, 2409,  "tcp"  },
+  { "sns-protocol",    { NULL }, 2409,  "udp"  },
+  { "vrts-registry",   { NULL }, 2410,  "tcp"  },
+  { "vrts-registry",   { NULL }, 2410,  "udp"  },
+  { "netwave-ap-mgmt", { NULL }, 2411,  "tcp"  },
+  { "netwave-ap-mgmt", { NULL }, 2411,  "udp"  },
+  { "cdn",             { NULL }, 2412,  "tcp"  },
+  { "cdn",             { NULL }, 2412,  "udp"  },
+  { "orion-rmi-reg",   { NULL }, 2413,  "tcp"  },
+  { "orion-rmi-reg",   { NULL }, 2413,  "udp"  },
+  { "beeyond",         { NULL }, 2414,  "tcp"  },
+  { "beeyond",         { NULL }, 2414,  "udp"  },
+  { "codima-rtp",      { NULL }, 2415,  "tcp"  },
+  { "codima-rtp",      { NULL }, 2415,  "udp"  },
+  { "rmtserver",       { NULL }, 2416,  "tcp"  },
+  { "rmtserver",       { NULL }, 2416,  "udp"  },
+  { "composit-server", { NULL }, 2417,  "tcp"  },
+  { "composit-server", { NULL }, 2417,  "udp"  },
+  { "cas",             { NULL }, 2418,  "tcp"  },
+  { "cas",             { NULL }, 2418,  "udp"  },
+  { "attachmate-s2s",  { NULL }, 2419,  "tcp"  },
+  { "attachmate-s2s",  { NULL }, 2419,  "udp"  },
+  { "dslremote-mgmt",  { NULL }, 2420,  "tcp"  },
+  { "dslremote-mgmt",  { NULL }, 2420,  "udp"  },
+  { "g-talk",          { NULL }, 2421,  "tcp"  },
+  { "g-talk",          { NULL }, 2421,  "udp"  },
+  { "crmsbits",        { NULL }, 2422,  "tcp"  },
+  { "crmsbits",        { NULL }, 2422,  "udp"  },
+  { "rnrp",            { NULL }, 2423,  "tcp"  },
+  { "rnrp",            { NULL }, 2423,  "udp"  },
+  { "kofax-svr",       { NULL }, 2424,  "tcp"  },
+  { "kofax-svr",       { NULL }, 2424,  "udp"  },
+  { "fjitsuappmgr",    { NULL }, 2425,  "tcp"  },
+  { "fjitsuappmgr",    { NULL }, 2425,  "udp"  },
+  { "mgcp-gateway",    { NULL }, 2427,  "tcp"  },
+  { "mgcp-gateway",    { NULL }, 2427,  "udp"  },
+  { "ott",             { NULL }, 2428,  "tcp"  },
+  { "ott",             { NULL }, 2428,  "udp"  },
+  { "ft-role",         { NULL }, 2429,  "tcp"  },
+  { "ft-role",         { NULL }, 2429,  "udp"  },
+  { "venus",           { NULL }, 2430,  "tcp"  },
+  { "venus",           { NULL }, 2430,  "udp"  },
+  { "venus-se",        { NULL }, 2431,  "tcp"  },
+  { "venus-se",        { NULL }, 2431,  "udp"  },
+  { "codasrv",         { NULL }, 2432,  "tcp"  },
+  { "codasrv",         { NULL }, 2432,  "udp"  },
+  { "codasrv-se",      { NULL }, 2433,  "tcp"  },
+  { "codasrv-se",      { NULL }, 2433,  "udp"  },
+  { "pxc-epmap",       { NULL }, 2434,  "tcp"  },
+  { "pxc-epmap",       { NULL }, 2434,  "udp"  },
+  { "optilogic",       { NULL }, 2435,  "tcp"  },
+  { "optilogic",       { NULL }, 2435,  "udp"  },
+  { "topx",            { NULL }, 2436,  "tcp"  },
+  { "topx",            { NULL }, 2436,  "udp"  },
+  { "unicontrol",      { NULL }, 2437,  "tcp"  },
+  { "unicontrol",      { NULL }, 2437,  "udp"  },
+  { "msp",             { NULL }, 2438,  "tcp"  },
+  { "msp",             { NULL }, 2438,  "udp"  },
+  { "sybasedbsynch",   { NULL }, 2439,  "tcp"  },
+  { "sybasedbsynch",   { NULL }, 2439,  "udp"  },
+  { "spearway",        { NULL }, 2440,  "tcp"  },
+  { "spearway",        { NULL }, 2440,  "udp"  },
+  { "pvsw-inet",       { NULL }, 2441,  "tcp"  },
+  { "pvsw-inet",       { NULL }, 2441,  "udp"  },
+  { "netangel",        { NULL }, 2442,  "tcp"  },
+  { "netangel",        { NULL }, 2442,  "udp"  },
+  { "powerclientcsf",  { NULL }, 2443,  "tcp"  },
+  { "powerclientcsf",  { NULL }, 2443,  "udp"  },
+  { "btpp2sectrans",   { NULL }, 2444,  "tcp"  },
+  { "btpp2sectrans",   { NULL }, 2444,  "udp"  },
+  { "dtn1",            { NULL }, 2445,  "tcp"  },
+  { "dtn1",            { NULL }, 2445,  "udp"  },
+  { "bues_service",    { NULL }, 2446,  "tcp"  },
+  { "bues_service",    { NULL }, 2446,  "udp"  },
+  { "ovwdb",           { NULL }, 2447,  "tcp"  },
+  { "ovwdb",           { NULL }, 2447,  "udp"  },
+  { "hpppssvr",        { NULL }, 2448,  "tcp"  },
+  { "hpppssvr",        { NULL }, 2448,  "udp"  },
+  { "ratl",            { NULL }, 2449,  "tcp"  },
+  { "ratl",            { NULL }, 2449,  "udp"  },
+  { "netadmin",        { NULL }, 2450,  "tcp"  },
+  { "netadmin",        { NULL }, 2450,  "udp"  },
+  { "netchat",         { NULL }, 2451,  "tcp"  },
+  { "netchat",         { NULL }, 2451,  "udp"  },
+  { "snifferclient",   { NULL }, 2452,  "tcp"  },
+  { "snifferclient",   { NULL }, 2452,  "udp"  },
+  { "madge-ltd",       { NULL }, 2453,  "tcp"  },
+  { "madge-ltd",       { NULL }, 2453,  "udp"  },
+  { "indx-dds",        { NULL }, 2454,  "tcp"  },
+  { "indx-dds",        { NULL }, 2454,  "udp"  },
+  { "wago-io-system",  { NULL }, 2455,  "tcp"  },
+  { "wago-io-system",  { NULL }, 2455,  "udp"  },
+  { "altav-remmgt",    { NULL }, 2456,  "tcp"  },
+  { "altav-remmgt",    { NULL }, 2456,  "udp"  },
+  { "rapido-ip",       { NULL }, 2457,  "tcp"  },
+  { "rapido-ip",       { NULL }, 2457,  "udp"  },
+  { "griffin",         { NULL }, 2458,  "tcp"  },
+  { "griffin",         { NULL }, 2458,  "udp"  },
+  { "community",       { NULL }, 2459,  "tcp"  },
+  { "community",       { NULL }, 2459,  "udp"  },
+  { "ms-theater",      { NULL }, 2460,  "tcp"  },
+  { "ms-theater",      { NULL }, 2460,  "udp"  },
+  { "qadmifoper",      { NULL }, 2461,  "tcp"  },
+  { "qadmifoper",      { NULL }, 2461,  "udp"  },
+  { "qadmifevent",     { NULL }, 2462,  "tcp"  },
+  { "qadmifevent",     { NULL }, 2462,  "udp"  },
+  { "lsi-raid-mgmt",   { NULL }, 2463,  "tcp"  },
+  { "lsi-raid-mgmt",   { NULL }, 2463,  "udp"  },
+  { "direcpc-si",      { NULL }, 2464,  "tcp"  },
+  { "direcpc-si",      { NULL }, 2464,  "udp"  },
+  { "lbm",             { NULL }, 2465,  "tcp"  },
+  { "lbm",             { NULL }, 2465,  "udp"  },
+  { "lbf",             { NULL }, 2466,  "tcp"  },
+  { "lbf",             { NULL }, 2466,  "udp"  },
+  { "high-criteria",   { NULL }, 2467,  "tcp"  },
+  { "high-criteria",   { NULL }, 2467,  "udp"  },
+  { "qip-msgd",        { NULL }, 2468,  "tcp"  },
+  { "qip-msgd",        { NULL }, 2468,  "udp"  },
+  { "mti-tcs-comm",    { NULL }, 2469,  "tcp"  },
+  { "mti-tcs-comm",    { NULL }, 2469,  "udp"  },
+  { "taskman-port",    { NULL }, 2470,  "tcp"  },
+  { "taskman-port",    { NULL }, 2470,  "udp"  },
+  { "seaodbc",         { NULL }, 2471,  "tcp"  },
+  { "seaodbc",         { NULL }, 2471,  "udp"  },
+  { "c3",              { NULL }, 2472,  "tcp"  },
+  { "c3",              { NULL }, 2472,  "udp"  },
+  { "aker-cdp",        { NULL }, 2473,  "tcp"  },
+  { "aker-cdp",        { NULL }, 2473,  "udp"  },
+  { "vitalanalysis",   { NULL }, 2474,  "tcp"  },
+  { "vitalanalysis",   { NULL }, 2474,  "udp"  },
+  { "ace-server",      { NULL }, 2475,  "tcp"  },
+  { "ace-server",      { NULL }, 2475,  "udp"  },
+  { "ace-svr-prop",    { NULL }, 2476,  "tcp"  },
+  { "ace-svr-prop",    { NULL }, 2476,  "udp"  },
+  { "ssm-cvs",         { NULL }, 2477,  "tcp"  },
+  { "ssm-cvs",         { NULL }, 2477,  "udp"  },
+  { "ssm-cssps",       { NULL }, 2478,  "tcp"  },
+  { "ssm-cssps",       { NULL }, 2478,  "udp"  },
+  { "ssm-els",         { NULL }, 2479,  "tcp"  },
+  { "ssm-els",         { NULL }, 2479,  "udp"  },
+  { "powerexchange",   { NULL }, 2480,  "tcp"  },
+  { "powerexchange",   { NULL }, 2480,  "udp"  },
+  { "giop",            { NULL }, 2481,  "tcp"  },
+  { "giop",            { NULL }, 2481,  "udp"  },
+  { "giop-ssl",        { NULL }, 2482,  "tcp"  },
+  { "giop-ssl",        { NULL }, 2482,  "udp"  },
+  { "ttc",             { NULL }, 2483,  "tcp"  },
+  { "ttc",             { NULL }, 2483,  "udp"  },
+  { "ttc-ssl",         { NULL }, 2484,  "tcp"  },
+  { "ttc-ssl",         { NULL }, 2484,  "udp"  },
+  { "netobjects1",     { NULL }, 2485,  "tcp"  },
+  { "netobjects1",     { NULL }, 2485,  "udp"  },
+  { "netobjects2",     { NULL }, 2486,  "tcp"  },
+  { "netobjects2",     { NULL }, 2486,  "udp"  },
+  { "pns",             { NULL }, 2487,  "tcp"  },
+  { "pns",             { NULL }, 2487,  "udp"  },
+  { "moy-corp",        { NULL }, 2488,  "tcp"  },
+  { "moy-corp",        { NULL }, 2488,  "udp"  },
+  { "tsilb",           { NULL }, 2489,  "tcp"  },
+  { "tsilb",           { NULL }, 2489,  "udp"  },
+  { "qip-qdhcp",       { NULL }, 2490,  "tcp"  },
+  { "qip-qdhcp",       { NULL }, 2490,  "udp"  },
+  { "conclave-cpp",    { NULL }, 2491,  "tcp"  },
+  { "conclave-cpp",    { NULL }, 2491,  "udp"  },
+  { "groove",          { NULL }, 2492,  "tcp"  },
+  { "groove",          { NULL }, 2492,  "udp"  },
+  { "talarian-mqs",    { NULL }, 2493,  "tcp"  },
+  { "talarian-mqs",    { NULL }, 2493,  "udp"  },
+  { "bmc-ar",          { NULL }, 2494,  "tcp"  },
+  { "bmc-ar",          { NULL }, 2494,  "udp"  },
+  { "fast-rem-serv",   { NULL }, 2495,  "tcp"  },
+  { "fast-rem-serv",   { NULL }, 2495,  "udp"  },
+  { "dirgis",          { NULL }, 2496,  "tcp"  },
+  { "dirgis",          { NULL }, 2496,  "udp"  },
+  { "quaddb",          { NULL }, 2497,  "tcp"  },
+  { "quaddb",          { NULL }, 2497,  "udp"  },
+  { "odn-castraq",     { NULL }, 2498,  "tcp"  },
+  { "odn-castraq",     { NULL }, 2498,  "udp"  },
+  { "unicontrol",      { NULL }, 2499,  "tcp"  },
+  { "unicontrol",      { NULL }, 2499,  "udp"  },
+  { "rtsserv",         { NULL }, 2500,  "tcp"  },
+  { "rtsserv",         { NULL }, 2500,  "udp"  },
+  { "rtsclient",       { NULL }, 2501,  "tcp"  },
+  { "rtsclient",       { NULL }, 2501,  "udp"  },
+  { "kentrox-prot",    { NULL }, 2502,  "tcp"  },
+  { "kentrox-prot",    { NULL }, 2502,  "udp"  },
+  { "nms-dpnss",       { NULL }, 2503,  "tcp"  },
+  { "nms-dpnss",       { NULL }, 2503,  "udp"  },
+  { "wlbs",            { NULL }, 2504,  "tcp"  },
+  { "wlbs",            { NULL }, 2504,  "udp"  },
+  { "ppcontrol",       { NULL }, 2505,  "tcp"  },
+  { "ppcontrol",       { NULL }, 2505,  "udp"  },
+  { "jbroker",         { NULL }, 2506,  "tcp"  },
+  { "jbroker",         { NULL }, 2506,  "udp"  },
+  { "spock",           { NULL }, 2507,  "tcp"  },
+  { "spock",           { NULL }, 2507,  "udp"  },
+  { "jdatastore",      { NULL }, 2508,  "tcp"  },
+  { "jdatastore",      { NULL }, 2508,  "udp"  },
+  { "fjmpss",          { NULL }, 2509,  "tcp"  },
+  { "fjmpss",          { NULL }, 2509,  "udp"  },
+  { "fjappmgrbulk",    { NULL }, 2510,  "tcp"  },
+  { "fjappmgrbulk",    { NULL }, 2510,  "udp"  },
+  { "metastorm",       { NULL }, 2511,  "tcp"  },
+  { "metastorm",       { NULL }, 2511,  "udp"  },
+  { "citrixima",       { NULL }, 2512,  "tcp"  },
+  { "citrixima",       { NULL }, 2512,  "udp"  },
+  { "citrixadmin",     { NULL }, 2513,  "tcp"  },
+  { "citrixadmin",     { NULL }, 2513,  "udp"  },
+  { "facsys-ntp",      { NULL }, 2514,  "tcp"  },
+  { "facsys-ntp",      { NULL }, 2514,  "udp"  },
+  { "facsys-router",   { NULL }, 2515,  "tcp"  },
+  { "facsys-router",   { NULL }, 2515,  "udp"  },
+  { "maincontrol",     { NULL }, 2516,  "tcp"  },
+  { "maincontrol",     { NULL }, 2516,  "udp"  },
+  { "call-sig-trans",  { NULL }, 2517,  "tcp"  },
+  { "call-sig-trans",  { NULL }, 2517,  "udp"  },
+  { "willy",           { NULL }, 2518,  "tcp"  },
+  { "willy",           { NULL }, 2518,  "udp"  },
+  { "globmsgsvc",      { NULL }, 2519,  "tcp"  },
+  { "globmsgsvc",      { NULL }, 2519,  "udp"  },
+  { "pvsw",            { NULL }, 2520,  "tcp"  },
+  { "pvsw",            { NULL }, 2520,  "udp"  },
+  { "adaptecmgr",      { NULL }, 2521,  "tcp"  },
+  { "adaptecmgr",      { NULL }, 2521,  "udp"  },
+  { "windb",           { NULL }, 2522,  "tcp"  },
+  { "windb",           { NULL }, 2522,  "udp"  },
+  { "qke-llc-v3",      { NULL }, 2523,  "tcp"  },
+  { "qke-llc-v3",      { NULL }, 2523,  "udp"  },
+  { "optiwave-lm",     { NULL }, 2524,  "tcp"  },
+  { "optiwave-lm",     { NULL }, 2524,  "udp"  },
+  { "ms-v-worlds",     { NULL }, 2525,  "tcp"  },
+  { "ms-v-worlds",     { NULL }, 2525,  "udp"  },
+  { "ema-sent-lm",     { NULL }, 2526,  "tcp"  },
+  { "ema-sent-lm",     { NULL }, 2526,  "udp"  },
+  { "iqserver",        { NULL }, 2527,  "tcp"  },
+  { "iqserver",        { NULL }, 2527,  "udp"  },
+  { "ncr_ccl",         { NULL }, 2528,  "tcp"  },
+  { "ncr_ccl",         { NULL }, 2528,  "udp"  },
+  { "utsftp",          { NULL }, 2529,  "tcp"  },
+  { "utsftp",          { NULL }, 2529,  "udp"  },
+  { "vrcommerce",      { NULL }, 2530,  "tcp"  },
+  { "vrcommerce",      { NULL }, 2530,  "udp"  },
+  { "ito-e-gui",       { NULL }, 2531,  "tcp"  },
+  { "ito-e-gui",       { NULL }, 2531,  "udp"  },
+  { "ovtopmd",         { NULL }, 2532,  "tcp"  },
+  { "ovtopmd",         { NULL }, 2532,  "udp"  },
+  { "snifferserver",   { NULL }, 2533,  "tcp"  },
+  { "snifferserver",   { NULL }, 2533,  "udp"  },
+  { "combox-web-acc",  { NULL }, 2534,  "tcp"  },
+  { "combox-web-acc",  { NULL }, 2534,  "udp"  },
+  { "madcap",          { NULL }, 2535,  "tcp"  },
+  { "madcap",          { NULL }, 2535,  "udp"  },
+  { "btpp2audctr1",    { NULL }, 2536,  "tcp"  },
+  { "btpp2audctr1",    { NULL }, 2536,  "udp"  },
+  { "upgrade",         { NULL }, 2537,  "tcp"  },
+  { "upgrade",         { NULL }, 2537,  "udp"  },
+  { "vnwk-prapi",      { NULL }, 2538,  "tcp"  },
+  { "vnwk-prapi",      { NULL }, 2538,  "udp"  },
+  { "vsiadmin",        { NULL }, 2539,  "tcp"  },
+  { "vsiadmin",        { NULL }, 2539,  "udp"  },
+  { "lonworks",        { NULL }, 2540,  "tcp"  },
+  { "lonworks",        { NULL }, 2540,  "udp"  },
+  { "lonworks2",       { NULL }, 2541,  "tcp"  },
+  { "lonworks2",       { NULL }, 2541,  "udp"  },
+  { "udrawgraph",      { NULL }, 2542,  "tcp"  },
+  { "udrawgraph",      { NULL }, 2542,  "udp"  },
+  { "reftek",          { NULL }, 2543,  "tcp"  },
+  { "reftek",          { NULL }, 2543,  "udp"  },
+  { "novell-zen",      { NULL }, 2544,  "tcp"  },
+  { "novell-zen",      { NULL }, 2544,  "udp"  },
+  { "sis-emt",         { NULL }, 2545,  "tcp"  },
+  { "sis-emt",         { NULL }, 2545,  "udp"  },
+  { "vytalvaultbrtp",  { NULL }, 2546,  "tcp"  },
+  { "vytalvaultbrtp",  { NULL }, 2546,  "udp"  },
+  { "vytalvaultvsmp",  { NULL }, 2547,  "tcp"  },
+  { "vytalvaultvsmp",  { NULL }, 2547,  "udp"  },
+  { "vytalvaultpipe",  { NULL }, 2548,  "tcp"  },
+  { "vytalvaultpipe",  { NULL }, 2548,  "udp"  },
+  { "ipass",           { NULL }, 2549,  "tcp"  },
+  { "ipass",           { NULL }, 2549,  "udp"  },
+  { "ads",             { NULL }, 2550,  "tcp"  },
+  { "ads",             { NULL }, 2550,  "udp"  },
+  { "isg-uda-server",  { NULL }, 2551,  "tcp"  },
+  { "isg-uda-server",  { NULL }, 2551,  "udp"  },
+  { "call-logging",    { NULL }, 2552,  "tcp"  },
+  { "call-logging",    { NULL }, 2552,  "udp"  },
+  { "efidiningport",   { NULL }, 2553,  "tcp"  },
+  { "efidiningport",   { NULL }, 2553,  "udp"  },
+  { "vcnet-link-v10",  { NULL }, 2554,  "tcp"  },
+  { "vcnet-link-v10",  { NULL }, 2554,  "udp"  },
+  { "compaq-wcp",      { NULL }, 2555,  "tcp"  },
+  { "compaq-wcp",      { NULL }, 2555,  "udp"  },
+  { "nicetec-nmsvc",   { NULL }, 2556,  "tcp"  },
+  { "nicetec-nmsvc",   { NULL }, 2556,  "udp"  },
+  { "nicetec-mgmt",    { NULL }, 2557,  "tcp"  },
+  { "nicetec-mgmt",    { NULL }, 2557,  "udp"  },
+  { "pclemultimedia",  { NULL }, 2558,  "tcp"  },
+  { "pclemultimedia",  { NULL }, 2558,  "udp"  },
+  { "lstp",            { NULL }, 2559,  "tcp"  },
+  { "lstp",            { NULL }, 2559,  "udp"  },
+  { "labrat",          { NULL }, 2560,  "tcp"  },
+  { "labrat",          { NULL }, 2560,  "udp"  },
+  { "mosaixcc",        { NULL }, 2561,  "tcp"  },
+  { "mosaixcc",        { NULL }, 2561,  "udp"  },
+  { "delibo",          { NULL }, 2562,  "tcp"  },
+  { "delibo",          { NULL }, 2562,  "udp"  },
+  { "cti-redwood",     { NULL }, 2563,  "tcp"  },
+  { "cti-redwood",     { NULL }, 2563,  "udp"  },
+  { "hp-3000-telnet",  { NULL }, 2564,  "tcp"  },
+  { "coord-svr",       { NULL }, 2565,  "tcp"  },
+  { "coord-svr",       { NULL }, 2565,  "udp"  },
+  { "pcs-pcw",         { NULL }, 2566,  "tcp"  },
+  { "pcs-pcw",         { NULL }, 2566,  "udp"  },
+  { "clp",             { NULL }, 2567,  "tcp"  },
+  { "clp",             { NULL }, 2567,  "udp"  },
+  { "spamtrap",        { NULL }, 2568,  "tcp"  },
+  { "spamtrap",        { NULL }, 2568,  "udp"  },
+  { "sonuscallsig",    { NULL }, 2569,  "tcp"  },
+  { "sonuscallsig",    { NULL }, 2569,  "udp"  },
+  { "hs-port",         { NULL }, 2570,  "tcp"  },
+  { "hs-port",         { NULL }, 2570,  "udp"  },
+  { "cecsvc",          { NULL }, 2571,  "tcp"  },
+  { "cecsvc",          { NULL }, 2571,  "udp"  },
+  { "ibp",             { NULL }, 2572,  "tcp"  },
+  { "ibp",             { NULL }, 2572,  "udp"  },
+  { "trustestablish",  { NULL }, 2573,  "tcp"  },
+  { "trustestablish",  { NULL }, 2573,  "udp"  },
+  { "blockade-bpsp",   { NULL }, 2574,  "tcp"  },
+  { "blockade-bpsp",   { NULL }, 2574,  "udp"  },
+  { "hl7",             { NULL }, 2575,  "tcp"  },
+  { "hl7",             { NULL }, 2575,  "udp"  },
+  { "tclprodebugger",  { NULL }, 2576,  "tcp"  },
+  { "tclprodebugger",  { NULL }, 2576,  "udp"  },
+  { "scipticslsrvr",   { NULL }, 2577,  "tcp"  },
+  { "scipticslsrvr",   { NULL }, 2577,  "udp"  },
+  { "rvs-isdn-dcp",    { NULL }, 2578,  "tcp"  },
+  { "rvs-isdn-dcp",    { NULL }, 2578,  "udp"  },
+  { "mpfoncl",         { NULL }, 2579,  "tcp"  },
+  { "mpfoncl",         { NULL }, 2579,  "udp"  },
+  { "tributary",       { NULL }, 2580,  "tcp"  },
+  { "tributary",       { NULL }, 2580,  "udp"  },
+  { "argis-te",        { NULL }, 2581,  "tcp"  },
+  { "argis-te",        { NULL }, 2581,  "udp"  },
+  { "argis-ds",        { NULL }, 2582,  "tcp"  },
+  { "argis-ds",        { NULL }, 2582,  "udp"  },
+  { "mon",             { NULL }, 2583,  "tcp"  },
+  { "mon",             { NULL }, 2583,  "udp"  },
+  { "cyaserv",         { NULL }, 2584,  "tcp"  },
+  { "cyaserv",         { NULL }, 2584,  "udp"  },
+  { "netx-server",     { NULL }, 2585,  "tcp"  },
+  { "netx-server",     { NULL }, 2585,  "udp"  },
+  { "netx-agent",      { NULL }, 2586,  "tcp"  },
+  { "netx-agent",      { NULL }, 2586,  "udp"  },
+  { "masc",            { NULL }, 2587,  "tcp"  },
+  { "masc",            { NULL }, 2587,  "udp"  },
+  { "privilege",       { NULL }, 2588,  "tcp"  },
+  { "privilege",       { NULL }, 2588,  "udp"  },
+  { "quartus-tcl",     { NULL }, 2589,  "tcp"  },
+  { "quartus-tcl",     { NULL }, 2589,  "udp"  },
+  { "idotdist",        { NULL }, 2590,  "tcp"  },
+  { "idotdist",        { NULL }, 2590,  "udp"  },
+  { "maytagshuffle",   { NULL }, 2591,  "tcp"  },
+  { "maytagshuffle",   { NULL }, 2591,  "udp"  },
+  { "netrek",          { NULL }, 2592,  "tcp"  },
+  { "netrek",          { NULL }, 2592,  "udp"  },
+  { "mns-mail",        { NULL }, 2593,  "tcp"  },
+  { "mns-mail",        { NULL }, 2593,  "udp"  },
+  { "dts",             { NULL }, 2594,  "tcp"  },
+  { "dts",             { NULL }, 2594,  "udp"  },
+  { "worldfusion1",    { NULL }, 2595,  "tcp"  },
+  { "worldfusion1",    { NULL }, 2595,  "udp"  },
+  { "worldfusion2",    { NULL }, 2596,  "tcp"  },
+  { "worldfusion2",    { NULL }, 2596,  "udp"  },
+  { "homesteadglory",  { NULL }, 2597,  "tcp"  },
+  { "homesteadglory",  { NULL }, 2597,  "udp"  },
+  { "citriximaclient", { NULL }, 2598,  "tcp"  },
+  { "citriximaclient", { NULL }, 2598,  "udp"  },
+  { "snapd",           { NULL }, 2599,  "tcp"  },
+  { "snapd",           { NULL }, 2599,  "udp"  },
+  { "hpstgmgr",        { NULL }, 2600,  "tcp"  },
+  { "hpstgmgr",        { NULL }, 2600,  "udp"  },
+  { "discp-client",    { NULL }, 2601,  "tcp"  },
+  { "discp-client",    { NULL }, 2601,  "udp"  },
+  { "discp-server",    { NULL }, 2602,  "tcp"  },
+  { "discp-server",    { NULL }, 2602,  "udp"  },
+  { "servicemeter",    { NULL }, 2603,  "tcp"  },
+  { "servicemeter",    { NULL }, 2603,  "udp"  },
+  { "nsc-ccs",         { NULL }, 2604,  "tcp"  },
+  { "nsc-ccs",         { NULL }, 2604,  "udp"  },
+  { "nsc-posa",        { NULL }, 2605,  "tcp"  },
+  { "nsc-posa",        { NULL }, 2605,  "udp"  },
+  { "netmon",          { NULL }, 2606,  "tcp"  },
+  { "netmon",          { NULL }, 2606,  "udp"  },
+  { "connection",      { NULL }, 2607,  "tcp"  },
+  { "connection",      { NULL }, 2607,  "udp"  },
+  { "wag-service",     { NULL }, 2608,  "tcp"  },
+  { "wag-service",     { NULL }, 2608,  "udp"  },
+  { "system-monitor",  { NULL }, 2609,  "tcp"  },
+  { "system-monitor",  { NULL }, 2609,  "udp"  },
+  { "versa-tek",       { NULL }, 2610,  "tcp"  },
+  { "versa-tek",       { NULL }, 2610,  "udp"  },
+  { "lionhead",        { NULL }, 2611,  "tcp"  },
+  { "lionhead",        { NULL }, 2611,  "udp"  },
+  { "qpasa-agent",     { NULL }, 2612,  "tcp"  },
+  { "qpasa-agent",     { NULL }, 2612,  "udp"  },
+  { "smntubootstrap",  { NULL }, 2613,  "tcp"  },
+  { "smntubootstrap",  { NULL }, 2613,  "udp"  },
+  { "neveroffline",    { NULL }, 2614,  "tcp"  },
+  { "neveroffline",    { NULL }, 2614,  "udp"  },
+  { "firepower",       { NULL }, 2615,  "tcp"  },
+  { "firepower",       { NULL }, 2615,  "udp"  },
+  { "appswitch-emp",   { NULL }, 2616,  "tcp"  },
+  { "appswitch-emp",   { NULL }, 2616,  "udp"  },
+  { "cmadmin",         { NULL }, 2617,  "tcp"  },
+  { "cmadmin",         { NULL }, 2617,  "udp"  },
+  { "priority-e-com",  { NULL }, 2618,  "tcp"  },
+  { "priority-e-com",  { NULL }, 2618,  "udp"  },
+  { "bruce",           { NULL }, 2619,  "tcp"  },
+  { "bruce",           { NULL }, 2619,  "udp"  },
+  { "lpsrecommender",  { NULL }, 2620,  "tcp"  },
+  { "lpsrecommender",  { NULL }, 2620,  "udp"  },
+  { "miles-apart",     { NULL }, 2621,  "tcp"  },
+  { "miles-apart",     { NULL }, 2621,  "udp"  },
+  { "metricadbc",      { NULL }, 2622,  "tcp"  },
+  { "metricadbc",      { NULL }, 2622,  "udp"  },
+  { "lmdp",            { NULL }, 2623,  "tcp"  },
+  { "lmdp",            { NULL }, 2623,  "udp"  },
+  { "aria",            { NULL }, 2624,  "tcp"  },
+  { "aria",            { NULL }, 2624,  "udp"  },
+  { "blwnkl-port",     { NULL }, 2625,  "tcp"  },
+  { "blwnkl-port",     { NULL }, 2625,  "udp"  },
+  { "gbjd816",         { NULL }, 2626,  "tcp"  },
+  { "gbjd816",         { NULL }, 2626,  "udp"  },
+  { "moshebeeri",      { NULL }, 2627,  "tcp"  },
+  { "moshebeeri",      { NULL }, 2627,  "udp"  },
+  { "dict",            { NULL }, 2628,  "tcp"  },
+  { "dict",            { NULL }, 2628,  "udp"  },
+  { "sitaraserver",    { NULL }, 2629,  "tcp"  },
+  { "sitaraserver",    { NULL }, 2629,  "udp"  },
+  { "sitaramgmt",      { NULL }, 2630,  "tcp"  },
+  { "sitaramgmt",      { NULL }, 2630,  "udp"  },
+  { "sitaradir",       { NULL }, 2631,  "tcp"  },
+  { "sitaradir",       { NULL }, 2631,  "udp"  },
+  { "irdg-post",       { NULL }, 2632,  "tcp"  },
+  { "irdg-post",       { NULL }, 2632,  "udp"  },
+  { "interintelli",    { NULL }, 2633,  "tcp"  },
+  { "interintelli",    { NULL }, 2633,  "udp"  },
+  { "pk-electronics",  { NULL }, 2634,  "tcp"  },
+  { "pk-electronics",  { NULL }, 2634,  "udp"  },
+  { "backburner",      { NULL }, 2635,  "tcp"  },
+  { "backburner",      { NULL }, 2635,  "udp"  },
+  { "solve",           { NULL }, 2636,  "tcp"  },
+  { "solve",           { NULL }, 2636,  "udp"  },
+  { "imdocsvc",        { NULL }, 2637,  "tcp"  },
+  { "imdocsvc",        { NULL }, 2637,  "udp"  },
+  { "sybaseanywhere",  { NULL }, 2638,  "tcp"  },
+  { "sybaseanywhere",  { NULL }, 2638,  "udp"  },
+  { "aminet",          { NULL }, 2639,  "tcp"  },
+  { "aminet",          { NULL }, 2639,  "udp"  },
+  { "sai_sentlm",      { NULL }, 2640,  "tcp"  },
+  { "sai_sentlm",      { NULL }, 2640,  "udp"  },
+  { "hdl-srv",         { NULL }, 2641,  "tcp"  },
+  { "hdl-srv",         { NULL }, 2641,  "udp"  },
+  { "tragic",          { NULL }, 2642,  "tcp"  },
+  { "tragic",          { NULL }, 2642,  "udp"  },
+  { "gte-samp",        { NULL }, 2643,  "tcp"  },
+  { "gte-samp",        { NULL }, 2643,  "udp"  },
+  { "travsoft-ipx-t",  { NULL }, 2644,  "tcp"  },
+  { "travsoft-ipx-t",  { NULL }, 2644,  "udp"  },
+  { "novell-ipx-cmd",  { NULL }, 2645,  "tcp"  },
+  { "novell-ipx-cmd",  { NULL }, 2645,  "udp"  },
+  { "and-lm",          { NULL }, 2646,  "tcp"  },
+  { "and-lm",          { NULL }, 2646,  "udp"  },
+  { "syncserver",      { NULL }, 2647,  "tcp"  },
+  { "syncserver",      { NULL }, 2647,  "udp"  },
+  { "upsnotifyprot",   { NULL }, 2648,  "tcp"  },
+  { "upsnotifyprot",   { NULL }, 2648,  "udp"  },
+  { "vpsipport",       { NULL }, 2649,  "tcp"  },
+  { "vpsipport",       { NULL }, 2649,  "udp"  },
+  { "eristwoguns",     { NULL }, 2650,  "tcp"  },
+  { "eristwoguns",     { NULL }, 2650,  "udp"  },
+  { "ebinsite",        { NULL }, 2651,  "tcp"  },
+  { "ebinsite",        { NULL }, 2651,  "udp"  },
+  { "interpathpanel",  { NULL }, 2652,  "tcp"  },
+  { "interpathpanel",  { NULL }, 2652,  "udp"  },
+  { "sonus",           { NULL }, 2653,  "tcp"  },
+  { "sonus",           { NULL }, 2653,  "udp"  },
+  { "corel_vncadmin",  { NULL }, 2654,  "tcp"  },
+  { "corel_vncadmin",  { NULL }, 2654,  "udp"  },
+  { "unglue",          { NULL }, 2655,  "tcp"  },
+  { "unglue",          { NULL }, 2655,  "udp"  },
+  { "kana",            { NULL }, 2656,  "tcp"  },
+  { "kana",            { NULL }, 2656,  "udp"  },
+  { "sns-dispatcher",  { NULL }, 2657,  "tcp"  },
+  { "sns-dispatcher",  { NULL }, 2657,  "udp"  },
+  { "sns-admin",       { NULL }, 2658,  "tcp"  },
+  { "sns-admin",       { NULL }, 2658,  "udp"  },
+  { "sns-query",       { NULL }, 2659,  "tcp"  },
+  { "sns-query",       { NULL }, 2659,  "udp"  },
+  { "gcmonitor",       { NULL }, 2660,  "tcp"  },
+  { "gcmonitor",       { NULL }, 2660,  "udp"  },
+  { "olhost",          { NULL }, 2661,  "tcp"  },
+  { "olhost",          { NULL }, 2661,  "udp"  },
+  { "bintec-capi",     { NULL }, 2662,  "tcp"  },
+  { "bintec-capi",     { NULL }, 2662,  "udp"  },
+  { "bintec-tapi",     { NULL }, 2663,  "tcp"  },
+  { "bintec-tapi",     { NULL }, 2663,  "udp"  },
+  { "patrol-mq-gm",    { NULL }, 2664,  "tcp"  },
+  { "patrol-mq-gm",    { NULL }, 2664,  "udp"  },
+  { "patrol-mq-nm",    { NULL }, 2665,  "tcp"  },
+  { "patrol-mq-nm",    { NULL }, 2665,  "udp"  },
+  { "extensis",        { NULL }, 2666,  "tcp"  },
+  { "extensis",        { NULL }, 2666,  "udp"  },
+  { "alarm-clock-s",   { NULL }, 2667,  "tcp"  },
+  { "alarm-clock-s",   { NULL }, 2667,  "udp"  },
+  { "alarm-clock-c",   { NULL }, 2668,  "tcp"  },
+  { "alarm-clock-c",   { NULL }, 2668,  "udp"  },
+  { "toad",            { NULL }, 2669,  "tcp"  },
+  { "toad",            { NULL }, 2669,  "udp"  },
+  { "tve-announce",    { NULL }, 2670,  "tcp"  },
+  { "tve-announce",    { NULL }, 2670,  "udp"  },
+  { "newlixreg",       { NULL }, 2671,  "tcp"  },
+  { "newlixreg",       { NULL }, 2671,  "udp"  },
+  { "nhserver",        { NULL }, 2672,  "tcp"  },
+  { "nhserver",        { NULL }, 2672,  "udp"  },
+  { "firstcall42",     { NULL }, 2673,  "tcp"  },
+  { "firstcall42",     { NULL }, 2673,  "udp"  },
+  { "ewnn",            { NULL }, 2674,  "tcp"  },
+  { "ewnn",            { NULL }, 2674,  "udp"  },
+  { "ttc-etap",        { NULL }, 2675,  "tcp"  },
+  { "ttc-etap",        { NULL }, 2675,  "udp"  },
+  { "simslink",        { NULL }, 2676,  "tcp"  },
+  { "simslink",        { NULL }, 2676,  "udp"  },
+  { "gadgetgate1way",  { NULL }, 2677,  "tcp"  },
+  { "gadgetgate1way",  { NULL }, 2677,  "udp"  },
+  { "gadgetgate2way",  { NULL }, 2678,  "tcp"  },
+  { "gadgetgate2way",  { NULL }, 2678,  "udp"  },
+  { "syncserverssl",   { NULL }, 2679,  "tcp"  },
+  { "syncserverssl",   { NULL }, 2679,  "udp"  },
+  { "pxc-sapxom",      { NULL }, 2680,  "tcp"  },
+  { "pxc-sapxom",      { NULL }, 2680,  "udp"  },
+  { "mpnjsomb",        { NULL }, 2681,  "tcp"  },
+  { "mpnjsomb",        { NULL }, 2681,  "udp"  },
+  { "ncdloadbalance",  { NULL }, 2683,  "tcp"  },
+  { "ncdloadbalance",  { NULL }, 2683,  "udp"  },
+  { "mpnjsosv",        { NULL }, 2684,  "tcp"  },
+  { "mpnjsosv",        { NULL }, 2684,  "udp"  },
+  { "mpnjsocl",        { NULL }, 2685,  "tcp"  },
+  { "mpnjsocl",        { NULL }, 2685,  "udp"  },
+  { "mpnjsomg",        { NULL }, 2686,  "tcp"  },
+  { "mpnjsomg",        { NULL }, 2686,  "udp"  },
+  { "pq-lic-mgmt",     { NULL }, 2687,  "tcp"  },
+  { "pq-lic-mgmt",     { NULL }, 2687,  "udp"  },
+  { "md-cg-http",      { NULL }, 2688,  "tcp"  },
+  { "md-cg-http",      { NULL }, 2688,  "udp"  },
+  { "fastlynx",        { NULL }, 2689,  "tcp"  },
+  { "fastlynx",        { NULL }, 2689,  "udp"  },
+  { "hp-nnm-data",     { NULL }, 2690,  "tcp"  },
+  { "hp-nnm-data",     { NULL }, 2690,  "udp"  },
+  { "itinternet",      { NULL }, 2691,  "tcp"  },
+  { "itinternet",      { NULL }, 2691,  "udp"  },
+  { "admins-lms",      { NULL }, 2692,  "tcp"  },
+  { "admins-lms",      { NULL }, 2692,  "udp"  },
+  { "pwrsevent",       { NULL }, 2694,  "tcp"  },
+  { "pwrsevent",       { NULL }, 2694,  "udp"  },
+  { "vspread",         { NULL }, 2695,  "tcp"  },
+  { "vspread",         { NULL }, 2695,  "udp"  },
+  { "unifyadmin",      { NULL }, 2696,  "tcp"  },
+  { "unifyadmin",      { NULL }, 2696,  "udp"  },
+  { "oce-snmp-trap",   { NULL }, 2697,  "tcp"  },
+  { "oce-snmp-trap",   { NULL }, 2697,  "udp"  },
+  { "mck-ivpip",       { NULL }, 2698,  "tcp"  },
+  { "mck-ivpip",       { NULL }, 2698,  "udp"  },
+  { "csoft-plusclnt",  { NULL }, 2699,  "tcp"  },
+  { "csoft-plusclnt",  { NULL }, 2699,  "udp"  },
+  { "tqdata",          { NULL }, 2700,  "tcp"  },
+  { "tqdata",          { NULL }, 2700,  "udp"  },
+  { "sms-rcinfo",      { NULL }, 2701,  "tcp"  },
+  { "sms-rcinfo",      { NULL }, 2701,  "udp"  },
+  { "sms-xfer",        { NULL }, 2702,  "tcp"  },
+  { "sms-xfer",        { NULL }, 2702,  "udp"  },
+  { "sms-chat",        { NULL }, 2703,  "tcp"  },
+  { "sms-chat",        { NULL }, 2703,  "udp"  },
+  { "sms-remctrl",     { NULL }, 2704,  "tcp"  },
+  { "sms-remctrl",     { NULL }, 2704,  "udp"  },
+  { "sds-admin",       { NULL }, 2705,  "tcp"  },
+  { "sds-admin",       { NULL }, 2705,  "udp"  },
+  { "ncdmirroring",    { NULL }, 2706,  "tcp"  },
+  { "ncdmirroring",    { NULL }, 2706,  "udp"  },
+  { "emcsymapiport",   { NULL }, 2707,  "tcp"  },
+  { "emcsymapiport",   { NULL }, 2707,  "udp"  },
+  { "banyan-net",      { NULL }, 2708,  "tcp"  },
+  { "banyan-net",      { NULL }, 2708,  "udp"  },
+  { "supermon",        { NULL }, 2709,  "tcp"  },
+  { "supermon",        { NULL }, 2709,  "udp"  },
+  { "sso-service",     { NULL }, 2710,  "tcp"  },
+  { "sso-service",     { NULL }, 2710,  "udp"  },
+  { "sso-control",     { NULL }, 2711,  "tcp"  },
+  { "sso-control",     { NULL }, 2711,  "udp"  },
+  { "aocp",            { NULL }, 2712,  "tcp"  },
+  { "aocp",            { NULL }, 2712,  "udp"  },
+  { "raventbs",        { NULL }, 2713,  "tcp"  },
+  { "raventbs",        { NULL }, 2713,  "udp"  },
+  { "raventdm",        { NULL }, 2714,  "tcp"  },
+  { "raventdm",        { NULL }, 2714,  "udp"  },
+  { "hpstgmgr2",       { NULL }, 2715,  "tcp"  },
+  { "hpstgmgr2",       { NULL }, 2715,  "udp"  },
+  { "inova-ip-disco",  { NULL }, 2716,  "tcp"  },
+  { "inova-ip-disco",  { NULL }, 2716,  "udp"  },
+  { "pn-requester",    { NULL }, 2717,  "tcp"  },
+  { "pn-requester",    { NULL }, 2717,  "udp"  },
+  { "pn-requester2",   { NULL }, 2718,  "tcp"  },
+  { "pn-requester2",   { NULL }, 2718,  "udp"  },
+  { "scan-change",     { NULL }, 2719,  "tcp"  },
+  { "scan-change",     { NULL }, 2719,  "udp"  },
+  { "wkars",           { NULL }, 2720,  "tcp"  },
+  { "wkars",           { NULL }, 2720,  "udp"  },
+  { "smart-diagnose",  { NULL }, 2721,  "tcp"  },
+  { "smart-diagnose",  { NULL }, 2721,  "udp"  },
+  { "proactivesrvr",   { NULL }, 2722,  "tcp"  },
+  { "proactivesrvr",   { NULL }, 2722,  "udp"  },
+  { "watchdog-nt",     { NULL }, 2723,  "tcp"  },
+  { "watchdog-nt",     { NULL }, 2723,  "udp"  },
+  { "qotps",           { NULL }, 2724,  "tcp"  },
+  { "qotps",           { NULL }, 2724,  "udp"  },
+  { "msolap-ptp2",     { NULL }, 2725,  "tcp"  },
+  { "msolap-ptp2",     { NULL }, 2725,  "udp"  },
+  { "tams",            { NULL }, 2726,  "tcp"  },
+  { "tams",            { NULL }, 2726,  "udp"  },
+  { "mgcp-callagent",  { NULL }, 2727,  "tcp"  },
+  { "mgcp-callagent",  { NULL }, 2727,  "udp"  },
+  { "sqdr",            { NULL }, 2728,  "tcp"  },
+  { "sqdr",            { NULL }, 2728,  "udp"  },
+  { "tcim-control",    { NULL }, 2729,  "tcp"  },
+  { "tcim-control",    { NULL }, 2729,  "udp"  },
+  { "nec-raidplus",    { NULL }, 2730,  "tcp"  },
+  { "nec-raidplus",    { NULL }, 2730,  "udp"  },
+  { "fyre-messanger",  { NULL }, 2731,  "tcp"  },
+  { "fyre-messanger",  { NULL }, 2731,  "udp"  },
+  { "g5m",             { NULL }, 2732,  "tcp"  },
+  { "g5m",             { NULL }, 2732,  "udp"  },
+  { "signet-ctf",      { NULL }, 2733,  "tcp"  },
+  { "signet-ctf",      { NULL }, 2733,  "udp"  },
+  { "ccs-software",    { NULL }, 2734,  "tcp"  },
+  { "ccs-software",    { NULL }, 2734,  "udp"  },
+  { "netiq-mc",        { NULL }, 2735,  "tcp"  },
+  { "netiq-mc",        { NULL }, 2735,  "udp"  },
+  { "radwiz-nms-srv",  { NULL }, 2736,  "tcp"  },
+  { "radwiz-nms-srv",  { NULL }, 2736,  "udp"  },
+  { "srp-feedback",    { NULL }, 2737,  "tcp"  },
+  { "srp-feedback",    { NULL }, 2737,  "udp"  },
+  { "ndl-tcp-ois-gw",  { NULL }, 2738,  "tcp"  },
+  { "ndl-tcp-ois-gw",  { NULL }, 2738,  "udp"  },
+  { "tn-timing",       { NULL }, 2739,  "tcp"  },
+  { "tn-timing",       { NULL }, 2739,  "udp"  },
+  { "alarm",           { NULL }, 2740,  "tcp"  },
+  { "alarm",           { NULL }, 2740,  "udp"  },
+  { "tsb",             { NULL }, 2741,  "tcp"  },
+  { "tsb",             { NULL }, 2741,  "udp"  },
+  { "tsb2",            { NULL }, 2742,  "tcp"  },
+  { "tsb2",            { NULL }, 2742,  "udp"  },
+  { "murx",            { NULL }, 2743,  "tcp"  },
+  { "murx",            { NULL }, 2743,  "udp"  },
+  { "honyaku",         { NULL }, 2744,  "tcp"  },
+  { "honyaku",         { NULL }, 2744,  "udp"  },
+  { "urbisnet",        { NULL }, 2745,  "tcp"  },
+  { "urbisnet",        { NULL }, 2745,  "udp"  },
+  { "cpudpencap",      { NULL }, 2746,  "tcp"  },
+  { "cpudpencap",      { NULL }, 2746,  "udp"  },
+  { "fjippol-swrly",   { NULL }, 2747,  "tcp"  },
+  { "fjippol-swrly",   { NULL }, 2747,  "udp"  },
+  { "fjippol-polsvr",  { NULL }, 2748,  "tcp"  },
+  { "fjippol-polsvr",  { NULL }, 2748,  "udp"  },
+  { "fjippol-cnsl",    { NULL }, 2749,  "tcp"  },
+  { "fjippol-cnsl",    { NULL }, 2749,  "udp"  },
+  { "fjippol-port1",   { NULL }, 2750,  "tcp"  },
+  { "fjippol-port1",   { NULL }, 2750,  "udp"  },
+  { "fjippol-port2",   { NULL }, 2751,  "tcp"  },
+  { "fjippol-port2",   { NULL }, 2751,  "udp"  },
+  { "rsisysaccess",    { NULL }, 2752,  "tcp"  },
+  { "rsisysaccess",    { NULL }, 2752,  "udp"  },
+  { "de-spot",         { NULL }, 2753,  "tcp"  },
+  { "de-spot",         { NULL }, 2753,  "udp"  },
+  { "apollo-cc",       { NULL }, 2754,  "tcp"  },
+  { "apollo-cc",       { NULL }, 2754,  "udp"  },
+  { "expresspay",      { NULL }, 2755,  "tcp"  },
+  { "expresspay",      { NULL }, 2755,  "udp"  },
+  { "simplement-tie",  { NULL }, 2756,  "tcp"  },
+  { "simplement-tie",  { NULL }, 2756,  "udp"  },
+  { "cnrp",            { NULL }, 2757,  "tcp"  },
+  { "cnrp",            { NULL }, 2757,  "udp"  },
+  { "apollo-status",   { NULL }, 2758,  "tcp"  },
+  { "apollo-status",   { NULL }, 2758,  "udp"  },
+  { "apollo-gms",      { NULL }, 2759,  "tcp"  },
+  { "apollo-gms",      { NULL }, 2759,  "udp"  },
+  { "sabams",          { NULL }, 2760,  "tcp"  },
+  { "sabams",          { NULL }, 2760,  "udp"  },
+  { "dicom-iscl",      { NULL }, 2761,  "tcp"  },
+  { "dicom-iscl",      { NULL }, 2761,  "udp"  },
+  { "dicom-tls",       { NULL }, 2762,  "tcp"  },
+  { "dicom-tls",       { NULL }, 2762,  "udp"  },
+  { "desktop-dna",     { NULL }, 2763,  "tcp"  },
+  { "desktop-dna",     { NULL }, 2763,  "udp"  },
+  { "data-insurance",  { NULL }, 2764,  "tcp"  },
+  { "data-insurance",  { NULL }, 2764,  "udp"  },
+  { "qip-audup",       { NULL }, 2765,  "tcp"  },
+  { "qip-audup",       { NULL }, 2765,  "udp"  },
+  { "compaq-scp",      { NULL }, 2766,  "tcp"  },
+  { "compaq-scp",      { NULL }, 2766,  "udp"  },
+  { "uadtc",           { NULL }, 2767,  "tcp"  },
+  { "uadtc",           { NULL }, 2767,  "udp"  },
+  { "uacs",            { NULL }, 2768,  "tcp"  },
+  { "uacs",            { NULL }, 2768,  "udp"  },
+  { "exce",            { NULL }, 2769,  "tcp"  },
+  { "exce",            { NULL }, 2769,  "udp"  },
+  { "veronica",        { NULL }, 2770,  "tcp"  },
+  { "veronica",        { NULL }, 2770,  "udp"  },
+  { "vergencecm",      { NULL }, 2771,  "tcp"  },
+  { "vergencecm",      { NULL }, 2771,  "udp"  },
+  { "auris",           { NULL }, 2772,  "tcp"  },
+  { "auris",           { NULL }, 2772,  "udp"  },
+  { "rbakcup1",        { NULL }, 2773,  "tcp"  },
+  { "rbakcup1",        { NULL }, 2773,  "udp"  },
+  { "rbakcup2",        { NULL }, 2774,  "tcp"  },
+  { "rbakcup2",        { NULL }, 2774,  "udp"  },
+  { "smpp",            { NULL }, 2775,  "tcp"  },
+  { "smpp",            { NULL }, 2775,  "udp"  },
+  { "ridgeway1",       { NULL }, 2776,  "tcp"  },
+  { "ridgeway1",       { NULL }, 2776,  "udp"  },
+  { "ridgeway2",       { NULL }, 2777,  "tcp"  },
+  { "ridgeway2",       { NULL }, 2777,  "udp"  },
+  { "gwen-sonya",      { NULL }, 2778,  "tcp"  },
+  { "gwen-sonya",      { NULL }, 2778,  "udp"  },
+  { "lbc-sync",        { NULL }, 2779,  "tcp"  },
+  { "lbc-sync",        { NULL }, 2779,  "udp"  },
+  { "lbc-control",     { NULL }, 2780,  "tcp"  },
+  { "lbc-control",     { NULL }, 2780,  "udp"  },
+  { "whosells",        { NULL }, 2781,  "tcp"  },
+  { "whosells",        { NULL }, 2781,  "udp"  },
+  { "everydayrc",      { NULL }, 2782,  "tcp"  },
+  { "everydayrc",      { NULL }, 2782,  "udp"  },
+  { "aises",           { NULL }, 2783,  "tcp"  },
+  { "aises",           { NULL }, 2783,  "udp"  },
+  { "www-dev",         { NULL }, 2784,  "tcp"  },
+  { "www-dev",         { NULL }, 2784,  "udp"  },
+  { "aic-np",          { NULL }, 2785,  "tcp"  },
+  { "aic-np",          { NULL }, 2785,  "udp"  },
+  { "aic-oncrpc",      { NULL }, 2786,  "tcp"  },
+  { "aic-oncrpc",      { NULL }, 2786,  "udp"  },
+  { "piccolo",         { NULL }, 2787,  "tcp"  },
+  { "piccolo",         { NULL }, 2787,  "udp"  },
+  { "fryeserv",        { NULL }, 2788,  "tcp"  },
+  { "fryeserv",        { NULL }, 2788,  "udp"  },
+  { "media-agent",     { NULL }, 2789,  "tcp"  },
+  { "media-agent",     { NULL }, 2789,  "udp"  },
+  { "plgproxy",        { NULL }, 2790,  "tcp"  },
+  { "plgproxy",        { NULL }, 2790,  "udp"  },
+  { "mtport-regist",   { NULL }, 2791,  "tcp"  },
+  { "mtport-regist",   { NULL }, 2791,  "udp"  },
+  { "f5-globalsite",   { NULL }, 2792,  "tcp"  },
+  { "f5-globalsite",   { NULL }, 2792,  "udp"  },
+  { "initlsmsad",      { NULL }, 2793,  "tcp"  },
+  { "initlsmsad",      { NULL }, 2793,  "udp"  },
+  { "livestats",       { NULL }, 2795,  "tcp"  },
+  { "livestats",       { NULL }, 2795,  "udp"  },
+  { "ac-tech",         { NULL }, 2796,  "tcp"  },
+  { "ac-tech",         { NULL }, 2796,  "udp"  },
+  { "esp-encap",       { NULL }, 2797,  "tcp"  },
+  { "esp-encap",       { NULL }, 2797,  "udp"  },
+  { "tmesis-upshot",   { NULL }, 2798,  "tcp"  },
+  { "tmesis-upshot",   { NULL }, 2798,  "udp"  },
+  { "icon-discover",   { NULL }, 2799,  "tcp"  },
+  { "icon-discover",   { NULL }, 2799,  "udp"  },
+  { "acc-raid",        { NULL }, 2800,  "tcp"  },
+  { "acc-raid",        { NULL }, 2800,  "udp"  },
+  { "igcp",            { NULL }, 2801,  "tcp"  },
+  { "igcp",            { NULL }, 2801,  "udp"  },
+  { "veritas-tcp1",    { NULL }, 2802,  "tcp"  },
+  { "veritas-udp1",    { NULL }, 2802,  "udp"  },
+  { "btprjctrl",       { NULL }, 2803,  "tcp"  },
+  { "btprjctrl",       { NULL }, 2803,  "udp"  },
+  { "dvr-esm",         { NULL }, 2804,  "tcp"  },
+  { "dvr-esm",         { NULL }, 2804,  "udp"  },
+  { "wta-wsp-s",       { NULL }, 2805,  "tcp"  },
+  { "wta-wsp-s",       { NULL }, 2805,  "udp"  },
+  { "cspuni",          { NULL }, 2806,  "tcp"  },
+  { "cspuni",          { NULL }, 2806,  "udp"  },
+  { "cspmulti",        { NULL }, 2807,  "tcp"  },
+  { "cspmulti",        { NULL }, 2807,  "udp"  },
+  { "j-lan-p",         { NULL }, 2808,  "tcp"  },
+  { "j-lan-p",         { NULL }, 2808,  "udp"  },
+  { "corbaloc",        { NULL }, 2809,  "tcp"  },
+  { "corbaloc",        { NULL }, 2809,  "udp"  },
+  { "netsteward",      { NULL }, 2810,  "tcp"  },
+  { "netsteward",      { NULL }, 2810,  "udp"  },
+  { "gsiftp",          { NULL }, 2811,  "tcp"  },
+  { "gsiftp",          { NULL }, 2811,  "udp"  },
+  { "atmtcp",          { NULL }, 2812,  "tcp"  },
+  { "atmtcp",          { NULL }, 2812,  "udp"  },
+  { "llm-pass",        { NULL }, 2813,  "tcp"  },
+  { "llm-pass",        { NULL }, 2813,  "udp"  },
+  { "llm-csv",         { NULL }, 2814,  "tcp"  },
+  { "llm-csv",         { NULL }, 2814,  "udp"  },
+  { "lbc-measure",     { NULL }, 2815,  "tcp"  },
+  { "lbc-measure",     { NULL }, 2815,  "udp"  },
+  { "lbc-watchdog",    { NULL }, 2816,  "tcp"  },
+  { "lbc-watchdog",    { NULL }, 2816,  "udp"  },
+  { "nmsigport",       { NULL }, 2817,  "tcp"  },
+  { "nmsigport",       { NULL }, 2817,  "udp"  },
+  { "rmlnk",           { NULL }, 2818,  "tcp"  },
+  { "rmlnk",           { NULL }, 2818,  "udp"  },
+  { "fc-faultnotify",  { NULL }, 2819,  "tcp"  },
+  { "fc-faultnotify",  { NULL }, 2819,  "udp"  },
+  { "univision",       { NULL }, 2820,  "tcp"  },
+  { "univision",       { NULL }, 2820,  "udp"  },
+  { "vrts-at-port",    { NULL }, 2821,  "tcp"  },
+  { "vrts-at-port",    { NULL }, 2821,  "udp"  },
+  { "ka0wuc",          { NULL }, 2822,  "tcp"  },
+  { "ka0wuc",          { NULL }, 2822,  "udp"  },
+  { "cqg-netlan",      { NULL }, 2823,  "tcp"  },
+  { "cqg-netlan",      { NULL }, 2823,  "udp"  },
+  { "cqg-netlan-1",    { NULL }, 2824,  "tcp"  },
+  { "cqg-netlan-1",    { NULL }, 2824,  "udp"  },
+  { "slc-systemlog",   { NULL }, 2826,  "tcp"  },
+  { "slc-systemlog",   { NULL }, 2826,  "udp"  },
+  { "slc-ctrlrloops",  { NULL }, 2827,  "tcp"  },
+  { "slc-ctrlrloops",  { NULL }, 2827,  "udp"  },
+  { "itm-lm",          { NULL }, 2828,  "tcp"  },
+  { "itm-lm",          { NULL }, 2828,  "udp"  },
+  { "silkp1",          { NULL }, 2829,  "tcp"  },
+  { "silkp1",          { NULL }, 2829,  "udp"  },
+  { "silkp2",          { NULL }, 2830,  "tcp"  },
+  { "silkp2",          { NULL }, 2830,  "udp"  },
+  { "silkp3",          { NULL }, 2831,  "tcp"  },
+  { "silkp3",          { NULL }, 2831,  "udp"  },
+  { "silkp4",          { NULL }, 2832,  "tcp"  },
+  { "silkp4",          { NULL }, 2832,  "udp"  },
+  { "glishd",          { NULL }, 2833,  "tcp"  },
+  { "glishd",          { NULL }, 2833,  "udp"  },
+  { "evtp",            { NULL }, 2834,  "tcp"  },
+  { "evtp",            { NULL }, 2834,  "udp"  },
+  { "evtp-data",       { NULL }, 2835,  "tcp"  },
+  { "evtp-data",       { NULL }, 2835,  "udp"  },
+  { "catalyst",        { NULL }, 2836,  "tcp"  },
+  { "catalyst",        { NULL }, 2836,  "udp"  },
+  { "repliweb",        { NULL }, 2837,  "tcp"  },
+  { "repliweb",        { NULL }, 2837,  "udp"  },
+  { "starbot",         { NULL }, 2838,  "tcp"  },
+  { "starbot",         { NULL }, 2838,  "udp"  },
+  { "nmsigport",       { NULL }, 2839,  "tcp"  },
+  { "nmsigport",       { NULL }, 2839,  "udp"  },
+  { "l3-exprt",        { NULL }, 2840,  "tcp"  },
+  { "l3-exprt",        { NULL }, 2840,  "udp"  },
+  { "l3-ranger",       { NULL }, 2841,  "tcp"  },
+  { "l3-ranger",       { NULL }, 2841,  "udp"  },
+  { "l3-hawk",         { NULL }, 2842,  "tcp"  },
+  { "l3-hawk",         { NULL }, 2842,  "udp"  },
+  { "pdnet",           { NULL }, 2843,  "tcp"  },
+  { "pdnet",           { NULL }, 2843,  "udp"  },
+  { "bpcp-poll",       { NULL }, 2844,  "tcp"  },
+  { "bpcp-poll",       { NULL }, 2844,  "udp"  },
+  { "bpcp-trap",       { NULL }, 2845,  "tcp"  },
+  { "bpcp-trap",       { NULL }, 2845,  "udp"  },
+  { "aimpp-hello",     { NULL }, 2846,  "tcp"  },
+  { "aimpp-hello",     { NULL }, 2846,  "udp"  },
+  { "aimpp-port-req",  { NULL }, 2847,  "tcp"  },
+  { "aimpp-port-req",  { NULL }, 2847,  "udp"  },
+  { "amt-blc-port",    { NULL }, 2848,  "tcp"  },
+  { "amt-blc-port",    { NULL }, 2848,  "udp"  },
+  { "fxp",             { NULL }, 2849,  "tcp"  },
+  { "fxp",             { NULL }, 2849,  "udp"  },
+  { "metaconsole",     { NULL }, 2850,  "tcp"  },
+  { "metaconsole",     { NULL }, 2850,  "udp"  },
+  { "webemshttp",      { NULL }, 2851,  "tcp"  },
+  { "webemshttp",      { NULL }, 2851,  "udp"  },
+  { "bears-01",        { NULL }, 2852,  "tcp"  },
+  { "bears-01",        { NULL }, 2852,  "udp"  },
+  { "ispipes",         { NULL }, 2853,  "tcp"  },
+  { "ispipes",         { NULL }, 2853,  "udp"  },
+  { "infomover",       { NULL }, 2854,  "tcp"  },
+  { "infomover",       { NULL }, 2854,  "udp"  },
+  { "msrp",            { NULL }, 2855,  "tcp"  },
+  { "msrp",            { NULL }, 2855,  "udp"  },
+  { "cesdinv",         { NULL }, 2856,  "tcp"  },
+  { "cesdinv",         { NULL }, 2856,  "udp"  },
+  { "simctlp",         { NULL }, 2857,  "tcp"  },
+  { "simctlp",         { NULL }, 2857,  "udp"  },
+  { "ecnp",            { NULL }, 2858,  "tcp"  },
+  { "ecnp",            { NULL }, 2858,  "udp"  },
+  { "activememory",    { NULL }, 2859,  "tcp"  },
+  { "activememory",    { NULL }, 2859,  "udp"  },
+  { "dialpad-voice1",  { NULL }, 2860,  "tcp"  },
+  { "dialpad-voice1",  { NULL }, 2860,  "udp"  },
+  { "dialpad-voice2",  { NULL }, 2861,  "tcp"  },
+  { "dialpad-voice2",  { NULL }, 2861,  "udp"  },
+  { "ttg-protocol",    { NULL }, 2862,  "tcp"  },
+  { "ttg-protocol",    { NULL }, 2862,  "udp"  },
+  { "sonardata",       { NULL }, 2863,  "tcp"  },
+  { "sonardata",       { NULL }, 2863,  "udp"  },
+  { "astromed-main",   { NULL }, 2864,  "tcp"  },
+  { "astromed-main",   { NULL }, 2864,  "udp"  },
+  { "pit-vpn",         { NULL }, 2865,  "tcp"  },
+  { "pit-vpn",         { NULL }, 2865,  "udp"  },
+  { "iwlistener",      { NULL }, 2866,  "tcp"  },
+  { "iwlistener",      { NULL }, 2866,  "udp"  },
+  { "esps-portal",     { NULL }, 2867,  "tcp"  },
+  { "esps-portal",     { NULL }, 2867,  "udp"  },
+  { "npep-messaging",  { NULL }, 2868,  "tcp"  },
+  { "npep-messaging",  { NULL }, 2868,  "udp"  },
+  { "icslap",          { NULL }, 2869,  "tcp"  },
+  { "icslap",          { NULL }, 2869,  "udp"  },
+  { "daishi",          { NULL }, 2870,  "tcp"  },
+  { "daishi",          { NULL }, 2870,  "udp"  },
+  { "msi-selectplay",  { NULL }, 2871,  "tcp"  },
+  { "msi-selectplay",  { NULL }, 2871,  "udp"  },
+  { "radix",           { NULL }, 2872,  "tcp"  },
+  { "radix",           { NULL }, 2872,  "udp"  },
+  { "dxmessagebase1",  { NULL }, 2874,  "tcp"  },
+  { "dxmessagebase1",  { NULL }, 2874,  "udp"  },
+  { "dxmessagebase2",  { NULL }, 2875,  "tcp"  },
+  { "dxmessagebase2",  { NULL }, 2875,  "udp"  },
+  { "sps-tunnel",      { NULL }, 2876,  "tcp"  },
+  { "sps-tunnel",      { NULL }, 2876,  "udp"  },
+  { "bluelance",       { NULL }, 2877,  "tcp"  },
+  { "bluelance",       { NULL }, 2877,  "udp"  },
+  { "aap",             { NULL }, 2878,  "tcp"  },
+  { "aap",             { NULL }, 2878,  "udp"  },
+  { "ucentric-ds",     { NULL }, 2879,  "tcp"  },
+  { "ucentric-ds",     { NULL }, 2879,  "udp"  },
+  { "synapse",         { NULL }, 2880,  "tcp"  },
+  { "synapse",         { NULL }, 2880,  "udp"  },
+  { "ndsp",            { NULL }, 2881,  "tcp"  },
+  { "ndsp",            { NULL }, 2881,  "udp"  },
+  { "ndtp",            { NULL }, 2882,  "tcp"  },
+  { "ndtp",            { NULL }, 2882,  "udp"  },
+  { "ndnp",            { NULL }, 2883,  "tcp"  },
+  { "ndnp",            { NULL }, 2883,  "udp"  },
+  { "flashmsg",        { NULL }, 2884,  "tcp"  },
+  { "flashmsg",        { NULL }, 2884,  "udp"  },
+  { "topflow",         { NULL }, 2885,  "tcp"  },
+  { "topflow",         { NULL }, 2885,  "udp"  },
+  { "responselogic",   { NULL }, 2886,  "tcp"  },
+  { "responselogic",   { NULL }, 2886,  "udp"  },
+  { "aironetddp",      { NULL }, 2887,  "tcp"  },
+  { "aironetddp",      { NULL }, 2887,  "udp"  },
+  { "spcsdlobby",      { NULL }, 2888,  "tcp"  },
+  { "spcsdlobby",      { NULL }, 2888,  "udp"  },
+  { "rsom",            { NULL }, 2889,  "tcp"  },
+  { "rsom",            { NULL }, 2889,  "udp"  },
+  { "cspclmulti",      { NULL }, 2890,  "tcp"  },
+  { "cspclmulti",      { NULL }, 2890,  "udp"  },
+  { "cinegrfx-elmd",   { NULL }, 2891,  "tcp"  },
+  { "cinegrfx-elmd",   { NULL }, 2891,  "udp"  },
+  { "snifferdata",     { NULL }, 2892,  "tcp"  },
+  { "snifferdata",     { NULL }, 2892,  "udp"  },
+  { "vseconnector",    { NULL }, 2893,  "tcp"  },
+  { "vseconnector",    { NULL }, 2893,  "udp"  },
+  { "abacus-remote",   { NULL }, 2894,  "tcp"  },
+  { "abacus-remote",   { NULL }, 2894,  "udp"  },
+  { "natuslink",       { NULL }, 2895,  "tcp"  },
+  { "natuslink",       { NULL }, 2895,  "udp"  },
+  { "ecovisiong6-1",   { NULL }, 2896,  "tcp"  },
+  { "ecovisiong6-1",   { NULL }, 2896,  "udp"  },
+  { "citrix-rtmp",     { NULL }, 2897,  "tcp"  },
+  { "citrix-rtmp",     { NULL }, 2897,  "udp"  },
+  { "appliance-cfg",   { NULL }, 2898,  "tcp"  },
+  { "appliance-cfg",   { NULL }, 2898,  "udp"  },
+  { "powergemplus",    { NULL }, 2899,  "tcp"  },
+  { "powergemplus",    { NULL }, 2899,  "udp"  },
+  { "quicksuite",      { NULL }, 2900,  "tcp"  },
+  { "quicksuite",      { NULL }, 2900,  "udp"  },
+  { "allstorcns",      { NULL }, 2901,  "tcp"  },
+  { "allstorcns",      { NULL }, 2901,  "udp"  },
+  { "netaspi",         { NULL }, 2902,  "tcp"  },
+  { "netaspi",         { NULL }, 2902,  "udp"  },
+  { "suitcase",        { NULL }, 2903,  "tcp"  },
+  { "suitcase",        { NULL }, 2903,  "udp"  },
+  { "m2ua",            { NULL }, 2904,  "tcp"  },
+  { "m2ua",            { NULL }, 2904,  "udp"  },
+  { "m2ua",            { NULL }, 2904,  "sctp" },
+  { "m3ua",            { NULL }, 2905,  "tcp"  },
+  { "m3ua",            { NULL }, 2905,  "sctp" },
+  { "caller9",         { NULL }, 2906,  "tcp"  },
+  { "caller9",         { NULL }, 2906,  "udp"  },
+  { "webmethods-b2b",  { NULL }, 2907,  "tcp"  },
+  { "webmethods-b2b",  { NULL }, 2907,  "udp"  },
+  { "mao",             { NULL }, 2908,  "tcp"  },
+  { "mao",             { NULL }, 2908,  "udp"  },
+  { "funk-dialout",    { NULL }, 2909,  "tcp"  },
+  { "funk-dialout",    { NULL }, 2909,  "udp"  },
+  { "tdaccess",        { NULL }, 2910,  "tcp"  },
+  { "tdaccess",        { NULL }, 2910,  "udp"  },
+  { "blockade",        { NULL }, 2911,  "tcp"  },
+  { "blockade",        { NULL }, 2911,  "udp"  },
+  { "epicon",          { NULL }, 2912,  "tcp"  },
+  { "epicon",          { NULL }, 2912,  "udp"  },
+  { "boosterware",     { NULL }, 2913,  "tcp"  },
+  { "boosterware",     { NULL }, 2913,  "udp"  },
+  { "gamelobby",       { NULL }, 2914,  "tcp"  },
+  { "gamelobby",       { NULL }, 2914,  "udp"  },
+  { "tksocket",        { NULL }, 2915,  "tcp"  },
+  { "tksocket",        { NULL }, 2915,  "udp"  },
+  { "elvin_server",    { NULL }, 2916,  "tcp"  },
+  { "elvin_server",    { NULL }, 2916,  "udp"  },
+  { "elvin_client",    { NULL }, 2917,  "tcp"  },
+  { "elvin_client",    { NULL }, 2917,  "udp"  },
+  { "kastenchasepad",  { NULL }, 2918,  "tcp"  },
+  { "kastenchasepad",  { NULL }, 2918,  "udp"  },
+  { "roboer",          { NULL }, 2919,  "tcp"  },
+  { "roboer",          { NULL }, 2919,  "udp"  },
+  { "roboeda",         { NULL }, 2920,  "tcp"  },
+  { "roboeda",         { NULL }, 2920,  "udp"  },
+  { "cesdcdman",       { NULL }, 2921,  "tcp"  },
+  { "cesdcdman",       { NULL }, 2921,  "udp"  },
+  { "cesdcdtrn",       { NULL }, 2922,  "tcp"  },
+  { "cesdcdtrn",       { NULL }, 2922,  "udp"  },
+  { "wta-wsp-wtp-s",   { NULL }, 2923,  "tcp"  },
+  { "wta-wsp-wtp-s",   { NULL }, 2923,  "udp"  },
+  { "precise-vip",     { NULL }, 2924,  "tcp"  },
+  { "precise-vip",     { NULL }, 2924,  "udp"  },
+  { "mobile-file-dl",  { NULL }, 2926,  "tcp"  },
+  { "mobile-file-dl",  { NULL }, 2926,  "udp"  },
+  { "unimobilectrl",   { NULL }, 2927,  "tcp"  },
+  { "unimobilectrl",   { NULL }, 2927,  "udp"  },
+  { "redstone-cpss",   { NULL }, 2928,  "tcp"  },
+  { "redstone-cpss",   { NULL }, 2928,  "udp"  },
+  { "amx-webadmin",    { NULL }, 2929,  "tcp"  },
+  { "amx-webadmin",    { NULL }, 2929,  "udp"  },
+  { "amx-weblinx",     { NULL }, 2930,  "tcp"  },
+  { "amx-weblinx",     { NULL }, 2930,  "udp"  },
+  { "circle-x",        { NULL }, 2931,  "tcp"  },
+  { "circle-x",        { NULL }, 2931,  "udp"  },
+  { "incp",            { NULL }, 2932,  "tcp"  },
+  { "incp",            { NULL }, 2932,  "udp"  },
+  { "4-tieropmgw",     { NULL }, 2933,  "tcp"  },
+  { "4-tieropmgw",     { NULL }, 2933,  "udp"  },
+  { "4-tieropmcli",    { NULL }, 2934,  "tcp"  },
+  { "4-tieropmcli",    { NULL }, 2934,  "udp"  },
+  { "qtp",             { NULL }, 2935,  "tcp"  },
+  { "qtp",             { NULL }, 2935,  "udp"  },
+  { "otpatch",         { NULL }, 2936,  "tcp"  },
+  { "otpatch",         { NULL }, 2936,  "udp"  },
+  { "pnaconsult-lm",   { NULL }, 2937,  "tcp"  },
+  { "pnaconsult-lm",   { NULL }, 2937,  "udp"  },
+  { "sm-pas-1",        { NULL }, 2938,  "tcp"  },
+  { "sm-pas-1",        { NULL }, 2938,  "udp"  },
+  { "sm-pas-2",        { NULL }, 2939,  "tcp"  },
+  { "sm-pas-2",        { NULL }, 2939,  "udp"  },
+  { "sm-pas-3",        { NULL }, 2940,  "tcp"  },
+  { "sm-pas-3",        { NULL }, 2940,  "udp"  },
+  { "sm-pas-4",        { NULL }, 2941,  "tcp"  },
+  { "sm-pas-4",        { NULL }, 2941,  "udp"  },
+  { "sm-pas-5",        { NULL }, 2942,  "tcp"  },
+  { "sm-pas-5",        { NULL }, 2942,  "udp"  },
+  { "ttnrepository",   { NULL }, 2943,  "tcp"  },
+  { "ttnrepository",   { NULL }, 2943,  "udp"  },
+  { "megaco-h248",     { NULL }, 2944,  "tcp"  },
+  { "megaco-h248",     { NULL }, 2944,  "udp"  },
+  { "megaco-h248",     { NULL }, 2944,  "sctp" },
+  { "h248-binary",     { NULL }, 2945,  "tcp"  },
+  { "h248-binary",     { NULL }, 2945,  "udp"  },
+  { "h248-binary",     { NULL }, 2945,  "sctp" },
+  { "fjsvmpor",        { NULL }, 2946,  "tcp"  },
+  { "fjsvmpor",        { NULL }, 2946,  "udp"  },
+  { "gpsd",            { NULL }, 2947,  "tcp"  },
+  { "gpsd",            { NULL }, 2947,  "udp"  },
+  { "wap-push",        { NULL }, 2948,  "tcp"  },
+  { "wap-push",        { NULL }, 2948,  "udp"  },
+  { "wap-pushsecure",  { NULL }, 2949,  "tcp"  },
+  { "wap-pushsecure",  { NULL }, 2949,  "udp"  },
+  { "esip",            { NULL }, 2950,  "tcp"  },
+  { "esip",            { NULL }, 2950,  "udp"  },
+  { "ottp",            { NULL }, 2951,  "tcp"  },
+  { "ottp",            { NULL }, 2951,  "udp"  },
+  { "mpfwsas",         { NULL }, 2952,  "tcp"  },
+  { "mpfwsas",         { NULL }, 2952,  "udp"  },
+  { "ovalarmsrv",      { NULL }, 2953,  "tcp"  },
+  { "ovalarmsrv",      { NULL }, 2953,  "udp"  },
+  { "ovalarmsrv-cmd",  { NULL }, 2954,  "tcp"  },
+  { "ovalarmsrv-cmd",  { NULL }, 2954,  "udp"  },
+  { "csnotify",        { NULL }, 2955,  "tcp"  },
+  { "csnotify",        { NULL }, 2955,  "udp"  },
+  { "ovrimosdbman",    { NULL }, 2956,  "tcp"  },
+  { "ovrimosdbman",    { NULL }, 2956,  "udp"  },
+  { "jmact5",          { NULL }, 2957,  "tcp"  },
+  { "jmact5",          { NULL }, 2957,  "udp"  },
+  { "jmact6",          { NULL }, 2958,  "tcp"  },
+  { "jmact6",          { NULL }, 2958,  "udp"  },
+  { "rmopagt",         { NULL }, 2959,  "tcp"  },
+  { "rmopagt",         { NULL }, 2959,  "udp"  },
+  { "dfoxserver",      { NULL }, 2960,  "tcp"  },
+  { "dfoxserver",      { NULL }, 2960,  "udp"  },
+  { "boldsoft-lm",     { NULL }, 2961,  "tcp"  },
+  { "boldsoft-lm",     { NULL }, 2961,  "udp"  },
+  { "iph-policy-cli",  { NULL }, 2962,  "tcp"  },
+  { "iph-policy-cli",  { NULL }, 2962,  "udp"  },
+  { "iph-policy-adm",  { NULL }, 2963,  "tcp"  },
+  { "iph-policy-adm",  { NULL }, 2963,  "udp"  },
+  { "bullant-srap",    { NULL }, 2964,  "tcp"  },
+  { "bullant-srap",    { NULL }, 2964,  "udp"  },
+  { "bullant-rap",     { NULL }, 2965,  "tcp"  },
+  { "bullant-rap",     { NULL }, 2965,  "udp"  },
+  { "idp-infotrieve",  { NULL }, 2966,  "tcp"  },
+  { "idp-infotrieve",  { NULL }, 2966,  "udp"  },
+  { "ssc-agent",       { NULL }, 2967,  "tcp"  },
+  { "ssc-agent",       { NULL }, 2967,  "udp"  },
+  { "enpp",            { NULL }, 2968,  "tcp"  },
+  { "enpp",            { NULL }, 2968,  "udp"  },
+  { "essp",            { NULL }, 2969,  "tcp"  },
+  { "essp",            { NULL }, 2969,  "udp"  },
+  { "index-net",       { NULL }, 2970,  "tcp"  },
+  { "index-net",       { NULL }, 2970,  "udp"  },
+  { "netclip",         { NULL }, 2971,  "tcp"  },
+  { "netclip",         { NULL }, 2971,  "udp"  },
+  { "pmsm-webrctl",    { NULL }, 2972,  "tcp"  },
+  { "pmsm-webrctl",    { NULL }, 2972,  "udp"  },
+  { "svnetworks",      { NULL }, 2973,  "tcp"  },
+  { "svnetworks",      { NULL }, 2973,  "udp"  },
+  { "signal",          { NULL }, 2974,  "tcp"  },
+  { "signal",          { NULL }, 2974,  "udp"  },
+  { "fjmpcm",          { NULL }, 2975,  "tcp"  },
+  { "fjmpcm",          { NULL }, 2975,  "udp"  },
+  { "cns-srv-port",    { NULL }, 2976,  "tcp"  },
+  { "cns-srv-port",    { NULL }, 2976,  "udp"  },
+  { "ttc-etap-ns",     { NULL }, 2977,  "tcp"  },
+  { "ttc-etap-ns",     { NULL }, 2977,  "udp"  },
+  { "ttc-etap-ds",     { NULL }, 2978,  "tcp"  },
+  { "ttc-etap-ds",     { NULL }, 2978,  "udp"  },
+  { "h263-video",      { NULL }, 2979,  "tcp"  },
+  { "h263-video",      { NULL }, 2979,  "udp"  },
+  { "wimd",            { NULL }, 2980,  "tcp"  },
+  { "wimd",            { NULL }, 2980,  "udp"  },
+  { "mylxamport",      { NULL }, 2981,  "tcp"  },
+  { "mylxamport",      { NULL }, 2981,  "udp"  },
+  { "iwb-whiteboard",  { NULL }, 2982,  "tcp"  },
+  { "iwb-whiteboard",  { NULL }, 2982,  "udp"  },
+  { "netplan",         { NULL }, 2983,  "tcp"  },
+  { "netplan",         { NULL }, 2983,  "udp"  },
+  { "hpidsadmin",      { NULL }, 2984,  "tcp"  },
+  { "hpidsadmin",      { NULL }, 2984,  "udp"  },
+  { "hpidsagent",      { NULL }, 2985,  "tcp"  },
+  { "hpidsagent",      { NULL }, 2985,  "udp"  },
+  { "stonefalls",      { NULL }, 2986,  "tcp"  },
+  { "stonefalls",      { NULL }, 2986,  "udp"  },
+  { "identify",        { NULL }, 2987,  "tcp"  },
+  { "identify",        { NULL }, 2987,  "udp"  },
+  { "hippad",          { NULL }, 2988,  "tcp"  },
+  { "hippad",          { NULL }, 2988,  "udp"  },
+  { "zarkov",          { NULL }, 2989,  "tcp"  },
+  { "zarkov",          { NULL }, 2989,  "udp"  },
+  { "boscap",          { NULL }, 2990,  "tcp"  },
+  { "boscap",          { NULL }, 2990,  "udp"  },
+  { "wkstn-mon",       { NULL }, 2991,  "tcp"  },
+  { "wkstn-mon",       { NULL }, 2991,  "udp"  },
+  { "avenyo",          { NULL }, 2992,  "tcp"  },
+  { "avenyo",          { NULL }, 2992,  "udp"  },
+  { "veritas-vis1",    { NULL }, 2993,  "tcp"  },
+  { "veritas-vis1",    { NULL }, 2993,  "udp"  },
+  { "veritas-vis2",    { NULL }, 2994,  "tcp"  },
+  { "veritas-vis2",    { NULL }, 2994,  "udp"  },
+  { "idrs",            { NULL }, 2995,  "tcp"  },
+  { "idrs",            { NULL }, 2995,  "udp"  },
+  { "vsixml",          { NULL }, 2996,  "tcp"  },
+  { "vsixml",          { NULL }, 2996,  "udp"  },
+  { "rebol",           { NULL }, 2997,  "tcp"  },
+  { "rebol",           { NULL }, 2997,  "udp"  },
+  { "realsecure",      { NULL }, 2998,  "tcp"  },
+  { "realsecure",      { NULL }, 2998,  "udp"  },
+  { "remoteware-un",   { NULL }, 2999,  "tcp"  },
+  { "remoteware-un",   { NULL }, 2999,  "udp"  },
+  { "hbci",            { NULL }, 3000,  "tcp"  },
+  { "hbci",            { NULL }, 3000,  "udp"  },
+  { "remoteware-cl",   { NULL }, 3000,  "tcp"  },
+  { "remoteware-cl",   { NULL }, 3000,  "udp"  },
+  { "exlm-agent",      { NULL }, 3002,  "tcp"  },
+  { "exlm-agent",      { NULL }, 3002,  "udp"  },
+  { "remoteware-srv",  { NULL }, 3002,  "tcp"  },
+  { "remoteware-srv",  { NULL }, 3002,  "udp"  },
+  { "cgms",            { NULL }, 3003,  "tcp"  },
+  { "cgms",            { NULL }, 3003,  "udp"  },
+  { "csoftragent",     { NULL }, 3004,  "tcp"  },
+  { "csoftragent",     { NULL }, 3004,  "udp"  },
+  { "geniuslm",        { NULL }, 3005,  "tcp"  },
+  { "geniuslm",        { NULL }, 3005,  "udp"  },
+  { "ii-admin",        { NULL }, 3006,  "tcp"  },
+  { "ii-admin",        { NULL }, 3006,  "udp"  },
+  { "lotusmtap",       { NULL }, 3007,  "tcp"  },
+  { "lotusmtap",       { NULL }, 3007,  "udp"  },
+  { "midnight-tech",   { NULL }, 3008,  "tcp"  },
+  { "midnight-tech",   { NULL }, 3008,  "udp"  },
+  { "pxc-ntfy",        { NULL }, 3009,  "tcp"  },
+  { "pxc-ntfy",        { NULL }, 3009,  "udp"  },
+  { "gw",              { NULL }, 3010,  "tcp"  },
+  { "ping-pong",       { NULL }, 3010,  "udp"  },
+  { "trusted-web",     { NULL }, 3011,  "tcp"  },
+  { "trusted-web",     { NULL }, 3011,  "udp"  },
+  { "twsdss",          { NULL }, 3012,  "tcp"  },
+  { "twsdss",          { NULL }, 3012,  "udp"  },
+  { "gilatskysurfer",  { NULL }, 3013,  "tcp"  },
+  { "gilatskysurfer",  { NULL }, 3013,  "udp"  },
+  { "broker_service",  { NULL }, 3014,  "tcp"  },
+  { "broker_service",  { NULL }, 3014,  "udp"  },
+  { "nati-dstp",       { NULL }, 3015,  "tcp"  },
+  { "nati-dstp",       { NULL }, 3015,  "udp"  },
+  { "notify_srvr",     { NULL }, 3016,  "tcp"  },
+  { "notify_srvr",     { NULL }, 3016,  "udp"  },
+  { "event_listener",  { NULL }, 3017,  "tcp"  },
+  { "event_listener",  { NULL }, 3017,  "udp"  },
+  { "srvc_registry",   { NULL }, 3018,  "tcp"  },
+  { "srvc_registry",   { NULL }, 3018,  "udp"  },
+  { "resource_mgr",    { NULL }, 3019,  "tcp"  },
+  { "resource_mgr",    { NULL }, 3019,  "udp"  },
+  { "cifs",            { NULL }, 3020,  "tcp"  },
+  { "cifs",            { NULL }, 3020,  "udp"  },
+  { "agriserver",      { NULL }, 3021,  "tcp"  },
+  { "agriserver",      { NULL }, 3021,  "udp"  },
+  { "csregagent",      { NULL }, 3022,  "tcp"  },
+  { "csregagent",      { NULL }, 3022,  "udp"  },
+  { "magicnotes",      { NULL }, 3023,  "tcp"  },
+  { "magicnotes",      { NULL }, 3023,  "udp"  },
+  { "nds_sso",         { NULL }, 3024,  "tcp"  },
+  { "nds_sso",         { NULL }, 3024,  "udp"  },
+  { "arepa-raft",      { NULL }, 3025,  "tcp"  },
+  { "arepa-raft",      { NULL }, 3025,  "udp"  },
+  { "agri-gateway",    { NULL }, 3026,  "tcp"  },
+  { "agri-gateway",    { NULL }, 3026,  "udp"  },
+  { "LiebDevMgmt_C",   { NULL }, 3027,  "tcp"  },
+  { "LiebDevMgmt_C",   { NULL }, 3027,  "udp"  },
+  { "LiebDevMgmt_DM",  { NULL }, 3028,  "tcp"  },
+  { "LiebDevMgmt_DM",  { NULL }, 3028,  "udp"  },
+  { "LiebDevMgmt_A",   { NULL }, 3029,  "tcp"  },
+  { "LiebDevMgmt_A",   { NULL }, 3029,  "udp"  },
+  { "arepa-cas",       { NULL }, 3030,  "tcp"  },
+  { "arepa-cas",       { NULL }, 3030,  "udp"  },
+  { "eppc",            { NULL }, 3031,  "tcp"  },
+  { "eppc",            { NULL }, 3031,  "udp"  },
+  { "redwood-chat",    { NULL }, 3032,  "tcp"  },
+  { "redwood-chat",    { NULL }, 3032,  "udp"  },
+  { "pdb",             { NULL }, 3033,  "tcp"  },
+  { "pdb",             { NULL }, 3033,  "udp"  },
+  { "osmosis-aeea",    { NULL }, 3034,  "tcp"  },
+  { "osmosis-aeea",    { NULL }, 3034,  "udp"  },
+  { "fjsv-gssagt",     { NULL }, 3035,  "tcp"  },
+  { "fjsv-gssagt",     { NULL }, 3035,  "udp"  },
+  { "hagel-dump",      { NULL }, 3036,  "tcp"  },
+  { "hagel-dump",      { NULL }, 3036,  "udp"  },
+  { "hp-san-mgmt",     { NULL }, 3037,  "tcp"  },
+  { "hp-san-mgmt",     { NULL }, 3037,  "udp"  },
+  { "santak-ups",      { NULL }, 3038,  "tcp"  },
+  { "santak-ups",      { NULL }, 3038,  "udp"  },
+  { "cogitate",        { NULL }, 3039,  "tcp"  },
+  { "cogitate",        { NULL }, 3039,  "udp"  },
+  { "tomato-springs",  { NULL }, 3040,  "tcp"  },
+  { "tomato-springs",  { NULL }, 3040,  "udp"  },
+  { "di-traceware",    { NULL }, 3041,  "tcp"  },
+  { "di-traceware",    { NULL }, 3041,  "udp"  },
+  { "journee",         { NULL }, 3042,  "tcp"  },
+  { "journee",         { NULL }, 3042,  "udp"  },
+  { "brp",             { NULL }, 3043,  "tcp"  },
+  { "brp",             { NULL }, 3043,  "udp"  },
+  { "epp",             { NULL }, 3044,  "tcp"  },
+  { "epp",             { NULL }, 3044,  "udp"  },
+  { "responsenet",     { NULL }, 3045,  "tcp"  },
+  { "responsenet",     { NULL }, 3045,  "udp"  },
+  { "di-ase",          { NULL }, 3046,  "tcp"  },
+  { "di-ase",          { NULL }, 3046,  "udp"  },
+  { "hlserver",        { NULL }, 3047,  "tcp"  },
+  { "hlserver",        { NULL }, 3047,  "udp"  },
+  { "pctrader",        { NULL }, 3048,  "tcp"  },
+  { "pctrader",        { NULL }, 3048,  "udp"  },
+  { "nsws",            { NULL }, 3049,  "tcp"  },
+  { "nsws",            { NULL }, 3049,  "udp"  },
+  { "gds_db",          { NULL }, 3050,  "tcp"  },
+  { "gds_db",          { NULL }, 3050,  "udp"  },
+  { "galaxy-server",   { NULL }, 3051,  "tcp"  },
+  { "galaxy-server",   { NULL }, 3051,  "udp"  },
+  { "apc-3052",        { NULL }, 3052,  "tcp"  },
+  { "apc-3052",        { NULL }, 3052,  "udp"  },
+  { "dsom-server",     { NULL }, 3053,  "tcp"  },
+  { "dsom-server",     { NULL }, 3053,  "udp"  },
+  { "amt-cnf-prot",    { NULL }, 3054,  "tcp"  },
+  { "amt-cnf-prot",    { NULL }, 3054,  "udp"  },
+  { "policyserver",    { NULL }, 3055,  "tcp"  },
+  { "policyserver",    { NULL }, 3055,  "udp"  },
+  { "cdl-server",      { NULL }, 3056,  "tcp"  },
+  { "cdl-server",      { NULL }, 3056,  "udp"  },
+  { "goahead-fldup",   { NULL }, 3057,  "tcp"  },
+  { "goahead-fldup",   { NULL }, 3057,  "udp"  },
+  { "videobeans",      { NULL }, 3058,  "tcp"  },
+  { "videobeans",      { NULL }, 3058,  "udp"  },
+  { "qsoft",           { NULL }, 3059,  "tcp"  },
+  { "qsoft",           { NULL }, 3059,  "udp"  },
+  { "interserver",     { NULL }, 3060,  "tcp"  },
+  { "interserver",     { NULL }, 3060,  "udp"  },
+  { "cautcpd",         { NULL }, 3061,  "tcp"  },
+  { "cautcpd",         { NULL }, 3061,  "udp"  },
+  { "ncacn-ip-tcp",    { NULL }, 3062,  "tcp"  },
+  { "ncacn-ip-tcp",    { NULL }, 3062,  "udp"  },
+  { "ncadg-ip-udp",    { NULL }, 3063,  "tcp"  },
+  { "ncadg-ip-udp",    { NULL }, 3063,  "udp"  },
+  { "rprt",            { NULL }, 3064,  "tcp"  },
+  { "rprt",            { NULL }, 3064,  "udp"  },
+  { "slinterbase",     { NULL }, 3065,  "tcp"  },
+  { "slinterbase",     { NULL }, 3065,  "udp"  },
+  { "netattachsdmp",   { NULL }, 3066,  "tcp"  },
+  { "netattachsdmp",   { NULL }, 3066,  "udp"  },
+  { "fjhpjp",          { NULL }, 3067,  "tcp"  },
+  { "fjhpjp",          { NULL }, 3067,  "udp"  },
+  { "ls3bcast",        { NULL }, 3068,  "tcp"  },
+  { "ls3bcast",        { NULL }, 3068,  "udp"  },
+  { "ls3",             { NULL }, 3069,  "tcp"  },
+  { "ls3",             { NULL }, 3069,  "udp"  },
+  { "mgxswitch",       { NULL }, 3070,  "tcp"  },
+  { "mgxswitch",       { NULL }, 3070,  "udp"  },
+  { "csd-mgmt-port",   { NULL }, 3071,  "tcp"  },
+  { "csd-mgmt-port",   { NULL }, 3071,  "udp"  },
+  { "csd-monitor",     { NULL }, 3072,  "tcp"  },
+  { "csd-monitor",     { NULL }, 3072,  "udp"  },
+  { "vcrp",            { NULL }, 3073,  "tcp"  },
+  { "vcrp",            { NULL }, 3073,  "udp"  },
+  { "xbox",            { NULL }, 3074,  "tcp"  },
+  { "xbox",            { NULL }, 3074,  "udp"  },
+  { "orbix-locator",   { NULL }, 3075,  "tcp"  },
+  { "orbix-locator",   { NULL }, 3075,  "udp"  },
+  { "orbix-config",    { NULL }, 3076,  "tcp"  },
+  { "orbix-config",    { NULL }, 3076,  "udp"  },
+  { "orbix-loc-ssl",   { NULL }, 3077,  "tcp"  },
+  { "orbix-loc-ssl",   { NULL }, 3077,  "udp"  },
+  { "orbix-cfg-ssl",   { NULL }, 3078,  "tcp"  },
+  { "orbix-cfg-ssl",   { NULL }, 3078,  "udp"  },
+  { "lv-frontpanel",   { NULL }, 3079,  "tcp"  },
+  { "lv-frontpanel",   { NULL }, 3079,  "udp"  },
+  { "stm_pproc",       { NULL }, 3080,  "tcp"  },
+  { "stm_pproc",       { NULL }, 3080,  "udp"  },
+  { "tl1-lv",          { NULL }, 3081,  "tcp"  },
+  { "tl1-lv",          { NULL }, 3081,  "udp"  },
+  { "tl1-raw",         { NULL }, 3082,  "tcp"  },
+  { "tl1-raw",         { NULL }, 3082,  "udp"  },
+  { "tl1-telnet",      { NULL }, 3083,  "tcp"  },
+  { "tl1-telnet",      { NULL }, 3083,  "udp"  },
+  { "itm-mccs",        { NULL }, 3084,  "tcp"  },
+  { "itm-mccs",        { NULL }, 3084,  "udp"  },
+  { "pcihreq",         { NULL }, 3085,  "tcp"  },
+  { "pcihreq",         { NULL }, 3085,  "udp"  },
+  { "jdl-dbkitchen",   { NULL }, 3086,  "tcp"  },
+  { "jdl-dbkitchen",   { NULL }, 3086,  "udp"  },
+  { "asoki-sma",       { NULL }, 3087,  "tcp"  },
+  { "asoki-sma",       { NULL }, 3087,  "udp"  },
+  { "xdtp",            { NULL }, 3088,  "tcp"  },
+  { "xdtp",            { NULL }, 3088,  "udp"  },
+  { "ptk-alink",       { NULL }, 3089,  "tcp"  },
+  { "ptk-alink",       { NULL }, 3089,  "udp"  },
+  { "stss",            { NULL }, 3090,  "tcp"  },
+  { "stss",            { NULL }, 3090,  "udp"  },
+  { "1ci-smcs",        { NULL }, 3091,  "tcp"  },
+  { "1ci-smcs",        { NULL }, 3091,  "udp"  },
+  { "rapidmq-center",  { NULL }, 3093,  "tcp"  },
+  { "rapidmq-center",  { NULL }, 3093,  "udp"  },
+  { "rapidmq-reg",     { NULL }, 3094,  "tcp"  },
+  { "rapidmq-reg",     { NULL }, 3094,  "udp"  },
+  { "panasas",         { NULL }, 3095,  "tcp"  },
+  { "panasas",         { NULL }, 3095,  "udp"  },
+  { "ndl-aps",         { NULL }, 3096,  "tcp"  },
+  { "ndl-aps",         { NULL }, 3096,  "udp"  },
+  { "itu-bicc-stc",    { NULL }, 3097,  "sctp" },
+  { "umm-port",        { NULL }, 3098,  "tcp"  },
+  { "umm-port",        { NULL }, 3098,  "udp"  },
+  { "chmd",            { NULL }, 3099,  "tcp"  },
+  { "chmd",            { NULL }, 3099,  "udp"  },
+  { "opcon-xps",       { NULL }, 3100,  "tcp"  },
+  { "opcon-xps",       { NULL }, 3100,  "udp"  },
+  { "hp-pxpib",        { NULL }, 3101,  "tcp"  },
+  { "hp-pxpib",        { NULL }, 3101,  "udp"  },
+  { "slslavemon",      { NULL }, 3102,  "tcp"  },
+  { "slslavemon",      { NULL }, 3102,  "udp"  },
+  { "autocuesmi",      { NULL }, 3103,  "tcp"  },
+  { "autocuesmi",      { NULL }, 3103,  "udp"  },
+  { "autocuelog",      { NULL }, 3104,  "tcp"  },
+  { "autocuetime",     { NULL }, 3104,  "udp"  },
+  { "cardbox",         { NULL }, 3105,  "tcp"  },
+  { "cardbox",         { NULL }, 3105,  "udp"  },
+  { "cardbox-http",    { NULL }, 3106,  "tcp"  },
+  { "cardbox-http",    { NULL }, 3106,  "udp"  },
+  { "business",        { NULL }, 3107,  "tcp"  },
+  { "business",        { NULL }, 3107,  "udp"  },
+  { "geolocate",       { NULL }, 3108,  "tcp"  },
+  { "geolocate",       { NULL }, 3108,  "udp"  },
+  { "personnel",       { NULL }, 3109,  "tcp"  },
+  { "personnel",       { NULL }, 3109,  "udp"  },
+  { "sim-control",     { NULL }, 3110,  "tcp"  },
+  { "sim-control",     { NULL }, 3110,  "udp"  },
+  { "wsynch",          { NULL }, 3111,  "tcp"  },
+  { "wsynch",          { NULL }, 3111,  "udp"  },
+  { "ksysguard",       { NULL }, 3112,  "tcp"  },
+  { "ksysguard",       { NULL }, 3112,  "udp"  },
+  { "cs-auth-svr",     { NULL }, 3113,  "tcp"  },
+  { "cs-auth-svr",     { NULL }, 3113,  "udp"  },
+  { "ccmad",           { NULL }, 3114,  "tcp"  },
+  { "ccmad",           { NULL }, 3114,  "udp"  },
+  { "mctet-master",    { NULL }, 3115,  "tcp"  },
+  { "mctet-master",    { NULL }, 3115,  "udp"  },
+  { "mctet-gateway",   { NULL }, 3116,  "tcp"  },
+  { "mctet-gateway",   { NULL }, 3116,  "udp"  },
+  { "mctet-jserv",     { NULL }, 3117,  "tcp"  },
+  { "mctet-jserv",     { NULL }, 3117,  "udp"  },
+  { "pkagent",         { NULL }, 3118,  "tcp"  },
+  { "pkagent",         { NULL }, 3118,  "udp"  },
+  { "d2000kernel",     { NULL }, 3119,  "tcp"  },
+  { "d2000kernel",     { NULL }, 3119,  "udp"  },
+  { "d2000webserver",  { NULL }, 3120,  "tcp"  },
+  { "d2000webserver",  { NULL }, 3120,  "udp"  },
+  { "vtr-emulator",    { NULL }, 3122,  "tcp"  },
+  { "vtr-emulator",    { NULL }, 3122,  "udp"  },
+  { "edix",            { NULL }, 3123,  "tcp"  },
+  { "edix",            { NULL }, 3123,  "udp"  },
+  { "beacon-port",     { NULL }, 3124,  "tcp"  },
+  { "beacon-port",     { NULL }, 3124,  "udp"  },
+  { "a13-an",          { NULL }, 3125,  "tcp"  },
+  { "a13-an",          { NULL }, 3125,  "udp"  },
+  { "ctx-bridge",      { NULL }, 3127,  "tcp"  },
+  { "ctx-bridge",      { NULL }, 3127,  "udp"  },
+  { "ndl-aas",         { NULL }, 3128,  "tcp"  },
+  { "ndl-aas",         { NULL }, 3128,  "udp"  },
+  { "netport-id",      { NULL }, 3129,  "tcp"  },
+  { "netport-id",      { NULL }, 3129,  "udp"  },
+  { "icpv2",           { NULL }, 3130,  "tcp"  },
+  { "icpv2",           { NULL }, 3130,  "udp"  },
+  { "netbookmark",     { NULL }, 3131,  "tcp"  },
+  { "netbookmark",     { NULL }, 3131,  "udp"  },
+  { "ms-rule-engine",  { NULL }, 3132,  "tcp"  },
+  { "ms-rule-engine",  { NULL }, 3132,  "udp"  },
+  { "prism-deploy",    { NULL }, 3133,  "tcp"  },
+  { "prism-deploy",    { NULL }, 3133,  "udp"  },
+  { "ecp",             { NULL }, 3134,  "tcp"  },
+  { "ecp",             { NULL }, 3134,  "udp"  },
+  { "peerbook-port",   { NULL }, 3135,  "tcp"  },
+  { "peerbook-port",   { NULL }, 3135,  "udp"  },
+  { "grubd",           { NULL }, 3136,  "tcp"  },
+  { "grubd",           { NULL }, 3136,  "udp"  },
+  { "rtnt-1",          { NULL }, 3137,  "tcp"  },
+  { "rtnt-1",          { NULL }, 3137,  "udp"  },
+  { "rtnt-2",          { NULL }, 3138,  "tcp"  },
+  { "rtnt-2",          { NULL }, 3138,  "udp"  },
+  { "incognitorv",     { NULL }, 3139,  "tcp"  },
+  { "incognitorv",     { NULL }, 3139,  "udp"  },
+  { "ariliamulti",     { NULL }, 3140,  "tcp"  },
+  { "ariliamulti",     { NULL }, 3140,  "udp"  },
+  { "vmodem",          { NULL }, 3141,  "tcp"  },
+  { "vmodem",          { NULL }, 3141,  "udp"  },
+  { "rdc-wh-eos",      { NULL }, 3142,  "tcp"  },
+  { "rdc-wh-eos",      { NULL }, 3142,  "udp"  },
+  { "seaview",         { NULL }, 3143,  "tcp"  },
+  { "seaview",         { NULL }, 3143,  "udp"  },
+  { "tarantella",      { NULL }, 3144,  "tcp"  },
+  { "tarantella",      { NULL }, 3144,  "udp"  },
+  { "csi-lfap",        { NULL }, 3145,  "tcp"  },
+  { "csi-lfap",        { NULL }, 3145,  "udp"  },
+  { "bears-02",        { NULL }, 3146,  "tcp"  },
+  { "bears-02",        { NULL }, 3146,  "udp"  },
+  { "rfio",            { NULL }, 3147,  "tcp"  },
+  { "rfio",            { NULL }, 3147,  "udp"  },
+  { "nm-game-admin",   { NULL }, 3148,  "tcp"  },
+  { "nm-game-admin",   { NULL }, 3148,  "udp"  },
+  { "nm-game-server",  { NULL }, 3149,  "tcp"  },
+  { "nm-game-server",  { NULL }, 3149,  "udp"  },
+  { "nm-asses-admin",  { NULL }, 3150,  "tcp"  },
+  { "nm-asses-admin",  { NULL }, 3150,  "udp"  },
+  { "nm-assessor",     { NULL }, 3151,  "tcp"  },
+  { "nm-assessor",     { NULL }, 3151,  "udp"  },
+  { "feitianrockey",   { NULL }, 3152,  "tcp"  },
+  { "feitianrockey",   { NULL }, 3152,  "udp"  },
+  { "s8-client-port",  { NULL }, 3153,  "tcp"  },
+  { "s8-client-port",  { NULL }, 3153,  "udp"  },
+  { "ccmrmi",          { NULL }, 3154,  "tcp"  },
+  { "ccmrmi",          { NULL }, 3154,  "udp"  },
+  { "jpegmpeg",        { NULL }, 3155,  "tcp"  },
+  { "jpegmpeg",        { NULL }, 3155,  "udp"  },
+  { "indura",          { NULL }, 3156,  "tcp"  },
+  { "indura",          { NULL }, 3156,  "udp"  },
+  { "e3consultants",   { NULL }, 3157,  "tcp"  },
+  { "e3consultants",   { NULL }, 3157,  "udp"  },
+  { "stvp",            { NULL }, 3158,  "tcp"  },
+  { "stvp",            { NULL }, 3158,  "udp"  },
+  { "navegaweb-port",  { NULL }, 3159,  "tcp"  },
+  { "navegaweb-port",  { NULL }, 3159,  "udp"  },
+  { "tip-app-server",  { NULL }, 3160,  "tcp"  },
+  { "tip-app-server",  { NULL }, 3160,  "udp"  },
+  { "doc1lm",          { NULL }, 3161,  "tcp"  },
+  { "doc1lm",          { NULL }, 3161,  "udp"  },
+  { "sflm",            { NULL }, 3162,  "tcp"  },
+  { "sflm",            { NULL }, 3162,  "udp"  },
+  { "res-sap",         { NULL }, 3163,  "tcp"  },
+  { "res-sap",         { NULL }, 3163,  "udp"  },
+  { "imprs",           { NULL }, 3164,  "tcp"  },
+  { "imprs",           { NULL }, 3164,  "udp"  },
+  { "newgenpay",       { NULL }, 3165,  "tcp"  },
+  { "newgenpay",       { NULL }, 3165,  "udp"  },
+  { "sossecollector",  { NULL }, 3166,  "tcp"  },
+  { "sossecollector",  { NULL }, 3166,  "udp"  },
+  { "nowcontact",      { NULL }, 3167,  "tcp"  },
+  { "nowcontact",      { NULL }, 3167,  "udp"  },
+  { "poweronnud",      { NULL }, 3168,  "tcp"  },
+  { "poweronnud",      { NULL }, 3168,  "udp"  },
+  { "serverview-as",   { NULL }, 3169,  "tcp"  },
+  { "serverview-as",   { NULL }, 3169,  "udp"  },
+  { "serverview-asn",  { NULL }, 3170,  "tcp"  },
+  { "serverview-asn",  { NULL }, 3170,  "udp"  },
+  { "serverview-gf",   { NULL }, 3171,  "tcp"  },
+  { "serverview-gf",   { NULL }, 3171,  "udp"  },
+  { "serverview-rm",   { NULL }, 3172,  "tcp"  },
+  { "serverview-rm",   { NULL }, 3172,  "udp"  },
+  { "serverview-icc",  { NULL }, 3173,  "tcp"  },
+  { "serverview-icc",  { NULL }, 3173,  "udp"  },
+  { "armi-server",     { NULL }, 3174,  "tcp"  },
+  { "armi-server",     { NULL }, 3174,  "udp"  },
+  { "t1-e1-over-ip",   { NULL }, 3175,  "tcp"  },
+  { "t1-e1-over-ip",   { NULL }, 3175,  "udp"  },
+  { "ars-master",      { NULL }, 3176,  "tcp"  },
+  { "ars-master",      { NULL }, 3176,  "udp"  },
+  { "phonex-port",     { NULL }, 3177,  "tcp"  },
+  { "phonex-port",     { NULL }, 3177,  "udp"  },
+  { "radclientport",   { NULL }, 3178,  "tcp"  },
+  { "radclientport",   { NULL }, 3178,  "udp"  },
+  { "h2gf-w-2m",       { NULL }, 3179,  "tcp"  },
+  { "h2gf-w-2m",       { NULL }, 3179,  "udp"  },
+  { "mc-brk-srv",      { NULL }, 3180,  "tcp"  },
+  { "mc-brk-srv",      { NULL }, 3180,  "udp"  },
+  { "bmcpatrolagent",  { NULL }, 3181,  "tcp"  },
+  { "bmcpatrolagent",  { NULL }, 3181,  "udp"  },
+  { "bmcpatrolrnvu",   { NULL }, 3182,  "tcp"  },
+  { "bmcpatrolrnvu",   { NULL }, 3182,  "udp"  },
+  { "cops-tls",        { NULL }, 3183,  "tcp"  },
+  { "cops-tls",        { NULL }, 3183,  "udp"  },
+  { "apogeex-port",    { NULL }, 3184,  "tcp"  },
+  { "apogeex-port",    { NULL }, 3184,  "udp"  },
+  { "smpppd",          { NULL }, 3185,  "tcp"  },
+  { "smpppd",          { NULL }, 3185,  "udp"  },
+  { "iiw-port",        { NULL }, 3186,  "tcp"  },
+  { "iiw-port",        { NULL }, 3186,  "udp"  },
+  { "odi-port",        { NULL }, 3187,  "tcp"  },
+  { "odi-port",        { NULL }, 3187,  "udp"  },
+  { "brcm-comm-port",  { NULL }, 3188,  "tcp"  },
+  { "brcm-comm-port",  { NULL }, 3188,  "udp"  },
+  { "pcle-infex",      { NULL }, 3189,  "tcp"  },
+  { "pcle-infex",      { NULL }, 3189,  "udp"  },
+  { "csvr-proxy",      { NULL }, 3190,  "tcp"  },
+  { "csvr-proxy",      { NULL }, 3190,  "udp"  },
+  { "csvr-sslproxy",   { NULL }, 3191,  "tcp"  },
+  { "csvr-sslproxy",   { NULL }, 3191,  "udp"  },
+  { "firemonrcc",      { NULL }, 3192,  "tcp"  },
+  { "firemonrcc",      { NULL }, 3192,  "udp"  },
+  { "spandataport",    { NULL }, 3193,  "tcp"  },
+  { "spandataport",    { NULL }, 3193,  "udp"  },
+  { "magbind",         { NULL }, 3194,  "tcp"  },
+  { "magbind",         { NULL }, 3194,  "udp"  },
+  { "ncu-1",           { NULL }, 3195,  "tcp"  },
+  { "ncu-1",           { NULL }, 3195,  "udp"  },
+  { "ncu-2",           { NULL }, 3196,  "tcp"  },
+  { "ncu-2",           { NULL }, 3196,  "udp"  },
+  { "embrace-dp-s",    { NULL }, 3197,  "tcp"  },
+  { "embrace-dp-s",    { NULL }, 3197,  "udp"  },
+  { "embrace-dp-c",    { NULL }, 3198,  "tcp"  },
+  { "embrace-dp-c",    { NULL }, 3198,  "udp"  },
+  { "dmod-workspace",  { NULL }, 3199,  "tcp"  },
+  { "dmod-workspace",  { NULL }, 3199,  "udp"  },
+  { "tick-port",       { NULL }, 3200,  "tcp"  },
+  { "tick-port",       { NULL }, 3200,  "udp"  },
+  { "cpq-tasksmart",   { NULL }, 3201,  "tcp"  },
+  { "cpq-tasksmart",   { NULL }, 3201,  "udp"  },
+  { "intraintra",      { NULL }, 3202,  "tcp"  },
+  { "intraintra",      { NULL }, 3202,  "udp"  },
+  { "netwatcher-mon",  { NULL }, 3203,  "tcp"  },
+  { "netwatcher-mon",  { NULL }, 3203,  "udp"  },
+  { "netwatcher-db",   { NULL }, 3204,  "tcp"  },
+  { "netwatcher-db",   { NULL }, 3204,  "udp"  },
+  { "isns",            { NULL }, 3205,  "tcp"  },
+  { "isns",            { NULL }, 3205,  "udp"  },
+  { "ironmail",        { NULL }, 3206,  "tcp"  },
+  { "ironmail",        { NULL }, 3206,  "udp"  },
+  { "vx-auth-port",    { NULL }, 3207,  "tcp"  },
+  { "vx-auth-port",    { NULL }, 3207,  "udp"  },
+  { "pfu-prcallback",  { NULL }, 3208,  "tcp"  },
+  { "pfu-prcallback",  { NULL }, 3208,  "udp"  },
+  { "netwkpathengine", { NULL }, 3209,  "tcp"  },
+  { "netwkpathengine", { NULL }, 3209,  "udp"  },
+  { "flamenco-proxy",  { NULL }, 3210,  "tcp"  },
+  { "flamenco-proxy",  { NULL }, 3210,  "udp"  },
+  { "avsecuremgmt",    { NULL }, 3211,  "tcp"  },
+  { "avsecuremgmt",    { NULL }, 3211,  "udp"  },
+  { "surveyinst",      { NULL }, 3212,  "tcp"  },
+  { "surveyinst",      { NULL }, 3212,  "udp"  },
+  { "neon24x7",        { NULL }, 3213,  "tcp"  },
+  { "neon24x7",        { NULL }, 3213,  "udp"  },
+  { "jmq-daemon-1",    { NULL }, 3214,  "tcp"  },
+  { "jmq-daemon-1",    { NULL }, 3214,  "udp"  },
+  { "jmq-daemon-2",    { NULL }, 3215,  "tcp"  },
+  { "jmq-daemon-2",    { NULL }, 3215,  "udp"  },
+  { "ferrari-foam",    { NULL }, 3216,  "tcp"  },
+  { "ferrari-foam",    { NULL }, 3216,  "udp"  },
+  { "unite",           { NULL }, 3217,  "tcp"  },
+  { "unite",           { NULL }, 3217,  "udp"  },
+  { "smartpackets",    { NULL }, 3218,  "tcp"  },
+  { "smartpackets",    { NULL }, 3218,  "udp"  },
+  { "wms-messenger",   { NULL }, 3219,  "tcp"  },
+  { "wms-messenger",   { NULL }, 3219,  "udp"  },
+  { "xnm-ssl",         { NULL }, 3220,  "tcp"  },
+  { "xnm-ssl",         { NULL }, 3220,  "udp"  },
+  { "xnm-clear-text",  { NULL }, 3221,  "tcp"  },
+  { "xnm-clear-text",  { NULL }, 3221,  "udp"  },
+  { "glbp",            { NULL }, 3222,  "tcp"  },
+  { "glbp",            { NULL }, 3222,  "udp"  },
+  { "digivote",        { NULL }, 3223,  "tcp"  },
+  { "digivote",        { NULL }, 3223,  "udp"  },
+  { "aes-discovery",   { NULL }, 3224,  "tcp"  },
+  { "aes-discovery",   { NULL }, 3224,  "udp"  },
+  { "fcip-port",       { NULL }, 3225,  "tcp"  },
+  { "fcip-port",       { NULL }, 3225,  "udp"  },
+  { "isi-irp",         { NULL }, 3226,  "tcp"  },
+  { "isi-irp",         { NULL }, 3226,  "udp"  },
+  { "dwnmshttp",       { NULL }, 3227,  "tcp"  },
+  { "dwnmshttp",       { NULL }, 3227,  "udp"  },
+  { "dwmsgserver",     { NULL }, 3228,  "tcp"  },
+  { "dwmsgserver",     { NULL }, 3228,  "udp"  },
+  { "global-cd-port",  { NULL }, 3229,  "tcp"  },
+  { "global-cd-port",  { NULL }, 3229,  "udp"  },
+  { "sftdst-port",     { NULL }, 3230,  "tcp"  },
+  { "sftdst-port",     { NULL }, 3230,  "udp"  },
+  { "vidigo",          { NULL }, 3231,  "tcp"  },
+  { "vidigo",          { NULL }, 3231,  "udp"  },
+  { "mdtp",            { NULL }, 3232,  "tcp"  },
+  { "mdtp",            { NULL }, 3232,  "udp"  },
+  { "whisker",         { NULL }, 3233,  "tcp"  },
+  { "whisker",         { NULL }, 3233,  "udp"  },
+  { "alchemy",         { NULL }, 3234,  "tcp"  },
+  { "alchemy",         { NULL }, 3234,  "udp"  },
+  { "mdap-port",       { NULL }, 3235,  "tcp"  },
+  { "mdap-port",       { NULL }, 3235,  "udp"  },
+  { "apparenet-ts",    { NULL }, 3236,  "tcp"  },
+  { "apparenet-ts",    { NULL }, 3236,  "udp"  },
+  { "apparenet-tps",   { NULL }, 3237,  "tcp"  },
+  { "apparenet-tps",   { NULL }, 3237,  "udp"  },
+  { "apparenet-as",    { NULL }, 3238,  "tcp"  },
+  { "apparenet-as",    { NULL }, 3238,  "udp"  },
+  { "apparenet-ui",    { NULL }, 3239,  "tcp"  },
+  { "apparenet-ui",    { NULL }, 3239,  "udp"  },
+  { "triomotion",      { NULL }, 3240,  "tcp"  },
+  { "triomotion",      { NULL }, 3240,  "udp"  },
+  { "sysorb",          { NULL }, 3241,  "tcp"  },
+  { "sysorb",          { NULL }, 3241,  "udp"  },
+  { "sdp-id-port",     { NULL }, 3242,  "tcp"  },
+  { "sdp-id-port",     { NULL }, 3242,  "udp"  },
+  { "timelot",         { NULL }, 3243,  "tcp"  },
+  { "timelot",         { NULL }, 3243,  "udp"  },
+  { "onesaf",          { NULL }, 3244,  "tcp"  },
+  { "onesaf",          { NULL }, 3244,  "udp"  },
+  { "vieo-fe",         { NULL }, 3245,  "tcp"  },
+  { "vieo-fe",         { NULL }, 3245,  "udp"  },
+  { "dvt-system",      { NULL }, 3246,  "tcp"  },
+  { "dvt-system",      { NULL }, 3246,  "udp"  },
+  { "dvt-data",        { NULL }, 3247,  "tcp"  },
+  { "dvt-data",        { NULL }, 3247,  "udp"  },
+  { "procos-lm",       { NULL }, 3248,  "tcp"  },
+  { "procos-lm",       { NULL }, 3248,  "udp"  },
+  { "ssp",             { NULL }, 3249,  "tcp"  },
+  { "ssp",             { NULL }, 3249,  "udp"  },
+  { "hicp",            { NULL }, 3250,  "tcp"  },
+  { "hicp",            { NULL }, 3250,  "udp"  },
+  { "sysscanner",      { NULL }, 3251,  "tcp"  },
+  { "sysscanner",      { NULL }, 3251,  "udp"  },
+  { "dhe",             { NULL }, 3252,  "tcp"  },
+  { "dhe",             { NULL }, 3252,  "udp"  },
+  { "pda-data",        { NULL }, 3253,  "tcp"  },
+  { "pda-data",        { NULL }, 3253,  "udp"  },
+  { "pda-sys",         { NULL }, 3254,  "tcp"  },
+  { "pda-sys",         { NULL }, 3254,  "udp"  },
+  { "semaphore",       { NULL }, 3255,  "tcp"  },
+  { "semaphore",       { NULL }, 3255,  "udp"  },
+  { "cpqrpm-agent",    { NULL }, 3256,  "tcp"  },
+  { "cpqrpm-agent",    { NULL }, 3256,  "udp"  },
+  { "cpqrpm-server",   { NULL }, 3257,  "tcp"  },
+  { "cpqrpm-server",   { NULL }, 3257,  "udp"  },
+  { "ivecon-port",     { NULL }, 3258,  "tcp"  },
+  { "ivecon-port",     { NULL }, 3258,  "udp"  },
+  { "epncdp2",         { NULL }, 3259,  "tcp"  },
+  { "epncdp2",         { NULL }, 3259,  "udp"  },
+  { "iscsi-target",    { NULL }, 3260,  "tcp"  },
+  { "iscsi-target",    { NULL }, 3260,  "udp"  },
+  { "winshadow",       { NULL }, 3261,  "tcp"  },
+  { "winshadow",       { NULL }, 3261,  "udp"  },
+  { "necp",            { NULL }, 3262,  "tcp"  },
+  { "necp",            { NULL }, 3262,  "udp"  },
+  { "ecolor-imager",   { NULL }, 3263,  "tcp"  },
+  { "ecolor-imager",   { NULL }, 3263,  "udp"  },
+  { "ccmail",          { NULL }, 3264,  "tcp"  },
+  { "ccmail",          { NULL }, 3264,  "udp"  },
+  { "altav-tunnel",    { NULL }, 3265,  "tcp"  },
+  { "altav-tunnel",    { NULL }, 3265,  "udp"  },
+  { "ns-cfg-server",   { NULL }, 3266,  "tcp"  },
+  { "ns-cfg-server",   { NULL }, 3266,  "udp"  },
+  { "ibm-dial-out",    { NULL }, 3267,  "tcp"  },
+  { "ibm-dial-out",    { NULL }, 3267,  "udp"  },
+  { "msft-gc",         { NULL }, 3268,  "tcp"  },
+  { "msft-gc",         { NULL }, 3268,  "udp"  },
+  { "msft-gc-ssl",     { NULL }, 3269,  "tcp"  },
+  { "msft-gc-ssl",     { NULL }, 3269,  "udp"  },
+  { "verismart",       { NULL }, 3270,  "tcp"  },
+  { "verismart",       { NULL }, 3270,  "udp"  },
+  { "csoft-prev",      { NULL }, 3271,  "tcp"  },
+  { "csoft-prev",      { NULL }, 3271,  "udp"  },
+  { "user-manager",    { NULL }, 3272,  "tcp"  },
+  { "user-manager",    { NULL }, 3272,  "udp"  },
+  { "sxmp",            { NULL }, 3273,  "tcp"  },
+  { "sxmp",            { NULL }, 3273,  "udp"  },
+  { "ordinox-server",  { NULL }, 3274,  "tcp"  },
+  { "ordinox-server",  { NULL }, 3274,  "udp"  },
+  { "samd",            { NULL }, 3275,  "tcp"  },
+  { "samd",            { NULL }, 3275,  "udp"  },
+  { "maxim-asics",     { NULL }, 3276,  "tcp"  },
+  { "maxim-asics",     { NULL }, 3276,  "udp"  },
+  { "awg-proxy",       { NULL }, 3277,  "tcp"  },
+  { "awg-proxy",       { NULL }, 3277,  "udp"  },
+  { "lkcmserver",      { NULL }, 3278,  "tcp"  },
+  { "lkcmserver",      { NULL }, 3278,  "udp"  },
+  { "admind",          { NULL }, 3279,  "tcp"  },
+  { "admind",          { NULL }, 3279,  "udp"  },
+  { "vs-server",       { NULL }, 3280,  "tcp"  },
+  { "vs-server",       { NULL }, 3280,  "udp"  },
+  { "sysopt",          { NULL }, 3281,  "tcp"  },
+  { "sysopt",          { NULL }, 3281,  "udp"  },
+  { "datusorb",        { NULL }, 3282,  "tcp"  },
+  { "datusorb",        { NULL }, 3282,  "udp"  },
+  { "net-assistant",   { NULL }, 3283,  "tcp"  },
+  { "net-assistant",   { NULL }, 3283,  "udp"  },
+  { "4talk",           { NULL }, 3284,  "tcp"  },
+  { "4talk",           { NULL }, 3284,  "udp"  },
+  { "plato",           { NULL }, 3285,  "tcp"  },
+  { "plato",           { NULL }, 3285,  "udp"  },
+  { "e-net",           { NULL }, 3286,  "tcp"  },
+  { "e-net",           { NULL }, 3286,  "udp"  },
+  { "directvdata",     { NULL }, 3287,  "tcp"  },
+  { "directvdata",     { NULL }, 3287,  "udp"  },
+  { "cops",            { NULL }, 3288,  "tcp"  },
+  { "cops",            { NULL }, 3288,  "udp"  },
+  { "enpc",            { NULL }, 3289,  "tcp"  },
+  { "enpc",            { NULL }, 3289,  "udp"  },
+  { "caps-lm",         { NULL }, 3290,  "tcp"  },
+  { "caps-lm",         { NULL }, 3290,  "udp"  },
+  { "sah-lm",          { NULL }, 3291,  "tcp"  },
+  { "sah-lm",          { NULL }, 3291,  "udp"  },
+  { "cart-o-rama",     { NULL }, 3292,  "tcp"  },
+  { "cart-o-rama",     { NULL }, 3292,  "udp"  },
+  { "fg-fps",          { NULL }, 3293,  "tcp"  },
+  { "fg-fps",          { NULL }, 3293,  "udp"  },
+  { "fg-gip",          { NULL }, 3294,  "tcp"  },
+  { "fg-gip",          { NULL }, 3294,  "udp"  },
+  { "dyniplookup",     { NULL }, 3295,  "tcp"  },
+  { "dyniplookup",     { NULL }, 3295,  "udp"  },
+  { "rib-slm",         { NULL }, 3296,  "tcp"  },
+  { "rib-slm",         { NULL }, 3296,  "udp"  },
+  { "cytel-lm",        { NULL }, 3297,  "tcp"  },
+  { "cytel-lm",        { NULL }, 3297,  "udp"  },
+  { "deskview",        { NULL }, 3298,  "tcp"  },
+  { "deskview",        { NULL }, 3298,  "udp"  },
+  { "pdrncs",          { NULL }, 3299,  "tcp"  },
+  { "pdrncs",          { NULL }, 3299,  "udp"  },
+  { "mcs-fastmail",    { NULL }, 3302,  "tcp"  },
+  { "mcs-fastmail",    { NULL }, 3302,  "udp"  },
+  { "opsession-clnt",  { NULL }, 3303,  "tcp"  },
+  { "opsession-clnt",  { NULL }, 3303,  "udp"  },
+  { "opsession-srvr",  { NULL }, 3304,  "tcp"  },
+  { "opsession-srvr",  { NULL }, 3304,  "udp"  },
+  { "odette-ftp",      { NULL }, 3305,  "tcp"  },
+  { "odette-ftp",      { NULL }, 3305,  "udp"  },
+  { "mysql",           { NULL }, 3306,  "tcp"  },
+  { "mysql",           { NULL }, 3306,  "udp"  },
+  { "opsession-prxy",  { NULL }, 3307,  "tcp"  },
+  { "opsession-prxy",  { NULL }, 3307,  "udp"  },
+  { "tns-server",      { NULL }, 3308,  "tcp"  },
+  { "tns-server",      { NULL }, 3308,  "udp"  },
+  { "tns-adv",         { NULL }, 3309,  "tcp"  },
+  { "tns-adv",         { NULL }, 3309,  "udp"  },
+  { "dyna-access",     { NULL }, 3310,  "tcp"  },
+  { "dyna-access",     { NULL }, 3310,  "udp"  },
+  { "mcns-tel-ret",    { NULL }, 3311,  "tcp"  },
+  { "mcns-tel-ret",    { NULL }, 3311,  "udp"  },
+  { "appman-server",   { NULL }, 3312,  "tcp"  },
+  { "appman-server",   { NULL }, 3312,  "udp"  },
+  { "uorb",            { NULL }, 3313,  "tcp"  },
+  { "uorb",            { NULL }, 3313,  "udp"  },
+  { "uohost",          { NULL }, 3314,  "tcp"  },
+  { "uohost",          { NULL }, 3314,  "udp"  },
+  { "cdid",            { NULL }, 3315,  "tcp"  },
+  { "cdid",            { NULL }, 3315,  "udp"  },
+  { "aicc-cmi",        { NULL }, 3316,  "tcp"  },
+  { "aicc-cmi",        { NULL }, 3316,  "udp"  },
+  { "vsaiport",        { NULL }, 3317,  "tcp"  },
+  { "vsaiport",        { NULL }, 3317,  "udp"  },
+  { "ssrip",           { NULL }, 3318,  "tcp"  },
+  { "ssrip",           { NULL }, 3318,  "udp"  },
+  { "sdt-lmd",         { NULL }, 3319,  "tcp"  },
+  { "sdt-lmd",         { NULL }, 3319,  "udp"  },
+  { "officelink2000",  { NULL }, 3320,  "tcp"  },
+  { "officelink2000",  { NULL }, 3320,  "udp"  },
+  { "vnsstr",          { NULL }, 3321,  "tcp"  },
+  { "vnsstr",          { NULL }, 3321,  "udp"  },
+  { "sftu",            { NULL }, 3326,  "tcp"  },
+  { "sftu",            { NULL }, 3326,  "udp"  },
+  { "bbars",           { NULL }, 3327,  "tcp"  },
+  { "bbars",           { NULL }, 3327,  "udp"  },
+  { "egptlm",          { NULL }, 3328,  "tcp"  },
+  { "egptlm",          { NULL }, 3328,  "udp"  },
+  { "hp-device-disc",  { NULL }, 3329,  "tcp"  },
+  { "hp-device-disc",  { NULL }, 3329,  "udp"  },
+  { "mcs-calypsoicf",  { NULL }, 3330,  "tcp"  },
+  { "mcs-calypsoicf",  { NULL }, 3330,  "udp"  },
+  { "mcs-messaging",   { NULL }, 3331,  "tcp"  },
+  { "mcs-messaging",   { NULL }, 3331,  "udp"  },
+  { "mcs-mailsvr",     { NULL }, 3332,  "tcp"  },
+  { "mcs-mailsvr",     { NULL }, 3332,  "udp"  },
+  { "dec-notes",       { NULL }, 3333,  "tcp"  },
+  { "dec-notes",       { NULL }, 3333,  "udp"  },
+  { "directv-web",     { NULL }, 3334,  "tcp"  },
+  { "directv-web",     { NULL }, 3334,  "udp"  },
+  { "directv-soft",    { NULL }, 3335,  "tcp"  },
+  { "directv-soft",    { NULL }, 3335,  "udp"  },
+  { "directv-tick",    { NULL }, 3336,  "tcp"  },
+  { "directv-tick",    { NULL }, 3336,  "udp"  },
+  { "directv-catlg",   { NULL }, 3337,  "tcp"  },
+  { "directv-catlg",   { NULL }, 3337,  "udp"  },
+  { "anet-b",          { NULL }, 3338,  "tcp"  },
+  { "anet-b",          { NULL }, 3338,  "udp"  },
+  { "anet-l",          { NULL }, 3339,  "tcp"  },
+  { "anet-l",          { NULL }, 3339,  "udp"  },
+  { "anet-m",          { NULL }, 3340,  "tcp"  },
+  { "anet-m",          { NULL }, 3340,  "udp"  },
+  { "anet-h",          { NULL }, 3341,  "tcp"  },
+  { "anet-h",          { NULL }, 3341,  "udp"  },
+  { "webtie",          { NULL }, 3342,  "tcp"  },
+  { "webtie",          { NULL }, 3342,  "udp"  },
+  { "ms-cluster-net",  { NULL }, 3343,  "tcp"  },
+  { "ms-cluster-net",  { NULL }, 3343,  "udp"  },
+  { "bnt-manager",     { NULL }, 3344,  "tcp"  },
+  { "bnt-manager",     { NULL }, 3344,  "udp"  },
+  { "influence",       { NULL }, 3345,  "tcp"  },
+  { "influence",       { NULL }, 3345,  "udp"  },
+  { "trnsprntproxy",   { NULL }, 3346,  "tcp"  },
+  { "trnsprntproxy",   { NULL }, 3346,  "udp"  },
+  { "phoenix-rpc",     { NULL }, 3347,  "tcp"  },
+  { "phoenix-rpc",     { NULL }, 3347,  "udp"  },
+  { "pangolin-laser",  { NULL }, 3348,  "tcp"  },
+  { "pangolin-laser",  { NULL }, 3348,  "udp"  },
+  { "chevinservices",  { NULL }, 3349,  "tcp"  },
+  { "chevinservices",  { NULL }, 3349,  "udp"  },
+  { "findviatv",       { NULL }, 3350,  "tcp"  },
+  { "findviatv",       { NULL }, 3350,  "udp"  },
+  { "btrieve",         { NULL }, 3351,  "tcp"  },
+  { "btrieve",         { NULL }, 3351,  "udp"  },
+  { "ssql",            { NULL }, 3352,  "tcp"  },
+  { "ssql",            { NULL }, 3352,  "udp"  },
+  { "fatpipe",         { NULL }, 3353,  "tcp"  },
+  { "fatpipe",         { NULL }, 3353,  "udp"  },
+  { "suitjd",          { NULL }, 3354,  "tcp"  },
+  { "suitjd",          { NULL }, 3354,  "udp"  },
+  { "ordinox-dbase",   { NULL }, 3355,  "tcp"  },
+  { "ordinox-dbase",   { NULL }, 3355,  "udp"  },
+  { "upnotifyps",      { NULL }, 3356,  "tcp"  },
+  { "upnotifyps",      { NULL }, 3356,  "udp"  },
+  { "adtech-test",     { NULL }, 3357,  "tcp"  },
+  { "adtech-test",     { NULL }, 3357,  "udp"  },
+  { "mpsysrmsvr",      { NULL }, 3358,  "tcp"  },
+  { "mpsysrmsvr",      { NULL }, 3358,  "udp"  },
+  { "wg-netforce",     { NULL }, 3359,  "tcp"  },
+  { "wg-netforce",     { NULL }, 3359,  "udp"  },
+  { "kv-server",       { NULL }, 3360,  "tcp"  },
+  { "kv-server",       { NULL }, 3360,  "udp"  },
+  { "kv-agent",        { NULL }, 3361,  "tcp"  },
+  { "kv-agent",        { NULL }, 3361,  "udp"  },
+  { "dj-ilm",          { NULL }, 3362,  "tcp"  },
+  { "dj-ilm",          { NULL }, 3362,  "udp"  },
+  { "nati-vi-server",  { NULL }, 3363,  "tcp"  },
+  { "nati-vi-server",  { NULL }, 3363,  "udp"  },
+  { "creativeserver",  { NULL }, 3364,  "tcp"  },
+  { "creativeserver",  { NULL }, 3364,  "udp"  },
+  { "contentserver",   { NULL }, 3365,  "tcp"  },
+  { "contentserver",   { NULL }, 3365,  "udp"  },
+  { "creativepartnr",  { NULL }, 3366,  "tcp"  },
+  { "creativepartnr",  { NULL }, 3366,  "udp"  },
+  { "tip2",            { NULL }, 3372,  "tcp"  },
+  { "tip2",            { NULL }, 3372,  "udp"  },
+  { "lavenir-lm",      { NULL }, 3373,  "tcp"  },
+  { "lavenir-lm",      { NULL }, 3373,  "udp"  },
+  { "cluster-disc",    { NULL }, 3374,  "tcp"  },
+  { "cluster-disc",    { NULL }, 3374,  "udp"  },
+  { "vsnm-agent",      { NULL }, 3375,  "tcp"  },
+  { "vsnm-agent",      { NULL }, 3375,  "udp"  },
+  { "cdbroker",        { NULL }, 3376,  "tcp"  },
+  { "cdbroker",        { NULL }, 3376,  "udp"  },
+  { "cogsys-lm",       { NULL }, 3377,  "tcp"  },
+  { "cogsys-lm",       { NULL }, 3377,  "udp"  },
+  { "wsicopy",         { NULL }, 3378,  "tcp"  },
+  { "wsicopy",         { NULL }, 3378,  "udp"  },
+  { "socorfs",         { NULL }, 3379,  "tcp"  },
+  { "socorfs",         { NULL }, 3379,  "udp"  },
+  { "sns-channels",    { NULL }, 3380,  "tcp"  },
+  { "sns-channels",    { NULL }, 3380,  "udp"  },
+  { "geneous",         { NULL }, 3381,  "tcp"  },
+  { "geneous",         { NULL }, 3381,  "udp"  },
+  { "fujitsu-neat",    { NULL }, 3382,  "tcp"  },
+  { "fujitsu-neat",    { NULL }, 3382,  "udp"  },
+  { "esp-lm",          { NULL }, 3383,  "tcp"  },
+  { "esp-lm",          { NULL }, 3383,  "udp"  },
+  { "hp-clic",         { NULL }, 3384,  "tcp"  },
+  { "hp-clic",         { NULL }, 3384,  "udp"  },
+  { "qnxnetman",       { NULL }, 3385,  "tcp"  },
+  { "qnxnetman",       { NULL }, 3385,  "udp"  },
+  { "gprs-data",       { NULL }, 3386,  "tcp"  },
+  { "gprs-sig",        { NULL }, 3386,  "udp"  },
+  { "backroomnet",     { NULL }, 3387,  "tcp"  },
+  { "backroomnet",     { NULL }, 3387,  "udp"  },
+  { "cbserver",        { NULL }, 3388,  "tcp"  },
+  { "cbserver",        { NULL }, 3388,  "udp"  },
+  { "ms-wbt-server",   { NULL }, 3389,  "tcp"  },
+  { "ms-wbt-server",   { NULL }, 3389,  "udp"  },
+  { "dsc",             { NULL }, 3390,  "tcp"  },
+  { "dsc",             { NULL }, 3390,  "udp"  },
+  { "savant",          { NULL }, 3391,  "tcp"  },
+  { "savant",          { NULL }, 3391,  "udp"  },
+  { "efi-lm",          { NULL }, 3392,  "tcp"  },
+  { "efi-lm",          { NULL }, 3392,  "udp"  },
+  { "d2k-tapestry1",   { NULL }, 3393,  "tcp"  },
+  { "d2k-tapestry1",   { NULL }, 3393,  "udp"  },
+  { "d2k-tapestry2",   { NULL }, 3394,  "tcp"  },
+  { "d2k-tapestry2",   { NULL }, 3394,  "udp"  },
+  { "dyna-lm",         { NULL }, 3395,  "tcp"  },
+  { "dyna-lm",         { NULL }, 3395,  "udp"  },
+  { "printer_agent",   { NULL }, 3396,  "tcp"  },
+  { "printer_agent",   { NULL }, 3396,  "udp"  },
+  { "cloanto-lm",      { NULL }, 3397,  "tcp"  },
+  { "cloanto-lm",      { NULL }, 3397,  "udp"  },
+  { "mercantile",      { NULL }, 3398,  "tcp"  },
+  { "mercantile",      { NULL }, 3398,  "udp"  },
+  { "csms",            { NULL }, 3399,  "tcp"  },
+  { "csms",            { NULL }, 3399,  "udp"  },
+  { "csms2",           { NULL }, 3400,  "tcp"  },
+  { "csms2",           { NULL }, 3400,  "udp"  },
+  { "filecast",        { NULL }, 3401,  "tcp"  },
+  { "filecast",        { NULL }, 3401,  "udp"  },
+  { "fxaengine-net",   { NULL }, 3402,  "tcp"  },
+  { "fxaengine-net",   { NULL }, 3402,  "udp"  },
+  { "nokia-ann-ch1",   { NULL }, 3405,  "tcp"  },
+  { "nokia-ann-ch1",   { NULL }, 3405,  "udp"  },
+  { "nokia-ann-ch2",   { NULL }, 3406,  "tcp"  },
+  { "nokia-ann-ch2",   { NULL }, 3406,  "udp"  },
+  { "ldap-admin",      { NULL }, 3407,  "tcp"  },
+  { "ldap-admin",      { NULL }, 3407,  "udp"  },
+  { "BESApi",          { NULL }, 3408,  "tcp"  },
+  { "BESApi",          { NULL }, 3408,  "udp"  },
+  { "networklens",     { NULL }, 3409,  "tcp"  },
+  { "networklens",     { NULL }, 3409,  "udp"  },
+  { "networklenss",    { NULL }, 3410,  "tcp"  },
+  { "networklenss",    { NULL }, 3410,  "udp"  },
+  { "biolink-auth",    { NULL }, 3411,  "tcp"  },
+  { "biolink-auth",    { NULL }, 3411,  "udp"  },
+  { "xmlblaster",      { NULL }, 3412,  "tcp"  },
+  { "xmlblaster",      { NULL }, 3412,  "udp"  },
+  { "svnet",           { NULL }, 3413,  "tcp"  },
+  { "svnet",           { NULL }, 3413,  "udp"  },
+  { "wip-port",        { NULL }, 3414,  "tcp"  },
+  { "wip-port",        { NULL }, 3414,  "udp"  },
+  { "bcinameservice",  { NULL }, 3415,  "tcp"  },
+  { "bcinameservice",  { NULL }, 3415,  "udp"  },
+  { "commandport",     { NULL }, 3416,  "tcp"  },
+  { "commandport",     { NULL }, 3416,  "udp"  },
+  { "csvr",            { NULL }, 3417,  "tcp"  },
+  { "csvr",            { NULL }, 3417,  "udp"  },
+  { "rnmap",           { NULL }, 3418,  "tcp"  },
+  { "rnmap",           { NULL }, 3418,  "udp"  },
+  { "softaudit",       { NULL }, 3419,  "tcp"  },
+  { "softaudit",       { NULL }, 3419,  "udp"  },
+  { "ifcp-port",       { NULL }, 3420,  "tcp"  },
+  { "ifcp-port",       { NULL }, 3420,  "udp"  },
+  { "bmap",            { NULL }, 3421,  "tcp"  },
+  { "bmap",            { NULL }, 3421,  "udp"  },
+  { "rusb-sys-port",   { NULL }, 3422,  "tcp"  },
+  { "rusb-sys-port",   { NULL }, 3422,  "udp"  },
+  { "xtrm",            { NULL }, 3423,  "tcp"  },
+  { "xtrm",            { NULL }, 3423,  "udp"  },
+  { "xtrms",           { NULL }, 3424,  "tcp"  },
+  { "xtrms",           { NULL }, 3424,  "udp"  },
+  { "agps-port",       { NULL }, 3425,  "tcp"  },
+  { "agps-port",       { NULL }, 3425,  "udp"  },
+  { "arkivio",         { NULL }, 3426,  "tcp"  },
+  { "arkivio",         { NULL }, 3426,  "udp"  },
+  { "websphere-snmp",  { NULL }, 3427,  "tcp"  },
+  { "websphere-snmp",  { NULL }, 3427,  "udp"  },
+  { "twcss",           { NULL }, 3428,  "tcp"  },
+  { "twcss",           { NULL }, 3428,  "udp"  },
+  { "gcsp",            { NULL }, 3429,  "tcp"  },
+  { "gcsp",            { NULL }, 3429,  "udp"  },
+  { "ssdispatch",      { NULL }, 3430,  "tcp"  },
+  { "ssdispatch",      { NULL }, 3430,  "udp"  },
+  { "ndl-als",         { NULL }, 3431,  "tcp"  },
+  { "ndl-als",         { NULL }, 3431,  "udp"  },
+  { "osdcp",           { NULL }, 3432,  "tcp"  },
+  { "osdcp",           { NULL }, 3432,  "udp"  },
+  { "alta-smp",        { NULL }, 3433,  "tcp"  },
+  { "alta-smp",        { NULL }, 3433,  "udp"  },
+  { "opencm",          { NULL }, 3434,  "tcp"  },
+  { "opencm",          { NULL }, 3434,  "udp"  },
+  { "pacom",           { NULL }, 3435,  "tcp"  },
+  { "pacom",           { NULL }, 3435,  "udp"  },
+  { "gc-config",       { NULL }, 3436,  "tcp"  },
+  { "gc-config",       { NULL }, 3436,  "udp"  },
+  { "autocueds",       { NULL }, 3437,  "tcp"  },
+  { "autocueds",       { NULL }, 3437,  "udp"  },
+  { "spiral-admin",    { NULL }, 3438,  "tcp"  },
+  { "spiral-admin",    { NULL }, 3438,  "udp"  },
+  { "hri-port",        { NULL }, 3439,  "tcp"  },
+  { "hri-port",        { NULL }, 3439,  "udp"  },
+  { "ans-console",     { NULL }, 3440,  "tcp"  },
+  { "ans-console",     { NULL }, 3440,  "udp"  },
+  { "connect-client",  { NULL }, 3441,  "tcp"  },
+  { "connect-client",  { NULL }, 3441,  "udp"  },
+  { "connect-server",  { NULL }, 3442,  "tcp"  },
+  { "connect-server",  { NULL }, 3442,  "udp"  },
+  { "ov-nnm-websrv",   { NULL }, 3443,  "tcp"  },
+  { "ov-nnm-websrv",   { NULL }, 3443,  "udp"  },
+  { "denali-server",   { NULL }, 3444,  "tcp"  },
+  { "denali-server",   { NULL }, 3444,  "udp"  },
+  { "monp",            { NULL }, 3445,  "tcp"  },
+  { "monp",            { NULL }, 3445,  "udp"  },
+  { "3comfaxrpc",      { NULL }, 3446,  "tcp"  },
+  { "3comfaxrpc",      { NULL }, 3446,  "udp"  },
+  { "directnet",       { NULL }, 3447,  "tcp"  },
+  { "directnet",       { NULL }, 3447,  "udp"  },
+  { "dnc-port",        { NULL }, 3448,  "tcp"  },
+  { "dnc-port",        { NULL }, 3448,  "udp"  },
+  { "hotu-chat",       { NULL }, 3449,  "tcp"  },
+  { "hotu-chat",       { NULL }, 3449,  "udp"  },
+  { "castorproxy",     { NULL }, 3450,  "tcp"  },
+  { "castorproxy",     { NULL }, 3450,  "udp"  },
+  { "asam",            { NULL }, 3451,  "tcp"  },
+  { "asam",            { NULL }, 3451,  "udp"  },
+  { "sabp-signal",     { NULL }, 3452,  "tcp"  },
+  { "sabp-signal",     { NULL }, 3452,  "udp"  },
+  { "pscupd",          { NULL }, 3453,  "tcp"  },
+  { "pscupd",          { NULL }, 3453,  "udp"  },
+  { "mira",            { NULL }, 3454,  "tcp"  },
+  { "prsvp",           { NULL }, 3455,  "tcp"  },
+  { "prsvp",           { NULL }, 3455,  "udp"  },
+  { "vat",             { NULL }, 3456,  "tcp"  },
+  { "vat",             { NULL }, 3456,  "udp"  },
+  { "vat-control",     { NULL }, 3457,  "tcp"  },
+  { "vat-control",     { NULL }, 3457,  "udp"  },
+  { "d3winosfi",       { NULL }, 3458,  "tcp"  },
+  { "d3winosfi",       { NULL }, 3458,  "udp"  },
+  { "integral",        { NULL }, 3459,  "tcp"  },
+  { "integral",        { NULL }, 3459,  "udp"  },
+  { "edm-manager",     { NULL }, 3460,  "tcp"  },
+  { "edm-manager",     { NULL }, 3460,  "udp"  },
+  { "edm-stager",      { NULL }, 3461,  "tcp"  },
+  { "edm-stager",      { NULL }, 3461,  "udp"  },
+  { "edm-std-notify",  { NULL }, 3462,  "tcp"  },
+  { "edm-std-notify",  { NULL }, 3462,  "udp"  },
+  { "edm-adm-notify",  { NULL }, 3463,  "tcp"  },
+  { "edm-adm-notify",  { NULL }, 3463,  "udp"  },
+  { "edm-mgr-sync",    { NULL }, 3464,  "tcp"  },
+  { "edm-mgr-sync",    { NULL }, 3464,  "udp"  },
+  { "edm-mgr-cntrl",   { NULL }, 3465,  "tcp"  },
+  { "edm-mgr-cntrl",   { NULL }, 3465,  "udp"  },
+  { "workflow",        { NULL }, 3466,  "tcp"  },
+  { "workflow",        { NULL }, 3466,  "udp"  },
+  { "rcst",            { NULL }, 3467,  "tcp"  },
+  { "rcst",            { NULL }, 3467,  "udp"  },
+  { "ttcmremotectrl",  { NULL }, 3468,  "tcp"  },
+  { "ttcmremotectrl",  { NULL }, 3468,  "udp"  },
+  { "pluribus",        { NULL }, 3469,  "tcp"  },
+  { "pluribus",        { NULL }, 3469,  "udp"  },
+  { "jt400",           { NULL }, 3470,  "tcp"  },
+  { "jt400",           { NULL }, 3470,  "udp"  },
+  { "jt400-ssl",       { NULL }, 3471,  "tcp"  },
+  { "jt400-ssl",       { NULL }, 3471,  "udp"  },
+  { "jaugsremotec-1",  { NULL }, 3472,  "tcp"  },
+  { "jaugsremotec-1",  { NULL }, 3472,  "udp"  },
+  { "jaugsremotec-2",  { NULL }, 3473,  "tcp"  },
+  { "jaugsremotec-2",  { NULL }, 3473,  "udp"  },
+  { "ttntspauto",      { NULL }, 3474,  "tcp"  },
+  { "ttntspauto",      { NULL }, 3474,  "udp"  },
+  { "genisar-port",    { NULL }, 3475,  "tcp"  },
+  { "genisar-port",    { NULL }, 3475,  "udp"  },
+  { "nppmp",           { NULL }, 3476,  "tcp"  },
+  { "nppmp",           { NULL }, 3476,  "udp"  },
+  { "ecomm",           { NULL }, 3477,  "tcp"  },
+  { "ecomm",           { NULL }, 3477,  "udp"  },
+  { "stun",            { NULL }, 3478,  "tcp"  },
+  { "stun",            { NULL }, 3478,  "udp"  },
+  { "turn",            { NULL }, 3478,  "tcp"  },
+  { "turn",            { NULL }, 3478,  "udp"  },
+  { "stun-behavior",   { NULL }, 3478,  "tcp"  },
+  { "stun-behavior",   { NULL }, 3478,  "udp"  },
+  { "twrpc",           { NULL }, 3479,  "tcp"  },
+  { "twrpc",           { NULL }, 3479,  "udp"  },
+  { "plethora",        { NULL }, 3480,  "tcp"  },
+  { "plethora",        { NULL }, 3480,  "udp"  },
+  { "cleanerliverc",   { NULL }, 3481,  "tcp"  },
+  { "cleanerliverc",   { NULL }, 3481,  "udp"  },
+  { "vulture",         { NULL }, 3482,  "tcp"  },
+  { "vulture",         { NULL }, 3482,  "udp"  },
+  { "slim-devices",    { NULL }, 3483,  "tcp"  },
+  { "slim-devices",    { NULL }, 3483,  "udp"  },
+  { "gbs-stp",         { NULL }, 3484,  "tcp"  },
+  { "gbs-stp",         { NULL }, 3484,  "udp"  },
+  { "celatalk",        { NULL }, 3485,  "tcp"  },
+  { "celatalk",        { NULL }, 3485,  "udp"  },
+  { "ifsf-hb-port",    { NULL }, 3486,  "tcp"  },
+  { "ifsf-hb-port",    { NULL }, 3486,  "udp"  },
+  { "ltctcp",          { NULL }, 3487,  "tcp"  },
+  { "ltcudp",          { NULL }, 3487,  "udp"  },
+  { "fs-rh-srv",       { NULL }, 3488,  "tcp"  },
+  { "fs-rh-srv",       { NULL }, 3488,  "udp"  },
+  { "dtp-dia",         { NULL }, 3489,  "tcp"  },
+  { "dtp-dia",         { NULL }, 3489,  "udp"  },
+  { "colubris",        { NULL }, 3490,  "tcp"  },
+  { "colubris",        { NULL }, 3490,  "udp"  },
+  { "swr-port",        { NULL }, 3491,  "tcp"  },
+  { "swr-port",        { NULL }, 3491,  "udp"  },
+  { "tvdumtray-port",  { NULL }, 3492,  "tcp"  },
+  { "tvdumtray-port",  { NULL }, 3492,  "udp"  },
+  { "nut",             { NULL }, 3493,  "tcp"  },
+  { "nut",             { NULL }, 3493,  "udp"  },
+  { "ibm3494",         { NULL }, 3494,  "tcp"  },
+  { "ibm3494",         { NULL }, 3494,  "udp"  },
+  { "seclayer-tcp",    { NULL }, 3495,  "tcp"  },
+  { "seclayer-tcp",    { NULL }, 3495,  "udp"  },
+  { "seclayer-tls",    { NULL }, 3496,  "tcp"  },
+  { "seclayer-tls",    { NULL }, 3496,  "udp"  },
+  { "ipether232port",  { NULL }, 3497,  "tcp"  },
+  { "ipether232port",  { NULL }, 3497,  "udp"  },
+  { "dashpas-port",    { NULL }, 3498,  "tcp"  },
+  { "dashpas-port",    { NULL }, 3498,  "udp"  },
+  { "sccip-media",     { NULL }, 3499,  "tcp"  },
+  { "sccip-media",     { NULL }, 3499,  "udp"  },
+  { "rtmp-port",       { NULL }, 3500,  "tcp"  },
+  { "rtmp-port",       { NULL }, 3500,  "udp"  },
+  { "isoft-p2p",       { NULL }, 3501,  "tcp"  },
+  { "isoft-p2p",       { NULL }, 3501,  "udp"  },
+  { "avinstalldisc",   { NULL }, 3502,  "tcp"  },
+  { "avinstalldisc",   { NULL }, 3502,  "udp"  },
+  { "lsp-ping",        { NULL }, 3503,  "tcp"  },
+  { "lsp-ping",        { NULL }, 3503,  "udp"  },
+  { "ironstorm",       { NULL }, 3504,  "tcp"  },
+  { "ironstorm",       { NULL }, 3504,  "udp"  },
+  { "ccmcomm",         { NULL }, 3505,  "tcp"  },
+  { "ccmcomm",         { NULL }, 3505,  "udp"  },
+  { "apc-3506",        { NULL }, 3506,  "tcp"  },
+  { "apc-3506",        { NULL }, 3506,  "udp"  },
+  { "nesh-broker",     { NULL }, 3507,  "tcp"  },
+  { "nesh-broker",     { NULL }, 3507,  "udp"  },
+  { "interactionweb",  { NULL }, 3508,  "tcp"  },
+  { "interactionweb",  { NULL }, 3508,  "udp"  },
+  { "vt-ssl",          { NULL }, 3509,  "tcp"  },
+  { "vt-ssl",          { NULL }, 3509,  "udp"  },
+  { "xss-port",        { NULL }, 3510,  "tcp"  },
+  { "xss-port",        { NULL }, 3510,  "udp"  },
+  { "webmail-2",       { NULL }, 3511,  "tcp"  },
+  { "webmail-2",       { NULL }, 3511,  "udp"  },
+  { "aztec",           { NULL }, 3512,  "tcp"  },
+  { "aztec",           { NULL }, 3512,  "udp"  },
+  { "arcpd",           { NULL }, 3513,  "tcp"  },
+  { "arcpd",           { NULL }, 3513,  "udp"  },
+  { "must-p2p",        { NULL }, 3514,  "tcp"  },
+  { "must-p2p",        { NULL }, 3514,  "udp"  },
+  { "must-backplane",  { NULL }, 3515,  "tcp"  },
+  { "must-backplane",  { NULL }, 3515,  "udp"  },
+  { "smartcard-port",  { NULL }, 3516,  "tcp"  },
+  { "smartcard-port",  { NULL }, 3516,  "udp"  },
+  { "802-11-iapp",     { NULL }, 3517,  "tcp"  },
+  { "802-11-iapp",     { NULL }, 3517,  "udp"  },
+  { "artifact-msg",    { NULL }, 3518,  "tcp"  },
+  { "artifact-msg",    { NULL }, 3518,  "udp"  },
+  { "nvmsgd",          { NULL }, 3519,  "tcp"  },
+  { "galileo",         { NULL }, 3519,  "udp"  },
+  { "galileolog",      { NULL }, 3520,  "tcp"  },
+  { "galileolog",      { NULL }, 3520,  "udp"  },
+  { "mc3ss",           { NULL }, 3521,  "tcp"  },
+  { "mc3ss",           { NULL }, 3521,  "udp"  },
+  { "nssocketport",    { NULL }, 3522,  "tcp"  },
+  { "nssocketport",    { NULL }, 3522,  "udp"  },
+  { "odeumservlink",   { NULL }, 3523,  "tcp"  },
+  { "odeumservlink",   { NULL }, 3523,  "udp"  },
+  { "ecmport",         { NULL }, 3524,  "tcp"  },
+  { "ecmport",         { NULL }, 3524,  "udp"  },
+  { "eisport",         { NULL }, 3525,  "tcp"  },
+  { "eisport",         { NULL }, 3525,  "udp"  },
+  { "starquiz-port",   { NULL }, 3526,  "tcp"  },
+  { "starquiz-port",   { NULL }, 3526,  "udp"  },
+  { "beserver-msg-q",  { NULL }, 3527,  "tcp"  },
+  { "beserver-msg-q",  { NULL }, 3527,  "udp"  },
+  { "jboss-iiop",      { NULL }, 3528,  "tcp"  },
+  { "jboss-iiop",      { NULL }, 3528,  "udp"  },
+  { "jboss-iiop-ssl",  { NULL }, 3529,  "tcp"  },
+  { "jboss-iiop-ssl",  { NULL }, 3529,  "udp"  },
+  { "gf",              { NULL }, 3530,  "tcp"  },
+  { "gf",              { NULL }, 3530,  "udp"  },
+  { "joltid",          { NULL }, 3531,  "tcp"  },
+  { "joltid",          { NULL }, 3531,  "udp"  },
+  { "raven-rmp",       { NULL }, 3532,  "tcp"  },
+  { "raven-rmp",       { NULL }, 3532,  "udp"  },
+  { "raven-rdp",       { NULL }, 3533,  "tcp"  },
+  { "raven-rdp",       { NULL }, 3533,  "udp"  },
+  { "urld-port",       { NULL }, 3534,  "tcp"  },
+  { "urld-port",       { NULL }, 3534,  "udp"  },
+  { "ms-la",           { NULL }, 3535,  "tcp"  },
+  { "ms-la",           { NULL }, 3535,  "udp"  },
+  { "snac",            { NULL }, 3536,  "tcp"  },
+  { "snac",            { NULL }, 3536,  "udp"  },
+  { "ni-visa-remote",  { NULL }, 3537,  "tcp"  },
+  { "ni-visa-remote",  { NULL }, 3537,  "udp"  },
+  { "ibm-diradm",      { NULL }, 3538,  "tcp"  },
+  { "ibm-diradm",      { NULL }, 3538,  "udp"  },
+  { "ibm-diradm-ssl",  { NULL }, 3539,  "tcp"  },
+  { "ibm-diradm-ssl",  { NULL }, 3539,  "udp"  },
+  { "pnrp-port",       { NULL }, 3540,  "tcp"  },
+  { "pnrp-port",       { NULL }, 3540,  "udp"  },
+  { "voispeed-port",   { NULL }, 3541,  "tcp"  },
+  { "voispeed-port",   { NULL }, 3541,  "udp"  },
+  { "hacl-monitor",    { NULL }, 3542,  "tcp"  },
+  { "hacl-monitor",    { NULL }, 3542,  "udp"  },
+  { "qftest-lookup",   { NULL }, 3543,  "tcp"  },
+  { "qftest-lookup",   { NULL }, 3543,  "udp"  },
+  { "teredo",          { NULL }, 3544,  "tcp"  },
+  { "teredo",          { NULL }, 3544,  "udp"  },
+  { "camac",           { NULL }, 3545,  "tcp"  },
+  { "camac",           { NULL }, 3545,  "udp"  },
+  { "symantec-sim",    { NULL }, 3547,  "tcp"  },
+  { "symantec-sim",    { NULL }, 3547,  "udp"  },
+  { "interworld",      { NULL }, 3548,  "tcp"  },
+  { "interworld",      { NULL }, 3548,  "udp"  },
+  { "tellumat-nms",    { NULL }, 3549,  "tcp"  },
+  { "tellumat-nms",    { NULL }, 3549,  "udp"  },
+  { "ssmpp",           { NULL }, 3550,  "tcp"  },
+  { "ssmpp",           { NULL }, 3550,  "udp"  },
+  { "apcupsd",         { NULL }, 3551,  "tcp"  },
+  { "apcupsd",         { NULL }, 3551,  "udp"  },
+  { "taserver",        { NULL }, 3552,  "tcp"  },
+  { "taserver",        { NULL }, 3552,  "udp"  },
+  { "rbr-discovery",   { NULL }, 3553,  "tcp"  },
+  { "rbr-discovery",   { NULL }, 3553,  "udp"  },
+  { "questnotify",     { NULL }, 3554,  "tcp"  },
+  { "questnotify",     { NULL }, 3554,  "udp"  },
+  { "razor",           { NULL }, 3555,  "tcp"  },
+  { "razor",           { NULL }, 3555,  "udp"  },
+  { "sky-transport",   { NULL }, 3556,  "tcp"  },
+  { "sky-transport",   { NULL }, 3556,  "udp"  },
+  { "personalos-001",  { NULL }, 3557,  "tcp"  },
+  { "personalos-001",  { NULL }, 3557,  "udp"  },
+  { "mcp-port",        { NULL }, 3558,  "tcp"  },
+  { "mcp-port",        { NULL }, 3558,  "udp"  },
+  { "cctv-port",       { NULL }, 3559,  "tcp"  },
+  { "cctv-port",       { NULL }, 3559,  "udp"  },
+  { "iniserve-port",   { NULL }, 3560,  "tcp"  },
+  { "iniserve-port",   { NULL }, 3560,  "udp"  },
+  { "bmc-onekey",      { NULL }, 3561,  "tcp"  },
+  { "bmc-onekey",      { NULL }, 3561,  "udp"  },
+  { "sdbproxy",        { NULL }, 3562,  "tcp"  },
+  { "sdbproxy",        { NULL }, 3562,  "udp"  },
+  { "watcomdebug",     { NULL }, 3563,  "tcp"  },
+  { "watcomdebug",     { NULL }, 3563,  "udp"  },
+  { "esimport",        { NULL }, 3564,  "tcp"  },
+  { "esimport",        { NULL }, 3564,  "udp"  },
+  { "m2pa",            { NULL }, 3565,  "tcp"  },
+  { "m2pa",            { NULL }, 3565,  "sctp" },
+  { "quest-data-hub",  { NULL }, 3566,  "tcp"  },
+  { "oap",             { NULL }, 3567,  "tcp"  },
+  { "oap",             { NULL }, 3567,  "udp"  },
+  { "oap-s",           { NULL }, 3568,  "tcp"  },
+  { "oap-s",           { NULL }, 3568,  "udp"  },
+  { "mbg-ctrl",        { NULL }, 3569,  "tcp"  },
+  { "mbg-ctrl",        { NULL }, 3569,  "udp"  },
+  { "mccwebsvr-port",  { NULL }, 3570,  "tcp"  },
+  { "mccwebsvr-port",  { NULL }, 3570,  "udp"  },
+  { "megardsvr-port",  { NULL }, 3571,  "tcp"  },
+  { "megardsvr-port",  { NULL }, 3571,  "udp"  },
+  { "megaregsvrport",  { NULL }, 3572,  "tcp"  },
+  { "megaregsvrport",  { NULL }, 3572,  "udp"  },
+  { "tag-ups-1",       { NULL }, 3573,  "tcp"  },
+  { "tag-ups-1",       { NULL }, 3573,  "udp"  },
+  { "dmaf-server",     { NULL }, 3574,  "tcp"  },
+  { "dmaf-caster",     { NULL }, 3574,  "udp"  },
+  { "ccm-port",        { NULL }, 3575,  "tcp"  },
+  { "ccm-port",        { NULL }, 3575,  "udp"  },
+  { "cmc-port",        { NULL }, 3576,  "tcp"  },
+  { "cmc-port",        { NULL }, 3576,  "udp"  },
+  { "config-port",     { NULL }, 3577,  "tcp"  },
+  { "config-port",     { NULL }, 3577,  "udp"  },
+  { "data-port",       { NULL }, 3578,  "tcp"  },
+  { "data-port",       { NULL }, 3578,  "udp"  },
+  { "ttat3lb",         { NULL }, 3579,  "tcp"  },
+  { "ttat3lb",         { NULL }, 3579,  "udp"  },
+  { "nati-svrloc",     { NULL }, 3580,  "tcp"  },
+  { "nati-svrloc",     { NULL }, 3580,  "udp"  },
+  { "kfxaclicensing",  { NULL }, 3581,  "tcp"  },
+  { "kfxaclicensing",  { NULL }, 3581,  "udp"  },
+  { "press",           { NULL }, 3582,  "tcp"  },
+  { "press",           { NULL }, 3582,  "udp"  },
+  { "canex-watch",     { NULL }, 3583,  "tcp"  },
+  { "canex-watch",     { NULL }, 3583,  "udp"  },
+  { "u-dbap",          { NULL }, 3584,  "tcp"  },
+  { "u-dbap",          { NULL }, 3584,  "udp"  },
+  { "emprise-lls",     { NULL }, 3585,  "tcp"  },
+  { "emprise-lls",     { NULL }, 3585,  "udp"  },
+  { "emprise-lsc",     { NULL }, 3586,  "tcp"  },
+  { "emprise-lsc",     { NULL }, 3586,  "udp"  },
+  { "p2pgroup",        { NULL }, 3587,  "tcp"  },
+  { "p2pgroup",        { NULL }, 3587,  "udp"  },
+  { "sentinel",        { NULL }, 3588,  "tcp"  },
+  { "sentinel",        { NULL }, 3588,  "udp"  },
+  { "isomair",         { NULL }, 3589,  "tcp"  },
+  { "isomair",         { NULL }, 3589,  "udp"  },
+  { "wv-csp-sms",      { NULL }, 3590,  "tcp"  },
+  { "wv-csp-sms",      { NULL }, 3590,  "udp"  },
+  { "gtrack-server",   { NULL }, 3591,  "tcp"  },
+  { "gtrack-server",   { NULL }, 3591,  "udp"  },
+  { "gtrack-ne",       { NULL }, 3592,  "tcp"  },
+  { "gtrack-ne",       { NULL }, 3592,  "udp"  },
+  { "bpmd",            { NULL }, 3593,  "tcp"  },
+  { "bpmd",            { NULL }, 3593,  "udp"  },
+  { "mediaspace",      { NULL }, 3594,  "tcp"  },
+  { "mediaspace",      { NULL }, 3594,  "udp"  },
+  { "shareapp",        { NULL }, 3595,  "tcp"  },
+  { "shareapp",        { NULL }, 3595,  "udp"  },
+  { "iw-mmogame",      { NULL }, 3596,  "tcp"  },
+  { "iw-mmogame",      { NULL }, 3596,  "udp"  },
+  { "a14",             { NULL }, 3597,  "tcp"  },
+  { "a14",             { NULL }, 3597,  "udp"  },
+  { "a15",             { NULL }, 3598,  "tcp"  },
+  { "a15",             { NULL }, 3598,  "udp"  },
+  { "quasar-server",   { NULL }, 3599,  "tcp"  },
+  { "quasar-server",   { NULL }, 3599,  "udp"  },
+  { "trap-daemon",     { NULL }, 3600,  "tcp"  },
+  { "trap-daemon",     { NULL }, 3600,  "udp"  },
+  { "visinet-gui",     { NULL }, 3601,  "tcp"  },
+  { "visinet-gui",     { NULL }, 3601,  "udp"  },
+  { "infiniswitchcl",  { NULL }, 3602,  "tcp"  },
+  { "infiniswitchcl",  { NULL }, 3602,  "udp"  },
+  { "int-rcv-cntrl",   { NULL }, 3603,  "tcp"  },
+  { "int-rcv-cntrl",   { NULL }, 3603,  "udp"  },
+  { "bmc-jmx-port",    { NULL }, 3604,  "tcp"  },
+  { "bmc-jmx-port",    { NULL }, 3604,  "udp"  },
+  { "comcam-io",       { NULL }, 3605,  "tcp"  },
+  { "comcam-io",       { NULL }, 3605,  "udp"  },
+  { "splitlock",       { NULL }, 3606,  "tcp"  },
+  { "splitlock",       { NULL }, 3606,  "udp"  },
+  { "precise-i3",      { NULL }, 3607,  "tcp"  },
+  { "precise-i3",      { NULL }, 3607,  "udp"  },
+  { "trendchip-dcp",   { NULL }, 3608,  "tcp"  },
+  { "trendchip-dcp",   { NULL }, 3608,  "udp"  },
+  { "cpdi-pidas-cm",   { NULL }, 3609,  "tcp"  },
+  { "cpdi-pidas-cm",   { NULL }, 3609,  "udp"  },
+  { "echonet",         { NULL }, 3610,  "tcp"  },
+  { "echonet",         { NULL }, 3610,  "udp"  },
+  { "six-degrees",     { NULL }, 3611,  "tcp"  },
+  { "six-degrees",     { NULL }, 3611,  "udp"  },
+  { "hp-dataprotect",  { NULL }, 3612,  "tcp"  },
+  { "hp-dataprotect",  { NULL }, 3612,  "udp"  },
+  { "alaris-disc",     { NULL }, 3613,  "tcp"  },
+  { "alaris-disc",     { NULL }, 3613,  "udp"  },
+  { "sigma-port",      { NULL }, 3614,  "tcp"  },
+  { "sigma-port",      { NULL }, 3614,  "udp"  },
+  { "start-network",   { NULL }, 3615,  "tcp"  },
+  { "start-network",   { NULL }, 3615,  "udp"  },
+  { "cd3o-protocol",   { NULL }, 3616,  "tcp"  },
+  { "cd3o-protocol",   { NULL }, 3616,  "udp"  },
+  { "sharp-server",    { NULL }, 3617,  "tcp"  },
+  { "sharp-server",    { NULL }, 3617,  "udp"  },
+  { "aairnet-1",       { NULL }, 3618,  "tcp"  },
+  { "aairnet-1",       { NULL }, 3618,  "udp"  },
+  { "aairnet-2",       { NULL }, 3619,  "tcp"  },
+  { "aairnet-2",       { NULL }, 3619,  "udp"  },
+  { "ep-pcp",          { NULL }, 3620,  "tcp"  },
+  { "ep-pcp",          { NULL }, 3620,  "udp"  },
+  { "ep-nsp",          { NULL }, 3621,  "tcp"  },
+  { "ep-nsp",          { NULL }, 3621,  "udp"  },
+  { "ff-lr-port",      { NULL }, 3622,  "tcp"  },
+  { "ff-lr-port",      { NULL }, 3622,  "udp"  },
+  { "haipe-discover",  { NULL }, 3623,  "tcp"  },
+  { "haipe-discover",  { NULL }, 3623,  "udp"  },
+  { "dist-upgrade",    { NULL }, 3624,  "tcp"  },
+  { "dist-upgrade",    { NULL }, 3624,  "udp"  },
+  { "volley",          { NULL }, 3625,  "tcp"  },
+  { "volley",          { NULL }, 3625,  "udp"  },
+  { "bvcdaemon-port",  { NULL }, 3626,  "tcp"  },
+  { "bvcdaemon-port",  { NULL }, 3626,  "udp"  },
+  { "jamserverport",   { NULL }, 3627,  "tcp"  },
+  { "jamserverport",   { NULL }, 3627,  "udp"  },
+  { "ept-machine",     { NULL }, 3628,  "tcp"  },
+  { "ept-machine",     { NULL }, 3628,  "udp"  },
+  { "escvpnet",        { NULL }, 3629,  "tcp"  },
+  { "escvpnet",        { NULL }, 3629,  "udp"  },
+  { "cs-remote-db",    { NULL }, 3630,  "tcp"  },
+  { "cs-remote-db",    { NULL }, 3630,  "udp"  },
+  { "cs-services",     { NULL }, 3631,  "tcp"  },
+  { "cs-services",     { NULL }, 3631,  "udp"  },
+  { "distcc",          { NULL }, 3632,  "tcp"  },
+  { "distcc",          { NULL }, 3632,  "udp"  },
+  { "wacp",            { NULL }, 3633,  "tcp"  },
+  { "wacp",            { NULL }, 3633,  "udp"  },
+  { "hlibmgr",         { NULL }, 3634,  "tcp"  },
+  { "hlibmgr",         { NULL }, 3634,  "udp"  },
+  { "sdo",             { NULL }, 3635,  "tcp"  },
+  { "sdo",             { NULL }, 3635,  "udp"  },
+  { "servistaitsm",    { NULL }, 3636,  "tcp"  },
+  { "servistaitsm",    { NULL }, 3636,  "udp"  },
+  { "scservp",         { NULL }, 3637,  "tcp"  },
+  { "scservp",         { NULL }, 3637,  "udp"  },
+  { "ehp-backup",      { NULL }, 3638,  "tcp"  },
+  { "ehp-backup",      { NULL }, 3638,  "udp"  },
+  { "xap-ha",          { NULL }, 3639,  "tcp"  },
+  { "xap-ha",          { NULL }, 3639,  "udp"  },
+  { "netplay-port1",   { NULL }, 3640,  "tcp"  },
+  { "netplay-port1",   { NULL }, 3640,  "udp"  },
+  { "netplay-port2",   { NULL }, 3641,  "tcp"  },
+  { "netplay-port2",   { NULL }, 3641,  "udp"  },
+  { "juxml-port",      { NULL }, 3642,  "tcp"  },
+  { "juxml-port",      { NULL }, 3642,  "udp"  },
+  { "audiojuggler",    { NULL }, 3643,  "tcp"  },
+  { "audiojuggler",    { NULL }, 3643,  "udp"  },
+  { "ssowatch",        { NULL }, 3644,  "tcp"  },
+  { "ssowatch",        { NULL }, 3644,  "udp"  },
+  { "cyc",             { NULL }, 3645,  "tcp"  },
+  { "cyc",             { NULL }, 3645,  "udp"  },
+  { "xss-srv-port",    { NULL }, 3646,  "tcp"  },
+  { "xss-srv-port",    { NULL }, 3646,  "udp"  },
+  { "splitlock-gw",    { NULL }, 3647,  "tcp"  },
+  { "splitlock-gw",    { NULL }, 3647,  "udp"  },
+  { "fjcp",            { NULL }, 3648,  "tcp"  },
+  { "fjcp",            { NULL }, 3648,  "udp"  },
+  { "nmmp",            { NULL }, 3649,  "tcp"  },
+  { "nmmp",            { NULL }, 3649,  "udp"  },
+  { "prismiq-plugin",  { NULL }, 3650,  "tcp"  },
+  { "prismiq-plugin",  { NULL }, 3650,  "udp"  },
+  { "xrpc-registry",   { NULL }, 3651,  "tcp"  },
+  { "xrpc-registry",   { NULL }, 3651,  "udp"  },
+  { "vxcrnbuport",     { NULL }, 3652,  "tcp"  },
+  { "vxcrnbuport",     { NULL }, 3652,  "udp"  },
+  { "tsp",             { NULL }, 3653,  "tcp"  },
+  { "tsp",             { NULL }, 3653,  "udp"  },
+  { "vaprtm",          { NULL }, 3654,  "tcp"  },
+  { "vaprtm",          { NULL }, 3654,  "udp"  },
+  { "abatemgr",        { NULL }, 3655,  "tcp"  },
+  { "abatemgr",        { NULL }, 3655,  "udp"  },
+  { "abatjss",         { NULL }, 3656,  "tcp"  },
+  { "abatjss",         { NULL }, 3656,  "udp"  },
+  { "immedianet-bcn",  { NULL }, 3657,  "tcp"  },
+  { "immedianet-bcn",  { NULL }, 3657,  "udp"  },
+  { "ps-ams",          { NULL }, 3658,  "tcp"  },
+  { "ps-ams",          { NULL }, 3658,  "udp"  },
+  { "apple-sasl",      { NULL }, 3659,  "tcp"  },
+  { "apple-sasl",      { NULL }, 3659,  "udp"  },
+  { "can-nds-ssl",     { NULL }, 3660,  "tcp"  },
+  { "can-nds-ssl",     { NULL }, 3660,  "udp"  },
+  { "can-ferret-ssl",  { NULL }, 3661,  "tcp"  },
+  { "can-ferret-ssl",  { NULL }, 3661,  "udp"  },
+  { "pserver",         { NULL }, 3662,  "tcp"  },
+  { "pserver",         { NULL }, 3662,  "udp"  },
+  { "dtp",             { NULL }, 3663,  "tcp"  },
+  { "dtp",             { NULL }, 3663,  "udp"  },
+  { "ups-engine",      { NULL }, 3664,  "tcp"  },
+  { "ups-engine",      { NULL }, 3664,  "udp"  },
+  { "ent-engine",      { NULL }, 3665,  "tcp"  },
+  { "ent-engine",      { NULL }, 3665,  "udp"  },
+  { "eserver-pap",     { NULL }, 3666,  "tcp"  },
+  { "eserver-pap",     { NULL }, 3666,  "udp"  },
+  { "infoexch",        { NULL }, 3667,  "tcp"  },
+  { "infoexch",        { NULL }, 3667,  "udp"  },
+  { "dell-rm-port",    { NULL }, 3668,  "tcp"  },
+  { "dell-rm-port",    { NULL }, 3668,  "udp"  },
+  { "casanswmgmt",     { NULL }, 3669,  "tcp"  },
+  { "casanswmgmt",     { NULL }, 3669,  "udp"  },
+  { "smile",           { NULL }, 3670,  "tcp"  },
+  { "smile",           { NULL }, 3670,  "udp"  },
+  { "efcp",            { NULL }, 3671,  "tcp"  },
+  { "efcp",            { NULL }, 3671,  "udp"  },
+  { "lispworks-orb",   { NULL }, 3672,  "tcp"  },
+  { "lispworks-orb",   { NULL }, 3672,  "udp"  },
+  { "mediavault-gui",  { NULL }, 3673,  "tcp"  },
+  { "mediavault-gui",  { NULL }, 3673,  "udp"  },
+  { "wininstall-ipc",  { NULL }, 3674,  "tcp"  },
+  { "wininstall-ipc",  { NULL }, 3674,  "udp"  },
+  { "calltrax",        { NULL }, 3675,  "tcp"  },
+  { "calltrax",        { NULL }, 3675,  "udp"  },
+  { "va-pacbase",      { NULL }, 3676,  "tcp"  },
+  { "va-pacbase",      { NULL }, 3676,  "udp"  },
+  { "roverlog",        { NULL }, 3677,  "tcp"  },
+  { "roverlog",        { NULL }, 3677,  "udp"  },
+  { "ipr-dglt",        { NULL }, 3678,  "tcp"  },
+  { "ipr-dglt",        { NULL }, 3678,  "udp"  },
+  { "newton-dock",     { NULL }, 3679,  "tcp"  },
+  { "newton-dock",     { NULL }, 3679,  "udp"  },
+  { "npds-tracker",    { NULL }, 3680,  "tcp"  },
+  { "npds-tracker",    { NULL }, 3680,  "udp"  },
+  { "bts-x73",         { NULL }, 3681,  "tcp"  },
+  { "bts-x73",         { NULL }, 3681,  "udp"  },
+  { "cas-mapi",        { NULL }, 3682,  "tcp"  },
+  { "cas-mapi",        { NULL }, 3682,  "udp"  },
+  { "bmc-ea",          { NULL }, 3683,  "tcp"  },
+  { "bmc-ea",          { NULL }, 3683,  "udp"  },
+  { "faxstfx-port",    { NULL }, 3684,  "tcp"  },
+  { "faxstfx-port",    { NULL }, 3684,  "udp"  },
+  { "dsx-agent",       { NULL }, 3685,  "tcp"  },
+  { "dsx-agent",       { NULL }, 3685,  "udp"  },
+  { "tnmpv2",          { NULL }, 3686,  "tcp"  },
+  { "tnmpv2",          { NULL }, 3686,  "udp"  },
+  { "simple-push",     { NULL }, 3687,  "tcp"  },
+  { "simple-push",     { NULL }, 3687,  "udp"  },
+  { "simple-push-s",   { NULL }, 3688,  "tcp"  },
+  { "simple-push-s",   { NULL }, 3688,  "udp"  },
+  { "daap",            { NULL }, 3689,  "tcp"  },
+  { "daap",            { NULL }, 3689,  "udp"  },
+  { "svn",             { NULL }, 3690,  "tcp"  },
+  { "svn",             { NULL }, 3690,  "udp"  },
+  { "magaya-network",  { NULL }, 3691,  "tcp"  },
+  { "magaya-network",  { NULL }, 3691,  "udp"  },
+  { "intelsync",       { NULL }, 3692,  "tcp"  },
+  { "intelsync",       { NULL }, 3692,  "udp"  },
+  { "bmc-data-coll",   { NULL }, 3695,  "tcp"  },
+  { "bmc-data-coll",   { NULL }, 3695,  "udp"  },
+  { "telnetcpcd",      { NULL }, 3696,  "tcp"  },
+  { "telnetcpcd",      { NULL }, 3696,  "udp"  },
+  { "nw-license",      { NULL }, 3697,  "tcp"  },
+  { "nw-license",      { NULL }, 3697,  "udp"  },
+  { "sagectlpanel",    { NULL }, 3698,  "tcp"  },
+  { "sagectlpanel",    { NULL }, 3698,  "udp"  },
+  { "kpn-icw",         { NULL }, 3699,  "tcp"  },
+  { "kpn-icw",         { NULL }, 3699,  "udp"  },
+  { "lrs-paging",      { NULL }, 3700,  "tcp"  },
+  { "lrs-paging",      { NULL }, 3700,  "udp"  },
+  { "netcelera",       { NULL }, 3701,  "tcp"  },
+  { "netcelera",       { NULL }, 3701,  "udp"  },
+  { "ws-discovery",    { NULL }, 3702,  "tcp"  },
+  { "ws-discovery",    { NULL }, 3702,  "udp"  },
+  { "adobeserver-3",   { NULL }, 3703,  "tcp"  },
+  { "adobeserver-3",   { NULL }, 3703,  "udp"  },
+  { "adobeserver-4",   { NULL }, 3704,  "tcp"  },
+  { "adobeserver-4",   { NULL }, 3704,  "udp"  },
+  { "adobeserver-5",   { NULL }, 3705,  "tcp"  },
+  { "adobeserver-5",   { NULL }, 3705,  "udp"  },
+  { "rt-event",        { NULL }, 3706,  "tcp"  },
+  { "rt-event",        { NULL }, 3706,  "udp"  },
+  { "rt-event-s",      { NULL }, 3707,  "tcp"  },
+  { "rt-event-s",      { NULL }, 3707,  "udp"  },
+  { "sun-as-iiops",    { NULL }, 3708,  "tcp"  },
+  { "sun-as-iiops",    { NULL }, 3708,  "udp"  },
+  { "ca-idms",         { NULL }, 3709,  "tcp"  },
+  { "ca-idms",         { NULL }, 3709,  "udp"  },
+  { "portgate-auth",   { NULL }, 3710,  "tcp"  },
+  { "portgate-auth",   { NULL }, 3710,  "udp"  },
+  { "edb-server2",     { NULL }, 3711,  "tcp"  },
+  { "edb-server2",     { NULL }, 3711,  "udp"  },
+  { "sentinel-ent",    { NULL }, 3712,  "tcp"  },
+  { "sentinel-ent",    { NULL }, 3712,  "udp"  },
+  { "tftps",           { NULL }, 3713,  "tcp"  },
+  { "tftps",           { NULL }, 3713,  "udp"  },
+  { "delos-dms",       { NULL }, 3714,  "tcp"  },
+  { "delos-dms",       { NULL }, 3714,  "udp"  },
+  { "anoto-rendezv",   { NULL }, 3715,  "tcp"  },
+  { "anoto-rendezv",   { NULL }, 3715,  "udp"  },
+  { "wv-csp-sms-cir",  { NULL }, 3716,  "tcp"  },
+  { "wv-csp-sms-cir",  { NULL }, 3716,  "udp"  },
+  { "wv-csp-udp-cir",  { NULL }, 3717,  "tcp"  },
+  { "wv-csp-udp-cir",  { NULL }, 3717,  "udp"  },
+  { "opus-services",   { NULL }, 3718,  "tcp"  },
+  { "opus-services",   { NULL }, 3718,  "udp"  },
+  { "itelserverport",  { NULL }, 3719,  "tcp"  },
+  { "itelserverport",  { NULL }, 3719,  "udp"  },
+  { "ufastro-instr",   { NULL }, 3720,  "tcp"  },
+  { "ufastro-instr",   { NULL }, 3720,  "udp"  },
+  { "xsync",           { NULL }, 3721,  "tcp"  },
+  { "xsync",           { NULL }, 3721,  "udp"  },
+  { "xserveraid",      { NULL }, 3722,  "tcp"  },
+  { "xserveraid",      { NULL }, 3722,  "udp"  },
+  { "sychrond",        { NULL }, 3723,  "tcp"  },
+  { "sychrond",        { NULL }, 3723,  "udp"  },
+  { "blizwow",         { NULL }, 3724,  "tcp"  },
+  { "blizwow",         { NULL }, 3724,  "udp"  },
+  { "na-er-tip",       { NULL }, 3725,  "tcp"  },
+  { "na-er-tip",       { NULL }, 3725,  "udp"  },
+  { "array-manager",   { NULL }, 3726,  "tcp"  },
+  { "array-manager",   { NULL }, 3726,  "udp"  },
+  { "e-mdu",           { NULL }, 3727,  "tcp"  },
+  { "e-mdu",           { NULL }, 3727,  "udp"  },
+  { "e-woa",           { NULL }, 3728,  "tcp"  },
+  { "e-woa",           { NULL }, 3728,  "udp"  },
+  { "fksp-audit",      { NULL }, 3729,  "tcp"  },
+  { "fksp-audit",      { NULL }, 3729,  "udp"  },
+  { "client-ctrl",     { NULL }, 3730,  "tcp"  },
+  { "client-ctrl",     { NULL }, 3730,  "udp"  },
+  { "smap",            { NULL }, 3731,  "tcp"  },
+  { "smap",            { NULL }, 3731,  "udp"  },
+  { "m-wnn",           { NULL }, 3732,  "tcp"  },
+  { "m-wnn",           { NULL }, 3732,  "udp"  },
+  { "multip-msg",      { NULL }, 3733,  "tcp"  },
+  { "multip-msg",      { NULL }, 3733,  "udp"  },
+  { "synel-data",      { NULL }, 3734,  "tcp"  },
+  { "synel-data",      { NULL }, 3734,  "udp"  },
+  { "pwdis",           { NULL }, 3735,  "tcp"  },
+  { "pwdis",           { NULL }, 3735,  "udp"  },
+  { "rs-rmi",          { NULL }, 3736,  "tcp"  },
+  { "rs-rmi",          { NULL }, 3736,  "udp"  },
+  { "xpanel",          { NULL }, 3737,  "tcp"  },
+  { "versatalk",       { NULL }, 3738,  "tcp"  },
+  { "versatalk",       { NULL }, 3738,  "udp"  },
+  { "launchbird-lm",   { NULL }, 3739,  "tcp"  },
+  { "launchbird-lm",   { NULL }, 3739,  "udp"  },
+  { "heartbeat",       { NULL }, 3740,  "tcp"  },
+  { "heartbeat",       { NULL }, 3740,  "udp"  },
+  { "wysdma",          { NULL }, 3741,  "tcp"  },
+  { "wysdma",          { NULL }, 3741,  "udp"  },
+  { "cst-port",        { NULL }, 3742,  "tcp"  },
+  { "cst-port",        { NULL }, 3742,  "udp"  },
+  { "ipcs-command",    { NULL }, 3743,  "tcp"  },
+  { "ipcs-command",    { NULL }, 3743,  "udp"  },
+  { "sasg",            { NULL }, 3744,  "tcp"  },
+  { "sasg",            { NULL }, 3744,  "udp"  },
+  { "gw-call-port",    { NULL }, 3745,  "tcp"  },
+  { "gw-call-port",    { NULL }, 3745,  "udp"  },
+  { "linktest",        { NULL }, 3746,  "tcp"  },
+  { "linktest",        { NULL }, 3746,  "udp"  },
+  { "linktest-s",      { NULL }, 3747,  "tcp"  },
+  { "linktest-s",      { NULL }, 3747,  "udp"  },
+  { "webdata",         { NULL }, 3748,  "tcp"  },
+  { "webdata",         { NULL }, 3748,  "udp"  },
+  { "cimtrak",         { NULL }, 3749,  "tcp"  },
+  { "cimtrak",         { NULL }, 3749,  "udp"  },
+  { "cbos-ip-port",    { NULL }, 3750,  "tcp"  },
+  { "cbos-ip-port",    { NULL }, 3750,  "udp"  },
+  { "gprs-cube",       { NULL }, 3751,  "tcp"  },
+  { "gprs-cube",       { NULL }, 3751,  "udp"  },
+  { "vipremoteagent",  { NULL }, 3752,  "tcp"  },
+  { "vipremoteagent",  { NULL }, 3752,  "udp"  },
+  { "nattyserver",     { NULL }, 3753,  "tcp"  },
+  { "nattyserver",     { NULL }, 3753,  "udp"  },
+  { "timestenbroker",  { NULL }, 3754,  "tcp"  },
+  { "timestenbroker",  { NULL }, 3754,  "udp"  },
+  { "sas-remote-hlp",  { NULL }, 3755,  "tcp"  },
+  { "sas-remote-hlp",  { NULL }, 3755,  "udp"  },
+  { "canon-capt",      { NULL }, 3756,  "tcp"  },
+  { "canon-capt",      { NULL }, 3756,  "udp"  },
+  { "grf-port",        { NULL }, 3757,  "tcp"  },
+  { "grf-port",        { NULL }, 3757,  "udp"  },
+  { "apw-registry",    { NULL }, 3758,  "tcp"  },
+  { "apw-registry",    { NULL }, 3758,  "udp"  },
+  { "exapt-lmgr",      { NULL }, 3759,  "tcp"  },
+  { "exapt-lmgr",      { NULL }, 3759,  "udp"  },
+  { "adtempusclient",  { NULL }, 3760,  "tcp"  },
+  { "adtempusclient",  { NULL }, 3760,  "udp"  },
+  { "gsakmp",          { NULL }, 3761,  "tcp"  },
+  { "gsakmp",          { NULL }, 3761,  "udp"  },
+  { "gbs-smp",         { NULL }, 3762,  "tcp"  },
+  { "gbs-smp",         { NULL }, 3762,  "udp"  },
+  { "xo-wave",         { NULL }, 3763,  "tcp"  },
+  { "xo-wave",         { NULL }, 3763,  "udp"  },
+  { "mni-prot-rout",   { NULL }, 3764,  "tcp"  },
+  { "mni-prot-rout",   { NULL }, 3764,  "udp"  },
+  { "rtraceroute",     { NULL }, 3765,  "tcp"  },
+  { "rtraceroute",     { NULL }, 3765,  "udp"  },
+  { "listmgr-port",    { NULL }, 3767,  "tcp"  },
+  { "listmgr-port",    { NULL }, 3767,  "udp"  },
+  { "rblcheckd",       { NULL }, 3768,  "tcp"  },
+  { "rblcheckd",       { NULL }, 3768,  "udp"  },
+  { "haipe-otnk",      { NULL }, 3769,  "tcp"  },
+  { "haipe-otnk",      { NULL }, 3769,  "udp"  },
+  { "cindycollab",     { NULL }, 3770,  "tcp"  },
+  { "cindycollab",     { NULL }, 3770,  "udp"  },
+  { "paging-port",     { NULL }, 3771,  "tcp"  },
+  { "paging-port",     { NULL }, 3771,  "udp"  },
+  { "ctp",             { NULL }, 3772,  "tcp"  },
+  { "ctp",             { NULL }, 3772,  "udp"  },
+  { "ctdhercules",     { NULL }, 3773,  "tcp"  },
+  { "ctdhercules",     { NULL }, 3773,  "udp"  },
+  { "zicom",           { NULL }, 3774,  "tcp"  },
+  { "zicom",           { NULL }, 3774,  "udp"  },
+  { "ispmmgr",         { NULL }, 3775,  "tcp"  },
+  { "ispmmgr",         { NULL }, 3775,  "udp"  },
+  { "dvcprov-port",    { NULL }, 3776,  "tcp"  },
+  { "dvcprov-port",    { NULL }, 3776,  "udp"  },
+  { "jibe-eb",         { NULL }, 3777,  "tcp"  },
+  { "jibe-eb",         { NULL }, 3777,  "udp"  },
+  { "c-h-it-port",     { NULL }, 3778,  "tcp"  },
+  { "c-h-it-port",     { NULL }, 3778,  "udp"  },
+  { "cognima",         { NULL }, 3779,  "tcp"  },
+  { "cognima",         { NULL }, 3779,  "udp"  },
+  { "nnp",             { NULL }, 3780,  "tcp"  },
+  { "nnp",             { NULL }, 3780,  "udp"  },
+  { "abcvoice-port",   { NULL }, 3781,  "tcp"  },
+  { "abcvoice-port",   { NULL }, 3781,  "udp"  },
+  { "iso-tp0s",        { NULL }, 3782,  "tcp"  },
+  { "iso-tp0s",        { NULL }, 3782,  "udp"  },
+  { "bim-pem",         { NULL }, 3783,  "tcp"  },
+  { "bim-pem",         { NULL }, 3783,  "udp"  },
+  { "bfd-control",     { NULL }, 3784,  "tcp"  },
+  { "bfd-control",     { NULL }, 3784,  "udp"  },
+  { "bfd-echo",        { NULL }, 3785,  "tcp"  },
+  { "bfd-echo",        { NULL }, 3785,  "udp"  },
+  { "upstriggervsw",   { NULL }, 3786,  "tcp"  },
+  { "upstriggervsw",   { NULL }, 3786,  "udp"  },
+  { "fintrx",          { NULL }, 3787,  "tcp"  },
+  { "fintrx",          { NULL }, 3787,  "udp"  },
+  { "isrp-port",       { NULL }, 3788,  "tcp"  },
+  { "isrp-port",       { NULL }, 3788,  "udp"  },
+  { "remotedeploy",    { NULL }, 3789,  "tcp"  },
+  { "remotedeploy",    { NULL }, 3789,  "udp"  },
+  { "quickbooksrds",   { NULL }, 3790,  "tcp"  },
+  { "quickbooksrds",   { NULL }, 3790,  "udp"  },
+  { "tvnetworkvideo",  { NULL }, 3791,  "tcp"  },
+  { "tvnetworkvideo",  { NULL }, 3791,  "udp"  },
+  { "sitewatch",       { NULL }, 3792,  "tcp"  },
+  { "sitewatch",       { NULL }, 3792,  "udp"  },
+  { "dcsoftware",      { NULL }, 3793,  "tcp"  },
+  { "dcsoftware",      { NULL }, 3793,  "udp"  },
+  { "jaus",            { NULL }, 3794,  "tcp"  },
+  { "jaus",            { NULL }, 3794,  "udp"  },
+  { "myblast",         { NULL }, 3795,  "tcp"  },
+  { "myblast",         { NULL }, 3795,  "udp"  },
+  { "spw-dialer",      { NULL }, 3796,  "tcp"  },
+  { "spw-dialer",      { NULL }, 3796,  "udp"  },
+  { "idps",            { NULL }, 3797,  "tcp"  },
+  { "idps",            { NULL }, 3797,  "udp"  },
+  { "minilock",        { NULL }, 3798,  "tcp"  },
+  { "minilock",        { NULL }, 3798,  "udp"  },
+  { "radius-dynauth",  { NULL }, 3799,  "tcp"  },
+  { "radius-dynauth",  { NULL }, 3799,  "udp"  },
+  { "pwgpsi",          { NULL }, 3800,  "tcp"  },
+  { "pwgpsi",          { NULL }, 3800,  "udp"  },
+  { "ibm-mgr",         { NULL }, 3801,  "tcp"  },
+  { "ibm-mgr",         { NULL }, 3801,  "udp"  },
+  { "vhd",             { NULL }, 3802,  "tcp"  },
+  { "vhd",             { NULL }, 3802,  "udp"  },
+  { "soniqsync",       { NULL }, 3803,  "tcp"  },
+  { "soniqsync",       { NULL }, 3803,  "udp"  },
+  { "iqnet-port",      { NULL }, 3804,  "tcp"  },
+  { "iqnet-port",      { NULL }, 3804,  "udp"  },
+  { "tcpdataserver",   { NULL }, 3805,  "tcp"  },
+  { "tcpdataserver",   { NULL }, 3805,  "udp"  },
+  { "wsmlb",           { NULL }, 3806,  "tcp"  },
+  { "wsmlb",           { NULL }, 3806,  "udp"  },
+  { "spugna",          { NULL }, 3807,  "tcp"  },
+  { "spugna",          { NULL }, 3807,  "udp"  },
+  { "sun-as-iiops-ca", { NULL }, 3808,  "tcp"  },
+  { "sun-as-iiops-ca", { NULL }, 3808,  "udp"  },
+  { "apocd",           { NULL }, 3809,  "tcp"  },
+  { "apocd",           { NULL }, 3809,  "udp"  },
+  { "wlanauth",        { NULL }, 3810,  "tcp"  },
+  { "wlanauth",        { NULL }, 3810,  "udp"  },
+  { "amp",             { NULL }, 3811,  "tcp"  },
+  { "amp",             { NULL }, 3811,  "udp"  },
+  { "neto-wol-server", { NULL }, 3812,  "tcp"  },
+  { "neto-wol-server", { NULL }, 3812,  "udp"  },
+  { "rap-ip",          { NULL }, 3813,  "tcp"  },
+  { "rap-ip",          { NULL }, 3813,  "udp"  },
+  { "neto-dcs",        { NULL }, 3814,  "tcp"  },
+  { "neto-dcs",        { NULL }, 3814,  "udp"  },
+  { "lansurveyorxml",  { NULL }, 3815,  "tcp"  },
+  { "lansurveyorxml",  { NULL }, 3815,  "udp"  },
+  { "sunlps-http",     { NULL }, 3816,  "tcp"  },
+  { "sunlps-http",     { NULL }, 3816,  "udp"  },
+  { "tapeware",        { NULL }, 3817,  "tcp"  },
+  { "tapeware",        { NULL }, 3817,  "udp"  },
+  { "crinis-hb",       { NULL }, 3818,  "tcp"  },
+  { "crinis-hb",       { NULL }, 3818,  "udp"  },
+  { "epl-slp",         { NULL }, 3819,  "tcp"  },
+  { "epl-slp",         { NULL }, 3819,  "udp"  },
+  { "scp",             { NULL }, 3820,  "tcp"  },
+  { "scp",             { NULL }, 3820,  "udp"  },
+  { "pmcp",            { NULL }, 3821,  "tcp"  },
+  { "pmcp",            { NULL }, 3821,  "udp"  },
+  { "acp-discovery",   { NULL }, 3822,  "tcp"  },
+  { "acp-discovery",   { NULL }, 3822,  "udp"  },
+  { "acp-conduit",     { NULL }, 3823,  "tcp"  },
+  { "acp-conduit",     { NULL }, 3823,  "udp"  },
+  { "acp-policy",      { NULL }, 3824,  "tcp"  },
+  { "acp-policy",      { NULL }, 3824,  "udp"  },
+  { "ffserver",        { NULL }, 3825,  "tcp"  },
+  { "ffserver",        { NULL }, 3825,  "udp"  },
+  { "wormux",          { NULL }, 3826,  "tcp"  },
+  { "wormux",          { NULL }, 3826,  "udp"  },
+  { "netmpi",          { NULL }, 3827,  "tcp"  },
+  { "netmpi",          { NULL }, 3827,  "udp"  },
+  { "neteh",           { NULL }, 3828,  "tcp"  },
+  { "neteh",           { NULL }, 3828,  "udp"  },
+  { "neteh-ext",       { NULL }, 3829,  "tcp"  },
+  { "neteh-ext",       { NULL }, 3829,  "udp"  },
+  { "cernsysmgmtagt",  { NULL }, 3830,  "tcp"  },
+  { "cernsysmgmtagt",  { NULL }, 3830,  "udp"  },
+  { "dvapps",          { NULL }, 3831,  "tcp"  },
+  { "dvapps",          { NULL }, 3831,  "udp"  },
+  { "xxnetserver",     { NULL }, 3832,  "tcp"  },
+  { "xxnetserver",     { NULL }, 3832,  "udp"  },
+  { "aipn-auth",       { NULL }, 3833,  "tcp"  },
+  { "aipn-auth",       { NULL }, 3833,  "udp"  },
+  { "spectardata",     { NULL }, 3834,  "tcp"  },
+  { "spectardata",     { NULL }, 3834,  "udp"  },
+  { "spectardb",       { NULL }, 3835,  "tcp"  },
+  { "spectardb",       { NULL }, 3835,  "udp"  },
+  { "markem-dcp",      { NULL }, 3836,  "tcp"  },
+  { "markem-dcp",      { NULL }, 3836,  "udp"  },
+  { "mkm-discovery",   { NULL }, 3837,  "tcp"  },
+  { "mkm-discovery",   { NULL }, 3837,  "udp"  },
+  { "sos",             { NULL }, 3838,  "tcp"  },
+  { "sos",             { NULL }, 3838,  "udp"  },
+  { "amx-rms",         { NULL }, 3839,  "tcp"  },
+  { "amx-rms",         { NULL }, 3839,  "udp"  },
+  { "flirtmitmir",     { NULL }, 3840,  "tcp"  },
+  { "flirtmitmir",     { NULL }, 3840,  "udp"  },
+  { "zfirm-shiprush3", { NULL }, 3841,  "tcp"  },
+  { "zfirm-shiprush3", { NULL }, 3841,  "udp"  },
+  { "nhci",            { NULL }, 3842,  "tcp"  },
+  { "nhci",            { NULL }, 3842,  "udp"  },
+  { "quest-agent",     { NULL }, 3843,  "tcp"  },
+  { "quest-agent",     { NULL }, 3843,  "udp"  },
+  { "rnm",             { NULL }, 3844,  "tcp"  },
+  { "rnm",             { NULL }, 3844,  "udp"  },
+  { "v-one-spp",       { NULL }, 3845,  "tcp"  },
+  { "v-one-spp",       { NULL }, 3845,  "udp"  },
+  { "an-pcp",          { NULL }, 3846,  "tcp"  },
+  { "an-pcp",          { NULL }, 3846,  "udp"  },
+  { "msfw-control",    { NULL }, 3847,  "tcp"  },
+  { "msfw-control",    { NULL }, 3847,  "udp"  },
+  { "item",            { NULL }, 3848,  "tcp"  },
+  { "item",            { NULL }, 3848,  "udp"  },
+  { "spw-dnspreload",  { NULL }, 3849,  "tcp"  },
+  { "spw-dnspreload",  { NULL }, 3849,  "udp"  },
+  { "qtms-bootstrap",  { NULL }, 3850,  "tcp"  },
+  { "qtms-bootstrap",  { NULL }, 3850,  "udp"  },
+  { "spectraport",     { NULL }, 3851,  "tcp"  },
+  { "spectraport",     { NULL }, 3851,  "udp"  },
+  { "sse-app-config",  { NULL }, 3852,  "tcp"  },
+  { "sse-app-config",  { NULL }, 3852,  "udp"  },
+  { "sscan",           { NULL }, 3853,  "tcp"  },
+  { "sscan",           { NULL }, 3853,  "udp"  },
+  { "stryker-com",     { NULL }, 3854,  "tcp"  },
+  { "stryker-com",     { NULL }, 3854,  "udp"  },
+  { "opentrac",        { NULL }, 3855,  "tcp"  },
+  { "opentrac",        { NULL }, 3855,  "udp"  },
+  { "informer",        { NULL }, 3856,  "tcp"  },
+  { "informer",        { NULL }, 3856,  "udp"  },
+  { "trap-port",       { NULL }, 3857,  "tcp"  },
+  { "trap-port",       { NULL }, 3857,  "udp"  },
+  { "trap-port-mom",   { NULL }, 3858,  "tcp"  },
+  { "trap-port-mom",   { NULL }, 3858,  "udp"  },
+  { "nav-port",        { NULL }, 3859,  "tcp"  },
+  { "nav-port",        { NULL }, 3859,  "udp"  },
+  { "sasp",            { NULL }, 3860,  "tcp"  },
+  { "sasp",            { NULL }, 3860,  "udp"  },
+  { "winshadow-hd",    { NULL }, 3861,  "tcp"  },
+  { "winshadow-hd",    { NULL }, 3861,  "udp"  },
+  { "giga-pocket",     { NULL }, 3862,  "tcp"  },
+  { "giga-pocket",     { NULL }, 3862,  "udp"  },
+  { "asap-tcp",        { NULL }, 3863,  "tcp"  },
+  { "asap-udp",        { NULL }, 3863,  "udp"  },
+  { "asap-sctp",       { NULL }, 3863,  "sctp" },
+  { "asap-tcp-tls",    { NULL }, 3864,  "tcp"  },
+  { "asap-sctp-tls",   { NULL }, 3864,  "sctp" },
+  { "xpl",             { NULL }, 3865,  "tcp"  },
+  { "xpl",             { NULL }, 3865,  "udp"  },
+  { "dzdaemon",        { NULL }, 3866,  "tcp"  },
+  { "dzdaemon",        { NULL }, 3866,  "udp"  },
+  { "dzoglserver",     { NULL }, 3867,  "tcp"  },
+  { "dzoglserver",     { NULL }, 3867,  "udp"  },
+  { "diameter",        { NULL }, 3868,  "tcp"  },
+  { "diameter",        { NULL }, 3868,  "sctp" },
+  { "ovsam-mgmt",      { NULL }, 3869,  "tcp"  },
+  { "ovsam-mgmt",      { NULL }, 3869,  "udp"  },
+  { "ovsam-d-agent",   { NULL }, 3870,  "tcp"  },
+  { "ovsam-d-agent",   { NULL }, 3870,  "udp"  },
+  { "avocent-adsap",   { NULL }, 3871,  "tcp"  },
+  { "avocent-adsap",   { NULL }, 3871,  "udp"  },
+  { "oem-agent",       { NULL }, 3872,  "tcp"  },
+  { "oem-agent",       { NULL }, 3872,  "udp"  },
+  { "fagordnc",        { NULL }, 3873,  "tcp"  },
+  { "fagordnc",        { NULL }, 3873,  "udp"  },
+  { "sixxsconfig",     { NULL }, 3874,  "tcp"  },
+  { "sixxsconfig",     { NULL }, 3874,  "udp"  },
+  { "pnbscada",        { NULL }, 3875,  "tcp"  },
+  { "pnbscada",        { NULL }, 3875,  "udp"  },
+  { "dl_agent",        { NULL }, 3876,  "tcp"  },
+  { "dl_agent",        { NULL }, 3876,  "udp"  },
+  { "xmpcr-interface", { NULL }, 3877,  "tcp"  },
+  { "xmpcr-interface", { NULL }, 3877,  "udp"  },
+  { "fotogcad",        { NULL }, 3878,  "tcp"  },
+  { "fotogcad",        { NULL }, 3878,  "udp"  },
+  { "appss-lm",        { NULL }, 3879,  "tcp"  },
+  { "appss-lm",        { NULL }, 3879,  "udp"  },
+  { "igrs",            { NULL }, 3880,  "tcp"  },
+  { "igrs",            { NULL }, 3880,  "udp"  },
+  { "idac",            { NULL }, 3881,  "tcp"  },
+  { "idac",            { NULL }, 3881,  "udp"  },
+  { "msdts1",          { NULL }, 3882,  "tcp"  },
+  { "msdts1",          { NULL }, 3882,  "udp"  },
+  { "vrpn",            { NULL }, 3883,  "tcp"  },
+  { "vrpn",            { NULL }, 3883,  "udp"  },
+  { "softrack-meter",  { NULL }, 3884,  "tcp"  },
+  { "softrack-meter",  { NULL }, 3884,  "udp"  },
+  { "topflow-ssl",     { NULL }, 3885,  "tcp"  },
+  { "topflow-ssl",     { NULL }, 3885,  "udp"  },
+  { "nei-management",  { NULL }, 3886,  "tcp"  },
+  { "nei-management",  { NULL }, 3886,  "udp"  },
+  { "ciphire-data",    { NULL }, 3887,  "tcp"  },
+  { "ciphire-data",    { NULL }, 3887,  "udp"  },
+  { "ciphire-serv",    { NULL }, 3888,  "tcp"  },
+  { "ciphire-serv",    { NULL }, 3888,  "udp"  },
+  { "dandv-tester",    { NULL }, 3889,  "tcp"  },
+  { "dandv-tester",    { NULL }, 3889,  "udp"  },
+  { "ndsconnect",      { NULL }, 3890,  "tcp"  },
+  { "ndsconnect",      { NULL }, 3890,  "udp"  },
+  { "rtc-pm-port",     { NULL }, 3891,  "tcp"  },
+  { "rtc-pm-port",     { NULL }, 3891,  "udp"  },
+  { "pcc-image-port",  { NULL }, 3892,  "tcp"  },
+  { "pcc-image-port",  { NULL }, 3892,  "udp"  },
+  { "cgi-starapi",     { NULL }, 3893,  "tcp"  },
+  { "cgi-starapi",     { NULL }, 3893,  "udp"  },
+  { "syam-agent",      { NULL }, 3894,  "tcp"  },
+  { "syam-agent",      { NULL }, 3894,  "udp"  },
+  { "syam-smc",        { NULL }, 3895,  "tcp"  },
+  { "syam-smc",        { NULL }, 3895,  "udp"  },
+  { "sdo-tls",         { NULL }, 3896,  "tcp"  },
+  { "sdo-tls",         { NULL }, 3896,  "udp"  },
+  { "sdo-ssh",         { NULL }, 3897,  "tcp"  },
+  { "sdo-ssh",         { NULL }, 3897,  "udp"  },
+  { "senip",           { NULL }, 3898,  "tcp"  },
+  { "senip",           { NULL }, 3898,  "udp"  },
+  { "itv-control",     { NULL }, 3899,  "tcp"  },
+  { "itv-control",     { NULL }, 3899,  "udp"  },
+  { "udt_os",          { NULL }, 3900,  "tcp"  },
+  { "udt_os",          { NULL }, 3900,  "udp"  },
+  { "nimsh",           { NULL }, 3901,  "tcp"  },
+  { "nimsh",           { NULL }, 3901,  "udp"  },
+  { "nimaux",          { NULL }, 3902,  "tcp"  },
+  { "nimaux",          { NULL }, 3902,  "udp"  },
+  { "charsetmgr",      { NULL }, 3903,  "tcp"  },
+  { "charsetmgr",      { NULL }, 3903,  "udp"  },
+  { "omnilink-port",   { NULL }, 3904,  "tcp"  },
+  { "omnilink-port",   { NULL }, 3904,  "udp"  },
+  { "mupdate",         { NULL }, 3905,  "tcp"  },
+  { "mupdate",         { NULL }, 3905,  "udp"  },
+  { "topovista-data",  { NULL }, 3906,  "tcp"  },
+  { "topovista-data",  { NULL }, 3906,  "udp"  },
+  { "imoguia-port",    { NULL }, 3907,  "tcp"  },
+  { "imoguia-port",    { NULL }, 3907,  "udp"  },
+  { "hppronetman",     { NULL }, 3908,  "tcp"  },
+  { "hppronetman",     { NULL }, 3908,  "udp"  },
+  { "surfcontrolcpa",  { NULL }, 3909,  "tcp"  },
+  { "surfcontrolcpa",  { NULL }, 3909,  "udp"  },
+  { "prnrequest",      { NULL }, 3910,  "tcp"  },
+  { "prnrequest",      { NULL }, 3910,  "udp"  },
+  { "prnstatus",       { NULL }, 3911,  "tcp"  },
+  { "prnstatus",       { NULL }, 3911,  "udp"  },
+  { "gbmt-stars",      { NULL }, 3912,  "tcp"  },
+  { "gbmt-stars",      { NULL }, 3912,  "udp"  },
+  { "listcrt-port",    { NULL }, 3913,  "tcp"  },
+  { "listcrt-port",    { NULL }, 3913,  "udp"  },
+  { "listcrt-port-2",  { NULL }, 3914,  "tcp"  },
+  { "listcrt-port-2",  { NULL }, 3914,  "udp"  },
+  { "agcat",           { NULL }, 3915,  "tcp"  },
+  { "agcat",           { NULL }, 3915,  "udp"  },
+  { "wysdmc",          { NULL }, 3916,  "tcp"  },
+  { "wysdmc",          { NULL }, 3916,  "udp"  },
+  { "aftmux",          { NULL }, 3917,  "tcp"  },
+  { "aftmux",          { NULL }, 3917,  "udp"  },
+  { "pktcablemmcops",  { NULL }, 3918,  "tcp"  },
+  { "pktcablemmcops",  { NULL }, 3918,  "udp"  },
+  { "hyperip",         { NULL }, 3919,  "tcp"  },
+  { "hyperip",         { NULL }, 3919,  "udp"  },
+  { "exasoftport1",    { NULL }, 3920,  "tcp"  },
+  { "exasoftport1",    { NULL }, 3920,  "udp"  },
+  { "herodotus-net",   { NULL }, 3921,  "tcp"  },
+  { "herodotus-net",   { NULL }, 3921,  "udp"  },
+  { "sor-update",      { NULL }, 3922,  "tcp"  },
+  { "sor-update",      { NULL }, 3922,  "udp"  },
+  { "symb-sb-port",    { NULL }, 3923,  "tcp"  },
+  { "symb-sb-port",    { NULL }, 3923,  "udp"  },
+  { "mpl-gprs-port",   { NULL }, 3924,  "tcp"  },
+  { "mpl-gprs-port",   { NULL }, 3924,  "udp"  },
+  { "zmp",             { NULL }, 3925,  "tcp"  },
+  { "zmp",             { NULL }, 3925,  "udp"  },
+  { "winport",         { NULL }, 3926,  "tcp"  },
+  { "winport",         { NULL }, 3926,  "udp"  },
+  { "natdataservice",  { NULL }, 3927,  "tcp"  },
+  { "natdataservice",  { NULL }, 3927,  "udp"  },
+  { "netboot-pxe",     { NULL }, 3928,  "tcp"  },
+  { "netboot-pxe",     { NULL }, 3928,  "udp"  },
+  { "smauth-port",     { NULL }, 3929,  "tcp"  },
+  { "smauth-port",     { NULL }, 3929,  "udp"  },
+  { "syam-webserver",  { NULL }, 3930,  "tcp"  },
+  { "syam-webserver",  { NULL }, 3930,  "udp"  },
+  { "msr-plugin-port", { NULL }, 3931,  "tcp"  },
+  { "msr-plugin-port", { NULL }, 3931,  "udp"  },
+  { "dyn-site",        { NULL }, 3932,  "tcp"  },
+  { "dyn-site",        { NULL }, 3932,  "udp"  },
+  { "plbserve-port",   { NULL }, 3933,  "tcp"  },
+  { "plbserve-port",   { NULL }, 3933,  "udp"  },
+  { "sunfm-port",      { NULL }, 3934,  "tcp"  },
+  { "sunfm-port",      { NULL }, 3934,  "udp"  },
+  { "sdp-portmapper",  { NULL }, 3935,  "tcp"  },
+  { "sdp-portmapper",  { NULL }, 3935,  "udp"  },
+  { "mailprox",        { NULL }, 3936,  "tcp"  },
+  { "mailprox",        { NULL }, 3936,  "udp"  },
+  { "dvbservdsc",      { NULL }, 3937,  "tcp"  },
+  { "dvbservdsc",      { NULL }, 3937,  "udp"  },
+  { "dbcontrol_agent", { NULL }, 3938,  "tcp"  },
+  { "dbcontrol_agent", { NULL }, 3938,  "udp"  },
+  { "aamp",            { NULL }, 3939,  "tcp"  },
+  { "aamp",            { NULL }, 3939,  "udp"  },
+  { "xecp-node",       { NULL }, 3940,  "tcp"  },
+  { "xecp-node",       { NULL }, 3940,  "udp"  },
+  { "homeportal-web",  { NULL }, 3941,  "tcp"  },
+  { "homeportal-web",  { NULL }, 3941,  "udp"  },
+  { "srdp",            { NULL }, 3942,  "tcp"  },
+  { "srdp",            { NULL }, 3942,  "udp"  },
+  { "tig",             { NULL }, 3943,  "tcp"  },
+  { "tig",             { NULL }, 3943,  "udp"  },
+  { "sops",            { NULL }, 3944,  "tcp"  },
+  { "sops",            { NULL }, 3944,  "udp"  },
+  { "emcads",          { NULL }, 3945,  "tcp"  },
+  { "emcads",          { NULL }, 3945,  "udp"  },
+  { "backupedge",      { NULL }, 3946,  "tcp"  },
+  { "backupedge",      { NULL }, 3946,  "udp"  },
+  { "ccp",             { NULL }, 3947,  "tcp"  },
+  { "ccp",             { NULL }, 3947,  "udp"  },
+  { "apdap",           { NULL }, 3948,  "tcp"  },
+  { "apdap",           { NULL }, 3948,  "udp"  },
+  { "drip",            { NULL }, 3949,  "tcp"  },
+  { "drip",            { NULL }, 3949,  "udp"  },
+  { "namemunge",       { NULL }, 3950,  "tcp"  },
+  { "namemunge",       { NULL }, 3950,  "udp"  },
+  { "pwgippfax",       { NULL }, 3951,  "tcp"  },
+  { "pwgippfax",       { NULL }, 3951,  "udp"  },
+  { "i3-sessionmgr",   { NULL }, 3952,  "tcp"  },
+  { "i3-sessionmgr",   { NULL }, 3952,  "udp"  },
+  { "xmlink-connect",  { NULL }, 3953,  "tcp"  },
+  { "xmlink-connect",  { NULL }, 3953,  "udp"  },
+  { "adrep",           { NULL }, 3954,  "tcp"  },
+  { "adrep",           { NULL }, 3954,  "udp"  },
+  { "p2pcommunity",    { NULL }, 3955,  "tcp"  },
+  { "p2pcommunity",    { NULL }, 3955,  "udp"  },
+  { "gvcp",            { NULL }, 3956,  "tcp"  },
+  { "gvcp",            { NULL }, 3956,  "udp"  },
+  { "mqe-broker",      { NULL }, 3957,  "tcp"  },
+  { "mqe-broker",      { NULL }, 3957,  "udp"  },
+  { "mqe-agent",       { NULL }, 3958,  "tcp"  },
+  { "mqe-agent",       { NULL }, 3958,  "udp"  },
+  { "treehopper",      { NULL }, 3959,  "tcp"  },
+  { "treehopper",      { NULL }, 3959,  "udp"  },
+  { "bess",            { NULL }, 3960,  "tcp"  },
+  { "bess",            { NULL }, 3960,  "udp"  },
+  { "proaxess",        { NULL }, 3961,  "tcp"  },
+  { "proaxess",        { NULL }, 3961,  "udp"  },
+  { "sbi-agent",       { NULL }, 3962,  "tcp"  },
+  { "sbi-agent",       { NULL }, 3962,  "udp"  },
+  { "thrp",            { NULL }, 3963,  "tcp"  },
+  { "thrp",            { NULL }, 3963,  "udp"  },
+  { "sasggprs",        { NULL }, 3964,  "tcp"  },
+  { "sasggprs",        { NULL }, 3964,  "udp"  },
+  { "ati-ip-to-ncpe",  { NULL }, 3965,  "tcp"  },
+  { "ati-ip-to-ncpe",  { NULL }, 3965,  "udp"  },
+  { "bflckmgr",        { NULL }, 3966,  "tcp"  },
+  { "bflckmgr",        { NULL }, 3966,  "udp"  },
+  { "ppsms",           { NULL }, 3967,  "tcp"  },
+  { "ppsms",           { NULL }, 3967,  "udp"  },
+  { "ianywhere-dbns",  { NULL }, 3968,  "tcp"  },
+  { "ianywhere-dbns",  { NULL }, 3968,  "udp"  },
+  { "landmarks",       { NULL }, 3969,  "tcp"  },
+  { "landmarks",       { NULL }, 3969,  "udp"  },
+  { "lanrevagent",     { NULL }, 3970,  "tcp"  },
+  { "lanrevagent",     { NULL }, 3970,  "udp"  },
+  { "lanrevserver",    { NULL }, 3971,  "tcp"  },
+  { "lanrevserver",    { NULL }, 3971,  "udp"  },
+  { "iconp",           { NULL }, 3972,  "tcp"  },
+  { "iconp",           { NULL }, 3972,  "udp"  },
+  { "progistics",      { NULL }, 3973,  "tcp"  },
+  { "progistics",      { NULL }, 3973,  "udp"  },
+  { "citysearch",      { NULL }, 3974,  "tcp"  },
+  { "citysearch",      { NULL }, 3974,  "udp"  },
+  { "airshot",         { NULL }, 3975,  "tcp"  },
+  { "airshot",         { NULL }, 3975,  "udp"  },
+  { "opswagent",       { NULL }, 3976,  "tcp"  },
+  { "opswagent",       { NULL }, 3976,  "udp"  },
+  { "opswmanager",     { NULL }, 3977,  "tcp"  },
+  { "opswmanager",     { NULL }, 3977,  "udp"  },
+  { "secure-cfg-svr",  { NULL }, 3978,  "tcp"  },
+  { "secure-cfg-svr",  { NULL }, 3978,  "udp"  },
+  { "smwan",           { NULL }, 3979,  "tcp"  },
+  { "smwan",           { NULL }, 3979,  "udp"  },
+  { "acms",            { NULL }, 3980,  "tcp"  },
+  { "acms",            { NULL }, 3980,  "udp"  },
+  { "starfish",        { NULL }, 3981,  "tcp"  },
+  { "starfish",        { NULL }, 3981,  "udp"  },
+  { "eis",             { NULL }, 3982,  "tcp"  },
+  { "eis",             { NULL }, 3982,  "udp"  },
+  { "eisp",            { NULL }, 3983,  "tcp"  },
+  { "eisp",            { NULL }, 3983,  "udp"  },
+  { "mapper-nodemgr",  { NULL }, 3984,  "tcp"  },
+  { "mapper-nodemgr",  { NULL }, 3984,  "udp"  },
+  { "mapper-mapethd",  { NULL }, 3985,  "tcp"  },
+  { "mapper-mapethd",  { NULL }, 3985,  "udp"  },
+  { "mapper-ws_ethd",  { NULL }, 3986,  "tcp"  },
+  { "mapper-ws_ethd",  { NULL }, 3986,  "udp"  },
+  { "centerline",      { NULL }, 3987,  "tcp"  },
+  { "centerline",      { NULL }, 3987,  "udp"  },
+  { "dcs-config",      { NULL }, 3988,  "tcp"  },
+  { "dcs-config",      { NULL }, 3988,  "udp"  },
+  { "bv-queryengine",  { NULL }, 3989,  "tcp"  },
+  { "bv-queryengine",  { NULL }, 3989,  "udp"  },
+  { "bv-is",           { NULL }, 3990,  "tcp"  },
+  { "bv-is",           { NULL }, 3990,  "udp"  },
+  { "bv-smcsrv",       { NULL }, 3991,  "tcp"  },
+  { "bv-smcsrv",       { NULL }, 3991,  "udp"  },
+  { "bv-ds",           { NULL }, 3992,  "tcp"  },
+  { "bv-ds",           { NULL }, 3992,  "udp"  },
+  { "bv-agent",        { NULL }, 3993,  "tcp"  },
+  { "bv-agent",        { NULL }, 3993,  "udp"  },
+  { "iss-mgmt-ssl",    { NULL }, 3995,  "tcp"  },
+  { "iss-mgmt-ssl",    { NULL }, 3995,  "udp"  },
+  { "abcsoftware",     { NULL }, 3996,  "tcp"  },
+  { "abcsoftware",     { NULL }, 3996,  "udp"  },
+  { "agentsease-db",   { NULL }, 3997,  "tcp"  },
+  { "agentsease-db",   { NULL }, 3997,  "udp"  },
+  { "dnx",             { NULL }, 3998,  "tcp"  },
+  { "dnx",             { NULL }, 3998,  "udp"  },
+  { "nvcnet",          { NULL }, 3999,  "tcp"  },
+  { "nvcnet",          { NULL }, 3999,  "udp"  },
+  { "terabase",        { NULL }, 4000,  "tcp"  },
+  { "terabase",        { NULL }, 4000,  "udp"  },
+  { "newoak",          { NULL }, 4001,  "tcp"  },
+  { "newoak",          { NULL }, 4001,  "udp"  },
+  { "pxc-spvr-ft",     { NULL }, 4002,  "tcp"  },
+  { "pxc-spvr-ft",     { NULL }, 4002,  "udp"  },
+  { "pxc-splr-ft",     { NULL }, 4003,  "tcp"  },
+  { "pxc-splr-ft",     { NULL }, 4003,  "udp"  },
+  { "pxc-roid",        { NULL }, 4004,  "tcp"  },
+  { "pxc-roid",        { NULL }, 4004,  "udp"  },
+  { "pxc-pin",         { NULL }, 4005,  "tcp"  },
+  { "pxc-pin",         { NULL }, 4005,  "udp"  },
+  { "pxc-spvr",        { NULL }, 4006,  "tcp"  },
+  { "pxc-spvr",        { NULL }, 4006,  "udp"  },
+  { "pxc-splr",        { NULL }, 4007,  "tcp"  },
+  { "pxc-splr",        { NULL }, 4007,  "udp"  },
+  { "netcheque",       { NULL }, 4008,  "tcp"  },
+  { "netcheque",       { NULL }, 4008,  "udp"  },
+  { "chimera-hwm",     { NULL }, 4009,  "tcp"  },
+  { "chimera-hwm",     { NULL }, 4009,  "udp"  },
+  { "samsung-unidex",  { NULL }, 4010,  "tcp"  },
+  { "samsung-unidex",  { NULL }, 4010,  "udp"  },
+  { "altserviceboot",  { NULL }, 4011,  "tcp"  },
+  { "altserviceboot",  { NULL }, 4011,  "udp"  },
+  { "pda-gate",        { NULL }, 4012,  "tcp"  },
+  { "pda-gate",        { NULL }, 4012,  "udp"  },
+  { "acl-manager",     { NULL }, 4013,  "tcp"  },
+  { "acl-manager",     { NULL }, 4013,  "udp"  },
+  { "taiclock",        { NULL }, 4014,  "tcp"  },
+  { "taiclock",        { NULL }, 4014,  "udp"  },
+  { "talarian-mcast1", { NULL }, 4015,  "tcp"  },
+  { "talarian-mcast1", { NULL }, 4015,  "udp"  },
+  { "talarian-mcast2", { NULL }, 4016,  "tcp"  },
+  { "talarian-mcast2", { NULL }, 4016,  "udp"  },
+  { "talarian-mcast3", { NULL }, 4017,  "tcp"  },
+  { "talarian-mcast3", { NULL }, 4017,  "udp"  },
+  { "talarian-mcast4", { NULL }, 4018,  "tcp"  },
+  { "talarian-mcast4", { NULL }, 4018,  "udp"  },
+  { "talarian-mcast5", { NULL }, 4019,  "tcp"  },
+  { "talarian-mcast5", { NULL }, 4019,  "udp"  },
+  { "trap",            { NULL }, 4020,  "tcp"  },
+  { "trap",            { NULL }, 4020,  "udp"  },
+  { "nexus-portal",    { NULL }, 4021,  "tcp"  },
+  { "nexus-portal",    { NULL }, 4021,  "udp"  },
+  { "dnox",            { NULL }, 4022,  "tcp"  },
+  { "dnox",            { NULL }, 4022,  "udp"  },
+  { "esnm-zoning",     { NULL }, 4023,  "tcp"  },
+  { "esnm-zoning",     { NULL }, 4023,  "udp"  },
+  { "tnp1-port",       { NULL }, 4024,  "tcp"  },
+  { "tnp1-port",       { NULL }, 4024,  "udp"  },
+  { "partimage",       { NULL }, 4025,  "tcp"  },
+  { "partimage",       { NULL }, 4025,  "udp"  },
+  { "as-debug",        { NULL }, 4026,  "tcp"  },
+  { "as-debug",        { NULL }, 4026,  "udp"  },
+  { "bxp",             { NULL }, 4027,  "tcp"  },
+  { "bxp",             { NULL }, 4027,  "udp"  },
+  { "dtserver-port",   { NULL }, 4028,  "tcp"  },
+  { "dtserver-port",   { NULL }, 4028,  "udp"  },
+  { "ip-qsig",         { NULL }, 4029,  "tcp"  },
+  { "ip-qsig",         { NULL }, 4029,  "udp"  },
+  { "jdmn-port",       { NULL }, 4030,  "tcp"  },
+  { "jdmn-port",       { NULL }, 4030,  "udp"  },
+  { "suucp",           { NULL }, 4031,  "tcp"  },
+  { "suucp",           { NULL }, 4031,  "udp"  },
+  { "vrts-auth-port",  { NULL }, 4032,  "tcp"  },
+  { "vrts-auth-port",  { NULL }, 4032,  "udp"  },
+  { "sanavigator",     { NULL }, 4033,  "tcp"  },
+  { "sanavigator",     { NULL }, 4033,  "udp"  },
+  { "ubxd",            { NULL }, 4034,  "tcp"  },
+  { "ubxd",            { NULL }, 4034,  "udp"  },
+  { "wap-push-http",   { NULL }, 4035,  "tcp"  },
+  { "wap-push-http",   { NULL }, 4035,  "udp"  },
+  { "wap-push-https",  { NULL }, 4036,  "tcp"  },
+  { "wap-push-https",  { NULL }, 4036,  "udp"  },
+  { "ravehd",          { NULL }, 4037,  "tcp"  },
+  { "ravehd",          { NULL }, 4037,  "udp"  },
+  { "fazzt-ptp",       { NULL }, 4038,  "tcp"  },
+  { "fazzt-ptp",       { NULL }, 4038,  "udp"  },
+  { "fazzt-admin",     { NULL }, 4039,  "tcp"  },
+  { "fazzt-admin",     { NULL }, 4039,  "udp"  },
+  { "yo-main",         { NULL }, 4040,  "tcp"  },
+  { "yo-main",         { NULL }, 4040,  "udp"  },
+  { "houston",         { NULL }, 4041,  "tcp"  },
+  { "houston",         { NULL }, 4041,  "udp"  },
+  { "ldxp",            { NULL }, 4042,  "tcp"  },
+  { "ldxp",            { NULL }, 4042,  "udp"  },
+  { "nirp",            { NULL }, 4043,  "tcp"  },
+  { "nirp",            { NULL }, 4043,  "udp"  },
+  { "ltp",             { NULL }, 4044,  "tcp"  },
+  { "ltp",             { NULL }, 4044,  "udp"  },
+  { "npp",             { NULL }, 4045,  "tcp"  },
+  { "npp",             { NULL }, 4045,  "udp"  },
+  { "acp-proto",       { NULL }, 4046,  "tcp"  },
+  { "acp-proto",       { NULL }, 4046,  "udp"  },
+  { "ctp-state",       { NULL }, 4047,  "tcp"  },
+  { "ctp-state",       { NULL }, 4047,  "udp"  },
+  { "wafs",            { NULL }, 4049,  "tcp"  },
+  { "wafs",            { NULL }, 4049,  "udp"  },
+  { "cisco-wafs",      { NULL }, 4050,  "tcp"  },
+  { "cisco-wafs",      { NULL }, 4050,  "udp"  },
+  { "cppdp",           { NULL }, 4051,  "tcp"  },
+  { "cppdp",           { NULL }, 4051,  "udp"  },
+  { "interact",        { NULL }, 4052,  "tcp"  },
+  { "interact",        { NULL }, 4052,  "udp"  },
+  { "ccu-comm-1",      { NULL }, 4053,  "tcp"  },
+  { "ccu-comm-1",      { NULL }, 4053,  "udp"  },
+  { "ccu-comm-2",      { NULL }, 4054,  "tcp"  },
+  { "ccu-comm-2",      { NULL }, 4054,  "udp"  },
+  { "ccu-comm-3",      { NULL }, 4055,  "tcp"  },
+  { "ccu-comm-3",      { NULL }, 4055,  "udp"  },
+  { "lms",             { NULL }, 4056,  "tcp"  },
+  { "lms",             { NULL }, 4056,  "udp"  },
+  { "wfm",             { NULL }, 4057,  "tcp"  },
+  { "wfm",             { NULL }, 4057,  "udp"  },
+  { "kingfisher",      { NULL }, 4058,  "tcp"  },
+  { "kingfisher",      { NULL }, 4058,  "udp"  },
+  { "dlms-cosem",      { NULL }, 4059,  "tcp"  },
+  { "dlms-cosem",      { NULL }, 4059,  "udp"  },
+  { "dsmeter_iatc",    { NULL }, 4060,  "tcp"  },
+  { "dsmeter_iatc",    { NULL }, 4060,  "udp"  },
+  { "ice-location",    { NULL }, 4061,  "tcp"  },
+  { "ice-location",    { NULL }, 4061,  "udp"  },
+  { "ice-slocation",   { NULL }, 4062,  "tcp"  },
+  { "ice-slocation",   { NULL }, 4062,  "udp"  },
+  { "ice-router",      { NULL }, 4063,  "tcp"  },
+  { "ice-router",      { NULL }, 4063,  "udp"  },
+  { "ice-srouter",     { NULL }, 4064,  "tcp"  },
+  { "ice-srouter",     { NULL }, 4064,  "udp"  },
+  { "avanti_cdp",      { NULL }, 4065,  "tcp"  },
+  { "avanti_cdp",      { NULL }, 4065,  "udp"  },
+  { "pmas",            { NULL }, 4066,  "tcp"  },
+  { "pmas",            { NULL }, 4066,  "udp"  },
+  { "idp",             { NULL }, 4067,  "tcp"  },
+  { "idp",             { NULL }, 4067,  "udp"  },
+  { "ipfltbcst",       { NULL }, 4068,  "tcp"  },
+  { "ipfltbcst",       { NULL }, 4068,  "udp"  },
+  { "minger",          { NULL }, 4069,  "tcp"  },
+  { "minger",          { NULL }, 4069,  "udp"  },
+  { "tripe",           { NULL }, 4070,  "tcp"  },
+  { "tripe",           { NULL }, 4070,  "udp"  },
+  { "aibkup",          { NULL }, 4071,  "tcp"  },
+  { "aibkup",          { NULL }, 4071,  "udp"  },
+  { "zieto-sock",      { NULL }, 4072,  "tcp"  },
+  { "zieto-sock",      { NULL }, 4072,  "udp"  },
+  { "iRAPP",           { NULL }, 4073,  "tcp"  },
+  { "iRAPP",           { NULL }, 4073,  "udp"  },
+  { "cequint-cityid",  { NULL }, 4074,  "tcp"  },
+  { "cequint-cityid",  { NULL }, 4074,  "udp"  },
+  { "perimlan",        { NULL }, 4075,  "tcp"  },
+  { "perimlan",        { NULL }, 4075,  "udp"  },
+  { "seraph",          { NULL }, 4076,  "tcp"  },
+  { "seraph",          { NULL }, 4076,  "udp"  },
+  { "ascomalarm",      { NULL }, 4077,  "udp"  },
+  { "cssp",            { NULL }, 4078,  "tcp"  },
+  { "santools",        { NULL }, 4079,  "tcp"  },
+  { "santools",        { NULL }, 4079,  "udp"  },
+  { "lorica-in",       { NULL }, 4080,  "tcp"  },
+  { "lorica-in",       { NULL }, 4080,  "udp"  },
+  { "lorica-in-sec",   { NULL }, 4081,  "tcp"  },
+  { "lorica-in-sec",   { NULL }, 4081,  "udp"  },
+  { "lorica-out",      { NULL }, 4082,  "tcp"  },
+  { "lorica-out",      { NULL }, 4082,  "udp"  },
+  { "lorica-out-sec",  { NULL }, 4083,  "tcp"  },
+  { "lorica-out-sec",  { NULL }, 4083,  "udp"  },
+  { "fortisphere-vm",  { NULL }, 4084,  "udp"  },
+  { "ezmessagesrv",    { NULL }, 4085,  "tcp"  },
+  { "ftsync",          { NULL }, 4086,  "udp"  },
+  { "applusservice",   { NULL }, 4087,  "tcp"  },
+  { "npsp",            { NULL }, 4088,  "tcp"  },
+  { "opencore",        { NULL }, 4089,  "tcp"  },
+  { "opencore",        { NULL }, 4089,  "udp"  },
+  { "omasgport",       { NULL }, 4090,  "tcp"  },
+  { "omasgport",       { NULL }, 4090,  "udp"  },
+  { "ewinstaller",     { NULL }, 4091,  "tcp"  },
+  { "ewinstaller",     { NULL }, 4091,  "udp"  },
+  { "ewdgs",           { NULL }, 4092,  "tcp"  },
+  { "ewdgs",           { NULL }, 4092,  "udp"  },
+  { "pvxpluscs",       { NULL }, 4093,  "tcp"  },
+  { "pvxpluscs",       { NULL }, 4093,  "udp"  },
+  { "sysrqd",          { NULL }, 4094,  "tcp"  },
+  { "sysrqd",          { NULL }, 4094,  "udp"  },
+  { "xtgui",           { NULL }, 4095,  "tcp"  },
+  { "xtgui",           { NULL }, 4095,  "udp"  },
+  { "bre",             { NULL }, 4096,  "tcp"  },
+  { "bre",             { NULL }, 4096,  "udp"  },
+  { "patrolview",      { NULL }, 4097,  "tcp"  },
+  { "patrolview",      { NULL }, 4097,  "udp"  },
+  { "drmsfsd",         { NULL }, 4098,  "tcp"  },
+  { "drmsfsd",         { NULL }, 4098,  "udp"  },
+  { "dpcp",            { NULL }, 4099,  "tcp"  },
+  { "dpcp",            { NULL }, 4099,  "udp"  },
+  { "igo-incognito",   { NULL }, 4100,  "tcp"  },
+  { "igo-incognito",   { NULL }, 4100,  "udp"  },
+  { "brlp-0",          { NULL }, 4101,  "tcp"  },
+  { "brlp-0",          { NULL }, 4101,  "udp"  },
+  { "brlp-1",          { NULL }, 4102,  "tcp"  },
+  { "brlp-1",          { NULL }, 4102,  "udp"  },
+  { "brlp-2",          { NULL }, 4103,  "tcp"  },
+  { "brlp-2",          { NULL }, 4103,  "udp"  },
+  { "brlp-3",          { NULL }, 4104,  "tcp"  },
+  { "brlp-3",          { NULL }, 4104,  "udp"  },
+  { "shofarplayer",    { NULL }, 4105,  "tcp"  },
+  { "shofarplayer",    { NULL }, 4105,  "udp"  },
+  { "synchronite",     { NULL }, 4106,  "tcp"  },
+  { "synchronite",     { NULL }, 4106,  "udp"  },
+  { "j-ac",            { NULL }, 4107,  "tcp"  },
+  { "j-ac",            { NULL }, 4107,  "udp"  },
+  { "accel",           { NULL }, 4108,  "tcp"  },
+  { "accel",           { NULL }, 4108,  "udp"  },
+  { "izm",             { NULL }, 4109,  "tcp"  },
+  { "izm",             { NULL }, 4109,  "udp"  },
+  { "g2tag",           { NULL }, 4110,  "tcp"  },
+  { "g2tag",           { NULL }, 4110,  "udp"  },
+  { "xgrid",           { NULL }, 4111,  "tcp"  },
+  { "xgrid",           { NULL }, 4111,  "udp"  },
+  { "apple-vpns-rp",   { NULL }, 4112,  "tcp"  },
+  { "apple-vpns-rp",   { NULL }, 4112,  "udp"  },
+  { "aipn-reg",        { NULL }, 4113,  "tcp"  },
+  { "aipn-reg",        { NULL }, 4113,  "udp"  },
+  { "jomamqmonitor",   { NULL }, 4114,  "tcp"  },
+  { "jomamqmonitor",   { NULL }, 4114,  "udp"  },
+  { "cds",             { NULL }, 4115,  "tcp"  },
+  { "cds",             { NULL }, 4115,  "udp"  },
+  { "smartcard-tls",   { NULL }, 4116,  "tcp"  },
+  { "smartcard-tls",   { NULL }, 4116,  "udp"  },
+  { "hillrserv",       { NULL }, 4117,  "tcp"  },
+  { "hillrserv",       { NULL }, 4117,  "udp"  },
+  { "netscript",       { NULL }, 4118,  "tcp"  },
+  { "netscript",       { NULL }, 4118,  "udp"  },
+  { "assuria-slm",     { NULL }, 4119,  "tcp"  },
+  { "assuria-slm",     { NULL }, 4119,  "udp"  },
+  { "e-builder",       { NULL }, 4121,  "tcp"  },
+  { "e-builder",       { NULL }, 4121,  "udp"  },
+  { "fprams",          { NULL }, 4122,  "tcp"  },
+  { "fprams",          { NULL }, 4122,  "udp"  },
+  { "z-wave",          { NULL }, 4123,  "tcp"  },
+  { "z-wave",          { NULL }, 4123,  "udp"  },
+  { "tigv2",           { NULL }, 4124,  "tcp"  },
+  { "tigv2",           { NULL }, 4124,  "udp"  },
+  { "opsview-envoy",   { NULL }, 4125,  "tcp"  },
+  { "opsview-envoy",   { NULL }, 4125,  "udp"  },
+  { "ddrepl",          { NULL }, 4126,  "tcp"  },
+  { "ddrepl",          { NULL }, 4126,  "udp"  },
+  { "unikeypro",       { NULL }, 4127,  "tcp"  },
+  { "unikeypro",       { NULL }, 4127,  "udp"  },
+  { "nufw",            { NULL }, 4128,  "tcp"  },
+  { "nufw",            { NULL }, 4128,  "udp"  },
+  { "nuauth",          { NULL }, 4129,  "tcp"  },
+  { "nuauth",          { NULL }, 4129,  "udp"  },
+  { "fronet",          { NULL }, 4130,  "tcp"  },
+  { "fronet",          { NULL }, 4130,  "udp"  },
+  { "stars",           { NULL }, 4131,  "tcp"  },
+  { "stars",           { NULL }, 4131,  "udp"  },
+  { "nuts_dem",        { NULL }, 4132,  "tcp"  },
+  { "nuts_dem",        { NULL }, 4132,  "udp"  },
+  { "nuts_bootp",      { NULL }, 4133,  "tcp"  },
+  { "nuts_bootp",      { NULL }, 4133,  "udp"  },
+  { "nifty-hmi",       { NULL }, 4134,  "tcp"  },
+  { "nifty-hmi",       { NULL }, 4134,  "udp"  },
+  { "cl-db-attach",    { NULL }, 4135,  "tcp"  },
+  { "cl-db-attach",    { NULL }, 4135,  "udp"  },
+  { "cl-db-request",   { NULL }, 4136,  "tcp"  },
+  { "cl-db-request",   { NULL }, 4136,  "udp"  },
+  { "cl-db-remote",    { NULL }, 4137,  "tcp"  },
+  { "cl-db-remote",    { NULL }, 4137,  "udp"  },
+  { "nettest",         { NULL }, 4138,  "tcp"  },
+  { "nettest",         { NULL }, 4138,  "udp"  },
+  { "thrtx",           { NULL }, 4139,  "tcp"  },
+  { "thrtx",           { NULL }, 4139,  "udp"  },
+  { "cedros_fds",      { NULL }, 4140,  "tcp"  },
+  { "cedros_fds",      { NULL }, 4140,  "udp"  },
+  { "oirtgsvc",        { NULL }, 4141,  "tcp"  },
+  { "oirtgsvc",        { NULL }, 4141,  "udp"  },
+  { "oidocsvc",        { NULL }, 4142,  "tcp"  },
+  { "oidocsvc",        { NULL }, 4142,  "udp"  },
+  { "oidsr",           { NULL }, 4143,  "tcp"  },
+  { "oidsr",           { NULL }, 4143,  "udp"  },
+  { "vvr-control",     { NULL }, 4145,  "tcp"  },
+  { "vvr-control",     { NULL }, 4145,  "udp"  },
+  { "tgcconnect",      { NULL }, 4146,  "tcp"  },
+  { "tgcconnect",      { NULL }, 4146,  "udp"  },
+  { "vrxpservman",     { NULL }, 4147,  "tcp"  },
+  { "vrxpservman",     { NULL }, 4147,  "udp"  },
+  { "hhb-handheld",    { NULL }, 4148,  "tcp"  },
+  { "hhb-handheld",    { NULL }, 4148,  "udp"  },
+  { "agslb",           { NULL }, 4149,  "tcp"  },
+  { "agslb",           { NULL }, 4149,  "udp"  },
+  { "PowerAlert-nsa",  { NULL }, 4150,  "tcp"  },
+  { "PowerAlert-nsa",  { NULL }, 4150,  "udp"  },
+  { "menandmice_noh",  { NULL }, 4151,  "tcp"  },
+  { "menandmice_noh",  { NULL }, 4151,  "udp"  },
+  { "idig_mux",        { NULL }, 4152,  "tcp"  },
+  { "idig_mux",        { NULL }, 4152,  "udp"  },
+  { "mbl-battd",       { NULL }, 4153,  "tcp"  },
+  { "mbl-battd",       { NULL }, 4153,  "udp"  },
+  { "atlinks",         { NULL }, 4154,  "tcp"  },
+  { "atlinks",         { NULL }, 4154,  "udp"  },
+  { "bzr",             { NULL }, 4155,  "tcp"  },
+  { "bzr",             { NULL }, 4155,  "udp"  },
+  { "stat-results",    { NULL }, 4156,  "tcp"  },
+  { "stat-results",    { NULL }, 4156,  "udp"  },
+  { "stat-scanner",    { NULL }, 4157,  "tcp"  },
+  { "stat-scanner",    { NULL }, 4157,  "udp"  },
+  { "stat-cc",         { NULL }, 4158,  "tcp"  },
+  { "stat-cc",         { NULL }, 4158,  "udp"  },
+  { "nss",             { NULL }, 4159,  "tcp"  },
+  { "nss",             { NULL }, 4159,  "udp"  },
+  { "jini-discovery",  { NULL }, 4160,  "tcp"  },
+  { "jini-discovery",  { NULL }, 4160,  "udp"  },
+  { "omscontact",      { NULL }, 4161,  "tcp"  },
+  { "omscontact",      { NULL }, 4161,  "udp"  },
+  { "omstopology",     { NULL }, 4162,  "tcp"  },
+  { "omstopology",     { NULL }, 4162,  "udp"  },
+  { "silverpeakpeer",  { NULL }, 4163,  "tcp"  },
+  { "silverpeakpeer",  { NULL }, 4163,  "udp"  },
+  { "silverpeakcomm",  { NULL }, 4164,  "tcp"  },
+  { "silverpeakcomm",  { NULL }, 4164,  "udp"  },
+  { "altcp",           { NULL }, 4165,  "tcp"  },
+  { "altcp",           { NULL }, 4165,  "udp"  },
+  { "joost",           { NULL }, 4166,  "tcp"  },
+  { "joost",           { NULL }, 4166,  "udp"  },
+  { "ddgn",            { NULL }, 4167,  "tcp"  },
+  { "ddgn",            { NULL }, 4167,  "udp"  },
+  { "pslicser",        { NULL }, 4168,  "tcp"  },
+  { "pslicser",        { NULL }, 4168,  "udp"  },
+  { "iadt",            { NULL }, 4169,  "tcp"  },
+  { "iadt-disc",       { NULL }, 4169,  "udp"  },
+  { "d-cinema-csp",    { NULL }, 4170,  "tcp"  },
+  { "ml-svnet",        { NULL }, 4171,  "tcp"  },
+  { "pcoip",           { NULL }, 4172,  "tcp"  },
+  { "pcoip",           { NULL }, 4172,  "udp"  },
+  { "smcluster",       { NULL }, 4174,  "tcp"  },
+  { "bccp",            { NULL }, 4175,  "tcp"  },
+  { "tl-ipcproxy",     { NULL }, 4176,  "tcp"  },
+  { "wello",           { NULL }, 4177,  "tcp"  },
+  { "wello",           { NULL }, 4177,  "udp"  },
+  { "storman",         { NULL }, 4178,  "tcp"  },
+  { "storman",         { NULL }, 4178,  "udp"  },
+  { "MaxumSP",         { NULL }, 4179,  "tcp"  },
+  { "MaxumSP",         { NULL }, 4179,  "udp"  },
+  { "httpx",           { NULL }, 4180,  "tcp"  },
+  { "httpx",           { NULL }, 4180,  "udp"  },
+  { "macbak",          { NULL }, 4181,  "tcp"  },
+  { "macbak",          { NULL }, 4181,  "udp"  },
+  { "pcptcpservice",   { NULL }, 4182,  "tcp"  },
+  { "pcptcpservice",   { NULL }, 4182,  "udp"  },
+  { "gmmp",            { NULL }, 4183,  "tcp"  },
+  { "gmmp",            { NULL }, 4183,  "udp"  },
+  { "universe_suite",  { NULL }, 4184,  "tcp"  },
+  { "universe_suite",  { NULL }, 4184,  "udp"  },
+  { "wcpp",            { NULL }, 4185,  "tcp"  },
+  { "wcpp",            { NULL }, 4185,  "udp"  },
+  { "boxbackupstore",  { NULL }, 4186,  "tcp"  },
+  { "csc_proxy",       { NULL }, 4187,  "tcp"  },
+  { "vatata",          { NULL }, 4188,  "tcp"  },
+  { "vatata",          { NULL }, 4188,  "udp"  },
+  { "pcep",            { NULL }, 4189,  "tcp"  },
+  { "sieve",           { NULL }, 4190,  "tcp"  },
+  { "dsmipv6",         { NULL }, 4191,  "udp"  },
+  { "azeti",           { NULL }, 4192,  "tcp"  },
+  { "azeti-bd",        { NULL }, 4192,  "udp"  },
+  { "pvxplusio",       { NULL }, 4193,  "tcp"  },
+  { "eims-admin",      { NULL }, 4199,  "tcp"  },
+  { "eims-admin",      { NULL }, 4199,  "udp"  },
+  { "corelccam",       { NULL }, 4300,  "tcp"  },
+  { "corelccam",       { NULL }, 4300,  "udp"  },
+  { "d-data",          { NULL }, 4301,  "tcp"  },
+  { "d-data",          { NULL }, 4301,  "udp"  },
+  { "d-data-control",  { NULL }, 4302,  "tcp"  },
+  { "d-data-control",  { NULL }, 4302,  "udp"  },
+  { "srcp",            { NULL }, 4303,  "tcp"  },
+  { "srcp",            { NULL }, 4303,  "udp"  },
+  { "owserver",        { NULL }, 4304,  "tcp"  },
+  { "owserver",        { NULL }, 4304,  "udp"  },
+  { "batman",          { NULL }, 4305,  "tcp"  },
+  { "batman",          { NULL }, 4305,  "udp"  },
+  { "pinghgl",         { NULL }, 4306,  "tcp"  },
+  { "pinghgl",         { NULL }, 4306,  "udp"  },
+  { "visicron-vs",     { NULL }, 4307,  "tcp"  },
+  { "visicron-vs",     { NULL }, 4307,  "udp"  },
+  { "compx-lockview",  { NULL }, 4308,  "tcp"  },
+  { "compx-lockview",  { NULL }, 4308,  "udp"  },
+  { "dserver",         { NULL }, 4309,  "tcp"  },
+  { "dserver",         { NULL }, 4309,  "udp"  },
+  { "mirrtex",         { NULL }, 4310,  "tcp"  },
+  { "mirrtex",         { NULL }, 4310,  "udp"  },
+  { "p6ssmc",          { NULL }, 4311,  "tcp"  },
+  { "pscl-mgt",        { NULL }, 4312,  "tcp"  },
+  { "perrla",          { NULL }, 4313,  "tcp"  },
+  { "fdt-rcatp",       { NULL }, 4320,  "tcp"  },
+  { "fdt-rcatp",       { NULL }, 4320,  "udp"  },
+  { "rwhois",          { NULL }, 4321,  "tcp"  },
+  { "rwhois",          { NULL }, 4321,  "udp"  },
+  { "trim-event",      { NULL }, 4322,  "tcp"  },
+  { "trim-event",      { NULL }, 4322,  "udp"  },
+  { "trim-ice",        { NULL }, 4323,  "tcp"  },
+  { "trim-ice",        { NULL }, 4323,  "udp"  },
+  { "balour",          { NULL }, 4324,  "tcp"  },
+  { "balour",          { NULL }, 4324,  "udp"  },
+  { "geognosisman",    { NULL }, 4325,  "tcp"  },
+  { "geognosisman",    { NULL }, 4325,  "udp"  },
+  { "geognosis",       { NULL }, 4326,  "tcp"  },
+  { "geognosis",       { NULL }, 4326,  "udp"  },
+  { "jaxer-web",       { NULL }, 4327,  "tcp"  },
+  { "jaxer-web",       { NULL }, 4327,  "udp"  },
+  { "jaxer-manager",   { NULL }, 4328,  "tcp"  },
+  { "jaxer-manager",   { NULL }, 4328,  "udp"  },
+  { "publiqare-sync",  { NULL }, 4329,  "tcp"  },
+  { "gaia",            { NULL }, 4340,  "tcp"  },
+  { "gaia",            { NULL }, 4340,  "udp"  },
+  { "lisp-data",       { NULL }, 4341,  "tcp"  },
+  { "lisp-data",       { NULL }, 4341,  "udp"  },
+  { "lisp-cons",       { NULL }, 4342,  "tcp"  },
+  { "lisp-control",    { NULL }, 4342,  "udp"  },
+  { "unicall",         { NULL }, 4343,  "tcp"  },
+  { "unicall",         { NULL }, 4343,  "udp"  },
+  { "vinainstall",     { NULL }, 4344,  "tcp"  },
+  { "vinainstall",     { NULL }, 4344,  "udp"  },
+  { "m4-network-as",   { NULL }, 4345,  "tcp"  },
+  { "m4-network-as",   { NULL }, 4345,  "udp"  },
+  { "elanlm",          { NULL }, 4346,  "tcp"  },
+  { "elanlm",          { NULL }, 4346,  "udp"  },
+  { "lansurveyor",     { NULL }, 4347,  "tcp"  },
+  { "lansurveyor",     { NULL }, 4347,  "udp"  },
+  { "itose",           { NULL }, 4348,  "tcp"  },
+  { "itose",           { NULL }, 4348,  "udp"  },
+  { "fsportmap",       { NULL }, 4349,  "tcp"  },
+  { "fsportmap",       { NULL }, 4349,  "udp"  },
+  { "net-device",      { NULL }, 4350,  "tcp"  },
+  { "net-device",      { NULL }, 4350,  "udp"  },
+  { "plcy-net-svcs",   { NULL }, 4351,  "tcp"  },
+  { "plcy-net-svcs",   { NULL }, 4351,  "udp"  },
+  { "pjlink",          { NULL }, 4352,  "tcp"  },
+  { "pjlink",          { NULL }, 4352,  "udp"  },
+  { "f5-iquery",       { NULL }, 4353,  "tcp"  },
+  { "f5-iquery",       { NULL }, 4353,  "udp"  },
+  { "qsnet-trans",     { NULL }, 4354,  "tcp"  },
+  { "qsnet-trans",     { NULL }, 4354,  "udp"  },
+  { "qsnet-workst",    { NULL }, 4355,  "tcp"  },
+  { "qsnet-workst",    { NULL }, 4355,  "udp"  },
+  { "qsnet-assist",    { NULL }, 4356,  "tcp"  },
+  { "qsnet-assist",    { NULL }, 4356,  "udp"  },
+  { "qsnet-cond",      { NULL }, 4357,  "tcp"  },
+  { "qsnet-cond",      { NULL }, 4357,  "udp"  },
+  { "qsnet-nucl",      { NULL }, 4358,  "tcp"  },
+  { "qsnet-nucl",      { NULL }, 4358,  "udp"  },
+  { "omabcastltkm",    { NULL }, 4359,  "tcp"  },
+  { "omabcastltkm",    { NULL }, 4359,  "udp"  },
+  { "matrix_vnet",     { NULL }, 4360,  "tcp"  },
+  { "nacnl",           { NULL }, 4361,  "udp"  },
+  { "afore-vdp-disc",  { NULL }, 4362,  "udp"  },
+  { "wxbrief",         { NULL }, 4368,  "tcp"  },
+  { "wxbrief",         { NULL }, 4368,  "udp"  },
+  { "epmd",            { NULL }, 4369,  "tcp"  },
+  { "epmd",            { NULL }, 4369,  "udp"  },
+  { "elpro_tunnel",    { NULL }, 4370,  "tcp"  },
+  { "elpro_tunnel",    { NULL }, 4370,  "udp"  },
+  { "l2c-control",     { NULL }, 4371,  "tcp"  },
+  { "l2c-disc",        { NULL }, 4371,  "udp"  },
+  { "l2c-data",        { NULL }, 4372,  "tcp"  },
+  { "l2c-data",        { NULL }, 4372,  "udp"  },
+  { "remctl",          { NULL }, 4373,  "tcp"  },
+  { "remctl",          { NULL }, 4373,  "udp"  },
+  { "psi-ptt",         { NULL }, 4374,  "tcp"  },
+  { "tolteces",        { NULL }, 4375,  "tcp"  },
+  { "tolteces",        { NULL }, 4375,  "udp"  },
+  { "bip",             { NULL }, 4376,  "tcp"  },
+  { "bip",             { NULL }, 4376,  "udp"  },
+  { "cp-spxsvr",       { NULL }, 4377,  "tcp"  },
+  { "cp-spxsvr",       { NULL }, 4377,  "udp"  },
+  { "cp-spxdpy",       { NULL }, 4378,  "tcp"  },
+  { "cp-spxdpy",       { NULL }, 4378,  "udp"  },
+  { "ctdb",            { NULL }, 4379,  "tcp"  },
+  { "ctdb",            { NULL }, 4379,  "udp"  },
+  { "xandros-cms",     { NULL }, 4389,  "tcp"  },
+  { "xandros-cms",     { NULL }, 4389,  "udp"  },
+  { "wiegand",         { NULL }, 4390,  "tcp"  },
+  { "wiegand",         { NULL }, 4390,  "udp"  },
+  { "apwi-imserver",   { NULL }, 4391,  "tcp"  },
+  { "apwi-rxserver",   { NULL }, 4392,  "tcp"  },
+  { "apwi-rxspooler",  { NULL }, 4393,  "tcp"  },
+  { "apwi-disc",       { NULL }, 4394,  "udp"  },
+  { "omnivisionesx",   { NULL }, 4395,  "tcp"  },
+  { "omnivisionesx",   { NULL }, 4395,  "udp"  },
+  { "fly",             { NULL }, 4396,  "tcp"  },
+  { "ds-srv",          { NULL }, 4400,  "tcp"  },
+  { "ds-srv",          { NULL }, 4400,  "udp"  },
+  { "ds-srvr",         { NULL }, 4401,  "tcp"  },
+  { "ds-srvr",         { NULL }, 4401,  "udp"  },
+  { "ds-clnt",         { NULL }, 4402,  "tcp"  },
+  { "ds-clnt",         { NULL }, 4402,  "udp"  },
+  { "ds-user",         { NULL }, 4403,  "tcp"  },
+  { "ds-user",         { NULL }, 4403,  "udp"  },
+  { "ds-admin",        { NULL }, 4404,  "tcp"  },
+  { "ds-admin",        { NULL }, 4404,  "udp"  },
+  { "ds-mail",         { NULL }, 4405,  "tcp"  },
+  { "ds-mail",         { NULL }, 4405,  "udp"  },
+  { "ds-slp",          { NULL }, 4406,  "tcp"  },
+  { "ds-slp",          { NULL }, 4406,  "udp"  },
+  { "nacagent",        { NULL }, 4407,  "tcp"  },
+  { "slscc",           { NULL }, 4408,  "tcp"  },
+  { "netcabinet-com",  { NULL }, 4409,  "tcp"  },
+  { "itwo-server",     { NULL }, 4410,  "tcp"  },
+  { "netrockey6",      { NULL }, 4425,  "tcp"  },
+  { "netrockey6",      { NULL }, 4425,  "udp"  },
+  { "beacon-port-2",   { NULL }, 4426,  "tcp"  },
+  { "beacon-port-2",   { NULL }, 4426,  "udp"  },
+  { "drizzle",         { NULL }, 4427,  "tcp"  },
+  { "omviserver",      { NULL }, 4428,  "tcp"  },
+  { "omviagent",       { NULL }, 4429,  "tcp"  },
+  { "rsqlserver",      { NULL }, 4430,  "tcp"  },
+  { "rsqlserver",      { NULL }, 4430,  "udp"  },
+  { "wspipe",          { NULL }, 4431,  "tcp"  },
+  { "netblox",         { NULL }, 4441,  "udp"  },
+  { "saris",           { NULL }, 4442,  "tcp"  },
+  { "saris",           { NULL }, 4442,  "udp"  },
+  { "pharos",          { NULL }, 4443,  "tcp"  },
+  { "pharos",          { NULL }, 4443,  "udp"  },
+  { "krb524",          { NULL }, 4444,  "tcp"  },
+  { "krb524",          { NULL }, 4444,  "udp"  },
+  { "nv-video",        { NULL }, 4444,  "tcp"  },
+  { "nv-video",        { NULL }, 4444,  "udp"  },
+  { "upnotifyp",       { NULL }, 4445,  "tcp"  },
+  { "upnotifyp",       { NULL }, 4445,  "udp"  },
+  { "n1-fwp",          { NULL }, 4446,  "tcp"  },
+  { "n1-fwp",          { NULL }, 4446,  "udp"  },
+  { "n1-rmgmt",        { NULL }, 4447,  "tcp"  },
+  { "n1-rmgmt",        { NULL }, 4447,  "udp"  },
+  { "asc-slmd",        { NULL }, 4448,  "tcp"  },
+  { "asc-slmd",        { NULL }, 4448,  "udp"  },
+  { "privatewire",     { NULL }, 4449,  "tcp"  },
+  { "privatewire",     { NULL }, 4449,  "udp"  },
+  { "camp",            { NULL }, 4450,  "tcp"  },
+  { "camp",            { NULL }, 4450,  "udp"  },
+  { "ctisystemmsg",    { NULL }, 4451,  "tcp"  },
+  { "ctisystemmsg",    { NULL }, 4451,  "udp"  },
+  { "ctiprogramload",  { NULL }, 4452,  "tcp"  },
+  { "ctiprogramload",  { NULL }, 4452,  "udp"  },
+  { "nssalertmgr",     { NULL }, 4453,  "tcp"  },
+  { "nssalertmgr",     { NULL }, 4453,  "udp"  },
+  { "nssagentmgr",     { NULL }, 4454,  "tcp"  },
+  { "nssagentmgr",     { NULL }, 4454,  "udp"  },
+  { "prchat-user",     { NULL }, 4455,  "tcp"  },
+  { "prchat-user",     { NULL }, 4455,  "udp"  },
+  { "prchat-server",   { NULL }, 4456,  "tcp"  },
+  { "prchat-server",   { NULL }, 4456,  "udp"  },
+  { "prRegister",      { NULL }, 4457,  "tcp"  },
+  { "prRegister",      { NULL }, 4457,  "udp"  },
+  { "mcp",             { NULL }, 4458,  "tcp"  },
+  { "mcp",             { NULL }, 4458,  "udp"  },
+  { "hpssmgmt",        { NULL }, 4484,  "tcp"  },
+  { "hpssmgmt",        { NULL }, 4484,  "udp"  },
+  { "assyst-dr",       { NULL }, 4485,  "tcp"  },
+  { "icms",            { NULL }, 4486,  "tcp"  },
+  { "icms",            { NULL }, 4486,  "udp"  },
+  { "prex-tcp",        { NULL }, 4487,  "tcp"  },
+  { "awacs-ice",       { NULL }, 4488,  "tcp"  },
+  { "awacs-ice",       { NULL }, 4488,  "udp"  },
+  { "ipsec-nat-t",     { NULL }, 4500,  "tcp"  },
+  { "ipsec-nat-t",     { NULL }, 4500,  "udp"  },
+  { "ehs",             { NULL }, 4535,  "tcp"  },
+  { "ehs",             { NULL }, 4535,  "udp"  },
+  { "ehs-ssl",         { NULL }, 4536,  "tcp"  },
+  { "ehs-ssl",         { NULL }, 4536,  "udp"  },
+  { "wssauthsvc",      { NULL }, 4537,  "tcp"  },
+  { "wssauthsvc",      { NULL }, 4537,  "udp"  },
+  { "swx-gate",        { NULL }, 4538,  "tcp"  },
+  { "swx-gate",        { NULL }, 4538,  "udp"  },
+  { "worldscores",     { NULL }, 4545,  "tcp"  },
+  { "worldscores",     { NULL }, 4545,  "udp"  },
+  { "sf-lm",           { NULL }, 4546,  "tcp"  },
+  { "sf-lm",           { NULL }, 4546,  "udp"  },
+  { "lanner-lm",       { NULL }, 4547,  "tcp"  },
+  { "lanner-lm",       { NULL }, 4547,  "udp"  },
+  { "synchromesh",     { NULL }, 4548,  "tcp"  },
+  { "synchromesh",     { NULL }, 4548,  "udp"  },
+  { "aegate",          { NULL }, 4549,  "tcp"  },
+  { "aegate",          { NULL }, 4549,  "udp"  },
+  { "gds-adppiw-db",   { NULL }, 4550,  "tcp"  },
+  { "gds-adppiw-db",   { NULL }, 4550,  "udp"  },
+  { "ieee-mih",        { NULL }, 4551,  "tcp"  },
+  { "ieee-mih",        { NULL }, 4551,  "udp"  },
+  { "menandmice-mon",  { NULL }, 4552,  "tcp"  },
+  { "menandmice-mon",  { NULL }, 4552,  "udp"  },
+  { "icshostsvc",      { NULL }, 4553,  "tcp"  },
+  { "msfrs",           { NULL }, 4554,  "tcp"  },
+  { "msfrs",           { NULL }, 4554,  "udp"  },
+  { "rsip",            { NULL }, 4555,  "tcp"  },
+  { "rsip",            { NULL }, 4555,  "udp"  },
+  { "dtn-bundle-tcp",  { NULL }, 4556,  "tcp"  },
+  { "dtn-bundle-udp",  { NULL }, 4556,  "udp"  },
+  { "mtcevrunqss",     { NULL }, 4557,  "udp"  },
+  { "mtcevrunqman",    { NULL }, 4558,  "udp"  },
+  { "hylafax",         { NULL }, 4559,  "tcp"  },
+  { "hylafax",         { NULL }, 4559,  "udp"  },
+  { "kwtc",            { NULL }, 4566,  "tcp"  },
+  { "kwtc",            { NULL }, 4566,  "udp"  },
+  { "tram",            { NULL }, 4567,  "tcp"  },
+  { "tram",            { NULL }, 4567,  "udp"  },
+  { "bmc-reporting",   { NULL }, 4568,  "tcp"  },
+  { "bmc-reporting",   { NULL }, 4568,  "udp"  },
+  { "iax",             { NULL }, 4569,  "tcp"  },
+  { "iax",             { NULL }, 4569,  "udp"  },
+  { "rid",             { NULL }, 4590,  "tcp"  },
+  { "l3t-at-an",       { NULL }, 4591,  "tcp"  },
+  { "l3t-at-an",       { NULL }, 4591,  "udp"  },
+  { "hrpd-ith-at-an",  { NULL }, 4592,  "udp"  },
+  { "ipt-anri-anri",   { NULL }, 4593,  "tcp"  },
+  { "ipt-anri-anri",   { NULL }, 4593,  "udp"  },
+  { "ias-session",     { NULL }, 4594,  "tcp"  },
+  { "ias-session",     { NULL }, 4594,  "udp"  },
+  { "ias-paging",      { NULL }, 4595,  "tcp"  },
+  { "ias-paging",      { NULL }, 4595,  "udp"  },
+  { "ias-neighbor",    { NULL }, 4596,  "tcp"  },
+  { "ias-neighbor",    { NULL }, 4596,  "udp"  },
+  { "a21-an-1xbs",     { NULL }, 4597,  "tcp"  },
+  { "a21-an-1xbs",     { NULL }, 4597,  "udp"  },
+  { "a16-an-an",       { NULL }, 4598,  "tcp"  },
+  { "a16-an-an",       { NULL }, 4598,  "udp"  },
+  { "a17-an-an",       { NULL }, 4599,  "tcp"  },
+  { "a17-an-an",       { NULL }, 4599,  "udp"  },
+  { "piranha1",        { NULL }, 4600,  "tcp"  },
+  { "piranha1",        { NULL }, 4600,  "udp"  },
+  { "piranha2",        { NULL }, 4601,  "tcp"  },
+  { "piranha2",        { NULL }, 4601,  "udp"  },
+  { "mtsserver",       { NULL }, 4602,  "tcp"  },
+  { "menandmice-upg",  { NULL }, 4603,  "tcp"  },
+  { "playsta2-app",    { NULL }, 4658,  "tcp"  },
+  { "playsta2-app",    { NULL }, 4658,  "udp"  },
+  { "playsta2-lob",    { NULL }, 4659,  "tcp"  },
+  { "playsta2-lob",    { NULL }, 4659,  "udp"  },
+  { "smaclmgr",        { NULL }, 4660,  "tcp"  },
+  { "smaclmgr",        { NULL }, 4660,  "udp"  },
+  { "kar2ouche",       { NULL }, 4661,  "tcp"  },
+  { "kar2ouche",       { NULL }, 4661,  "udp"  },
+  { "oms",             { NULL }, 4662,  "tcp"  },
+  { "oms",             { NULL }, 4662,  "udp"  },
+  { "noteit",          { NULL }, 4663,  "tcp"  },
+  { "noteit",          { NULL }, 4663,  "udp"  },
+  { "ems",             { NULL }, 4664,  "tcp"  },
+  { "ems",             { NULL }, 4664,  "udp"  },
+  { "contclientms",    { NULL }, 4665,  "tcp"  },
+  { "contclientms",    { NULL }, 4665,  "udp"  },
+  { "eportcomm",       { NULL }, 4666,  "tcp"  },
+  { "eportcomm",       { NULL }, 4666,  "udp"  },
+  { "mmacomm",         { NULL }, 4667,  "tcp"  },
+  { "mmacomm",         { NULL }, 4667,  "udp"  },
+  { "mmaeds",          { NULL }, 4668,  "tcp"  },
+  { "mmaeds",          { NULL }, 4668,  "udp"  },
+  { "eportcommdata",   { NULL }, 4669,  "tcp"  },
+  { "eportcommdata",   { NULL }, 4669,  "udp"  },
+  { "light",           { NULL }, 4670,  "tcp"  },
+  { "light",           { NULL }, 4670,  "udp"  },
+  { "acter",           { NULL }, 4671,  "tcp"  },
+  { "acter",           { NULL }, 4671,  "udp"  },
+  { "rfa",             { NULL }, 4672,  "tcp"  },
+  { "rfa",             { NULL }, 4672,  "udp"  },
+  { "cxws",            { NULL }, 4673,  "tcp"  },
+  { "cxws",            { NULL }, 4673,  "udp"  },
+  { "appiq-mgmt",      { NULL }, 4674,  "tcp"  },
+  { "appiq-mgmt",      { NULL }, 4674,  "udp"  },
+  { "dhct-status",     { NULL }, 4675,  "tcp"  },
+  { "dhct-status",     { NULL }, 4675,  "udp"  },
+  { "dhct-alerts",     { NULL }, 4676,  "tcp"  },
+  { "dhct-alerts",     { NULL }, 4676,  "udp"  },
+  { "bcs",             { NULL }, 4677,  "tcp"  },
+  { "bcs",             { NULL }, 4677,  "udp"  },
+  { "traversal",       { NULL }, 4678,  "tcp"  },
+  { "traversal",       { NULL }, 4678,  "udp"  },
+  { "mgesupervision",  { NULL }, 4679,  "tcp"  },
+  { "mgesupervision",  { NULL }, 4679,  "udp"  },
+  { "mgemanagement",   { NULL }, 4680,  "tcp"  },
+  { "mgemanagement",   { NULL }, 4680,  "udp"  },
+  { "parliant",        { NULL }, 4681,  "tcp"  },
+  { "parliant",        { NULL }, 4681,  "udp"  },
+  { "finisar",         { NULL }, 4682,  "tcp"  },
+  { "finisar",         { NULL }, 4682,  "udp"  },
+  { "spike",           { NULL }, 4683,  "tcp"  },
+  { "spike",           { NULL }, 4683,  "udp"  },
+  { "rfid-rp1",        { NULL }, 4684,  "tcp"  },
+  { "rfid-rp1",        { NULL }, 4684,  "udp"  },
+  { "autopac",         { NULL }, 4685,  "tcp"  },
+  { "autopac",         { NULL }, 4685,  "udp"  },
+  { "msp-os",          { NULL }, 4686,  "tcp"  },
+  { "msp-os",          { NULL }, 4686,  "udp"  },
+  { "nst",             { NULL }, 4687,  "tcp"  },
+  { "nst",             { NULL }, 4687,  "udp"  },
+  { "mobile-p2p",      { NULL }, 4688,  "tcp"  },
+  { "mobile-p2p",      { NULL }, 4688,  "udp"  },
+  { "altovacentral",   { NULL }, 4689,  "tcp"  },
+  { "altovacentral",   { NULL }, 4689,  "udp"  },
+  { "prelude",         { NULL }, 4690,  "tcp"  },
+  { "prelude",         { NULL }, 4690,  "udp"  },
+  { "mtn",             { NULL }, 4691,  "tcp"  },
+  { "mtn",             { NULL }, 4691,  "udp"  },
+  { "conspiracy",      { NULL }, 4692,  "tcp"  },
+  { "conspiracy",      { NULL }, 4692,  "udp"  },
+  { "netxms-agent",    { NULL }, 4700,  "tcp"  },
+  { "netxms-agent",    { NULL }, 4700,  "udp"  },
+  { "netxms-mgmt",     { NULL }, 4701,  "tcp"  },
+  { "netxms-mgmt",     { NULL }, 4701,  "udp"  },
+  { "netxms-sync",     { NULL }, 4702,  "tcp"  },
+  { "netxms-sync",     { NULL }, 4702,  "udp"  },
+  { "npqes-test",      { NULL }, 4703,  "tcp"  },
+  { "assuria-ins",     { NULL }, 4704,  "tcp"  },
+  { "truckstar",       { NULL }, 4725,  "tcp"  },
+  { "truckstar",       { NULL }, 4725,  "udp"  },
+  { "a26-fap-fgw",     { NULL }, 4726,  "udp"  },
+  { "fcis",            { NULL }, 4727,  "tcp"  },
+  { "fcis-disc",       { NULL }, 4727,  "udp"  },
+  { "capmux",          { NULL }, 4728,  "tcp"  },
+  { "capmux",          { NULL }, 4728,  "udp"  },
+  { "gsmtap",          { NULL }, 4729,  "udp"  },
+  { "gearman",         { NULL }, 4730,  "tcp"  },
+  { "gearman",         { NULL }, 4730,  "udp"  },
+  { "remcap",          { NULL }, 4731,  "tcp"  },
+  { "ohmtrigger",      { NULL }, 4732,  "udp"  },
+  { "resorcs",         { NULL }, 4733,  "tcp"  },
+  { "ipdr-sp",         { NULL }, 4737,  "tcp"  },
+  { "ipdr-sp",         { NULL }, 4737,  "udp"  },
+  { "solera-lpn",      { NULL }, 4738,  "tcp"  },
+  { "solera-lpn",      { NULL }, 4738,  "udp"  },
+  { "ipfix",           { NULL }, 4739,  "tcp"  },
+  { "ipfix",           { NULL }, 4739,  "udp"  },
+  { "ipfix",           { NULL }, 4739,  "sctp" },
+  { "ipfixs",          { NULL }, 4740,  "tcp"  },
+  { "ipfixs",          { NULL }, 4740,  "sctp" },
+  { "ipfixs",          { NULL }, 4740,  "udp"  },
+  { "lumimgrd",        { NULL }, 4741,  "tcp"  },
+  { "lumimgrd",        { NULL }, 4741,  "udp"  },
+  { "sicct",           { NULL }, 4742,  "tcp"  },
+  { "sicct-sdp",       { NULL }, 4742,  "udp"  },
+  { "openhpid",        { NULL }, 4743,  "tcp"  },
+  { "openhpid",        { NULL }, 4743,  "udp"  },
+  { "ifsp",            { NULL }, 4744,  "tcp"  },
+  { "ifsp",            { NULL }, 4744,  "udp"  },
+  { "fmp",             { NULL }, 4745,  "tcp"  },
+  { "fmp",             { NULL }, 4745,  "udp"  },
+  { "profilemac",      { NULL }, 4749,  "tcp"  },
+  { "profilemac",      { NULL }, 4749,  "udp"  },
+  { "ssad",            { NULL }, 4750,  "tcp"  },
+  { "ssad",            { NULL }, 4750,  "udp"  },
+  { "spocp",           { NULL }, 4751,  "tcp"  },
+  { "spocp",           { NULL }, 4751,  "udp"  },
+  { "snap",            { NULL }, 4752,  "tcp"  },
+  { "snap",            { NULL }, 4752,  "udp"  },
+  { "bfd-multi-ctl",   { NULL }, 4784,  "tcp"  },
+  { "bfd-multi-ctl",   { NULL }, 4784,  "udp"  },
+  { "cncp",            { NULL }, 4785,  "udp"  },
+  { "smart-install",   { NULL }, 4786,  "tcp"  },
+  { "sia-ctrl-plane",  { NULL }, 4787,  "tcp"  },
+  { "iims",            { NULL }, 4800,  "tcp"  },
+  { "iims",            { NULL }, 4800,  "udp"  },
+  { "iwec",            { NULL }, 4801,  "tcp"  },
+  { "iwec",            { NULL }, 4801,  "udp"  },
+  { "ilss",            { NULL }, 4802,  "tcp"  },
+  { "ilss",            { NULL }, 4802,  "udp"  },
+  { "notateit",        { NULL }, 4803,  "tcp"  },
+  { "notateit-disc",   { NULL }, 4803,  "udp"  },
+  { "aja-ntv4-disc",   { NULL }, 4804,  "udp"  },
+  { "htcp",            { NULL }, 4827,  "tcp"  },
+  { "htcp",            { NULL }, 4827,  "udp"  },
+  { "varadero-0",      { NULL }, 4837,  "tcp"  },
+  { "varadero-0",      { NULL }, 4837,  "udp"  },
+  { "varadero-1",      { NULL }, 4838,  "tcp"  },
+  { "varadero-1",      { NULL }, 4838,  "udp"  },
+  { "varadero-2",      { NULL }, 4839,  "tcp"  },
+  { "varadero-2",      { NULL }, 4839,  "udp"  },
+  { "opcua-tcp",       { NULL }, 4840,  "tcp"  },
+  { "opcua-udp",       { NULL }, 4840,  "udp"  },
+  { "quosa",           { NULL }, 4841,  "tcp"  },
+  { "quosa",           { NULL }, 4841,  "udp"  },
+  { "gw-asv",          { NULL }, 4842,  "tcp"  },
+  { "gw-asv",          { NULL }, 4842,  "udp"  },
+  { "opcua-tls",       { NULL }, 4843,  "tcp"  },
+  { "opcua-tls",       { NULL }, 4843,  "udp"  },
+  { "gw-log",          { NULL }, 4844,  "tcp"  },
+  { "gw-log",          { NULL }, 4844,  "udp"  },
+  { "wcr-remlib",      { NULL }, 4845,  "tcp"  },
+  { "wcr-remlib",      { NULL }, 4845,  "udp"  },
+  { "contamac_icm",    { NULL }, 4846,  "tcp"  },
+  { "contamac_icm",    { NULL }, 4846,  "udp"  },
+  { "wfc",             { NULL }, 4847,  "tcp"  },
+  { "wfc",             { NULL }, 4847,  "udp"  },
+  { "appserv-http",    { NULL }, 4848,  "tcp"  },
+  { "appserv-http",    { NULL }, 4848,  "udp"  },
+  { "appserv-https",   { NULL }, 4849,  "tcp"  },
+  { "appserv-https",   { NULL }, 4849,  "udp"  },
+  { "sun-as-nodeagt",  { NULL }, 4850,  "tcp"  },
+  { "sun-as-nodeagt",  { NULL }, 4850,  "udp"  },
+  { "derby-repli",     { NULL }, 4851,  "tcp"  },
+  { "derby-repli",     { NULL }, 4851,  "udp"  },
+  { "unify-debug",     { NULL }, 4867,  "tcp"  },
+  { "unify-debug",     { NULL }, 4867,  "udp"  },
+  { "phrelay",         { NULL }, 4868,  "tcp"  },
+  { "phrelay",         { NULL }, 4868,  "udp"  },
+  { "phrelaydbg",      { NULL }, 4869,  "tcp"  },
+  { "phrelaydbg",      { NULL }, 4869,  "udp"  },
+  { "cc-tracking",     { NULL }, 4870,  "tcp"  },
+  { "cc-tracking",     { NULL }, 4870,  "udp"  },
+  { "wired",           { NULL }, 4871,  "tcp"  },
+  { "wired",           { NULL }, 4871,  "udp"  },
+  { "tritium-can",     { NULL }, 4876,  "tcp"  },
+  { "tritium-can",     { NULL }, 4876,  "udp"  },
+  { "lmcs",            { NULL }, 4877,  "tcp"  },
+  { "lmcs",            { NULL }, 4877,  "udp"  },
+  { "inst-discovery",  { NULL }, 4878,  "udp"  },
+  { "wsdl-event",      { NULL }, 4879,  "tcp"  },
+  { "hislip",          { NULL }, 4880,  "tcp"  },
+  { "socp-t",          { NULL }, 4881,  "udp"  },
+  { "socp-c",          { NULL }, 4882,  "udp"  },
+  { "wmlserver",       { NULL }, 4883,  "tcp"  },
+  { "hivestor",        { NULL }, 4884,  "tcp"  },
+  { "hivestor",        { NULL }, 4884,  "udp"  },
+  { "abbs",            { NULL }, 4885,  "tcp"  },
+  { "abbs",            { NULL }, 4885,  "udp"  },
+  { "lyskom",          { NULL }, 4894,  "tcp"  },
+  { "lyskom",          { NULL }, 4894,  "udp"  },
+  { "radmin-port",     { NULL }, 4899,  "tcp"  },
+  { "radmin-port",     { NULL }, 4899,  "udp"  },
+  { "hfcs",            { NULL }, 4900,  "tcp"  },
+  { "hfcs",            { NULL }, 4900,  "udp"  },
+  { "flr_agent",       { NULL }, 4901,  "tcp"  },
+  { "magiccontrol",    { NULL }, 4902,  "tcp"  },
+  { "lutap",           { NULL }, 4912,  "tcp"  },
+  { "lutcp",           { NULL }, 4913,  "tcp"  },
+  { "bones",           { NULL }, 4914,  "tcp"  },
+  { "bones",           { NULL }, 4914,  "udp"  },
+  { "frcs",            { NULL }, 4915,  "tcp"  },
+  { "atsc-mh-ssc",     { NULL }, 4937,  "udp"  },
+  { "eq-office-4940",  { NULL }, 4940,  "tcp"  },
+  { "eq-office-4940",  { NULL }, 4940,  "udp"  },
+  { "eq-office-4941",  { NULL }, 4941,  "tcp"  },
+  { "eq-office-4941",  { NULL }, 4941,  "udp"  },
+  { "eq-office-4942",  { NULL }, 4942,  "tcp"  },
+  { "eq-office-4942",  { NULL }, 4942,  "udp"  },
+  { "munin",           { NULL }, 4949,  "tcp"  },
+  { "munin",           { NULL }, 4949,  "udp"  },
+  { "sybasesrvmon",    { NULL }, 4950,  "tcp"  },
+  { "sybasesrvmon",    { NULL }, 4950,  "udp"  },
+  { "pwgwims",         { NULL }, 4951,  "tcp"  },
+  { "pwgwims",         { NULL }, 4951,  "udp"  },
+  { "sagxtsds",        { NULL }, 4952,  "tcp"  },
+  { "sagxtsds",        { NULL }, 4952,  "udp"  },
+  { "dbsyncarbiter",   { NULL }, 4953,  "tcp"  },
+  { "ccss-qmm",        { NULL }, 4969,  "tcp"  },
+  { "ccss-qmm",        { NULL }, 4969,  "udp"  },
+  { "ccss-qsm",        { NULL }, 4970,  "tcp"  },
+  { "ccss-qsm",        { NULL }, 4970,  "udp"  },
+  { "webyast",         { NULL }, 4984,  "tcp"  },
+  { "gerhcs",          { NULL }, 4985,  "tcp"  },
+  { "mrip",            { NULL }, 4986,  "tcp"  },
+  { "mrip",            { NULL }, 4986,  "udp"  },
+  { "smar-se-port1",   { NULL }, 4987,  "tcp"  },
+  { "smar-se-port1",   { NULL }, 4987,  "udp"  },
+  { "smar-se-port2",   { NULL }, 4988,  "tcp"  },
+  { "smar-se-port2",   { NULL }, 4988,  "udp"  },
+  { "parallel",        { NULL }, 4989,  "tcp"  },
+  { "parallel",        { NULL }, 4989,  "udp"  },
+  { "busycal",         { NULL }, 4990,  "tcp"  },
+  { "busycal",         { NULL }, 4990,  "udp"  },
+  { "vrt",             { NULL }, 4991,  "tcp"  },
+  { "vrt",             { NULL }, 4991,  "udp"  },
+  { "hfcs-manager",    { NULL }, 4999,  "tcp"  },
+  { "hfcs-manager",    { NULL }, 4999,  "udp"  },
+  { "commplex-main",   { NULL }, 5000,  "tcp"  },
+  { "commplex-main",   { NULL }, 5000,  "udp"  },
+  { "commplex-link",   { NULL }, 5001,  "tcp"  },
+  { "commplex-link",   { NULL }, 5001,  "udp"  },
+  { "rfe",             { NULL }, 5002,  "tcp"  },
+  { "rfe",             { NULL }, 5002,  "udp"  },
+  { "fmpro-internal",  { NULL }, 5003,  "tcp"  },
+  { "fmpro-internal",  { NULL }, 5003,  "udp"  },
+  { "avt-profile-1",   { NULL }, 5004,  "tcp"  },
+  { "avt-profile-1",   { NULL }, 5004,  "udp"  },
+  { "avt-profile-1",   { NULL }, 5004,  "dccp" },
+  { "avt-profile-2",   { NULL }, 5005,  "tcp"  },
+  { "avt-profile-2",   { NULL }, 5005,  "udp"  },
+  { "avt-profile-2",   { NULL }, 5005,  "dccp" },
+  { "wsm-server",      { NULL }, 5006,  "tcp"  },
+  { "wsm-server",      { NULL }, 5006,  "udp"  },
+  { "wsm-server-ssl",  { NULL }, 5007,  "tcp"  },
+  { "wsm-server-ssl",  { NULL }, 5007,  "udp"  },
+  { "synapsis-edge",   { NULL }, 5008,  "tcp"  },
+  { "synapsis-edge",   { NULL }, 5008,  "udp"  },
+  { "winfs",           { NULL }, 5009,  "tcp"  },
+  { "winfs",           { NULL }, 5009,  "udp"  },
+  { "telelpathstart",  { NULL }, 5010,  "tcp"  },
+  { "telelpathstart",  { NULL }, 5010,  "udp"  },
+  { "telelpathattack", { NULL }, 5011,  "tcp"  },
+  { "telelpathattack", { NULL }, 5011,  "udp"  },
+  { "nsp",             { NULL }, 5012,  "tcp"  },
+  { "nsp",             { NULL }, 5012,  "udp"  },
+  { "fmpro-v6",        { NULL }, 5013,  "tcp"  },
+  { "fmpro-v6",        { NULL }, 5013,  "udp"  },
+  { "onpsocket",       { NULL }, 5014,  "udp"  },
+  { "fmwp",            { NULL }, 5015,  "tcp"  },
+  { "zenginkyo-1",     { NULL }, 5020,  "tcp"  },
+  { "zenginkyo-1",     { NULL }, 5020,  "udp"  },
+  { "zenginkyo-2",     { NULL }, 5021,  "tcp"  },
+  { "zenginkyo-2",     { NULL }, 5021,  "udp"  },
+  { "mice",            { NULL }, 5022,  "tcp"  },
+  { "mice",            { NULL }, 5022,  "udp"  },
+  { "htuilsrv",        { NULL }, 5023,  "tcp"  },
+  { "htuilsrv",        { NULL }, 5023,  "udp"  },
+  { "scpi-telnet",     { NULL }, 5024,  "tcp"  },
+  { "scpi-telnet",     { NULL }, 5024,  "udp"  },
+  { "scpi-raw",        { NULL }, 5025,  "tcp"  },
+  { "scpi-raw",        { NULL }, 5025,  "udp"  },
+  { "strexec-d",       { NULL }, 5026,  "tcp"  },
+  { "strexec-d",       { NULL }, 5026,  "udp"  },
+  { "strexec-s",       { NULL }, 5027,  "tcp"  },
+  { "strexec-s",       { NULL }, 5027,  "udp"  },
+  { "qvr",             { NULL }, 5028,  "tcp"  },
+  { "infobright",      { NULL }, 5029,  "tcp"  },
+  { "infobright",      { NULL }, 5029,  "udp"  },
+  { "surfpass",        { NULL }, 5030,  "tcp"  },
+  { "surfpass",        { NULL }, 5030,  "udp"  },
+  { "dmp",             { NULL }, 5031,  "udp"  },
+  { "asnaacceler8db",  { NULL }, 5042,  "tcp"  },
+  { "asnaacceler8db",  { NULL }, 5042,  "udp"  },
+  { "swxadmin",        { NULL }, 5043,  "tcp"  },
+  { "swxadmin",        { NULL }, 5043,  "udp"  },
+  { "lxi-evntsvc",     { NULL }, 5044,  "tcp"  },
+  { "lxi-evntsvc",     { NULL }, 5044,  "udp"  },
+  { "osp",             { NULL }, 5045,  "tcp"  },
+  { "vpm-udp",         { NULL }, 5046,  "udp"  },
+  { "iscape",          { NULL }, 5047,  "udp"  },
+  { "texai",           { NULL }, 5048,  "tcp"  },
+  { "ivocalize",       { NULL }, 5049,  "tcp"  },
+  { "ivocalize",       { NULL }, 5049,  "udp"  },
+  { "mmcc",            { NULL }, 5050,  "tcp"  },
+  { "mmcc",            { NULL }, 5050,  "udp"  },
+  { "ita-agent",       { NULL }, 5051,  "tcp"  },
+  { "ita-agent",       { NULL }, 5051,  "udp"  },
+  { "ita-manager",     { NULL }, 5052,  "tcp"  },
+  { "ita-manager",     { NULL }, 5052,  "udp"  },
+  { "rlm",             { NULL }, 5053,  "tcp"  },
+  { "rlm-admin",       { NULL }, 5054,  "tcp"  },
+  { "unot",            { NULL }, 5055,  "tcp"  },
+  { "unot",            { NULL }, 5055,  "udp"  },
+  { "intecom-ps1",     { NULL }, 5056,  "tcp"  },
+  { "intecom-ps1",     { NULL }, 5056,  "udp"  },
+  { "intecom-ps2",     { NULL }, 5057,  "tcp"  },
+  { "intecom-ps2",     { NULL }, 5057,  "udp"  },
+  { "locus-disc",      { NULL }, 5058,  "udp"  },
+  { "sds",             { NULL }, 5059,  "tcp"  },
+  { "sds",             { NULL }, 5059,  "udp"  },
+  { "sip",             { NULL }, 5060,  "tcp"  },
+  { "sip",             { NULL }, 5060,  "udp"  },
+  { "sip-tls",         { NULL }, 5061,  "tcp"  },
+  { "sip-tls",         { NULL }, 5061,  "udp"  },
+  { "na-localise",     { NULL }, 5062,  "tcp"  },
+  { "na-localise",     { NULL }, 5062,  "udp"  },
+  { "csrpc",           { NULL }, 5063,  "tcp"  },
+  { "ca-1",            { NULL }, 5064,  "tcp"  },
+  { "ca-1",            { NULL }, 5064,  "udp"  },
+  { "ca-2",            { NULL }, 5065,  "tcp"  },
+  { "ca-2",            { NULL }, 5065,  "udp"  },
+  { "stanag-5066",     { NULL }, 5066,  "tcp"  },
+  { "stanag-5066",     { NULL }, 5066,  "udp"  },
+  { "authentx",        { NULL }, 5067,  "tcp"  },
+  { "authentx",        { NULL }, 5067,  "udp"  },
+  { "bitforestsrv",    { NULL }, 5068,  "tcp"  },
+  { "i-net-2000-npr",  { NULL }, 5069,  "tcp"  },
+  { "i-net-2000-npr",  { NULL }, 5069,  "udp"  },
+  { "vtsas",           { NULL }, 5070,  "tcp"  },
+  { "vtsas",           { NULL }, 5070,  "udp"  },
+  { "powerschool",     { NULL }, 5071,  "tcp"  },
+  { "powerschool",     { NULL }, 5071,  "udp"  },
+  { "ayiya",           { NULL }, 5072,  "tcp"  },
+  { "ayiya",           { NULL }, 5072,  "udp"  },
+  { "tag-pm",          { NULL }, 5073,  "tcp"  },
+  { "tag-pm",          { NULL }, 5073,  "udp"  },
+  { "alesquery",       { NULL }, 5074,  "tcp"  },
+  { "alesquery",       { NULL }, 5074,  "udp"  },
+  { "cp-spxrpts",      { NULL }, 5079,  "udp"  },
+  { "onscreen",        { NULL }, 5080,  "tcp"  },
+  { "onscreen",        { NULL }, 5080,  "udp"  },
+  { "sdl-ets",         { NULL }, 5081,  "tcp"  },
+  { "sdl-ets",         { NULL }, 5081,  "udp"  },
+  { "qcp",             { NULL }, 5082,  "tcp"  },
+  { "qcp",             { NULL }, 5082,  "udp"  },
+  { "qfp",             { NULL }, 5083,  "tcp"  },
+  { "qfp",             { NULL }, 5083,  "udp"  },
+  { "llrp",            { NULL }, 5084,  "tcp"  },
+  { "llrp",            { NULL }, 5084,  "udp"  },
+  { "encrypted-llrp",  { NULL }, 5085,  "tcp"  },
+  { "encrypted-llrp",  { NULL }, 5085,  "udp"  },
+  { "aprigo-cs",       { NULL }, 5086,  "tcp"  },
+  { "car",             { NULL }, 5090,  "sctp" },
+  { "cxtp",            { NULL }, 5091,  "sctp" },
+  { "magpie",          { NULL }, 5092,  "udp"  },
+  { "sentinel-lm",     { NULL }, 5093,  "tcp"  },
+  { "sentinel-lm",     { NULL }, 5093,  "udp"  },
+  { "hart-ip",         { NULL }, 5094,  "tcp"  },
+  { "hart-ip",         { NULL }, 5094,  "udp"  },
+  { "sentlm-srv2srv",  { NULL }, 5099,  "tcp"  },
+  { "sentlm-srv2srv",  { NULL }, 5099,  "udp"  },
+  { "socalia",         { NULL }, 5100,  "tcp"  },
+  { "socalia",         { NULL }, 5100,  "udp"  },
+  { "talarian-tcp",    { NULL }, 5101,  "tcp"  },
+  { "talarian-udp",    { NULL }, 5101,  "udp"  },
+  { "oms-nonsecure",   { NULL }, 5102,  "tcp"  },
+  { "oms-nonsecure",   { NULL }, 5102,  "udp"  },
+  { "actifio-c2c",     { NULL }, 5103,  "tcp"  },
+  { "tinymessage",     { NULL }, 5104,  "udp"  },
+  { "hughes-ap",       { NULL }, 5105,  "udp"  },
+  { "taep-as-svc",     { NULL }, 5111,  "tcp"  },
+  { "taep-as-svc",     { NULL }, 5111,  "udp"  },
+  { "pm-cmdsvr",       { NULL }, 5112,  "tcp"  },
+  { "pm-cmdsvr",       { NULL }, 5112,  "udp"  },
+  { "ev-services",     { NULL }, 5114,  "tcp"  },
+  { "autobuild",       { NULL }, 5115,  "tcp"  },
+  { "emb-proj-cmd",    { NULL }, 5116,  "udp"  },
+  { "gradecam",        { NULL }, 5117,  "tcp"  },
+  { "nbt-pc",          { NULL }, 5133,  "tcp"  },
+  { "nbt-pc",          { NULL }, 5133,  "udp"  },
+  { "ppactivation",    { NULL }, 5134,  "tcp"  },
+  { "erp-scale",       { NULL }, 5135,  "tcp"  },
+  { "minotaur-sa",     { NULL }, 5136,  "udp"  },
+  { "ctsd",            { NULL }, 5137,  "tcp"  },
+  { "ctsd",            { NULL }, 5137,  "udp"  },
+  { "rmonitor_secure", { NULL }, 5145,  "tcp"  },
+  { "rmonitor_secure", { NULL }, 5145,  "udp"  },
+  { "social-alarm",    { NULL }, 5146,  "tcp"  },
+  { "atmp",            { NULL }, 5150,  "tcp"  },
+  { "atmp",            { NULL }, 5150,  "udp"  },
+  { "esri_sde",        { NULL }, 5151,  "tcp"  },
+  { "esri_sde",        { NULL }, 5151,  "udp"  },
+  { "sde-discovery",   { NULL }, 5152,  "tcp"  },
+  { "sde-discovery",   { NULL }, 5152,  "udp"  },
+  { "toruxserver",     { NULL }, 5153,  "tcp"  },
+  { "bzflag",          { NULL }, 5154,  "tcp"  },
+  { "bzflag",          { NULL }, 5154,  "udp"  },
+  { "asctrl-agent",    { NULL }, 5155,  "tcp"  },
+  { "asctrl-agent",    { NULL }, 5155,  "udp"  },
+  { "rugameonline",    { NULL }, 5156,  "tcp"  },
+  { "mediat",          { NULL }, 5157,  "tcp"  },
+  { "snmpssh",         { NULL }, 5161,  "tcp"  },
+  { "snmpssh-trap",    { NULL }, 5162,  "tcp"  },
+  { "sbackup",         { NULL }, 5163,  "tcp"  },
+  { "vpa",             { NULL }, 5164,  "tcp"  },
+  { "vpa-disc",        { NULL }, 5164,  "udp"  },
+  { "ife_icorp",       { NULL }, 5165,  "tcp"  },
+  { "ife_icorp",       { NULL }, 5165,  "udp"  },
+  { "winpcs",          { NULL }, 5166,  "tcp"  },
+  { "winpcs",          { NULL }, 5166,  "udp"  },
+  { "scte104",         { NULL }, 5167,  "tcp"  },
+  { "scte104",         { NULL }, 5167,  "udp"  },
+  { "scte30",          { NULL }, 5168,  "tcp"  },
+  { "scte30",          { NULL }, 5168,  "udp"  },
+  { "aol",             { NULL }, 5190,  "tcp"  },
+  { "aol",             { NULL }, 5190,  "udp"  },
+  { "aol-1",           { NULL }, 5191,  "tcp"  },
+  { "aol-1",           { NULL }, 5191,  "udp"  },
+  { "aol-2",           { NULL }, 5192,  "tcp"  },
+  { "aol-2",           { NULL }, 5192,  "udp"  },
+  { "aol-3",           { NULL }, 5193,  "tcp"  },
+  { "aol-3",           { NULL }, 5193,  "udp"  },
+  { "cpscomm",         { NULL }, 5194,  "tcp"  },
+  { "targus-getdata",  { NULL }, 5200,  "tcp"  },
+  { "targus-getdata",  { NULL }, 5200,  "udp"  },
+  { "targus-getdata1", { NULL }, 5201,  "tcp"  },
+  { "targus-getdata1", { NULL }, 5201,  "udp"  },
+  { "targus-getdata2", { NULL }, 5202,  "tcp"  },
+  { "targus-getdata2", { NULL }, 5202,  "udp"  },
+  { "targus-getdata3", { NULL }, 5203,  "tcp"  },
+  { "targus-getdata3", { NULL }, 5203,  "udp"  },
+  { "3exmp",           { NULL }, 5221,  "tcp"  },
+  { "xmpp-client",     { NULL }, 5222,  "tcp"  },
+  { "hpvirtgrp",       { NULL }, 5223,  "tcp"  },
+  { "hpvirtgrp",       { NULL }, 5223,  "udp"  },
+  { "hpvirtctrl",      { NULL }, 5224,  "tcp"  },
+  { "hpvirtctrl",      { NULL }, 5224,  "udp"  },
+  { "hp-server",       { NULL }, 5225,  "tcp"  },
+  { "hp-server",       { NULL }, 5225,  "udp"  },
+  { "hp-status",       { NULL }, 5226,  "tcp"  },
+  { "hp-status",       { NULL }, 5226,  "udp"  },
+  { "perfd",           { NULL }, 5227,  "tcp"  },
+  { "perfd",           { NULL }, 5227,  "udp"  },
+  { "hpvroom",         { NULL }, 5228,  "tcp"  },
+  { "csedaemon",       { NULL }, 5232,  "tcp"  },
+  { "enfs",            { NULL }, 5233,  "tcp"  },
+  { "eenet",           { NULL }, 5234,  "tcp"  },
+  { "eenet",           { NULL }, 5234,  "udp"  },
+  { "galaxy-network",  { NULL }, 5235,  "tcp"  },
+  { "galaxy-network",  { NULL }, 5235,  "udp"  },
+  { "padl2sim",        { NULL }, 5236,  "tcp"  },
+  { "padl2sim",        { NULL }, 5236,  "udp"  },
+  { "mnet-discovery",  { NULL }, 5237,  "tcp"  },
+  { "mnet-discovery",  { NULL }, 5237,  "udp"  },
+  { "downtools",       { NULL }, 5245,  "tcp"  },
+  { "downtools-disc",  { NULL }, 5245,  "udp"  },
+  { "capwap-control",  { NULL }, 5246,  "udp"  },
+  { "capwap-data",     { NULL }, 5247,  "udp"  },
+  { "caacws",          { NULL }, 5248,  "tcp"  },
+  { "caacws",          { NULL }, 5248,  "udp"  },
+  { "caaclang2",       { NULL }, 5249,  "tcp"  },
+  { "caaclang2",       { NULL }, 5249,  "udp"  },
+  { "soagateway",      { NULL }, 5250,  "tcp"  },
+  { "soagateway",      { NULL }, 5250,  "udp"  },
+  { "caevms",          { NULL }, 5251,  "tcp"  },
+  { "caevms",          { NULL }, 5251,  "udp"  },
+  { "movaz-ssc",       { NULL }, 5252,  "tcp"  },
+  { "movaz-ssc",       { NULL }, 5252,  "udp"  },
+  { "kpdp",            { NULL }, 5253,  "tcp"  },
+  { "3com-njack-1",    { NULL }, 5264,  "tcp"  },
+  { "3com-njack-1",    { NULL }, 5264,  "udp"  },
+  { "3com-njack-2",    { NULL }, 5265,  "tcp"  },
+  { "3com-njack-2",    { NULL }, 5265,  "udp"  },
+  { "xmpp-server",     { NULL }, 5269,  "tcp"  },
+  { "xmp",             { NULL }, 5270,  "tcp"  },
+  { "xmp",             { NULL }, 5270,  "udp"  },
+  { "cuelink",         { NULL }, 5271,  "tcp"  },
+  { "cuelink-disc",    { NULL }, 5271,  "udp"  },
+  { "pk",              { NULL }, 5272,  "tcp"  },
+  { "pk",              { NULL }, 5272,  "udp"  },
+  { "xmpp-bosh",       { NULL }, 5280,  "tcp"  },
+  { "undo-lm",         { NULL }, 5281,  "tcp"  },
+  { "transmit-port",   { NULL }, 5282,  "tcp"  },
+  { "transmit-port",   { NULL }, 5282,  "udp"  },
+  { "presence",        { NULL }, 5298,  "tcp"  },
+  { "presence",        { NULL }, 5298,  "udp"  },
+  { "nlg-data",        { NULL }, 5299,  "tcp"  },
+  { "nlg-data",        { NULL }, 5299,  "udp"  },
+  { "hacl-hb",         { NULL }, 5300,  "tcp"  },
+  { "hacl-hb",         { NULL }, 5300,  "udp"  },
+  { "hacl-gs",         { NULL }, 5301,  "tcp"  },
+  { "hacl-gs",         { NULL }, 5301,  "udp"  },
+  { "hacl-cfg",        { NULL }, 5302,  "tcp"  },
+  { "hacl-cfg",        { NULL }, 5302,  "udp"  },
+  { "hacl-probe",      { NULL }, 5303,  "tcp"  },
+  { "hacl-probe",      { NULL }, 5303,  "udp"  },
+  { "hacl-local",      { NULL }, 5304,  "tcp"  },
+  { "hacl-local",      { NULL }, 5304,  "udp"  },
+  { "hacl-test",       { NULL }, 5305,  "tcp"  },
+  { "hacl-test",       { NULL }, 5305,  "udp"  },
+  { "sun-mc-grp",      { NULL }, 5306,  "tcp"  },
+  { "sun-mc-grp",      { NULL }, 5306,  "udp"  },
+  { "sco-aip",         { NULL }, 5307,  "tcp"  },
+  { "sco-aip",         { NULL }, 5307,  "udp"  },
+  { "cfengine",        { NULL }, 5308,  "tcp"  },
+  { "cfengine",        { NULL }, 5308,  "udp"  },
+  { "jprinter",        { NULL }, 5309,  "tcp"  },
+  { "jprinter",        { NULL }, 5309,  "udp"  },
+  { "outlaws",         { NULL }, 5310,  "tcp"  },
+  { "outlaws",         { NULL }, 5310,  "udp"  },
+  { "permabit-cs",     { NULL }, 5312,  "tcp"  },
+  { "permabit-cs",     { NULL }, 5312,  "udp"  },
+  { "rrdp",            { NULL }, 5313,  "tcp"  },
+  { "rrdp",            { NULL }, 5313,  "udp"  },
+  { "opalis-rbt-ipc",  { NULL }, 5314,  "tcp"  },
+  { "opalis-rbt-ipc",  { NULL }, 5314,  "udp"  },
+  { "hacl-poll",       { NULL }, 5315,  "tcp"  },
+  { "hacl-poll",       { NULL }, 5315,  "udp"  },
+  { "hpdevms",         { NULL }, 5316,  "tcp"  },
+  { "hpdevms",         { NULL }, 5316,  "udp"  },
+  { "bsfserver-zn",    { NULL }, 5320,  "tcp"  },
+  { "bsfsvr-zn-ssl",   { NULL }, 5321,  "tcp"  },
+  { "kfserver",        { NULL }, 5343,  "tcp"  },
+  { "kfserver",        { NULL }, 5343,  "udp"  },
+  { "xkotodrcp",       { NULL }, 5344,  "tcp"  },
+  { "xkotodrcp",       { NULL }, 5344,  "udp"  },
+  { "stuns",           { NULL }, 5349,  "tcp"  },
+  { "stuns",           { NULL }, 5349,  "udp"  },
+  { "turns",           { NULL }, 5349,  "tcp"  },
+  { "turns",           { NULL }, 5349,  "udp"  },
+  { "stun-behaviors",  { NULL }, 5349,  "tcp"  },
+  { "stun-behaviors",  { NULL }, 5349,  "udp"  },
+  { "nat-pmp-status",  { NULL }, 5350,  "tcp"  },
+  { "nat-pmp-status",  { NULL }, 5350,  "udp"  },
+  { "nat-pmp",         { NULL }, 5351,  "tcp"  },
+  { "nat-pmp",         { NULL }, 5351,  "udp"  },
+  { "dns-llq",         { NULL }, 5352,  "tcp"  },
+  { "dns-llq",         { NULL }, 5352,  "udp"  },
+  { "mdns",            { NULL }, 5353,  "tcp"  },
+  { "mdns",            { NULL }, 5353,  "udp"  },
+  { "mdnsresponder",   { NULL }, 5354,  "tcp"  },
+  { "mdnsresponder",   { NULL }, 5354,  "udp"  },
+  { "llmnr",           { NULL }, 5355,  "tcp"  },
+  { "llmnr",           { NULL }, 5355,  "udp"  },
+  { "ms-smlbiz",       { NULL }, 5356,  "tcp"  },
+  { "ms-smlbiz",       { NULL }, 5356,  "udp"  },
+  { "wsdapi",          { NULL }, 5357,  "tcp"  },
+  { "wsdapi",          { NULL }, 5357,  "udp"  },
+  { "wsdapi-s",        { NULL }, 5358,  "tcp"  },
+  { "wsdapi-s",        { NULL }, 5358,  "udp"  },
+  { "ms-alerter",      { NULL }, 5359,  "tcp"  },
+  { "ms-alerter",      { NULL }, 5359,  "udp"  },
+  { "ms-sideshow",     { NULL }, 5360,  "tcp"  },
+  { "ms-sideshow",     { NULL }, 5360,  "udp"  },
+  { "ms-s-sideshow",   { NULL }, 5361,  "tcp"  },
+  { "ms-s-sideshow",   { NULL }, 5361,  "udp"  },
+  { "serverwsd2",      { NULL }, 5362,  "tcp"  },
+  { "serverwsd2",      { NULL }, 5362,  "udp"  },
+  { "net-projection",  { NULL }, 5363,  "tcp"  },
+  { "net-projection",  { NULL }, 5363,  "udp"  },
+  { "stresstester",    { NULL }, 5397,  "tcp"  },
+  { "stresstester",    { NULL }, 5397,  "udp"  },
+  { "elektron-admin",  { NULL }, 5398,  "tcp"  },
+  { "elektron-admin",  { NULL }, 5398,  "udp"  },
+  { "securitychase",   { NULL }, 5399,  "tcp"  },
+  { "securitychase",   { NULL }, 5399,  "udp"  },
+  { "excerpt",         { NULL }, 5400,  "tcp"  },
+  { "excerpt",         { NULL }, 5400,  "udp"  },
+  { "excerpts",        { NULL }, 5401,  "tcp"  },
+  { "excerpts",        { NULL }, 5401,  "udp"  },
+  { "mftp",            { NULL }, 5402,  "tcp"  },
+  { "mftp",            { NULL }, 5402,  "udp"  },
+  { "hpoms-ci-lstn",   { NULL }, 5403,  "tcp"  },
+  { "hpoms-ci-lstn",   { NULL }, 5403,  "udp"  },
+  { "hpoms-dps-lstn",  { NULL }, 5404,  "tcp"  },
+  { "hpoms-dps-lstn",  { NULL }, 5404,  "udp"  },
+  { "netsupport",      { NULL }, 5405,  "tcp"  },
+  { "netsupport",      { NULL }, 5405,  "udp"  },
+  { "systemics-sox",   { NULL }, 5406,  "tcp"  },
+  { "systemics-sox",   { NULL }, 5406,  "udp"  },
+  { "foresyte-clear",  { NULL }, 5407,  "tcp"  },
+  { "foresyte-clear",  { NULL }, 5407,  "udp"  },
+  { "foresyte-sec",    { NULL }, 5408,  "tcp"  },
+  { "foresyte-sec",    { NULL }, 5408,  "udp"  },
+  { "salient-dtasrv",  { NULL }, 5409,  "tcp"  },
+  { "salient-dtasrv",  { NULL }, 5409,  "udp"  },
+  { "salient-usrmgr",  { NULL }, 5410,  "tcp"  },
+  { "salient-usrmgr",  { NULL }, 5410,  "udp"  },
+  { "actnet",          { NULL }, 5411,  "tcp"  },
+  { "actnet",          { NULL }, 5411,  "udp"  },
+  { "continuus",       { NULL }, 5412,  "tcp"  },
+  { "continuus",       { NULL }, 5412,  "udp"  },
+  { "wwiotalk",        { NULL }, 5413,  "tcp"  },
+  { "wwiotalk",        { NULL }, 5413,  "udp"  },
+  { "statusd",         { NULL }, 5414,  "tcp"  },
+  { "statusd",         { NULL }, 5414,  "udp"  },
+  { "ns-server",       { NULL }, 5415,  "tcp"  },
+  { "ns-server",       { NULL }, 5415,  "udp"  },
+  { "sns-gateway",     { NULL }, 5416,  "tcp"  },
+  { "sns-gateway",     { NULL }, 5416,  "udp"  },
+  { "sns-agent",       { NULL }, 5417,  "tcp"  },
+  { "sns-agent",       { NULL }, 5417,  "udp"  },
+  { "mcntp",           { NULL }, 5418,  "tcp"  },
+  { "mcntp",           { NULL }, 5418,  "udp"  },
+  { "dj-ice",          { NULL }, 5419,  "tcp"  },
+  { "dj-ice",          { NULL }, 5419,  "udp"  },
+  { "cylink-c",        { NULL }, 5420,  "tcp"  },
+  { "cylink-c",        { NULL }, 5420,  "udp"  },
+  { "netsupport2",     { NULL }, 5421,  "tcp"  },
+  { "netsupport2",     { NULL }, 5421,  "udp"  },
+  { "salient-mux",     { NULL }, 5422,  "tcp"  },
+  { "salient-mux",     { NULL }, 5422,  "udp"  },
+  { "virtualuser",     { NULL }, 5423,  "tcp"  },
+  { "virtualuser",     { NULL }, 5423,  "udp"  },
+  { "beyond-remote",   { NULL }, 5424,  "tcp"  },
+  { "beyond-remote",   { NULL }, 5424,  "udp"  },
+  { "br-channel",      { NULL }, 5425,  "tcp"  },
+  { "br-channel",      { NULL }, 5425,  "udp"  },
+  { "devbasic",        { NULL }, 5426,  "tcp"  },
+  { "devbasic",        { NULL }, 5426,  "udp"  },
+  { "sco-peer-tta",    { NULL }, 5427,  "tcp"  },
+  { "sco-peer-tta",    { NULL }, 5427,  "udp"  },
+  { "telaconsole",     { NULL }, 5428,  "tcp"  },
+  { "telaconsole",     { NULL }, 5428,  "udp"  },
+  { "base",            { NULL }, 5429,  "tcp"  },
+  { "base",            { NULL }, 5429,  "udp"  },
+  { "radec-corp",      { NULL }, 5430,  "tcp"  },
+  { "radec-corp",      { NULL }, 5430,  "udp"  },
+  { "park-agent",      { NULL }, 5431,  "tcp"  },
+  { "park-agent",      { NULL }, 5431,  "udp"  },
+  { "postgresql",      { NULL }, 5432,  "tcp"  },
+  { "postgresql",      { NULL }, 5432,  "udp"  },
+  { "pyrrho",          { NULL }, 5433,  "tcp"  },
+  { "pyrrho",          { NULL }, 5433,  "udp"  },
+  { "sgi-arrayd",      { NULL }, 5434,  "tcp"  },
+  { "sgi-arrayd",      { NULL }, 5434,  "udp"  },
+  { "sceanics",        { NULL }, 5435,  "tcp"  },
+  { "sceanics",        { NULL }, 5435,  "udp"  },
+  { "pmip6-cntl",      { NULL }, 5436,  "udp"  },
+  { "pmip6-data",      { NULL }, 5437,  "udp"  },
+  { "spss",            { NULL }, 5443,  "tcp"  },
+  { "spss",            { NULL }, 5443,  "udp"  },
+  { "surebox",         { NULL }, 5453,  "tcp"  },
+  { "surebox",         { NULL }, 5453,  "udp"  },
+  { "apc-5454",        { NULL }, 5454,  "tcp"  },
+  { "apc-5454",        { NULL }, 5454,  "udp"  },
+  { "apc-5455",        { NULL }, 5455,  "tcp"  },
+  { "apc-5455",        { NULL }, 5455,  "udp"  },
+  { "apc-5456",        { NULL }, 5456,  "tcp"  },
+  { "apc-5456",        { NULL }, 5456,  "udp"  },
+  { "silkmeter",       { NULL }, 5461,  "tcp"  },
+  { "silkmeter",       { NULL }, 5461,  "udp"  },
+  { "ttl-publisher",   { NULL }, 5462,  "tcp"  },
+  { "ttl-publisher",   { NULL }, 5462,  "udp"  },
+  { "ttlpriceproxy",   { NULL }, 5463,  "tcp"  },
+  { "ttlpriceproxy",   { NULL }, 5463,  "udp"  },
+  { "quailnet",        { NULL }, 5464,  "tcp"  },
+  { "quailnet",        { NULL }, 5464,  "udp"  },
+  { "netops-broker",   { NULL }, 5465,  "tcp"  },
+  { "netops-broker",   { NULL }, 5465,  "udp"  },
+  { "fcp-addr-srvr1",  { NULL }, 5500,  "tcp"  },
+  { "fcp-addr-srvr1",  { NULL }, 5500,  "udp"  },
+  { "fcp-addr-srvr2",  { NULL }, 5501,  "tcp"  },
+  { "fcp-addr-srvr2",  { NULL }, 5501,  "udp"  },
+  { "fcp-srvr-inst1",  { NULL }, 5502,  "tcp"  },
+  { "fcp-srvr-inst1",  { NULL }, 5502,  "udp"  },
+  { "fcp-srvr-inst2",  { NULL }, 5503,  "tcp"  },
+  { "fcp-srvr-inst2",  { NULL }, 5503,  "udp"  },
+  { "fcp-cics-gw1",    { NULL }, 5504,  "tcp"  },
+  { "fcp-cics-gw1",    { NULL }, 5504,  "udp"  },
+  { "checkoutdb",      { NULL }, 5505,  "tcp"  },
+  { "checkoutdb",      { NULL }, 5505,  "udp"  },
+  { "amc",             { NULL }, 5506,  "tcp"  },
+  { "amc",             { NULL }, 5506,  "udp"  },
+  { "sgi-eventmond",   { NULL }, 5553,  "tcp"  },
+  { "sgi-eventmond",   { NULL }, 5553,  "udp"  },
+  { "sgi-esphttp",     { NULL }, 5554,  "tcp"  },
+  { "sgi-esphttp",     { NULL }, 5554,  "udp"  },
+  { "personal-agent",  { NULL }, 5555,  "tcp"  },
+  { "personal-agent",  { NULL }, 5555,  "udp"  },
+  { "freeciv",         { NULL }, 5556,  "tcp"  },
+  { "freeciv",         { NULL }, 5556,  "udp"  },
+  { "farenet",         { NULL }, 5557,  "tcp"  },
+  { "westec-connect",  { NULL }, 5566,  "tcp"  },
+  { "m-oap",           { NULL }, 5567,  "tcp"  },
+  { "m-oap",           { NULL }, 5567,  "udp"  },
+  { "sdt",             { NULL }, 5568,  "tcp"  },
+  { "sdt",             { NULL }, 5568,  "udp"  },
+  { "sdmmp",           { NULL }, 5573,  "tcp"  },
+  { "sdmmp",           { NULL }, 5573,  "udp"  },
+  { "lsi-bobcat",      { NULL }, 5574,  "tcp"  },
+  { "ora-oap",         { NULL }, 5575,  "tcp"  },
+  { "fdtracks",        { NULL }, 5579,  "tcp"  },
+  { "tmosms0",         { NULL }, 5580,  "tcp"  },
+  { "tmosms0",         { NULL }, 5580,  "udp"  },
+  { "tmosms1",         { NULL }, 5581,  "tcp"  },
+  { "tmosms1",         { NULL }, 5581,  "udp"  },
+  { "fac-restore",     { NULL }, 5582,  "tcp"  },
+  { "fac-restore",     { NULL }, 5582,  "udp"  },
+  { "tmo-icon-sync",   { NULL }, 5583,  "tcp"  },
+  { "tmo-icon-sync",   { NULL }, 5583,  "udp"  },
+  { "bis-web",         { NULL }, 5584,  "tcp"  },
+  { "bis-web",         { NULL }, 5584,  "udp"  },
+  { "bis-sync",        { NULL }, 5585,  "tcp"  },
+  { "bis-sync",        { NULL }, 5585,  "udp"  },
+  { "ininmessaging",   { NULL }, 5597,  "tcp"  },
+  { "ininmessaging",   { NULL }, 5597,  "udp"  },
+  { "mctfeed",         { NULL }, 5598,  "tcp"  },
+  { "mctfeed",         { NULL }, 5598,  "udp"  },
+  { "esinstall",       { NULL }, 5599,  "tcp"  },
+  { "esinstall",       { NULL }, 5599,  "udp"  },
+  { "esmmanager",      { NULL }, 5600,  "tcp"  },
+  { "esmmanager",      { NULL }, 5600,  "udp"  },
+  { "esmagent",        { NULL }, 5601,  "tcp"  },
+  { "esmagent",        { NULL }, 5601,  "udp"  },
+  { "a1-msc",          { NULL }, 5602,  "tcp"  },
+  { "a1-msc",          { NULL }, 5602,  "udp"  },
+  { "a1-bs",           { NULL }, 5603,  "tcp"  },
+  { "a1-bs",           { NULL }, 5603,  "udp"  },
+  { "a3-sdunode",      { NULL }, 5604,  "tcp"  },
+  { "a3-sdunode",      { NULL }, 5604,  "udp"  },
+  { "a4-sdunode",      { NULL }, 5605,  "tcp"  },
+  { "a4-sdunode",      { NULL }, 5605,  "udp"  },
+  { "ninaf",           { NULL }, 5627,  "tcp"  },
+  { "ninaf",           { NULL }, 5627,  "udp"  },
+  { "htrust",          { NULL }, 5628,  "tcp"  },
+  { "htrust",          { NULL }, 5628,  "udp"  },
+  { "symantec-sfdb",   { NULL }, 5629,  "tcp"  },
+  { "symantec-sfdb",   { NULL }, 5629,  "udp"  },
+  { "precise-comm",    { NULL }, 5630,  "tcp"  },
+  { "precise-comm",    { NULL }, 5630,  "udp"  },
+  { "pcanywheredata",  { NULL }, 5631,  "tcp"  },
+  { "pcanywheredata",  { NULL }, 5631,  "udp"  },
+  { "pcanywherestat",  { NULL }, 5632,  "tcp"  },
+  { "pcanywherestat",  { NULL }, 5632,  "udp"  },
+  { "beorl",           { NULL }, 5633,  "tcp"  },
+  { "beorl",           { NULL }, 5633,  "udp"  },
+  { "xprtld",          { NULL }, 5634,  "tcp"  },
+  { "xprtld",          { NULL }, 5634,  "udp"  },
+  { "sfmsso",          { NULL }, 5635,  "tcp"  },
+  { "sfm-db-server",   { NULL }, 5636,  "tcp"  },
+  { "cssc",            { NULL }, 5637,  "tcp"  },
+  { "amqps",           { NULL }, 5671,  "tcp"  },
+  { "amqps",           { NULL }, 5671,  "udp"  },
+  { "amqp",            { NULL }, 5672,  "tcp"  },
+  { "amqp",            { NULL }, 5672,  "udp"  },
+  { "amqp",            { NULL }, 5672,  "sctp" },
+  { "jms",             { NULL }, 5673,  "tcp"  },
+  { "jms",             { NULL }, 5673,  "udp"  },
+  { "hyperscsi-port",  { NULL }, 5674,  "tcp"  },
+  { "hyperscsi-port",  { NULL }, 5674,  "udp"  },
+  { "v5ua",            { NULL }, 5675,  "tcp"  },
+  { "v5ua",            { NULL }, 5675,  "udp"  },
+  { "v5ua",            { NULL }, 5675,  "sctp" },
+  { "raadmin",         { NULL }, 5676,  "tcp"  },
+  { "raadmin",         { NULL }, 5676,  "udp"  },
+  { "questdb2-lnchr",  { NULL }, 5677,  "tcp"  },
+  { "questdb2-lnchr",  { NULL }, 5677,  "udp"  },
+  { "rrac",            { NULL }, 5678,  "tcp"  },
+  { "rrac",            { NULL }, 5678,  "udp"  },
+  { "dccm",            { NULL }, 5679,  "tcp"  },
+  { "dccm",            { NULL }, 5679,  "udp"  },
+  { "auriga-router",   { NULL }, 5680,  "tcp"  },
+  { "auriga-router",   { NULL }, 5680,  "udp"  },
+  { "ncxcp",           { NULL }, 5681,  "tcp"  },
+  { "ncxcp",           { NULL }, 5681,  "udp"  },
+  { "brightcore",      { NULL }, 5682,  "udp"  },
+  { "ggz",             { NULL }, 5688,  "tcp"  },
+  { "ggz",             { NULL }, 5688,  "udp"  },
+  { "qmvideo",         { NULL }, 5689,  "tcp"  },
+  { "qmvideo",         { NULL }, 5689,  "udp"  },
+  { "proshareaudio",   { NULL }, 5713,  "tcp"  },
+  { "proshareaudio",   { NULL }, 5713,  "udp"  },
+  { "prosharevideo",   { NULL }, 5714,  "tcp"  },
+  { "prosharevideo",   { NULL }, 5714,  "udp"  },
+  { "prosharedata",    { NULL }, 5715,  "tcp"  },
+  { "prosharedata",    { NULL }, 5715,  "udp"  },
+  { "prosharerequest", { NULL }, 5716,  "tcp"  },
+  { "prosharerequest", { NULL }, 5716,  "udp"  },
+  { "prosharenotify",  { NULL }, 5717,  "tcp"  },
+  { "prosharenotify",  { NULL }, 5717,  "udp"  },
+  { "dpm",             { NULL }, 5718,  "tcp"  },
+  { "dpm",             { NULL }, 5718,  "udp"  },
+  { "dpm-agent",       { NULL }, 5719,  "tcp"  },
+  { "dpm-agent",       { NULL }, 5719,  "udp"  },
+  { "ms-licensing",    { NULL }, 5720,  "tcp"  },
+  { "ms-licensing",    { NULL }, 5720,  "udp"  },
+  { "dtpt",            { NULL }, 5721,  "tcp"  },
+  { "dtpt",            { NULL }, 5721,  "udp"  },
+  { "msdfsr",          { NULL }, 5722,  "tcp"  },
+  { "msdfsr",          { NULL }, 5722,  "udp"  },
+  { "omhs",            { NULL }, 5723,  "tcp"  },
+  { "omhs",            { NULL }, 5723,  "udp"  },
+  { "omsdk",           { NULL }, 5724,  "tcp"  },
+  { "omsdk",           { NULL }, 5724,  "udp"  },
+  { "ms-ilm",          { NULL }, 5725,  "tcp"  },
+  { "ms-ilm-sts",      { NULL }, 5726,  "tcp"  },
+  { "asgenf",          { NULL }, 5727,  "tcp"  },
+  { "io-dist-data",    { NULL }, 5728,  "tcp"  },
+  { "io-dist-group",   { NULL }, 5728,  "udp"  },
+  { "openmail",        { NULL }, 5729,  "tcp"  },
+  { "openmail",        { NULL }, 5729,  "udp"  },
+  { "unieng",          { NULL }, 5730,  "tcp"  },
+  { "unieng",          { NULL }, 5730,  "udp"  },
+  { "ida-discover1",   { NULL }, 5741,  "tcp"  },
+  { "ida-discover1",   { NULL }, 5741,  "udp"  },
+  { "ida-discover2",   { NULL }, 5742,  "tcp"  },
+  { "ida-discover2",   { NULL }, 5742,  "udp"  },
+  { "watchdoc-pod",    { NULL }, 5743,  "tcp"  },
+  { "watchdoc-pod",    { NULL }, 5743,  "udp"  },
+  { "watchdoc",        { NULL }, 5744,  "tcp"  },
+  { "watchdoc",        { NULL }, 5744,  "udp"  },
+  { "fcopy-server",    { NULL }, 5745,  "tcp"  },
+  { "fcopy-server",    { NULL }, 5745,  "udp"  },
+  { "fcopys-server",   { NULL }, 5746,  "tcp"  },
+  { "fcopys-server",   { NULL }, 5746,  "udp"  },
+  { "tunatic",         { NULL }, 5747,  "tcp"  },
+  { "tunatic",         { NULL }, 5747,  "udp"  },
+  { "tunalyzer",       { NULL }, 5748,  "tcp"  },
+  { "tunalyzer",       { NULL }, 5748,  "udp"  },
+  { "rscd",            { NULL }, 5750,  "tcp"  },
+  { "rscd",            { NULL }, 5750,  "udp"  },
+  { "openmailg",       { NULL }, 5755,  "tcp"  },
+  { "openmailg",       { NULL }, 5755,  "udp"  },
+  { "x500ms",          { NULL }, 5757,  "tcp"  },
+  { "x500ms",          { NULL }, 5757,  "udp"  },
+  { "openmailns",      { NULL }, 5766,  "tcp"  },
+  { "openmailns",      { NULL }, 5766,  "udp"  },
+  { "s-openmail",      { NULL }, 5767,  "tcp"  },
+  { "s-openmail",      { NULL }, 5767,  "udp"  },
+  { "openmailpxy",     { NULL }, 5768,  "tcp"  },
+  { "openmailpxy",     { NULL }, 5768,  "udp"  },
+  { "spramsca",        { NULL }, 5769,  "tcp"  },
+  { "spramsca",        { NULL }, 5769,  "udp"  },
+  { "spramsd",         { NULL }, 5770,  "tcp"  },
+  { "spramsd",         { NULL }, 5770,  "udp"  },
+  { "netagent",        { NULL }, 5771,  "tcp"  },
+  { "netagent",        { NULL }, 5771,  "udp"  },
+  { "dali-port",       { NULL }, 5777,  "tcp"  },
+  { "dali-port",       { NULL }, 5777,  "udp"  },
+  { "vts-rpc",         { NULL }, 5780,  "tcp"  },
+  { "3par-evts",       { NULL }, 5781,  "tcp"  },
+  { "3par-evts",       { NULL }, 5781,  "udp"  },
+  { "3par-mgmt",       { NULL }, 5782,  "tcp"  },
+  { "3par-mgmt",       { NULL }, 5782,  "udp"  },
+  { "3par-mgmt-ssl",   { NULL }, 5783,  "tcp"  },
+  { "3par-mgmt-ssl",   { NULL }, 5783,  "udp"  },
+  { "ibar",            { NULL }, 5784,  "udp"  },
+  { "3par-rcopy",      { NULL }, 5785,  "tcp"  },
+  { "3par-rcopy",      { NULL }, 5785,  "udp"  },
+  { "cisco-redu",      { NULL }, 5786,  "udp"  },
+  { "waascluster",     { NULL }, 5787,  "udp"  },
+  { "xtreamx",         { NULL }, 5793,  "tcp"  },
+  { "xtreamx",         { NULL }, 5793,  "udp"  },
+  { "spdp",            { NULL }, 5794,  "udp"  },
+  { "icmpd",           { NULL }, 5813,  "tcp"  },
+  { "icmpd",           { NULL }, 5813,  "udp"  },
+  { "spt-automation",  { NULL }, 5814,  "tcp"  },
+  { "spt-automation",  { NULL }, 5814,  "udp"  },
+  { "wherehoo",        { NULL }, 5859,  "tcp"  },
+  { "wherehoo",        { NULL }, 5859,  "udp"  },
+  { "ppsuitemsg",      { NULL }, 5863,  "tcp"  },
+  { "ppsuitemsg",      { NULL }, 5863,  "udp"  },
+  { "rfb",             { NULL }, 5900,  "tcp"  },
+  { "rfb",             { NULL }, 5900,  "udp"  },
+  { "cm",              { NULL }, 5910,  "tcp"  },
+  { "cm",              { NULL }, 5910,  "udp"  },
+  { "cpdlc",           { NULL }, 5911,  "tcp"  },
+  { "cpdlc",           { NULL }, 5911,  "udp"  },
+  { "fis",             { NULL }, 5912,  "tcp"  },
+  { "fis",             { NULL }, 5912,  "udp"  },
+  { "ads-c",           { NULL }, 5913,  "tcp"  },
+  { "ads-c",           { NULL }, 5913,  "udp"  },
+  { "indy",            { NULL }, 5963,  "tcp"  },
+  { "indy",            { NULL }, 5963,  "udp"  },
+  { "mppolicy-v5",     { NULL }, 5968,  "tcp"  },
+  { "mppolicy-v5",     { NULL }, 5968,  "udp"  },
+  { "mppolicy-mgr",    { NULL }, 5969,  "tcp"  },
+  { "mppolicy-mgr",    { NULL }, 5969,  "udp"  },
+  { "couchdb",         { NULL }, 5984,  "tcp"  },
+  { "couchdb",         { NULL }, 5984,  "udp"  },
+  { "wsman",           { NULL }, 5985,  "tcp"  },
+  { "wsman",           { NULL }, 5985,  "udp"  },
+  { "wsmans",          { NULL }, 5986,  "tcp"  },
+  { "wsmans",          { NULL }, 5986,  "udp"  },
+  { "wbem-rmi",        { NULL }, 5987,  "tcp"  },
+  { "wbem-rmi",        { NULL }, 5987,  "udp"  },
+  { "wbem-http",       { NULL }, 5988,  "tcp"  },
+  { "wbem-http",       { NULL }, 5988,  "udp"  },
+  { "wbem-https",      { NULL }, 5989,  "tcp"  },
+  { "wbem-https",      { NULL }, 5989,  "udp"  },
+  { "wbem-exp-https",  { NULL }, 5990,  "tcp"  },
+  { "wbem-exp-https",  { NULL }, 5990,  "udp"  },
+  { "nuxsl",           { NULL }, 5991,  "tcp"  },
+  { "nuxsl",           { NULL }, 5991,  "udp"  },
+  { "consul-insight",  { NULL }, 5992,  "tcp"  },
+  { "consul-insight",  { NULL }, 5992,  "udp"  },
+  { "cvsup",           { NULL }, 5999,  "tcp"  },
+  { "cvsup",           { NULL }, 5999,  "udp"  },
+  { "ndl-ahp-svc",     { NULL }, 6064,  "tcp"  },
+  { "ndl-ahp-svc",     { NULL }, 6064,  "udp"  },
+  { "winpharaoh",      { NULL }, 6065,  "tcp"  },
+  { "winpharaoh",      { NULL }, 6065,  "udp"  },
+  { "ewctsp",          { NULL }, 6066,  "tcp"  },
+  { "ewctsp",          { NULL }, 6066,  "udp"  },
+  { "gsmp",            { NULL }, 6068,  "tcp"  },
+  { "gsmp",            { NULL }, 6068,  "udp"  },
+  { "trip",            { NULL }, 6069,  "tcp"  },
+  { "trip",            { NULL }, 6069,  "udp"  },
+  { "messageasap",     { NULL }, 6070,  "tcp"  },
+  { "messageasap",     { NULL }, 6070,  "udp"  },
+  { "ssdtp",           { NULL }, 6071,  "tcp"  },
+  { "ssdtp",           { NULL }, 6071,  "udp"  },
+  { "diagnose-proc",   { NULL }, 6072,  "tcp"  },
+  { "diagnose-proc",   { NULL }, 6072,  "udp"  },
+  { "directplay8",     { NULL }, 6073,  "tcp"  },
+  { "directplay8",     { NULL }, 6073,  "udp"  },
+  { "max",             { NULL }, 6074,  "tcp"  },
+  { "max",             { NULL }, 6074,  "udp"  },
+  { "dpm-acm",         { NULL }, 6075,  "tcp"  },
+  { "miami-bcast",     { NULL }, 6083,  "udp"  },
+  { "p2p-sip",         { NULL }, 6084,  "tcp"  },
+  { "konspire2b",      { NULL }, 6085,  "tcp"  },
+  { "konspire2b",      { NULL }, 6085,  "udp"  },
+  { "pdtp",            { NULL }, 6086,  "tcp"  },
+  { "pdtp",            { NULL }, 6086,  "udp"  },
+  { "ldss",            { NULL }, 6087,  "tcp"  },
+  { "ldss",            { NULL }, 6087,  "udp"  },
+  { "raxa-mgmt",       { NULL }, 6099,  "tcp"  },
+  { "synchronet-db",   { NULL }, 6100,  "tcp"  },
+  { "synchronet-db",   { NULL }, 6100,  "udp"  },
+  { "synchronet-rtc",  { NULL }, 6101,  "tcp"  },
+  { "synchronet-rtc",  { NULL }, 6101,  "udp"  },
+  { "synchronet-upd",  { NULL }, 6102,  "tcp"  },
+  { "synchronet-upd",  { NULL }, 6102,  "udp"  },
+  { "rets",            { NULL }, 6103,  "tcp"  },
+  { "rets",            { NULL }, 6103,  "udp"  },
+  { "dbdb",            { NULL }, 6104,  "tcp"  },
+  { "dbdb",            { NULL }, 6104,  "udp"  },
+  { "primaserver",     { NULL }, 6105,  "tcp"  },
+  { "primaserver",     { NULL }, 6105,  "udp"  },
+  { "mpsserver",       { NULL }, 6106,  "tcp"  },
+  { "mpsserver",       { NULL }, 6106,  "udp"  },
+  { "etc-control",     { NULL }, 6107,  "tcp"  },
+  { "etc-control",     { NULL }, 6107,  "udp"  },
+  { "sercomm-scadmin", { NULL }, 6108,  "tcp"  },
+  { "sercomm-scadmin", { NULL }, 6108,  "udp"  },
+  { "globecast-id",    { NULL }, 6109,  "tcp"  },
+  { "globecast-id",    { NULL }, 6109,  "udp"  },
+  { "softcm",          { NULL }, 6110,  "tcp"  },
+  { "softcm",          { NULL }, 6110,  "udp"  },
+  { "spc",             { NULL }, 6111,  "tcp"  },
+  { "spc",             { NULL }, 6111,  "udp"  },
+  { "dtspcd",          { NULL }, 6112,  "tcp"  },
+  { "dtspcd",          { NULL }, 6112,  "udp"  },
+  { "dayliteserver",   { NULL }, 6113,  "tcp"  },
+  { "wrspice",         { NULL }, 6114,  "tcp"  },
+  { "xic",             { NULL }, 6115,  "tcp"  },
+  { "xtlserv",         { NULL }, 6116,  "tcp"  },
+  { "daylitetouch",    { NULL }, 6117,  "tcp"  },
+  { "spdy",            { NULL }, 6121,  "tcp"  },
+  { "bex-webadmin",    { NULL }, 6122,  "tcp"  },
+  { "bex-webadmin",    { NULL }, 6122,  "udp"  },
+  { "backup-express",  { NULL }, 6123,  "tcp"  },
+  { "backup-express",  { NULL }, 6123,  "udp"  },
+  { "pnbs",            { NULL }, 6124,  "tcp"  },
+  { "pnbs",            { NULL }, 6124,  "udp"  },
+  { "nbt-wol",         { NULL }, 6133,  "tcp"  },
+  { "nbt-wol",         { NULL }, 6133,  "udp"  },
+  { "pulsonixnls",     { NULL }, 6140,  "tcp"  },
+  { "pulsonixnls",     { NULL }, 6140,  "udp"  },
+  { "meta-corp",       { NULL }, 6141,  "tcp"  },
+  { "meta-corp",       { NULL }, 6141,  "udp"  },
+  { "aspentec-lm",     { NULL }, 6142,  "tcp"  },
+  { "aspentec-lm",     { NULL }, 6142,  "udp"  },
+  { "watershed-lm",    { NULL }, 6143,  "tcp"  },
+  { "watershed-lm",    { NULL }, 6143,  "udp"  },
+  { "statsci1-lm",     { NULL }, 6144,  "tcp"  },
+  { "statsci1-lm",     { NULL }, 6144,  "udp"  },
+  { "statsci2-lm",     { NULL }, 6145,  "tcp"  },
+  { "statsci2-lm",     { NULL }, 6145,  "udp"  },
+  { "lonewolf-lm",     { NULL }, 6146,  "tcp"  },
+  { "lonewolf-lm",     { NULL }, 6146,  "udp"  },
+  { "montage-lm",      { NULL }, 6147,  "tcp"  },
+  { "montage-lm",      { NULL }, 6147,  "udp"  },
+  { "ricardo-lm",      { NULL }, 6148,  "tcp"  },
+  { "ricardo-lm",      { NULL }, 6148,  "udp"  },
+  { "tal-pod",         { NULL }, 6149,  "tcp"  },
+  { "tal-pod",         { NULL }, 6149,  "udp"  },
+  { "efb-aci",         { NULL }, 6159,  "tcp"  },
+  { "patrol-ism",      { NULL }, 6161,  "tcp"  },
+  { "patrol-ism",      { NULL }, 6161,  "udp"  },
+  { "patrol-coll",     { NULL }, 6162,  "tcp"  },
+  { "patrol-coll",     { NULL }, 6162,  "udp"  },
+  { "pscribe",         { NULL }, 6163,  "tcp"  },
+  { "pscribe",         { NULL }, 6163,  "udp"  },
+  { "lm-x",            { NULL }, 6200,  "tcp"  },
+  { "lm-x",            { NULL }, 6200,  "udp"  },
+  { "radmind",         { NULL }, 6222,  "tcp"  },
+  { "radmind",         { NULL }, 6222,  "udp"  },
+  { "jeol-nsdtp-1",    { NULL }, 6241,  "tcp"  },
+  { "jeol-nsddp-1",    { NULL }, 6241,  "udp"  },
+  { "jeol-nsdtp-2",    { NULL }, 6242,  "tcp"  },
+  { "jeol-nsddp-2",    { NULL }, 6242,  "udp"  },
+  { "jeol-nsdtp-3",    { NULL }, 6243,  "tcp"  },
+  { "jeol-nsddp-3",    { NULL }, 6243,  "udp"  },
+  { "jeol-nsdtp-4",    { NULL }, 6244,  "tcp"  },
+  { "jeol-nsddp-4",    { NULL }, 6244,  "udp"  },
+  { "tl1-raw-ssl",     { NULL }, 6251,  "tcp"  },
+  { "tl1-raw-ssl",     { NULL }, 6251,  "udp"  },
+  { "tl1-ssh",         { NULL }, 6252,  "tcp"  },
+  { "tl1-ssh",         { NULL }, 6252,  "udp"  },
+  { "crip",            { NULL }, 6253,  "tcp"  },
+  { "crip",            { NULL }, 6253,  "udp"  },
+  { "gld",             { NULL }, 6267,  "tcp"  },
+  { "grid",            { NULL }, 6268,  "tcp"  },
+  { "grid",            { NULL }, 6268,  "udp"  },
+  { "grid-alt",        { NULL }, 6269,  "tcp"  },
+  { "grid-alt",        { NULL }, 6269,  "udp"  },
+  { "bmc-grx",         { NULL }, 6300,  "tcp"  },
+  { "bmc-grx",         { NULL }, 6300,  "udp"  },
+  { "bmc_ctd_ldap",    { NULL }, 6301,  "tcp"  },
+  { "bmc_ctd_ldap",    { NULL }, 6301,  "udp"  },
+  { "ufmp",            { NULL }, 6306,  "tcp"  },
+  { "ufmp",            { NULL }, 6306,  "udp"  },
+  { "scup",            { NULL }, 6315,  "tcp"  },
+  { "scup-disc",       { NULL }, 6315,  "udp"  },
+  { "abb-escp",        { NULL }, 6316,  "tcp"  },
+  { "abb-escp",        { NULL }, 6316,  "udp"  },
+  { "repsvc",          { NULL }, 6320,  "tcp"  },
+  { "repsvc",          { NULL }, 6320,  "udp"  },
+  { "emp-server1",     { NULL }, 6321,  "tcp"  },
+  { "emp-server1",     { NULL }, 6321,  "udp"  },
+  { "emp-server2",     { NULL }, 6322,  "tcp"  },
+  { "emp-server2",     { NULL }, 6322,  "udp"  },
+  { "sflow",           { NULL }, 6343,  "tcp"  },
+  { "sflow",           { NULL }, 6343,  "udp"  },
+  { "gnutella-svc",    { NULL }, 6346,  "tcp"  },
+  { "gnutella-svc",    { NULL }, 6346,  "udp"  },
+  { "gnutella-rtr",    { NULL }, 6347,  "tcp"  },
+  { "gnutella-rtr",    { NULL }, 6347,  "udp"  },
+  { "adap",            { NULL }, 6350,  "tcp"  },
+  { "adap",            { NULL }, 6350,  "udp"  },
+  { "pmcs",            { NULL }, 6355,  "tcp"  },
+  { "pmcs",            { NULL }, 6355,  "udp"  },
+  { "metaedit-mu",     { NULL }, 6360,  "tcp"  },
+  { "metaedit-mu",     { NULL }, 6360,  "udp"  },
+  { "metaedit-se",     { NULL }, 6370,  "tcp"  },
+  { "metaedit-se",     { NULL }, 6370,  "udp"  },
+  { "metatude-mds",    { NULL }, 6382,  "tcp"  },
+  { "metatude-mds",    { NULL }, 6382,  "udp"  },
+  { "clariion-evr01",  { NULL }, 6389,  "tcp"  },
+  { "clariion-evr01",  { NULL }, 6389,  "udp"  },
+  { "metaedit-ws",     { NULL }, 6390,  "tcp"  },
+  { "metaedit-ws",     { NULL }, 6390,  "udp"  },
+  { "faxcomservice",   { NULL }, 6417,  "tcp"  },
+  { "faxcomservice",   { NULL }, 6417,  "udp"  },
+  { "syserverremote",  { NULL }, 6418,  "tcp"  },
+  { "svdrp",           { NULL }, 6419,  "tcp"  },
+  { "nim-vdrshell",    { NULL }, 6420,  "tcp"  },
+  { "nim-vdrshell",    { NULL }, 6420,  "udp"  },
+  { "nim-wan",         { NULL }, 6421,  "tcp"  },
+  { "nim-wan",         { NULL }, 6421,  "udp"  },
+  { "pgbouncer",       { NULL }, 6432,  "tcp"  },
+  { "sun-sr-https",    { NULL }, 6443,  "tcp"  },
+  { "sun-sr-https",    { NULL }, 6443,  "udp"  },
+  { "sge_qmaster",     { NULL }, 6444,  "tcp"  },
+  { "sge_qmaster",     { NULL }, 6444,  "udp"  },
+  { "sge_execd",       { NULL }, 6445,  "tcp"  },
+  { "sge_execd",       { NULL }, 6445,  "udp"  },
+  { "mysql-proxy",     { NULL }, 6446,  "tcp"  },
+  { "mysql-proxy",     { NULL }, 6446,  "udp"  },
+  { "skip-cert-recv",  { NULL }, 6455,  "tcp"  },
+  { "skip-cert-send",  { NULL }, 6456,  "udp"  },
+  { "lvision-lm",      { NULL }, 6471,  "tcp"  },
+  { "lvision-lm",      { NULL }, 6471,  "udp"  },
+  { "sun-sr-http",     { NULL }, 6480,  "tcp"  },
+  { "sun-sr-http",     { NULL }, 6480,  "udp"  },
+  { "servicetags",     { NULL }, 6481,  "tcp"  },
+  { "servicetags",     { NULL }, 6481,  "udp"  },
+  { "ldoms-mgmt",      { NULL }, 6482,  "tcp"  },
+  { "ldoms-mgmt",      { NULL }, 6482,  "udp"  },
+  { "SunVTS-RMI",      { NULL }, 6483,  "tcp"  },
+  { "SunVTS-RMI",      { NULL }, 6483,  "udp"  },
+  { "sun-sr-jms",      { NULL }, 6484,  "tcp"  },
+  { "sun-sr-jms",      { NULL }, 6484,  "udp"  },
+  { "sun-sr-iiop",     { NULL }, 6485,  "tcp"  },
+  { "sun-sr-iiop",     { NULL }, 6485,  "udp"  },
+  { "sun-sr-iiops",    { NULL }, 6486,  "tcp"  },
+  { "sun-sr-iiops",    { NULL }, 6486,  "udp"  },
+  { "sun-sr-iiop-aut", { NULL }, 6487,  "tcp"  },
+  { "sun-sr-iiop-aut", { NULL }, 6487,  "udp"  },
+  { "sun-sr-jmx",      { NULL }, 6488,  "tcp"  },
+  { "sun-sr-jmx",      { NULL }, 6488,  "udp"  },
+  { "sun-sr-admin",    { NULL }, 6489,  "tcp"  },
+  { "sun-sr-admin",    { NULL }, 6489,  "udp"  },
+  { "boks",            { NULL }, 6500,  "tcp"  },
+  { "boks",            { NULL }, 6500,  "udp"  },
+  { "boks_servc",      { NULL }, 6501,  "tcp"  },
+  { "boks_servc",      { NULL }, 6501,  "udp"  },
+  { "boks_servm",      { NULL }, 6502,  "tcp"  },
+  { "boks_servm",      { NULL }, 6502,  "udp"  },
+  { "boks_clntd",      { NULL }, 6503,  "tcp"  },
+  { "boks_clntd",      { NULL }, 6503,  "udp"  },
+  { "badm_priv",       { NULL }, 6505,  "tcp"  },
+  { "badm_priv",       { NULL }, 6505,  "udp"  },
+  { "badm_pub",        { NULL }, 6506,  "tcp"  },
+  { "badm_pub",        { NULL }, 6506,  "udp"  },
+  { "bdir_priv",       { NULL }, 6507,  "tcp"  },
+  { "bdir_priv",       { NULL }, 6507,  "udp"  },
+  { "bdir_pub",        { NULL }, 6508,  "tcp"  },
+  { "bdir_pub",        { NULL }, 6508,  "udp"  },
+  { "mgcs-mfp-port",   { NULL }, 6509,  "tcp"  },
+  { "mgcs-mfp-port",   { NULL }, 6509,  "udp"  },
+  { "mcer-port",       { NULL }, 6510,  "tcp"  },
+  { "mcer-port",       { NULL }, 6510,  "udp"  },
+  { "netconf-tls",     { NULL }, 6513,  "tcp"  },
+  { "syslog-tls",      { NULL }, 6514,  "tcp"  },
+  { "syslog-tls",      { NULL }, 6514,  "udp"  },
+  { "syslog-tls",      { NULL }, 6514,  "dccp" },
+  { "elipse-rec",      { NULL }, 6515,  "tcp"  },
+  { "elipse-rec",      { NULL }, 6515,  "udp"  },
+  { "lds-distrib",     { NULL }, 6543,  "tcp"  },
+  { "lds-distrib",     { NULL }, 6543,  "udp"  },
+  { "lds-dump",        { NULL }, 6544,  "tcp"  },
+  { "lds-dump",        { NULL }, 6544,  "udp"  },
+  { "apc-6547",        { NULL }, 6547,  "tcp"  },
+  { "apc-6547",        { NULL }, 6547,  "udp"  },
+  { "apc-6548",        { NULL }, 6548,  "tcp"  },
+  { "apc-6548",        { NULL }, 6548,  "udp"  },
+  { "apc-6549",        { NULL }, 6549,  "tcp"  },
+  { "apc-6549",        { NULL }, 6549,  "udp"  },
+  { "fg-sysupdate",    { NULL }, 6550,  "tcp"  },
+  { "fg-sysupdate",    { NULL }, 6550,  "udp"  },
+  { "sum",             { NULL }, 6551,  "tcp"  },
+  { "sum",             { NULL }, 6551,  "udp"  },
+  { "xdsxdm",          { NULL }, 6558,  "tcp"  },
+  { "xdsxdm",          { NULL }, 6558,  "udp"  },
+  { "sane-port",       { NULL }, 6566,  "tcp"  },
+  { "sane-port",       { NULL }, 6566,  "udp"  },
+  { "esp",             { NULL }, 6567,  "tcp"  },
+  { "esp",             { NULL }, 6567,  "udp"  },
+  { "canit_store",     { NULL }, 6568,  "tcp"  },
+  { "rp-reputation",   { NULL }, 6568,  "udp"  },
+  { "affiliate",       { NULL }, 6579,  "tcp"  },
+  { "affiliate",       { NULL }, 6579,  "udp"  },
+  { "parsec-master",   { NULL }, 6580,  "tcp"  },
+  { "parsec-master",   { NULL }, 6580,  "udp"  },
+  { "parsec-peer",     { NULL }, 6581,  "tcp"  },
+  { "parsec-peer",     { NULL }, 6581,  "udp"  },
+  { "parsec-game",     { NULL }, 6582,  "tcp"  },
+  { "parsec-game",     { NULL }, 6582,  "udp"  },
+  { "joaJewelSuite",   { NULL }, 6583,  "tcp"  },
+  { "joaJewelSuite",   { NULL }, 6583,  "udp"  },
+  { "mshvlm",          { NULL }, 6600,  "tcp"  },
+  { "mstmg-sstp",      { NULL }, 6601,  "tcp"  },
+  { "wsscomfrmwk",     { NULL }, 6602,  "tcp"  },
+  { "odette-ftps",     { NULL }, 6619,  "tcp"  },
+  { "odette-ftps",     { NULL }, 6619,  "udp"  },
+  { "kftp-data",       { NULL }, 6620,  "tcp"  },
+  { "kftp-data",       { NULL }, 6620,  "udp"  },
+  { "kftp",            { NULL }, 6621,  "tcp"  },
+  { "kftp",            { NULL }, 6621,  "udp"  },
+  { "mcftp",           { NULL }, 6622,  "tcp"  },
+  { "mcftp",           { NULL }, 6622,  "udp"  },
+  { "ktelnet",         { NULL }, 6623,  "tcp"  },
+  { "ktelnet",         { NULL }, 6623,  "udp"  },
+  { "datascaler-db",   { NULL }, 6624,  "tcp"  },
+  { "datascaler-ctl",  { NULL }, 6625,  "tcp"  },
+  { "wago-service",    { NULL }, 6626,  "tcp"  },
+  { "wago-service",    { NULL }, 6626,  "udp"  },
+  { "nexgen",          { NULL }, 6627,  "tcp"  },
+  { "nexgen",          { NULL }, 6627,  "udp"  },
+  { "afesc-mc",        { NULL }, 6628,  "tcp"  },
+  { "afesc-mc",        { NULL }, 6628,  "udp"  },
+  { "mxodbc-connect",  { NULL }, 6632,  "tcp"  },
+  { "pcs-sf-ui-man",   { NULL }, 6655,  "tcp"  },
+  { "emgmsg",          { NULL }, 6656,  "tcp"  },
+  { "palcom-disc",     { NULL }, 6657,  "udp"  },
+  { "vocaltec-gold",   { NULL }, 6670,  "tcp"  },
+  { "vocaltec-gold",   { NULL }, 6670,  "udp"  },
+  { "p4p-portal",      { NULL }, 6671,  "tcp"  },
+  { "p4p-portal",      { NULL }, 6671,  "udp"  },
+  { "vision_server",   { NULL }, 6672,  "tcp"  },
+  { "vision_server",   { NULL }, 6672,  "udp"  },
+  { "vision_elmd",     { NULL }, 6673,  "tcp"  },
+  { "vision_elmd",     { NULL }, 6673,  "udp"  },
+  { "vfbp",            { NULL }, 6678,  "tcp"  },
+  { "vfbp-disc",       { NULL }, 6678,  "udp"  },
+  { "osaut",           { NULL }, 6679,  "tcp"  },
+  { "osaut",           { NULL }, 6679,  "udp"  },
+  { "clever-ctrace",   { NULL }, 6687,  "tcp"  },
+  { "clever-tcpip",    { NULL }, 6688,  "tcp"  },
+  { "tsa",             { NULL }, 6689,  "tcp"  },
+  { "tsa",             { NULL }, 6689,  "udp"  },
+  { "babel",           { NULL }, 6697,  "udp"  },
+  { "kti-icad-srvr",   { NULL }, 6701,  "tcp"  },
+  { "kti-icad-srvr",   { NULL }, 6701,  "udp"  },
+  { "e-design-net",    { NULL }, 6702,  "tcp"  },
+  { "e-design-net",    { NULL }, 6702,  "udp"  },
+  { "e-design-web",    { NULL }, 6703,  "tcp"  },
+  { "e-design-web",    { NULL }, 6703,  "udp"  },
+  { "frc-hp",          { NULL }, 6704,  "sctp" },
+  { "frc-mp",          { NULL }, 6705,  "sctp" },
+  { "frc-lp",          { NULL }, 6706,  "sctp" },
+  { "ibprotocol",      { NULL }, 6714,  "tcp"  },
+  { "ibprotocol",      { NULL }, 6714,  "udp"  },
+  { "fibotrader-com",  { NULL }, 6715,  "tcp"  },
+  { "fibotrader-com",  { NULL }, 6715,  "udp"  },
+  { "bmc-perf-agent",  { NULL }, 6767,  "tcp"  },
+  { "bmc-perf-agent",  { NULL }, 6767,  "udp"  },
+  { "bmc-perf-mgrd",   { NULL }, 6768,  "tcp"  },
+  { "bmc-perf-mgrd",   { NULL }, 6768,  "udp"  },
+  { "adi-gxp-srvprt",  { NULL }, 6769,  "tcp"  },
+  { "adi-gxp-srvprt",  { NULL }, 6769,  "udp"  },
+  { "plysrv-http",     { NULL }, 6770,  "tcp"  },
+  { "plysrv-http",     { NULL }, 6770,  "udp"  },
+  { "plysrv-https",    { NULL }, 6771,  "tcp"  },
+  { "plysrv-https",    { NULL }, 6771,  "udp"  },
+  { "dgpf-exchg",      { NULL }, 6785,  "tcp"  },
+  { "dgpf-exchg",      { NULL }, 6785,  "udp"  },
+  { "smc-jmx",         { NULL }, 6786,  "tcp"  },
+  { "smc-jmx",         { NULL }, 6786,  "udp"  },
+  { "smc-admin",       { NULL }, 6787,  "tcp"  },
+  { "smc-admin",       { NULL }, 6787,  "udp"  },
+  { "smc-http",        { NULL }, 6788,  "tcp"  },
+  { "smc-http",        { NULL }, 6788,  "udp"  },
+  { "smc-https",       { NULL }, 6789,  "tcp"  },
+  { "smc-https",       { NULL }, 6789,  "udp"  },
+  { "hnmp",            { NULL }, 6790,  "tcp"  },
+  { "hnmp",            { NULL }, 6790,  "udp"  },
+  { "hnm",             { NULL }, 6791,  "tcp"  },
+  { "hnm",             { NULL }, 6791,  "udp"  },
+  { "acnet",           { NULL }, 6801,  "tcp"  },
+  { "acnet",           { NULL }, 6801,  "udp"  },
+  { "pentbox-sim",     { NULL }, 6817,  "tcp"  },
+  { "ambit-lm",        { NULL }, 6831,  "tcp"  },
+  { "ambit-lm",        { NULL }, 6831,  "udp"  },
+  { "netmo-default",   { NULL }, 6841,  "tcp"  },
+  { "netmo-default",   { NULL }, 6841,  "udp"  },
+  { "netmo-http",      { NULL }, 6842,  "tcp"  },
+  { "netmo-http",      { NULL }, 6842,  "udp"  },
+  { "iccrushmore",     { NULL }, 6850,  "tcp"  },
+  { "iccrushmore",     { NULL }, 6850,  "udp"  },
+  { "acctopus-cc",     { NULL }, 6868,  "tcp"  },
+  { "acctopus-st",     { NULL }, 6868,  "udp"  },
+  { "muse",            { NULL }, 6888,  "tcp"  },
+  { "muse",            { NULL }, 6888,  "udp"  },
+  { "jetstream",       { NULL }, 6901,  "tcp"  },
+  { "xsmsvc",          { NULL }, 6936,  "tcp"  },
+  { "xsmsvc",          { NULL }, 6936,  "udp"  },
+  { "bioserver",       { NULL }, 6946,  "tcp"  },
+  { "bioserver",       { NULL }, 6946,  "udp"  },
+  { "otlp",            { NULL }, 6951,  "tcp"  },
+  { "otlp",            { NULL }, 6951,  "udp"  },
+  { "jmact3",          { NULL }, 6961,  "tcp"  },
+  { "jmact3",          { NULL }, 6961,  "udp"  },
+  { "jmevt2",          { NULL }, 6962,  "tcp"  },
+  { "jmevt2",          { NULL }, 6962,  "udp"  },
+  { "swismgr1",        { NULL }, 6963,  "tcp"  },
+  { "swismgr1",        { NULL }, 6963,  "udp"  },
+  { "swismgr2",        { NULL }, 6964,  "tcp"  },
+  { "swismgr2",        { NULL }, 6964,  "udp"  },
+  { "swistrap",        { NULL }, 6965,  "tcp"  },
+  { "swistrap",        { NULL }, 6965,  "udp"  },
+  { "swispol",         { NULL }, 6966,  "tcp"  },
+  { "swispol",         { NULL }, 6966,  "udp"  },
+  { "acmsoda",         { NULL }, 6969,  "tcp"  },
+  { "acmsoda",         { NULL }, 6969,  "udp"  },
+  { "MobilitySrv",     { NULL }, 6997,  "tcp"  },
+  { "MobilitySrv",     { NULL }, 6997,  "udp"  },
+  { "iatp-highpri",    { NULL }, 6998,  "tcp"  },
+  { "iatp-highpri",    { NULL }, 6998,  "udp"  },
+  { "iatp-normalpri",  { NULL }, 6999,  "tcp"  },
+  { "iatp-normalpri",  { NULL }, 6999,  "udp"  },
+  { "afs3-fileserver", { NULL }, 7000,  "tcp"  },
+  { "afs3-fileserver", { NULL }, 7000,  "udp"  },
+  { "afs3-callback",   { NULL }, 7001,  "tcp"  },
+  { "afs3-callback",   { NULL }, 7001,  "udp"  },
+  { "afs3-prserver",   { NULL }, 7002,  "tcp"  },
+  { "afs3-prserver",   { NULL }, 7002,  "udp"  },
+  { "afs3-vlserver",   { NULL }, 7003,  "tcp"  },
+  { "afs3-vlserver",   { NULL }, 7003,  "udp"  },
+  { "afs3-kaserver",   { NULL }, 7004,  "tcp"  },
+  { "afs3-kaserver",   { NULL }, 7004,  "udp"  },
+  { "afs3-volser",     { NULL }, 7005,  "tcp"  },
+  { "afs3-volser",     { NULL }, 7005,  "udp"  },
+  { "afs3-errors",     { NULL }, 7006,  "tcp"  },
+  { "afs3-errors",     { NULL }, 7006,  "udp"  },
+  { "afs3-bos",        { NULL }, 7007,  "tcp"  },
+  { "afs3-bos",        { NULL }, 7007,  "udp"  },
+  { "afs3-update",     { NULL }, 7008,  "tcp"  },
+  { "afs3-update",     { NULL }, 7008,  "udp"  },
+  { "afs3-rmtsys",     { NULL }, 7009,  "tcp"  },
+  { "afs3-rmtsys",     { NULL }, 7009,  "udp"  },
+  { "ups-onlinet",     { NULL }, 7010,  "tcp"  },
+  { "ups-onlinet",     { NULL }, 7010,  "udp"  },
+  { "talon-disc",      { NULL }, 7011,  "tcp"  },
+  { "talon-disc",      { NULL }, 7011,  "udp"  },
+  { "talon-engine",    { NULL }, 7012,  "tcp"  },
+  { "talon-engine",    { NULL }, 7012,  "udp"  },
+  { "microtalon-dis",  { NULL }, 7013,  "tcp"  },
+  { "microtalon-dis",  { NULL }, 7013,  "udp"  },
+  { "microtalon-com",  { NULL }, 7014,  "tcp"  },
+  { "microtalon-com",  { NULL }, 7014,  "udp"  },
+  { "talon-webserver", { NULL }, 7015,  "tcp"  },
+  { "talon-webserver", { NULL }, 7015,  "udp"  },
+  { "dpserve",         { NULL }, 7020,  "tcp"  },
+  { "dpserve",         { NULL }, 7020,  "udp"  },
+  { "dpserveadmin",    { NULL }, 7021,  "tcp"  },
+  { "dpserveadmin",    { NULL }, 7021,  "udp"  },
+  { "ctdp",            { NULL }, 7022,  "tcp"  },
+  { "ctdp",            { NULL }, 7022,  "udp"  },
+  { "ct2nmcs",         { NULL }, 7023,  "tcp"  },
+  { "ct2nmcs",         { NULL }, 7023,  "udp"  },
+  { "vmsvc",           { NULL }, 7024,  "tcp"  },
+  { "vmsvc",           { NULL }, 7024,  "udp"  },
+  { "vmsvc-2",         { NULL }, 7025,  "tcp"  },
+  { "vmsvc-2",         { NULL }, 7025,  "udp"  },
+  { "op-probe",        { NULL }, 7030,  "tcp"  },
+  { "op-probe",        { NULL }, 7030,  "udp"  },
+  { "arcp",            { NULL }, 7070,  "tcp"  },
+  { "arcp",            { NULL }, 7070,  "udp"  },
+  { "iwg1",            { NULL }, 7071,  "tcp"  },
+  { "iwg1",            { NULL }, 7071,  "udp"  },
+  { "empowerid",       { NULL }, 7080,  "tcp"  },
+  { "empowerid",       { NULL }, 7080,  "udp"  },
+  { "lazy-ptop",       { NULL }, 7099,  "tcp"  },
+  { "lazy-ptop",       { NULL }, 7099,  "udp"  },
+  { "font-service",    { NULL }, 7100,  "tcp"  },
+  { "font-service",    { NULL }, 7100,  "udp"  },
+  { "elcn",            { NULL }, 7101,  "tcp"  },
+  { "elcn",            { NULL }, 7101,  "udp"  },
+  { "aes-x170",        { NULL }, 7107,  "udp"  },
+  { "virprot-lm",      { NULL }, 7121,  "tcp"  },
+  { "virprot-lm",      { NULL }, 7121,  "udp"  },
+  { "scenidm",         { NULL }, 7128,  "tcp"  },
+  { "scenidm",         { NULL }, 7128,  "udp"  },
+  { "scenccs",         { NULL }, 7129,  "tcp"  },
+  { "scenccs",         { NULL }, 7129,  "udp"  },
+  { "cabsm-comm",      { NULL }, 7161,  "tcp"  },
+  { "cabsm-comm",      { NULL }, 7161,  "udp"  },
+  { "caistoragemgr",   { NULL }, 7162,  "tcp"  },
+  { "caistoragemgr",   { NULL }, 7162,  "udp"  },
+  { "cacsambroker",    { NULL }, 7163,  "tcp"  },
+  { "cacsambroker",    { NULL }, 7163,  "udp"  },
+  { "fsr",             { NULL }, 7164,  "tcp"  },
+  { "fsr",             { NULL }, 7164,  "udp"  },
+  { "doc-server",      { NULL }, 7165,  "tcp"  },
+  { "doc-server",      { NULL }, 7165,  "udp"  },
+  { "aruba-server",    { NULL }, 7166,  "tcp"  },
+  { "aruba-server",    { NULL }, 7166,  "udp"  },
+  { "casrmagent",      { NULL }, 7167,  "tcp"  },
+  { "cnckadserver",    { NULL }, 7168,  "tcp"  },
+  { "ccag-pib",        { NULL }, 7169,  "tcp"  },
+  { "ccag-pib",        { NULL }, 7169,  "udp"  },
+  { "nsrp",            { NULL }, 7170,  "tcp"  },
+  { "nsrp",            { NULL }, 7170,  "udp"  },
+  { "drm-production",  { NULL }, 7171,  "tcp"  },
+  { "drm-production",  { NULL }, 7171,  "udp"  },
+  { "zsecure",         { NULL }, 7173,  "tcp"  },
+  { "clutild",         { NULL }, 7174,  "tcp"  },
+  { "clutild",         { NULL }, 7174,  "udp"  },
+  { "fodms",           { NULL }, 7200,  "tcp"  },
+  { "fodms",           { NULL }, 7200,  "udp"  },
+  { "dlip",            { NULL }, 7201,  "tcp"  },
+  { "dlip",            { NULL }, 7201,  "udp"  },
+  { "ramp",            { NULL }, 7227,  "tcp"  },
+  { "ramp",            { NULL }, 7227,  "udp"  },
+  { "citrixupp",       { NULL }, 7228,  "tcp"  },
+  { "citrixuppg",      { NULL }, 7229,  "tcp"  },
+  { "pads",            { NULL }, 7237,  "tcp"  },
+  { "cnap",            { NULL }, 7262,  "tcp"  },
+  { "cnap",            { NULL }, 7262,  "udp"  },
+  { "watchme-7272",    { NULL }, 7272,  "tcp"  },
+  { "watchme-7272",    { NULL }, 7272,  "udp"  },
+  { "oma-rlp",         { NULL }, 7273,  "tcp"  },
+  { "oma-rlp",         { NULL }, 7273,  "udp"  },
+  { "oma-rlp-s",       { NULL }, 7274,  "tcp"  },
+  { "oma-rlp-s",       { NULL }, 7274,  "udp"  },
+  { "oma-ulp",         { NULL }, 7275,  "tcp"  },
+  { "oma-ulp",         { NULL }, 7275,  "udp"  },
+  { "oma-ilp",         { NULL }, 7276,  "tcp"  },
+  { "oma-ilp",         { NULL }, 7276,  "udp"  },
+  { "oma-ilp-s",       { NULL }, 7277,  "tcp"  },
+  { "oma-ilp-s",       { NULL }, 7277,  "udp"  },
+  { "oma-dcdocbs",     { NULL }, 7278,  "tcp"  },
+  { "oma-dcdocbs",     { NULL }, 7278,  "udp"  },
+  { "ctxlic",          { NULL }, 7279,  "tcp"  },
+  { "ctxlic",          { NULL }, 7279,  "udp"  },
+  { "itactionserver1", { NULL }, 7280,  "tcp"  },
+  { "itactionserver1", { NULL }, 7280,  "udp"  },
+  { "itactionserver2", { NULL }, 7281,  "tcp"  },
+  { "itactionserver2", { NULL }, 7281,  "udp"  },
+  { "mzca-action",     { NULL }, 7282,  "tcp"  },
+  { "mzca-alert",      { NULL }, 7282,  "udp"  },
+  { "lcm-server",      { NULL }, 7365,  "tcp"  },
+  { "lcm-server",      { NULL }, 7365,  "udp"  },
+  { "mindfilesys",     { NULL }, 7391,  "tcp"  },
+  { "mindfilesys",     { NULL }, 7391,  "udp"  },
+  { "mrssrendezvous",  { NULL }, 7392,  "tcp"  },
+  { "mrssrendezvous",  { NULL }, 7392,  "udp"  },
+  { "nfoldman",        { NULL }, 7393,  "tcp"  },
+  { "nfoldman",        { NULL }, 7393,  "udp"  },
+  { "fse",             { NULL }, 7394,  "tcp"  },
+  { "fse",             { NULL }, 7394,  "udp"  },
+  { "winqedit",        { NULL }, 7395,  "tcp"  },
+  { "winqedit",        { NULL }, 7395,  "udp"  },
+  { "hexarc",          { NULL }, 7397,  "tcp"  },
+  { "hexarc",          { NULL }, 7397,  "udp"  },
+  { "rtps-discovery",  { NULL }, 7400,  "tcp"  },
+  { "rtps-discovery",  { NULL }, 7400,  "udp"  },
+  { "rtps-dd-ut",      { NULL }, 7401,  "tcp"  },
+  { "rtps-dd-ut",      { NULL }, 7401,  "udp"  },
+  { "rtps-dd-mt",      { NULL }, 7402,  "tcp"  },
+  { "rtps-dd-mt",      { NULL }, 7402,  "udp"  },
+  { "ionixnetmon",     { NULL }, 7410,  "tcp"  },
+  { "ionixnetmon",     { NULL }, 7410,  "udp"  },
+  { "mtportmon",       { NULL }, 7421,  "tcp"  },
+  { "mtportmon",       { NULL }, 7421,  "udp"  },
+  { "pmdmgr",          { NULL }, 7426,  "tcp"  },
+  { "pmdmgr",          { NULL }, 7426,  "udp"  },
+  { "oveadmgr",        { NULL }, 7427,  "tcp"  },
+  { "oveadmgr",        { NULL }, 7427,  "udp"  },
+  { "ovladmgr",        { NULL }, 7428,  "tcp"  },
+  { "ovladmgr",        { NULL }, 7428,  "udp"  },
+  { "opi-sock",        { NULL }, 7429,  "tcp"  },
+  { "opi-sock",        { NULL }, 7429,  "udp"  },
+  { "xmpv7",           { NULL }, 7430,  "tcp"  },
+  { "xmpv7",           { NULL }, 7430,  "udp"  },
+  { "pmd",             { NULL }, 7431,  "tcp"  },
+  { "pmd",             { NULL }, 7431,  "udp"  },
+  { "faximum",         { NULL }, 7437,  "tcp"  },
+  { "faximum",         { NULL }, 7437,  "udp"  },
+  { "oracleas-https",  { NULL }, 7443,  "tcp"  },
+  { "oracleas-https",  { NULL }, 7443,  "udp"  },
+  { "rise",            { NULL }, 7473,  "tcp"  },
+  { "rise",            { NULL }, 7473,  "udp"  },
+  { "telops-lmd",      { NULL }, 7491,  "tcp"  },
+  { "telops-lmd",      { NULL }, 7491,  "udp"  },
+  { "silhouette",      { NULL }, 7500,  "tcp"  },
+  { "silhouette",      { NULL }, 7500,  "udp"  },
+  { "ovbus",           { NULL }, 7501,  "tcp"  },
+  { "ovbus",           { NULL }, 7501,  "udp"  },
+  { "acplt",           { NULL }, 7509,  "tcp"  },
+  { "ovhpas",          { NULL }, 7510,  "tcp"  },
+  { "ovhpas",          { NULL }, 7510,  "udp"  },
+  { "pafec-lm",        { NULL }, 7511,  "tcp"  },
+  { "pafec-lm",        { NULL }, 7511,  "udp"  },
+  { "saratoga",        { NULL }, 7542,  "tcp"  },
+  { "saratoga",        { NULL }, 7542,  "udp"  },
+  { "atul",            { NULL }, 7543,  "tcp"  },
+  { "atul",            { NULL }, 7543,  "udp"  },
+  { "nta-ds",          { NULL }, 7544,  "tcp"  },
+  { "nta-ds",          { NULL }, 7544,  "udp"  },
+  { "nta-us",          { NULL }, 7545,  "tcp"  },
+  { "nta-us",          { NULL }, 7545,  "udp"  },
+  { "cfs",             { NULL }, 7546,  "tcp"  },
+  { "cfs",             { NULL }, 7546,  "udp"  },
+  { "cwmp",            { NULL }, 7547,  "tcp"  },
+  { "cwmp",            { NULL }, 7547,  "udp"  },
+  { "tidp",            { NULL }, 7548,  "tcp"  },
+  { "tidp",            { NULL }, 7548,  "udp"  },
+  { "nls-tl",          { NULL }, 7549,  "tcp"  },
+  { "nls-tl",          { NULL }, 7549,  "udp"  },
+  { "sncp",            { NULL }, 7560,  "tcp"  },
+  { "sncp",            { NULL }, 7560,  "udp"  },
+  { "cfw",             { NULL }, 7563,  "tcp"  },
+  { "vsi-omega",       { NULL }, 7566,  "tcp"  },
+  { "vsi-omega",       { NULL }, 7566,  "udp"  },
+  { "dell-eql-asm",    { NULL }, 7569,  "tcp"  },
+  { "aries-kfinder",   { NULL }, 7570,  "tcp"  },
+  { "aries-kfinder",   { NULL }, 7570,  "udp"  },
+  { "sun-lm",          { NULL }, 7588,  "tcp"  },
+  { "sun-lm",          { NULL }, 7588,  "udp"  },
+  { "indi",            { NULL }, 7624,  "tcp"  },
+  { "indi",            { NULL }, 7624,  "udp"  },
+  { "simco",           { NULL }, 7626,  "tcp"  },
+  { "simco",           { NULL }, 7626,  "sctp" },
+  { "soap-http",       { NULL }, 7627,  "tcp"  },
+  { "soap-http",       { NULL }, 7627,  "udp"  },
+  { "zen-pawn",        { NULL }, 7628,  "tcp"  },
+  { "zen-pawn",        { NULL }, 7628,  "udp"  },
+  { "xdas",            { NULL }, 7629,  "tcp"  },
+  { "xdas",            { NULL }, 7629,  "udp"  },
+  { "hawk",            { NULL }, 7630,  "tcp"  },
+  { "tesla-sys-msg",   { NULL }, 7631,  "tcp"  },
+  { "pmdfmgt",         { NULL }, 7633,  "tcp"  },
+  { "pmdfmgt",         { NULL }, 7633,  "udp"  },
+  { "cuseeme",         { NULL }, 7648,  "tcp"  },
+  { "cuseeme",         { NULL }, 7648,  "udp"  },
+  { "imqstomp",        { NULL }, 7672,  "tcp"  },
+  { "imqstomps",       { NULL }, 7673,  "tcp"  },
+  { "imqtunnels",      { NULL }, 7674,  "tcp"  },
+  { "imqtunnels",      { NULL }, 7674,  "udp"  },
+  { "imqtunnel",       { NULL }, 7675,  "tcp"  },
+  { "imqtunnel",       { NULL }, 7675,  "udp"  },
+  { "imqbrokerd",      { NULL }, 7676,  "tcp"  },
+  { "imqbrokerd",      { NULL }, 7676,  "udp"  },
+  { "sun-user-https",  { NULL }, 7677,  "tcp"  },
+  { "sun-user-https",  { NULL }, 7677,  "udp"  },
+  { "pando-pub",       { NULL }, 7680,  "tcp"  },
+  { "pando-pub",       { NULL }, 7680,  "udp"  },
+  { "collaber",        { NULL }, 7689,  "tcp"  },
+  { "collaber",        { NULL }, 7689,  "udp"  },
+  { "klio",            { NULL }, 7697,  "tcp"  },
+  { "klio",            { NULL }, 7697,  "udp"  },
+  { "em7-secom",       { NULL }, 7700,  "tcp"  },
+  { "sync-em7",        { NULL }, 7707,  "tcp"  },
+  { "sync-em7",        { NULL }, 7707,  "udp"  },
+  { "scinet",          { NULL }, 7708,  "tcp"  },
+  { "scinet",          { NULL }, 7708,  "udp"  },
+  { "medimageportal",  { NULL }, 7720,  "tcp"  },
+  { "medimageportal",  { NULL }, 7720,  "udp"  },
+  { "nsdeepfreezectl", { NULL }, 7724,  "tcp"  },
+  { "nsdeepfreezectl", { NULL }, 7724,  "udp"  },
+  { "nitrogen",        { NULL }, 7725,  "tcp"  },
+  { "nitrogen",        { NULL }, 7725,  "udp"  },
+  { "freezexservice",  { NULL }, 7726,  "tcp"  },
+  { "freezexservice",  { NULL }, 7726,  "udp"  },
+  { "trident-data",    { NULL }, 7727,  "tcp"  },
+  { "trident-data",    { NULL }, 7727,  "udp"  },
+  { "smip",            { NULL }, 7734,  "tcp"  },
+  { "smip",            { NULL }, 7734,  "udp"  },
+  { "aiagent",         { NULL }, 7738,  "tcp"  },
+  { "aiagent",         { NULL }, 7738,  "udp"  },
+  { "scriptview",      { NULL }, 7741,  "tcp"  },
+  { "scriptview",      { NULL }, 7741,  "udp"  },
+  { "msss",            { NULL }, 7742,  "tcp"  },
+  { "sstp-1",          { NULL }, 7743,  "tcp"  },
+  { "sstp-1",          { NULL }, 7743,  "udp"  },
+  { "raqmon-pdu",      { NULL }, 7744,  "tcp"  },
+  { "raqmon-pdu",      { NULL }, 7744,  "udp"  },
+  { "prgp",            { NULL }, 7747,  "tcp"  },
+  { "prgp",            { NULL }, 7747,  "udp"  },
+  { "cbt",             { NULL }, 7777,  "tcp"  },
+  { "cbt",             { NULL }, 7777,  "udp"  },
+  { "interwise",       { NULL }, 7778,  "tcp"  },
+  { "interwise",       { NULL }, 7778,  "udp"  },
+  { "vstat",           { NULL }, 7779,  "tcp"  },
+  { "vstat",           { NULL }, 7779,  "udp"  },
+  { "accu-lmgr",       { NULL }, 7781,  "tcp"  },
+  { "accu-lmgr",       { NULL }, 7781,  "udp"  },
+  { "minivend",        { NULL }, 7786,  "tcp"  },
+  { "minivend",        { NULL }, 7786,  "udp"  },
+  { "popup-reminders", { NULL }, 7787,  "tcp"  },
+  { "popup-reminders", { NULL }, 7787,  "udp"  },
+  { "office-tools",    { NULL }, 7789,  "tcp"  },
+  { "office-tools",    { NULL }, 7789,  "udp"  },
+  { "q3ade",           { NULL }, 7794,  "tcp"  },
+  { "q3ade",           { NULL }, 7794,  "udp"  },
+  { "pnet-conn",       { NULL }, 7797,  "tcp"  },
+  { "pnet-conn",       { NULL }, 7797,  "udp"  },
+  { "pnet-enc",        { NULL }, 7798,  "tcp"  },
+  { "pnet-enc",        { NULL }, 7798,  "udp"  },
+  { "altbsdp",         { NULL }, 7799,  "tcp"  },
+  { "altbsdp",         { NULL }, 7799,  "udp"  },
+  { "asr",             { NULL }, 7800,  "tcp"  },
+  { "asr",             { NULL }, 7800,  "udp"  },
+  { "ssp-client",      { NULL }, 7801,  "tcp"  },
+  { "ssp-client",      { NULL }, 7801,  "udp"  },
+  { "rbt-wanopt",      { NULL }, 7810,  "tcp"  },
+  { "rbt-wanopt",      { NULL }, 7810,  "udp"  },
+  { "apc-7845",        { NULL }, 7845,  "tcp"  },
+  { "apc-7845",        { NULL }, 7845,  "udp"  },
+  { "apc-7846",        { NULL }, 7846,  "tcp"  },
+  { "apc-7846",        { NULL }, 7846,  "udp"  },
+  { "mobileanalyzer",  { NULL }, 7869,  "tcp"  },
+  { "rbt-smc",         { NULL }, 7870,  "tcp"  },
+  { "pss",             { NULL }, 7880,  "tcp"  },
+  { "pss",             { NULL }, 7880,  "udp"  },
+  { "ubroker",         { NULL }, 7887,  "tcp"  },
+  { "ubroker",         { NULL }, 7887,  "udp"  },
+  { "mevent",          { NULL }, 7900,  "tcp"  },
+  { "mevent",          { NULL }, 7900,  "udp"  },
+  { "tnos-sp",         { NULL }, 7901,  "tcp"  },
+  { "tnos-sp",         { NULL }, 7901,  "udp"  },
+  { "tnos-dp",         { NULL }, 7902,  "tcp"  },
+  { "tnos-dp",         { NULL }, 7902,  "udp"  },
+  { "tnos-dps",        { NULL }, 7903,  "tcp"  },
+  { "tnos-dps",        { NULL }, 7903,  "udp"  },
+  { "qo-secure",       { NULL }, 7913,  "tcp"  },
+  { "qo-secure",       { NULL }, 7913,  "udp"  },
+  { "t2-drm",          { NULL }, 7932,  "tcp"  },
+  { "t2-drm",          { NULL }, 7932,  "udp"  },
+  { "t2-brm",          { NULL }, 7933,  "tcp"  },
+  { "t2-brm",          { NULL }, 7933,  "udp"  },
+  { "supercell",       { NULL }, 7967,  "tcp"  },
+  { "supercell",       { NULL }, 7967,  "udp"  },
+  { "micromuse-ncps",  { NULL }, 7979,  "tcp"  },
+  { "micromuse-ncps",  { NULL }, 7979,  "udp"  },
+  { "quest-vista",     { NULL }, 7980,  "tcp"  },
+  { "quest-vista",     { NULL }, 7980,  "udp"  },
+  { "sossd-collect",   { NULL }, 7981,  "tcp"  },
+  { "sossd-agent",     { NULL }, 7982,  "tcp"  },
+  { "sossd-disc",      { NULL }, 7982,  "udp"  },
+  { "pushns",          { NULL }, 7997,  "tcp"  },
+  { "usicontentpush",  { NULL }, 7998,  "udp"  },
+  { "irdmi2",          { NULL }, 7999,  "tcp"  },
+  { "irdmi2",          { NULL }, 7999,  "udp"  },
+  { "irdmi",           { NULL }, 8000,  "tcp"  },
+  { "irdmi",           { NULL }, 8000,  "udp"  },
+  { "vcom-tunnel",     { NULL }, 8001,  "tcp"  },
+  { "vcom-tunnel",     { NULL }, 8001,  "udp"  },
+  { "teradataordbms",  { NULL }, 8002,  "tcp"  },
+  { "teradataordbms",  { NULL }, 8002,  "udp"  },
+  { "mcreport",        { NULL }, 8003,  "tcp"  },
+  { "mcreport",        { NULL }, 8003,  "udp"  },
+  { "mxi",             { NULL }, 8005,  "tcp"  },
+  { "mxi",             { NULL }, 8005,  "udp"  },
+  { "http-alt",        { NULL }, 8008,  "tcp"  },
+  { "http-alt",        { NULL }, 8008,  "udp"  },
+  { "qbdb",            { NULL }, 8019,  "tcp"  },
+  { "qbdb",            { NULL }, 8019,  "udp"  },
+  { "intu-ec-svcdisc", { NULL }, 8020,  "tcp"  },
+  { "intu-ec-svcdisc", { NULL }, 8020,  "udp"  },
+  { "intu-ec-client",  { NULL }, 8021,  "tcp"  },
+  { "intu-ec-client",  { NULL }, 8021,  "udp"  },
+  { "oa-system",       { NULL }, 8022,  "tcp"  },
+  { "oa-system",       { NULL }, 8022,  "udp"  },
+  { "ca-audit-da",     { NULL }, 8025,  "tcp"  },
+  { "ca-audit-da",     { NULL }, 8025,  "udp"  },
+  { "ca-audit-ds",     { NULL }, 8026,  "tcp"  },
+  { "ca-audit-ds",     { NULL }, 8026,  "udp"  },
+  { "pro-ed",          { NULL }, 8032,  "tcp"  },
+  { "pro-ed",          { NULL }, 8032,  "udp"  },
+  { "mindprint",       { NULL }, 8033,  "tcp"  },
+  { "mindprint",       { NULL }, 8033,  "udp"  },
+  { "vantronix-mgmt",  { NULL }, 8034,  "tcp"  },
+  { "vantronix-mgmt",  { NULL }, 8034,  "udp"  },
+  { "ampify",          { NULL }, 8040,  "tcp"  },
+  { "ampify",          { NULL }, 8040,  "udp"  },
+  { "fs-agent",        { NULL }, 8042,  "tcp"  },
+  { "fs-server",       { NULL }, 8043,  "tcp"  },
+  { "fs-mgmt",         { NULL }, 8044,  "tcp"  },
+  { "senomix01",       { NULL }, 8052,  "tcp"  },
+  { "senomix01",       { NULL }, 8052,  "udp"  },
+  { "senomix02",       { NULL }, 8053,  "tcp"  },
+  { "senomix02",       { NULL }, 8053,  "udp"  },
+  { "senomix03",       { NULL }, 8054,  "tcp"  },
+  { "senomix03",       { NULL }, 8054,  "udp"  },
+  { "senomix04",       { NULL }, 8055,  "tcp"  },
+  { "senomix04",       { NULL }, 8055,  "udp"  },
+  { "senomix05",       { NULL }, 8056,  "tcp"  },
+  { "senomix05",       { NULL }, 8056,  "udp"  },
+  { "senomix06",       { NULL }, 8057,  "tcp"  },
+  { "senomix06",       { NULL }, 8057,  "udp"  },
+  { "senomix07",       { NULL }, 8058,  "tcp"  },
+  { "senomix07",       { NULL }, 8058,  "udp"  },
+  { "senomix08",       { NULL }, 8059,  "tcp"  },
+  { "senomix08",       { NULL }, 8059,  "udp"  },
+  { "gadugadu",        { NULL }, 8074,  "tcp"  },
+  { "gadugadu",        { NULL }, 8074,  "udp"  },
+  { "http-alt",        { NULL }, 8080,  "tcp"  },
+  { "http-alt",        { NULL }, 8080,  "udp"  },
+  { "sunproxyadmin",   { NULL }, 8081,  "tcp"  },
+  { "sunproxyadmin",   { NULL }, 8081,  "udp"  },
+  { "us-cli",          { NULL }, 8082,  "tcp"  },
+  { "us-cli",          { NULL }, 8082,  "udp"  },
+  { "us-srv",          { NULL }, 8083,  "tcp"  },
+  { "us-srv",          { NULL }, 8083,  "udp"  },
+  { "d-s-n",           { NULL }, 8086,  "tcp"  },
+  { "d-s-n",           { NULL }, 8086,  "udp"  },
+  { "simplifymedia",   { NULL }, 8087,  "tcp"  },
+  { "simplifymedia",   { NULL }, 8087,  "udp"  },
+  { "radan-http",      { NULL }, 8088,  "tcp"  },
+  { "radan-http",      { NULL }, 8088,  "udp"  },
+  { "jamlink",         { NULL }, 8091,  "tcp"  },
+  { "sac",             { NULL }, 8097,  "tcp"  },
+  { "sac",             { NULL }, 8097,  "udp"  },
+  { "xprint-server",   { NULL }, 8100,  "tcp"  },
+  { "xprint-server",   { NULL }, 8100,  "udp"  },
+  { "ldoms-migr",      { NULL }, 8101,  "tcp"  },
+  { "mtl8000-matrix",  { NULL }, 8115,  "tcp"  },
+  { "mtl8000-matrix",  { NULL }, 8115,  "udp"  },
+  { "cp-cluster",      { NULL }, 8116,  "tcp"  },
+  { "cp-cluster",      { NULL }, 8116,  "udp"  },
+  { "privoxy",         { NULL }, 8118,  "tcp"  },
+  { "privoxy",         { NULL }, 8118,  "udp"  },
+  { "apollo-data",     { NULL }, 8121,  "tcp"  },
+  { "apollo-data",     { NULL }, 8121,  "udp"  },
+  { "apollo-admin",    { NULL }, 8122,  "tcp"  },
+  { "apollo-admin",    { NULL }, 8122,  "udp"  },
+  { "paycash-online",  { NULL }, 8128,  "tcp"  },
+  { "paycash-online",  { NULL }, 8128,  "udp"  },
+  { "paycash-wbp",     { NULL }, 8129,  "tcp"  },
+  { "paycash-wbp",     { NULL }, 8129,  "udp"  },
+  { "indigo-vrmi",     { NULL }, 8130,  "tcp"  },
+  { "indigo-vrmi",     { NULL }, 8130,  "udp"  },
+  { "indigo-vbcp",     { NULL }, 8131,  "tcp"  },
+  { "indigo-vbcp",     { NULL }, 8131,  "udp"  },
+  { "dbabble",         { NULL }, 8132,  "tcp"  },
+  { "dbabble",         { NULL }, 8132,  "udp"  },
+  { "isdd",            { NULL }, 8148,  "tcp"  },
+  { "isdd",            { NULL }, 8148,  "udp"  },
+  { "patrol",          { NULL }, 8160,  "tcp"  },
+  { "patrol",          { NULL }, 8160,  "udp"  },
+  { "patrol-snmp",     { NULL }, 8161,  "tcp"  },
+  { "patrol-snmp",     { NULL }, 8161,  "udp"  },
+  { "vmware-fdm",      { NULL }, 8182,  "tcp"  },
+  { "vmware-fdm",      { NULL }, 8182,  "udp"  },
+  { "proremote",       { NULL }, 8183,  "tcp"  },
+  { "itach",           { NULL }, 8184,  "tcp"  },
+  { "itach",           { NULL }, 8184,  "udp"  },
+  { "spytechphone",    { NULL }, 8192,  "tcp"  },
+  { "spytechphone",    { NULL }, 8192,  "udp"  },
+  { "blp1",            { NULL }, 8194,  "tcp"  },
+  { "blp1",            { NULL }, 8194,  "udp"  },
+  { "blp2",            { NULL }, 8195,  "tcp"  },
+  { "blp2",            { NULL }, 8195,  "udp"  },
+  { "vvr-data",        { NULL }, 8199,  "tcp"  },
+  { "vvr-data",        { NULL }, 8199,  "udp"  },
+  { "trivnet1",        { NULL }, 8200,  "tcp"  },
+  { "trivnet1",        { NULL }, 8200,  "udp"  },
+  { "trivnet2",        { NULL }, 8201,  "tcp"  },
+  { "trivnet2",        { NULL }, 8201,  "udp"  },
+  { "lm-perfworks",    { NULL }, 8204,  "tcp"  },
+  { "lm-perfworks",    { NULL }, 8204,  "udp"  },
+  { "lm-instmgr",      { NULL }, 8205,  "tcp"  },
+  { "lm-instmgr",      { NULL }, 8205,  "udp"  },
+  { "lm-dta",          { NULL }, 8206,  "tcp"  },
+  { "lm-dta",          { NULL }, 8206,  "udp"  },
+  { "lm-sserver",      { NULL }, 8207,  "tcp"  },
+  { "lm-sserver",      { NULL }, 8207,  "udp"  },
+  { "lm-webwatcher",   { NULL }, 8208,  "tcp"  },
+  { "lm-webwatcher",   { NULL }, 8208,  "udp"  },
+  { "rexecj",          { NULL }, 8230,  "tcp"  },
+  { "rexecj",          { NULL }, 8230,  "udp"  },
+  { "synapse-nhttps",  { NULL }, 8243,  "tcp"  },
+  { "synapse-nhttps",  { NULL }, 8243,  "udp"  },
+  { "pando-sec",       { NULL }, 8276,  "tcp"  },
+  { "pando-sec",       { NULL }, 8276,  "udp"  },
+  { "synapse-nhttp",   { NULL }, 8280,  "tcp"  },
+  { "synapse-nhttp",   { NULL }, 8280,  "udp"  },
+  { "blp3",            { NULL }, 8292,  "tcp"  },
+  { "blp3",            { NULL }, 8292,  "udp"  },
+  { "hiperscan-id",    { NULL }, 8293,  "tcp"  },
+  { "blp4",            { NULL }, 8294,  "tcp"  },
+  { "blp4",            { NULL }, 8294,  "udp"  },
+  { "tmi",             { NULL }, 8300,  "tcp"  },
+  { "tmi",             { NULL }, 8300,  "udp"  },
+  { "amberon",         { NULL }, 8301,  "tcp"  },
+  { "amberon",         { NULL }, 8301,  "udp"  },
+  { "tnp-discover",    { NULL }, 8320,  "tcp"  },
+  { "tnp-discover",    { NULL }, 8320,  "udp"  },
+  { "tnp",             { NULL }, 8321,  "tcp"  },
+  { "tnp",             { NULL }, 8321,  "udp"  },
+  { "server-find",     { NULL }, 8351,  "tcp"  },
+  { "server-find",     { NULL }, 8351,  "udp"  },
+  { "cruise-enum",     { NULL }, 8376,  "tcp"  },
+  { "cruise-enum",     { NULL }, 8376,  "udp"  },
+  { "cruise-swroute",  { NULL }, 8377,  "tcp"  },
+  { "cruise-swroute",  { NULL }, 8377,  "udp"  },
+  { "cruise-config",   { NULL }, 8378,  "tcp"  },
+  { "cruise-config",   { NULL }, 8378,  "udp"  },
+  { "cruise-diags",    { NULL }, 8379,  "tcp"  },
+  { "cruise-diags",    { NULL }, 8379,  "udp"  },
+  { "cruise-update",   { NULL }, 8380,  "tcp"  },
+  { "cruise-update",   { NULL }, 8380,  "udp"  },
+  { "m2mservices",     { NULL }, 8383,  "tcp"  },
+  { "m2mservices",     { NULL }, 8383,  "udp"  },
+  { "cvd",             { NULL }, 8400,  "tcp"  },
+  { "cvd",             { NULL }, 8400,  "udp"  },
+  { "sabarsd",         { NULL }, 8401,  "tcp"  },
+  { "sabarsd",         { NULL }, 8401,  "udp"  },
+  { "abarsd",          { NULL }, 8402,  "tcp"  },
+  { "abarsd",          { NULL }, 8402,  "udp"  },
+  { "admind",          { NULL }, 8403,  "tcp"  },
+  { "admind",          { NULL }, 8403,  "udp"  },
+  { "svcloud",         { NULL }, 8404,  "tcp"  },
+  { "svbackup",        { NULL }, 8405,  "tcp"  },
+  { "espeech",         { NULL }, 8416,  "tcp"  },
+  { "espeech",         { NULL }, 8416,  "udp"  },
+  { "espeech-rtp",     { NULL }, 8417,  "tcp"  },
+  { "espeech-rtp",     { NULL }, 8417,  "udp"  },
+  { "cybro-a-bus",     { NULL }, 8442,  "tcp"  },
+  { "cybro-a-bus",     { NULL }, 8442,  "udp"  },
+  { "pcsync-https",    { NULL }, 8443,  "tcp"  },
+  { "pcsync-https",    { NULL }, 8443,  "udp"  },
+  { "pcsync-http",     { NULL }, 8444,  "tcp"  },
+  { "pcsync-http",     { NULL }, 8444,  "udp"  },
+  { "npmp",            { NULL }, 8450,  "tcp"  },
+  { "npmp",            { NULL }, 8450,  "udp"  },
+  { "cisco-avp",       { NULL }, 8470,  "tcp"  },
+  { "pim-port",        { NULL }, 8471,  "tcp"  },
+  { "pim-port",        { NULL }, 8471,  "sctp" },
+  { "otv",             { NULL }, 8472,  "tcp"  },
+  { "otv",             { NULL }, 8472,  "udp"  },
+  { "vp2p",            { NULL }, 8473,  "tcp"  },
+  { "vp2p",            { NULL }, 8473,  "udp"  },
+  { "noteshare",       { NULL }, 8474,  "tcp"  },
+  { "noteshare",       { NULL }, 8474,  "udp"  },
+  { "fmtp",            { NULL }, 8500,  "tcp"  },
+  { "fmtp",            { NULL }, 8500,  "udp"  },
+  { "rtsp-alt",        { NULL }, 8554,  "tcp"  },
+  { "rtsp-alt",        { NULL }, 8554,  "udp"  },
+  { "d-fence",         { NULL }, 8555,  "tcp"  },
+  { "d-fence",         { NULL }, 8555,  "udp"  },
+  { "oap-admin",       { NULL }, 8567,  "tcp"  },
+  { "oap-admin",       { NULL }, 8567,  "udp"  },
+  { "asterix",         { NULL }, 8600,  "tcp"  },
+  { "asterix",         { NULL }, 8600,  "udp"  },
+  { "canon-mfnp",      { NULL }, 8610,  "tcp"  },
+  { "canon-mfnp",      { NULL }, 8610,  "udp"  },
+  { "canon-bjnp1",     { NULL }, 8611,  "tcp"  },
+  { "canon-bjnp1",     { NULL }, 8611,  "udp"  },
+  { "canon-bjnp2",     { NULL }, 8612,  "tcp"  },
+  { "canon-bjnp2",     { NULL }, 8612,  "udp"  },
+  { "canon-bjnp3",     { NULL }, 8613,  "tcp"  },
+  { "canon-bjnp3",     { NULL }, 8613,  "udp"  },
+  { "canon-bjnp4",     { NULL }, 8614,  "tcp"  },
+  { "canon-bjnp4",     { NULL }, 8614,  "udp"  },
+  { "sun-as-jmxrmi",   { NULL }, 8686,  "tcp"  },
+  { "sun-as-jmxrmi",   { NULL }, 8686,  "udp"  },
+  { "vnyx",            { NULL }, 8699,  "tcp"  },
+  { "vnyx",            { NULL }, 8699,  "udp"  },
+  { "dtp-net",         { NULL }, 8732,  "udp"  },
+  { "ibus",            { NULL }, 8733,  "tcp"  },
+  { "ibus",            { NULL }, 8733,  "udp"  },
+  { "mc-appserver",    { NULL }, 8763,  "tcp"  },
+  { "mc-appserver",    { NULL }, 8763,  "udp"  },
+  { "openqueue",       { NULL }, 8764,  "tcp"  },
+  { "openqueue",       { NULL }, 8764,  "udp"  },
+  { "ultraseek-http",  { NULL }, 8765,  "tcp"  },
+  { "ultraseek-http",  { NULL }, 8765,  "udp"  },
+  { "dpap",            { NULL }, 8770,  "tcp"  },
+  { "dpap",            { NULL }, 8770,  "udp"  },
+  { "msgclnt",         { NULL }, 8786,  "tcp"  },
+  { "msgclnt",         { NULL }, 8786,  "udp"  },
+  { "msgsrvr",         { NULL }, 8787,  "tcp"  },
+  { "msgsrvr",         { NULL }, 8787,  "udp"  },
+  { "sunwebadmin",     { NULL }, 8800,  "tcp"  },
+  { "sunwebadmin",     { NULL }, 8800,  "udp"  },
+  { "truecm",          { NULL }, 8804,  "tcp"  },
+  { "truecm",          { NULL }, 8804,  "udp"  },
+  { "dxspider",        { NULL }, 8873,  "tcp"  },
+  { "dxspider",        { NULL }, 8873,  "udp"  },
+  { "cddbp-alt",       { NULL }, 8880,  "tcp"  },
+  { "cddbp-alt",       { NULL }, 8880,  "udp"  },
+  { "secure-mqtt",     { NULL }, 8883,  "tcp"  },
+  { "secure-mqtt",     { NULL }, 8883,  "udp"  },
+  { "ddi-tcp-1",       { NULL }, 8888,  "tcp"  },
+  { "ddi-udp-1",       { NULL }, 8888,  "udp"  },
+  { "ddi-tcp-2",       { NULL }, 8889,  "tcp"  },
+  { "ddi-udp-2",       { NULL }, 8889,  "udp"  },
+  { "ddi-tcp-3",       { NULL }, 8890,  "tcp"  },
+  { "ddi-udp-3",       { NULL }, 8890,  "udp"  },
+  { "ddi-tcp-4",       { NULL }, 8891,  "tcp"  },
+  { "ddi-udp-4",       { NULL }, 8891,  "udp"  },
+  { "ddi-tcp-5",       { NULL }, 8892,  "tcp"  },
+  { "ddi-udp-5",       { NULL }, 8892,  "udp"  },
+  { "ddi-tcp-6",       { NULL }, 8893,  "tcp"  },
+  { "ddi-udp-6",       { NULL }, 8893,  "udp"  },
+  { "ddi-tcp-7",       { NULL }, 8894,  "tcp"  },
+  { "ddi-udp-7",       { NULL }, 8894,  "udp"  },
+  { "ospf-lite",       { NULL }, 8899,  "tcp"  },
+  { "ospf-lite",       { NULL }, 8899,  "udp"  },
+  { "jmb-cds1",        { NULL }, 8900,  "tcp"  },
+  { "jmb-cds1",        { NULL }, 8900,  "udp"  },
+  { "jmb-cds2",        { NULL }, 8901,  "tcp"  },
+  { "jmb-cds2",        { NULL }, 8901,  "udp"  },
+  { "manyone-http",    { NULL }, 8910,  "tcp"  },
+  { "manyone-http",    { NULL }, 8910,  "udp"  },
+  { "manyone-xml",     { NULL }, 8911,  "tcp"  },
+  { "manyone-xml",     { NULL }, 8911,  "udp"  },
+  { "wcbackup",        { NULL }, 8912,  "tcp"  },
+  { "wcbackup",        { NULL }, 8912,  "udp"  },
+  { "dragonfly",       { NULL }, 8913,  "tcp"  },
+  { "dragonfly",       { NULL }, 8913,  "udp"  },
+  { "twds",            { NULL }, 8937,  "tcp"  },
+  { "cumulus-admin",   { NULL }, 8954,  "tcp"  },
+  { "cumulus-admin",   { NULL }, 8954,  "udp"  },
+  { "sunwebadmins",    { NULL }, 8989,  "tcp"  },
+  { "sunwebadmins",    { NULL }, 8989,  "udp"  },
+  { "http-wmap",       { NULL }, 8990,  "tcp"  },
+  { "http-wmap",       { NULL }, 8990,  "udp"  },
+  { "https-wmap",      { NULL }, 8991,  "tcp"  },
+  { "https-wmap",      { NULL }, 8991,  "udp"  },
+  { "bctp",            { NULL }, 8999,  "tcp"  },
+  { "bctp",            { NULL }, 8999,  "udp"  },
+  { "cslistener",      { NULL }, 9000,  "tcp"  },
+  { "cslistener",      { NULL }, 9000,  "udp"  },
+  { "etlservicemgr",   { NULL }, 9001,  "tcp"  },
+  { "etlservicemgr",   { NULL }, 9001,  "udp"  },
+  { "dynamid",         { NULL }, 9002,  "tcp"  },
+  { "dynamid",         { NULL }, 9002,  "udp"  },
+  { "ogs-client",      { NULL }, 9007,  "udp"  },
+  { "ogs-server",      { NULL }, 9008,  "tcp"  },
+  { "pichat",          { NULL }, 9009,  "tcp"  },
+  { "pichat",          { NULL }, 9009,  "udp"  },
+  { "sdr",             { NULL }, 9010,  "tcp"  },
+  { "tambora",         { NULL }, 9020,  "tcp"  },
+  { "tambora",         { NULL }, 9020,  "udp"  },
+  { "panagolin-ident", { NULL }, 9021,  "tcp"  },
+  { "panagolin-ident", { NULL }, 9021,  "udp"  },
+  { "paragent",        { NULL }, 9022,  "tcp"  },
+  { "paragent",        { NULL }, 9022,  "udp"  },
+  { "swa-1",           { NULL }, 9023,  "tcp"  },
+  { "swa-1",           { NULL }, 9023,  "udp"  },
+  { "swa-2",           { NULL }, 9024,  "tcp"  },
+  { "swa-2",           { NULL }, 9024,  "udp"  },
+  { "swa-3",           { NULL }, 9025,  "tcp"  },
+  { "swa-3",           { NULL }, 9025,  "udp"  },
+  { "swa-4",           { NULL }, 9026,  "tcp"  },
+  { "swa-4",           { NULL }, 9026,  "udp"  },
+  { "versiera",        { NULL }, 9050,  "tcp"  },
+  { "fio-cmgmt",       { NULL }, 9051,  "tcp"  },
+  { "glrpc",           { NULL }, 9080,  "tcp"  },
+  { "glrpc",           { NULL }, 9080,  "udp"  },
+  { "lcs-ap",          { NULL }, 9082,  "sctp" },
+  { "emc-pp-mgmtsvc",  { NULL }, 9083,  "tcp"  },
+  { "aurora",          { NULL }, 9084,  "tcp"  },
+  { "aurora",          { NULL }, 9084,  "udp"  },
+  { "aurora",          { NULL }, 9084,  "sctp" },
+  { "ibm-rsyscon",     { NULL }, 9085,  "tcp"  },
+  { "ibm-rsyscon",     { NULL }, 9085,  "udp"  },
+  { "net2display",     { NULL }, 9086,  "tcp"  },
+  { "net2display",     { NULL }, 9086,  "udp"  },
+  { "classic",         { NULL }, 9087,  "tcp"  },
+  { "classic",         { NULL }, 9087,  "udp"  },
+  { "sqlexec",         { NULL }, 9088,  "tcp"  },
+  { "sqlexec",         { NULL }, 9088,  "udp"  },
+  { "sqlexec-ssl",     { NULL }, 9089,  "tcp"  },
+  { "sqlexec-ssl",     { NULL }, 9089,  "udp"  },
+  { "websm",           { NULL }, 9090,  "tcp"  },
+  { "websm",           { NULL }, 9090,  "udp"  },
+  { "xmltec-xmlmail",  { NULL }, 9091,  "tcp"  },
+  { "xmltec-xmlmail",  { NULL }, 9091,  "udp"  },
+  { "XmlIpcRegSvc",    { NULL }, 9092,  "tcp"  },
+  { "XmlIpcRegSvc",    { NULL }, 9092,  "udp"  },
+  { "hp-pdl-datastr",  { NULL }, 9100,  "tcp"  },
+  { "hp-pdl-datastr",  { NULL }, 9100,  "udp"  },
+  { "pdl-datastream",  { NULL }, 9100,  "tcp"  },
+  { "pdl-datastream",  { NULL }, 9100,  "udp"  },
+  { "bacula-dir",      { NULL }, 9101,  "tcp"  },
+  { "bacula-dir",      { NULL }, 9101,  "udp"  },
+  { "bacula-fd",       { NULL }, 9102,  "tcp"  },
+  { "bacula-fd",       { NULL }, 9102,  "udp"  },
+  { "bacula-sd",       { NULL }, 9103,  "tcp"  },
+  { "bacula-sd",       { NULL }, 9103,  "udp"  },
+  { "peerwire",        { NULL }, 9104,  "tcp"  },
+  { "peerwire",        { NULL }, 9104,  "udp"  },
+  { "xadmin",          { NULL }, 9105,  "tcp"  },
+  { "xadmin",          { NULL }, 9105,  "udp"  },
+  { "astergate",       { NULL }, 9106,  "tcp"  },
+  { "astergate-disc",  { NULL }, 9106,  "udp"  },
+  { "astergatefax",    { NULL }, 9107,  "tcp"  },
+  { "mxit",            { NULL }, 9119,  "tcp"  },
+  { "mxit",            { NULL }, 9119,  "udp"  },
+  { "dddp",            { NULL }, 9131,  "tcp"  },
+  { "dddp",            { NULL }, 9131,  "udp"  },
+  { "apani1",          { NULL }, 9160,  "tcp"  },
+  { "apani1",          { NULL }, 9160,  "udp"  },
+  { "apani2",          { NULL }, 9161,  "tcp"  },
+  { "apani2",          { NULL }, 9161,  "udp"  },
+  { "apani3",          { NULL }, 9162,  "tcp"  },
+  { "apani3",          { NULL }, 9162,  "udp"  },
+  { "apani4",          { NULL }, 9163,  "tcp"  },
+  { "apani4",          { NULL }, 9163,  "udp"  },
+  { "apani5",          { NULL }, 9164,  "tcp"  },
+  { "apani5",          { NULL }, 9164,  "udp"  },
+  { "sun-as-jpda",     { NULL }, 9191,  "tcp"  },
+  { "sun-as-jpda",     { NULL }, 9191,  "udp"  },
+  { "wap-wsp",         { NULL }, 9200,  "tcp"  },
+  { "wap-wsp",         { NULL }, 9200,  "udp"  },
+  { "wap-wsp-wtp",     { NULL }, 9201,  "tcp"  },
+  { "wap-wsp-wtp",     { NULL }, 9201,  "udp"  },
+  { "wap-wsp-s",       { NULL }, 9202,  "tcp"  },
+  { "wap-wsp-s",       { NULL }, 9202,  "udp"  },
+  { "wap-wsp-wtp-s",   { NULL }, 9203,  "tcp"  },
+  { "wap-wsp-wtp-s",   { NULL }, 9203,  "udp"  },
+  { "wap-vcard",       { NULL }, 9204,  "tcp"  },
+  { "wap-vcard",       { NULL }, 9204,  "udp"  },
+  { "wap-vcal",        { NULL }, 9205,  "tcp"  },
+  { "wap-vcal",        { NULL }, 9205,  "udp"  },
+  { "wap-vcard-s",     { NULL }, 9206,  "tcp"  },
+  { "wap-vcard-s",     { NULL }, 9206,  "udp"  },
+  { "wap-vcal-s",      { NULL }, 9207,  "tcp"  },
+  { "wap-vcal-s",      { NULL }, 9207,  "udp"  },
+  { "rjcdb-vcards",    { NULL }, 9208,  "tcp"  },
+  { "rjcdb-vcards",    { NULL }, 9208,  "udp"  },
+  { "almobile-system", { NULL }, 9209,  "tcp"  },
+  { "almobile-system", { NULL }, 9209,  "udp"  },
+  { "oma-mlp",         { NULL }, 9210,  "tcp"  },
+  { "oma-mlp",         { NULL }, 9210,  "udp"  },
+  { "oma-mlp-s",       { NULL }, 9211,  "tcp"  },
+  { "oma-mlp-s",       { NULL }, 9211,  "udp"  },
+  { "serverviewdbms",  { NULL }, 9212,  "tcp"  },
+  { "serverviewdbms",  { NULL }, 9212,  "udp"  },
+  { "serverstart",     { NULL }, 9213,  "tcp"  },
+  { "serverstart",     { NULL }, 9213,  "udp"  },
+  { "ipdcesgbs",       { NULL }, 9214,  "tcp"  },
+  { "ipdcesgbs",       { NULL }, 9214,  "udp"  },
+  { "insis",           { NULL }, 9215,  "tcp"  },
+  { "insis",           { NULL }, 9215,  "udp"  },
+  { "acme",            { NULL }, 9216,  "tcp"  },
+  { "acme",            { NULL }, 9216,  "udp"  },
+  { "fsc-port",        { NULL }, 9217,  "tcp"  },
+  { "fsc-port",        { NULL }, 9217,  "udp"  },
+  { "teamcoherence",   { NULL }, 9222,  "tcp"  },
+  { "teamcoherence",   { NULL }, 9222,  "udp"  },
+  { "mon",             { NULL }, 9255,  "tcp"  },
+  { "mon",             { NULL }, 9255,  "udp"  },
+  { "pegasus",         { NULL }, 9278,  "tcp"  },
+  { "pegasus",         { NULL }, 9278,  "udp"  },
+  { "pegasus-ctl",     { NULL }, 9279,  "tcp"  },
+  { "pegasus-ctl",     { NULL }, 9279,  "udp"  },
+  { "pgps",            { NULL }, 9280,  "tcp"  },
+  { "pgps",            { NULL }, 9280,  "udp"  },
+  { "swtp-port1",      { NULL }, 9281,  "tcp"  },
+  { "swtp-port1",      { NULL }, 9281,  "udp"  },
+  { "swtp-port2",      { NULL }, 9282,  "tcp"  },
+  { "swtp-port2",      { NULL }, 9282,  "udp"  },
+  { "callwaveiam",     { NULL }, 9283,  "tcp"  },
+  { "callwaveiam",     { NULL }, 9283,  "udp"  },
+  { "visd",            { NULL }, 9284,  "tcp"  },
+  { "visd",            { NULL }, 9284,  "udp"  },
+  { "n2h2server",      { NULL }, 9285,  "tcp"  },
+  { "n2h2server",      { NULL }, 9285,  "udp"  },
+  { "n2receive",       { NULL }, 9286,  "udp"  },
+  { "cumulus",         { NULL }, 9287,  "tcp"  },
+  { "cumulus",         { NULL }, 9287,  "udp"  },
+  { "armtechdaemon",   { NULL }, 9292,  "tcp"  },
+  { "armtechdaemon",   { NULL }, 9292,  "udp"  },
+  { "storview",        { NULL }, 9293,  "tcp"  },
+  { "storview",        { NULL }, 9293,  "udp"  },
+  { "armcenterhttp",   { NULL }, 9294,  "tcp"  },
+  { "armcenterhttp",   { NULL }, 9294,  "udp"  },
+  { "armcenterhttps",  { NULL }, 9295,  "tcp"  },
+  { "armcenterhttps",  { NULL }, 9295,  "udp"  },
+  { "vrace",           { NULL }, 9300,  "tcp"  },
+  { "vrace",           { NULL }, 9300,  "udp"  },
+  { "sphinxql",        { NULL }, 9306,  "tcp"  },
+  { "sphinxapi",       { NULL }, 9312,  "tcp"  },
+  { "secure-ts",       { NULL }, 9318,  "tcp"  },
+  { "secure-ts",       { NULL }, 9318,  "udp"  },
+  { "guibase",         { NULL }, 9321,  "tcp"  },
+  { "guibase",         { NULL }, 9321,  "udp"  },
+  { "mpidcmgr",        { NULL }, 9343,  "tcp"  },
+  { "mpidcmgr",        { NULL }, 9343,  "udp"  },
+  { "mphlpdmc",        { NULL }, 9344,  "tcp"  },
+  { "mphlpdmc",        { NULL }, 9344,  "udp"  },
+  { "ctechlicensing",  { NULL }, 9346,  "tcp"  },
+  { "ctechlicensing",  { NULL }, 9346,  "udp"  },
+  { "fjdmimgr",        { NULL }, 9374,  "tcp"  },
+  { "fjdmimgr",        { NULL }, 9374,  "udp"  },
+  { "boxp",            { NULL }, 9380,  "tcp"  },
+  { "boxp",            { NULL }, 9380,  "udp"  },
+  { "d2dconfig",       { NULL }, 9387,  "tcp"  },
+  { "d2ddatatrans",    { NULL }, 9388,  "tcp"  },
+  { "adws",            { NULL }, 9389,  "tcp"  },
+  { "otp",             { NULL }, 9390,  "tcp"  },
+  { "fjinvmgr",        { NULL }, 9396,  "tcp"  },
+  { "fjinvmgr",        { NULL }, 9396,  "udp"  },
+  { "mpidcagt",        { NULL }, 9397,  "tcp"  },
+  { "mpidcagt",        { NULL }, 9397,  "udp"  },
+  { "sec-t4net-srv",   { NULL }, 9400,  "tcp"  },
+  { "sec-t4net-srv",   { NULL }, 9400,  "udp"  },
+  { "sec-t4net-clt",   { NULL }, 9401,  "tcp"  },
+  { "sec-t4net-clt",   { NULL }, 9401,  "udp"  },
+  { "sec-pc2fax-srv",  { NULL }, 9402,  "tcp"  },
+  { "sec-pc2fax-srv",  { NULL }, 9402,  "udp"  },
+  { "git",             { NULL }, 9418,  "tcp"  },
+  { "git",             { NULL }, 9418,  "udp"  },
+  { "tungsten-https",  { NULL }, 9443,  "tcp"  },
+  { "tungsten-https",  { NULL }, 9443,  "udp"  },
+  { "wso2esb-console", { NULL }, 9444,  "tcp"  },
+  { "wso2esb-console", { NULL }, 9444,  "udp"  },
+  { "sntlkeyssrvr",    { NULL }, 9450,  "tcp"  },
+  { "sntlkeyssrvr",    { NULL }, 9450,  "udp"  },
+  { "ismserver",       { NULL }, 9500,  "tcp"  },
+  { "ismserver",       { NULL }, 9500,  "udp"  },
+  { "sma-spw",         { NULL }, 9522,  "udp"  },
+  { "mngsuite",        { NULL }, 9535,  "tcp"  },
+  { "mngsuite",        { NULL }, 9535,  "udp"  },
+  { "laes-bf",         { NULL }, 9536,  "tcp"  },
+  { "laes-bf",         { NULL }, 9536,  "udp"  },
+  { "trispen-sra",     { NULL }, 9555,  "tcp"  },
+  { "trispen-sra",     { NULL }, 9555,  "udp"  },
+  { "ldgateway",       { NULL }, 9592,  "tcp"  },
+  { "ldgateway",       { NULL }, 9592,  "udp"  },
+  { "cba8",            { NULL }, 9593,  "tcp"  },
+  { "cba8",            { NULL }, 9593,  "udp"  },
+  { "msgsys",          { NULL }, 9594,  "tcp"  },
+  { "msgsys",          { NULL }, 9594,  "udp"  },
+  { "pds",             { NULL }, 9595,  "tcp"  },
+  { "pds",             { NULL }, 9595,  "udp"  },
+  { "mercury-disc",    { NULL }, 9596,  "tcp"  },
+  { "mercury-disc",    { NULL }, 9596,  "udp"  },
+  { "pd-admin",        { NULL }, 9597,  "tcp"  },
+  { "pd-admin",        { NULL }, 9597,  "udp"  },
+  { "vscp",            { NULL }, 9598,  "tcp"  },
+  { "vscp",            { NULL }, 9598,  "udp"  },
+  { "robix",           { NULL }, 9599,  "tcp"  },
+  { "robix",           { NULL }, 9599,  "udp"  },
+  { "micromuse-ncpw",  { NULL }, 9600,  "tcp"  },
+  { "micromuse-ncpw",  { NULL }, 9600,  "udp"  },
+  { "streamcomm-ds",   { NULL }, 9612,  "tcp"  },
+  { "streamcomm-ds",   { NULL }, 9612,  "udp"  },
+  { "iadt-tls",        { NULL }, 9614,  "tcp"  },
+  { "erunbook_agent",  { NULL }, 9616,  "tcp"  },
+  { "erunbook_server", { NULL }, 9617,  "tcp"  },
+  { "condor",          { NULL }, 9618,  "tcp"  },
+  { "condor",          { NULL }, 9618,  "udp"  },
+  { "odbcpathway",     { NULL }, 9628,  "tcp"  },
+  { "odbcpathway",     { NULL }, 9628,  "udp"  },
+  { "uniport",         { NULL }, 9629,  "tcp"  },
+  { "uniport",         { NULL }, 9629,  "udp"  },
+  { "peoctlr",         { NULL }, 9630,  "tcp"  },
+  { "peocoll",         { NULL }, 9631,  "tcp"  },
+  { "mc-comm",         { NULL }, 9632,  "udp"  },
+  { "pqsflows",        { NULL }, 9640,  "tcp"  },
+  { "xmms2",           { NULL }, 9667,  "tcp"  },
+  { "xmms2",           { NULL }, 9667,  "udp"  },
+  { "tec5-sdctp",      { NULL }, 9668,  "tcp"  },
+  { "tec5-sdctp",      { NULL }, 9668,  "udp"  },
+  { "client-wakeup",   { NULL }, 9694,  "tcp"  },
+  { "client-wakeup",   { NULL }, 9694,  "udp"  },
+  { "ccnx",            { NULL }, 9695,  "tcp"  },
+  { "ccnx",            { NULL }, 9695,  "udp"  },
+  { "board-roar",      { NULL }, 9700,  "tcp"  },
+  { "board-roar",      { NULL }, 9700,  "udp"  },
+  { "l5nas-parchan",   { NULL }, 9747,  "tcp"  },
+  { "l5nas-parchan",   { NULL }, 9747,  "udp"  },
+  { "board-voip",      { NULL }, 9750,  "tcp"  },
+  { "board-voip",      { NULL }, 9750,  "udp"  },
+  { "rasadv",          { NULL }, 9753,  "tcp"  },
+  { "rasadv",          { NULL }, 9753,  "udp"  },
+  { "tungsten-http",   { NULL }, 9762,  "tcp"  },
+  { "tungsten-http",   { NULL }, 9762,  "udp"  },
+  { "davsrc",          { NULL }, 9800,  "tcp"  },
+  { "davsrc",          { NULL }, 9800,  "udp"  },
+  { "sstp-2",          { NULL }, 9801,  "tcp"  },
+  { "sstp-2",          { NULL }, 9801,  "udp"  },
+  { "davsrcs",         { NULL }, 9802,  "tcp"  },
+  { "davsrcs",         { NULL }, 9802,  "udp"  },
+  { "sapv1",           { NULL }, 9875,  "tcp"  },
+  { "sapv1",           { NULL }, 9875,  "udp"  },
+  { "sd",              { NULL }, 9876,  "tcp"  },
+  { "sd",              { NULL }, 9876,  "udp"  },
+  { "cyborg-systems",  { NULL }, 9888,  "tcp"  },
+  { "cyborg-systems",  { NULL }, 9888,  "udp"  },
+  { "gt-proxy",        { NULL }, 9889,  "tcp"  },
+  { "gt-proxy",        { NULL }, 9889,  "udp"  },
+  { "monkeycom",       { NULL }, 9898,  "tcp"  },
+  { "monkeycom",       { NULL }, 9898,  "udp"  },
+  { "sctp-tunneling",  { NULL }, 9899,  "tcp"  },
+  { "sctp-tunneling",  { NULL }, 9899,  "udp"  },
+  { "iua",             { NULL }, 9900,  "tcp"  },
+  { "iua",             { NULL }, 9900,  "udp"  },
+  { "iua",             { NULL }, 9900,  "sctp" },
+  { "enrp",            { NULL }, 9901,  "udp"  },
+  { "enrp-sctp",       { NULL }, 9901,  "sctp" },
+  { "enrp-sctp-tls",   { NULL }, 9902,  "sctp" },
+  { "domaintime",      { NULL }, 9909,  "tcp"  },
+  { "domaintime",      { NULL }, 9909,  "udp"  },
+  { "sype-transport",  { NULL }, 9911,  "tcp"  },
+  { "sype-transport",  { NULL }, 9911,  "udp"  },
+  { "apc-9950",        { NULL }, 9950,  "tcp"  },
+  { "apc-9950",        { NULL }, 9950,  "udp"  },
+  { "apc-9951",        { NULL }, 9951,  "tcp"  },
+  { "apc-9951",        { NULL }, 9951,  "udp"  },
+  { "apc-9952",        { NULL }, 9952,  "tcp"  },
+  { "apc-9952",        { NULL }, 9952,  "udp"  },
+  { "acis",            { NULL }, 9953,  "tcp"  },
+  { "acis",            { NULL }, 9953,  "udp"  },
+  { "odnsp",           { NULL }, 9966,  "tcp"  },
+  { "odnsp",           { NULL }, 9966,  "udp"  },
+  { "dsm-scm-target",  { NULL }, 9987,  "tcp"  },
+  { "dsm-scm-target",  { NULL }, 9987,  "udp"  },
+  { "nsesrvr",         { NULL }, 9988,  "tcp"  },
+  { "osm-appsrvr",     { NULL }, 9990,  "tcp"  },
+  { "osm-appsrvr",     { NULL }, 9990,  "udp"  },
+  { "osm-oev",         { NULL }, 9991,  "tcp"  },
+  { "osm-oev",         { NULL }, 9991,  "udp"  },
+  { "palace-1",        { NULL }, 9992,  "tcp"  },
+  { "palace-1",        { NULL }, 9992,  "udp"  },
+  { "palace-2",        { NULL }, 9993,  "tcp"  },
+  { "palace-2",        { NULL }, 9993,  "udp"  },
+  { "palace-3",        { NULL }, 9994,  "tcp"  },
+  { "palace-3",        { NULL }, 9994,  "udp"  },
+  { "palace-4",        { NULL }, 9995,  "tcp"  },
+  { "palace-4",        { NULL }, 9995,  "udp"  },
+  { "palace-5",        { NULL }, 9996,  "tcp"  },
+  { "palace-5",        { NULL }, 9996,  "udp"  },
+  { "palace-6",        { NULL }, 9997,  "tcp"  },
+  { "palace-6",        { NULL }, 9997,  "udp"  },
+  { "distinct32",      { NULL }, 9998,  "tcp"  },
+  { "distinct32",      { NULL }, 9998,  "udp"  },
+  { "distinct",        { NULL }, 9999,  "tcp"  },
+  { "distinct",        { NULL }, 9999,  "udp"  },
+  { "ndmp",            { NULL }, 10000, "tcp"  },
+  { "ndmp",            { NULL }, 10000, "udp"  },
+  { "scp-config",      { NULL }, 10001, "tcp"  },
+  { "scp-config",      { NULL }, 10001, "udp"  },
+  { "documentum",      { NULL }, 10002, "tcp"  },
+  { "documentum",      { NULL }, 10002, "udp"  },
+  { "documentum_s",    { NULL }, 10003, "tcp"  },
+  { "documentum_s",    { NULL }, 10003, "udp"  },
+  { "emcrmirccd",      { NULL }, 10004, "tcp"  },
+  { "emcrmird",        { NULL }, 10005, "tcp"  },
+  { "mvs-capacity",    { NULL }, 10007, "tcp"  },
+  { "mvs-capacity",    { NULL }, 10007, "udp"  },
+  { "octopus",         { NULL }, 10008, "tcp"  },
+  { "octopus",         { NULL }, 10008, "udp"  },
+  { "swdtp-sv",        { NULL }, 10009, "tcp"  },
+  { "swdtp-sv",        { NULL }, 10009, "udp"  },
+  { "rxapi",           { NULL }, 10010, "tcp"  },
+  { "zabbix-agent",    { NULL }, 10050, "tcp"  },
+  { "zabbix-agent",    { NULL }, 10050, "udp"  },
+  { "zabbix-trapper",  { NULL }, 10051, "tcp"  },
+  { "zabbix-trapper",  { NULL }, 10051, "udp"  },
+  { "qptlmd",          { NULL }, 10055, "tcp"  },
+  { "amanda",          { NULL }, 10080, "tcp"  },
+  { "amanda",          { NULL }, 10080, "udp"  },
+  { "famdc",           { NULL }, 10081, "tcp"  },
+  { "famdc",           { NULL }, 10081, "udp"  },
+  { "itap-ddtp",       { NULL }, 10100, "tcp"  },
+  { "itap-ddtp",       { NULL }, 10100, "udp"  },
+  { "ezmeeting-2",     { NULL }, 10101, "tcp"  },
+  { "ezmeeting-2",     { NULL }, 10101, "udp"  },
+  { "ezproxy-2",       { NULL }, 10102, "tcp"  },
+  { "ezproxy-2",       { NULL }, 10102, "udp"  },
+  { "ezrelay",         { NULL }, 10103, "tcp"  },
+  { "ezrelay",         { NULL }, 10103, "udp"  },
+  { "swdtp",           { NULL }, 10104, "tcp"  },
+  { "swdtp",           { NULL }, 10104, "udp"  },
+  { "bctp-server",     { NULL }, 10107, "tcp"  },
+  { "bctp-server",     { NULL }, 10107, "udp"  },
+  { "nmea-0183",       { NULL }, 10110, "tcp"  },
+  { "nmea-0183",       { NULL }, 10110, "udp"  },
+  { "netiq-endpoint",  { NULL }, 10113, "tcp"  },
+  { "netiq-endpoint",  { NULL }, 10113, "udp"  },
+  { "netiq-qcheck",    { NULL }, 10114, "tcp"  },
+  { "netiq-qcheck",    { NULL }, 10114, "udp"  },
+  { "netiq-endpt",     { NULL }, 10115, "tcp"  },
+  { "netiq-endpt",     { NULL }, 10115, "udp"  },
+  { "netiq-voipa",     { NULL }, 10116, "tcp"  },
+  { "netiq-voipa",     { NULL }, 10116, "udp"  },
+  { "iqrm",            { NULL }, 10117, "tcp"  },
+  { "iqrm",            { NULL }, 10117, "udp"  },
+  { "bmc-perf-sd",     { NULL }, 10128, "tcp"  },
+  { "bmc-perf-sd",     { NULL }, 10128, "udp"  },
+  { "bmc-gms",         { NULL }, 10129, "tcp"  },
+  { "qb-db-server",    { NULL }, 10160, "tcp"  },
+  { "qb-db-server",    { NULL }, 10160, "udp"  },
+  { "snmptls",         { NULL }, 10161, "tcp"  },
+  { "snmpdtls",        { NULL }, 10161, "udp"  },
+  { "snmptls-trap",    { NULL }, 10162, "tcp"  },
+  { "snmpdtls-trap",   { NULL }, 10162, "udp"  },
+  { "trisoap",         { NULL }, 10200, "tcp"  },
+  { "trisoap",         { NULL }, 10200, "udp"  },
+  { "rsms",            { NULL }, 10201, "tcp"  },
+  { "rscs",            { NULL }, 10201, "udp"  },
+  { "apollo-relay",    { NULL }, 10252, "tcp"  },
+  { "apollo-relay",    { NULL }, 10252, "udp"  },
+  { "axis-wimp-port",  { NULL }, 10260, "tcp"  },
+  { "axis-wimp-port",  { NULL }, 10260, "udp"  },
+  { "blocks",          { NULL }, 10288, "tcp"  },
+  { "blocks",          { NULL }, 10288, "udp"  },
+  { "cosir",           { NULL }, 10321, "tcp"  },
+  { "hip-nat-t",       { NULL }, 10500, "udp"  },
+  { "MOS-lower",       { NULL }, 10540, "tcp"  },
+  { "MOS-lower",       { NULL }, 10540, "udp"  },
+  { "MOS-upper",       { NULL }, 10541, "tcp"  },
+  { "MOS-upper",       { NULL }, 10541, "udp"  },
+  { "MOS-aux",         { NULL }, 10542, "tcp"  },
+  { "MOS-aux",         { NULL }, 10542, "udp"  },
+  { "MOS-soap",        { NULL }, 10543, "tcp"  },
+  { "MOS-soap",        { NULL }, 10543, "udp"  },
+  { "MOS-soap-opt",    { NULL }, 10544, "tcp"  },
+  { "MOS-soap-opt",    { NULL }, 10544, "udp"  },
+  { "gap",             { NULL }, 10800, "tcp"  },
+  { "gap",             { NULL }, 10800, "udp"  },
+  { "lpdg",            { NULL }, 10805, "tcp"  },
+  { "lpdg",            { NULL }, 10805, "udp"  },
+  { "nbd",             { NULL }, 10809, "tcp"  },
+  { "nmc-disc",        { NULL }, 10810, "udp"  },
+  { "helix",           { NULL }, 10860, "tcp"  },
+  { "helix",           { NULL }, 10860, "udp"  },
+  { "rmiaux",          { NULL }, 10990, "tcp"  },
+  { "rmiaux",          { NULL }, 10990, "udp"  },
+  { "irisa",           { NULL }, 11000, "tcp"  },
+  { "irisa",           { NULL }, 11000, "udp"  },
+  { "metasys",         { NULL }, 11001, "tcp"  },
+  { "metasys",         { NULL }, 11001, "udp"  },
+  { "netapp-icmgmt",   { NULL }, 11104, "tcp"  },
+  { "netapp-icdata",   { NULL }, 11105, "tcp"  },
+  { "sgi-lk",          { NULL }, 11106, "tcp"  },
+  { "sgi-lk",          { NULL }, 11106, "udp"  },
+  { "vce",             { NULL }, 11111, "tcp"  },
+  { "vce",             { NULL }, 11111, "udp"  },
+  { "dicom",           { NULL }, 11112, "tcp"  },
+  { "dicom",           { NULL }, 11112, "udp"  },
+  { "suncacao-snmp",   { NULL }, 11161, "tcp"  },
+  { "suncacao-snmp",   { NULL }, 11161, "udp"  },
+  { "suncacao-jmxmp",  { NULL }, 11162, "tcp"  },
+  { "suncacao-jmxmp",  { NULL }, 11162, "udp"  },
+  { "suncacao-rmi",    { NULL }, 11163, "tcp"  },
+  { "suncacao-rmi",    { NULL }, 11163, "udp"  },
+  { "suncacao-csa",    { NULL }, 11164, "tcp"  },
+  { "suncacao-csa",    { NULL }, 11164, "udp"  },
+  { "suncacao-websvc", { NULL }, 11165, "tcp"  },
+  { "suncacao-websvc", { NULL }, 11165, "udp"  },
+  { "snss",            { NULL }, 11171, "udp"  },
+  { "oemcacao-jmxmp",  { NULL }, 11172, "tcp"  },
+  { "oemcacao-rmi",    { NULL }, 11174, "tcp"  },
+  { "oemcacao-websvc", { NULL }, 11175, "tcp"  },
+  { "smsqp",           { NULL }, 11201, "tcp"  },
+  { "smsqp",           { NULL }, 11201, "udp"  },
+  { "wifree",          { NULL }, 11208, "tcp"  },
+  { "wifree",          { NULL }, 11208, "udp"  },
+  { "memcache",        { NULL }, 11211, "tcp"  },
+  { "memcache",        { NULL }, 11211, "udp"  },
+  { "imip",            { NULL }, 11319, "tcp"  },
+  { "imip",            { NULL }, 11319, "udp"  },
+  { "imip-channels",   { NULL }, 11320, "tcp"  },
+  { "imip-channels",   { NULL }, 11320, "udp"  },
+  { "arena-server",    { NULL }, 11321, "tcp"  },
+  { "arena-server",    { NULL }, 11321, "udp"  },
+  { "atm-uhas",        { NULL }, 11367, "tcp"  },
+  { "atm-uhas",        { NULL }, 11367, "udp"  },
+  { "hkp",             { NULL }, 11371, "tcp"  },
+  { "hkp",             { NULL }, 11371, "udp"  },
+  { "asgcypresstcps",  { NULL }, 11489, "tcp"  },
+  { "tempest-port",    { NULL }, 11600, "tcp"  },
+  { "tempest-port",    { NULL }, 11600, "udp"  },
+  { "h323callsigalt",  { NULL }, 11720, "tcp"  },
+  { "h323callsigalt",  { NULL }, 11720, "udp"  },
+  { "intrepid-ssl",    { NULL }, 11751, "tcp"  },
+  { "intrepid-ssl",    { NULL }, 11751, "udp"  },
+  { "xoraya",          { NULL }, 11876, "tcp"  },
+  { "xoraya",          { NULL }, 11876, "udp"  },
+  { "x2e-disc",        { NULL }, 11877, "udp"  },
+  { "sysinfo-sp",      { NULL }, 11967, "tcp"  },
+  { "sysinfo-sp",      { NULL }, 11967, "udp"  },
+  { "wmereceiving",    { NULL }, 11997, "sctp" },
+  { "wmedistribution", { NULL }, 11998, "sctp" },
+  { "wmereporting",    { NULL }, 11999, "sctp" },
+  { "entextxid",       { NULL }, 12000, "tcp"  },
+  { "entextxid",       { NULL }, 12000, "udp"  },
+  { "entextnetwk",     { NULL }, 12001, "tcp"  },
+  { "entextnetwk",     { NULL }, 12001, "udp"  },
+  { "entexthigh",      { NULL }, 12002, "tcp"  },
+  { "entexthigh",      { NULL }, 12002, "udp"  },
+  { "entextmed",       { NULL }, 12003, "tcp"  },
+  { "entextmed",       { NULL }, 12003, "udp"  },
+  { "entextlow",       { NULL }, 12004, "tcp"  },
+  { "entextlow",       { NULL }, 12004, "udp"  },
+  { "dbisamserver1",   { NULL }, 12005, "tcp"  },
+  { "dbisamserver1",   { NULL }, 12005, "udp"  },
+  { "dbisamserver2",   { NULL }, 12006, "tcp"  },
+  { "dbisamserver2",   { NULL }, 12006, "udp"  },
+  { "accuracer",       { NULL }, 12007, "tcp"  },
+  { "accuracer",       { NULL }, 12007, "udp"  },
+  { "accuracer-dbms",  { NULL }, 12008, "tcp"  },
+  { "accuracer-dbms",  { NULL }, 12008, "udp"  },
+  { "edbsrvr",         { NULL }, 12010, "tcp"  },
+  { "vipera",          { NULL }, 12012, "tcp"  },
+  { "vipera",          { NULL }, 12012, "udp"  },
+  { "vipera-ssl",      { NULL }, 12013, "tcp"  },
+  { "vipera-ssl",      { NULL }, 12013, "udp"  },
+  { "rets-ssl",        { NULL }, 12109, "tcp"  },
+  { "rets-ssl",        { NULL }, 12109, "udp"  },
+  { "nupaper-ss",      { NULL }, 12121, "tcp"  },
+  { "nupaper-ss",      { NULL }, 12121, "udp"  },
+  { "cawas",           { NULL }, 12168, "tcp"  },
+  { "cawas",           { NULL }, 12168, "udp"  },
+  { "hivep",           { NULL }, 12172, "tcp"  },
+  { "hivep",           { NULL }, 12172, "udp"  },
+  { "linogridengine",  { NULL }, 12300, "tcp"  },
+  { "linogridengine",  { NULL }, 12300, "udp"  },
+  { "warehouse-sss",   { NULL }, 12321, "tcp"  },
+  { "warehouse-sss",   { NULL }, 12321, "udp"  },
+  { "warehouse",       { NULL }, 12322, "tcp"  },
+  { "warehouse",       { NULL }, 12322, "udp"  },
+  { "italk",           { NULL }, 12345, "tcp"  },
+  { "italk",           { NULL }, 12345, "udp"  },
+  { "tsaf",            { NULL }, 12753, "tcp"  },
+  { "tsaf",            { NULL }, 12753, "udp"  },
+  { "i-zipqd",         { NULL }, 13160, "tcp"  },
+  { "i-zipqd",         { NULL }, 13160, "udp"  },
+  { "bcslogc",         { NULL }, 13216, "tcp"  },
+  { "bcslogc",         { NULL }, 13216, "udp"  },
+  { "rs-pias",         { NULL }, 13217, "tcp"  },
+  { "rs-pias",         { NULL }, 13217, "udp"  },
+  { "emc-vcas-tcp",    { NULL }, 13218, "tcp"  },
+  { "emc-vcas-udp",    { NULL }, 13218, "udp"  },
+  { "powwow-client",   { NULL }, 13223, "tcp"  },
+  { "powwow-client",   { NULL }, 13223, "udp"  },
+  { "powwow-server",   { NULL }, 13224, "tcp"  },
+  { "powwow-server",   { NULL }, 13224, "udp"  },
+  { "doip-data",       { NULL }, 13400, "tcp"  },
+  { "doip-disc",       { NULL }, 13400, "udp"  },
+  { "bprd",            { NULL }, 13720, "tcp"  },
+  { "bprd",            { NULL }, 13720, "udp"  },
+  { "bpdbm",           { NULL }, 13721, "tcp"  },
+  { "bpdbm",           { NULL }, 13721, "udp"  },
+  { "bpjava-msvc",     { NULL }, 13722, "tcp"  },
+  { "bpjava-msvc",     { NULL }, 13722, "udp"  },
+  { "vnetd",           { NULL }, 13724, "tcp"  },
+  { "vnetd",           { NULL }, 13724, "udp"  },
+  { "bpcd",            { NULL }, 13782, "tcp"  },
+  { "bpcd",            { NULL }, 13782, "udp"  },
+  { "vopied",          { NULL }, 13783, "tcp"  },
+  { "vopied",          { NULL }, 13783, "udp"  },
+  { "nbdb",            { NULL }, 13785, "tcp"  },
+  { "nbdb",            { NULL }, 13785, "udp"  },
+  { "nomdb",           { NULL }, 13786, "tcp"  },
+  { "nomdb",           { NULL }, 13786, "udp"  },
+  { "dsmcc-config",    { NULL }, 13818, "tcp"  },
+  { "dsmcc-config",    { NULL }, 13818, "udp"  },
+  { "dsmcc-session",   { NULL }, 13819, "tcp"  },
+  { "dsmcc-session",   { NULL }, 13819, "udp"  },
+  { "dsmcc-passthru",  { NULL }, 13820, "tcp"  },
+  { "dsmcc-passthru",  { NULL }, 13820, "udp"  },
+  { "dsmcc-download",  { NULL }, 13821, "tcp"  },
+  { "dsmcc-download",  { NULL }, 13821, "udp"  },
+  { "dsmcc-ccp",       { NULL }, 13822, "tcp"  },
+  { "dsmcc-ccp",       { NULL }, 13822, "udp"  },
+  { "bmdss",           { NULL }, 13823, "tcp"  },
+  { "dta-systems",     { NULL }, 13929, "tcp"  },
+  { "dta-systems",     { NULL }, 13929, "udp"  },
+  { "medevolve",       { NULL }, 13930, "tcp"  },
+  { "scotty-ft",       { NULL }, 14000, "tcp"  },
+  { "scotty-ft",       { NULL }, 14000, "udp"  },
+  { "sua",             { NULL }, 14001, "tcp"  },
+  { "sua",             { NULL }, 14001, "udp"  },
+  { "sua",             { NULL }, 14001, "sctp" },
+  { "sage-best-com1",  { NULL }, 14033, "tcp"  },
+  { "sage-best-com1",  { NULL }, 14033, "udp"  },
+  { "sage-best-com2",  { NULL }, 14034, "tcp"  },
+  { "sage-best-com2",  { NULL }, 14034, "udp"  },
+  { "vcs-app",         { NULL }, 14141, "tcp"  },
+  { "vcs-app",         { NULL }, 14141, "udp"  },
+  { "icpp",            { NULL }, 14142, "tcp"  },
+  { "icpp",            { NULL }, 14142, "udp"  },
+  { "gcm-app",         { NULL }, 14145, "tcp"  },
+  { "gcm-app",         { NULL }, 14145, "udp"  },
+  { "vrts-tdd",        { NULL }, 14149, "tcp"  },
+  { "vrts-tdd",        { NULL }, 14149, "udp"  },
+  { "vcscmd",          { NULL }, 14150, "tcp"  },
+  { "vad",             { NULL }, 14154, "tcp"  },
+  { "vad",             { NULL }, 14154, "udp"  },
+  { "cps",             { NULL }, 14250, "tcp"  },
+  { "cps",             { NULL }, 14250, "udp"  },
+  { "ca-web-update",   { NULL }, 14414, "tcp"  },
+  { "ca-web-update",   { NULL }, 14414, "udp"  },
+  { "hde-lcesrvr-1",   { NULL }, 14936, "tcp"  },
+  { "hde-lcesrvr-1",   { NULL }, 14936, "udp"  },
+  { "hde-lcesrvr-2",   { NULL }, 14937, "tcp"  },
+  { "hde-lcesrvr-2",   { NULL }, 14937, "udp"  },
+  { "hydap",           { NULL }, 15000, "tcp"  },
+  { "hydap",           { NULL }, 15000, "udp"  },
+  { "xpilot",          { NULL }, 15345, "tcp"  },
+  { "xpilot",          { NULL }, 15345, "udp"  },
+  { "3link",           { NULL }, 15363, "tcp"  },
+  { "3link",           { NULL }, 15363, "udp"  },
+  { "cisco-snat",      { NULL }, 15555, "tcp"  },
+  { "cisco-snat",      { NULL }, 15555, "udp"  },
+  { "bex-xr",          { NULL }, 15660, "tcp"  },
+  { "bex-xr",          { NULL }, 15660, "udp"  },
+  { "ptp",             { NULL }, 15740, "tcp"  },
+  { "ptp",             { NULL }, 15740, "udp"  },
+  { "2ping",           { NULL }, 15998, "udp"  },
+  { "programmar",      { NULL }, 15999, "tcp"  },
+  { "fmsas",           { NULL }, 16000, "tcp"  },
+  { "fmsascon",        { NULL }, 16001, "tcp"  },
+  { "gsms",            { NULL }, 16002, "tcp"  },
+  { "alfin",           { NULL }, 16003, "udp"  },
+  { "jwpc",            { NULL }, 16020, "tcp"  },
+  { "jwpc-bin",        { NULL }, 16021, "tcp"  },
+  { "sun-sea-port",    { NULL }, 16161, "tcp"  },
+  { "sun-sea-port",    { NULL }, 16161, "udp"  },
+  { "solaris-audit",   { NULL }, 16162, "tcp"  },
+  { "etb4j",           { NULL }, 16309, "tcp"  },
+  { "etb4j",           { NULL }, 16309, "udp"  },
+  { "pduncs",          { NULL }, 16310, "tcp"  },
+  { "pduncs",          { NULL }, 16310, "udp"  },
+  { "pdefmns",         { NULL }, 16311, "tcp"  },
+  { "pdefmns",         { NULL }, 16311, "udp"  },
+  { "netserialext1",   { NULL }, 16360, "tcp"  },
+  { "netserialext1",   { NULL }, 16360, "udp"  },
+  { "netserialext2",   { NULL }, 16361, "tcp"  },
+  { "netserialext2",   { NULL }, 16361, "udp"  },
+  { "netserialext3",   { NULL }, 16367, "tcp"  },
+  { "netserialext3",   { NULL }, 16367, "udp"  },
+  { "netserialext4",   { NULL }, 16368, "tcp"  },
+  { "netserialext4",   { NULL }, 16368, "udp"  },
+  { "connected",       { NULL }, 16384, "tcp"  },
+  { "connected",       { NULL }, 16384, "udp"  },
+  { "xoms",            { NULL }, 16619, "tcp"  },
+  { "newbay-snc-mc",   { NULL }, 16900, "tcp"  },
+  { "newbay-snc-mc",   { NULL }, 16900, "udp"  },
+  { "sgcip",           { NULL }, 16950, "tcp"  },
+  { "sgcip",           { NULL }, 16950, "udp"  },
+  { "intel-rci-mp",    { NULL }, 16991, "tcp"  },
+  { "intel-rci-mp",    { NULL }, 16991, "udp"  },
+  { "amt-soap-http",   { NULL }, 16992, "tcp"  },
+  { "amt-soap-http",   { NULL }, 16992, "udp"  },
+  { "amt-soap-https",  { NULL }, 16993, "tcp"  },
+  { "amt-soap-https",  { NULL }, 16993, "udp"  },
+  { "amt-redir-tcp",   { NULL }, 16994, "tcp"  },
+  { "amt-redir-tcp",   { NULL }, 16994, "udp"  },
+  { "amt-redir-tls",   { NULL }, 16995, "tcp"  },
+  { "amt-redir-tls",   { NULL }, 16995, "udp"  },
+  { "isode-dua",       { NULL }, 17007, "tcp"  },
+  { "isode-dua",       { NULL }, 17007, "udp"  },
+  { "soundsvirtual",   { NULL }, 17185, "tcp"  },
+  { "soundsvirtual",   { NULL }, 17185, "udp"  },
+  { "chipper",         { NULL }, 17219, "tcp"  },
+  { "chipper",         { NULL }, 17219, "udp"  },
+  { "integrius-stp",   { NULL }, 17234, "tcp"  },
+  { "integrius-stp",   { NULL }, 17234, "udp"  },
+  { "ssh-mgmt",        { NULL }, 17235, "tcp"  },
+  { "ssh-mgmt",        { NULL }, 17235, "udp"  },
+  { "db-lsp",          { NULL }, 17500, "tcp"  },
+  { "db-lsp-disc",     { NULL }, 17500, "udp"  },
+  { "ea",              { NULL }, 17729, "tcp"  },
+  { "ea",              { NULL }, 17729, "udp"  },
+  { "zep",             { NULL }, 17754, "tcp"  },
+  { "zep",             { NULL }, 17754, "udp"  },
+  { "zigbee-ip",       { NULL }, 17755, "tcp"  },
+  { "zigbee-ip",       { NULL }, 17755, "udp"  },
+  { "zigbee-ips",      { NULL }, 17756, "tcp"  },
+  { "zigbee-ips",      { NULL }, 17756, "udp"  },
+  { "sw-orion",        { NULL }, 17777, "tcp"  },
+  { "biimenu",         { NULL }, 18000, "tcp"  },
+  { "biimenu",         { NULL }, 18000, "udp"  },
+  { "radpdf",          { NULL }, 18104, "tcp"  },
+  { "racf",            { NULL }, 18136, "tcp"  },
+  { "opsec-cvp",       { NULL }, 18181, "tcp"  },
+  { "opsec-cvp",       { NULL }, 18181, "udp"  },
+  { "opsec-ufp",       { NULL }, 18182, "tcp"  },
+  { "opsec-ufp",       { NULL }, 18182, "udp"  },
+  { "opsec-sam",       { NULL }, 18183, "tcp"  },
+  { "opsec-sam",       { NULL }, 18183, "udp"  },
+  { "opsec-lea",       { NULL }, 18184, "tcp"  },
+  { "opsec-lea",       { NULL }, 18184, "udp"  },
+  { "opsec-omi",       { NULL }, 18185, "tcp"  },
+  { "opsec-omi",       { NULL }, 18185, "udp"  },
+  { "ohsc",            { NULL }, 18186, "tcp"  },
+  { "ohsc",            { NULL }, 18186, "udp"  },
+  { "opsec-ela",       { NULL }, 18187, "tcp"  },
+  { "opsec-ela",       { NULL }, 18187, "udp"  },
+  { "checkpoint-rtm",  { NULL }, 18241, "tcp"  },
+  { "checkpoint-rtm",  { NULL }, 18241, "udp"  },
+  { "gv-pf",           { NULL }, 18262, "tcp"  },
+  { "gv-pf",           { NULL }, 18262, "udp"  },
+  { "ac-cluster",      { NULL }, 18463, "tcp"  },
+  { "ac-cluster",      { NULL }, 18463, "udp"  },
+  { "rds-ib",          { NULL }, 18634, "tcp"  },
+  { "rds-ib",          { NULL }, 18634, "udp"  },
+  { "rds-ip",          { NULL }, 18635, "tcp"  },
+  { "rds-ip",          { NULL }, 18635, "udp"  },
+  { "ique",            { NULL }, 18769, "tcp"  },
+  { "ique",            { NULL }, 18769, "udp"  },
+  { "infotos",         { NULL }, 18881, "tcp"  },
+  { "infotos",         { NULL }, 18881, "udp"  },
+  { "apc-necmp",       { NULL }, 18888, "tcp"  },
+  { "apc-necmp",       { NULL }, 18888, "udp"  },
+  { "igrid",           { NULL }, 19000, "tcp"  },
+  { "igrid",           { NULL }, 19000, "udp"  },
+  { "j-link",          { NULL }, 19020, "tcp"  },
+  { "opsec-uaa",       { NULL }, 19191, "tcp"  },
+  { "opsec-uaa",       { NULL }, 19191, "udp"  },
+  { "ua-secureagent",  { NULL }, 19194, "tcp"  },
+  { "ua-secureagent",  { NULL }, 19194, "udp"  },
+  { "keysrvr",         { NULL }, 19283, "tcp"  },
+  { "keysrvr",         { NULL }, 19283, "udp"  },
+  { "keyshadow",       { NULL }, 19315, "tcp"  },
+  { "keyshadow",       { NULL }, 19315, "udp"  },
+  { "mtrgtrans",       { NULL }, 19398, "tcp"  },
+  { "mtrgtrans",       { NULL }, 19398, "udp"  },
+  { "hp-sco",          { NULL }, 19410, "tcp"  },
+  { "hp-sco",          { NULL }, 19410, "udp"  },
+  { "hp-sca",          { NULL }, 19411, "tcp"  },
+  { "hp-sca",          { NULL }, 19411, "udp"  },
+  { "hp-sessmon",      { NULL }, 19412, "tcp"  },
+  { "hp-sessmon",      { NULL }, 19412, "udp"  },
+  { "fxuptp",          { NULL }, 19539, "tcp"  },
+  { "fxuptp",          { NULL }, 19539, "udp"  },
+  { "sxuptp",          { NULL }, 19540, "tcp"  },
+  { "sxuptp",          { NULL }, 19540, "udp"  },
+  { "jcp",             { NULL }, 19541, "tcp"  },
+  { "jcp",             { NULL }, 19541, "udp"  },
+  { "iec-104-sec",     { NULL }, 19998, "tcp"  },
+  { "dnp-sec",         { NULL }, 19999, "tcp"  },
+  { "dnp-sec",         { NULL }, 19999, "udp"  },
+  { "dnp",             { NULL }, 20000, "tcp"  },
+  { "dnp",             { NULL }, 20000, "udp"  },
+  { "microsan",        { NULL }, 20001, "tcp"  },
+  { "microsan",        { NULL }, 20001, "udp"  },
+  { "commtact-http",   { NULL }, 20002, "tcp"  },
+  { "commtact-http",   { NULL }, 20002, "udp"  },
+  { "commtact-https",  { NULL }, 20003, "tcp"  },
+  { "commtact-https",  { NULL }, 20003, "udp"  },
+  { "openwebnet",      { NULL }, 20005, "tcp"  },
+  { "openwebnet",      { NULL }, 20005, "udp"  },
+  { "ss-idi-disc",     { NULL }, 20012, "udp"  },
+  { "ss-idi",          { NULL }, 20013, "tcp"  },
+  { "opendeploy",      { NULL }, 20014, "tcp"  },
+  { "opendeploy",      { NULL }, 20014, "udp"  },
+  { "nburn_id",        { NULL }, 20034, "tcp"  },
+  { "nburn_id",        { NULL }, 20034, "udp"  },
+  { "tmophl7mts",      { NULL }, 20046, "tcp"  },
+  { "tmophl7mts",      { NULL }, 20046, "udp"  },
+  { "mountd",          { NULL }, 20048, "tcp"  },
+  { "mountd",          { NULL }, 20048, "udp"  },
+  { "nfsrdma",         { NULL }, 20049, "tcp"  },
+  { "nfsrdma",         { NULL }, 20049, "udp"  },
+  { "nfsrdma",         { NULL }, 20049, "sctp" },
+  { "tolfab",          { NULL }, 20167, "tcp"  },
+  { "tolfab",          { NULL }, 20167, "udp"  },
+  { "ipdtp-port",      { NULL }, 20202, "tcp"  },
+  { "ipdtp-port",      { NULL }, 20202, "udp"  },
+  { "ipulse-ics",      { NULL }, 20222, "tcp"  },
+  { "ipulse-ics",      { NULL }, 20222, "udp"  },
+  { "emwavemsg",       { NULL }, 20480, "tcp"  },
+  { "emwavemsg",       { NULL }, 20480, "udp"  },
+  { "track",           { NULL }, 20670, "tcp"  },
+  { "track",           { NULL }, 20670, "udp"  },
+  { "athand-mmp",      { NULL }, 20999, "tcp"  },
+  { "athand-mmp",      { NULL }, 20999, "udp"  },
+  { "irtrans",         { NULL }, 21000, "tcp"  },
+  { "irtrans",         { NULL }, 21000, "udp"  },
+  { "dfserver",        { NULL }, 21554, "tcp"  },
+  { "dfserver",        { NULL }, 21554, "udp"  },
+  { "vofr-gateway",    { NULL }, 21590, "tcp"  },
+  { "vofr-gateway",    { NULL }, 21590, "udp"  },
+  { "tvpm",            { NULL }, 21800, "tcp"  },
+  { "tvpm",            { NULL }, 21800, "udp"  },
+  { "webphone",        { NULL }, 21845, "tcp"  },
+  { "webphone",        { NULL }, 21845, "udp"  },
+  { "netspeak-is",     { NULL }, 21846, "tcp"  },
+  { "netspeak-is",     { NULL }, 21846, "udp"  },
+  { "netspeak-cs",     { NULL }, 21847, "tcp"  },
+  { "netspeak-cs",     { NULL }, 21847, "udp"  },
+  { "netspeak-acd",    { NULL }, 21848, "tcp"  },
+  { "netspeak-acd",    { NULL }, 21848, "udp"  },
+  { "netspeak-cps",    { NULL }, 21849, "tcp"  },
+  { "netspeak-cps",    { NULL }, 21849, "udp"  },
+  { "snapenetio",      { NULL }, 22000, "tcp"  },
+  { "snapenetio",      { NULL }, 22000, "udp"  },
+  { "optocontrol",     { NULL }, 22001, "tcp"  },
+  { "optocontrol",     { NULL }, 22001, "udp"  },
+  { "optohost002",     { NULL }, 22002, "tcp"  },
+  { "optohost002",     { NULL }, 22002, "udp"  },
+  { "optohost003",     { NULL }, 22003, "tcp"  },
+  { "optohost003",     { NULL }, 22003, "udp"  },
+  { "optohost004",     { NULL }, 22004, "tcp"  },
+  { "optohost004",     { NULL }, 22004, "udp"  },
+  { "optohost004",     { NULL }, 22005, "tcp"  },
+  { "optohost004",     { NULL }, 22005, "udp"  },
+  { "dcap",            { NULL }, 22125, "tcp"  },
+  { "gsidcap",         { NULL }, 22128, "tcp"  },
+  { "wnn6",            { NULL }, 22273, "tcp"  },
+  { "wnn6",            { NULL }, 22273, "udp"  },
+  { "cis",             { NULL }, 22305, "tcp"  },
+  { "cis",             { NULL }, 22305, "udp"  },
+  { "cis-secure",      { NULL }, 22343, "tcp"  },
+  { "cis-secure",      { NULL }, 22343, "udp"  },
+  { "WibuKey",         { NULL }, 22347, "tcp"  },
+  { "WibuKey",         { NULL }, 22347, "udp"  },
+  { "CodeMeter",       { NULL }, 22350, "tcp"  },
+  { "CodeMeter",       { NULL }, 22350, "udp"  },
+  { "vocaltec-wconf",  { NULL }, 22555, "tcp"  },
+  { "vocaltec-phone",  { NULL }, 22555, "udp"  },
+  { "talikaserver",    { NULL }, 22763, "tcp"  },
+  { "talikaserver",    { NULL }, 22763, "udp"  },
+  { "aws-brf",         { NULL }, 22800, "tcp"  },
+  { "aws-brf",         { NULL }, 22800, "udp"  },
+  { "brf-gw",          { NULL }, 22951, "tcp"  },
+  { "brf-gw",          { NULL }, 22951, "udp"  },
+  { "inovaport1",      { NULL }, 23000, "tcp"  },
+  { "inovaport1",      { NULL }, 23000, "udp"  },
+  { "inovaport2",      { NULL }, 23001, "tcp"  },
+  { "inovaport2",      { NULL }, 23001, "udp"  },
+  { "inovaport3",      { NULL }, 23002, "tcp"  },
+  { "inovaport3",      { NULL }, 23002, "udp"  },
+  { "inovaport4",      { NULL }, 23003, "tcp"  },
+  { "inovaport4",      { NULL }, 23003, "udp"  },
+  { "inovaport5",      { NULL }, 23004, "tcp"  },
+  { "inovaport5",      { NULL }, 23004, "udp"  },
+  { "inovaport6",      { NULL }, 23005, "tcp"  },
+  { "inovaport6",      { NULL }, 23005, "udp"  },
+  { "s102",            { NULL }, 23272, "udp"  },
+  { "elxmgmt",         { NULL }, 23333, "tcp"  },
+  { "elxmgmt",         { NULL }, 23333, "udp"  },
+  { "novar-dbase",     { NULL }, 23400, "tcp"  },
+  { "novar-dbase",     { NULL }, 23400, "udp"  },
+  { "novar-alarm",     { NULL }, 23401, "tcp"  },
+  { "novar-alarm",     { NULL }, 23401, "udp"  },
+  { "novar-global",    { NULL }, 23402, "tcp"  },
+  { "novar-global",    { NULL }, 23402, "udp"  },
+  { "aequus",          { NULL }, 23456, "tcp"  },
+  { "aequus-alt",      { NULL }, 23457, "tcp"  },
+  { "med-ltp",         { NULL }, 24000, "tcp"  },
+  { "med-ltp",         { NULL }, 24000, "udp"  },
+  { "med-fsp-rx",      { NULL }, 24001, "tcp"  },
+  { "med-fsp-rx",      { NULL }, 24001, "udp"  },
+  { "med-fsp-tx",      { NULL }, 24002, "tcp"  },
+  { "med-fsp-tx",      { NULL }, 24002, "udp"  },
+  { "med-supp",        { NULL }, 24003, "tcp"  },
+  { "med-supp",        { NULL }, 24003, "udp"  },
+  { "med-ovw",         { NULL }, 24004, "tcp"  },
+  { "med-ovw",         { NULL }, 24004, "udp"  },
+  { "med-ci",          { NULL }, 24005, "tcp"  },
+  { "med-ci",          { NULL }, 24005, "udp"  },
+  { "med-net-svc",     { NULL }, 24006, "tcp"  },
+  { "med-net-svc",     { NULL }, 24006, "udp"  },
+  { "filesphere",      { NULL }, 24242, "tcp"  },
+  { "filesphere",      { NULL }, 24242, "udp"  },
+  { "vista-4gl",       { NULL }, 24249, "tcp"  },
+  { "vista-4gl",       { NULL }, 24249, "udp"  },
+  { "ild",             { NULL }, 24321, "tcp"  },
+  { "ild",             { NULL }, 24321, "udp"  },
+  { "intel_rci",       { NULL }, 24386, "tcp"  },
+  { "intel_rci",       { NULL }, 24386, "udp"  },
+  { "tonidods",        { NULL }, 24465, "tcp"  },
+  { "tonidods",        { NULL }, 24465, "udp"  },
+  { "binkp",           { NULL }, 24554, "tcp"  },
+  { "binkp",           { NULL }, 24554, "udp"  },
+  { "canditv",         { NULL }, 24676, "tcp"  },
+  { "canditv",         { NULL }, 24676, "udp"  },
+  { "flashfiler",      { NULL }, 24677, "tcp"  },
+  { "flashfiler",      { NULL }, 24677, "udp"  },
+  { "proactivate",     { NULL }, 24678, "tcp"  },
+  { "proactivate",     { NULL }, 24678, "udp"  },
+  { "tcc-http",        { NULL }, 24680, "tcp"  },
+  { "tcc-http",        { NULL }, 24680, "udp"  },
+  { "cslg",            { NULL }, 24754, "tcp"  },
+  { "find",            { NULL }, 24922, "tcp"  },
+  { "find",            { NULL }, 24922, "udp"  },
+  { "icl-twobase1",    { NULL }, 25000, "tcp"  },
+  { "icl-twobase1",    { NULL }, 25000, "udp"  },
+  { "icl-twobase2",    { NULL }, 25001, "tcp"  },
+  { "icl-twobase2",    { NULL }, 25001, "udp"  },
+  { "icl-twobase3",    { NULL }, 25002, "tcp"  },
+  { "icl-twobase3",    { NULL }, 25002, "udp"  },
+  { "icl-twobase4",    { NULL }, 25003, "tcp"  },
+  { "icl-twobase4",    { NULL }, 25003, "udp"  },
+  { "icl-twobase5",    { NULL }, 25004, "tcp"  },
+  { "icl-twobase5",    { NULL }, 25004, "udp"  },
+  { "icl-twobase6",    { NULL }, 25005, "tcp"  },
+  { "icl-twobase6",    { NULL }, 25005, "udp"  },
+  { "icl-twobase7",    { NULL }, 25006, "tcp"  },
+  { "icl-twobase7",    { NULL }, 25006, "udp"  },
+  { "icl-twobase8",    { NULL }, 25007, "tcp"  },
+  { "icl-twobase8",    { NULL }, 25007, "udp"  },
+  { "icl-twobase9",    { NULL }, 25008, "tcp"  },
+  { "icl-twobase9",    { NULL }, 25008, "udp"  },
+  { "icl-twobase10",   { NULL }, 25009, "tcp"  },
+  { "icl-twobase10",   { NULL }, 25009, "udp"  },
+  { "rna",             { NULL }, 25471, "sctp" },
+  { "sauterdongle",    { NULL }, 25576, "tcp"  },
+  { "vocaltec-hos",    { NULL }, 25793, "tcp"  },
+  { "vocaltec-hos",    { NULL }, 25793, "udp"  },
+  { "tasp-net",        { NULL }, 25900, "tcp"  },
+  { "tasp-net",        { NULL }, 25900, "udp"  },
+  { "niobserver",      { NULL }, 25901, "tcp"  },
+  { "niobserver",      { NULL }, 25901, "udp"  },
+  { "nilinkanalyst",   { NULL }, 25902, "tcp"  },
+  { "nilinkanalyst",   { NULL }, 25902, "udp"  },
+  { "niprobe",         { NULL }, 25903, "tcp"  },
+  { "niprobe",         { NULL }, 25903, "udp"  },
+  { "quake",           { NULL }, 26000, "tcp"  },
+  { "quake",           { NULL }, 26000, "udp"  },
+  { "scscp",           { NULL }, 26133, "tcp"  },
+  { "scscp",           { NULL }, 26133, "udp"  },
+  { "wnn6-ds",         { NULL }, 26208, "tcp"  },
+  { "wnn6-ds",         { NULL }, 26208, "udp"  },
+  { "ezproxy",         { NULL }, 26260, "tcp"  },
+  { "ezproxy",         { NULL }, 26260, "udp"  },
+  { "ezmeeting",       { NULL }, 26261, "tcp"  },
+  { "ezmeeting",       { NULL }, 26261, "udp"  },
+  { "k3software-svr",  { NULL }, 26262, "tcp"  },
+  { "k3software-svr",  { NULL }, 26262, "udp"  },
+  { "k3software-cli",  { NULL }, 26263, "tcp"  },
+  { "k3software-cli",  { NULL }, 26263, "udp"  },
+  { "exoline-tcp",     { NULL }, 26486, "tcp"  },
+  { "exoline-udp",     { NULL }, 26486, "udp"  },
+  { "exoconfig",       { NULL }, 26487, "tcp"  },
+  { "exoconfig",       { NULL }, 26487, "udp"  },
+  { "exonet",          { NULL }, 26489, "tcp"  },
+  { "exonet",          { NULL }, 26489, "udp"  },
+  { "imagepump",       { NULL }, 27345, "tcp"  },
+  { "imagepump",       { NULL }, 27345, "udp"  },
+  { "jesmsjc",         { NULL }, 27442, "tcp"  },
+  { "jesmsjc",         { NULL }, 27442, "udp"  },
+  { "kopek-httphead",  { NULL }, 27504, "tcp"  },
+  { "kopek-httphead",  { NULL }, 27504, "udp"  },
+  { "ars-vista",       { NULL }, 27782, "tcp"  },
+  { "ars-vista",       { NULL }, 27782, "udp"  },
+  { "tw-auth-key",     { NULL }, 27999, "tcp"  },
+  { "tw-auth-key",     { NULL }, 27999, "udp"  },
+  { "nxlmd",           { NULL }, 28000, "tcp"  },
+  { "nxlmd",           { NULL }, 28000, "udp"  },
+  { "pqsp",            { NULL }, 28001, "tcp"  },
+  { "siemensgsm",      { NULL }, 28240, "tcp"  },
+  { "siemensgsm",      { NULL }, 28240, "udp"  },
+  { "sgsap",           { NULL }, 29118, "sctp" },
+  { "otmp",            { NULL }, 29167, "tcp"  },
+  { "otmp",            { NULL }, 29167, "udp"  },
+  { "sbcap",           { NULL }, 29168, "sctp" },
+  { "iuhsctpassoc",    { NULL }, 29169, "sctp" },
+  { "pago-services1",  { NULL }, 30001, "tcp"  },
+  { "pago-services1",  { NULL }, 30001, "udp"  },
+  { "pago-services2",  { NULL }, 30002, "tcp"  },
+  { "pago-services2",  { NULL }, 30002, "udp"  },
+  { "kingdomsonline",  { NULL }, 30260, "tcp"  },
+  { "kingdomsonline",  { NULL }, 30260, "udp"  },
+  { "ovobs",           { NULL }, 30999, "tcp"  },
+  { "ovobs",           { NULL }, 30999, "udp"  },
+  { "autotrac-acp",    { NULL }, 31020, "tcp"  },
+  { "yawn",            { NULL }, 31029, "udp"  },
+  { "xqosd",           { NULL }, 31416, "tcp"  },
+  { "xqosd",           { NULL }, 31416, "udp"  },
+  { "tetrinet",        { NULL }, 31457, "tcp"  },
+  { "tetrinet",        { NULL }, 31457, "udp"  },
+  { "lm-mon",          { NULL }, 31620, "tcp"  },
+  { "lm-mon",          { NULL }, 31620, "udp"  },
+  { "dsx_monitor",     { NULL }, 31685, "tcp"  },
+  { "gamesmith-port",  { NULL }, 31765, "tcp"  },
+  { "gamesmith-port",  { NULL }, 31765, "udp"  },
+  { "iceedcp_tx",      { NULL }, 31948, "tcp"  },
+  { "iceedcp_tx",      { NULL }, 31948, "udp"  },
+  { "iceedcp_rx",      { NULL }, 31949, "tcp"  },
+  { "iceedcp_rx",      { NULL }, 31949, "udp"  },
+  { "iracinghelper",   { NULL }, 32034, "tcp"  },
+  { "iracinghelper",   { NULL }, 32034, "udp"  },
+  { "t1distproc60",    { NULL }, 32249, "tcp"  },
+  { "t1distproc60",    { NULL }, 32249, "udp"  },
+  { "apm-link",        { NULL }, 32483, "tcp"  },
+  { "apm-link",        { NULL }, 32483, "udp"  },
+  { "sec-ntb-clnt",    { NULL }, 32635, "tcp"  },
+  { "sec-ntb-clnt",    { NULL }, 32635, "udp"  },
+  { "DMExpress",       { NULL }, 32636, "tcp"  },
+  { "DMExpress",       { NULL }, 32636, "udp"  },
+  { "filenet-powsrm",  { NULL }, 32767, "tcp"  },
+  { "filenet-powsrm",  { NULL }, 32767, "udp"  },
+  { "filenet-tms",     { NULL }, 32768, "tcp"  },
+  { "filenet-tms",     { NULL }, 32768, "udp"  },
+  { "filenet-rpc",     { NULL }, 32769, "tcp"  },
+  { "filenet-rpc",     { NULL }, 32769, "udp"  },
+  { "filenet-nch",     { NULL }, 32770, "tcp"  },
+  { "filenet-nch",     { NULL }, 32770, "udp"  },
+  { "filenet-rmi",     { NULL }, 32771, "tcp"  },
+  { "filenet-rmi",     { NULL }, 32771, "udp"  },
+  { "filenet-pa",      { NULL }, 32772, "tcp"  },
+  { "filenet-pa",      { NULL }, 32772, "udp"  },
+  { "filenet-cm",      { NULL }, 32773, "tcp"  },
+  { "filenet-cm",      { NULL }, 32773, "udp"  },
+  { "filenet-re",      { NULL }, 32774, "tcp"  },
+  { "filenet-re",      { NULL }, 32774, "udp"  },
+  { "filenet-pch",     { NULL }, 32775, "tcp"  },
+  { "filenet-pch",     { NULL }, 32775, "udp"  },
+  { "filenet-peior",   { NULL }, 32776, "tcp"  },
+  { "filenet-peior",   { NULL }, 32776, "udp"  },
+  { "filenet-obrok",   { NULL }, 32777, "tcp"  },
+  { "filenet-obrok",   { NULL }, 32777, "udp"  },
+  { "mlsn",            { NULL }, 32801, "tcp"  },
+  { "mlsn",            { NULL }, 32801, "udp"  },
+  { "retp",            { NULL }, 32811, "tcp"  },
+  { "idmgratm",        { NULL }, 32896, "tcp"  },
+  { "idmgratm",        { NULL }, 32896, "udp"  },
+  { "aurora-balaena",  { NULL }, 33123, "tcp"  },
+  { "aurora-balaena",  { NULL }, 33123, "udp"  },
+  { "diamondport",     { NULL }, 33331, "tcp"  },
+  { "diamondport",     { NULL }, 33331, "udp"  },
+  { "dgi-serv",        { NULL }, 33333, "tcp"  },
+  { "traceroute",      { NULL }, 33434, "tcp"  },
+  { "traceroute",      { NULL }, 33434, "udp"  },
+  { "snip-slave",      { NULL }, 33656, "tcp"  },
+  { "snip-slave",      { NULL }, 33656, "udp"  },
+  { "turbonote-2",     { NULL }, 34249, "tcp"  },
+  { "turbonote-2",     { NULL }, 34249, "udp"  },
+  { "p-net-local",     { NULL }, 34378, "tcp"  },
+  { "p-net-local",     { NULL }, 34378, "udp"  },
+  { "p-net-remote",    { NULL }, 34379, "tcp"  },
+  { "p-net-remote",    { NULL }, 34379, "udp"  },
+  { "dhanalakshmi",    { NULL }, 34567, "tcp"  },
+  { "profinet-rt",     { NULL }, 34962, "tcp"  },
+  { "profinet-rt",     { NULL }, 34962, "udp"  },
+  { "profinet-rtm",    { NULL }, 34963, "tcp"  },
+  { "profinet-rtm",    { NULL }, 34963, "udp"  },
+  { "profinet-cm",     { NULL }, 34964, "tcp"  },
+  { "profinet-cm",     { NULL }, 34964, "udp"  },
+  { "ethercat",        { NULL }, 34980, "tcp"  },
+  { "ethercat",        { NULL }, 34980, "udp"  },
+  { "allpeers",        { NULL }, 36001, "tcp"  },
+  { "allpeers",        { NULL }, 36001, "udp"  },
+  { "s1-control",      { NULL }, 36412, "sctp" },
+  { "x2-control",      { NULL }, 36422, "sctp" },
+  { "m2ap",            { NULL }, 36443, "sctp" },
+  { "m3ap",            { NULL }, 36444, "sctp" },
+  { "kastenxpipe",     { NULL }, 36865, "tcp"  },
+  { "kastenxpipe",     { NULL }, 36865, "udp"  },
+  { "neckar",          { NULL }, 37475, "tcp"  },
+  { "neckar",          { NULL }, 37475, "udp"  },
+  { "unisys-eportal",  { NULL }, 37654, "tcp"  },
+  { "unisys-eportal",  { NULL }, 37654, "udp"  },
+  { "galaxy7-data",    { NULL }, 38201, "tcp"  },
+  { "galaxy7-data",    { NULL }, 38201, "udp"  },
+  { "fairview",        { NULL }, 38202, "tcp"  },
+  { "fairview",        { NULL }, 38202, "udp"  },
+  { "agpolicy",        { NULL }, 38203, "tcp"  },
+  { "agpolicy",        { NULL }, 38203, "udp"  },
+  { "turbonote-1",     { NULL }, 39681, "tcp"  },
+  { "turbonote-1",     { NULL }, 39681, "udp"  },
+  { "safetynetp",      { NULL }, 40000, "tcp"  },
+  { "safetynetp",      { NULL }, 40000, "udp"  },
+  { "cscp",            { NULL }, 40841, "tcp"  },
+  { "cscp",            { NULL }, 40841, "udp"  },
+  { "csccredir",       { NULL }, 40842, "tcp"  },
+  { "csccredir",       { NULL }, 40842, "udp"  },
+  { "csccfirewall",    { NULL }, 40843, "tcp"  },
+  { "csccfirewall",    { NULL }, 40843, "udp"  },
+  { "ortec-disc",      { NULL }, 40853, "udp"  },
+  { "fs-qos",          { NULL }, 41111, "tcp"  },
+  { "fs-qos",          { NULL }, 41111, "udp"  },
+  { "tentacle",        { NULL }, 41121, "tcp"  },
+  { "crestron-cip",    { NULL }, 41794, "tcp"  },
+  { "crestron-cip",    { NULL }, 41794, "udp"  },
+  { "crestron-ctp",    { NULL }, 41795, "tcp"  },
+  { "crestron-ctp",    { NULL }, 41795, "udp"  },
+  { "candp",           { NULL }, 42508, "tcp"  },
+  { "candp",           { NULL }, 42508, "udp"  },
+  { "candrp",          { NULL }, 42509, "tcp"  },
+  { "candrp",          { NULL }, 42509, "udp"  },
+  { "caerpc",          { NULL }, 42510, "tcp"  },
+  { "caerpc",          { NULL }, 42510, "udp"  },
+  { "reachout",        { NULL }, 43188, "tcp"  },
+  { "reachout",        { NULL }, 43188, "udp"  },
+  { "ndm-agent-port",  { NULL }, 43189, "tcp"  },
+  { "ndm-agent-port",  { NULL }, 43189, "udp"  },
+  { "ip-provision",    { NULL }, 43190, "tcp"  },
+  { "ip-provision",    { NULL }, 43190, "udp"  },
+  { "noit-transport",  { NULL }, 43191, "tcp"  },
+  { "ew-mgmt",         { NULL }, 43440, "tcp"  },
+  { "ew-disc-cmd",     { NULL }, 43440, "udp"  },
+  { "ciscocsdb",       { NULL }, 43441, "tcp"  },
+  { "ciscocsdb",       { NULL }, 43441, "udp"  },
+  { "pmcd",            { NULL }, 44321, "tcp"  },
+  { "pmcd",            { NULL }, 44321, "udp"  },
+  { "pmcdproxy",       { NULL }, 44322, "tcp"  },
+  { "pmcdproxy",       { NULL }, 44322, "udp"  },
+  { "pcp",             { NULL }, 44323, "udp"  },
+  { "rbr-debug",       { NULL }, 44553, "tcp"  },
+  { "rbr-debug",       { NULL }, 44553, "udp"  },
+  { "EtherNet/IP-2",   { NULL }, 44818, "tcp"  },
+  { "EtherNet/IP-2",   { NULL }, 44818, "udp"  },
+  { "invision-ag",     { NULL }, 45054, "tcp"  },
+  { "invision-ag",     { NULL }, 45054, "udp"  },
+  { "eba",             { NULL }, 45678, "tcp"  },
+  { "eba",             { NULL }, 45678, "udp"  },
+  { "qdb2service",     { NULL }, 45825, "tcp"  },
+  { "qdb2service",     { NULL }, 45825, "udp"  },
+  { "ssr-servermgr",   { NULL }, 45966, "tcp"  },
+  { "ssr-servermgr",   { NULL }, 45966, "udp"  },
+  { "mediabox",        { NULL }, 46999, "tcp"  },
+  { "mediabox",        { NULL }, 46999, "udp"  },
+  { "mbus",            { NULL }, 47000, "tcp"  },
+  { "mbus",            { NULL }, 47000, "udp"  },
+  { "winrm",           { NULL }, 47001, "tcp"  },
+  { "dbbrowse",        { NULL }, 47557, "tcp"  },
+  { "dbbrowse",        { NULL }, 47557, "udp"  },
+  { "directplaysrvr",  { NULL }, 47624, "tcp"  },
+  { "directplaysrvr",  { NULL }, 47624, "udp"  },
+  { "ap",              { NULL }, 47806, "tcp"  },
+  { "ap",              { NULL }, 47806, "udp"  },
+  { "bacnet",          { NULL }, 47808, "tcp"  },
+  { "bacnet",          { NULL }, 47808, "udp"  },
+  { "nimcontroller",   { NULL }, 48000, "tcp"  },
+  { "nimcontroller",   { NULL }, 48000, "udp"  },
+  { "nimspooler",      { NULL }, 48001, "tcp"  },
+  { "nimspooler",      { NULL }, 48001, "udp"  },
+  { "nimhub",          { NULL }, 48002, "tcp"  },
+  { "nimhub",          { NULL }, 48002, "udp"  },
+  { "nimgtw",          { NULL }, 48003, "tcp"  },
+  { "nimgtw",          { NULL }, 48003, "udp"  },
+  { "nimbusdb",        { NULL }, 48004, "tcp"  },
+  { "nimbusdbctrl",    { NULL }, 48005, "tcp"  },
+  { "3gpp-cbsp",       { NULL }, 48049, "tcp"  },
+  { "isnetserv",       { NULL }, 48128, "tcp"  },
+  { "isnetserv",       { NULL }, 48128, "udp"  },
+  { "blp5",            { NULL }, 48129, "tcp"  },
+  { "blp5",            { NULL }, 48129, "udp"  },
+  { "com-bardac-dw",   { NULL }, 48556, "tcp"  },
+  { "com-bardac-dw",   { NULL }, 48556, "udp"  },
+  { "iqobject",        { NULL }, 48619, "tcp"  },
+  { "iqobject",        { NULL }, 48619, "udp"  },
 #  endif  /* USE_IANA_REGISTERED_PORTS */
-  { NULL,              { NULL }, 0,     NULL  }
+  { NULL,              { NULL }, 0,     NULL   }
 };
 
 struct servent *getservbyport(int port, const char *proto)
diff --git a/contrib/libs/c-ares/src/lib/ares_private.h b/contrib/libs/c-ares/src/lib/ares_private.h
index 8d6e8ba77bfd..6d9fc117712d 100644
--- a/contrib/libs/c-ares/src/lib/ares_private.h
+++ b/contrib/libs/c-ares/src/lib/ares_private.h
@@ -114,6 +114,7 @@ typedef struct ares_rand_state ares_rand_state;
 #include "ares__htable_strvp.h"
 #include "ares__htable_szvp.h"
 #include "ares__htable_asvp.h"
+#include "ares__htable_vpvp.h"
 #include "ares__buf.h"
 #include "ares_dns_private.h"
 #include "ares__iface_ips.h"
@@ -166,6 +167,22 @@ struct server_connection {
   ares__llist_t       *queries_to_conn;
 };
 
+#ifdef _MSC_VER
+typedef __int64          ares_int64_t;
+typedef unsigned __int64 ares_uint64_t;
+#else
+typedef long long          ares_int64_t;
+typedef unsigned long long ares_uint64_t;
+#endif
+
+/*! struct timeval on some systems like Windows doesn't support 64bit time so
+ *  therefore can't be used due to Y2K38 issues.  Make our own that does have
+ *  64bit time. */
+typedef struct {
+  ares_int64_t sec;  /*!< Seconds */
+  unsigned int usec; /*!< Microseconds. Can't be negative. */
+} ares_timeval_t;
+
 struct server_state {
   /* Configuration */
   size_t                    idx; /* index for server in system configuration */
@@ -182,7 +199,7 @@ struct server_state {
   struct server_connection *tcp_conn;
 
   /* The next time when we will retry this server if it has hit failures */
-  struct timeval            next_retry_time;
+  ares_timeval_t            next_retry_time;
 
   /* TCP buffer since multiple responses can come back in one read, or partial
    * in a read */
@@ -199,7 +216,7 @@ struct server_state {
 struct query {
   /* Query ID from qbuf, for faster lookup, and current timeout */
   unsigned short            qid; /* host byte order */
-  struct timeval            timeout;
+  ares_timeval_t            timeout;
   ares_channel_t           *channel;
 
   /*
@@ -331,8 +348,19 @@ struct ares_channeldata {
    * The retry delay is the minimum time in milliseconds to wait between doing
    * such retries (applied per-server).
    */
-  unsigned short server_retry_chance;
-  size_t         server_retry_delay;
+  unsigned short                      server_retry_chance;
+  size_t                              server_retry_delay;
+
+  /* Callback triggered when a server has a successful or failed response */
+  ares_server_state_callback          server_state_cb;
+  void                               *server_state_cb_data;
+
+  /* TRUE if a reinit is pending.  Reinit spawns a thread to read the system
+   * configuration and then apply the configuration since configuration
+   * reading may block.  The thread handle is provided for waiting on thread
+   * exit. */
+  ares_bool_t                         reinit_pending;
+  ares__thread_t                     *reinit_thread;
 };
 
 /* Does the domain end in ".onion" or ".onion."? Case-insensitive. */
@@ -346,12 +374,13 @@ void         *ares_malloc_zero(size_t size);
 void         *ares_realloc_zero(void *ptr, size_t orig_size, size_t new_size);
 
 /* return true if now is exactly check time or later */
-ares_bool_t   ares__timedout(const struct timeval *now,
-                             const struct timeval *check);
+ares_bool_t   ares__timedout(const ares_timeval_t *now,
+                             const ares_timeval_t *check);
 
 /* Returns one of the normal ares status codes like ARES_SUCCESS */
-ares_status_t ares__send_query(struct query *query, struct timeval *now);
-ares_status_t ares__requeue_query(struct query *query, struct timeval *now);
+ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now);
+ares_status_t ares__requeue_query(struct query         *query,
+                                  const ares_timeval_t *now);
 
 /*! Retrieve a list of names to use for searching.  The first successful
  *  query in the list wins.  This function also uses the HOSTSALIASES file
@@ -390,10 +419,10 @@ void             ares__destroy_rand_state(ares_rand_state *state);
 void ares__rand_bytes(ares_rand_state *state, unsigned char *buf, size_t len);
 
 unsigned short ares__generate_new_id(ares_rand_state *state);
-struct timeval ares__tvnow(void);
-void           ares__timeval_remaining(struct timeval       *remaining,
-                                       const struct timeval *now,
-                                       const struct timeval *tout);
+ares_timeval_t ares__tvnow(void);
+void           ares__timeval_remaining(ares_timeval_t       *remaining,
+                                       const ares_timeval_t *now,
+                                       const ares_timeval_t *tout);
 ares_status_t  ares__expand_name_validated(const unsigned char *encoded,
                                            const unsigned char *abuf,
                                            size_t alen, char **s, size_t *enclen,
@@ -426,10 +455,17 @@ typedef struct {
   ares_bool_t      usevc;
 } ares_sysconfig_t;
 
+ares_status_t ares__sysconfig_set_options(ares_sysconfig_t *sysconfig,
+                                          const char       *str);
+
 ares_status_t ares__init_by_environment(ares_sysconfig_t *sysconfig);
 
 ares_status_t ares__init_sysconfig_files(const ares_channel_t *channel,
                                          ares_sysconfig_t     *sysconfig);
+#ifdef __APPLE__
+ares_status_t ares__init_sysconfig_macos(ares_sysconfig_t *sysconfig);
+#endif
+
 ares_status_t ares__parse_sortlist(struct apattern **sortlist, size_t *nsort,
                                    const char *str);
 
@@ -515,6 +551,8 @@ ares_status_t ares__sconfig_append_fromstr(ares__llist_t **sconfig,
 ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
                                                   size_t          nservers,
                                                   ares__llist_t **llist);
+ares_status_t ares_get_server_addr(const struct server_state *server,
+                                   ares__buf_t               *buf);
 
 struct ares_hosts_entry;
 typedef struct ares_hosts_entry ares_hosts_entry_t;
@@ -598,9 +636,9 @@ void          ares_queue_notify_empty(ares_channel_t *channel);
     }                                                             \
   } while (0)
 
-#define ARES_CONFIG_CHECK(x)                                             \
-  (x && x->lookups && ares__slist_len(x->servers) > 0 && \
-   x->timeout > 0 && x->tries > 0)
+#define ARES_CONFIG_CHECK(x)                                               \
+  (x && x->lookups && ares__slist_len(x->servers) > 0 && x->timeout > 0 && \
+   x->tries > 0)
 
 ares_bool_t   ares__subnet_match(const struct ares_addr *addr,
                                  const struct ares_addr *subnet,
@@ -619,18 +657,18 @@ ares_status_t ares__qcache_create(ares_rand_state *rand_state,
                                   ares__qcache_t **cache_out);
 void          ares__qcache_flush(ares__qcache_t *cache);
 ares_status_t ares_qcache_insert(ares_channel_t       *channel,
-                                 const struct timeval *now,
+                                 const ares_timeval_t *now,
                                  const struct query   *query,
                                  ares_dns_record_t    *dnsrec);
 ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
-                                const struct timeval     *now,
+                                const ares_timeval_t     *now,
                                 const ares_dns_record_t  *dnsrec,
                                 const ares_dns_record_t **dnsrec_resp);
 
 ares_status_t ares__channel_threading_init(ares_channel_t *channel);
 void          ares__channel_threading_destroy(ares_channel_t *channel);
-void          ares__channel_lock(ares_channel_t *channel);
-void          ares__channel_unlock(ares_channel_t *channel);
+void          ares__channel_lock(const ares_channel_t *channel);
+void          ares__channel_unlock(const ares_channel_t *channel);
 
 struct ares_event_thread;
 typedef struct ares_event_thread ares_event_thread_t;
@@ -639,14 +677,6 @@ void          ares_event_thread_destroy(ares_channel_t *channel);
 ares_status_t ares_event_thread_init(ares_channel_t *channel);
 
 
-#ifdef _MSC_VER
-typedef __int64          ares_int64_t;
-typedef unsigned __int64 ares_uint64_t;
-#else
-typedef long long          ares_int64_t;
-typedef unsigned long long ares_uint64_t;
-#endif
-
 #ifdef _WIN32
 #  define HOSTENT_ADDRTYPE_TYPE short
 #  define HOSTENT_LENGTH_TYPE   short
diff --git a/contrib/libs/c-ares/src/lib/ares_process.c b/contrib/libs/c-ares/src/lib/ares_process.c
index 23fb6786c27f..0d8f3ca9ed0b 100644
--- a/contrib/libs/c-ares/src/lib/ares_process.c
+++ b/contrib/libs/c-ares/src/lib/ares_process.c
@@ -50,17 +50,18 @@
 #include "ares_nameser.h"
 #include "ares_dns.h"
 
-static void        timeadd(struct timeval *now, size_t millisecs);
-static ares_bool_t try_again(int errnum);
-static void        write_tcp_data(ares_channel_t *channel, fd_set *write_fds,
-                                  ares_socket_t write_fd);
-static void        read_packets(ares_channel_t *channel, fd_set *read_fds,
-                                ares_socket_t read_fd, struct timeval *now);
-static void process_timeouts(ares_channel_t *channel, struct timeval *now);
+static void          timeadd(ares_timeval_t *now, size_t millisecs);
+static ares_bool_t   try_again(int errnum);
+static void          write_tcp_data(ares_channel_t *channel, fd_set *write_fds,
+                                    ares_socket_t write_fd);
+static void          read_packets(ares_channel_t *channel, fd_set *read_fds,
+                                  ares_socket_t read_fd, const ares_timeval_t *now);
+static void          process_timeouts(ares_channel_t       *channel,
+                                      const ares_timeval_t *now);
 static ares_status_t process_answer(ares_channel_t      *channel,
                                     const unsigned char *abuf, size_t alen,
                                     struct server_connection *conn,
-                                    ares_bool_t tcp, struct timeval *now);
+                                    ares_bool_t tcp, const ares_timeval_t *now);
 static void          handle_conn_error(struct server_connection *conn,
                                        ares_bool_t               critical_failure);
 
@@ -71,11 +72,47 @@ static ares_bool_t   same_address(const struct sockaddr  *sa,
 static void          end_query(ares_channel_t *channel, struct query *query,
                                ares_status_t status, const ares_dns_record_t *dnsrec);
 
-static void server_increment_failures(struct server_state *server)
+/* Invoke the server state callback after a success or failure */
+static void          invoke_server_state_cb(const struct server_state *server,
+                                            ares_bool_t success, int flags)
+{
+  const ares_channel_t *channel = server->channel;
+  ares__buf_t          *buf;
+  ares_status_t         status;
+  char                 *server_string;
+
+  if (channel->server_state_cb == NULL) {
+    return;
+  }
+
+  buf = ares__buf_create();
+  if (buf == NULL) {
+    return;
+  }
+
+  status = ares_get_server_addr(server, buf);
+  if (status != ARES_SUCCESS) {
+    ares__buf_destroy(buf);
+    return;
+  }
+
+  server_string = ares__buf_finish_str(buf, NULL);
+  buf           = NULL;
+  if (server_string == NULL) {
+    return;
+  }
+
+  channel->server_state_cb(server_string, success, flags,
+                           channel->server_state_cb_data);
+  ares_free(server_string);
+}
+
+static void server_increment_failures(struct server_state *server,
+                                      ares_bool_t          used_tcp)
 {
   ares__slist_node_t   *node;
   const ares_channel_t *channel = server->channel;
-  struct timeval        next_retry_time;
+  ares_timeval_t        next_retry_time;
 
   node = ares__slist_node_find(channel->servers, server);
   if (node == NULL) {
@@ -88,9 +125,13 @@ static void server_increment_failures(struct server_state *server)
   next_retry_time = ares__tvnow();
   timeadd(&next_retry_time, channel->server_retry_delay);
   server->next_retry_time = next_retry_time;
+
+  invoke_server_state_cb(server, ARES_FALSE,
+                         used_tcp == ARES_TRUE ? ARES_SERV_STATE_TCP
+                                               : ARES_SERV_STATE_UDP);
 }
 
-static void server_set_good(struct server_state *server)
+static void server_set_good(struct server_state *server, ares_bool_t used_tcp)
 {
   ares__slist_node_t   *node;
   const ares_channel_t *channel = server->channel;
@@ -105,15 +146,19 @@ static void server_set_good(struct server_state *server)
     ares__slist_node_reinsert(node);
   }
 
-  server->next_retry_time.tv_sec = 0;
-  server->next_retry_time.tv_usec = 0;
+  server->next_retry_time.sec  = 0;
+  server->next_retry_time.usec = 0;
+
+  invoke_server_state_cb(server, ARES_TRUE,
+                         used_tcp == ARES_TRUE ? ARES_SERV_STATE_TCP
+                                               : ARES_SERV_STATE_UDP);
 }
 
 /* return true if now is exactly check time or later */
-ares_bool_t ares__timedout(const struct timeval *now,
-                           const struct timeval *check)
+ares_bool_t ares__timedout(const ares_timeval_t *now,
+                           const ares_timeval_t *check)
 {
-  ares_int64_t secs = ((ares_int64_t)now->tv_sec - (ares_int64_t)check->tv_sec);
+  ares_int64_t secs = (now->sec - check->sec);
 
   if (secs > 0) {
     return ARES_TRUE; /* yes, timed out */
@@ -123,20 +168,20 @@ ares_bool_t ares__timedout(const struct timeval *now,
   }
 
   /* if the full seconds were identical, check the sub second parts */
-  return ((ares_int64_t)now->tv_usec - (ares_int64_t)check->tv_usec) >= 0
+  return ((ares_int64_t)now->usec - (ares_int64_t)check->usec) >= 0
            ? ARES_TRUE
            : ARES_FALSE;
 }
 
 /* add the specific number of milliseconds to the time in the first argument */
-static void timeadd(struct timeval *now, size_t millisecs)
+static void timeadd(ares_timeval_t *now, size_t millisecs)
 {
-  now->tv_sec  += (time_t)millisecs / 1000;
-  now->tv_usec += (time_t)((millisecs % 1000) * 1000);
+  now->sec  += (ares_int64_t)millisecs / 1000;
+  now->usec += (unsigned int)((millisecs % 1000) * 1000);
 
-  if (now->tv_usec >= 1000000) {
-    ++(now->tv_sec);
-    now->tv_usec -= 1000000;
+  if (now->usec >= 1000000) {
+    now->sec  += now->usec / 1000000;
+    now->usec %= 1000000;
   }
 }
 
@@ -147,7 +192,7 @@ static void processfds(ares_channel_t *channel, fd_set *read_fds,
                        ares_socket_t read_fd, fd_set *write_fds,
                        ares_socket_t write_fd)
 {
-  struct timeval now;
+  ares_timeval_t now;
 
   if (channel == NULL) {
     return;
@@ -280,7 +325,8 @@ static void write_tcp_data(ares_channel_t *channel, fd_set *write_fds,
  * a packet if we finish reading one.
  */
 static void read_tcp_data(ares_channel_t           *channel,
-                          struct server_connection *conn, struct timeval *now)
+                          struct server_connection *conn,
+                          const ares_timeval_t     *now)
 {
   ares_ssize_t         count;
   struct server_state *server = conn->server;
@@ -419,7 +465,7 @@ static ares_socket_t *channel_socket_list(const ares_channel_t *channel,
 /* If any UDP sockets select true for reading, process them. */
 static void read_udp_packets_fd(ares_channel_t           *channel,
                                 struct server_connection *conn,
-                                struct timeval           *now)
+                                const ares_timeval_t     *now)
 {
   ares_ssize_t  read_len;
   unsigned char buf[MAXENDSSZ + 1];
@@ -483,7 +529,7 @@ static void read_udp_packets_fd(ares_channel_t           *channel,
 }
 
 static void read_packets(ares_channel_t *channel, fd_set *read_fds,
-                         ares_socket_t read_fd, struct timeval *now)
+                         ares_socket_t read_fd, const ares_timeval_t *now)
 {
   size_t                    i;
   ares_socket_t            *socketlist  = NULL;
@@ -550,7 +596,7 @@ static void read_packets(ares_channel_t *channel, fd_set *read_fds,
 }
 
 /* If any queries have timed out, note the timeout and move them on. */
-static void process_timeouts(ares_channel_t *channel, struct timeval *now)
+static void process_timeouts(ares_channel_t *channel, const ares_timeval_t *now)
 {
   ares__slist_node_t *node =
     ares__slist_node_first(channel->queries_by_timeout);
@@ -569,7 +615,7 @@ static void process_timeouts(ares_channel_t *channel, struct timeval *now)
     query->timeouts++;
 
     conn = query->conn;
-    server_increment_failures(conn->server);
+    server_increment_failures(conn->server, query->using_tcp);
     ares__requeue_query(query, now);
     ares__check_cleanup_conn(channel, conn);
 
@@ -623,7 +669,7 @@ static ares_status_t rewrite_without_edns(ares_dns_record_t *qdnsrec,
 static ares_status_t process_answer(ares_channel_t      *channel,
                                     const unsigned char *abuf, size_t alen,
                                     struct server_connection *conn,
-                                    ares_bool_t tcp, struct timeval *now)
+                                    ares_bool_t tcp, const ares_timeval_t *now)
 {
   struct query        *query;
   /* Cache these as once ares__send_query() gets called, it may end up
@@ -724,7 +770,7 @@ static ares_status_t process_answer(ares_channel_t      *channel,
           break;
       }
 
-      server_increment_failures(server);
+      server_increment_failures(server, query->using_tcp);
       ares__requeue_query(query, now);
 
       /* Should any of these cause a connection termination?
@@ -740,7 +786,7 @@ static ares_status_t process_answer(ares_channel_t      *channel,
     is_cached = ARES_TRUE;
   }
 
-  server_set_good(server);
+  server_set_good(server, query->using_tcp);
   end_query(channel, query, ARES_SUCCESS, rdnsrec);
 
   status = ARES_SUCCESS;
@@ -763,14 +809,15 @@ static void handle_conn_error(struct server_connection *conn,
   /* Increment failures first before requeue so it is unlikely to requeue
    * to the same server */
   if (critical_failure) {
-    server_increment_failures(server);
+    server_increment_failures(server, conn->is_tcp);
   }
 
   /* This will requeue any connections automatically */
   ares__close_connection(conn);
 }
 
-ares_status_t ares__requeue_query(struct query *query, struct timeval *now)
+ares_status_t ares__requeue_query(struct query         *query,
+                                  const ares_timeval_t *now)
 {
   ares_channel_t *channel = query->channel;
   size_t max_tries        = ares__slist_len(channel->servers) * channel->tries;
@@ -840,8 +887,9 @@ static struct server_state *ares__random_server(ares_channel_t *channel)
 static struct server_state *ares__failover_server(ares_channel_t *channel)
 {
   struct server_state *first_server = ares__slist_first_val(channel->servers);
-  struct server_state *last_server  = ares__slist_last_val(channel->servers);
-  unsigned short       r;
+  const struct server_state *last_server =
+    ares__slist_last_val(channel->servers);
+  unsigned short r;
 
   /* Defensive code against no servers being available on the channel. */
   if (first_server == NULL) {
@@ -868,7 +916,7 @@ static struct server_state *ares__failover_server(ares_channel_t *channel)
   ares__rand_bytes(channel->rand_state, (unsigned char *)&r, sizeof(r));
   if (r % channel->server_retry_chance == 0) {
     /* Select a suitable failed server to retry. */
-    struct timeval      now = ares__tvnow();
+    ares_timeval_t      now = ares__tvnow();
     ares__slist_node_t *node;
     for (node = ares__slist_node_first(channel->servers); node != NULL;
          node = ares__slist_node_next(node)) {
@@ -945,7 +993,7 @@ static size_t ares__calc_query_timeout(const struct query *query)
   return timeplus;
 }
 
-ares_status_t ares__send_query(struct query *query, struct timeval *now)
+ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now)
 {
   ares_channel_t           *channel = query->channel;
   struct server_state      *server;
@@ -987,7 +1035,7 @@ ares_status_t ares__send_query(struct query *query, struct timeval *now)
          * error codes */
         case ARES_ECONNREFUSED:
         case ARES_EBADFAMILY:
-          server_increment_failures(server);
+          server_increment_failures(server, query->using_tcp);
           query->error_status = status;
           return ares__requeue_query(query, now);
 
@@ -1046,7 +1094,7 @@ ares_status_t ares__send_query(struct query *query, struct timeval *now)
          * error codes */
         case ARES_ECONNREFUSED:
         case ARES_EBADFAMILY:
-          server_increment_failures(server);
+          server_increment_failures(server, query->using_tcp);
           query->error_status = status;
           return ares__requeue_query(query, now);
 
@@ -1061,7 +1109,7 @@ ares_status_t ares__send_query(struct query *query, struct timeval *now)
     conn = ares__llist_node_val(node);
     if (ares__socket_write(channel, conn->fd, query->qbuf, query->qlen) == -1) {
       /* FIXME: Handle EAGAIN here since it likely can happen. */
-      server_increment_failures(server);
+      server_increment_failures(server, query->using_tcp);
       status = ares__requeue_query(query, now);
 
       /* Only safe to kill connection if it was new, otherwise it should be
diff --git a/contrib/libs/c-ares/src/lib/ares_qcache.c b/contrib/libs/c-ares/src/lib/ares_qcache.c
index 2af1125a0d29..087518d7b808 100644
--- a/contrib/libs/c-ares/src/lib/ares_qcache.c
+++ b/contrib/libs/c-ares/src/lib/ares_qcache.c
@@ -137,7 +137,7 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
 }
 
 static void ares__qcache_expire(ares__qcache_t       *cache,
-                                const struct timeval *now)
+                                const ares_timeval_t *now)
 {
   ares__slist_node_t *node;
 
@@ -147,7 +147,9 @@ static void ares__qcache_expire(ares__qcache_t       *cache,
 
   while ((node = ares__slist_node_first(cache->expire)) != NULL) {
     const ares__qcache_entry_t *entry = ares__slist_node_val(node);
-    if (entry->expire_ts > now->tv_sec) {
+
+    /* If now is NULL, we're flushing everything, so don't break */
+    if (now != NULL && entry->expire_ts > now->sec) {
       break;
     }
 
@@ -158,9 +160,7 @@ static void ares__qcache_expire(ares__qcache_t       *cache,
 
 void ares__qcache_flush(ares__qcache_t *cache)
 {
-  struct timeval now;
-  memset(&now, 0, sizeof(now));
-  ares__qcache_expire(cache, &now);
+  ares__qcache_expire(cache, NULL /* flush all */);
 }
 
 void ares__qcache_destroy(ares__qcache_t *cache)
@@ -254,7 +254,10 @@ static unsigned int ares__qcache_calc_minttl(ares_dns_record_t *dnsrec)
         ares_dns_record_rr_get(dnsrec, (ares_dns_section_t)sect, i);
       ares_dns_rec_type_t type = ares_dns_rr_get_type(rr);
       unsigned int        ttl  = ares_dns_rr_get_ttl(rr);
-      if (type == ARES_REC_TYPE_OPT || type == ARES_REC_TYPE_SOA) {
+
+      /* TTL is meaningless on these record types */
+      if (type == ARES_REC_TYPE_OPT || type == ARES_REC_TYPE_SOA ||
+          type == ARES_REC_TYPE_SIG) {
         continue;
       }
 
@@ -319,7 +322,7 @@ static char *ares__qcache_calc_key_frombuf(const unsigned char *qbuf,
 static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
                                          ares_dns_record_t   *dnsrec,
                                          const unsigned char *qbuf, size_t qlen,
-                                         const struct timeval *now)
+                                         const ares_timeval_t *now)
 {
   ares__qcache_entry_t *entry;
   unsigned int          ttl;
@@ -362,8 +365,8 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
   }
 
   entry->dnsrec    = dnsrec;
-  entry->expire_ts = now->tv_sec + (time_t)ttl;
-  entry->insert_ts = now->tv_sec;
+  entry->expire_ts = now->sec + (time_t)ttl;
+  entry->insert_ts = now->sec;
 
   /* We can't guarantee the server responded with the same flags as the
    * request had, so we have to re-parse the request in order to generate the
@@ -394,7 +397,7 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
 }
 
 ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
-                                const struct timeval     *now,
+                                const ares_timeval_t     *now,
                                 const ares_dns_record_t  *dnsrec,
                                 const ares_dns_record_t **dnsrec_resp)
 {
@@ -425,7 +428,7 @@ ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
   }
 
   ares_dns_record_write_ttl_decrement(
-    entry->dnsrec, (unsigned int)(now->tv_sec - entry->insert_ts));
+    entry->dnsrec, (unsigned int)(now->sec - entry->insert_ts));
 
   *dnsrec_resp = entry->dnsrec;
 
@@ -435,7 +438,7 @@ ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
 }
 
 ares_status_t ares_qcache_insert(ares_channel_t       *channel,
-                                 const struct timeval *now,
+                                 const ares_timeval_t *now,
                                  const struct query   *query,
                                  ares_dns_record_t    *dnsrec)
 {
diff --git a/contrib/libs/c-ares/src/lib/ares_rand.c b/contrib/libs/c-ares/src/lib/ares_rand.c
index a7a74c9a8d70..bf3a695c9c24 100644
--- a/contrib/libs/c-ares/src/lib/ares_rand.c
+++ b/contrib/libs/c-ares/src/lib/ares_rand.c
@@ -70,7 +70,7 @@ static void ares_rc4_generate_key(ares_rand_rc4 *rc4_state, unsigned char *key,
   size_t         i;
   size_t         len = 0;
   unsigned int   data;
-  struct timeval tv;
+  ares_timeval_t tv;
 
   if (key_len != ARES_RC4_KEY_LEN) {
     return;
@@ -89,12 +89,12 @@ static void ares_rc4_generate_key(ares_rand_rc4 *rc4_state, unsigned char *key,
   len += sizeof(data);
 
   tv   = ares__tvnow();
-  data = (unsigned int)((tv.tv_sec | tv.tv_usec) & 0xFFFFFFFF);
+  data = (unsigned int)((tv.sec | tv.usec) & 0xFFFFFFFF);
   memcpy(key + len, &data, sizeof(data));
   len += sizeof(data);
 
   srand(ares_u32_from_ptr(rc4_state) | ares_u32_from_ptr(&i) |
-        (unsigned int)((tv.tv_sec | tv.tv_usec) & 0xFFFFFFFF));
+        (unsigned int)((tv.sec | tv.usec) & 0xFFFFFFFF));
 
   for (i = len; i < key_len; i++) {
     key[i] = (unsigned char)(rand() % 256); /* LCOV_EXCL_LINE */
diff --git a/contrib/libs/c-ares/src/lib/ares_send.c b/contrib/libs/c-ares/src/lib/ares_send.c
index 54f2b504d50c..8bbc6e758b47 100644
--- a/contrib/libs/c-ares/src/lib/ares_send.c
+++ b/contrib/libs/c-ares/src/lib/ares_send.c
@@ -55,7 +55,7 @@ static ares_status_t ares_send_dnsrec_int(ares_channel_t          *channel,
 {
   struct query            *query;
   size_t                   packetsz;
-  struct timeval           now = ares__tvnow();
+  ares_timeval_t           now = ares__tvnow();
   ares_status_t            status;
   unsigned short           id          = generate_unique_qid(channel);
   const ares_dns_record_t *dnsrec_resp = NULL;
@@ -91,9 +91,9 @@ static ares_status_t ares_send_dnsrec_int(ares_channel_t          *channel,
     return status;
   }
 
-  query->qid             = id;
-  query->timeout.tv_sec  = 0;
-  query->timeout.tv_usec = 0;
+  query->qid          = id;
+  query->timeout.sec  = 0;
+  query->timeout.usec = 0;
 
   /* Ignore first 2 bytes, assign our own query id */
   query->qbuf[0] = (unsigned char)((id >> 8) & 0xFF);
@@ -200,7 +200,7 @@ void ares_send(ares_channel_t *channel, const unsigned char *qbuf, int qlen,
   ares_dns_record_destroy(dnsrec);
 }
 
-size_t ares_queue_active_queries(ares_channel_t *channel)
+size_t ares_queue_active_queries(const ares_channel_t *channel)
 {
   size_t len;
 
diff --git a/contrib/libs/c-ares/src/lib/ares_str.c b/contrib/libs/c-ares/src/lib/ares_str.c
index 5f25cfeaff04..44a5e452fb88 100644
--- a/contrib/libs/c-ares/src/lib/ares_str.c
+++ b/contrib/libs/c-ares/src/lib/ares_str.c
@@ -260,6 +260,11 @@ ares_bool_t ares__is_hostnamech(int ch)
 ares_bool_t ares__is_hostname(const char *str)
 {
   size_t i;
+
+  if (str == NULL) {
+    return ARES_FALSE;
+  }
+
   for (i = 0; str[i] != 0; i++) {
     if (!ares__is_hostnamech(str[i])) {
       return ARES_FALSE;
@@ -267,3 +272,19 @@ ares_bool_t ares__is_hostname(const char *str)
   }
   return ARES_TRUE;
 }
+
+ares_bool_t ares__str_isprint(const char *str, size_t len)
+{
+  size_t i;
+
+  if (str == NULL && len != 0) {
+    return ARES_FALSE;
+  }
+
+  for (i = 0; i < len; i++) {
+    if (!ares__isprint(str[i])) {
+      return ARES_FALSE;
+    }
+  }
+  return ARES_TRUE;
+}
diff --git a/contrib/libs/c-ares/src/lib/ares_str.h b/contrib/libs/c-ares/src/lib/ares_str.h
index 8d869073d815..526a927a6286 100644
--- a/contrib/libs/c-ares/src/lib/ares_str.h
+++ b/contrib/libs/c-ares/src/lib/ares_str.h
@@ -62,5 +62,18 @@ ares_bool_t   ares__is_hostnamech(int ch);
 
 ares_bool_t   ares__is_hostname(const char *str);
 
+/*! Validate the string provided is printable.  The length specified must be
+ *  at least the size of the buffer provided.  If a NULL-terminator is hit
+ *  before the length provided is hit, this will not be considered a valid
+ *  printable string.  This does not validate that the string is actually
+ *  NULL terminated.
+ *
+ *  \param[in] str  Buffer containing string to evaluate.
+ *  \param[in] len  Number of characters to evaluate within provided buffer.
+ *                  If 0, will return TRUE since it did not hit an exception.
+ *  \return ARES_TRUE if the entire string is printable, ARES_FALSE if not.
+ */
+ares_bool_t   ares__str_isprint(const char *str, size_t len);
+
 
 #endif /* __ARES_STR_H */
diff --git a/contrib/libs/c-ares/src/lib/ares_sysconfig.c b/contrib/libs/c-ares/src/lib/ares_sysconfig.c
index 474534512af1..d56ee22e0888 100644
--- a/contrib/libs/c-ares/src/lib/ares_sysconfig.c
+++ b/contrib/libs/c-ares/src/lib/ares_sysconfig.c
@@ -957,23 +957,24 @@ static ares_status_t ares__init_sysconfig_libresolv(ares_sysconfig_t *sysconfig)
   if (res.ndots >= 0) {
     sysconfig->ndots = (size_t)res.ndots;
   }
+/* Apple does not allow configuration of retry, so this is a static dummy
+ * value, ignore */
+#  ifndef __APPLE__
   if (res.retry > 0) {
     sysconfig->tries = (size_t)res.retry;
   }
+#  endif
   if (res.options & RES_ROTATE) {
     sysconfig->rotate = ARES_TRUE;
   }
 
   if (res.retrans > 0) {
+/* Apple does not allow configuration of retrans, so this is a dummy value
+ * that is extremely high (5s) */
+#  ifndef __APPLE__
     if (res.retrans > 0) {
       sysconfig->timeout_ms = (unsigned int)res.retrans * 1000;
     }
-#  ifdef __APPLE__
-    if (res.retry >= 0) {
-      sysconfig->timeout_ms /=
-        ((unsigned int)res.retry + 1) *
-        (unsigned int)(res.nscount > 0 ? res.nscount : 1);
-    }
 #  endif
   }
 
@@ -1083,6 +1084,8 @@ ares_status_t ares__init_by_sysconfig(ares_channel_t *channel)
   status = ares__init_sysconfig_watt32(&sysconfig);
 #elif defined(ANDROID) || defined(__ANDROID__)
   status = ares__init_sysconfig_android(&sysconfig);
+#elif defined(__APPLE__)
+  status = ares__init_sysconfig_macos(&sysconfig);
 #elif defined(CARES_USE_LIBRESOLV)
   status = ares__init_sysconfig_libresolv(&sysconfig);
 #else
@@ -1099,7 +1102,14 @@ ares_status_t ares__init_by_sysconfig(ares_channel_t *channel)
     goto done;
   }
 
+  /* Lock when applying the configuration to the channel.  Don't need to
+   * lock prior to this. */
+
+  ares__channel_lock(channel);
+
   status = ares_sysconfig_apply(channel, &sysconfig);
+  ares__channel_unlock(channel);
+
   if (status != ARES_SUCCESS) {
     goto done;
   }
diff --git a/contrib/libs/c-ares/src/lib/ares_sysconfig_files.c b/contrib/libs/c-ares/src/lib/ares_sysconfig_files.c
index 557888bc740a..5771a581db5e 100644
--- a/contrib/libs/c-ares/src/lib/ares_sysconfig_files.c
+++ b/contrib/libs/c-ares/src/lib/ares_sysconfig_files.c
@@ -436,7 +436,8 @@ static ares_status_t process_option(ares_sysconfig_t *sysconfig,
   return status;
 }
 
-static ares_status_t set_options(ares_sysconfig_t *sysconfig, const char *str)
+ares_status_t ares__sysconfig_set_options(ares_sysconfig_t *sysconfig,
+                                          const char       *str)
 {
   ares__buf_t        *buf     = NULL;
   ares__llist_t      *options = NULL;
@@ -494,7 +495,7 @@ ares_status_t ares__init_by_environment(ares_sysconfig_t *sysconfig)
 
   res_options = getenv("RES_OPTIONS");
   if (res_options) {
-    status = set_options(sysconfig, res_options);
+    status = ares__sysconfig_set_options(sysconfig, res_options);
     if (status != ARES_SUCCESS) {
       return status;
     }
@@ -617,7 +618,7 @@ static ares_status_t parse_resolvconf_line(ares_sysconfig_t *sysconfig,
       status = ARES_SUCCESS;
     }
   } else if (strcmp(option, "options") == 0) {
-    status = set_options(sysconfig, value);
+    status = ares__sysconfig_set_options(sysconfig, value);
   }
 
   return status;
diff --git a/contrib/libs/c-ares/src/lib/ares_sysconfig_mac.c b/contrib/libs/c-ares/src/lib/ares_sysconfig_mac.c
new file mode 100644
index 000000000000..302bd0d34491
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/ares_sysconfig_mac.c
@@ -0,0 +1,339 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 The c-ares project and its contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifdef __APPLE__
+
+/* The DNS configuration for apple is stored in the system configuration
+ * database.  Apple does provide an emulated `/etc/resolv.conf` on MacOS (but
+ * not iOS), it cannot, however, represent the entirety of the DNS
+ * configuration.  Alternatively, libresolv could be used to also retrieve some
+ * system configuration, but it too is not capable of retrieving the entirety
+ * of the DNS configuration.
+ *
+ * Attempts to use the preferred public API of `SCDynamicStoreCreate()` and
+ * friends yielded incomplete DNS information.  Instead, that leaves some apple
+ * "internal" symbols from `configd` that we need to access in order to get the
+ * entire configuration.  We can see that we're not the only ones to do this as
+ * Google Chrome also does:
+ * https://chromium.googlesource.com/chromium/src/+/HEAD/net/dns/dns_config_watcher_mac.cc
+ * These internal functions are what `libresolv` and `scutil` use to retrieve
+ * the dns configuration.  Since these symbols are not publicly available, we
+ * will dynamically load the symbols from `libSystem` and import the `dnsinfo.h`
+ * private header extracted from:
+ * https://opensource.apple.com/source/configd/configd-1109.140.1/dnsinfo/dnsinfo.h
+ */
+#  include "ares_setup.h"
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <string.h>
+#  include <dlfcn.h>
+#  include <arpa/inet.h>
+#  include "thirdparty/apple/dnsinfo.h"
+#  include <SystemConfiguration/SCNetworkConfiguration.h>
+#  include "ares.h"
+#  include "ares_private.h"
+
+typedef struct {
+  void *handle;
+  dns_config_t *(*dns_configuration_copy)(void);
+  void (*dns_configuration_free)(dns_config_t *config);
+} dnsinfo_t;
+
+static void dnsinfo_destroy(dnsinfo_t *dnsinfo)
+{
+  if (dnsinfo == NULL) {
+    return;
+  }
+
+  if (dnsinfo->handle) {
+    dlclose(dnsinfo->handle);
+  }
+
+  ares_free(dnsinfo);
+}
+
+static ares_status_t dnsinfo_init(dnsinfo_t **dnsinfo_out)
+{
+  dnsinfo_t    *dnsinfo = NULL;
+  ares_status_t status  = ARES_SUCCESS;
+
+  if (dnsinfo_out == NULL) {
+    status = ARES_EFORMERR;
+    goto done;
+  }
+
+  *dnsinfo_out = NULL;
+
+  dnsinfo = ares_malloc_zero(sizeof(*dnsinfo));
+
+  if (dnsinfo == NULL) {
+    status = ARES_ENOMEM;
+    goto done;
+  }
+
+  dnsinfo->handle = dlopen("/usr/lib/libSystem.dylib", RTLD_LAZY | RTLD_NOLOAD);
+  if (dnsinfo->handle == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  dnsinfo->dns_configuration_copy =
+    dlsym(dnsinfo->handle, "dns_configuration_copy");
+  dnsinfo->dns_configuration_free =
+    dlsym(dnsinfo->handle, "dns_configuration_free");
+
+  if (dnsinfo->dns_configuration_copy == NULL ||
+      dnsinfo->dns_configuration_free == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+
+done:
+  if (status == ARES_SUCCESS) {
+    *dnsinfo_out = dnsinfo;
+  } else {
+    dnsinfo_destroy(dnsinfo);
+  }
+
+  return status;
+}
+
+static ares_bool_t search_is_duplicate(const ares_sysconfig_t *sysconfig,
+                                       const char             *name)
+{
+  size_t i;
+  for (i = 0; i < sysconfig->ndomains; i++) {
+    if (strcasecmp(sysconfig->domains[i], name) == 0) {
+      return ARES_TRUE;
+    }
+  }
+  return ARES_FALSE;
+}
+
+static ares_status_t read_resolver(const dns_resolver_t *resolver,
+                                   ares_sysconfig_t     *sysconfig)
+{
+  int            i;
+  unsigned short port   = 0;
+  ares_status_t  status = ARES_SUCCESS;
+
+  /* XXX: resolver->domain is for domain-specific servers.  When we implement
+   *      this support, we'll want to use this.  But for now, we're going to
+   *      skip any servers which set this since we can't properly route. */
+  if (resolver->domain != NULL) {
+    return ARES_SUCCESS;
+  }
+
+  /* Check to see if DNS server should be used, base this on if the server is
+   * reachable or can be reachable automatically if we send traffic that
+   * direction. */
+  if (!(resolver->reach_flags &
+        (kSCNetworkFlagsReachable |
+         kSCNetworkReachabilityFlagsConnectionOnTraffic))) {
+    return ARES_SUCCESS;
+  }
+
+  /* NOTE: it doesn't look like resolver->flags is relevant */
+
+  /* If there's no nameservers, nothing to do */
+  if (resolver->n_nameserver <= 0) {
+    return ARES_SUCCESS;
+  }
+
+  /* Default port */
+  port = resolver->port;
+
+  /* Append search list */
+  if (resolver->n_search > 0) {
+    char **new_domains = ares_realloc_zero(
+      sysconfig->domains, sizeof(*sysconfig->domains) * sysconfig->ndomains,
+      sizeof(*sysconfig->domains) *
+        (sysconfig->ndomains + (size_t)resolver->n_search));
+    if (new_domains == NULL) {
+      return ARES_ENOMEM;
+    }
+    sysconfig->domains = new_domains;
+
+    for (i = 0; i < resolver->n_search; i++) {
+      const char *search;
+      /* UBSAN: copy pointer using memcpy due to misalignment */
+      memcpy(&search, resolver->search + i, sizeof(search));
+
+      /* Skip duplicates */
+      if (search_is_duplicate(sysconfig, search)) {
+        continue;
+      }
+      sysconfig->domains[sysconfig->ndomains] = ares_strdup(search);
+      if (sysconfig->domains[sysconfig->ndomains] == NULL) {
+        return ARES_ENOMEM;
+      }
+      sysconfig->ndomains++;
+    }
+  }
+
+  /* NOTE: we're going to skip importing the sort addresses for now.  Its
+   *       likely not used, its not obvious how to even configure such a thing.
+   */
+#  if 0
+  for (i=0; i<resolver->n_sortaddr; i++) {
+    char val[256];
+    inet_ntop(AF_INET, &resolver->sortaddr[i]->address, val, sizeof(val));
+    printf("\t\t%s/", val);
+    inet_ntop(AF_INET, &resolver->sortaddr[i]->mask, val, sizeof(val));
+    printf("%s\n", val);
+  }
+#  endif
+
+  if (resolver->options != NULL) {
+    status = ares__sysconfig_set_options(sysconfig, resolver->options);
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+  }
+
+  /* NOTE:
+   *   - resolver->timeout appears unused, always 0, so we ignore this
+   *   - resolver->service_identifier doesn't appear relevant to us
+   *   - resolver->cid also isn't relevant
+   *   - resolver->if_index we don't need, if_name is used instead.
+   */
+
+  /* XXX: resolver->search_order appears like it might be relevant, we might
+   * need to sort the resulting list by this metric if we find in the future we
+   * need to.  That said, due to the automatic re-sorting we do, I'm not sure it
+   * matters.  Here's an article on this search order stuff:
+   *      https://www.cnet.com/tech/computing/os-x-10-6-3-and-dns-server-priority-changes/
+   */
+
+  for (i = 0; i < resolver->n_nameserver; i++) {
+    struct ares_addr       addr;
+    unsigned short         addrport;
+    const struct sockaddr *sockaddr;
+
+    /* UBSAN alignment workaround to fetch memory address */
+    memcpy(&sockaddr, resolver->nameserver + i, sizeof(sockaddr));
+
+    if (sockaddr->sa_family == AF_INET) {
+      /* NOTE: memcpy sockaddr_in due to alignment issues found by UBSAN due to
+       *       dnsinfo packing */
+      struct sockaddr_in addr_in;
+      memcpy(&addr_in, sockaddr, sizeof(addr_in));
+
+      addr.family = AF_INET;
+      memcpy(&addr.addr.addr4, &(addr_in.sin_addr), sizeof(addr.addr.addr4));
+      addrport = ntohs(addr_in.sin_port);
+    } else if (sockaddr->sa_family == AF_INET6) {
+      /* NOTE: memcpy sockaddr_in6 due to alignment issues found by UBSAN due to
+       *       dnsinfo packing */
+      struct sockaddr_in6 addr_in6;
+      memcpy(&addr_in6, sockaddr, sizeof(addr_in6));
+
+      addr.family = AF_INET6;
+      memcpy(&addr.addr.addr6, &(addr_in6.sin6_addr), sizeof(addr.addr.addr6));
+      addrport = ntohs(addr_in6.sin6_port);
+    } else {
+      continue;
+    }
+
+    if (addrport == 0) {
+      addrport = port;
+    }
+    status = ares__sconfig_append(&sysconfig->sconfig, &addr, addrport,
+                                  addrport, resolver->if_name);
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+  }
+
+  return status;
+}
+
+static ares_status_t read_resolvers(dns_resolver_t **resolvers, int nresolvers,
+                                    ares_sysconfig_t *sysconfig)
+{
+  ares_status_t status = ARES_SUCCESS;
+  int           i;
+
+  for (i = 0; status == ARES_SUCCESS && i < nresolvers; i++) {
+    const dns_resolver_t *resolver_ptr;
+    dns_resolver_t        resolver;
+
+    /* UBSAN doesn't like that this is unaligned, lets use memcpy to get the
+     * address.  Equivalent to:
+     *   resolver = resolvers[i]
+     */
+    memcpy(&resolver_ptr, resolvers + i, sizeof(resolver_ptr));
+
+    /* UBSAN. If the pointer is misaligned, try to use memcpy to get the data
+     * into a new structure that is hopefully aligned properly */
+    memcpy(&resolver, resolver_ptr, sizeof(resolver));
+    status = read_resolver(&resolver, sysconfig);
+  }
+
+  return status;
+}
+
+ares_status_t ares__init_sysconfig_macos(ares_sysconfig_t *sysconfig)
+{
+  dnsinfo_t    *dnsinfo = NULL;
+  dns_config_t *sc_dns  = NULL;
+  ares_status_t status  = ARES_SUCCESS;
+
+  status = dnsinfo_init(&dnsinfo);
+
+  if (status != ARES_SUCCESS) {
+    goto done;
+  }
+
+  sc_dns = dnsinfo->dns_configuration_copy();
+  if (sc_dns == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  /* There are `resolver`, `scoped_resolver`, and `service_specific_resolver`
+   * settings. The `scoped_resolver` settings appear to be already available via
+   * the `resolver` settings and likely are only relevant to link-local dns
+   * servers which we can already detect via the address itself, so we'll ignore
+   * the `scoped_resolver` section.  It isn't clear what the
+   * `service_specific_resolver` is used for, I haven't personally seen it
+   * in use so we'll ignore this until at some point where we find we need it.
+   * Likely this wasn't available via `/etc/resolv.conf` nor `libresolv` anyhow
+   * so its not worse to prior configuration methods, worst case. */
+
+  status = read_resolvers(sc_dns->resolver, sc_dns->n_resolver, sysconfig);
+
+done:
+  if (dnsinfo) {
+    dnsinfo->dns_configuration_free(sc_dns);
+    dnsinfo_destroy(dnsinfo);
+  }
+  return status;
+}
+
+
+#endif
diff --git a/contrib/libs/c-ares/src/lib/ares_timeout.c b/contrib/libs/c-ares/src/lib/ares_timeout.c
index 4e80580b5e0a..3acc66a87fe2 100644
--- a/contrib/libs/c-ares/src/lib/ares_timeout.c
+++ b/contrib/libs/c-ares/src/lib/ares_timeout.c
@@ -34,62 +34,88 @@
 #include "ares.h"
 #include "ares_private.h"
 
-void ares__timeval_remaining(struct timeval       *remaining,
-                             const struct timeval *now,
-                             const struct timeval *tout)
+void ares__timeval_remaining(ares_timeval_t       *remaining,
+                             const ares_timeval_t *now,
+                             const ares_timeval_t *tout)
 {
   memset(remaining, 0, sizeof(*remaining));
 
   /* Expired! */
-  if (tout->tv_sec < now->tv_sec ||
-      (tout->tv_sec == now->tv_sec && tout->tv_usec < now->tv_usec)) {
+  if (tout->sec < now->sec ||
+      (tout->sec == now->sec && tout->usec < now->usec)) {
     return;
   }
 
-  remaining->tv_sec = tout->tv_sec - now->tv_sec;
-  if (tout->tv_usec < now->tv_usec) {
-    remaining->tv_sec  -= 1;
-    remaining->tv_usec  = (tout->tv_usec + 1000000) - now->tv_usec;
+  remaining->sec = tout->sec - now->sec;
+  if (tout->usec < now->usec) {
+    remaining->sec  -= 1;
+    remaining->usec  = (tout->usec + 1000000) - now->usec;
   } else {
-    remaining->tv_usec = tout->tv_usec - now->tv_usec;
+    remaining->usec = tout->usec - now->usec;
   }
 }
 
-struct timeval *ares_timeout(ares_channel_t *channel, struct timeval *maxtv,
-                             struct timeval *tvbuf)
+static struct timeval ares_timeval_to_struct_timeval(const ares_timeval_t *atv)
+{
+  struct timeval tv;
+
+  tv.tv_sec  = (time_t)atv->sec;
+  tv.tv_usec = (int)atv->usec;
+
+  return tv;
+}
+
+static ares_timeval_t struct_timeval_to_ares_timeval(const struct timeval *tv)
+{
+  ares_timeval_t atv;
+
+  atv.sec  = (ares_int64_t)tv->tv_sec;
+  atv.usec = (unsigned int)tv->tv_usec;
+
+  return atv;
+}
+
+struct timeval *ares_timeout(const ares_channel_t *channel,
+                             struct timeval *maxtv, struct timeval *tvbuf)
 {
   const struct query *query;
   ares__slist_node_t *node;
-  struct timeval      now;
+  ares_timeval_t      now;
+  ares_timeval_t      atvbuf;
+  ares_timeval_t      amaxtv;
 
   /* The minimum timeout of all queries is always the first entry in
    * channel->queries_by_timeout */
   node = ares__slist_node_first(channel->queries_by_timeout);
   /* no queries/timeout */
   if (node == NULL) {
-    return maxtv; /* <-- maxtv can be null though, hrm */
+    return maxtv;
   }
 
   query = ares__slist_node_val(node);
 
   now = ares__tvnow();
 
-  ares__timeval_remaining(tvbuf, &now, &query->timeout);
+  ares__timeval_remaining(&atvbuf, &now, &query->timeout);
+
+  *tvbuf = ares_timeval_to_struct_timeval(&atvbuf);
 
   if (maxtv == NULL) {
     return tvbuf;
   }
 
   /* Return the minimum time between maxtv and tvbuf */
+  amaxtv = struct_timeval_to_ares_timeval(maxtv);
 
-  if (tvbuf->tv_sec > maxtv->tv_sec) {
+  if (atvbuf.sec > amaxtv.sec) {
     return maxtv;
   }
-  if (tvbuf->tv_sec < maxtv->tv_sec) {
+
+  if (atvbuf.sec < amaxtv.sec) {
     return tvbuf;
   }
 
-  if (tvbuf->tv_usec > maxtv->tv_usec) {
+  if (atvbuf.usec > amaxtv.usec) {
     return maxtv;
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_update_servers.c b/contrib/libs/c-ares/src/lib/ares_update_servers.c
index b8e26fcbae03..8075b1d1c0d3 100644
--- a/contrib/libs/c-ares/src/lib/ares_update_servers.c
+++ b/contrib/libs/c-ares/src/lib/ares_update_servers.c
@@ -167,13 +167,13 @@ static ares_bool_t ares_server_blacklisted(const struct ares_addr *addr)
     const unsigned char netbase[16];
     unsigned char       netmask;
   } blacklist_v6[] = {
-  /* fec0::/10 was deprecated by [RFC3879] in September 2004. Formerly a
-  * Site-Local scoped address prefix.  These are never valid DNS servers,
-  * but are known to be returned at least sometimes on Windows and Android.
-  */
-    {{ 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    /* fec0::/10 was deprecated by [RFC3879] in September 2004. Formerly a
+     * Site-Local scoped address prefix.  These are never valid DNS servers,
+     * but are known to be returned at least sometimes on Windows and Android.
+     */
+    { { 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00 },
-     10}
+     10 }
   };
 
   size_t i;
@@ -405,10 +405,16 @@ ares_status_t ares__sconfig_append(ares__llist_t         **sconfig,
   s->udp_port = udp_port;
   s->tcp_port = tcp_port;
 
-  /* Handle link-local enumeration */
-  if (ares_strlen(ll_iface) && ares__addr_is_linklocal(&s->addr)) {
+  /* Handle link-local enumeration. If an interface is specified on a
+   * non-link-local address, we'll simply end up ignoring that */
+  if (ares__addr_is_linklocal(&s->addr)) {
+    if (ares_strlen(ll_iface) == 0) {
+      /* Silently ignore this entry, we require an interface */
+      status = ARES_SUCCESS;
+      goto fail;
+    }
     status = ares__sconfig_linklocal(s, ll_iface);
-    /* Silently ignore this entry */
+    /* Silently ignore this entry, we can't validate the interface */
     if (status != ARES_SUCCESS) {
       status = ARES_SUCCESS;
       goto fail;
@@ -587,8 +593,8 @@ static ares_status_t ares__server_create(ares_channel_t       *channel,
   server->udp_port    = ares__sconfig_get_port(channel, sconfig, ARES_FALSE);
   server->tcp_port    = ares__sconfig_get_port(channel, sconfig, ARES_TRUE);
   server->addr.family = sconfig->addr.family;
-  server->next_retry_time.tv_sec = 0;
-  server->next_retry_time.tv_usec = 0;
+  server->next_retry_time.sec  = 0;
+  server->next_retry_time.usec = 0;
 
   if (sconfig->addr.family == AF_INET) {
     memcpy(&server->addr.addr.addr4, &sconfig->addr.addr.addr4,
@@ -665,10 +671,11 @@ static ares_bool_t ares__server_in_newconfig(const struct server_state *server,
   return ARES_FALSE;
 }
 
-static void ares__servers_remove_stale(ares_channel_t *channel,
-                                       ares__llist_t  *srvlist)
+static ares_bool_t ares__servers_remove_stale(ares_channel_t *channel,
+                                              ares__llist_t  *srvlist)
 {
-  ares__slist_node_t *snode = ares__slist_node_first(channel->servers);
+  ares_bool_t         stale_removed = ARES_FALSE;
+  ares__slist_node_t *snode         = ares__slist_node_first(channel->servers);
 
   while (snode != NULL) {
     ares__slist_node_t        *snext  = ares__slist_node_next(snode);
@@ -677,9 +684,11 @@ static void ares__servers_remove_stale(ares_channel_t *channel,
       /* This will clean up all server state via the destruction callback and
        * move any queries to new servers */
       ares__slist_node_destroy(snode);
+      stale_removed = ARES_TRUE;
     }
     snode = snext;
   }
+  return stale_removed;
 }
 
 static void ares__servers_trim_single(ares_channel_t *channel)
@@ -696,6 +705,7 @@ ares_status_t ares__servers_update(ares_channel_t *channel,
   ares__llist_node_t *node;
   size_t              idx = 0;
   ares_status_t       status;
+  ares_bool_t         list_changed = ARES_FALSE;
 
   if (channel == NULL) {
     return ARES_EFORMERR;
@@ -713,7 +723,7 @@ ares_status_t ares__servers_update(ares_channel_t *channel,
     const ares_sconfig_t *sconfig = ares__llist_node_val(node);
     ares__slist_node_t   *snode;
 
-    /* Don't add duplicate servers! */
+    /* If a server has already appeared in the list of new servers, skip it. */
     if (ares__server_isdup(channel, node)) {
       continue;
     }
@@ -741,13 +751,17 @@ ares_status_t ares__servers_update(ares_channel_t *channel,
       if (status != ARES_SUCCESS) {
         goto done;
       }
+
+      list_changed = ARES_TRUE;
     }
 
     idx++;
   }
 
   /* Remove any servers that don't exist in the current configuration */
-  ares__servers_remove_stale(channel, server_list);
+  if (ares__servers_remove_stale(channel, server_list)) {
+    list_changed = ARES_TRUE;
+  }
 
   /* Trim to one server if ARES_FLAG_PRIMARY is set. */
   if (channel->flags & ARES_FLAG_PRIMARY) {
@@ -759,8 +773,10 @@ ares_status_t ares__servers_update(ares_channel_t *channel,
     channel->optmask |= ARES_OPT_SERVERS;
   }
 
-  /* Clear any cached query results */
-  ares__qcache_flush(channel->qcache);
+  /* Clear any cached query results only if the server list changed */
+  if (list_changed) {
+    ares__qcache_flush(channel->qcache);
+  }
 
   status = ARES_SUCCESS;
 
@@ -910,7 +926,64 @@ ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
   return ARES_ENOMEM;
 }
 
-int ares_get_servers(ares_channel_t *channel, struct ares_addr_node **servers)
+/* Write out the details of a server to a buffer */
+ares_status_t ares_get_server_addr(const struct server_state *server,
+                                   ares__buf_t               *buf)
+{
+  ares_status_t status;
+  char          addr[INET6_ADDRSTRLEN];
+
+  /* ipv4addr or [ipv6addr] */
+  if (server->addr.family == AF_INET6) {
+    status = ares__buf_append_byte(buf, '[');
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+  }
+
+  ares_inet_ntop(server->addr.family, &server->addr.addr, addr, sizeof(addr));
+
+  status = ares__buf_append_str(buf, addr);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  if (server->addr.family == AF_INET6) {
+    status = ares__buf_append_byte(buf, ']');
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+  }
+
+  /* :port */
+  status = ares__buf_append_byte(buf, ':');
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  status = ares__buf_append_num_dec(buf, server->udp_port, 0);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* %iface */
+  if (ares_strlen(server->ll_iface)) {
+    status = ares__buf_append_byte(buf, '%');
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+
+    status = ares__buf_append_str(buf, server->ll_iface);
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+  }
+
+  return ARES_SUCCESS;
+}
+
+int ares_get_servers(const ares_channel_t   *channel,
+                     struct ares_addr_node **servers)
 {
   struct ares_addr_node *srvr_head = NULL;
   struct ares_addr_node *srvr_last = NULL;
@@ -964,7 +1037,7 @@ int ares_get_servers(ares_channel_t *channel, struct ares_addr_node **servers)
   return (int)status;
 }
 
-int ares_get_servers_ports(ares_channel_t              *channel,
+int ares_get_servers_ports(const ares_channel_t        *channel,
                            struct ares_addr_port_node **servers)
 {
   struct ares_addr_port_node *srvr_head = NULL;
@@ -1112,7 +1185,7 @@ int ares_set_servers_ports_csv(ares_channel_t *channel, const char *_csv)
   return (int)set_servers_csv(channel, _csv);
 }
 
-char *ares_get_servers_csv(ares_channel_t *channel)
+char *ares_get_servers_csv(const ares_channel_t *channel)
 {
   ares__buf_t        *buf = NULL;
   char               *out = NULL;
@@ -1129,7 +1202,6 @@ char *ares_get_servers_csv(ares_channel_t *channel)
        node = ares__slist_node_next(node)) {
     ares_status_t              status;
     const struct server_state *server = ares__slist_node_val(node);
-    char                       addr[64];
 
     if (ares__buf_len(buf)) {
       status = ares__buf_append_byte(buf, ',');
@@ -1138,51 +1210,10 @@ char *ares_get_servers_csv(ares_channel_t *channel)
       }
     }
 
-    /* ipv4addr or [ipv6addr] */
-    if (server->addr.family == AF_INET6) {
-      status = ares__buf_append_byte(buf, '[');
-      if (status != ARES_SUCCESS) {
-        goto done;
-      }
-    }
-
-    ares_inet_ntop(server->addr.family, &server->addr.addr, addr, sizeof(addr));
-
-    status = ares__buf_append_str(buf, addr);
-    if (status != ARES_SUCCESS) {
-      goto done;
-    }
-
-    if (server->addr.family == AF_INET6) {
-      status = ares__buf_append_byte(buf, ']');
-      if (status != ARES_SUCCESS) {
-        goto done;
-      }
-    }
-
-    /* :port */
-    status = ares__buf_append_byte(buf, ':');
-    if (status != ARES_SUCCESS) {
-      goto done;
-    }
-
-    status = ares__buf_append_num_dec(buf, server->udp_port, 0);
+    status = ares_get_server_addr(server, buf);
     if (status != ARES_SUCCESS) {
       goto done;
     }
-
-    /* %iface */
-    if (ares_strlen(server->ll_iface)) {
-      status = ares__buf_append_byte(buf, '%');
-      if (status != ARES_SUCCESS) {
-        goto done;
-      }
-
-      status = ares__buf_append_str(buf, server->ll_iface);
-      if (status != ARES_SUCCESS) {
-        goto done;
-      }
-    }
   }
 
   out = ares__buf_finish_str(buf, NULL);
@@ -1193,3 +1224,13 @@ char *ares_get_servers_csv(ares_channel_t *channel)
   ares__buf_destroy(buf);
   return out;
 }
+
+void ares_set_server_state_callback(ares_channel_t            *channel,
+                                    ares_server_state_callback cb, void *data)
+{
+  if (channel == NULL) {
+    return;
+  }
+  channel->server_state_cb      = cb;
+  channel->server_state_cb_data = data;
+}
diff --git a/contrib/libs/c-ares/src/lib/thirdparty/apple/README.md b/contrib/libs/c-ares/src/lib/thirdparty/apple/README.md
new file mode 100644
index 000000000000..e0915f4a431b
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/thirdparty/apple/README.md
@@ -0,0 +1,4 @@
+The `dnsinfo.h` header was extracted from Apple's OpenSource repository:
+[https://opensource.apple.com/source/configd/configd-1109.140.1/dnsinfo/dnsinfo.h](https://opensource.apple.com/source/configd/configd-1109.140.1/dnsinfo/dnsinfo.h)
+
+This is needed to call into `dns_configuration_copy()` and `dns_configuration_free()`.
diff --git a/contrib/libs/c-ares/src/lib/thirdparty/apple/dnsinfo.h b/contrib/libs/c-ares/src/lib/thirdparty/apple/dnsinfo.h
new file mode 100644
index 000000000000..d5a0e70e2f31
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/thirdparty/apple/dnsinfo.h
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2004-2006, 2008, 2009, 2011-2013, 2015-2018 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __DNSINFO_H__
+#define __DNSINFO_H__
+
+/*
+ * These routines provide access to the systems DNS configuration
+ */
+
+#include <os/availability.h>
+#include <sys/cdefs.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#define	DNSINFO_VERSION		20170629
+
+#define DEFAULT_SEARCH_ORDER    200000   /* search order for the "default" resolver domain name */
+
+#define	DNS_PTR(type, name)				\
+	union {						\
+		type		name;			\
+		uint64_t	_ ## name ## _p;	\
+	}
+
+#define	DNS_VAR(type, name)				\
+	type	name
+
+
+#pragma pack(4)
+typedef struct {
+	struct in_addr	address;
+	struct in_addr	mask;
+} dns_sortaddr_t;
+#pragma pack()
+
+
+#pragma pack(4)
+typedef struct {
+	DNS_PTR(char *,			domain);	/* domain */
+	DNS_VAR(int32_t,		n_nameserver);	/* # nameserver */
+	DNS_PTR(struct sockaddr **,	nameserver);
+	DNS_VAR(uint16_t,		port);		/* port (in host byte order) */
+	DNS_VAR(int32_t,		n_search);	/* # search */
+	DNS_PTR(char **,		search);
+	DNS_VAR(int32_t,		n_sortaddr);	/* # sortaddr */
+	DNS_PTR(dns_sortaddr_t **,	sortaddr);
+	DNS_PTR(char *,			options);	/* options */
+	DNS_VAR(uint32_t,		timeout);	/* timeout */
+	DNS_VAR(uint32_t,		search_order);	/* search_order */
+	DNS_VAR(uint32_t,		if_index);
+	DNS_VAR(uint32_t,		flags);
+	DNS_VAR(uint32_t,		reach_flags);	/* SCNetworkReachabilityFlags */
+	DNS_VAR(uint32_t,		service_identifier);
+	DNS_PTR(char *,			cid);		/* configuration identifer */
+	DNS_PTR(char *,			if_name);	/* if_index interface name */
+} dns_resolver_t;
+#pragma pack()
+
+
+#define DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS	0x0002		/* always requesting for A dns records in queries */
+#define DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS	0x0004		/* always requesting for AAAA dns records in queries */
+
+#define	DNS_RESOLVER_FLAGS_REQUEST_ALL_RECORDS	\
+	(DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS | DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS)
+
+#define DNS_RESOLVER_FLAGS_SCOPED		0x1000		/* configuration is for scoped questions */
+#define DNS_RESOLVER_FLAGS_SERVICE_SPECIFIC	0x2000		/* configuration is service-specific */
+#define DNS_RESOLVER_FLAGS_SUPPLEMENTAL		0x4000		/* supplemental match configuration */
+
+
+#pragma pack(4)
+typedef struct {
+	DNS_VAR(int32_t,		n_resolver);		/* resolver configurations */
+	DNS_PTR(dns_resolver_t **,	resolver);
+	DNS_VAR(int32_t,		n_scoped_resolver);	/* "scoped" resolver configurations */
+	DNS_PTR(dns_resolver_t **,	scoped_resolver);
+	DNS_VAR(uint64_t,		generation);
+	DNS_VAR(int32_t,		n_service_specific_resolver);
+	DNS_PTR(dns_resolver_t **,	service_specific_resolver);
+	DNS_VAR(uint32_t,		version);
+} dns_config_t;
+#pragma pack()
+
+
+__BEGIN_DECLS
+
+/*
+ * DNS configuration access APIs
+ */
+const char *
+dns_configuration_notify_key    (void)				API_AVAILABLE(macos(10.4), ios(2.0));
+
+dns_config_t *
+dns_configuration_copy		(void)				API_AVAILABLE(macos(10.4), ios(2.0));
+
+void
+dns_configuration_free		(dns_config_t	*config)	API_AVAILABLE(macos(10.4), ios(2.0));
+
+void
+_dns_configuration_ack		(dns_config_t	*config,
+				 const char	*bundle_id)	API_AVAILABLE(macos(10.8), ios(6.0));
+
+__END_DECLS
+
+#endif	/* __DNSINFO_H__ */
diff --git a/contrib/libs/c-ares/ya.make b/contrib/libs/c-ares/ya.make
index 30d390111a89..7850b6718587 100644
--- a/contrib/libs/c-ares/ya.make
+++ b/contrib/libs/c-ares/ya.make
@@ -3,6 +3,7 @@
 LIBRARY()
 
 LICENSE(
+    APSL-2.0 AND
     BSD-3-Clause AND
     ISC AND
     MIT AND
@@ -11,9 +12,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(1.28.1)
+VERSION(1.30.0)
 
-ORIGINAL_SOURCE(https://github.com/c-ares/c-ares/archive/cares-1_28_1.tar.gz)
+ORIGINAL_SOURCE(https://github.com/c-ares/c-ares/archive/v1.30.0.tar.gz)
 
 PEERDIR(
     contrib/libs/libc_compat
@@ -56,6 +57,7 @@ SRCS(
     src/lib/ares__htable_asvp.c
     src/lib/ares__htable_strvp.c
     src/lib/ares__htable_szvp.c
+    src/lib/ares__htable_vpvp.c
     src/lib/ares__iface_ips.c
     src/lib/ares__llist.c
     src/lib/ares__parse_into_addrinfo.c
@@ -74,6 +76,7 @@ SRCS(
     src/lib/ares_dns_parse.c
     src/lib/ares_dns_record.c
     src/lib/ares_dns_write.c
+    src/lib/ares_event_configchg.c
     src/lib/ares_event_epoll.c
     src/lib/ares_event_kqueue.c
     src/lib/ares_event_poll.c
@@ -121,6 +124,7 @@ SRCS(
     src/lib/ares_strsplit.c
     src/lib/ares_sysconfig.c
     src/lib/ares_sysconfig_files.c
+    src/lib/ares_sysconfig_mac.c
     src/lib/ares_timeout.c
     src/lib/ares_update_servers.c
     src/lib/ares_version.c

From 0dc3baade9c1b37ef1ee3d79451234c02fe64ced Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Mon, 5 Aug 2024 11:19:25 +0300
Subject: [PATCH 049/104] Intermediate changes

---
 contrib/libs/cxxsupp/libcxxmsvc/include/string      | 3 ++-
 contrib/libs/cxxsupp/libcxxmsvc/include/string_view | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/libs/cxxsupp/libcxxmsvc/include/string b/contrib/libs/cxxsupp/libcxxmsvc/include/string
index a1bfff1f6a25..4e4bb8646467 100644
--- a/contrib/libs/cxxsupp/libcxxmsvc/include/string
+++ b/contrib/libs/cxxsupp/libcxxmsvc/include/string
@@ -534,6 +534,7 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++1
 #include <initializer_list>
 #include <iosfwd>
 #include <iterator>
+#include <limits>
 #include <memory>
 #include <stdexcept>
 #include <string_view>
@@ -772,7 +773,7 @@ private:
 
 public:
     _LIBCPP_TEMPLATE_DATA_VIS
-    static const size_type npos = -1;
+    static const size_type npos = numeric_limits<size_type>::max();
 
     _LIBCPP_INLINE_VISIBILITY basic_string()
         _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
diff --git a/contrib/libs/cxxsupp/libcxxmsvc/include/string_view b/contrib/libs/cxxsupp/libcxxmsvc/include/string_view
index 81d8c8a2b7d8..a55ea4ede364 100644
--- a/contrib/libs/cxxsupp/libcxxmsvc/include/string_view
+++ b/contrib/libs/cxxsupp/libcxxmsvc/include/string_view
@@ -264,7 +264,7 @@ public:
     typedef const_reverse_iterator                     reverse_iterator;
     typedef size_t                                     size_type;
     typedef ptrdiff_t                                  difference_type;
-    static _LIBCPP_CONSTEXPR const size_type npos = -1; // size_type(-1);
+    static _LIBCPP_CONSTEXPR const size_type npos = numeric_limits<size_type>::max(); // size_type(-1);
 
     static_assert((!is_array<value_type>::value), "Character type of basic_string_view must not be an array");
     static_assert(( is_standard_layout<value_type>::value), "Character type of basic_string_view must be standard-layout");

From 8ead472243985333d15c527eb0d998468dc716e1 Mon Sep 17 00:00:00 2001
From: babenko <babenko@yandex-team.com>
Date: Mon, 5 Aug 2024 11:53:01 +0300
Subject: [PATCH 050/104] YT-22466: Be more relaxed about current discovery
 session being null fca5afbf70755c6d683865aebea713b32e5fa795

---
 yt/yt/core/rpc/dynamic_channel_pool.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/yt/yt/core/rpc/dynamic_channel_pool.cpp b/yt/yt/core/rpc/dynamic_channel_pool.cpp
index 61bd8ba9c44d..6581b3080f19 100644
--- a/yt/yt/core/rpc/dynamic_channel_pool.cpp
+++ b/yt/yt/core/rpc/dynamic_channel_pool.cpp
@@ -666,12 +666,12 @@ class TDynamicChannelPool::TImpl
         TDiscoverySessionPtr session;
         {
             auto guard = ReaderGuard(SpinLock_);
-
-            YT_VERIFY(CurrentDiscoverySession_);
             session = CurrentDiscoverySession_;
         }
 
-        session->Run();
+        if (session) {
+            session->Run();
+        }
     }
 
     void OnDiscoverySessionFinished(const TError& globalDiscoveryError)
@@ -680,8 +680,6 @@ class TDynamicChannelPool::TImpl
         auto guard = WriterGuard(SpinLock_);
 
         LastGlobalDiscoveryError_ = globalDiscoveryError;
-
-        YT_VERIFY(CurrentDiscoverySession_);
         CurrentDiscoverySession_.Reset();
 
         TDelayedExecutor::CancelAndClear(RediscoveryCookie_);

From acf04c75cb52f804ce76b16c356611268be3daf3 Mon Sep 17 00:00:00 2001
From: d-dima <d-dima@yandex-team.com>
Date: Mon, 5 Aug 2024 13:19:22 +0300
Subject: [PATCH 051/104] Allow to read Nan/Inf values from JSON

Allow to read Nan/Inf values from JSON
9fbb79a21d81cf178abc89cd11d7ac75a9a4aaed
---
 library/cpp/json/json_reader.cpp           |  7 ++++++
 library/cpp/json/json_reader.h             |  3 +++
 library/cpp/json/ut/json_reader_nan_ut.cpp | 29 ++++++++++++++++++++++
 library/cpp/json/ut/ya.make                |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 library/cpp/json/ut/json_reader_nan_ut.cpp

diff --git a/library/cpp/json/json_reader.cpp b/library/cpp/json/json_reader.cpp
index 0d048dfcd1ed..a1a9584481f7 100644
--- a/library/cpp/json/json_reader.cpp
+++ b/library/cpp/json/json_reader.cpp
@@ -336,6 +336,9 @@ namespace NJson {
         constexpr ui32 ConvertToRapidJsonFlags(ui8 flags) {
             ui32 rapidjsonFlags = rapidjson::kParseNoFlags;
 
+            if (flags & ReaderConfigFlags::NANINF) {
+                rapidjsonFlags |= rapidjson::kParseNanAndInfFlag;
+            }
             if (flags & ReaderConfigFlags::ITERATIVE) {
                 rapidjsonFlags |= rapidjson::kParseIterativeFlag;
             }
@@ -371,6 +374,7 @@ namespace NJson {
         ); \
     }
 
+            TRY_EXTRACT_FLAG(ReaderConfigFlags::NANINF);
             TRY_EXTRACT_FLAG(ReaderConfigFlags::ITERATIVE);
             TRY_EXTRACT_FLAG(ReaderConfigFlags::COMMENTS);
             TRY_EXTRACT_FLAG(ReaderConfigFlags::VALIDATE);
@@ -405,6 +409,9 @@ namespace NJson {
             if (config.AllowEscapedApostrophe) {
                 flags |= ReaderConfigFlags::ESCAPE;
             }
+            if (config.AllowReadNanInf) {
+                flags |= ReaderConfigFlags::NANINF;
+            }
 
             return ReadWithRuntimeFlags(flags, reader, is, handler);
         }
diff --git a/library/cpp/json/json_reader.h b/library/cpp/json/json_reader.h
index 6c8e8c32e2a0..373a390085ea 100644
--- a/library/cpp/json/json_reader.h
+++ b/library/cpp/json/json_reader.h
@@ -20,6 +20,8 @@ namespace NJson {
         bool AllowComments = false;
         bool DontValidateUtf8 = false;
         bool AllowEscapedApostrophe = false;
+        // Allow to read Nan and Inf as integer values
+        bool AllowReadNanInf = false;
 
         ui64 MaxDepth = 0;
 
@@ -48,6 +50,7 @@ namespace NJson {
     bool ReadJson(IInputStream* in, const TJsonReaderConfig* config, TJsonCallbacks* callbacks);
 
     enum ReaderConfigFlags {
+        NANINF = 0b10000,
         ITERATIVE = 0b1000,
         COMMENTS = 0b0100,
         VALIDATE = 0b0010,
diff --git a/library/cpp/json/ut/json_reader_nan_ut.cpp b/library/cpp/json/ut/json_reader_nan_ut.cpp
new file mode 100644
index 000000000000..fdd66249eb25
--- /dev/null
+++ b/library/cpp/json/ut/json_reader_nan_ut.cpp
@@ -0,0 +1,29 @@
+#include <library/cpp/json/json_reader.h>
+#include <library/cpp/testing/unittest/registar.h>
+
+using namespace NJson;
+
+namespace {
+
+constexpr TStringBuf JSON_NAN_TEST = "{ \"Value1\": 0.0, \"Value2\": 1, \"Value3\": NaN }";
+
+}
+
+Y_UNIT_TEST_SUITE(TJsonReaderNanTest) {
+    Y_UNIT_TEST(WithoutNanTest) {
+        TJsonReaderConfig cfg;
+        TJsonValue out;
+        // This read will fail
+        UNIT_ASSERT(!ReadJsonTree(JSON_NAN_TEST, &cfg, &out, /* throwOnError */ false));
+
+    }
+    Y_UNIT_TEST(WithNanTest) {
+        TJsonReaderConfig cfg;
+        cfg.AllowReadNanInf = true;
+
+        TJsonValue out;
+        // This read will ok
+        UNIT_ASSERT(ReadJsonTree(JSON_NAN_TEST, &cfg, &out, /* throwOnError */ false));
+    }
+}
+
diff --git a/library/cpp/json/ut/ya.make b/library/cpp/json/ut/ya.make
index 2ed6ccb9f0bf..89363ddd6afb 100644
--- a/library/cpp/json/ut/ya.make
+++ b/library/cpp/json/ut/ya.make
@@ -8,6 +8,7 @@ PEERDIR(
 SRCS(
     json_reader_fast_ut.cpp
     json_reader_ut.cpp
+    json_reader_nan_ut.cpp
     json_prettifier_ut.cpp
     json_writer_ut.cpp
     json_saveload_ut.cpp

From 636037ad08e5e0ea28bb4f7eaa1d8bc414c3a038 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Mon, 5 Aug 2024 14:45:45 +0300
Subject: [PATCH 052/104] Intermediate changes

---
 contrib/libs/cxxsupp/libcxxmsvc/include/bitset | 2 +-
 contrib/python/certifi/py2/ya.make             | 2 ++
 contrib/python/certifi/py3/ya.make             | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/libs/cxxsupp/libcxxmsvc/include/bitset b/contrib/libs/cxxsupp/libcxxmsvc/include/bitset
index d5c42991d9f4..c85a280fdfb5 100644
--- a/contrib/libs/cxxsupp/libcxxmsvc/include/bitset
+++ b/contrib/libs/cxxsupp/libcxxmsvc/include/bitset
@@ -387,7 +387,7 @@ __bitset<_N_words, _Size>::to_ullong(true_type, true_type) const
 {
     unsigned long long __r = __first_[0];
     for (size_t __i = 1; __i < sizeof(unsigned long long) / sizeof(__storage_type); ++__i)
-        __r |= static_cast<unsigned long long>(__first_[__i]) << (sizeof(__storage_type) * CHAR_BIT);
+        __r |= static_cast<unsigned long long>(__first_[__i]) << (sizeof(__storage_type) * CHAR_BIT * __i);
     return __r;
 }
 
diff --git a/contrib/python/certifi/py2/ya.make b/contrib/python/certifi/py2/ya.make
index 274da44efc03..27aa0018f466 100644
--- a/contrib/python/certifi/py2/ya.make
+++ b/contrib/python/certifi/py2/ya.make
@@ -2,6 +2,8 @@ PY2_LIBRARY()
 
 LICENSE(Service-Py23-Proxy)
 
+VERSION(Service-no-external-sources)
+
 PEERDIR(
     library/python/certifi
 )
diff --git a/contrib/python/certifi/py3/ya.make b/contrib/python/certifi/py3/ya.make
index fa3aa2c9d010..e841bd82d54d 100644
--- a/contrib/python/certifi/py3/ya.make
+++ b/contrib/python/certifi/py3/ya.make
@@ -2,6 +2,8 @@ PY3_LIBRARY()
 
 LICENSE(Service-Py23-Proxy)
 
+VERSION(Service-no-external-sources)
+
 PEERDIR(
     library/python/certifi
 )

From a3f104c22b12182c435e7a95ed013d116380a566 Mon Sep 17 00:00:00 2001
From: v-korovin <v-korovin@yandex-team.com>
Date: Mon, 5 Aug 2024 14:45:47 +0300
Subject: [PATCH 053/104] Revert commit rXXXXXX, Automatic release build for
 test_tool, ya_bin, os_ya, os_test_tool
 bd6d2de454e042fee933838154a729a28c1cc282

---
 build/mapping.conf.json                      |  4 ----
 build/platform/test_tool/host.ya.make.inc    | 10 +++++-----
 build/platform/test_tool/host_os.ya.make.inc | 10 +++++-----
 ya                                           | 20 ++++++++++----------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index e4a928185829..20ebdd49791f 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -351,8 +351,6 @@
         "6733663069": "https://devtools-registry.s3.yandex.net/6733663069",
         "6761602592": "https://devtools-registry.s3.yandex.net/6761602592",
         "6761604639": "https://devtools-registry.s3.yandex.net/6761604639",
-        "6806306613": "https://devtools-registry.s3.yandex.net/6806306613",
-        "6806306627": "https://devtools-registry.s3.yandex.net/6806306627",
         "5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
         "5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
         "5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -1088,8 +1086,6 @@
         "6733663069": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6761602592": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6761604639": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
-        "6806306613": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
-        "6806306627": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc
index ba5adea13db9..9f76ce6d3eed 100644
--- a/build/platform/test_tool/host.ya.make.inc
+++ b/build/platform/test_tool/host.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306122)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603811)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806305772)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603407)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306627)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761604639)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806305594)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603045)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306344)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761604252)
 
 ENDIF()
diff --git a/build/platform/test_tool/host_os.ya.make.inc b/build/platform/test_tool/host_os.ya.make.inc
index 43b926c1814a..b80ee3059ca8 100644
--- a/build/platform/test_tool/host_os.ya.make.inc
+++ b/build/platform/test_tool/host_os.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306169)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601964)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806305813)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601833)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306613)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761602592)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806305649)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601614)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6806306371)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761602256)
 
 ENDIF()
diff --git a/ya b/ya
index 70a92a438f57..57b5ea81ab66 100755
--- a/ya
+++ b/ya
@@ -39,33 +39,33 @@ REGISTRY_ENDPOINT = os.environ.get("YA_REGISTRY_ENDPOINT", "https://devtools-reg
 PLATFORM_MAP = {
     "data": {
         "darwin": {
-            "md5": "cd778a12cd93b085137f3e30b25008ae",
+            "md5": "0fde66aa3d2eedca282b89f27dc498fb",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6806300256"
+                f"{REGISTRY_ENDPOINT}/6761606505"
             ]
         },
         "darwin-arm64": {
-            "md5": "9cd59726b1d7ebad262faf6589c59de8",
+            "md5": "d87f182ed40f1be37c1c3b271c83669c",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6806299955"
+                f"{REGISTRY_ENDPOINT}/6761606258"
             ]
         },
         "linux-aarch64": {
-            "md5": "1aa452b20c9c553f0e2d915b8096e5a1",
+            "md5": "e3555221b30ffb2f992012fb0dd21587",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6806299806"
+                f"{REGISTRY_ENDPOINT}/6761606102"
             ]
         },
         "win32-clang-cl": {
-            "md5": "b3ec7606223ca2c88e448d5cd8b03b1d",
+            "md5": "0dc634d2325ed6edc9d79f4daf61bca8",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6806300365"
+                f"{REGISTRY_ENDPOINT}/6761606645"
             ]
         },
         "linux": {
-            "md5": "4fd058322f65a5f31887c1207ca4424e",
+            "md5": "a1f742755f8fb41fe2dcc521bff6fe95",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6806300480"
+                f"{REGISTRY_ENDPOINT}/6761606901"
             ]
         }
     }

From 5213b839c544c58f58131b48686406008788c7b5 Mon Sep 17 00:00:00 2001
From: arkady-e1ppa <arkady-e1ppa@yandex-team.com>
Date: Mon, 5 Aug 2024 14:51:09 +0300
Subject: [PATCH 054/104] YT-22212: Better logs in throttlers
 16f9acd778a1e2782e6c0b967b0c01096f3f59be

---
 yt/yt/core/concurrency/fair_throttler.cpp     |  6 +++-
 .../core/concurrency/throughput_throttler.cpp | 34 +++++++++++++------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/yt/yt/core/concurrency/fair_throttler.cpp b/yt/yt/core/concurrency/fair_throttler.cpp
index 12e78b5ad47b..3899c949e7fc 100644
--- a/yt/yt/core/concurrency/fair_throttler.cpp
+++ b/yt/yt/core/concurrency/fair_throttler.cpp
@@ -261,6 +261,7 @@ struct TBucketThrottleRequest
     TPromise<void> Promise = NewPromise<void>();
     std::atomic<bool> Cancelled = false;
     NProfiling::TCpuInstant StartTime = NProfiling::GetCpuInstant();
+    TGuid RequestId = TGuid::Create();
 
     void Cancel(const TError& /*error*/)
     {
@@ -371,7 +372,10 @@ class TBucketThrottler
         request->Promise.OnCanceled(BIND(&TBucketThrottleRequest::Cancel, MakeWeak(request)));
         request->Promise.ToFuture().Subscribe(BIND(&TBucketThrottler::OnRequestComplete, MakeWeak(this), amount));
 
-        YT_LOG_DEBUG("Started waiting for throttler (Amount: %v)", amount);
+        YT_LOG_DEBUG(
+            "Started waiting for throttler (Amount: %v, RequestId: %v)",
+            amount,
+            request->RequestId);
 
         auto guard = Guard(Lock_);
         Queue_.push_back(request);
diff --git a/yt/yt/core/concurrency/throughput_throttler.cpp b/yt/yt/core/concurrency/throughput_throttler.cpp
index 0503dbf4f61c..70a41ff07f37 100644
--- a/yt/yt/core/concurrency/throughput_throttler.cpp
+++ b/yt/yt/core/concurrency/throughput_throttler.cpp
@@ -306,15 +306,21 @@ class TReconfigurableThroughputThrottler
         }
 
         // Enqueue request to be executed later.
-        YT_LOG_DEBUG("Started waiting for throttler (Amount: %v)", amount);
         auto promise = NewPromise<void>();
         auto request = New<TThrottlerRequest>(amount);
         request->TraceContext = NTracing::CreateTraceContextFromCurrent("Throttler");
+
+        YT_LOG_DEBUG(
+            "Started waiting for throttler (Amount: %v, RequestTraceId: %v)",
+            amount,
+            request->TraceContext->GetTraceId());
+
         promise.OnCanceled(BIND([weakRequest = MakeWeak(request), amount, this, this_ = MakeStrong(this)] (const TError& error) {
             auto request = weakRequest.Lock();
             if (request && !request->Set.test_and_set()) {
                 NTracing::TTraceContextFinishGuard guard(std::move(request->TraceContext));
-                YT_LOG_DEBUG("Canceled waiting for throttler (Amount: %v)",
+                YT_LOG_DEBUG(
+                    "Canceled waiting for throttler (Amount: %v)",
                     amount);
                 request->Promise.Set(TError(NYT::EErrorCode::Canceled, "Throttled request canceled")
                     << error);
@@ -472,7 +478,8 @@ class TReconfigurableThroughputThrottler
                 NTracing::TTraceContextGuard traceGuard(std::move(request->TraceContext));
 
                 auto waitTime = NProfiling::CpuDurationToDuration(NProfiling::GetCpuInstant() - request->StartTime);
-                YT_LOG_DEBUG("Finished waiting for throttler (Amount: %v, WaitTime: %v)",
+                YT_LOG_DEBUG(
+                    "Finished waiting for throttler (Amount: %v, WaitTime: %v)",
                     request->Amount,
                     waitTime);
 
@@ -872,7 +879,8 @@ class TPrefetchingThrottler
             IncomingRequests_.emplace_back(TIncomingRequest{amount, promise, incomingRequestId});
         }
 
-        YT_LOG_DEBUG("Enqueued a request to the prefetching throttler (Id: %v, Amount: %v)",
+        YT_LOG_DEBUG(
+            "Enqueued a request to the prefetching throttler (Id: %v, Amount: %v)",
             incomingRequestId,
             amount);
 
@@ -956,7 +964,8 @@ class TPrefetchingThrottler
             Available_ += amount;
         }
 
-        YT_LOG_DEBUG("Released from prefetching throttler (Amount: %v)",
+        YT_LOG_DEBUG(
+            "Released from prefetching throttler (Amount: %v)",
             amount);
     }
 
@@ -1142,7 +1151,8 @@ class TPrefetchingThrottler
             prefetchAmount = PrefetchAmount_;
         }
 
-        YT_LOG_DEBUG("Request to the underlying throttler (Id: %v, UnderlyingAmount: %v, Balance: %v, Prefetch: %v, IncomingRps: %v, UnderlyingRps: %v)",
+        YT_LOG_DEBUG(
+            "Request to the underlying throttler (Id: %v, UnderlyingAmount: %v, Balance: %v, Prefetch: %v, IncomingRps: %v, UnderlyingRps: %v)",
             underlyingRequestId,
             underlyingAmount,
             balance,
@@ -1184,7 +1194,8 @@ class TPrefetchingThrottler
         }
         PrefetchAmount_ = std::clamp(PrefetchAmount_, Config_->MinPrefetchAmount, Config_->MaxPrefetchAmount);
 
-        YT_LOG_DEBUG("Recalculate the amount to prefetch from the underlying throttler (RequestsInWindow: %v, Window: %v, UnderlyingRps: %v, TargetRps: %v, PrefetchAmount: %v)",
+        YT_LOG_DEBUG(
+            "Recalculate the amount to prefetch from the underlying throttler (RequestsInWindow: %v, Window: %v, UnderlyingRps: %v, TargetRps: %v, PrefetchAmount: %v)",
             UnderlyingRequests_.size(),
             Config_->Window,
             underlyingRps,
@@ -1195,7 +1206,8 @@ class TPrefetchingThrottler
     //! Handles a response from the underlying throttler.
     void OnThrottlingResponse(i64 available, i64 id, const TError& error)
     {
-        YT_LOG_DEBUG("Response from the underlying throttler (Id: %v, Amount: %v, Result: %v)",
+        YT_LOG_DEBUG(
+            "Response from the underlying throttler (Id: %v, Amount: %v, Result: %v)",
             id,
             available,
             error.IsOK());
@@ -1241,7 +1253,8 @@ class TPrefetchingThrottler
             // a recursive call to #SatisfyIncomingRequests when the corresponding #promise is set.
             // So that #promise should be set without holding the #Lock_.
             auto result = request.Promise.TrySet();
-            YT_LOG_DEBUG("Sent the response for the incoming request (Id: %v, Amount: %v, Result: %v)",
+            YT_LOG_DEBUG(
+                "Sent the response for the incoming request (Id: %v, Amount: %v, Result: %v)",
                 request.Id,
                 request.Amount,
                 result);
@@ -1269,7 +1282,8 @@ class TPrefetchingThrottler
 
         for (auto& request : fulfilled) {
             request.Promise.Set(error);
-            YT_LOG_DEBUG("Dropped the incoming request (Id: %v, Amount: %v)",
+            YT_LOG_DEBUG(
+                "Dropped the incoming request (Id: %v, Amount: %v)",
                 request.Id,
                 request.Amount);
         }

From ba067423626788072ca641cc3ff96a0cad543c53 Mon Sep 17 00:00:00 2001
From: pazus <pazus@yandex-team.com>
Date: Mon, 5 Aug 2024 19:44:05 +0300
Subject: [PATCH 055/104] Fix "build/scripts/desc_rawproto_wrapper.py"
 b21b7e0155944e115b76a8530fd6da0687eb5c65

---
 build/scripts/desc_rawproto_wrapper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/scripts/desc_rawproto_wrapper.py b/build/scripts/desc_rawproto_wrapper.py
index 94dd90fd3ff2..a6f67d675e79 100644
--- a/build/scripts/desc_rawproto_wrapper.py
+++ b/build/scripts/desc_rawproto_wrapper.py
@@ -21,7 +21,7 @@ def main(args):
 
     try:
         subprocess.run(cmd, stdin=None, stderr=subprocess.STDOUT, text=True, check=True)
-    except subrocess.CalledProcessError as e:
+    except subprocess.CalledProcessError as e:
         sys.stderr.write(f'{e.cmd} returned non-zero exit code {e.returncode}.\n{e.output}\n')
         return e.returncode
 

From cbf77b7170f0718ae8fb9330567a99fca2293d0c Mon Sep 17 00:00:00 2001
From: miripiruni <miripiruni@yandex-team.com>
Date: Mon, 5 Aug 2024 21:23:20 +0300
Subject: [PATCH 056/104] =?UTF-8?q?conf:=20=D1=80=D0=B0=D1=81=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D0=B4=D0=BE=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

issue: https://st.yandex-team.ru/
462a9a825049ade39a9a4bc1f50b3e3f72c4ded5
---
 build/conf/ts/ts.conf         |  6 ++++++
 build/conf/ts/ts_next.conf    | 12 ++++++++---
 build/conf/ts/ts_package.conf |  3 +++
 build/conf/ts/ts_test.conf    | 39 +++++++++++++++++++++++++++++++++--
 build/conf/ts/ts_tsc.conf     |  2 ++
 build/conf/ts/ts_vite.conf    |  7 +++++++
 build/conf/ts/ts_webpack.conf |  6 ++++++
 7 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf
index 4fb763242b17..47c1aebd2fc4 100644
--- a/build/conf/ts/ts.conf
+++ b/build/conf/ts/ts.conf
@@ -16,6 +16,8 @@ TS_CONFIG_PATH=tsconfig.json
 ### Macro sets the path for "TypeScript Config".
 ###
 ### - ConfigPath - config path (one at least)
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-config
 macro TS_CONFIG(FirstConfigPath, ConfigPath...) {
     SET(TS_CONFIG_PATH $FirstConfigPath $ConfigPath)
 }
@@ -59,6 +61,8 @@ TS_GLOB_EXCLUDE_ADDITIONAL=
 ### These files won't be copied to BINDIR.
 ###
 ### - GlobExpression - glob expression
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-exclude-files-glob
 macro TS_EXCLUDE_FILES_GLOB(GlobExpression) {
   SET(TS_GLOB_EXCLUDE_ADDITIONAL $GlobExpression)
 }
@@ -99,6 +103,8 @@ ESLINT_CONFIG_PATH=.eslintrc.js
 ### Macro sets the path for ESLint config file.
 ###
 ### - ConfigPath - config path
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-eslint-config
 macro TS_ESLINT_CONFIG(ConfigName) {
   SET(ESLINT_CONFIG_PATH $ConfigName)
 }
diff --git a/build/conf/ts/ts_next.conf b/build/conf/ts/ts_next.conf
index fa3cddd63143..db25950527a9 100644
--- a/build/conf/ts/ts_next.conf
+++ b/build/conf/ts/ts_next.conf
@@ -4,7 +4,9 @@ TS_NEXT_CONFIG_PATH=next.config.js
 ###
 ### Macro sets the config path for TS_NEXT module.
 ###
-### - ConfigPath - config path
+### - ConfigPath - config path. Default value: next.config.js
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT#ts-next-config
 macro TS_NEXT_CONFIG(ConfigPath) {
     SET(TS_NEXT_CONFIG_PATH $ConfigPath)
 }
@@ -16,7 +18,9 @@ TS_NEXT_OUTPUT_DIR=.next
 ###
 ### Macro sets the output directory name for TS_NEXT module.
 ###
-### - DirName - output directory name
+### - DirName - output directory name. Default value: .next.
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT#ts-next-output
 macro TS_NEXT_OUTPUT(DirName) {
     SET(TS_NEXT_OUTPUT_DIR $DirName)
 }
@@ -32,12 +36,14 @@ TS_NEXT_CMD=$TOUCH_UNIT \
     ${output;hide:"package.json"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_NXT"}
 
-### @usage: TS_NEXT()
+### @usage: TS_NEXT([name])
 ###
 ### NextJS app, built with `next build`. Requires sources to be under /src folder.
 ### /pages and /app on the root level ar not supported.
 ### Build results are output.tar.
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT
+###
 ### @example
 ###
 ###     TS_NEXT()
diff --git a/build/conf/ts/ts_package.conf b/build/conf/ts/ts_package.conf
index b93ac6216af1..76abb4f8530d 100644
--- a/build/conf/ts/ts_package.conf
+++ b/build/conf/ts/ts_package.conf
@@ -5,6 +5,7 @@ TS_PACK=$TOUCH_UNIT \
     && $_TS_FILES_COPY_CMD \
     ${kv;hide:"p TS_PKG"} ${kv;hide:"pc magenta"}
 
+### # internal
 macro _TS_PACKAGE_EPILOGUE() {
   _TS_PACKAGE_CHECK_FILES()
 }
@@ -15,6 +16,8 @@ macro _TS_PACKAGE_EPILOGUE() {
 ### and is just a set of files and NPM dependencies. List required files in TS_FILES macro.
 ### `package.json` is included by default.
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_PACKAGE
+###
 ### @example
 ###
 ###     TS_PACKAGE()
diff --git a/build/conf/ts/ts_test.conf b/build/conf/ts/ts_test.conf
index b4b1fc740a16..19bcfcc6cc30 100644
--- a/build/conf/ts/ts_test.conf
+++ b/build/conf/ts/ts_test.conf
@@ -19,6 +19,8 @@ TS_TEST_JEST_CMD=$TOUCH_UNIT \
 ###
 ### Defines testing module with jest test runner.
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_TEST_JEST_FOR
+###
 ### @example
 ###
 ###     TS_TEST_JEST_FOR(path/to/module)
@@ -52,6 +54,8 @@ TS_TEST_HERMIONE_CMD=$TOUCH_UNIT \
 ###
 ### Defines testing module with hermione test runner.
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_TEST_HERMIONE_FOR
+###
 ### @example
 ###
 ###     TS_TEST_HERMIONE_FOR(path/to/module)
@@ -84,6 +88,8 @@ TS_TEST_PLAYWRIGHT_CMD=$TOUCH_UNIT \
 ###
 ### Defines testing module with playwright test runner.
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_TEST_PLAYWRIGHT_FOR
+###
 ### @example
 ###
 ###     TS_TEST_PLAYWRIGHT_FOR(path/to/module)
@@ -107,6 +113,7 @@ module TS_TEST_PLAYWRIGHT_FOR: _TS_TEST_BASE {
     _TS_TEST_FOR_CONFIGURE(playwright playwright.config.ts workspace_node_modules.tar)
 }
 
+### # internal
 module _TS_TEST_BASE: _BARE_UNIT {
     # ignore SRCS macro
     .ALIASES=SRCS=_NOOP_MACRO
@@ -160,6 +167,8 @@ macro _SETUP_INSTALL_NODE_MODULES_RECIPE() {
 ### Macro sets the path to configuration file of the test runner.
 ###
 ### - Path - path to the config file.
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-test-config
 macro TS_TEST_CONFIG(Path) {
     SET(TS_TEST_CONFIG_PATH $Path)
 }
@@ -172,6 +181,8 @@ _TS_TEST_EXTRA_SRCS_VALUE=
 ### Macro to define directories where the test source files should be located.
 ###
 ### - DIRS... - directories.
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-test-srcs
 macro TS_TEST_SRCS(DIRS...) {
     _GLOB(_TS_TEST_SRCS_VALUE ${suf=/**/*.$TS_TEST_EXTENSION:DIRS})
     SRCS($_TS_TEST_SRCS_VALUE)
@@ -217,18 +228,42 @@ macro NO_TS_TYPECHECK() {
     SET(_TS_TYPECHECK_VALUE none)
 }
 
+### @usage: TS_TYPECHECK(tsconfigFile)
+###
+### For check CSS, SASS, LESS for StyleLint. Must be inside of Module (TS_WEBPACK, TS_VITE, TS_NEXT, etc)
+###
+###    - tsconfigFile - by default tsconfig.json or value from TS_CONFIG macros.
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-typecheck
+###
+### @example:
+###
+###     TS_VITE()
+###         TS_TYPECHECK()
+###     END()
 macro TS_TYPECHECK(TS_CONFG="") {
     ENABLE(_TS_TYPECHECK_VALUE)
     SET(_TS_TYPECHECK_TSCONFIG $TS_CONFG)
 }
 
-
 # TS_STYLELINT
-
 _TS_STYLELINT_VALUE=no
 _TS_STYLELINT_CONFIG=
 _TS_STYLELINT_FILES=
 
+### @usage: TS_STYLELINT(configFile)
+###
+### For check CSS, SASS, LESS for StyleLint. Must be inside of Module (TS_WEBPACK, TS_VITE, TS_NEXT, etc)
+###
+###    - configFile - by default .stylelintrc.
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-stylelint
+###
+### @example:
+###
+###     TS_VITE()
+###         TS_STYLELINT(.stylelintrc)
+###     END()
 macro TS_STYLELINT(_CONFIG) {
     ENABLE(_TS_STYLELINT_VALUE)
     SET(_TS_STYLELINT_CONFIG $_CONFIG)
diff --git a/build/conf/ts/ts_tsc.conf b/build/conf/ts/ts_tsc.conf
index 2052a99ee111..7dd51b29acdb 100644
--- a/build/conf/ts/ts_tsc.conf
+++ b/build/conf/ts/ts_tsc.conf
@@ -11,6 +11,8 @@ TS_TSC_CMD=$TOUCH_UNIT \
 ### The TypeScript/JavaScript library module, compiles TypeScript sources to JavaScript using tsc.
 ### Build results are JavaScript files, typings and source mappings (depending on local tsconfig.json settings).
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_TSC
+###
 ### @example
 ###
 ###     TS_TSC()
diff --git a/build/conf/ts/ts_vite.conf b/build/conf/ts/ts_vite.conf
index 14c04950174d..ca6ff048f91f 100644
--- a/build/conf/ts/ts_vite.conf
+++ b/build/conf/ts/ts_vite.conf
@@ -5,6 +5,8 @@ VITE_CONFIG_PATH=vite.config.ts
 ### Macro sets the config path for TS_VITE module.
 ###
 ### - ConfigPath - config path
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_VITE#ts-vite-config
 macro TS_VITE_CONFIG(ConfigPath) {
     SET(VITE_CONFIG_PATH $ConfigPath)
 }
@@ -17,10 +19,13 @@ VITE_OUTPUT_DIR=dist
 ### Macro sets the output directory name for TS_VITE module.
 ###
 ### - DirName - output directory name
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_VITE#ts-vite-output
 macro TS_VITE_OUTPUT(DirName) {
     SET(VITE_OUTPUT_DIR $DirName)
 }
 
+# TODO: remove me: https://st.yandex-team.ru/FBP-1678
 # tag:deprecated
 macro VITE_OUTPUT(DirName) {
     MESSAGE(WARNING "VITE_OUTPUT is deprecated, use TS_VITE_OUTPUT instead")
@@ -44,6 +49,8 @@ TS_VITE_CMD=$TOUCH_UNIT \
 ### The Vite bundle, bundles JavaScript code.
 ### Build results are packed as `output.tar`.
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_VITE
+###
 ### @example
 ###
 ###     TS_VITE()
diff --git a/build/conf/ts/ts_webpack.conf b/build/conf/ts/ts_webpack.conf
index 04eaf2421bc3..6cea71c0e3ea 100644
--- a/build/conf/ts/ts_webpack.conf
+++ b/build/conf/ts/ts_webpack.conf
@@ -5,6 +5,8 @@ WEBPACK_CONFIG_PATH=webpack.config.js
 ### Macro sets the config path for TS_WEBPACK module.
 ###
 ### - ConfigPath - config path
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_WEBPACK#ts-webpack-config
 macro TS_WEBPACK_CONFIG(ConfigPath) {
     SET(WEBPACK_CONFIG_PATH $ConfigPath)
 }
@@ -16,10 +18,12 @@ WEBPACK_OUTPUT_DIR=bundle
 ### Macro sets the output directory names (one at least) for TS_WEBPACK module.
 ###
 ### - DirNames - output directory names (one at least)
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_WEBPACK#ts-webpack-output
 macro TS_WEBPACK_OUTPUT(FirstDirName, DirNames...) {
     SET(WEBPACK_OUTPUT_DIR $FirstDirName $DirNames)
 }
 
+# TODO: remove me: https://st.yandex-team.ru/FBP-1678
 # tag:deprecated
 macro WEBPACK_OUTPUT(FirstDirName, DirNames...) {
     MESSAGE(WARNING "WEBPACK_OUTPUT is deprecated, use TS_WEBPACK_OUTPUT instead")
@@ -42,6 +46,8 @@ TS_WEBPACK_CMD=$TOUCH_UNIT \
 ### The Webpack bundle, bundles JavaScript code.
 ### Build results are packed as `output.tar`.
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_WEBPACK
+###
 ### @example
 ###
 ###     TS_WEBPACK()

From 7e4871a90ed022841bf02fc2908d005f51c6b53b Mon Sep 17 00:00:00 2001
From: somov <somov@yandex-team.com>
Date: Mon, 5 Aug 2024 21:27:50 +0300
Subject: [PATCH 057/104] Revert "collect .proto files by PROTO_DESCRIPTIONS"

Revert "collect .proto files by PROTO_DESCRIPTIONS"
This reverts commit 1b642fbbf446d68522225c9794b993dc4ba3760e, reversing
changes made to d98cd239c58371f81606a07ed034bdd4fe047d64.

Revert "Fix "build/scripts/desc_rawproto_wrapper.py""
This reverts commit b21b7e0155944e115b76a8530fd6da0687eb5c65, reversing
changes made to 186fa4c81699cea84cb35c15c7cc050ccff602fa.
3f211d58faacd2ac500331707f54d065c4be088c
---
 build/conf/proto.conf                  | 13 ++++-----
 build/scripts/collect_rawproto.py      | 37 ------------------------
 build/scripts/desc_rawproto_wrapper.py | 34 ----------------------
 build/scripts/merge_files.py           |  4 +--
 build/scripts/merge_protosrc.py        | 39 --------------------------
 5 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 build/scripts/collect_rawproto.py
 delete mode 100644 build/scripts/desc_rawproto_wrapper.py
 delete mode 100644 build/scripts/merge_protosrc.py

diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 6bacb350e0a2..89870fbe19b6 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -639,12 +639,12 @@ macro LIST_PROTO(TO="files.proto", Files...) {
 }
 
 # tag:proto
-macro _PROTO_DESC_RAWPROTO_CMD(File) {
-    .CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${output;norel;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${input;rootrel:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}
+macro _PROTO_DESC_CMD(File) {
+    .CMD=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --descriptor_set_out=${output;suf=.desc:File} --include_source_info $_PROTOC_FLAGS ${input;rootrel:File} ${hide:PROTO_FAKEID}
 }
 
-_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET ${ext=.desc:AUTO_INPUT} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/collect_rawproto.py"} --output ${output;suf=.protosrc:REALPRJNAME} ${rootrel;ext=.rawproto:AUTO_INPUT}
-_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL}  ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/merge_protosrc.py"} --output ${output;suf=.tar:REALPRJNAME} ${rootrel:PEERS}
+_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $AUTO_INPUT ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
+_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL}  ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
 
 NEED_GOOGLE_PROTO_PEERDIRS=yes
 
@@ -807,7 +807,7 @@ multimodule PROTO_LIBRARY {
     module DESC_PROTO: _BARE_UNIT {
         .CMD=_PROTO_DESC_MERGE_CMD
         .SEM=IGNORED
-        .EXTS=.desc .rawproto
+        .EXTS=.desc
         .NODE_TYPE=Library
         .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
         .ALIASES=SRCS=_SRCS_NO_GLOBAL
@@ -817,7 +817,6 @@ multimodule PROTO_LIBRARY {
         DISABLE(_NEED_SBOM_INFO)
         MODULE_SUFFIX=.self.protodesc
         SET(MODULE_TYPE LIBRARY)
-        SET(_MODDIR_HASH ${hash:MODDIR})
 
         _EVLOG_CMDLINE=$_PROTO_DESC_CMDLINE
         _PROTO_CMDLINE=$_PROTO_DESC_CMDLINE
@@ -871,6 +870,6 @@ _CPP_PROTO_EVLOG_CMDLINE=$_CPP_PROTO_EVLOG_CMD($SRC)
 _CPP_VANILLA_PROTO_CMDLINE=$_CPP_VANILLA_PROTO_CMD($SRC)
 _JAVA_EVLOG_CMDLINE=$_JAVA_EVLOG_CMD($SRC)
 _JAVA_PROTO_CMDLINE=$_JAVA_PROTO_CMD($SRC)
-_PROTO_DESC_CMDLINE=$_PROTO_DESC_RAWPROTO_CMD($SRC)
+_PROTO_DESC_CMDLINE=$_PROTO_DESC_CMD($SRC)
 _PY_EVLOG_CMDLINE=$_PY_EVLOG_CMD($SRC)
 _PY_PROTO_CMDLINE=$_PY_PROTO_CMD($SRC)
diff --git a/build/scripts/collect_rawproto.py b/build/scripts/collect_rawproto.py
deleted file mode 100644
index 92086b4f7734..000000000000
--- a/build/scripts/collect_rawproto.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import argparse
-import os
-import tarfile
-import stat
-import sys
-
-
-def parse_args():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--output', required=True)
-    parser.add_argument('args', nargs='*')
-    return parser.parse_args()
-
-
-def main(args):
-    rawprotos = args.args
-    with tarfile.open(args.output, 'w') as fout:
-        for rawproto in sorted(os.path.normpath(r).replace('\\', '/') for r in rawprotos):
-            assert rawproto.endswith('.rawproto')
-            arcname = os.path.splitext(rawproto[:-len('.rawproto')])[0]
-            with open(rawproto, 'rb') as fin:
-                tarinfo = fout.gettarinfo(rawproto, arcname)
-                tarinfo.mode = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH if tarinfo.mode | stat.S_IXUSR else 0
-                tarinfo.mode = (
-                    tarinfo.mode | stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP | stat.S_IROTH
-                )
-                tarinfo.mtime = 0
-                tarinfo.uid = 0
-                tarinfo.gid = 0
-                tarinfo.uname = 'dummy'
-                tarinfo.gname = 'dummy'
-                fout.addfile(tarinfo, fin)
-    return 0
-
-
-if __name__ == '__main__':
-    sys.exit(main(parse_args()))
diff --git a/build/scripts/desc_rawproto_wrapper.py b/build/scripts/desc_rawproto_wrapper.py
deleted file mode 100644
index a6f67d675e79..000000000000
--- a/build/scripts/desc_rawproto_wrapper.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import argparse
-import shutil
-import subprocess
-import sys
-
-
-def parse_args():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--desc-output', required=True)
-    parser.add_argument('--rawproto-output', required=True)
-    parser.add_argument('--proto-file', required=True)
-    parser.add_argument('args', nargs='+')
-
-    return parser.parse_args()
-
-
-def main(args):
-    cmd = list(args.args)
-    cmd.append(f'--descriptor_set_out={args.desc_output}')
-    cmd.append(args.proto_file)
-
-    try:
-        subprocess.run(cmd, stdin=None, stderr=subprocess.STDOUT, text=True, check=True)
-    except subprocess.CalledProcessError as e:
-        sys.stderr.write(f'{e.cmd} returned non-zero exit code {e.returncode}.\n{e.output}\n')
-        return e.returncode
-
-    shutil.copyfile(args.proto_file, args.rawproto_output)
-
-    return 0
-
-
-if __name__ == '__main__':
-    sys.exit(main(parse_args()))
diff --git a/build/scripts/merge_files.py b/build/scripts/merge_files.py
index 7d52a56f0f0b..d42d6a21392f 100644
--- a/build/scripts/merge_files.py
+++ b/build/scripts/merge_files.py
@@ -2,7 +2,7 @@
 
 
 if __name__ == "__main__":
-    with open(sys.argv[1], "wb") as f:
+    with open(sys.argv[1], "w") as f:
         for appended in sys.argv[2:]:
-            with open(appended, "rb") as a:
+            with open(appended) as a:
                 f.write(a.read())
diff --git a/build/scripts/merge_protosrc.py b/build/scripts/merge_protosrc.py
deleted file mode 100644
index 55e44c9063a4..000000000000
--- a/build/scripts/merge_protosrc.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import argparse
-import os
-import tarfile
-import sys
-
-
-def parse_args():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--output', required=True)
-    parser.add_argument('args', nargs='+')
-    return parser.parse_args()
-
-
-def main(args):
-    peers = args.args
-
-    compression_mode = ''
-    if args.output.endswith(('.tar.gz', '.tgz')):
-        compression_mode = 'gz'
-    elif args.output.endswith('.bzip2'):
-        compression_mode = 'bz2'
-
-    files = set()
-    with tarfile.open(args.output, f'w:{compression_mode}') as dest:
-        for psrc in [p[:-len('.self.protodesc')]+'.protosrc' for p in peers if p.endswith('.self.protodesc')]:
-            with tarfile.open(psrc, 'r') as src:
-                for tarinfo in [m for m in src.getmembers() if m.name != '']:
-                    if tarinfo.name in files:
-                        continue
-                    files.add(tarinfo.name)
-                    if tarinfo.isdir():
-                        dest.addfile(tarinfo)
-                    else:
-                        dest.addfile(tarinfo, src.extractfile(tarinfo))
-    return 0
-
-
-if __name__ == '__main__':
-    sys.exit(main(parse_args()))

From fd63b546ecde6050e2aa37e80163612446d56ff4 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Tue, 6 Aug 2024 05:41:38 +0300
Subject: [PATCH 058/104] Intermediate changes

---
 .../threading/future/core/coroutine_traits.h  | 58 ++++++++++++++-----
 .../future/ut_gtest/coroutine_traits_ut.cpp   | 18 ++++++
 2 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/library/cpp/threading/future/core/coroutine_traits.h b/library/cpp/threading/future/core/coroutine_traits.h
index f032190fb1ba..cdd3eeeff3e7 100644
--- a/library/cpp/threading/future/core/coroutine_traits.h
+++ b/library/cpp/threading/future/core/coroutine_traits.h
@@ -4,7 +4,7 @@
 
 #include <coroutine>
 
-template<typename... Args>
+template <typename... Args>
 struct std::coroutine_traits<NThreading::TFuture<void>, Args...> {
     struct promise_type {
 
@@ -28,7 +28,7 @@ struct std::coroutine_traits<NThreading::TFuture<void>, Args...> {
     };
 };
 
-template<typename T, typename... Args>
+template <typename T, typename... Args>
 struct std::coroutine_traits<NThreading::TFuture<T>, Args...> {
     struct promise_type {
         NThreading::TFuture<T> get_return_object() {
@@ -53,11 +53,16 @@ struct std::coroutine_traits<NThreading::TFuture<T>, Args...> {
 
 namespace NThreading {
 
-    template<typename T>
+    template <typename T, bool Extracting = false>
     struct TFutureAwaitable {
         NThreading::TFuture<T> Future;
 
-        TFutureAwaitable(NThreading::TFuture<T> future) noexcept
+        TFutureAwaitable(const NThreading::TFuture<T>& future) noexcept requires (!Extracting)
+            : Future{future}
+        {
+        }
+
+        TFutureAwaitable(NThreading::TFuture<T>&& future) noexcept
             : Future{std::move(future)}
         {
         }
@@ -68,12 +73,12 @@ namespace NThreading {
 
         void await_suspend(auto h) noexcept {
             /*
-             * This library assumes that resume never throws an exception.
-             * This assumption is made due to the fact that the users of these library in most cases do not need to write their own coroutine handlers,
-             * and all coroutine handlers provided by the library do not throw exception from resume.
-             *
-             * WARNING: do not change subscribe to apply or something other here, creating an extra future state degrades performance.
-             */
+            * This library assumes that resume never throws an exception.
+            * This assumption is made due to the fact that the users of these library in most cases do not need to write their own coroutine handlers,
+            * and all coroutine handlers provided by the library do not throw exception from resume.
+            *
+            * WARNING: do not change subscribe to apply or something other here, creating an extra future state degrades performance.
+            */
             Future.NoexceptSubscribe(
                 [h](auto) mutable noexcept {
                     h();
@@ -82,22 +87,43 @@ namespace NThreading {
         }
 
         decltype(auto) await_resume() {
-            return Future.GetValue();
+            if constexpr (Extracting && !std::is_same_v<T, void>) {  // Future<void> has only GetValue()
+                return Future.ExtractValue();
+            } else {
+                return Future.GetValue();
+            }
         }
     };
 
+    template <typename T>
+    using TExtractingFutureAwaitable = TFutureAwaitable<T, true>;
+
 } // namespace NThreading
 
-template<typename T>
-auto operator co_await(const NThreading::TFuture<T>& future) {
+template <typename T>
+auto operator co_await(const NThreading::TFuture<T>& future) noexcept {
     return NThreading::TFutureAwaitable{future};
 }
 
+template <typename T>
+auto operator co_await(NThreading::TFuture<T>&& future) noexcept {
+    // Not TExtractongFutureAwaitable, because TFuture works like std::shared_future.
+    // auto value = co_await GetCachedFuture();
+    // If GetCachedFuture stores a future in some cache and returns its copies,
+    // then subsequent uses of co_await will return a moved-from value.
+    return NThreading::TFutureAwaitable{std::move(future)};
+}
+
 namespace NThreading {
 
-    template<typename T>
-    auto AsAwaitable(const NThreading::TFuture<T>& fut) {
-        return operator co_await(fut);
+    template <typename T>
+    auto AsAwaitable(const NThreading::TFuture<T>& fut) noexcept {
+        return TFutureAwaitable(fut);
+    }
+
+    template <typename T>
+    auto AsExtractingAwaitable(NThreading::TFuture<T>&& fut) noexcept {
+        return TExtractingFutureAwaitable<T>(std::move(fut));
     }
 
 } // namespace NThreading
diff --git a/library/cpp/threading/future/ut_gtest/coroutine_traits_ut.cpp b/library/cpp/threading/future/ut_gtest/coroutine_traits_ut.cpp
index a98e455c583e..2daa1f5e47ac 100644
--- a/library/cpp/threading/future/ut_gtest/coroutine_traits_ut.cpp
+++ b/library/cpp/threading/future/ut_gtest/coroutine_traits_ut.cpp
@@ -187,3 +187,21 @@ TEST(TestFutureTraits, CrashOnExceptionInCoroutineHandlerResume) {
 #endif
     );
 }
+
+TEST(ExtractingFutureAwaitable, Simple) {
+    NThreading::TPromise<THolder<size_t>> suspendPromise = NThreading::NewPromise<THolder<size_t>>();
+    auto coro = [](NThreading::TFuture<THolder<size_t>> future) -> NThreading::TFuture<THolder<size_t>> {
+        auto value = co_await NThreading::AsExtractingAwaitable(std::move(future));
+        co_return value;
+    };
+
+    NThreading::TFuture<THolder<size_t>> getHolder = coro(suspendPromise.GetFuture());
+    EXPECT_FALSE(getHolder.HasValue());
+    EXPECT_FALSE(getHolder.HasException());
+    suspendPromise.SetValue(MakeHolder<size_t>(42));
+
+    EXPECT_TRUE(getHolder.HasValue());
+    auto holder = getHolder.ExtractValue();
+    ASSERT_NE(holder, nullptr);
+    EXPECT_EQ(*holder, 42u);
+}

From 754c5c17faf3622b414edc5ec8d61df214a4fa2c Mon Sep 17 00:00:00 2001
From: robot-ya-builder <robot-ya-builder@yandex-team.com>
Date: Tue, 6 Aug 2024 07:05:12 +0300
Subject: [PATCH 059/104] Automatic release build for ymake, os_ymake

From hash: [9d2fca88fd5844e2ce26874be35a78070c5f0652](https://a.yandex-team.ru/arcadia/commit/9d2fca88fd5844e2ce26874be35a78070c5f0652)
From revision: [14563702](https://a.yandex-team.ru/arcadia/commit/rXXXXXX)
[CI flow](https://a.yandex-team.ru/projects/ya_make/ci/releases/flow?dir=devtools%2Fya&id=release-ymake&version=214)
Flow triggered by user: [svidyuk](https://staff.yandex-team.ru/svidyuk)

Update tools: ymake, os_ymake
6784d84d70c158f0eb443cfb9088e7ac71d6fef7
---
 build/external_resources/ymake/public.resources.json | 10 +++++-----
 build/external_resources/ymake/resources.json        | 10 +++++-----
 build/mapping.conf.json                              | 10 ++++++++++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/build/external_resources/ymake/public.resources.json b/build/external_resources/ymake/public.resources.json
index 2b8e1738df2c..d78dd3577ae1 100644
--- a/build/external_resources/ymake/public.resources.json
+++ b/build/external_resources/ymake/public.resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:6758526969"
+            "uri": "sbr:6810222813"
         },
         "darwin-arm64": {
-            "uri": "sbr:6758526691"
+            "uri": "sbr:6810222474"
         },
         "linux": {
-            "uri": "sbr:6758527904"
+            "uri": "sbr:6810223737"
         },
         "linux-aarch64": {
-            "uri": "sbr:6758526355"
+            "uri": "sbr:6810222156"
         },
         "win32-clang-cl": {
-            "uri": "sbr:6758527388"
+            "uri": "sbr:6810223259"
         }
     }
 }
diff --git a/build/external_resources/ymake/resources.json b/build/external_resources/ymake/resources.json
index 3d3944630d3d..0008b28220e1 100644
--- a/build/external_resources/ymake/resources.json
+++ b/build/external_resources/ymake/resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:6758513717"
+            "uri": "sbr:6810214859"
         },
         "darwin-arm64": {
-            "uri": "sbr:6758513019"
+            "uri": "sbr:6810214480"
         },
         "linux": {
-            "uri": "sbr:6758515488"
+            "uri": "sbr:6810215412"
         },
         "linux-aarch64": {
-            "uri": "sbr:6758512085"
+            "uri": "sbr:6810214095"
         },
         "win32-clang-cl": {
-            "uri": "sbr:6758514612"
+            "uri": "sbr:6810215119"
         }
     }
 }
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 20ebdd49791f..f368473ab43f 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -486,6 +486,7 @@
         "6639828525": "https://devtools-registry.s3.yandex.net/6639828525",
         "6715755432": "https://devtools-registry.s3.yandex.net/6715755432",
         "6758526969": "https://devtools-registry.s3.yandex.net/6758526969",
+        "6810222813": "https://devtools-registry.s3.yandex.net/6810222813",
         "5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
         "5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
         "5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -514,6 +515,7 @@
         "6639826777": "https://devtools-registry.s3.yandex.net/6639826777",
         "6715754419": "https://devtools-registry.s3.yandex.net/6715754419",
         "6758526691": "https://devtools-registry.s3.yandex.net/6758526691",
+        "6810222474": "https://devtools-registry.s3.yandex.net/6810222474",
         "5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
         "5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
         "5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -542,6 +544,7 @@
         "6639832402": "https://devtools-registry.s3.yandex.net/6639832402",
         "6715757753": "https://devtools-registry.s3.yandex.net/6715757753",
         "6758527904": "https://devtools-registry.s3.yandex.net/6758527904",
+        "6810223737": "https://devtools-registry.s3.yandex.net/6810223737",
         "5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
         "5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
         "5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -570,6 +573,7 @@
         "6639824710": "https://devtools-registry.s3.yandex.net/6639824710",
         "6715753858": "https://devtools-registry.s3.yandex.net/6715753858",
         "6758526355": "https://devtools-registry.s3.yandex.net/6758526355",
+        "6810222156": "https://devtools-registry.s3.yandex.net/6810222156",
         "5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
         "5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
         "5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -598,6 +602,7 @@
         "6639830383": "https://devtools-registry.s3.yandex.net/6639830383",
         "6715756641": "https://devtools-registry.s3.yandex.net/6715756641",
         "6758527388": "https://devtools-registry.s3.yandex.net/6758527388",
+        "6810223259": "https://devtools-registry.s3.yandex.net/6810223259",
         "4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
         "5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
         "4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -1221,6 +1226,7 @@
         "6639828525": "devtools/ymake/bin/ymake for darwin",
         "6715755432": "devtools/ymake/bin/ymake for darwin",
         "6758526969": "devtools/ymake/bin/ymake for darwin",
+        "6810222813": "devtools/ymake/bin/ymake for darwin",
         "5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
         "5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
         "5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1249,6 +1255,7 @@
         "6639826777": "devtools/ymake/bin/ymake for darwin-arm64",
         "6715754419": "devtools/ymake/bin/ymake for darwin-arm64",
         "6758526691": "devtools/ymake/bin/ymake for darwin-arm64",
+        "6810222474": "devtools/ymake/bin/ymake for darwin-arm64",
         "5766173070": "devtools/ymake/bin/ymake for linux",
         "5805432830": "devtools/ymake/bin/ymake for linux",
         "5829031598": "devtools/ymake/bin/ymake for linux",
@@ -1277,6 +1284,7 @@
         "6639832402": "devtools/ymake/bin/ymake for linux",
         "6715757753": "devtools/ymake/bin/ymake for linux",
         "6758527904": "devtools/ymake/bin/ymake for linux",
+        "6810223737": "devtools/ymake/bin/ymake for linux",
         "5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
         "5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
         "5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -1305,6 +1313,7 @@
         "6639824710": "devtools/ymake/bin/ymake for linux-aarch64",
         "6715753858": "devtools/ymake/bin/ymake for linux-aarch64",
         "6758526355": "devtools/ymake/bin/ymake for linux-aarch64",
+        "6810222156": "devtools/ymake/bin/ymake for linux-aarch64",
         "5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
         "5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
         "5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -1333,6 +1342,7 @@
         "6639830383": "devtools/ymake/bin/ymake for win32-clang-cl",
         "6715756641": "devtools/ymake/bin/ymake for win32-clang-cl",
         "6758527388": "devtools/ymake/bin/ymake for win32-clang-cl",
+        "6810223259": "devtools/ymake/bin/ymake for win32-clang-cl",
         "4307890075": "flake8_linter for linux",
         "5517245192": "flake8_linter for linux",
         "4307901240": "flake8_linter for linux-aarch64",

From 957f0c255bd884c03bf673d354346180583537bb Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Tue, 6 Aug 2024 08:17:05 +0300
Subject: [PATCH 060/104] Intermediate changes

---
 contrib/python/hypothesis/py3/.dist-info/METADATA   | 10 +++++-----
 .../hypothesis/py3/_hypothesis_pytestplugin.py      |  6 ++----
 .../hypothesis/internal/conjecture/junkdrawer.py    |  6 +++++-
 .../python/hypothesis/py3/hypothesis/reporting.py   | 13 ++-----------
 contrib/python/hypothesis/py3/hypothesis/version.py |  2 +-
 contrib/python/hypothesis/py3/ya.make               |  2 +-
 .../python/pytest-lazy-fixtures/.dist-info/METADATA |  2 +-
 .../pytest_lazy_fixtures/normalizer.py              |  7 ++++---
 contrib/python/pytest-lazy-fixtures/ya.make         |  2 +-
 9 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/contrib/python/hypothesis/py3/.dist-info/METADATA b/contrib/python/hypothesis/py3/.dist-info/METADATA
index ffee48a82f07..223aafcb6948 100644
--- a/contrib/python/hypothesis/py3/.dist-info/METADATA
+++ b/contrib/python/hypothesis/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hypothesis
-Version: 6.108.2
+Version: 6.108.4
 Summary: A library for property-based testing
 Home-page: https://hypothesis.works
 Author: David R. MacIver and Zac Hatfield-Dodds
@@ -41,10 +41,10 @@ Requires-Dist: exceptiongroup >=1.0.0 ; python_version < "3.11"
 Provides-Extra: all
 Requires-Dist: black >=19.10b0 ; extra == 'all'
 Requires-Dist: click >=7.0 ; extra == 'all'
-Requires-Dist: crosshair-tool >=0.0.61 ; extra == 'all'
+Requires-Dist: crosshair-tool >=0.0.63 ; extra == 'all'
 Requires-Dist: django >=3.2 ; extra == 'all'
 Requires-Dist: dpcontracts >=0.4 ; extra == 'all'
-Requires-Dist: hypothesis-crosshair >=0.0.7 ; extra == 'all'
+Requires-Dist: hypothesis-crosshair >=0.0.9 ; extra == 'all'
 Requires-Dist: lark >=0.10.1 ; extra == 'all'
 Requires-Dist: libcst >=0.3.16 ; extra == 'all'
 Requires-Dist: numpy >=1.17.3 ; extra == 'all'
@@ -63,8 +63,8 @@ Requires-Dist: rich >=9.0.0 ; extra == 'cli'
 Provides-Extra: codemods
 Requires-Dist: libcst >=0.3.16 ; extra == 'codemods'
 Provides-Extra: crosshair
-Requires-Dist: hypothesis-crosshair >=0.0.7 ; extra == 'crosshair'
-Requires-Dist: crosshair-tool >=0.0.61 ; extra == 'crosshair'
+Requires-Dist: hypothesis-crosshair >=0.0.9 ; extra == 'crosshair'
+Requires-Dist: crosshair-tool >=0.0.63 ; extra == 'crosshair'
 Provides-Extra: dateutil
 Requires-Dist: python-dateutil >=1.4 ; extra == 'dateutil'
 Provides-Extra: django
diff --git a/contrib/python/hypothesis/py3/_hypothesis_pytestplugin.py b/contrib/python/hypothesis/py3/_hypothesis_pytestplugin.py
index e82b528bb535..9df7817c68c3 100644
--- a/contrib/python/hypothesis/py3/_hypothesis_pytestplugin.py
+++ b/contrib/python/hypothesis/py3/_hypothesis_pytestplugin.py
@@ -309,7 +309,7 @@ def note_statistics(stats):
                     with current_pytest_item.with_value(item):
                         yield
             if store.results:
-                item.hypothesis_report_information = list(store.results)
+                item.hypothesis_report_information = "\n".join(store.results)
 
     def _stash_get(config, key, default):
         if hasattr(config, "stash"):
@@ -325,9 +325,7 @@ def _stash_get(config, key, default):
     def pytest_runtest_makereport(item, call):
         report = (yield).get_result()
         if hasattr(item, "hypothesis_report_information"):
-            report.sections.append(
-                ("Hypothesis", "\n".join(item.hypothesis_report_information))
-            )
+            report.sections.append(("Hypothesis", item.hypothesis_report_information))
         if report.when != "teardown":
             return
 
diff --git a/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/junkdrawer.py b/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/junkdrawer.py
index 7dbab5b97173..4465f59e5c45 100644
--- a/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/junkdrawer.py
+++ b/contrib/python/hypothesis/py3/hypothesis/internal/conjecture/junkdrawer.py
@@ -421,6 +421,10 @@ def find(self, condition: Callable[[T], bool]) -> T:
 _gc_start = 0
 _gc_cumulative_time = 0
 
+# Since gc_callback potentially runs in test context, and perf_counter
+# might be monkeypatched, we store a reference to the real one.
+_perf_counter = time.perf_counter
+
 
 def gc_cumulative_time() -> float:
     global _gc_initialized
@@ -430,7 +434,7 @@ def gc_cumulative_time() -> float:
             def gc_callback(phase, info):
                 global _gc_start, _gc_cumulative_time
                 try:
-                    now = time.perf_counter()
+                    now = _perf_counter()
                     if phase == "start":
                         _gc_start = now
                     elif phase == "stop" and _gc_start > 0:
diff --git a/contrib/python/hypothesis/py3/hypothesis/reporting.py b/contrib/python/hypothesis/py3/hypothesis/reporting.py
index a0f300b2bcb3..19073c5aff20 100644
--- a/contrib/python/hypothesis/py3/hypothesis/reporting.py
+++ b/contrib/python/hypothesis/py3/hypothesis/reporting.py
@@ -8,8 +8,6 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-import inspect
-
 from hypothesis._settings import Verbosity, settings
 from hypothesis.internal.compat import escape_unicode_characters
 from hypothesis.utils.dynamicvariables import DynamicVariable
@@ -37,14 +35,6 @@ def current_verbosity():
     return settings.default.verbosity
 
 
-def to_text(textish):
-    if inspect.isfunction(textish):
-        textish = textish()
-    if isinstance(textish, bytes):
-        textish = textish.decode()
-    return textish
-
-
 def verbose_report(text):
     if current_verbosity() >= Verbosity.verbose:
         base_report(text)
@@ -61,4 +51,5 @@ def report(text):
 
 
 def base_report(text):
-    current_reporter()(to_text(text))
+    assert isinstance(text, str), f"unexpected non-str {text=}"
+    current_reporter()(text)
diff --git a/contrib/python/hypothesis/py3/hypothesis/version.py b/contrib/python/hypothesis/py3/hypothesis/version.py
index 4858f7fb0ca5..29e2144b92ad 100644
--- a/contrib/python/hypothesis/py3/hypothesis/version.py
+++ b/contrib/python/hypothesis/py3/hypothesis/version.py
@@ -8,5 +8,5 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-__version_info__ = (6, 108, 2)
+__version_info__ = (6, 108, 4)
 __version__ = ".".join(map(str, __version_info__))
diff --git a/contrib/python/hypothesis/py3/ya.make b/contrib/python/hypothesis/py3/ya.make
index 63eb354c8e23..4efa89329dd4 100644
--- a/contrib/python/hypothesis/py3/ya.make
+++ b/contrib/python/hypothesis/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(6.108.2)
+VERSION(6.108.4)
 
 LICENSE(MPL-2.0)
 
diff --git a/contrib/python/pytest-lazy-fixtures/.dist-info/METADATA b/contrib/python/pytest-lazy-fixtures/.dist-info/METADATA
index e03b9014b7d4..8b36c5866f6e 100644
--- a/contrib/python/pytest-lazy-fixtures/.dist-info/METADATA
+++ b/contrib/python/pytest-lazy-fixtures/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-lazy-fixtures
-Version: 1.1.0
+Version: 1.1.1
 Summary: Allows you to use fixtures in @pytest.mark.parametrize.
 Home-page: https://github.com/dev-petrov/pytest-lazy-fixtures
 License: MIT
diff --git a/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/normalizer.py b/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/normalizer.py
index fdbfe86402bc..db4cfa8b00b7 100644
--- a/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/normalizer.py
+++ b/contrib/python/pytest-lazy-fixtures/pytest_lazy_fixtures/normalizer.py
@@ -64,14 +64,15 @@ def _normalize_call(callspec, metafunc, used_keys):
     fm = metafunc.config.pluginmanager.get_plugin("funcmanage")
 
     used_keys = used_keys or set()
-    valtype_keys = callspec.params.keys() - used_keys
+    params = callspec.params.copy() if pytest.version_tuple >= (8, 0, 0) else {**callspec.params, **callspec.funcargs}
+    valtype_keys = params.keys() - used_keys
 
     for arg in valtype_keys:
-        value = callspec.params[arg]
+        value = params[arg]
         fixturenames_closure, arg2fixturedefs = _get_fixturenames_closure_and_arg2fixturedefs(fm, metafunc, value)
 
         if fixturenames_closure and arg2fixturedefs:
-            extra_fixturenames = [fname for fname in fixturenames_closure if fname not in callspec.params]
+            extra_fixturenames = [fname for fname in fixturenames_closure if fname not in params]
 
             newmetafunc = _copy_metafunc(metafunc)
             newmetafunc.fixturenames = extra_fixturenames
diff --git a/contrib/python/pytest-lazy-fixtures/ya.make b/contrib/python/pytest-lazy-fixtures/ya.make
index 47d86e8e0216..43c43a87f9d7 100644
--- a/contrib/python/pytest-lazy-fixtures/ya.make
+++ b/contrib/python/pytest-lazy-fixtures/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(1.1.0)
+VERSION(1.1.1)
 
 LICENSE(MIT)
 

From ec2f22a4794efe938e85da54c86f06e19b3173dc Mon Sep 17 00:00:00 2001
From: babenko <babenko@yandex-team.com>
Date: Tue, 6 Aug 2024 10:06:49 +0300
Subject: [PATCH 061/104] Log connection abort message with proper logging
 level ec2a88315813fe2a5b85361d4ef80d2de8bcd62c

---
 yt/yt/core/bus/tcp/connection.cpp | 10 ++++------
 yt/yt/core/bus/tcp/connection.h   |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/yt/yt/core/bus/tcp/connection.cpp b/yt/yt/core/bus/tcp/connection.cpp
index e6241815b4f0..e084539c97cd 100644
--- a/yt/yt/core/bus/tcp/connection.cpp
+++ b/yt/yt/core/bus/tcp/connection.cpp
@@ -215,8 +215,7 @@ void TTcpConnection::Start()
 
     if (!Poller_->TryRegister(this)) {
         auto error = TError(NBus::EErrorCode::TransportError, "Cannot register connection pollable");
-        Abort(error);
-        YT_LOG_WARNING(error << *EndpointAttributes_, "Connection aborted");
+        Abort(error, NLogging::ELogLevel::Warning);
         return;
     }
 
@@ -226,8 +225,7 @@ void TTcpConnection::Start()
         InitBuffers();
     } catch (const std::exception& ex) {
         auto error = TError(NBus::EErrorCode::TransportError, "I/O buffers allocation error") << ex;
-        Abort(error);
-        YT_LOG_WARNING(error << *EndpointAttributes_, "Connection aborted");
+        Abort(error, NLogging::ELogLevel::Warning);
         return;
     }
 
@@ -507,7 +505,7 @@ void TTcpConnection::SetupNetwork(const TNetworkAddress& address)
     }
 }
 
-void TTcpConnection::Abort(const TError& error)
+void TTcpConnection::Abort(const TError& error, NLogging::ELogLevel logLevel)
 {
     AbortSslSession();
 
@@ -545,7 +543,7 @@ void TTcpConnection::Abort(const TError& error)
         PendingControl_.fetch_or(static_cast<ui64>(EPollControl::Shutdown));
     }
 
-    YT_LOG_DEBUG(detailedError, "Connection aborted");
+    YT_LOG_EVENT(Logger, logLevel, detailedError, "Connection aborted");
 
     // OnShutdown() will be called after draining events from thread pools.
     YT_UNUSED_FUTURE(Poller_->Unregister(this));
diff --git a/yt/yt/core/bus/tcp/connection.h b/yt/yt/core/bus/tcp/connection.h
index ed395db9df4c..05a5bdc62fc6 100644
--- a/yt/yt/core/bus/tcp/connection.h
+++ b/yt/yt/core/bus/tcp/connection.h
@@ -288,7 +288,7 @@ class TTcpConnection
     void Close();
     void CloseSslSession(ESslState newSslState);
 
-    void Abort(const TError& error);
+    void Abort(const TError& error, NLogging::ELogLevel logLevel = NLogging::ELogLevel::Debug);
     bool AbortIfNetworkingDisabled();
     void AbortSslSession();
 

From e842851d5b299675ac1be291a152853c339a9add Mon Sep 17 00:00:00 2001
From: nechda <nechda@yandex-team.com>
Date: Tue, 6 Aug 2024 10:15:22 +0300
Subject: [PATCH 062/104] Dont generate ctors for TRange & TMutableRange if
 protobuf cant handle it 9aa0e068d05932c7ea3065408ed3dbb7fddb6321

---
 library/cpp/yt/memory/range.h                 | 15 +++-
 .../range_protobuf_repeated_field_ut.cpp      | 76 +++++++++++++++++++
 library/cpp/yt/memory/unittests/ya.make       |  1 +
 3 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 library/cpp/yt/memory/unittests/range_protobuf_repeated_field_ut.cpp

diff --git a/library/cpp/yt/memory/range.h b/library/cpp/yt/memory/range.h
index 932f7d93c2de..420ee9b4294f 100644
--- a/library/cpp/yt/memory/range.h
+++ b/library/cpp/yt/memory/range.h
@@ -9,6 +9,7 @@
 #include <optional>
 #include <span>
 #include <vector>
+#include <type_traits>
 
 // For size_t.
 #include <stddef.h>
@@ -60,6 +61,12 @@ class TRange
     using const_iterator = const T*;
     using size_type = size_t;
 
+    static constexpr bool CAnyRepeatedField = requires {
+        { google::protobuf::RepeatedField<T>{} }
+            ->
+        std::same_as<google::protobuf::RepeatedField<T>>;
+    };
+
     //! Constructs a null TRange.
     TRange()
         : Data_(nullptr)
@@ -126,7 +133,9 @@ class TRange
     { }
 
     //! Constructs a TRange from RepeatedField.
-    TRange(const google::protobuf::RepeatedField<T>& elements)
+    template<std::same_as<T> U = T>
+    requires CAnyRepeatedField
+    TRange(const google::protobuf::RepeatedField<U>& elements)
         : Data_(elements.data())
         , Length_(elements.size())
     { }
@@ -333,7 +342,9 @@ class TMutableRange
     { }
 
     //! Constructs a TMutableRange from RepeatedField.
-    TMutableRange(google::protobuf::RepeatedField<T>& elements)
+    template<std::same_as<T> U = T>
+    requires TRange<T>::CAnyRepeatedField
+    TMutableRange(google::protobuf::RepeatedField<U>& elements)
         : TRange<T>(elements)
     { }
 
diff --git a/library/cpp/yt/memory/unittests/range_protobuf_repeated_field_ut.cpp b/library/cpp/yt/memory/unittests/range_protobuf_repeated_field_ut.cpp
new file mode 100644
index 000000000000..35581468a4ec
--- /dev/null
+++ b/library/cpp/yt/memory/unittests/range_protobuf_repeated_field_ut.cpp
@@ -0,0 +1,76 @@
+#include <library/cpp/testing/gtest/gtest.h>
+
+#include <library/cpp/testing/gtest_extensions/assertions.h>
+
+#include <library/cpp/yt/memory/range.h>
+#include <vector>
+
+namespace {
+
+////////////////////////////////////////////////////////////////////////////////
+
+/*
+    Test build
+    https://a.yandex-team.ru/arcadia/yt/yt/library/backtrace_introspector/introspect.cpp?rev=r14560536#L165
+*/
+
+TEST(TRangeVector, ImmutableRange)
+{
+    std::vector<const void*> backtrace;
+    [[maybe_unused]] auto range = NYT::TRange(backtrace);
+}
+
+TEST(TRangeVector, MutableRange)
+{
+    std::vector<const void*> backtrace;
+    [[maybe_unused]] auto range = NYT::TMutableRange(backtrace);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+/*
+    Test build
+    https://a.yandex-team.ru/arcadia/yt/yt/library/oom/oom.cpp?rev=r14560536#L112
+*/
+
+static const char* TDummyStringArray[] = {
+    "xxx",
+    "yyy",
+    "zzz",
+};
+
+TEST(TRangeArrayOfStrings, ImmutableRange)
+{
+    [[maybe_unused]] auto range = NYT::TRange(TDummyStringArray);
+}
+
+TEST(TRangeArrayOfStrings, MutableRange)
+{
+    [[maybe_unused]] auto range = NYT::TMutableRange(TDummyStringArray);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+/*
+    Test build
+    https://a.yandex-team.ru/arcadia/yt/yt/orm/server/access_control/object_cluster.cpp?rev=r14560536#L188
+*/
+
+TEST(TRangeRawPtr, ImmutableRange)
+{
+    struct TDummyData{};
+    TDummyData** ptr = nullptr;
+    constexpr int size = 0x10;
+    [[maybe_unused]] auto range = NYT::TRange<TDummyData*>(ptr, size);
+}
+
+TEST(TRangeRawPtr, MutableRange)
+{
+    struct TDummyData{};
+    TDummyData** ptr = nullptr;
+    constexpr int size = 0x10;
+    [[maybe_unused]] auto range = NYT::TMutableRange<TDummyData*>(ptr, size);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+} // namespace
diff --git a/library/cpp/yt/memory/unittests/ya.make b/library/cpp/yt/memory/unittests/ya.make
index d2f098fa7227..920873de265a 100644
--- a/library/cpp/yt/memory/unittests/ya.make
+++ b/library/cpp/yt/memory/unittests/ya.make
@@ -18,6 +18,7 @@ SRCS(
     shared_range_ut.cpp
     weak_ptr_ut.cpp
     ref_ut.cpp
+    range_protobuf_repeated_field_ut.cpp
 )
 
 IF (NOT OS_WINDOWS)

From 6da98cd7aef7a8a7d13bb1f4646ab9cb99c5c5f3 Mon Sep 17 00:00:00 2001
From: robot-contrib <robot-contrib@yandex-team.com>
Date: Tue, 6 Aug 2024 10:56:38 +0300
Subject: [PATCH 063/104] Update contrib/restricted/fast_float to 6.1.2
 fe8a378bede398ff0144b74ffade134ea3355aa6

---
 contrib/restricted/fast_float/README.md       | 16 +++--
 .../include/fast_float/ascii_number.h         | 20 +-----
 .../include/fast_float/decimal_to_binary.h    |  5 +-
 .../include/fast_float/float_common.h         |  2 +-
 .../include/fast_float/parse_number.h         | 63 ++++++++++++-------
 contrib/restricted/fast_float/ya.make         |  4 +-
 6 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/contrib/restricted/fast_float/README.md b/contrib/restricted/fast_float/README.md
index d9208dad29f8..98da296fee3e 100644
--- a/contrib/restricted/fast_float/README.md
+++ b/contrib/restricted/fast_float/README.md
@@ -285,18 +285,19 @@ int main() {
 }
 ``````
 
-## Relation With Other Work
+## Users and Related Work
 
 The fast_float library is part of:
 
 - GCC (as of version 12): the `from_chars` function in GCC relies on fast_float.
 - [WebKit](https://github.com/WebKit/WebKit), the engine behind Safari (Apple's web browser)
+- [DuckDB](https://duckdb.org)
+- [Apache Arrow](https://github.com/apache/arrow/pull/8494) where it multiplied the number parsing speed by two or three times
+- [Google Jsonnet](https://github.com/google/jsonnet)
+- [ClickHouse](https://github.com/ClickHouse/ClickHouse)
 
 
-The fastfloat algorithm is part of the [LLVM standard libraries](https://github.com/llvm/llvm-project/commit/87c016078ad72c46505461e4ff8bfa04819fe7ba).
-
-There is a [derived implementation part of AdaCore](https://github.com/AdaCore/VSS).
-
+The fastfloat algorithm is part of the [LLVM standard libraries](https://github.com/llvm/llvm-project/commit/87c016078ad72c46505461e4ff8bfa04819fe7ba). There is a [derived implementation part of AdaCore](https://github.com/AdaCore/VSS).
 
 The fast_float library provides a performance similar to that of the [fast_double_parser](https://github.com/lemire/fast_double_parser) library but using an updated algorithm reworked from the ground up, and while offering an API more in line with the expectations of C++ programmers. The fast_double_parser library is part of the [Microsoft LightGBM machine-learning framework](https://github.com/microsoft/LightGBM).
 
@@ -313,9 +314,6 @@ The fast_float library provides a performance similar to that of the [fast_doubl
 - [There is a C# port of the fast_float library](https://github.com/CarlVerret/csFastFloat) called `csFastFloat`.
 
 
-## Users
-
-The fast_float library is used by [Apache Arrow](https://github.com/apache/arrow/pull/8494) where it multiplied the number parsing speed by two or three times. It is also used by [ClickHouse](https://github.com/ClickHouse/ClickHouse) and by [Google Jsonnet](https://github.com/google/jsonnet). It is part of GCC (as of GCC 12). It is part of WebKit (Safari).
 
 
 ## How fast is it?
@@ -381,7 +379,7 @@ the command line help.
 
 You may directly download automatically generated single-header files:
 
-https://github.com/fastfloat/fast_float/releases/download/v6.1.1/fast_float.h
+https://github.com/fastfloat/fast_float/releases/download/v6.1.2/fast_float.h
 
 ## RFC 7159
 
diff --git a/contrib/restricted/fast_float/include/fast_float/ascii_number.h b/contrib/restricted/fast_float/include/fast_float/ascii_number.h
index 15a8a20f88c2..4c9da17a50af 100644
--- a/contrib/restricted/fast_float/include/fast_float/ascii_number.h
+++ b/contrib/restricted/fast_float/include/fast_float/ascii_number.h
@@ -123,24 +123,6 @@ uint64_t simd_read8_to_u64(UC const*) {
   return 0;
 }
 
-
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20
-void write_u64(uint8_t *chars, uint64_t val) {
-  if (cpp20_and_in_constexpr()) {
-    for(int i = 0; i < 8; ++i) {
-      *chars = uint8_t(val);
-      val >>= 8;
-      ++chars;
-    }
-    return;
-  }
-#if FASTFLOAT_IS_BIG_ENDIAN == 1
-  // Need to read as-if the number was in little-endian order.
-  val = byteswap(val);
-#endif
-  ::memcpy(chars, &val, sizeof(uint64_t));
-}
-
 // credit  @aqrit
 fastfloat_really_inline FASTFLOAT_CONSTEXPR14
 uint32_t parse_eight_digits_unrolled(uint64_t val) {
@@ -367,7 +349,7 @@ parsed_number_string_t<UC> parse_number_string(UC const *p, UC const * pend, par
       ++p;
     }
     if ((p == pend) || !is_integer(*p)) {
-      if(!(fmt & chars_format::fixed)) {
+      if(!(fmt & chars_format::fixed) || (fmt & FASTFLOAT_JSONFMT)) {
         // We are in error.
         return answer;
       }
diff --git a/contrib/restricted/fast_float/include/fast_float/decimal_to_binary.h b/contrib/restricted/fast_float/include/fast_float/decimal_to_binary.h
index fec916f3a07b..a4e245be86a2 100644
--- a/contrib/restricted/fast_float/include/fast_float/decimal_to_binary.h
+++ b/contrib/restricted/fast_float/include/fast_float/decimal_to_binary.h
@@ -127,8 +127,9 @@ adjusted_mantissa compute_float(int64_t q, uint64_t w)  noexcept  {
   // but in practice, we can win big with the compute_product_approximation if its additional branch
   // is easily predicted. Which is best is data specific.
   int upperbit = int(product.high >> 63);
+  int shift = upperbit + 64 - binary::mantissa_explicit_bits() - 3;
 
-  answer.mantissa = product.high >> (upperbit + 64 - binary::mantissa_explicit_bits() - 3);
+  answer.mantissa = product.high >> shift;
 
   answer.power2 = int32_t(detail::power(int32_t(q)) + upperbit - lz - binary::minimum_exponent());
   if (answer.power2 <= 0) { // we have a subnormal?
@@ -164,7 +165,7 @@ adjusted_mantissa compute_float(int64_t q, uint64_t w)  noexcept  {
     // To be in-between two floats we need that in doing
     //   answer.mantissa = product.high >> (upperbit + 64 - binary::mantissa_explicit_bits() - 3);
     // ... we dropped out only zeroes. But if this happened, then we can go back!!!
-    if((answer.mantissa  << (upperbit + 64 - binary::mantissa_explicit_bits() - 3)) ==  product.high) {
+    if((answer.mantissa  << shift) ==  product.high) {
       answer.mantissa &= ~uint64_t(1);          // flip it so that we do not round up
     }
   }
diff --git a/contrib/restricted/fast_float/include/fast_float/float_common.h b/contrib/restricted/fast_float/include/fast_float/float_common.h
index 8928da71c5c5..1c9835976c30 100644
--- a/contrib/restricted/fast_float/include/fast_float/float_common.h
+++ b/contrib/restricted/fast_float/include/fast_float/float_common.h
@@ -564,7 +564,7 @@ inline constexpr int binary_format<double>::smallest_power_of_ten() {
 }
 template <>
 inline constexpr int binary_format<float>::smallest_power_of_ten() {
-  return -65;
+  return -64;
 }
 
 template <> inline constexpr size_t binary_format<double>::max_digits() {
diff --git a/contrib/restricted/fast_float/include/fast_float/parse_number.h b/contrib/restricted/fast_float/include/fast_float/parse_number.h
index a97906eb9e35..57bcf46b7450 100644
--- a/contrib/restricted/fast_float/include/fast_float/parse_number.h
+++ b/contrib/restricted/fast_float/include/fast_float/parse_number.h
@@ -187,35 +187,20 @@ from_chars_result_t<UC> from_chars(UC const * first, UC const * last,
   return from_chars_caller<T>::call(first, last, value, parse_options_t<UC>(fmt));
 }
 
+/**
+ * This function overload takes parsed_number_string_t structure that is created and populated
+ * either by from_chars_advanced function taking chars range and parsing options
+ * or other parsing custom function implemented by user.
+ */
 template<typename T, typename UC>
 FASTFLOAT_CONSTEXPR20
-from_chars_result_t<UC> from_chars_advanced(UC const * first, UC const * last,
-                                      T &value, parse_options_t<UC> options)  noexcept  {
+from_chars_result_t<UC> from_chars_advanced(parsed_number_string_t<UC>& pns,
+                                      T &value)  noexcept  {
 
   static_assert (is_supported_float_type<T>(), "only some floating-point types are supported");
   static_assert (is_supported_char_type<UC>(), "only char, wchar_t, char16_t and char32_t are supported");
 
   from_chars_result_t<UC> answer;
-#ifdef FASTFLOAT_SKIP_WHITE_SPACE  // disabled by default
-  while ((first != last) && fast_float::is_space(uint8_t(*first))) {
-    first++;
-  }
-#endif
-  if (first == last) {
-    answer.ec = std::errc::invalid_argument;
-    answer.ptr = first;
-    return answer;
-  }
-  parsed_number_string_t<UC> pns = parse_number_string<UC>(first, last, options);
-  if (!pns.valid) {
-    if (options.format & chars_format::no_infnan) {
-      answer.ec = std::errc::invalid_argument;
-      answer.ptr = first;
-      return answer;
-    } else {
-      return detail::parse_infnan(first, last, value);
-    }
-  }
 
   answer.ec = std::errc(); // be optimistic
   answer.ptr = pns.lastmatch;
@@ -276,6 +261,40 @@ from_chars_result_t<UC> from_chars_advanced(UC const * first, UC const * last,
   return answer;
 }
 
+template<typename T, typename UC>
+FASTFLOAT_CONSTEXPR20
+from_chars_result_t<UC> from_chars_advanced(UC const * first, UC const * last,
+                                      T &value, parse_options_t<UC> options)  noexcept  {
+
+  static_assert (is_supported_float_type<T>(), "only some floating-point types are supported");
+  static_assert (is_supported_char_type<UC>(), "only char, wchar_t, char16_t and char32_t are supported");
+
+  from_chars_result_t<UC> answer;
+#ifdef FASTFLOAT_SKIP_WHITE_SPACE  // disabled by default
+  while ((first != last) && fast_float::is_space(uint8_t(*first))) {
+    first++;
+  }
+#endif
+  if (first == last) {
+    answer.ec = std::errc::invalid_argument;
+    answer.ptr = first;
+    return answer;
+  }
+  parsed_number_string_t<UC> pns = parse_number_string<UC>(first, last, options);
+  if (!pns.valid) {
+    if (options.format & chars_format::no_infnan) {
+      answer.ec = std::errc::invalid_argument;
+      answer.ptr = first;
+      return answer;
+    } else {
+      return detail::parse_infnan(first, last, value);
+    }
+  }
+
+  // call overload that takes parsed_number_string_t directly.
+  return from_chars_advanced(pns, value);
+}
+
 
 template <typename T, typename UC, typename>
 FASTFLOAT_CONSTEXPR20
diff --git a/contrib/restricted/fast_float/ya.make b/contrib/restricted/fast_float/ya.make
index f4c92eb84f54..324d1643a9a5 100644
--- a/contrib/restricted/fast_float/ya.make
+++ b/contrib/restricted/fast_float/ya.make
@@ -10,9 +10,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(6.1.1)
+VERSION(6.1.2)
 
-ORIGINAL_SOURCE(https://github.com/fastfloat/fast_float/archive/v6.1.1.tar.gz)
+ORIGINAL_SOURCE(https://github.com/fastfloat/fast_float/archive/v6.1.2.tar.gz)
 
 NO_COMPILER_WARNINGS()
 

From 9d41cdb89df0c2f28c2ad59318ee2709def3f31d Mon Sep 17 00:00:00 2001
From: khoden <khoden@yandex-team.com>
Date: Tue, 6 Aug 2024 10:59:46 +0300
Subject: [PATCH 064/104] nots/builder: builder as prebuilt-tool
 5fb9fd433f0bfd678a9f20c9dcada12f65098240

---
 build/conf/ts/ts.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf
index 47c1aebd2fc4..4ef7732e5045 100644
--- a/build/conf/ts/ts.conf
+++ b/build/conf/ts/ts.conf
@@ -6,6 +6,7 @@ TS_LOCAL_CLI=no
 TS_YNDEXING=no
 # Use outdir defined in tsconfig (actual not for bundlers, they use own way to define output directory)
 TS_CONFIG_USE_OUTDIR=
+TS_USE_PREBUILT_NOTS_TOOL=yes
 NOTS_TOOL=${tool:"devtools/frontend_build_platform/nots/builder"}
 
 

From 71b83d2d0c089e0192004d1c08ec46c9b330f327 Mon Sep 17 00:00:00 2001
From: shadchin <shadchin@yandex-team.com>
Date: Tue, 6 Aug 2024 11:02:43 +0300
Subject: [PATCH 065/104] Update black binaries to 24.8.0
 2e90a11e72ba2621ba2f22d6af55e4302486a751

---
 build/ya.conf.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/ya.conf.json b/build/ya.conf.json
index 1df829e368cb..160259cd3730 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -39,19 +39,19 @@
             "formula": {
                 "by_platform": {
                     "darwin-arm64": {
-                        "uri": "sbr:6635026071"
+                        "uri": "sbr:6816406079"
                     },
                     "darwin-x86_64": {
-                        "uri": "sbr:6635026187"
+                        "uri": "sbr:6816406420"
                     },
                     "linux-aarch64": {
-                        "uri": "sbr:6635025898"
+                        "uri": "sbr:6816405372"
                     },
                     "linux-x86_64": {
-                        "uri": "sbr:6635026422"
+                        "uri": "sbr:6816407233"
                     },
                     "win32-x86_64": {
-                        "uri": "sbr:6635026287"
+                        "uri": "sbr:6816406896"
                     }
                 }
             }

From 1f8ff429f58361372263a2a5e85ddf5a7c83890d Mon Sep 17 00:00:00 2001
From: ignat <ignat@yandex-team.com>
Date: Tue, 6 Aug 2024 11:18:40 +0300
Subject: [PATCH 066/104] YT-22431: add patch to thrift for C++-17
 compatibility 6cc1faf90b8b7c009e9df27e7e3c657b56698771

---
 .../thrift/thrift/transport/TSocketPool.cpp          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/contrib/restricted/thrift/thrift/transport/TSocketPool.cpp b/contrib/restricted/thrift/thrift/transport/TSocketPool.cpp
index 9aad9b38108d..0511f45d1b0e 100644
--- a/contrib/restricted/thrift/thrift/transport/TSocketPool.cpp
+++ b/contrib/restricted/thrift/thrift/transport/TSocketPool.cpp
@@ -21,11 +21,13 @@
 
 #include <algorithm>
 #include <iostream>
+#if __cplusplus >= 201703L
+#include <random>
+#endif
 
 #include <thrift/transport/TSocketPool.h>
 
 using std::pair;
-using std::random_shuffle;
 using std::string;
 using std::vector;
 
@@ -189,7 +191,13 @@ void TSocketPool::open() {
   }
 
   if (randomize_ && numServers > 1) {
-    random_shuffle(servers_.begin(), servers_.end());
+#if __cplusplus >= 201703L
+    std::random_device rng;
+    std::mt19937 urng(rng());
+    std::shuffle(servers_.begin(), servers_.end(), urng);
+#else
+    std::random_shuffle(servers_.begin(), servers_.end());
+#endif
   }
 
   for (size_t i = 0; i < numServers; ++i) {

From e003b4c129e1381591dcb75a96bf9a970b2b47fb Mon Sep 17 00:00:00 2001
From: robot-ya-builder <robot-ya-builder@yandex-team.com>
Date: Tue, 6 Aug 2024 11:19:17 +0300
Subject: [PATCH 067/104] Automatic release build for test_tool, ya_bin, os_ya,
 os_test_tool

From hash: [e58e576becf02895fccef3f49d4b79967f2cf2ce](https://a.yandex-team.ru/arcadia/commit/e58e576becf02895fccef3f49d4b79967f2cf2ce)
From revision: [14570782](https://a.yandex-team.ru/arcadia/commit/rXXXXXX)
[CI flow](https://a.yandex-team.ru/projects/ya_make/ci/releases/flow?dir=devtools%2Fya&id=release-ya-bin2-ya-bin3-tts&version=453)
Flow triggered by user: [zhukoff-pavel](https://staff.yandex-team.ru/zhukoff-pavel)

Update tools: test_tool, ya_bin, os_ya, os_test_tool
e1190be4c367d8940a2f88914fa51393157f1a38
---
 build/mapping.conf.json                      |  4 ++++
 build/platform/test_tool/host.ya.make.inc    | 10 +++++-----
 build/platform/test_tool/host_os.ya.make.inc | 10 +++++-----
 ya                                           | 20 ++++++++++----------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index f368473ab43f..f4b822facf63 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -351,6 +351,8 @@
         "6733663069": "https://devtools-registry.s3.yandex.net/6733663069",
         "6761602592": "https://devtools-registry.s3.yandex.net/6761602592",
         "6761604639": "https://devtools-registry.s3.yandex.net/6761604639",
+        "6815682618": "https://devtools-registry.s3.yandex.net/6815682618",
+        "6815696206": "https://devtools-registry.s3.yandex.net/6815696206",
         "5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
         "5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
         "5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -1091,6 +1093,8 @@
         "6733663069": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6761602592": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "6761604639": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "6815682618": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "6815696206": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
         "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc
index 9f76ce6d3eed..984997a9750d 100644
--- a/build/platform/test_tool/host.ya.make.inc
+++ b/build/platform/test_tool/host.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603811)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815679855)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603407)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815678752)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761604639)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815682618)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761603045)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815677851)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761604252)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815681031)
 
 ENDIF()
diff --git a/build/platform/test_tool/host_os.ya.make.inc b/build/platform/test_tool/host_os.ya.make.inc
index b80ee3059ca8..a83c00293f85 100644
--- a/build/platform/test_tool/host_os.ya.make.inc
+++ b/build/platform/test_tool/host_os.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601964)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815693736)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601833)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815692155)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761602592)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815696206)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761601614)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815690541)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6761602256)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6815694963)
 
 ENDIF()
diff --git a/ya b/ya
index 57b5ea81ab66..f315db0b7d3b 100755
--- a/ya
+++ b/ya
@@ -39,33 +39,33 @@ REGISTRY_ENDPOINT = os.environ.get("YA_REGISTRY_ENDPOINT", "https://devtools-reg
 PLATFORM_MAP = {
     "data": {
         "darwin": {
-            "md5": "0fde66aa3d2eedca282b89f27dc498fb",
+            "md5": "dba7b41893efeb5ce98500cb6e0bf444",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606505"
+                f"{REGISTRY_ENDPOINT}/6815678992"
             ]
         },
         "darwin-arm64": {
-            "md5": "d87f182ed40f1be37c1c3b271c83669c",
+            "md5": "cf2f84d059ca06ed916797d21e5c9b5e",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606258"
+                f"{REGISTRY_ENDPOINT}/6815678339"
             ]
         },
         "linux-aarch64": {
-            "md5": "e3555221b30ffb2f992012fb0dd21587",
+            "md5": "d0fd298e8027f3b424d95ff88643e01a",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606102"
+                f"{REGISTRY_ENDPOINT}/6815677562"
             ]
         },
         "win32-clang-cl": {
-            "md5": "0dc634d2325ed6edc9d79f4daf61bca8",
+            "md5": "2e673bd1413816a79d4114f1a61831f4",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606645"
+                f"{REGISTRY_ENDPOINT}/6815679755"
             ]
         },
         "linux": {
-            "md5": "a1f742755f8fb41fe2dcc521bff6fe95",
+            "md5": "72389b6c6c584aa368e1cfdda777603f",
             "urls": [
-                f"{REGISTRY_ENDPOINT}/6761606901"
+                f"{REGISTRY_ENDPOINT}/6815680535"
             ]
         }
     }

From de4d7efd8871b850e3ea79164d7661e2299836b7 Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Tue, 6 Aug 2024 11:28:07 +0300
Subject: [PATCH 068/104] Update contrib/restricted/abseil-cpp-tstring to
 20240722.0 83a5727000e16bc5a94523a0cf1cce75fa86a191

---
 .../y_absl/algorithm/container.h              |   75 +-
 .../y_absl/algorithm/ya.make                  |    4 +-
 .../y_absl/base/attributes.h                  |   84 +
 .../abseil-cpp-tstring/y_absl/base/config.h   |   85 +-
 .../y_absl/base/dynamic_annotations.h         |   16 -
 .../y_absl/base/internal/nullability_impl.h   |    4 +-
 .../y_absl/base/internal/poison.cc            |   84 +
 .../y_absl/base/internal/poison.h             |   59 +
 .../y_absl/base/internal/spinlock.h           |   16 +-
 .../base/internal/unscaledcycleclock.cc       |   12 -
 .../base/internal/unscaledcycleclock_config.h |    8 +-
 .../abseil-cpp-tstring/y_absl/base/macros.h   |   48 +
 .../y_absl/base/no_destructor.h               |   75 +-
 .../y_absl/base/nullability.h                 |   40 +-
 .../y_absl/base/optimization.h                |   11 +
 .../abseil-cpp-tstring/y_absl/base/options.h  |    2 +-
 .../abseil-cpp-tstring/y_absl/base/prefetch.h |    2 +-
 .../abseil-cpp-tstring/y_absl/base/ya.make    |    1 +
 .../y_absl/container/flat_hash_map.h          |   80 +-
 .../y_absl/container/flat_hash_set.h          |   66 +-
 .../container/hash_container_defaults.h       |   45 +
 .../y_absl/container/inlined_vector.h         |   13 +
 .../container/internal/common_policy_traits.h |   31 +-
 .../container/internal/compressed_tuple.h     |   31 +-
 .../container/internal/container_memory.h     |   35 +-
 .../internal/hash_function_defaults.h         |   69 +-
 .../container/internal/hash_policy_traits.h   |   50 +
 .../container/internal/hashtablez_sampler.cc  |   29 +-
 .../container/internal/hashtablez_sampler.h   |   34 +-
 .../container/internal/inlined_vector.h       |   74 +-
 .../y_absl/container/internal/raw_hash_map.h  |   14 +-
 .../y_absl/container/internal/raw_hash_set.cc |  405 +++-
 .../y_absl/container/internal/raw_hash_set.h  | 1757 ++++++++++++-----
 .../internal/crc32_x86_arm_combined_simd.h    |   36 +-
 .../y_absl/crc/internal/crc_cord_state.cc     |    7 +-
 .../crc/internal/crc_memcpy_fallback.cc       |    3 +-
 .../internal/crc_memcpy_x86_arm_combined.cc   |   20 +-
 .../crc/internal/crc_non_temporal_memcpy.cc   |    2 +-
 .../crc/internal/crc_x86_arm_combined.cc      |   18 +-
 .../y_absl/crc/internal/non_temporal_memcpy.h |   35 +-
 .../y_absl/debugging/failure_signal_handler.h |    2 +-
 .../internal/bounded_utf8_length_sequence.h   |  126 ++
 .../internal/decode_rust_punycode.cc          |  258 +++
 .../debugging/internal/decode_rust_punycode.h |   55 +
 .../y_absl/debugging/internal/demangle.cc     | 1143 ++++++++++-
 .../y_absl/debugging/internal/demangle.h      |    3 +
 .../debugging/internal/demangle_rust.cc       |  925 +++++++++
 .../y_absl/debugging/internal/demangle_rust.h |   42 +
 .../debugging/internal/elf_mem_image.cc       |   59 +-
 .../y_absl/debugging/internal/elf_mem_image.h |   15 +-
 .../internal/stacktrace_aarch64-inl.inc       |   17 +-
 .../debugging/internal/utf8_for_code_point.cc |   70 +
 .../debugging/internal/utf8_for_code_point.h  |   47 +
 .../y_absl/debugging/ya.make                  |    3 +
 .../y_absl/flags/commandlineflag.h            |   11 +
 .../abseil-cpp-tstring/y_absl/flags/flag.h    |    2 +
 .../y_absl/flags/internal/flag.cc             |  147 +-
 .../y_absl/flags/internal/flag.h              |  222 ++-
 .../y_absl/flags/reflection.cc                |   10 +
 .../y_absl/functional/any_invocable.h         |   16 +-
 .../y_absl/functional/bind_front.h            |    5 +-
 .../functional/internal/any_invocable.h       |   14 +-
 .../y_absl/functional/internal/front_binder.h |   18 +-
 .../y_absl/functional/ya.make                 |    4 +-
 .../y_absl/hash/internal/hash.cc              |    2 +-
 .../y_absl/hash/internal/hash.h               |   16 +-
 .../y_absl/hash/internal/low_level_hash.cc    |   88 +-
 .../y_absl/hash/internal/low_level_hash.h     |    4 +
 .../abseil-cpp-tstring/y_absl/memory/ya.make  |    4 +-
 .../y_absl/meta/type_traits.h                 |  180 +-
 .../abseil-cpp-tstring/y_absl/meta/ya.make    |    4 +-
 .../y_absl/numeric/int128.cc                  |    3 -
 .../y_absl/numeric/int128.h                   |   40 +-
 .../y_absl/numeric/int128_have_intrinsic.inc  |   14 +
 .../y_absl/numeric/int128_no_intrinsic.inc    |   18 +
 .../y_absl/numeric/internal/bits.h            |    8 +-
 .../profiling/internal/periodic_sampler.h     |    2 +-
 .../y_absl/random/beta_distribution.h         |   16 +-
 .../y_absl/random/distributions.h             |   22 +-
 .../y_absl/random/seed_sequences.h            |    2 +
 .../status/internal/statusor_internal.h       |   63 +-
 .../y_absl/status/status.cc                   |    4 -
 .../abseil-cpp-tstring/y_absl/status/status.h |    8 +-
 .../y_absl/status/statusor.h                  |  250 +--
 .../y_absl/strings/ascii.cc                   |  103 +-
 .../abseil-cpp-tstring/y_absl/strings/cord.cc |   35 +-
 .../abseil-cpp-tstring/y_absl/strings/cord.h  |   75 +-
 .../y_absl/strings/escaping.cc                |   91 +-
 .../y_absl/strings/escaping.h                 |   33 +-
 .../y_absl/strings/has_absl_stringify.h       |    1 +
 .../y_absl/strings/internal/charconv_bigint.h |   10 +
 .../y_absl/strings/internal/cord_internal.h   |   38 +-
 .../y_absl/strings/internal/cord_rep_btree.h  |    4 +-
 .../strings/internal/cordz_functions.cc       |   32 +-
 .../y_absl/strings/internal/cordz_functions.h |   36 +-
 .../y_absl/strings/internal/cordz_handle.cc   |   48 +-
 .../y_absl/strings/internal/cordz_info.cc     |   19 +-
 .../y_absl/strings/internal/cordz_info.h      |   13 +-
 .../y_absl/strings/internal/escaping.cc       |    7 +-
 .../strings/internal/str_join_internal.h      |   25 +-
 .../strings/internal/str_split_internal.h     |    6 +-
 .../y_absl/strings/numbers.cc                 |  440 +----
 .../y_absl/strings/numbers.h                  |  163 +-
 .../y_absl/strings/str_cat.cc                 |  191 +-
 .../y_absl/strings/str_cat.h                  |  154 +-
 .../y_absl/strings/str_format.h               |    2 +-
 .../y_absl/strings/str_join.h                 |   24 +-
 .../y_absl/strings/str_split.h                |    4 +-
 .../y_absl/strings/string_view.h              |    5 +-
 .../y_absl/strings/substitute.cc              |    4 +
 .../synchronization/internal/graphcycles.cc   |   13 +-
 .../synchronization/internal/graphcycles.h    |    5 +
 .../y_absl/synchronization/mutex.h            |    9 +-
 .../y_absl/time/civil_time.h                  |    4 +-
 .../abseil-cpp-tstring/y_absl/time/clock.cc   |   16 +-
 .../y_absl/time/duration.cc                   |  111 +-
 .../abseil-cpp-tstring/y_absl/time/format.cc  |    3 +-
 .../time/internal/cctz/src/time_zone_libc.cc  |    2 +-
 .../internal/cctz/src/time_zone_lookup.cc     |   29 -
 .../y_absl/time/internal/cctz/src/tzfile.h    |    6 +-
 .../abseil-cpp-tstring/y_absl/time/time.h     |  102 +-
 .../abseil-cpp-tstring/y_absl/types/compare.h |  505 +++++
 .../y_absl/types/internal/optional.h          |    4 +-
 .../y_absl/types/internal/variant.h           |  122 +-
 .../y_absl/types/optional.h                   |   33 +-
 .../abseil-cpp-tstring/y_absl/types/span.h    |    5 +-
 .../abseil-cpp-tstring/y_absl/types/variant.h |   43 +-
 .../y_absl/utility/utility.h                  |   44 +-
 .../abseil-cpp-tstring/y_absl/utility/ya.make |    4 +-
 129 files changed, 7566 insertions(+), 2499 deletions(-)
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/poison.cc
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/poison.h
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/container/hash_container_defaults.h
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/bounded_utf8_length_sequence.h
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/decode_rust_punycode.cc
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/decode_rust_punycode.h
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle_rust.cc
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle_rust.h
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/utf8_for_code_point.cc
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/utf8_for_code_point.h
 create mode 100644 contrib/restricted/abseil-cpp-tstring/y_absl/types/compare.h

diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/container.h b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/container.h
index 09864bb86888..cf525657269b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/container.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/container.h
@@ -44,6 +44,7 @@
 #include <cassert>
 #include <iterator>
 #include <numeric>
+#include <random>
 #include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
@@ -51,6 +52,7 @@
 #include <vector>
 
 #include "y_absl/algorithm/algorithm.h"
+#include "y_absl/base/config.h"
 #include "y_absl/base/macros.h"
 #include "y_absl/base/nullability.h"
 #include "y_absl/meta/type_traits.h"
@@ -92,17 +94,17 @@ using ContainerPointerType =
 //   using std::end;
 //   std::foo(begin(c), end(c));
 // becomes
-//   std::foo(container_algorithm_internal::begin(c),
-//            container_algorithm_internal::end(c));
+//   std::foo(container_algorithm_internal::c_begin(c),
+//            container_algorithm_internal::c_end(c));
 // These are meant for internal use only.
 
 template <typename C>
-ContainerIter<C> c_begin(C& c) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17 ContainerIter<C> c_begin(C& c) {
   return begin(c);
 }
 
 template <typename C>
-ContainerIter<C> c_end(C& c) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17 ContainerIter<C> c_end(C& c) {
   return end(c);
 }
 
@@ -145,8 +147,9 @@ bool c_linear_search(const C& c, EqualityComparable&& value) {
 // Container-based version of the <iterator> `std::distance()` function to
 // return the number of elements within a container.
 template <typename C>
-container_algorithm_internal::ContainerDifferenceType<const C> c_distance(
-    const C& c) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerDifferenceType<const C>
+    c_distance(const C& c) {
   return std::distance(container_algorithm_internal::c_begin(c),
                        container_algorithm_internal::c_end(c));
 }
@@ -210,6 +213,16 @@ container_algorithm_internal::ContainerIter<C> c_find(C& c, T&& value) {
                    std::forward<T>(value));
 }
 
+// c_contains()
+//
+// Container-based version of the <algorithm> `std::ranges::contains()` C++23
+// function to search a container for a value.
+template <typename Sequence, typename T>
+bool c_contains(const Sequence& sequence, T&& value) {
+  return y_absl::c_find(sequence, std::forward<T>(value)) !=
+         container_algorithm_internal::c_end(sequence);
+}
+
 // c_find_if()
 //
 // Container-based version of the <algorithm> `std::find_if()` function to find
@@ -426,6 +439,26 @@ container_algorithm_internal::ContainerIter<Sequence1> c_search(
                      std::forward<BinaryPredicate>(pred));
 }
 
+// c_contains_subrange()
+//
+// Container-based version of the <algorithm> `std::ranges::contains_subrange()`
+// C++23 function to search a container for a subsequence.
+template <typename Sequence1, typename Sequence2>
+bool c_contains_subrange(Sequence1& sequence, Sequence2& subsequence) {
+  return y_absl::c_search(sequence, subsequence) !=
+         container_algorithm_internal::c_end(sequence);
+}
+
+// Overload of c_contains_subrange() for using a predicate evaluation other than
+// `==` as the function's test condition.
+template <typename Sequence1, typename Sequence2, typename BinaryPredicate>
+bool c_contains_subrange(Sequence1& sequence, Sequence2& subsequence,
+                         BinaryPredicate&& pred) {
+  return y_absl::c_search(sequence, subsequence,
+                        std::forward<BinaryPredicate>(pred)) !=
+         container_algorithm_internal::c_end(sequence);
+}
+
 // c_search_n()
 //
 // Container-based version of the <algorithm> `std::search_n()` function to
@@ -1500,8 +1533,9 @@ c_is_heap_until(RandomAccessContainer& sequence, LessThan&& comp) {
 // to return an iterator pointing to the element with the smallest value, using
 // `operator<` to make the comparisons.
 template <typename Sequence>
-container_algorithm_internal::ContainerIter<Sequence> c_min_element(
-    Sequence& sequence) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIter<Sequence>
+    c_min_element(Sequence& sequence) {
   return std::min_element(container_algorithm_internal::c_begin(sequence),
                           container_algorithm_internal::c_end(sequence));
 }
@@ -1509,8 +1543,9 @@ container_algorithm_internal::ContainerIter<Sequence> c_min_element(
 // Overload of c_min_element() for performing a `comp` comparison other than
 // `operator<`.
 template <typename Sequence, typename LessThan>
-container_algorithm_internal::ContainerIter<Sequence> c_min_element(
-    Sequence& sequence, LessThan&& comp) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIter<Sequence>
+    c_min_element(Sequence& sequence, LessThan&& comp) {
   return std::min_element(container_algorithm_internal::c_begin(sequence),
                           container_algorithm_internal::c_end(sequence),
                           std::forward<LessThan>(comp));
@@ -1522,8 +1557,9 @@ container_algorithm_internal::ContainerIter<Sequence> c_min_element(
 // to return an iterator pointing to the element with the largest value, using
 // `operator<` to make the comparisons.
 template <typename Sequence>
-container_algorithm_internal::ContainerIter<Sequence> c_max_element(
-    Sequence& sequence) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIter<Sequence>
+    c_max_element(Sequence& sequence) {
   return std::max_element(container_algorithm_internal::c_begin(sequence),
                           container_algorithm_internal::c_end(sequence));
 }
@@ -1531,8 +1567,9 @@ container_algorithm_internal::ContainerIter<Sequence> c_max_element(
 // Overload of c_max_element() for performing a `comp` comparison other than
 // `operator<`.
 template <typename Sequence, typename LessThan>
-container_algorithm_internal::ContainerIter<Sequence> c_max_element(
-    Sequence& sequence, LessThan&& comp) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIter<Sequence>
+    c_max_element(Sequence& sequence, LessThan&& comp) {
   return std::max_element(container_algorithm_internal::c_begin(sequence),
                           container_algorithm_internal::c_end(sequence),
                           std::forward<LessThan>(comp));
@@ -1545,8 +1582,9 @@ container_algorithm_internal::ContainerIter<Sequence> c_max_element(
 // smallest and largest values, respectively, using `operator<` to make the
 // comparisons.
 template <typename C>
-container_algorithm_internal::ContainerIterPairType<C, C> c_minmax_element(
-    C& c) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIterPairType<C, C>
+    c_minmax_element(C& c) {
   return std::minmax_element(container_algorithm_internal::c_begin(c),
                              container_algorithm_internal::c_end(c));
 }
@@ -1554,8 +1592,9 @@ container_algorithm_internal::ContainerIterPairType<C, C> c_minmax_element(
 // Overload of c_minmax_element() for performing `comp` comparisons other than
 // `operator<`.
 template <typename C, typename LessThan>
-container_algorithm_internal::ContainerIterPairType<C, C> c_minmax_element(
-    C& c, LessThan&& comp) {
+Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+    container_algorithm_internal::ContainerIterPairType<C, C>
+    c_minmax_element(C& c, LessThan&& comp) {
   return std::minmax_element(container_algorithm_internal::c_begin(c),
                              container_algorithm_internal::c_end(c),
                              std::forward<LessThan>(comp));
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/ya.make
index ac5695f0720e..467248d2799d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/algorithm/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 NO_RUNTIME()
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/attributes.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/attributes.h
index 8865a7a294f0..5818c1361548 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/attributes.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/attributes.h
@@ -195,6 +195,9 @@
 // Y_ABSL_ATTRIBUTE_NORETURN
 //
 // Tells the compiler that a given function never returns.
+//
+// Deprecated: Prefer the `[[noreturn]]` attribute standardized by C++11 over
+// this macro.
 #if Y_ABSL_HAVE_ATTRIBUTE(noreturn) || (defined(__GNUC__) && !defined(__clang__))
 #define Y_ABSL_ATTRIBUTE_NORETURN __attribute__((noreturn))
 #elif defined(_MSC_VER)
@@ -702,6 +705,11 @@
   _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
 #define Y_ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING \
   _Pragma("GCC diagnostic pop")
+#elif defined(_MSC_VER)
+#define Y_ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING \
+  _Pragma("warning(push)") _Pragma("warning(disable: 4996)")
+#define Y_ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING \
+  _Pragma("warning(pop)")
 #else
 #define Y_ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
 #define Y_ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
@@ -808,14 +816,43 @@
 //
 // See also the upstream documentation:
 // https://clang.llvm.org/docs/AttributeReference.html#lifetimebound
+// https://learn.microsoft.com/en-us/cpp/code-quality/c26816?view=msvc-170
 #if Y_ABSL_HAVE_CPP_ATTRIBUTE(clang::lifetimebound)
 #define Y_ABSL_ATTRIBUTE_LIFETIME_BOUND [[clang::lifetimebound]]
+#elif Y_ABSL_HAVE_CPP_ATTRIBUTE(msvc::lifetimebound)
+#define Y_ABSL_ATTRIBUTE_LIFETIME_BOUND [[msvc::lifetimebound]]
 #elif Y_ABSL_HAVE_ATTRIBUTE(lifetimebound)
 #define Y_ABSL_ATTRIBUTE_LIFETIME_BOUND __attribute__((lifetimebound))
 #else
 #define Y_ABSL_ATTRIBUTE_LIFETIME_BOUND
 #endif
 
+// Y_ABSL_INTERNAL_ATTRIBUTE_VIEW indicates that a type acts like a view i.e. a
+// raw (non-owning) pointer. This enables diagnoses similar to those enabled by
+// Y_ABSL_ATTRIBUTE_LIFETIME_BOUND.
+//
+// See the following links for details:
+// https://reviews.llvm.org/D64448
+// https://lists.llvm.org/pipermail/cfe-dev/2018-November/060355.html
+#if Y_ABSL_HAVE_CPP_ATTRIBUTE(gsl::Pointer)
+#define Y_ABSL_INTERNAL_ATTRIBUTE_VIEW [[gsl::Pointer]]
+#else
+#define Y_ABSL_INTERNAL_ATTRIBUTE_VIEW
+#endif
+
+// Y_ABSL_INTERNAL_ATTRIBUTE_OWNER indicates that a type acts like a smart
+// (owning) pointer. This enables diagnoses similar to those enabled by
+// Y_ABSL_ATTRIBUTE_LIFETIME_BOUND.
+//
+// See the following links for details:
+// https://reviews.llvm.org/D64448
+// https://lists.llvm.org/pipermail/cfe-dev/2018-November/060355.html
+#if Y_ABSL_HAVE_CPP_ATTRIBUTE(gsl::Owner)
+#define Y_ABSL_INTERNAL_ATTRIBUTE_OWNER [[gsl::Owner]]
+#else
+#define Y_ABSL_INTERNAL_ATTRIBUTE_OWNER
+#endif
+
 // Y_ABSL_ATTRIBUTE_TRIVIAL_ABI
 // Indicates that a type is "trivially relocatable" -- meaning it can be
 // relocated without invoking the constructor/destructor, using a form of move
@@ -871,4 +908,51 @@
 #define Y_ABSL_ATTRIBUTE_NO_UNIQUE_ADDRESS
 #endif
 
+// Y_ABSL_ATTRIBUTE_UNINITIALIZED
+//
+// GCC and Clang support a flag `-ftrivial-auto-var-init=<option>` (<option>
+// can be "zero" or "pattern") that can be used to initialize automatic stack
+// variables. Variables with this attribute will be left uninitialized,
+// overriding the compiler flag.
+//
+// See https://clang.llvm.org/docs/AttributeReference.html#uninitialized
+// and https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html#index-uninitialized-variable-attribute
+#if Y_ABSL_HAVE_CPP_ATTRIBUTE(clang::uninitialized)
+#define Y_ABSL_ATTRIBUTE_UNINITIALIZED [[clang::uninitialized]]
+#elif Y_ABSL_HAVE_CPP_ATTRIBUTE(gnu::uninitialized)
+#define Y_ABSL_ATTRIBUTE_UNINITIALIZED [[gnu::uninitialized]]
+#elif Y_ABSL_HAVE_ATTRIBUTE(uninitialized)
+#define Y_ABSL_ATTRIBUTE_UNINITIALIZED __attribute__((uninitialized))
+#else
+#define Y_ABSL_ATTRIBUTE_UNINITIALIZED
+#endif
+
+// Y_ABSL_ATTRIBUTE_WARN_UNUSED
+//
+// Compilers routinely warn about trivial variables that are unused.  For
+// non-trivial types, this warning is suppressed since the
+// constructor/destructor may be intentional and load-bearing, for example, with
+// a RAII scoped lock.
+//
+// For example:
+//
+// class Y_ABSL_ATTRIBUTE_WARN_UNUSED MyType {
+//  public:
+//   MyType();
+//   ~MyType();
+// };
+//
+// void foo() {
+//   // Warns with Y_ABSL_ATTRIBUTE_WARN_UNUSED attribute present.
+//   MyType unused;
+// }
+//
+// See https://clang.llvm.org/docs/AttributeReference.html#warn-unused and
+// https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html#index-warn_005funused-type-attribute
+#if Y_ABSL_HAVE_CPP_ATTRIBUTE(gnu::warn_unused)
+#define Y_ABSL_ATTRIBUTE_WARN_UNUSED [[gnu::warn_unused]]
+#else
+#define Y_ABSL_ATTRIBUTE_WARN_UNUSED
+#endif
+
 #endif  // Y_ABSL_BASE_ATTRIBUTES_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/config.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/config.h
index 22bbf3c0b59a..58bafcd82907 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/config.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/config.h
@@ -117,8 +117,8 @@
 //
 // LTS releases can be obtained from
 // https://github.com/abseil/abseil-cpp/releases.
-#define Y_ABSL_LTS_RELEASE_VERSION 20240116
-#define Y_ABSL_LTS_RELEASE_PATCH_LEVEL 2
+#define Y_ABSL_LTS_RELEASE_VERSION 20240722
+#define Y_ABSL_LTS_RELEASE_PATCH_LEVEL 0
 
 // Helper macro to convert a CPP variable to a string literal.
 #define Y_ABSL_INTERNAL_DO_TOKEN_STR(x) #x
@@ -231,12 +231,11 @@ static_assert(Y_ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #endif
 
 // Y_ABSL_HAVE_TLS is defined to 1 when __thread should be supported.
-// We assume __thread is supported on Linux or Asylo when compiled with Clang or
+// We assume __thread is supported on Linux when compiled with Clang or
 // compiled against libstdc++ with _GLIBCXX_HAVE_TLS defined.
 #ifdef Y_ABSL_HAVE_TLS
 #error Y_ABSL_HAVE_TLS cannot be directly set
-#elif (defined(__linux__) || defined(__ASYLO__)) && \
-    (defined(__clang__) || defined(_GLIBCXX_HAVE_TLS))
+#elif (defined(__linux__)) && (defined(__clang__) || defined(_GLIBCXX_HAVE_TLS))
 #define Y_ABSL_HAVE_TLS 1
 #endif
 
@@ -275,53 +274,18 @@ static_assert(Y_ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #define Y_ABSL_HAVE_STD_IS_TRIVIALLY_COPYABLE 1
 #endif
 
+
 // Y_ABSL_HAVE_THREAD_LOCAL
 //
+// DEPRECATED - `thread_local` is available on all supported platforms.
 // Checks whether C++11's `thread_local` storage duration specifier is
 // supported.
 #ifdef Y_ABSL_HAVE_THREAD_LOCAL
 #error Y_ABSL_HAVE_THREAD_LOCAL cannot be directly set
-#elif defined(__APPLE__)
-// Notes:
-// * Xcode's clang did not support `thread_local` until version 8, and
-//   even then not for all iOS < 9.0.
-// * Xcode 9.3 started disallowing `thread_local` for 32-bit iOS simulator
-//   targeting iOS 9.x.
-// * Xcode 10 moves the deployment target check for iOS < 9.0 to link time
-//   making Y_ABSL_HAVE_FEATURE unreliable there.
-//
-#if Y_ABSL_HAVE_FEATURE(cxx_thread_local) && \
-    !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
-#define Y_ABSL_HAVE_THREAD_LOCAL 1
-#endif
-#else  // !defined(__APPLE__)
+#else
 #define Y_ABSL_HAVE_THREAD_LOCAL 1
 #endif
 
-// There are platforms for which TLS should not be used even though the compiler
-// makes it seem like it's supported (Android NDK < r12b for example).
-// This is primarily because of linker problems and toolchain misconfiguration:
-// Abseil does not intend to support this indefinitely. Currently, the newest
-// toolchain that we intend to support that requires this behavior is the
-// r11 NDK - allowing for a 5 year support window on that means this option
-// is likely to be removed around June of 2021.
-// TLS isn't supported until NDK r12b per
-// https://developer.android.com/ndk/downloads/revision_history.html
-// Since NDK r16, `__NDK_MAJOR__` and `__NDK_MINOR__` are defined in
-// <android/ndk-version.h>. For NDK < r16, users should define these macros,
-// e.g. `-D__NDK_MAJOR__=11 -D__NKD_MINOR__=0` for NDK r11.
-#if defined(__ANDROID__) && defined(__clang__)
-#if __has_include(<android/ndk-version.h>)
-#include <android/ndk-version.h>
-#endif  // __has_include(<android/ndk-version.h>)
-#if defined(__ANDROID__) && defined(__clang__) && defined(__NDK_MAJOR__) && \
-    defined(__NDK_MINOR__) &&                                               \
-    ((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))
-#undef Y_ABSL_HAVE_TLS
-#undef Y_ABSL_HAVE_THREAD_LOCAL
-#endif
-#endif  // defined(__ANDROID__) && defined(__clang__)
-
 // Y_ABSL_HAVE_INTRINSIC_INT128
 //
 // Checks whether the __int128 compiler extension for a 128-bit integral type is
@@ -379,9 +343,7 @@ static_assert(Y_ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #define Y_ABSL_HAVE_EXCEPTIONS 1
 #endif  // defined(__EXCEPTIONS) && Y_ABSL_HAVE_FEATURE(cxx_exceptions)
 // Handle remaining special cases and default to exceptions being supported.
-#elif !(defined(__GNUC__) && (__GNUC__ < 5) && !defined(__EXCEPTIONS)) && \
-    !(Y_ABSL_INTERNAL_HAVE_MIN_GNUC_VERSION(5, 0) &&                        \
-      !defined(__cpp_exceptions)) &&                                      \
+#elif !(defined(__GNUC__) && !defined(__cpp_exceptions)) && \
     !(defined(_MSC_VER) && !defined(_CPPUNWIND))
 #define Y_ABSL_HAVE_EXCEPTIONS 1
 #endif
@@ -416,9 +378,9 @@ static_assert(Y_ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||    \
     defined(_AIX) || defined(__ros__) || defined(__native_client__) ||       \
     defined(__asmjs__) || defined(__EMSCRIPTEN__) || defined(__Fuchsia__) || \
-    defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) ||          \
-    defined(__HAIKU__) || defined(__OpenBSD__) || defined(__NetBSD__) ||     \
-    defined(__QNX__) || defined(__VXWORKS__) || defined(__hexagon__)
+    defined(__sun) || defined(__myriad2__) || defined(__HAIKU__) ||          \
+    defined(__OpenBSD__) || defined(__NetBSD__) || defined(__QNX__) ||       \
+    defined(__VXWORKS__) || defined(__hexagon__)
 #define Y_ABSL_HAVE_MMAP 1
 #endif
 
@@ -902,9 +864,7 @@ static_assert(Y_ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #error Y_ABSL_INTERNAL_HAS_CXA_DEMANGLE cannot be directly set
 #elif defined(OS_ANDROID) && (defined(__i386__) || defined(__x86_64__))
 #define Y_ABSL_INTERNAL_HAS_CXA_DEMANGLE 0
-#elif defined(__GNUC__) && defined(__GNUC_MINOR__) &&            \
-    (__GNUC__ >= 4 || (__GNUC__ >= 3 && __GNUC_MINOR__ >= 4)) && \
-    !defined(__mips__)
+#elif defined(__GNUC__)
 #define Y_ABSL_INTERNAL_HAS_CXA_DEMANGLE 1
 #elif defined(__clang__) && !defined(_MSC_VER)
 #define Y_ABSL_INTERNAL_HAS_CXA_DEMANGLE 1
@@ -981,6 +941,27 @@ static_assert(Y_ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #define Y_ABSL_HAVE_CONSTANT_EVALUATED 1
 #endif
 
+// Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXXYY is used to conditionally define constexpr
+// for different C++ versions.
+//
+// These macros are an implementation detail and will be unconditionally removed
+// once the minimum supported C++ version catches up to a given version.
+//
+// For this reason, this symbol is considered INTERNAL and code outside of
+// Abseil must not use it.
+#if defined(Y_ABSL_INTERNAL_CPLUSPLUS_LANG) && \
+    Y_ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L
+#define Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17 constexpr
+#else
+#define Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX17
+#endif
+#if defined(Y_ABSL_INTERNAL_CPLUSPLUS_LANG) && \
+    Y_ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L
+#define Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX20 constexpr
+#else
+#define Y_ABSL_INTERNAL_CONSTEXPR_SINCE_CXX20
+#endif
+
 // Y_ABSL_INTERNAL_EMSCRIPTEN_VERSION combines Emscripten's three version macros
 // into an integer that can be compared against.
 #ifdef Y_ABSL_INTERNAL_EMSCRIPTEN_VERSION
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/dynamic_annotations.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/dynamic_annotations.h
index 1f486bc97e94..2621435b3bdf 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/dynamic_annotations.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/dynamic_annotations.h
@@ -252,25 +252,9 @@ Y_ABSL_INTERNAL_END_EXTERN_C
 
 #else  // !defined(Y_ABSL_HAVE_MEMORY_SANITIZER)
 
-// TODO(rogeeff): remove this branch
-#ifdef Y_ABSL_HAVE_THREAD_SANITIZER
-#define Y_ABSL_ANNOTATE_MEMORY_IS_INITIALIZED(address, size) \
-  do {                                                     \
-    (void)(address);                                       \
-    (void)(size);                                          \
-  } while (0)
-#define Y_ABSL_ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size) \
-  do {                                                       \
-    (void)(address);                                         \
-    (void)(size);                                            \
-  } while (0)
-#else
-
 #define Y_ABSL_ANNOTATE_MEMORY_IS_INITIALIZED(address, size)    // empty
 #define Y_ABSL_ANNOTATE_MEMORY_IS_UNINITIALIZED(address, size)  // empty
 
-#endif
-
 #endif  // Y_ABSL_HAVE_MEMORY_SANITIZER
 
 // -------------------------------------------------------------------------
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/nullability_impl.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/nullability_impl.h
index 17cd15fc172f..aa5d374aa30e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/nullability_impl.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/nullability_impl.h
@@ -19,10 +19,11 @@
 #include <type_traits>
 
 #include "y_absl/base/attributes.h"
+#include "y_absl/base/config.h"
 #include "y_absl/meta/type_traits.h"
 
 namespace y_absl {
-
+Y_ABSL_NAMESPACE_BEGIN
 namespace nullability_internal {
 
 // `IsNullabilityCompatible` checks whether its first argument is a class
@@ -101,6 +102,7 @@ using NullabilityUnknownImpl
     = T;
 
 }  // namespace nullability_internal
+Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
 
 #endif  // Y_ABSL_BASE_INTERNAL_NULLABILITY_IMPL_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/poison.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/poison.cc
new file mode 100644
index 000000000000..10d608a942f7
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/poison.cc
@@ -0,0 +1,84 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "y_absl/base/internal/poison.h"
+
+#include <cstdlib>
+
+#include "y_absl/base/config.h"
+#include "y_absl/base/internal/direct_mmap.h"
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
+#if defined(Y_ABSL_HAVE_ADDRESS_SANITIZER)
+#include <sanitizer/asan_interface.h>
+#elif defined(Y_ABSL_HAVE_MEMORY_SANITIZER)
+#include <sanitizer/msan_interface.h>
+#elif defined(Y_ABSL_HAVE_MMAP)
+#include <sys/mman.h>
+#endif
+
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace base_internal {
+
+namespace {
+
+size_t GetPageSize() {
+#ifdef _WIN32
+  SYSTEM_INFO system_info;
+  GetSystemInfo(&system_info);
+  return system_info.dwPageSize;
+#elif defined(__wasm__) || defined(__asmjs__) || defined(__hexagon__)
+  return getpagesize();
+#else
+  return static_cast<size_t>(sysconf(_SC_PAGESIZE));
+#endif
+}
+
+}  // namespace
+
+void* InitializePoisonedPointerInternal() {
+  const size_t block_size = GetPageSize();
+#if defined(Y_ABSL_HAVE_ADDRESS_SANITIZER)
+  void* data = malloc(block_size);
+  ASAN_POISON_MEMORY_REGION(data, block_size);
+#elif defined(Y_ABSL_HAVE_MEMORY_SANITIZER)
+  void* data = malloc(block_size);
+  __msan_poison(data, block_size);
+#elif defined(Y_ABSL_HAVE_MMAP)
+  void* data = DirectMmap(nullptr, block_size, PROT_NONE,
+                          MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+  if (data == MAP_FAILED) return GetBadPointerInternal();
+#elif defined(_WIN32)
+  void* data = VirtualAlloc(nullptr, block_size, MEM_RESERVE | MEM_COMMIT,
+                            PAGE_NOACCESS);
+  if (data == nullptr) return GetBadPointerInternal();
+#else
+  return GetBadPointerInternal();
+#endif
+  // Return the middle of the block so that dereferences before and after the
+  // pointer will both crash.
+  return static_cast<char*>(data) + block_size / 2;
+}
+
+}  // namespace base_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/poison.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/poison.h
new file mode 100644
index 000000000000..4e3c7c0c33a6
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/poison.h
@@ -0,0 +1,59 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef Y_ABSL_BASE_INTERNAL_POISON_H_
+#define Y_ABSL_BASE_INTERNAL_POISON_H_
+
+#include <cstdint>
+
+#include "y_absl/base/config.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace base_internal {
+
+inline void* GetBadPointerInternal() {
+  // A likely bad pointer. Pointers are required to have high bits that are all
+  // zero or all one for certain 64-bit CPUs. This pointer value will hopefully
+  // cause a crash on dereference and also be clearly recognizable as invalid.
+  constexpr uint64_t kBadPtr = 0xBAD0BAD0BAD0BAD0;
+  auto ret = reinterpret_cast<void*>(static_cast<uintptr_t>(kBadPtr));
+#ifndef _MSC_VER  // MSVC doesn't support inline asm with `volatile`.
+  // Try to prevent the compiler from optimizing out the undefined behavior.
+  asm volatile("" : : "r"(ret) :);  // NOLINT
+#endif
+  return ret;
+}
+
+void* InitializePoisonedPointerInternal();
+
+inline void* get_poisoned_pointer() {
+#if defined(NDEBUG) && !defined(Y_ABSL_HAVE_ADDRESS_SANITIZER) && \
+    !defined(Y_ABSL_HAVE_MEMORY_SANITIZER)
+  // In optimized non-sanitized builds, avoid the function-local static because
+  // of the codegen and runtime cost.
+  return GetBadPointerInternal();
+#else
+  // Non-optimized builds may use more robust implementation. Note that we can't
+  // use a static global because Chromium doesn't allow non-constinit globals.
+  static void* ptr = InitializePoisonedPointerInternal();
+  return ptr;
+#endif
+}
+
+}  // namespace base_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
+
+#endif  // Y_ABSL_BASE_INTERNAL_POISON_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock.h
index b2e0ee8bbc01..aedfdd30b0c0 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/spinlock.h
@@ -53,7 +53,7 @@ namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
 namespace base_internal {
 
-class Y_ABSL_LOCKABLE SpinLock {
+class Y_ABSL_LOCKABLE Y_ABSL_ATTRIBUTE_WARN_UNUSED SpinLock {
  public:
   SpinLock() : lockword_(kSpinLockCooperative) {
     Y_ABSL_TSAN_MUTEX_CREATE(this, __tsan_mutex_not_static);
@@ -89,7 +89,8 @@ class Y_ABSL_LOCKABLE SpinLock {
   // acquisition was successful.  If the lock was not acquired, false is
   // returned.  If this SpinLock is free at the time of the call, TryLock
   // will return true with high probability.
-  inline bool TryLock() Y_ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+  Y_ABSL_MUST_USE_RESULT inline bool TryLock()
+      Y_ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
     Y_ABSL_TSAN_MUTEX_PRE_LOCK(this, __tsan_mutex_try_lock);
     bool res = TryLockImpl();
     Y_ABSL_TSAN_MUTEX_POST_LOCK(
@@ -120,7 +121,7 @@ class Y_ABSL_LOCKABLE SpinLock {
   // Determine if the lock is held.  When the lock is held by the invoking
   // thread, true will always be returned. Intended to be used as
   // CHECK(lock.IsHeld()).
-  inline bool IsHeld() const {
+  Y_ABSL_MUST_USE_RESULT inline bool IsHeld() const {
     return (lockword_.load(std::memory_order_relaxed) & kSpinLockHeld) != 0;
   }
 
@@ -202,6 +203,15 @@ class Y_ABSL_LOCKABLE SpinLock {
 
 // Corresponding locker object that arranges to acquire a spinlock for
 // the duration of a C++ scope.
+//
+// TODO(b/176172494): Use only [[nodiscard]] when baseline is raised.
+// TODO(b/6695610): Remove forward declaration when #ifdef is no longer needed.
+#if Y_ABSL_HAVE_CPP_ATTRIBUTE(nodiscard)
+class [[nodiscard]] SpinLockHolder;
+#else
+class Y_ABSL_MUST_USE_RESULT Y_ABSL_ATTRIBUTE_TRIVIAL_ABI SpinLockHolder;
+#endif
+
 class Y_ABSL_SCOPED_LOCKABLE SpinLockHolder {
  public:
   inline explicit SpinLockHolder(SpinLock* l) Y_ABSL_EXCLUSIVE_LOCK_FUNCTION(l)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/unscaledcycleclock.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/unscaledcycleclock.cc
index afd1a8b11054..eed845ff0fdf 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/unscaledcycleclock.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/unscaledcycleclock.cc
@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() {
   return aarch64_timer_frequency;
 }
 
-#elif defined(__riscv)
-
-int64_t UnscaledCycleClock::Now() {
-  int64_t virtual_timer_value;
-  asm volatile("rdcycle %0" : "=r"(virtual_timer_value));
-  return virtual_timer_value;
-}
-
-double UnscaledCycleClock::Frequency() {
-  return base_internal::NominalCPUFrequency();
-}
-
 #elif defined(_M_IX86) || defined(_M_X64)
 
 #pragma intrinsic(__rdtsc)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/unscaledcycleclock_config.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/unscaledcycleclock_config.h
index 5ea8eac335bd..80cf455a43c1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/unscaledcycleclock_config.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/unscaledcycleclock_config.h
@@ -21,8 +21,8 @@
 
 // The following platforms have an implementation of a hardware counter.
 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
-    defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+    defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) ||     \
+    (defined(_M_X64) && !defined(_M_ARM64EC))
 #define Y_ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
 #else
 #define Y_ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
@@ -53,8 +53,8 @@
 #if Y_ABSL_USE_UNSCALED_CYCLECLOCK
 // This macro can be used to test if UnscaledCycleClock::Frequency()
 // is NominalCPUFrequency() on a particular platform.
-#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \
-     defined(_M_IX86) || defined(_M_X64))
+#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
+     defined(_M_X64))
 #define Y_ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
 #endif
 #endif
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/macros.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/macros.h
index e343701084b1..62aab2511111 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/macros.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/macros.h
@@ -138,4 +138,52 @@ Y_ABSL_NAMESPACE_END
 #define Y_ABSL_INTERNAL_RETHROW do {} while (false)
 #endif  // Y_ABSL_HAVE_EXCEPTIONS
 
+// Y_ABSL_DEPRECATE_AND_INLINE()
+//
+// Marks a function or type alias as deprecated and tags it to be picked up for
+// automated refactoring by go/cpp-inliner. It can added to inline function
+// definitions or type aliases. It should only be used within a header file. It
+// differs from `Y_ABSL_DEPRECATED` in the following ways:
+//
+// 1. New uses of the function or type will be discouraged via Tricorder
+//    warnings.
+// 2. If enabled via `METADATA`, automated changes will be sent out inlining the
+//    functions's body or replacing the type where it is used.
+//
+// For example:
+//
+// Y_ABSL_DEPRECATE_AND_INLINE() inline int OldFunc(int x) {
+//   return NewFunc(x, 0);
+// }
+//
+// will mark `OldFunc` as deprecated, and the go/cpp-inliner service will
+// replace calls to `OldFunc(x)` with calls to `NewFunc(x, 0)`. Once all calls
+// to `OldFunc` have been replaced, `OldFunc` can be deleted.
+//
+// See go/cpp-inliner for more information.
+//
+// Note: go/cpp-inliner is Google-internal service for automated refactoring.
+// While open-source users do not have access to this service, the macro is
+// provided for compatibility, and so that users receive deprecation warnings.
+#if Y_ABSL_HAVE_CPP_ATTRIBUTE(deprecated) && \
+    Y_ABSL_HAVE_CPP_ATTRIBUTE(clang::annotate)
+#define Y_ABSL_DEPRECATE_AND_INLINE() [[deprecated, clang::annotate("inline-me")]]
+#elif Y_ABSL_HAVE_CPP_ATTRIBUTE(deprecated)
+#define Y_ABSL_DEPRECATE_AND_INLINE() [[deprecated]]
+#else
+#define Y_ABSL_DEPRECATE_AND_INLINE()
+#endif
+
+// Requires the compiler to prove that the size of the given object is at least
+// the expected amount.
+#if Y_ABSL_HAVE_ATTRIBUTE(diagnose_if) && Y_ABSL_HAVE_BUILTIN(__builtin_object_size)
+#define Y_ABSL_INTERNAL_NEED_MIN_SIZE(Obj, N)                     \
+  __attribute__((diagnose_if(__builtin_object_size(Obj, 0) < N, \
+                             "object size provably too small "  \
+                             "(this would corrupt memory)",     \
+                             "error")))
+#else
+#define Y_ABSL_INTERNAL_NEED_MIN_SIZE(Obj, N)
+#endif
+
 #endif  // Y_ABSL_BASE_MACROS_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/no_destructor.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/no_destructor.h
index 03dff922c60e..2e01b93a6838 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/no_destructor.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/no_destructor.h
@@ -21,14 +21,13 @@
 // such an object survives during program exit (and can be safely accessed at
 // any time).
 //
-// Objects of such type, if constructed safely and under the right conditions,
-// provide two main benefits over other alternatives:
-//
-//   * Global objects not normally allowed due to concerns of destruction order
-//     (i.e. no "complex globals") can be safely allowed, provided that such
-//     objects can be constant initialized.
-//   * Function scope static objects can be optimized to avoid heap allocation,
-//     pointer chasing, and allow lazy construction.
+// y_absl::NoDestructor<T> is useful when when a variable has static storage
+// duration but its type has a non-trivial destructor. Global constructors are
+// not recommended because of the C++'s static initialization order fiasco (See
+// https://en.cppreference.com/w/cpp/language/siof). Global destructors are not
+// allowed due to similar concerns about destruction ordering. Using
+// y_absl::NoDestructor<T> as a function-local static prevents both of these
+// issues.
 //
 // See below for complete details.
 
@@ -41,6 +40,7 @@
 #include <utility>
 
 #include "y_absl/base/config.h"
+#include "y_absl/base/nullability.h"
 
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
@@ -49,8 +49,8 @@ Y_ABSL_NAMESPACE_BEGIN
 //
 // NoDestructor<T> is a wrapper around an object of type T that behaves as an
 // object of type T but never calls T's destructor. NoDestructor<T> makes it
-// safer and/or more efficient to use such objects in static storage contexts:
-// as global or function scope static variables.
+// safer and/or more efficient to use such objects in static storage contexts,
+// ideally as function scope static variables.
 //
 // An instance of y_absl::NoDestructor<T> has similar type semantics to an
 // instance of T:
@@ -61,9 +61,6 @@ Y_ABSL_NAMESPACE_BEGIN
 //   `->`, `*`, and `get()`.
 //   (Note that `const NoDestructor<T>` works like a pointer to const `T`.)
 //
-// An object of type NoDestructor<T> should be defined in static storage:
-// as either a global static object, or as a function scope static variable.
-//
 // Additionally, NoDestructor<T> provides the following benefits:
 //
 // * Never calls T's destructor for the object
@@ -71,24 +68,7 @@ Y_ABSL_NAMESPACE_BEGIN
 //   lazily constructed.
 //
 // An object of type NoDestructor<T> is "trivially destructible" in the notion
-// that its destructor is never run. Provided that an object of this type can be
-// safely initialized and does not need to be cleaned up on program shutdown,
-// NoDestructor<T> allows you to define global static variables, since Google's
-// C++ style guide ban on such objects doesn't apply to objects that are
-// trivially destructible.
-//
-// Usage as Global Static Variables
-//
-// NoDestructor<T> allows declaration of a global object with a non-trivial
-// constructor in static storage without needing to add a destructor.
-// However, such objects still need to worry about initialization order, so
-// such objects should be const initialized:
-//
-//    // Global or namespace scope.
-//    Y_ABSL_CONST_INIT y_absl::NoDestructor<MyRegistry> reg{"foo", "bar", 8008};
-//
-// Note that if your object already has a trivial destructor, you don't need to
-// use NoDestructor<T>.
+// that its destructor is never run.
 //
 // Usage as Function Scope Static Variables
 //
@@ -114,6 +94,21 @@ Y_ABSL_NAMESPACE_BEGIN
 //     return *x;
 //   }
 //
+// Usage as Global Static Variables
+//
+// NoDestructor<T> allows declaration of a global object of type T that has a
+// non-trivial destructor since its destructor is never run. However, such
+// objects still need to worry about initialization order, so such use is not
+// recommended, strongly discouraged by the Google C++ Style Guide, and outright
+// banned in Chromium.
+// See https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables
+//
+//    // Global or namespace scope.
+//    y_absl::NoDestructor<MyRegistry> reg{"foo", "bar", 8008};
+//
+// Note that if your object already has a trivial destructor, you don't need to
+// use NoDestructor<T>.
+//
 template <typename T>
 class NoDestructor {
  public:
@@ -140,11 +135,11 @@ class NoDestructor {
   // Pretend to be a smart pointer to T with deep constness.
   // Never returns a null pointer.
   T& operator*() { return *get(); }
-  T* operator->() { return get(); }
-  T* get() { return impl_.get(); }
+  y_absl::Nonnull<T*> operator->() { return get(); }
+  y_absl::Nonnull<T*> get() { return impl_.get(); }
   const T& operator*() const { return *get(); }
-  const T* operator->() const { return get(); }
-  const T* get() const { return impl_.get(); }
+  y_absl::Nonnull<const T*> operator->() const { return get(); }
+  y_absl::Nonnull<const T*> get() const { return impl_.get(); }
 
  private:
   class DirectImpl {
@@ -152,8 +147,8 @@ class NoDestructor {
     template <typename... Args>
     explicit constexpr DirectImpl(Args&&... args)
         : value_(std::forward<Args>(args)...) {}
-    const T* get() const { return &value_; }
-    T* get() { return &value_; }
+    y_absl::Nonnull<const T*> get() const { return &value_; }
+    y_absl::Nonnull<T*> get() { return &value_; }
 
    private:
     T value_;
@@ -165,14 +160,14 @@ class NoDestructor {
     explicit PlacementImpl(Args&&... args) {
       new (&space_) T(std::forward<Args>(args)...);
     }
-    const T* get() const {
+    y_absl::Nonnull<const T*> get() const {
       return Launder(reinterpret_cast<const T*>(&space_));
     }
-    T* get() { return Launder(reinterpret_cast<T*>(&space_)); }
+    y_absl::Nonnull<T*> get() { return Launder(reinterpret_cast<T*>(&space_)); }
 
    private:
     template <typename P>
-    static P* Launder(P* p) {
+    static y_absl::Nonnull<P*> Launder(y_absl::Nonnull<P*> p) {
 #if defined(__cpp_lib_launder) && __cpp_lib_launder >= 201606L
       return std::launder(p);
 #elif Y_ABSL_HAVE_BUILTIN(__builtin_launder)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/nullability.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/nullability.h
index 4930eb7ac50c..cd5b21ac3720 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/nullability.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/nullability.h
@@ -128,9 +128,17 @@
 //
 // By default, nullability annotations are applicable to raw and smart
 // pointers. User-defined types can indicate compatibility with nullability
-// annotations by providing an `absl_nullability_compatible` nested type. The
-// actual definition of this inner type is not relevant as it is used merely as
-// a marker. It is common to use a using declaration of
+// annotations by adding the Y_ABSL_NULLABILITY_COMPATIBLE attribute.
+//
+// // Example:
+// struct Y_ABSL_NULLABILITY_COMPATIBLE MyPtr {
+//   ...
+// };
+//
+// Note: For the time being, nullability-compatible classes should additionally
+// be marked with an `absl_nullability_compatible` nested type (this will soon
+// be deprecated). The actual definition of this inner type is not relevant as
+// it is used merely as a marker. It is common to use a using declaration of
 // `absl_nullability_compatible` set to void.
 //
 // // Example:
@@ -150,14 +158,16 @@
 #ifndef Y_ABSL_BASE_NULLABILITY_H_
 #define Y_ABSL_BASE_NULLABILITY_H_
 
+#include "y_absl/base/config.h"
 #include "y_absl/base/internal/nullability_impl.h"
 
 namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
 
 // y_absl::Nonnull
 //
 // The indicated pointer is never null. It is the responsibility of the provider
-// of this pointer across an API boundary to ensure that the pointer is never be
+// of this pointer across an API boundary to ensure that the pointer is never
 // set to null. Consumers of this pointer across an API boundary may safely
 // dereference the pointer.
 //
@@ -198,9 +208,9 @@ using Nullable = nullability_internal::NullableImpl<T>;
 // migrated into one of the above two nullability states: `Nonnull<T>` or
 //  `Nullable<T>`.
 //
-// NOTE: Because this annotation is the global default state, pointers without
-// any annotation are assumed to have "unknown" semantics. This assumption is
-// designed to minimize churn and reduce clutter within the codebase.
+// NOTE: Because this annotation is the global default state, unannotated
+// pointers are assumed to have "unknown" semantics. This assumption is designed
+// to minimize churn and reduce clutter within the codebase.
 //
 // Example:
 //
@@ -219,6 +229,22 @@ using Nullable = nullability_internal::NullableImpl<T>;
 template <typename T>
 using NullabilityUnknown = nullability_internal::NullabilityUnknownImpl<T>;
 
+Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
 
+// Y_ABSL_NULLABILITY_COMPATIBLE
+//
+// Indicates that a class is compatible with nullability annotations.
+//
+// For example:
+//
+// struct Y_ABSL_NULLABILITY_COMPATIBLE MyPtr {
+//   ...
+// };
+#if Y_ABSL_HAVE_FEATURE(nullability_on_classes)
+#define Y_ABSL_NULLABILITY_COMPATIBLE _Nullable
+#else
+#define Y_ABSL_NULLABILITY_COMPATIBLE
+#endif
+
 #endif  // Y_ABSL_BASE_NULLABILITY_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/optimization.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/optimization.h
index 2fdcacfd7253..b977c63e4392 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/optimization.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/optimization.h
@@ -18,12 +18,23 @@
 // -----------------------------------------------------------------------------
 //
 // This header file defines portable macros for performance optimization.
+//
+// This header is included in both C++ code and legacy C code and thus must
+// remain compatible with both C and C++. C compatibility will be removed if
+// the legacy code is removed or converted to C++. Do not include this header in
+// new code that requires C compatibility or assume C compatibility will remain
+// indefinitely.
 
 #ifndef Y_ABSL_BASE_OPTIMIZATION_H_
 #define Y_ABSL_BASE_OPTIMIZATION_H_
 
 #include <assert.h>
 
+#ifdef __cplusplus
+// Included for std::unreachable()
+#include <utility>
+#endif  // __cplusplus
+
 #include "y_absl/base/config.h"
 #include "y_absl/base/options.h"
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/options.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/options.h
index 84f6d4df4452..7f39f260754c 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/options.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/options.h
@@ -226,7 +226,7 @@
 // allowed.
 
 #define Y_ABSL_OPTION_USE_INLINE_NAMESPACE 1
-#define Y_ABSL_OPTION_INLINE_NAMESPACE_NAME lts_y_20240116
+#define Y_ABSL_OPTION_INLINE_NAMESPACE_NAME lts_y_20240722
 
 // Y_ABSL_OPTION_HARDENED
 //
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/prefetch.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/prefetch.h
index 53f25bbd06f6..fe1103e44144 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/prefetch.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/prefetch.h
@@ -129,7 +129,7 @@ void PrefetchToLocalCacheNta(const void* addr);
 //
 //  void* Arena::Allocate(size_t size) {
 //    void* ptr = AllocateBlock(size);
-//    y_absl::PrefetchToLocalCacheForWrite(p);
+//    y_absl::PrefetchToLocalCacheForWrite(ptr);
 //    return ptr;
 //  }
 //
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/base/ya.make
index 7f1a35bfcf4d..ca91a4610e41 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/ya.make
@@ -19,6 +19,7 @@ NO_COMPILER_WARNINGS()
 SRCS(
     internal/cycleclock.cc
     internal/low_level_alloc.cc
+    internal/poison.cc
     internal/raw_logging.cc
     internal/scoped_set_env.cc
     internal/spinlock.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/flat_hash_map.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/flat_hash_map.h
index c71b6402a7fb..a24278b56dbc 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/flat_hash_map.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/flat_hash_map.h
@@ -26,21 +26,24 @@
 //
 // In most cases, your default choice for a hash map should be a map of type
 // `flat_hash_map`.
+//
+// `flat_hash_map` is not exception-safe.
 
 #ifndef Y_ABSL_CONTAINER_FLAT_HASH_MAP_H_
 #define Y_ABSL_CONTAINER_FLAT_HASH_MAP_H_
 
 #include <cstddef>
-#include <new>
+#include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "y_absl/algorithm/container.h"
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/macros.h"
+#include "y_absl/container/hash_container_defaults.h"
 #include "y_absl/container/internal/container_memory.h"
-#include "y_absl/container/internal/hash_function_defaults.h"  // IWYU pragma: export
 #include "y_absl/container/internal/raw_hash_map.h"  // IWYU pragma: export
-#include "y_absl/memory/memory.h"
+#include "y_absl/meta/type_traits.h"
 
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
@@ -62,7 +65,7 @@ struct FlatHashMapPolicy;
 // * Requires values that are MoveConstructible
 // * Supports heterogeneous lookup, through `find()`, `operator[]()` and
 //   `insert()`, provided that the map is provided a compatible heterogeneous
-//   hashing function and equality operator.
+//   hashing function and equality operator. See below for details.
 // * Invalidates any references and pointers to elements within the table after
 //   `rehash()` and when the table is moved.
 // * Contains a `capacity()` member function indicating the number of element
@@ -80,6 +83,19 @@ struct FlatHashMapPolicy;
 // libraries (e.g. .dll, .so) is unsupported due to way `y_absl::Hash` values may
 // be randomized across dynamically loaded libraries.
 //
+// To achieve heterogeneous lookup for custom types either `Hash` and `Eq` type
+// parameters can be used or `T` should have public inner types
+// `absl_container_hash` and (optionally) `absl_container_eq`. In either case,
+// `typename Hash::is_transparent` and `typename Eq::is_transparent` should be
+// well-formed. Both types are basically functors:
+// * `Hash` should support `size_t operator()(U val) const` that returns a hash
+// for the given `val`.
+// * `Eq` should support `bool operator()(U lhs, V rhs) const` that returns true
+// if `lhs` is equal to `rhs`.
+//
+// In most cases `T` needs only to provide the `absl_container_hash`. In this
+// case `std::equal_to<void>` will be used instead of `eq` part.
+//
 // NOTE: A `flat_hash_map` stores its value types directly inside its
 // implementation array to avoid memory indirection. Because a `flat_hash_map`
 // is designed to move data when rehashed, map values will not retain pointer
@@ -106,13 +122,13 @@ struct FlatHashMapPolicy;
 //  if (result != ducks.end()) {
 //    std::cout << "Result: " << result->second << std::endl;
 //  }
-template <class K, class V,
-          class Hash = y_absl::container_internal::hash_default_hash<K>,
-          class Eq = y_absl::container_internal::hash_default_eq<K>,
+template <class K, class V, class Hash = DefaultHashContainerHash<K>,
+          class Eq = DefaultHashContainerEq<K>,
           class Allocator = std::allocator<std::pair<const K, V>>>
-class flat_hash_map : public y_absl::container_internal::raw_hash_map<
-                          y_absl::container_internal::FlatHashMapPolicy<K, V>,
-                          Hash, Eq, Allocator> {
+class Y_ABSL_INTERNAL_ATTRIBUTE_OWNER flat_hash_map
+    : public y_absl::container_internal::raw_hash_map<
+          y_absl::container_internal::FlatHashMapPolicy<K, V>, Hash, Eq,
+          Allocator> {
   using Base = typename flat_hash_map::raw_hash_map;
 
  public:
@@ -560,6 +576,38 @@ typename flat_hash_map<K, V, H, E, A>::size_type erase_if(
 
 namespace container_internal {
 
+// c_for_each_fast(flat_hash_map<>, Function)
+//
+// Container-based version of the <algorithm> `std::for_each()` function to
+// apply a function to a container's elements.
+// There is no guarantees on the order of the function calls.
+// Erasure and/or insertion of elements in the function is not allowed.
+template <typename K, typename V, typename H, typename E, typename A,
+          typename Function>
+decay_t<Function> c_for_each_fast(const flat_hash_map<K, V, H, E, A>& c,
+                                  Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+template <typename K, typename V, typename H, typename E, typename A,
+          typename Function>
+decay_t<Function> c_for_each_fast(flat_hash_map<K, V, H, E, A>& c,
+                                  Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+template <typename K, typename V, typename H, typename E, typename A,
+          typename Function>
+decay_t<Function> c_for_each_fast(flat_hash_map<K, V, H, E, A>&& c,
+                                  Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+
+}  // namespace container_internal
+
+namespace container_internal {
+
 template <class K, class V>
 struct FlatHashMapPolicy {
   using slot_policy = container_internal::map_slot_policy<K, V>;
@@ -573,9 +621,10 @@ struct FlatHashMapPolicy {
     slot_policy::construct(alloc, slot, std::forward<Args>(args)...);
   }
 
+  // Returns std::true_type in case destroy is trivial.
   template <class Allocator>
-  static void destroy(Allocator* alloc, slot_type* slot) {
-    slot_policy::destroy(alloc, slot);
+  static auto destroy(Allocator* alloc, slot_type* slot) {
+    return slot_policy::destroy(alloc, slot);
   }
 
   template <class Allocator>
@@ -592,6 +641,13 @@ struct FlatHashMapPolicy {
                                                    std::forward<Args>(args)...);
   }
 
+  template <class Hash>
+  static constexpr HashSlotFn get_hash_slot_fn() {
+    return memory_internal::IsLayoutCompatible<K, V>::value
+               ? &TypeErasedApplyToSlotFn<Hash, K>
+               : nullptr;
+  }
+
   static size_t space_used(const slot_type*) { return 0; }
 
   static std::pair<const K, V>& element(slot_type* slot) { return slot->value; }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/flat_hash_set.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/flat_hash_set.h
index c9d414d6caf7..3e92ef2cf136 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/flat_hash_set.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/flat_hash_set.h
@@ -26,18 +26,25 @@
 //
 // In most cases, your default choice for a hash set should be a set of type
 // `flat_hash_set`.
+//
+// `flat_hash_set` is not exception-safe.
+
 #ifndef Y_ABSL_CONTAINER_FLAT_HASH_SET_H_
 #define Y_ABSL_CONTAINER_FLAT_HASH_SET_H_
 
+#include <cstddef>
+#include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "y_absl/algorithm/container.h"
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/macros.h"
+#include "y_absl/container/hash_container_defaults.h"
 #include "y_absl/container/internal/container_memory.h"
-#include "y_absl/container/internal/hash_function_defaults.h"  // IWYU pragma: export
 #include "y_absl/container/internal/raw_hash_set.h"  // IWYU pragma: export
 #include "y_absl/memory/memory.h"
+#include "y_absl/meta/type_traits.h"
 
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
@@ -58,7 +65,7 @@ struct FlatHashSetPolicy;
 // * Requires keys that are CopyConstructible
 // * Supports heterogeneous lookup, through `find()` and `insert()`, provided
 //   that the set is provided a compatible heterogeneous hashing function and
-//   equality operator.
+//   equality operator. See below for details.
 // * Invalidates any references and pointers to elements within the table after
 //   `rehash()` and when the table is moved.
 // * Contains a `capacity()` member function indicating the number of element
@@ -76,6 +83,19 @@ struct FlatHashSetPolicy;
 // libraries (e.g. .dll, .so) is unsupported due to way `y_absl::Hash` values may
 // be randomized across dynamically loaded libraries.
 //
+// To achieve heterogeneous lookup for custom types either `Hash` and `Eq` type
+// parameters can be used or `T` should have public inner types
+// `absl_container_hash` and (optionally) `absl_container_eq`. In either case,
+// `typename Hash::is_transparent` and `typename Eq::is_transparent` should be
+// well-formed. Both types are basically functors:
+// * `Hash` should support `size_t operator()(U val) const` that returns a hash
+// for the given `val`.
+// * `Eq` should support `bool operator()(U lhs, V rhs) const` that returns true
+// if `lhs` is equal to `rhs`.
+//
+// In most cases `T` needs only to provide the `absl_container_hash`. In this
+// case `std::equal_to<void>` will be used instead of `eq` part.
+//
 // NOTE: A `flat_hash_set` stores its keys directly inside its implementation
 // array to avoid memory indirection. Because a `flat_hash_set` is designed to
 // move data when rehashed, set keys will not retain pointer stability. If you
@@ -99,10 +119,10 @@ struct FlatHashSetPolicy;
 //  if (ducks.contains("dewey")) {
 //    std::cout << "We found dewey!" << std::endl;
 //  }
-template <class T, class Hash = y_absl::container_internal::hash_default_hash<T>,
-          class Eq = y_absl::container_internal::hash_default_eq<T>,
+template <class T, class Hash = DefaultHashContainerHash<T>,
+          class Eq = DefaultHashContainerEq<T>,
           class Allocator = std::allocator<T>>
-class flat_hash_set
+class Y_ABSL_INTERNAL_ATTRIBUTE_OWNER flat_hash_set
     : public y_absl::container_internal::raw_hash_set<
           y_absl::container_internal::FlatHashSetPolicy<T>, Hash, Eq, Allocator> {
   using Base = typename flat_hash_set::raw_hash_set;
@@ -460,6 +480,33 @@ typename flat_hash_set<T, H, E, A>::size_type erase_if(
 
 namespace container_internal {
 
+// c_for_each_fast(flat_hash_set<>, Function)
+//
+// Container-based version of the <algorithm> `std::for_each()` function to
+// apply a function to a container's elements.
+// There is no guarantees on the order of the function calls.
+// Erasure and/or insertion of elements in the function is not allowed.
+template <typename T, typename H, typename E, typename A, typename Function>
+decay_t<Function> c_for_each_fast(const flat_hash_set<T, H, E, A>& c,
+                                  Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+template <typename T, typename H, typename E, typename A, typename Function>
+decay_t<Function> c_for_each_fast(flat_hash_set<T, H, E, A>& c, Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+template <typename T, typename H, typename E, typename A, typename Function>
+decay_t<Function> c_for_each_fast(flat_hash_set<T, H, E, A>&& c, Function&& f) {
+  container_internal::ForEach(f, &c);
+  return f;
+}
+
+}  // namespace container_internal
+
+namespace container_internal {
+
 template <class T>
 struct FlatHashSetPolicy {
   using slot_type = T;
@@ -473,9 +520,11 @@ struct FlatHashSetPolicy {
                                                  std::forward<Args>(args)...);
   }
 
+  // Return std::true_type in case destroy is trivial.
   template <class Allocator>
-  static void destroy(Allocator* alloc, slot_type* slot) {
+  static auto destroy(Allocator* alloc, slot_type* slot) {
     y_absl::allocator_traits<Allocator>::destroy(*alloc, slot);
+    return IsDestructionTrivial<Allocator, slot_type>();
   }
 
   static T& element(slot_type* slot) { return *slot; }
@@ -489,6 +538,11 @@ struct FlatHashSetPolicy {
   }
 
   static size_t space_used(const T*) { return 0; }
+
+  template <class Hash>
+  static constexpr HashSlotFn get_hash_slot_fn() {
+    return &TypeErasedApplyToSlotFn<Hash, T>;
+  }
 };
 }  // namespace container_internal
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/hash_container_defaults.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/hash_container_defaults.h
new file mode 100644
index 000000000000..8b234f9c9000
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/hash_container_defaults.h
@@ -0,0 +1,45 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef Y_ABSL_CONTAINER_HASH_CONTAINER_DEFAULTS_H_
+#define Y_ABSL_CONTAINER_HASH_CONTAINER_DEFAULTS_H_
+
+#include "y_absl/base/config.h"
+#include "y_absl/container/internal/hash_function_defaults.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+
+// DefaultHashContainerHash is a convenience alias for the functor that is used
+// by default by Abseil hash-based (unordered) containers for hashing when
+// `Hash` type argument is not explicitly specified.
+//
+// This type alias can be used by generic code that wants to provide more
+// flexibility for defining underlying containers.
+template <typename T>
+using DefaultHashContainerHash = y_absl::container_internal::hash_default_hash<T>;
+
+// DefaultHashContainerEq is a convenience alias for the functor that is used by
+// default by Abseil hash-based (unordered) containers for equality check when
+// `Eq` type argument is not explicitly specified.
+//
+// This type alias can be used by generic code that wants to provide more
+// flexibility for defining underlying containers.
+template <typename T>
+using DefaultHashContainerEq = y_absl::container_internal::hash_default_eq<T>;
+
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
+
+#endif  // Y_ABSL_CONTAINER_HASH_CONTAINER_DEFAULTS_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/inlined_vector.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/inlined_vector.h
index f5df597aca17..e2a782f460c6 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/inlined_vector.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/inlined_vector.h
@@ -775,7 +775,20 @@ class InlinedVector {
     Y_ABSL_HARDENING_ASSERT(pos >= begin());
     Y_ABSL_HARDENING_ASSERT(pos < end());
 
+    // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102329#c2
+    // It appears that GCC thinks that since `pos` is a const pointer and may
+    // point to uninitialized memory at this point, a warning should be
+    // issued. But `pos` is actually only used to compute an array index to
+    // write to.
+#if !defined(__clang__) && defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#pragma GCC diagnostic ignored "-Wuninitialized"
+#endif
     return storage_.Erase(pos, pos + 1);
+#if !defined(__clang__) && defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
   }
 
   // Overload of `InlinedVector::erase(...)` that erases every element in the
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/common_policy_traits.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/common_policy_traits.h
index cdc3b07f32b8..cc73685dc8f6 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/common_policy_traits.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/common_policy_traits.h
@@ -45,9 +45,10 @@ struct common_policy_traits {
 
   // PRECONDITION: `slot` is INITIALIZED
   // POSTCONDITION: `slot` is UNINITIALIZED
+  // Returns std::true_type in case destroy is trivial.
   template <class Alloc>
-  static void destroy(Alloc* alloc, slot_type* slot) {
-    Policy::destroy(alloc, slot);
+  static auto destroy(Alloc* alloc, slot_type* slot) {
+    return Policy::destroy(alloc, slot);
   }
 
   // Transfers the `old_slot` to `new_slot`. Any memory allocated by the
@@ -63,7 +64,7 @@ struct common_policy_traits {
   //                UNINITIALIZED
   template <class Alloc>
   static void transfer(Alloc* alloc, slot_type* new_slot, slot_type* old_slot) {
-    transfer_impl(alloc, new_slot, old_slot, Rank0{});
+    transfer_impl(alloc, new_slot, old_slot, Rank2{});
   }
 
   // PRECONDITION: `slot` is INITIALIZED
@@ -82,23 +83,31 @@ struct common_policy_traits {
 
   static constexpr bool transfer_uses_memcpy() {
     return std::is_same<decltype(transfer_impl<std::allocator<char>>(
-                            nullptr, nullptr, nullptr, Rank0{})),
+                            nullptr, nullptr, nullptr, Rank2{})),
+                        std::true_type>::value;
+  }
+
+  // Returns true if destroy is trivial and can be omitted.
+  template <class Alloc>
+  static constexpr bool destroy_is_trivial() {
+    return std::is_same<decltype(destroy<Alloc>(nullptr, nullptr)),
                         std::true_type>::value;
   }
 
  private:
-  // To rank the overloads below for overload resolution. Rank0 is preferred.
-  struct Rank2 {};
-  struct Rank1 : Rank2 {};
-  struct Rank0 : Rank1 {};
+  // Use go/ranked-overloads for dispatching.
+  struct Rank0 {};
+  struct Rank1 : Rank0 {};
+  struct Rank2 : Rank1 {};
 
   // Use auto -> decltype as an enabler.
   // P::transfer returns std::true_type if transfer uses memcpy (e.g. in
   // node_slot_policy).
   template <class Alloc, class P = Policy>
   static auto transfer_impl(Alloc* alloc, slot_type* new_slot,
-                            slot_type* old_slot, Rank0)
-      -> decltype(P::transfer(alloc, new_slot, old_slot)) {
+                            slot_type* old_slot,
+                            Rank2) -> decltype(P::transfer(alloc, new_slot,
+                                                           old_slot)) {
     return P::transfer(alloc, new_slot, old_slot);
   }
 #if defined(__cpp_lib_launder) && __cpp_lib_launder >= 201606
@@ -121,7 +130,7 @@ struct common_policy_traits {
 
   template <class Alloc>
   static void transfer_impl(Alloc* alloc, slot_type* new_slot,
-                            slot_type* old_slot, Rank2) {
+                            slot_type* old_slot, Rank0) {
     construct(alloc, new_slot, std::move(element(old_slot)));
     destroy(alloc, old_slot);
   }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/compressed_tuple.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/compressed_tuple.h
index 6602a7308818..6953a08d84b4 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/compressed_tuple.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/compressed_tuple.h
@@ -87,11 +87,11 @@ struct Storage {
   constexpr Storage() = default;
   template <typename V>
   explicit constexpr Storage(y_absl::in_place_t, V&& v)
-      : value(y_absl::forward<V>(v)) {}
+      : value(std::forward<V>(v)) {}
   constexpr const T& get() const& { return value; }
-  T& get() & { return value; }
-  constexpr const T&& get() const&& { return y_absl::move(*this).value; }
-  T&& get() && { return std::move(*this).value; }
+  constexpr T& get() & { return value; }
+  constexpr const T&& get() const&& { return std::move(*this).value; }
+  constexpr T&& get() && { return std::move(*this).value; }
 };
 
 template <typename T, size_t I>
@@ -99,13 +99,12 @@ struct Y_ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC Storage<T, I, true> : T {
   constexpr Storage() = default;
 
   template <typename V>
-  explicit constexpr Storage(y_absl::in_place_t, V&& v)
-      : T(y_absl::forward<V>(v)) {}
+  explicit constexpr Storage(y_absl::in_place_t, V&& v) : T(std::forward<V>(v)) {}
 
   constexpr const T& get() const& { return *this; }
-  T& get() & { return *this; }
-  constexpr const T&& get() const&& { return y_absl::move(*this); }
-  T&& get() && { return std::move(*this); }
+  constexpr T& get() & { return *this; }
+  constexpr const T&& get() const&& { return std::move(*this); }
+  constexpr T&& get() && { return std::move(*this); }
 };
 
 template <typename D, typename I, bool ShouldAnyUseBase>
@@ -123,7 +122,7 @@ struct Y_ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTupleImpl<
   constexpr CompressedTupleImpl() = default;
   template <typename... Vs>
   explicit constexpr CompressedTupleImpl(y_absl::in_place_t, Vs&&... args)
-      : Storage<Ts, I>(y_absl::in_place, y_absl::forward<Vs>(args))... {}
+      : Storage<Ts, I>(y_absl::in_place, std::forward<Vs>(args))... {}
   friend CompressedTuple<Ts...>;
 };
 
@@ -135,7 +134,7 @@ struct Y_ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTupleImpl<
   constexpr CompressedTupleImpl() = default;
   template <typename... Vs>
   explicit constexpr CompressedTupleImpl(y_absl::in_place_t, Vs&&... args)
-      : Storage<Ts, I, false>(y_absl::in_place, y_absl::forward<Vs>(args))... {}
+      : Storage<Ts, I, false>(y_absl::in_place, std::forward<Vs>(args))... {}
   friend CompressedTuple<Ts...>;
 };
 
@@ -234,11 +233,11 @@ class Y_ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTuple
                 bool> = true>
   explicit constexpr CompressedTuple(First&& first, Vs&&... base)
       : CompressedTuple::CompressedTupleImpl(y_absl::in_place,
-                                             y_absl::forward<First>(first),
-                                             y_absl::forward<Vs>(base)...) {}
+                                             std::forward<First>(first),
+                                             std::forward<Vs>(base)...) {}
 
   template <int I>
-  ElemT<I>& get() & {
+  constexpr ElemT<I>& get() & {
     return StorageT<I>::get();
   }
 
@@ -248,13 +247,13 @@ class Y_ABSL_INTERNAL_COMPRESSED_TUPLE_DECLSPEC CompressedTuple
   }
 
   template <int I>
-  ElemT<I>&& get() && {
+  constexpr ElemT<I>&& get() && {
     return std::move(*this).StorageT<I>::get();
   }
 
   template <int I>
   constexpr const ElemT<I>&& get() const&& {
-    return y_absl::move(*this).StorageT<I>::get();
+    return std::move(*this).StorageT<I>::get();
   }
 };
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/container_memory.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/container_memory.h
index 82bb3ebde07b..2a6281f541e6 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/container_memory.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/container_memory.h
@@ -68,6 +68,18 @@ void* Allocate(Alloc* alloc, size_t n) {
   return p;
 }
 
+// Returns true if the destruction of the value with given Allocator will be
+// trivial.
+template <class Allocator, class ValueType>
+constexpr auto IsDestructionTrivial() {
+  constexpr bool result =
+      std::is_trivially_destructible<ValueType>::value &&
+      std::is_same<typename y_absl::allocator_traits<
+                       Allocator>::template rebind_alloc<char>,
+                   std::allocator<char>>::value;
+  return std::integral_constant<bool, result>();
+}
+
 // The pointer must have been previously obtained by calling
 // Allocate<Alignment>(alloc, n).
 template <size_t Alignment, class Alloc>
@@ -414,12 +426,13 @@ struct map_slot_policy {
   }
 
   template <class Allocator>
-  static void destroy(Allocator* alloc, slot_type* slot) {
+  static auto destroy(Allocator* alloc, slot_type* slot) {
     if (kMutableKeys::value) {
       y_absl::allocator_traits<Allocator>::destroy(*alloc, &slot->mutable_value);
     } else {
       y_absl::allocator_traits<Allocator>::destroy(*alloc, &slot->value);
     }
+    return IsDestructionTrivial<Allocator, value_type>();
   }
 
   template <class Allocator>
@@ -451,6 +464,26 @@ struct map_slot_policy {
   }
 };
 
+// Type erased function for computing hash of the slot.
+using HashSlotFn = size_t (*)(const void* hash_fn, void* slot);
+
+// Type erased function to apply `Fn` to data inside of the `slot`.
+// The data is expected to have type `T`.
+template <class Fn, class T>
+size_t TypeErasedApplyToSlotFn(const void* fn, void* slot) {
+  const auto* f = static_cast<const Fn*>(fn);
+  return (*f)(*static_cast<const T*>(slot));
+}
+
+// Type erased function to apply `Fn` to data inside of the `*slot_ptr`.
+// The data is expected to have type `T`.
+template <class Fn, class T>
+size_t TypeErasedDerefAndApplyToSlotFn(const void* fn, void* slot_ptr) {
+  const auto* f = static_cast<const Fn*>(fn);
+  const T* slot = *static_cast<const T**>(slot_ptr);
+  return (*f)(*slot);
+}
+
 }  // namespace container_internal
 Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hash_function_defaults.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hash_function_defaults.h
index 98e3a9449b9b..bb4a0ddddf0b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hash_function_defaults.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hash_function_defaults.h
@@ -45,14 +45,16 @@
 #ifndef Y_ABSL_CONTAINER_INTERNAL_HASH_FUNCTION_DEFAULTS_H_
 #define Y_ABSL_CONTAINER_INTERNAL_HASH_FUNCTION_DEFAULTS_H_
 
-#include <stdint.h>
 #include <cstddef>
+#include <functional>
 #include <memory>
 #include <util/generic/string.h>
 #include <type_traits>
 
 #include "y_absl/base/config.h"
+#include "y_absl/container/internal/common.h"
 #include "y_absl/hash/hash.h"
+#include "y_absl/meta/type_traits.h"
 #include "y_absl/strings/cord.h"
 #include "y_absl/strings/string_view.h"
 
@@ -188,6 +190,71 @@ struct HashEq<std::unique_ptr<T, D>> : HashEq<T*> {};
 template <class T>
 struct HashEq<std::shared_ptr<T>> : HashEq<T*> {};
 
+template <typename T, typename E = void>
+struct HasAbslContainerHash : std::false_type {};
+
+template <typename T>
+struct HasAbslContainerHash<T, y_absl::void_t<typename T::absl_container_hash>>
+    : std::true_type {};
+
+template <typename T, typename E = void>
+struct HasAbslContainerEq : std::false_type {};
+
+template <typename T>
+struct HasAbslContainerEq<T, y_absl::void_t<typename T::absl_container_eq>>
+    : std::true_type {};
+
+template <typename T, typename E = void>
+struct AbslContainerEq {
+  using type = std::equal_to<>;
+};
+
+template <typename T>
+struct AbslContainerEq<
+    T, typename std::enable_if_t<HasAbslContainerEq<T>::value>> {
+  using type = typename T::absl_container_eq;
+};
+
+template <typename T, typename E = void>
+struct AbslContainerHash {
+  using type = void;
+};
+
+template <typename T>
+struct AbslContainerHash<
+    T, typename std::enable_if_t<HasAbslContainerHash<T>::value>> {
+  using type = typename T::absl_container_hash;
+};
+
+// HashEq specialization for user types that provide `absl_container_hash` and
+// (optionally) `absl_container_eq`. This specialization allows user types to
+// provide heterogeneous lookup without requiring to explicitly specify Hash/Eq
+// type arguments in unordered Abseil containers.
+//
+// Both `absl_container_hash` and `absl_container_eq` should be transparent
+// (have inner is_transparent type). While there is no technical reason to
+// restrict to transparent-only types, there is also no feasible use case when
+// it shouldn't be transparent - it is easier to relax the requirement later if
+// such a case arises rather than restricting it.
+//
+// If type provides only `absl_container_hash` then `eq` part will be
+// `std::equal_to<void>`.
+//
+// User types are not allowed to provide only a `Eq` part as there is no
+// feasible use case for this behavior - if Hash should be a default one then Eq
+// should be an equivalent to the `std::equal_to<T>`.
+template <typename T>
+struct HashEq<T, typename std::enable_if_t<HasAbslContainerHash<T>::value>> {
+  using Hash = typename AbslContainerHash<T>::type;
+  using Eq = typename AbslContainerEq<T>::type;
+  static_assert(IsTransparent<Hash>::value,
+                "absl_container_hash must be transparent. To achieve it add a "
+                "`using is_transparent = void;` clause to this type.");
+  static_assert(IsTransparent<Eq>::value,
+                "absl_container_eq must be transparent. To achieve it add a "
+                "`using is_transparent = void;` clause to this type.");
+};
+
 // This header's visibility is restricted.  If you need to access the default
 // hasher please use the container's ::hasher alias instead.
 //
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hash_policy_traits.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hash_policy_traits.h
index cf60b63e5fde..4eee196983b5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hash_policy_traits.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hash_policy_traits.h
@@ -148,6 +148,56 @@ struct hash_policy_traits : common_policy_traits<Policy> {
   static auto value(T* elem) -> decltype(P::value(elem)) {
     return P::value(elem);
   }
+
+  using HashSlotFn = size_t (*)(const void* hash_fn, void* slot);
+
+  template <class Hash>
+  static constexpr HashSlotFn get_hash_slot_fn() {
+// get_hash_slot_fn may return nullptr to signal that non type erased function
+// should be used. GCC warns against comparing function address with nullptr.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+// silent error: the address of * will never be NULL [-Werror=address]
+#pragma GCC diagnostic ignored "-Waddress"
+#endif
+    return Policy::template get_hash_slot_fn<Hash>() == nullptr
+               ? &hash_slot_fn_non_type_erased<Hash>
+               : Policy::template get_hash_slot_fn<Hash>();
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+  }
+
+  // Whether small object optimization is enabled. True by default.
+  static constexpr bool soo_enabled() { return soo_enabled_impl(Rank1{}); }
+
+ private:
+  template <class Hash>
+  struct HashElement {
+    template <class K, class... Args>
+    size_t operator()(const K& key, Args&&...) const {
+      return h(key);
+    }
+    const Hash& h;
+  };
+
+  template <class Hash>
+  static size_t hash_slot_fn_non_type_erased(const void* hash_fn, void* slot) {
+    return Policy::apply(HashElement<Hash>{*static_cast<const Hash*>(hash_fn)},
+                         Policy::element(static_cast<slot_type*>(slot)));
+  }
+
+  // Use go/ranked-overloads for dispatching. Rank1 is preferred.
+  struct Rank0 {};
+  struct Rank1 : Rank0 {};
+
+  // Use auto -> decltype as an enabler.
+  template <class P = Policy>
+  static constexpr auto soo_enabled_impl(Rank1) -> decltype(P::soo_enabled()) {
+    return P::soo_enabled();
+  }
+
+  static constexpr bool soo_enabled_impl(Rank0) { return true; }
 };
 
 }  // namespace container_internal
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.cc
index e6369d913d16..cb3bd879f8d1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.cc
@@ -18,12 +18,18 @@
 #include <atomic>
 #include <cassert>
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <limits>
 
 #include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
+#include "y_absl/base/internal/per_thread_tls.h"
 #include "y_absl/base/internal/raw_logging.h"
+#include "y_absl/base/macros.h"
+#include "y_absl/base/no_destructor.h"
+#include "y_absl/base/optimization.h"
 #include "y_absl/debugging/stacktrace.h"
 #include "y_absl/memory/memory.h"
 #include "y_absl/profiling/internal/exponential_biased.h"
@@ -64,7 +70,7 @@ Y_ABSL_PER_THREAD_TLS_KEYWORD SamplingState global_next_sample = {0, 0};
 #endif  // defined(Y_ABSL_INTERNAL_HASHTABLEZ_SAMPLE)
 
 HashtablezSampler& GlobalHashtablezSampler() {
-  static auto* sampler = new HashtablezSampler();
+  static y_absl::NoDestructor<HashtablezSampler> sampler;
   return *sampler;
 }
 
@@ -72,7 +78,10 @@ HashtablezInfo::HashtablezInfo() = default;
 HashtablezInfo::~HashtablezInfo() = default;
 
 void HashtablezInfo::PrepareForSampling(int64_t stride,
-                                        size_t inline_element_size_value) {
+                                        size_t inline_element_size_value,
+                                        size_t key_size_value,
+                                        size_t value_size_value,
+                                        uint16_t soo_capacity_value) {
   capacity.store(0, std::memory_order_relaxed);
   size.store(0, std::memory_order_relaxed);
   num_erases.store(0, std::memory_order_relaxed);
@@ -92,6 +101,9 @@ void HashtablezInfo::PrepareForSampling(int64_t stride,
   depth = y_absl::GetStackTrace(stack, HashtablezInfo::kMaxStackDepth,
                               /* skip_count= */ 0);
   inline_element_size = inline_element_size_value;
+  key_size = key_size_value;
+  value_size = value_size_value;
+  soo_capacity = soo_capacity_value;
 }
 
 static bool ShouldForceSampling() {
@@ -115,12 +127,13 @@ static bool ShouldForceSampling() {
 }
 
 HashtablezInfo* SampleSlow(SamplingState& next_sample,
-                           size_t inline_element_size) {
+                           size_t inline_element_size, size_t key_size,
+                           size_t value_size, uint16_t soo_capacity) {
   if (Y_ABSL_PREDICT_FALSE(ShouldForceSampling())) {
     next_sample.next_sample = 1;
     const int64_t old_stride = exchange(next_sample.sample_stride, 1);
-    HashtablezInfo* result =
-        GlobalHashtablezSampler().Register(old_stride, inline_element_size);
+    HashtablezInfo* result = GlobalHashtablezSampler().Register(
+        old_stride, inline_element_size, key_size, value_size, soo_capacity);
     return result;
   }
 
@@ -150,10 +163,12 @@ HashtablezInfo* SampleSlow(SamplingState& next_sample,
   // that case.
   if (first) {
     if (Y_ABSL_PREDICT_TRUE(--next_sample.next_sample > 0)) return nullptr;
-    return SampleSlow(next_sample, inline_element_size);
+    return SampleSlow(next_sample, inline_element_size, key_size, value_size,
+                      soo_capacity);
   }
 
-  return GlobalHashtablezSampler().Register(old_stride, inline_element_size);
+  return GlobalHashtablezSampler().Register(old_stride, inline_element_size,
+                                            key_size, value_size, soo_capacity);
 #endif
 }
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.h
index 32f64a22a62d..7c2cba672db9 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/hashtablez_sampler.h
@@ -40,15 +40,20 @@
 #define Y_ABSL_CONTAINER_INTERNAL_HASHTABLEZ_SAMPLER_H_
 
 #include <atomic>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <vector>
 
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/internal/per_thread_tls.h"
 #include "y_absl/base/optimization.h"
+#include "y_absl/base/thread_annotations.h"
 #include "y_absl/profiling/internal/sample_recorder.h"
 #include "y_absl/synchronization/mutex.h"
+#include "y_absl/time/time.h"
 #include "y_absl/utility/utility.h"
 
 namespace y_absl {
@@ -67,7 +72,9 @@ struct HashtablezInfo : public profiling_internal::Sample<HashtablezInfo> {
 
   // Puts the object into a clean state, fills in the logically `const` members,
   // blocking for any readers that are currently sampling the object.
-  void PrepareForSampling(int64_t stride, size_t inline_element_size_value)
+  void PrepareForSampling(int64_t stride, size_t inline_element_size_value,
+                          size_t key_size, size_t value_size,
+                          uint16_t soo_capacity_value)
       Y_ABSL_EXCLUSIVE_LOCKS_REQUIRED(init_mu);
 
   // These fields are mutated by the various Record* APIs and need to be
@@ -91,8 +98,15 @@ struct HashtablezInfo : public profiling_internal::Sample<HashtablezInfo> {
   static constexpr int kMaxStackDepth = 64;
   y_absl::Time create_time;
   int32_t depth;
+  // The SOO capacity for this table in elements (not bytes). Note that sampled
+  // tables are never SOO because we need to store the infoz handle on the heap.
+  // Tables that would be SOO if not sampled should have: soo_capacity > 0 &&
+  // size <= soo_capacity && max_reserve <= soo_capacity.
+  uint16_t soo_capacity;
   void* stack[kMaxStackDepth];
-  size_t inline_element_size;  // How big is the slot?
+  size_t inline_element_size;  // How big is the slot in bytes?
+  size_t key_size;             // sizeof(key_type)
+  size_t value_size;           // sizeof(value_type)
 };
 
 void RecordRehashSlow(HashtablezInfo* info, size_t total_probe_length);
@@ -117,7 +131,8 @@ struct SamplingState {
 };
 
 HashtablezInfo* SampleSlow(SamplingState& next_sample,
-                           size_t inline_element_size);
+                           size_t inline_element_size, size_t key_size,
+                           size_t value_size, uint16_t soo_capacity);
 void UnsampleSlow(HashtablezInfo* info);
 
 #if defined(Y_ABSL_INTERNAL_HASHTABLEZ_SAMPLE)
@@ -204,16 +219,19 @@ class HashtablezInfoHandle {
 extern Y_ABSL_PER_THREAD_TLS_KEYWORD SamplingState global_next_sample;
 #endif  // defined(Y_ABSL_INTERNAL_HASHTABLEZ_SAMPLE)
 
-// Returns an RAII sampling handle that manages registration and unregistation
-// with the global sampler.
+// Returns a sampling handle.
 inline HashtablezInfoHandle Sample(
-    size_t inline_element_size Y_ABSL_ATTRIBUTE_UNUSED) {
+    Y_ABSL_ATTRIBUTE_UNUSED size_t inline_element_size,
+    Y_ABSL_ATTRIBUTE_UNUSED size_t key_size,
+    Y_ABSL_ATTRIBUTE_UNUSED size_t value_size,
+    Y_ABSL_ATTRIBUTE_UNUSED uint16_t soo_capacity) {
 #if defined(Y_ABSL_INTERNAL_HASHTABLEZ_SAMPLE)
   if (Y_ABSL_PREDICT_TRUE(--global_next_sample.next_sample > 0)) {
     return HashtablezInfoHandle(nullptr);
   }
-  return HashtablezInfoHandle(
-      SampleSlow(global_next_sample, inline_element_size));
+  return HashtablezInfoHandle(SampleSlow(global_next_sample,
+                                         inline_element_size, key_size,
+                                         value_size, soo_capacity));
 #else
   return HashtablezInfoHandle(nullptr);
 #endif  // !Y_ABSL_PER_THREAD_TLS
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/inlined_vector.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/inlined_vector.h
index 67fffc4f7978..a56a7774626c 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/inlined_vector.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/inlined_vector.h
@@ -27,6 +27,7 @@
 
 #include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
+#include "y_absl/base/internal/identity.h"
 #include "y_absl/base/macros.h"
 #include "y_absl/container/internal/compressed_tuple.h"
 #include "y_absl/memory/memory.h"
@@ -82,16 +83,6 @@ using IsMoveAssignOk = std::is_move_assignable<ValueType<A>>;
 template <typename A>
 using IsSwapOk = y_absl::type_traits_internal::IsSwappable<ValueType<A>>;
 
-template <typename T>
-struct TypeIdentity {
-  using type = T;
-};
-
-// Used for function arguments in template functions to prevent ADL by forcing
-// callers to explicitly specify the template parameter.
-template <typename T>
-using NoTypeDeduction = typename TypeIdentity<T>::type;
-
 template <typename A, bool IsTriviallyDestructible =
                           y_absl::is_trivially_destructible<ValueType<A>>::value>
 struct DestroyAdapter;
@@ -139,7 +130,7 @@ struct MallocAdapter {
 };
 
 template <typename A, typename ValueAdapter>
-void ConstructElements(NoTypeDeduction<A>& allocator,
+void ConstructElements(y_absl::internal::type_identity_t<A>& allocator,
                        Pointer<A> construct_first, ValueAdapter& values,
                        SizeType<A> construct_size) {
   for (SizeType<A> i = 0; i < construct_size; ++i) {
@@ -322,14 +313,13 @@ class Storage {
 
   // The policy to be used specifically when swapping inlined elements.
   using SwapInlinedElementsPolicy = y_absl::conditional_t<
-      // Fast path: if the value type can be trivially move constructed/assigned
-      // and destroyed, and we know the allocator doesn't do anything fancy,
-      // then it's safe for us to simply swap the bytes in the inline storage.
-      // It's as if we had move-constructed a temporary vector, move-assigned
-      // one to the other, then move-assigned the first from the temporary.
-      y_absl::conjunction<y_absl::is_trivially_move_constructible<ValueType<A>>,
-                        y_absl::is_trivially_move_assignable<ValueType<A>>,
-                        y_absl::is_trivially_destructible<ValueType<A>>,
+      // Fast path: if the value type can be trivially relocated, and we
+      // know the allocator doesn't do anything fancy, then it's safe for us
+      // to simply swap the bytes in the inline storage. It's as if we had
+      // relocated the first vector's elements into temporary storage,
+      // relocated the second's elements into the (now-empty) first's,
+      // and then relocated from temporary storage into the second.
+      y_absl::conjunction<y_absl::is_trivially_relocatable<ValueType<A>>,
                         std::is_same<A, std::allocator<ValueType<A>>>>::value,
       MemcpyPolicy,
       y_absl::conditional_t<IsSwapOk<A>::value, ElementwiseSwapPolicy,
@@ -624,8 +614,8 @@ void Storage<T, N, A>::InitFrom(const Storage& other) {
 
 template <typename T, size_t N, typename A>
 template <typename ValueAdapter>
-auto Storage<T, N, A>::Initialize(ValueAdapter values, SizeType<A> new_size)
-    -> void {
+auto Storage<T, N, A>::Initialize(ValueAdapter values,
+                                  SizeType<A> new_size) -> void {
   // Only callable from constructors!
   Y_ABSL_HARDENING_ASSERT(!GetIsAllocated());
   Y_ABSL_HARDENING_ASSERT(GetSize() == 0);
@@ -656,8 +646,8 @@ auto Storage<T, N, A>::Initialize(ValueAdapter values, SizeType<A> new_size)
 
 template <typename T, size_t N, typename A>
 template <typename ValueAdapter>
-auto Storage<T, N, A>::Assign(ValueAdapter values, SizeType<A> new_size)
-    -> void {
+auto Storage<T, N, A>::Assign(ValueAdapter values,
+                              SizeType<A> new_size) -> void {
   StorageView<A> storage_view = MakeStorageView();
 
   AllocationTransaction<A> allocation_tx(GetAllocator());
@@ -699,8 +689,8 @@ auto Storage<T, N, A>::Assign(ValueAdapter values, SizeType<A> new_size)
 
 template <typename T, size_t N, typename A>
 template <typename ValueAdapter>
-auto Storage<T, N, A>::Resize(ValueAdapter values, SizeType<A> new_size)
-    -> void {
+auto Storage<T, N, A>::Resize(ValueAdapter values,
+                              SizeType<A> new_size) -> void {
   StorageView<A> storage_view = MakeStorageView();
   Pointer<A> const base = storage_view.data;
   const SizeType<A> size = storage_view.size;
@@ -885,8 +875,8 @@ auto Storage<T, N, A>::EmplaceBackSlow(Args&&... args) -> Reference<A> {
 }
 
 template <typename T, size_t N, typename A>
-auto Storage<T, N, A>::Erase(ConstIterator<A> from, ConstIterator<A> to)
-    -> Iterator<A> {
+auto Storage<T, N, A>::Erase(ConstIterator<A> from,
+                             ConstIterator<A> to) -> Iterator<A> {
   StorageView<A> storage_view = MakeStorageView();
 
   auto erase_size = static_cast<SizeType<A>>(std::distance(from, to));
@@ -894,16 +884,30 @@ auto Storage<T, N, A>::Erase(ConstIterator<A> from, ConstIterator<A> to)
       std::distance(ConstIterator<A>(storage_view.data), from));
   SizeType<A> erase_end_index = erase_index + erase_size;
 
-  IteratorValueAdapter<A, MoveIterator<A>> move_values(
-      MoveIterator<A>(storage_view.data + erase_end_index));
-
-  AssignElements<A>(storage_view.data + erase_index, move_values,
-                    storage_view.size - erase_end_index);
+  // Fast path: if the value type is trivially relocatable and we know
+  // the allocator doesn't do anything fancy, then we know it is legal for us to
+  // simply destroy the elements in the "erasure window" (which cannot throw)
+  // and then memcpy downward to close the window.
+  if (y_absl::is_trivially_relocatable<ValueType<A>>::value &&
+      std::is_nothrow_destructible<ValueType<A>>::value &&
+      std::is_same<A, std::allocator<ValueType<A>>>::value) {
+    DestroyAdapter<A>::DestroyElements(
+        GetAllocator(), storage_view.data + erase_index, erase_size);
+    std::memmove(
+        reinterpret_cast<char*>(storage_view.data + erase_index),
+        reinterpret_cast<const char*>(storage_view.data + erase_end_index),
+        (storage_view.size - erase_end_index) * sizeof(ValueType<A>));
+  } else {
+    IteratorValueAdapter<A, MoveIterator<A>> move_values(
+        MoveIterator<A>(storage_view.data + erase_end_index));
 
-  DestroyAdapter<A>::DestroyElements(
-      GetAllocator(), storage_view.data + (storage_view.size - erase_size),
-      erase_size);
+    AssignElements<A>(storage_view.data + erase_index, move_values,
+                      storage_view.size - erase_end_index);
 
+    DestroyAdapter<A>::DestroyElements(
+        GetAllocator(), storage_view.data + (storage_view.size - erase_size),
+        erase_size);
+  }
   SubtractSize(erase_size);
   return Iterator<A>(storage_view.data + erase_index);
 }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_map.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_map.h
index d442b3189ef7..8f0050a84c52 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_map.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_map.h
@@ -198,22 +198,24 @@ class raw_hash_map : public raw_hash_set<Policy, Hash, Eq, Alloc> {
   std::pair<iterator, bool> insert_or_assign_impl(K&& k, V&& v)
       Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
     auto res = this->find_or_prepare_insert(k);
-    if (res.second)
+    if (res.second) {
       this->emplace_at(res.first, std::forward<K>(k), std::forward<V>(v));
-    else
-      Policy::value(&*this->iterator_at(res.first)) = std::forward<V>(v);
-    return {this->iterator_at(res.first), res.second};
+    } else {
+      Policy::value(&*res.first) = std::forward<V>(v);
+    }
+    return res;
   }
 
   template <class K = key_type, class... Args>
   std::pair<iterator, bool> try_emplace_impl(K&& k, Args&&... args)
       Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
     auto res = this->find_or_prepare_insert(k);
-    if (res.second)
+    if (res.second) {
       this->emplace_at(res.first, std::piecewise_construct,
                        std::forward_as_tuple(std::forward<K>(k)),
                        std::forward_as_tuple(std::forward<Args>(args)...));
-    return {this->iterator_at(res.first), res.second};
+    }
+    return res;
   }
 };
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.cc
index bb19ecf63e24..8517e51ba7ea 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.cc
@@ -23,19 +23,24 @@
 #include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/dynamic_annotations.h"
+#include "y_absl/base/internal/endian.h"
+#include "y_absl/base/optimization.h"
 #include "y_absl/container/internal/container_memory.h"
+#include "y_absl/container/internal/hashtablez_sampler.h"
 #include "y_absl/hash/hash.h"
 
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
 namespace container_internal {
 
-// We have space for `growth_left` before a single block of control bytes. A
+// Represents a control byte corresponding to a full slot with arbitrary hash.
+constexpr ctrl_t ZeroCtrlT() { return static_cast<ctrl_t>(0); }
+
+// We have space for `growth_info` before a single block of control bytes. A
 // single block of empty control bytes for tables without any slots allocated.
 // This enables removing a branch in the hot path of find(). In order to ensure
 // that the control bytes are aligned to 16, we have 16 bytes before the control
-// bytes even though growth_left only needs 8.
-constexpr ctrl_t ZeroCtrlT() { return static_cast<ctrl_t>(0); }
+// bytes even though growth_info only needs 8.
 alignas(16) Y_ABSL_CONST_INIT Y_ABSL_DLL const ctrl_t kEmptyGroup[32] = {
     ZeroCtrlT(),       ZeroCtrlT(),    ZeroCtrlT(),    ZeroCtrlT(),
     ZeroCtrlT(),       ZeroCtrlT(),    ZeroCtrlT(),    ZeroCtrlT(),
@@ -46,6 +51,18 @@ alignas(16) Y_ABSL_CONST_INIT Y_ABSL_DLL const ctrl_t kEmptyGroup[32] = {
     ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty, ctrl_t::kEmpty,
     ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty, ctrl_t::kEmpty};
 
+// We need one full byte followed by a sentinel byte for iterator::operator++ to
+// work. We have a full group after kSentinel to be safe (in case operator++ is
+// changed to read a full group).
+Y_ABSL_CONST_INIT Y_ABSL_DLL const ctrl_t kSooControl[17] = {
+    ZeroCtrlT(),    ctrl_t::kSentinel, ZeroCtrlT(),    ctrl_t::kEmpty,
+    ctrl_t::kEmpty, ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty,
+    ctrl_t::kEmpty, ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty,
+    ctrl_t::kEmpty, ctrl_t::kEmpty,    ctrl_t::kEmpty, ctrl_t::kEmpty,
+    ctrl_t::kEmpty};
+static_assert(NumControlBytes(SooCapacity()) <= 17,
+              "kSooControl capacity too small");
+
 #ifdef Y_ABSL_INTERNAL_NEED_REDUNDANT_CONSTEXPR_DECL
 constexpr size_t Group::kWidth;
 #endif
@@ -104,10 +121,25 @@ bool CommonFieldsGenerationInfoEnabled::should_rehash_for_bug_detection_on_move(
   return ShouldRehashForBugDetection(ctrl, capacity);
 }
 
-bool ShouldInsertBackwards(size_t hash, const ctrl_t* ctrl) {
+bool ShouldInsertBackwardsForDebug(size_t capacity, size_t hash,
+                                   const ctrl_t* ctrl) {
   // To avoid problems with weak hashes and single bit tests, we use % 13.
   // TODO(kfm,sbenza): revisit after we do unconditional mixing
-  return (H1(hash, ctrl) ^ RandomSeed()) % 13 > 6;
+  return !is_small(capacity) && (H1(hash, ctrl) ^ RandomSeed()) % 13 > 6;
+}
+
+size_t PrepareInsertAfterSoo(size_t hash, size_t slot_size,
+                             CommonFields& common) {
+  assert(common.capacity() == NextCapacity(SooCapacity()));
+  // After resize from capacity 1 to 3, we always have exactly the slot with
+  // index 1 occupied, so we need to insert either at index 0 or index 2.
+  assert(HashSetResizeHelper::SooSlotIndex() == 1);
+  PrepareInsertCommon(common);
+  const size_t offset = H1(hash, common.control()) & 2;
+  common.growth_info().OverwriteEmptyAsFull();
+  SetCtrlInSingleGroupTable(common, offset, H2(hash), slot_size);
+  common.infoz().RecordInsert(hash, /*distance_from_desired=*/0);
+  return offset;
 }
 
 void ConvertDeletedToEmptyAndFullToDeleted(ctrl_t* ctrl, size_t capacity) {
@@ -128,6 +160,8 @@ FindInfo find_first_non_full_outofline(const CommonFields& common,
   return find_first_non_full(common, hash);
 }
 
+namespace {
+
 // Returns the address of the slot just after slot assuming each slot has the
 // specified size.
 static inline void* NextSlot(void* slot, size_t slot_size) {
@@ -140,8 +174,22 @@ static inline void* PrevSlot(void* slot, size_t slot_size) {
   return reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(slot) - slot_size);
 }
 
+// Finds guaranteed to exists empty slot from the given position.
+// NOTE: this function is almost never triggered inside of the
+// DropDeletesWithoutResize, so we keep it simple.
+// The table is rather sparse, so empty slot will be found very quickly.
+size_t FindEmptySlot(size_t start, size_t end, const ctrl_t* ctrl) {
+  for (size_t i = start; i < end; ++i) {
+    if (IsEmpty(ctrl[i])) {
+      return i;
+    }
+  }
+  assert(false && "no empty slot");
+  return ~size_t{};
+}
+
 void DropDeletesWithoutResize(CommonFields& common,
-                              const PolicyFunctions& policy, void* tmp_space) {
+                              const PolicyFunctions& policy) {
   void* set = &common;
   void* slot_array = common.slot_array();
   const size_t capacity = common.capacity();
@@ -165,17 +213,28 @@ void DropDeletesWithoutResize(CommonFields& common,
   //       repeat procedure for current slot with moved from element (target)
   ctrl_t* ctrl = common.control();
   ConvertDeletedToEmptyAndFullToDeleted(ctrl, capacity);
+  const void* hash_fn = policy.hash_fn(common);
   auto hasher = policy.hash_slot;
   auto transfer = policy.transfer;
   const size_t slot_size = policy.slot_size;
 
   size_t total_probe_length = 0;
   void* slot_ptr = SlotAddress(slot_array, 0, slot_size);
+
+  // The index of an empty slot that can be used as temporary memory for
+  // the swap operation.
+  constexpr size_t kUnknownId = ~size_t{};
+  size_t tmp_space_id = kUnknownId;
+
   for (size_t i = 0; i != capacity;
        ++i, slot_ptr = NextSlot(slot_ptr, slot_size)) {
     assert(slot_ptr == SlotAddress(slot_array, i, slot_size));
+    if (IsEmpty(ctrl[i])) {
+      tmp_space_id = i;
+      continue;
+    }
     if (!IsDeleted(ctrl[i])) continue;
-    const size_t hash = (*hasher)(set, slot_ptr);
+    const size_t hash = (*hasher)(hash_fn, slot_ptr);
     const FindInfo target = find_first_non_full(common, hash);
     const size_t new_i = target.offset;
     total_probe_length += target.probe_length;
@@ -202,16 +261,26 @@ void DropDeletesWithoutResize(CommonFields& common,
       SetCtrl(common, new_i, H2(hash), slot_size);
       (*transfer)(set, new_slot_ptr, slot_ptr);
       SetCtrl(common, i, ctrl_t::kEmpty, slot_size);
+      // Initialize or change empty space id.
+      tmp_space_id = i;
     } else {
       assert(IsDeleted(ctrl[new_i]));
       SetCtrl(common, new_i, H2(hash), slot_size);
       // Until we are done rehashing, DELETED marks previously FULL slots.
 
+      if (tmp_space_id == kUnknownId) {
+        tmp_space_id = FindEmptySlot(i + 1, capacity, ctrl);
+      }
+      void* tmp_space = SlotAddress(slot_array, tmp_space_id, slot_size);
+      SanitizerUnpoisonMemoryRegion(tmp_space, slot_size);
+
       // Swap i and new_i elements.
       (*transfer)(set, tmp_space, new_slot_ptr);
       (*transfer)(set, new_slot_ptr, slot_ptr);
       (*transfer)(set, slot_ptr, tmp_space);
 
+      SanitizerPoisonMemoryRegion(tmp_space, slot_size);
+
       // repeat the processing of the ith slot
       --i;
       slot_ptr = PrevSlot(slot_ptr, slot_size);
@@ -238,6 +307,8 @@ static bool WasNeverFull(CommonFields& c, size_t index) {
              Group::kWidth;
 }
 
+}  // namespace
+
 void EraseMetaOnly(CommonFields& c, size_t index, size_t slot_size) {
   assert(IsFull(c.control()[index]) && "erasing a dangling iterator");
   c.decrement_size();
@@ -245,17 +316,19 @@ void EraseMetaOnly(CommonFields& c, size_t index, size_t slot_size) {
 
   if (WasNeverFull(c, index)) {
     SetCtrl(c, index, ctrl_t::kEmpty, slot_size);
-    c.set_growth_left(c.growth_left() + 1);
+    c.growth_info().OverwriteFullAsEmpty();
     return;
   }
 
+  c.growth_info().OverwriteFullAsDeleted();
   SetCtrl(c, index, ctrl_t::kDeleted, slot_size);
 }
 
 void ClearBackingArray(CommonFields& c, const PolicyFunctions& policy,
-                       bool reuse) {
+                       bool reuse, bool soo_enabled) {
   c.set_size(0);
   if (reuse) {
+    assert(!soo_enabled || c.capacity() > SooCapacity());
     ResetCtrl(c, policy.slot_size);
     ResetGrowthLeft(c);
     c.infoz().RecordStorageChanged(0, c.capacity());
@@ -263,118 +336,308 @@ void ClearBackingArray(CommonFields& c, const PolicyFunctions& policy,
     // We need to record infoz before calling dealloc, which will unregister
     // infoz.
     c.infoz().RecordClearedReservation();
-    c.infoz().RecordStorageChanged(0, 0);
+    c.infoz().RecordStorageChanged(0, soo_enabled ? SooCapacity() : 0);
     (*policy.dealloc)(c, policy);
-    c.set_control(EmptyGroup());
-    c.set_generation_ptr(EmptyGeneration());
-    c.set_slots(nullptr);
-    c.set_capacity(0);
+    c = soo_enabled ? CommonFields{soo_tag_t{}} : CommonFields{};
   }
 }
 
 void HashSetResizeHelper::GrowIntoSingleGroupShuffleControlBytes(
-    ctrl_t* new_ctrl, size_t new_capacity) const {
+    ctrl_t* __restrict new_ctrl, size_t new_capacity) const {
   assert(is_single_group(new_capacity));
   constexpr size_t kHalfWidth = Group::kWidth / 2;
+  constexpr size_t kQuarterWidth = Group::kWidth / 4;
   assert(old_capacity_ < kHalfWidth);
+  static_assert(sizeof(uint64_t) >= kHalfWidth,
+                "Group size is too large. The ctrl bytes for half a group must "
+                "fit into a uint64_t for this implementation.");
+  static_assert(sizeof(uint64_t) <= Group::kWidth,
+                "Group size is too small. The ctrl bytes for a group must "
+                "cover a uint64_t for this implementation.");
 
   const size_t half_old_capacity = old_capacity_ / 2;
 
   // NOTE: operations are done with compile time known size = kHalfWidth.
   // Compiler optimizes that into single ASM operation.
 
-  // Copy second half of bytes to the beginning.
-  // We potentially copy more bytes in order to have compile time known size.
-  // Mirrored bytes from the old_ctrl_ will also be copied.
-  // In case of old_capacity_ == 3, we will copy 1st element twice.
+  // Load the bytes from half_old_capacity + 1. This contains the last half of
+  // old_ctrl bytes, followed by the sentinel byte, and then the first half of
+  // the cloned bytes. This effectively shuffles the control bytes.
+  uint64_t copied_bytes = 0;
+  copied_bytes =
+      y_absl::little_endian::Load64(old_ctrl() + half_old_capacity + 1);
+
+  // We change the sentinel byte to kEmpty before storing to both the start of
+  // the new_ctrl, and past the end of the new_ctrl later for the new cloned
+  // bytes. Note that this is faster than setting the sentinel byte to kEmpty
+  // after the copy directly in new_ctrl because we are limited on store
+  // bandwidth.
+  constexpr uint64_t kEmptyXorSentinel =
+      static_cast<uint8_t>(ctrl_t::kEmpty) ^
+      static_cast<uint8_t>(ctrl_t::kSentinel);
+  const uint64_t mask_convert_old_sentinel_to_empty =
+      kEmptyXorSentinel << (half_old_capacity * 8);
+  copied_bytes ^= mask_convert_old_sentinel_to_empty;
+
+  // Copy second half of bytes to the beginning. This correctly sets the bytes
+  // [0, old_capacity]. We potentially copy more bytes in order to have compile
+  // time known size. Mirrored bytes from the old_ctrl() will also be copied. In
+  // case of old_capacity_ == 3, we will copy 1st element twice.
   // Examples:
+  // (old capacity = 1)
   // old_ctrl = 0S0EEEEEEE...
-  // new_ctrl = S0EEEEEEEE...
+  // new_ctrl = E0EEEEEE??...
   //
-  // old_ctrl = 01S01EEEEE...
-  // new_ctrl = 1S01EEEEEE...
+  // (old capacity = 3)
+  // old_ctrl = 012S012EEEEE...
+  // new_ctrl = 12E012EE????...
   //
+  // (old capacity = 7)
   // old_ctrl = 0123456S0123456EE...
-  // new_ctrl = 456S0123?????????...
-  std::memcpy(new_ctrl, old_ctrl_ + half_old_capacity + 1, kHalfWidth);
-  // Clean up copied kSentinel from old_ctrl.
-  new_ctrl[half_old_capacity] = ctrl_t::kEmpty;
-
-  // Clean up damaged or uninitialized bytes.
-
-  // Clean bytes after the intended size of the copy.
-  // Example:
-  // new_ctrl = 1E01EEEEEEE????
-  // *new_ctrl= 1E0EEEEEEEE????
-  // position      /
-  std::memset(new_ctrl + old_capacity_ + 1, static_cast<int8_t>(ctrl_t::kEmpty),
-              kHalfWidth);
-  // Clean non-mirrored bytes that are not initialized.
-  // For small old_capacity that may be inside of mirrored bytes zone.
+  // new_ctrl = 456E0123?????????...
+  y_absl::little_endian::Store64(new_ctrl, copied_bytes);
+
+  // Set the space [old_capacity + 1, new_capacity] to empty as these bytes will
+  // not be written again. This is safe because
+  // NumControlBytes = new_capacity + kWidth and new_capacity >=
+  // old_capacity+1.
   // Examples:
-  // new_ctrl = 1E0EEEEEEEE??????????....
-  // *new_ctrl= 1E0EEEEEEEEEEEEE?????....
-  // position           /
+  // (old_capacity = 3, new_capacity = 15)
+  // new_ctrl  = 12E012EE?????????????...??
+  // *new_ctrl = 12E0EEEEEEEEEEEEEEEE?...??
+  // position        /          S
   //
-  // new_ctrl = 456E0123???????????...
-  // *new_ctrl= 456E0123EEEEEEEE???...
-  // position           /
-  std::memset(new_ctrl + kHalfWidth, static_cast<int8_t>(ctrl_t::kEmpty),
-              kHalfWidth);
-  // Clean last mirrored bytes that are not initialized
-  // and will not be overwritten by mirroring.
+  // (old_capacity = 7, new_capacity = 15)
+  // new_ctrl  = 456E0123?????????????????...??
+  // *new_ctrl = 456E0123EEEEEEEEEEEEEEEE?...??
+  // position            /      S
+  std::memset(new_ctrl + old_capacity_ + 1, static_cast<int8_t>(ctrl_t::kEmpty),
+              Group::kWidth);
+
+  // Set the last kHalfWidth bytes to empty, to ensure the bytes all the way to
+  // the end are initialized.
   // Examples:
-  // new_ctrl = 1E0EEEEEEEEEEEEE????????
-  // *new_ctrl= 1E0EEEEEEEEEEEEEEEEEEEEE
-  // position           S       /
+  // new_ctrl  = 12E0EEEEEEEEEEEEEEEE?...???????
+  // *new_ctrl = 12E0EEEEEEEEEEEEEEEE???EEEEEEEE
+  // position                   S       /
   //
-  // new_ctrl = 456E0123EEEEEEEE???????????????
-  // *new_ctrl= 456E0123EEEEEEEE???????EEEEEEEE
-  // position                  S       /
-  std::memset(new_ctrl + new_capacity + kHalfWidth,
+  // new_ctrl  = 456E0123EEEEEEEEEEEEEEEE???????
+  // *new_ctrl = 456E0123EEEEEEEEEEEEEEEEEEEEEEE
+  // position                   S       /
+  std::memset(new_ctrl + NumControlBytes(new_capacity) - kHalfWidth,
               static_cast<int8_t>(ctrl_t::kEmpty), kHalfWidth);
 
-  // Create mirrored bytes. old_capacity_ < kHalfWidth
-  // Example:
-  // new_ctrl = 456E0123EEEEEEEE???????EEEEEEEE
-  // *new_ctrl= 456E0123EEEEEEEE456E0123EEEEEEE
-  // position                  S/
-  ctrl_t g[kHalfWidth];
-  std::memcpy(g, new_ctrl, kHalfWidth);
-  std::memcpy(new_ctrl + new_capacity + 1, g, kHalfWidth);
+  // Copy the first bytes to the end (starting at new_capacity +1) to set the
+  // cloned bytes. Note that we use the already copied bytes from old_ctrl here
+  // rather than copying from new_ctrl to avoid a Read-after-Write hazard, since
+  // new_ctrl was just written to. The first old_capacity-1 bytes are set
+  // correctly. Then there may be up to old_capacity bytes that need to be
+  // overwritten, and any remaining bytes will be correctly set to empty. This
+  // sets [new_capacity + 1, new_capacity +1 + old_capacity] correctly.
+  // Examples:
+  // new_ctrl  = 12E0EEEEEEEEEEEEEEEE?...???????
+  // *new_ctrl = 12E0EEEEEEEEEEEE12E012EEEEEEEEE
+  // position                   S/
+  //
+  // new_ctrl  = 456E0123EEEEEEEE?...???EEEEEEEE
+  // *new_ctrl = 456E0123EEEEEEEE456E0123EEEEEEE
+  // position                   S/
+  y_absl::little_endian::Store64(new_ctrl + new_capacity + 1, copied_bytes);
+
+  // Set The remaining bytes at the end past the cloned bytes to empty. The
+  // incorrectly set bytes are [new_capacity + old_capacity + 2,
+  // min(new_capacity + 1 + kHalfWidth, new_capacity + old_capacity + 2 +
+  // half_old_capacity)]. Taking the difference, we need to set min(kHalfWidth -
+  // (old_capacity + 1), half_old_capacity)]. Since old_capacity < kHalfWidth,
+  // half_old_capacity < kQuarterWidth, so we set kQuarterWidth beginning at
+  // new_capacity + old_capacity + 2 to kEmpty.
+  // Examples:
+  // new_ctrl  = 12E0EEEEEEEEEEEE12E012EEEEEEEEE
+  // *new_ctrl = 12E0EEEEEEEEEEEE12E0EEEEEEEEEEE
+  // position                   S    /
+  //
+  // new_ctrl  = 456E0123EEEEEEEE456E0123EEEEEEE
+  // *new_ctrl = 456E0123EEEEEEEE456E0123EEEEEEE (no change)
+  // position                   S        /
+  std::memset(new_ctrl + new_capacity + old_capacity_ + 2,
+              static_cast<int8_t>(ctrl_t::kEmpty), kQuarterWidth);
+
+  // Finally, we set the new sentinel byte.
+  new_ctrl[new_capacity] = ctrl_t::kSentinel;
+}
 
-  // Finally set sentinel to its place.
+void HashSetResizeHelper::InitControlBytesAfterSoo(ctrl_t* new_ctrl, ctrl_t h2,
+                                                   size_t new_capacity) {
+  assert(is_single_group(new_capacity));
+  std::memset(new_ctrl, static_cast<int8_t>(ctrl_t::kEmpty),
+              NumControlBytes(new_capacity));
+  assert(HashSetResizeHelper::SooSlotIndex() == 1);
+  // This allows us to avoid branching on had_soo_slot_.
+  assert(had_soo_slot_ || h2 == ctrl_t::kEmpty);
+  new_ctrl[1] = new_ctrl[new_capacity + 2] = h2;
   new_ctrl[new_capacity] = ctrl_t::kSentinel;
 }
 
 void HashSetResizeHelper::GrowIntoSingleGroupShuffleTransferableSlots(
-    void* old_slots, void* new_slots, size_t slot_size) const {
+    void* new_slots, size_t slot_size) const {
   assert(old_capacity_ > 0);
   const size_t half_old_capacity = old_capacity_ / 2;
 
-  SanitizerUnpoisonMemoryRegion(old_slots, slot_size * old_capacity_);
+  SanitizerUnpoisonMemoryRegion(old_slots(), slot_size * old_capacity_);
   std::memcpy(new_slots,
-              SlotAddress(old_slots, half_old_capacity + 1, slot_size),
+              SlotAddress(old_slots(), half_old_capacity + 1, slot_size),
               slot_size * half_old_capacity);
   std::memcpy(SlotAddress(new_slots, half_old_capacity + 1, slot_size),
-              old_slots, slot_size * (half_old_capacity + 1));
+              old_slots(), slot_size * (half_old_capacity + 1));
 }
 
 void HashSetResizeHelper::GrowSizeIntoSingleGroupTransferable(
-    CommonFields& c, void* old_slots, size_t slot_size) {
+    CommonFields& c, size_t slot_size) {
   assert(old_capacity_ < Group::kWidth / 2);
   assert(is_single_group(c.capacity()));
   assert(IsGrowingIntoSingleGroupApplicable(old_capacity_, c.capacity()));
 
   GrowIntoSingleGroupShuffleControlBytes(c.control(), c.capacity());
-  GrowIntoSingleGroupShuffleTransferableSlots(old_slots, c.slot_array(),
-                                              slot_size);
+  GrowIntoSingleGroupShuffleTransferableSlots(c.slot_array(), slot_size);
 
   // We poison since GrowIntoSingleGroupShuffleTransferableSlots
   // may leave empty slots unpoisoned.
   PoisonSingleGroupEmptySlots(c, slot_size);
 }
 
+void HashSetResizeHelper::TransferSlotAfterSoo(CommonFields& c,
+                                               size_t slot_size) {
+  assert(was_soo_);
+  assert(had_soo_slot_);
+  assert(is_single_group(c.capacity()));
+  std::memcpy(SlotAddress(c.slot_array(), SooSlotIndex(), slot_size),
+              old_soo_data(), slot_size);
+  PoisonSingleGroupEmptySlots(c, slot_size);
+}
+
+namespace {
+
+// Called whenever the table needs to vacate empty slots either by removing
+// tombstones via rehash or growth.
+Y_ABSL_ATTRIBUTE_NOINLINE
+FindInfo FindInsertPositionWithGrowthOrRehash(CommonFields& common, size_t hash,
+                                              const PolicyFunctions& policy) {
+  const size_t cap = common.capacity();
+  if (cap > Group::kWidth &&
+      // Do these calculations in 64-bit to avoid overflow.
+      common.size() * uint64_t{32} <= cap * uint64_t{25}) {
+    // Squash DELETED without growing if there is enough capacity.
+    //
+    // Rehash in place if the current size is <= 25/32 of capacity.
+    // Rationale for such a high factor: 1) DropDeletesWithoutResize() is
+    // faster than resize, and 2) it takes quite a bit of work to add
+    // tombstones.  In the worst case, seems to take approximately 4
+    // insert/erase pairs to create a single tombstone and so if we are
+    // rehashing because of tombstones, we can afford to rehash-in-place as
+    // long as we are reclaiming at least 1/8 the capacity without doing more
+    // than 2X the work.  (Where "work" is defined to be size() for rehashing
+    // or rehashing in place, and 1 for an insert or erase.)  But rehashing in
+    // place is faster per operation than inserting or even doubling the size
+    // of the table, so we actually afford to reclaim even less space from a
+    // resize-in-place.  The decision is to rehash in place if we can reclaim
+    // at about 1/8th of the usable capacity (specifically 3/28 of the
+    // capacity) which means that the total cost of rehashing will be a small
+    // fraction of the total work.
+    //
+    // Here is output of an experiment using the BM_CacheInSteadyState
+    // benchmark running the old case (where we rehash-in-place only if we can
+    // reclaim at least 7/16*capacity) vs. this code (which rehashes in place
+    // if we can recover 3/32*capacity).
+    //
+    // Note that although in the worst-case number of rehashes jumped up from
+    // 15 to 190, but the number of operations per second is almost the same.
+    //
+    // Abridged output of running BM_CacheInSteadyState benchmark from
+    // raw_hash_set_benchmark.   N is the number of insert/erase operations.
+    //
+    //      | OLD (recover >= 7/16        | NEW (recover >= 3/32)
+    // size |    N/s LoadFactor NRehashes |    N/s LoadFactor NRehashes
+    //  448 | 145284       0.44        18 | 140118       0.44        19
+    //  493 | 152546       0.24        11 | 151417       0.48        28
+    //  538 | 151439       0.26        11 | 151152       0.53        38
+    //  583 | 151765       0.28        11 | 150572       0.57        50
+    //  628 | 150241       0.31        11 | 150853       0.61        66
+    //  672 | 149602       0.33        12 | 150110       0.66        90
+    //  717 | 149998       0.35        12 | 149531       0.70       129
+    //  762 | 149836       0.37        13 | 148559       0.74       190
+    //  807 | 149736       0.39        14 | 151107       0.39        14
+    //  852 | 150204       0.42        15 | 151019       0.42        15
+    DropDeletesWithoutResize(common, policy);
+  } else {
+    // Otherwise grow the container.
+    policy.resize(common, NextCapacity(cap), HashtablezInfoHandle{});
+  }
+  // This function is typically called with tables containing deleted slots.
+  // The table will be big and `FindFirstNonFullAfterResize` will always
+  // fallback to `find_first_non_full`. So using `find_first_non_full` directly.
+  return find_first_non_full(common, hash);
+}
+
+}  // namespace
+
+const void* GetHashRefForEmptyHasher(const CommonFields& common) {
+  // Empty base optimization typically make the empty base class address to be
+  // the same as the first address of the derived class object.
+  // But we generally assume that for empty hasher we can return any valid
+  // pointer.
+  return &common;
+}
+
+size_t PrepareInsertNonSoo(CommonFields& common, size_t hash, FindInfo target,
+                           const PolicyFunctions& policy) {
+  // When there are no deleted slots in the table
+  // and growth_left is positive, we can insert at the first
+  // empty slot in the probe sequence (target).
+  const bool use_target_hint =
+      // Optimization is disabled when generations are enabled.
+      // We have to rehash even sparse tables randomly in such mode.
+      !SwisstableGenerationsEnabled() &&
+      common.growth_info().HasNoDeletedAndGrowthLeft();
+  if (Y_ABSL_PREDICT_FALSE(!use_target_hint)) {
+    // Notes about optimized mode when generations are disabled:
+    // We do not enter this branch if table has no deleted slots
+    // and growth_left is positive.
+    // We enter this branch in the following cases listed in decreasing
+    // frequency:
+    // 1. Table without deleted slots (>95% cases) that needs to be resized.
+    // 2. Table with deleted slots that has space for the inserting element.
+    // 3. Table with deleted slots that needs to be rehashed or resized.
+    if (Y_ABSL_PREDICT_TRUE(common.growth_info().HasNoGrowthLeftAndNoDeleted())) {
+      const size_t old_capacity = common.capacity();
+      policy.resize(common, NextCapacity(old_capacity), HashtablezInfoHandle{});
+      target = HashSetResizeHelper::FindFirstNonFullAfterResize(
+          common, old_capacity, hash);
+    } else {
+      // Note: the table may have no deleted slots here when generations
+      // are enabled.
+      const bool rehash_for_bug_detection =
+          common.should_rehash_for_bug_detection_on_insert();
+      if (rehash_for_bug_detection) {
+        // Move to a different heap allocation in order to detect bugs.
+        const size_t cap = common.capacity();
+        policy.resize(common,
+                      common.growth_left() > 0 ? cap : NextCapacity(cap),
+                      HashtablezInfoHandle{});
+      }
+      if (Y_ABSL_PREDICT_TRUE(common.growth_left() > 0)) {
+        target = find_first_non_full(common, hash);
+      } else {
+        target = FindInsertPositionWithGrowthOrRehash(common, hash, policy);
+      }
+    }
+  }
+  PrepareInsertCommon(common);
+  common.growth_info().OverwriteControlAsFull(common.control()[target.offset]);
+  SetCtrl(common, target.offset, H2(hash), policy.slot_size);
+  common.infoz().RecordInsert(hash, target.probe_length);
+  return target.offset;
+}
+
 }  // namespace container_internal
 Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.h b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.h
index eb2ef632c2ec..f3e9d1244504 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/container/internal/raw_hash_set.h
@@ -80,7 +80,7 @@
 //     slot_type slots[capacity];
 //   };
 //
-// The length of this array is computed by `AllocSize()` below.
+// The length of this array is computed by `RawHashSetLayout::alloc_size` below.
 //
 // Control bytes (`ctrl_t`) are bytes (collected into groups of a
 // platform-specific size) that define the state of the corresponding slot in
@@ -100,6 +100,13 @@
 // Storing control bytes in a separate array also has beneficial cache effects,
 // since more logical slots will fit into a cache line.
 //
+// # Small Object Optimization (SOO)
+//
+// When the size/alignment of the value_type and the capacity of the table are
+// small, we enable small object optimization and store the values inline in
+// the raw_hash_set object. This optimization allows us to avoid
+// allocation/deallocation as well as cache/dTLB misses.
+//
 // # Hashing
 //
 // We compute two separate hashes, `H1` and `H2`, from the hash of an object.
@@ -233,9 +240,10 @@ namespace container_internal {
 
 #ifdef Y_ABSL_SWISSTABLE_ENABLE_GENERATIONS
 #error Y_ABSL_SWISSTABLE_ENABLE_GENERATIONS cannot be directly set
-#elif defined(Y_ABSL_HAVE_ADDRESS_SANITIZER) || \
-    defined(Y_ABSL_HAVE_HWADDRESS_SANITIZER) || \
-    defined(Y_ABSL_HAVE_MEMORY_SANITIZER)
+#elif (defined(Y_ABSL_HAVE_ADDRESS_SANITIZER) ||   \
+       defined(Y_ABSL_HAVE_HWADDRESS_SANITIZER) || \
+       defined(Y_ABSL_HAVE_MEMORY_SANITIZER)) &&   \
+    !defined(NDEBUG_SANITIZER)  // If defined, performance is important.
 // When compiled in sanitizer mode, we add generation integers to the backing
 // array and iterators. In the backing array, we store the generation between
 // the control bytes and the slots. When iterators are dereferenced, we assert
@@ -374,6 +382,9 @@ uint32_t TrailingZeros(T x) {
   return static_cast<uint32_t>(countr_zero(x));
 }
 
+// 8 bytes bitmask with most significant bit set for every byte.
+constexpr uint64_t kMsbs8Bytes = 0x8080808080808080ULL;
+
 // An abstract bitmask, such as that emitted by a SIMD instruction.
 //
 // Specifically, this type implements a simple bitset whose representation is
@@ -423,27 +434,35 @@ class NonIterableBitMask {
 // an ordinary 16-bit bitset occupying the low 16 bits of `mask`. When
 // `SignificantBits` is 8 and `Shift` is 3, abstract bits are represented as
 // the bytes `0x00` and `0x80`, and it occupies all 64 bits of the bitmask.
+// If NullifyBitsOnIteration is true (only allowed for Shift == 3),
+// non zero abstract bit is allowed to have additional bits
+// (e.g., `0xff`, `0x83` and `0x9c` are ok, but `0x6f` is not).
 //
 // For example:
 //   for (int i : BitMask<uint32_t, 16>(0b101)) -> yields 0, 2
 //   for (int i : BitMask<uint64_t, 8, 3>(0x0000000080800000)) -> yields 2, 3
-template <class T, int SignificantBits, int Shift = 0>
+template <class T, int SignificantBits, int Shift = 0,
+          bool NullifyBitsOnIteration = false>
 class BitMask : public NonIterableBitMask<T, SignificantBits, Shift> {
   using Base = NonIterableBitMask<T, SignificantBits, Shift>;
   static_assert(std::is_unsigned<T>::value, "");
   static_assert(Shift == 0 || Shift == 3, "");
+  static_assert(!NullifyBitsOnIteration || Shift == 3, "");
 
  public:
-  explicit BitMask(T mask) : Base(mask) {}
+  explicit BitMask(T mask) : Base(mask) {
+    if (Shift == 3 && !NullifyBitsOnIteration) {
+      assert(this->mask_ == (this->mask_ & kMsbs8Bytes));
+    }
+  }
   // BitMask is an iterator over the indices of its abstract bits.
   using value_type = int;
   using iterator = BitMask;
   using const_iterator = BitMask;
 
   BitMask& operator++() {
-    if (Shift == 3) {
-      constexpr uint64_t msbs = 0x8080808080808080ULL;
-      this->mask_ &= msbs;
+    if (Shift == 3 && NullifyBitsOnIteration) {
+      this->mask_ &= kMsbs8Bytes;
     }
     this->mask_ &= (this->mask_ - 1);
     return *this;
@@ -520,10 +539,24 @@ Y_ABSL_DLL extern const ctrl_t kEmptyGroup[32];
 // Returns a pointer to a control byte group that can be used by empty tables.
 inline ctrl_t* EmptyGroup() {
   // Const must be cast away here; no uses of this function will actually write
-  // to it, because it is only used for empty tables.
+  // to it because it is only used for empty tables.
   return const_cast<ctrl_t*>(kEmptyGroup + 16);
 }
 
+// For use in SOO iterators.
+// TODO(b/289225379): we could potentially get rid of this by adding an is_soo
+// bit in iterators. This would add branches but reduce cache misses.
+Y_ABSL_DLL extern const ctrl_t kSooControl[17];
+
+// Returns a pointer to a full byte followed by a sentinel byte.
+inline ctrl_t* SooControl() {
+  // Const must be cast away here; no uses of this function will actually write
+  // to it because it is only used for SOO iterators.
+  return const_cast<ctrl_t*>(kSooControl);
+}
+// Whether ctrl is from the SooControl array.
+inline bool IsSooControl(const ctrl_t* ctrl) { return ctrl == SooControl(); }
+
 // Returns a pointer to a generation to use for an empty hashtable.
 GenerationType* EmptyGeneration();
 
@@ -535,7 +568,37 @@ inline bool IsEmptyGeneration(const GenerationType* generation) {
 
 // Mixes a randomly generated per-process seed with `hash` and `ctrl` to
 // randomize insertion order within groups.
-bool ShouldInsertBackwards(size_t hash, const ctrl_t* ctrl);
+bool ShouldInsertBackwardsForDebug(size_t capacity, size_t hash,
+                                   const ctrl_t* ctrl);
+
+Y_ABSL_ATTRIBUTE_ALWAYS_INLINE inline bool ShouldInsertBackwards(
+    Y_ABSL_ATTRIBUTE_UNUSED size_t capacity, Y_ABSL_ATTRIBUTE_UNUSED size_t hash,
+    Y_ABSL_ATTRIBUTE_UNUSED const ctrl_t* ctrl) {
+#if defined(NDEBUG)
+  return false;
+#else
+  return ShouldInsertBackwardsForDebug(capacity, hash, ctrl);
+#endif
+}
+
+// Returns insert position for the given mask.
+// We want to add entropy even when ASLR is not enabled.
+// In debug build we will randomly insert in either the front or back of
+// the group.
+// TODO(kfm,sbenza): revisit after we do unconditional mixing
+template <class Mask>
+Y_ABSL_ATTRIBUTE_ALWAYS_INLINE inline auto GetInsertionOffset(
+    Mask mask, Y_ABSL_ATTRIBUTE_UNUSED size_t capacity,
+    Y_ABSL_ATTRIBUTE_UNUSED size_t hash,
+    Y_ABSL_ATTRIBUTE_UNUSED const ctrl_t* ctrl) {
+#if defined(NDEBUG)
+  return mask.LowestBitSet();
+#else
+  return ShouldInsertBackwardsForDebug(capacity, hash, ctrl)
+             ? mask.HighestBitSet()
+             : mask.LowestBitSet();
+#endif
+}
 
 // Returns a per-table, hash salt, which changes on resize. This gets mixed into
 // H1 to randomize iteration order per-table.
@@ -560,7 +623,12 @@ inline h2_t H2(size_t hash) { return hash & 0x7F; }
 
 // Helpers for checking the state of a control byte.
 inline bool IsEmpty(ctrl_t c) { return c == ctrl_t::kEmpty; }
-inline bool IsFull(ctrl_t c) { return c >= static_cast<ctrl_t>(0); }
+inline bool IsFull(ctrl_t c) {
+  // Cast `c` to the underlying type instead of casting `0` to `ctrl_t` as `0`
+  // is not a value in the enum. Both ways are equivalent, but this way makes
+  // linters happier.
+  return static_cast<std::underlying_type_t<ctrl_t>>(c) >= 0;
+}
 inline bool IsDeleted(ctrl_t c) { return c == ctrl_t::kDeleted; }
 inline bool IsEmptyOrDeleted(ctrl_t c) { return c < ctrl_t::kSentinel; }
 
@@ -646,6 +714,14 @@ struct GroupSse2Impl {
         static_cast<uint16_t>(_mm_movemask_epi8(ctrl) ^ 0xffff));
   }
 
+  // Returns a bitmask representing the positions of non full slots.
+  // Note: this includes: kEmpty, kDeleted, kSentinel.
+  // It is useful in contexts when kSentinel is not present.
+  auto MaskNonFull() const {
+    return BitMask<uint16_t, kWidth>(
+        static_cast<uint16_t>(_mm_movemask_epi8(ctrl)));
+  }
+
   // Returns a bitmask representing the positions of empty or deleted slots.
   NonIterableBitMask<uint16_t, kWidth> MaskEmptyOrDeleted() const {
     auto special = _mm_set1_epi8(static_cast<char>(ctrl_t::kSentinel));
@@ -685,10 +761,11 @@ struct GroupAArch64Impl {
     ctrl = vld1_u8(reinterpret_cast<const uint8_t*>(pos));
   }
 
-  BitMask<uint64_t, kWidth, 3> Match(h2_t hash) const {
+  auto Match(h2_t hash) const {
     uint8x8_t dup = vdup_n_u8(hash);
     auto mask = vceq_u8(ctrl, dup);
-    return BitMask<uint64_t, kWidth, 3>(
+    return BitMask<uint64_t, kWidth, /*Shift=*/3,
+                   /*NullifyBitsOnIteration=*/true>(
         vget_lane_u64(vreinterpret_u64_u8(mask), 0));
   }
 
@@ -704,12 +781,25 @@ struct GroupAArch64Impl {
   // Returns a bitmask representing the positions of full slots.
   // Note: for `is_small()` tables group may contain the "same" slot twice:
   // original and mirrored.
-  BitMask<uint64_t, kWidth, 3> MaskFull() const {
+  auto MaskFull() const {
     uint64_t mask = vget_lane_u64(
         vreinterpret_u64_u8(vcge_s8(vreinterpret_s8_u8(ctrl),
                                     vdup_n_s8(static_cast<int8_t>(0)))),
         0);
-    return BitMask<uint64_t, kWidth, 3>(mask);
+    return BitMask<uint64_t, kWidth, /*Shift=*/3,
+                   /*NullifyBitsOnIteration=*/true>(mask);
+  }
+
+  // Returns a bitmask representing the positions of non full slots.
+  // Note: this includes: kEmpty, kDeleted, kSentinel.
+  // It is useful in contexts when kSentinel is not present.
+  auto MaskNonFull() const {
+    uint64_t mask = vget_lane_u64(
+        vreinterpret_u64_u8(vclt_s8(vreinterpret_s8_u8(ctrl),
+                                    vdup_n_s8(static_cast<int8_t>(0)))),
+        0);
+    return BitMask<uint64_t, kWidth, /*Shift=*/3,
+                   /*NullifyBitsOnIteration=*/true>(mask);
   }
 
   NonIterableBitMask<uint64_t, kWidth, 3> MaskEmptyOrDeleted() const {
@@ -736,11 +826,10 @@ struct GroupAArch64Impl {
 
   void ConvertSpecialToEmptyAndFullToDeleted(ctrl_t* dst) const {
     uint64_t mask = vget_lane_u64(vreinterpret_u64_u8(ctrl), 0);
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     constexpr uint64_t slsbs = 0x0202020202020202ULL;
     constexpr uint64_t midbs = 0x7e7e7e7e7e7e7e7eULL;
     auto x = slsbs & (mask >> 6);
-    auto res = (x + midbs) | msbs;
+    auto res = (x + midbs) | kMsbs8Bytes;
     little_endian::Store64(dst, res);
   }
 
@@ -768,30 +857,33 @@ struct GroupPortableImpl {
     //   v = 0x1716151413121110
     //   hash = 0x12
     //   retval = (v - lsbs) & ~v & msbs = 0x0000000080800000
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     constexpr uint64_t lsbs = 0x0101010101010101ULL;
     auto x = ctrl ^ (lsbs * hash);
-    return BitMask<uint64_t, kWidth, 3>((x - lsbs) & ~x & msbs);
+    return BitMask<uint64_t, kWidth, 3>((x - lsbs) & ~x & kMsbs8Bytes);
   }
 
   NonIterableBitMask<uint64_t, kWidth, 3> MaskEmpty() const {
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     return NonIterableBitMask<uint64_t, kWidth, 3>((ctrl & ~(ctrl << 6)) &
-                                                   msbs);
+                                                   kMsbs8Bytes);
   }
 
   // Returns a bitmask representing the positions of full slots.
   // Note: for `is_small()` tables group may contain the "same" slot twice:
   // original and mirrored.
   BitMask<uint64_t, kWidth, 3> MaskFull() const {
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
-    return BitMask<uint64_t, kWidth, 3>((ctrl ^ msbs) & msbs);
+    return BitMask<uint64_t, kWidth, 3>((ctrl ^ kMsbs8Bytes) & kMsbs8Bytes);
+  }
+
+  // Returns a bitmask representing the positions of non full slots.
+  // Note: this includes: kEmpty, kDeleted, kSentinel.
+  // It is useful in contexts when kSentinel is not present.
+  auto MaskNonFull() const {
+    return BitMask<uint64_t, kWidth, 3>(ctrl & kMsbs8Bytes);
   }
 
   NonIterableBitMask<uint64_t, kWidth, 3> MaskEmptyOrDeleted() const {
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     return NonIterableBitMask<uint64_t, kWidth, 3>((ctrl & ~(ctrl << 7)) &
-                                                   msbs);
+                                                   kMsbs8Bytes);
   }
 
   uint32_t CountLeadingEmptyOrDeleted() const {
@@ -803,9 +895,8 @@ struct GroupPortableImpl {
   }
 
   void ConvertSpecialToEmptyAndFullToDeleted(ctrl_t* dst) const {
-    constexpr uint64_t msbs = 0x8080808080808080ULL;
     constexpr uint64_t lsbs = 0x0101010101010101ULL;
-    auto x = ctrl & msbs;
+    auto x = ctrl & kMsbs8Bytes;
     auto res = (~x + (x >> 7)) & ~lsbs;
     little_endian::Store64(dst, res);
   }
@@ -815,21 +906,21 @@ struct GroupPortableImpl {
 
 #ifdef Y_ABSL_INTERNAL_HAVE_SSE2
 using Group = GroupSse2Impl;
-using GroupEmptyOrDeleted = GroupSse2Impl;
+using GroupFullEmptyOrDeleted = GroupSse2Impl;
 #elif defined(Y_ABSL_INTERNAL_HAVE_ARM_NEON) && defined(Y_ABSL_IS_LITTLE_ENDIAN)
 using Group = GroupAArch64Impl;
 // For Aarch64, we use the portable implementation for counting and masking
-// empty or deleted group elements. This is to avoid the latency of moving
+// full, empty or deleted group elements. This is to avoid the latency of moving
 // between data GPRs and Neon registers when it does not provide a benefit.
 // Using Neon is profitable when we call Match(), but is not when we don't,
-// which is the case when we do *EmptyOrDeleted operations. It is difficult to
-// make a similar approach beneficial on other architectures such as x86 since
-// they have much lower GPR <-> vector register transfer latency and 16-wide
-// Groups.
-using GroupEmptyOrDeleted = GroupPortableImpl;
+// which is the case when we do *EmptyOrDeleted and MaskFull operations.
+// It is difficult to make a similar approach beneficial on other architectures
+// such as x86 since they have much lower GPR <-> vector register transfer
+// latency and 16-wide Groups.
+using GroupFullEmptyOrDeleted = GroupPortableImpl;
 #else
 using Group = GroupPortableImpl;
-using GroupEmptyOrDeleted = GroupPortableImpl;
+using GroupFullEmptyOrDeleted = GroupPortableImpl;
 #endif
 
 // When there is an insertion with no reserved growth, we rehash with
@@ -978,17 +1069,96 @@ using CommonFieldsGenerationInfo = CommonFieldsGenerationInfoDisabled;
 using HashSetIteratorGenerationInfo = HashSetIteratorGenerationInfoDisabled;
 #endif
 
+// Stored the information regarding number of slots we can still fill
+// without needing to rehash.
+//
+// We want to ensure sufficient number of empty slots in the table in order
+// to keep probe sequences relatively short. Empty slot in the probe group
+// is required to stop probing.
+//
+// Tombstones (kDeleted slots) are not included in the growth capacity,
+// because we'd like to rehash when the table is filled with tombstones and/or
+// full slots.
+//
+// GrowthInfo also stores a bit that encodes whether table may have any
+// deleted slots.
+// Most of the tables (>95%) have no deleted slots, so some functions can
+// be more efficient with this information.
+//
+// Callers can also force a rehash via the standard `rehash(0)`,
+// which will recompute this value as a side-effect.
+//
+// See also `CapacityToGrowth()`.
+class GrowthInfo {
+ public:
+  // Leaves data member uninitialized.
+  GrowthInfo() = default;
+
+  // Initializes the GrowthInfo assuming we can grow `growth_left` elements
+  // and there are no kDeleted slots in the table.
+  void InitGrowthLeftNoDeleted(size_t growth_left) {
+    growth_left_info_ = growth_left;
+  }
+
+  // Overwrites single full slot with an empty slot.
+  void OverwriteFullAsEmpty() { ++growth_left_info_; }
+
+  // Overwrites single empty slot with a full slot.
+  void OverwriteEmptyAsFull() {
+    assert(GetGrowthLeft() > 0);
+    --growth_left_info_;
+  }
+
+  // Overwrites several empty slots with full slots.
+  void OverwriteManyEmptyAsFull(size_t cnt) {
+    assert(GetGrowthLeft() >= cnt);
+    growth_left_info_ -= cnt;
+  }
+
+  // Overwrites specified control element with full slot.
+  void OverwriteControlAsFull(ctrl_t ctrl) {
+    assert(GetGrowthLeft() >= static_cast<size_t>(IsEmpty(ctrl)));
+    growth_left_info_ -= static_cast<size_t>(IsEmpty(ctrl));
+  }
+
+  // Overwrites single full slot with a deleted slot.
+  void OverwriteFullAsDeleted() { growth_left_info_ |= kDeletedBit; }
+
+  // Returns true if table satisfies two properties:
+  // 1. Guaranteed to have no kDeleted slots.
+  // 2. There is a place for at least one element to grow.
+  bool HasNoDeletedAndGrowthLeft() const {
+    return static_cast<std::make_signed_t<size_t>>(growth_left_info_) > 0;
+  }
+
+  // Returns true if the table satisfies two properties:
+  // 1. Guaranteed to have no kDeleted slots.
+  // 2. There is no growth left.
+  bool HasNoGrowthLeftAndNoDeleted() const { return growth_left_info_ == 0; }
+
+  // Returns true if table guaranteed to have no k
+  bool HasNoDeleted() const {
+    return static_cast<std::make_signed_t<size_t>>(growth_left_info_) >= 0;
+  }
+
+  // Returns the number of elements left to grow.
+  size_t GetGrowthLeft() const { return growth_left_info_ & kGrowthLeftMask; }
+
+ private:
+  static constexpr size_t kGrowthLeftMask = ((~size_t{}) >> 1);
+  static constexpr size_t kDeletedBit = ~kGrowthLeftMask;
+  // Topmost bit signal whenever there are deleted slots.
+  size_t growth_left_info_;
+};
+
+static_assert(sizeof(GrowthInfo) == sizeof(size_t), "");
+static_assert(alignof(GrowthInfo) == alignof(size_t), "");
+
 // Returns whether `n` is a valid capacity (i.e., number of slots).
 //
 // A valid capacity is a non-zero integer `2^m - 1`.
 inline bool IsValidCapacity(size_t n) { return ((n + 1) & n) == 0 && n > 0; }
 
-// Computes the offset from the start of the backing allocation of control.
-// infoz and growth_left are stored at the beginning of the backing array.
-inline size_t ControlOffset(bool has_infoz) {
-  return (has_infoz ? sizeof(HashtablezInfoHandle) : 0) + sizeof(size_t);
-}
-
 // Returns the number of "cloned control bytes".
 //
 // This is the number of control bytes that are present both at the beginning
@@ -996,36 +1166,157 @@ inline size_t ControlOffset(bool has_infoz) {
 // `Group::kWidth`-width probe window starting from any control byte.
 constexpr size_t NumClonedBytes() { return Group::kWidth - 1; }
 
-// Given the capacity of a table, computes the offset (from the start of the
-// backing allocation) of the generation counter (if it exists).
-inline size_t GenerationOffset(size_t capacity, bool has_infoz) {
-  assert(IsValidCapacity(capacity));
-  const size_t num_control_bytes = capacity + 1 + NumClonedBytes();
-  return ControlOffset(has_infoz) + num_control_bytes;
+// Returns the number of control bytes including cloned.
+constexpr size_t NumControlBytes(size_t capacity) {
+  return capacity + 1 + NumClonedBytes();
 }
 
-// Given the capacity of a table, computes the offset (from the start of the
-// backing allocation) at which the slots begin.
-inline size_t SlotOffset(size_t capacity, size_t slot_align, bool has_infoz) {
-  assert(IsValidCapacity(capacity));
-  return (GenerationOffset(capacity, has_infoz) + NumGenerationBytes() +
-          slot_align - 1) &
-         (~slot_align + 1);
+// Computes the offset from the start of the backing allocation of control.
+// infoz and growth_info are stored at the beginning of the backing array.
+inline static size_t ControlOffset(bool has_infoz) {
+  return (has_infoz ? sizeof(HashtablezInfoHandle) : 0) + sizeof(GrowthInfo);
 }
 
-// Given the capacity of a table, computes the total size of the backing
-// array.
-inline size_t AllocSize(size_t capacity, size_t slot_size, size_t slot_align,
-                        bool has_infoz) {
-  return SlotOffset(capacity, slot_align, has_infoz) + capacity * slot_size;
-}
+// Helper class for computing offsets and allocation size of hash set fields.
+class RawHashSetLayout {
+ public:
+  explicit RawHashSetLayout(size_t capacity, size_t slot_align, bool has_infoz)
+      : capacity_(capacity),
+        control_offset_(ControlOffset(has_infoz)),
+        generation_offset_(control_offset_ + NumControlBytes(capacity)),
+        slot_offset_(
+            (generation_offset_ + NumGenerationBytes() + slot_align - 1) &
+            (~slot_align + 1)) {
+    assert(IsValidCapacity(capacity));
+  }
+
+  // Returns the capacity of a table.
+  size_t capacity() const { return capacity_; }
+
+  // Returns precomputed offset from the start of the backing allocation of
+  // control.
+  size_t control_offset() const { return control_offset_; }
+
+  // Given the capacity of a table, computes the offset (from the start of the
+  // backing allocation) of the generation counter (if it exists).
+  size_t generation_offset() const { return generation_offset_; }
+
+  // Given the capacity of a table, computes the offset (from the start of the
+  // backing allocation) at which the slots begin.
+  size_t slot_offset() const { return slot_offset_; }
+
+  // Given the capacity of a table, computes the total size of the backing
+  // array.
+  size_t alloc_size(size_t slot_size) const {
+    return slot_offset_ + capacity_ * slot_size;
+  }
+
+ private:
+  size_t capacity_;
+  size_t control_offset_;
+  size_t generation_offset_;
+  size_t slot_offset_;
+};
+
+struct HashtableFreeFunctionsAccess;
+
+// We only allow a maximum of 1 SOO element, which makes the implementation
+// much simpler. Complications with multiple SOO elements include:
+// - Satisfying the guarantee that erasing one element doesn't invalidate
+//   iterators to other elements means we would probably need actual SOO
+//   control bytes.
+// - In order to prevent user code from depending on iteration order for small
+//   tables, we would need to randomize the iteration order somehow.
+constexpr size_t SooCapacity() { return 1; }
+// Sentinel type to indicate SOO CommonFields construction.
+struct soo_tag_t {};
+// Sentinel type to indicate SOO CommonFields construction with full size.
+struct full_soo_tag_t {};
+
+// Suppress erroneous uninitialized memory errors on GCC. For example, GCC
+// thinks that the call to slot_array() in find_or_prepare_insert() is reading
+// uninitialized memory, but slot_array is only called there when the table is
+// non-empty and this memory is initialized when the table is non-empty.
+#if !defined(__clang__) && defined(__GNUC__)
+#define Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED(x)                    \
+  _Pragma("GCC diagnostic push")                                   \
+      _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")  \
+          _Pragma("GCC diagnostic ignored \"-Wuninitialized\"") x; \
+  _Pragma("GCC diagnostic pop")
+#define Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(x) \
+  Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED(return x)
+#else
+#define Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED(x) x
+#define Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(x) return x
+#endif
+
+// This allows us to work around an uninitialized memory warning when
+// constructing begin() iterators in empty hashtables.
+union MaybeInitializedPtr {
+  void* get() const { Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(p); }
+  void set(void* ptr) { p = ptr; }
+
+  void* p;
+};
+
+struct HeapPtrs {
+  HeapPtrs() = default;
+  explicit HeapPtrs(ctrl_t* c) : control(c) {}
+
+  // The control bytes (and, also, a pointer near to the base of the backing
+  // array).
+  //
+  // This contains `capacity + 1 + NumClonedBytes()` entries, even
+  // when the table is empty (hence EmptyGroup).
+  //
+  // Note that growth_info is stored immediately before this pointer.
+  // May be uninitialized for SOO tables.
+  ctrl_t* control;
+
+  // The beginning of the slots, located at `SlotOffset()` bytes after
+  // `control`. May be uninitialized for empty tables.
+  // Note: we can't use `slots` because Qt defines "slots" as a macro.
+  MaybeInitializedPtr slot_array;
+};
+
+// Manages the backing array pointers or the SOO slot. When raw_hash_set::is_soo
+// is true, the SOO slot is stored in `soo_data`. Otherwise, we use `heap`.
+union HeapOrSoo {
+  HeapOrSoo() = default;
+  explicit HeapOrSoo(ctrl_t* c) : heap(c) {}
+
+  ctrl_t*& control() {
+    Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(heap.control);
+  }
+  ctrl_t* control() const {
+    Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(heap.control);
+  }
+  MaybeInitializedPtr& slot_array() {
+    Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(heap.slot_array);
+  }
+  MaybeInitializedPtr slot_array() const {
+    Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(heap.slot_array);
+  }
+  void* get_soo_data() {
+    Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(soo_data);
+  }
+  const void* get_soo_data() const {
+    Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN(soo_data);
+  }
+
+  HeapPtrs heap;
+  unsigned char soo_data[sizeof(HeapPtrs)];
+};
 
 // CommonFields hold the fields in raw_hash_set that do not depend
 // on template parameters. This allows us to conveniently pass all
 // of this state to helper functions as a single argument.
 class CommonFields : public CommonFieldsGenerationInfo {
  public:
-  CommonFields() = default;
+  CommonFields() : capacity_(0), size_(0), heap_or_soo_(EmptyGroup()) {}
+  explicit CommonFields(soo_tag_t) : capacity_(SooCapacity()), size_(0) {}
+  explicit CommonFields(full_soo_tag_t)
+      : capacity_(SooCapacity()), size_(size_t{1} << HasInfozShift()) {}
 
   // Not copyable
   CommonFields(const CommonFields&) = delete;
@@ -1035,23 +1326,44 @@ class CommonFields : public CommonFieldsGenerationInfo {
   CommonFields(CommonFields&& that) = default;
   CommonFields& operator=(CommonFields&&) = default;
 
-  ctrl_t* control() const { return control_; }
-  void set_control(ctrl_t* c) { control_ = c; }
+  template <bool kSooEnabled>
+  static CommonFields CreateDefault() {
+    return kSooEnabled ? CommonFields{soo_tag_t{}} : CommonFields{};
+  }
+
+  // The inline data for SOO is written on top of control_/slots_.
+  const void* soo_data() const { return heap_or_soo_.get_soo_data(); }
+  void* soo_data() { return heap_or_soo_.get_soo_data(); }
+
+  HeapOrSoo heap_or_soo() const { return heap_or_soo_; }
+  const HeapOrSoo& heap_or_soo_ref() const { return heap_or_soo_; }
+
+  ctrl_t* control() const { return heap_or_soo_.control(); }
+  void set_control(ctrl_t* c) { heap_or_soo_.control() = c; }
   void* backing_array_start() const {
-    // growth_left (and maybe infoz) is stored before control bytes.
+    // growth_info (and maybe infoz) is stored before control bytes.
     assert(reinterpret_cast<uintptr_t>(control()) % alignof(size_t) == 0);
     return control() - ControlOffset(has_infoz());
   }
 
   // Note: we can't use slots() because Qt defines "slots" as a macro.
-  void* slot_array() const { return slots_; }
-  void set_slots(void* s) { slots_ = s; }
+  void* slot_array() const { return heap_or_soo_.slot_array().get(); }
+  MaybeInitializedPtr slots_union() const { return heap_or_soo_.slot_array(); }
+  void set_slots(void* s) { heap_or_soo_.slot_array().set(s); }
 
   // The number of filled slots.
   size_t size() const { return size_ >> HasInfozShift(); }
   void set_size(size_t s) {
     size_ = (s << HasInfozShift()) | (size_ & HasInfozMask());
   }
+  void set_empty_soo() {
+    AssertInSooMode();
+    size_ = 0;
+  }
+  void set_full_soo() {
+    AssertInSooMode();
+    size_ = size_t{1} << HasInfozShift();
+  }
   void increment_size() {
     assert(size() < capacity());
     size_ += size_t{1} << HasInfozShift();
@@ -1070,15 +1382,17 @@ class CommonFields : public CommonFieldsGenerationInfo {
 
   // The number of slots we can still fill without needing to rehash.
   // This is stored in the heap allocation before the control bytes.
-  size_t growth_left() const {
-    const size_t* gl_ptr = reinterpret_cast<size_t*>(control()) - 1;
-    assert(reinterpret_cast<uintptr_t>(gl_ptr) % alignof(size_t) == 0);
+  // TODO(b/289225379): experiment with moving growth_info back inline to
+  // increase room for SOO.
+  size_t growth_left() const { return growth_info().GetGrowthLeft(); }
+
+  GrowthInfo& growth_info() {
+    auto* gl_ptr = reinterpret_cast<GrowthInfo*>(control()) - 1;
+    assert(reinterpret_cast<uintptr_t>(gl_ptr) % alignof(GrowthInfo) == 0);
     return *gl_ptr;
   }
-  void set_growth_left(size_t gl) {
-    size_t* gl_ptr = reinterpret_cast<size_t*>(control()) - 1;
-    assert(reinterpret_cast<uintptr_t>(gl_ptr) % alignof(size_t) == 0);
-    *gl_ptr = gl;
+  GrowthInfo growth_info() const {
+    return const_cast<CommonFields*>(this)->growth_info();
   }
 
   bool has_infoz() const {
@@ -1103,12 +1417,8 @@ class CommonFields : public CommonFieldsGenerationInfo {
         should_rehash_for_bug_detection_on_insert(control(), capacity());
   }
   bool should_rehash_for_bug_detection_on_move() const {
-    return CommonFieldsGenerationInfo::
-        should_rehash_for_bug_detection_on_move(control(), capacity());
-  }
-  void maybe_increment_generation_on_move() {
-    if (capacity() == 0) return;
-    increment_generation();
+    return CommonFieldsGenerationInfo::should_rehash_for_bug_detection_on_move(
+        control(), capacity());
   }
   void reset_reserved_growth(size_t reservation) {
     CommonFieldsGenerationInfo::reset_reserved_growth(reservation, size());
@@ -1116,7 +1426,16 @@ class CommonFields : public CommonFieldsGenerationInfo {
 
   // The size of the backing array allocation.
   size_t alloc_size(size_t slot_size, size_t slot_align) const {
-    return AllocSize(capacity(), slot_size, slot_align, has_infoz());
+    return RawHashSetLayout(capacity(), slot_align, has_infoz())
+        .alloc_size(slot_size);
+  }
+
+  // Move fields other than heap_or_soo_.
+  void move_non_heap_or_soo_fields(CommonFields& that) {
+    static_cast<CommonFieldsGenerationInfo&>(*this) =
+        std::move(static_cast<CommonFieldsGenerationInfo&>(that));
+    capacity_ = that.capacity_;
+    size_ = that.size_;
   }
 
   // Returns the number of control bytes set to kDeleted. For testing only.
@@ -1132,21 +1451,12 @@ class CommonFields : public CommonFieldsGenerationInfo {
     return (size_t{1} << HasInfozShift()) - 1;
   }
 
-  // TODO(b/182800944): Investigate removing some of these fields:
-  // - control/slots can be derived from each other
-
-  // The control bytes (and, also, a pointer near to the base of the backing
-  // array).
-  //
-  // This contains `capacity + 1 + NumClonedBytes()` entries, even
-  // when the table is empty (hence EmptyGroup).
-  //
-  // Note that growth_left is stored immediately before this pointer.
-  ctrl_t* control_ = EmptyGroup();
-
-  // The beginning of the slots, located at `SlotOffset()` bytes after
-  // `control`. May be null for empty tables.
-  void* slots_ = nullptr;
+  // We can't assert that SOO is enabled because we don't have SooEnabled(), but
+  // we assert what we can.
+  void AssertInSooMode() const {
+    assert(capacity() == SooCapacity());
+    assert(!has_infoz());
+  }
 
   // The number of slots in the backing array. This is always 2^N-1 for an
   // integer N. NOTE: we tried experimenting with compressing the capacity and
@@ -1154,10 +1464,16 @@ class CommonFields : public CommonFieldsGenerationInfo {
   // power (N in 2^N-1), and (b) storing 2^N as the most significant bit of
   // size_ and storing size in the low bits. Both of these experiments were
   // regressions, presumably because we need capacity to do find operations.
-  size_t capacity_ = 0;
+  size_t capacity_;
 
   // The size and also has one bit that stores whether we have infoz.
-  size_t size_ = 0;
+  // TODO(b/289225379): we could put size_ into HeapOrSoo and make capacity_
+  // encode the size in SOO case. We would be making size()/capacity() more
+  // expensive in order to have more SOO space.
+  size_t size_;
+
+  // Either the control/slots pointers or the SOO slot.
+  HeapOrSoo heap_or_soo_;
 };
 
 template <class Policy, class Hash, class Eq, class Alloc>
@@ -1320,6 +1636,10 @@ inline bool AreItersFromSameContainer(const ctrl_t* ctrl_a,
                                       const void* const& slot_b) {
   // If either control byte is null, then we can't tell.
   if (ctrl_a == nullptr || ctrl_b == nullptr) return true;
+  const bool a_is_soo = IsSooControl(ctrl_a);
+  if (a_is_soo != IsSooControl(ctrl_b)) return false;
+  if (a_is_soo) return slot_a == slot_b;
+
   const void* low_slot = slot_a;
   const void* hi_slot = slot_b;
   if (ctrl_a > ctrl_b) {
@@ -1343,41 +1663,45 @@ inline void AssertSameContainer(const ctrl_t* ctrl_a, const ctrl_t* ctrl_b,
   // - use `Y_ABSL_PREDICT_FALSE()` to provide a compiler hint for code layout
   // - use `Y_ABSL_RAW_LOG()` with a format string to reduce code size and improve
   //   the chances that the hot paths will be inlined.
+
+  // fail_if(is_invalid, message) crashes when is_invalid is true and provides
+  // an error message based on `message`.
+  const auto fail_if = [](bool is_invalid, const char* message) {
+    if (Y_ABSL_PREDICT_FALSE(is_invalid)) {
+      Y_ABSL_RAW_LOG(FATAL, "Invalid iterator comparison. %s", message);
+    }
+  };
+
   const bool a_is_default = ctrl_a == EmptyGroup();
   const bool b_is_default = ctrl_b == EmptyGroup();
-  if (Y_ABSL_PREDICT_FALSE(a_is_default != b_is_default)) {
-    Y_ABSL_RAW_LOG(
-        FATAL,
-        "Invalid iterator comparison. Comparing default-constructed iterator "
-        "with non-default-constructed iterator.");
-  }
   if (a_is_default && b_is_default) return;
+  fail_if(a_is_default != b_is_default,
+          "Comparing default-constructed hashtable iterator with a "
+          "non-default-constructed hashtable iterator.");
 
   if (SwisstableGenerationsEnabled()) {
     if (Y_ABSL_PREDICT_TRUE(generation_ptr_a == generation_ptr_b)) return;
+    // Users don't need to know whether the tables are SOO so don't mention SOO
+    // in the debug message.
+    const bool a_is_soo = IsSooControl(ctrl_a);
+    const bool b_is_soo = IsSooControl(ctrl_b);
+    fail_if(a_is_soo != b_is_soo || (a_is_soo && b_is_soo),
+            "Comparing iterators from different hashtables.");
+
     const bool a_is_empty = IsEmptyGeneration(generation_ptr_a);
     const bool b_is_empty = IsEmptyGeneration(generation_ptr_b);
-    if (a_is_empty != b_is_empty) {
-      Y_ABSL_RAW_LOG(FATAL,
-                   "Invalid iterator comparison. Comparing iterator from a "
-                   "non-empty hashtable with an iterator from an empty "
-                   "hashtable.");
-    }
-    if (a_is_empty && b_is_empty) {
-      Y_ABSL_RAW_LOG(FATAL,
-                   "Invalid iterator comparison. Comparing iterators from "
-                   "different empty hashtables.");
-    }
+    fail_if(a_is_empty != b_is_empty,
+            "Comparing an iterator from an empty hashtable with an iterator "
+            "from a non-empty hashtable.");
+    fail_if(a_is_empty && b_is_empty,
+            "Comparing iterators from different empty hashtables.");
+
     const bool a_is_end = ctrl_a == nullptr;
     const bool b_is_end = ctrl_b == nullptr;
-    if (a_is_end || b_is_end) {
-      Y_ABSL_RAW_LOG(FATAL,
-                   "Invalid iterator comparison. Comparing iterator with an "
-                   "end() iterator from a different hashtable.");
-    }
-    Y_ABSL_RAW_LOG(FATAL,
-                 "Invalid iterator comparison. Comparing non-end() iterators "
-                 "from different hashtables.");
+    fail_if(a_is_end || b_is_end,
+            "Comparing iterator with an end() iterator from a different "
+            "hashtable.");
+    fail_if(true, "Comparing non-end() iterators from different hashtables.");
   } else {
     Y_ABSL_HARDENING_ASSERT(
         AreItersFromSameContainer(ctrl_a, ctrl_b, slot_a, slot_b) &&
@@ -1432,20 +1756,17 @@ template <typename = void>
 inline FindInfo find_first_non_full(const CommonFields& common, size_t hash) {
   auto seq = probe(common, hash);
   const ctrl_t* ctrl = common.control();
+  if (IsEmptyOrDeleted(ctrl[seq.offset()]) &&
+      !ShouldInsertBackwards(common.capacity(), hash, ctrl)) {
+    return {seq.offset(), /*probe_length=*/0};
+  }
   while (true) {
-    GroupEmptyOrDeleted g{ctrl + seq.offset()};
+    GroupFullEmptyOrDeleted g{ctrl + seq.offset()};
     auto mask = g.MaskEmptyOrDeleted();
     if (mask) {
-#if !defined(NDEBUG)
-      // We want to add entropy even when ASLR is not enabled.
-      // In debug build we will randomly insert in either the front or back of
-      // the group.
-      // TODO(kfm,sbenza): revisit after we do unconditional mixing
-      if (!is_small(common.capacity()) && ShouldInsertBackwards(hash, ctrl)) {
-        return {seq.offset(mask.HighestBitSet()), seq.index()};
-      }
-#endif
-      return {seq.offset(mask.LowestBitSet()), seq.index()};
+      return {
+          seq.offset(GetInsertionOffset(mask, common.capacity(), hash, ctrl)),
+          seq.index()};
     }
     seq.next();
     assert(seq.index() <= common.capacity() && "full table!");
@@ -1462,7 +1783,8 @@ extern template FindInfo find_first_non_full(const CommonFields&, size_t);
 FindInfo find_first_non_full_outofline(const CommonFields&, size_t);
 
 inline void ResetGrowthLeft(CommonFields& common) {
-  common.set_growth_left(CapacityToGrowth(common.capacity()) - common.size());
+  common.growth_info().InitGrowthLeftNoDeleted(
+      CapacityToGrowth(common.capacity()) - common.size());
 }
 
 // Sets `ctrl` to `{kEmpty, kSentinel, ..., kEmpty}`, marking the entire
@@ -1476,43 +1798,140 @@ inline void ResetCtrl(CommonFields& common, size_t slot_size) {
   SanitizerPoisonMemoryRegion(common.slot_array(), slot_size * capacity);
 }
 
-// Sets `ctrl[i]` to `h`.
-//
-// Unlike setting it directly, this function will perform bounds checks and
-// mirror the value to the cloned tail if necessary.
-inline void SetCtrl(const CommonFields& common, size_t i, ctrl_t h,
-                    size_t slot_size) {
-  const size_t capacity = common.capacity();
-  assert(i < capacity);
-
-  auto* slot_i = static_cast<const char*>(common.slot_array()) + i * slot_size;
+// Sets sanitizer poisoning for slot corresponding to control byte being set.
+inline void DoSanitizeOnSetCtrl(const CommonFields& c, size_t i, ctrl_t h,
+                                size_t slot_size) {
+  assert(i < c.capacity());
+  auto* slot_i = static_cast<const char*>(c.slot_array()) + i * slot_size;
   if (IsFull(h)) {
     SanitizerUnpoisonMemoryRegion(slot_i, slot_size);
   } else {
     SanitizerPoisonMemoryRegion(slot_i, slot_size);
   }
+}
 
-  ctrl_t* ctrl = common.control();
+// Sets `ctrl[i]` to `h`.
+//
+// Unlike setting it directly, this function will perform bounds checks and
+// mirror the value to the cloned tail if necessary.
+inline void SetCtrl(const CommonFields& c, size_t i, ctrl_t h,
+                    size_t slot_size) {
+  DoSanitizeOnSetCtrl(c, i, h, slot_size);
+  ctrl_t* ctrl = c.control();
   ctrl[i] = h;
-  ctrl[((i - NumClonedBytes()) & capacity) + (NumClonedBytes() & capacity)] = h;
+  ctrl[((i - NumClonedBytes()) & c.capacity()) +
+       (NumClonedBytes() & c.capacity())] = h;
+}
+// Overload for setting to an occupied `h2_t` rather than a special `ctrl_t`.
+inline void SetCtrl(const CommonFields& c, size_t i, h2_t h, size_t slot_size) {
+  SetCtrl(c, i, static_cast<ctrl_t>(h), slot_size);
 }
 
+// Like SetCtrl, but in a single group table, we can save some operations when
+// setting the cloned control byte.
+inline void SetCtrlInSingleGroupTable(const CommonFields& c, size_t i, ctrl_t h,
+                                      size_t slot_size) {
+  assert(is_single_group(c.capacity()));
+  DoSanitizeOnSetCtrl(c, i, h, slot_size);
+  ctrl_t* ctrl = c.control();
+  ctrl[i] = h;
+  ctrl[i + c.capacity() + 1] = h;
+}
 // Overload for setting to an occupied `h2_t` rather than a special `ctrl_t`.
-inline void SetCtrl(const CommonFields& common, size_t i, h2_t h,
-                    size_t slot_size) {
-  SetCtrl(common, i, static_cast<ctrl_t>(h), slot_size);
+inline void SetCtrlInSingleGroupTable(const CommonFields& c, size_t i, h2_t h,
+                                      size_t slot_size) {
+  SetCtrlInSingleGroupTable(c, i, static_cast<ctrl_t>(h), slot_size);
 }
 
-// growth_left (which is a size_t) is stored with the backing array.
+// growth_info (which is a size_t) is stored with the backing array.
 constexpr size_t BackingArrayAlignment(size_t align_of_slot) {
-  return (std::max)(align_of_slot, alignof(size_t));
+  return (std::max)(align_of_slot, alignof(GrowthInfo));
 }
 
 // Returns the address of the ith slot in slots where each slot occupies
 // slot_size.
 inline void* SlotAddress(void* slot_array, size_t slot, size_t slot_size) {
-  return reinterpret_cast<void*>(reinterpret_cast<char*>(slot_array) +
-                                 (slot * slot_size));
+  return static_cast<void*>(static_cast<char*>(slot_array) +
+                            (slot * slot_size));
+}
+
+// Iterates over all full slots and calls `cb(const ctrl_t*, SlotType*)`.
+// No insertion to the table allowed during Callback call.
+// Erasure is allowed only for the element passed to the callback.
+template <class SlotType, class Callback>
+Y_ABSL_ATTRIBUTE_ALWAYS_INLINE inline void IterateOverFullSlots(
+    const CommonFields& c, SlotType* slot, Callback cb) {
+  const size_t cap = c.capacity();
+  const ctrl_t* ctrl = c.control();
+  if (is_small(cap)) {
+    // Mirrored/cloned control bytes in small table are also located in the
+    // first group (starting from position 0). We are taking group from position
+    // `capacity` in order to avoid duplicates.
+
+    // Small tables capacity fits into portable group, where
+    // GroupPortableImpl::MaskFull is more efficient for the
+    // capacity <= GroupPortableImpl::kWidth.
+    assert(cap <= GroupPortableImpl::kWidth &&
+           "unexpectedly large small capacity");
+    static_assert(Group::kWidth >= GroupPortableImpl::kWidth,
+                  "unexpected group width");
+    // Group starts from kSentinel slot, so indices in the mask will
+    // be increased by 1.
+    const auto mask = GroupPortableImpl(ctrl + cap).MaskFull();
+    --ctrl;
+    --slot;
+    for (uint32_t i : mask) {
+      cb(ctrl + i, slot + i);
+    }
+    return;
+  }
+  size_t remaining = c.size();
+  Y_ABSL_ATTRIBUTE_UNUSED const size_t original_size_for_assert = remaining;
+  while (remaining != 0) {
+    for (uint32_t i : GroupFullEmptyOrDeleted(ctrl).MaskFull()) {
+      assert(IsFull(ctrl[i]) && "hash table was modified unexpectedly");
+      cb(ctrl + i, slot + i);
+      --remaining;
+    }
+    ctrl += Group::kWidth;
+    slot += Group::kWidth;
+    assert((remaining == 0 || *(ctrl - 1) != ctrl_t::kSentinel) &&
+           "hash table was modified unexpectedly");
+  }
+  // NOTE: erasure of the current element is allowed in callback for
+  // y_absl::erase_if specialization. So we use `>=`.
+  assert(original_size_for_assert >= c.size() &&
+         "hash table was modified unexpectedly");
+}
+
+template <typename CharAlloc>
+constexpr bool ShouldSampleHashtablezInfo() {
+  // Folks with custom allocators often make unwarranted assumptions about the
+  // behavior of their classes vis-a-vis trivial destructability and what
+  // calls they will or won't make.  Avoid sampling for people with custom
+  // allocators to get us out of this mess.  This is not a hard guarantee but
+  // a workaround while we plan the exact guarantee we want to provide.
+  return std::is_same<CharAlloc, std::allocator<char>>::value;
+}
+
+template <bool kSooEnabled>
+HashtablezInfoHandle SampleHashtablezInfo(size_t sizeof_slot, size_t sizeof_key,
+                                          size_t sizeof_value,
+                                          size_t old_capacity, bool was_soo,
+                                          HashtablezInfoHandle forced_infoz,
+                                          CommonFields& c) {
+  if (forced_infoz.IsSampled()) return forced_infoz;
+  // In SOO, we sample on the first insertion so if this is an empty SOO case
+  // (e.g. when reserve is called), then we still need to sample.
+  if (kSooEnabled && was_soo && c.size() == 0) {
+    return Sample(sizeof_slot, sizeof_key, sizeof_value, SooCapacity());
+  }
+  // For non-SOO cases, we sample whenever the capacity is increasing from zero
+  // to non-zero.
+  if (!kSooEnabled && old_capacity == 0) {
+    return Sample(sizeof_slot, sizeof_key, sizeof_value, 0);
+  }
+  return c.infoz();
 }
 
 // Helper class to perform resize of the hash set.
@@ -1521,17 +1940,21 @@ inline void* SlotAddress(void* slot_array, size_t slot, size_t slot_size) {
 // See GrowIntoSingleGroupShuffleControlBytes for details.
 class HashSetResizeHelper {
  public:
-  explicit HashSetResizeHelper(CommonFields& c)
-      : old_ctrl_(c.control()),
-        old_capacity_(c.capacity()),
-        had_infoz_(c.has_infoz()) {}
-
-  // Optimized for small groups version of `find_first_non_full` applicable
-  // only right after calling `raw_hash_set::resize`.
+  explicit HashSetResizeHelper(CommonFields& c, bool was_soo, bool had_soo_slot,
+                               HashtablezInfoHandle forced_infoz)
+      : old_capacity_(c.capacity()),
+        had_infoz_(c.has_infoz()),
+        was_soo_(was_soo),
+        had_soo_slot_(had_soo_slot),
+        forced_infoz_(forced_infoz) {}
+
+  // Optimized for small groups version of `find_first_non_full`.
+  // Beneficial only right after calling `raw_hash_set::resize`.
+  // It is safe to call in case capacity is big or was not changed, but there
+  // will be no performance benefit.
   // It has implicit assumption that `resize` will call
   // `GrowSizeIntoSingleGroup*` in case `IsGrowingIntoSingleGroupApplicable`.
-  // Falls back to `find_first_non_full` in case of big groups, so it is
-  // safe to use after `rehash_and_grow_if_necessary`.
+  // Falls back to `find_first_non_full` in case of big groups.
   static FindInfo FindFirstNonFullAfterResize(const CommonFields& c,
                                               size_t old_capacity,
                                               size_t hash) {
@@ -1553,14 +1976,30 @@ class HashSetResizeHelper {
     return FindInfo{offset, 0};
   }
 
-  ctrl_t* old_ctrl() const { return old_ctrl_; }
+  HeapOrSoo& old_heap_or_soo() { return old_heap_or_soo_; }
+  void* old_soo_data() { return old_heap_or_soo_.get_soo_data(); }
+  ctrl_t* old_ctrl() const {
+    assert(!was_soo_);
+    return old_heap_or_soo_.control();
+  }
+  void* old_slots() const {
+    assert(!was_soo_);
+    return old_heap_or_soo_.slot_array().get();
+  }
   size_t old_capacity() const { return old_capacity_; }
 
+  // Returns the index of the SOO slot when growing from SOO to non-SOO in a
+  // single group. See also InitControlBytesAfterSoo(). It's important to use
+  // index 1 so that when resizing from capacity 1 to 3, we can still have
+  // random iteration order between the first two inserted elements.
+  // I.e. it allows inserting the second element at either index 0 or 2.
+  static size_t SooSlotIndex() { return 1; }
+
   // Allocates a backing array for the hashtable.
   // Reads `capacity` and updates all other fields based on the result of
   // the allocation.
   //
-  // It also may do the folowing actions:
+  // It also may do the following actions:
   // 1. initialize control bytes
   // 2. initialize slots
   // 3. deallocate old slots.
@@ -1590,45 +2029,45 @@ class HashSetResizeHelper {
   //
   //  Returns IsGrowingIntoSingleGroupApplicable result to avoid recomputation.
   template <typename Alloc, size_t SizeOfSlot, bool TransferUsesMemcpy,
-            size_t AlignOfSlot>
-  Y_ABSL_ATTRIBUTE_NOINLINE bool InitializeSlots(CommonFields& c, void* old_slots,
-                                               Alloc alloc) {
+            bool SooEnabled, size_t AlignOfSlot>
+  Y_ABSL_ATTRIBUTE_NOINLINE bool InitializeSlots(CommonFields& c, Alloc alloc,
+                                               ctrl_t soo_slot_h2,
+                                               size_t key_size,
+                                               size_t value_size) {
     assert(c.capacity());
-    // Folks with custom allocators often make unwarranted assumptions about the
-    // behavior of their classes vis-a-vis trivial destructability and what
-    // calls they will or won't make.  Avoid sampling for people with custom
-    // allocators to get us out of this mess.  This is not a hard guarantee but
-    // a workaround while we plan the exact guarantee we want to provide.
-    const size_t sample_size =
-        (std::is_same<Alloc, std::allocator<char>>::value &&
-         c.slot_array() == nullptr)
-            ? SizeOfSlot
-            : 0;
     HashtablezInfoHandle infoz =
-        sample_size > 0 ? Sample(sample_size) : c.infoz();
+        ShouldSampleHashtablezInfo<Alloc>()
+            ? SampleHashtablezInfo<SooEnabled>(SizeOfSlot, key_size, value_size,
+                                               old_capacity_, was_soo_,
+                                               forced_infoz_, c)
+            : HashtablezInfoHandle{};
 
     const bool has_infoz = infoz.IsSampled();
-    const size_t cap = c.capacity();
-    const size_t alloc_size =
-        AllocSize(cap, SizeOfSlot, AlignOfSlot, has_infoz);
-    char* mem = static_cast<char*>(
-        Allocate<BackingArrayAlignment(AlignOfSlot)>(&alloc, alloc_size));
+    RawHashSetLayout layout(c.capacity(), AlignOfSlot, has_infoz);
+    char* mem = static_cast<char*>(Allocate<BackingArrayAlignment(AlignOfSlot)>(
+        &alloc, layout.alloc_size(SizeOfSlot)));
     const GenerationType old_generation = c.generation();
-    c.set_generation_ptr(reinterpret_cast<GenerationType*>(
-        mem + GenerationOffset(cap, has_infoz)));
+    c.set_generation_ptr(
+        reinterpret_cast<GenerationType*>(mem + layout.generation_offset()));
     c.set_generation(NextGeneration(old_generation));
-    c.set_control(reinterpret_cast<ctrl_t*>(mem + ControlOffset(has_infoz)));
-    c.set_slots(mem + SlotOffset(cap, AlignOfSlot, has_infoz));
+    c.set_control(reinterpret_cast<ctrl_t*>(mem + layout.control_offset()));
+    c.set_slots(mem + layout.slot_offset());
     ResetGrowthLeft(c);
 
     const bool grow_single_group =
-        IsGrowingIntoSingleGroupApplicable(old_capacity_, c.capacity());
-    if (old_capacity_ != 0 && grow_single_group) {
+        IsGrowingIntoSingleGroupApplicable(old_capacity_, layout.capacity());
+    if (SooEnabled && was_soo_ && grow_single_group) {
+      InitControlBytesAfterSoo(c.control(), soo_slot_h2, layout.capacity());
+      if (TransferUsesMemcpy && had_soo_slot_) {
+        TransferSlotAfterSoo(c, SizeOfSlot);
+      }
+      // SooEnabled implies that old_capacity_ != 0.
+    } else if ((SooEnabled || old_capacity_ != 0) && grow_single_group) {
       if (TransferUsesMemcpy) {
-        GrowSizeIntoSingleGroupTransferable(c, old_slots, SizeOfSlot);
-        DeallocateOld<AlignOfSlot>(alloc, SizeOfSlot, old_slots);
+        GrowSizeIntoSingleGroupTransferable(c, SizeOfSlot);
+        DeallocateOld<AlignOfSlot>(alloc, SizeOfSlot);
       } else {
-        GrowIntoSingleGroupShuffleControlBytes(c.control(), c.capacity());
+        GrowIntoSingleGroupShuffleControlBytes(c.control(), layout.capacity());
       }
     } else {
       ResetCtrl(c, SizeOfSlot);
@@ -1636,8 +2075,8 @@ class HashSetResizeHelper {
 
     c.set_has_infoz(has_infoz);
     if (has_infoz) {
-      infoz.RecordStorageChanged(c.size(), cap);
-      if (grow_single_group || old_capacity_ == 0) {
+      infoz.RecordStorageChanged(c.size(), layout.capacity());
+      if ((SooEnabled && was_soo_) || grow_single_group || old_capacity_ == 0) {
         infoz.RecordRehash(0);
       }
       c.set_infoz(infoz);
@@ -1651,21 +2090,22 @@ class HashSetResizeHelper {
   // PRECONDITIONS:
   // 1. GrowIntoSingleGroupShuffleControlBytes was already called.
   template <class PolicyTraits, class Alloc>
-  void GrowSizeIntoSingleGroup(CommonFields& c, Alloc& alloc_ref,
-                               typename PolicyTraits::slot_type* old_slots) {
+  void GrowSizeIntoSingleGroup(CommonFields& c, Alloc& alloc_ref) {
     assert(old_capacity_ < Group::kWidth / 2);
     assert(IsGrowingIntoSingleGroupApplicable(old_capacity_, c.capacity()));
     using slot_type = typename PolicyTraits::slot_type;
     assert(is_single_group(c.capacity()));
 
-    auto* new_slots = reinterpret_cast<slot_type*>(c.slot_array());
+    auto* new_slots = static_cast<slot_type*>(c.slot_array());
+    auto* old_slots_ptr = static_cast<slot_type*>(old_slots());
 
     size_t shuffle_bit = old_capacity_ / 2 + 1;
     for (size_t i = 0; i < old_capacity_; ++i) {
-      if (IsFull(old_ctrl_[i])) {
+      if (IsFull(old_ctrl()[i])) {
         size_t new_i = i ^ shuffle_bit;
         SanitizerUnpoisonMemoryRegion(new_slots + new_i, sizeof(slot_type));
-        PolicyTraits::transfer(&alloc_ref, new_slots + new_i, old_slots + i);
+        PolicyTraits::transfer(&alloc_ref, new_slots + new_i,
+                               old_slots_ptr + i);
       }
     }
     PoisonSingleGroupEmptySlots(c, sizeof(slot_type));
@@ -1673,11 +2113,12 @@ class HashSetResizeHelper {
 
   // Deallocates old backing array.
   template <size_t AlignOfSlot, class CharAlloc>
-  void DeallocateOld(CharAlloc alloc_ref, size_t slot_size, void* old_slots) {
-    SanitizerUnpoisonMemoryRegion(old_slots, slot_size * old_capacity_);
+  void DeallocateOld(CharAlloc alloc_ref, size_t slot_size) {
+    SanitizerUnpoisonMemoryRegion(old_slots(), slot_size * old_capacity_);
+    auto layout = RawHashSetLayout(old_capacity_, AlignOfSlot, had_infoz_);
     Deallocate<BackingArrayAlignment(AlignOfSlot)>(
-        &alloc_ref, old_ctrl_ - ControlOffset(had_infoz_),
-        AllocSize(old_capacity_, slot_size, AlignOfSlot, had_infoz_));
+        &alloc_ref, old_ctrl() - layout.control_offset(),
+        layout.alloc_size(slot_size));
   }
 
  private:
@@ -1692,8 +2133,12 @@ class HashSetResizeHelper {
   // Relocates control bytes and slots into new single group for
   // transferable objects.
   // Must be called only if IsGrowingIntoSingleGroupApplicable returned true.
-  void GrowSizeIntoSingleGroupTransferable(CommonFields& c, void* old_slots,
-                                           size_t slot_size);
+  void GrowSizeIntoSingleGroupTransferable(CommonFields& c, size_t slot_size);
+
+  // If there was an SOO slot and slots are transferable, transfers the SOO slot
+  // into the new heap allocation. Must be called only if
+  // IsGrowingIntoSingleGroupApplicable returned true.
+  void TransferSlotAfterSoo(CommonFields& c, size_t slot_size);
 
   // Shuffle control bits deterministically to the next capacity.
   // Returns offset for newly added element with given hash.
@@ -1726,6 +2171,13 @@ class HashSetResizeHelper {
   void GrowIntoSingleGroupShuffleControlBytes(ctrl_t* new_ctrl,
                                               size_t new_capacity) const;
 
+  // If the table was SOO, initializes new control bytes. `h2` is the control
+  // byte corresponding to the full slot. Must be called only if
+  // IsGrowingIntoSingleGroupApplicable returned true.
+  // Requires: `had_soo_slot_ || h2 == ctrl_t::kEmpty`.
+  void InitControlBytesAfterSoo(ctrl_t* new_ctrl, ctrl_t h2,
+                                size_t new_capacity);
+
   // Shuffle trivially transferable slots in the way consistent with
   // GrowIntoSingleGroupShuffleControlBytes.
   //
@@ -1739,8 +2191,7 @@ class HashSetResizeHelper {
   // 1. new_slots are transferred from old_slots_ consistent with
   //    GrowIntoSingleGroupShuffleControlBytes.
   // 2. Empty new_slots are *not* poisoned.
-  void GrowIntoSingleGroupShuffleTransferableSlots(void* old_slots,
-                                                   void* new_slots,
+  void GrowIntoSingleGroupShuffleTransferableSlots(void* new_slots,
                                                    size_t slot_size) const;
 
   // Poison empty slots that were transferred using the deterministic algorithm
@@ -1760,11 +2211,24 @@ class HashSetResizeHelper {
     }
   }
 
-  ctrl_t* old_ctrl_;
+  HeapOrSoo old_heap_or_soo_;
   size_t old_capacity_;
   bool had_infoz_;
+  bool was_soo_;
+  bool had_soo_slot_;
+  // Either null infoz or a pre-sampled forced infoz for SOO tables.
+  HashtablezInfoHandle forced_infoz_;
 };
 
+inline void PrepareInsertCommon(CommonFields& common) {
+  common.increment_size();
+  common.maybe_increment_generation_on_insert();
+}
+
+// Like prepare_insert, but for the case of inserting into a full SOO table.
+size_t PrepareInsertAfterSoo(size_t hash, size_t slot_size,
+                             CommonFields& common);
+
 // PolicyFunctions bundles together some information for a particular
 // raw_hash_set<T, ...> instantiation. This information is passed to
 // type-erased functions that want to do small amounts of type-specific
@@ -1772,21 +2236,29 @@ class HashSetResizeHelper {
 struct PolicyFunctions {
   size_t slot_size;
 
+  // Returns the pointer to the hash function stored in the set.
+  const void* (*hash_fn)(const CommonFields& common);
+
   // Returns the hash of the pointed-to slot.
-  size_t (*hash_slot)(void* set, void* slot);
+  size_t (*hash_slot)(const void* hash_fn, void* slot);
 
-  // Transfer the contents of src_slot to dst_slot.
+  // Transfers the contents of src_slot to dst_slot.
   void (*transfer)(void* set, void* dst_slot, void* src_slot);
 
-  // Deallocate the backing store from common.
+  // Deallocates the backing store from common.
   void (*dealloc)(CommonFields& common, const PolicyFunctions& policy);
+
+  // Resizes set to the new capacity.
+  // Arguments are used as in raw_hash_set::resize_impl.
+  void (*resize)(CommonFields& common, size_t new_capacity,
+                 HashtablezInfoHandle forced_infoz);
 };
 
 // ClearBackingArray clears the backing array, either modifying it in place,
 // or creating a new one based on the value of "reuse".
 // REQUIRES: c.capacity > 0
 void ClearBackingArray(CommonFields& c, const PolicyFunctions& policy,
-                       bool reuse);
+                       bool reuse, bool soo_enabled);
 
 // Type-erased version of raw_hash_set::erase_meta_only.
 void EraseMetaOnly(CommonFields& c, size_t index, size_t slot_size);
@@ -1817,9 +2289,26 @@ Y_ABSL_ATTRIBUTE_NOINLINE void TransferRelocatable(void*, void* dst, void* src)
   memcpy(dst, src, SizeOfSlot);
 }
 
-// Type-erased version of raw_hash_set::drop_deletes_without_resize.
-void DropDeletesWithoutResize(CommonFields& common,
-                              const PolicyFunctions& policy, void* tmp_space);
+// Type erased raw_hash_set::get_hash_ref_fn for the empty hash function case.
+const void* GetHashRefForEmptyHasher(const CommonFields& common);
+
+// Given the hash of a value not currently in the table and the first empty
+// slot in the probe sequence, finds a viable slot index to insert it at.
+//
+// In case there's no space left, the table can be resized or rehashed
+// (for tables with deleted slots, see FindInsertPositionWithGrowthOrRehash).
+//
+// In the case of absence of deleted slots and positive growth_left, the element
+// can be inserted in the provided `target` position.
+//
+// When the table has deleted slots (according to GrowthInfo), the target
+// position will be searched one more time using `find_first_non_full`.
+//
+// REQUIRES: Table is not SOO.
+// REQUIRES: At least one non-full slot available.
+// REQUIRES: `target` is a valid empty position to insert.
+size_t PrepareInsertNonSoo(CommonFields& common, size_t hash, FindInfo target,
+                           const PolicyFunctions& policy);
 
 // A SwissTable.
 //
@@ -1875,6 +2364,26 @@ class raw_hash_set {
   using key_arg = typename KeyArgImpl::template type<K, key_type>;
 
  private:
+  // TODO(b/289225379): we could add extra SOO space inside raw_hash_set
+  // after CommonFields to allow inlining larger slot_types (e.g. TString),
+  // but it's a bit complicated if we want to support incomplete mapped_type in
+  // flat_hash_map. We could potentially do this for flat_hash_set and for an
+  // allowlist of `mapped_type`s of flat_hash_map that includes e.g. arithmetic
+  // types, strings, cords, and pairs/tuples of allowlisted types.
+  constexpr static bool SooEnabled() {
+    return PolicyTraits::soo_enabled() &&
+           sizeof(slot_type) <= sizeof(HeapOrSoo) &&
+           alignof(slot_type) <= alignof(HeapOrSoo);
+  }
+
+  // Whether `size` fits in the SOO capacity of this table.
+  bool fits_in_soo(size_t size) const {
+    return SooEnabled() && size <= SooCapacity();
+  }
+  // Whether this table is in SOO mode or non-SOO mode.
+  bool is_soo() const { return fits_in_soo(capacity()); }
+  bool is_full_soo() const { return is_soo() && !empty(); }
+
   // Give an early error when key_type is not hashable/eq.
   auto KeyTypeCanBeHashed(const Hash& h, const key_type& k) -> decltype(h(k));
   auto KeyTypeCanBeEq(const Eq& eq, const key_type& k) -> decltype(eq(k, k));
@@ -1928,6 +2437,7 @@ class raw_hash_set {
 
   class iterator : private HashSetIteratorGenerationInfo {
     friend class raw_hash_set;
+    friend struct HashtableFreeFunctionsAccess;
 
    public:
     using iterator_category = std::forward_iterator_tag;
@@ -1958,6 +2468,7 @@ class raw_hash_set {
       ++ctrl_;
       ++slot_;
       skip_empty_or_deleted();
+      if (Y_ABSL_PREDICT_FALSE(*ctrl_ == ctrl_t::kSentinel)) ctrl_ = nullptr;
       return *this;
     }
     // PRECONDITION: not an end() iterator.
@@ -1988,22 +2499,31 @@ class raw_hash_set {
       // not equal to any end iterator.
       Y_ABSL_ASSUME(ctrl != nullptr);
     }
+    // This constructor is used in begin() to avoid an MSan
+    // use-of-uninitialized-value error. Delegating from this constructor to
+    // the previous one doesn't avoid the error.
+    iterator(ctrl_t* ctrl, MaybeInitializedPtr slot,
+             const GenerationType* generation_ptr)
+        : HashSetIteratorGenerationInfo(generation_ptr),
+          ctrl_(ctrl),
+          slot_(to_slot(slot.get())) {
+      // This assumption helps the compiler know that any non-end iterator is
+      // not equal to any end iterator.
+      Y_ABSL_ASSUME(ctrl != nullptr);
+    }
     // For end() iterators.
     explicit iterator(const GenerationType* generation_ptr)
         : HashSetIteratorGenerationInfo(generation_ptr), ctrl_(nullptr) {}
 
-    // Fixes up `ctrl_` to point to a full by advancing it and `slot_` until
-    // they reach one.
-    //
-    // If a sentinel is reached, we null `ctrl_` out instead.
+    // Fixes up `ctrl_` to point to a full or sentinel by advancing `ctrl_` and
+    // `slot_` until they reach one.
     void skip_empty_or_deleted() {
       while (IsEmptyOrDeleted(*ctrl_)) {
         uint32_t shift =
-            GroupEmptyOrDeleted{ctrl_}.CountLeadingEmptyOrDeleted();
+            GroupFullEmptyOrDeleted{ctrl_}.CountLeadingEmptyOrDeleted();
         ctrl_ += shift;
         slot_ += shift;
       }
-      if (Y_ABSL_PREDICT_FALSE(*ctrl_ == ctrl_t::kSentinel)) ctrl_ = nullptr;
     }
 
     ctrl_t* control() const { return ctrl_; }
@@ -2091,8 +2611,9 @@ class raw_hash_set {
       size_t bucket_count, const hasher& hash = hasher(),
       const key_equal& eq = key_equal(),
       const allocator_type& alloc = allocator_type())
-      : settings_(CommonFields{}, hash, eq, alloc) {
-    if (bucket_count) {
+      : settings_(CommonFields::CreateDefault<SooEnabled()>(), hash, eq,
+                  alloc) {
+    if (bucket_count > (SooEnabled() ? SooCapacity() : 0)) {
       resize(NormalizeCapacity(bucket_count));
     }
   }
@@ -2193,22 +2714,69 @@ class raw_hash_set {
                                that.alloc_ref())) {}
 
   raw_hash_set(const raw_hash_set& that, const allocator_type& a)
-      : raw_hash_set(0, that.hash_ref(), that.eq_ref(), a) {
+      : raw_hash_set(GrowthToLowerboundCapacity(that.size()), that.hash_ref(),
+                     that.eq_ref(), a) {
     const size_t size = that.size();
-    if (size == 0) return;
-    reserve(size);
-    // Because the table is guaranteed to be empty, we can do something faster
-    // than a full `insert`.
-    for (const auto& v : that) {
-      const size_t hash = PolicyTraits::apply(HashElement{hash_ref()}, v);
-      auto target = find_first_non_full_outofline(common(), hash);
-      SetCtrl(common(), target.offset, H2(hash), sizeof(slot_type));
-      emplace_at(target.offset, v);
-      common().maybe_increment_generation_on_insert();
-      infoz().RecordInsert(hash, target.probe_length);
+    if (size == 0) {
+      return;
+    }
+    // We don't use `that.is_soo()` here because `that` can have non-SOO
+    // capacity but have a size that fits into SOO capacity.
+    if (fits_in_soo(size)) {
+      assert(size == 1);
+      common().set_full_soo();
+      emplace_at(soo_iterator(), *that.begin());
+      const HashtablezInfoHandle infoz = try_sample_soo();
+      if (infoz.IsSampled()) resize_with_soo_infoz(infoz);
+      return;
+    }
+    assert(!that.is_soo());
+    const size_t cap = capacity();
+    // Note about single group tables:
+    // 1. It is correct to have any order of elements.
+    // 2. Order has to be non deterministic.
+    // 3. We are assigning elements with arbitrary `shift` starting from
+    //    `capacity + shift` position.
+    // 4. `shift` must be coprime with `capacity + 1` in order to be able to use
+    //     modular arithmetic to traverse all positions, instead if cycling
+    //     through a subset of positions. Odd numbers are coprime with any
+    //     `capacity + 1` (2^N).
+    size_t offset = cap;
+    const size_t shift =
+        is_single_group(cap) ? (PerTableSalt(control()) | 1) : 0;
+    IterateOverFullSlots(
+        that.common(), that.slot_array(),
+        [&](const ctrl_t* that_ctrl,
+            slot_type* that_slot) Y_ABSL_ATTRIBUTE_ALWAYS_INLINE {
+          if (shift == 0) {
+            // Big tables case. Position must be searched via probing.
+            // The table is guaranteed to be empty, so we can do faster than
+            // a full `insert`.
+            const size_t hash = PolicyTraits::apply(
+                HashElement{hash_ref()}, PolicyTraits::element(that_slot));
+            FindInfo target = find_first_non_full_outofline(common(), hash);
+            infoz().RecordInsert(hash, target.probe_length);
+            offset = target.offset;
+          } else {
+            // Small tables case. Next position is computed via shift.
+            offset = (offset + shift) & cap;
+          }
+          const h2_t h2 = static_cast<h2_t>(*that_ctrl);
+          assert(  // We rely that hash is not changed for small tables.
+              H2(PolicyTraits::apply(HashElement{hash_ref()},
+                                     PolicyTraits::element(that_slot))) == h2 &&
+              "hash function value changed unexpectedly during the copy");
+          SetCtrl(common(), offset, h2, sizeof(slot_type));
+          emplace_at(iterator_at(offset), PolicyTraits::element(that_slot));
+          common().maybe_increment_generation_on_insert();
+        });
+    if (shift != 0) {
+      // On small table copy we do not record individual inserts.
+      // RecordInsert requires hash, but it is unknown for small tables.
+      infoz().RecordStorageChanged(size, cap);
     }
     common().set_size(size);
-    set_growth_left(growth_left() - size);
+    growth_info().OverwriteManyEmptyAsFull(size);
   }
 
   Y_ABSL_ATTRIBUTE_NOINLINE raw_hash_set(raw_hash_set&& that) noexcept(
@@ -2220,16 +2788,22 @@ class raw_hash_set {
          // would create a nullptr functor that cannot be called.
          // TODO(b/296061262): move instead of copying hash/eq/alloc.
          // Note: we avoid using exchange for better generated code.
-        settings_(std::move(that.common()), that.hash_ref(), that.eq_ref(),
-                  that.alloc_ref()) {
-    that.common() = CommonFields{};
+        settings_(PolicyTraits::transfer_uses_memcpy() || !that.is_full_soo()
+                      ? std::move(that.common())
+                      : CommonFields{full_soo_tag_t{}},
+                  that.hash_ref(), that.eq_ref(), that.alloc_ref()) {
+    if (!PolicyTraits::transfer_uses_memcpy() && that.is_full_soo()) {
+      transfer(soo_slot(), that.soo_slot());
+    }
+    that.common() = CommonFields::CreateDefault<SooEnabled()>();
     maybe_increment_generation_or_rehash_on_move();
   }
 
   raw_hash_set(raw_hash_set&& that, const allocator_type& a)
-      : settings_(CommonFields{}, that.hash_ref(), that.eq_ref(), a) {
+      : settings_(CommonFields::CreateDefault<SooEnabled()>(), that.hash_ref(),
+                  that.eq_ref(), a) {
     if (a == that.alloc_ref()) {
-      std::swap(common(), that.common());
+      swap_common(that);
       maybe_increment_generation_or_rehash_on_move();
     } else {
       move_elements_allocs_unequal(std::move(that));
@@ -2264,8 +2838,12 @@ class raw_hash_set {
   ~raw_hash_set() { destructor_impl(); }
 
   iterator begin() Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    auto it = iterator_at(0);
+    if (Y_ABSL_PREDICT_FALSE(empty())) return end();
+    if (is_soo()) return soo_iterator();
+    iterator it = {control(), common().slots_union(),
+                   common().generation_ptr()};
     it.skip_empty_or_deleted();
+    assert(IsFull(*it.control()));
     return it;
   }
   iterator end() Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
@@ -2285,7 +2863,14 @@ class raw_hash_set {
 
   bool empty() const { return !size(); }
   size_t size() const { return common().size(); }
-  size_t capacity() const { return common().capacity(); }
+  size_t capacity() const {
+    const size_t cap = common().capacity();
+    // Compiler complains when using functions in assume so use local variables.
+    Y_ABSL_ATTRIBUTE_UNUSED static constexpr bool kEnabled = SooEnabled();
+    Y_ABSL_ATTRIBUTE_UNUSED static constexpr size_t kCapacity = SooCapacity();
+    Y_ABSL_ASSUME(!kEnabled || cap >= kCapacity);
+    return cap;
+  }
   size_t max_size() const { return (std::numeric_limits<size_t>::max)(); }
 
   Y_ABSL_ATTRIBUTE_REINITIALIZES void clear() {
@@ -2299,9 +2884,13 @@ class raw_hash_set {
     const size_t cap = capacity();
     if (cap == 0) {
       // Already guaranteed to be empty; so nothing to do.
+    } else if (is_soo()) {
+      if (!empty()) destroy(soo_slot());
+      common().set_empty_soo();
     } else {
       destroy_slots();
-      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/cap < 128);
+      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/cap < 128,
+                        SooEnabled());
     }
     common().set_reserved_growth(0);
     common().set_reservation_size(0);
@@ -2432,7 +3021,7 @@ class raw_hash_set {
   std::pair<iterator, bool> emplace(Args&&... args)
       Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
     alignas(slot_type) unsigned char raw[sizeof(slot_type)];
-    slot_type* slot = reinterpret_cast<slot_type*>(&raw);
+    slot_type* slot = to_slot(&raw);
 
     construct(slot, std::forward<Args>(args)...);
     const auto& elem = PolicyTraits::element(slot);
@@ -2496,11 +3085,11 @@ class raw_hash_set {
                         F&& f) Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
     auto res = find_or_prepare_insert(key);
     if (res.second) {
-      slot_type* slot = slot_array() + res.first;
+      slot_type* slot = res.first.slot();
       std::forward<F>(f)(constructor(&alloc_ref(), &slot));
       assert(!slot);
     }
-    return iterator_at(res.first);
+    return res.first;
   }
 
   // Extension API: support for heterogeneous keys.
@@ -2524,7 +3113,7 @@ class raw_hash_set {
   // this method returns void to reduce algorithmic complexity to O(1).  The
   // iterator is invalidated, so any increment should be done before calling
   // erase.  In order to erase while iterating across a map, use the following
-  // idiom (which also works for standard containers):
+  // idiom (which also works for some standard containers):
   //
   // for (auto it = m.begin(), end = m.end(); it != end;) {
   //   // `erase()` will invalidate `it`, so advance `it` first.
@@ -2540,7 +3129,11 @@ class raw_hash_set {
   void erase(iterator it) {
     AssertIsFull(it.control(), it.generation(), it.generation_ptr(), "erase()");
     destroy(it.slot());
-    erase_meta_only(it);
+    if (is_soo()) {
+      common().set_empty_soo();
+    } else {
+      erase_meta_only(it);
+    }
   }
 
   iterator erase(const_iterator first,
@@ -2548,12 +3141,19 @@ class raw_hash_set {
     // We check for empty first because ClearBackingArray requires that
     // capacity() > 0 as a precondition.
     if (empty()) return end();
+    if (first == last) return last.inner_;
+    if (is_soo()) {
+      destroy(soo_slot());
+      common().set_empty_soo();
+      return end();
+    }
     if (first == begin() && last == end()) {
       // TODO(ezb): we access control bytes in destroy_slots so it could make
       // sense to combine destroy_slots and ClearBackingArray to avoid cache
       // misses when the table is large. Note that we also do this in clear().
       destroy_slots();
-      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/true);
+      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/true,
+                        SooEnabled());
       common().set_reserved_growth(common().reservation_size());
       return end();
     }
@@ -2568,13 +3168,21 @@ class raw_hash_set {
   template <typename H, typename E>
   void merge(raw_hash_set<Policy, H, E, Alloc>& src) {  // NOLINT
     assert(this != &src);
+    // Returns whether insertion took place.
+    const auto insert_slot = [this](slot_type* src_slot) {
+      return PolicyTraits::apply(InsertSlot<false>{*this, std::move(*src_slot)},
+                                 PolicyTraits::element(src_slot))
+          .second;
+    };
+
+    if (src.is_soo()) {
+      if (src.empty()) return;
+      if (insert_slot(src.soo_slot())) src.common().set_empty_soo();
+      return;
+    }
     for (auto it = src.begin(), e = src.end(); it != e;) {
       auto next = std::next(it);
-      if (PolicyTraits::apply(InsertSlot<false>{*this, std::move(*it.slot())},
-                              PolicyTraits::element(it.slot()))
-              .second) {
-        src.erase_meta_only(it);
-      }
+      if (insert_slot(it.slot())) src.erase_meta_only(it);
       it = next;
     }
   }
@@ -2588,7 +3196,11 @@ class raw_hash_set {
     AssertIsFull(position.control(), position.inner_.generation(),
                  position.inner_.generation_ptr(), "extract()");
     auto node = CommonAccess::Transfer<node_type>(alloc_ref(), position.slot());
-    erase_meta_only(position);
+    if (is_soo()) {
+      common().set_empty_soo();
+    } else {
+      erase_meta_only(position);
+    }
     return node;
   }
 
@@ -2605,7 +3217,7 @@ class raw_hash_set {
       IsNoThrowSwappable<allocator_type>(
           typename AllocTraits::propagate_on_container_swap{})) {
     using std::swap;
-    swap(common(), that.common());
+    swap_common(that);
     swap(hash_ref(), that.hash_ref());
     swap(eq_ref(), that.eq_ref());
     SwapAlloc(alloc_ref(), that.alloc_ref(),
@@ -2613,17 +3225,41 @@ class raw_hash_set {
   }
 
   void rehash(size_t n) {
-    if (n == 0 && capacity() == 0) return;
-    if (n == 0 && size() == 0) {
-      ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/false);
-      return;
+    const size_t cap = capacity();
+    if (n == 0) {
+      if (cap == 0 || is_soo()) return;
+      if (empty()) {
+        ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/false,
+                          SooEnabled());
+        return;
+      }
+      if (fits_in_soo(size())) {
+        // When the table is already sampled, we keep it sampled.
+        if (infoz().IsSampled()) {
+          const size_t kInitialSampledCapacity = NextCapacity(SooCapacity());
+          if (capacity() > kInitialSampledCapacity) {
+            resize(kInitialSampledCapacity);
+          }
+          // This asserts that we didn't lose sampling coverage in `resize`.
+          assert(infoz().IsSampled());
+          return;
+        }
+        alignas(slot_type) unsigned char slot_space[sizeof(slot_type)];
+        slot_type* tmp_slot = to_slot(slot_space);
+        transfer(tmp_slot, begin().slot());
+        ClearBackingArray(common(), GetPolicyFunctions(), /*reuse=*/false,
+                          SooEnabled());
+        transfer(soo_slot(), tmp_slot);
+        common().set_full_soo();
+        return;
+      }
     }
 
     // bitor is a faster way of doing `max` here. We will round up to the next
     // power-of-2-minus-1, so bitor is good enough.
     auto m = NormalizeCapacity(n | GrowthToLowerboundCapacity(size()));
     // n == 0 unconditionally rehashes as per the standard.
-    if (n == 0 || m > capacity()) {
+    if (n == 0 || m > cap) {
       resize(m);
 
       // This is after resize, to ensure that we have completed the allocation
@@ -2633,7 +3269,9 @@ class raw_hash_set {
   }
 
   void reserve(size_t n) {
-    if (n > size() + growth_left()) {
+    const size_t max_size_before_growth =
+        is_soo() ? SooCapacity() : size() + growth_left();
+    if (n > max_size_before_growth) {
       size_t m = GrowthToLowerboundCapacity(n);
       resize(NormalizeCapacity(m));
 
@@ -2666,6 +3304,7 @@ class raw_hash_set {
   // specific benchmarks indicating its importance.
   template <class K = key_type>
   void prefetch(const key_arg<K>& key) const {
+    if (SooEnabled() ? is_soo() : capacity() == 0) return;
     (void)key;
     // Avoid probing if we won't be able to prefetch the addresses received.
 #ifdef Y_ABSL_HAVE_PREFETCH
@@ -2686,26 +3325,16 @@ class raw_hash_set {
   template <class K = key_type>
   iterator find(const key_arg<K>& key,
                 size_t hash) Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    auto seq = probe(common(), hash);
-    slot_type* slot_ptr = slot_array();
-    const ctrl_t* ctrl = control();
-    while (true) {
-      Group g{ctrl + seq.offset()};
-      for (uint32_t i : g.Match(H2(hash))) {
-        if (Y_ABSL_PREDICT_TRUE(PolicyTraits::apply(
-                EqualElement<K>{key, eq_ref()},
-                PolicyTraits::element(slot_ptr + seq.offset(i)))))
-          return iterator_at(seq.offset(i));
-      }
-      if (Y_ABSL_PREDICT_TRUE(g.MaskEmpty())) return end();
-      seq.next();
-      assert(seq.index() <= capacity() && "full table!");
-    }
+    AssertHashEqConsistent(key);
+    if (is_soo()) return find_soo(key);
+    return find_non_soo(key, hash);
   }
   template <class K = key_type>
   iterator find(const key_arg<K>& key) Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    AssertHashEqConsistent(key);
+    if (is_soo()) return find_soo(key);
     prefetch_heap_block();
-    return find(key, hash_ref()(key));
+    return find_non_soo(key, hash_ref()(key));
   }
 
   template <class K = key_type>
@@ -2716,8 +3345,7 @@ class raw_hash_set {
   template <class K = key_type>
   const_iterator find(const key_arg<K>& key) const
       Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    prefetch_heap_block();
-    return find(key, hash_ref()(key));
+    return const_cast<raw_hash_set*>(this)->find(key);
   }
 
   template <class K = key_type>
@@ -2791,6 +3419,8 @@ class raw_hash_set {
   friend struct y_absl::container_internal::hashtable_debug_internal::
       HashtableDebugAccess;
 
+  friend struct y_absl::container_internal::HashtableFreeFunctionsAccess;
+
   struct FindElement {
     template <class K, class... Args>
     const_iterator operator()(const K& key, Args&&...) const {
@@ -2824,7 +3454,7 @@ class raw_hash_set {
       if (res.second) {
         s.emplace_at(res.first, std::forward<Args>(args)...);
       }
-      return {s.iterator_at(res.first), res.second};
+      return res;
     }
     raw_hash_set& s;
   };
@@ -2835,11 +3465,11 @@ class raw_hash_set {
     std::pair<iterator, bool> operator()(const K& key, Args&&...) && {
       auto res = s.find_or_prepare_insert(key);
       if (res.second) {
-        s.transfer(s.slot_array() + res.first, &slot);
+        s.transfer(res.first.slot(), &slot);
       } else if (do_destroy) {
         s.destroy(&slot);
       }
-      return {s.iterator_at(res.first), res.second};
+      return res;
     }
     raw_hash_set& s;
     // Constructed slot. Either moved into place or destroyed.
@@ -2858,17 +3488,55 @@ class raw_hash_set {
     PolicyTraits::transfer(&alloc_ref(), to, from);
   }
 
-  inline void destroy_slots() {
-    const size_t cap = capacity();
+  // TODO(b/289225379): consider having a helper class that has the impls for
+  // SOO functionality.
+  template <class K = key_type>
+  iterator find_soo(const key_arg<K>& key) {
+    assert(is_soo());
+    return empty() || !PolicyTraits::apply(EqualElement<K>{key, eq_ref()},
+                                           PolicyTraits::element(soo_slot()))
+               ? end()
+               : soo_iterator();
+  }
+
+  template <class K = key_type>
+  iterator find_non_soo(const key_arg<K>& key, size_t hash) {
+    assert(!is_soo());
+    auto seq = probe(common(), hash);
     const ctrl_t* ctrl = control();
-    slot_type* slot = slot_array();
-    for (size_t i = 0; i != cap; ++i) {
-      if (IsFull(ctrl[i])) {
-        destroy(slot + i);
+    while (true) {
+      Group g{ctrl + seq.offset()};
+      for (uint32_t i : g.Match(H2(hash))) {
+        if (Y_ABSL_PREDICT_TRUE(PolicyTraits::apply(
+                EqualElement<K>{key, eq_ref()},
+                PolicyTraits::element(slot_array() + seq.offset(i)))))
+          return iterator_at(seq.offset(i));
       }
+      if (Y_ABSL_PREDICT_TRUE(g.MaskEmpty())) return end();
+      seq.next();
+      assert(seq.index() <= capacity() && "full table!");
     }
   }
 
+  // Conditionally samples hashtablez for SOO tables. This should be called on
+  // insertion into an empty SOO table and in copy construction when the size
+  // can fit in SOO capacity.
+  inline HashtablezInfoHandle try_sample_soo() {
+    assert(is_soo());
+    if (!ShouldSampleHashtablezInfo<CharAlloc>()) return HashtablezInfoHandle{};
+    return Sample(sizeof(slot_type), sizeof(key_type), sizeof(value_type),
+                  SooCapacity());
+  }
+
+  inline void destroy_slots() {
+    assert(!is_soo());
+    if (PolicyTraits::template destroy_is_trivial<Alloc>()) return;
+    IterateOverFullSlots(
+        common(), slot_array(),
+        [&](const ctrl_t*, slot_type* slot)
+            Y_ABSL_ATTRIBUTE_ALWAYS_INLINE { this->destroy(slot); });
+  }
+
   inline void dealloc() {
     assert(capacity() != 0);
     // Unpoison before returning the memory to the allocator.
@@ -2881,6 +3549,12 @@ class raw_hash_set {
 
   inline void destructor_impl() {
     if (capacity() == 0) return;
+    if (is_soo()) {
+      if (!empty()) {
+        Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED(destroy(soo_slot()));
+      }
+      return;
+    }
     destroy_slots();
     dealloc();
   }
@@ -2890,10 +3564,16 @@ class raw_hash_set {
   // This merely updates the pertinent control byte. This can be used in
   // conjunction with Policy::transfer to move the object to another place.
   void erase_meta_only(const_iterator it) {
+    assert(!is_soo());
     EraseMetaOnly(common(), static_cast<size_t>(it.control() - control()),
                   sizeof(slot_type));
   }
 
+  size_t hash_of(slot_type* slot) const {
+    return PolicyTraits::apply(HashElement{hash_ref()},
+                               PolicyTraits::element(slot));
+  }
+
   // Resizes table to the new capacity and move all elements to the new
   // positions accordingly.
   //
@@ -2902,143 +3582,165 @@ class raw_hash_set {
   // HashSetResizeHelper::FindFirstNonFullAfterResize(
   //    common(), old_capacity, hash)
   // can be called right after `resize`.
-  Y_ABSL_ATTRIBUTE_NOINLINE void resize(size_t new_capacity) {
+  void resize(size_t new_capacity) {
+    raw_hash_set::resize_impl(common(), new_capacity, HashtablezInfoHandle{});
+  }
+
+  // As above, except that we also accept a pre-sampled, forced infoz for
+  // SOO tables, since they need to switch from SOO to heap in order to
+  // store the infoz.
+  void resize_with_soo_infoz(HashtablezInfoHandle forced_infoz) {
+    assert(forced_infoz.IsSampled());
+    raw_hash_set::resize_impl(common(), NextCapacity(SooCapacity()),
+                              forced_infoz);
+  }
+
+  // Resizes set to the new capacity.
+  // It is a static function in order to use its pointer in GetPolicyFunctions.
+  Y_ABSL_ATTRIBUTE_NOINLINE static void resize_impl(
+      CommonFields& common, size_t new_capacity,
+      HashtablezInfoHandle forced_infoz) {
+    raw_hash_set* set = reinterpret_cast<raw_hash_set*>(&common);
     assert(IsValidCapacity(new_capacity));
-    HashSetResizeHelper resize_helper(common());
-    auto* old_slots = slot_array();
-    common().set_capacity(new_capacity);
+    assert(!set->fits_in_soo(new_capacity));
+    const bool was_soo = set->is_soo();
+    const bool had_soo_slot = was_soo && !set->empty();
+    const ctrl_t soo_slot_h2 =
+        had_soo_slot ? static_cast<ctrl_t>(H2(set->hash_of(set->soo_slot())))
+                     : ctrl_t::kEmpty;
+    HashSetResizeHelper resize_helper(common, was_soo, had_soo_slot,
+                                      forced_infoz);
+    // Initialize HashSetResizeHelper::old_heap_or_soo_. We can't do this in
+    // HashSetResizeHelper constructor because it can't transfer slots when
+    // transfer_uses_memcpy is false.
+    // TODO(b/289225379): try to handle more of the SOO cases inside
+    // InitializeSlots. See comment on cl/555990034 snapshot #63.
+    if (PolicyTraits::transfer_uses_memcpy() || !had_soo_slot) {
+      resize_helper.old_heap_or_soo() = common.heap_or_soo();
+    } else {
+      set->transfer(set->to_slot(resize_helper.old_soo_data()),
+                    set->soo_slot());
+    }
+    common.set_capacity(new_capacity);
     // Note that `InitializeSlots` does different number initialization steps
     // depending on the values of `transfer_uses_memcpy` and capacities.
     // Refer to the comment in `InitializeSlots` for more details.
     const bool grow_single_group =
         resize_helper.InitializeSlots<CharAlloc, sizeof(slot_type),
                                       PolicyTraits::transfer_uses_memcpy(),
-                                      alignof(slot_type)>(
-            common(), const_cast<std::remove_const_t<slot_type>*>(old_slots),
-            CharAlloc(alloc_ref()));
+                                      SooEnabled(), alignof(slot_type)>(
+            common, CharAlloc(set->alloc_ref()), soo_slot_h2, sizeof(key_type),
+            sizeof(value_type));
 
-    if (resize_helper.old_capacity() == 0) {
+    // In the SooEnabled() case, capacity is never 0 so we don't check.
+    if (!SooEnabled() && resize_helper.old_capacity() == 0) {
       // InitializeSlots did all the work including infoz().RecordRehash().
       return;
     }
+    assert(resize_helper.old_capacity() > 0);
+    // Nothing more to do in this case.
+    if (was_soo && !had_soo_slot) return;
 
+    slot_type* new_slots = set->slot_array();
     if (grow_single_group) {
       if (PolicyTraits::transfer_uses_memcpy()) {
         // InitializeSlots did all the work.
         return;
       }
-      // We want GrowSizeIntoSingleGroup to be called here in order to make
-      // InitializeSlots not depend on PolicyTraits.
-      resize_helper.GrowSizeIntoSingleGroup<PolicyTraits>(common(), alloc_ref(),
-                                                          old_slots);
+      if (was_soo) {
+        set->transfer(new_slots + resize_helper.SooSlotIndex(),
+                      to_slot(resize_helper.old_soo_data()));
+        return;
+      } else {
+        // We want GrowSizeIntoSingleGroup to be called here in order to make
+        // InitializeSlots not depend on PolicyTraits.
+        resize_helper.GrowSizeIntoSingleGroup<PolicyTraits>(common,
+                                                            set->alloc_ref());
+      }
     } else {
       // InitializeSlots prepares control bytes to correspond to empty table.
-      auto* new_slots = slot_array();
-      size_t total_probe_length = 0;
-      for (size_t i = 0; i != resize_helper.old_capacity(); ++i) {
-        if (IsFull(resize_helper.old_ctrl()[i])) {
-          size_t hash = PolicyTraits::apply(
-              HashElement{hash_ref()}, PolicyTraits::element(old_slots + i));
-          auto target = find_first_non_full(common(), hash);
-          size_t new_i = target.offset;
-          total_probe_length += target.probe_length;
-          SetCtrl(common(), new_i, H2(hash), sizeof(slot_type));
-          transfer(new_slots + new_i, old_slots + i);
+      const auto insert_slot = [&](slot_type* slot) {
+        size_t hash = PolicyTraits::apply(HashElement{set->hash_ref()},
+                                          PolicyTraits::element(slot));
+        auto target = find_first_non_full(common, hash);
+        SetCtrl(common, target.offset, H2(hash), sizeof(slot_type));
+        set->transfer(new_slots + target.offset, slot);
+        return target.probe_length;
+      };
+      if (was_soo) {
+        insert_slot(to_slot(resize_helper.old_soo_data()));
+        return;
+      } else {
+        auto* old_slots = static_cast<slot_type*>(resize_helper.old_slots());
+        size_t total_probe_length = 0;
+        for (size_t i = 0; i != resize_helper.old_capacity(); ++i) {
+          if (IsFull(resize_helper.old_ctrl()[i])) {
+            total_probe_length += insert_slot(old_slots + i);
+          }
         }
+        common.infoz().RecordRehash(total_probe_length);
       }
-      infoz().RecordRehash(total_probe_length);
     }
-    resize_helper.DeallocateOld<alignof(slot_type)>(
-        CharAlloc(alloc_ref()), sizeof(slot_type),
-        const_cast<std::remove_const_t<slot_type>*>(old_slots));
+    resize_helper.DeallocateOld<alignof(slot_type)>(CharAlloc(set->alloc_ref()),
+                                                    sizeof(slot_type));
   }
 
-  // Prunes control bytes to remove as many tombstones as possible.
-  //
-  // See the comment on `rehash_and_grow_if_necessary()`.
-  inline void drop_deletes_without_resize() {
-    // Stack-allocate space for swapping elements.
-    alignas(slot_type) unsigned char tmp[sizeof(slot_type)];
-    DropDeletesWithoutResize(common(), GetPolicyFunctions(), tmp);
-  }
+  // Casting directly from e.g. char* to slot_type* can cause compilation errors
+  // on objective-C. This function converts to void* first, avoiding the issue.
+  static slot_type* to_slot(void* buf) { return static_cast<slot_type*>(buf); }
 
-  // Called whenever the table *might* need to conditionally grow.
-  //
-  // This function is an optimization opportunity to perform a rehash even when
-  // growth is unnecessary, because vacating tombstones is beneficial for
-  // performance in the long-run.
-  void rehash_and_grow_if_necessary() {
-    const size_t cap = capacity();
-    if (cap > Group::kWidth &&
-        // Do these calculations in 64-bit to avoid overflow.
-        size() * uint64_t{32} <= cap * uint64_t{25}) {
-      // Squash DELETED without growing if there is enough capacity.
-      //
-      // Rehash in place if the current size is <= 25/32 of capacity.
-      // Rationale for such a high factor: 1) drop_deletes_without_resize() is
-      // faster than resize, and 2) it takes quite a bit of work to add
-      // tombstones.  In the worst case, seems to take approximately 4
-      // insert/erase pairs to create a single tombstone and so if we are
-      // rehashing because of tombstones, we can afford to rehash-in-place as
-      // long as we are reclaiming at least 1/8 the capacity without doing more
-      // than 2X the work.  (Where "work" is defined to be size() for rehashing
-      // or rehashing in place, and 1 for an insert or erase.)  But rehashing in
-      // place is faster per operation than inserting or even doubling the size
-      // of the table, so we actually afford to reclaim even less space from a
-      // resize-in-place.  The decision is to rehash in place if we can reclaim
-      // at about 1/8th of the usable capacity (specifically 3/28 of the
-      // capacity) which means that the total cost of rehashing will be a small
-      // fraction of the total work.
-      //
-      // Here is output of an experiment using the BM_CacheInSteadyState
-      // benchmark running the old case (where we rehash-in-place only if we can
-      // reclaim at least 7/16*capacity) vs. this code (which rehashes in place
-      // if we can recover 3/32*capacity).
-      //
-      // Note that although in the worst-case number of rehashes jumped up from
-      // 15 to 190, but the number of operations per second is almost the same.
-      //
-      // Abridged output of running BM_CacheInSteadyState benchmark from
-      // raw_hash_set_benchmark.   N is the number of insert/erase operations.
-      //
-      //      | OLD (recover >= 7/16        | NEW (recover >= 3/32)
-      // size |    N/s LoadFactor NRehashes |    N/s LoadFactor NRehashes
-      //  448 | 145284       0.44        18 | 140118       0.44        19
-      //  493 | 152546       0.24        11 | 151417       0.48        28
-      //  538 | 151439       0.26        11 | 151152       0.53        38
-      //  583 | 151765       0.28        11 | 150572       0.57        50
-      //  628 | 150241       0.31        11 | 150853       0.61        66
-      //  672 | 149602       0.33        12 | 150110       0.66        90
-      //  717 | 149998       0.35        12 | 149531       0.70       129
-      //  762 | 149836       0.37        13 | 148559       0.74       190
-      //  807 | 149736       0.39        14 | 151107       0.39        14
-      //  852 | 150204       0.42        15 | 151019       0.42        15
-      drop_deletes_without_resize();
+  // Requires that lhs does not have a full SOO slot.
+  static void move_common(bool that_is_full_soo, allocator_type& rhs_alloc,
+                          CommonFields& lhs, CommonFields&& rhs) {
+    if (PolicyTraits::transfer_uses_memcpy() || !that_is_full_soo) {
+      lhs = std::move(rhs);
     } else {
-      // Otherwise grow the container.
-      resize(NextCapacity(cap));
+      lhs.move_non_heap_or_soo_fields(rhs);
+      // TODO(b/303305702): add reentrancy guard.
+      PolicyTraits::transfer(&rhs_alloc, to_slot(lhs.soo_data()),
+                             to_slot(rhs.soo_data()));
     }
   }
 
+  // Swaps common fields making sure to avoid memcpy'ing a full SOO slot if we
+  // aren't allowed to do so.
+  void swap_common(raw_hash_set& that) {
+    using std::swap;
+    if (PolicyTraits::transfer_uses_memcpy()) {
+      swap(common(), that.common());
+      return;
+    }
+    CommonFields tmp = CommonFields::CreateDefault<SooEnabled()>();
+    const bool that_is_full_soo = that.is_full_soo();
+    move_common(that_is_full_soo, that.alloc_ref(), tmp,
+                std::move(that.common()));
+    move_common(is_full_soo(), alloc_ref(), that.common(), std::move(common()));
+    move_common(that_is_full_soo, that.alloc_ref(), common(), std::move(tmp));
+  }
+
   void maybe_increment_generation_or_rehash_on_move() {
-    common().maybe_increment_generation_on_move();
+    if (!SwisstableGenerationsEnabled() || capacity() == 0 || is_soo()) {
+      return;
+    }
+    common().increment_generation();
     if (!empty() && common().should_rehash_for_bug_detection_on_move()) {
       resize(capacity());
     }
   }
 
-  template<bool propagate_alloc>
+  template <bool propagate_alloc>
   raw_hash_set& assign_impl(raw_hash_set&& that) {
     // We don't bother checking for this/that aliasing. We just need to avoid
     // breaking the invariants in that case.
     destructor_impl();
-    common() = std::move(that.common());
+    move_common(that.is_full_soo(), that.alloc_ref(), common(),
+                std::move(that.common()));
     // TODO(b/296061262): move instead of copying hash/eq/alloc.
     hash_ref() = that.hash_ref();
     eq_ref() = that.eq_ref();
     CopyAlloc(alloc_ref(), that.alloc_ref(),
               std::integral_constant<bool, propagate_alloc>());
-    that.common() = CommonFields{};
+    that.common() = CommonFields::CreateDefault<SooEnabled()>();
     maybe_increment_generation_or_rehash_on_move();
     return *this;
   }
@@ -3051,8 +3753,8 @@ class raw_hash_set {
       insert(std::move(PolicyTraits::element(it.slot())));
       that.destroy(it.slot());
     }
-    that.dealloc();
-    that.common() = CommonFields{};
+    if (!that.is_soo()) that.dealloc();
+    that.common() = CommonFields::CreateDefault<SooEnabled()>();
     maybe_increment_generation_or_rehash_on_move();
     return *this;
   }
@@ -3078,12 +3780,30 @@ class raw_hash_set {
     return move_elements_allocs_unequal(std::move(that));
   }
 
- protected:
-  // Attempts to find `key` in the table; if it isn't found, returns a slot that
-  // the value can be inserted into, with the control byte already set to
-  // `key`'s H2.
   template <class K>
-  std::pair<size_t, bool> find_or_prepare_insert(const K& key) {
+  std::pair<iterator, bool> find_or_prepare_insert_soo(const K& key) {
+    if (empty()) {
+      const HashtablezInfoHandle infoz = try_sample_soo();
+      if (infoz.IsSampled()) {
+        resize_with_soo_infoz(infoz);
+      } else {
+        common().set_full_soo();
+        return {soo_iterator(), true};
+      }
+    } else if (PolicyTraits::apply(EqualElement<K>{key, eq_ref()},
+                                   PolicyTraits::element(soo_slot()))) {
+      return {soo_iterator(), false};
+    } else {
+      resize(NextCapacity(SooCapacity()));
+    }
+    const size_t index =
+        PrepareInsertAfterSoo(hash_ref()(key), sizeof(slot_type), common());
+    return {iterator_at(index), true};
+  }
+
+  template <class K>
+  std::pair<iterator, bool> find_or_prepare_insert_non_soo(const K& key) {
+    assert(!is_soo());
     prefetch_heap_block();
     auto hash = hash_ref()(key);
     auto seq = probe(common(), hash);
@@ -3094,65 +3814,92 @@ class raw_hash_set {
         if (Y_ABSL_PREDICT_TRUE(PolicyTraits::apply(
                 EqualElement<K>{key, eq_ref()},
                 PolicyTraits::element(slot_array() + seq.offset(i)))))
-          return {seq.offset(i), false};
+          return {iterator_at(seq.offset(i)), false};
+      }
+      auto mask_empty = g.MaskEmpty();
+      if (Y_ABSL_PREDICT_TRUE(mask_empty)) {
+        size_t target = seq.offset(
+            GetInsertionOffset(mask_empty, capacity(), hash, control()));
+        return {iterator_at(PrepareInsertNonSoo(common(), hash,
+                                                FindInfo{target, seq.index()},
+                                                GetPolicyFunctions())),
+                true};
       }
-      if (Y_ABSL_PREDICT_TRUE(g.MaskEmpty())) break;
       seq.next();
       assert(seq.index() <= capacity() && "full table!");
     }
-    return {prepare_insert(hash), true};
   }
 
-  // Given the hash of a value not currently in the table, finds the next
-  // viable slot index to insert it at.
-  //
-  // REQUIRES: At least one non-full slot available.
-  size_t prepare_insert(size_t hash) Y_ABSL_ATTRIBUTE_NOINLINE {
-    const bool rehash_for_bug_detection =
-        common().should_rehash_for_bug_detection_on_insert();
-    if (rehash_for_bug_detection) {
-      // Move to a different heap allocation in order to detect bugs.
-      const size_t cap = capacity();
-      resize(growth_left() > 0 ? cap : NextCapacity(cap));
-    }
-    auto target = find_first_non_full(common(), hash);
-    if (!rehash_for_bug_detection &&
-        Y_ABSL_PREDICT_FALSE(growth_left() == 0 &&
-                           !IsDeleted(control()[target.offset]))) {
-      size_t old_capacity = capacity();
-      rehash_and_grow_if_necessary();
-      // NOTE: It is safe to use `FindFirstNonFullAfterResize`.
-      // `FindFirstNonFullAfterResize` must be called right after resize.
-      // `rehash_and_grow_if_necessary` may *not* call `resize`
-      // and perform `drop_deletes_without_resize` instead. But this
-      // could happen only on big tables.
-      // For big tables `FindFirstNonFullAfterResize` will always
-      // fallback to normal `find_first_non_full`, so it is safe to use it.
-      target = HashSetResizeHelper::FindFirstNonFullAfterResize(
-          common(), old_capacity, hash);
-    }
-    common().increment_size();
-    set_growth_left(growth_left() - IsEmpty(control()[target.offset]));
-    SetCtrl(common(), target.offset, H2(hash), sizeof(slot_type));
-    common().maybe_increment_generation_on_insert();
-    infoz().RecordInsert(hash, target.probe_length);
-    return target.offset;
+ protected:
+  // Asserts that hash and equal functors provided by the user are consistent,
+  // meaning that `eq(k1, k2)` implies `hash(k1)==hash(k2)`.
+  template <class K>
+  void AssertHashEqConsistent(Y_ABSL_ATTRIBUTE_UNUSED const K& key) {
+#ifndef NDEBUG
+    if (empty()) return;
+
+    const size_t hash_of_arg = hash_ref()(key);
+    const auto assert_consistent = [&](const ctrl_t*, slot_type* slot) {
+      const value_type& element = PolicyTraits::element(slot);
+      const bool is_key_equal =
+          PolicyTraits::apply(EqualElement<K>{key, eq_ref()}, element);
+      if (!is_key_equal) return;
+
+      const size_t hash_of_slot =
+          PolicyTraits::apply(HashElement{hash_ref()}, element);
+      const bool is_hash_equal = hash_of_arg == hash_of_slot;
+      if (!is_hash_equal) {
+        // In this case, we're going to crash. Do a couple of other checks for
+        // idempotence issues. Recalculating hash/eq here is also convenient for
+        // debugging with gdb/lldb.
+        const size_t once_more_hash_arg = hash_ref()(key);
+        assert(hash_of_arg == once_more_hash_arg && "hash is not idempotent.");
+        const size_t once_more_hash_slot =
+            PolicyTraits::apply(HashElement{hash_ref()}, element);
+        assert(hash_of_slot == once_more_hash_slot &&
+               "hash is not idempotent.");
+        const bool once_more_eq =
+            PolicyTraits::apply(EqualElement<K>{key, eq_ref()}, element);
+        assert(is_key_equal == once_more_eq && "equality is not idempotent.");
+      }
+      assert((!is_key_equal || is_hash_equal) &&
+             "eq(k1, k2) must imply that hash(k1) == hash(k2). "
+             "hash/eq functors are inconsistent.");
+    };
+
+    if (is_soo()) {
+      assert_consistent(/*unused*/ nullptr, soo_slot());
+      return;
+    }
+    // We only do validation for small tables so that it's constant time.
+    if (capacity() > 16) return;
+    IterateOverFullSlots(common(), slot_array(), assert_consistent);
+#endif
+  }
+
+  // Attempts to find `key` in the table; if it isn't found, returns an iterator
+  // where the value can be inserted into, with the control byte already set to
+  // `key`'s H2. Returns a bool indicating whether an insertion can take place.
+  template <class K>
+  std::pair<iterator, bool> find_or_prepare_insert(const K& key) {
+    AssertHashEqConsistent(key);
+    if (is_soo()) return find_or_prepare_insert_soo(key);
+    return find_or_prepare_insert_non_soo(key);
   }
 
   // Constructs the value in the space pointed by the iterator. This only works
   // after an unsuccessful find_or_prepare_insert() and before any other
   // modifications happen in the raw_hash_set.
   //
-  // PRECONDITION: i is an index returned from find_or_prepare_insert(k), where
-  // k is the key decomposed from `forward<Args>(args)...`, and the bool
-  // returned by find_or_prepare_insert(k) was true.
+  // PRECONDITION: iter was returned from find_or_prepare_insert(k), where k is
+  // the key decomposed from `forward<Args>(args)...`, and the bool returned by
+  // find_or_prepare_insert(k) was true.
   // POSTCONDITION: *m.iterator_at(i) == value_type(forward<Args>(args)...).
   template <class... Args>
-  void emplace_at(size_t i, Args&&... args) {
-    construct(slot_array() + i, std::forward<Args>(args)...);
+  void emplace_at(iterator iter, Args&&... args) {
+    construct(iter.slot(), std::forward<Args>(args)...);
 
-    assert(PolicyTraits::apply(FindElement{*this}, *iterator_at(i)) ==
-               iterator_at(i) &&
+    assert(PolicyTraits::apply(FindElement{*this}, *iter) == iter &&
            "constructed value does not match the lookup key");
   }
 
@@ -3160,7 +3907,7 @@ class raw_hash_set {
     return {control() + i, slot_array() + i, common().generation_ptr()};
   }
   const_iterator iterator_at(size_t i) const Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return {control() + i, slot_array() + i, common().generation_ptr()};
+    return const_cast<raw_hash_set*>(this)->iterator_at(i);
   }
 
   reference unchecked_deref(iterator it) { return it.unchecked_deref(); }
@@ -3178,13 +3925,25 @@ class raw_hash_set {
   // side-effect.
   //
   // See `CapacityToGrowth()`.
-  size_t growth_left() const { return common().growth_left(); }
-  void set_growth_left(size_t gl) { return common().set_growth_left(gl); }
+  size_t growth_left() const {
+    assert(!is_soo());
+    return common().growth_left();
+  }
+
+  GrowthInfo& growth_info() {
+    assert(!is_soo());
+    return common().growth_info();
+  }
+  GrowthInfo growth_info() const {
+    assert(!is_soo());
+    return common().growth_info();
+  }
 
   // Prefetch the heap-allocated memory region to resolve potential TLB and
   // cache misses. This is intended to overlap with execution of calculating the
   // hash for a key.
   void prefetch_heap_block() const {
+    assert(!is_soo());
 #if Y_ABSL_HAVE_BUILTIN(__builtin_prefetch) || defined(__GNUC__)
     __builtin_prefetch(control(), 0, 1);
 #endif
@@ -3193,11 +3952,31 @@ class raw_hash_set {
   CommonFields& common() { return settings_.template get<0>(); }
   const CommonFields& common() const { return settings_.template get<0>(); }
 
-  ctrl_t* control() const { return common().control(); }
+  ctrl_t* control() const {
+    assert(!is_soo());
+    return common().control();
+  }
   slot_type* slot_array() const {
+    assert(!is_soo());
     return static_cast<slot_type*>(common().slot_array());
   }
-  HashtablezInfoHandle infoz() { return common().infoz(); }
+  slot_type* soo_slot() {
+    assert(is_soo());
+    return static_cast<slot_type*>(common().soo_data());
+  }
+  const slot_type* soo_slot() const {
+    return const_cast<raw_hash_set*>(this)->soo_slot();
+  }
+  iterator soo_iterator() {
+    return {SooControl(), soo_slot(), common().generation_ptr()};
+  }
+  const_iterator soo_iterator() const {
+    return const_cast<raw_hash_set*>(this)->soo_iterator();
+  }
+  HashtablezInfoHandle infoz() {
+    assert(!is_soo());
+    return common().infoz();
+  }
 
   hasher& hash_ref() { return settings_.template get<1>(); }
   const hasher& hash_ref() const { return settings_.template get<1>(); }
@@ -3208,12 +3987,9 @@ class raw_hash_set {
     return settings_.template get<3>();
   }
 
-  // Make type-specific functions for this type's PolicyFunctions struct.
-  static size_t hash_slot_fn(void* set, void* slot) {
-    auto* h = static_cast<raw_hash_set*>(set);
-    return PolicyTraits::apply(
-        HashElement{h->hash_ref()},
-        PolicyTraits::element(static_cast<slot_type*>(slot)));
+  static const void* get_hash_ref_fn(const CommonFields& common) {
+    auto* h = reinterpret_cast<const raw_hash_set*>(&common);
+    return &h->hash_ref();
   }
   static void transfer_slot_fn(void* set, void* dst, void* src) {
     auto* h = static_cast<raw_hash_set*>(set);
@@ -3236,13 +4012,18 @@ class raw_hash_set {
   static const PolicyFunctions& GetPolicyFunctions() {
     static constexpr PolicyFunctions value = {
         sizeof(slot_type),
-        &raw_hash_set::hash_slot_fn,
+        // TODO(b/328722020): try to type erase
+        // for standard layout and alignof(Hash) <= alignof(CommonFields).
+        std::is_empty<hasher>::value ? &GetHashRefForEmptyHasher
+                                     : &raw_hash_set::get_hash_ref_fn,
+        PolicyTraits::template get_hash_slot_fn<hasher>(),
         PolicyTraits::transfer_uses_memcpy()
             ? TransferRelocatable<sizeof(slot_type)>
             : &raw_hash_set::transfer_slot_fn,
         (std::is_same<SlotAlloc, std::allocator<slot_type>>::value
              ? &DeallocateStandard<alignof(slot_type)>
              : &raw_hash_set::dealloc_fn),
+        &raw_hash_set::resize_impl,
     };
     return value;
   }
@@ -3252,22 +4033,78 @@ class raw_hash_set {
   // fields that occur after CommonFields.
   y_absl::container_internal::CompressedTuple<CommonFields, hasher, key_equal,
                                             allocator_type>
-      settings_{CommonFields{}, hasher{}, key_equal{}, allocator_type{}};
+      settings_{CommonFields::CreateDefault<SooEnabled()>(), hasher{},
+                key_equal{}, allocator_type{}};
+};
+
+// Friend access for free functions in raw_hash_set.h.
+struct HashtableFreeFunctionsAccess {
+  template <class Predicate, typename Set>
+  static typename Set::size_type EraseIf(Predicate& pred, Set* c) {
+    if (c->empty()) {
+      return 0;
+    }
+    if (c->is_soo()) {
+      auto it = c->soo_iterator();
+      if (!pred(*it)) {
+        assert(c->size() == 1 && "hash table was modified unexpectedly");
+        return 0;
+      }
+      c->destroy(it.slot());
+      c->common().set_empty_soo();
+      return 1;
+    }
+    Y_ABSL_ATTRIBUTE_UNUSED const size_t original_size_for_assert = c->size();
+    size_t num_deleted = 0;
+    IterateOverFullSlots(
+        c->common(), c->slot_array(), [&](const ctrl_t* ctrl, auto* slot) {
+          if (pred(Set::PolicyTraits::element(slot))) {
+            c->destroy(slot);
+            EraseMetaOnly(c->common(), static_cast<size_t>(ctrl - c->control()),
+                          sizeof(*slot));
+            ++num_deleted;
+          }
+        });
+    // NOTE: IterateOverFullSlots allow removal of the current element, so we
+    // verify the size additionally here.
+    assert(original_size_for_assert - num_deleted == c->size() &&
+           "hash table was modified unexpectedly");
+    return num_deleted;
+  }
+
+  template <class Callback, typename Set>
+  static void ForEach(Callback& cb, Set* c) {
+    if (c->empty()) {
+      return;
+    }
+    if (c->is_soo()) {
+      cb(*c->soo_iterator());
+      return;
+    }
+    using ElementTypeWithConstness = decltype(*c->begin());
+    IterateOverFullSlots(
+        c->common(), c->slot_array(), [&cb](const ctrl_t*, auto* slot) {
+          ElementTypeWithConstness& element = Set::PolicyTraits::element(slot);
+          cb(element);
+        });
+  }
 };
 
 // Erases all elements that satisfy the predicate `pred` from the container `c`.
 template <typename P, typename H, typename E, typename A, typename Predicate>
 typename raw_hash_set<P, H, E, A>::size_type EraseIf(
     Predicate& pred, raw_hash_set<P, H, E, A>* c) {
-  const auto initial_size = c->size();
-  for (auto it = c->begin(), last = c->end(); it != last;) {
-    if (pred(*it)) {
-      c->erase(it++);
-    } else {
-      ++it;
-    }
-  }
-  return initial_size - c->size();
+  return HashtableFreeFunctionsAccess::EraseIf(pred, c);
+}
+
+// Calls `cb` for all elements in the container `c`.
+template <typename P, typename H, typename E, typename A, typename Callback>
+void ForEach(Callback& cb, raw_hash_set<P, H, E, A>* c) {
+  return HashtableFreeFunctionsAccess::ForEach(cb, c);
+}
+template <typename P, typename H, typename E, typename A, typename Callback>
+void ForEach(Callback& cb, const raw_hash_set<P, H, E, A>* c) {
+  return HashtableFreeFunctionsAccess::ForEach(cb, c);
 }
 
 namespace hashtable_debug_internal {
@@ -3278,6 +4115,7 @@ struct HashtableDebugAccess<Set, y_absl::void_t<typename Set::raw_hash_set>> {
 
   static size_t GetNumProbes(const Set& set,
                              const typename Set::key_type& key) {
+    if (set.is_soo()) return 0;
     size_t num_probes = 0;
     size_t hash = set.hash_ref()(key);
     auto seq = probe(set.common(), hash);
@@ -3301,7 +4139,8 @@ struct HashtableDebugAccess<Set, y_absl::void_t<typename Set::raw_hash_set>> {
   static size_t AllocatedByteSize(const Set& c) {
     size_t capacity = c.capacity();
     if (capacity == 0) return 0;
-    size_t m = c.common().alloc_size(sizeof(Slot), alignof(Slot));
+    size_t m =
+        c.is_soo() ? 0 : c.common().alloc_size(sizeof(Slot), alignof(Slot));
 
     size_t per_slot = Traits::space_used(static_cast<const Slot*>(nullptr));
     if (per_slot != ~size_t{}) {
@@ -3321,5 +4160,7 @@ Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
 
 #undef Y_ABSL_SWISSTABLE_ENABLE_GENERATIONS
+#undef Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED
+#undef Y_ABSL_SWISSTABLE_IGNORE_UNINITIALIZED_RETURN
 
 #endif  // Y_ABSL_CONTAINER_INTERNAL_RAW_HASH_SET_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc32_x86_arm_combined_simd.h b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc32_x86_arm_combined_simd.h
index 0e53b0f57354..c1bbdf498f3b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc32_x86_arm_combined_simd.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc32_x86_arm_combined_simd.h
@@ -33,14 +33,15 @@
 #include <x86intrin.h>
 #define Y_ABSL_CRC_INTERNAL_HAVE_X86_SIMD
 
-#elif defined(_MSC_VER) && !defined(__clang__) && defined(__AVX__)
+#elif defined(_MSC_VER) && !defined(__clang__) && defined(__AVX__) && \
+    defined(_M_AMD64)
 
 // MSVC AVX (/arch:AVX) implies SSE 4.2 and PCLMULQDQ.
 #include <intrin.h>
 #define Y_ABSL_CRC_INTERNAL_HAVE_X86_SIMD
 
-#elif defined(__aarch64__) && defined(__LITTLE_ENDIAN__) && \
-    defined(__ARM_FEATURE_CRC32) && defined(Y_ABSL_INTERNAL_HAVE_ARM_NEON) &&  \
+#elif defined(__aarch64__) && defined(__LITTLE_ENDIAN__) &&                 \
+    defined(__ARM_FEATURE_CRC32) && defined(Y_ABSL_INTERNAL_HAVE_ARM_NEON) && \
     defined(__ARM_FEATURE_CRYPTO)
 
 #include <arm_acle.h>
@@ -101,10 +102,11 @@ V128 V128_Xor(const V128 l, const V128 r);
 // Produces an AND operation of |l| and |r|.
 V128 V128_And(const V128 l, const V128 r);
 
-// Sets two 64 bit integers to one 128 bit vector. The order is reverse.
+// Sets the lower half of a 128 bit register to the given 64-bit value and
+// zeroes the upper half.
 // dst[63:0] := |r|
-// dst[127:64] := |l|
-V128 V128_From2x64(const uint64_t l, const uint64_t r);
+// dst[127:64] := |0|
+V128 V128_From64WithZeroFill(const uint64_t r);
 
 // Shift |l| right by |imm| bytes while shifting in zeros.
 template <int imm>
@@ -121,8 +123,8 @@ uint64_t V128_Extract64(const V128 l);
 // Extracts the low 64 bits from V128.
 int64_t V128_Low64(const V128 l);
 
-// Left-shifts packed 64-bit integers in l by r.
-V128 V128_ShiftLeft64(const V128 l, const V128 r);
+// Add packed 64-bit integers in |l| and |r|.
+V128 V128_Add64(const V128 l, const V128 r);
 
 #endif
 
@@ -170,8 +172,8 @@ inline V128 V128_Xor(const V128 l, const V128 r) { return _mm_xor_si128(l, r); }
 
 inline V128 V128_And(const V128 l, const V128 r) { return _mm_and_si128(l, r); }
 
-inline V128 V128_From2x64(const uint64_t l, const uint64_t r) {
-  return _mm_set_epi64x(static_cast<int64_t>(l), static_cast<int64_t>(r));
+inline V128 V128_From64WithZeroFill(const uint64_t r) {
+  return _mm_set_epi64x(static_cast<int64_t>(0), static_cast<int64_t>(r));
 }
 
 template <int imm>
@@ -191,8 +193,8 @@ inline uint64_t V128_Extract64(const V128 l) {
 
 inline int64_t V128_Low64(const V128 l) { return _mm_cvtsi128_si64(l); }
 
-inline V128 V128_ShiftLeft64(const V128 l, const V128 r) {
-  return _mm_sll_epi64(l, r);
+inline V128 V128_Add64(const V128 l, const V128 r) {
+  return _mm_add_epi64(l, r);
 }
 
 #elif defined(Y_ABSL_CRC_INTERNAL_HAVE_ARM_SIMD)
@@ -261,10 +263,12 @@ inline V128 V128_Xor(const V128 l, const V128 r) { return veorq_u64(l, r); }
 
 inline V128 V128_And(const V128 l, const V128 r) { return vandq_u64(l, r); }
 
-inline V128 V128_From2x64(const uint64_t l, const uint64_t r) {
-  return vcombine_u64(vcreate_u64(r), vcreate_u64(l));
+inline V128 V128_From64WithZeroFill(const uint64_t r){
+  constexpr uint64x2_t kZero = {0, 0};
+  return vsetq_lane_u64(r, kZero, 0);
 }
 
+
 template <int imm>
 inline V128 V128_ShiftRight(const V128 l) {
   return vreinterpretq_u64_s8(
@@ -285,9 +289,7 @@ inline int64_t V128_Low64(const V128 l) {
   return vgetq_lane_s64(vreinterpretq_s64_u64(l), 0);
 }
 
-inline V128 V128_ShiftLeft64(const V128 l, const V128 r) {
-  return vshlq_u64(l, vreinterpretq_s64_u64(r));
-}
+inline V128 V128_Add64(const V128 l, const V128 r) { return vaddq_u64(l, r); }
 
 #endif
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_cord_state.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_cord_state.cc
index 695f2db14a59..71a4088dec45 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_cord_state.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_cord_state.cc
@@ -17,6 +17,7 @@
 #include <cassert>
 
 #include "y_absl/base/config.h"
+#include "y_absl/base/no_destructor.h"
 #include "y_absl/numeric/bits.h"
 
 namespace y_absl {
@@ -24,14 +25,14 @@ Y_ABSL_NAMESPACE_BEGIN
 namespace crc_internal {
 
 CrcCordState::RefcountedRep* CrcCordState::RefSharedEmptyRep() {
-  static CrcCordState::RefcountedRep* empty = new CrcCordState::RefcountedRep;
+  static y_absl::NoDestructor<CrcCordState::RefcountedRep> empty;
 
   assert(empty->count.load(std::memory_order_relaxed) >= 1);
   assert(empty->rep.removed_prefix.length == 0);
   assert(empty->rep.prefix_crc.empty());
 
-  Ref(empty);
-  return empty;
+  Ref(empty.get());
+  return empty.get();
 }
 
 CrcCordState::CrcCordState() : refcounted_rep_(new RefcountedRep) {}
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_memcpy_fallback.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_memcpy_fallback.cc
index cf03a5e10cd7..5b0cac2542f4 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_memcpy_fallback.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_memcpy_fallback.cc
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <cstdint>
+#include <cstring>
 #include <memory>
 
 #include "y_absl/base/config.h"
 #include "y_absl/crc/crc32c.h"
 #include "y_absl/crc/internal/crc_memcpy.h"
+#include "y_absl/strings/string_view.h"
 
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_memcpy_x86_arm_combined.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_memcpy_x86_arm_combined.cc
index e88e235cd474..ab65d3f8a037 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_memcpy_x86_arm_combined.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_memcpy_x86_arm_combined.cc
@@ -52,6 +52,7 @@
 #include <cstring>
 #include <memory>
 
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/optimization.h"
 #include "y_absl/base/prefetch.h"
@@ -88,9 +89,11 @@ inline crc32c_t ShortCrcCopy(char* dst, const char* src, std::size_t length,
 constexpr size_t kIntLoadsPerVec = sizeof(V128) / sizeof(uint64_t);
 
 // Common function for copying the tails of multiple large regions.
+// Disable ubsan for benign unaligned access. See b/254108538.
 template <size_t vec_regions, size_t int_regions>
-inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src,
-                          size_t region_size, size_t copy_rounds) {
+Y_ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED inline void LargeTailCopy(
+    crc32c_t* crcs, char** dst, const char** src, size_t region_size,
+    size_t copy_rounds) {
   std::array<V128, vec_regions> data;
   std::array<uint64_t, kIntLoadsPerVec * int_regions> int_data;
 
@@ -127,8 +130,8 @@ inline void LargeTailCopy(crc32c_t* crcs, char** dst, const char** src,
         size_t data_index = i * kIntLoadsPerVec + j;
 
         int_data[data_index] = *(usrc + j);
-        crcs[region] = crc32c_t{static_cast<uint32_t>(CRC32_u64(
-            static_cast<uint32_t>(crcs[region]), int_data[data_index]))};
+        crcs[region] = crc32c_t{CRC32_u64(static_cast<uint32_t>(crcs[region]),
+                                          int_data[data_index])};
 
         *(udst + j) = int_data[data_index];
       }
@@ -155,8 +158,10 @@ class AcceleratedCrcMemcpyEngine : public CrcMemcpyEngine {
                    std::size_t length, crc32c_t initial_crc) const override;
 };
 
+// Disable ubsan for benign unaligned access. See b/254108538.
 template <size_t vec_regions, size_t int_regions>
-crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
+Y_ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED crc32c_t
+AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
     void* __restrict dst, const void* __restrict src, std::size_t length,
     crc32c_t initial_crc) const {
   constexpr std::size_t kRegions = vec_regions + int_regions;
@@ -196,7 +201,6 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
 
   // Start work on the CRC: undo the XOR from the previous calculation or set up
   // the initial value of the CRC.
-  // initial_crc ^= kCrcDataXor;
   initial_crc = crc32c_t{static_cast<uint32_t>(initial_crc) ^ kCrcDataXor};
 
   // Do an initial alignment copy, so we can use aligned store instructions to
@@ -295,8 +299,8 @@ crc32c_t AcceleratedCrcMemcpyEngine<vec_regions, int_regions>::Compute(
 
           // Load and CRC the data.
           int_data[data_index] = *(usrc + i * kIntLoadsPerVec + k);
-          crcs[region] = crc32c_t{static_cast<uint32_t>(CRC32_u64(
-              static_cast<uint32_t>(crcs[region]), int_data[data_index]))};
+          crcs[region] = crc32c_t{CRC32_u64(static_cast<uint32_t>(crcs[region]),
+                                            int_data[data_index])};
 
           // Store the data.
           *(udst + i * kIntLoadsPerVec + k) = int_data[data_index];
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_non_temporal_memcpy.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_non_temporal_memcpy.cc
index e73e6487cfeb..78dec49f28f4 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_non_temporal_memcpy.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_non_temporal_memcpy.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <cstdint>
+#include <cstddef>
 
 #include "y_absl/base/config.h"
 #include "y_absl/crc/crc32c.h"
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_x86_arm_combined.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_x86_arm_combined.cc
index d72151a5f17d..88a953efadcd 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_x86_arm_combined.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/crc_x86_arm_combined.cc
@@ -101,13 +101,17 @@ constexpr size_t kMediumCutoff = 2048;
 namespace {
 
 uint32_t multiply(uint32_t a, uint32_t b) {
-  V128 shifts = V128_From2x64(0, 1);
-  V128 power = V128_From2x64(0, a);
-  V128 crc = V128_From2x64(0, b);
+  V128 power = V128_From64WithZeroFill(a);
+  V128 crc = V128_From64WithZeroFill(b);
   V128 res = V128_PMulLow(power, crc);
 
-  // Combine crc values
-  res = V128_ShiftLeft64(res, shifts);
+  // Combine crc values.
+  //
+  // Adding res to itself is equivalent to multiplying by 2,
+  // or shifting left by 1. Addition is used as not all compilers
+  // are able to generate optimal code without this hint.
+  // https://godbolt.org/z/rr3fMnf39
+  res = V128_Add64(res, res);
   return static_cast<uint32_t>(V128_Extract32<1>(res)) ^
          CRC32_u32(0, static_cast<uint32_t>(V128_Low64(res)));
 }
@@ -444,11 +448,11 @@ class CRC32AcceleratedX86ARMCombinedMultipleStreams
 
         V128 magic = *(reinterpret_cast<const V128*>(kClmulConstants) + bs - 1);
 
-        V128 tmp = V128_From2x64(0, l64);
+        V128 tmp = V128_From64WithZeroFill(l64);
 
         V128 res1 = V128_PMulLow(tmp, magic);
 
-        tmp = V128_From2x64(0, l641);
+        tmp = V128_From64WithZeroFill(l641);
 
         V128 res2 = V128_PMul10(tmp, magic);
         V128 x = V128_Xor(res1, res2);
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/non_temporal_memcpy.h b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/non_temporal_memcpy.h
index fce0007046b1..80f36714249e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/non_temporal_memcpy.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/crc/internal/non_temporal_memcpy.h
@@ -19,19 +19,8 @@
 #include <intrin.h>
 #endif
 
-#ifdef __SSE__
-#include <xmmintrin.h>
-#endif
-
-#ifdef __SSE2__
-#include <emmintrin.h>
-#endif
-
-#ifdef __SSE3__
-#include <pmmintrin.h>
-#endif
-
-#ifdef __AVX__
+#if defined(__SSE__) || defined(__AVX__)
+// Pulls in both SSE and AVX intrinsics.
 #include <immintrin.h>
 #endif
 
@@ -44,6 +33,7 @@
 #include <cstdint>
 #include <cstring>
 
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/optimization.h"
 
@@ -57,7 +47,9 @@ namespace crc_internal {
 // memcpy can save 1 DRAM load of the destination cacheline.
 constexpr size_t kCacheLineSize = Y_ABSL_CACHELINE_SIZE;
 
-// If the objects overlap, the behavior is undefined.
+// If the objects overlap, the behavior is undefined. Uses regular memcpy
+// instead of non-temporal memcpy if the required CPU intrinsics are unavailable
+// at compile time.
 inline void *non_temporal_store_memcpy(void *__restrict dst,
                                        const void *__restrict src, size_t len) {
 #if defined(__SSE3__) || defined(__aarch64__) || \
@@ -119,10 +111,20 @@ inline void *non_temporal_store_memcpy(void *__restrict dst,
 #endif  // __SSE3__ || __aarch64__ || (_MSC_VER && __AVX__)
 }
 
+// If the objects overlap, the behavior is undefined. Uses regular memcpy
+// instead of non-temporal memcpy if the required CPU intrinsics are unavailable
+// at compile time.
+#if Y_ABSL_HAVE_CPP_ATTRIBUTE(gnu::target) && \
+    (defined(__x86_64__) || defined(__i386__))
+[[gnu::target("avx")]]
+#endif
 inline void *non_temporal_store_memcpy_avx(void *__restrict dst,
                                            const void *__restrict src,
                                            size_t len) {
-#ifdef __AVX__
+  // This function requires AVX. For clang and gcc we compile it with AVX even
+  // if the translation unit isn't built with AVX support. This works because we
+  // only select this implementation at runtime if the CPU supports AVX.
+#if defined(__SSE3__) || (defined(_MSC_VER) && defined(__AVX__))
   uint8_t *d = reinterpret_cast<uint8_t *>(dst);
   const uint8_t *s = reinterpret_cast<const uint8_t *>(src);
 
@@ -168,9 +170,8 @@ inline void *non_temporal_store_memcpy_avx(void *__restrict dst,
   }
   return dst;
 #else
-  // Fallback to regular memcpy when AVX is not available.
   return memcpy(dst, src, len);
-#endif  // __AVX__
+#endif  // __SSE3__ || (_MSC_VER && __AVX__)
 }
 
 }  // namespace crc_internal
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/failure_signal_handler.h b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/failure_signal_handler.h
index 03ce76be4246..0766fbeee92e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/failure_signal_handler.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/failure_signal_handler.h
@@ -33,7 +33,7 @@
 // }
 //
 // Any program that raises a fatal signal (such as `SIGSEGV`, `SIGILL`,
-// `SIGFPE`, `SIGABRT`, `SIGTERM`, `SIGBUG`, and `SIGTRAP`) will call the
+// `SIGFPE`, `SIGABRT`, `SIGTERM`, `SIGBUS`, and `SIGTRAP`) will call the
 // installed failure signal handler and provide debugging information to stderr.
 //
 // Note that you should *not* install the Abseil failure signal handler more
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/bounded_utf8_length_sequence.h b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/bounded_utf8_length_sequence.h
new file mode 100644
index 000000000000..df2804299bb1
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/bounded_utf8_length_sequence.h
@@ -0,0 +1,126 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef Y_ABSL_DEBUGGING_INTERNAL_BOUNDED_UTF8_LENGTH_SEQUENCE_H_
+#define Y_ABSL_DEBUGGING_INTERNAL_BOUNDED_UTF8_LENGTH_SEQUENCE_H_
+
+#include <cstdint>
+
+#include "y_absl/base/config.h"
+#include "y_absl/numeric/bits.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+// A sequence of up to max_elements integers between 1 and 4 inclusive, whose
+// insertion operation computes the sum of all the elements before the insertion
+// point.  This is useful in decoding Punycode, where one needs to know where in
+// a UTF-8 byte stream the n-th code point begins.
+//
+// BoundedUtf8LengthSequence is async-signal-safe and suitable for use in
+// symbolizing stack traces in a signal handler, provided max_elements is not
+// improvidently large.  For inputs of lengths accepted by the Rust demangler,
+// up to a couple hundred code points, InsertAndReturnSumOfPredecessors should
+// run in a few dozen clock cycles, on par with the other arithmetic required
+// for Punycode decoding.
+template <uint32_t max_elements>
+class BoundedUtf8LengthSequence {
+ public:
+  // Constructs an empty sequence.
+  BoundedUtf8LengthSequence() = default;
+
+  // Inserts `utf_length` at position `index`, shifting any existing elements at
+  // or beyond `index` one position to the right.  If the sequence is already
+  // full, the rightmost element is discarded.
+  //
+  // Returns the sum of the elements at positions 0 to `index - 1` inclusive.
+  // If `index` is greater than the number of elements already inserted, the
+  // excess positions in the range count 1 apiece.
+  //
+  // REQUIRES: index < max_elements and 1 <= utf8_length <= 4.
+  uint32_t InsertAndReturnSumOfPredecessors(
+      uint32_t index, uint32_t utf8_length) {
+    // The caller shouldn't pass out-of-bounds inputs, but if it does happen,
+    // clamp the values and try to continue.  If we're being called from a
+    // signal handler, the last thing we want to do is crash.  Emitting
+    // malformed UTF-8 is a lesser evil.
+    if (index >= max_elements) index = max_elements - 1;
+    if (utf8_length == 0 || utf8_length > 4) utf8_length = 1;
+
+    const uint32_t word_index = index/32;
+    const uint32_t bit_index = 2 * (index % 32);
+    const uint64_t ones_bit = uint64_t{1} << bit_index;
+
+    // Compute the sum of predecessors.
+    //   - Each value from 1 to 4 is represented by a bit field with value from
+    //     0 to 3, so the desired sum is index plus the sum of the
+    //     representations actually stored.
+    //   - For each bit field, a set low bit should contribute 1 to the sum, and
+    //     a set high bit should contribute 2.
+    //   - Another way to say the same thing is that each set bit contributes 1,
+    //     and each set high bit contributes an additional 1.
+    //   - So the sum we want is index + popcount(everything) + popcount(bits in
+    //     odd positions).
+    const uint64_t odd_bits_mask = 0xaaaaaaaaaaaaaaaa;
+    const uint64_t lower_seminibbles_mask = ones_bit - 1;
+    const uint64_t higher_seminibbles_mask = ~lower_seminibbles_mask;
+    const uint64_t same_word_bits_below_insertion =
+        rep_[word_index] & lower_seminibbles_mask;
+    int full_popcount = y_absl::popcount(same_word_bits_below_insertion);
+    int odd_popcount =
+        y_absl::popcount(same_word_bits_below_insertion & odd_bits_mask);
+    for (uint32_t j = word_index; j > 0; --j) {
+      const uint64_t word_below_insertion = rep_[j - 1];
+      full_popcount += y_absl::popcount(word_below_insertion);
+      odd_popcount += y_absl::popcount(word_below_insertion & odd_bits_mask);
+    }
+    const uint32_t sum_of_predecessors =
+        index + static_cast<uint32_t>(full_popcount + odd_popcount);
+
+    // Now insert utf8_length's representation, shifting successors up one
+    // place.
+    for (uint32_t j = max_elements/32 - 1; j > word_index; --j) {
+      rep_[j] = (rep_[j] << 2) | (rep_[j - 1] >> 62);
+    }
+    rep_[word_index] =
+        (rep_[word_index] & lower_seminibbles_mask) |
+        (uint64_t{utf8_length - 1} << bit_index) |
+        ((rep_[word_index] & higher_seminibbles_mask) << 2);
+
+    return sum_of_predecessors;
+  }
+
+ private:
+  // If the (32 * i + j)-th element of the represented sequence has the value k
+  // (0 <= j < 32, 1 <= k <= 4), then bits 2 * j and 2 * j + 1 of rep_[i]
+  // contain the seminibble (k - 1).
+  //
+  // In particular, the zero-initialization of rep_ makes positions not holding
+  // any inserted element count as 1 in InsertAndReturnSumOfPredecessors.
+  //
+  // Example: rep_ = {0xb1, ... the rest zeroes ...} represents the sequence
+  // (2, 1, 4, 3, ... the rest 1's ...).  Constructing the sequence of Unicode
+  // code points "Àa🂻中" = {U+00C0, U+0061, U+1F0BB, U+4E2D} (among many
+  // other examples) would yield this value of rep_.
+  static_assert(max_elements > 0 && max_elements % 32 == 0,
+                "max_elements must be a positive multiple of 32");
+  uint64_t rep_[max_elements/32] = {};
+};
+
+}  // namespace debugging_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
+
+#endif  // Y_ABSL_DEBUGGING_INTERNAL_BOUNDED_UTF8_LENGTH_SEQUENCE_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/decode_rust_punycode.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/decode_rust_punycode.cc
new file mode 100644
index 000000000000..bb9fe3cb0ed0
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/decode_rust_punycode.cc
@@ -0,0 +1,258 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "y_absl/debugging/internal/decode_rust_punycode.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+
+#include "y_absl/base/config.h"
+#include "y_absl/base/nullability.h"
+#include "y_absl/debugging/internal/bounded_utf8_length_sequence.h"
+#include "y_absl/debugging/internal/utf8_for_code_point.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+namespace {
+
+// Decoding Punycode requires repeated random-access insertion into a stream of
+// variable-length UTF-8 code-point encodings.  We need this to be tolerably
+// fast (no N^2 slowdown for unfortunate inputs), and we can't allocate any data
+// structures on the heap (async-signal-safety).
+//
+// It is pragmatic to impose a moderately low limit on the identifier length and
+// bail out if we ever hit it.  Then BoundedUtf8LengthSequence efficiently
+// determines where to insert the next code point, and memmove efficiently makes
+// room for it.
+//
+// The chosen limit is a round number several times larger than identifiers
+// expected in practice, yet still small enough that a memmove of this many
+// UTF-8 characters is not much more expensive than the division and modulus
+// operations that Punycode decoding requires.
+constexpr uint32_t kMaxChars = 256;
+
+// Constants from RFC 3492 section 5.
+constexpr uint32_t kBase = 36, kTMin = 1, kTMax = 26, kSkew = 38, kDamp = 700;
+
+constexpr uint32_t kMaxCodePoint = 0x10ffff;
+
+// Overflow threshold in DecodeRustPunycode's inner loop; see comments there.
+constexpr uint32_t kMaxI = 1 << 30;
+
+// If punycode_begin .. punycode_end begins with a prefix matching the regular
+// expression [0-9a-zA-Z_]+_, removes that prefix, copies all but the final
+// underscore into out_begin .. out_end, sets num_ascii_chars to the number of
+// bytes copied, and returns true.  (A prefix of this sort represents the
+// nonempty subsequence of ASCII characters in the corresponding plaintext.)
+//
+// If punycode_begin .. punycode_end does not contain an underscore, sets
+// num_ascii_chars to zero and returns true.  (The encoding of a plaintext
+// without any ASCII characters does not carry such a prefix.)
+//
+// Returns false and zeroes num_ascii_chars on failure (either parse error or
+// not enough space in the output buffer).
+bool ConsumeOptionalAsciiPrefix(const char*& punycode_begin,
+                                const char* const punycode_end,
+                                char* const out_begin,
+                                char* const out_end,
+                                uint32_t& num_ascii_chars) {
+  num_ascii_chars = 0;
+
+  // Remember the last underscore if any.  Also use the same string scan to
+  // reject any ASCII bytes that do not belong in an identifier, including NUL,
+  // as well as non-ASCII bytes, which should have been delta-encoded instead.
+  int last_underscore = -1;
+  for (int i = 0; i < punycode_end - punycode_begin; ++i) {
+    const char c = punycode_begin[i];
+    if (c == '_') {
+      last_underscore = i;
+      continue;
+    }
+    // We write out the meaning of y_absl::ascii_isalnum rather than call that
+    // function because its documentation does not promise it will remain
+    // async-signal-safe under future development.
+    if ('a' <= c && c <= 'z') continue;
+    if ('A' <= c && c <= 'Z') continue;
+    if ('0' <= c && c <= '9') continue;
+    return false;
+  }
+
+  // If there was no underscore, that means there were no ASCII characters in
+  // the plaintext, so there is no prefix to consume.  Our work is done.
+  if (last_underscore < 0) return true;
+
+  // Otherwise there will be an underscore delimiter somewhere.  It can't be
+  // initial because then there would be no ASCII characters to its left, and no
+  // delimiter would have been added in that case.
+  if (last_underscore == 0) return false;
+
+  // Any other position is reasonable.  Make sure there's room in the buffer.
+  if (last_underscore + 1 > out_end - out_begin) return false;
+
+  // Consume and write out the ASCII characters.
+  num_ascii_chars = static_cast<uint32_t>(last_underscore);
+  std::memcpy(out_begin, punycode_begin, num_ascii_chars);
+  out_begin[num_ascii_chars] = '\0';
+  punycode_begin += num_ascii_chars + 1;
+  return true;
+}
+
+// Returns the value of `c` as a base-36 digit according to RFC 3492 section 5,
+// or -1 if `c` is not such a digit.
+int DigitValue(char c) {
+  if ('0' <= c && c <= '9') return c - '0' + 26;
+  if ('a' <= c && c <= 'z') return c - 'a';
+  if ('A' <= c && c <= 'Z') return c - 'A';
+  return -1;
+}
+
+// Consumes the next delta encoding from punycode_begin .. punycode_end,
+// updating i accordingly.  Returns true on success.  Returns false on parse
+// failure or arithmetic overflow.
+bool ScanNextDelta(const char*& punycode_begin, const char* const punycode_end,
+                   uint32_t bias, uint32_t& i) {
+  uint64_t w = 1;  // 64 bits to prevent overflow in w *= kBase - t
+
+  // "for k = base to infinity in steps of base do begin ... end" in RFC 3492
+  // section 6.2.  Each loop iteration scans one digit of the delta.
+  for (uint32_t k = kBase; punycode_begin != punycode_end; k += kBase) {
+    const int digit_value = DigitValue(*punycode_begin++);
+    if (digit_value < 0) return false;
+
+    // Compute this in 64-bit arithmetic so we can check for overflow afterward.
+    const uint64_t new_i = i + static_cast<uint64_t>(digit_value) * w;
+
+    // Valid deltas are bounded by (#chars already emitted) * kMaxCodePoint, but
+    // invalid input could encode an arbitrarily large delta.  Nip that in the
+    // bud here.
+    static_assert(
+        kMaxI >= kMaxChars * kMaxCodePoint,
+        "kMaxI is too small to prevent spurious failures on good input");
+    if (new_i > kMaxI) return false;
+
+    static_assert(
+        kMaxI < (uint64_t{1} << 32),
+        "Make kMaxI smaller or i 64 bits wide to prevent silent wraparound");
+    i = static_cast<uint32_t>(new_i);
+
+    // Compute the threshold that determines whether this is the last digit and
+    // (if not) what the next digit's place value will be.  This logic from RFC
+    // 3492 section 6.2 is explained in section 3.3.
+    uint32_t t;
+    if (k <= bias + kTMin) {
+      t = kTMin;
+    } else if (k >= bias + kTMax) {
+      t = kTMax;
+    } else {
+      t = k - bias;
+    }
+    if (static_cast<uint32_t>(digit_value) < t) return true;
+
+    // If this gets too large, the range check on new_i in the next iteration
+    // will catch it.  We know this multiplication will not overwrap because w
+    // is 64 bits wide.
+    w *= kBase - t;
+  }
+  return false;
+}
+
+}  // namespace
+
+y_absl::Nullable<char*> DecodeRustPunycode(DecodeRustPunycodeOptions options) {
+  const char* punycode_begin = options.punycode_begin;
+  const char* const punycode_end = options.punycode_end;
+  char* const out_begin = options.out_begin;
+  char* const out_end = options.out_end;
+
+  // Write a NUL terminator first.  Later memcpy calls will keep bumping it
+  // along to its new right place.
+  const size_t out_size = static_cast<size_t>(out_end - out_begin);
+  if (out_size == 0) return nullptr;
+  *out_begin = '\0';
+
+  // RFC 3492 section 6.2 begins here.  We retain the names of integer variables
+  // appearing in that text.
+  uint32_t n = 128, i = 0, bias = 72, num_chars = 0;
+
+  // If there are any ASCII characters, consume them and their trailing
+  // underscore delimiter.
+  if (!ConsumeOptionalAsciiPrefix(punycode_begin, punycode_end,
+                                  out_begin, out_end, num_chars)) {
+    return nullptr;
+  }
+  uint32_t total_utf8_bytes = num_chars;
+
+  BoundedUtf8LengthSequence<kMaxChars> utf8_lengths;
+
+  // "while the input is not exhausted do begin ... end"
+  while (punycode_begin != punycode_end) {
+    if (num_chars >= kMaxChars) return nullptr;
+
+    const uint32_t old_i = i;
+
+    if (!ScanNextDelta(punycode_begin, punycode_end, bias, i)) return nullptr;
+
+    // Update bias as in RFC 3492 section 6.1.  (We have inlined adapt.)
+    uint32_t delta = i - old_i;
+    delta /= (old_i == 0 ? kDamp : 2);
+    delta += delta/(num_chars + 1);
+    bias = 0;
+    while (delta > ((kBase - kTMin) * kTMax)/2) {
+      delta /= kBase - kTMin;
+      bias += kBase;
+    }
+    bias += ((kBase - kTMin + 1) * delta)/(delta + kSkew);
+
+    // Back in section 6.2, compute the new code point and insertion index.
+    static_assert(
+        kMaxI + kMaxCodePoint < (uint64_t{1} << 32),
+        "Make kMaxI smaller or n 64 bits wide to prevent silent wraparound");
+    n += i/(num_chars + 1);
+    i %= num_chars + 1;
+
+    // To actually insert, we need to convert the code point n to UTF-8 and the
+    // character index i to an index into the byte stream emitted so far.  First
+    // prepare the UTF-8 encoding for n, rejecting surrogates, overlarge values,
+    // and anything that won't fit into the remaining output storage.
+    Utf8ForCodePoint utf8_for_code_point(n);
+    if (!utf8_for_code_point.ok()) return nullptr;
+    if (total_utf8_bytes + utf8_for_code_point.length + 1 > out_size) {
+      return nullptr;
+    }
+
+    // Now insert the new character into both our length map and the output.
+    uint32_t n_index =
+        utf8_lengths.InsertAndReturnSumOfPredecessors(
+            i, utf8_for_code_point.length);
+    std::memmove(
+        out_begin + n_index + utf8_for_code_point.length, out_begin + n_index,
+        total_utf8_bytes + 1 - n_index);
+    std::memcpy(out_begin + n_index, utf8_for_code_point.bytes,
+                utf8_for_code_point.length);
+    total_utf8_bytes += utf8_for_code_point.length;
+    ++num_chars;
+
+    // Finally, advance to the next state before continuing.
+    ++i;
+  }
+
+  return out_begin + total_utf8_bytes;
+}
+
+}  // namespace debugging_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/decode_rust_punycode.h b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/decode_rust_punycode.h
new file mode 100644
index 000000000000..b232b4c12fff
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/decode_rust_punycode.h
@@ -0,0 +1,55 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef Y_ABSL_DEBUGGING_INTERNAL_DECODE_RUST_PUNYCODE_H_
+#define Y_ABSL_DEBUGGING_INTERNAL_DECODE_RUST_PUNYCODE_H_
+
+#include "y_absl/base/config.h"
+#include "y_absl/base/nullability.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+struct DecodeRustPunycodeOptions {
+  const char* punycode_begin;
+  const char* punycode_end;
+  char* out_begin;
+  char* out_end;
+};
+
+// Given Rust Punycode in `punycode_begin .. punycode_end`, writes the
+// corresponding UTF-8 plaintext into `out_begin .. out_end`, followed by a NUL
+// character, and returns a pointer to that final NUL on success.  On failure
+// returns a null pointer, and the contents of `out_begin .. out_end` are
+// unspecified.
+//
+// Failure occurs in precisely these cases:
+//   - Any input byte does not match [0-9a-zA-Z_].
+//   - The first input byte is an underscore, but no other underscore appears in
+//     the input.
+//   - The delta sequence does not represent a valid sequence of code-point
+//     insertions.
+//   - The plaintext would contain more than 256 code points.
+//
+// DecodeRustPunycode is async-signal-safe with bounded runtime and a small
+// stack footprint, making it suitable for use in demangling Rust symbol names
+// from a signal handler.
+y_absl::Nullable<char*> DecodeRustPunycode(DecodeRustPunycodeOptions options);
+
+}  // namespace debugging_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
+
+#endif  // Y_ABSL_DEBUGGING_INTERNAL_DECODE_RUST_PUNYCODE_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.cc
index f79c798eef5b..22848f98612d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.cc
@@ -14,18 +14,19 @@
 
 // For reference check out:
 // https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling
-//
-// Note that we only have partial C++11 support yet.
 
 #include "y_absl/debugging/internal/demangle.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <limits>
 #include <util/generic/string.h>
 
 #include "y_absl/base/config.h"
+#include "y_absl/debugging/internal/demangle_rust.h"
 
 #if Y_ABSL_INTERNAL_HAS_CXA_DEMANGLE
 #include <cxxabi.h>
@@ -44,14 +45,16 @@ typedef struct {
 
 // List of operators from Itanium C++ ABI.
 static const AbbrevPair kOperatorList[] = {
-    // New has special syntax (not currently supported).
+    // New has special syntax.
     {"nw", "new", 0},
     {"na", "new[]", 0},
 
-    // Works except that the 'gs' prefix is not supported.
+    // Special-cased elsewhere to support the optional gs prefix.
     {"dl", "delete", 1},
     {"da", "delete[]", 1},
 
+    {"aw", "co_await", 1},
+
     {"ps", "+", 1},  // "positive"
     {"ng", "-", 1},  // "negative"
     {"ad", "&", 1},  // "address-of"
@@ -79,6 +82,7 @@ static const AbbrevPair kOperatorList[] = {
     {"rs", ">>", 2},
     {"lS", "<<=", 2},
     {"rS", ">>=", 2},
+    {"ss", "<=>", 2},
     {"eq", "==", 2},
     {"ne", "!=", 2},
     {"lt", "<", 2},
@@ -98,6 +102,7 @@ static const AbbrevPair kOperatorList[] = {
     {"qu", "?", 3},
     {"st", "sizeof", 0},  // Special syntax
     {"sz", "sizeof", 1},  // Not a real operator name, but used in expressions.
+    {"sZ", "sizeof...", 0},  // Special syntax
     {nullptr, nullptr, 0},
 };
 
@@ -187,9 +192,50 @@ typedef struct {
   int recursion_depth;        // For stack exhaustion prevention.
   int steps;               // Cap how much work we'll do, regardless of depth.
   ParseState parse_state;  // Backtrackable state copied for most frames.
+
+  // Conditionally compiled support for marking the position of the first
+  // construct Demangle couldn't parse.  This preprocessor symbol is intended
+  // for use by Abseil demangler maintainers only; its behavior is not part of
+  // Abseil's public interface.
+#ifdef Y_ABSL_INTERNAL_DEMANGLE_RECORDS_HIGH_WATER_MARK
+  int high_water_mark;  // Input position where parsing failed.
+  bool too_complex;  // True if any guard.IsTooComplex() call returned true.
+#endif
 } State;
 
 namespace {
+
+#ifdef Y_ABSL_INTERNAL_DEMANGLE_RECORDS_HIGH_WATER_MARK
+void UpdateHighWaterMark(State *state) {
+  if (state->high_water_mark < state->parse_state.mangled_idx) {
+    state->high_water_mark = state->parse_state.mangled_idx;
+  }
+}
+
+void ReportHighWaterMark(State *state) {
+  // Write out the mangled name with the trouble point marked, provided that the
+  // output buffer is large enough and the mangled name did not hit a complexity
+  // limit (in which case the high water mark wouldn't point out an unparsable
+  // construct, only the point where a budget ran out).
+  const size_t input_length = std::strlen(state->mangled_begin);
+  if (input_length + 6 > static_cast<size_t>(state->out_end_idx) ||
+      state->too_complex) {
+    if (state->out_end_idx > 0) state->out[0] = '\0';
+    return;
+  }
+  const size_t high_water_mark = static_cast<size_t>(state->high_water_mark);
+  std::memcpy(state->out, state->mangled_begin, high_water_mark);
+  std::memcpy(state->out + high_water_mark, "--!--", 5);
+  std::memcpy(state->out + high_water_mark + 5,
+              state->mangled_begin + high_water_mark,
+              input_length - high_water_mark);
+  state->out[input_length + 5] = '\0';
+}
+#else
+void UpdateHighWaterMark(State *) {}
+void ReportHighWaterMark(State *) {}
+#endif
+
 // Prevent deep recursion / stack exhaustion.
 // Also prevent unbounded handling of complex inputs.
 class ComplexityGuard {
@@ -201,7 +247,7 @@ class ComplexityGuard {
   ~ComplexityGuard() { --state_->recursion_depth; }
 
   // 256 levels of recursion seems like a reasonable upper limit on depth.
-  // 128 is not enough to demagle synthetic tests from demangle_unittest.txt:
+  // 128 is not enough to demangle synthetic tests from demangle_unittest.txt:
   // "_ZaaZZZZ..." and "_ZaaZcvZcvZ..."
   static constexpr int kRecursionDepthLimit = 256;
 
@@ -222,8 +268,14 @@ class ComplexityGuard {
   static constexpr int kParseStepsLimit = 1 << 17;
 
   bool IsTooComplex() const {
-    return state_->recursion_depth > kRecursionDepthLimit ||
-           state_->steps > kParseStepsLimit;
+    if (state_->recursion_depth > kRecursionDepthLimit ||
+        state_->steps > kParseStepsLimit) {
+#ifdef Y_ABSL_INTERNAL_DEMANGLE_RECORDS_HIGH_WATER_MARK
+      state_->too_complex = true;
+#endif
+      return true;
+    }
+    return false;
   }
 
  private:
@@ -270,6 +322,10 @@ static void InitState(State* state,
   state->out_end_idx = static_cast<int>(out_size);
   state->recursion_depth = 0;
   state->steps = 0;
+#ifdef Y_ABSL_INTERNAL_DEMANGLE_RECORDS_HIGH_WATER_MARK
+  state->high_water_mark = 0;
+  state->too_complex = false;
+#endif
 
   state->parse_state.mangled_idx = 0;
   state->parse_state.out_cur_idx = 0;
@@ -291,13 +347,14 @@ static bool ParseOneCharToken(State *state, const char one_char_token) {
   if (guard.IsTooComplex()) return false;
   if (RemainingInput(state)[0] == one_char_token) {
     ++state->parse_state.mangled_idx;
+    UpdateHighWaterMark(state);
     return true;
   }
   return false;
 }
 
-// Returns true and advances "mangled_cur" if we find "two_char_token"
-// at "mangled_cur" position.  It is assumed that "two_char_token" does
+// Returns true and advances "mangled_idx" if we find "two_char_token"
+// at "mangled_idx" position.  It is assumed that "two_char_token" does
 // not contain '\0'.
 static bool ParseTwoCharToken(State *state, const char *two_char_token) {
   ComplexityGuard guard(state);
@@ -305,11 +362,45 @@ static bool ParseTwoCharToken(State *state, const char *two_char_token) {
   if (RemainingInput(state)[0] == two_char_token[0] &&
       RemainingInput(state)[1] == two_char_token[1]) {
     state->parse_state.mangled_idx += 2;
+    UpdateHighWaterMark(state);
     return true;
   }
   return false;
 }
 
+// Returns true and advances "mangled_idx" if we find "three_char_token"
+// at "mangled_idx" position.  It is assumed that "three_char_token" does
+// not contain '\0'.
+static bool ParseThreeCharToken(State *state, const char *three_char_token) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  if (RemainingInput(state)[0] == three_char_token[0] &&
+      RemainingInput(state)[1] == three_char_token[1] &&
+      RemainingInput(state)[2] == three_char_token[2]) {
+    state->parse_state.mangled_idx += 3;
+    UpdateHighWaterMark(state);
+    return true;
+  }
+  return false;
+}
+
+// Returns true and advances "mangled_idx" if we find a copy of the
+// NUL-terminated string "long_token" at "mangled_idx" position.
+static bool ParseLongToken(State *state, const char *long_token) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  int i = 0;
+  for (; long_token[i] != '\0'; ++i) {
+    // Note that we cannot run off the end of the NUL-terminated input here.
+    // Inside the loop body, long_token[i] is known to be different from NUL.
+    // So if we read the NUL on the end of the input here, we return at once.
+    if (RemainingInput(state)[i] != long_token[i]) return false;
+  }
+  state->parse_state.mangled_idx += i;
+  UpdateHighWaterMark(state);
+  return true;
+}
+
 // Returns true and advances "mangled_cur" if we find any character in
 // "char_class" at "mangled_cur" position.
 static bool ParseCharClass(State *state, const char *char_class) {
@@ -322,6 +413,7 @@ static bool ParseCharClass(State *state, const char *char_class) {
   for (; *p != '\0'; ++p) {
     if (RemainingInput(state)[0] == *p) {
       ++state->parse_state.mangled_idx;
+      UpdateHighWaterMark(state);
       return true;
     }
   }
@@ -554,6 +646,7 @@ static bool ParseFloatNumber(State *state);
 static bool ParseSeqId(State *state);
 static bool ParseIdentifier(State *state, size_t length);
 static bool ParseOperatorName(State *state, int *arity);
+static bool ParseConversionOperatorType(State *state);
 static bool ParseSpecialName(State *state);
 static bool ParseCallOffset(State *state);
 static bool ParseNVOffset(State *state);
@@ -563,21 +656,33 @@ static bool ParseCtorDtorName(State *state);
 static bool ParseDecltype(State *state);
 static bool ParseType(State *state);
 static bool ParseCVQualifiers(State *state);
+static bool ParseExtendedQualifier(State *state);
 static bool ParseBuiltinType(State *state);
+static bool ParseVendorExtendedType(State *state);
 static bool ParseFunctionType(State *state);
 static bool ParseBareFunctionType(State *state);
+static bool ParseOverloadAttribute(State *state);
 static bool ParseClassEnumType(State *state);
 static bool ParseArrayType(State *state);
 static bool ParsePointerToMemberType(State *state);
 static bool ParseTemplateParam(State *state);
+static bool ParseTemplateParamDecl(State *state);
 static bool ParseTemplateTemplateParam(State *state);
 static bool ParseTemplateArgs(State *state);
 static bool ParseTemplateArg(State *state);
 static bool ParseBaseUnresolvedName(State *state);
 static bool ParseUnresolvedName(State *state);
+static bool ParseUnresolvedQualifierLevel(State *state);
+static bool ParseUnionSelector(State* state);
+static bool ParseFunctionParam(State* state);
+static bool ParseBracedExpression(State *state);
 static bool ParseExpression(State *state);
+static bool ParseInitializer(State *state);
 static bool ParseExprPrimary(State *state);
-static bool ParseExprCastValue(State *state);
+static bool ParseExprCastValueAndTrailingE(State *state);
+static bool ParseQRequiresClauseExpr(State *state);
+static bool ParseRequirement(State *state);
+static bool ParseTypeConstraint(State *state);
 static bool ParseLocalName(State *state);
 static bool ParseLocalNameSuffix(State *state);
 static bool ParseDiscriminator(State *state);
@@ -622,22 +727,34 @@ static bool ParseMangledName(State *state) {
 }
 
 // <encoding> ::= <(function) name> <bare-function-type>
+//                [`Q` <requires-clause expr>]
 //            ::= <(data) name>
 //            ::= <special-name>
+//
+// NOTE: Based on http://shortn/_Hoq9qG83rx
 static bool ParseEncoding(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
-  // Implementing the first two productions together as <name>
-  // [<bare-function-type>] avoids exponential blowup of backtracking.
+  // Since the first two productions both start with <name>, attempt
+  // to parse it only once to avoid exponential blowup of backtracking.
   //
-  // Since Optional(...) can't fail, there's no need to copy the state for
-  // backtracking.
-  if (ParseName(state) && Optional(ParseBareFunctionType(state))) {
+  // We're careful about exponential blowup because <encoding> recursively
+  // appears in other productions downstream of its first two productions,
+  // which means that every call to `ParseName` would possibly indirectly
+  // result in two calls to `ParseName` etc.
+  if (ParseName(state)) {
+    if (!ParseBareFunctionType(state)) {
+      return true;  // <(data) name>
+    }
+
+    // Parsed: <(function) name> <bare-function-type>
+    // Pending: [`Q` <requires-clause expr>]
+    ParseQRequiresClauseExpr(state);  // restores state on failure
     return true;
   }
 
   if (ParseSpecialName(state)) {
-    return true;
+    return true;  // <special-name>
   }
   return false;
 }
@@ -723,19 +840,26 @@ static bool ParseNestedName(State *state) {
 // <prefix> ::= <prefix> <unqualified-name>
 //          ::= <template-prefix> <template-args>
 //          ::= <template-param>
+//          ::= <decltype>
 //          ::= <substitution>
 //          ::= # empty
 // <template-prefix> ::= <prefix> <(template) unqualified-name>
 //                   ::= <template-param>
 //                   ::= <substitution>
+//                   ::= <vendor-extended-type>
 static bool ParsePrefix(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   bool has_something = false;
   while (true) {
     MaybeAppendSeparator(state);
-    if (ParseTemplateParam(state) ||
+    if (ParseTemplateParam(state) || ParseDecltype(state) ||
         ParseSubstitution(state, /*accept_std=*/true) ||
+        // Although the official grammar does not mention it, nested-names
+        // shaped like Nu14__some_builtinIiE6memberE occur in practice, and it
+        // is not clear what else a compiler is supposed to do when a
+        // vendor-extended type has named members.
+        ParseVendorExtendedType(state) ||
         ParseUnscopedName(state) ||
         (ParseOneCharToken(state, 'M') && ParseUnnamedTypeName(state))) {
       has_something = true;
@@ -757,8 +881,14 @@ static bool ParsePrefix(State *state) {
 //                    ::= <source-name> [<abi-tags>]
 //                    ::= <local-source-name> [<abi-tags>]
 //                    ::= <unnamed-type-name> [<abi-tags>]
+//                    ::= DC <source-name>+ E  # C++17 structured binding
+//                    ::= F <source-name>  # C++20 constrained friend
+//                    ::= F <operator-name>  # C++20 constrained friend
 //
 // <local-source-name> is a GCC extension; see below.
+//
+// For the F notation for constrained friends, see
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/24#issuecomment-1491130332.
 static bool ParseUnqualifiedName(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
@@ -767,6 +897,23 @@ static bool ParseUnqualifiedName(State *state) {
       ParseUnnamedTypeName(state)) {
     return ParseAbiTags(state);
   }
+
+  // DC <source-name>+ E
+  ParseState copy = state->parse_state;
+  if (ParseTwoCharToken(state, "DC") && OneOrMore(ParseSourceName, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // F <source-name>
+  // F <operator-name>
+  if (ParseOneCharToken(state, 'F') && MaybeAppend(state, "friend ") &&
+      (ParseSourceName(state) || ParseOperatorName(state, nullptr))) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
@@ -824,7 +971,11 @@ static bool ParseLocalSourceName(State *state) {
 // <unnamed-type-name> ::= Ut [<(nonnegative) number>] _
 //                     ::= <closure-type-name>
 // <closure-type-name> ::= Ul <lambda-sig> E [<(nonnegative) number>] _
-// <lambda-sig>        ::= <(parameter) type>+
+// <lambda-sig>        ::= <template-param-decl>* <(parameter) type>+
+//
+// For <template-param-decl>* in <lambda-sig> see:
+//
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/31
 static bool ParseUnnamedTypeName(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
@@ -847,6 +998,7 @@ static bool ParseUnnamedTypeName(State *state) {
   // Closure type.
   which = -1;
   if (ParseTwoCharToken(state, "Ul") && DisableAppend(state) &&
+      ZeroOrMore(ParseTemplateParamDecl, state) &&
       OneOrMore(ParseType, state) && RestoreAppend(state, copy.append) &&
       ParseOneCharToken(state, 'E') && Optional(ParseNumber(state, &which)) &&
       which <= std::numeric_limits<int>::max() - 2 &&  // Don't overflow.
@@ -888,6 +1040,7 @@ static bool ParseNumber(State *state, int *number_out) {
   }
   if (p != RemainingInput(state)) {  // Conversion succeeded.
     state->parse_state.mangled_idx += p - RemainingInput(state);
+    UpdateHighWaterMark(state);
     if (number_out != nullptr) {
       // Note: possibly truncate "number".
       *number_out = static_cast<int>(number);
@@ -910,6 +1063,7 @@ static bool ParseFloatNumber(State *state) {
   }
   if (p != RemainingInput(state)) {  // Conversion succeeded.
     state->parse_state.mangled_idx += p - RemainingInput(state);
+    UpdateHighWaterMark(state);
     return true;
   }
   return false;
@@ -928,6 +1082,7 @@ static bool ParseSeqId(State *state) {
   }
   if (p != RemainingInput(state)) {  // Conversion succeeded.
     state->parse_state.mangled_idx += p - RemainingInput(state);
+    UpdateHighWaterMark(state);
     return true;
   }
   return false;
@@ -946,11 +1101,13 @@ static bool ParseIdentifier(State *state, size_t length) {
     MaybeAppendWithLength(state, RemainingInput(state), length);
   }
   state->parse_state.mangled_idx += length;
+  UpdateHighWaterMark(state);
   return true;
 }
 
 // <operator-name> ::= nw, and other two letters cases
 //                 ::= cv <type>  # (cast)
+//                 ::= li <source-name>  # C++11 user-defined literal
 //                 ::= v  <digit> <source-name> # vendor extended operator
 static bool ParseOperatorName(State *state, int *arity) {
   ComplexityGuard guard(state);
@@ -961,7 +1118,7 @@ static bool ParseOperatorName(State *state, int *arity) {
   // First check with "cv" (cast) case.
   ParseState copy = state->parse_state;
   if (ParseTwoCharToken(state, "cv") && MaybeAppend(state, "operator ") &&
-      EnterNestedName(state) && ParseType(state) &&
+      EnterNestedName(state) && ParseConversionOperatorType(state) &&
       LeaveNestedName(state, copy.nest_level)) {
     if (arity != nullptr) {
       *arity = 1;
@@ -970,6 +1127,13 @@ static bool ParseOperatorName(State *state, int *arity) {
   }
   state->parse_state = copy;
 
+  // Then user-defined literals.
+  if (ParseTwoCharToken(state, "li") && MaybeAppend(state, "operator\"\" ") &&
+      ParseSourceName(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   // Then vendor extended operators.
   if (ParseOneCharToken(state, 'v') && ParseDigit(state, arity) &&
       ParseSourceName(state)) {
@@ -997,36 +1161,120 @@ static bool ParseOperatorName(State *state, int *arity) {
       }
       MaybeAppend(state, p->real_name);
       state->parse_state.mangled_idx += 2;
+      UpdateHighWaterMark(state);
       return true;
     }
   }
   return false;
 }
 
+// <operator-name> ::= cv <type>  # (cast)
+//
+// The name of a conversion operator is the one place where cv-qualifiers, *, &,
+// and other simple type combinators are expected to appear in our stripped-down
+// demangling (elsewhere they appear in function signatures or template
+// arguments, which we omit from the output).  We make reasonable efforts to
+// render simple cases accurately.
+static bool ParseConversionOperatorType(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  // Scan pointers, const, and other easy mangling prefixes with postfix
+  // demanglings.  Remember the range of input for later rescanning.
+  //
+  // See `ParseType` and the `switch` below for the meaning of each char.
+  const char* begin_simple_prefixes = RemainingInput(state);
+  while (ParseCharClass(state, "OPRCGrVK")) {}
+  const char* end_simple_prefixes = RemainingInput(state);
+
+  // Emit the base type first.
+  if (!ParseType(state)) {
+    state->parse_state = copy;
+    return false;
+  }
+
+  // Then rescan the easy type combinators in reverse order to emit their
+  // demanglings in the expected output order.
+  while (begin_simple_prefixes != end_simple_prefixes) {
+    switch (*--end_simple_prefixes) {
+      case 'P':
+        MaybeAppend(state, "*");
+        break;
+      case 'R':
+        MaybeAppend(state, "&");
+        break;
+      case 'O':
+        MaybeAppend(state, "&&");
+        break;
+      case 'C':
+        MaybeAppend(state, " _Complex");
+        break;
+      case 'G':
+        MaybeAppend(state, " _Imaginary");
+        break;
+      case 'r':
+        MaybeAppend(state, " restrict");
+        break;
+      case 'V':
+        MaybeAppend(state, " volatile");
+        break;
+      case 'K':
+        MaybeAppend(state, " const");
+        break;
+    }
+  }
+  return true;
+}
+
 // <special-name> ::= TV <type>
 //                ::= TT <type>
 //                ::= TI <type>
 //                ::= TS <type>
-//                ::= TH <type>  # thread-local
+//                ::= TW <name>  # thread-local wrapper
+//                ::= TH <name>  # thread-local initialization
 //                ::= Tc <call-offset> <call-offset> <(base) encoding>
 //                ::= GV <(object) name>
+//                ::= GR <(object) name> [<seq-id>] _
 //                ::= T <call-offset> <(base) encoding>
+//                ::= GTt <encoding>  # transaction-safe entry point
+//                ::= TA <template-arg>  # nontype template parameter object
 // G++ extensions:
 //                ::= TC <type> <(offset) number> _ <(base) type>
 //                ::= TF <type>
 //                ::= TJ <type>
-//                ::= GR <name>
+//                ::= GR <name>  # without final _, perhaps an earlier form?
 //                ::= GA <encoding>
 //                ::= Th <call-offset> <(base) encoding>
 //                ::= Tv <call-offset> <(base) encoding>
 //
-// Note: we don't care much about them since they don't appear in
-// stack traces.  The are special data.
+// Note: Most of these are special data, not functions that occur in stack
+// traces.  Exceptions are TW and TH, which denote functions supporting the
+// thread_local feature.  For these see:
+//
+// https://maskray.me/blog/2021-02-14-all-about-thread-local-storage
+//
+// For TA see https://github.com/itanium-cxx-abi/cxx-abi/issues/63.
 static bool ParseSpecialName(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
-  if (ParseOneCharToken(state, 'T') && ParseCharClass(state, "VTISH") &&
+
+  if (ParseTwoCharToken(state, "TW")) {
+    MaybeAppend(state, "thread-local wrapper routine for ");
+    if (ParseName(state)) return true;
+    state->parse_state = copy;
+    return false;
+  }
+
+  if (ParseTwoCharToken(state, "TH")) {
+    MaybeAppend(state, "thread-local initialization routine for ");
+    if (ParseName(state)) return true;
+    state->parse_state = copy;
+    return false;
+  }
+
+  if (ParseOneCharToken(state, 'T') && ParseCharClass(state, "VTIS") &&
       ParseType(state)) {
     return true;
   }
@@ -1064,21 +1312,51 @@ static bool ParseSpecialName(State *state) {
   }
   state->parse_state = copy;
 
-  if (ParseTwoCharToken(state, "GR") && ParseName(state)) {
+  // <special-name> ::= GR <(object) name> [<seq-id>] _  # modern standard
+  //                ::= GR <(object) name>  # also recognized
+  if (ParseTwoCharToken(state, "GR")) {
+    MaybeAppend(state, "reference temporary for ");
+    if (!ParseName(state)) {
+      state->parse_state = copy;
+      return false;
+    }
+    const bool has_seq_id = ParseSeqId(state);
+    const bool has_underscore = ParseOneCharToken(state, '_');
+    if (has_seq_id && !has_underscore) {
+      state->parse_state = copy;
+      return false;
+    }
     return true;
   }
-  state->parse_state = copy;
 
   if (ParseTwoCharToken(state, "GA") && ParseEncoding(state)) {
     return true;
   }
   state->parse_state = copy;
 
+  if (ParseThreeCharToken(state, "GTt") &&
+      MaybeAppend(state, "transaction clone for ") && ParseEncoding(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   if (ParseOneCharToken(state, 'T') && ParseCharClass(state, "hv") &&
       ParseCallOffset(state) && ParseEncoding(state)) {
     return true;
   }
   state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "TA")) {
+    bool append = state->parse_state.append;
+    DisableAppend(state);
+    if (ParseTemplateArg(state)) {
+      RestoreAppend(state, append);
+      MaybeAppend(state, "template parameter object");
+      return true;
+    }
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
@@ -1182,7 +1460,6 @@ static bool ParseDecltype(State *state) {
 //        ::= O <type>   # rvalue reference-to (C++0x)
 //        ::= C <type>   # complex pair (C 2000)
 //        ::= G <type>   # imaginary (C 2000)
-//        ::= U <source-name> <type>  # vendor extended type qualifier
 //        ::= <builtin-type>
 //        ::= <function-type>
 //        ::= <class-enum-type>  # note: just an alias for <name>
@@ -1193,7 +1470,9 @@ static bool ParseDecltype(State *state) {
 //        ::= <decltype>
 //        ::= <substitution>
 //        ::= Dp <type>          # pack expansion of (C++0x)
-//        ::= Dv <num-elems> _   # GNU vector extension
+//        ::= Dv <(elements) number> _ <type>  # GNU vector extension
+//        ::= Dv <(bytes) expression> _ <type>
+//        ::= Dk <type-constraint>  # constrained auto
 //
 static bool ParseType(State *state) {
   ComplexityGuard guard(state);
@@ -1236,12 +1515,6 @@ static bool ParseType(State *state) {
   }
   state->parse_state = copy;
 
-  if (ParseOneCharToken(state, 'U') && ParseSourceName(state) &&
-      ParseType(state)) {
-    return true;
-  }
-  state->parse_state = copy;
-
   if (ParseBuiltinType(state) || ParseFunctionType(state) ||
       ParseClassEnumType(state) || ParseArrayType(state) ||
       ParsePointerToMemberType(state) || ParseDecltype(state) ||
@@ -1260,54 +1533,160 @@ static bool ParseType(State *state) {
     return true;
   }
 
+  // GNU vector extension Dv <number> _ <type>
   if (ParseTwoCharToken(state, "Dv") && ParseNumber(state, nullptr) &&
-      ParseOneCharToken(state, '_')) {
+      ParseOneCharToken(state, '_') && ParseType(state)) {
     return true;
   }
   state->parse_state = copy;
 
-  return false;
+  // GNU vector extension Dv <expression> _ <type>
+  if (ParseTwoCharToken(state, "Dv") && ParseExpression(state) &&
+      ParseOneCharToken(state, '_') && ParseType(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Dk") && ParseTypeConstraint(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // For this notation see CXXNameMangler::mangleType in Clang's source code.
+  // The relevant logic and its comment "not clear how to mangle this!" date
+  // from 2011, so it may be with us awhile.
+  return ParseLongToken(state, "_SUBSTPACK_");
 }
 
+// <qualifiers> ::= <extended-qualifier>* <CV-qualifiers>
 // <CV-qualifiers> ::= [r] [V] [K]
+//
 // We don't allow empty <CV-qualifiers> to avoid infinite loop in
 // ParseType().
 static bool ParseCVQualifiers(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   int num_cv_qualifiers = 0;
+  while (ParseExtendedQualifier(state)) ++num_cv_qualifiers;
   num_cv_qualifiers += ParseOneCharToken(state, 'r');
   num_cv_qualifiers += ParseOneCharToken(state, 'V');
   num_cv_qualifiers += ParseOneCharToken(state, 'K');
   return num_cv_qualifiers > 0;
 }
 
+// <extended-qualifier> ::= U <source-name> [<template-args>]
+static bool ParseExtendedQualifier(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  if (!ParseOneCharToken(state, 'U')) return false;
+
+  bool append = state->parse_state.append;
+  DisableAppend(state);
+  if (!ParseSourceName(state)) {
+    state->parse_state = copy;
+    return false;
+  }
+  Optional(ParseTemplateArgs(state));
+  RestoreAppend(state, append);
+  return true;
+}
+
 // <builtin-type> ::= v, etc.  # single-character builtin types
-//                ::= u <source-name>
+//                ::= <vendor-extended-type>
 //                ::= Dd, etc.  # two-character builtin types
+//                ::= DB (<number> | <expression>) _  # _BitInt(N)
+//                ::= DU (<number> | <expression>) _  # unsigned _BitInt(N)
+//                ::= DF <number> _  # _FloatN (N bits)
+//                ::= DF <number> x  # _FloatNx
+//                ::= DF16b  # std::bfloat16_t
 //
 // Not supported:
-//                ::= DF <number> _ # _FloatN (N bits)
-//
+//                ::= [DS] DA <fixed-point-size>
+//                ::= [DS] DR <fixed-point-size>
+// because real implementations of N1169 fixed-point are scant.
 static bool ParseBuiltinType(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
-  const AbbrevPair *p;
-  for (p = kBuiltinTypeList; p->abbrev != nullptr; ++p) {
+  ParseState copy = state->parse_state;
+
+  // DB (<number> | <expression>) _  # _BitInt(N)
+  // DU (<number> | <expression>) _  # unsigned _BitInt(N)
+  if (ParseTwoCharToken(state, "DB") ||
+      (ParseTwoCharToken(state, "DU") && MaybeAppend(state, "unsigned "))) {
+    bool append = state->parse_state.append;
+    DisableAppend(state);
+    int number = -1;
+    if (!ParseNumber(state, &number) && !ParseExpression(state)) {
+      state->parse_state = copy;
+      return false;
+    }
+    RestoreAppend(state, append);
+
+    if (!ParseOneCharToken(state, '_')) {
+      state->parse_state = copy;
+      return false;
+    }
+
+    MaybeAppend(state, "_BitInt(");
+    if (number >= 0) {
+      MaybeAppendDecimal(state, number);
+    } else {
+      MaybeAppend(state, "?");  // the best we can do for dependent sizes
+    }
+    MaybeAppend(state, ")");
+    return true;
+  }
+
+  // DF <number> _  # _FloatN
+  // DF <number> x  # _FloatNx
+  // DF16b  # std::bfloat16_t
+  if (ParseTwoCharToken(state, "DF")) {
+    if (ParseThreeCharToken(state, "16b")) {
+      MaybeAppend(state, "std::bfloat16_t");
+      return true;
+    }
+    int number = 0;
+    if (!ParseNumber(state, &number)) {
+      state->parse_state = copy;
+      return false;
+    }
+    MaybeAppend(state, "_Float");
+    MaybeAppendDecimal(state, number);
+    if (ParseOneCharToken(state, 'x')) {
+      MaybeAppend(state, "x");
+      return true;
+    }
+    if (ParseOneCharToken(state, '_')) return true;
+    state->parse_state = copy;
+    return false;
+  }
+
+  for (const AbbrevPair *p = kBuiltinTypeList; p->abbrev != nullptr; ++p) {
     // Guaranteed only 1- or 2-character strings in kBuiltinTypeList.
     if (p->abbrev[1] == '\0') {
       if (ParseOneCharToken(state, p->abbrev[0])) {
         MaybeAppend(state, p->real_name);
-        return true;
+        return true;  // ::= v, etc.  # single-character builtin types
       }
     } else if (p->abbrev[2] == '\0' && ParseTwoCharToken(state, p->abbrev)) {
       MaybeAppend(state, p->real_name);
-      return true;
+      return true;  // ::= Dd, etc.  # two-character builtin types
     }
   }
 
+  return ParseVendorExtendedType(state);
+}
+
+// <vendor-extended-type> ::= u <source-name> [<template-args>]
+static bool ParseVendorExtendedType(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
   ParseState copy = state->parse_state;
-  if (ParseOneCharToken(state, 'u') && ParseSourceName(state)) {
+  if (ParseOneCharToken(state, 'u') && ParseSourceName(state) &&
+      Optional(ParseTemplateArgs(state))) {
     return true;
   }
   state->parse_state = copy;
@@ -1342,28 +1721,44 @@ static bool ParseExceptionSpec(State *state) {
   return false;
 }
 
-// <function-type> ::= [exception-spec] F [Y] <bare-function-type> [O] E
+// <function-type> ::=
+//     [exception-spec] [Dx] F [Y] <bare-function-type> [<ref-qualifier>] E
+//
+// <ref-qualifier> ::= R | O
 static bool ParseFunctionType(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
-  if (Optional(ParseExceptionSpec(state)) && ParseOneCharToken(state, 'F') &&
-      Optional(ParseOneCharToken(state, 'Y')) && ParseBareFunctionType(state) &&
-      Optional(ParseOneCharToken(state, 'O')) &&
-      ParseOneCharToken(state, 'E')) {
-    return true;
+  Optional(ParseExceptionSpec(state));
+  Optional(ParseTwoCharToken(state, "Dx"));
+  if (!ParseOneCharToken(state, 'F')) {
+    state->parse_state = copy;
+    return false;
   }
-  state->parse_state = copy;
-  return false;
+  Optional(ParseOneCharToken(state, 'Y'));
+  if (!ParseBareFunctionType(state)) {
+    state->parse_state = copy;
+    return false;
+  }
+  Optional(ParseCharClass(state, "RO"));
+  if (!ParseOneCharToken(state, 'E')) {
+    state->parse_state = copy;
+    return false;
+  }
+  return true;
 }
 
-// <bare-function-type> ::= <(signature) type>+
+// <bare-function-type> ::= <overload-attribute>* <(signature) type>+
+//
+// The <overload-attribute>* prefix is nonstandard; see the comment on
+// ParseOverloadAttribute.
 static bool ParseBareFunctionType(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
   DisableAppend(state);
-  if (OneOrMore(ParseType, state)) {
+  if (ZeroOrMore(ParseOverloadAttribute, state) &&
+      OneOrMore(ParseType, state)) {
     RestoreAppend(state, copy.append);
     MaybeAppend(state, "()");
     return true;
@@ -1372,11 +1767,43 @@ static bool ParseBareFunctionType(State *state) {
   return false;
 }
 
+// <overload-attribute> ::= Ua <name>
+//
+// The nonstandard <overload-attribute> production is sufficient to accept the
+// current implementation of __attribute__((enable_if(condition, "message")))
+// and future attributes of a similar shape.  See
+// https://clang.llvm.org/docs/AttributeReference.html#enable-if and the
+// definition of CXXNameMangler::mangleFunctionEncodingBareType in Clang's
+// source code.
+static bool ParseOverloadAttribute(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+  if (ParseTwoCharToken(state, "Ua") && ParseName(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+  return false;
+}
+
 // <class-enum-type> ::= <name>
+//                   ::= Ts <name>  # struct Name or class Name
+//                   ::= Tu <name>  # union Name
+//                   ::= Te <name>  # enum Name
+//
+// See http://shortn/_W3YrltiEd0.
 static bool ParseClassEnumType(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
-  return ParseName(state);
+  ParseState copy = state->parse_state;
+  if (Optional(ParseTwoCharToken(state, "Ts") ||
+               ParseTwoCharToken(state, "Tu") ||
+               ParseTwoCharToken(state, "Te")) &&
+      ParseName(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+  return false;
 }
 
 // <array-type> ::= A <(positive dimension) number> _ <(element) type>
@@ -1413,21 +1840,83 @@ static bool ParsePointerToMemberType(State *state) {
 
 // <template-param> ::= T_
 //                  ::= T <parameter-2 non-negative number> _
+//                  ::= TL <level-1> __
+//                  ::= TL <level-1> _ <parameter-2 non-negative number> _
 static bool ParseTemplateParam(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   if (ParseTwoCharToken(state, "T_")) {
     MaybeAppend(state, "?");  // We don't support template substitutions.
-    return true;
+    return true;              // ::= T_
   }
 
   ParseState copy = state->parse_state;
   if (ParseOneCharToken(state, 'T') && ParseNumber(state, nullptr) &&
       ParseOneCharToken(state, '_')) {
     MaybeAppend(state, "?");  // We don't support template substitutions.
+    return true;              // ::= T <parameter-2 non-negative number> _
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "TL") && ParseNumber(state, nullptr)) {
+    if (ParseTwoCharToken(state, "__")) {
+      MaybeAppend(state, "?");  // We don't support template substitutions.
+      return true;              // ::= TL <level-1> __
+    }
+
+    if (ParseOneCharToken(state, '_') && ParseNumber(state, nullptr) &&
+        ParseOneCharToken(state, '_')) {
+      MaybeAppend(state, "?");  // We don't support template substitutions.
+      return true;  // ::= TL <level-1> _ <parameter-2 non-negative number> _
+    }
+  }
+  state->parse_state = copy;
+  return false;
+}
+
+// <template-param-decl>
+//   ::= Ty                                  # template type parameter
+//   ::= Tk <concept name> [<template-args>] # constrained type parameter
+//   ::= Tn <type>                           # template non-type parameter
+//   ::= Tt <template-param-decl>* E         # template template parameter
+//   ::= Tp <template-param-decl>            # template parameter pack
+//
+// NOTE: <concept name> is just a <name>: http://shortn/_MqJVyr0fc1
+// TODO(b/324066279): Implement optional suffix for `Tt`:
+// [Q <requires-clause expr>]
+static bool ParseTemplateParamDecl(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  if (ParseTwoCharToken(state, "Ty")) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Tk") && ParseName(state) &&
+      Optional(ParseTemplateArgs(state))) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Tn") && ParseType(state)) {
     return true;
   }
   state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Tt") &&
+      ZeroOrMore(ParseTemplateParamDecl, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "Tp") && ParseTemplateParamDecl(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
@@ -1441,13 +1930,14 @@ static bool ParseTemplateTemplateParam(State *state) {
           ParseSubstitution(state, /*accept_std=*/false));
 }
 
-// <template-args> ::= I <template-arg>+ E
+// <template-args> ::= I <template-arg>+ [Q <requires-clause expr>] E
 static bool ParseTemplateArgs(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
   DisableAppend(state);
   if (ParseOneCharToken(state, 'I') && OneOrMore(ParseTemplateArg, state) &&
+      Optional(ParseQRequiresClauseExpr(state)) &&
       ParseOneCharToken(state, 'E')) {
     RestoreAppend(state, copy.append);
     MaybeAppend(state, "<>");
@@ -1457,7 +1947,8 @@ static bool ParseTemplateArgs(State *state) {
   return false;
 }
 
-// <template-arg>  ::= <type>
+// <template-arg>  ::= <template-param-decl> <template-arg>
+//                 ::= <type>
 //                 ::= <expr-primary>
 //                 ::= J <template-arg>* E        # argument pack
 //                 ::= X <expression> E
@@ -1541,7 +2032,7 @@ static bool ParseTemplateArg(State *state) {
   //     ::= L <source-name> [<template-args>] [<expr-cast-value> E]
   if (ParseLocalSourceName(state) && Optional(ParseTemplateArgs(state))) {
     copy = state->parse_state;
-    if (ParseExprCastValue(state) && ParseOneCharToken(state, 'E')) {
+    if (ParseExprCastValueAndTrailingE(state)) {
       return true;
     }
     state->parse_state = copy;
@@ -1560,6 +2051,12 @@ static bool ParseTemplateArg(State *state) {
     return true;
   }
   state->parse_state = copy;
+
+  if (ParseTemplateParamDecl(state) && ParseTemplateArg(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
@@ -1614,6 +2111,13 @@ static bool ParseBaseUnresolvedName(State *state) {
 //                         <base-unresolved-name>
 //                   ::= [gs] sr <unresolved-qualifier-level>+ E
 //                         <base-unresolved-name>
+//                   ::= sr St <simple-id> <simple-id>  # nonstandard
+//
+// The last case is not part of the official grammar but has been observed in
+// real-world examples that the GNU demangler (but not the LLVM demangler) is
+// able to decode; see demangle_test.cc for one such symbol name.  The shape
+// sr St <simple-id> <simple-id> was inferred by closed-box testing of the GNU
+// demangler.
 static bool ParseUnresolvedName(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
@@ -1633,7 +2137,7 @@ static bool ParseUnresolvedName(State *state) {
 
   if (ParseTwoCharToken(state, "sr") && ParseOneCharToken(state, 'N') &&
       ParseUnresolvedType(state) &&
-      OneOrMore(/* <unresolved-qualifier-level> ::= */ ParseSimpleId, state) &&
+      OneOrMore(ParseUnresolvedQualifierLevel, state) &&
       ParseOneCharToken(state, 'E') && ParseBaseUnresolvedName(state)) {
     return true;
   }
@@ -1641,35 +2145,160 @@ static bool ParseUnresolvedName(State *state) {
 
   if (Optional(ParseTwoCharToken(state, "gs")) &&
       ParseTwoCharToken(state, "sr") &&
-      OneOrMore(/* <unresolved-qualifier-level> ::= */ ParseSimpleId, state) &&
+      OneOrMore(ParseUnresolvedQualifierLevel, state) &&
       ParseOneCharToken(state, 'E') && ParseBaseUnresolvedName(state)) {
     return true;
   }
   state->parse_state = copy;
 
+  if (ParseTwoCharToken(state, "sr") && ParseTwoCharToken(state, "St") &&
+      ParseSimpleId(state) && ParseSimpleId(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return false;
 }
 
+// <unresolved-qualifier-level> ::= <simple-id>
+//                              ::= <substitution> <template-args>
+//
+// The production <substitution> <template-args> is nonstandard but is observed
+// in practice.  An upstream discussion on the best shape of <unresolved-name>
+// has not converged:
+//
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/38
+static bool ParseUnresolvedQualifierLevel(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
+  if (ParseSimpleId(state)) return true;
+
+  ParseState copy = state->parse_state;
+  if (ParseSubstitution(state, /*accept_std=*/false) &&
+      ParseTemplateArgs(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+  return false;
+}
+
+// <union-selector> ::= _ [<number>]
+//
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/47
+static bool ParseUnionSelector(State *state) {
+  return ParseOneCharToken(state, '_') && Optional(ParseNumber(state, nullptr));
+}
+
+// <function-param> ::= fp <(top-level) CV-qualifiers> _
+//                  ::= fp <(top-level) CV-qualifiers> <number> _
+//                  ::= fL <number> p <(top-level) CV-qualifiers> _
+//                  ::= fL <number> p <(top-level) CV-qualifiers> <number> _
+//                  ::= fpT  # this
+static bool ParseFunctionParam(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
+  ParseState copy = state->parse_state;
+
+  // Function-param expression (level 0).
+  if (ParseTwoCharToken(state, "fp") && Optional(ParseCVQualifiers(state)) &&
+      Optional(ParseNumber(state, nullptr)) && ParseOneCharToken(state, '_')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // Function-param expression (level 1+).
+  if (ParseTwoCharToken(state, "fL") && Optional(ParseNumber(state, nullptr)) &&
+      ParseOneCharToken(state, 'p') && Optional(ParseCVQualifiers(state)) &&
+      Optional(ParseNumber(state, nullptr)) && ParseOneCharToken(state, '_')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  return ParseThreeCharToken(state, "fpT");
+}
+
+// <braced-expression> ::= <expression>
+//                     ::= di <field source-name> <braced-expression>
+//                     ::= dx <index expression> <braced-expression>
+//                     ::= dX <expression> <expression> <braced-expression>
+static bool ParseBracedExpression(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
+  ParseState copy = state->parse_state;
+
+  if (ParseTwoCharToken(state, "di") && ParseSourceName(state) &&
+      ParseBracedExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "dx") && ParseExpression(state) &&
+      ParseBracedExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "dX") &&
+      ParseExpression(state) && ParseExpression(state) &&
+      ParseBracedExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  return ParseExpression(state);
+}
+
 // <expression> ::= <1-ary operator-name> <expression>
 //              ::= <2-ary operator-name> <expression> <expression>
 //              ::= <3-ary operator-name> <expression> <expression> <expression>
+//              ::= pp_ <expression>  # ++e; pp <expression> is e++
+//              ::= mm_ <expression>  # --e; mm <expression> is e--
 //              ::= cl <expression>+ E
 //              ::= cp <simple-id> <expression>* E # Clang-specific.
+//              ::= so <type> <expression> [<number>] <union-selector>* [p] E
 //              ::= cv <type> <expression>      # type (expression)
 //              ::= cv <type> _ <expression>* E # type (expr-list)
+//              ::= tl <type> <braced-expression>* E
+//              ::= il <braced-expression>* E
+//              ::= [gs] nw <expression>* _ <type> E
+//              ::= [gs] nw <expression>* _ <type> <initializer>
+//              ::= [gs] na <expression>* _ <type> E
+//              ::= [gs] na <expression>* _ <type> <initializer>
+//              ::= [gs] dl <expression>
+//              ::= [gs] da <expression>
+//              ::= dc <type> <expression>
+//              ::= sc <type> <expression>
+//              ::= cc <type> <expression>
+//              ::= rc <type> <expression>
+//              ::= ti <type>
+//              ::= te <expression>
 //              ::= st <type>
+//              ::= at <type>
+//              ::= az <expression>
+//              ::= nx <expression>
 //              ::= <template-param>
 //              ::= <function-param>
+//              ::= sZ <template-param>
+//              ::= sZ <function-param>
+//              ::= sP <template-arg>* E
 //              ::= <expr-primary>
 //              ::= dt <expression> <unresolved-name> # expr.name
 //              ::= pt <expression> <unresolved-name> # expr->name
 //              ::= sp <expression>         # argument pack expansion
+//              ::= fl <binary operator-name> <expression>
+//              ::= fr <binary operator-name> <expression>
+//              ::= fL <binary operator-name> <expression> <expression>
+//              ::= fR <binary operator-name> <expression> <expression>
+//              ::= tw <expression>
+//              ::= tr
 //              ::= sr <type> <unqualified-name> <template-args>
 //              ::= sr <type> <unqualified-name>
-// <function-param> ::= fp <(top-level) CV-qualifiers> _
-//                  ::= fp <(top-level) CV-qualifiers> <number> _
-//                  ::= fL <number> p <(top-level) CV-qualifiers> _
-//                  ::= fL <number> p <(top-level) CV-qualifiers> <number> _
+//              ::= u <source-name> <template-arg>* E  # vendor extension
+//              ::= rq <requirement>+ E
+//              ::= rQ <bare-function-type> _ <requirement>+ E
 static bool ParseExpression(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
@@ -1686,6 +2315,15 @@ static bool ParseExpression(State *state) {
   }
   state->parse_state = copy;
 
+  // Preincrement and predecrement.  Postincrement and postdecrement are handled
+  // by the operator-name logic later on.
+  if ((ParseThreeCharToken(state, "pp_") ||
+       ParseThreeCharToken(state, "mm_")) &&
+      ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   // Clang-specific "cp <simple-id> <expression>* E"
   //   https://clang.llvm.org/doxygen/ItaniumMangle_8cpp_source.html#l04338
   if (ParseTwoCharToken(state, "cp") && ParseSimpleId(state) &&
@@ -1694,17 +2332,65 @@ static bool ParseExpression(State *state) {
   }
   state->parse_state = copy;
 
-  // Function-param expression (level 0).
-  if (ParseTwoCharToken(state, "fp") && Optional(ParseCVQualifiers(state)) &&
-      Optional(ParseNumber(state, nullptr)) && ParseOneCharToken(state, '_')) {
+  // <expression> ::= so <type> <expression> [<number>] <union-selector>* [p] E
+  //
+  // https://github.com/itanium-cxx-abi/cxx-abi/issues/47
+  if (ParseTwoCharToken(state, "so") && ParseType(state) &&
+      ParseExpression(state) && Optional(ParseNumber(state, nullptr)) &&
+      ZeroOrMore(ParseUnionSelector, state) &&
+      Optional(ParseOneCharToken(state, 'p')) &&
+      ParseOneCharToken(state, 'E')) {
     return true;
   }
   state->parse_state = copy;
 
-  // Function-param expression (level 1+).
-  if (ParseTwoCharToken(state, "fL") && Optional(ParseNumber(state, nullptr)) &&
-      ParseOneCharToken(state, 'p') && Optional(ParseCVQualifiers(state)) &&
-      Optional(ParseNumber(state, nullptr)) && ParseOneCharToken(state, '_')) {
+  // <expression> ::= <function-param>
+  if (ParseFunctionParam(state)) return true;
+  state->parse_state = copy;
+
+  // <expression> ::= tl <type> <braced-expression>* E
+  if (ParseTwoCharToken(state, "tl") && ParseType(state) &&
+      ZeroOrMore(ParseBracedExpression, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= il <braced-expression>* E
+  if (ParseTwoCharToken(state, "il") &&
+      ZeroOrMore(ParseBracedExpression, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= [gs] nw <expression>* _ <type> E
+  //              ::= [gs] nw <expression>* _ <type> <initializer>
+  //              ::= [gs] na <expression>* _ <type> E
+  //              ::= [gs] na <expression>* _ <type> <initializer>
+  if (Optional(ParseTwoCharToken(state, "gs")) &&
+      (ParseTwoCharToken(state, "nw") || ParseTwoCharToken(state, "na")) &&
+      ZeroOrMore(ParseExpression, state) && ParseOneCharToken(state, '_') &&
+      ParseType(state) &&
+      (ParseOneCharToken(state, 'E') || ParseInitializer(state))) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= [gs] dl <expression>
+  //              ::= [gs] da <expression>
+  if (Optional(ParseTwoCharToken(state, "gs")) &&
+      (ParseTwoCharToken(state, "dl") || ParseTwoCharToken(state, "da")) &&
+      ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // dynamic_cast, static_cast, const_cast, reinterpret_cast.
+  //
+  // <expression> ::= (dc | sc | cc | rc) <type> <expression>
+  if (ParseCharClass(state, "dscr") && ParseOneCharToken(state, 'c') &&
+      ParseType(state) && ParseExpression(state)) {
     return true;
   }
   state->parse_state = copy;
@@ -1746,15 +2432,96 @@ static bool ParseExpression(State *state) {
   }
   state->parse_state = copy;
 
+  // typeid(type)
+  if (ParseTwoCharToken(state, "ti") && ParseType(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // typeid(expression)
+  if (ParseTwoCharToken(state, "te") && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
   // sizeof type
   if (ParseTwoCharToken(state, "st") && ParseType(state)) {
     return true;
   }
   state->parse_state = copy;
 
+  // alignof(type)
+  if (ParseTwoCharToken(state, "at") && ParseType(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // alignof(expression), a GNU extension
+  if (ParseTwoCharToken(state, "az") && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // noexcept(expression) appearing as an expression in a dependent signature
+  if (ParseTwoCharToken(state, "nx") && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // sizeof...(pack)
+  //
+  // <expression> ::= sZ <template-param>
+  //              ::= sZ <function-param>
+  if (ParseTwoCharToken(state, "sZ") &&
+      (ParseFunctionParam(state) || ParseTemplateParam(state))) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // sizeof...(pack) captured from an alias template
+  //
+  // <expression> ::= sP <template-arg>* E
+  if (ParseTwoCharToken(state, "sP") && ZeroOrMore(ParseTemplateArg, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // Unary folds (... op pack) and (pack op ...).
+  //
+  // <expression> ::= fl <binary operator-name> <expression>
+  //              ::= fr <binary operator-name> <expression>
+  if ((ParseTwoCharToken(state, "fl") || ParseTwoCharToken(state, "fr")) &&
+      ParseOperatorName(state, nullptr) && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // Binary folds (init op ... op pack) and (pack op ... op init).
+  //
+  // <expression> ::= fL <binary operator-name> <expression> <expression>
+  //              ::= fR <binary operator-name> <expression> <expression>
+  if ((ParseTwoCharToken(state, "fL") || ParseTwoCharToken(state, "fR")) &&
+      ParseOperatorName(state, nullptr) && ParseExpression(state) &&
+      ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // tw <expression>: throw e
+  if (ParseTwoCharToken(state, "tw") && ParseExpression(state)) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // tr: throw (rethrows an exception from the handler that caught it)
+  if (ParseTwoCharToken(state, "tr")) return true;
+
   // Object and pointer member access expressions.
+  //
+  // <expression> ::= (dt | pt) <expression> <unresolved-name>
   if ((ParseTwoCharToken(state, "dt") || ParseTwoCharToken(state, "pt")) &&
-      ParseExpression(state) && ParseType(state)) {
+      ParseExpression(state) && ParseUnresolvedName(state)) {
     return true;
   }
   state->parse_state = copy;
@@ -1774,9 +2541,61 @@ static bool ParseExpression(State *state) {
   }
   state->parse_state = copy;
 
+  // Vendor extended expressions
+  if (ParseOneCharToken(state, 'u') && ParseSourceName(state) &&
+      ZeroOrMore(ParseTemplateArg, state) && ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= rq <requirement>+ E
+  //
+  // https://github.com/itanium-cxx-abi/cxx-abi/issues/24
+  if (ParseTwoCharToken(state, "rq") && OneOrMore(ParseRequirement, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  // <expression> ::= rQ <bare-function-type> _ <requirement>+ E
+  //
+  // https://github.com/itanium-cxx-abi/cxx-abi/issues/24
+  if (ParseTwoCharToken(state, "rQ") && ParseBareFunctionType(state) &&
+      ParseOneCharToken(state, '_') && OneOrMore(ParseRequirement, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
   return ParseUnresolvedName(state);
 }
 
+// <initializer> ::= pi <expression>* E
+//               ::= il <braced-expression>* E
+//
+// The il ... E form is not in the ABI spec but is seen in practice for
+// braced-init-lists in new-expressions, which are standard syntax from C++11
+// on.
+static bool ParseInitializer(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  if (ParseTwoCharToken(state, "pi") && ZeroOrMore(ParseExpression, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+
+  if (ParseTwoCharToken(state, "il") &&
+      ZeroOrMore(ParseBracedExpression, state) &&
+      ParseOneCharToken(state, 'E')) {
+    return true;
+  }
+  state->parse_state = copy;
+  return false;
+}
+
 // <expr-primary> ::= L <type> <(value) number> E
 //                ::= L <type> <(value) float> E
 //                ::= L <mangled-name> E
@@ -1819,10 +2638,35 @@ static bool ParseExprPrimary(State *state) {
     return false;
   }
 
-  // The merged cast production.
-  if (ParseOneCharToken(state, 'L') && ParseType(state) &&
-      ParseExprCastValue(state)) {
-    return true;
+  if (ParseOneCharToken(state, 'L')) {
+    // There are two special cases in which a literal may or must contain a type
+    // without a value.  The first is that both LDnE and LDn0E are valid
+    // encodings of nullptr, used in different situations.  Recognize LDnE here,
+    // leaving LDn0E to be recognized by the general logic afterward.
+    if (ParseThreeCharToken(state, "DnE")) return true;
+
+    // The second special case is a string literal, currently mangled in C++98
+    // style as LA<length + 1>_KcE.  This is inadequate to support C++11 and
+    // later versions, and the discussion of this problem has not converged.
+    //
+    // https://github.com/itanium-cxx-abi/cxx-abi/issues/64
+    //
+    // For now the bare-type mangling is what's used in practice, so we
+    // recognize this form and only this form if an array type appears here.
+    // Someday we'll probably have to accept a new form of value mangling in
+    // LA...E constructs.  (Note also that C++20 allows a wide range of
+    // class-type objects as template arguments, so someday their values will be
+    // mangled and we'll have to recognize them here too.)
+    if (RemainingInput(state)[0] == 'A' /* an array type follows */) {
+      if (ParseType(state) && ParseOneCharToken(state, 'E')) return true;
+      state->parse_state = copy;
+      return false;
+    }
+
+    // The merged cast production.
+    if (ParseType(state) && ParseExprCastValueAndTrailingE(state)) {
+      return true;
+    }
   }
   state->parse_state = copy;
 
@@ -1836,7 +2680,7 @@ static bool ParseExprPrimary(State *state) {
 }
 
 // <number> or <float>, followed by 'E', as described above ParseExprPrimary.
-static bool ParseExprCastValue(State *state) {
+static bool ParseExprCastValueAndTrailingE(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   // We have to be able to backtrack after accepting a number because we could
@@ -1848,39 +2692,148 @@ static bool ParseExprCastValue(State *state) {
   }
   state->parse_state = copy;
 
-  if (ParseFloatNumber(state) && ParseOneCharToken(state, 'E')) {
+  if (ParseFloatNumber(state)) {
+    // <float> for ordinary floating-point types
+    if (ParseOneCharToken(state, 'E')) return true;
+
+    // <float> _ <float> for complex floating-point types
+    if (ParseOneCharToken(state, '_') && ParseFloatNumber(state) &&
+        ParseOneCharToken(state, 'E')) {
+      return true;
+    }
+  }
+  state->parse_state = copy;
+
+  return false;
+}
+
+// Parses `Q <requires-clause expr>`.
+// If parsing fails, applies backtracking to `state`.
+//
+// This function covers two symbols instead of one for convenience,
+// because in LLVM's Itanium ABI mangling grammar, <requires-clause expr>
+// always appears after Q.
+//
+// Does not emit the parsed `requires` clause to simplify the implementation.
+// In other words, these two functions' mangled names will demangle identically:
+//
+// template <typename T>
+// int foo(T) requires IsIntegral<T>;
+//
+// vs.
+//
+// template <typename T>
+// int foo(T);
+static bool ParseQRequiresClauseExpr(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+  DisableAppend(state);
+
+  // <requires-clause expr> is just an <expression>: http://shortn/_9E1Ul0rIM8
+  if (ParseOneCharToken(state, 'Q') && ParseExpression(state)) {
+    RestoreAppend(state, copy.append);
+    return true;
+  }
+
+  // also restores append
+  state->parse_state = copy;
+  return false;
+}
+
+// <requirement> ::= X <expression> [N] [R <type-constraint>]
+// <requirement> ::= T <type>
+// <requirement> ::= Q <constraint-expression>
+//
+// <constraint-expression> ::= <expression>
+//
+// https://github.com/itanium-cxx-abi/cxx-abi/issues/24
+static bool ParseRequirement(State *state) {
+  ComplexityGuard guard(state);
+  if (guard.IsTooComplex()) return false;
+
+  ParseState copy = state->parse_state;
+
+  if (ParseOneCharToken(state, 'X') && ParseExpression(state) &&
+      Optional(ParseOneCharToken(state, 'N')) &&
+      // This logic backtracks cleanly if we eat an R but a valid type doesn't
+      // follow it.
+      (!ParseOneCharToken(state, 'R') || ParseTypeConstraint(state))) {
     return true;
   }
   state->parse_state = copy;
 
+  if (ParseOneCharToken(state, 'T') && ParseType(state)) return true;
+  state->parse_state = copy;
+
+  if (ParseOneCharToken(state, 'Q') && ParseExpression(state)) return true;
+  state->parse_state = copy;
+
   return false;
 }
 
+// <type-constraint> ::= <name>
+static bool ParseTypeConstraint(State *state) {
+  return ParseName(state);
+}
+
 // <local-name> ::= Z <(function) encoding> E <(entity) name> [<discriminator>]
 //              ::= Z <(function) encoding> E s [<discriminator>]
+//              ::= Z <(function) encoding> E d [<(parameter) number>] _ <name>
 //
 // Parsing a common prefix of these two productions together avoids an
 // exponential blowup of backtracking.  Parse like:
 //   <local-name> := Z <encoding> E <local-name-suffix>
 //   <local-name-suffix> ::= s [<discriminator>]
+//                       ::= d [<(parameter) number>] _ <name>
 //                       ::= <name> [<discriminator>]
 
 static bool ParseLocalNameSuffix(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
+  ParseState copy = state->parse_state;
+
+  // <local-name-suffix> ::= d [<(parameter) number>] _ <name>
+  if (ParseOneCharToken(state, 'd') &&
+      (IsDigit(RemainingInput(state)[0]) || RemainingInput(state)[0] == '_')) {
+    int number = -1;
+    Optional(ParseNumber(state, &number));
+    if (number < -1 || number > 2147483645) {
+      // Work around overflow cases.  We do not expect these outside of a fuzzer
+      // or other source of adversarial input.  If we do detect overflow here,
+      // we'll print {default arg#1}.
+      number = -1;
+    }
+    number += 2;
+
+    // The ::{default arg#1}:: infix must be rendered before the lambda itself,
+    // so print this before parsing the rest of the <local-name-suffix>.
+    MaybeAppend(state, "::{default arg#");
+    MaybeAppendDecimal(state, number);
+    MaybeAppend(state, "}::");
+    if (ParseOneCharToken(state, '_') && ParseName(state)) return true;
+
+    // On late parse failure, roll back not only the input but also the output,
+    // whose trailing NUL was overwritten.
+    state->parse_state = copy;
+    if (state->parse_state.append) {
+      state->out[state->parse_state.out_cur_idx] = '\0';
+    }
+    return false;
+  }
+  state->parse_state = copy;
 
+  // <local-name-suffix> ::= <name> [<discriminator>]
   if (MaybeAppend(state, "::") && ParseName(state) &&
       Optional(ParseDiscriminator(state))) {
     return true;
   }
-
-  // Since we're not going to overwrite the above "::" by re-parsing the
-  // <encoding> (whose trailing '\0' byte was in the byte now holding the
-  // first ':'), we have to rollback the "::" if the <name> parse failed.
+  state->parse_state = copy;
   if (state->parse_state.append) {
-    state->out[state->parse_state.out_cur_idx - 2] = '\0';
+    state->out[state->parse_state.out_cur_idx] = '\0';
   }
 
+  // <local-name-suffix> ::= s [<discriminator>]
   return ParseOneCharToken(state, 's') && Optional(ParseDiscriminator(state));
 }
 
@@ -1896,12 +2849,22 @@ static bool ParseLocalName(State *state) {
   return false;
 }
 
-// <discriminator> := _ <(non-negative) number>
+// <discriminator> := _ <digit>
+//                 := __ <number (>= 10)> _
 static bool ParseDiscriminator(State *state) {
   ComplexityGuard guard(state);
   if (guard.IsTooComplex()) return false;
   ParseState copy = state->parse_state;
-  if (ParseOneCharToken(state, '_') && ParseNumber(state, nullptr)) {
+
+  // Both forms start with _ so parse that first.
+  if (!ParseOneCharToken(state, '_')) return false;
+
+  // <digit>
+  if (ParseDigit(state, nullptr)) return true;
+
+  // _ <number> _
+  if (ParseOneCharToken(state, '_') && ParseNumber(state, nullptr) &&
+      ParseOneCharToken(state, '_')) {
     return true;
   }
   state->parse_state = copy;
@@ -1947,6 +2910,7 @@ static bool ParseSubstitution(State *state, bool accept_std) {
           MaybeAppend(state, p->real_name);
         }
         ++state->parse_state.mangled_idx;
+        UpdateHighWaterMark(state);
         return true;
       }
     }
@@ -1972,10 +2936,13 @@ static bool ParseTopLevelMangledName(State *state) {
         MaybeAppend(state, RemainingInput(state));
         return true;
       }
+      ReportHighWaterMark(state);
       return false;  // Unconsumed suffix.
     }
     return true;
   }
+
+  ReportHighWaterMark(state);
   return false;
 }
 
@@ -1985,6 +2952,10 @@ static bool Overflowed(const State *state) {
 
 // The demangler entry point.
 bool Demangle(const char* mangled, char* out, size_t out_size) {
+  if (mangled[0] == '_' && mangled[1] == 'R') {
+    return DemangleRustSymbolEncoding(mangled, out, out_size);
+  }
+
   State state;
   InitState(&state, mangled, out, out_size);
   return ParseTopLevelMangledName(&state) && !Overflowed(&state) &&
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.h b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.h
index 6acfee2c5081..a1166f9e7c7d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle.h
@@ -56,6 +56,9 @@ namespace debugging_internal {
 //
 // See the unit test for more examples.
 //
+// Demangle also recognizes Rust mangled names by delegating the parsing of
+// anything that starts with _R to DemangleRustSymbolEncoding (demangle_rust.h).
+//
 // Note: we might want to write demanglers for ABIs other than Itanium
 // C++ ABI in the future.
 bool Demangle(const char* mangled, char* out, size_t out_size);
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle_rust.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle_rust.cc
new file mode 100644
index 000000000000..086e1457f9f1
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle_rust.cc
@@ -0,0 +1,925 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "y_absl/debugging/internal/demangle_rust.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <limits>
+
+#include "y_absl/base/attributes.h"
+#include "y_absl/base/config.h"
+#include "y_absl/debugging/internal/decode_rust_punycode.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+namespace {
+
+// Same step limit as the C++ demangler in demangle.cc uses.
+constexpr int kMaxReturns = 1 << 17;
+
+bool IsDigit(char c) { return '0' <= c && c <= '9'; }
+bool IsLower(char c) { return 'a' <= c && c <= 'z'; }
+bool IsUpper(char c) { return 'A' <= c && c <= 'Z'; }
+bool IsAlpha(char c) { return IsLower(c) || IsUpper(c); }
+bool IsIdentifierChar(char c) { return IsAlpha(c) || IsDigit(c) || c == '_'; }
+bool IsLowerHexDigit(char c) { return IsDigit(c) || ('a' <= c && c <= 'f'); }
+
+const char* BasicTypeName(char c) {
+  switch (c) {
+    case 'a': return "i8";
+    case 'b': return "bool";
+    case 'c': return "char";
+    case 'd': return "f64";
+    case 'e': return "str";
+    case 'f': return "f32";
+    case 'h': return "u8";
+    case 'i': return "isize";
+    case 'j': return "usize";
+    case 'l': return "i32";
+    case 'm': return "u32";
+    case 'n': return "i128";
+    case 'o': return "u128";
+    case 'p': return "_";
+    case 's': return "i16";
+    case 't': return "u16";
+    case 'u': return "()";
+    case 'v': return "...";
+    case 'x': return "i64";
+    case 'y': return "u64";
+    case 'z': return "!";
+  }
+  return nullptr;
+}
+
+// Parser for Rust symbol mangling v0, whose grammar is defined here:
+//
+// https://doc.rust-lang.org/rustc/symbol-mangling/v0.html#symbol-grammar-summary
+class RustSymbolParser {
+ public:
+  // Prepares to demangle the given encoding, a Rust symbol name starting with
+  // _R, into the output buffer [out, out_end).  The caller is expected to
+  // continue by calling the new object's Parse function.
+  RustSymbolParser(const char* encoding, char* out, char* const out_end)
+      : encoding_(encoding), out_(out), out_end_(out_end) {
+    if (out_ != out_end_) *out_ = '\0';
+  }
+
+  // Parses the constructor's encoding argument, writing output into the range
+  // [out, out_end).  Returns true on success and false for input whose
+  // structure was not recognized or exceeded implementation limits, such as by
+  // nesting structures too deep.  In either case *this should not be used
+  // again.
+  Y_ABSL_MUST_USE_RESULT bool Parse() && {
+    // Recursively parses the grammar production named by callee, then resumes
+    // execution at the next statement.
+    //
+    // Recursive-descent parsing is a beautifully readable translation of a
+    // grammar, but it risks stack overflow if implemented by naive recursion on
+    // the C++ call stack.  So we simulate recursion by goto and switch instead,
+    // keeping a bounded stack of "return addresses" in the recursion_stack_
+    // member.
+    //
+    // The callee argument is a statement label.  We goto that label after
+    // saving the "return address" on recursion_stack_.  The next continue
+    // statement in the for loop below "returns" from this "call".
+    //
+    // The caller argument names the return point.  Each value of caller must
+    // appear in only one Y_ABSL_DEMANGLER_RECURSE call and be listed in the
+    // definition of enum ReturnAddress.  The switch implements the control
+    // transfer from the end of a "called" subroutine back to the statement
+    // after the "call".
+    //
+    // Note that not all the grammar productions have to be packed into the
+    // switch, but only those which appear in a cycle in the grammar.  Anything
+    // acyclic can be written as ordinary functions and function calls, e.g.,
+    // ParseIdentifier.
+#define Y_ABSL_DEMANGLER_RECURSE(callee, caller) \
+    do { \
+      if (recursion_depth_ == kStackSize) return false; \
+      /* The next continue will switch on this saved value ... */ \
+      recursion_stack_[recursion_depth_++] = caller; \
+      goto callee; \
+      /* ... and will land here, resuming the suspended code. */ \
+      case caller: {} \
+    } while (0)
+
+    // Parse the encoding, counting completed recursive calls to guard against
+    // excessively complex input and infinite-loop bugs.
+    int iter = 0;
+    goto whole_encoding;
+    for (; iter < kMaxReturns && recursion_depth_ > 0; ++iter) {
+      // This switch resumes the code path most recently suspended by
+      // Y_ABSL_DEMANGLER_RECURSE.
+      switch (recursion_stack_[--recursion_depth_]) {
+        //
+        // symbol-name ->
+        // _R decimal-number? path instantiating-crate? vendor-specific-suffix?
+        whole_encoding:
+          if (!Eat('_') || !Eat('R')) return false;
+          // decimal-number? is always empty today, so proceed to path, which
+          // can't start with a decimal digit.
+          Y_ABSL_DEMANGLER_RECURSE(path, kInstantiatingCrate);
+          if (IsAlpha(Peek())) {
+            ++silence_depth_;  // Print nothing more from here on.
+            Y_ABSL_DEMANGLER_RECURSE(path, kVendorSpecificSuffix);
+          }
+          switch (Take()) {
+            case '.': case '$': case '\0': return true;
+          }
+          return false;  // unexpected trailing content
+
+        // path -> crate-root | inherent-impl | trait-impl | trait-definition |
+        //         nested-path | generic-args | backref
+        //
+        // Note that Y_ABSL_DEMANGLER_RECURSE does not work inside a nested switch
+        // (which would hide the generated case label).  Thus we jump out of the
+        // inner switch with gotos before performing any fake recursion.
+        path:
+          switch (Take()) {
+            case 'C': goto crate_root;
+            case 'M': goto inherent_impl;
+            case 'X': goto trait_impl;
+            case 'Y': goto trait_definition;
+            case 'N': goto nested_path;
+            case 'I': goto generic_args;
+            case 'B': goto path_backref;
+            default: return false;
+          }
+
+        // crate-root -> C identifier (C consumed above)
+        crate_root:
+          if (!ParseIdentifier()) return false;
+          continue;
+
+        // inherent-impl -> M impl-path type (M already consumed)
+        inherent_impl:
+          if (!Emit("<")) return false;
+          Y_ABSL_DEMANGLER_RECURSE(impl_path, kInherentImplType);
+          Y_ABSL_DEMANGLER_RECURSE(type, kInherentImplEnding);
+          if (!Emit(">")) return false;
+          continue;
+
+        // trait-impl -> X impl-path type path (X already consumed)
+        trait_impl:
+          if (!Emit("<")) return false;
+          Y_ABSL_DEMANGLER_RECURSE(impl_path, kTraitImplType);
+          Y_ABSL_DEMANGLER_RECURSE(type, kTraitImplInfix);
+          if (!Emit(" as ")) return false;
+          Y_ABSL_DEMANGLER_RECURSE(path, kTraitImplEnding);
+          if (!Emit(">")) return false;
+          continue;
+
+        // impl-path -> disambiguator? path (but never print it!)
+        impl_path:
+          ++silence_depth_;
+          {
+            int ignored_disambiguator;
+            if (!ParseDisambiguator(ignored_disambiguator)) return false;
+          }
+          Y_ABSL_DEMANGLER_RECURSE(path, kImplPathEnding);
+          --silence_depth_;
+          continue;
+
+        // trait-definition -> Y type path (Y already consumed)
+        trait_definition:
+          if (!Emit("<")) return false;
+          Y_ABSL_DEMANGLER_RECURSE(type, kTraitDefinitionInfix);
+          if (!Emit(" as ")) return false;
+          Y_ABSL_DEMANGLER_RECURSE(path, kTraitDefinitionEnding);
+          if (!Emit(">")) return false;
+          continue;
+
+        // nested-path -> N namespace path identifier (N already consumed)
+        // namespace -> lower | upper
+        nested_path:
+          // Uppercase namespaces must be saved on a stack so we can print
+          // ::{closure#0} or ::{shim:vtable#0} or ::{X:name#0} as needed.
+          if (IsUpper(Peek())) {
+            if (!PushNamespace(Take())) return false;
+            Y_ABSL_DEMANGLER_RECURSE(path, kIdentifierInUppercaseNamespace);
+            if (!Emit("::")) return false;
+            if (!ParseIdentifier(PopNamespace())) return false;
+            continue;
+          }
+
+          // Lowercase namespaces, however, are never represented in the output;
+          // they all emit just ::name.
+          if (IsLower(Take())) {
+            Y_ABSL_DEMANGLER_RECURSE(path, kIdentifierInLowercaseNamespace);
+            if (!Emit("::")) return false;
+            if (!ParseIdentifier()) return false;
+            continue;
+          }
+
+          // Neither upper or lower
+          return false;
+
+        // type -> basic-type | array-type | slice-type | tuple-type |
+        //         ref-type | mut-ref-type | const-ptr-type | mut-ptr-type |
+        //         fn-type | dyn-trait-type | path | backref
+        //
+        // We use ifs instead of switch (Take()) because the default case jumps
+        // to path, which will need to see the first character not yet Taken
+        // from the input.  Because we do not use a nested switch here,
+        // Y_ABSL_DEMANGLER_RECURSE works fine in the 'S' case.
+        type:
+          if (IsLower(Peek())) {
+            const char* type_name = BasicTypeName(Take());
+            if (type_name == nullptr || !Emit(type_name)) return false;
+            continue;
+          }
+          if (Eat('A')) {
+            // array-type = A type const
+            if (!Emit("[")) return false;
+            Y_ABSL_DEMANGLER_RECURSE(type, kArraySize);
+            if (!Emit("; ")) return false;
+            Y_ABSL_DEMANGLER_RECURSE(constant, kFinishArray);
+            if (!Emit("]")) return false;
+            continue;
+          }
+          if (Eat('S')) {
+            if (!Emit("[")) return false;
+            Y_ABSL_DEMANGLER_RECURSE(type, kSliceEnding);
+            if (!Emit("]")) return false;
+            continue;
+          }
+          if (Eat('T')) goto tuple_type;
+          if (Eat('R')) {
+            if (!Emit("&")) return false;
+            if (!ParseOptionalLifetime()) return false;
+            goto type;
+          }
+          if (Eat('Q')) {
+            if (!Emit("&mut ")) return false;
+            if (!ParseOptionalLifetime()) return false;
+            goto type;
+          }
+          if (Eat('P')) {
+            if (!Emit("*const ")) return false;
+            goto type;
+          }
+          if (Eat('O')) {
+            if (!Emit("*mut ")) return false;
+            goto type;
+          }
+          if (Eat('F')) goto fn_type;
+          if (Eat('D')) goto dyn_trait_type;
+          if (Eat('B')) goto type_backref;
+          goto path;
+
+        // tuple-type -> T type* E (T already consumed)
+        tuple_type:
+          if (!Emit("(")) return false;
+
+          // The toolchain should call the unit type u instead of TE, but the
+          // grammar and other demanglers also recognize TE, so we do too.
+          if (Eat('E')) {
+            if (!Emit(")")) return false;
+            continue;
+          }
+
+          // A tuple with one element is rendered (type,) instead of (type).
+          Y_ABSL_DEMANGLER_RECURSE(type, kAfterFirstTupleElement);
+          if (Eat('E')) {
+            if (!Emit(",)")) return false;
+            continue;
+          }
+
+          // A tuple with two elements is of course (x, y).
+          if (!Emit(", ")) return false;
+          Y_ABSL_DEMANGLER_RECURSE(type, kAfterSecondTupleElement);
+          if (Eat('E')) {
+            if (!Emit(")")) return false;
+            continue;
+          }
+
+          // And (x, y, z) for three elements.
+          if (!Emit(", ")) return false;
+          Y_ABSL_DEMANGLER_RECURSE(type, kAfterThirdTupleElement);
+          if (Eat('E')) {
+            if (!Emit(")")) return false;
+            continue;
+          }
+
+          // For longer tuples we write (x, y, z, ...), printing none of the
+          // content of the fourth and later types.  Thus we avoid exhausting
+          // output buffers and human readers' patience when some library has a
+          // long tuple as an implementation detail, without having to
+          // completely obfuscate all tuples.
+          if (!Emit(", ...)")) return false;
+          ++silence_depth_;
+          while (!Eat('E')) {
+            Y_ABSL_DEMANGLER_RECURSE(type, kAfterSubsequentTupleElement);
+          }
+          --silence_depth_;
+          continue;
+
+        // fn-type -> F fn-sig (F already consumed)
+        // fn-sig -> binder? U? (K abi)? type* E type
+        // abi -> C | undisambiguated-identifier
+        //
+        // We follow the C++ demangler in suppressing details of function
+        // signatures.  Every function type is rendered "fn...".
+        fn_type:
+          if (!Emit("fn...")) return false;
+          ++silence_depth_;
+          if (!ParseOptionalBinder()) return false;
+          (void)Eat('U');
+          if (Eat('K')) {
+            if (!Eat('C') && !ParseUndisambiguatedIdentifier()) return false;
+          }
+          while (!Eat('E')) {
+            Y_ABSL_DEMANGLER_RECURSE(type, kContinueParameterList);
+          }
+          Y_ABSL_DEMANGLER_RECURSE(type, kFinishFn);
+          --silence_depth_;
+          continue;
+
+        // dyn-trait-type -> D dyn-bounds lifetime (D already consumed)
+        // dyn-bounds -> binder? dyn-trait* E
+        //
+        // The grammar strangely allows an empty trait list, even though the
+        // compiler should never output one.  We follow existing demanglers in
+        // rendering DEL_ as "dyn ".
+        //
+        // Because auto traits lengthen a type name considerably without
+        // providing much value to a search for related source code, it would be
+        // desirable to abbreviate
+        //     dyn main::Trait + std::marker::Copy + std::marker::Send
+        // to
+        //     dyn main::Trait + ...,
+        // eliding the auto traits.  But it is difficult to do so correctly, in
+        // part because there is no guarantee that the mangling will list the
+        // main trait first.  So we just print all the traits in their order of
+        // appearance in the mangled name.
+        dyn_trait_type:
+          if (!Emit("dyn ")) return false;
+          if (!ParseOptionalBinder()) return false;
+          if (!Eat('E')) {
+            Y_ABSL_DEMANGLER_RECURSE(dyn_trait, kBeginAutoTraits);
+            while (!Eat('E')) {
+              if (!Emit(" + ")) return false;
+              Y_ABSL_DEMANGLER_RECURSE(dyn_trait, kContinueAutoTraits);
+            }
+          }
+          if (!ParseRequiredLifetime()) return false;
+          continue;
+
+        // dyn-trait -> path dyn-trait-assoc-binding*
+        // dyn-trait-assoc-binding -> p undisambiguated-identifier type
+        //
+        // We render nonempty binding lists as <>, omitting their contents as
+        // for generic-args.
+        dyn_trait:
+          Y_ABSL_DEMANGLER_RECURSE(path, kContinueDynTrait);
+          if (Peek() == 'p') {
+            if (!Emit("<>")) return false;
+            ++silence_depth_;
+            while (Eat('p')) {
+              if (!ParseUndisambiguatedIdentifier()) return false;
+              Y_ABSL_DEMANGLER_RECURSE(type, kContinueAssocBinding);
+            }
+            --silence_depth_;
+          }
+          continue;
+
+        // const -> type const-data | p | backref
+        //
+        // const is a C++ keyword, so we use the label `constant` instead.
+        constant:
+          if (Eat('B')) goto const_backref;
+          if (Eat('p')) {
+            if (!Emit("_")) return false;
+            continue;
+          }
+
+          // Scan the type without printing it.
+          //
+          // The Rust language restricts the type of a const generic argument
+          // much more than the mangling grammar does.  We do not enforce this.
+          //
+          // We also do not bother printing false, true, 'A', and '\u{abcd}' for
+          // the types bool and char.  Because we do not print generic-args
+          // contents, we expect to print constants only in array sizes, and
+          // those should not be bool or char.
+          ++silence_depth_;
+          Y_ABSL_DEMANGLER_RECURSE(type, kConstData);
+          --silence_depth_;
+
+          // const-data -> n? hex-digit* _
+          //
+          // Although the grammar doesn't say this, existing demanglers expect
+          // that zero is 0, not an empty digit sequence, and no nonzero value
+          // may have leading zero digits.  Also n0_ is accepted and printed as
+          // -0, though a toolchain will probably never write that encoding.
+          if (Eat('n') && !EmitChar('-')) return false;
+          if (!Emit("0x")) return false;
+          if (Eat('0')) {
+            if (!EmitChar('0')) return false;
+            if (!Eat('_')) return false;
+            continue;
+          }
+          while (IsLowerHexDigit(Peek())) {
+            if (!EmitChar(Take())) return false;
+          }
+          if (!Eat('_')) return false;
+          continue;
+
+        // generic-args -> I path generic-arg* E (I already consumed)
+        //
+        // We follow the C++ demangler in omitting all the arguments from the
+        // output, printing only the list opening and closing tokens.
+        generic_args:
+          Y_ABSL_DEMANGLER_RECURSE(path, kBeginGenericArgList);
+          if (!Emit("::<>")) return false;
+          ++silence_depth_;
+          while (!Eat('E')) {
+            Y_ABSL_DEMANGLER_RECURSE(generic_arg, kContinueGenericArgList);
+          }
+          --silence_depth_;
+          continue;
+
+        // generic-arg -> lifetime | type | K const
+        generic_arg:
+          if (Peek() == 'L') {
+            if (!ParseOptionalLifetime()) return false;
+            continue;
+          }
+          if (Eat('K')) goto constant;
+          goto type;
+
+        // backref -> B base-62-number (B already consumed)
+        //
+        // The BeginBackref call parses and range-checks the base-62-number.  We
+        // always do that much.
+        //
+        // The recursive call parses and prints what the backref points at.  We
+        // save CPU and stack by skipping this work if the output would be
+        // suppressed anyway.
+        path_backref:
+          if (!BeginBackref()) return false;
+          if (silence_depth_ == 0) {
+            Y_ABSL_DEMANGLER_RECURSE(path, kPathBackrefEnding);
+          }
+          EndBackref();
+          continue;
+
+        // This represents the same backref production as in path_backref but
+        // parses the target as a type instead of a path.
+        type_backref:
+          if (!BeginBackref()) return false;
+          if (silence_depth_ == 0) {
+            Y_ABSL_DEMANGLER_RECURSE(type, kTypeBackrefEnding);
+          }
+          EndBackref();
+          continue;
+
+        const_backref:
+          if (!BeginBackref()) return false;
+          if (silence_depth_ == 0) {
+            Y_ABSL_DEMANGLER_RECURSE(constant, kConstantBackrefEnding);
+          }
+          EndBackref();
+          continue;
+      }
+    }
+
+    return false;  // hit iteration limit or a bug in our stack handling
+  }
+
+ private:
+  // Enumerates resumption points for Y_ABSL_DEMANGLER_RECURSE calls.
+  enum ReturnAddress : uint8_t {
+    kInstantiatingCrate,
+    kVendorSpecificSuffix,
+    kIdentifierInUppercaseNamespace,
+    kIdentifierInLowercaseNamespace,
+    kInherentImplType,
+    kInherentImplEnding,
+    kTraitImplType,
+    kTraitImplInfix,
+    kTraitImplEnding,
+    kImplPathEnding,
+    kTraitDefinitionInfix,
+    kTraitDefinitionEnding,
+    kArraySize,
+    kFinishArray,
+    kSliceEnding,
+    kAfterFirstTupleElement,
+    kAfterSecondTupleElement,
+    kAfterThirdTupleElement,
+    kAfterSubsequentTupleElement,
+    kContinueParameterList,
+    kFinishFn,
+    kBeginAutoTraits,
+    kContinueAutoTraits,
+    kContinueDynTrait,
+    kContinueAssocBinding,
+    kConstData,
+    kBeginGenericArgList,
+    kContinueGenericArgList,
+    kPathBackrefEnding,
+    kTypeBackrefEnding,
+    kConstantBackrefEnding,
+  };
+
+  // Element counts for the stack arrays.  Larger stack sizes accommodate more
+  // deeply nested names at the cost of a larger footprint on the C++ call
+  // stack.
+  enum {
+    // Maximum recursive calls outstanding at one time.
+    kStackSize = 256,
+
+    // Maximum N<uppercase> nested-paths open at once.  We do not expect
+    // closures inside closures inside closures as much as functions inside
+    // modules inside other modules, so we can use a smaller array here.
+    kNamespaceStackSize = 64,
+
+    // Maximum number of nested backrefs.  We can keep this stack pretty small
+    // because we do not follow backrefs inside generic-args or other contexts
+    // that suppress printing, so deep stacking is unlikely in practice.
+    kPositionStackSize = 16,
+  };
+
+  // Returns the next input character without consuming it.
+  char Peek() const { return encoding_[pos_]; }
+
+  // Consumes and returns the next input character.
+  char Take() { return encoding_[pos_++]; }
+
+  // If the next input character is the given character, consumes it and returns
+  // true; otherwise returns false without consuming a character.
+  Y_ABSL_MUST_USE_RESULT bool Eat(char want) {
+    if (encoding_[pos_] != want) return false;
+    ++pos_;
+    return true;
+  }
+
+  // Provided there is enough remaining output space, appends c to the output,
+  // writing a fresh NUL terminator afterward, and returns true.  Returns false
+  // if the output buffer had less than two bytes free.
+  Y_ABSL_MUST_USE_RESULT bool EmitChar(char c) {
+    if (silence_depth_ > 0) return true;
+    if (out_end_ - out_ < 2) return false;
+    *out_++ = c;
+    *out_ = '\0';
+    return true;
+  }
+
+  // Provided there is enough remaining output space, appends the C string token
+  // to the output, followed by a NUL character, and returns true.  Returns
+  // false if not everything fit into the output buffer.
+  Y_ABSL_MUST_USE_RESULT bool Emit(const char* token) {
+    if (silence_depth_ > 0) return true;
+    const size_t token_length = std::strlen(token);
+    const size_t bytes_to_copy = token_length + 1;  // token and final NUL
+    if (static_cast<size_t>(out_end_ - out_) < bytes_to_copy) return false;
+    std::memcpy(out_, token, bytes_to_copy);
+    out_ += token_length;
+    return true;
+  }
+
+  // Provided there is enough remaining output space, appends the decimal form
+  // of disambiguator (if it's nonnegative) or "?" (if it's negative) to the
+  // output, followed by a NUL character, and returns true.  Returns false if
+  // not everything fit into the output buffer.
+  Y_ABSL_MUST_USE_RESULT bool EmitDisambiguator(int disambiguator) {
+    if (disambiguator < 0) return EmitChar('?');  // parsed but too large
+    if (disambiguator == 0) return EmitChar('0');
+    // Convert disambiguator to decimal text.  Three digits per byte is enough
+    // because 999 > 256.  The bound will remain correct even if future
+    // maintenance changes the type of the disambiguator variable.
+    char digits[3 * sizeof(disambiguator)] = {};
+    size_t leading_digit_index = sizeof(digits) - 1;
+    for (; disambiguator > 0; disambiguator /= 10) {
+      digits[--leading_digit_index] =
+          static_cast<char>('0' + disambiguator % 10);
+    }
+    return Emit(digits + leading_digit_index);
+  }
+
+  // Consumes an optional disambiguator (s123_) from the input.
+  //
+  // On success returns true and fills value with the encoded value if it was
+  // not too big, otherwise with -1.  If the optional disambiguator was omitted,
+  // value is 0.  On parse failure returns false and sets value to -1.
+  Y_ABSL_MUST_USE_RESULT bool ParseDisambiguator(int& value) {
+    value = -1;
+
+    // disambiguator = s base-62-number
+    //
+    // Disambiguators are optional.  An omitted disambiguator is zero.
+    if (!Eat('s')) {
+      value = 0;
+      return true;
+    }
+    int base_62_value = 0;
+    if (!ParseBase62Number(base_62_value)) return false;
+    value = base_62_value < 0 ? -1 : base_62_value + 1;
+    return true;
+  }
+
+  // Consumes a base-62 number like _ or 123_ from the input.
+  //
+  // On success returns true and fills value with the encoded value if it was
+  // not too big, otherwise with -1.  On parse failure returns false and sets
+  // value to -1.
+  Y_ABSL_MUST_USE_RESULT bool ParseBase62Number(int& value) {
+    value = -1;
+
+    // base-62-number = (digit | lower | upper)* _
+    //
+    // An empty base-62 digit sequence means 0.
+    if (Eat('_')) {
+      value = 0;
+      return true;
+    }
+
+    // A nonempty digit sequence denotes its base-62 value plus 1.
+    int encoded_number = 0;
+    bool overflowed = false;
+    while (IsAlpha(Peek()) || IsDigit(Peek())) {
+      const char c = Take();
+      if (encoded_number >= std::numeric_limits<int>::max()/62) {
+        // If we are close to overflowing an int, keep parsing but stop updating
+        // encoded_number and remember to return -1 at the end.  The point is to
+        // avoid undefined behavior while parsing crate-root disambiguators,
+        // which are large in practice but not shown in demangling, while
+        // successfully computing closure and shim disambiguators, which are
+        // typically small and are printed out.
+        overflowed = true;
+      } else {
+        int digit;
+        if (IsDigit(c)) {
+          digit = c - '0';
+        } else if (IsLower(c)) {
+          digit = c - 'a' + 10;
+        } else {
+          digit = c - 'A' + 36;
+        }
+        encoded_number = 62 * encoded_number + digit;
+      }
+    }
+
+    if (!Eat('_')) return false;
+    if (!overflowed) value = encoded_number + 1;
+    return true;
+  }
+
+  // Consumes an identifier from the input, returning true on success.
+  //
+  // A nonzero uppercase_namespace specifies the character after the N in a
+  // nested-identifier, e.g., 'C' for a closure, allowing ParseIdentifier to
+  // write out the name with the conventional decoration for that namespace.
+  Y_ABSL_MUST_USE_RESULT bool ParseIdentifier(char uppercase_namespace = '\0') {
+    // identifier -> disambiguator? undisambiguated-identifier
+    int disambiguator = 0;
+    if (!ParseDisambiguator(disambiguator)) return false;
+
+    return ParseUndisambiguatedIdentifier(uppercase_namespace, disambiguator);
+  }
+
+  // Consumes from the input an identifier with no preceding disambiguator,
+  // returning true on success.
+  //
+  // When ParseIdentifier calls this, it passes the N<namespace> character and
+  // disambiguator value so that "{closure#42}" and similar forms can be
+  // rendered correctly.
+  //
+  // At other appearances of undisambiguated-identifier in the grammar, this
+  // treatment is not applicable, and the call site omits both arguments.
+  Y_ABSL_MUST_USE_RESULT bool ParseUndisambiguatedIdentifier(
+      char uppercase_namespace = '\0', int disambiguator = 0) {
+    // undisambiguated-identifier -> u? decimal-number _? bytes
+    const bool is_punycoded = Eat('u');
+    if (!IsDigit(Peek())) return false;
+    int num_bytes = 0;
+    if (!ParseDecimalNumber(num_bytes)) return false;
+    (void)Eat('_');  // optional separator, needed if a digit follows
+    if (is_punycoded) {
+      DecodeRustPunycodeOptions options;
+      options.punycode_begin = &encoding_[pos_];
+      options.punycode_end = &encoding_[pos_] + num_bytes;
+      options.out_begin = out_;
+      options.out_end = out_end_;
+      out_ = DecodeRustPunycode(options);
+      if (out_ == nullptr) return false;
+      pos_ += static_cast<size_t>(num_bytes);
+    }
+
+    // Emit the beginnings of braced forms like {shim:vtable#0}.
+    if (uppercase_namespace != '\0') {
+      switch (uppercase_namespace) {
+        case 'C':
+          if (!Emit("{closure")) return false;
+          break;
+        case 'S':
+          if (!Emit("{shim")) return false;
+          break;
+        default:
+          if (!EmitChar('{') || !EmitChar(uppercase_namespace)) return false;
+          break;
+      }
+      if (num_bytes > 0 && !Emit(":")) return false;
+    }
+
+    // Emit the name itself.
+    if (!is_punycoded) {
+      for (int i = 0; i < num_bytes; ++i) {
+        const char c = Take();
+        if (!IsIdentifierChar(c) &&
+            // The spec gives toolchains the choice of Punycode or raw UTF-8 for
+            // identifiers containing code points above 0x7f, so accept bytes
+            // with the high bit set.
+            (c & 0x80) == 0) {
+          return false;
+        }
+        if (!EmitChar(c)) return false;
+      }
+    }
+
+    // Emit the endings of braced forms, e.g., "#42}".
+    if (uppercase_namespace != '\0') {
+      if (!EmitChar('#')) return false;
+      if (!EmitDisambiguator(disambiguator)) return false;
+      if (!EmitChar('}')) return false;
+    }
+
+    return true;
+  }
+
+  // Consumes a decimal number like 0 or 123 from the input.  On success returns
+  // true and fills value with the encoded value.  If the encoded value is too
+  // large or otherwise unparsable, returns false and sets value to -1.
+  Y_ABSL_MUST_USE_RESULT bool ParseDecimalNumber(int& value) {
+    value = -1;
+    if (!IsDigit(Peek())) return false;
+    int encoded_number = Take() - '0';
+    if (encoded_number == 0) {
+      // Decimal numbers are never encoded with extra leading zeroes.
+      value = 0;
+      return true;
+    }
+    while (IsDigit(Peek()) &&
+           // avoid overflow
+           encoded_number < std::numeric_limits<int>::max()/10) {
+      encoded_number = 10 * encoded_number + (Take() - '0');
+    }
+    if (IsDigit(Peek())) return false;  // too big
+    value = encoded_number;
+    return true;
+  }
+
+  // Consumes a binder of higher-ranked lifetimes if one is present.  On success
+  // returns true and discards the encoded lifetime count.  On parse failure
+  // returns false.
+  Y_ABSL_MUST_USE_RESULT bool ParseOptionalBinder() {
+    // binder -> G base-62-number
+    if (!Eat('G')) return true;
+    int ignored_binding_count;
+    return ParseBase62Number(ignored_binding_count);
+  }
+
+  // Consumes a lifetime if one is present.
+  //
+  // On success returns true and discards the lifetime index.  We do not print
+  // or even range-check lifetimes because they are a finer detail than other
+  // things we omit from output, such as the entire contents of generic-args.
+  //
+  // On parse failure returns false.
+  Y_ABSL_MUST_USE_RESULT bool ParseOptionalLifetime() {
+    // lifetime -> L base-62-number
+    if (!Eat('L')) return true;
+    int ignored_de_bruijn_index;
+    return ParseBase62Number(ignored_de_bruijn_index);
+  }
+
+  // Consumes a lifetime just like ParseOptionalLifetime, but returns false if
+  // there is no lifetime here.
+  Y_ABSL_MUST_USE_RESULT bool ParseRequiredLifetime() {
+    if (Peek() != 'L') return false;
+    return ParseOptionalLifetime();
+  }
+
+  // Pushes ns onto the namespace stack and returns true if the stack is not
+  // full, else returns false.
+  Y_ABSL_MUST_USE_RESULT bool PushNamespace(char ns) {
+    if (namespace_depth_ == kNamespaceStackSize) return false;
+    namespace_stack_[namespace_depth_++] = ns;
+    return true;
+  }
+
+  // Pops the last pushed namespace.  Requires that the namespace stack is not
+  // empty (namespace_depth_ > 0).
+  char PopNamespace() { return namespace_stack_[--namespace_depth_]; }
+
+  // Pushes position onto the position stack and returns true if the stack is
+  // not full, else returns false.
+  Y_ABSL_MUST_USE_RESULT bool PushPosition(int position) {
+    if (position_depth_ == kPositionStackSize) return false;
+    position_stack_[position_depth_++] = position;
+    return true;
+  }
+
+  // Pops the last pushed input position.  Requires that the position stack is
+  // not empty (position_depth_ > 0).
+  int PopPosition() { return position_stack_[--position_depth_]; }
+
+  // Consumes a base-62-number denoting a backref target, pushes the current
+  // input position on the data stack, and sets the input position to the
+  // beginning of the backref target.  Returns true on success.  Returns false
+  // if parsing failed, the stack is exhausted, or the backref target position
+  // is out of range.
+  Y_ABSL_MUST_USE_RESULT bool BeginBackref() {
+    // backref = B base-62-number (B already consumed)
+    //
+    // Reject backrefs that don't parse, overflow int, or don't point backward.
+    // If the offset looks fine, adjust it to account for the _R prefix.
+    int offset = 0;
+    const int offset_of_this_backref =
+        pos_ - 2 /* _R */ - 1 /* B already consumed */;
+    if (!ParseBase62Number(offset) || offset < 0 ||
+        offset >= offset_of_this_backref) {
+      return false;
+    }
+    offset += 2;
+
+    // Save the old position to restore later.
+    if (!PushPosition(pos_)) return false;
+
+    // Move the input position to the backref target.
+    //
+    // Note that we do not check whether the new position points to the
+    // beginning of a construct matching the context in which the backref
+    // appeared.  We just jump to it and see whether nested parsing succeeds.
+    // We therefore accept various wrong manglings, e.g., a type backref
+    // pointing to an 'l' character inside an identifier, which happens to mean
+    // i32 when parsed as a type mangling.  This saves the complexity and RAM
+    // footprint of remembering which offsets began which kinds of
+    // substructures.  Existing demanglers take similar shortcuts.
+    pos_ = offset;
+    return true;
+  }
+
+  // Cleans up after a backref production by restoring the previous input
+  // position from the data stack.
+  void EndBackref() { pos_ = PopPosition(); }
+
+  // The leftmost recursion_depth_ elements of recursion_stack_ contain the
+  // ReturnAddresses pushed by Y_ABSL_DEMANGLER_RECURSE calls not yet completed.
+  ReturnAddress recursion_stack_[kStackSize] = {};
+  int recursion_depth_ = 0;
+
+  // The leftmost namespace_depth_ elements of namespace_stack_ contain the
+  // uppercase namespace identifiers for open nested-paths, e.g., 'C' for a
+  // closure.
+  char namespace_stack_[kNamespaceStackSize] = {};
+  int namespace_depth_ = 0;
+
+  // The leftmost position_depth_ elements of position_stack_ contain the input
+  // positions to return to after fully printing the targets of backrefs.
+  int position_stack_[kPositionStackSize] = {};
+  int position_depth_ = 0;
+
+  // Anything parsed while silence_depth_ > 0 contributes nothing to the
+  // demangled output.  For constructs omitted from the demangling, such as
+  // impl-path and the contents of generic-args, we will increment
+  // silence_depth_ on the way in and decrement silence_depth_ on the way out.
+  int silence_depth_ = 0;
+
+  // Input: encoding_ points to a Rust mangled symbol, and encoding_[pos_] is
+  // the next input character to be scanned.
+  int pos_ = 0;
+  const char* encoding_ = nullptr;
+
+  // Output: *out_ is where the next output character should be written, and
+  // out_end_ points past the last byte of available space.
+  char* out_ = nullptr;
+  char* out_end_ = nullptr;
+};
+
+}  // namespace
+
+bool DemangleRustSymbolEncoding(const char* mangled, char* out,
+                                size_t out_size) {
+  return RustSymbolParser(mangled, out, out + out_size).Parse();
+}
+
+}  // namespace debugging_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle_rust.h b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle_rust.h
new file mode 100644
index 000000000000..70ec90d3b9be
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/demangle_rust.h
@@ -0,0 +1,42 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef Y_ABSL_DEBUGGING_INTERNAL_DEMANGLE_RUST_H_
+#define Y_ABSL_DEBUGGING_INTERNAL_DEMANGLE_RUST_H_
+
+#include <cstddef>
+
+#include "y_absl/base/config.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+// Demangle the Rust encoding `mangled`.  On success, return true and write the
+// demangled symbol name to `out`.  Otherwise, return false, leaving unspecified
+// contents in `out`.  For example, calling DemangleRustSymbolEncoding with
+// `mangled = "_RNvC8my_crate7my_func"` will yield `my_crate::my_func` in `out`,
+// provided `out_size` is large enough for that value and its trailing NUL.
+//
+// DemangleRustSymbolEncoding is async-signal-safe and runs in bounded C++
+// call-stack space.  It is suitable for symbolizing stack traces in a signal
+// handler.
+bool DemangleRustSymbolEncoding(const char* mangled, char* out,
+                                size_t out_size);
+
+}  // namespace debugging_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
+
+#endif  // Y_ABSL_DEBUGGING_INTERNAL_DEMANGLE_RUST_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc
index cead525c9341..f9fc638597a0 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.cc
@@ -20,8 +20,11 @@
 #ifdef Y_ABSL_HAVE_ELF_MEM_IMAGE  // defined in elf_mem_image.h
 
 #include <string.h>
+
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
+
 #include "y_absl/base/config.h"
 #include "y_absl/base/internal/raw_logging.h"
 
@@ -86,20 +89,14 @@ ElfMemImage::ElfMemImage(const void *base) {
   Init(base);
 }
 
-int ElfMemImage::GetNumSymbols() const {
-  if (!hash_) {
-    return 0;
-  }
-  // See http://www.caldera.com/developers/gabi/latest/ch5.dynamic.html#hash
-  return static_cast<int>(hash_[1]);
-}
+uint32_t ElfMemImage::GetNumSymbols() const { return num_syms_; }
 
-const ElfW(Sym) *ElfMemImage::GetDynsym(int index) const {
+const ElfW(Sym) * ElfMemImage::GetDynsym(uint32_t index) const {
   Y_ABSL_RAW_CHECK(index < GetNumSymbols(), "index out of range");
   return dynsym_ + index;
 }
 
-const ElfW(Versym) *ElfMemImage::GetVersym(int index) const {
+const ElfW(Versym) *ElfMemImage::GetVersym(uint32_t index) const {
   Y_ABSL_RAW_CHECK(index < GetNumSymbols(), "index out of range");
   return versym_ + index;
 }
@@ -154,7 +151,7 @@ void ElfMemImage::Init(const void *base) {
   dynstr_    = nullptr;
   versym_    = nullptr;
   verdef_    = nullptr;
-  hash_      = nullptr;
+  num_syms_ = 0;
   strsize_   = 0;
   verdefnum_ = 0;
   // Sentinel: PT_LOAD .p_vaddr can't possibly be this.
@@ -219,12 +216,17 @@ void ElfMemImage::Init(const void *base) {
       base_as_char - reinterpret_cast<const char *>(link_base_);
   ElfW(Dyn)* dynamic_entry = reinterpret_cast<ElfW(Dyn)*>(
       static_cast<intptr_t>(dynamic_program_header->p_vaddr) + relocation);
+  uint32_t *sysv_hash = nullptr;
+  uint32_t *gnu_hash = nullptr;
   for (; dynamic_entry->d_tag != DT_NULL; ++dynamic_entry) {
     const auto value =
         static_cast<intptr_t>(dynamic_entry->d_un.d_val) + relocation;
     switch (dynamic_entry->d_tag) {
       case DT_HASH:
-        hash_ = reinterpret_cast<ElfW(Word) *>(value);
+        sysv_hash = reinterpret_cast<uint32_t *>(value);
+        break;
+      case DT_GNU_HASH:
+        gnu_hash = reinterpret_cast<uint32_t *>(value);
         break;
       case DT_SYMTAB:
         dynsym_ = reinterpret_cast<ElfW(Sym) *>(value);
@@ -249,13 +251,38 @@ void ElfMemImage::Init(const void *base) {
         break;
     }
   }
-  if (!hash_ || !dynsym_ || !dynstr_ || !versym_ ||
+  if ((!sysv_hash && !gnu_hash) || !dynsym_ || !dynstr_ || !versym_ ||
       !verdef_ || !verdefnum_ || !strsize_) {
     assert(false);  // invalid VDSO
     // Mark this image as not present. Can not recur infinitely.
     Init(nullptr);
     return;
   }
+  if (sysv_hash) {
+    num_syms_ = sysv_hash[1];
+  } else {
+    assert(gnu_hash);
+    // Compute the number of symbols for DT_GNU_HASH, which is specified by
+    // https://sourceware.org/gnu-gabi/program-loading-and-dynamic-linking.txt
+    uint32_t nbuckets = gnu_hash[0];
+    // The buckets array is located after the header (4 uint32) and the bloom
+    // filter (size_t array of gnu_hash[2] elements).
+    uint32_t *buckets = gnu_hash + 4 + sizeof(size_t) / 4 * gnu_hash[2];
+    // Find the chain of the last non-empty bucket.
+    uint32_t idx = 0;
+    for (uint32_t i = nbuckets; i > 0;) {
+      idx = buckets[--i];
+      if (idx != 0) break;
+    }
+    if (idx != 0) {
+      // Find the last element of the chain, which has an odd value.
+      // Add one to get the number of symbols.
+      uint32_t *chain = buckets + nbuckets - gnu_hash[1];
+      while (chain[idx++] % 2 == 0) {
+      }
+    }
+    num_syms_ = idx;
+  }
 }
 
 bool ElfMemImage::LookupSymbol(const char *name,
@@ -300,9 +327,9 @@ bool ElfMemImage::LookupSymbolByAddress(const void *address,
   return false;
 }
 
-ElfMemImage::SymbolIterator::SymbolIterator(const void *const image, int index)
-    : index_(index), image_(image) {
-}
+ElfMemImage::SymbolIterator::SymbolIterator(const void *const image,
+                                            uint32_t index)
+    : index_(index), image_(image) {}
 
 const ElfMemImage::SymbolInfo *ElfMemImage::SymbolIterator::operator->() const {
   return &info_;
@@ -335,7 +362,7 @@ ElfMemImage::SymbolIterator ElfMemImage::end() const {
   return SymbolIterator(this, GetNumSymbols());
 }
 
-void ElfMemImage::SymbolIterator::Update(int increment) {
+void ElfMemImage::SymbolIterator::Update(uint32_t increment) {
   const ElfMemImage *image = reinterpret_cast<const ElfMemImage *>(image_);
   Y_ABSL_RAW_CHECK(image->IsPresent() || increment == 0, "");
   if (!image->IsPresent()) {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.h b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.h
index 9c5e588fbbc7..4a3ee56edf5e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/elf_mem_image.h
@@ -22,6 +22,7 @@
 // Including this will define the __GLIBC__ macro if glibc is being
 // used.
 #include <climits>
+#include <cstdint>
 
 #include "y_absl/base/config.h"
 
@@ -82,10 +83,10 @@ class ElfMemImage {
     bool operator!=(const SymbolIterator &rhs) const;
     bool operator==(const SymbolIterator &rhs) const;
    private:
-    SymbolIterator(const void *const image, int index);
-    void Update(int incr);
+    SymbolIterator(const void *const image, uint32_t index);
+    void Update(uint32_t incr);
     SymbolInfo info_;
-    int index_;
+    uint32_t index_;
     const void *const image_;
   };
 
@@ -94,14 +95,14 @@ class ElfMemImage {
   void                 Init(const void *base);
   bool                 IsPresent() const { return ehdr_ != nullptr; }
   const ElfW(Phdr)*    GetPhdr(int index) const;
-  const ElfW(Sym)*     GetDynsym(int index) const;
-  const ElfW(Versym)*  GetVersym(int index) const;
+  const ElfW(Sym) * GetDynsym(uint32_t index) const;
+  const ElfW(Versym)*  GetVersym(uint32_t index) const;
   const ElfW(Verdef)*  GetVerdef(int index) const;
   const ElfW(Verdaux)* GetVerdefAux(const ElfW(Verdef) *verdef) const;
   const char*          GetDynstr(ElfW(Word) offset) const;
   const void*          GetSymAddr(const ElfW(Sym) *sym) const;
   const char*          GetVerstr(ElfW(Word) offset) const;
-  int                  GetNumSymbols() const;
+  uint32_t GetNumSymbols() const;
 
   SymbolIterator begin() const;
   SymbolIterator end() const;
@@ -124,8 +125,8 @@ class ElfMemImage {
   const ElfW(Sym) *dynsym_;
   const ElfW(Versym) *versym_;
   const ElfW(Verdef) *verdef_;
-  const ElfW(Word) *hash_;
   const char *dynstr_;
+  uint32_t num_syms_;
   size_t strsize_;
   size_t verdefnum_;
   ElfW(Addr) link_base_;     // Link-time base (p_vaddr of first PT_LOAD).
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/stacktrace_aarch64-inl.inc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/stacktrace_aarch64-inl.inc
index 7c7c0304e34e..1bf78f03e139 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/stacktrace_aarch64-inl.inc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/stacktrace_aarch64-inl.inc
@@ -89,6 +89,8 @@ struct StackInfo {
 
 static bool InsideSignalStack(void** ptr, const StackInfo* stack_info) {
   uintptr_t comparable_ptr = reinterpret_cast<uintptr_t>(ptr);
+  if (stack_info->sig_stack_high == kUnknownStackEnd)
+    return false;
   return (comparable_ptr >= stack_info->sig_stack_low &&
           comparable_ptr < stack_info->sig_stack_high);
 }
@@ -122,13 +124,6 @@ static void **NextStackFrame(void **old_frame_pointer, const void *uc,
       if (pre_signal_frame_pointer >= old_frame_pointer) {
         new_frame_pointer = pre_signal_frame_pointer;
       }
-      // Check that alleged frame pointer is actually readable. This is to
-      // prevent "double fault" in case we hit the first fault due to e.g.
-      // stack corruption.
-      if (!y_absl::debugging_internal::AddressIsReadable(
-              new_frame_pointer))
-        return nullptr;
-    }
   }
 #endif
 
@@ -136,6 +131,14 @@ static void **NextStackFrame(void **old_frame_pointer, const void *uc,
   if ((reinterpret_cast<uintptr_t>(new_frame_pointer) & 7) != 0)
     return nullptr;
 
+  // Check that alleged frame pointer is actually readable. This is to
+  // prevent "double fault" in case we hit the first fault due to e.g.
+  // stack corruption.
+  if (!y_absl::debugging_internal::AddressIsReadable(
+          new_frame_pointer))
+    return nullptr;
+  }
+
   // Only check the size if both frames are in the same stack.
   if (InsideSignalStack(new_frame_pointer, stack_info) ==
       InsideSignalStack(old_frame_pointer, stack_info)) {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/utf8_for_code_point.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/utf8_for_code_point.cc
new file mode 100644
index 000000000000..ed158c62b3d2
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/utf8_for_code_point.cc
@@ -0,0 +1,70 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "y_absl/debugging/internal/utf8_for_code_point.h"
+
+#include <cstdint>
+
+#include "y_absl/base/config.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+namespace {
+
+// UTF-8 encoding bounds.
+constexpr uint32_t kMinSurrogate = 0xd800, kMaxSurrogate = 0xdfff;
+constexpr uint32_t kMax1ByteCodePoint = 0x7f;
+constexpr uint32_t kMax2ByteCodePoint = 0x7ff;
+constexpr uint32_t kMax3ByteCodePoint = 0xffff;
+constexpr uint32_t kMaxCodePoint = 0x10ffff;
+
+}  // namespace
+
+Utf8ForCodePoint::Utf8ForCodePoint(uint64_t code_point) {
+  if (code_point <= kMax1ByteCodePoint) {
+    length = 1;
+    bytes[0] = static_cast<char>(code_point);
+    return;
+  }
+
+  if (code_point <= kMax2ByteCodePoint) {
+    length = 2;
+    bytes[0] = static_cast<char>(0xc0 | (code_point >> 6));
+    bytes[1] = static_cast<char>(0x80 | (code_point & 0x3f));
+    return;
+  }
+
+  if (kMinSurrogate <= code_point && code_point <= kMaxSurrogate) return;
+
+  if (code_point <= kMax3ByteCodePoint) {
+    length = 3;
+    bytes[0] = static_cast<char>(0xe0 | (code_point >> 12));
+    bytes[1] = static_cast<char>(0x80 | ((code_point >> 6) & 0x3f));
+    bytes[2] = static_cast<char>(0x80 | (code_point & 0x3f));
+    return;
+  }
+
+  if (code_point > kMaxCodePoint) return;
+
+  length = 4;
+  bytes[0] = static_cast<char>(0xf0 | (code_point >> 18));
+  bytes[1] = static_cast<char>(0x80 | ((code_point >> 12) & 0x3f));
+  bytes[2] = static_cast<char>(0x80 | ((code_point >> 6) & 0x3f));
+  bytes[3] = static_cast<char>(0x80 | (code_point & 0x3f));
+}
+
+}  // namespace debugging_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/utf8_for_code_point.h b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/utf8_for_code_point.h
new file mode 100644
index 000000000000..aa0dc65b82ff
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/utf8_for_code_point.h
@@ -0,0 +1,47 @@
+// Copyright 2024 The Abseil Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef Y_ABSL_DEBUGGING_INTERNAL_UTF8_FOR_CODE_POINT_H_
+#define Y_ABSL_DEBUGGING_INTERNAL_UTF8_FOR_CODE_POINT_H_
+
+#include <cstdint>
+
+#include "y_absl/base/config.h"
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+namespace debugging_internal {
+
+struct Utf8ForCodePoint {
+  // Converts a Unicode code point to the corresponding UTF-8 byte sequence.
+  // Async-signal-safe to support use in symbolizing stack traces from a signal
+  // handler.
+  explicit Utf8ForCodePoint(uint64_t code_point);
+
+  // Returns true if the constructor's code_point argument was valid.
+  bool ok() const { return length != 0; }
+
+  // If code_point was in range, then 1 <= length <= 4, and the UTF-8 encoding
+  // is found in bytes[0 .. (length - 1)].  If code_point was invalid, then
+  // length == 0.  In either case, the contents of bytes[length .. 3] are
+  // unspecified.
+  char bytes[4] = {};
+  uint32_t length = 0;
+};
+
+}  // namespace debugging_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
+
+#endif  // Y_ABSL_DEBUGGING_INTERNAL_UTF8_FOR_CODE_POINT_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/ya.make
index 0ceb1cd2caa9..d16ebf04ddc1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/ya.make
@@ -20,9 +20,12 @@ NO_COMPILER_WARNINGS()
 SRCS(
     failure_signal_handler.cc
     internal/address_is_readable.cc
+    internal/decode_rust_punycode.cc
     internal/demangle.cc
+    internal/demangle_rust.cc
     internal/elf_mem_image.cc
     internal/examine_stack.cc
+    internal/utf8_for_code_point.cc
     internal/vdso_support.cc
     leak_check.cc
     stacktrace.cc
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/commandlineflag.h b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/commandlineflag.h
index 1a6f3f5447be..47e183ec54eb 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/commandlineflag.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/commandlineflag.h
@@ -59,6 +59,14 @@ class PrivateHandleAccessor;
 //   // Now you can get flag info from that reflection handle.
 //   TString flag_location = my_flag_data->Filename();
 //   ...
+
+// These are only used as constexpr global objects.
+// They do not use a virtual destructor to simplify their implementation.
+// They are not destroyed except at program exit, so leaks do not matter.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 class CommandLineFlag {
  public:
   constexpr CommandLineFlag() = default;
@@ -193,6 +201,9 @@ class CommandLineFlag {
   // flag's value type.
   virtual void CheckDefaultValueParsingRoundtrip() const = 0;
 };
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 
 Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/flag.h b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/flag.h
index 68a649b0891f..ab36ad427d64 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/flag.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/flag.h
@@ -29,12 +29,14 @@
 #ifndef Y_ABSL_FLAGS_FLAG_H_
 #define Y_ABSL_FLAGS_FLAG_H_
 
+#include <cstdint>
 #include <util/generic/string.h>
 #include <type_traits>
 
 #include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/optimization.h"
+#include "y_absl/flags/commandlineflag.h"
 #include "y_absl/flags/config.h"
 #include "y_absl/flags/internal/flag.h"
 #include "y_absl/flags/internal/registry.h"
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag.cc
index 2e4397796640..a0078232211f 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag.cc
@@ -22,14 +22,17 @@
 
 #include <array>
 #include <atomic>
+#include <cstring>
 #include <memory>
-#include <new>
 #include <util/generic/string.h>
 #include <typeinfo>
+#include <vector>
 
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/call_once.h"
 #include "y_absl/base/casts.h"
 #include "y_absl/base/config.h"
+#include "y_absl/base/const_init.h"
 #include "y_absl/base/dynamic_annotations.h"
 #include "y_absl/base/optimization.h"
 #include "y_absl/flags/config.h"
@@ -44,10 +47,9 @@ namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
 namespace flags_internal {
 
-// The help message indicating that the commandline flag has been
-// 'stripped'. It will not show up when doing "-help" and its
-// variants. The flag is stripped if Y_ABSL_FLAGS_STRIP_HELP is set to 1
-// before including y_absl/flags/flag.h
+// The help message indicating that the commandline flag has been stripped. It
+// will not show up when doing "-help" and its variants. The flag is stripped
+// if Y_ABSL_FLAGS_STRIP_HELP is set to 1 before including y_absl/flags/flag.h
 const char kStrippedFlagHelp[] = "\001\002\003\004 (unknown) \004\003\002\001";
 
 namespace {
@@ -78,8 +80,31 @@ class MutexRelock {
   y_absl::Mutex& mu_;
 };
 
+// This is a freelist of leaked flag values and guard for its access.
+// When we can't guarantee it is safe to reuse the memory for flag values,
+// we move the memory to the freelist where it lives indefinitely, so it can
+// still be safely accessed. This also prevents leak checkers from complaining
+// about the leaked memory that can no longer be accessed through any pointer.
+Y_ABSL_CONST_INIT y_absl::Mutex s_freelist_guard(y_absl::kConstInit);
+Y_ABSL_CONST_INIT std::vector<void*>* s_freelist = nullptr;
+
+void AddToFreelist(void* p) {
+  y_absl::MutexLock l(&s_freelist_guard);
+  if (!s_freelist) {
+    s_freelist = new std::vector<void*>;
+  }
+  s_freelist->push_back(p);
+}
+
 }  // namespace
 
+///////////////////////////////////////////////////////////////////////////////
+
+uint64_t NumLeakedFlagValues() {
+  y_absl::MutexLock l(&s_freelist_guard);
+  return s_freelist == nullptr ? 0u : s_freelist->size();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Persistent state of the flag data.
 
@@ -97,7 +122,7 @@ class FlagState : public flags_internal::FlagStateInterface {
         counter_(counter) {}
 
   ~FlagState() override {
-    if (flag_impl_.ValueStorageKind() != FlagValueStorageKind::kAlignedBuffer &&
+    if (flag_impl_.ValueStorageKind() != FlagValueStorageKind::kHeapAllocated &&
         flag_impl_.ValueStorageKind() != FlagValueStorageKind::kSequenceLocked)
       return;
     flags_internal::Delete(flag_impl_.op_, value_.heap_allocated);
@@ -140,6 +165,33 @@ void DynValueDeleter::operator()(void* ptr) const {
   Delete(op, ptr);
 }
 
+MaskedPointer::MaskedPointer(ptr_t rhs, bool is_candidate) : ptr_(rhs) {
+  if (is_candidate) {
+    ApplyMask(kUnprotectedReadCandidate);
+  }
+}
+
+bool MaskedPointer::IsUnprotectedReadCandidate() const {
+  return CheckMask(kUnprotectedReadCandidate);
+}
+
+bool MaskedPointer::HasBeenRead() const { return CheckMask(kHasBeenRead); }
+
+void MaskedPointer::Set(FlagOpFn op, const void* src, bool is_candidate) {
+  flags_internal::Copy(op, src, Ptr());
+  if (is_candidate) {
+    ApplyMask(kUnprotectedReadCandidate);
+  }
+}
+void MaskedPointer::MarkAsRead() { ApplyMask(kHasBeenRead); }
+
+void MaskedPointer::ApplyMask(mask_t mask) {
+  ptr_ = reinterpret_cast<ptr_t>(reinterpret_cast<mask_t>(ptr_) | mask);
+}
+bool MaskedPointer::CheckMask(mask_t mask) const {
+  return (reinterpret_cast<mask_t>(ptr_) & mask) != 0;
+}
+
 void FlagImpl::Init() {
   new (&data_guard_) y_absl::Mutex;
 
@@ -174,11 +226,16 @@ void FlagImpl::Init() {
       (*default_value_.gen_func)(AtomicBufferValue());
       break;
     }
-    case FlagValueStorageKind::kAlignedBuffer:
+    case FlagValueStorageKind::kHeapAllocated:
       // For this storage kind the default_value_ always points to gen_func
       // during initialization.
       assert(def_kind == FlagDefaultKind::kGenFunc);
-      (*default_value_.gen_func)(AlignedBufferValue());
+      // Flag value initially points to the internal buffer.
+      MaskedPointer ptr_value = PtrStorage().load(std::memory_order_acquire);
+      (*default_value_.gen_func)(ptr_value.Ptr());
+      // Default value is a candidate for an unprotected read.
+      PtrStorage().store(MaskedPointer(ptr_value.Ptr(), true),
+                         std::memory_order_release);
       break;
   }
   seq_lock_.MarkInitialized();
@@ -234,7 +291,7 @@ std::unique_ptr<void, DynValueDeleter> FlagImpl::MakeInitValue() const {
   return {res, DynValueDeleter{op_}};
 }
 
-void FlagImpl::StoreValue(const void* src) {
+void FlagImpl::StoreValue(const void* src, ValueSource source) {
   switch (ValueStorageKind()) {
     case FlagValueStorageKind::kValueAndInitBit:
     case FlagValueStorageKind::kOneWordAtomic: {
@@ -249,8 +306,27 @@ void FlagImpl::StoreValue(const void* src) {
       seq_lock_.Write(AtomicBufferValue(), src, Sizeof(op_));
       break;
     }
-    case FlagValueStorageKind::kAlignedBuffer:
-      Copy(op_, src, AlignedBufferValue());
+    case FlagValueStorageKind::kHeapAllocated:
+      MaskedPointer ptr_value = PtrStorage().load(std::memory_order_acquire);
+
+      if (ptr_value.IsUnprotectedReadCandidate() && ptr_value.HasBeenRead()) {
+        // If current value is a candidate for an unprotected read and if it was
+        // already read at least once, follow up reads (if any) are done without
+        // mutex protection. We can't guarantee it is safe to reuse this memory
+        // since it may have been accessed by another thread concurrently, so
+        // instead we move the memory to a freelist so it can still be safely
+        // accessed, and allocate a new one for the new value.
+        AddToFreelist(ptr_value.Ptr());
+        ptr_value = MaskedPointer(Clone(op_, src), source == kCommandLine);
+      } else {
+        // Current value either was set programmatically or was never read.
+        // We can reuse the memory since all accesses to this value (if any)
+        // were protected by mutex. That said, if a new value comes from command
+        // line it now becomes a candidate for an unprotected read.
+        ptr_value.Set(op_, src, source == kCommandLine);
+      }
+
+      PtrStorage().store(ptr_value, std::memory_order_release);
       seq_lock_.IncrementModificationCount();
       break;
   }
@@ -305,9 +381,10 @@ TString FlagImpl::CurrentValue() const {
       ReadSequenceLockedData(cloned.get());
       return flags_internal::Unparse(op_, cloned.get());
     }
-    case FlagValueStorageKind::kAlignedBuffer: {
+    case FlagValueStorageKind::kHeapAllocated: {
       y_absl::MutexLock l(guard);
-      return flags_internal::Unparse(op_, AlignedBufferValue());
+      return flags_internal::Unparse(
+          op_, PtrStorage().load(std::memory_order_acquire).Ptr());
     }
   }
 
@@ -370,10 +447,12 @@ std::unique_ptr<FlagStateInterface> FlagImpl::SaveState() {
       return y_absl::make_unique<FlagState>(*this, cloned, modified,
                                           on_command_line, ModificationCount());
     }
-    case FlagValueStorageKind::kAlignedBuffer: {
+    case FlagValueStorageKind::kHeapAllocated: {
       return y_absl::make_unique<FlagState>(
-          *this, flags_internal::Clone(op_, AlignedBufferValue()), modified,
-          on_command_line, ModificationCount());
+          *this,
+          flags_internal::Clone(
+              op_, PtrStorage().load(std::memory_order_acquire).Ptr()),
+          modified, on_command_line, ModificationCount());
     }
   }
   return nullptr;
@@ -388,11 +467,11 @@ bool FlagImpl::RestoreState(const FlagState& flag_state) {
   switch (ValueStorageKind()) {
     case FlagValueStorageKind::kValueAndInitBit:
     case FlagValueStorageKind::kOneWordAtomic:
-      StoreValue(&flag_state.value_.one_word);
+      StoreValue(&flag_state.value_.one_word, kProgrammaticChange);
       break;
     case FlagValueStorageKind::kSequenceLocked:
-    case FlagValueStorageKind::kAlignedBuffer:
-      StoreValue(flag_state.value_.heap_allocated);
+    case FlagValueStorageKind::kHeapAllocated:
+      StoreValue(flag_state.value_.heap_allocated, kProgrammaticChange);
       break;
   }
 
@@ -411,11 +490,6 @@ StorageT* FlagImpl::OffsetValue() const {
   return reinterpret_cast<StorageT*>(p + offset);
 }
 
-void* FlagImpl::AlignedBufferValue() const {
-  assert(ValueStorageKind() == FlagValueStorageKind::kAlignedBuffer);
-  return OffsetValue<void>();
-}
-
 std::atomic<uint64_t>* FlagImpl::AtomicBufferValue() const {
   assert(ValueStorageKind() == FlagValueStorageKind::kSequenceLocked);
   return OffsetValue<std::atomic<uint64_t>>();
@@ -427,6 +501,11 @@ std::atomic<int64_t>& FlagImpl::OneWordValue() const {
   return OffsetValue<FlagOneWordValue>()->value;
 }
 
+std::atomic<MaskedPointer>& FlagImpl::PtrStorage() const {
+  assert(ValueStorageKind() == FlagValueStorageKind::kHeapAllocated);
+  return OffsetValue<FlagMaskedPointerValue>()->value;
+}
+
 // Attempts to parse supplied `value` string using parsing routine in the `flag`
 // argument. If parsing successful, this function replaces the dst with newly
 // parsed value. In case if any error is encountered in either step, the error
@@ -460,9 +539,17 @@ void FlagImpl::Read(void* dst) const {
       ReadSequenceLockedData(dst);
       break;
     }
-    case FlagValueStorageKind::kAlignedBuffer: {
+    case FlagValueStorageKind::kHeapAllocated: {
       y_absl::MutexLock l(guard);
-      flags_internal::CopyConstruct(op_, AlignedBufferValue(), dst);
+      MaskedPointer ptr_value = PtrStorage().load(std::memory_order_acquire);
+
+      flags_internal::CopyConstruct(op_, ptr_value.Ptr(), dst);
+
+      // For unprotected read candidates, mark that the value as has been read.
+      if (ptr_value.IsUnprotectedReadCandidate() && !ptr_value.HasBeenRead()) {
+        ptr_value.MarkAsRead();
+        PtrStorage().store(ptr_value, std::memory_order_release);
+      }
       break;
     }
   }
@@ -513,7 +600,7 @@ void FlagImpl::Write(const void* src) {
     }
   }
 
-  StoreValue(src);
+  StoreValue(src, kProgrammaticChange);
 }
 
 // Sets the value of the flag based on specified string `value`. If the flag
@@ -534,7 +621,7 @@ bool FlagImpl::ParseFrom(y_absl::string_view value, FlagSettingMode set_mode,
       auto tentative_value = TryParse(value, err);
       if (!tentative_value) return false;
 
-      StoreValue(tentative_value.get());
+      StoreValue(tentative_value.get(), source);
 
       if (source == kCommandLine) {
         on_command_line_ = true;
@@ -555,7 +642,7 @@ bool FlagImpl::ParseFrom(y_absl::string_view value, FlagSettingMode set_mode,
       auto tentative_value = TryParse(value, err);
       if (!tentative_value) return false;
 
-      StoreValue(tentative_value.get());
+      StoreValue(tentative_value.get(), source);
       break;
     }
     case SET_FLAGS_DEFAULT: {
@@ -573,7 +660,7 @@ bool FlagImpl::ParseFrom(y_absl::string_view value, FlagSettingMode set_mode,
 
       if (!modified_) {
         // Need to set both default value *and* current, in this case.
-        StoreValue(default_value_.dynamic_value);
+        StoreValue(default_value_.dynamic_value, source);
         modified_ = false;
       }
       break;
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag.h b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag.h
index ecccfe0edb1a..6a3b2c1376f3 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/internal/flag.h
@@ -22,7 +22,6 @@
 #include <atomic>
 #include <cstring>
 #include <memory>
-#include <new>
 #include <util/generic/string.h>
 #include <type_traits>
 #include <typeinfo>
@@ -296,11 +295,8 @@ constexpr FlagDefaultArg DefaultArg(char) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// Flag current value auxiliary structs.
-
-constexpr int64_t UninitializedFlagValue() {
-  return static_cast<int64_t>(0xababababababababll);
-}
+// Flag storage selector traits. Each trait indicates what kind of storage kind
+// to use for the flag value.
 
 template <typename T>
 using FlagUseValueAndInitBitStorage =
@@ -322,9 +318,11 @@ enum class FlagValueStorageKind : uint8_t {
   kValueAndInitBit = 0,
   kOneWordAtomic = 1,
   kSequenceLocked = 2,
-  kAlignedBuffer = 3,
+  kHeapAllocated = 3,
 };
 
+// This constexpr function returns the storage kind for the given flag value
+// type.
 template <typename T>
 static constexpr FlagValueStorageKind StorageKind() {
   return FlagUseValueAndInitBitStorage<T>::value
@@ -333,14 +331,24 @@ static constexpr FlagValueStorageKind StorageKind() {
              ? FlagValueStorageKind::kOneWordAtomic
          : FlagUseSequenceLockStorage<T>::value
              ? FlagValueStorageKind::kSequenceLocked
-             : FlagValueStorageKind::kAlignedBuffer;
+             : FlagValueStorageKind::kHeapAllocated;
 }
 
+// This is a base class for the storage classes used by kOneWordAtomic and
+// kValueAndInitBit storage kinds. It literally just stores the one word value
+// as an atomic. By default, it is initialized to a magic value that is unlikely
+// a valid value for the flag value type.
 struct FlagOneWordValue {
+  constexpr static int64_t Uninitialized() {
+    return static_cast<int64_t>(0xababababababababll);
+  }
+
+  constexpr FlagOneWordValue() : value(Uninitialized()) {}
   constexpr explicit FlagOneWordValue(int64_t v) : value(v) {}
   std::atomic<int64_t> value;
 };
 
+// This class represents a memory layout used by kValueAndInitBit storage kind.
 template <typename T>
 struct alignas(8) FlagValueAndInitBit {
   T value;
@@ -349,16 +357,91 @@ struct alignas(8) FlagValueAndInitBit {
   uint8_t init;
 };
 
+// This class implements an aligned pointer with two options stored via masks
+// in unused bits of the pointer value (due to alignment requirement).
+//  - IsUnprotectedReadCandidate - indicates that the value can be switched to
+//    unprotected read without a lock.
+//  - HasBeenRead - indicates that the value has been read at least once.
+//  - AllowsUnprotectedRead - combination of the two options above and indicates
+//    that the value can now be read without a lock.
+// Further details of these options and their use is covered in the description
+// of the FlagValue<T, FlagValueStorageKind::kHeapAllocated> specialization.
+class MaskedPointer {
+ public:
+  using mask_t = uintptr_t;
+  using ptr_t = void*;
+
+  static constexpr int RequiredAlignment() { return 4; }
+
+  constexpr explicit MaskedPointer(ptr_t rhs) : ptr_(rhs) {}
+  MaskedPointer(ptr_t rhs, bool is_candidate);
+
+  void* Ptr() const {
+    return reinterpret_cast<void*>(reinterpret_cast<mask_t>(ptr_) &
+                                   kPtrValueMask);
+  }
+  bool AllowsUnprotectedRead() const {
+    return (reinterpret_cast<mask_t>(ptr_) & kAllowsUnprotectedRead) ==
+           kAllowsUnprotectedRead;
+  }
+  bool IsUnprotectedReadCandidate() const;
+  bool HasBeenRead() const;
+
+  void Set(FlagOpFn op, const void* src, bool is_candidate);
+  void MarkAsRead();
+
+ private:
+  // Masks
+  // Indicates that the flag value either default or originated from command
+  // line.
+  static constexpr mask_t kUnprotectedReadCandidate = 0x1u;
+  // Indicates that flag has been read.
+  static constexpr mask_t kHasBeenRead = 0x2u;
+  static constexpr mask_t kAllowsUnprotectedRead =
+      kUnprotectedReadCandidate | kHasBeenRead;
+  static constexpr mask_t kPtrValueMask = ~kAllowsUnprotectedRead;
+
+  void ApplyMask(mask_t mask);
+  bool CheckMask(mask_t mask) const;
+
+  ptr_t ptr_;
+};
+
+// This class implements a type erased storage of the heap allocated flag value.
+// It is used as a base class for the storage class for kHeapAllocated storage
+// kind. The initial_buffer is expected to have an alignment of at least
+// MaskedPointer::RequiredAlignment(), so that the bits used by the
+// MaskedPointer to store masks are set to 0. This guarantees that value starts
+// in an uninitialized state.
+struct FlagMaskedPointerValue {
+  constexpr explicit FlagMaskedPointerValue(MaskedPointer::ptr_t initial_buffer)
+      : value(MaskedPointer(initial_buffer)) {}
+
+  std::atomic<MaskedPointer> value;
+};
+
+// This is the forward declaration for the template that represents a storage
+// for the flag values. This template is expected to be explicitly specialized
+// for each storage kind and it does not have a generic default
+// implementation.
 template <typename T,
           FlagValueStorageKind Kind = flags_internal::StorageKind<T>()>
 struct FlagValue;
 
+// This specialization represents the storage of flag values types with the
+// kValueAndInitBit storage kind. It is based on the FlagOneWordValue class
+// and relies on memory layout in FlagValueAndInitBit<T> to indicate that the
+// value has been initialized or not.
 template <typename T>
 struct FlagValue<T, FlagValueStorageKind::kValueAndInitBit> : FlagOneWordValue {
   constexpr FlagValue() : FlagOneWordValue(0) {}
   bool Get(const SequenceLock&, T& dst) const {
     int64_t storage = value.load(std::memory_order_acquire);
     if (Y_ABSL_PREDICT_FALSE(storage == 0)) {
+      // This assert is to ensure that the initialization inside FlagImpl::Init
+      // is able to set init member correctly.
+      static_assert(offsetof(FlagValueAndInitBit<T>, init) == sizeof(T),
+                    "Unexpected memory layout of FlagValueAndInitBit");
       return false;
     }
     dst = y_absl::bit_cast<FlagValueAndInitBit<T>>(storage).value;
@@ -366,12 +449,16 @@ struct FlagValue<T, FlagValueStorageKind::kValueAndInitBit> : FlagOneWordValue {
   }
 };
 
+// This specialization represents the storage of flag values types with the
+// kOneWordAtomic storage kind. It is based on the FlagOneWordValue class
+// and relies on the magic uninitialized state of default constructed instead of
+// FlagOneWordValue to indicate that the value has been initialized or not.
 template <typename T>
 struct FlagValue<T, FlagValueStorageKind::kOneWordAtomic> : FlagOneWordValue {
-  constexpr FlagValue() : FlagOneWordValue(UninitializedFlagValue()) {}
+  constexpr FlagValue() : FlagOneWordValue() {}
   bool Get(const SequenceLock&, T& dst) const {
     int64_t one_word_val = value.load(std::memory_order_acquire);
-    if (Y_ABSL_PREDICT_FALSE(one_word_val == UninitializedFlagValue())) {
+    if (Y_ABSL_PREDICT_FALSE(one_word_val == FlagOneWordValue::Uninitialized())) {
       return false;
     }
     std::memcpy(&dst, static_cast<const void*>(&one_word_val), sizeof(T));
@@ -379,6 +466,12 @@ struct FlagValue<T, FlagValueStorageKind::kOneWordAtomic> : FlagOneWordValue {
   }
 };
 
+// This specialization represents the storage of flag values types with the
+// kSequenceLocked storage kind. This storage is used by trivially copyable
+// types with size greater than 8 bytes. This storage relies on uninitialized
+// state of the SequenceLock to indicate that the value has been initialized or
+// not. This storage also provides lock-free read access to the underlying
+// value once it is initialized.
 template <typename T>
 struct FlagValue<T, FlagValueStorageKind::kSequenceLocked> {
   bool Get(const SequenceLock& lock, T& dst) const {
@@ -392,11 +485,62 @@ struct FlagValue<T, FlagValueStorageKind::kSequenceLocked> {
       std::atomic<uint64_t>) std::atomic<uint64_t> value_words[kNumWords];
 };
 
+// This specialization represents the storage of flag values types with the
+// kHeapAllocated storage kind. This is a storage of last resort and is used
+// if none of other storage kinds are applicable.
+//
+// Generally speaking the values with this storage kind can't be accessed
+// atomically and thus can't be read without holding a lock. If we would ever
+// want to avoid the lock, we'd need to leak the old value every time new flag
+// value is being set (since we are in danger of having a race condition
+// otherwise).
+//
+// Instead of doing that, this implementation attempts to cater to some common
+// use cases by allowing at most 2 values to be leaked - default value and
+// value set from the command line.
+//
+// This specialization provides an initial buffer for the first flag value. This
+// is where the default value is going to be stored. We attempt to reuse this
+// buffer if possible, including storing the value set from the command line
+// there.
+//
+// As long as we only read this value, we can access it without a lock (in
+// practice we still use the lock for the very first read to be able set
+// "has been read" option on this flag).
+//
+// If flag is specified on the command line we store the parsed value either
+// in the internal buffer (if the default value never been read) or we leak the
+// default value and allocate the new storage for the parse value. This value is
+// also a candidate for an unprotected read. If flag is set programmatically
+// after the command line is parsed, the storage for this value is going to be
+// leaked. Note that in both scenarios we are not going to have a real leak.
+// Instead we'll store the leaked value pointers in the internal freelist to
+// avoid triggering the memory leak checker complains.
+//
+// If the flag is ever set programmatically, it stops being the candidate for an
+// unprotected read, and any follow up access to the flag value requires a lock.
+// Note that if the value if set programmatically before the command line is
+// parsed, we can switch back to enabling unprotected reads for that value.
 template <typename T>
-struct FlagValue<T, FlagValueStorageKind::kAlignedBuffer> {
-  bool Get(const SequenceLock&, T&) const { return false; }
+struct FlagValue<T, FlagValueStorageKind::kHeapAllocated>
+    : FlagMaskedPointerValue {
+  // We const initialize the value with unmasked pointer to the internal buffer,
+  // making sure it is not a candidate for unprotected read. This way we can
+  // ensure Init is done before any access to the flag value.
+  constexpr FlagValue() : FlagMaskedPointerValue(&buffer[0]) {}
+
+  bool Get(const SequenceLock&, T& dst) const {
+    MaskedPointer ptr_value = value.load(std::memory_order_acquire);
 
-  alignas(T) char value[sizeof(T)];
+    if (Y_ABSL_PREDICT_TRUE(ptr_value.AllowsUnprotectedRead())) {
+      ::new (static_cast<void*>(&dst)) T(*static_cast<T*>(ptr_value.Ptr()));
+      return true;
+    }
+    return false;
+  }
+
+  alignas(MaskedPointer::RequiredAlignment()) alignas(
+      T) char buffer[sizeof(T)]{};
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -425,6 +569,13 @@ struct DynValueDeleter {
 
 class FlagState;
 
+// These are only used as constexpr global objects.
+// They do not use a virtual destructor to simplify their implementation.
+// They are not destroyed except at program exit, so leaks do not matter.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 class FlagImpl final : public CommandLineFlag {
  public:
   constexpr FlagImpl(const char* name, const char* filename, FlagOpFn op,
@@ -477,7 +628,7 @@ class FlagImpl final : public CommandLineFlag {
   // Used in read/write operations to validate source/target has correct type.
   // For example if flag is declared as y_absl::Flag<int> FLAGS_foo, a call to
   // y_absl::GetFlag(FLAGS_foo) validates that the type of FLAGS_foo is indeed
-  // int. To do that we pass the "assumed" type id (which is deduced from type
+  // int. To do that we pass the assumed type id (which is deduced from type
   // int) as an argument `type_id`, which is in turn is validated against the
   // type id stored in flag object by flag definition statement.
   void AssertValidType(FlagFastTypeId type_id,
@@ -498,17 +649,13 @@ class FlagImpl final : public CommandLineFlag {
   void Init();
 
   // Offset value access methods. One per storage kind. These methods to not
-  // respect const correctness, so be very carefull using them.
+  // respect const correctness, so be very careful using them.
 
   // This is a shared helper routine which encapsulates most of the magic. Since
   // it is only used inside the three routines below, which are defined in
   // flag.cc, we can define it in that file as well.
   template <typename StorageT>
   StorageT* OffsetValue() const;
-  // This is an accessor for a value stored in an aligned buffer storage
-  // used for non-trivially-copyable data types.
-  // Returns a mutable pointer to the start of a buffer.
-  void* AlignedBufferValue() const;
 
   // The same as above, but used for sequencelock-protected storage.
   std::atomic<uint64_t>* AtomicBufferValue() const;
@@ -517,13 +664,16 @@ class FlagImpl final : public CommandLineFlag {
   // mutable reference to an atomic value.
   std::atomic<int64_t>& OneWordValue() const;
 
+  std::atomic<MaskedPointer>& PtrStorage() const;
+
   // Attempts to parse supplied `value` string. If parsing is successful,
   // returns new value. Otherwise returns nullptr.
   std::unique_ptr<void, DynValueDeleter> TryParse(y_absl::string_view value,
                                                   TString& err) const
       Y_ABSL_EXCLUSIVE_LOCKS_REQUIRED(*DataGuard());
   // Stores the flag value based on the pointer to the source.
-  void StoreValue(const void* src) Y_ABSL_EXCLUSIVE_LOCKS_REQUIRED(*DataGuard());
+  void StoreValue(const void* src, ValueSource source)
+      Y_ABSL_EXCLUSIVE_LOCKS_REQUIRED(*DataGuard());
 
   // Copy the flag data, protected by `seq_lock_` into `dst`.
   //
@@ -579,7 +729,7 @@ class FlagImpl final : public CommandLineFlag {
   const char* const name_;
   // The file name where Y_ABSL_FLAG resides.
   const char* const filename_;
-  // Type-specific operations "vtable".
+  // Type-specific operations vtable.
   const FlagOpFn op_;
   // Help message literal or function to generate it.
   const FlagHelpMsg help_;
@@ -624,6 +774,9 @@ class FlagImpl final : public CommandLineFlag {
   // problems.
   alignas(y_absl::Mutex) mutable char data_guard_[sizeof(y_absl::Mutex)];
 };
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // The Flag object parameterized by the flag's value type. This class implements
@@ -711,16 +864,21 @@ class FlagImplPeer {
 // Implementation of Flag value specific operations routine.
 template <typename T>
 void* FlagOps(FlagOp op, const void* v1, void* v2, void* v3) {
+  struct AlignedSpace {
+    alignas(MaskedPointer::RequiredAlignment()) alignas(T) char buf[sizeof(T)];
+  };
+  using Allocator = std::allocator<AlignedSpace>;
   switch (op) {
     case FlagOp::kAlloc: {
-      std::allocator<T> alloc;
-      return std::allocator_traits<std::allocator<T>>::allocate(alloc, 1);
+      Allocator alloc;
+      return std::allocator_traits<Allocator>::allocate(alloc, 1);
     }
     case FlagOp::kDelete: {
       T* p = static_cast<T*>(v2);
       p->~T();
-      std::allocator<T> alloc;
-      std::allocator_traits<std::allocator<T>>::deallocate(alloc, p, 1);
+      Allocator alloc;
+      std::allocator_traits<Allocator>::deallocate(
+          alloc, reinterpret_cast<AlignedSpace*>(p), 1);
       return nullptr;
     }
     case FlagOp::kCopy:
@@ -754,8 +912,7 @@ void* FlagOps(FlagOp op, const void* v1, void* v2, void* v3) {
       // Round sizeof(FlagImp) to a multiple of alignof(FlagValue<T>) to get the
       // offset of the data.
       size_t round_to = alignof(FlagValue<T>);
-      size_t offset =
-          (sizeof(FlagImpl) + round_to - 1) / round_to * round_to;
+      size_t offset = (sizeof(FlagImpl) + round_to - 1) / round_to * round_to;
       return reinterpret_cast<void*>(offset);
     }
   }
@@ -770,7 +927,8 @@ struct FlagRegistrarEmpty {};
 template <typename T, bool do_register>
 class FlagRegistrar {
  public:
-  explicit FlagRegistrar(Flag<T>& flag, const char* filename) : flag_(flag) {
+  constexpr explicit FlagRegistrar(Flag<T>& flag, const char* filename)
+      : flag_(flag) {
     if (do_register)
       flags_internal::RegisterCommandLineFlag(flag_.impl_, filename);
   }
@@ -780,15 +938,19 @@ class FlagRegistrar {
     return *this;
   }
 
-  // Make the registrar "die" gracefully as an empty struct on a line where
+  // Makes the registrar die gracefully as an empty struct on a line where
   // registration happens. Registrar objects are intended to live only as
   // temporary.
-  operator FlagRegistrarEmpty() const { return {}; }  // NOLINT
+  constexpr operator FlagRegistrarEmpty() const { return {}; }  // NOLINT
 
  private:
   Flag<T>& flag_;  // Flag being registered (not owned).
 };
 
+///////////////////////////////////////////////////////////////////////////////
+// Test only API
+uint64_t NumLeakedFlagValues();
+
 }  // namespace flags_internal
 Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/reflection.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/reflection.cc
index 61d52e612169..4ecec8411bbc 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/flags/reflection.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/flags/reflection.cc
@@ -217,6 +217,13 @@ void FinalizeRegistry() {
 
 namespace {
 
+// These are only used as constexpr global objects.
+// They do not use a virtual destructor to simplify their implementation.
+// They are not destroyed except at program exit, so leaks do not matter.
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 class RetiredFlagObj final : public CommandLineFlag {
  public:
   constexpr RetiredFlagObj(const char* name, FlagFastTypeId type_id)
@@ -276,6 +283,9 @@ class RetiredFlagObj final : public CommandLineFlag {
   const char* const name_;
   const FlagFastTypeId type_id_;
 };
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 
 }  // namespace
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/any_invocable.h b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/any_invocable.h
index f04000578a98..d3e96ad5853b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/any_invocable.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/any_invocable.h
@@ -34,6 +34,7 @@
 #define Y_ABSL_FUNCTIONAL_ANY_INVOCABLE_H_
 
 #include <cstddef>
+#include <functional>
 #include <initializer_list>
 #include <type_traits>
 #include <utility>
@@ -98,9 +99,9 @@ Y_ABSL_NAMESPACE_BEGIN
 // `AnyInvocable` also properly respects `const` qualifiers, reference
 // qualifiers, and the `noexcept` specification (only in C++ 17 and beyond) as
 // part of the user-specified function type (e.g.
-// `AnyInvocable<void()&& const noexcept>`). These qualifiers will be applied to
-// the `AnyInvocable` object's `operator()`, and the underlying invocable must
-// be compatible with those qualifiers.
+// `AnyInvocable<void() const && noexcept>`). These qualifiers will be applied
+// to the `AnyInvocable` object's `operator()`, and the underlying invocable
+// must be compatible with those qualifiers.
 //
 // Comparison of const and non-const function types:
 //
@@ -151,6 +152,12 @@ Y_ABSL_NAMESPACE_BEGIN
 //
 // Attempting to call `y_absl::AnyInvocable` multiple times in such a case
 // results in undefined behavior.
+//
+// Invoking an empty `y_absl::AnyInvocable` results in undefined behavior:
+//
+//   // Create an empty instance using the default constructor.
+//   AnyInvocable<void()> empty;
+//   empty();  // WARNING: Undefined behavior!
 template <class Sig>
 class AnyInvocable : private internal_any_invocable::Impl<Sig> {
  private:
@@ -167,6 +174,7 @@ class AnyInvocable : private internal_any_invocable::Impl<Sig> {
   // Constructors
 
   // Constructs the `AnyInvocable` in an empty state.
+  // Invoking it results in undefined behavior.
   AnyInvocable() noexcept = default;
   AnyInvocable(std::nullptr_t) noexcept {}  // NOLINT
 
@@ -277,6 +285,8 @@ class AnyInvocable : private internal_any_invocable::Impl<Sig> {
   // In other words:
   //   std::function<void()> f;  // empty
   //   y_absl::AnyInvocable<void()> a = std::move(f);  // not empty
+  //
+  // Invoking an empty `AnyInvocable` results in undefined behavior.
   explicit operator bool() const noexcept { return this->HasValue(); }
 
   // Invokes the target object of `*this`. `*this` must not be empty.
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/bind_front.h b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/bind_front.h
index 27597c486b2a..ecb2e62160f3 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/bind_front.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/bind_front.h
@@ -34,6 +34,8 @@
 #include <functional>  // For std::bind_front.
 #endif  // defined(__cpp_lib_bind_front) && __cpp_lib_bind_front >= 201907L
 
+#include <utility>
+
 #include "y_absl/functional/internal/front_binder.h"
 #include "y_absl/utility/utility.h"
 
@@ -182,8 +184,7 @@ template <class F, class... BoundArgs>
 constexpr functional_internal::bind_front_t<F, BoundArgs...> bind_front(
     F&& func, BoundArgs&&... args) {
   return functional_internal::bind_front_t<F, BoundArgs...>(
-      y_absl::in_place, y_absl::forward<F>(func),
-      y_absl::forward<BoundArgs>(args)...);
+      y_absl::in_place, std::forward<F>(func), std::forward<BoundArgs>(args)...);
 }
 #endif  // defined(__cpp_lib_bind_front) && __cpp_lib_bind_front >= 201907L
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/internal/any_invocable.h b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/internal/any_invocable.h
index 009a54c6b665..17163431ef87 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/internal/any_invocable.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/internal/any_invocable.h
@@ -19,11 +19,11 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
-// This implementation of the proposed `any_invocable` uses an approach that  //
-// chooses between local storage and remote storage for the contained target  //
-// object based on the target object's size, alignment requirements, and      //
-// whether or not it has a nothrow move constructor. Additional optimizations //
-// are performed when the object is a trivially copyable type [basic.types].  //
+// This implementation chooses between local storage and remote storage for   //
+// the contained target object based on the target object's size, alignment   //
+// requirements, and whether or not it has a nothrow move constructor.        //
+// Additional optimizations are performed when the object is a trivially      //
+// copyable type [basic.types].                                               //
 //                                                                            //
 // There are three datamembers per `AnyInvocable` instance                    //
 //                                                                            //
@@ -39,7 +39,7 @@
 //    target object, directly returning the result.                           //
 //                                                                            //
 // When in the logically empty state, the manager function is an empty        //
-// function and the invoker function is one that would be undefined-behavior  //
+// function and the invoker function is one that would be undefined behavior  //
 // to call.                                                                   //
 //                                                                            //
 // An additional optimization is performed when converting from one           //
@@ -58,12 +58,12 @@
 #include <cstring>
 #include <exception>
 #include <functional>
-#include <initializer_list>
 #include <memory>
 #include <new>
 #include <type_traits>
 #include <utility>
 
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/internal/invoke.h"
 #include "y_absl/base/macros.h"
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/internal/front_binder.h b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/internal/front_binder.h
index e20e1d266649..49fc58c881aa 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/internal/front_binder.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/internal/front_binder.h
@@ -34,8 +34,8 @@ namespace functional_internal {
 template <class R, class Tuple, size_t... Idx, class... Args>
 R Apply(Tuple&& bound, y_absl::index_sequence<Idx...>, Args&&... free) {
   return base_internal::invoke(
-      y_absl::forward<Tuple>(bound).template get<Idx>()...,
-      y_absl::forward<Args>(free)...);
+      std::forward<Tuple>(bound).template get<Idx>()...,
+      std::forward<Args>(free)...);
 }
 
 template <class F, class... BoundArgs>
@@ -48,13 +48,13 @@ class FrontBinder {
  public:
   template <class... Ts>
   constexpr explicit FrontBinder(y_absl::in_place_t, Ts&&... ts)
-      : bound_args_(y_absl::forward<Ts>(ts)...) {}
+      : bound_args_(std::forward<Ts>(ts)...) {}
 
   template <class... FreeArgs, class R = base_internal::invoke_result_t<
                                    F&, BoundArgs&..., FreeArgs&&...>>
   R operator()(FreeArgs&&... free_args) & {
     return functional_internal::Apply<R>(bound_args_, Idx(),
-                                         y_absl::forward<FreeArgs>(free_args)...);
+                                         std::forward<FreeArgs>(free_args)...);
   }
 
   template <class... FreeArgs,
@@ -62,7 +62,7 @@ class FrontBinder {
                 const F&, const BoundArgs&..., FreeArgs&&...>>
   R operator()(FreeArgs&&... free_args) const& {
     return functional_internal::Apply<R>(bound_args_, Idx(),
-                                         y_absl::forward<FreeArgs>(free_args)...);
+                                         std::forward<FreeArgs>(free_args)...);
   }
 
   template <class... FreeArgs, class R = base_internal::invoke_result_t<
@@ -70,8 +70,8 @@ class FrontBinder {
   R operator()(FreeArgs&&... free_args) && {
     // This overload is called when *this is an rvalue. If some of the bound
     // arguments are stored by value or rvalue reference, we move them.
-    return functional_internal::Apply<R>(y_absl::move(bound_args_), Idx(),
-                                         y_absl::forward<FreeArgs>(free_args)...);
+    return functional_internal::Apply<R>(std::move(bound_args_), Idx(),
+                                         std::forward<FreeArgs>(free_args)...);
   }
 
   template <class... FreeArgs,
@@ -80,8 +80,8 @@ class FrontBinder {
   R operator()(FreeArgs&&... free_args) const&& {
     // This overload is called when *this is an rvalue. If some of the bound
     // arguments are stored by value or rvalue reference, we move them.
-    return functional_internal::Apply<R>(y_absl::move(bound_args_), Idx(),
-                                         y_absl::forward<FreeArgs>(free_args)...);
+    return functional_internal::Apply<R>(std::move(bound_args_), Idx(),
+                                         std::forward<FreeArgs>(free_args)...);
   }
 };
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/ya.make
index ac5695f0720e..467248d2799d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/functional/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/functional/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 NO_RUNTIME()
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.cc
index 356cb7631c45..e335f01be8f9 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.cc
@@ -61,7 +61,7 @@ constexpr uint64_t kHashSalt[5] = {
 
 uint64_t MixingHashState::LowLevelHashImpl(const unsigned char* data,
                                            size_t len) {
-  return LowLevelHash(data, len, Seed(), kHashSalt);
+  return LowLevelHashLenGt16(data, len, Seed(), kHashSalt);
 }
 
 }  // namespace hash_internal
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.h b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.h
index b289e1fa5f0c..107afcaa6bb4 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/hash.h
@@ -24,6 +24,15 @@
 #include <TargetConditionals.h>
 #endif
 
+#include "y_absl/base/config.h"
+
+// For feature testing and determining which headers can be included.
+#if Y_ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L
+#include <version>
+#else
+#include <ciso646>
+#endif
+
 #include <algorithm>
 #include <array>
 #include <bitset>
@@ -47,7 +56,6 @@
 #include <utility>
 #include <vector>
 
-#include "y_absl/base/config.h"
 #include "y_absl/base/internal/unaligned_access.h"
 #include "y_absl/base/port.h"
 #include "y_absl/container/fixed_array.h"
@@ -61,7 +69,7 @@
 #include "y_absl/types/variant.h"
 #include "y_absl/utility/utility.h"
 
-#if Y_ABSL_INTERNAL_CPLUSPLUS_LANG >= 201703L && \
+#if defined(__cpp_lib_filesystem) && __cpp_lib_filesystem >= 201703L && \
     !defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)
 #include <filesystem>  // NOLINT
 #endif
@@ -591,7 +599,9 @@ H AbslHashValue(H hash_state, std::basic_string_view<Char> str) {
 #if defined(__cpp_lib_filesystem) && __cpp_lib_filesystem >= 201703L && \
     !defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY) && \
     (!defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) ||        \
-     __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000)
+     __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000) &&       \
+    (!defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) ||         \
+     __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101500)
 
 #define Y_ABSL_INTERNAL_STD_FILESYSTEM_PATH_HASH_AVAILABLE 1
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.cc
index 4c491215d9b9..1f431e0989d0 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.cc
@@ -14,6 +14,9 @@
 
 #include "y_absl/hash/internal/low_level_hash.h"
 
+#include <cstddef>
+#include <cstdint>
+
 #include "y_absl/base/internal/unaligned_access.h"
 #include "y_absl/base/prefetch.h"
 #include "y_absl/numeric/int128.h"
@@ -28,19 +31,22 @@ static uint64_t Mix(uint64_t v0, uint64_t v1) {
   return y_absl::Uint128Low64(p) ^ y_absl::Uint128High64(p);
 }
 
-uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
-                      const uint64_t salt[5]) {
+uint64_t LowLevelHashLenGt16(const void* data, size_t len, uint64_t seed,
+                             const uint64_t salt[5]) {
   // Prefetch the cacheline that data resides in.
   PrefetchToLocalCache(data);
   const uint8_t* ptr = static_cast<const uint8_t*>(data);
   uint64_t starting_length = static_cast<uint64_t>(len);
+  const uint8_t* last_16_ptr = ptr + starting_length - 16;
   uint64_t current_state = seed ^ salt[0];
 
   if (len > 64) {
     // If we have more than 64 bytes, we're going to handle chunks of 64
     // bytes at a time. We're going to build up two separate hash states
     // which we will then hash together.
-    uint64_t duplicated_state = current_state;
+    uint64_t duplicated_state0 = current_state;
+    uint64_t duplicated_state1 = current_state;
+    uint64_t duplicated_state2 = current_state;
 
     do {
       // Always prefetch the next cacheline.
@@ -55,40 +61,72 @@ uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
       uint64_t g = y_absl::base_internal::UnalignedLoad64(ptr + 48);
       uint64_t h = y_absl::base_internal::UnalignedLoad64(ptr + 56);
 
-      uint64_t cs0 = Mix(a ^ salt[1], b ^ current_state);
-      uint64_t cs1 = Mix(c ^ salt[2], d ^ current_state);
-      current_state = (cs0 ^ cs1);
+      current_state = Mix(a ^ salt[1], b ^ current_state);
+      duplicated_state0 = Mix(c ^ salt[2], d ^ duplicated_state0);
 
-      uint64_t ds0 = Mix(e ^ salt[3], f ^ duplicated_state);
-      uint64_t ds1 = Mix(g ^ salt[4], h ^ duplicated_state);
-      duplicated_state = (ds0 ^ ds1);
+      duplicated_state1 = Mix(e ^ salt[3], f ^ duplicated_state1);
+      duplicated_state2 = Mix(g ^ salt[4], h ^ duplicated_state2);
 
       ptr += 64;
       len -= 64;
     } while (len > 64);
 
-    current_state = current_state ^ duplicated_state;
+    current_state = (current_state ^ duplicated_state0) ^
+                    (duplicated_state1 + duplicated_state2);
   }
 
   // We now have a data `ptr` with at most 64 bytes and the current state
   // of the hashing state machine stored in current_state.
-  while (len > 16) {
+  if (len > 32) {
     uint64_t a = y_absl::base_internal::UnalignedLoad64(ptr);
     uint64_t b = y_absl::base_internal::UnalignedLoad64(ptr + 8);
+    uint64_t c = y_absl::base_internal::UnalignedLoad64(ptr + 16);
+    uint64_t d = y_absl::base_internal::UnalignedLoad64(ptr + 24);
 
-    current_state = Mix(a ^ salt[1], b ^ current_state);
+    uint64_t cs0 = Mix(a ^ salt[1], b ^ current_state);
+    uint64_t cs1 = Mix(c ^ salt[2], d ^ current_state);
+    current_state = cs0 ^ cs1;
+
+    ptr += 32;
+    len -= 32;
+  }
 
-    ptr += 16;
-    len -= 16;
+  // We now have a data `ptr` with at most 32 bytes and the current state
+  // of the hashing state machine stored in current_state.
+  if (len > 16) {
+    uint64_t a = y_absl::base_internal::UnalignedLoad64(ptr);
+    uint64_t b = y_absl::base_internal::UnalignedLoad64(ptr + 8);
+
+    current_state = Mix(a ^ salt[1], b ^ current_state);
   }
 
-  // We now have a data `ptr` with at most 16 bytes.
+  // We now have a data `ptr` with at least 1 and at most 16 bytes. But we can
+  // safely read from `ptr + len - 16`.
+  uint64_t a = y_absl::base_internal::UnalignedLoad64(last_16_ptr);
+  uint64_t b = y_absl::base_internal::UnalignedLoad64(last_16_ptr + 8);
+
+  return Mix(a ^ salt[1] ^ starting_length, b ^ current_state);
+}
+
+uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
+                      const uint64_t salt[5]) {
+  if (len > 16) return LowLevelHashLenGt16(data, len, seed, salt);
+
+  // Prefetch the cacheline that data resides in.
+  PrefetchToLocalCache(data);
+  const uint8_t* ptr = static_cast<const uint8_t*>(data);
+  uint64_t starting_length = static_cast<uint64_t>(len);
+  uint64_t current_state = seed ^ salt[0];
+  if (len == 0) return current_state;
+
   uint64_t a = 0;
   uint64_t b = 0;
+
+  // We now have a data `ptr` with at least 1 and at most 16 bytes.
   if (len > 8) {
     // When we have at least 9 and at most 16 bytes, set A to the first 64
-    // bits of the input and B to the last 64 bits of the input. Yes, they will
-    // overlap in the middle if we are working with less than the full 16
+    // bits of the input and B to the last 64 bits of the input. Yes, they
+    // will overlap in the middle if we are working with less than the full 16
     // bytes.
     a = y_absl::base_internal::UnalignedLoad64(ptr);
     b = y_absl::base_internal::UnalignedLoad64(ptr + len - 8);
@@ -97,20 +135,14 @@ uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
     // bits and B to the last 32 bits.
     a = y_absl::base_internal::UnalignedLoad32(ptr);
     b = y_absl::base_internal::UnalignedLoad32(ptr + len - 4);
-  } else if (len > 0) {
-    // If we have at least 1 and at most 3 bytes, read all of the provided
-    // bits into A, with some adjustments.
-    a = static_cast<uint64_t>((ptr[0] << 16) | (ptr[len >> 1] << 8) |
-                              ptr[len - 1]);
-    b = 0;
   } else {
-    a = 0;
-    b = 0;
+    // If we have at least 1 and at most 3 bytes, read 2 bytes into A and the
+    // other byte into B, with some adjustments.
+    a = static_cast<uint64_t>((ptr[0] << 8) | ptr[len - 1]);
+    b = static_cast<uint64_t>(ptr[len >> 1]);
   }
 
-  uint64_t w = Mix(a ^ salt[1], b ^ current_state);
-  uint64_t z = salt[1] ^ starting_length;
-  return Mix(w, z);
+  return Mix(a ^ salt[1] ^ starting_length, b ^ current_state);
 }
 
 }  // namespace hash_internal
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.h b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.h
index f371e5943390..e55e857188ee 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/hash/internal/low_level_hash.h
@@ -43,6 +43,10 @@ namespace hash_internal {
 uint64_t LowLevelHash(const void* data, size_t len, uint64_t seed,
                       const uint64_t salt[5]);
 
+// Same as above except the length must be greater than 16.
+uint64_t LowLevelHashLenGt16(const void* data, size_t len, uint64_t seed,
+                             const uint64_t salt[5]);
+
 }  // namespace hash_internal
 Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/ya.make
index d1894c43e59a..9e45a8300e1b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/memory/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/memory/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/abseil-cpp-tstring/y_absl/meta
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/type_traits.h b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/type_traits.h
index 0bec59b05641..b05179217b94 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/type_traits.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/type_traits.h
@@ -37,11 +37,21 @@
 
 #include <cstddef>
 #include <functional>
+#include <util/generic/string.h>
 #include <type_traits>
+#include <vector>
 
 #include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 
+#ifdef __cpp_lib_span
+#include <span>  // NOLINT(build/c++20)
+#endif
+
+#ifdef Y_ABSL_HAVE_STD_STRING_VIEW
+#include <string_view>
+#endif
+
 // Defines the default alignment. `__STDCPP_DEFAULT_NEW_ALIGNMENT__` is a C++17
 // feature.
 #if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
@@ -152,8 +162,8 @@ template <typename... Ts>
 struct disjunction : std::false_type {};
 
 template <typename T, typename... Ts>
-struct disjunction<T, Ts...> :
-      std::conditional<T::value, T, disjunction<Ts...>>::type {};
+struct disjunction<T, Ts...>
+    : std::conditional<T::value, T, disjunction<Ts...>>::type {};
 
 template <typename T>
 struct disjunction<T> : T {};
@@ -279,27 +289,6 @@ using remove_extent_t = typename std::remove_extent<T>::type;
 template <typename T>
 using remove_all_extents_t = typename std::remove_all_extents<T>::type;
 
-Y_ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
-namespace type_traits_internal {
-// This trick to retrieve a default alignment is necessary for our
-// implementation of aligned_storage_t to be consistent with any
-// implementation of std::aligned_storage.
-template <size_t Len, typename T = std::aligned_storage<Len>>
-struct default_alignment_of_aligned_storage;
-
-template <size_t Len, size_t Align>
-struct default_alignment_of_aligned_storage<
-    Len, std::aligned_storage<Len, Align>> {
-  static constexpr size_t value = Align;
-};
-}  // namespace type_traits_internal
-
-// TODO(b/260219225): std::aligned_storage(_t) is deprecated in C++23.
-template <size_t Len, size_t Align = type_traits_internal::
-                          default_alignment_of_aligned_storage<Len>::value>
-using aligned_storage_t = typename std::aligned_storage<Len, Align>::type;
-Y_ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
-
 template <typename T>
 using decay_t = typename std::decay<T>::type;
 
@@ -315,22 +304,23 @@ using common_type_t = typename std::common_type<T...>::type;
 template <typename T>
 using underlying_type_t = typename std::underlying_type<T>::type;
 
-
 namespace type_traits_internal {
 
 #if (defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703L) || \
     (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
 // std::result_of is deprecated (C++17) or removed (C++20)
-template<typename> struct result_of;
-template<typename F, typename... Args>
+template <typename>
+struct result_of;
+template <typename F, typename... Args>
 struct result_of<F(Args...)> : std::invoke_result<F, Args...> {};
 #else
-template<typename F> using result_of = std::result_of<F>;
+template <typename F>
+using result_of = std::result_of<F>;
 #endif
 
 }  // namespace type_traits_internal
 
-template<typename F>
+template <typename F>
 using result_of_t = typename type_traits_internal::result_of<F>::type;
 
 namespace type_traits_internal {
@@ -463,20 +453,23 @@ namespace type_traits_internal {
 // Make the swap-related traits/function accessible from this namespace.
 using swap_internal::IsNothrowSwappable;
 using swap_internal::IsSwappable;
-using swap_internal::Swap;
 using swap_internal::StdSwapIsUnconstrained;
+using swap_internal::Swap;
 
 }  // namespace type_traits_internal
 
 // y_absl::is_trivially_relocatable<T>
 //
 // Detects whether a type is known to be "trivially relocatable" -- meaning it
-// can be relocated without invoking the constructor/destructor, using a form of
-// move elision.
+// can be relocated from one place to another as if by memcpy/memmove.
+// This implies that its object representation doesn't depend on its address,
+// and also none of its special member functions do anything strange.
 //
-// This trait is conservative, for backwards compatibility. If it's true then
-// the type is definitely trivially relocatable, but if it's false then the type
-// may or may not be.
+// This trait is conservative. If it's true then the type is definitely
+// trivially relocatable, but if it's false then the type may or may not be. For
+// example, std::vector<int> is trivially relocatable on every known STL
+// implementation, but y_absl::is_trivially_relocatable<std::vector<int>> remains
+// false.
 //
 // Example:
 //
@@ -501,22 +494,34 @@ using swap_internal::StdSwapIsUnconstrained;
 //
 // TODO(b/275003464): remove the opt-out once the bug is fixed.
 //
+// Starting with Xcode 15, the Apple compiler will falsely say a type
+// with a user-provided move constructor is trivially relocatable
+// (b/324278148). We will opt out without a version check, due to
+// the fluidity of Apple versions.
+//
+// TODO(b/324278148): If all versions we use have the bug fixed, then
+// remove the condition.
+//
+// Clang on all platforms fails to detect that a type with a user-provided
+// move-assignment operator is not trivially relocatable. So in fact we
+// opt out of Clang altogether, for now.
+//
+// TODO(b/325479096): Remove the opt-out once Clang's behavior is fixed.
+//
 // According to https://github.com/abseil/abseil-cpp/issues/1479, this does not
 // work with NVCC either.
-#if Y_ABSL_HAVE_BUILTIN(__is_trivially_relocatable) &&                 \
-    !(defined(__clang__) && (defined(_WIN32) || defined(_WIN64))) && \
-    !defined(__NVCC__)
+#if Y_ABSL_HAVE_BUILTIN(__is_trivially_relocatable) && \
+    (defined(__cpp_impl_trivially_relocatable) ||    \
+     (!defined(__clang__) && !defined(__APPLE__) && !defined(__NVCC__)))
 template <class T>
 struct is_trivially_relocatable
     : std::integral_constant<bool, __is_trivially_relocatable(T)> {};
 #else
 // Otherwise we use a fallback that detects only those types we can feasibly
-// detect. Any time that has trivial move-construction and destruction
-// operations is by definition trivially relocatable.
+// detect. Any type that is trivially copyable is by definition trivially
+// relocatable.
 template <class T>
-struct is_trivially_relocatable
-    : y_absl::conjunction<y_absl::is_trivially_move_constructible<T>,
-                        y_absl::is_trivially_destructible<T>> {};
+struct is_trivially_relocatable : std::is_trivially_copyable<T> {};
 #endif
 
 // y_absl::is_constant_evaluated()
@@ -558,6 +563,97 @@ constexpr bool is_constant_evaluated() noexcept {
 #endif
 }
 #endif  // Y_ABSL_HAVE_CONSTANT_EVALUATED
+
+namespace type_traits_internal {
+
+// Detects if a class's definition has declared itself to be an owner by
+// declaring
+//   using absl_internal_is_view = std::true_type;
+// as a member.
+// Types that don't want either must either omit this declaration entirely, or
+// (if e.g. inheriting from a base class) define the member to something that
+// isn't a Boolean trait class, such as `void`.
+// Do not specialize or use this directly. It's an implementation detail.
+template <typename T, typename = void>
+struct IsOwnerImpl : std::false_type {
+  static_assert(std::is_same<T, y_absl::remove_cvref_t<T>>::value,
+                "type must lack qualifiers");
+};
+
+template <typename T>
+struct IsOwnerImpl<
+    T,
+    std::enable_if_t<std::is_class<typename T::absl_internal_is_view>::value>>
+    : y_absl::negation<typename T::absl_internal_is_view> {};
+
+// A trait to determine whether a type is an owner.
+// Do *not* depend on the correctness of this trait for correct code behavior.
+// It is only a safety feature and its value may change in the future.
+// Do not specialize this; instead, define the member trait inside your type so
+// that it can be auto-detected, and to prevent ODR violations.
+// If it ever becomes possible to detect [[gsl::Owner]], we should leverage it:
+// https://wg21.link/p1179
+template <typename T>
+struct IsOwner : IsOwnerImpl<T> {};
+
+template <typename T, typename Traits, typename Alloc>
+struct IsOwner<std::basic_string<T, Traits, Alloc>> : std::true_type {};
+
+template <typename T, typename Alloc>
+struct IsOwner<std::vector<T, Alloc>> : std::true_type {};
+
+// Detects if a class's definition has declared itself to be a view by declaring
+//   using absl_internal_is_view = std::true_type;
+// as a member.
+// Do not specialize or use this directly.
+template <typename T, typename = void>
+struct IsViewImpl : std::false_type {
+  static_assert(std::is_same<T, y_absl::remove_cvref_t<T>>::value,
+                "type must lack qualifiers");
+};
+
+template <typename T>
+struct IsViewImpl<
+    T,
+    std::enable_if_t<std::is_class<typename T::absl_internal_is_view>::value>>
+    : T::absl_internal_is_view {};
+
+// A trait to determine whether a type is a view.
+// Do *not* depend on the correctness of this trait for correct code behavior.
+// It is only a safety feature, and its value may change in the future.
+// Do not specialize this trait. Instead, define the member
+//   using absl_internal_is_view = std::true_type;
+// in your class to allow its detection while preventing ODR violations.
+// If it ever becomes possible to detect [[gsl::Pointer]], we should leverage
+// it: https://wg21.link/p1179
+template <typename T>
+struct IsView : std::integral_constant<bool, std::is_pointer<T>::value ||
+                                                 IsViewImpl<T>::value> {};
+
+#ifdef Y_ABSL_HAVE_STD_STRING_VIEW
+template <typename Char, typename Traits>
+struct IsView<std::basic_string_view<Char, Traits>> : std::true_type {};
+#endif
+
+#ifdef __cpp_lib_span
+template <typename T>
+struct IsView<std::span<T>> : std::true_type {};
+#endif
+
+// Determines whether the assignment of the given types is lifetime-bound.
+// Do *not* depend on the correctness of this trait for correct code behavior.
+// It is only a safety feature and its value may change in the future.
+// If it ever becomes possible to detect [[clang::lifetimebound]] directly,
+// we should change the implementation to leverage that.
+// Until then, we consider an assignment from an "owner" (such as TString)
+// to a "view" (such as std::string_view) to be a lifetime-bound assignment.
+template <typename T, typename U>
+using IsLifetimeBoundAssignment =
+    std::integral_constant<bool, IsView<y_absl::remove_cvref_t<T>>::value &&
+                                     IsOwner<y_absl::remove_cvref_t<U>>::value>;
+
+}  // namespace type_traits_internal
+
 Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/ya.make
index 1b4070658f8b..e91c31489897 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/meta/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/meta/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/abseil-cpp-tstring/y_absl/base
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.cc
index fa62f6ad5029..c57010c4c1d9 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.cc
@@ -29,9 +29,6 @@
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
 
-Y_ABSL_DLL const uint128 kuint128max = MakeUint128(
-    std::numeric_limits<uint64_t>::max(), std::numeric_limits<uint64_t>::max());
-
 namespace {
 
 // Returns the 0-based position of the last set bit (i.e., most significant bit)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.h b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.h
index d90efdaece0f..92d90e482d06 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128.h
@@ -38,6 +38,7 @@
 #include "y_absl/base/config.h"
 #include "y_absl/base/macros.h"
 #include "y_absl/base/port.h"
+#include "y_absl/types/compare.h"
 
 #if defined(_MSC_VER)
 // In very old versions of MSVC and when the /Zc:wchar_t flag is off, wchar_t is
@@ -244,11 +245,6 @@ class
 #endif  // byte order
 };
 
-// Prefer to use the constexpr `Uint128Max()`.
-//
-// TODO(y_absl-team) deprecate kuint128max once migration tool is released.
-Y_ABSL_DLL extern const uint128 kuint128max;
-
 // allow uint128 to be logged
 std::ostream& operator<<(std::ostream& os, uint128 v);
 
@@ -274,7 +270,9 @@ class numeric_limits<y_absl::uint128> {
   static constexpr bool has_infinity = false;
   static constexpr bool has_quiet_NaN = false;
   static constexpr bool has_signaling_NaN = false;
+  Y_ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
   static constexpr float_denorm_style has_denorm = denorm_absent;
+  Y_ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
   static constexpr bool has_denorm_loss = false;
   static constexpr float_round_style round_style = round_toward_zero;
   static constexpr bool is_iec559 = false;
@@ -517,7 +515,9 @@ class numeric_limits<y_absl::int128> {
   static constexpr bool has_infinity = false;
   static constexpr bool has_quiet_NaN = false;
   static constexpr bool has_signaling_NaN = false;
+  Y_ABSL_INTERNAL_DISABLE_DEPRECATED_DECLARATION_WARNING
   static constexpr float_denorm_style has_denorm = denorm_absent;
+  Y_ABSL_INTERNAL_RESTORE_DEPRECATED_DECLARATION_WARNING
   static constexpr bool has_denorm_loss = false;
   static constexpr float_round_style round_style = round_toward_zero;
   static constexpr bool is_iec559 = false;
@@ -824,6 +824,36 @@ constexpr bool operator<=(uint128 lhs, uint128 rhs) { return !(rhs < lhs); }
 
 constexpr bool operator>=(uint128 lhs, uint128 rhs) { return !(lhs < rhs); }
 
+#ifdef __cpp_impl_three_way_comparison
+constexpr y_absl::strong_ordering operator<=>(uint128 lhs, uint128 rhs) {
+#if defined(Y_ABSL_HAVE_INTRINSIC_INT128)
+  if (auto lhs_128 = static_cast<unsigned __int128>(lhs),
+      rhs_128 = static_cast<unsigned __int128>(rhs);
+      lhs_128 < rhs_128) {
+    return y_absl::strong_ordering::less;
+  } else if (lhs_128 > rhs_128) {
+    return y_absl::strong_ordering::greater;
+  } else {
+    return y_absl::strong_ordering::equal;
+  }
+#else
+  if (uint64_t lhs_high = Uint128High64(lhs), rhs_high = Uint128High64(rhs);
+      lhs_high < rhs_high) {
+    return y_absl::strong_ordering::less;
+  } else if (lhs_high > rhs_high) {
+    return y_absl::strong_ordering::greater;
+  } else if (uint64_t lhs_low = Uint128Low64(lhs), rhs_low = Uint128Low64(rhs);
+             lhs_low < rhs_low) {
+    return y_absl::strong_ordering::less;
+  } else if (lhs_low > rhs_low) {
+    return y_absl::strong_ordering::greater;
+  } else {
+    return y_absl::strong_ordering::equal;
+  }
+#endif
+}
+#endif
+
 // Unary operators.
 
 constexpr inline uint128 operator+(uint128 val) { return val; }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128_have_intrinsic.inc b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128_have_intrinsic.inc
index 7133611d8f00..19f83d1ae4ed 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128_have_intrinsic.inc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128_have_intrinsic.inc
@@ -220,6 +220,20 @@ constexpr bool operator>=(int128 lhs, int128 rhs) {
   return static_cast<__int128>(lhs) >= static_cast<__int128>(rhs);
 }
 
+#ifdef __cpp_impl_three_way_comparison
+constexpr y_absl::strong_ordering operator<=>(int128 lhs, int128 rhs) {
+  if (auto lhs_128 = static_cast<__int128>(lhs),
+      rhs_128 = static_cast<__int128>(rhs);
+      lhs_128 < rhs_128) {
+    return y_absl::strong_ordering::less;
+  } else if (lhs_128 > rhs_128) {
+    return y_absl::strong_ordering::greater;
+  } else {
+    return y_absl::strong_ordering::equal;
+  }
+}
+#endif
+
 // Unary operators.
 
 constexpr int128 operator-(int128 v) { return -static_cast<__int128>(v); }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128_no_intrinsic.inc b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128_no_intrinsic.inc
index e41d2a55e6d0..836cef321333 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128_no_intrinsic.inc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/int128_no_intrinsic.inc
@@ -186,6 +186,24 @@ constexpr bool operator<=(int128 lhs, int128 rhs) { return !(lhs > rhs); }
 
 constexpr bool operator>=(int128 lhs, int128 rhs) { return !(lhs < rhs); }
 
+#ifdef __cpp_impl_three_way_comparison
+constexpr y_absl::strong_ordering operator<=>(int128 lhs, int128 rhs) {
+  if (int64_t lhs_high = Int128High64(lhs), rhs_high = Int128High64(rhs);
+      lhs_high < rhs_high) {
+    return y_absl::strong_ordering::less;
+  } else if (lhs_high > rhs_high) {
+    return y_absl::strong_ordering::greater;
+  } else if (uint64_t lhs_low = Uint128Low64(lhs), rhs_low = Uint128Low64(rhs);
+             lhs_low < rhs_low) {
+    return y_absl::strong_ordering::less;
+  } else if (lhs_low > rhs_low) {
+    return y_absl::strong_ordering::greater;
+  } else {
+    return y_absl::strong_ordering::equal;
+  }
+}
+#endif
+
 // Unary operators.
 
 constexpr int128 operator-(int128 v) {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/internal/bits.h b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/internal/bits.h
index a19e3c6bbc96..152b5005a3c1 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/internal/bits.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/numeric/internal/bits.h
@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) {
 
 Y_ABSL_ATTRIBUTE_ALWAYS_INLINE Y_ABSL_INTERNAL_CONSTEXPR_CLZ inline int
 CountLeadingZeroes16(uint16_t x) {
-#if Y_ABSL_HAVE_BUILTIN(__builtin_clzs)
+#if Y_ABSL_HAVE_BUILTIN(__builtin_clzg)
+  return x == 0 ? 16 : __builtin_clzg(x);
+#elif Y_ABSL_HAVE_BUILTIN(__builtin_clzs)
   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
                 "__builtin_clzs does not take 16-bit arg");
   return x == 0 ? 16 : __builtin_clzs(x);
@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) {
 
 Y_ABSL_ATTRIBUTE_ALWAYS_INLINE Y_ABSL_INTERNAL_CONSTEXPR_CTZ inline int
 CountTrailingZeroesNonzero16(uint16_t x) {
-#if Y_ABSL_HAVE_BUILTIN(__builtin_ctzs)
+#if Y_ABSL_HAVE_BUILTIN(__builtin_ctzg)
+  return __builtin_ctzg(x);
+#elif Y_ABSL_HAVE_BUILTIN(__builtin_ctzs)
   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)
                 "__builtin_ctzs does not take 16-bit arg");
   return __builtin_ctzs(x);
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/periodic_sampler.h b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/periodic_sampler.h
index 6faa2d7566bb..ada284be0bc5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/periodic_sampler.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/profiling/internal/periodic_sampler.h
@@ -172,7 +172,7 @@ inline bool PeriodicSamplerBase::Sample() noexcept {
 // Typical use case:
 //
 //   struct HashTablezTag {};
-//   thread_local PeriodicSampler sampler;
+//   thread_local PeriodicSampler<HashTablezTag, 100> sampler;
 //
 //   void HashTableSamplingLogic(...) {
 //     if (sampler.Sample()) {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/beta_distribution.h b/contrib/restricted/abseil-cpp-tstring/y_absl/random/beta_distribution.h
index 8914a8b45a46..b0a336d3d44a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/beta_distribution.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/beta_distribution.h
@@ -181,18 +181,18 @@ class beta_distribution {
     result_type alpha_;
     result_type beta_;
 
-    result_type a_;  // the smaller of {alpha, beta}, or 1.0/alpha_ in JOEHNK
-    result_type b_;  // the larger of {alpha, beta}, or 1.0/beta_ in JOEHNK
-    result_type x_;  // alpha + beta, or the result in degenerate cases
-    result_type log_x_;  // log(x_)
-    result_type y_;      // "beta" in Cheng
-    result_type gamma_;  // "gamma" in Cheng
+    result_type a_{};  // the smaller of {alpha, beta}, or 1.0/alpha_ in JOEHNK
+    result_type b_{};  // the larger of {alpha, beta}, or 1.0/beta_ in JOEHNK
+    result_type x_{};  // alpha + beta, or the result in degenerate cases
+    result_type log_x_{};  // log(x_)
+    result_type y_{};      // "beta" in Cheng
+    result_type gamma_{};  // "gamma" in Cheng
 
-    Method method_;
+    Method method_{};
 
     // Placing this last for optimal alignment.
     // Whether alpha_ != a_, i.e. true iff alpha_ > beta_.
-    bool inverted_;
+    bool inverted_{};
 
     static_assert(std::is_floating_point<RealType>::value,
                   "Class-template y_absl::beta_distribution<> must be "
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/distributions.h b/contrib/restricted/abseil-cpp-tstring/y_absl/random/distributions.h
index ddd1b9ce6e6e..84a13b47df47 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/distributions.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/distributions.h
@@ -32,8 +32,8 @@
 //     continuously and independently at a constant average rate
 //   * `y_absl::Gaussian` (also known as "normal distributions") for continuous
 //     distributions using an associated quadratic function
-//   * `y_absl::LogUniform` for continuous uniform distributions where the log
-//     to the given base of all values is uniform
+//   * `y_absl::LogUniform` for discrete distributions where the log to the given
+//     base of all values is uniform
 //   * `y_absl::Poisson` for discrete probability distributions that express the
 //     probability of a given number of events occurring within a fixed interval
 //   * `y_absl::Zipf` for discrete probability distributions commonly used for
@@ -46,23 +46,23 @@
 #ifndef Y_ABSL_RANDOM_DISTRIBUTIONS_H_
 #define Y_ABSL_RANDOM_DISTRIBUTIONS_H_
 
-#include <algorithm>
-#include <cmath>
 #include <limits>
-#include <random>
 #include <type_traits>
 
+#include "y_absl/base/config.h"
 #include "y_absl/base/internal/inline_variable.h"
+#include "y_absl/meta/type_traits.h"
 #include "y_absl/random/bernoulli_distribution.h"
 #include "y_absl/random/beta_distribution.h"
 #include "y_absl/random/exponential_distribution.h"
 #include "y_absl/random/gaussian_distribution.h"
 #include "y_absl/random/internal/distribution_caller.h"  // IWYU pragma: export
+#include "y_absl/random/internal/traits.h"
 #include "y_absl/random/internal/uniform_helper.h"  // IWYU pragma: export
 #include "y_absl/random/log_uniform_int_distribution.h"
 #include "y_absl/random/poisson_distribution.h"
-#include "y_absl/random/uniform_int_distribution.h"
-#include "y_absl/random/uniform_real_distribution.h"
+#include "y_absl/random/uniform_int_distribution.h"  // IWYU pragma: export
+#include "y_absl/random/uniform_real_distribution.h"  // IWYU pragma: export
 #include "y_absl/random/zipf_distribution.h"
 
 namespace y_absl {
@@ -176,7 +176,7 @@ Uniform(TagType tag,
 
   return random_internal::DistributionCaller<gen_t>::template Call<
       distribution_t>(&urbg, tag, static_cast<return_t>(lo),
-                                static_cast<return_t>(hi));
+                      static_cast<return_t>(hi));
 }
 
 // y_absl::Uniform(bitgen, lo, hi)
@@ -200,7 +200,7 @@ Uniform(URBG&& urbg,  // NOLINT(runtime/references)
 
   return random_internal::DistributionCaller<gen_t>::template Call<
       distribution_t>(&urbg, static_cast<return_t>(lo),
-                                static_cast<return_t>(hi));
+                      static_cast<return_t>(hi));
 }
 
 // y_absl::Uniform<unsigned T>(bitgen)
@@ -208,7 +208,7 @@ Uniform(URBG&& urbg,  // NOLINT(runtime/references)
 // Overload of Uniform() using the minimum and maximum values of a given type
 // `T` (which must be unsigned), returning a value of type `unsigned T`
 template <typename R, typename URBG>
-typename y_absl::enable_if_t<!std::is_signed<R>::value, R>  //
+typename y_absl::enable_if_t<!std::numeric_limits<R>::is_signed, R>  //
 Uniform(URBG&& urbg) {  // NOLINT(runtime/references)
   using gen_t = y_absl::decay_t<URBG>;
   using distribution_t = random_internal::UniformDistributionWrapper<R>;
@@ -362,7 +362,7 @@ RealType Gaussian(URBG&& urbg,  // NOLINT(runtime/references)
 // If `lo` is nonzero then this distribution is shifted to the desired interval,
 // so LogUniform(lo, hi, b) is equivalent to LogUniform(0, hi-lo, b)+lo.
 //
-// See https://en.wikipedia.org/wiki/Log-normal_distribution
+// See https://en.wikipedia.org/wiki/Reciprocal_distribution
 //
 // Example:
 //
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/random/seed_sequences.h b/contrib/restricted/abseil-cpp-tstring/y_absl/random/seed_sequences.h
index c5bd44e13f43..de4f71c25ee2 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/random/seed_sequences.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/random/seed_sequences.h
@@ -29,9 +29,11 @@
 #include <random>
 
 #include "y_absl/base/config.h"
+#include "y_absl/base/nullability.h"
 #include "y_absl/random/internal/salted_seed_seq.h"
 #include "y_absl/random/internal/seed_material.h"
 #include "y_absl/random/seed_gen_exception.h"
+#include "y_absl/strings/string_view.h"
 #include "y_absl/types/span.h"
 
 namespace y_absl {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/internal/statusor_internal.h b/contrib/restricted/abseil-cpp-tstring/y_absl/status/internal/statusor_internal.h
index fa22190dbde5..5fd4edf791cb 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/internal/statusor_internal.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/internal/statusor_internal.h
@@ -123,11 +123,70 @@ using IsForwardingAssignmentValid = y_absl::disjunction<
         std::is_same<y_absl::in_place_t, y_absl::remove_cvref_t<U>>,
         IsForwardingAssignmentAmbiguous<T, U>>>>;
 
+template <bool Value, typename T>
+using Equality = std::conditional_t<Value, T, y_absl::negation<T>>;
+
+template <bool Explicit, typename T, typename U, bool Lifetimebound>
+using IsConstructionValid = y_absl::conjunction<
+    Equality<Lifetimebound,
+             type_traits_internal::IsLifetimeBoundAssignment<T, U>>,
+    IsDirectInitializationValid<T, U&&>, std::is_constructible<T, U&&>,
+    Equality<!Explicit, std::is_convertible<U&&, T>>,
+    y_absl::disjunction<
+        std::is_same<T, y_absl::remove_cvref_t<U>>,
+        y_absl::conjunction<
+            std::conditional_t<
+                Explicit,
+                y_absl::negation<std::is_constructible<y_absl::Status, U&&>>,
+                y_absl::negation<std::is_convertible<U&&, y_absl::Status>>>,
+            y_absl::negation<
+                internal_statusor::HasConversionOperatorToStatusOr<T, U&&>>>>>;
+
+template <typename T, typename U, bool Lifetimebound>
+using IsAssignmentValid = y_absl::conjunction<
+    Equality<Lifetimebound,
+             type_traits_internal::IsLifetimeBoundAssignment<T, U>>,
+    std::is_constructible<T, U&&>, std::is_assignable<T&, U&&>,
+    y_absl::disjunction<
+        std::is_same<T, y_absl::remove_cvref_t<U>>,
+        y_absl::conjunction<
+            y_absl::negation<std::is_convertible<U&&, y_absl::Status>>,
+            y_absl::negation<HasConversionOperatorToStatusOr<T, U&&>>>>,
+    IsForwardingAssignmentValid<T, U&&>>;
+
+template <bool Explicit, typename T, typename U>
+using IsConstructionFromStatusValid = y_absl::conjunction<
+    y_absl::negation<std::is_same<y_absl::StatusOr<T>, y_absl::remove_cvref_t<U>>>,
+    y_absl::negation<std::is_same<T, y_absl::remove_cvref_t<U>>>,
+    y_absl::negation<std::is_same<y_absl::in_place_t, y_absl::remove_cvref_t<U>>>,
+    Equality<!Explicit, std::is_convertible<U, y_absl::Status>>,
+    std::is_constructible<y_absl::Status, U>,
+    y_absl::negation<HasConversionOperatorToStatusOr<T, U>>>;
+
+template <bool Explicit, typename T, typename U, bool Lifetimebound,
+          typename UQ>
+using IsConstructionFromStatusOrValid = y_absl::conjunction<
+    y_absl::negation<std::is_same<T, U>>,
+    Equality<Lifetimebound,
+             type_traits_internal::IsLifetimeBoundAssignment<T, U>>,
+    std::is_constructible<T, UQ>,
+    Equality<!Explicit, std::is_convertible<UQ, T>>,
+    y_absl::negation<IsConstructibleOrConvertibleFromStatusOr<T, U>>>;
+
+template <typename T, typename U, bool Lifetimebound>
+using IsStatusOrAssignmentValid = y_absl::conjunction<
+    y_absl::negation<std::is_same<T, y_absl::remove_cvref_t<U>>>,
+    Equality<Lifetimebound,
+             type_traits_internal::IsLifetimeBoundAssignment<T, U>>,
+    std::is_constructible<T, U>, std::is_assignable<T, U>,
+    y_absl::negation<IsConstructibleOrConvertibleOrAssignableFromStatusOr<
+        T, y_absl::remove_cvref_t<U>>>>;
+
 class Helper {
  public:
   // Move type-agnostic error handling to the .cc.
   static void HandleInvalidStatusCtorArg(y_absl::Nonnull<Status*>);
-  Y_ABSL_ATTRIBUTE_NORETURN static void Crash(const y_absl::Status& status);
+  [[noreturn]] static void Crash(const y_absl::Status& status);
 };
 
 // Construct an instance of T in `p` through placement new, passing Args... to
@@ -379,7 +438,7 @@ struct MoveAssignBase<T, false> {
   MoveAssignBase& operator=(MoveAssignBase&&) = delete;
 };
 
-Y_ABSL_ATTRIBUTE_NORETURN void ThrowBadStatusOrAccess(y_absl::Status status);
+[[noreturn]] void ThrowBadStatusOrAccess(y_absl::Status status);
 
 // Used to introduce jitter into the output of printing functions for
 // `StatusOr` (i.e. `AbslStringify` and `operator<<`).
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.cc
index 41655b15e247..25098c159382 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.cc
@@ -273,14 +273,12 @@ StatusCode ErrnoToStatusCode(int error_number) {
     case EFAULT:        // Bad address
     case EILSEQ:        // Illegal byte sequence
     case ENOPROTOOPT:   // Protocol not available
-    case ENOSTR:        // Not a STREAM
     case ENOTSOCK:      // Not a socket
     case ENOTTY:        // Inappropriate I/O control operation
     case EPROTOTYPE:    // Protocol wrong type for socket
     case ESPIPE:        // Invalid seek
       return StatusCode::kInvalidArgument;
     case ETIMEDOUT:  // Connection timed out
-    case ETIME:      // Timer expired
       return StatusCode::kDeadlineExceeded;
     case ENODEV:  // No such device
     case ENOENT:  // No such file or directory
@@ -339,9 +337,7 @@ StatusCode ErrnoToStatusCode(int error_number) {
     case EMLINK:   // Too many links
     case ENFILE:   // Too many open files in system
     case ENOBUFS:  // No buffer space available
-    case ENODATA:  // No message is available on the STREAM read queue
     case ENOMEM:   // Not enough space
-    case ENOSR:    // No STREAM resources
 #ifdef EUSERS
     case EUSERS:  // Too many users
 #endif
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.h b/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.h
index d2d9d3742b61..6fdf608b2a9e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/status.h
@@ -452,7 +452,7 @@ class Y_ABSL_ATTRIBUTE_TRIVIAL_ABI Status final {
 
   // The moved-from state is valid but unspecified.
   Status(Status&&) noexcept;
-  Status& operator=(Status&&);
+  Status& operator=(Status&&) noexcept;
 
   ~Status();
 
@@ -539,7 +539,7 @@ class Y_ABSL_ATTRIBUTE_TRIVIAL_ABI Status final {
   // swap()
   //
   // Swap the contents of one status with another.
-  friend void swap(Status& a, Status& b);
+  friend void swap(Status& a, Status& b) noexcept;
 
   //----------------------------------------------------------------------------
   // Payload Management APIs
@@ -789,7 +789,7 @@ inline Status::Status(Status&& x) noexcept : Status(x.rep_) {
   x.rep_ = MovedFromRep();
 }
 
-inline Status& Status::operator=(Status&& x) {
+inline Status& Status::operator=(Status&& x) noexcept {
   uintptr_t old_rep = rep_;
   if (x.rep_ != old_rep) {
     rep_ = x.rep_;
@@ -852,7 +852,7 @@ inline void Status::IgnoreError() const {
   // no-op
 }
 
-inline void swap(y_absl::Status& a, y_absl::Status& b) {
+inline void swap(y_absl::Status& a, y_absl::Status& b) noexcept {
   using std::swap;
   swap(a.rep_, b.rep_);
 }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor.h b/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor.h
index d12ed41d151d..dd6462f691d6 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/status/statusor.h
@@ -236,57 +236,55 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   // is explicit if and only if the corresponding construction of `T` from `U`
   // is explicit. (This constructor inherits its explicitness from the
   // underlying constructor.)
-  template <
-      typename U,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              y_absl::negation<std::is_same<T, U>>,
-              std::is_constructible<T, const U&>,
-              std::is_convertible<const U&, T>,
-              y_absl::negation<
-                  internal_statusor::IsConstructibleOrConvertibleFromStatusOr<
-                      T, U>>>::value,
-          int> = 0>
+  template <typename U, y_absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                false, T, U, false, const U&>::value,
+                            int> = 0>
   StatusOr(const StatusOr<U>& other)  // NOLINT
       : Base(static_cast<const typename StatusOr<U>::Base&>(other)) {}
-  template <
-      typename U,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              y_absl::negation<std::is_same<T, U>>,
-              std::is_constructible<T, const U&>,
-              y_absl::negation<std::is_convertible<const U&, T>>,
-              y_absl::negation<
-                  internal_statusor::IsConstructibleOrConvertibleFromStatusOr<
-                      T, U>>>::value,
-          int> = 0>
+  template <typename U, y_absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                false, T, U, true, const U&>::value,
+                            int> = 0>
+  StatusOr(const StatusOr<U>& other Y_ABSL_ATTRIBUTE_LIFETIME_BOUND)  // NOLINT
+      : Base(static_cast<const typename StatusOr<U>::Base&>(other)) {}
+  template <typename U, y_absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                true, T, U, false, const U&>::value,
+                            int> = 0>
   explicit StatusOr(const StatusOr<U>& other)
       : Base(static_cast<const typename StatusOr<U>::Base&>(other)) {}
+  template <typename U, y_absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                true, T, U, true, const U&>::value,
+                            int> = 0>
+  explicit StatusOr(const StatusOr<U>& other Y_ABSL_ATTRIBUTE_LIFETIME_BOUND)
+      : Base(static_cast<const typename StatusOr<U>::Base&>(other)) {}
 
-  template <
-      typename U,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              y_absl::negation<std::is_same<T, U>>, std::is_constructible<T, U&&>,
-              std::is_convertible<U&&, T>,
-              y_absl::negation<
-                  internal_statusor::IsConstructibleOrConvertibleFromStatusOr<
-                      T, U>>>::value,
-          int> = 0>
+  template <typename U, y_absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                false, T, U, false, U&&>::value,
+                            int> = 0>
   StatusOr(StatusOr<U>&& other)  // NOLINT
       : Base(static_cast<typename StatusOr<U>::Base&&>(other)) {}
-  template <
-      typename U,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              y_absl::negation<std::is_same<T, U>>, std::is_constructible<T, U&&>,
-              y_absl::negation<std::is_convertible<U&&, T>>,
-              y_absl::negation<
-                  internal_statusor::IsConstructibleOrConvertibleFromStatusOr<
-                      T, U>>>::value,
-          int> = 0>
+  template <typename U, y_absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                false, T, U, true, U&&>::value,
+                            int> = 0>
+  StatusOr(StatusOr<U>&& other Y_ABSL_ATTRIBUTE_LIFETIME_BOUND)  // NOLINT
+      : Base(static_cast<typename StatusOr<U>::Base&&>(other)) {}
+  template <typename U, y_absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                true, T, U, false, U&&>::value,
+                            int> = 0>
   explicit StatusOr(StatusOr<U>&& other)
       : Base(static_cast<typename StatusOr<U>::Base&&>(other)) {}
+  template <typename U, y_absl::enable_if_t<
+                            internal_statusor::IsConstructionFromStatusOrValid<
+                                true, T, U, true, U&&>::value,
+                            int> = 0>
+  explicit StatusOr(StatusOr<U>&& other Y_ABSL_ATTRIBUTE_LIFETIME_BOUND)
+      : Base(static_cast<typename StatusOr<U>::Base&&>(other)) {}
 
   // Converting Assignment Operators
 
@@ -307,37 +305,38 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   // These overloads only apply if `y_absl::StatusOr<T>` is constructible and
   // assignable from `y_absl::StatusOr<U>` and `StatusOr<T>` cannot be directly
   // assigned from `StatusOr<U>`.
-  template <
-      typename U,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              y_absl::negation<std::is_same<T, U>>,
-              std::is_constructible<T, const U&>,
-              std::is_assignable<T, const U&>,
-              y_absl::negation<
-                  internal_statusor::
-                      IsConstructibleOrConvertibleOrAssignableFromStatusOr<
-                          T, U>>>::value,
-          int> = 0>
+  template <typename U,
+            y_absl::enable_if_t<internal_statusor::IsStatusOrAssignmentValid<
+                                  T, const U&, false>::value,
+                              int> = 0>
   StatusOr& operator=(const StatusOr<U>& other) {
     this->Assign(other);
     return *this;
   }
-  template <
-      typename U,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              y_absl::negation<std::is_same<T, U>>, std::is_constructible<T, U&&>,
-              std::is_assignable<T, U&&>,
-              y_absl::negation<
-                  internal_statusor::
-                      IsConstructibleOrConvertibleOrAssignableFromStatusOr<
-                          T, U>>>::value,
-          int> = 0>
+  template <typename U,
+            y_absl::enable_if_t<internal_statusor::IsStatusOrAssignmentValid<
+                                  T, const U&, true>::value,
+                              int> = 0>
+  StatusOr& operator=(const StatusOr<U>& other Y_ABSL_ATTRIBUTE_LIFETIME_BOUND) {
+    this->Assign(other);
+    return *this;
+  }
+  template <typename U,
+            y_absl::enable_if_t<internal_statusor::IsStatusOrAssignmentValid<
+                                  T, U&&, false>::value,
+                              int> = 0>
   StatusOr& operator=(StatusOr<U>&& other) {
     this->Assign(std::move(other));
     return *this;
   }
+  template <typename U,
+            y_absl::enable_if_t<internal_statusor::IsStatusOrAssignmentValid<
+                                  T, U&&, true>::value,
+                              int> = 0>
+  StatusOr& operator=(StatusOr<U>&& other Y_ABSL_ATTRIBUTE_LIFETIME_BOUND) {
+    this->Assign(std::move(other));
+    return *this;
+  }
 
   // Constructs a new `y_absl::StatusOr<T>` with a non-ok status. After calling
   // this constructor, `this->ok()` will be `false` and calls to `value()` will
@@ -350,46 +349,21 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   // REQUIRES: !Status(std::forward<U>(v)).ok(). This requirement is DCHECKed.
   // In optimized builds, passing y_absl::OkStatus() here will have the effect
   // of passing y_absl::StatusCode::kInternal as a fallback.
-  template <
-      typename U = y_absl::Status,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              std::is_convertible<U&&, y_absl::Status>,
-              std::is_constructible<y_absl::Status, U&&>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, y_absl::StatusOr<T>>>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, T>>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, y_absl::in_place_t>>,
-              y_absl::negation<internal_statusor::HasConversionOperatorToStatusOr<
-                  T, U&&>>>::value,
-          int> = 0>
+  template <typename U = y_absl::Status,
+            y_absl::enable_if_t<internal_statusor::IsConstructionFromStatusValid<
+                                  false, T, U>::value,
+                              int> = 0>
   StatusOr(U&& v) : Base(std::forward<U>(v)) {}
 
-  template <
-      typename U = y_absl::Status,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              y_absl::negation<std::is_convertible<U&&, y_absl::Status>>,
-              std::is_constructible<y_absl::Status, U&&>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, y_absl::StatusOr<T>>>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, T>>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, y_absl::in_place_t>>,
-              y_absl::negation<internal_statusor::HasConversionOperatorToStatusOr<
-                  T, U&&>>>::value,
-          int> = 0>
+  template <typename U = y_absl::Status,
+            y_absl::enable_if_t<internal_statusor::IsConstructionFromStatusValid<
+                                  true, T, U>::value,
+                              int> = 0>
   explicit StatusOr(U&& v) : Base(std::forward<U>(v)) {}
-
-  template <
-      typename U = y_absl::Status,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              std::is_convertible<U&&, y_absl::Status>,
-              std::is_constructible<y_absl::Status, U&&>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, y_absl::StatusOr<T>>>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, T>>,
-              y_absl::negation<std::is_same<y_absl::decay_t<U>, y_absl::in_place_t>>,
-              y_absl::negation<internal_statusor::HasConversionOperatorToStatusOr<
-                  T, U&&>>>::value,
-          int> = 0>
+  template <typename U = y_absl::Status,
+            y_absl::enable_if_t<internal_statusor::IsConstructionFromStatusValid<
+                                  false, T, U>::value,
+                              int> = 0>
   StatusOr& operator=(U&& v) {
     this->AssignStatus(std::forward<U>(v));
     return *this;
@@ -411,21 +385,22 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   //    StatusOr<bool> s1 = true;  // s1.ok() && *s1 == true
   //    StatusOr<bool> s2 = false;  // s2.ok() && *s2 == false
   //    s1 = s2;  // ambiguous, `s1 = *s2` or `s1 = bool(s2)`?
-  template <
-      typename U = T,
-      typename = typename std::enable_if<y_absl::conjunction<
-          std::is_constructible<T, U&&>, std::is_assignable<T&, U&&>,
-          y_absl::disjunction<
-              std::is_same<y_absl::remove_cvref_t<U>, T>,
-              y_absl::conjunction<
-                  y_absl::negation<std::is_convertible<U&&, y_absl::Status>>,
-                  y_absl::negation<internal_statusor::
-                                     HasConversionOperatorToStatusOr<T, U&&>>>>,
-          internal_statusor::IsForwardingAssignmentValid<T, U&&>>::value>::type>
+  template <typename U = T,
+            typename std::enable_if<
+                internal_statusor::IsAssignmentValid<T, U, false>::value,
+                int>::type = 0>
   StatusOr& operator=(U&& v) {
     this->Assign(std::forward<U>(v));
     return *this;
   }
+  template <typename U = T,
+            typename std::enable_if<
+                internal_statusor::IsAssignmentValid<T, U, true>::value,
+                int>::type = 0>
+  StatusOr& operator=(U&& v Y_ABSL_ATTRIBUTE_LIFETIME_BOUND) {
+    this->Assign(std::forward<U>(v));
+    return *this;
+  }
 
   // Constructs the inner value `T` in-place using the provided args, using the
   // `T(args...)` constructor.
@@ -442,40 +417,31 @@ class StatusOr : private internal_statusor::StatusOrData<T>,
   // This constructor is explicit if `U` is not convertible to `T`. To avoid
   // ambiguity, this constructor is disabled if `U` is a `StatusOr<J>`, where
   // `J` is convertible to `T`.
-  template <
-      typename U = T,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              internal_statusor::IsDirectInitializationValid<T, U&&>,
-              std::is_constructible<T, U&&>, std::is_convertible<U&&, T>,
-              y_absl::disjunction<
-                  std::is_same<y_absl::remove_cvref_t<U>, T>,
-                  y_absl::conjunction<
-                      y_absl::negation<std::is_convertible<U&&, y_absl::Status>>,
-                      y_absl::negation<
-                          internal_statusor::HasConversionOperatorToStatusOr<
-                              T, U&&>>>>>::value,
-          int> = 0>
+  template <typename U = T,
+            y_absl::enable_if_t<internal_statusor::IsConstructionValid<
+                                  false, T, U, false>::value,
+                              int> = 0>
   StatusOr(U&& u)  // NOLINT
       : StatusOr(y_absl::in_place, std::forward<U>(u)) {}
+  template <typename U = T,
+            y_absl::enable_if_t<internal_statusor::IsConstructionValid<
+                                  false, T, U, true>::value,
+                              int> = 0>
+  StatusOr(U&& u Y_ABSL_ATTRIBUTE_LIFETIME_BOUND)  // NOLINT
+      : StatusOr(y_absl::in_place, std::forward<U>(u)) {}
 
-  template <
-      typename U = T,
-      y_absl::enable_if_t<
-          y_absl::conjunction<
-              internal_statusor::IsDirectInitializationValid<T, U&&>,
-              y_absl::disjunction<
-                  std::is_same<y_absl::remove_cvref_t<U>, T>,
-                  y_absl::conjunction<
-                      y_absl::negation<std::is_constructible<y_absl::Status, U&&>>,
-                      y_absl::negation<
-                          internal_statusor::HasConversionOperatorToStatusOr<
-                              T, U&&>>>>,
-              std::is_constructible<T, U&&>,
-              y_absl::negation<std::is_convertible<U&&, T>>>::value,
-          int> = 0>
+  template <typename U = T,
+            y_absl::enable_if_t<internal_statusor::IsConstructionValid<
+                                  true, T, U, false>::value,
+                              int> = 0>
   explicit StatusOr(U&& u)  // NOLINT
       : StatusOr(y_absl::in_place, std::forward<U>(u)) {}
+  template <typename U = T,
+            y_absl::enable_if_t<
+                internal_statusor::IsConstructionValid<true, T, U, true>::value,
+                int> = 0>
+  explicit StatusOr(U&& u Y_ABSL_ATTRIBUTE_LIFETIME_BOUND)  // NOLINT
+      : StatusOr(y_absl::in_place, std::forward<U>(u)) {}
 
   // StatusOr<T>::ok()
   //
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ascii.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ascii.cc
index 0d8a1d838ed5..81cfceabcc5a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ascii.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/ascii.cc
@@ -15,13 +15,14 @@
 #include "y_absl/strings/ascii.h"
 
 #include <climits>
-#include <cstdint>
+#include <cstddef>
 #include <cstring>
 #include <util/generic/string.h>
-#include <type_traits>
 
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/nullability.h"
+#include "y_absl/base/optimization.h"
 
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
@@ -162,19 +163,6 @@ Y_ABSL_DLL const char kToUpper[256] = {
 };
 // clang-format on
 
-template <class T>
-static constexpr T BroadcastByte(unsigned char value) {
-  static_assert(std::is_integral<T>::value && sizeof(T) <= sizeof(uint64_t) &&
-                    std::is_unsigned<T>::value,
-                "only unsigned integers up to 64-bit allowed");
-  T result = value;
-  constexpr size_t result_bit_width = sizeof(result) * CHAR_BIT;
-  result |= result << ((CHAR_BIT << 0) & (result_bit_width - 1));
-  result |= result << ((CHAR_BIT << 1) & (result_bit_width - 1));
-  result |= result << ((CHAR_BIT << 2) & (result_bit_width - 1));
-  return result;
-}
-
 // Returns whether `c` is in the a-z/A-Z range (w.r.t. `ToUpper`).
 // Implemented by:
 //  1. Pushing the a-z/A-Z range to [SCHAR_MIN, SCHAR_MIN + 26).
@@ -189,47 +177,10 @@ constexpr bool AsciiInAZRange(unsigned char c) {
   return static_cast<signed char>(u) < threshold;
 }
 
+// Force-inline so the compiler won't merge the short and long implementations.
 template <bool ToUpper>
-static constexpr char* PartialAsciiStrCaseFold(y_absl::Nonnull<char*> p,
-                                               y_absl::Nonnull<char*> end) {
-  using vec_t = size_t;
-  const size_t n = static_cast<size_t>(end - p);
-
-  // SWAR algorithm: http://0x80.pl/notesen/2016-01-06-swar-swap-case.html
-  constexpr char ch_a = ToUpper ? 'a' : 'A', ch_z = ToUpper ? 'z' : 'Z';
-  char* const swar_end = p + (n / sizeof(vec_t)) * sizeof(vec_t);
-  while (p < swar_end) {
-    vec_t v = vec_t();
-
-    // memcpy the vector, but constexpr
-    for (size_t i = 0; i < sizeof(vec_t); ++i) {
-      v |= static_cast<vec_t>(static_cast<unsigned char>(p[i]))
-           << (i * CHAR_BIT);
-    }
-
-    constexpr unsigned int msb = 1u << (CHAR_BIT - 1);
-    const vec_t v_msb = v & BroadcastByte<vec_t>(msb);
-    const vec_t v_nonascii_mask = (v_msb << 1) - (v_msb >> (CHAR_BIT - 1));
-    const vec_t v_nonascii = v & v_nonascii_mask;
-    const vec_t v_ascii = v & ~v_nonascii_mask;
-    const vec_t a = v_ascii + BroadcastByte<vec_t>(msb - ch_a - 0),
-                z = v_ascii + BroadcastByte<vec_t>(msb - ch_z - 1);
-    v = v_nonascii | (v_ascii ^ ((a ^ z) & BroadcastByte<vec_t>(msb)) >> 2);
-
-    // memcpy the vector, but constexpr
-    for (size_t i = 0; i < sizeof(vec_t); ++i) {
-      p[i] = static_cast<char>(v >> (i * CHAR_BIT));
-    }
-
-    p += sizeof(v);
-  }
-
-  return p;
-}
-
-template <bool ToUpper>
-static constexpr void AsciiStrCaseFold(y_absl::Nonnull<char*> p,
-                                       y_absl::Nonnull<char*> end) {
+Y_ABSL_ATTRIBUTE_ALWAYS_INLINE inline constexpr void AsciiStrCaseFoldImpl(
+    y_absl::Nonnull<char*> p, size_t size) {
   // The upper- and lowercase versions of ASCII characters differ by only 1 bit.
   // When we need to flip the case, we can xor with this bit to achieve the
   // desired result. Note that the choice of 'a' and 'A' here is arbitrary. We
@@ -237,20 +188,32 @@ static constexpr void AsciiStrCaseFold(y_absl::Nonnull<char*> p,
   // have the same single bit difference.
   constexpr unsigned char kAsciiCaseBitFlip = 'a' ^ 'A';
 
-  using vec_t = size_t;
-  // TODO(b/316380338): When FDO becomes able to vectorize these,
-  // revert this manual optimization and just leave the naive loop.
-  if (static_cast<size_t>(end - p) >= sizeof(vec_t)) {
-    p = ascii_internal::PartialAsciiStrCaseFold<ToUpper>(p, end);
-  }
-  while (p < end) {
-    unsigned char v = static_cast<unsigned char>(*p);
+  for (size_t i = 0; i < size; ++i) {
+    unsigned char v = static_cast<unsigned char>(p[i]);
     v ^= AsciiInAZRange<ToUpper>(v) ? kAsciiCaseBitFlip : 0;
-    *p = static_cast<char>(v);
-    ++p;
+    p[i] = static_cast<char>(v);
   }
 }
 
+// The string size threshold for starting using the long string version.
+constexpr size_t kCaseFoldThreshold = 16;
+
+// No-inline so the compiler won't merge the short and long implementations.
+template <bool ToUpper>
+Y_ABSL_ATTRIBUTE_NOINLINE constexpr void AsciiStrCaseFoldLong(
+    y_absl::Nonnull<char*> p, size_t size) {
+  Y_ABSL_ASSUME(size >= kCaseFoldThreshold);
+  AsciiStrCaseFoldImpl<ToUpper>(p, size);
+}
+
+// Splitting to short and long strings to allow vectorization decisions
+// to be made separately in the long and short cases.
+template <bool ToUpper>
+constexpr void AsciiStrCaseFold(y_absl::Nonnull<char*> p, size_t size) {
+  size < kCaseFoldThreshold ? AsciiStrCaseFoldImpl<ToUpper>(p, size)
+                            : AsciiStrCaseFoldLong<ToUpper>(p, size);
+}
+
 static constexpr size_t ValidateAsciiCasefold() {
   constexpr size_t num_chars = 1 + CHAR_MAX - CHAR_MIN;
   size_t incorrect_index = 0;
@@ -259,8 +222,8 @@ static constexpr size_t ValidateAsciiCasefold() {
   for (unsigned int i = 0; i < num_chars; ++i) {
     uppered[i] = lowered[i] = static_cast<char>(i);
   }
-  AsciiStrCaseFold<false>(&lowered[0], &lowered[num_chars]);
-  AsciiStrCaseFold<true>(&uppered[0], &uppered[num_chars]);
+  AsciiStrCaseFold<false>(&lowered[0], num_chars);
+  AsciiStrCaseFold<true>(&uppered[0], num_chars);
   for (size_t i = 0; i < num_chars; ++i) {
     const char ch = static_cast<char>(i),
                ch_upper = ('a' <= ch && ch <= 'z' ? 'A' + (ch - 'a') : ch),
@@ -278,13 +241,11 @@ static_assert(ValidateAsciiCasefold() == 0, "error in case conversion");
 }  // namespace ascii_internal
 
 void AsciiStrToLower(y_absl::Nonnull<TString*> s) {
-  char* p = &(*s)[0];  // Guaranteed to be valid for empty strings
-  return ascii_internal::AsciiStrCaseFold<false>(p, p + s->size());
+  return ascii_internal::AsciiStrCaseFold<false>(&(*s)[0], s->size());
 }
 
 void AsciiStrToUpper(y_absl::Nonnull<TString*> s) {
-  char* p = &(*s)[0];  // Guaranteed to be valid for empty strings
-  return ascii_internal::AsciiStrCaseFold<true>(p, p + s->size());
+  return ascii_internal::AsciiStrCaseFold<true>(&(*s)[0], s->size());
 }
 
 void RemoveExtraAsciiWhitespace(y_absl::Nonnull<TString*> str) {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.cc
index a1e7c30bca01..93d332578afa 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.cc
@@ -75,7 +75,7 @@ using ::y_absl::cord_internal::kMinFlatLength;
 using ::y_absl::cord_internal::kInlinedVectorSize;
 using ::y_absl::cord_internal::kMaxBytesToCopy;
 
-static void DumpNode(y_absl::Nonnull<CordRep*> rep, bool include_data,
+static void DumpNode(y_absl::Nonnull<CordRep*> nonnull_rep, bool include_data,
                      y_absl::Nonnull<std::ostream*> os, int indent = 0);
 static bool VerifyNode(y_absl::Nonnull<CordRep*> root,
                        y_absl::Nonnull<CordRep*> start_node);
@@ -425,8 +425,8 @@ Cord& Cord::operator=(y_absl::string_view src) {
 // we keep it here to make diffs easier.
 void Cord::InlineRep::AppendArray(y_absl::string_view src,
                                   MethodIdentifier method) {
-  MaybeRemoveEmptyCrcNode();
   if (src.empty()) return;  // memcpy(_, nullptr, 0) is undefined.
+  MaybeRemoveEmptyCrcNode();
 
   size_t appended = 0;
   CordRep* rep = tree();
@@ -1062,6 +1062,15 @@ void CopyCordToString(const Cord& src, y_absl::Nonnull<TString*> dst) {
   }
 }
 
+void AppendCordToString(const Cord& src, y_absl::Nonnull<TString*> dst) {
+  const size_t cur_dst_size = dst->size();
+  const size_t new_dst_size = cur_dst_size + src.size();
+  y_absl::strings_internal::STLStringResizeUninitializedAmortized(dst,
+                                                                new_dst_size);
+  char* append_ptr = &(*dst)[cur_dst_size];
+  src.CopyToArrayImpl(append_ptr);
+}
+
 void Cord::CopyToArraySlowPath(y_absl::Nonnull<char*> dst) const {
   assert(contents_.is_tree());
   y_absl::string_view fragment;
@@ -1448,14 +1457,13 @@ y_absl::string_view Cord::FlattenSlowPath() {
   }
 }
 
-static void DumpNode(y_absl::Nonnull<CordRep*> rep, bool include_data,
+static void DumpNode(y_absl::Nonnull<CordRep*> nonnull_rep, bool include_data,
                      y_absl::Nonnull<std::ostream*> os, int indent) {
+  CordRep* rep = nonnull_rep;
   const int kIndentStep = 1;
-  y_absl::InlinedVector<CordRep*, kInlinedVectorSize> stack;
-  y_absl::InlinedVector<int, kInlinedVectorSize> indents;
   for (;;) {
-    *os << std::setw(3) << rep->refcount.Get();
-    *os << " " << std::setw(7) << rep->length;
+    *os << std::setw(3) << (rep == nullptr ? 0 : rep->refcount.Get());
+    *os << " " << std::setw(7) << (rep == nullptr ? 0 : rep->length);
     *os << " [";
     if (include_data) *os << static_cast<void*>(rep);
     *os << "]";
@@ -1477,26 +1485,23 @@ static void DumpNode(y_absl::Nonnull<CordRep*> rep, bool include_data,
       if (rep->IsExternal()) {
         *os << "EXTERNAL [";
         if (include_data)
-          *os << y_absl::CEscape(TString(rep->external()->base, rep->length));
+          *os << y_absl::CEscape(
+              y_absl::string_view(rep->external()->base, rep->length));
         *os << "]\n";
       } else if (rep->IsFlat()) {
         *os << "FLAT cap=" << rep->flat()->Capacity() << " [";
         if (include_data)
-          *os << y_absl::CEscape(TString(rep->flat()->Data(), rep->length));
+          *os << y_absl::CEscape(
+              y_absl::string_view(rep->flat()->Data(), rep->length));
         *os << "]\n";
       } else {
         CordRepBtree::Dump(rep, /*label=*/"", include_data, *os);
       }
     }
     if (leaf) {
-      if (stack.empty()) break;
-      rep = stack.back();
-      stack.pop_back();
-      indent = indents.back();
-      indents.pop_back();
+      break;
     }
   }
-  Y_ABSL_INTERNAL_CHECK(indents.empty(), "");
 }
 
 static TString ReportError(y_absl::Nonnull<CordRep*> root,
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.h
index e1ece2438206..eabfc9d92044 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/cord.h
@@ -75,6 +75,7 @@
 #include "y_absl/base/internal/per_thread_tls.h"
 #include "y_absl/base/macros.h"
 #include "y_absl/base/nullability.h"
+#include "y_absl/base/optimization.h"
 #include "y_absl/base/port.h"
 #include "y_absl/container/inlined_vector.h"
 #include "y_absl/crc/internal/crc_cord_state.h"
@@ -95,6 +96,7 @@
 #include "y_absl/strings/internal/resize_uninitialized.h"
 #include "y_absl/strings/internal/string_constant.h"
 #include "y_absl/strings/string_view.h"
+#include "y_absl/types/compare.h"
 #include "y_absl/types/optional.h"
 
 namespace y_absl {
@@ -104,6 +106,7 @@ class CordTestPeer;
 template <typename Releaser>
 Cord MakeCordFromExternal(y_absl::string_view, Releaser&&);
 void CopyCordToString(const Cord& src, y_absl::Nonnull<TString*> dst);
+void AppendCordToString(const Cord& src, y_absl::Nonnull<TString*> dst);
 
 // Cord memory accounting modes
 enum class CordMemoryAccounting {
@@ -420,6 +423,18 @@ class Cord {
   friend void CopyCordToString(const Cord& src,
                                y_absl::Nonnull<TString*> dst);
 
+  // AppendCordToString()
+  //
+  // Appends the contents of a `src` Cord to a `*dst` string.
+  //
+  // This function optimizes the case of appending to a non-empty destination
+  // string. If `*dst` already has capacity to store the contents of the cord,
+  // this function does not invalidate pointers previously returned by
+  // `dst->data()`. If `*dst` is a new object, prefer to simply use the
+  // conversion operator to `TString`.
+  friend void AppendCordToString(const Cord& src,
+                                 y_absl::Nonnull<TString*> dst);
+
   class CharIterator;
 
   //----------------------------------------------------------------------------
@@ -757,7 +772,7 @@ class Cord {
 
   // Cord::Find()
   //
-  // Returns an iterator to the first occurrance of the substring `needle`.
+  // Returns an iterator to the first occurrence of the substring `needle`.
   //
   // If the substring `needle` does not occur, `Cord::char_end()` is returned.
   CharIterator Find(y_absl::string_view needle) const;
@@ -835,6 +850,38 @@ class Cord {
   friend bool operator==(const Cord& lhs, const Cord& rhs);
   friend bool operator==(const Cord& lhs, y_absl::string_view rhs);
 
+#ifdef __cpp_impl_three_way_comparison
+
+  // Cords support comparison with other Cords and string_views via operator<
+  // and others; here we provide a wrapper for the C++20 three-way comparison
+  // <=> operator.
+
+  static inline std::strong_ordering ConvertCompareResultToStrongOrdering(
+      int c) {
+    if (c == 0) {
+      return std::strong_ordering::equal;
+    } else if (c < 0) {
+      return std::strong_ordering::less;
+    } else {
+      return std::strong_ordering::greater;
+    }
+  }
+
+  friend inline std::strong_ordering operator<=>(const Cord& x, const Cord& y) {
+    return ConvertCompareResultToStrongOrdering(x.Compare(y));
+  }
+
+  friend inline std::strong_ordering operator<=>(const Cord& lhs,
+                                                 y_absl::string_view rhs) {
+    return ConvertCompareResultToStrongOrdering(lhs.Compare(rhs));
+  }
+
+  friend inline std::strong_ordering operator<=>(y_absl::string_view lhs,
+                                                 const Cord& rhs) {
+    return ConvertCompareResultToStrongOrdering(-rhs.Compare(lhs));
+  }
+#endif
+
   friend y_absl::Nullable<const CordzInfo*> GetCordzInfoForTesting(
       const Cord& cord);
 
@@ -1065,6 +1112,8 @@ class Cord {
       const;
 
   CharIterator FindImpl(CharIterator it, y_absl::string_view needle) const;
+
+  void CopyToArrayImpl(y_absl::Nonnull<char*> dst) const;
 };
 
 Y_ABSL_NAMESPACE_END
@@ -1103,8 +1152,8 @@ y_absl::Nonnull<CordRep*> NewExternalRep(y_absl::string_view data,
 // Overload for function reference types that dispatches using a function
 // pointer because there are no `alignof()` or `sizeof()` a function reference.
 // NOLINTNEXTLINE - suppress clang-tidy raw pointer return.
-inline y_absl::Nonnull<CordRep*> NewExternalRep(y_absl::string_view data,
-                               void (&releaser)(y_absl::string_view)) {
+inline y_absl::Nonnull<CordRep*> NewExternalRep(
+    y_absl::string_view data, void (&releaser)(y_absl::string_view)) {
   return NewExternalRep(data, &releaser);
 }
 
@@ -1120,7 +1169,7 @@ Cord MakeCordFromExternal(y_absl::string_view data, Releaser&& releaser) {
   } else {
     using ReleaserType = y_absl::decay_t<Releaser>;
     cord_internal::InvokeReleaser(
-        cord_internal::Rank0{}, ReleaserType(std::forward<Releaser>(releaser)),
+        cord_internal::Rank1{}, ReleaserType(std::forward<Releaser>(releaser)),
         data);
   }
   return cord;
@@ -1170,7 +1219,8 @@ inline void Cord::InlineRep::Swap(y_absl::Nonnull<Cord::InlineRep*> rhs) {
   if (rhs == this) {
     return;
   }
-  std::swap(data_, rhs->data_);
+  using std::swap;
+  swap(data_, rhs->data_);
 }
 
 inline y_absl::Nullable<const char*> Cord::InlineRep::data() const {
@@ -1352,7 +1402,8 @@ inline size_t Cord::EstimatedMemoryUsage(
   return result;
 }
 
-inline y_absl::optional<y_absl::string_view> Cord::TryFlat() const {
+inline y_absl::optional<y_absl::string_view> Cord::TryFlat() const
+    Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
   y_absl::cord_internal::CordRep* rep = contents_.tree();
   if (rep == nullptr) {
     return y_absl::string_view(contents_.data(), contents_.size());
@@ -1364,7 +1415,7 @@ inline y_absl::optional<y_absl::string_view> Cord::TryFlat() const {
   return y_absl::nullopt;
 }
 
-inline y_absl::string_view Cord::Flatten() {
+inline y_absl::string_view Cord::Flatten() Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
   y_absl::cord_internal::CordRep* rep = contents_.tree();
   if (rep == nullptr) {
     return y_absl::string_view(contents_.data(), contents_.size());
@@ -1387,6 +1438,7 @@ inline void Cord::Prepend(y_absl::string_view src) {
 
 inline void Cord::Append(CordBuffer buffer) {
   if (Y_ABSL_PREDICT_FALSE(buffer.length() == 0)) return;
+  contents_.MaybeRemoveEmptyCrcNode();
   y_absl::string_view short_value;
   if (CordRep* rep = buffer.ConsumeValue(short_value)) {
     contents_.AppendTree(rep, CordzUpdateTracker::kAppendCordBuffer);
@@ -1397,6 +1449,7 @@ inline void Cord::Append(CordBuffer buffer) {
 
 inline void Cord::Prepend(CordBuffer buffer) {
   if (Y_ABSL_PREDICT_FALSE(buffer.length() == 0)) return;
+  contents_.MaybeRemoveEmptyCrcNode();
   y_absl::string_view short_value;
   if (CordRep* rep = buffer.ConsumeValue(short_value)) {
     contents_.PrependTree(rep, CordzUpdateTracker::kPrependCordBuffer);
@@ -1445,6 +1498,14 @@ inline bool Cord::StartsWith(y_absl::string_view rhs) const {
   return EqualsImpl(rhs, rhs_size);
 }
 
+inline void Cord::CopyToArrayImpl(y_absl::Nonnull<char*> dst) const {
+  if (!contents_.is_tree()) {
+    if (!empty()) contents_.CopyToArray(dst);
+  } else {
+    CopyToArraySlowPath(dst);
+  }
+}
+
 inline void Cord::ChunkIterator::InitTree(
     y_absl::Nonnull<cord_internal::CordRep*> tree) {
   tree = cord_internal::SkipCrcNode(tree);
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.cc
index 78a706a1bee3..73eb224803af 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.cc
@@ -21,10 +21,12 @@
 #include <cstring>
 #include <limits>
 #include <util/generic/string.h>
+#include <utility>
 
 #include "y_absl/base/config.h"
 #include "y_absl/base/internal/raw_logging.h"
 #include "y_absl/base/internal/unaligned_access.h"
+#include "y_absl/base/nullability.h"
 #include "y_absl/strings/ascii.h"
 #include "y_absl/strings/charset.h"
 #include "y_absl/strings/internal/escaping.h"
@@ -54,7 +56,8 @@ inline unsigned int hex_digit_to_int(char c) {
   return x & 0xf;
 }
 
-inline bool IsSurrogate(char32_t c, y_absl::string_view src, TString* error) {
+inline bool IsSurrogate(char32_t c, y_absl::string_view src,
+                        y_absl::Nullable<TString*> error) {
   if (c >= 0xD800 && c <= 0xDFFF) {
     if (error) {
       *error = y_absl::StrCat("invalid surrogate character (0xD800-DFFF): \\",
@@ -83,7 +86,9 @@ inline bool IsSurrogate(char32_t c, y_absl::string_view src, TString* error) {
 //     UnescapeCEscapeSequences().
 // ----------------------------------------------------------------------
 bool CUnescapeInternal(y_absl::string_view source, bool leave_nulls_escaped,
-                       char* dest, ptrdiff_t* dest_len, TString* error) {
+                       y_absl::Nonnull<char*> dest,
+                       y_absl::Nonnull<ptrdiff_t*> dest_len,
+                       y_absl::Nullable<TString*> error) {
   char* d = dest;
   const char* p = source.data();
   const char* end = p + source.size();
@@ -290,7 +295,8 @@ bool CUnescapeInternal(y_absl::string_view source, bool leave_nulls_escaped,
 //    may be the same.
 // ----------------------------------------------------------------------
 bool CUnescapeInternal(y_absl::string_view source, bool leave_nulls_escaped,
-                       TString* dest, TString* error) {
+                       y_absl::Nonnull<TString*> dest,
+                       y_absl::Nullable<TString*> error) {
   strings_internal::STLStringResizeUninitialized(dest, source.size());
 
   ptrdiff_t dest_size;
@@ -407,7 +413,8 @@ inline size_t CEscapedLength(y_absl::string_view src) {
   return escaped_len;
 }
 
-void CEscapeAndAppendInternal(y_absl::string_view src, TString* dest) {
+void CEscapeAndAppendInternal(y_absl::string_view src,
+                              y_absl::Nonnull<TString*> dest) {
   size_t escaped_len = CEscapedLength(src);
   if (escaped_len == src.size()) {
     dest->append(src.data(), src.size());
@@ -464,9 +471,10 @@ void CEscapeAndAppendInternal(y_absl::string_view src, TString* dest) {
 
 // Reverses the mapping in Base64EscapeInternal; see that method's
 // documentation for details of the mapping.
-bool Base64UnescapeInternal(const char* src_param, size_t szsrc, char* dest,
-                            size_t szdest, const signed char* unbase64,
-                            size_t* len) {
+bool Base64UnescapeInternal(y_absl::Nullable<const char*> src_param, size_t szsrc,
+                            y_absl::Nullable<char*> dest, size_t szdest,
+                            y_absl::Nonnull<const signed char*> unbase64,
+                            y_absl::Nonnull<size_t*> len) {
   static const char kPad64Equals = '=';
   static const char kPad64Dot = '.';
 
@@ -802,8 +810,9 @@ constexpr signed char kUnWebSafeBase64[] = {
 /* clang-format on */
 
 template <typename String>
-bool Base64UnescapeInternal(const char* src, size_t slen, String* dest,
-                            const signed char* unbase64) {
+bool Base64UnescapeInternal(y_absl::Nullable<const char*> src, size_t slen,
+                            y_absl::Nonnull<String*> dest,
+                            y_absl::Nonnull<const signed char*> unbase64) {
   // Determine the size of the output string.  Base64 encodes every 3 bytes into
   // 4 characters.  Any leftover chars are added directly for good measure.
   const size_t dest_len = 3 * (slen / 4) + (slen % 4);
@@ -847,13 +856,32 @@ constexpr char kHexValueLenient[256] = {
     0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
+constexpr signed char kHexValueStrict[256] = {
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1,  // '0'..'9'
+    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,  // 'A'..'F'
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,  // 'a'..'f'
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+};
 /* clang-format on */
 
 // This is a templated function so that T can be either a char*
 // or a string.  This works because we use the [] operator to access
 // individual characters at a time.
 template <typename T>
-void HexStringToBytesInternal(const char* from, T to, size_t num) {
+void HexStringToBytesInternal(y_absl::Nullable<const char*> from, T to,
+                              size_t num) {
   for (size_t i = 0; i < num; i++) {
     to[i] = static_cast<char>(kHexValueLenient[from[i * 2] & 0xFF] << 4) +
             (kHexValueLenient[from[i * 2 + 1] & 0xFF]);
@@ -863,7 +891,8 @@ void HexStringToBytesInternal(const char* from, T to, size_t num) {
 // This is a templated function so that T can be either a char* or a
 // TString.
 template <typename T>
-void BytesToHexStringInternal(const unsigned char* src, T dest, size_t num) {
+void BytesToHexStringInternal(y_absl::Nullable<const unsigned char*> src, T dest,
+                              size_t num) {
   auto dest_ptr = &dest[0];
   for (auto src_ptr = src; src_ptr != (src + num); ++src_ptr, dest_ptr += 2) {
     const char* hex_p = &numbers_internal::kHexTable[*src_ptr * 2];
@@ -878,8 +907,8 @@ void BytesToHexStringInternal(const unsigned char* src, T dest, size_t num) {
 //
 // See CUnescapeInternal() for implementation details.
 // ----------------------------------------------------------------------
-bool CUnescape(y_absl::string_view source, TString* dest,
-               TString* error) {
+bool CUnescape(y_absl::string_view source, y_absl::Nonnull<TString*> dest,
+               y_absl::Nullable<TString*> error) {
   return CUnescapeInternal(source, kUnescapeNulls, dest, error);
 }
 
@@ -901,21 +930,23 @@ TString Utf8SafeCHexEscape(y_absl::string_view src) {
   return CEscapeInternal(src, true, true);
 }
 
-bool Base64Unescape(y_absl::string_view src, TString* dest) {
+bool Base64Unescape(y_absl::string_view src, y_absl::Nonnull<TString*> dest) {
   return Base64UnescapeInternal(src.data(), src.size(), dest, kUnBase64);
 }
 
-bool WebSafeBase64Unescape(y_absl::string_view src, TString* dest) {
+bool WebSafeBase64Unescape(y_absl::string_view src,
+                           y_absl::Nonnull<TString*> dest) {
   return Base64UnescapeInternal(src.data(), src.size(), dest, kUnWebSafeBase64);
 }
 
-void Base64Escape(y_absl::string_view src, TString* dest) {
+void Base64Escape(y_absl::string_view src, y_absl::Nonnull<TString*> dest) {
   strings_internal::Base64EscapeInternal(
       reinterpret_cast<const unsigned char*>(src.data()), src.size(), dest,
       true, strings_internal::kBase64Chars);
 }
 
-void WebSafeBase64Escape(y_absl::string_view src, TString* dest) {
+void WebSafeBase64Escape(y_absl::string_view src,
+                         y_absl::Nonnull<TString*> dest) {
   strings_internal::Base64EscapeInternal(
       reinterpret_cast<const unsigned char*>(src.data()), src.size(), dest,
       false, strings_internal::kWebSafeBase64Chars);
@@ -937,6 +968,32 @@ TString WebSafeBase64Escape(y_absl::string_view src) {
   return dest;
 }
 
+bool HexStringToBytes(y_absl::string_view hex,
+                      y_absl::Nonnull<TString*> bytes) {
+  TString output;
+
+  size_t num_bytes = hex.size() / 2;
+  if (hex.size() != num_bytes * 2) {
+    return false;
+  }
+
+  y_absl::strings_internal::STLStringResizeUninitialized(&output, num_bytes);
+  auto hex_p = hex.cbegin();
+  for (TString::iterator bin_p = output.begin(); bin_p != output.end();
+       ++bin_p) {
+    int h1 = y_absl::kHexValueStrict[static_cast<size_t>(*hex_p++)];
+    int h2 = y_absl::kHexValueStrict[static_cast<size_t>(*hex_p++)];
+    if (h1 == -1 || h2 == -1) {
+      output.resize(static_cast<size_t>(bin_p - output.begin()));
+      return false;
+    }
+    *bin_p = static_cast<char>((h1 << 4) + h2);
+  }
+
+  *bytes = std::move(output);
+  return true;
+}
+
 TString HexStringToBytes(y_absl::string_view from) {
   TString result;
   const auto num = from.size() / 2;
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.h
index 3b5e0537b6e0..8cadf95e7a73 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/escaping.h
@@ -27,7 +27,9 @@
 #include <util/generic/string.h>
 #include <vector>
 
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/macros.h"
+#include "y_absl/base/nullability.h"
 #include "y_absl/strings/ascii.h"
 #include "y_absl/strings/str_join.h"
 #include "y_absl/strings/string_view.h"
@@ -65,14 +67,16 @@ Y_ABSL_NAMESPACE_BEGIN
 //
 //   TString s = "foo\\rbar\\nbaz\\t";
 //   TString unescaped_s;
-//   if (!y_absl::CUnescape(s, &unescaped_s) {
+//   if (!y_absl::CUnescape(s, &unescaped_s)) {
 //     ...
 //   }
 //   EXPECT_EQ(unescaped_s, "foo\rbar\nbaz\t");
-bool CUnescape(y_absl::string_view source, TString* dest, TString* error);
+bool CUnescape(y_absl::string_view source, y_absl::Nonnull<TString*> dest,
+               y_absl::Nullable<TString*> error);
 
 // Overload of `CUnescape()` with no error reporting.
-inline bool CUnescape(y_absl::string_view source, TString* dest) {
+inline bool CUnescape(y_absl::string_view source,
+                      y_absl::Nonnull<TString*> dest) {
   return CUnescape(source, dest, nullptr);
 }
 
@@ -122,7 +126,7 @@ TString Utf8SafeCHexEscape(y_absl::string_view src);
 // Encodes a `src` string into a base64-encoded 'dest' string with padding
 // characters. This function conforms with RFC 4648 section 4 (base64) and RFC
 // 2045.
-void Base64Escape(y_absl::string_view src, TString* dest);
+void Base64Escape(y_absl::string_view src, y_absl::Nonnull<TString*> dest);
 TString Base64Escape(y_absl::string_view src);
 
 // WebSafeBase64Escape()
@@ -130,7 +134,8 @@ TString Base64Escape(y_absl::string_view src);
 // Encodes a `src` string into a base64 string, like Base64Escape() does, but
 // outputs '-' instead of '+' and '_' instead of '/', and does not pad 'dest'.
 // This function conforms with RFC 4648 section 5 (base64url).
-void WebSafeBase64Escape(y_absl::string_view src, TString* dest);
+void WebSafeBase64Escape(y_absl::string_view src,
+                         y_absl::Nonnull<TString*> dest);
 TString WebSafeBase64Escape(y_absl::string_view src);
 
 // Base64Unescape()
@@ -140,7 +145,7 @@ TString WebSafeBase64Escape(y_absl::string_view src);
 // `src` contains invalid characters, `dest` is cleared and returns `false`.
 // If padding is included (note that `Base64Escape()` does produce it), it must
 // be correct. In the padding, '=' and '.' are treated identically.
-bool Base64Unescape(y_absl::string_view src, TString* dest);
+bool Base64Unescape(y_absl::string_view src, y_absl::Nonnull<TString*> dest);
 
 // WebSafeBase64Unescape()
 //
@@ -149,12 +154,24 @@ bool Base64Unescape(y_absl::string_view src, TString* dest);
 // invalid characters, `dest` is cleared and returns `false`. If padding is
 // included (note that `WebSafeBase64Escape()` does not produce it), it must be
 // correct. In the padding, '=' and '.' are treated identically.
-bool WebSafeBase64Unescape(y_absl::string_view src, TString* dest);
+bool WebSafeBase64Unescape(y_absl::string_view src,
+                           y_absl::Nonnull<TString*> dest);
+
+// HexStringToBytes()
+//
+// Converts the hexadecimal encoded data in `hex` into raw bytes in the `bytes`
+// output string.  If `hex` does not consist of valid hexadecimal data, this
+// function returns false and leaves `bytes` in an unspecified state. Returns
+// true on success.
+Y_ABSL_MUST_USE_RESULT bool HexStringToBytes(y_absl::string_view hex,
+                                           y_absl::Nonnull<TString*> bytes);
 
 // HexStringToBytes()
 //
 // Converts an ASCII hex string into bytes, returning binary data of length
-// `from.size()/2`.
+// `from.size()/2`. The input must be valid hexadecimal data, otherwise the
+// return value is unspecified.
+Y_ABSL_DEPRECATED("Use the HexStringToBytes() that returns a bool")
 TString HexStringToBytes(y_absl::string_view from);
 
 // BytesToHexString()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/has_absl_stringify.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/has_absl_stringify.h
index 1ee2e96f99c6..6304317c1a81 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/has_absl_stringify.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/has_absl_stringify.h
@@ -18,6 +18,7 @@
 #include <type_traits>
 #include <utility>
 
+#include "y_absl/base/config.h"
 #include "y_absl/strings/string_view.h"
 
 namespace y_absl {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/charconv_bigint.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/charconv_bigint.h
index fe9a61f943be..6264dc9e8006 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/charconv_bigint.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/charconv_bigint.h
@@ -109,7 +109,17 @@ class BigUnsigned {
       size_ = (std::min)(size_ + word_shift, max_words);
       count %= 32;
       if (count == 0) {
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=warray-bounds
+// shows a lot of bogus -Warray-bounds warnings under GCC.
+// This is not the only one in Abseil.
+#if Y_ABSL_INTERNAL_HAVE_MIN_GNUC_VERSION(14, 0)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
         std::copy_backward(words_, words_ + size_ - word_shift, words_ + size_);
+#if Y_ABSL_INTERNAL_HAVE_MIN_GNUC_VERSION(14, 0)
+#pragma GCC diagnostic pop
+#endif
       } else {
         for (int i = (std::min)(size_, max_words - 1); i > word_shift; --i) {
           words_[i] = (words_[i - word_shift] << count) |
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_internal.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_internal.h
index 7a03ba333774..22d6deb67adc 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_internal.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_internal.h
@@ -85,7 +85,7 @@ enum Constants {
 };
 
 // Emits a fatal error "Unexpected node type: xyz" and aborts the program.
-Y_ABSL_ATTRIBUTE_NORETURN void LogFatalNodeType(CordRep* rep);
+[[noreturn]] void LogFatalNodeType(CordRep* rep);
 
 // Fast implementation of memmove for up to 15 bytes. This implementation is
 // safe for overlapping regions. If nullify_tail is true, the destination is
@@ -259,7 +259,7 @@ struct CordRep {
   // on the specific layout of these fields. Notably: the non-trivial field
   // `refcount` being preceded by `length`, and being tailed by POD data
   // members only.
-  // # LINT.IfChange
+  // LINT.IfChange
   size_t length;
   RefcountAndFlags refcount;
   // If tag < FLAT, it represents CordRepKind and indicates the type of node.
@@ -275,7 +275,7 @@ struct CordRep {
   // allocate room for these in the derived class, as not all compilers reuse
   // padding space from the base class (clang and gcc do, MSVC does not, etc)
   uint8_t storage[3];
-  // # LINT.ThenChange(cord_rep_btree.h:copy_raw)
+  // LINT.ThenChange(cord_rep_btree.h:copy_raw)
 
   // Returns true if this instance's tag matches the requested type.
   constexpr bool IsSubstring() const { return tag == SUBSTRING; }
@@ -352,18 +352,19 @@ struct CordRepExternal : public CordRep {
   static void Delete(CordRep* rep);
 };
 
-struct Rank1 {};
-struct Rank0 : Rank1 {};
+// Use go/ranked-overloads for dispatching.
+struct Rank0 {};
+struct Rank1 : Rank0 {};
 
 template <typename Releaser, typename = ::y_absl::base_internal::invoke_result_t<
                                  Releaser, y_absl::string_view>>
-void InvokeReleaser(Rank0, Releaser&& releaser, y_absl::string_view data) {
+void InvokeReleaser(Rank1, Releaser&& releaser, y_absl::string_view data) {
   ::y_absl::base_internal::invoke(std::forward<Releaser>(releaser), data);
 }
 
 template <typename Releaser,
           typename = ::y_absl::base_internal::invoke_result_t<Releaser>>
-void InvokeReleaser(Rank1, Releaser&& releaser, y_absl::string_view) {
+void InvokeReleaser(Rank0, Releaser&& releaser, y_absl::string_view) {
   ::y_absl::base_internal::invoke(std::forward<Releaser>(releaser));
 }
 
@@ -381,7 +382,7 @@ struct CordRepExternalImpl
   }
 
   ~CordRepExternalImpl() {
-    InvokeReleaser(Rank0{}, std::move(this->template get<0>()),
+    InvokeReleaser(Rank1{}, std::move(this->template get<0>()),
                    y_absl::string_view(base, length));
   }
 
@@ -398,7 +399,6 @@ inline CordRepSubstring* CordRepSubstring::Create(CordRep* child, size_t pos,
   assert(pos < child->length);
   assert(n <= child->length - pos);
 
-  // TODO(b/217376272): Harden internal logic.
   // Move to strategical places inside the Cord logic and make this an assert.
   if (Y_ABSL_PREDICT_FALSE(!(child->IsExternal() || child->IsFlat()))) {
     LogFatalNodeType(child);
@@ -520,6 +520,7 @@ class InlineData {
 
   constexpr InlineData(const InlineData& rhs) noexcept;
   InlineData& operator=(const InlineData& rhs) noexcept;
+  friend void swap(InlineData& lhs, InlineData& rhs) noexcept;
 
   friend bool operator==(const InlineData& lhs, const InlineData& rhs) {
 #ifdef Y_ABSL_INTERNAL_CORD_HAVE_SANITIZER
@@ -770,6 +771,12 @@ class InlineData {
       char data[kMaxInline + 1];
       AsTree as_tree;
     };
+
+    // TODO(b/145829486): see swap(InlineData, InlineData) for more info.
+    inline void SwapValue(Rep rhs, Rep& refrhs) {
+      memcpy(&refrhs, this, sizeof(*this));
+      memcpy(this, &rhs, sizeof(*this));
+    }
   };
 
   // Private implementation of `Compare()`
@@ -884,6 +891,19 @@ inline void CordRep::Unref(CordRep* rep) {
   }
 }
 
+inline void swap(InlineData& lhs, InlineData& rhs) noexcept {
+  lhs.unpoison();
+  rhs.unpoison();
+  // TODO(b/145829486): `std::swap(lhs.rep_, rhs.rep_)` results in bad codegen
+  // on clang, spilling the temporary swap value on the stack. Since `Rep` is
+  // trivial, we can make clang DTRT by calling a hand-rolled `SwapValue` where
+  // we pass `rhs` both by value (register allocated) and by reference. The IR
+  // then folds and inlines correctly into an optimized swap without spill.
+  lhs.rep_.SwapValue(rhs.rep_, rhs.rep_);
+  rhs.poison();
+  lhs.poison();
+}
+
 }  // namespace cord_internal
 
 Y_ABSL_NAMESPACE_END
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_rep_btree.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_rep_btree.h
index 0d5b4ad427ba..d527b03df7cb 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_rep_btree.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cord_rep_btree.h
@@ -684,14 +684,14 @@ inline CordRepBtree* CordRepBtree::CopyRaw(size_t new_length) const {
   // except `refcount` is trivially copyable, and the compiler does not
   // efficiently coalesce member-wise copy of these members.
   // See https://gcc.godbolt.org/z/qY8zsca6z
-  // # LINT.IfChange(copy_raw)
+  // LINT.IfChange(copy_raw)
   tree->length = new_length;
   uint8_t* dst = &tree->tag;
   const uint8_t* src = &tag;
   const ptrdiff_t offset = src - reinterpret_cast<const uint8_t*>(this);
   memcpy(dst, src, sizeof(CordRepBtree) - static_cast<size_t>(offset));
   return tree;
-  // # LINT.ThenChange()
+  // LINT.ThenChange()
 }
 
 inline CordRepBtree* CordRepBtree::Copy() const {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.cc
index e6038c9b30a1..bfa72e9609ca 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.cc
@@ -40,13 +40,15 @@ std::atomic<int> g_cordz_mean_interval(50000);
 // Special negative 'not initialized' per thread value for cordz_next_sample.
 static constexpr int64_t kInitCordzNextSample = -1;
 
-Y_ABSL_CONST_INIT thread_local int64_t cordz_next_sample = kInitCordzNextSample;
+Y_ABSL_CONST_INIT thread_local SamplingState cordz_next_sample = {
+    kInitCordzNextSample, 1};
 
 // kIntervalIfDisabled is the number of profile-eligible events need to occur
 // before the code will confirm that cordz is still disabled.
 constexpr int64_t kIntervalIfDisabled = 1 << 16;
 
-Y_ABSL_ATTRIBUTE_NOINLINE bool cordz_should_profile_slow() {
+Y_ABSL_ATTRIBUTE_NOINLINE int64_t
+cordz_should_profile_slow(SamplingState& state) {
 
   thread_local y_absl::profiling_internal::ExponentialBiased
       exponential_biased_generator;
@@ -55,30 +57,34 @@ Y_ABSL_ATTRIBUTE_NOINLINE bool cordz_should_profile_slow() {
   // Check if we disabled profiling. If so, set the next sample to a "large"
   // number to minimize the overhead of the should_profile codepath.
   if (mean_interval <= 0) {
-    cordz_next_sample = kIntervalIfDisabled;
-    return false;
+    state = {kIntervalIfDisabled, kIntervalIfDisabled};
+    return 0;
   }
 
   // Check if we're always sampling.
   if (mean_interval == 1) {
-    cordz_next_sample = 1;
-    return true;
+    state = {1, 1};
+    return 1;
   }
 
-  if (cordz_next_sample <= 0) {
+  if (cordz_next_sample.next_sample <= 0) {
     // If first check on current thread, check cordz_should_profile()
     // again using the created (initial) stride in cordz_next_sample.
-    const bool initialized = cordz_next_sample != kInitCordzNextSample;
-    cordz_next_sample = exponential_biased_generator.GetStride(mean_interval);
-    return initialized || cordz_should_profile();
+    const bool initialized =
+        cordz_next_sample.next_sample != kInitCordzNextSample;
+    auto old_stride = state.sample_stride;
+    auto stride = exponential_biased_generator.GetStride(mean_interval);
+    state = {stride, stride};
+    bool should_sample = initialized || cordz_should_profile() > 0;
+    return should_sample ? old_stride : 0;
   }
 
-  --cordz_next_sample;
-  return false;
+  --state.next_sample;
+  return 0;
 }
 
 void cordz_set_next_sample_for_testing(int64_t next_sample) {
-  cordz_next_sample = next_sample;
+  cordz_next_sample = {next_sample, next_sample};
 }
 
 #endif  // Y_ABSL_INTERNAL_CORDZ_ENABLED
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.h
index 040444777716..cb45562da6e4 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_functions.h
@@ -41,23 +41,33 @@ void set_cordz_mean_interval(int32_t mean_interval);
 
 #ifdef Y_ABSL_INTERNAL_CORDZ_ENABLED
 
+struct SamplingState {
+  int64_t next_sample;
+  int64_t sample_stride;
+};
+
 // cordz_next_sample is the number of events until the next sample event. If
 // the value is 1 or less, the code will check on the next event if cordz is
 // enabled, and if so, will sample the Cord. cordz is only enabled when we can
 // use thread locals.
-Y_ABSL_CONST_INIT extern thread_local int64_t cordz_next_sample;
-
-// Determines if the next sample should be profiled. If it is, the value pointed
-// at by next_sample will be set with the interval until the next sample.
-bool cordz_should_profile_slow();
-
-// Returns true if the next cord should be sampled.
-inline bool cordz_should_profile() {
-  if (Y_ABSL_PREDICT_TRUE(cordz_next_sample > 1)) {
-    cordz_next_sample--;
-    return false;
+Y_ABSL_CONST_INIT extern thread_local SamplingState cordz_next_sample;
+
+// Determines if the next sample should be profiled.
+// Returns:
+//   0: Do not sample
+//  >0: Sample with the stride of the last sampling period
+int64_t cordz_should_profile_slow(SamplingState& state);
+
+// Determines if the next sample should be profiled.
+// Returns:
+//   0: Do not sample
+//  >0: Sample with the stride of the last sampling period
+inline int64_t cordz_should_profile() {
+  if (Y_ABSL_PREDICT_TRUE(cordz_next_sample.next_sample > 1)) {
+    cordz_next_sample.next_sample--;
+    return 0;
   }
-  return cordz_should_profile_slow();
+  return cordz_should_profile_slow(cordz_next_sample);
 }
 
 // Sets the interval until the next sample (for testing only)
@@ -65,7 +75,7 @@ void cordz_set_next_sample_for_testing(int64_t next_sample);
 
 #else  // Y_ABSL_INTERNAL_CORDZ_ENABLED
 
-inline bool cordz_should_profile() { return false; }
+inline int64_t cordz_should_profile() { return 0; }
 inline void cordz_set_next_sample_for_testing(int64_t) {}
 
 #endif  // Y_ABSL_INTERNAL_CORDZ_ENABLED
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle.cc
index 24baed918362..28334d9556b9 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_handle.cc
@@ -16,6 +16,7 @@
 #include <atomic>
 
 #include "y_absl/base/internal/raw_logging.h"  // For Y_ABSL_RAW_CHECK
+#include "y_absl/base/no_destructor.h"
 #include "y_absl/synchronization/mutex.h"
 
 namespace y_absl {
@@ -43,33 +44,32 @@ struct Queue {
   }
 };
 
-static Queue* GlobalQueue() {
-  static Queue* global_queue = new Queue;
-  return global_queue;
+static Queue& GlobalQueue() {
+  static y_absl::NoDestructor<Queue> global_queue;
+  return *global_queue;
 }
 
 }  // namespace
 
 CordzHandle::CordzHandle(bool is_snapshot) : is_snapshot_(is_snapshot) {
-  Queue* global_queue = GlobalQueue();
+  Queue& global_queue = GlobalQueue();
   if (is_snapshot) {
-    MutexLock lock(&global_queue->mutex);
-    CordzHandle* dq_tail =
-        global_queue->dq_tail.load(std::memory_order_acquire);
+    MutexLock lock(&global_queue.mutex);
+    CordzHandle* dq_tail = global_queue.dq_tail.load(std::memory_order_acquire);
     if (dq_tail != nullptr) {
       dq_prev_ = dq_tail;
       dq_tail->dq_next_ = this;
     }
-    global_queue->dq_tail.store(this, std::memory_order_release);
+    global_queue.dq_tail.store(this, std::memory_order_release);
   }
 }
 
 CordzHandle::~CordzHandle() {
-  Queue* global_queue = GlobalQueue();
+  Queue& global_queue = GlobalQueue();
   if (is_snapshot_) {
     std::vector<CordzHandle*> to_delete;
     {
-      MutexLock lock(&global_queue->mutex);
+      MutexLock lock(&global_queue.mutex);
       CordzHandle* next = dq_next_;
       if (dq_prev_ == nullptr) {
         // We were head of the queue, delete every CordzHandle until we reach
@@ -85,7 +85,7 @@ CordzHandle::~CordzHandle() {
       if (next) {
         next->dq_prev_ = dq_prev_;
       } else {
-        global_queue->dq_tail.store(dq_prev_, std::memory_order_release);
+        global_queue.dq_tail.store(dq_prev_, std::memory_order_release);
       }
     }
     for (CordzHandle* handle : to_delete) {
@@ -95,20 +95,20 @@ CordzHandle::~CordzHandle() {
 }
 
 bool CordzHandle::SafeToDelete() const {
-  return is_snapshot_ || GlobalQueue()->IsEmpty();
+  return is_snapshot_ || GlobalQueue().IsEmpty();
 }
 
 void CordzHandle::Delete(CordzHandle* handle) {
   assert(handle);
   if (handle) {
-    Queue* const queue = GlobalQueue();
+    Queue& queue = GlobalQueue();
     if (!handle->SafeToDelete()) {
-      MutexLock lock(&queue->mutex);
-      CordzHandle* dq_tail = queue->dq_tail.load(std::memory_order_acquire);
+      MutexLock lock(&queue.mutex);
+      CordzHandle* dq_tail = queue.dq_tail.load(std::memory_order_acquire);
       if (dq_tail != nullptr) {
         handle->dq_prev_ = dq_tail;
         dq_tail->dq_next_ = handle;
-        queue->dq_tail.store(handle, std::memory_order_release);
+        queue.dq_tail.store(handle, std::memory_order_release);
         return;
       }
     }
@@ -118,9 +118,9 @@ void CordzHandle::Delete(CordzHandle* handle) {
 
 std::vector<const CordzHandle*> CordzHandle::DiagnosticsGetDeleteQueue() {
   std::vector<const CordzHandle*> handles;
-  Queue* global_queue = GlobalQueue();
-  MutexLock lock(&global_queue->mutex);
-  CordzHandle* dq_tail = global_queue->dq_tail.load(std::memory_order_acquire);
+  Queue& global_queue = GlobalQueue();
+  MutexLock lock(&global_queue.mutex);
+  CordzHandle* dq_tail = global_queue.dq_tail.load(std::memory_order_acquire);
   for (const CordzHandle* p = dq_tail; p; p = p->dq_prev_) {
     handles.push_back(p);
   }
@@ -133,9 +133,9 @@ bool CordzHandle::DiagnosticsHandleIsSafeToInspect(
   if (handle == nullptr) return true;
   if (handle->is_snapshot_) return false;
   bool snapshot_found = false;
-  Queue* global_queue = GlobalQueue();
-  MutexLock lock(&global_queue->mutex);
-  for (const CordzHandle* p = global_queue->dq_tail; p; p = p->dq_prev_) {
+  Queue& global_queue = GlobalQueue();
+  MutexLock lock(&global_queue.mutex);
+  for (const CordzHandle* p = global_queue.dq_tail; p; p = p->dq_prev_) {
     if (p == handle) return !snapshot_found;
     if (p == this) snapshot_found = true;
   }
@@ -150,8 +150,8 @@ CordzHandle::DiagnosticsGetSafeToInspectDeletedHandles() {
     return handles;
   }
 
-  Queue* global_queue = GlobalQueue();
-  MutexLock lock(&global_queue->mutex);
+  Queue& global_queue = GlobalQueue();
+  MutexLock lock(&global_queue.mutex);
   for (const CordzHandle* p = dq_next_; p != nullptr; p = p->dq_next_) {
     if (!p->is_snapshot()) {
       handles.push_back(p);
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc
index 6c3c0e6c22bc..320a01edd457 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.cc
@@ -14,6 +14,8 @@
 
 #include "y_absl/strings/internal/cordz_info.h"
 
+#include <cstdint>
+
 #include "y_absl/base/config.h"
 #include "y_absl/base/internal/spinlock.h"
 #include "y_absl/container/inlined_vector.h"
@@ -247,10 +249,12 @@ CordzInfo* CordzInfo::Next(const CordzSnapshot& snapshot) const {
   return next;
 }
 
-void CordzInfo::TrackCord(InlineData& cord, MethodIdentifier method) {
+void CordzInfo::TrackCord(InlineData& cord, MethodIdentifier method,
+                          int64_t sampling_stride) {
   assert(cord.is_tree());
   assert(!cord.is_profiled());
-  CordzInfo* cordz_info = new CordzInfo(cord.as_tree(), nullptr, method);
+  CordzInfo* cordz_info =
+      new CordzInfo(cord.as_tree(), nullptr, method, sampling_stride);
   cord.set_cordz_info(cordz_info);
   cordz_info->Track();
 }
@@ -266,7 +270,8 @@ void CordzInfo::TrackCord(InlineData& cord, const InlineData& src,
   if (cordz_info != nullptr) cordz_info->Untrack();
 
   // Start new cord sample
-  cordz_info = new CordzInfo(cord.as_tree(), src.cordz_info(), method);
+  cordz_info = new CordzInfo(cord.as_tree(), src.cordz_info(), method,
+                             src.cordz_info()->sampling_stride());
   cord.set_cordz_info(cordz_info);
   cordz_info->Track();
 }
@@ -298,9 +303,8 @@ size_t CordzInfo::FillParentStack(const CordzInfo* src, void** stack) {
   return src->stack_depth_;
 }
 
-CordzInfo::CordzInfo(CordRep* rep,
-                     const CordzInfo* src,
-                     MethodIdentifier method)
+CordzInfo::CordzInfo(CordRep* rep, const CordzInfo* src,
+                     MethodIdentifier method, int64_t sampling_stride)
     : rep_(rep),
       stack_depth_(
           static_cast<size_t>(y_absl::GetStackTrace(stack_,
@@ -309,7 +313,8 @@ CordzInfo::CordzInfo(CordRep* rep,
       parent_stack_depth_(FillParentStack(src, parent_stack_)),
       method_(method),
       parent_method_(GetParentMethod(src)),
-      create_time_(y_absl::Now()) {
+      create_time_(y_absl::Now()),
+      sampling_stride_(sampling_stride) {
   update_tracker_.LossyAdd(method);
   if (src) {
     // Copy parent counters.
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.h
index ca7ecab469e1..7bbbb9e231ff 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/cordz_info.h
@@ -60,7 +60,8 @@ class Y_ABSL_LOCKABLE CordzInfo : public CordzHandle {
   // and/or deleted. `method` identifies the Cord public API method initiating
   // the cord to be sampled.
   // Requires `cord` to hold a tree, and `cord.cordz_info()` to be null.
-  static void TrackCord(InlineData& cord, MethodIdentifier method);
+  static void TrackCord(InlineData& cord, MethodIdentifier method,
+                        int64_t sampling_stride);
 
   // Identical to TrackCord(), except that this function fills the
   // `parent_stack` and `parent_method` properties of the returned CordzInfo
@@ -181,6 +182,8 @@ class Y_ABSL_LOCKABLE CordzInfo : public CordzHandle {
   // or RemovePrefix.
   CordzStatistics GetCordzStatistics() const;
 
+  int64_t sampling_stride() const { return sampling_stride_; }
+
  private:
   using SpinLock = y_absl::base_internal::SpinLock;
   using SpinLockHolder = ::y_absl::base_internal::SpinLockHolder;
@@ -199,7 +202,7 @@ class Y_ABSL_LOCKABLE CordzInfo : public CordzHandle {
   static constexpr size_t kMaxStackDepth = 64;
 
   explicit CordzInfo(CordRep* rep, const CordzInfo* src,
-                     MethodIdentifier method);
+                     MethodIdentifier method, int64_t weight);
   ~CordzInfo() override;
 
   // Sets `rep_` without holding a lock.
@@ -250,12 +253,14 @@ class Y_ABSL_LOCKABLE CordzInfo : public CordzHandle {
   const MethodIdentifier parent_method_;
   CordzUpdateTracker update_tracker_;
   const y_absl::Time create_time_;
+  const int64_t sampling_stride_;
 };
 
 inline Y_ABSL_ATTRIBUTE_ALWAYS_INLINE void CordzInfo::MaybeTrackCord(
     InlineData& cord, MethodIdentifier method) {
-  if (Y_ABSL_PREDICT_FALSE(cordz_should_profile())) {
-    TrackCord(cord, method);
+  auto stride = cordz_should_profile();
+  if (Y_ABSL_PREDICT_FALSE(stride > 0)) {
+    TrackCord(cord, method, stride);
   }
 }
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/escaping.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/escaping.cc
index 94d3a21db3ac..cbfeed0440f7 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/escaping.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/escaping.cc
@@ -14,6 +14,8 @@
 
 #include "y_absl/strings/internal/escaping.h"
 
+#include <limits>
+
 #include "y_absl/base/internal/endian.h"
 #include "y_absl/base/internal/raw_logging.h"
 
@@ -31,12 +33,14 @@ Y_ABSL_CONST_INIT const char kBase64Chars[] =
 Y_ABSL_CONST_INIT const char kWebSafeBase64Chars[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 
-
 size_t CalculateBase64EscapedLenInternal(size_t input_len, bool do_padding) {
   // Base64 encodes three bytes of input at a time. If the input is not
   // divisible by three, we pad as appropriate.
   //
   // Base64 encodes each three bytes of input into four bytes of output.
+  constexpr size_t kMaxSize = (std::numeric_limits<size_t>::max() - 1) / 4 * 3;
+  Y_ABSL_INTERNAL_CHECK(input_len <= kMaxSize,
+                      "CalculateBase64EscapedLenInternal() overflow");
   size_t len = (input_len / 3) * 4;
 
   // Since all base 64 input is an integral number of octets, only the following
@@ -66,7 +70,6 @@ size_t CalculateBase64EscapedLenInternal(size_t input_len, bool do_padding) {
     }
   }
 
-  assert(len >= input_len);  // make sure we didn't overflow
   return len;
 }
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_join_internal.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_join_internal.h
index d4ef8a2c863d..7a1aa0585fa5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_join_internal.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_join_internal.h
@@ -31,16 +31,23 @@
 #ifndef Y_ABSL_STRINGS_INTERNAL_STR_JOIN_INTERNAL_H_
 #define Y_ABSL_STRINGS_INTERNAL_STR_JOIN_INTERNAL_H_
 
+#include <cstdint>
 #include <cstring>
+#include <initializer_list>
 #include <iterator>
+#include <limits>
 #include <memory>
 #include <util/generic/string.h>
+#include <tuple>
 #include <type_traits>
 #include <utility>
 
+#include "y_absl/base/config.h"
+#include "y_absl/base/internal/raw_logging.h"
 #include "y_absl/strings/internal/ostringstream.h"
 #include "y_absl/strings/internal/resize_uninitialized.h"
 #include "y_absl/strings/str_cat.h"
+#include "y_absl/strings/string_view.h"
 
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
@@ -230,14 +237,19 @@ TString JoinAlgorithm(Iterator start, Iterator end, y_absl::string_view s,
   if (start != end) {
     // Sums size
     auto&& start_value = *start;
-    size_t result_size = start_value.size();
+    // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+    // in memory strings to overflow a uint64_t.
+    uint64_t result_size = start_value.size();
     for (Iterator it = start; ++it != end;) {
       result_size += s.size();
       result_size += (*it).size();
     }
 
     if (result_size > 0) {
-      STLStringResizeUninitialized(&result, result_size);
+      constexpr uint64_t kMaxSize =
+          uint64_t{(std::numeric_limits<size_t>::max)()};
+      Y_ABSL_INTERNAL_CHECK(result_size <= kMaxSize, "size_t overflow");
+      STLStringResizeUninitialized(&result, static_cast<size_t>(result_size));
 
       // Joins strings
       char* result_buf = &*result.begin();
@@ -310,6 +322,15 @@ TString JoinRange(const Range& range, y_absl::string_view separator) {
   return JoinRange(begin(range), end(range), separator);
 }
 
+template <typename Tuple, std::size_t... I>
+TString JoinTuple(const Tuple& value, y_absl::string_view separator,
+                      std::index_sequence<I...>) {
+  return JoinRange(
+      std::initializer_list<y_absl::string_view>{
+          static_cast<const AlphaNum&>(std::get<I>(value)).Piece()...},
+      separator);
+}
+
 }  // namespace strings_internal
 Y_ABSL_NAMESPACE_END
 }  // namespace y_absl
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_split_internal.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_split_internal.h
index 19afc28ee521..fff1be7aaa91 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_split_internal.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/internal/str_split_internal.h
@@ -30,6 +30,7 @@
 #define Y_ABSL_STRINGS_INTERNAL_STR_SPLIT_INTERNAL_H_
 
 #include <array>
+#include <cstddef>
 #include <initializer_list>
 #include <iterator>
 #include <tuple>
@@ -402,7 +403,10 @@ class Splitter {
           ar[index].size = it->size();
           ++it;
         } while (++index != ar.size() && !it.at_end());
-        v.insert(v.end(), ar.begin(), ar.begin() + index);
+        // We static_cast index to a signed type to work around overzealous
+        // compiler warnings about signedness.
+        v.insert(v.end(), ar.begin(),
+                 ar.begin() + static_cast<ptrdiff_t>(index));
       }
       return v;
     }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/numbers.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/numbers.cc
index a200efb10b79..4ec2023fb883 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/numbers.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/numbers.cc
@@ -20,9 +20,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cfloat>  // for DBL_DIG and FLT_DIG
-#include <climits>
 #include <cmath>   // for HUGE_VAL
-#include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
@@ -30,7 +28,6 @@
 #include <iterator>
 #include <limits>
 #include <system_error>  // NOLINT(build/c++11)
-#include <type_traits>
 #include <utility>
 
 #include "y_absl/base/attributes.h"
@@ -159,71 +156,28 @@ constexpr uint32_t kTwoZeroBytes = 0x0101 * '0';
 constexpr uint64_t kFourZeroBytes = 0x01010101 * '0';
 constexpr uint64_t kEightZeroBytes = 0x0101010101010101ull * '0';
 
-template <typename T>
-constexpr T Pow(T base, uint32_t n) {
-  // Exponentiation by squaring
-  return static_cast<T>((n > 1 ? Pow(base * base, n >> 1) : static_cast<T>(1)) *
-                        ((n & 1) ? base : static_cast<T>(1)));
-}
-
-// Given n, calculates C where the following holds for all 0 <= x < Pow(100, n):
-// x / Pow(10, n) == x * C / Pow(2, n * 10)
-// In other words, it allows us to divide by a power of 10 via a single
-// multiplication and bit shifts, assuming the input will be smaller than the
-// square of that power of 10.
-template <typename T>
-constexpr T ComputePowerOf100DivisionCoefficient(uint32_t n) {
-  if (n > 4) {
-    // This doesn't work for large powers of 100, due to overflow
-    abort();
-  }
-  T denom = 16 - 1;
-  T num = (denom + 1) - 10;
-  T gcd = 3;  // Greatest common divisor of numerator and denominator
-  denom = Pow(denom / gcd, n);
-  num = Pow(num / gcd, 9 * n);
-  T quotient = num / denom;
-  if (num % denom >= denom / 2) {
-    // Round up, since the remainder is more than half the denominator
-    ++quotient;
-  }
-  return quotient;
-}
-
-// * kDivisionBy10Mul / kDivisionBy10Div is a division by 10 for values from 0
-// to 99. It's also a division of a structure [k takes 2 bytes][m takes 2
-// bytes], then * kDivisionBy10Mul / kDivisionBy10Div will be [k / 10][m / 10].
-// It allows parallel division.
-constexpr uint64_t kDivisionBy10Mul =
-    ComputePowerOf100DivisionCoefficient<uint64_t>(1);
-static_assert(kDivisionBy10Mul == 103,
-              "division coefficient for 10 is incorrect");
+// * 103 / 1024 is a division by 10 for values from 0 to 99. It's also a
+// division of a structure [k takes 2 bytes][m takes 2 bytes], then * 103 / 1024
+// will be [k / 10][m / 10]. It allows parallel division.
+constexpr uint64_t kDivisionBy10Mul = 103u;
 constexpr uint64_t kDivisionBy10Div = 1 << 10;
 
-// * kDivisionBy100Mul / kDivisionBy100Div is a division by 100 for values from
-// 0 to 9999.
-constexpr uint64_t kDivisionBy100Mul =
-    ComputePowerOf100DivisionCoefficient<uint64_t>(2);
-static_assert(kDivisionBy100Mul == 10486,
-              "division coefficient for 100 is incorrect");
+// * 10486 / 1048576 is a division by 100 for values from 0 to 9999.
+constexpr uint64_t kDivisionBy100Mul = 10486u;
 constexpr uint64_t kDivisionBy100Div = 1 << 20;
 
-static_assert(ComputePowerOf100DivisionCoefficient<uint64_t>(3) == 1073742,
-              "division coefficient for 1000 is incorrect");
-
-// Same as `PrepareEightDigits`, but produces 2 digits for integers < 100.
-inline uint32_t PrepareTwoDigitsImpl(uint32_t i, bool reversed) {
-  assert(i < 100);
-  uint32_t div10 = (i * kDivisionBy10Mul) / kDivisionBy10Div;
-  uint32_t mod10 = i - 10u * div10;
-  return (div10 << (reversed ? 8 : 0)) + (mod10 << (reversed ? 0 : 8));
-}
-inline uint32_t PrepareTwoDigits(uint32_t i) {
-  return PrepareTwoDigitsImpl(i, false);
+// Encode functions write the ASCII output of input `n` to `out_str`.
+inline char* EncodeHundred(uint32_t n, y_absl::Nonnull<char*> out_str) {
+  int num_digits = static_cast<int>(n - 10) >> 8;
+  uint32_t div10 = (n * kDivisionBy10Mul) / kDivisionBy10Div;
+  uint32_t mod10 = n - 10u * div10;
+  uint32_t base = kTwoZeroBytes + div10 + (mod10 << 8);
+  base >>= num_digits & 8;
+  little_endian::Store16(out_str, static_cast<uint16_t>(base));
+  return out_str + 2 + num_digits;
 }
 
-// Same as `PrepareEightDigits`, but produces 4 digits for integers < 10000.
-inline uint32_t PrepareFourDigitsImpl(uint32_t n, bool reversed) {
+inline char* EncodeTenThousand(uint32_t n, y_absl::Nonnull<char*> out_str) {
   // We split lower 2 digits and upper 2 digits of n into 2 byte consecutive
   // blocks. 123 ->  [\0\1][\0\23]. We divide by 10 both blocks
   // (it's 1 division + zeroing upper bits), and compute modulo 10 as well "in
@@ -231,19 +185,22 @@ inline uint32_t PrepareFourDigitsImpl(uint32_t n, bool reversed) {
   // strip trailing zeros, add ASCII '0000' and return.
   uint32_t div100 = (n * kDivisionBy100Mul) / kDivisionBy100Div;
   uint32_t mod100 = n - 100ull * div100;
-  uint32_t hundreds =
-      (mod100 << (reversed ? 0 : 16)) + (div100 << (reversed ? 16 : 0));
+  uint32_t hundreds = (mod100 << 16) + div100;
   uint32_t tens = (hundreds * kDivisionBy10Mul) / kDivisionBy10Div;
   tens &= (0xFull << 16) | 0xFull;
-  tens = (tens << (reversed ? 8 : 0)) +
-         static_cast<uint32_t>((hundreds - 10ull * tens) << (reversed ? 0 : 8));
-  return tens;
-}
-inline uint32_t PrepareFourDigits(uint32_t n) {
-  return PrepareFourDigitsImpl(n, false);
-}
-inline uint32_t PrepareFourDigitsReversed(uint32_t n) {
-  return PrepareFourDigitsImpl(n, true);
+  tens += (hundreds - 10ull * tens) << 8;
+  Y_ABSL_ASSUME(tens != 0);
+  // The result can contain trailing zero bits, we need to strip them to a first
+  // significant byte in a final representation. For example, for n = 123, we
+  // have tens to have representation \0\1\2\3. We do `& -8` to round
+  // to a multiple to 8 to strip zero bytes, not all zero bits.
+  // countr_zero to help.
+  // 0 minus 8 to make MSVC happy.
+  uint32_t zeroes = static_cast<uint32_t>(y_absl::countr_zero(tens)) & (0 - 8u);
+  tens += kFourZeroBytes;
+  tens >>= zeroes;
+  little_endian::Store32(out_str, tens);
+  return out_str + sizeof(tens) - zeroes / 8;
 }
 
 // Helper function to produce an ASCII representation of `i`.
@@ -259,309 +216,126 @@ inline uint32_t PrepareFourDigitsReversed(uint32_t n) {
 //  // Note two leading zeros:
 //  EXPECT_EQ(y_absl::string_view(ascii, 8), "00102030");
 //
-// If `Reversed` is set to true, the result becomes reversed to "03020100".
-//
 // Pre-condition: `i` must be less than 100000000.
-inline uint64_t PrepareEightDigitsImpl(uint32_t i, bool reversed) {
+inline uint64_t PrepareEightDigits(uint32_t i) {
   Y_ABSL_ASSUME(i < 10000'0000);
   // Prepare 2 blocks of 4 digits "in parallel".
   uint32_t hi = i / 10000;
   uint32_t lo = i % 10000;
-  uint64_t merged = (uint64_t{hi} << (reversed ? 32 : 0)) |
-                    (uint64_t{lo} << (reversed ? 0 : 32));
+  uint64_t merged = hi | (uint64_t{lo} << 32);
   uint64_t div100 = ((merged * kDivisionBy100Mul) / kDivisionBy100Div) &
                     ((0x7Full << 32) | 0x7Full);
   uint64_t mod100 = merged - 100ull * div100;
-  uint64_t hundreds =
-      (mod100 << (reversed ? 0 : 16)) + (div100 << (reversed ? 16 : 0));
+  uint64_t hundreds = (mod100 << 16) + div100;
   uint64_t tens = (hundreds * kDivisionBy10Mul) / kDivisionBy10Div;
   tens &= (0xFull << 48) | (0xFull << 32) | (0xFull << 16) | 0xFull;
-  tens = (tens << (reversed ? 8 : 0)) +
-         ((hundreds - 10ull * tens) << (reversed ? 0 : 8));
+  tens += (hundreds - 10ull * tens) << 8;
   return tens;
 }
-inline uint64_t PrepareEightDigits(uint32_t i) {
-  return PrepareEightDigitsImpl(i, false);
-}
-inline uint64_t PrepareEightDigitsReversed(uint32_t i) {
-  return PrepareEightDigitsImpl(i, true);
-}
 
-template <typename T, typename BackwardIt>
-class FastUIntToStringConverter {
-  static_assert(
-      std::is_same<T, decltype(+std::declval<T>())>::value,
-      "to avoid code bloat, only instantiate this for int and larger types");
-  static_assert(std::is_unsigned<T>::value,
-                "this class is only for unsigned types");
-
- public:
-  // Outputs the given number backward (like with std::copy_backward),
-  // starting from the end of the string.
-  // The number of digits in the number must have been already measured and
-  // passed *exactly*, otherwise the behavior is undefined.
-  // (This is an optimization, as calculating the number of digits again would
-  // slow down the hot path.)
-  // Returns an iterator to the start of the suffix that was appended.
-  static BackwardIt FastIntToBufferBackward(T v, BackwardIt end) {
-    // THIS IS A HOT FUNCTION with a very deliberate structure to exploit branch
-    // prediction and shorten the critical path for smaller numbers.
-    // Do not move around the if/else blocks or attempt to simplify it
-    // without benchmarking any changes.
-
-    if (v < 10) {
-      goto AT_LEAST_1 /* NOTE: mandatory for the 0 case */;
-    }
-    if (v < 1000) {
-      goto AT_LEAST_10;
-    }
-    if (v < 10000000) {
-      goto AT_LEAST_1000;
-    }
-
-    if (v >= 100000000 / 10) {
-      if (v >= 10000000000000000 / 10) {
-        DoFastIntToBufferBackward<8>(v, end);
-      }
-      DoFastIntToBufferBackward<8>(v, end);
-    }
-
-    if (v >= 10000 / 10) {
-    AT_LEAST_1000:
-      DoFastIntToBufferBackward<4>(v, end);
-    }
-
-    if (v >= 100 / 10) {
-    AT_LEAST_10:
-      DoFastIntToBufferBackward<2>(v, end);
-    }
-
-    if (v >= 10 / 10) {
-    AT_LEAST_1:
-      end = DoFastIntToBufferBackward(v, end, std::integral_constant<int, 1>());
-    }
-    return end;
+inline Y_ABSL_ATTRIBUTE_ALWAYS_INLINE y_absl::Nonnull<char*> EncodeFullU32(
+    uint32_t n, y_absl::Nonnull<char*> out_str) {
+  if (n < 10) {
+    *out_str = static_cast<char>('0' + n);
+    return out_str + 1;
   }
-
- private:
-  // Only assume pointers are contiguous for now. String and vector iterators
-  // could be special-cased as well, but there's no need for them here.
-  // With C++20 we can probably switch to std::contiguous_iterator_tag.
-  static constexpr bool kIsContiguousIterator =
-      std::is_pointer<BackwardIt>::value;
-
-  template <int Exponent>
-  static void DoFastIntToBufferBackward(T& v, BackwardIt& end) {
-    constexpr T kModulus = Pow<T>(10, Exponent);
-    T remainder = static_cast<T>(v % kModulus);
-    v = static_cast<T>(v / kModulus);
-    end = DoFastIntToBufferBackward(remainder, end,
-                                    std::integral_constant<int, Exponent>());
-  }
-
-  static BackwardIt DoFastIntToBufferBackward(const T&, BackwardIt end,
-                                              std::integral_constant<int, 0>) {
-    return end;
-  }
-
-  static BackwardIt DoFastIntToBufferBackward(T v, BackwardIt end,
-                                              std::integral_constant<int, 1>) {
-    *--end = static_cast<char>('0' + v);
-    return DoFastIntToBufferBackward(v, end, std::integral_constant<int, 0>());
-  }
-
-  static BackwardIt DoFastIntToBufferBackward(T v, BackwardIt end,
-                                              std::integral_constant<int, 4>) {
-    if (kIsContiguousIterator) {
-      const uint32_t digits =
-          PrepareFourDigits(static_cast<uint32_t>(v)) + kFourZeroBytes;
-      end -= sizeof(digits);
-      little_endian::Store32(&*end, digits);
-    } else {
-      uint32_t digits =
-          PrepareFourDigitsReversed(static_cast<uint32_t>(v)) + kFourZeroBytes;
-      for (size_t i = 0; i < sizeof(digits); ++i) {
-        *--end = static_cast<char>(digits);
-        digits >>= CHAR_BIT;
-      }
-    }
-    return end;
+  if (n < 100'000'000) {
+    uint64_t bottom = PrepareEightDigits(n);
+    Y_ABSL_ASSUME(bottom != 0);
+    // 0 minus 8 to make MSVC happy.
+    uint32_t zeroes =
+        static_cast<uint32_t>(y_absl::countr_zero(bottom)) & (0 - 8u);
+    little_endian::Store64(out_str, (bottom + kEightZeroBytes) >> zeroes);
+    return out_str + sizeof(bottom) - zeroes / 8;
   }
-
-  static BackwardIt DoFastIntToBufferBackward(T v, BackwardIt end,
-                                              std::integral_constant<int, 8>) {
-    if (kIsContiguousIterator) {
-      const uint64_t digits =
-          PrepareEightDigits(static_cast<uint32_t>(v)) + kEightZeroBytes;
-      end -= sizeof(digits);
-      little_endian::Store64(&*end, digits);
-    } else {
-      uint64_t digits = PrepareEightDigitsReversed(static_cast<uint32_t>(v)) +
-                        kEightZeroBytes;
-      for (size_t i = 0; i < sizeof(digits); ++i) {
-        *--end = static_cast<char>(digits);
-        digits >>= CHAR_BIT;
-      }
-    }
-    return end;
-  }
-
-  template <int Digits>
-  static BackwardIt DoFastIntToBufferBackward(
-      T v, BackwardIt end, std::integral_constant<int, Digits>) {
-    constexpr int kLogModulus = Digits - Digits / 2;
-    constexpr T kModulus = Pow(static_cast<T>(10), kLogModulus);
-    bool is_safe_to_use_division_trick = Digits <= 8;
-    T quotient, remainder;
-    if (is_safe_to_use_division_trick) {
-      constexpr uint64_t kCoefficient =
-          ComputePowerOf100DivisionCoefficient<uint64_t>(kLogModulus);
-      quotient = (v * kCoefficient) >> (10 * kLogModulus);
-      remainder = v - quotient * kModulus;
-    } else {
-      quotient = v / kModulus;
-      remainder = v % kModulus;
-    }
-    end = DoFastIntToBufferBackward(remainder, end,
-                                    std::integral_constant<int, kLogModulus>());
-    return DoFastIntToBufferBackward(
-        quotient, end, std::integral_constant<int, Digits - kLogModulus>());
-  }
-};
-
-// Returns an iterator to the start of the suffix that was appended
-template <typename T, typename BackwardIt>
-std::enable_if_t<std::is_unsigned<T>::value, BackwardIt>
-DoFastIntToBufferBackward(T v, BackwardIt end, uint32_t digits) {
-  using PromotedT = std::decay_t<decltype(+v)>;
-  using Converter = FastUIntToStringConverter<PromotedT, BackwardIt>;
-  (void)digits;
-  return Converter().FastIntToBufferBackward(v, end);
+  uint32_t div08 = n / 100'000'000;
+  uint32_t mod08 = n % 100'000'000;
+  uint64_t bottom = PrepareEightDigits(mod08) + kEightZeroBytes;
+  out_str = EncodeHundred(div08, out_str);
+  little_endian::Store64(out_str, bottom);
+  return out_str + sizeof(bottom);
 }
 
-template <typename T, typename BackwardIt>
-std::enable_if_t<std::is_signed<T>::value, BackwardIt>
-DoFastIntToBufferBackward(T v, BackwardIt end, uint32_t digits) {
-  if (y_absl::numbers_internal::IsNegative(v)) {
-    // Store the minus sign *before* we produce the number itself, not after.
-    // This gets us a tail call.
-    end[-static_cast<ptrdiff_t>(digits) - 1] = '-';
+inline Y_ABSL_ATTRIBUTE_ALWAYS_INLINE char* EncodeFullU64(uint64_t i,
+                                                        char* buffer) {
+  if (i <= std::numeric_limits<uint32_t>::max()) {
+    return EncodeFullU32(static_cast<uint32_t>(i), buffer);
   }
-  return DoFastIntToBufferBackward(
-      y_absl::numbers_internal::UnsignedAbsoluteValue(v), end, digits);
-}
-
-template <class T>
-std::enable_if_t<std::is_integral<T>::value, int>
-GetNumDigitsOrNegativeIfNegativeImpl(T v) {
-  const auto /* either bool or std::false_type */ is_negative =
-      y_absl::numbers_internal::IsNegative(v);
-  const int digits = static_cast<int>(y_absl::numbers_internal::Base10Digits(
-      y_absl::numbers_internal::UnsignedAbsoluteValue(v)));
-  return is_negative ? ~digits : digits;
+  uint32_t mod08;
+  if (i < 1'0000'0000'0000'0000ull) {
+    uint32_t div08 = static_cast<uint32_t>(i / 100'000'000ull);
+    mod08 =  static_cast<uint32_t>(i % 100'000'000ull);
+    buffer = EncodeFullU32(div08, buffer);
+  } else {
+    uint64_t div08 = i / 100'000'000ull;
+    mod08 =  static_cast<uint32_t>(i % 100'000'000ull);
+    uint32_t div016 = static_cast<uint32_t>(div08 / 100'000'000ull);
+    uint32_t div08mod08 = static_cast<uint32_t>(div08 % 100'000'000ull);
+    uint64_t mid_result = PrepareEightDigits(div08mod08) + kEightZeroBytes;
+    buffer = EncodeTenThousand(div016, buffer);
+    little_endian::Store64(buffer, mid_result);
+    buffer += sizeof(mid_result);
+  }
+  uint64_t mod_result = PrepareEightDigits(mod08) + kEightZeroBytes;
+  little_endian::Store64(buffer, mod_result);
+  return buffer + sizeof(mod_result);
 }
 
 }  // namespace
 
 void numbers_internal::PutTwoDigits(uint32_t i, y_absl::Nonnull<char*> buf) {
-  little_endian::Store16(
-      buf, static_cast<uint16_t>(PrepareTwoDigits(i) + kTwoZeroBytes));
+  assert(i < 100);
+  uint32_t base = kTwoZeroBytes;
+  uint32_t div10 = (i * kDivisionBy10Mul) / kDivisionBy10Div;
+  uint32_t mod10 = i - 10u * div10;
+  base += div10 + (mod10 << 8);
+  little_endian::Store16(buf, static_cast<uint16_t>(base));
 }
 
 y_absl::Nonnull<char*> numbers_internal::FastIntToBuffer(
-    uint32_t i, y_absl::Nonnull<char*> buffer) {
-  const uint32_t digits = y_absl::numbers_internal::Base10Digits(i);
-  buffer += digits;
-  *buffer = '\0';  // We're going backward, so store this first
-  FastIntToBufferBackward(i, buffer, digits);
-  return buffer;
+    uint32_t n, y_absl::Nonnull<char*> out_str) {
+  out_str = EncodeFullU32(n, out_str);
+  *out_str = '\0';
+  return out_str;
 }
 
 y_absl::Nonnull<char*> numbers_internal::FastIntToBuffer(
     int32_t i, y_absl::Nonnull<char*> buffer) {
-  buffer += static_cast<int>(i < 0);
-  uint32_t digits = y_absl::numbers_internal::Base10Digits(
-      y_absl::numbers_internal::UnsignedAbsoluteValue(i));
-  buffer += digits;
-  *buffer = '\0';  // We're going backward, so store this first
-  FastIntToBufferBackward(i, buffer, digits);
+  uint32_t u = static_cast<uint32_t>(i);
+  if (i < 0) {
+    *buffer++ = '-';
+    // We need to do the negation in modular (i.e., "unsigned")
+    // arithmetic; MSVC++ apparently warns for plain "-u", so
+    // we write the equivalent expression "0 - u" instead.
+    u = 0 - u;
+  }
+  buffer = EncodeFullU32(u, buffer);
+  *buffer = '\0';
   return buffer;
 }
 
 y_absl::Nonnull<char*> numbers_internal::FastIntToBuffer(
     uint64_t i, y_absl::Nonnull<char*> buffer) {
-  uint32_t digits = y_absl::numbers_internal::Base10Digits(i);
-  buffer += digits;
-  *buffer = '\0';  // We're going backward, so store this first
-  FastIntToBufferBackward(i, buffer, digits);
+  buffer = EncodeFullU64(i, buffer);
+  *buffer = '\0';
   return buffer;
 }
 
 y_absl::Nonnull<char*> numbers_internal::FastIntToBuffer(
     int64_t i, y_absl::Nonnull<char*> buffer) {
-  buffer += static_cast<int>(i < 0);
-  uint32_t digits = y_absl::numbers_internal::Base10Digits(
-      y_absl::numbers_internal::UnsignedAbsoluteValue(i));
-  buffer += digits;
-  *buffer = '\0';  // We're going backward, so store this first
-  FastIntToBufferBackward(i, buffer, digits);
+  uint64_t u = static_cast<uint64_t>(i);
+  if (i < 0) {
+    *buffer++ = '-';
+    // We need to do the negation in modular (i.e., "unsigned")
+    // arithmetic; MSVC++ apparently warns for plain "-u", so
+    // we write the equivalent expression "0 - u" instead.
+    u = 0 - u;
+  }
+  buffer = EncodeFullU64(u, buffer);
+  *buffer = '\0';
   return buffer;
 }
 
-y_absl::Nonnull<char*> numbers_internal::FastIntToBufferBackward(
-    uint32_t i, y_absl::Nonnull<char*> buffer_end, uint32_t exact_digit_count) {
-  return DoFastIntToBufferBackward(i, buffer_end, exact_digit_count);
-}
-
-y_absl::Nonnull<char*> numbers_internal::FastIntToBufferBackward(
-    int32_t i, y_absl::Nonnull<char*> buffer_end, uint32_t exact_digit_count) {
-  return DoFastIntToBufferBackward(i, buffer_end, exact_digit_count);
-}
-
-y_absl::Nonnull<char*> numbers_internal::FastIntToBufferBackward(
-    uint64_t i, y_absl::Nonnull<char*> buffer_end, uint32_t exact_digit_count) {
-  return DoFastIntToBufferBackward(i, buffer_end, exact_digit_count);
-}
-
-y_absl::Nonnull<char*> numbers_internal::FastIntToBufferBackward(
-    int64_t i, y_absl::Nonnull<char*> buffer_end, uint32_t exact_digit_count) {
-  return DoFastIntToBufferBackward(i, buffer_end, exact_digit_count);
-}
-
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(signed char v) {
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(unsigned char v) {
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(short v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(
-    unsigned short v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(int v) {
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(unsigned int v) {
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(long v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(
-    unsigned long v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(long long v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-int numbers_internal::GetNumDigitsOrNegativeIfNegative(
-    unsigned long long v) {  // NOLINT
-  return GetNumDigitsOrNegativeIfNegativeImpl(v);
-}
-
 // Given a 128-bit number expressed as a pair of uint64_t, high half first,
 // return that number multiplied by the given 32-bit value.  If the result is
 // too large to fit in a 128-bit number, divide it by 2 until it fits.
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/numbers.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/numbers.h
index 737a0f0308c8..483afc26e1a5 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/numbers.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/numbers.h
@@ -32,7 +32,6 @@
 #endif
 
 #include <cstddef>
-#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
@@ -40,12 +39,10 @@
 #include <util/generic/string.h>
 #include <type_traits>
 
-#include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/internal/endian.h"
 #include "y_absl/base/macros.h"
 #include "y_absl/base/nullability.h"
-#include "y_absl/base/optimization.h"
 #include "y_absl/base/port.h"
 #include "y_absl/numeric/bits.h"
 #include "y_absl/numeric/int128.h"
@@ -161,96 +158,6 @@ bool safe_strtou128_base(y_absl::string_view text,
 static const int kFastToBufferSize = 32;
 static const int kSixDigitsToBufferSize = 16;
 
-template <class T>
-std::enable_if_t<!std::is_unsigned<T>::value, bool> IsNegative(const T& v) {
-  return v < T();
-}
-
-template <class T>
-std::enable_if_t<std::is_unsigned<T>::value, std::false_type> IsNegative(
-    const T&) {
-  // The integer is unsigned, so return a compile-time constant.
-  // This can help the optimizer avoid having to prove bool to be false later.
-  return std::false_type();
-}
-
-template <class T>
-std::enable_if_t<std::is_unsigned<std::decay_t<T>>::value, T&&>
-UnsignedAbsoluteValue(T&& v Y_ABSL_ATTRIBUTE_LIFETIME_BOUND) {
-  // The value is unsigned; just return the original.
-  return std::forward<T>(v);
-}
-
-template <class T>
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION
-    std::enable_if_t<!std::is_unsigned<T>::value, std::make_unsigned_t<T>>
-    UnsignedAbsoluteValue(T v) {
-  using U = std::make_unsigned_t<T>;
-  return IsNegative(v) ? U() - static_cast<U>(v) : static_cast<U>(v);
-}
-
-// Returns the number of base-10 digits in the given number.
-// Note that this strictly counts digits. It does not count the sign.
-// The `initial_digits` parameter is the starting point, which is normally equal
-// to 1 because the number of digits in 0 is 1 (a special case).
-// However, callers may e.g. wish to change it to 2 to account for the sign.
-template <typename T>
-std::enable_if_t<std::is_unsigned<T>::value, uint32_t> Base10Digits(
-    T v, const uint32_t initial_digits = 1) {
-  uint32_t r = initial_digits;
-  // If code size becomes an issue, the 'if' stage can be removed for a minor
-  // performance loss.
-  for (;;) {
-    if (Y_ABSL_PREDICT_TRUE(v < 10 * 10)) {
-      r += (v >= 10);
-      break;
-    }
-    if (Y_ABSL_PREDICT_TRUE(v < 1000 * 10)) {
-      r += (v >= 1000) + 2;
-      break;
-    }
-    if (Y_ABSL_PREDICT_TRUE(v < 100000 * 10)) {
-      r += (v >= 100000) + 4;
-      break;
-    }
-    r += 6;
-    v = static_cast<T>(v / 1000000);
-  }
-  return r;
-}
-
-template <typename T>
-std::enable_if_t<std::is_signed<T>::value, uint32_t> Base10Digits(
-    T v, uint32_t r = 1) {
-  // Branchlessly add 1 to account for a minus sign.
-  r += static_cast<uint32_t>(IsNegative(v));
-  return Base10Digits(UnsignedAbsoluteValue(v), r);
-}
-
-// These functions return the number of base-10 digits, but multiplied by -1 if
-// the input itself is negative. This is handy and efficient for later usage,
-// since the bitwise complement of the result becomes equal to the number of
-// characters required.
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    signed char v);
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned char v);
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    short v);  // NOLINT
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned short v);  // NOLINT
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(int v);
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned int v);
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    long v);  // NOLINT
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned long v);  // NOLINT
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    long long v);  // NOLINT
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
-    unsigned long long v);  // NOLINT
-
 // Helper function for fast formatting of floating-point values.
 // The result is the same as printf's "%g", a.k.a. "%.6g"; that is, six
 // significant digits are returned, trailing zeros are removed, and numbers
@@ -259,18 +166,24 @@ Y_ABSL_ATTRIBUTE_CONST_FUNCTION int GetNumDigitsOrNegativeIfNegative(
 // Required buffer size is `kSixDigitsToBufferSize`.
 size_t SixDigitsToBuffer(double d, y_absl::Nonnull<char*> buffer);
 
-// All of these functions take an output buffer
+// WARNING: These functions may write more characters than necessary, because
+// they are intended for speed. All functions take an output buffer
 // as an argument and return a pointer to the last byte they wrote, which is the
 // terminating '\0'. At most `kFastToBufferSize` bytes are written.
-y_absl::Nonnull<char*> FastIntToBuffer(int32_t i, y_absl::Nonnull<char*> buffer);
-y_absl::Nonnull<char*> FastIntToBuffer(uint32_t i, y_absl::Nonnull<char*> buffer);
-y_absl::Nonnull<char*> FastIntToBuffer(int64_t i, y_absl::Nonnull<char*> buffer);
-y_absl::Nonnull<char*> FastIntToBuffer(uint64_t i, y_absl::Nonnull<char*> buffer);
+y_absl::Nonnull<char*> FastIntToBuffer(int32_t i, y_absl::Nonnull<char*> buffer)
+    Y_ABSL_INTERNAL_NEED_MIN_SIZE(buffer, kFastToBufferSize);
+y_absl::Nonnull<char*> FastIntToBuffer(uint32_t n, y_absl::Nonnull<char*> out_str)
+    Y_ABSL_INTERNAL_NEED_MIN_SIZE(out_str, kFastToBufferSize);
+y_absl::Nonnull<char*> FastIntToBuffer(int64_t i, y_absl::Nonnull<char*> buffer)
+    Y_ABSL_INTERNAL_NEED_MIN_SIZE(buffer, kFastToBufferSize);
+y_absl::Nonnull<char*> FastIntToBuffer(uint64_t i, y_absl::Nonnull<char*> buffer)
+    Y_ABSL_INTERNAL_NEED_MIN_SIZE(buffer, kFastToBufferSize);
 
 // For enums and integer types that are not an exact match for the types above,
 // use templates to call the appropriate one of the four overloads above.
 template <typename int_type>
-y_absl::Nonnull<char*> FastIntToBuffer(int_type i, y_absl::Nonnull<char*> buffer) {
+y_absl::Nonnull<char*> FastIntToBuffer(int_type i, y_absl::Nonnull<char*> buffer)
+    Y_ABSL_INTERNAL_NEED_MIN_SIZE(buffer, kFastToBufferSize) {
   static_assert(sizeof(i) <= 64 / 8,
                 "FastIntToBuffer works only with 64-bit-or-less integers.");
   // TODO(jorg): This signed-ness check is used because it works correctly
@@ -294,58 +207,6 @@ y_absl::Nonnull<char*> FastIntToBuffer(int_type i, y_absl::Nonnull<char*> buffer
   }
 }
 
-// These functions do NOT add any null-terminator.
-// They return a pointer to the beginning of the written string.
-// The digit counts provided must *exactly* match the number of base-10 digits
-// in the number, or the behavior is undefined.
-// (i.e. do NOT count the minus sign, or over- or under-count the digits.)
-y_absl::Nonnull<char*> FastIntToBufferBackward(int32_t i,
-                                             y_absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count);
-y_absl::Nonnull<char*> FastIntToBufferBackward(uint32_t i,
-                                             y_absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count);
-y_absl::Nonnull<char*> FastIntToBufferBackward(int64_t i,
-                                             y_absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count);
-y_absl::Nonnull<char*> FastIntToBufferBackward(uint64_t i,
-                                             y_absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count);
-
-// For enums and integer types that are not an exact match for the types above,
-// use templates to call the appropriate one of the four overloads above.
-template <typename int_type>
-y_absl::Nonnull<char*> FastIntToBufferBackward(int_type i,
-                                             y_absl::Nonnull<char*> buffer_end,
-                                             uint32_t exact_digit_count) {
-  static_assert(
-      sizeof(i) <= 64 / 8,
-      "FastIntToBufferBackward works only with 64-bit-or-less integers.");
-  // This signed-ness check is used because it works correctly
-  // with enums, and it also serves to check that int_type is not a pointer.
-  // If one day something like std::is_signed<enum E> works, switch to it.
-  // These conditions are constexpr bools to suppress MSVC warning C4127.
-  constexpr bool kIsSigned = static_cast<int_type>(1) - 2 < 0;
-  constexpr bool kUse64Bit = sizeof(i) > 32 / 8;
-  if (kIsSigned) {
-    if (kUse64Bit) {
-      return FastIntToBufferBackward(static_cast<int64_t>(i), buffer_end,
-                                     exact_digit_count);
-    } else {
-      return FastIntToBufferBackward(static_cast<int32_t>(i), buffer_end,
-                                     exact_digit_count);
-    }
-  } else {
-    if (kUse64Bit) {
-      return FastIntToBufferBackward(static_cast<uint64_t>(i), buffer_end,
-                                     exact_digit_count);
-    } else {
-      return FastIntToBufferBackward(static_cast<uint32_t>(i), buffer_end,
-                                     exact_digit_count);
-    }
-  }
-}
-
 // Implementation of SimpleAtoi, generalized to support arbitrary base (used
 // with base different from 10 elsewhere in Abseil implementation).
 template <typename int_type>
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_cat.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_cat.cc
index 2f74723a54b0..079990824772 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_cat.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_cat.cc
@@ -20,19 +20,18 @@
 #include <cstdint>
 #include <cstring>
 #include <initializer_list>
+#include <limits>
 #include <util/generic/string.h>
-#include <type_traits>
 
 #include "y_absl/base/config.h"
+#include "y_absl/base/internal/raw_logging.h"
 #include "y_absl/base/nullability.h"
 #include "y_absl/strings/internal/resize_uninitialized.h"
-#include "y_absl/strings/numbers.h"
 #include "y_absl/strings/string_view.h"
 
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
 
-
 // ----------------------------------------------------------------------
 // StrCat()
 //    This merges the given strings or integers, with no delimiter. This
@@ -43,7 +42,8 @@ Y_ABSL_NAMESPACE_BEGIN
 namespace {
 // Append is merely a version of memcpy that returns the address of the byte
 // after the area just overwritten.
-y_absl::Nonnull<char*> Append(y_absl::Nonnull<char*> out, const AlphaNum& x) {
+inline y_absl::Nonnull<char*> Append(y_absl::Nonnull<char*> out,
+                                   const AlphaNum& x) {
   // memcpy is allowed to overwrite arbitrary memory, so doing this after the
   // call would force an extra fetch of x.size().
   char* after = out + x.size();
@@ -53,12 +53,23 @@ y_absl::Nonnull<char*> Append(y_absl::Nonnull<char*> out, const AlphaNum& x) {
   return after;
 }
 
+inline void STLStringAppendUninitializedAmortized(TString* dest,
+                                                  size_t to_append) {
+  strings_internal::AppendUninitializedTraits<TString>::Append(dest,
+                                                                   to_append);
+}
 }  // namespace
 
 TString StrCat(const AlphaNum& a, const AlphaNum& b) {
   TString result;
-  y_absl::strings_internal::STLStringResizeUninitialized(&result,
-                                                       a.size() + b.size());
+  // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+  // in memory strings to overflow a uint64_t.
+  constexpr uint64_t kMaxSize = uint64_t{std::numeric_limits<size_t>::max()};
+  const uint64_t result_size =
+      static_cast<uint64_t>(a.size()) + static_cast<uint64_t>(b.size());
+  Y_ABSL_INTERNAL_CHECK(result_size <= kMaxSize, "size_t overflow");
+  y_absl::strings_internal::STLStringResizeUninitialized(
+      &result, static_cast<size_t>(result_size));
   char* const begin = &result[0];
   char* out = begin;
   out = Append(out, a);
@@ -69,8 +80,15 @@ TString StrCat(const AlphaNum& a, const AlphaNum& b) {
 
 TString StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c) {
   TString result;
+  // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+  // in memory strings to overflow a uint64_t.
+  constexpr uint64_t kMaxSize = uint64_t{std::numeric_limits<size_t>::max()};
+  const uint64_t result_size = static_cast<uint64_t>(a.size()) +
+                               static_cast<uint64_t>(b.size()) +
+                               static_cast<uint64_t>(c.size());
+  Y_ABSL_INTERNAL_CHECK(result_size <= kMaxSize, "size_t overflow");
   strings_internal::STLStringResizeUninitialized(
-      &result, a.size() + b.size() + c.size());
+      &result, static_cast<size_t>(result_size));
   char* const begin = &result[0];
   char* out = begin;
   out = Append(out, a);
@@ -83,8 +101,16 @@ TString StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c) {
 TString StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c,
                    const AlphaNum& d) {
   TString result;
+  // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+  // in memory strings to overflow a uint64_t.
+  constexpr uint64_t kMaxSize = uint64_t{std::numeric_limits<size_t>::max()};
+  const uint64_t result_size = static_cast<uint64_t>(a.size()) +
+                               static_cast<uint64_t>(b.size()) +
+                               static_cast<uint64_t>(c.size()) +
+                               static_cast<uint64_t>(d.size());
+  Y_ABSL_INTERNAL_CHECK(result_size <= kMaxSize, "size_t overflow");
   strings_internal::STLStringResizeUninitialized(
-      &result, a.size() + b.size() + c.size() + d.size());
+      &result, static_cast<size_t>(result_size));
   char* const begin = &result[0];
   char* out = begin;
   out = Append(out, a);
@@ -98,135 +124,18 @@ TString StrCat(const AlphaNum& a, const AlphaNum& b, const AlphaNum& c,
 namespace strings_internal {
 
 // Do not call directly - these are not part of the public API.
-void STLStringAppendUninitializedAmortized(TString* dest,
-                                           size_t to_append) {
-  strings_internal::AppendUninitializedTraits<TString>::Append(dest,
-                                                                   to_append);
-}
-
-template <typename Integer>
-std::enable_if_t<std::is_integral<Integer>::value, TString> IntegerToString(
-    Integer i) {
-  TString str;
-  const auto /* either bool or std::false_type */ is_negative =
-      y_absl::numbers_internal::IsNegative(i);
-  const uint32_t digits = y_absl::numbers_internal::Base10Digits(
-      y_absl::numbers_internal::UnsignedAbsoluteValue(i));
-  y_absl::strings_internal::STLStringResizeUninitialized(
-      &str, digits + static_cast<uint32_t>(is_negative));
-  y_absl::numbers_internal::FastIntToBufferBackward(i, &str[str.size()], digits);
-  return str;
-}
-
-template <>
-TString IntegerToString(long i) {  // NOLINT
-  if (sizeof(i) <= sizeof(int)) {
-    return IntegerToString(static_cast<int>(i));
-  } else {
-    return IntegerToString(static_cast<long long>(i));  // NOLINT
-  }
-}
-
-template <>
-TString IntegerToString(unsigned long i) {  // NOLINT
-  if (sizeof(i) <= sizeof(unsigned int)) {
-    return IntegerToString(static_cast<unsigned int>(i));
-  } else {
-    return IntegerToString(static_cast<unsigned long long>(i));  // NOLINT
-  }
-}
-
-template <typename Float>
-std::enable_if_t<std::is_floating_point<Float>::value, TString>
-FloatToString(Float f) {
-  TString result;
-  strings_internal::STLStringResizeUninitialized(
-      &result, numbers_internal::kSixDigitsToBufferSize);
-  char* start = &result[0];
-  result.erase(numbers_internal::SixDigitsToBuffer(f, start));
-  return result;
-}
-
-TString SingleArgStrCat(int x) { return IntegerToString(x); }
-TString SingleArgStrCat(unsigned int x) { return IntegerToString(x); }
-// NOLINTNEXTLINE
-TString SingleArgStrCat(long x) { return IntegerToString(x); }
-// NOLINTNEXTLINE
-TString SingleArgStrCat(unsigned long x) { return IntegerToString(x); }
-// NOLINTNEXTLINE
-TString SingleArgStrCat(long long x) { return IntegerToString(x); }
-// NOLINTNEXTLINE
-TString SingleArgStrCat(unsigned long long x) { return IntegerToString(x); }
-TString SingleArgStrCat(float x) { return FloatToString(x); }
-TString SingleArgStrCat(double x) { return FloatToString(x); }
-
-template <class Integer>
-std::enable_if_t<std::is_integral<Integer>::value, void> AppendIntegerToString(
-    TString& str, Integer i) {
-  const auto /* either bool or std::false_type */ is_negative =
-      y_absl::numbers_internal::IsNegative(i);
-  const uint32_t digits = y_absl::numbers_internal::Base10Digits(
-      y_absl::numbers_internal::UnsignedAbsoluteValue(i));
-  y_absl::strings_internal::STLStringAppendUninitializedAmortized(
-      &str, digits + static_cast<uint32_t>(is_negative));
-  y_absl::numbers_internal::FastIntToBufferBackward(i, &str[str.size()], digits);
-}
-
-template <>
-void AppendIntegerToString(TString& str, long i) {  // NOLINT
-  if (sizeof(i) <= sizeof(int)) {
-    return AppendIntegerToString(str, static_cast<int>(i));
-  } else {
-    return AppendIntegerToString(str, static_cast<long long>(i));  // NOLINT
-  }
-}
-
-template <>
-void AppendIntegerToString(TString& str,
-                           unsigned long i) {  // NOLINT
-  if (sizeof(i) <= sizeof(unsigned int)) {
-    return AppendIntegerToString(str, static_cast<unsigned int>(i));
-  } else {
-    return AppendIntegerToString(str,
-                                 static_cast<unsigned long long>(i));  // NOLINT
-  }
-}
-
-// `SingleArgStrAppend` overloads are defined here for the same reasons as with
-// `SingleArgStrCat` above.
-void SingleArgStrAppend(TString& str, int x) {
-  return AppendIntegerToString(str, x);
-}
-
-void SingleArgStrAppend(TString& str, unsigned int x) {
-  return AppendIntegerToString(str, x);
-}
-
-// NOLINTNEXTLINE
-void SingleArgStrAppend(TString& str, long x) {
-  return AppendIntegerToString(str, x);
-}
-
-// NOLINTNEXTLINE
-void SingleArgStrAppend(TString& str, unsigned long x) {
-  return AppendIntegerToString(str, x);
-}
-
-// NOLINTNEXTLINE
-void SingleArgStrAppend(TString& str, long long x) {
-  return AppendIntegerToString(str, x);
-}
-
-// NOLINTNEXTLINE
-void SingleArgStrAppend(TString& str, unsigned long long x) {
-  return AppendIntegerToString(str, x);
-}
-
 TString CatPieces(std::initializer_list<y_absl::string_view> pieces) {
   TString result;
-  size_t total_size = 0;
-  for (y_absl::string_view piece : pieces) total_size += piece.size();
-  strings_internal::STLStringResizeUninitialized(&result, total_size);
+  // Use uint64_t to prevent size_t overflow. We assume it is not possible for
+  // in memory strings to overflow a uint64_t.
+  constexpr uint64_t kMaxSize = uint64_t{std::numeric_limits<size_t>::max()};
+  uint64_t total_size = 0;
+  for (y_absl::string_view piece : pieces) {
+    total_size += piece.size();
+  }
+  Y_ABSL_INTERNAL_CHECK(total_size <= kMaxSize, "size_t overflow");
+  strings_internal::STLStringResizeUninitialized(
+      &result, static_cast<size_t>(total_size));
 
   char* const begin = &result[0];
   char* out = begin;
@@ -258,7 +167,7 @@ void AppendPieces(y_absl::Nonnull<TString*> dest,
     ASSERT_NO_OVERLAP(*dest, piece);
     to_append += piece.size();
   }
-  strings_internal::STLStringAppendUninitializedAmortized(dest, to_append);
+  STLStringAppendUninitializedAmortized(dest, to_append);
 
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
@@ -277,7 +186,7 @@ void AppendPieces(y_absl::Nonnull<TString*> dest,
 void StrAppend(y_absl::Nonnull<TString*> dest, const AlphaNum& a) {
   ASSERT_NO_OVERLAP(*dest, a);
   TString::size_type old_size = dest->size();
-  strings_internal::STLStringAppendUninitializedAmortized(dest, a.size());
+  STLStringAppendUninitializedAmortized(dest, a.size());
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
   out = Append(out, a);
@@ -289,8 +198,7 @@ void StrAppend(y_absl::Nonnull<TString*> dest, const AlphaNum& a,
   ASSERT_NO_OVERLAP(*dest, a);
   ASSERT_NO_OVERLAP(*dest, b);
   TString::size_type old_size = dest->size();
-  strings_internal::STLStringAppendUninitializedAmortized(dest,
-                                                          a.size() + b.size());
+  STLStringAppendUninitializedAmortized(dest, a.size() + b.size());
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
   out = Append(out, a);
@@ -304,8 +212,7 @@ void StrAppend(y_absl::Nonnull<TString*> dest, const AlphaNum& a,
   ASSERT_NO_OVERLAP(*dest, b);
   ASSERT_NO_OVERLAP(*dest, c);
   TString::size_type old_size = dest->size();
-  strings_internal::STLStringAppendUninitializedAmortized(
-      dest, a.size() + b.size() + c.size());
+  STLStringAppendUninitializedAmortized(dest, a.size() + b.size() + c.size());
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
   out = Append(out, a);
@@ -321,7 +228,7 @@ void StrAppend(y_absl::Nonnull<TString*> dest, const AlphaNum& a,
   ASSERT_NO_OVERLAP(*dest, c);
   ASSERT_NO_OVERLAP(*dest, d);
   TString::size_type old_size = dest->size();
-  strings_internal::STLStringAppendUninitializedAmortized(
+  STLStringAppendUninitializedAmortized(
       dest, a.size() + b.size() + c.size() + d.size());
   char* const begin = &(*dest)[0];
   char* out = begin + old_size;
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_cat.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_cat.h
index 67d117f10474..cd48de11686a 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_cat.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_cat.h
@@ -93,6 +93,8 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <initializer_list>
+#include <limits>
 #include <util/generic/string.h>
 #include <type_traits>
 #include <utility>
@@ -312,6 +314,10 @@ class AlphaNum {
   // No bool ctor -- bools convert to an integral type.
   // A bool ctor would also convert incoming pointers (bletch).
 
+  // Prevent brace initialization
+  template <typename T>
+  AlphaNum(std::initializer_list<T>) = delete;  // NOLINT(runtime/explicit)
+
   AlphaNum(int x)  // NOLINT(runtime/explicit)
       : piece_(digits_, static_cast<size_t>(
                             numbers_internal::FastIntToBuffer(x, digits_) -
@@ -451,36 +457,77 @@ TString CatPieces(std::initializer_list<y_absl::string_view> pieces);
 void AppendPieces(y_absl::Nonnull<TString*> dest,
                   std::initializer_list<y_absl::string_view> pieces);
 
-void STLStringAppendUninitializedAmortized(TString* dest, size_t to_append);
+template <typename Integer>
+TString IntegerToString(Integer i) {
+  // Any integer (signed/unsigned) up to 64 bits can be formatted into a buffer
+  // with 22 bytes (including NULL at the end).
+  constexpr size_t kMaxDigits10 = 22;
+  TString result;
+  strings_internal::STLStringResizeUninitialized(&result, kMaxDigits10);
+  char* start = &result[0];
+  // note: this can be optimized to not write last zero.
+  char* end = numbers_internal::FastIntToBuffer(i, start);
+  auto size = static_cast<size_t>(end - start);
+  assert((size < result.size()) &&
+         "StrCat(Integer) does not fit into kMaxDigits10");
+  result.erase(size);
+  return result;
+}
+template <typename Float>
+TString FloatToString(Float f) {
+  TString result;
+  strings_internal::STLStringResizeUninitialized(
+      &result, numbers_internal::kSixDigitsToBufferSize);
+  char* start = &result[0];
+  result.erase(numbers_internal::SixDigitsToBuffer(f, start));
+  return result;
+}
 
 // `SingleArgStrCat` overloads take built-in `int`, `long` and `long long` types
 // (signed / unsigned) to avoid ambiguity on the call side. If we used int32_t
 // and int64_t, then at least one of the three (`int` / `long` / `long long`)
 // would have been ambiguous when passed to `SingleArgStrCat`.
-TString SingleArgStrCat(int x);
-TString SingleArgStrCat(unsigned int x);
-TString SingleArgStrCat(long x);                // NOLINT
-TString SingleArgStrCat(unsigned long x);       // NOLINT
-TString SingleArgStrCat(long long x);           // NOLINT
-TString SingleArgStrCat(unsigned long long x);  // NOLINT
-TString SingleArgStrCat(float x);
-TString SingleArgStrCat(double x);
-
-// `SingleArgStrAppend` overloads are defined here for the same reasons as with
-// `SingleArgStrCat` above.
-void SingleArgStrAppend(TString& str, int x);
-void SingleArgStrAppend(TString& str, unsigned int x);
-void SingleArgStrAppend(TString& str, long x);                // NOLINT
-void SingleArgStrAppend(TString& str, unsigned long x);       // NOLINT
-void SingleArgStrAppend(TString& str, long long x);           // NOLINT
-void SingleArgStrAppend(TString& str, unsigned long long x);  // NOLINT
-
-template <typename T,
-          typename = std::enable_if_t<std::is_arithmetic<T>::value &&
-                                      !std::is_same<T, char>::value &&
-                                      !std::is_same<T, bool>::value>>
+inline TString SingleArgStrCat(int x) { return IntegerToString(x); }
+inline TString SingleArgStrCat(unsigned int x) {
+  return IntegerToString(x);
+}
+// NOLINTNEXTLINE
+inline TString SingleArgStrCat(long x) { return IntegerToString(x); }
+// NOLINTNEXTLINE
+inline TString SingleArgStrCat(unsigned long x) {
+  return IntegerToString(x);
+}
+// NOLINTNEXTLINE
+inline TString SingleArgStrCat(long long x) { return IntegerToString(x); }
+// NOLINTNEXTLINE
+inline TString SingleArgStrCat(unsigned long long x) {
+  return IntegerToString(x);
+}
+inline TString SingleArgStrCat(float x) { return FloatToString(x); }
+inline TString SingleArgStrCat(double x) { return FloatToString(x); }
+
+// As of September 2023, the SingleArgStrCat() optimization is only enabled for
+// libc++. The reasons for this are:
+// 1) The SSO size for libc++ is 23, while libstdc++ and MSSTL have an SSO size
+// of 15. Since IntegerToString unconditionally resizes the string to 22 bytes,
+// this causes both libstdc++ and MSSTL to allocate.
+// 2) strings_internal::STLStringResizeUninitialized() only has an
+// implementation that avoids initialization when using libc++. This isn't as
+// relevant as (1), and the cost should be benchmarked if (1) ever changes on
+// libstc++ or MSSTL.
+#ifdef _LIBCPP_VERSION
+#define Y_ABSL_INTERNAL_STRCAT_ENABLE_FAST_CASE true
+#else
+#define Y_ABSL_INTERNAL_STRCAT_ENABLE_FAST_CASE false
+#endif
+
+template <typename T, typename = std::enable_if_t<
+                          Y_ABSL_INTERNAL_STRCAT_ENABLE_FAST_CASE &&
+                          std::is_arithmetic<T>{} && !std::is_same<T, char>{}>>
 using EnableIfFastCase = T;
 
+#undef Y_ABSL_INTERNAL_STRCAT_ENABLE_FAST_CASE
+
 }  // namespace strings_internal
 
 Y_ABSL_MUST_USE_RESULT inline TString StrCat() { return TString(); }
@@ -556,67 +603,6 @@ inline void StrAppend(y_absl::Nonnull<TString*> dest, const AlphaNum& a,
              static_cast<const AlphaNum&>(args).Piece()...});
 }
 
-template <class String, class T>
-std::enable_if_t<
-    std::is_integral<y_absl::strings_internal::EnableIfFastCase<T>>::value, void>
-StrAppend(y_absl::Nonnull<String*> result, T i) {
-  return y_absl::strings_internal::SingleArgStrAppend(*result, i);
-}
-
-// This overload is only selected if all the parameters are numbers that can be
-// handled quickly.
-// Later we can look into how we can extend this to more general argument
-// mixtures without bloating codegen too much, or copying unnecessarily.
-template <typename String, typename... T>
-std::enable_if_t<
-    (sizeof...(T) > 1),
-    std::common_type_t<std::conditional_t<
-        true, void, y_absl::strings_internal::EnableIfFastCase<T>>...>>
-StrAppend(y_absl::Nonnull<String*> str, T... args) {
-  // Do not add unnecessary variables, logic, or even "free" lambdas here.
-  // They can add overhead for the compiler and/or at run time.
-  // Furthermore, assume this function will be inlined.
-  // This function is carefully tailored to be able to be largely optimized away
-  // so that it becomes near-equivalent to the caller handling each argument
-  // individually while minimizing register pressure, so that the compiler
-  // can inline it with minimal overhead.
-
-  // First, calculate the total length, so we can perform just a single resize.
-  // Save all the lengths for later.
-  size_t total_length = 0;
-  const ptrdiff_t lengths[] = {
-      y_absl::numbers_internal::GetNumDigitsOrNegativeIfNegative(args)...};
-  for (const ptrdiff_t possibly_negative_length : lengths) {
-    // Lengths are negative for negative numbers. Keep them for later use, but
-    // take their absolute values for calculating total lengths;
-    total_length += possibly_negative_length < 0
-                        ? static_cast<size_t>(-possibly_negative_length)
-                        : static_cast<size_t>(possibly_negative_length);
-  }
-
-  // Now reserve space for all the arguments.
-  const size_t old_size = str->size();
-  y_absl::strings_internal::STLStringAppendUninitializedAmortized(str,
-                                                                total_length);
-
-  // Finally, output each argument one-by-one, from left to right.
-  size_t i = 0;  // The current argument we're processing
-  ptrdiff_t n;   // The length of the current argument
-  typename String::pointer pos = &(*str)[old_size];
-  using SomeTrivialEmptyType = std::false_type;
-  const SomeTrivialEmptyType dummy;
-  // Ugly code due to the lack of C++17 fold expressions
-  const SomeTrivialEmptyType dummies[] = {
-      (/* Comma expressions are poor man's C++17 fold expression for C++14 */
-       (void)(n = lengths[i]),
-       (void)(n < 0 ? (void)(*pos++ = '-'), (n = ~n) : 0),
-       (void)y_absl::numbers_internal::FastIntToBufferBackward(
-           y_absl::numbers_internal::UnsignedAbsoluteValue(std::move(args)),
-           pos += n, static_cast<uint32_t>(n)),
-       (void)++i, dummy)...};
-  (void)dummies;  // Remove & migrate to fold expressions in C++17
-}
-
 // Helper function for the future StrCat default floating-point format, %.6g
 // This is fast.
 inline strings_internal::AlphaNumBuffer<
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_format.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_format.h
index 63c6b4505f31..c2f9d81d5043 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_format.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_format.h
@@ -181,7 +181,7 @@ class FormatCountCapture {
 // For a `FormatSpec` to be valid at compile-time, it must be provided as
 // either:
 //
-// * A `constexpr` literal or `y_absl::string_view`, which is how it most often
+// * A `constexpr` literal or `y_absl::string_view`, which is how it is most often
 //   used.
 // * A `ParsedFormat` instantiation, which ensures the format string is
 //   valid before use. (See below.)
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_join.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_join.h
index 9fc0f37af54b..23c51cf95c8e 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_join.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_join.h
@@ -247,12 +247,20 @@ TString StrJoin(const Range& range, y_absl::string_view separator,
   return strings_internal::JoinRange(range, separator, fmt);
 }
 
-template <typename T, typename Formatter>
+template <typename T, typename Formatter,
+          typename = typename std::enable_if<
+              !std::is_convertible<T, y_absl::string_view>::value>::type>
 TString StrJoin(std::initializer_list<T> il, y_absl::string_view separator,
                     Formatter&& fmt) {
   return strings_internal::JoinRange(il, separator, fmt);
 }
 
+template <typename Formatter>
+inline TString StrJoin(std::initializer_list<y_absl::string_view> il,
+                           y_absl::string_view separator, Formatter&& fmt) {
+  return strings_internal::JoinRange(il, separator, fmt);
+}
+
 template <typename... T, typename Formatter>
 TString StrJoin(const std::tuple<T...>& value, y_absl::string_view separator,
                     Formatter&& fmt) {
@@ -269,16 +277,22 @@ TString StrJoin(const Range& range, y_absl::string_view separator) {
   return strings_internal::JoinRange(range, separator);
 }
 
-template <typename T>
-TString StrJoin(std::initializer_list<T> il,
-                    y_absl::string_view separator) {
+template <typename T, typename = typename std::enable_if<!std::is_convertible<
+                          T, y_absl::string_view>::value>::type>
+TString StrJoin(std::initializer_list<T> il, y_absl::string_view separator) {
+  return strings_internal::JoinRange(il, separator);
+}
+
+inline TString StrJoin(std::initializer_list<y_absl::string_view> il,
+                           y_absl::string_view separator) {
   return strings_internal::JoinRange(il, separator);
 }
 
 template <typename... T>
 TString StrJoin(const std::tuple<T...>& value,
                     y_absl::string_view separator) {
-  return strings_internal::JoinAlgorithm(value, separator, AlphaNumFormatter());
+  return strings_internal::JoinTuple(value, separator,
+                                     std::index_sequence_for<T...>{});
 }
 
 Y_ABSL_NAMESPACE_END
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_split.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_split.h
index f75a1f18e9e3..1cb0f08cbfbc 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_split.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/str_split.h
@@ -456,7 +456,7 @@ using EnableSplitIfString =
 //   // Stores results in a std::set<TString>, which also performs
 //   // de-duplication and orders the elements in ascending order.
 //   std::set<TString> a = y_absl::StrSplit("b,a,c,a,b", ',');
-//   // v[0] == "a", v[1] == "b", v[2] = "c"
+//   // a[0] == "a", a[1] == "b", a[2] == "c"
 //
 //   // `StrSplit()` can be used within a range-based for loop, in which case
 //   // each element will be of type `y_absl::string_view`.
@@ -544,7 +544,7 @@ StrSplit(strings_internal::ConvertibleToStringView text, Delimiter d,
       typename strings_internal::SelectDelimiter<Delimiter>::type;
   return strings_internal::Splitter<DelimiterType, Predicate,
                                     y_absl::string_view>(
-      text.value(), DelimiterType(d), std::move(p));
+      text.value(), DelimiterType(std::move(d)), std::move(p));
 }
 
 template <typename Delimiter, typename Predicate, typename StringType,
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/string_view.h b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/string_view.h
index c3dcbacacf23..551a2c87bf95 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/string_view.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/string_view.h
@@ -159,7 +159,7 @@ Y_ABSL_NAMESPACE_BEGIN
 //
 //   y_absl::string_view() == y_absl::string_view("", 0)
 //   y_absl::string_view(nullptr, 0) == y_absl::string_view("abcdef"+6, 0)
-class string_view {
+class Y_ABSL_INTERNAL_ATTRIBUTE_VIEW string_view {
  public:
   using traits_type = std::char_traits<char>;
   using value_type = char;
@@ -173,6 +173,7 @@ class string_view {
   using reverse_iterator = const_reverse_iterator;
   using size_type = size_t;
   using difference_type = std::ptrdiff_t;
+  using absl_internal_is_view = std::true_type;
 
   static constexpr size_type npos = static_cast<size_type>(-1);
 
@@ -670,7 +671,7 @@ class string_view {
   }
 
   static constexpr size_type StrlenInternal(y_absl::Nonnull<const char*> str) {
-#if defined(_MSC_VER) && _MSC_VER >= 1910 && !defined(__clang__)
+#if defined(_MSC_VER) && !defined(__clang__)
     // MSVC 2017+ can evaluate this at compile-time.
     const char* begin = str;
     while (*str != '\0') ++str;
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/substitute.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/substitute.cc
index 72c9c71b2d88..b64ce570f431 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/strings/substitute.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/strings/substitute.cc
@@ -18,6 +18,7 @@
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <util/generic/string.h>
 
 #include "y_absl/base/config.h"
@@ -84,6 +85,9 @@ void SubstituteAndAppendArray(
 
   // Build the string.
   size_t original_size = output->size();
+  Y_ABSL_INTERNAL_CHECK(
+      size <= std::numeric_limits<size_t>::max() - original_size,
+      "size_t overflow");
   strings_internal::STLStringResizeUninitializedAmortized(output,
                                                           original_size + size);
   char* target = &(*output)[original_size];
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.cc
index 0053c1ed28e0..0f4fa5b7b5c8 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.cc
@@ -211,7 +211,7 @@ class NodeSet {
   Vec<int32_t> table_;
   uint32_t occupied_;     // Count of non-empty slots (includes deleted slots)
 
-  static uint32_t Hash(int32_t a) { return static_cast<uint32_t>(a * 41); }
+  static uint32_t Hash(int32_t a) { return static_cast<uint32_t>(a) * 41; }
 
   // Return index for storing v.  May return an empty index or deleted index
   uint32_t FindIndex(int32_t v) const {
@@ -333,7 +333,7 @@ class PointerMap {
 
  private:
   // Number of buckets in hash table for pointer lookups.
-  static constexpr uint32_t kHashTableSize = 8171;  // should be prime
+  static constexpr uint32_t kHashTableSize = 262139;  // should be prime
 
   const Vec<Node*>* nodes_;
   std::array<int32_t, kHashTableSize> table_;
@@ -365,6 +365,14 @@ static Node* FindNode(GraphCycles::Rep* rep, GraphId id) {
   return (n->version == NodeVersion(id)) ? n : nullptr;
 }
 
+void GraphCycles::TestOnlyAddNodes(uint32_t n) {
+  uint32_t old_size = rep_->nodes_.size();
+  rep_->nodes_.resize(n);
+  for (auto i = old_size; i < n; ++i) {
+    rep_->nodes_[i] = nullptr;
+  }
+}
+
 GraphCycles::GraphCycles() {
   InitArenaIfNecessary();
   rep_ = new (base_internal::LowLevelAlloc::AllocWithArena(sizeof(Rep), arena))
@@ -373,6 +381,7 @@ GraphCycles::GraphCycles() {
 
 GraphCycles::~GraphCycles() {
   for (auto* node : rep_->nodes_) {
+    if (node == nullptr) { continue; }
     node->Node::~Node();
     base_internal::LowLevelAlloc::Free(node);
   }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.h b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.h
index ea39862db15b..1dd7998734ac 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/internal/graphcycles.h
@@ -126,6 +126,11 @@ class GraphCycles {
   // Expensive: should only be called from graphcycles_test.cc.
   bool CheckInvariants() const;
 
+  // Test-only method to add more nodes. The nodes will not be valid, and this
+  // method should only be used to test the behavior of the graph when it is
+  // very full.
+  void TestOnlyAddNodes(uint32_t n);
+
   // ----------------------------------------------------
   struct Rep;
  private:
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.h b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.h
index 6dae8b408dbf..7dfefad6e6e0 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/synchronization/mutex.h
@@ -148,7 +148,7 @@ struct SynchWaitParams;
 //
 // See also `MutexLock`, below, for scoped `Mutex` acquisition.
 
-class Y_ABSL_LOCKABLE Mutex {
+class Y_ABSL_LOCKABLE Y_ABSL_ATTRIBUTE_WARN_UNUSED Mutex {
  public:
   // Creates a `Mutex` that is not held by anyone. This constructor is
   // typically used for Mutexes allocated on the heap or the stack.
@@ -190,7 +190,7 @@ class Y_ABSL_LOCKABLE Mutex {
   // If the mutex can be acquired without blocking, does so exclusively and
   // returns `true`. Otherwise, returns `false`. Returns `true` with high
   // probability if the `Mutex` was free.
-  bool TryLock() Y_ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true);
+  Y_ABSL_MUST_USE_RESULT bool TryLock() Y_ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true);
 
   // Mutex::AssertHeld()
   //
@@ -255,7 +255,7 @@ class Y_ABSL_LOCKABLE Mutex {
   // If the mutex can be acquired without blocking, acquires this mutex for
   // shared access and returns `true`. Otherwise, returns `false`. Returns
   // `true` with high probability if the `Mutex` was free or shared.
-  bool ReaderTryLock() Y_ABSL_SHARED_TRYLOCK_FUNCTION(true);
+  Y_ABSL_MUST_USE_RESULT bool ReaderTryLock() Y_ABSL_SHARED_TRYLOCK_FUNCTION(true);
 
   // Mutex::AssertReaderHeld()
   //
@@ -281,7 +281,8 @@ class Y_ABSL_LOCKABLE Mutex {
 
   void WriterUnlock() Y_ABSL_UNLOCK_FUNCTION() { this->Unlock(); }
 
-  bool WriterTryLock() Y_ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+  Y_ABSL_MUST_USE_RESULT bool WriterTryLock()
+      Y_ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
     return this->TryLock();
   }
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time.h b/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time.h
index fcf4247360bb..a70939a023fa 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/civil_time.h
@@ -55,7 +55,7 @@
 // Example:
 //
 //   // Construct a civil-time object for a specific day
-//   const y_absl::CivilDay cd(1969, 07, 20);
+//   const y_absl::CivilDay cd(1969, 7, 20);
 //
 //   // Construct a civil-time object for a specific second
 //   const y_absl::CivilSecond cd(2018, 8, 1, 12, 0, 1);
@@ -65,7 +65,7 @@
 // Example:
 //
 //   // Valid in C++14
-//   constexpr y_absl::CivilDay cd(1969, 07, 20);
+//   constexpr y_absl::CivilDay cd(1969, 7, 20);
 
 #ifndef Y_ABSL_TIME_CIVIL_TIME_H_
 #define Y_ABSL_TIME_CIVIL_TIME_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/clock.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/time/clock.cc
index 332b9978f9d4..b9f94d4355a4 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/clock.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/clock.cc
@@ -88,11 +88,25 @@ Y_ABSL_NAMESPACE_END
 namespace y_absl {
 Y_ABSL_NAMESPACE_BEGIN
 namespace time_internal {
+
+// On some processors, consecutive reads of the cycle counter may yield the
+// same value (weakly-increasing). In debug mode, clear the least significant
+// bits to discourage depending on a strictly-increasing Now() value.
+// In x86-64's debug mode, discourage depending on a strictly-increasing Now()
+// value.
+#if !defined(NDEBUG) && defined(__x86_64__)
+constexpr int64_t kCycleClockNowMask = ~int64_t{0xff};
+#else
+constexpr int64_t kCycleClockNowMask = ~int64_t{0};
+#endif
+
 // This is a friend wrapper around UnscaledCycleClock::Now()
 // (needed to access UnscaledCycleClock).
 class UnscaledCycleClockWrapperForGetCurrentTime {
  public:
-  static int64_t Now() { return base_internal::UnscaledCycleClock::Now(); }
+  static int64_t Now() {
+    return base_internal::UnscaledCycleClock::Now() & kCycleClockNowMask;
+  }
 };
 }  // namespace time_internal
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/duration.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/time/duration.cc
index 62c355ce8085..da44b06d5b79 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/duration.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/duration.cc
@@ -219,7 +219,7 @@ struct SafeMultiply {
                  ? static_cast<uint128>(Uint128Low64(a) * Uint128Low64(b))
                  : a * b;
     }
-    return b == 0 ? b : (a > kuint128max / b) ? kuint128max : a * b;
+    return b == 0 ? b : (a > Uint128Max() / b) ? Uint128Max() : a * b;
   }
 };
 
@@ -280,33 +280,35 @@ inline bool IDivFastPath(const Duration num, const Duration den, int64_t* q,
   int64_t den_hi = time_internal::GetRepHi(den);
   uint32_t den_lo = time_internal::GetRepLo(den);
 
-  if (den_hi == 0 && den_lo == kTicksPerNanosecond) {
-    // Dividing by 1ns
-    if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000000000) {
-      *q = num_hi * 1000000000 + num_lo / kTicksPerNanosecond;
-      *rem = time_internal::MakeDuration(0, num_lo % den_lo);
-      return true;
-    }
-  } else if (den_hi == 0 && den_lo == 100 * kTicksPerNanosecond) {
-    // Dividing by 100ns (common when converting to Universal time)
-    if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 10000000) {
-      *q = num_hi * 10000000 + num_lo / (100 * kTicksPerNanosecond);
-      *rem = time_internal::MakeDuration(0, num_lo % den_lo);
-      return true;
-    }
-  } else if (den_hi == 0 && den_lo == 1000 * kTicksPerNanosecond) {
-    // Dividing by 1us
-    if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000000) {
-      *q = num_hi * 1000000 + num_lo / (1000 * kTicksPerNanosecond);
-      *rem = time_internal::MakeDuration(0, num_lo % den_lo);
-      return true;
-    }
-  } else if (den_hi == 0 && den_lo == 1000000 * kTicksPerNanosecond) {
-    // Dividing by 1ms
-    if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000) {
-      *q = num_hi * 1000 + num_lo / (1000000 * kTicksPerNanosecond);
-      *rem = time_internal::MakeDuration(0, num_lo % den_lo);
-      return true;
+  if (den_hi == 0) {
+    if (den_lo == kTicksPerNanosecond) {
+      // Dividing by 1ns
+      if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000000000) {
+        *q = num_hi * 1000000000 + num_lo / kTicksPerNanosecond;
+        *rem = time_internal::MakeDuration(0, num_lo % den_lo);
+        return true;
+      }
+    } else if (den_lo == 100 * kTicksPerNanosecond) {
+      // Dividing by 100ns (common when converting to Universal time)
+      if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 10000000) {
+        *q = num_hi * 10000000 + num_lo / (100 * kTicksPerNanosecond);
+        *rem = time_internal::MakeDuration(0, num_lo % den_lo);
+        return true;
+      }
+    } else if (den_lo == 1000 * kTicksPerNanosecond) {
+      // Dividing by 1us
+      if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000000) {
+        *q = num_hi * 1000000 + num_lo / (1000 * kTicksPerNanosecond);
+        *rem = time_internal::MakeDuration(0, num_lo % den_lo);
+        return true;
+      }
+    } else if (den_lo == 1000000 * kTicksPerNanosecond) {
+      // Dividing by 1ms
+      if (num_hi >= 0 && num_hi < (kint64max - kTicksPerSecond) / 1000) {
+        *q = num_hi * 1000 + num_lo / (1000000 * kTicksPerNanosecond);
+        *rem = time_internal::MakeDuration(0, num_lo % den_lo);
+        return true;
+      }
     }
   } else if (den_hi > 0 && den_lo == 0) {
     // Dividing by positive multiple of 1s
@@ -342,19 +344,10 @@ inline bool IDivFastPath(const Duration num, const Duration den, int64_t* q,
 
 }  // namespace
 
-namespace time_internal {
+namespace {
 
-// The 'satq' argument indicates whether the quotient should saturate at the
-// bounds of int64_t.  If it does saturate, the difference will spill over to
-// the remainder.  If it does not saturate, the remainder remain accurate,
-// but the returned quotient will over/underflow int64_t and should not be used.
-int64_t IDivDuration(bool satq, const Duration num, const Duration den,
+int64_t IDivSlowPath(bool satq, const Duration num, const Duration den,
                      Duration* rem) {
-  int64_t q = 0;
-  if (IDivFastPath(num, den, &q, rem)) {
-    return q;
-  }
-
   const bool num_neg = num < ZeroDuration();
   const bool den_neg = den < ZeroDuration();
   const bool quotient_neg = num_neg != den_neg;
@@ -391,7 +384,27 @@ int64_t IDivDuration(bool satq, const Duration num, const Duration den,
   return -static_cast<int64_t>(Uint128Low64(quotient128 - 1) & kint64max) - 1;
 }
 
-}  // namespace time_internal
+// The 'satq' argument indicates whether the quotient should saturate at the
+// bounds of int64_t.  If it does saturate, the difference will spill over to
+// the remainder.  If it does not saturate, the remainder remain accurate,
+// but the returned quotient will over/underflow int64_t and should not be used.
+Y_ABSL_ATTRIBUTE_ALWAYS_INLINE inline int64_t IDivDurationImpl(bool satq,
+                                                             const Duration num,
+                                                             const Duration den,
+                                                             Duration* rem) {
+  int64_t q = 0;
+  if (IDivFastPath(num, den, &q, rem)) {
+    return q;
+  }
+  return IDivSlowPath(satq, num, den, rem);
+}
+
+}  // namespace
+
+int64_t IDivDuration(Duration num, Duration den, Duration* rem) {
+  return IDivDurationImpl(true, num, den,
+                          rem);  // trunc towards zero
+}
 
 //
 // Additive operators.
@@ -475,7 +488,7 @@ Duration& Duration::operator/=(double r) {
 }
 
 Duration& Duration::operator%=(Duration rhs) {
-  time_internal::IDivDuration(false, *this, rhs, this);
+  IDivDurationImpl(false, *this, rhs, this);
   return *this;
 }
 
@@ -501,9 +514,7 @@ double FDivDuration(Duration num, Duration den) {
 // Trunc/Floor/Ceil.
 //
 
-Duration Trunc(Duration d, Duration unit) {
-  return d - (d % unit);
-}
+Duration Trunc(Duration d, Duration unit) { return d - (d % unit); }
 
 Duration Floor(const Duration d, const Duration unit) {
   const y_absl::Duration td = Trunc(d, unit);
@@ -591,15 +602,9 @@ double ToDoubleMicroseconds(Duration d) {
 double ToDoubleMilliseconds(Duration d) {
   return FDivDuration(d, Milliseconds(1));
 }
-double ToDoubleSeconds(Duration d) {
-  return FDivDuration(d, Seconds(1));
-}
-double ToDoubleMinutes(Duration d) {
-  return FDivDuration(d, Minutes(1));
-}
-double ToDoubleHours(Duration d) {
-  return FDivDuration(d, Hours(1));
-}
+double ToDoubleSeconds(Duration d) { return FDivDuration(d, Seconds(1)); }
+double ToDoubleMinutes(Duration d) { return FDivDuration(d, Minutes(1)); }
+double ToDoubleHours(Duration d) { return FDivDuration(d, Hours(1)); }
 
 timespec ToTimespec(Duration d) {
   timespec ts;
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/format.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/time/format.cc
index fca2ff6043a4..eb9f99533335 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/format.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/format.cc
@@ -16,6 +16,7 @@
 
 #include <cctype>
 #include <cstdint>
+#include <utility>
 
 #include "y_absl/strings/match.h"
 #include "y_absl/strings/string_view.h"
@@ -136,7 +137,7 @@ bool ParseTime(y_absl::string_view format, y_absl::string_view input,
   if (b) {
     *time = Join(parts);
   } else if (err != nullptr) {
-    *err = error;
+    *err = std::move(error);
   }
   return b;
 }
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_libc.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_libc.cc
index a38a4a092dc9..473be412e425 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_libc.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_libc.cc
@@ -12,7 +12,7 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 
-#if defined(_WIN32) || defined(_WIN64)
+#if !defined(_CRT_SECURE_NO_WARNINGS) && defined(_WIN32)
 #define _CRT_SECURE_NO_WARNINGS 1
 #endif
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_lookup.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_lookup.cc
index dc495d060698..75797a199057 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_lookup.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/time_zone_lookup.cc
@@ -17,9 +17,6 @@
 
 #if defined(__ANDROID__)
 #include <sys/system_properties.h>
-#if defined(__ANDROID_API__) && __ANDROID_API__ >= 21
-#include <dlfcn.h>
-#endif
 #endif
 
 #if defined(__APPLE__)
@@ -66,32 +63,6 @@ namespace time_internal {
 namespace cctz {
 
 namespace {
-#if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 21
-// Android 'L' removes __system_property_get() from the NDK, however
-// it is still a hidden symbol in libc so we use dlsym() to access it.
-// See Chromium's base/sys_info_android.cc for a similar example.
-
-using property_get_func = int (*)(const char*, char*);
-
-property_get_func LoadSystemPropertyGet() {
-  int flag = RTLD_LAZY | RTLD_GLOBAL;
-#if defined(RTLD_NOLOAD)
-  flag |= RTLD_NOLOAD;  // libc.so should already be resident
-#endif
-  if (void* handle = dlopen("libc.so", flag)) {
-    void* sym = dlsym(handle, "__system_property_get");
-    dlclose(handle);
-    return reinterpret_cast<property_get_func>(sym);
-  }
-  return nullptr;
-}
-
-int __system_property_get(const char* name, char* value) {
-  static property_get_func system_property_get = LoadSystemPropertyGet();
-  return system_property_get ? system_property_get(name, value) : -1;
-}
-#endif
-
 #if defined(USE_WIN32_LOCAL_TIME_ZONE)
 // Calls the WinRT Calendar.GetTimeZone method to obtain the IANA ID of the
 // local time zone. Returns an empty vector in case of an error.
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/tzfile.h b/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/tzfile.h
index 114026d066c7..2be3bb8d98a8 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/tzfile.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/internal/cctz/src/tzfile.h
@@ -77,11 +77,11 @@ struct tzhead {
 ** time uses 8 rather than 4 chars,
 ** then a POSIX-TZ-environment-variable-style string for use in handling
 ** instants after the last transition time stored in the file
-** (with nothing between the newlines if there is no POSIX representation for
-** such instants).
+** (with nothing between the newlines if there is no POSIX.1-2017
+** representation for such instants).
 **
 ** If tz_version is '3' or greater, the above is extended as follows.
-** First, the POSIX TZ string's hour offset may range from -167
+** First, the TZ string's hour offset may range from -167
 ** through 167 as compared to the POSIX-required 0 through 24.
 ** Second, its DST start time may be January 1 at 00:00 and its stop
 ** time December 31 at 24:00 plus the difference between DST and
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/time/time.h b/contrib/restricted/abseil-cpp-tstring/y_absl/time/time.h
index 9d68396d5d5b..9b8079acfcd9 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/time/time.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/time/time.h
@@ -75,15 +75,22 @@
 struct timeval;
 #endif
 #include <chrono>  // NOLINT(build/c++11)
+
+#ifdef __cpp_lib_three_way_comparison
+#include <compare>
+#endif  // __cpp_lib_three_way_comparison
+
 #include <cmath>
 #include <cstdint>
 #include <ctime>
 #include <limits>
 #include <ostream>
+#include <ratio>  // NOLINT(build/c++11)
 #include <util/generic/string.h>
 #include <type_traits>
 #include <utility>
 
+#include "y_absl/base/attributes.h"
 #include "y_absl/base/config.h"
 #include "y_absl/base/macros.h"
 #include "y_absl/strings/string_view.h"
@@ -98,7 +105,6 @@ class Time;      // Defined below
 class TimeZone;  // Defined below
 
 namespace time_internal {
-int64_t IDivDuration(bool satq, Duration num, Duration den, Duration* rem);
 Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Time FromUnixDuration(Duration d);
 Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr Duration ToUnixDuration(Time t);
 Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr int64_t GetRepHi(Duration d);
@@ -306,6 +312,14 @@ class Duration {
 };
 
 // Relational Operators
+
+#ifdef __cpp_lib_three_way_comparison
+
+Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr std::strong_ordering operator<=>(
+    Duration lhs, Duration rhs);
+
+#endif  // __cpp_lib_three_way_comparison
+
 Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator<(Duration lhs,
                                                        Duration rhs);
 Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator>(Duration lhs,
@@ -338,30 +352,6 @@ Y_ABSL_ATTRIBUTE_CONST_FUNCTION inline Duration operator-(Duration lhs,
   return lhs -= rhs;
 }
 
-// Multiplicative Operators
-// Integer operands must be representable as int64_t.
-template <typename T>
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator*(Duration lhs, T rhs) {
-  return lhs *= rhs;
-}
-template <typename T>
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator*(T lhs, Duration rhs) {
-  return rhs *= lhs;
-}
-template <typename T>
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator/(Duration lhs, T rhs) {
-  return lhs /= rhs;
-}
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION inline int64_t operator/(Duration lhs,
-                                                       Duration rhs) {
-  return time_internal::IDivDuration(true, lhs, rhs,
-                                     &lhs);  // trunc towards zero
-}
-Y_ABSL_ATTRIBUTE_CONST_FUNCTION inline Duration operator%(Duration lhs,
-                                                        Duration rhs) {
-  return lhs %= rhs;
-}
-
 // IDivDuration()
 //
 // Divides a numerator `Duration` by a denominator `Duration`, returning the
@@ -390,10 +380,7 @@ Y_ABSL_ATTRIBUTE_CONST_FUNCTION inline Duration operator%(Duration lhs,
 //   // Here, q would overflow int64_t, so rem accounts for the difference.
 //   int64_t q = y_absl::IDivDuration(a, b, &rem);
 //   // q == std::numeric_limits<int64_t>::max(), rem == a - b * q
-inline int64_t IDivDuration(Duration num, Duration den, Duration* rem) {
-  return time_internal::IDivDuration(true, num, den,
-                                     rem);  // trunc towards zero
-}
+int64_t IDivDuration(Duration num, Duration den, Duration* rem);
 
 // FDivDuration()
 //
@@ -409,6 +396,30 @@ inline int64_t IDivDuration(Duration num, Duration den, Duration* rem) {
 //   // d == 1.5
 Y_ABSL_ATTRIBUTE_CONST_FUNCTION double FDivDuration(Duration num, Duration den);
 
+// Multiplicative Operators
+// Integer operands must be representable as int64_t.
+template <typename T>
+Y_ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator*(Duration lhs, T rhs) {
+  return lhs *= rhs;
+}
+template <typename T>
+Y_ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator*(T lhs, Duration rhs) {
+  return rhs *= lhs;
+}
+template <typename T>
+Y_ABSL_ATTRIBUTE_CONST_FUNCTION Duration operator/(Duration lhs, T rhs) {
+  return lhs /= rhs;
+}
+Y_ABSL_ATTRIBUTE_CONST_FUNCTION inline int64_t operator/(Duration lhs,
+                                                       Duration rhs) {
+  return IDivDuration(lhs, rhs,
+                      &lhs);  // trunc towards zero
+}
+Y_ABSL_ATTRIBUTE_CONST_FUNCTION inline Duration operator%(Duration lhs,
+                                                        Duration rhs) {
+  return lhs %= rhs;
+}
+
 // ZeroDuration()
 //
 // Returns a zero-length duration. This function behaves just like the default
@@ -841,6 +852,11 @@ class Time {
  private:
   friend constexpr Time time_internal::FromUnixDuration(Duration d);
   friend constexpr Duration time_internal::ToUnixDuration(Time t);
+
+#ifdef __cpp_lib_three_way_comparison
+  friend constexpr std::strong_ordering operator<=>(Time lhs, Time rhs);
+#endif  // __cpp_lib_three_way_comparison
+
   friend constexpr bool operator<(Time lhs, Time rhs);
   friend constexpr bool operator==(Time lhs, Time rhs);
   friend Duration operator-(Time lhs, Time rhs);
@@ -852,6 +868,15 @@ class Time {
 };
 
 // Relational Operators
+#ifdef __cpp_lib_three_way_comparison
+
+Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr std::strong_ordering operator<=>(
+    Time lhs, Time rhs) {
+  return lhs.rep_ <=> rhs.rep_;
+}
+
+#endif  // __cpp_lib_three_way_comparison
+
 Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator<(Time lhs, Time rhs) {
   return lhs.rep_ < rhs.rep_;
 }
@@ -1727,6 +1752,25 @@ Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator<(Duration lhs,
              : time_internal::GetRepLo(lhs) < time_internal::GetRepLo(rhs);
 }
 
+
+#ifdef __cpp_lib_three_way_comparison
+
+Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr std::strong_ordering operator<=>(
+    Duration lhs, Duration rhs) {
+  const int64_t lhs_hi = time_internal::GetRepHi(lhs);
+  const int64_t rhs_hi = time_internal::GetRepHi(rhs);
+  if (auto c = lhs_hi <=> rhs_hi; c != std::strong_ordering::equal) {
+    return c;
+  }
+  const uint32_t lhs_lo = time_internal::GetRepLo(lhs);
+  const uint32_t rhs_lo = time_internal::GetRepLo(rhs);
+  return (lhs_hi == (std::numeric_limits<int64_t>::min)())
+             ? (lhs_lo + 1) <=> (rhs_lo + 1)
+             : lhs_lo <=> rhs_lo;
+}
+
+#endif  // __cpp_lib_three_way_comparison
+
 Y_ABSL_ATTRIBUTE_CONST_FUNCTION constexpr bool operator==(Duration lhs,
                                                         Duration rhs) {
   return time_internal::GetRepHi(lhs) == time_internal::GetRepHi(rhs) &&
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/compare.h b/contrib/restricted/abseil-cpp-tstring/y_absl/types/compare.h
new file mode 100644
index 000000000000..4560e03e077e
--- /dev/null
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/compare.h
@@ -0,0 +1,505 @@
+// Copyright 2018 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// compare.h
+// -----------------------------------------------------------------------------
+//
+// This header file defines the `y_absl::partial_ordering`, `y_absl::weak_ordering`,
+// and `y_absl::strong_ordering` types for storing the results of three way
+// comparisons.
+//
+// Example:
+//   y_absl::weak_ordering compare(const TString& a, const TString& b);
+//
+// These are C++11 compatible versions of the C++20 corresponding types
+// (`std::partial_ordering`, etc.) and are designed to be drop-in replacements
+// for code compliant with C++20.
+
+#ifndef Y_ABSL_TYPES_COMPARE_H_
+#define Y_ABSL_TYPES_COMPARE_H_
+
+#include "y_absl/base/config.h"
+
+#ifdef Y_ABSL_USES_STD_ORDERING
+
+#include <compare>  // IWYU pragma: export
+#include <type_traits>
+
+#include "y_absl/meta/type_traits.h"
+
+#else
+
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <type_traits>
+
+#include "y_absl/base/attributes.h"
+#include "y_absl/base/macros.h"
+#include "y_absl/meta/type_traits.h"
+
+#endif
+
+namespace y_absl {
+Y_ABSL_NAMESPACE_BEGIN
+
+#ifdef Y_ABSL_USES_STD_ORDERING
+
+using std::partial_ordering;
+using std::strong_ordering;
+using std::weak_ordering;
+
+#else
+
+namespace compare_internal {
+
+using value_type = int8_t;
+
+class OnlyLiteralZero {
+ public:
+#if Y_ABSL_HAVE_ATTRIBUTE(enable_if) && !defined(__CUDACC__)
+  // On clang, we can avoid triggering modernize-use-nullptr by only enabling
+  // this overload when the value is a compile time integer constant equal to 0.
+  //
+  // In c++20, this could be a static_assert in a consteval function.
+  constexpr OnlyLiteralZero(int n)  // NOLINT
+      __attribute__((enable_if(n == 0, "Only literal `0` is allowed."))) {}
+#else  // Y_ABSL_HAVE_ATTRIBUTE(enable_if)
+  // Accept only literal zero since it can be implicitly converted to a pointer
+  // to member type. nullptr constants will be caught by the other constructor
+  // which accepts a nullptr_t.
+  //
+  // This constructor is not used for clang since it triggers
+  // modernize-use-nullptr.
+  constexpr OnlyLiteralZero(int OnlyLiteralZero::*) noexcept {}  // NOLINT
+#endif
+
+  // Fails compilation when `nullptr` or integral type arguments other than
+  // `int` are passed. This constructor doesn't accept `int` because literal `0`
+  // has type `int`. Literal `0` arguments will be implicitly converted to
+  // `std::nullptr_t` and accepted by the above constructor, while other `int`
+  // arguments will fail to be converted and cause compilation failure.
+  template <typename T, typename = typename std::enable_if<
+                            std::is_same<T, std::nullptr_t>::value ||
+                            (std::is_integral<T>::value &&
+                             !std::is_same<T, int>::value)>::type>
+  OnlyLiteralZero(T) {  // NOLINT
+    static_assert(sizeof(T) < 0, "Only literal `0` is allowed.");
+  }
+};
+
+enum class eq : value_type {
+  equal = 0,
+  equivalent = equal,
+  nonequal = 1,
+  nonequivalent = nonequal,
+};
+
+enum class ord : value_type { less = -1, greater = 1 };
+
+enum class ncmp : value_type { unordered = -127 };
+
+// Define macros to allow for creation or emulation of C++17 inline variables
+// based on whether the feature is supported. Note: we can't use
+// Y_ABSL_INTERNAL_INLINE_CONSTEXPR here because the variables here are of
+// incomplete types so they need to be defined after the types are complete.
+#ifdef __cpp_inline_variables
+
+// A no-op expansion that can be followed by a semicolon at class level.
+#define Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(name) static_assert(true, "")
+
+#define Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) \
+  static const type name
+
+#define Y_ABSL_COMPARE_INLINE_INIT(type, name, init) \
+  inline constexpr type type::name(init)
+
+#else  // __cpp_inline_variables
+
+#define Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(name) \
+  Y_ABSL_CONST_INIT static const T name
+
+// A no-op expansion that can be followed by a semicolon at class level.
+#define Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(type, name) static_assert(true, "")
+
+#define Y_ABSL_COMPARE_INLINE_INIT(type, name, init) \
+  template <typename T>                            \
+  const T compare_internal::type##_base<T>::name(init)
+
+#endif  // __cpp_inline_variables
+
+// These template base classes allow for defining the values of the constants
+// in the header file (for performance) without using inline variables (which
+// aren't available in C++11).
+template <typename T>
+struct partial_ordering_base {
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(less);
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(equivalent);
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(greater);
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(unordered);
+};
+
+template <typename T>
+struct weak_ordering_base {
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(less);
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(equivalent);
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(greater);
+};
+
+template <typename T>
+struct strong_ordering_base {
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(less);
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(equal);
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(equivalent);
+  Y_ABSL_COMPARE_INLINE_BASECLASS_DECL(greater);
+};
+
+}  // namespace compare_internal
+
+class partial_ordering
+    : public compare_internal::partial_ordering_base<partial_ordering> {
+  explicit constexpr partial_ordering(compare_internal::eq v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  explicit constexpr partial_ordering(compare_internal::ord v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  explicit constexpr partial_ordering(compare_internal::ncmp v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  friend struct compare_internal::partial_ordering_base<partial_ordering>;
+
+  constexpr bool is_ordered() const noexcept {
+    return value_ !=
+           compare_internal::value_type(compare_internal::ncmp::unordered);
+  }
+
+ public:
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, less);
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, equivalent);
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, greater);
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(partial_ordering, unordered);
+
+  // Comparisons
+  friend constexpr bool operator==(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ == 0;
+  }
+  friend constexpr bool operator!=(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return !v.is_ordered() || v.value_ != 0;
+  }
+  friend constexpr bool operator<(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ < 0;
+  }
+  friend constexpr bool operator<=(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ <= 0;
+  }
+  friend constexpr bool operator>(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ > 0;
+  }
+  friend constexpr bool operator>=(
+      partial_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.is_ordered() && v.value_ >= 0;
+  }
+  friend constexpr bool operator==(compare_internal::OnlyLiteralZero,
+                                   partial_ordering v) noexcept {
+    return v.is_ordered() && 0 == v.value_;
+  }
+  friend constexpr bool operator!=(compare_internal::OnlyLiteralZero,
+                                   partial_ordering v) noexcept {
+    return !v.is_ordered() || 0 != v.value_;
+  }
+  friend constexpr bool operator<(compare_internal::OnlyLiteralZero,
+                                  partial_ordering v) noexcept {
+    return v.is_ordered() && 0 < v.value_;
+  }
+  friend constexpr bool operator<=(compare_internal::OnlyLiteralZero,
+                                   partial_ordering v) noexcept {
+    return v.is_ordered() && 0 <= v.value_;
+  }
+  friend constexpr bool operator>(compare_internal::OnlyLiteralZero,
+                                  partial_ordering v) noexcept {
+    return v.is_ordered() && 0 > v.value_;
+  }
+  friend constexpr bool operator>=(compare_internal::OnlyLiteralZero,
+                                   partial_ordering v) noexcept {
+    return v.is_ordered() && 0 >= v.value_;
+  }
+  friend constexpr bool operator==(partial_ordering v1,
+                                   partial_ordering v2) noexcept {
+    return v1.value_ == v2.value_;
+  }
+  friend constexpr bool operator!=(partial_ordering v1,
+                                   partial_ordering v2) noexcept {
+    return v1.value_ != v2.value_;
+  }
+
+ private:
+  compare_internal::value_type value_;
+};
+Y_ABSL_COMPARE_INLINE_INIT(partial_ordering, less, compare_internal::ord::less);
+Y_ABSL_COMPARE_INLINE_INIT(partial_ordering, equivalent,
+                         compare_internal::eq::equivalent);
+Y_ABSL_COMPARE_INLINE_INIT(partial_ordering, greater,
+                         compare_internal::ord::greater);
+Y_ABSL_COMPARE_INLINE_INIT(partial_ordering, unordered,
+                         compare_internal::ncmp::unordered);
+
+class weak_ordering
+    : public compare_internal::weak_ordering_base<weak_ordering> {
+  explicit constexpr weak_ordering(compare_internal::eq v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  explicit constexpr weak_ordering(compare_internal::ord v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  friend struct compare_internal::weak_ordering_base<weak_ordering>;
+
+ public:
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, less);
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, equivalent);
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(weak_ordering, greater);
+
+  // Conversions
+  constexpr operator partial_ordering() const noexcept {  // NOLINT
+    return value_ == 0 ? partial_ordering::equivalent
+                       : (value_ < 0 ? partial_ordering::less
+                                     : partial_ordering::greater);
+  }
+  // Comparisons
+  friend constexpr bool operator==(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ == 0;
+  }
+  friend constexpr bool operator!=(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ != 0;
+  }
+  friend constexpr bool operator<(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ < 0;
+  }
+  friend constexpr bool operator<=(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ <= 0;
+  }
+  friend constexpr bool operator>(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ > 0;
+  }
+  friend constexpr bool operator>=(
+      weak_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ >= 0;
+  }
+  friend constexpr bool operator==(compare_internal::OnlyLiteralZero,
+                                   weak_ordering v) noexcept {
+    return 0 == v.value_;
+  }
+  friend constexpr bool operator!=(compare_internal::OnlyLiteralZero,
+                                   weak_ordering v) noexcept {
+    return 0 != v.value_;
+  }
+  friend constexpr bool operator<(compare_internal::OnlyLiteralZero,
+                                  weak_ordering v) noexcept {
+    return 0 < v.value_;
+  }
+  friend constexpr bool operator<=(compare_internal::OnlyLiteralZero,
+                                   weak_ordering v) noexcept {
+    return 0 <= v.value_;
+  }
+  friend constexpr bool operator>(compare_internal::OnlyLiteralZero,
+                                  weak_ordering v) noexcept {
+    return 0 > v.value_;
+  }
+  friend constexpr bool operator>=(compare_internal::OnlyLiteralZero,
+                                   weak_ordering v) noexcept {
+    return 0 >= v.value_;
+  }
+  friend constexpr bool operator==(weak_ordering v1,
+                                   weak_ordering v2) noexcept {
+    return v1.value_ == v2.value_;
+  }
+  friend constexpr bool operator!=(weak_ordering v1,
+                                   weak_ordering v2) noexcept {
+    return v1.value_ != v2.value_;
+  }
+
+ private:
+  compare_internal::value_type value_;
+};
+Y_ABSL_COMPARE_INLINE_INIT(weak_ordering, less, compare_internal::ord::less);
+Y_ABSL_COMPARE_INLINE_INIT(weak_ordering, equivalent,
+                         compare_internal::eq::equivalent);
+Y_ABSL_COMPARE_INLINE_INIT(weak_ordering, greater,
+                         compare_internal::ord::greater);
+
+class strong_ordering
+    : public compare_internal::strong_ordering_base<strong_ordering> {
+  explicit constexpr strong_ordering(compare_internal::eq v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  explicit constexpr strong_ordering(compare_internal::ord v) noexcept
+      : value_(static_cast<compare_internal::value_type>(v)) {}
+  friend struct compare_internal::strong_ordering_base<strong_ordering>;
+
+ public:
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, less);
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equal);
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, equivalent);
+  Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL(strong_ordering, greater);
+
+  // Conversions
+  constexpr operator partial_ordering() const noexcept {  // NOLINT
+    return value_ == 0 ? partial_ordering::equivalent
+                       : (value_ < 0 ? partial_ordering::less
+                                     : partial_ordering::greater);
+  }
+  constexpr operator weak_ordering() const noexcept {  // NOLINT
+    return value_ == 0
+               ? weak_ordering::equivalent
+               : (value_ < 0 ? weak_ordering::less : weak_ordering::greater);
+  }
+  // Comparisons
+  friend constexpr bool operator==(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ == 0;
+  }
+  friend constexpr bool operator!=(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ != 0;
+  }
+  friend constexpr bool operator<(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ < 0;
+  }
+  friend constexpr bool operator<=(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ <= 0;
+  }
+  friend constexpr bool operator>(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ > 0;
+  }
+  friend constexpr bool operator>=(
+      strong_ordering v, compare_internal::OnlyLiteralZero) noexcept {
+    return v.value_ >= 0;
+  }
+  friend constexpr bool operator==(compare_internal::OnlyLiteralZero,
+                                   strong_ordering v) noexcept {
+    return 0 == v.value_;
+  }
+  friend constexpr bool operator!=(compare_internal::OnlyLiteralZero,
+                                   strong_ordering v) noexcept {
+    return 0 != v.value_;
+  }
+  friend constexpr bool operator<(compare_internal::OnlyLiteralZero,
+                                  strong_ordering v) noexcept {
+    return 0 < v.value_;
+  }
+  friend constexpr bool operator<=(compare_internal::OnlyLiteralZero,
+                                   strong_ordering v) noexcept {
+    return 0 <= v.value_;
+  }
+  friend constexpr bool operator>(compare_internal::OnlyLiteralZero,
+                                  strong_ordering v) noexcept {
+    return 0 > v.value_;
+  }
+  friend constexpr bool operator>=(compare_internal::OnlyLiteralZero,
+                                   strong_ordering v) noexcept {
+    return 0 >= v.value_;
+  }
+  friend constexpr bool operator==(strong_ordering v1,
+                                   strong_ordering v2) noexcept {
+    return v1.value_ == v2.value_;
+  }
+  friend constexpr bool operator!=(strong_ordering v1,
+                                   strong_ordering v2) noexcept {
+    return v1.value_ != v2.value_;
+  }
+
+ private:
+  compare_internal::value_type value_;
+};
+Y_ABSL_COMPARE_INLINE_INIT(strong_ordering, less, compare_internal::ord::less);
+Y_ABSL_COMPARE_INLINE_INIT(strong_ordering, equal, compare_internal::eq::equal);
+Y_ABSL_COMPARE_INLINE_INIT(strong_ordering, equivalent,
+                         compare_internal::eq::equivalent);
+Y_ABSL_COMPARE_INLINE_INIT(strong_ordering, greater,
+                         compare_internal::ord::greater);
+
+#undef Y_ABSL_COMPARE_INLINE_BASECLASS_DECL
+#undef Y_ABSL_COMPARE_INLINE_SUBCLASS_DECL
+#undef Y_ABSL_COMPARE_INLINE_INIT
+
+#endif  // Y_ABSL_USES_STD_ORDERING
+
+namespace compare_internal {
+// We also provide these comparator adapter functions for internal y_absl use.
+
+// Helper functions to do a boolean comparison of two keys given a boolean
+// or three-way comparator.
+// SFINAE prevents implicit conversions to bool (such as from int).
+template <typename BoolT,
+          y_absl::enable_if_t<std::is_same<bool, BoolT>::value, int> = 0>
+constexpr bool compare_result_as_less_than(const BoolT r) { return r; }
+constexpr bool compare_result_as_less_than(const y_absl::weak_ordering r) {
+  return r < 0;
+}
+
+template <typename Compare, typename K, typename LK>
+constexpr bool do_less_than_comparison(const Compare &compare, const K &x,
+                                       const LK &y) {
+  return compare_result_as_less_than(compare(x, y));
+}
+
+// Helper functions to do a three-way comparison of two keys given a boolean or
+// three-way comparator.
+// SFINAE prevents implicit conversions to int (such as from bool).
+template <typename Int,
+          y_absl::enable_if_t<std::is_same<int, Int>::value, int> = 0>
+constexpr y_absl::weak_ordering compare_result_as_ordering(const Int c) {
+  return c < 0 ? y_absl::weak_ordering::less
+               : c == 0 ? y_absl::weak_ordering::equivalent
+                        : y_absl::weak_ordering::greater;
+}
+constexpr y_absl::weak_ordering compare_result_as_ordering(
+    const y_absl::weak_ordering c) {
+  return c;
+}
+
+template <
+    typename Compare, typename K, typename LK,
+    y_absl::enable_if_t<!std::is_same<bool, y_absl::result_of_t<Compare(
+                                              const K &, const LK &)>>::value,
+                      int> = 0>
+constexpr y_absl::weak_ordering do_three_way_comparison(const Compare &compare,
+                                                      const K &x, const LK &y) {
+  return compare_result_as_ordering(compare(x, y));
+}
+template <
+    typename Compare, typename K, typename LK,
+    y_absl::enable_if_t<std::is_same<bool, y_absl::result_of_t<Compare(
+                                             const K &, const LK &)>>::value,
+                      int> = 0>
+constexpr y_absl::weak_ordering do_three_way_comparison(const Compare &compare,
+                                                      const K &x, const LK &y) {
+  return compare(x, y) ? y_absl::weak_ordering::less
+                       : compare(y, x) ? y_absl::weak_ordering::greater
+                                       : y_absl::weak_ordering::equivalent;
+}
+
+}  // namespace compare_internal
+Y_ABSL_NAMESPACE_END
+}  // namespace y_absl
+
+#endif  // Y_ABSL_TYPES_COMPARE_H_
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/optional.h b/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/optional.h
index faaf18711ba8..6c870a3affff 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/optional.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/optional.h
@@ -81,7 +81,7 @@ class optional_data_dtor_base {
 
   template <typename... Args>
   constexpr explicit optional_data_dtor_base(in_place_t, Args&&... args)
-      : engaged_(true), data_(y_absl::forward<Args>(args)...) {}
+      : engaged_(true), data_(std::forward<Args>(args)...) {}
 
   ~optional_data_dtor_base() { destruct(); }
 };
@@ -110,7 +110,7 @@ class optional_data_dtor_base<T, true> {
 
   template <typename... Args>
   constexpr explicit optional_data_dtor_base(in_place_t, Args&&... args)
-      : engaged_(true), data_(y_absl::forward<Args>(args)...) {}
+      : engaged_(true), data_(std::forward<Args>(args)...) {}
 };
 
 template <typename T>
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/variant.h b/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/variant.h
index da3bd41d8612..eca59de50aa9 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/variant.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/internal/variant.h
@@ -26,6 +26,7 @@
 #include <stdexcept>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 
 #include "y_absl/base/config.h"
 #include "y_absl/base/internal/identity.h"
@@ -214,7 +215,7 @@ constexpr ReturnType call_with_indices(FunctionObject&& function) {
       std::is_same<ReturnType, decltype(std::declval<FunctionObject>()(
                                    SizeT<Indices>()...))>::value,
       "Not all visitation overloads have the same return type.");
-  return y_absl::forward<FunctionObject>(function)(SizeT<Indices>()...);
+  return std::forward<FunctionObject>(function)(SizeT<Indices>()...);
 }
 
 template <class ReturnType, class FunctionObject, std::size_t... BoundIndices>
@@ -272,27 +273,14 @@ struct UnreachableSwitchCase {
   template <class Op>
   [[noreturn]] static VisitIndicesResultT<Op, std::size_t> Run(
       Op&& /*ignored*/) {
-#if Y_ABSL_HAVE_BUILTIN(__builtin_unreachable) || \
-    (defined(__GNUC__) && !defined(__clang__))
-    __builtin_unreachable();
-#elif defined(_MSC_VER)
-    __assume(false);
-#else
-    // Try to use assert of false being identified as an unreachable intrinsic.
-    // NOTE: We use assert directly to increase chances of exploiting an assume
-    //       intrinsic.
-    assert(false);  // NOLINT
-
-    // Hack to silence potential no return warning -- cause an infinite loop.
-    return Run(y_absl::forward<Op>(op));
-#endif  // Checks for __builtin_unreachable
+    Y_ABSL_UNREACHABLE();
   }
 };
 
 template <class Op, std::size_t I>
 struct ReachableSwitchCase {
   static VisitIndicesResultT<Op, std::size_t> Run(Op&& op) {
-    return y_absl::base_internal::invoke(y_absl::forward<Op>(op), SizeT<I>());
+    return y_absl::base_internal::invoke(std::forward<Op>(op), SizeT<I>());
   }
 };
 
@@ -357,74 +345,74 @@ struct VisitIndicesSwitch {
   static VisitIndicesResultT<Op, std::size_t> Run(Op&& op, std::size_t i) {
     switch (i) {
       case 0:
-        return PickCase<Op, 0, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 0, EndIndex>::Run(std::forward<Op>(op));
       case 1:
-        return PickCase<Op, 1, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 1, EndIndex>::Run(std::forward<Op>(op));
       case 2:
-        return PickCase<Op, 2, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 2, EndIndex>::Run(std::forward<Op>(op));
       case 3:
-        return PickCase<Op, 3, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 3, EndIndex>::Run(std::forward<Op>(op));
       case 4:
-        return PickCase<Op, 4, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 4, EndIndex>::Run(std::forward<Op>(op));
       case 5:
-        return PickCase<Op, 5, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 5, EndIndex>::Run(std::forward<Op>(op));
       case 6:
-        return PickCase<Op, 6, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 6, EndIndex>::Run(std::forward<Op>(op));
       case 7:
-        return PickCase<Op, 7, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 7, EndIndex>::Run(std::forward<Op>(op));
       case 8:
-        return PickCase<Op, 8, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 8, EndIndex>::Run(std::forward<Op>(op));
       case 9:
-        return PickCase<Op, 9, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 9, EndIndex>::Run(std::forward<Op>(op));
       case 10:
-        return PickCase<Op, 10, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 10, EndIndex>::Run(std::forward<Op>(op));
       case 11:
-        return PickCase<Op, 11, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 11, EndIndex>::Run(std::forward<Op>(op));
       case 12:
-        return PickCase<Op, 12, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 12, EndIndex>::Run(std::forward<Op>(op));
       case 13:
-        return PickCase<Op, 13, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 13, EndIndex>::Run(std::forward<Op>(op));
       case 14:
-        return PickCase<Op, 14, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 14, EndIndex>::Run(std::forward<Op>(op));
       case 15:
-        return PickCase<Op, 15, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 15, EndIndex>::Run(std::forward<Op>(op));
       case 16:
-        return PickCase<Op, 16, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 16, EndIndex>::Run(std::forward<Op>(op));
       case 17:
-        return PickCase<Op, 17, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 17, EndIndex>::Run(std::forward<Op>(op));
       case 18:
-        return PickCase<Op, 18, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 18, EndIndex>::Run(std::forward<Op>(op));
       case 19:
-        return PickCase<Op, 19, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 19, EndIndex>::Run(std::forward<Op>(op));
       case 20:
-        return PickCase<Op, 20, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 20, EndIndex>::Run(std::forward<Op>(op));
       case 21:
-        return PickCase<Op, 21, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 21, EndIndex>::Run(std::forward<Op>(op));
       case 22:
-        return PickCase<Op, 22, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 22, EndIndex>::Run(std::forward<Op>(op));
       case 23:
-        return PickCase<Op, 23, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 23, EndIndex>::Run(std::forward<Op>(op));
       case 24:
-        return PickCase<Op, 24, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 24, EndIndex>::Run(std::forward<Op>(op));
       case 25:
-        return PickCase<Op, 25, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 25, EndIndex>::Run(std::forward<Op>(op));
       case 26:
-        return PickCase<Op, 26, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 26, EndIndex>::Run(std::forward<Op>(op));
       case 27:
-        return PickCase<Op, 27, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 27, EndIndex>::Run(std::forward<Op>(op));
       case 28:
-        return PickCase<Op, 28, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 28, EndIndex>::Run(std::forward<Op>(op));
       case 29:
-        return PickCase<Op, 29, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 29, EndIndex>::Run(std::forward<Op>(op));
       case 30:
-        return PickCase<Op, 30, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 30, EndIndex>::Run(std::forward<Op>(op));
       case 31:
-        return PickCase<Op, 31, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 31, EndIndex>::Run(std::forward<Op>(op));
       case 32:
-        return PickCase<Op, 32, EndIndex>::Run(y_absl::forward<Op>(op));
+        return PickCase<Op, 32, EndIndex>::Run(std::forward<Op>(op));
       default:
         Y_ABSL_ASSERT(i == variant_npos);
-        return y_absl::base_internal::invoke(y_absl::forward<Op>(op), NPos());
+        return y_absl::base_internal::invoke(std::forward<Op>(op), NPos());
     }
   }
 };
@@ -437,7 +425,7 @@ struct VisitIndicesFallback {
         MakeVisitationMatrix<VisitIndicesResultT<Op, SizeT...>, Op,
                              index_sequence<(EndIndices + 1)...>,
                              index_sequence<>>::Run(),
-        (indices + 1)...)(y_absl::forward<Op>(op));
+        (indices + 1)...)(std::forward<Op>(op));
   }
 };
 
@@ -489,7 +477,7 @@ struct VisitIndicesVariadicImpl<y_absl::index_sequence<N...>, EndIndices...> {
     VisitIndicesResultT<Op, decltype(EndIndices)...> operator()(
         SizeT<I> /*index*/) && {
       return base_internal::invoke(
-          y_absl::forward<Op>(op),
+          std::forward<Op>(op),
           SizeT<UnflattenIndex<I, N, (EndIndices + 1)...>::value -
                 std::size_t{1}>()...);
     }
@@ -501,7 +489,7 @@ struct VisitIndicesVariadicImpl<y_absl::index_sequence<N...>, EndIndices...> {
   static VisitIndicesResultT<Op, decltype(EndIndices)...> Run(Op&& op,
                                                               SizeType... i) {
     return VisitIndicesSwitch<NumCasesOfSwitch<EndIndices...>::value>::Run(
-        FlattenedOp<Op>{y_absl::forward<Op>(op)},
+        FlattenedOp<Op>{std::forward<Op>(op)},
         FlattenIndices<(EndIndices + std::size_t{1})...>::Run(
             (i + std::size_t{1})...));
   }
@@ -612,7 +600,7 @@ struct VariantCoreAccess {
       TypedThrowBadVariantAccess<VariantAccessResult<I, Variant>>();
     }
 
-    return Access<I>(y_absl::forward<Variant>(self));
+    return Access<I>(std::forward<Variant>(self));
   }
 
   // The implementation of the move-assignment operation for a variant.
@@ -684,7 +672,7 @@ struct VariantCoreAccess {
 
     void operator()(SizeT<NewIndex::value> /*old_i*/
     ) const {
-      Access<NewIndex::value>(*left) = y_absl::forward<QualifiedNew>(other);
+      Access<NewIndex::value>(*left) = std::forward<QualifiedNew>(other);
     }
 
     template <std::size_t OldIndex>
@@ -695,13 +683,13 @@ struct VariantCoreAccess {
       if (std::is_nothrow_constructible<New, QualifiedNew>::value ||
           !std::is_nothrow_move_constructible<New>::value) {
         left->template emplace<NewIndex::value>(
-            y_absl::forward<QualifiedNew>(other));
+            std::forward<QualifiedNew>(other));
       } else {
         // the standard says "equivalent to
         // operator=(variant(std::forward<T>(t)))", but we use `emplace` here
         // because the variant's move assignment operator could be deleted.
         left->template emplace<NewIndex::value>(
-            New(y_absl::forward<QualifiedNew>(other)));
+            New(std::forward<QualifiedNew>(other)));
       }
     }
 
@@ -712,7 +700,7 @@ struct VariantCoreAccess {
   template <class Left, class QualifiedNew>
   static ConversionAssignVisitor<Left, QualifiedNew>
   MakeConversionAssignVisitor(Left* left, QualifiedNew&& qual) {
-    return {left, y_absl::forward<QualifiedNew>(qual)};
+    return {left, std::forward<QualifiedNew>(qual)};
   }
 
   // Backend for operations for `emplace()` which destructs `*self` then
@@ -723,7 +711,7 @@ struct VariantCoreAccess {
     Destroy(*self);
     using New = typename y_absl::variant_alternative<NewIndex, Self>::type;
     New* const result = ::new (static_cast<void*>(&self->state_))
-        New(y_absl::forward<Args>(args)...);
+        New(std::forward<Args>(args)...);
     self->index_ = NewIndex;
     return *result;
   }
@@ -919,9 +907,9 @@ struct PerformVisitation {
                                           Is, QualifiedVariants>...)>>::value,
         "All visitation overloads must have the same return type.");
     return y_absl::base_internal::invoke(
-        y_absl::forward<Op>(op),
+        std::forward<Op>(op),
         VariantCoreAccess::Access<Is>(
-            y_absl::forward<QualifiedVariants>(std::get<TupIs>(variant_tup)))...);
+            std::forward<QualifiedVariants>(std::get<TupIs>(variant_tup)))...);
   }
 
   template <std::size_t... TupIs, std::size_t... Is>
@@ -969,11 +957,11 @@ union Union<Head, Tail...> {
 
   template <class... P>
   explicit constexpr Union(EmplaceTag<0>, P&&... args)
-      : head(y_absl::forward<P>(args)...) {}
+      : head(std::forward<P>(args)...) {}
 
   template <std::size_t I, class... P>
   explicit constexpr Union(EmplaceTag<I>, P&&... args)
-      : tail(EmplaceTag<I - 1>{}, y_absl::forward<P>(args)...) {}
+      : tail(EmplaceTag<I - 1>{}, std::forward<P>(args)...) {}
 
   Head head;
   TailUnion tail;
@@ -1001,11 +989,11 @@ union DestructibleUnionImpl<Head, Tail...> {
 
   template <class... P>
   explicit constexpr DestructibleUnionImpl(EmplaceTag<0>, P&&... args)
-      : head(y_absl::forward<P>(args)...) {}
+      : head(std::forward<P>(args)...) {}
 
   template <std::size_t I, class... P>
   explicit constexpr DestructibleUnionImpl(EmplaceTag<I>, P&&... args)
-      : tail(EmplaceTag<I - 1>{}, y_absl::forward<P>(args)...) {}
+      : tail(EmplaceTag<I - 1>{}, std::forward<P>(args)...) {}
 
   ~DestructibleUnionImpl() {}
 
@@ -1036,7 +1024,7 @@ class VariantStateBase {
 
   template <std::size_t I, class... P>
   explicit constexpr VariantStateBase(EmplaceTag<I> tag, P&&... args)
-      : state_(tag, y_absl::forward<P>(args)...), index_(I) {}
+      : state_(tag, std::forward<P>(args)...), index_(I) {}
 
   explicit constexpr VariantStateBase(NoopConstructorTag)
       : state_(NoopConstructorTag()), index_(variant_npos) {}
@@ -1321,7 +1309,7 @@ class VariantMoveBaseNontrivial : protected VariantStateBaseDestructor<T...> {
       using Alternative =
           typename y_absl::variant_alternative<I, variant<T...>>::type;
       ::new (static_cast<void*>(&self->state_)) Alternative(
-          variant_internal::AccessUnion(y_absl::move(other->state_), i));
+          variant_internal::AccessUnion(std::move(other->state_), i));
     }
 
     void operator()(SizeT<y_absl::variant_npos> /*i*/) const {}
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/optional.h b/contrib/restricted/abseil-cpp-tstring/y_absl/types/optional.h
index fe5ff87fc713..aa06cf9ebbc0 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/optional.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/optional.h
@@ -151,7 +151,7 @@ class optional : private optional_internal::optional_data<T>,
                 std::is_same<InPlaceT, in_place_t>,
                 std::is_constructible<T, Args&&...> >::value>* = nullptr>
   constexpr explicit optional(InPlaceT, Args&&... args)
-      : data_base(in_place_t(), y_absl::forward<Args>(args)...) {}
+      : data_base(in_place_t(), std::forward<Args>(args)...) {}
 
   // Constructs a non-empty `optional` direct-initialized value of type `T` from
   // the arguments of an initializer_list and `std::forward<Args>(args)...`.
@@ -162,8 +162,7 @@ class optional : private optional_internal::optional_data<T>,
                 T, std::initializer_list<U>&, Args&&...>::value>::type>
   constexpr explicit optional(in_place_t, std::initializer_list<U> il,
                               Args&&... args)
-      : data_base(in_place_t(), il, y_absl::forward<Args>(args)...) {
-  }
+      : data_base(in_place_t(), il, std::forward<Args>(args)...) {}
 
   // Value constructor (implicit)
   template <
@@ -176,21 +175,21 @@ class optional : private optional_internal::optional_data<T>,
                             std::is_convertible<U&&, T>,
                             std::is_constructible<T, U&&> >::value,
           bool>::type = false>
-  constexpr optional(U&& v) : data_base(in_place_t(), y_absl::forward<U>(v)) {}
+  constexpr optional(U&& v) : data_base(in_place_t(), std::forward<U>(v)) {}
 
   // Value constructor (explicit)
   template <
       typename U = T,
       typename std::enable_if<
           y_absl::conjunction<y_absl::negation<std::is_same<
-                                in_place_t, typename std::decay<U>::type>>,
+                                in_place_t, typename std::decay<U>::type> >,
                             y_absl::negation<std::is_same<
-                                optional<T>, typename std::decay<U>::type>>,
-                            y_absl::negation<std::is_convertible<U&&, T>>,
-                            std::is_constructible<T, U&&>>::value,
+                                optional<T>, typename std::decay<U>::type> >,
+                            y_absl::negation<std::is_convertible<U&&, T> >,
+                            std::is_constructible<T, U&&> >::value,
           bool>::type = false>
   explicit constexpr optional(U&& v)
-      : data_base(in_place_t(), y_absl::forward<U>(v)) {}
+      : data_base(in_place_t(), std::forward<U>(v)) {}
 
   // Converting copy constructor (implicit)
   template <typename U,
@@ -437,7 +436,7 @@ class optional : private optional_internal::optional_data<T>,
     return reference();
   }
   constexpr const T&& operator*() const&& Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return Y_ABSL_HARDENING_ASSERT(this->engaged_), y_absl::move(reference());
+    return Y_ABSL_HARDENING_ASSERT(this->engaged_), std::move(reference());
   }
   T&& operator*() && Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {
     Y_ABSL_HARDENING_ASSERT(this->engaged_);
@@ -492,7 +491,7 @@ class optional : private optional_internal::optional_data<T>,
   }
   constexpr const T&& value()
       const&& Y_ABSL_ATTRIBUTE_LIFETIME_BOUND {  // NOLINT(build/c++11)
-    return y_absl::move(
+    return std::move(
         static_cast<bool>(*this)
             ? reference()
             : (optional_internal::throw_bad_optional_access(), reference()));
@@ -511,9 +510,8 @@ class optional : private optional_internal::optional_data<T>,
                   "optional<T>::value_or: T must be copy constructible");
     static_assert(std::is_convertible<U&&, value_type>::value,
                   "optional<T>::value_or: U must be convertible to T");
-    return static_cast<bool>(*this)
-               ? **this
-               : static_cast<T>(y_absl::forward<U>(v));
+    return static_cast<bool>(*this) ? **this
+                                    : static_cast<T>(std::forward<U>(v));
   }
   template <typename U>
   T value_or(U&& v) && {  // NOLINT(build/c++11)
@@ -573,19 +571,18 @@ void swap(optional<T>& a, optional<T>& b) noexcept(noexcept(a.swap(b))) {
 //   static_assert(opt.value() == 1, "");
 template <typename T>
 constexpr optional<typename std::decay<T>::type> make_optional(T&& v) {
-  return optional<typename std::decay<T>::type>(y_absl::forward<T>(v));
+  return optional<typename std::decay<T>::type>(std::forward<T>(v));
 }
 
 template <typename T, typename... Args>
 constexpr optional<T> make_optional(Args&&... args) {
-  return optional<T>(in_place_t(), y_absl::forward<Args>(args)...);
+  return optional<T>(in_place_t(), std::forward<Args>(args)...);
 }
 
 template <typename T, typename U, typename... Args>
 constexpr optional<T> make_optional(std::initializer_list<U> il,
                                     Args&&... args) {
-  return optional<T>(in_place_t(), il,
-                     y_absl::forward<Args>(args)...);
+  return optional<T>(in_place_t(), il, std::forward<Args>(args)...);
 }
 
 // Relational operators [optional.relops]
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/span.h b/contrib/restricted/abseil-cpp-tstring/y_absl/types/span.h
index 83bee533f121..e6f1bdaee9db 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/span.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/span.h
@@ -43,7 +43,7 @@
 //    * A read-only `y_absl::Span<const T>` can be implicitly constructed from an
 //      initializer list.
 //    * `y_absl::Span` has no `bytes()`, `size_bytes()`, `as_bytes()`, or
-//      `as_mutable_bytes()` methods
+//      `as_writable_bytes()` methods
 //    * `y_absl::Span` has no static extent template parameter, nor constructors
 //      which exist only because of the static extent parameter.
 //    * `y_absl::Span` has an explicit mutable-reference constructor
@@ -151,7 +151,7 @@ Y_ABSL_NAMESPACE_BEGIN
 //   int* my_array = new int[10];
 //   MyRoutine(y_absl::Span<const int>(my_array, 10));
 template <typename T>
-class Span {
+class Y_ABSL_INTERNAL_ATTRIBUTE_VIEW Span {
  private:
   // Used to determine whether a Span can be constructed from a container of
   // type C.
@@ -185,6 +185,7 @@ class Span {
   using const_reverse_iterator = std::reverse_iterator<const_iterator>;
   using size_type = size_t;
   using difference_type = ptrdiff_t;
+  using absl_internal_is_view = std::true_type;
 
   static const size_type npos = ~(size_type(0));
 
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/types/variant.h b/contrib/restricted/abseil-cpp-tstring/y_absl/types/variant.h
index dd21ab9e97da..1ed8dfce00a0 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/types/variant.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/types/variant.h
@@ -303,11 +303,10 @@ constexpr T& get(variant<Types...>& v) {  // NOLINT
 }
 
 // Overload for getting a variant's rvalue by type.
-// Note: `y_absl::move()` is required to allow use of constexpr in C++11.
 template <class T, class... Types>
 constexpr T&& get(variant<Types...>&& v) {
   return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(y_absl::move(v));
+      variant_internal::IndexOf<T, Types...>::value>(std::move(v));
 }
 
 // Overload for getting a variant's const lvalue by type.
@@ -318,11 +317,10 @@ constexpr const T& get(const variant<Types...>& v) {
 }
 
 // Overload for getting a variant's const rvalue by type.
-// Note: `y_absl::move()` is required to allow use of constexpr in C++11.
 template <class T, class... Types>
 constexpr const T&& get(const variant<Types...>&& v) {
   return variant_internal::VariantCoreAccess::CheckedAccess<
-      variant_internal::IndexOf<T, Types...>::value>(y_absl::move(v));
+      variant_internal::IndexOf<T, Types...>::value>(std::move(v));
 }
 
 // Overload for getting a variant's lvalue by index.
@@ -333,11 +331,10 @@ constexpr variant_alternative_t<I, variant<Types...>>& get(
 }
 
 // Overload for getting a variant's rvalue by index.
-// Note: `y_absl::move()` is required to allow use of constexpr in C++11.
 template <std::size_t I, class... Types>
 constexpr variant_alternative_t<I, variant<Types...>>&& get(
     variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(y_absl::move(v));
+  return variant_internal::VariantCoreAccess::CheckedAccess<I>(std::move(v));
 }
 
 // Overload for getting a variant's const lvalue by index.
@@ -348,11 +345,10 @@ constexpr const variant_alternative_t<I, variant<Types...>>& get(
 }
 
 // Overload for getting a variant's const rvalue by index.
-// Note: `y_absl::move()` is required to allow use of constexpr in C++11.
 template <std::size_t I, class... Types>
 constexpr const variant_alternative_t<I, variant<Types...>>&& get(
     const variant<Types...>&& v) {
-  return variant_internal::VariantCoreAccess::CheckedAccess<I>(y_absl::move(v));
+  return variant_internal::VariantCoreAccess::CheckedAccess<I>(std::move(v));
 }
 
 // get_if()
@@ -432,8 +428,8 @@ variant_internal::VisitResult<Visitor, Variants...> visit(Visitor&& vis,
   return variant_internal::
       VisitIndices<variant_size<y_absl::decay_t<Variants> >::value...>::Run(
           variant_internal::PerformVisitation<Visitor, Variants...>{
-              std::forward_as_tuple(y_absl::forward<Variants>(vars)...),
-              y_absl::forward<Visitor>(vis)},
+              std::forward_as_tuple(std::forward<Variants>(vars)...),
+              std::forward<Visitor>(vis)},
           vars.index()...);
 }
 
@@ -504,13 +500,12 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
       class T,
       std::size_t I = std::enable_if<
           variant_internal::IsNeitherSelfNorInPlace<variant,
-                                                    y_absl::decay_t<T>>::value,
-          variant_internal::IndexOfConstructedType<variant, T>>::type::value,
+                                                    y_absl::decay_t<T> >::value,
+          variant_internal::IndexOfConstructedType<variant, T> >::type::value,
       class Tj = y_absl::variant_alternative_t<I, variant>,
-      y_absl::enable_if_t<std::is_constructible<Tj, T>::value>* =
-          nullptr>
+      y_absl::enable_if_t<std::is_constructible<Tj, T>::value>* = nullptr>
   constexpr variant(T&& t) noexcept(std::is_nothrow_constructible<Tj, T>::value)
-      : Base(variant_internal::EmplaceTag<I>(), y_absl::forward<T>(t)) {}
+      : Base(variant_internal::EmplaceTag<I>(), std::forward<T>(t)) {}
 
   // Constructs a variant of an alternative type from the arguments through
   // direct-initialization.
@@ -524,7 +519,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   constexpr explicit variant(in_place_type_t<T>, Args&&... args)
       : Base(variant_internal::EmplaceTag<
                  variant_internal::UnambiguousIndexOf<variant, T>::value>(),
-             y_absl::forward<Args>(args)...) {}
+             std::forward<Args>(args)...) {}
 
   // Constructs a variant of an alternative type from an initializer list
   // and other arguments through direct-initialization.
@@ -539,7 +534,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
                              Args&&... args)
       : Base(variant_internal::EmplaceTag<
                  variant_internal::UnambiguousIndexOf<variant, T>::value>(),
-             il, y_absl::forward<Args>(args)...) {}
+             il, std::forward<Args>(args)...) {}
 
   // Constructs a variant of an alternative type from a provided index,
   // through value-initialization using the provided forwarded arguments.
@@ -548,7 +543,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
                 variant_internal::VariantAlternativeSfinaeT<I, variant>,
                 Args...>::value>::type* = nullptr>
   constexpr explicit variant(in_place_index_t<I>, Args&&... args)
-      : Base(variant_internal::EmplaceTag<I>(), y_absl::forward<Args>(args)...) {}
+      : Base(variant_internal::EmplaceTag<I>(), std::forward<Args>(args)...) {}
 
   // Constructs a variant of an alternative type from a provided index,
   // through value-initialization of an initializer list and the provided
@@ -560,7 +555,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   constexpr explicit variant(in_place_index_t<I>, std::initializer_list<U> il,
                              Args&&... args)
       : Base(variant_internal::EmplaceTag<I>(), il,
-             y_absl::forward<Args>(args)...) {}
+             std::forward<Args>(args)...) {}
 
   // Destructors
 
@@ -595,7 +590,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
           std::is_nothrow_constructible<Tj, T>::value) {
     variant_internal::VisitIndices<sizeof...(Tn) + 1>::Run(
         variant_internal::VariantCoreAccess::MakeConversionAssignVisitor(
-            this, y_absl::forward<T>(t)),
+            this, std::forward<T>(t)),
         index());
 
     return *this;
@@ -623,7 +618,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   T& emplace(Args&&... args) {
     return variant_internal::VariantCoreAccess::Replace<
         variant_internal::UnambiguousIndexOf<variant, T>::value>(
-        this, y_absl::forward<Args>(args)...);
+        this, std::forward<Args>(args)...);
   }
 
   // Constructs a value of the given alternative type T within the variant using
@@ -644,7 +639,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   T& emplace(std::initializer_list<U> il, Args&&... args) {
     return variant_internal::VariantCoreAccess::Replace<
         variant_internal::UnambiguousIndexOf<variant, T>::value>(
-        this, il, y_absl::forward<Args>(args)...);
+        this, il, std::forward<Args>(args)...);
   }
 
   // Destroys the current value of the variant (provided that
@@ -663,7 +658,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
                                       Args...>::value>::type* = nullptr>
   y_absl::variant_alternative_t<I, variant>& emplace(Args&&... args) {
     return variant_internal::VariantCoreAccess::Replace<I>(
-        this, y_absl::forward<Args>(args)...);
+        this, std::forward<Args>(args)...);
   }
 
   // Destroys the current value of the variant (provided that
@@ -681,7 +676,7 @@ class variant<T0, Tn...> : private variant_internal::VariantBase<T0, Tn...> {
   y_absl::variant_alternative_t<I, variant>& emplace(std::initializer_list<U> il,
                                                    Args&&... args) {
     return variant_internal::VariantCoreAccess::Replace<I>(
-        this, il, y_absl::forward<Args>(args)...);
+        this, il, std::forward<Args>(args)...);
   }
 
   // variant::valueless_by_exception()
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/utility.h b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/utility.h
index f0c4db7f60d6..992763fd202b 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/utility.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/utility.h
@@ -51,11 +51,14 @@ Y_ABSL_NAMESPACE_BEGIN
 // abstractions for platforms that had not yet provided them. Those
 // platforms are no longer supported. New code should simply use the
 // the ones from std directly.
+using std::exchange;
+using std::forward;
 using std::index_sequence;
 using std::index_sequence_for;
 using std::integer_sequence;
 using std::make_index_sequence;
 using std::make_integer_sequence;
+using std::move;
 
 namespace utility_internal {
 
@@ -129,27 +132,6 @@ template <size_t I>
 void in_place_index(utility_internal::InPlaceIndexTag<I>) {}
 #endif  // Y_ABSL_USES_STD_VARIANT
 
-// Constexpr move and forward
-
-// move()
-//
-// A constexpr version of `std::move()`, designed to be a drop-in replacement
-// for C++14's `std::move()`.
-template <typename T>
-constexpr y_absl::remove_reference_t<T>&& move(T&& t) noexcept {
-  return static_cast<y_absl::remove_reference_t<T>&&>(t);
-}
-
-// forward()
-//
-// A constexpr version of `std::forward()`, designed to be a drop-in replacement
-// for C++14's `std::forward()`.
-template <typename T>
-constexpr T&& forward(
-    y_absl::remove_reference_t<T>& t) noexcept {  // NOLINT(runtime/references)
-  return static_cast<T&&>(t);
-}
-
 namespace utility_internal {
 // Helper method for expanding tuple into a called method.
 template <typename Functor, typename Tuple, std::size_t... Indexes>
@@ -215,26 +197,6 @@ auto apply(Functor&& functor, Tuple&& t)
           typename std::remove_reference<Tuple>::type>::value>{});
 }
 
-// exchange
-//
-// Replaces the value of `obj` with `new_value` and returns the old value of
-// `obj`.  `y_absl::exchange` is designed to be a drop-in replacement for C++14's
-// `std::exchange`.
-//
-// Example:
-//
-//   Foo& operator=(Foo&& other) {
-//     ptr1_ = y_absl::exchange(other.ptr1_, nullptr);
-//     int1_ = y_absl::exchange(other.int1_, -1);
-//     return *this;
-//   }
-template <typename T, typename U = T>
-T exchange(T& obj, U&& new_value) {
-  T old_value = y_absl::move(obj);
-  obj = y_absl::forward<U>(new_value);
-  return old_value;
-}
-
 namespace utility_internal {
 template <typename T, typename Tuple, size_t... I>
 T make_from_tuple_impl(Tuple&& tup, y_absl::index_sequence<I...>) {
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/ya.make b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/ya.make
index ac5695f0720e..467248d2799d 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/utility/ya.make
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/utility/ya.make
@@ -6,9 +6,9 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(20240116.2)
+VERSION(20240722.0)
 
-ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz)
 
 NO_RUNTIME()
 

From db9505d66cb73d62c7beaff1980941cfb1aec0ea Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Tue, 6 Aug 2024 11:28:41 +0300
Subject: [PATCH 069/104] Define -D_DEBUG and -DNDEBUG disregarding target
 platform

I have found out that Windows build omits`Y_ASSERT` statements when compiled in `--build=relwithdebinfo`
The reason is simple: most people know about `ifndef NDEBUG`, yet nobody checks `ifdef _DEBUG` (codesearch queries over util [for NDEBUG](https://a.yandex-team.ru/search?search=NDEBUG%2C%255Eutil%2Cw%2Carcadia%2C%2C200) and [for _DEBUG](https://a.yandex-team.ru/search?search=_DEBUG%2C%255Eutil%2Cw%2Carcadia%2C%2C200)).

This PR makes these two values consistent with each other disregarding the target platform.

https://stackoverflow.com/questions/2290509/debug-vs-ndebug/2290616#2290616
https://learn.microsoft.com/en-us/visualstudio/debugger/enabling-debug-features-in-visual-cpp-d-debug
7bab996a4a9e0db5e11a92d804733f50200b745c
---
 build/conf/compilers/msvc_compiler.conf |  6 ++----
 build/ymake.core.conf                   | 21 +++++++++++++++++++++
 build/ymake_conf.py                     | 12 ------------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf
index 9550b9effb54..c6cf77de2f0a 100644
--- a/build/conf/compilers/msvc_compiler.conf
+++ b/build/conf/compilers/msvc_compiler.conf
@@ -28,10 +28,8 @@ when ($IDE_MSVS == "yes") {
     DEBUG_INFO_FLAGS=/Zi /FS
 }
 
-# For the flags regarding runtime library selection, see
-# https://msdn.microsoft.com/en-us/library/abx4dbyh.aspx
-CFLAGS_DEBUG   = /Od /Ob0 /Oi /D_DEBUG /MTd
-CFLAGS_RELEASE = /O2 /Ob2 /Oi /DNDEBUG /MT
+CFLAGS_DEBUG   = /Od /Ob0 /Oi
+CFLAGS_RELEASE = /O2 /Ob2 /Oi
 
 MASMFLAGS=
 _MASM_IO=/nologo /c /Fo${output;suf=${OBJECT_SUF}:SRC} ${input:SRC}
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 8b864929bfe2..469b5ac0cd45 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -4842,6 +4842,27 @@ when ($CLANG && $DEBUGINFO_LINES_ONLY == "yes" && $NO_DEBUGINFO != "yes") {
     DEBUG_INFO_FLAGS=-gline-tables-only
 }
 
+# NB: Assertions under sanitizers are disabled as they cause
+#     a couple _relocation out of range_ problems plus an
+#     ICE when building contrib/libs/hyperscan/runtime_avx512.
+when ($BUILD_TYPE == "release" || $BUILD_TYPE == "minsizerel" || $BUILD_TYPE == "valgrind-release" || $BUILD_TYPE == "profile" || $BUILD_TYPE == "gprof" || $BUILD_TYPE == "debugnoasserts" || $SANITIZER_TYPE != "") {
+    CFLAGS += -DNDEBUG
+    when ($OS_WINDOWS) {
+        # FIXME: defining _DEBUG on Linux gives more relation problems and breaks certain tests
+        CFLAGS += -U_DEBUG
+        # For the flags regarding runtime library selection, see
+        # https://msdn.microsoft.com/en-us/library/abx4dbyh.aspx
+        CFLAGS += /MT
+    }
+}
+otherwise {
+    CFLAGS += -UNDEBUG
+    when ($OS_WINDOWS) {
+        CFLAGS += -D_DEBUG
+        CFLAGS += /MTd
+    }
+}
+
 # TODO: configurable tar and touch
 PACK_TGZ=${cwd:ARCADIA_BUILD_ROOT} tar -czf ${rootrel:OUTPUT} ${rootrel:INPUT} ${hide;kv:"p AR"} ${hide;kv:"pc light-red"}
 
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 1db5338b4287..bdb3c7e8d92c 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -609,9 +609,6 @@ def print_build(self):
         if self.is_size_optimized:
             emit('_BUILD_SIZE_OPTIMIZED', 'yes')
 
-        if self.with_ndebug:
-            emit('_BUILD_WITH_NDEBUG', 'yes')
-
         toolchain_type, compiler_type, linker_type = Compilers[self.tc.type]
         toolchain = toolchain_type(self.tc, self)
         compiler = compiler_type(self.tc, self)
@@ -663,10 +660,6 @@ def is_sanitized(self):
         sanitizer = preset('SANITIZER_TYPE')
         return bool(sanitizer) and not is_negative_str(sanitizer)
 
-    @property
-    def with_ndebug(self):
-        return self.build_type in ('release', 'minsizerel', 'valgrind-release', 'profile', 'gprof', 'debugnoasserts')
-
     @property
     def is_valgrind(self):
         return self.build_type == 'valgrind' or self.build_type == 'valgrind-release'
@@ -1598,11 +1591,6 @@ def configure_build_type(self):
             else:
                 self.optimize = '-O3'
 
-        if self.build.with_ndebug:
-            self.c_defines.append('-DNDEBUG')
-        else:
-            self.c_defines.append('-UNDEBUG')
-
         if self.build.profiler_type in (Profiler.Generic, Profiler.GProf):
             self.c_foptions.append('-fno-omit-frame-pointer')
 

From 03cdd2da9245de42a5bed37355d703f62486ec21 Mon Sep 17 00:00:00 2001
From: ignat <ignat@yandex-team.com>
Date: Tue, 6 Aug 2024 11:45:32 +0300
Subject: [PATCH 070/104] YT-22431: Move TProtoStringType under orc namespace
 03c4c55ccebe71a295336e40c980ee2d65da4d9f

---
 contrib/libs/apache/orc/c++/include/orc/Common.hh    |  4 ++--
 contrib/libs/apache/orc/c++/src/Reader.cc            |  8 ++++----
 contrib/libs/apache/orc/c++/src/Statistics.hh        | 10 +++++-----
 contrib/libs/apache/orc/c++/src/Writer.cc            | 12 ++++++------
 .../libs/apache/orc/c++/src/sargs/PredicateLeaf.cc   |  6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/contrib/libs/apache/orc/c++/include/orc/Common.hh b/contrib/libs/apache/orc/c++/include/orc/Common.hh
index b3db848b5240..e983280e46d9 100644
--- a/contrib/libs/apache/orc/c++/include/orc/Common.hh
+++ b/contrib/libs/apache/orc/c++/include/orc/Common.hh
@@ -27,10 +27,10 @@
 
 #include <string>
 
-using TProtoStringType = decltype(std::declval<::google::protobuf::MessageLite>().GetTypeName());
-
 namespace orc {
 
+  using TProtobufString = decltype(std::declval<::google::protobuf::MessageLite>().GetTypeName());
+
   class FileVersion {
    private:
     uint32_t majorVersion;
diff --git a/contrib/libs/apache/orc/c++/src/Reader.cc b/contrib/libs/apache/orc/c++/src/Reader.cc
index 0586918d80f7..8f96914b9473 100644
--- a/contrib/libs/apache/orc/c++/src/Reader.cc
+++ b/contrib/libs/apache/orc/c++/src/Reader.cc
@@ -565,7 +565,7 @@ namespace orc {
     mutableFooter->CopyFrom(*footer);
     tail.set_file_length(fileLength);
     tail.set_postscript_length(postscriptLength);
-    TProtoStringType result;
+    TProtobufString result;
     if (!tail.SerializeToString(&result)) {
       throw ParseError("Failed to serialize file tail");
     }
@@ -691,7 +691,7 @@ namespace orc {
 
   std::string ReaderImpl::getMetadataValue(const std::string& key) const {
     for (int i = 0; i < footer->metadata_size(); ++i) {
-      if (footer->metadata(i).name() == TProtoStringType(key)) {
+      if (footer->metadata(i).name() == TProtobufString(key)) {
         return footer->metadata(i).value();
       }
     }
@@ -741,7 +741,7 @@ namespace orc {
 
   bool ReaderImpl::hasMetadataValue(const std::string& key) const {
     for (int i = 0; i < footer->metadata_size(); ++i) {
-      if (footer->metadata(i).name() == TProtoStringType(key)) {
+      if (footer->metadata(i).name() == TProtobufString(key)) {
         return true;
       }
     }
@@ -1367,7 +1367,7 @@ namespace orc {
     if (serializedFooter.length() != 0) {
       // Parse the file tail from the serialized one.
       proto::FileTail tail;
-      if (!tail.ParseFromString(TProtoStringType(serializedFooter))) {
+      if (!tail.ParseFromString(TProtobufString(serializedFooter))) {
         throw ParseError("Failed to parse the file tail from string");
       }
       contents->postscript = std::make_unique<proto::PostScript>(tail.postscript());
diff --git a/contrib/libs/apache/orc/c++/src/Statistics.hh b/contrib/libs/apache/orc/c++/src/Statistics.hh
index eb14011c410b..94e19417c3ae 100644
--- a/contrib/libs/apache/orc/c++/src/Statistics.hh
+++ b/contrib/libs/apache/orc/c++/src/Statistics.hh
@@ -711,14 +711,14 @@ namespace orc {
 
       proto::DecimalStatistics* decStats = pbStats.mutable_decimal_statistics();
       if (_stats.hasMinimum()) {
-        decStats->set_minimum(TProtoStringType(_stats.getMinimum().toString(true)));
-        decStats->set_maximum(TProtoStringType(_stats.getMaximum().toString(true)));
+        decStats->set_minimum(TProtobufString(_stats.getMinimum().toString(true)));
+        decStats->set_maximum(TProtobufString(_stats.getMaximum().toString(true)));
       } else {
         decStats->clear_minimum();
         decStats->clear_maximum();
       }
       if (_stats.hasSum()) {
-        decStats->set_sum(TProtoStringType(_stats.getSum().toString(true)));
+        decStats->set_sum(TProtobufString(_stats.getSum().toString(true)));
       } else {
         decStats->clear_sum();
       }
@@ -1225,8 +1225,8 @@ namespace orc {
 
       proto::StringStatistics* strStats = pbStats.mutable_string_statistics();
       if (_stats.hasMinimum()) {
-        strStats->set_minimum(TProtoStringType(_stats.getMinimum()));
-        strStats->set_maximum(TProtoStringType(_stats.getMaximum()));
+        strStats->set_minimum(TProtobufString(_stats.getMinimum()));
+        strStats->set_maximum(TProtobufString(_stats.getMaximum()));
       } else {
         strStats->clear_minimum();
         strStats->clear_maximum();
diff --git a/contrib/libs/apache/orc/c++/src/Writer.cc b/contrib/libs/apache/orc/c++/src/Writer.cc
index ca96e709c9d6..8a8044f02914 100644
--- a/contrib/libs/apache/orc/c++/src/Writer.cc
+++ b/contrib/libs/apache/orc/c++/src/Writer.cc
@@ -429,8 +429,8 @@ namespace orc {
 
   void WriterImpl::addUserMetadata(const std::string& name, const std::string& value) {
     proto::UserMetadataItem* userMetadataItem = fileFooter.add_metadata();
-    userMetadataItem->set_name(TProtoStringType(name));
-    userMetadataItem->set_value(TProtoStringType(value));
+    userMetadataItem->set_name(TProtobufString(name));
+    userMetadataItem->set_value(TProtobufString(value));
   }
 
   void WriterImpl::init() {
@@ -510,7 +510,7 @@ namespace orc {
       *stripeFooter.add_columns() = encodings[i];
     }
 
-    stripeFooter.set_writer_timezone(TProtoStringType(options.getTimezoneName()));
+    stripeFooter.set_writer_timezone(TProtobufString(options.getTimezoneName()));
 
     // add stripe statistics to metadata
     proto::StripeStatistics* stripeStats = metadata.add_stripe_stats();
@@ -679,8 +679,8 @@ namespace orc {
     for (auto& key : t.getAttributeKeys()) {
       const auto& value = t.getAttributeValue(key);
       auto protoAttr = protoType.add_attributes();
-      protoAttr->set_key(TProtoStringType(key));
-      protoAttr->set_value(TProtoStringType(value));
+      protoAttr->set_key(TProtobufString(key));
+      protoAttr->set_value(TProtobufString(value));
     }
 
     int pos = static_cast<int>(index);
@@ -689,7 +689,7 @@ namespace orc {
     for (uint64_t i = 0; i < t.getSubtypeCount(); ++i) {
       // only add subtypes' field names if this type is STRUCT
       if (t.getKind() == STRUCT) {
-        footer.mutable_types(pos)->add_field_names(TProtoStringType(t.getFieldName(i)));
+        footer.mutable_types(pos)->add_field_names(TProtobufString(t.getFieldName(i)));
       }
       footer.mutable_types(pos)->add_subtypes(++index);
       buildFooterType(*t.getSubtype(i), footer, index);
diff --git a/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc b/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc
index 78b699f3f2e3..dda89f7c3b79 100644
--- a/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc
+++ b/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc
@@ -495,11 +495,11 @@ namespace orc {
     return result;
   }
 
-  static std::vector<TProtoStringType> literal2String(const std::vector<Literal>& values) {
-    std::vector<TProtoStringType> result;
+  static std::vector<TProtobufString> literal2String(const std::vector<Literal>& values) {
+    std::vector<TProtobufString> result;
     std::for_each(values.cbegin(), values.cend(), [&](const Literal& val) {
       if (!val.isNull()) {
-        result.emplace_back(TProtoStringType(val.getString()));
+        result.emplace_back(TProtobufString(val.getString()));
       }
     });
     return result;

From b992a648e70ca7771833e02562bbd1bcac60932f Mon Sep 17 00:00:00 2001
From: ignat <ignat@yandex-team.com>
Date: Tue, 6 Aug 2024 11:47:47 +0300
Subject: [PATCH 071/104] YT-22431: change protobuf method names to standard
 protobuf style c25caa4efe1b2675e1073e26adabad60a16e2e5c

---
 library/cpp/tdigest/tdigest.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/cpp/tdigest/tdigest.cpp b/library/cpp/tdigest/tdigest.cpp
index 2381db1b14e9..145cef78e104 100644
--- a/library/cpp/tdigest/tdigest.cpp
+++ b/library/cpp/tdigest/tdigest.cpp
@@ -24,11 +24,11 @@ TDigest::TDigest(TStringBuf serializedDigest)
 {
     NTDigest::TDigest digest;
     Y_ABORT_UNLESS(digest.ParseFromArray(serializedDigest.data(), serializedDigest.size()));
-    Delta = digest.GetDelta();
-    K = digest.GetK();
+    Delta = digest.delta();
+    K = digest.k();
     for (int i = 0; i < digest.centroids_size(); ++i) {
         const NTDigest::TDigest::TCentroid& centroid = digest.centroids(i);
-        Update(centroid.GetMean(), centroid.GetWeight());
+        Update(centroid.mean(), centroid.weight());
     }
 }
 
@@ -187,12 +187,12 @@ double TDigest::GetRank(double value) {
 TString TDigest::Serialize() {
     Compress();
     NTDigest::TDigest digest;
-    digest.SetDelta(Delta);
-    digest.SetK(K);
+    digest.set_delta(Delta);
+    digest.set_k(K);
     for (const auto& it : Centroids) {
-        NTDigest::TDigest::TCentroid* centroid = digest.AddCentroids();
-        centroid->SetMean(it.Mean);
-        centroid->SetWeight(it.Count);
+        NTDigest::TDigest::TCentroid* centroid = digest.add_centroids();
+        centroid->set_mean(it.Mean);
+        centroid->set_weight(it.Count);
     }
     return digest.SerializeAsString();
 }

From 21990649bfd4b251d7344073e80cbd36641b9299 Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Tue, 6 Aug 2024 12:08:30 +0300
Subject: [PATCH 072/104] Replace another bison patch with environment variable
 038ae732c509e3b2c4b4fc745092e090378ab5a2

---
 build/conf/bison_lex.conf       | 2 +-
 contrib/tools/bison/src/files.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/build/conf/bison_lex.conf b/build/conf/bison_lex.conf
index f8bee6b89abe..317d1b6851c9 100644
--- a/build/conf/bison_lex.conf
+++ b/build/conf/bison_lex.conf
@@ -135,7 +135,7 @@ macro USE_OLD_FLEX() {
 
 macro _SRC("y", SRC, SRCFLAGS...) {
     .PEERDIR=build/induced/by_bison
-    .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:"M4=${tool:M4_PATH}"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
+    .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:"M4=${tool:M4_PATH}"} ${env:"BISON_PKGDATADIR=${ARCADIA_ROOT}/${_BISON_DATA_DIR}"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
     .SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"' && target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && platform_vars-BISON_FLAGS ${quo:BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
 }
 
diff --git a/contrib/tools/bison/src/files.c b/contrib/tools/bison/src/files.c
index 8bc7a4da041f..d383a0ede04c 100644
--- a/contrib/tools/bison/src/files.c
+++ b/contrib/tools/bison/src/files.c
@@ -419,18 +419,9 @@ unlink_generated_sources (void)
 /* Memory allocated by relocate2, to free.  */
 static char *relocate_buffer = NULL;
 
-#include "uniqstr.h"
-#include <contrib/tools/bison/arcadia_root.h>
-#define STR(a) XSTR(a)
-#define XSTR(a) #a
 char const *
 pkgdatadir (void)
 {
-  const char* arc_path  = getenv("ARCADIA_ROOT_DISTBUILD");
-  if (arc_path == NULL)
-    arc_path = ArcadiaRoot();
-  return uniqstr_concat(3, arc_path, "/", STR(BISON_DATA_DIR));
-  
   if (relocate_buffer)
     return relocate_buffer;
   else

From dd6d591bc6f07723fafb39dd89c9800e8feaca19 Mon Sep 17 00:00:00 2001
From: dimdim11 <dimdim11@yandex-team.com>
Date: Tue, 6 Aug 2024 12:45:44 +0300
Subject: [PATCH 073/104] Save isolated projects hash, switch for
 include/exclude isolated projects to config hash

Save isolated projects hash, switch for include/exclude isolated projects to config hash
c4bc85d4d5d53ed5a81e16eb80b7b4356088030b
---
 build/conf/settings.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/conf/settings.conf b/build/conf/settings.conf
index a35a68a0cb0a..423e64923db5 100644
--- a/build/conf/settings.conf
+++ b/build/conf/settings.conf
@@ -14,6 +14,7 @@ FORCE_RESOLVE_MACRO_INCLS=yes
 ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
 REPORT_ALL_DUPSRC=yes
 DEPS_CACHE_CONTROL_UIDS_CACHE=yes
+INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes
 
 when ($YMAKE_USE_OLD_UIDS != "yes") {
     YMAKE_USE_NEW_UIDS=yes

From 047f6fe1e8ef644674f45640bc79d3589a40f461 Mon Sep 17 00:00:00 2001
From: coteeq <coteeq@yandex-team.com>
Date: Tue, 6 Aug 2024 14:50:42 +0300
Subject: [PATCH 074/104] YT-22262: Fix zero limit yet again
 f988887dd2aae3ab0e817c4ebc91166355b0f481

---
 yt/yt/core/concurrency/throughput_throttler.cpp  | 16 +++++++++++++---
 .../unittests/throughput_throttler_ut.cpp        | 13 +++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/yt/yt/core/concurrency/throughput_throttler.cpp b/yt/yt/core/concurrency/throughput_throttler.cpp
index 70a41ff07f37..15320a591569 100644
--- a/yt/yt/core/concurrency/throughput_throttler.cpp
+++ b/yt/yt/core/concurrency/throughput_throttler.cpp
@@ -106,11 +106,12 @@ class TReconfigurableThroughputThrottler
             return true;
         }
 
-        if (Limit_.load() >= 0) {
+        auto limit = Limit_.load();
+        if (limit >= 0) {
             while (true) {
                 TryUpdateAvailable();
                 auto available = Available_.load();
-                if (available < 0) {
+                if ((limit > 0 && available < 0) || (limit == 0 && available <= 0)) {
                     return false;
                 }
                 if (Available_.compare_exchange_weak(available, available - amount)) {
@@ -472,7 +473,16 @@ class TReconfigurableThroughputThrottler
         std::vector<TThrottlerRequestPtr> readyList;
 
         auto limit = Limit_.load();
-        while (!Requests_.empty() && (limit < 0 || Available_ >= 0)) {
+        auto canSpend = [&] {
+            auto available = Available_.load();
+            return
+                limit < 0 ||
+                // NB(coteeq): Do not spend tokens if limit is zero.
+                (limit == 0 && available > 0) ||
+                (limit > 0 && available >= 0);
+        };
+
+        while (!Requests_.empty() && canSpend()) {
             const auto& request = Requests_.front();
             if (!request->Set.test_and_set()) {
                 NTracing::TTraceContextGuard traceGuard(std::move(request->TraceContext));
diff --git a/yt/yt/core/concurrency/unittests/throughput_throttler_ut.cpp b/yt/yt/core/concurrency/unittests/throughput_throttler_ut.cpp
index 19a615833791..ada4b11c6ca2 100644
--- a/yt/yt/core/concurrency/unittests/throughput_throttler_ut.cpp
+++ b/yt/yt/core/concurrency/unittests/throughput_throttler_ut.cpp
@@ -35,6 +35,19 @@ TEST(TReconfigurableThroughputThrottlerTest, NoLimit)
     EXPECT_LE(timer.GetElapsedTime().MilliSeconds(), 100u);
 }
 
+TEST(TReconfigurableThroughputThrottlerTest, CannotBeAbusedViaReconfigure)
+{
+    auto throttler = CreateReconfigurableThroughputThrottler(
+        TThroughputThrottlerConfig::Create(0));
+
+    auto future1 = throttler->Throttle(1);
+    auto future2 = throttler->Throttle(1);
+    throttler->SetLimit(0);
+
+    EXPECT_FALSE(future1.IsSet());
+    EXPECT_FALSE(future2.IsSet());
+}
+
 TEST(TReconfigurableThroughputThrottlerTest, Limit)
 {
     auto throttler = CreateReconfigurableThroughputThrottler(

From 62f2557217f2b1f9e00011d5b328d7ac85fa1d9e Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Tue, 6 Aug 2024 16:00:14 +0300
Subject: [PATCH 075/104] Fix BUILD_TYPE spelling
 a057b08a1dd34d2365f2679e8202dc4f338a3b60

---
 build/ymake.core.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 469b5ac0cd45..535da24a330b 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -4845,7 +4845,7 @@ when ($CLANG && $DEBUGINFO_LINES_ONLY == "yes" && $NO_DEBUGINFO != "yes") {
 # NB: Assertions under sanitizers are disabled as they cause
 #     a couple _relocation out of range_ problems plus an
 #     ICE when building contrib/libs/hyperscan/runtime_avx512.
-when ($BUILD_TYPE == "release" || $BUILD_TYPE == "minsizerel" || $BUILD_TYPE == "valgrind-release" || $BUILD_TYPE == "profile" || $BUILD_TYPE == "gprof" || $BUILD_TYPE == "debugnoasserts" || $SANITIZER_TYPE != "") {
+when ($BUILD_TYPE == "RELEASE" || $BUILD_TYPE == "MINSIZEREL" || $BUILD_TYPE == "VALGRIND-RELEASE" || $BUILD_TYPE == "PROFILE" || $BUILD_TYPE == "GPROF" || $BUILD_TYPE == "DEBUGNOASSERTS" || $SANITIZER_TYPE != "") {
     CFLAGS += -DNDEBUG
     when ($OS_WINDOWS) {
         # FIXME: defining _DEBUG on Linux gives more relation problems and breaks certain tests

From 0322f8aa6f5794b8dca79988173ee93dd29c49f6 Mon Sep 17 00:00:00 2001
From: nadya73 <nadya73@yandex-team.com>
Date: Tue, 6 Aug 2024 16:10:12 +0300
Subject: [PATCH 076/104] [queues] YT-21996: Producer client with batching
 f005b79bfccc891d618b2f69e38fa2e322f352dc

---
 yt/yt/client/api/delegating_transaction.cpp   |  10 +
 yt/yt/client/api/delegating_transaction.h     |   9 +
 yt/yt/client/api/queue_transaction.h          |  15 ++
 .../client/api/rpc_proxy/transaction_impl.cpp |  39 +++-
 yt/yt/client/api/rpc_proxy/transaction_impl.h |   9 +
 yt/yt/client/federated/client.cpp             |  10 +
 yt/yt/client/queue_client/producer_client.cpp | 177 ++++++++++++++++++
 yt/yt/client/queue_client/producer_client.h   |  67 +++++++
 yt/yt/client/queue_client/public.h            |   3 +
 yt/yt/client/table_client/wire_protocol.cpp   |  24 ++-
 yt/yt/client/table_client/wire_protocol.h     |   4 +
 yt/yt/client/unittests/mock/transaction.h     |   9 +
 yt/yt/client/ya.make                          |   1 +
 yt/yt/core/test_framework/framework.cpp       |  13 +-
 yt/yt/core/test_framework/framework.h         |   5 +
 15 files changed, 380 insertions(+), 15 deletions(-)
 create mode 100644 yt/yt/client/queue_client/producer_client.cpp
 create mode 100644 yt/yt/client/queue_client/producer_client.h

diff --git a/yt/yt/client/api/delegating_transaction.cpp b/yt/yt/client/api/delegating_transaction.cpp
index 2b1cb55d3233..3e539bf9f73c 100644
--- a/yt/yt/client/api/delegating_transaction.cpp
+++ b/yt/yt/client/api/delegating_transaction.cpp
@@ -302,6 +302,16 @@ DELEGATE_METHOD(TFuture<TPushQueueProducerResult>, PushQueueProducer, (
     const TPushQueueProducerOptions& options),
     (producerPath, queuePath, sessionId, epoch, nameTable, rows, options))
 
+DELEGATE_METHOD(TFuture<TPushQueueProducerResult>, PushQueueProducer, (
+    const NYPath::TRichYPath& producerPath,
+    const NYPath::TRichYPath& queuePath,
+    const NQueueClient::TQueueProducerSessionId& sessionId,
+    NQueueClient::TQueueProducerEpoch epoch,
+    NTableClient::TNameTablePtr nameTable,
+    const std::vector<TSharedRef>& serializedRows,
+    const TPushQueueProducerOptions& options),
+    (producerPath, queuePath, sessionId, epoch, nameTable, serializedRows, options))
+
 #undef DELEGATE_METHOD
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/client/api/delegating_transaction.h b/yt/yt/client/api/delegating_transaction.h
index 37aeb46f4a70..533a0482040b 100644
--- a/yt/yt/client/api/delegating_transaction.h
+++ b/yt/yt/client/api/delegating_transaction.h
@@ -247,6 +247,15 @@ class TDelegatingTransaction
         TSharedRange<NTableClient::TUnversionedRow> rows,
         const TPushQueueProducerOptions& options) override;
 
+    TFuture<TPushQueueProducerResult> PushQueueProducer(
+        const NYPath::TRichYPath& producerPath,
+        const NYPath::TRichYPath& queuePath,
+        const NQueueClient::TQueueProducerSessionId& sessionId,
+        NQueueClient::TQueueProducerEpoch epoch,
+        NTableClient::TNameTablePtr nameTable,
+        const std::vector<TSharedRef>& serializedRows,
+        const TPushQueueProducerOptions& options) override;
+
 protected:
     const ITransactionPtr Underlying_;
 };
diff --git a/yt/yt/client/api/queue_transaction.h b/yt/yt/client/api/queue_transaction.h
index 4c4744561956..f01beae54198 100644
--- a/yt/yt/client/api/queue_transaction.h
+++ b/yt/yt/client/api/queue_transaction.h
@@ -87,6 +87,21 @@ struct IQueueTransaction
         NTableClient::TNameTablePtr nameTable,
         TSharedRange<NTableClient::TUnversionedRow> rows,
         const TPushQueueProducerOptions& options = {}) = 0;
+
+    //! Write rows in the queue with checking their sequence number.
+    /*!
+     * If row sequence number is less than sequence number saved in producer table, then this row will not be written.
+     * #sessionId - an identificator of write session, for example, `<host>-<filename>`.
+     * #epoch - a number of producer epoch. All calls with an epoch less than the current epoch will fail.
+     */
+    virtual TFuture<TPushQueueProducerResult> PushQueueProducer(
+        const NYPath::TRichYPath& producerPath,
+        const NYPath::TRichYPath& queuePath,
+        const NQueueClient::TQueueProducerSessionId& sessionId,
+        NQueueClient::TQueueProducerEpoch epoch,
+        NTableClient::TNameTablePtr nameTable,
+        const std::vector<TSharedRef>& serializedRows,
+        const TPushQueueProducerOptions& options = {}) = 0;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/client/api/rpc_proxy/transaction_impl.cpp b/yt/yt/client/api/rpc_proxy/transaction_impl.cpp
index a5ed64fa5ce4..6d32ba3995ba 100644
--- a/yt/yt/client/api/rpc_proxy/transaction_impl.cpp
+++ b/yt/yt/client/api/rpc_proxy/transaction_impl.cpp
@@ -4,11 +4,14 @@
 #include "config.h"
 #include "private.h"
 
-#include <yt/yt/client/transaction_client/helpers.h>
+#include <yt/yt/client/api/transaction.h>
+
+#include <yt/yt/client/table_client/name_table.h>
+#include <yt/yt/client/table_client/wire_protocol.h>
 
 #include <yt/yt/client/tablet_client/table_mount_cache.h>
 
-#include <yt/yt/client/api/transaction.h>
+#include <yt/yt/client/transaction_client/helpers.h>
 
 namespace NYT::NApi::NRpcProxy {
 
@@ -534,7 +537,7 @@ TFuture<TPushQueueProducerResult> TTransaction::PushQueueProducer(
     const TQueueProducerSessionId& sessionId,
     TQueueProducerEpoch epoch,
     NTableClient::TNameTablePtr nameTable,
-    TSharedRange<NTableClient::TUnversionedRow> rows,
+    const std::vector<TSharedRef>& serializedRows,
     const TPushQueueProducerOptions& options)
 {
     ValidateTabletTransactionId(GetId());
@@ -569,10 +572,16 @@ TFuture<TPushQueueProducerResult> TTransaction::PushQueueProducer(
         ToProto(req->mutable_user_meta(), ConvertToYsonString(options.UserMeta).ToString());
     }
 
-    req->Attachments() = SerializeRowset(
-        nameTable,
-        TRange(rows),
-        req->mutable_rowset_descriptor());
+    auto* descriptor = req->mutable_rowset_descriptor();
+    descriptor->Clear();
+    descriptor->set_wire_format_version(NApi::NRpcProxy::CurrentWireFormatVersion);
+    descriptor->set_rowset_kind(NProto::RK_UNVERSIONED);
+    for (int id = 0; id < nameTable->GetSize(); ++id) {
+        auto* entry = descriptor->add_name_table_entries();
+        entry->set_name(TString(nameTable->GetName(id)));
+    }
+
+    req->Attachments() = serializedRows;
 
     return req->Invoke().Apply(BIND([] (const TApiServiceProxy::TRspPushQueueProducerPtr& rsp) {
         return TPushQueueProducerResult{
@@ -582,6 +591,22 @@ TFuture<TPushQueueProducerResult> TTransaction::PushQueueProducer(
     }));
 }
 
+TFuture<TPushQueueProducerResult> TTransaction::PushQueueProducer(
+    const NYPath::TRichYPath& producerPath,
+    const NYPath::TRichYPath& queuePath,
+    const TQueueProducerSessionId& sessionId,
+    TQueueProducerEpoch epoch,
+    NTableClient::TNameTablePtr nameTable,
+    TSharedRange<NTableClient::TUnversionedRow> rows,
+    const TPushQueueProducerOptions& options)
+{
+    auto writer = CreateWireProtocolWriter();
+    writer->WriteUnversionedRowset(rows);
+    auto serializedRows = writer->Finish();
+
+    return PushQueueProducer(producerPath, queuePath, sessionId, epoch, nameTable, serializedRows, options);
+}
+
 TFuture<ITransactionPtr> TTransaction::StartTransaction(
     ETransactionType type,
     const TTransactionStartOptions& options)
diff --git a/yt/yt/client/api/rpc_proxy/transaction_impl.h b/yt/yt/client/api/rpc_proxy/transaction_impl.h
index 588469d7525b..636b8fe2e240 100644
--- a/yt/yt/client/api/rpc_proxy/transaction_impl.h
+++ b/yt/yt/client/api/rpc_proxy/transaction_impl.h
@@ -87,6 +87,15 @@ class TTransaction
         i64 newOffset,
         const TAdvanceQueueConsumerOptions& options) override;
 
+    TFuture<TPushQueueProducerResult> PushQueueProducer(
+        const NYPath::TRichYPath& producerPath,
+        const NYPath::TRichYPath& queuePath,
+        const NQueueClient::TQueueProducerSessionId& sessionId,
+        NQueueClient::TQueueProducerEpoch epoch,
+        NTableClient::TNameTablePtr nameTable,
+        const std::vector<TSharedRef>& serializedRows,
+        const TPushQueueProducerOptions& options) override;
+
     TFuture<TPushQueueProducerResult> PushQueueProducer(
         const NYPath::TRichYPath& producerPath,
         const NYPath::TRichYPath& queuePath,
diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp
index c5b200d409c1..3302fcd923db 100644
--- a/yt/yt/client/federated/client.cpp
+++ b/yt/yt/client/federated/client.cpp
@@ -102,6 +102,15 @@ class TTransaction
         TSharedRange<NTableClient::TUnversionedRow> rows,
         const TPushQueueProducerOptions& options) override;
 
+    TFuture<TPushQueueProducerResult> PushQueueProducer(
+        const NYPath::TRichYPath& producerPath,
+        const NYPath::TRichYPath& queuePath,
+        const TQueueProducerSessionId& sessionId,
+        TQueueProducerEpoch epoch,
+        NTableClient::TNameTablePtr nameTable,
+        const std::vector<TSharedRef>& serializedRows,
+        const TPushQueueProducerOptions& options) override;
+
     TFuture<TTransactionFlushResult> Flush() override;
 
     TFuture<void> Ping(const NApi::TTransactionPingOptions& options = {}) override;
@@ -527,6 +536,7 @@ TRANSACTION_METHOD_IMPL(std::vector<TUnversionedLookupRowsResult>, MultiLookupRo
 TRANSACTION_METHOD_IMPL(TPullRowsResult, PullRows, (const NYPath::TYPath&, const TPullRowsOptions&));
 TRANSACTION_METHOD_IMPL(void, AdvanceQueueConsumer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, int, std::optional<i64>, i64, const TAdvanceQueueConsumerOptions&));
 TRANSACTION_METHOD_IMPL(TPushQueueProducerResult, PushQueueProducer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, const TQueueProducerSessionId&, TQueueProducerEpoch, NTableClient::TNameTablePtr, TSharedRange<NTableClient::TUnversionedRow>, const TPushQueueProducerOptions&));
+TRANSACTION_METHOD_IMPL(TPushQueueProducerResult, PushQueueProducer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, const TQueueProducerSessionId&, TQueueProducerEpoch, NTableClient::TNameTablePtr, const std::vector<TSharedRef>&, const TPushQueueProducerOptions&));
 TRANSACTION_METHOD_IMPL(NYson::TYsonString, ExplainQuery, (const TString&, const TExplainQueryOptions&));
 TRANSACTION_METHOD_IMPL(NYson::TYsonString, GetNode, (const NYPath::TYPath&, const TGetNodeOptions&));
 TRANSACTION_METHOD_IMPL(NYson::TYsonString, ListNode, (const NYPath::TYPath&, const TListNodeOptions&));
diff --git a/yt/yt/client/queue_client/producer_client.cpp b/yt/yt/client/queue_client/producer_client.cpp
new file mode 100644
index 000000000000..2115805de060
--- /dev/null
+++ b/yt/yt/client/queue_client/producer_client.cpp
@@ -0,0 +1,177 @@
+#include "producer_client.h"
+
+#include <yt/yt/client/api/client.h>
+#include <yt/yt/client/api/transaction.h>
+
+#include <yt/yt/client/table_client/name_table.h>
+#include <yt/yt/client/table_client/wire_protocol.h>
+
+#include <yt/yt/client/ypath/rich.h>
+
+#include <yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.pb.h>
+
+namespace NYT::NQueueClient {
+
+using namespace NApi;
+using namespace NConcurrency;
+using namespace NCrypto;
+using namespace NTableClient;
+using namespace NThreading;
+using namespace NTransactionClient;
+using namespace NYPath;
+using namespace NYTree;
+
+////////////////////////////////////////////////////////////////////////////////
+
+class TProducerSession
+    : public IProducerSession
+{
+public:
+    TProducerSession(
+        IClientPtr client,
+        TRichYPath producerPath,
+        TRichYPath queuePath,
+        TNameTablePtr nameTable,
+        TQueueProducerSessionId sessionId,
+        TCreateQueueProducerSessionResult createSessionResult,
+        TProducerSessionOptions options)
+        : Client_(std::move(client))
+        , ProducerPath_(std::move(producerPath))
+        , QueuePath_(std::move(queuePath))
+        , NameTable_(std::move(nameTable))
+        , SessionId_(std::move(sessionId))
+        , Options_(std::move(options))
+        , Epoch_(createSessionResult.Epoch)
+        , LastSequenceNumber_(createSessionResult.SequenceNumber)
+        , UserMeta_(std::move(createSessionResult.UserMeta))
+        , BufferedRowWriter_(CreateWireProtocolWriter())
+    { }
+
+    // TODO(nadya73): add possibility to pass user meta.
+
+    TQueueProducerSequenceNumber GetLastSequenceNumber() const override
+    {
+        return LastSequenceNumber_;
+    }
+
+    const INodePtr& GetUserMeta() const override
+    {
+        return UserMeta_;
+    }
+
+    bool Write(TRange<TUnversionedRow> rows) override
+    {
+        for (const auto& row : rows) {
+            BufferedRowWriter_->WriteUnversionedRow(row);
+            ++BufferedRowCount_;
+        }
+        return BufferedRowWriter_->GetByteSize() < Options_.MaxBufferSize;
+    }
+
+    TFuture<void> GetReadyEvent() override
+    {
+        return TryToFlush();
+    }
+
+    TFuture<void> Close() override
+    {
+        return Flush();
+    }
+
+
+    std::optional<TMD5Hash> GetDigest() const override
+    {
+        return std::nullopt;
+    }
+
+private:
+    const IClientPtr Client_;
+    const TRichYPath ProducerPath_;
+    const TRichYPath QueuePath_;
+    const TNameTablePtr NameTable_;
+    const TQueueProducerSessionId SessionId_;
+    const TProducerSessionOptions Options_;
+
+    TQueueProducerEpoch Epoch_ = TQueueProducerEpoch{0};
+    TQueueProducerSequenceNumber LastSequenceNumber_ = TQueueProducerSequenceNumber{0};
+    INodePtr UserMeta_;
+
+    std::unique_ptr<IWireProtocolWriter> BufferedRowWriter_;
+    i64 BufferedRowCount_ = 0;
+
+    YT_DECLARE_SPIN_LOCK(TSpinLock, SpinLock_);
+
+    TFuture<void> TryToFlush()
+    {
+        if (BufferedRowWriter_->GetByteSize() >= Options_.MaxBufferSize) {
+            return Flush();
+        }
+        return VoidFuture;
+    }
+
+    TFuture<void> Flush()
+    {
+        auto guard = Guard(SpinLock_);
+
+        auto writer = CreateWireProtocolWriter();
+        writer->WriteSerializedRowset(BufferedRowCount_, BufferedRowWriter_->Finish());
+        BufferedRowWriter_ = CreateWireProtocolWriter();
+        BufferedRowCount_ = 0;
+
+        return Client_->StartTransaction(ETransactionType::Tablet)
+            .Apply(BIND([writer = std::move(writer), this, this_ = MakeStrong(this)] (const ITransactionPtr& transaction) {
+                TPushQueueProducerOptions pushQueueProducerOptions;
+                if (Options_.AutoSequenceNumber) {
+                    pushQueueProducerOptions.SequenceNumber = TQueueProducerSequenceNumber{LastSequenceNumber_.Underlying() + 1};
+                }
+
+                return transaction->PushQueueProducer(ProducerPath_, QueuePath_, SessionId_, Epoch_, NameTable_, writer->Finish(), pushQueueProducerOptions)
+                    .Apply(BIND([=, this, this_ = MakeStrong(this)] (const TPushQueueProducerResult& pushQueueProducerResult) {
+                        LastSequenceNumber_ = pushQueueProducerResult.LastSequenceNumber;
+                        return transaction->Commit();
+                    }));
+            })).AsVoid();
+    }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+class TProducerClient
+    : public IProducerClient
+{
+public:
+    TProducerClient(IClientPtr client, TRichYPath producerPath)
+        : Client_(std::move(client))
+        , ProducerPath_(std::move(producerPath))
+    { }
+
+    TFuture<IProducerSessionPtr> CreateSession(
+        const TRichYPath& queuePath,
+        const TNameTablePtr& nameTable,
+        const TQueueProducerSessionId& sessionId,
+        const TProducerSessionOptions& options) override
+    {
+        return Client_->CreateQueueProducerSession(ProducerPath_, queuePath, sessionId)
+            .Apply(BIND([=, this, this_ = MakeStrong(this)]
+                        (const TCreateQueueProducerSessionResult& createSessionResult) -> IProducerSessionPtr {
+                return New<TProducerSession>(Client_, ProducerPath_, queuePath, nameTable, sessionId, createSessionResult, options);
+            }));
+    }
+
+private:
+    const IClientPtr Client_;
+    const TRichYPath ProducerPath_;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+IProducerClientPtr CreateProducerClient(
+    const IClientPtr& client,
+    const TRichYPath& producerPath)
+{
+    return New<TProducerClient>(client, producerPath);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+} // namespace NYT::NQueueClient
diff --git a/yt/yt/client/queue_client/producer_client.h b/yt/yt/client/queue_client/producer_client.h
new file mode 100644
index 000000000000..4e1b46756a5a
--- /dev/null
+++ b/yt/yt/client/queue_client/producer_client.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "public.h"
+
+#include <yt/yt/client/api/public.h>
+
+#include <yt/yt/client/table_client/public.h>
+#include <yt/yt/client/table_client/unversioned_writer.h>
+
+#include <yt/yt/client/ypath/public.h>
+
+#include <yt/yt/core/actions/future.h>
+
+#include <yt/yt/core/ytree/yson_struct.h>
+
+namespace NYT::NQueueClient {
+
+////////////////////////////////////////////////////////////////////////////////
+
+struct TProducerSessionOptions
+{
+    //! If true, sequence numbers will be incremented automatically,
+    //! and rows should not contain values of $sequence_number column.
+    //! If false, each row should contain value of $sequnce_number column.
+    bool AutoSequenceNumber = false;
+
+    //! Size of buffer when rows will be flushed to server.
+    size_t MaxBufferSize = 1_MB;
+};
+
+struct IProducerSession
+    : public NTableClient::IUnversionedRowsetWriter
+{
+    //! Get sequence number of last pushed row.
+    //! For example, it can be gotten right after creating session
+    //! to understand what rows should be written now.
+    virtual TQueueProducerSequenceNumber GetLastSequenceNumber() const = 0;
+
+    //! Get user meta saved in the producer session.
+    virtual const NYTree::INodePtr& GetUserMeta() const = 0;
+};
+DEFINE_REFCOUNTED_TYPE(IProducerSession)
+
+////////////////////////////////////////////////////////////////////////////////
+
+struct IProducerClient
+    : public virtual TRefCounted
+{
+    //! Create a session (or increase its epoch) and return session writer.
+    //! NB: Session writer return by this method is NOT thread-safe.
+    virtual TFuture<IProducerSessionPtr> CreateSession(
+        const NYPath::TRichYPath& queuePath,
+        const NTableClient::TNameTablePtr& nameTable,
+        const NQueueClient::TQueueProducerSessionId& sessionId,
+        const TProducerSessionOptions& options = {}) = 0;
+};
+DEFINE_REFCOUNTED_TYPE(IProducerClient)
+
+////////////////////////////////////////////////////////////////////////////////
+
+IProducerClientPtr CreateProducerClient(
+    const NApi::IClientPtr& client,
+    const NYPath::TRichYPath& producerPath);
+
+////////////////////////////////////////////////////////////////////////////////
+
+} // namespace NYT::NQueueClient
diff --git a/yt/yt/client/queue_client/public.h b/yt/yt/client/queue_client/public.h
index 12f037814042..f9a0e2e13240 100644
--- a/yt/yt/client/queue_client/public.h
+++ b/yt/yt/client/queue_client/public.h
@@ -25,6 +25,9 @@ DECLARE_REFCOUNTED_STRUCT(IPersistentQueueRowset)
 DECLARE_REFCOUNTED_STRUCT(IConsumerClient)
 DECLARE_REFCOUNTED_STRUCT(ISubConsumerClient)
 
+DECLARE_REFCOUNTED_STRUCT(IProducerClient)
+DECLARE_REFCOUNTED_STRUCT(IProducerSession)
+
 DECLARE_REFCOUNTED_STRUCT(IPartitionReader)
 DECLARE_REFCOUNTED_CLASS(TPartitionReaderConfig)
 DECLARE_REFCOUNTED_CLASS(TQueueStaticExportDestinationConfig)
diff --git a/yt/yt/client/table_client/wire_protocol.cpp b/yt/yt/client/table_client/wire_protocol.cpp
index 6bb5446eca2c..32da27163ed5 100644
--- a/yt/yt/client/table_client/wire_protocol.cpp
+++ b/yt/yt/client/table_client/wire_protocol.cpp
@@ -87,7 +87,7 @@ class TWireProtocolWriter
 
     size_t GetByteSize() const override
     {
-        return Stream_.GetSize();
+        return Stream_.GetSize() + (Current_ - BeginPreallocated_);
     }
 
     void WriteCommand(EWireProtocolCommand command) override
@@ -206,17 +206,29 @@ class TWireProtocolWriter
         TRange<TUnversionedRow> rowset,
         const TNameTableToSchemaIdMapping* idMapping) override
     {
-        WriteRowCount(rowset);
+        WriteRowCount(rowset.Size());
         for (auto row : rowset) {
             WriteUnversionedRow(row, idMapping);
         }
     }
 
+    void WriteSerializedRowset(
+        size_t rowCount,
+        const std::vector<TSharedRef>& serializedRowset) override
+    {
+        WriteRowCount(rowCount);
+
+        for (const auto& item : serializedRowset) {
+            EnsureCapacity(item.Size());
+            UnsafeWriteRaw(item.Data(), item.Size());
+        }
+    }
+
     void WriteSchemafulRowset(
         TRange<TUnversionedRow> rowset,
         const TNameTableToSchemaIdMapping* idMapping) override
     {
-        WriteRowCount(rowset);
+        WriteRowCount(rowset.Size());
         for (auto row : rowset) {
             WriteSchemafulRow(row, idMapping);
         }
@@ -224,7 +236,7 @@ class TWireProtocolWriter
 
     void WriteVersionedRowset(TRange<TVersionedRow> rowset) override
     {
-        WriteRowCount(rowset);
+        WriteRowCount(rowset.Size());
         for (auto row : rowset) {
             WriteVersionedRow(row);
         }
@@ -326,10 +338,8 @@ class TWireProtocolWriter
         UnsafeWritePod(value);
     }
 
-    template <class TRow>
-    void WriteRowCount(TRange<TRow> rowset)
+    void WriteRowCount(size_t rowCount)
     {
-        size_t rowCount = rowset.Size();
         ValidateRowCount(rowCount);
         WriteUint64(rowCount);
     }
diff --git a/yt/yt/client/table_client/wire_protocol.h b/yt/yt/client/table_client/wire_protocol.h
index a38259b98658..b83888b1ab83 100644
--- a/yt/yt/client/table_client/wire_protocol.h
+++ b/yt/yt/client/table_client/wire_protocol.h
@@ -171,6 +171,10 @@ struct IWireProtocolWriter
         NTableClient::TUnversionedValueRange valueRange,
         const NTableClient::TNameTableToSchemaIdMapping* idMapping = nullptr) = 0;
 
+    virtual void WriteSerializedRowset(
+        size_t rowCount,
+        const std::vector<TSharedRef>& serializedRowset) = 0;
+
     virtual void WriteUnversionedRowset(
         TRange<NTableClient::TUnversionedRow> rowset,
         const NTableClient::TNameTableToSchemaIdMapping* idMapping = nullptr) = 0;
diff --git a/yt/yt/client/unittests/mock/transaction.h b/yt/yt/client/unittests/mock/transaction.h
index d158b665e61a..5d4ada47f9cc 100644
--- a/yt/yt/client/unittests/mock/transaction.h
+++ b/yt/yt/client/unittests/mock/transaction.h
@@ -222,6 +222,15 @@ class TMockTransaction
         NTableClient::TNameTablePtr nameTable,
         TSharedRange<NTableClient::TUnversionedRow> rows,
         const TPushQueueProducerOptions& options), (override));
+
+    MOCK_METHOD(TFuture<TPushQueueProducerResult>, PushQueueProducer, (
+        const NYPath::TRichYPath& producerPath,
+        const NYPath::TRichYPath& queuePath,
+        const NQueueClient::TQueueProducerSessionId& sessionId,
+        NQueueClient::TQueueProducerEpoch epoch,
+        NTableClient::TNameTablePtr nameTable,
+        const std::vector<TSharedRef>& serializedRows,
+        const TPushQueueProducerOptions& options), (override));
 };
 
 DEFINE_REFCOUNTED_TYPE(TMockTransaction)
diff --git a/yt/yt/client/ya.make b/yt/yt/client/ya.make
index 18869730255d..1d135c93661f 100644
--- a/yt/yt/client/ya.make
+++ b/yt/yt/client/ya.make
@@ -152,6 +152,7 @@ SRCS(
     queue_client/consumer_client.cpp
     queue_client/helpers.cpp
     queue_client/partition_reader.cpp
+    queue_client/producer_client.cpp
     queue_client/queue_rowset.cpp
 
     ypath/rich.cpp
diff --git a/yt/yt/core/test_framework/framework.cpp b/yt/yt/core/test_framework/framework.cpp
index 7ae48b9f689d..4c1c4ea563c2 100644
--- a/yt/yt/core/test_framework/framework.cpp
+++ b/yt/yt/core/test_framework/framework.cpp
@@ -59,7 +59,18 @@ void WaitForPredicate(
             }
         }
     }
-    THROW_ERROR_EXCEPTION("Wait failed");
+    THROW_ERROR_EXCEPTION("Wait failed: %s", options.Message);
+}
+
+void WaitForPredicate(
+    std::function<bool()> predicate,
+    const TString& message)
+{
+    WaitForPredicate(
+        std::move(predicate),
+        TWaitForPredicateOptions{
+            .Message = message,
+        });
 }
 
 void WaitForPredicate(
diff --git a/yt/yt/core/test_framework/framework.h b/yt/yt/core/test_framework/framework.h
index f7bc3e052887..4255a3eb445d 100644
--- a/yt/yt/core/test_framework/framework.h
+++ b/yt/yt/core/test_framework/framework.h
@@ -51,12 +51,17 @@ struct TWaitForPredicateOptions
     int IterationCount = 300;
     TDuration Period = TDuration::MilliSeconds(100);
     bool IgnoreExceptions = false;
+    TString Message = "<no-message>";
 };
 
 void WaitForPredicate(
     std::function<bool()> predicate,
     TWaitForPredicateOptions options);
 
+void WaitForPredicate(
+    std::function<bool()> predicate,
+    const TString& message);
+
 void WaitForPredicate(
     std::function<bool()> predicate,
     int iterationCount = 300,

From 4f495b080a6a0f72c77fa503b9f4a1b357969037 Mon Sep 17 00:00:00 2001
From: rekby <rekby@ydb.tech>
Date: Tue, 6 Aug 2024 16:45:38 +0300
Subject: [PATCH 077/104] Export python mergedeep library to in
 github.com/ydb-platform/ydb d57ca70b751f8907c3621fa2935e0a9fcdba7972

---
 contrib/python/mergedeep/.dist-info/METADATA  | 154 +++++++
 .../python/mergedeep/.dist-info/top_level.txt |   1 +
 .../mergedeep/.yandex_meta/yamaker.yaml       |   2 +
 contrib/python/mergedeep/LICENSE              |  21 +
 contrib/python/mergedeep/README.md            | 133 ++++++
 .../python/mergedeep/mergedeep/__init__.py    |   5 +
 .../python/mergedeep/mergedeep/mergedeep.py   | 100 +++++
 .../mergedeep/mergedeep/test_mergedeep.py     | 397 ++++++++++++++++++
 contrib/python/mergedeep/tests/ya.make        |  17 +
 contrib/python/mergedeep/ya.make              |  29 ++
 10 files changed, 859 insertions(+)
 create mode 100644 contrib/python/mergedeep/.dist-info/METADATA
 create mode 100644 contrib/python/mergedeep/.dist-info/top_level.txt
 create mode 100644 contrib/python/mergedeep/.yandex_meta/yamaker.yaml
 create mode 100644 contrib/python/mergedeep/LICENSE
 create mode 100644 contrib/python/mergedeep/README.md
 create mode 100644 contrib/python/mergedeep/mergedeep/__init__.py
 create mode 100644 contrib/python/mergedeep/mergedeep/mergedeep.py
 create mode 100644 contrib/python/mergedeep/mergedeep/test_mergedeep.py
 create mode 100644 contrib/python/mergedeep/tests/ya.make
 create mode 100644 contrib/python/mergedeep/ya.make

diff --git a/contrib/python/mergedeep/.dist-info/METADATA b/contrib/python/mergedeep/.dist-info/METADATA
new file mode 100644
index 000000000000..23452d786be0
--- /dev/null
+++ b/contrib/python/mergedeep/.dist-info/METADATA
@@ -0,0 +1,154 @@
+Metadata-Version: 2.1
+Name: mergedeep
+Version: 1.3.4
+Summary: A deep merge function for 🐍.
+Home-page: https://github.com/clarketm/mergedeep
+Author: Travis Clarke
+Author-email: travis.m.clarke@gmail.com
+License: UNKNOWN
+Platform: UNKNOWN
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+
+# [mergedeep](https://mergedeep.readthedocs.io/en/latest/)
+
+[![PyPi release](https://img.shields.io/pypi/v/mergedeep.svg)](https://pypi.org/project/mergedeep/)
+[![PyPi versions](https://img.shields.io/pypi/pyversions/mergedeep.svg)](https://pypi.org/project/mergedeep/)
+[![Downloads](https://pepy.tech/badge/mergedeep)](https://pepy.tech/project/mergedeep)
+[![Conda Version](https://img.shields.io/conda/vn/conda-forge/mergedeep.svg)](https://anaconda.org/conda-forge/mergedeep)
+[![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/mergedeep.svg)](https://anaconda.org/conda-forge/mergedeep)
+[![Documentation Status](https://readthedocs.org/projects/mergedeep/badge/?version=latest)](https://mergedeep.readthedocs.io/en/latest/?badge=latest)
+
+A deep merge function for 🐍.
+
+[Check out the mergedeep docs](https://mergedeep.readthedocs.io/en/latest/)
+
+## Installation
+
+```bash
+$ pip install mergedeep
+```
+
+## Usage
+
+```text
+merge(destination: MutableMapping, *sources: Mapping, strategy: Strategy = Strategy.REPLACE) -> MutableMapping
+```
+
+Deep merge without mutating the source dicts.
+
+```python3
+from mergedeep import merge
+
+a = {"keyA": 1}
+b = {"keyB": {"sub1": 10}}
+c = {"keyB": {"sub2": 20}}
+
+merged = merge({}, a, b, c) 
+
+print(merged)
+# {"keyA": 1, "keyB": {"sub1": 10, "sub2": 20}}
+```
+
+Deep merge into an existing dict.
+```python3
+from mergedeep import merge
+
+a = {"keyA": 1}
+b = {"keyB": {"sub1": 10}}
+c = {"keyB": {"sub2": 20}}
+
+merge(a, b, c) 
+
+print(a)
+# {"keyA": 1, "keyB": {"sub1": 10, "sub2": 20}}
+```
+
+### Merge strategies:
+
+1. Replace (*default*)
+
+> `Strategy.REPLACE`
+
+```python3
+# When `destination` and `source` keys are the same, replace the `destination` value with one from `source` (default).
+
+# Note: with multiple sources, the `last` (i.e. rightmost) source value will be what appears in the merged result. 
+
+from mergedeep import merge, Strategy
+
+dst = {"key": [1, 2]}
+src = {"key": [3, 4]}
+
+merge(dst, src, strategy=Strategy.REPLACE) 
+# same as: merge(dst, src)
+
+print(dst)
+# {"key": [3, 4]}
+```
+
+2. Additive
+
+> `Strategy.ADDITIVE`
+
+```python3
+# When `destination` and `source` values are both the same additive collection type, extend `destination` by adding values from `source`.
+# Additive collection types include: `list`, `tuple`, `set`, and `Counter`
+
+# Note: if the values are not additive collections of the same type, then fallback to a `REPLACE` merge.
+
+from mergedeep import merge, Strategy
+
+dst = {"key": [1, 2], "count": Counter({"a": 1, "b": 1})}
+src = {"key": [3, 4], "count": Counter({"a": 1, "c": 1})}
+
+merge(dst, src, strategy=Strategy.ADDITIVE) 
+
+print(dst)
+# {"key": [1, 2, 3, 4], "count": Counter({"a": 2, "b": 1, "c": 1})}
+```
+
+3. Typesafe replace
+
+> `Strategy.TYPESAFE_REPLACE` or `Strategy.TYPESAFE`
+
+```python3
+# When `destination` and `source` values are of different types, raise `TypeError`. Otherwise, perform a `REPLACE` merge.
+
+from mergedeep import merge, Strategy
+
+dst = {"key": [1, 2]}
+src = {"key": {3, 4}}
+
+merge(dst, src, strategy=Strategy.TYPESAFE_REPLACE) # same as: `Strategy.TYPESAFE`  
+# TypeError: destination type: <class 'list'> differs from source type: <class 'set'> for key: "key"
+```
+
+4. Typesafe additive
+
+> `Strategy.TYPESAFE_ADDITIVE`
+
+```python3
+# When `destination` and `source` values are of different types, raise `TypeError`. Otherwise, perform a `ADDITIVE` merge.
+
+from mergedeep import merge, Strategy
+
+dst = {"key": [1, 2]}
+src = {"key": {3, 4}}
+
+merge(dst, src, strategy=Strategy.TYPESAFE_ADDITIVE) 
+# TypeError: destination type: <class 'list'> differs from source type: <class 'set'> for key: "key"
+```
+
+## License
+
+MIT &copy; [**Travis Clarke**](https://blog.travismclarke.com/)
+
+
diff --git a/contrib/python/mergedeep/.dist-info/top_level.txt b/contrib/python/mergedeep/.dist-info/top_level.txt
new file mode 100644
index 000000000000..5413932b2681
--- /dev/null
+++ b/contrib/python/mergedeep/.dist-info/top_level.txt
@@ -0,0 +1 @@
+mergedeep
diff --git a/contrib/python/mergedeep/.yandex_meta/yamaker.yaml b/contrib/python/mergedeep/.yandex_meta/yamaker.yaml
new file mode 100644
index 000000000000..b88229ef483f
--- /dev/null
+++ b/contrib/python/mergedeep/.yandex_meta/yamaker.yaml
@@ -0,0 +1,2 @@
+mark_as_tests:
+  - mergedeep/test_mergedeep.py
diff --git a/contrib/python/mergedeep/LICENSE b/contrib/python/mergedeep/LICENSE
new file mode 100644
index 000000000000..45c644081627
--- /dev/null
+++ b/contrib/python/mergedeep/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2019 Travis Clarke <travis.m.clarke@gmail.com> (https://www.travismclarke.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/contrib/python/mergedeep/README.md b/contrib/python/mergedeep/README.md
new file mode 100644
index 000000000000..86322730cd98
--- /dev/null
+++ b/contrib/python/mergedeep/README.md
@@ -0,0 +1,133 @@
+# [mergedeep](https://mergedeep.readthedocs.io/en/latest/)
+
+[![PyPi release](https://img.shields.io/pypi/v/mergedeep.svg)](https://pypi.org/project/mergedeep/)
+[![PyPi versions](https://img.shields.io/pypi/pyversions/mergedeep.svg)](https://pypi.org/project/mergedeep/)
+[![Downloads](https://pepy.tech/badge/mergedeep)](https://pepy.tech/project/mergedeep)
+[![Conda Version](https://img.shields.io/conda/vn/conda-forge/mergedeep.svg)](https://anaconda.org/conda-forge/mergedeep)
+[![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/mergedeep.svg)](https://anaconda.org/conda-forge/mergedeep)
+[![Documentation Status](https://readthedocs.org/projects/mergedeep/badge/?version=latest)](https://mergedeep.readthedocs.io/en/latest/?badge=latest)
+
+A deep merge function for 🐍.
+
+[Check out the mergedeep docs](https://mergedeep.readthedocs.io/en/latest/)
+
+## Installation
+
+```bash
+$ pip install mergedeep
+```
+
+## Usage
+
+```text
+merge(destination: MutableMapping, *sources: Mapping, strategy: Strategy = Strategy.REPLACE) -> MutableMapping
+```
+
+Deep merge without mutating the source dicts.
+
+```python3
+from mergedeep import merge
+
+a = {"keyA": 1}
+b = {"keyB": {"sub1": 10}}
+c = {"keyB": {"sub2": 20}}
+
+merged = merge({}, a, b, c) 
+
+print(merged)
+# {"keyA": 1, "keyB": {"sub1": 10, "sub2": 20}}
+```
+
+Deep merge into an existing dict.
+```python3
+from mergedeep import merge
+
+a = {"keyA": 1}
+b = {"keyB": {"sub1": 10}}
+c = {"keyB": {"sub2": 20}}
+
+merge(a, b, c) 
+
+print(a)
+# {"keyA": 1, "keyB": {"sub1": 10, "sub2": 20}}
+```
+
+### Merge strategies:
+
+1. Replace (*default*)
+
+> `Strategy.REPLACE`
+
+```python3
+# When `destination` and `source` keys are the same, replace the `destination` value with one from `source` (default).
+
+# Note: with multiple sources, the `last` (i.e. rightmost) source value will be what appears in the merged result. 
+
+from mergedeep import merge, Strategy
+
+dst = {"key": [1, 2]}
+src = {"key": [3, 4]}
+
+merge(dst, src, strategy=Strategy.REPLACE) 
+# same as: merge(dst, src)
+
+print(dst)
+# {"key": [3, 4]}
+```
+
+2. Additive
+
+> `Strategy.ADDITIVE`
+
+```python3
+# When `destination` and `source` values are both the same additive collection type, extend `destination` by adding values from `source`.
+# Additive collection types include: `list`, `tuple`, `set`, and `Counter`
+
+# Note: if the values are not additive collections of the same type, then fallback to a `REPLACE` merge.
+
+from mergedeep import merge, Strategy
+
+dst = {"key": [1, 2], "count": Counter({"a": 1, "b": 1})}
+src = {"key": [3, 4], "count": Counter({"a": 1, "c": 1})}
+
+merge(dst, src, strategy=Strategy.ADDITIVE) 
+
+print(dst)
+# {"key": [1, 2, 3, 4], "count": Counter({"a": 2, "b": 1, "c": 1})}
+```
+
+3. Typesafe replace
+
+> `Strategy.TYPESAFE_REPLACE` or `Strategy.TYPESAFE`
+
+```python3
+# When `destination` and `source` values are of different types, raise `TypeError`. Otherwise, perform a `REPLACE` merge.
+
+from mergedeep import merge, Strategy
+
+dst = {"key": [1, 2]}
+src = {"key": {3, 4}}
+
+merge(dst, src, strategy=Strategy.TYPESAFE_REPLACE) # same as: `Strategy.TYPESAFE`  
+# TypeError: destination type: <class 'list'> differs from source type: <class 'set'> for key: "key"
+```
+
+4. Typesafe additive
+
+> `Strategy.TYPESAFE_ADDITIVE`
+
+```python3
+# When `destination` and `source` values are of different types, raise `TypeError`. Otherwise, perform a `ADDITIVE` merge.
+
+from mergedeep import merge, Strategy
+
+dst = {"key": [1, 2]}
+src = {"key": {3, 4}}
+
+merge(dst, src, strategy=Strategy.TYPESAFE_ADDITIVE) 
+# TypeError: destination type: <class 'list'> differs from source type: <class 'set'> for key: "key"
+```
+
+## License
+
+MIT &copy; [**Travis Clarke**](https://blog.travismclarke.com/)
diff --git a/contrib/python/mergedeep/mergedeep/__init__.py b/contrib/python/mergedeep/mergedeep/__init__.py
new file mode 100644
index 000000000000..92d12f6c949f
--- /dev/null
+++ b/contrib/python/mergedeep/mergedeep/__init__.py
@@ -0,0 +1,5 @@
+__version__ = "1.3.4"
+
+from mergedeep.mergedeep import merge, Strategy
+
+__all__ = ["merge", "Strategy"]
diff --git a/contrib/python/mergedeep/mergedeep/mergedeep.py b/contrib/python/mergedeep/mergedeep/mergedeep.py
new file mode 100644
index 000000000000..6dda8e82f38a
--- /dev/null
+++ b/contrib/python/mergedeep/mergedeep/mergedeep.py
@@ -0,0 +1,100 @@
+from collections import Counter
+from collections.abc import Mapping
+from copy import deepcopy
+from enum import Enum
+from functools import reduce, partial
+from typing import MutableMapping
+
+
+class Strategy(Enum):
+    # Replace `destination` item with one from `source` (default).
+    REPLACE = 0
+    # Combine `list`, `tuple`, `set`, or `Counter` types into one collection.
+    ADDITIVE = 1
+    # Alias to: `TYPESAFE_REPLACE`
+    TYPESAFE = 2
+    # Raise `TypeError` when `destination` and `source` types differ. Otherwise, perform a `REPLACE` merge.
+    TYPESAFE_REPLACE = 3
+    # Raise `TypeError` when `destination` and `source` types differ. Otherwise, perform a `ADDITIVE` merge.
+    TYPESAFE_ADDITIVE = 4
+
+
+def _handle_merge_replace(destination, source, key):
+    if isinstance(destination[key], Counter) and isinstance(source[key], Counter):
+        # Merge both destination and source `Counter` as if they were a standard dict.
+        _deepmerge(destination[key], source[key])
+    else:
+        # If a key exists in both objects and the values are `different`, the value from the `source` object will be used.
+        destination[key] = deepcopy(source[key])
+
+
+def _handle_merge_additive(destination, source, key):
+    # Values are combined into one long collection.
+    if isinstance(destination[key], list) and isinstance(source[key], list):
+        # Extend destination if both destination and source are `list` type.
+        destination[key].extend(deepcopy(source[key]))
+    elif isinstance(destination[key], set) and isinstance(source[key], set):
+        # Update destination if both destination and source are `set` type.
+        destination[key].update(deepcopy(source[key]))
+    elif isinstance(destination[key], tuple) and isinstance(source[key], tuple):
+        # Update destination if both destination and source are `tuple` type.
+        destination[key] = destination[key] + deepcopy(source[key])
+    elif isinstance(destination[key], Counter) and isinstance(source[key], Counter):
+        # Update destination if both destination and source are `Counter` type.
+        destination[key].update(deepcopy(source[key]))
+    else:
+        _handle_merge[Strategy.REPLACE](destination, source, key)
+
+
+def _handle_merge_typesafe(destination, source, key, strategy):
+    # Raise a TypeError if the destination and source types differ.
+    if type(destination[key]) is not type(source[key]):
+        raise TypeError(
+            f'destination type: {type(destination[key])} differs from source type: {type(source[key])} for key: "{key}"'
+        )
+    else:
+        _handle_merge[strategy](destination, source, key)
+
+
+_handle_merge = {
+    Strategy.REPLACE: _handle_merge_replace,
+    Strategy.ADDITIVE: _handle_merge_additive,
+    Strategy.TYPESAFE: partial(_handle_merge_typesafe, strategy=Strategy.REPLACE),
+    Strategy.TYPESAFE_REPLACE: partial(_handle_merge_typesafe, strategy=Strategy.REPLACE),
+    Strategy.TYPESAFE_ADDITIVE: partial(_handle_merge_typesafe, strategy=Strategy.ADDITIVE),
+}
+
+
+def _is_recursive_merge(a, b):
+    both_mapping = isinstance(a, Mapping) and isinstance(b, Mapping)
+    both_counter = isinstance(a, Counter) and isinstance(b, Counter)
+    return both_mapping and not both_counter
+
+
+def _deepmerge(dst, src, strategy=Strategy.REPLACE):
+    for key in src:
+        if key in dst:
+            if _is_recursive_merge(dst[key], src[key]):
+                # If the key for both `dst` and `src` are both Mapping types (e.g. dict), then recurse.
+                _deepmerge(dst[key], src[key], strategy)
+            elif dst[key] is src[key]:
+                # If a key exists in both objects and the values are `same`, the value from the `dst` object will be used.
+                pass
+            else:
+                _handle_merge.get(strategy)(dst, src, key)
+        else:
+            # If the key exists only in `src`, the value from the `src` object will be used.
+            dst[key] = deepcopy(src[key])
+    return dst
+
+
+def merge(destination: MutableMapping, *sources: Mapping, strategy: Strategy = Strategy.REPLACE) -> MutableMapping:
+    """
+    A deep merge function for 🐍.
+
+    :param destination: The destination mapping.
+    :param sources: The source mappings.
+    :param strategy: The merge strategy.
+    :return:
+    """
+    return reduce(partial(_deepmerge, strategy=strategy), sources, destination)
diff --git a/contrib/python/mergedeep/mergedeep/test_mergedeep.py b/contrib/python/mergedeep/mergedeep/test_mergedeep.py
new file mode 100644
index 000000000000..ef3972883502
--- /dev/null
+++ b/contrib/python/mergedeep/mergedeep/test_mergedeep.py
@@ -0,0 +1,397 @@
+"""mergedeep test module"""
+import inspect
+import unittest
+from collections import Counter
+from copy import deepcopy
+
+from mergedeep import merge, Strategy
+
+
+class test_mergedeep(unittest.TestCase):
+    """mergedeep function tests."""
+
+    ##############################################################################################################################
+    # REPLACE
+    ##############################################################################################################################
+
+    def test_should_merge_3_dicts_into_new_dict_using_replace_strategy_and_only_mutate_target(self,):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "e": {1: 2, "a": {"f": 2}},
+            "f": [4, 5, 6],
+            "g": (100, 200),
+            "h": Counter({"a": 5, "b": 1, "c": 1}),
+            "i": 2,
+            "j": Counter({"z": 2}),
+            "z": Counter({"a": 2}),
+        }
+
+        a = {
+            "a": {"b": {"c": 5}},
+            "d": 1,
+            "e": {2: 3},
+            "f": [1, 2, 3],
+            "g": (2, 4, 6),
+            "h": Counter({"a": 1, "b": 1}),
+            "j": 1,
+        }
+        a_copy = deepcopy(a)
+
+        b = {
+            "a": {"B": {"C": 10}},
+            "d": 2,
+            "e": 2,
+            "f": [4, 5, 6],
+            "g": (100, 200),
+            "h": Counter({"a": 5, "c": 1}),
+            "i": Counter({"a": 1}),
+            "z": Counter({"a": 2}),
+        }
+        b_copy = deepcopy(b)
+
+        c = {
+            "a": {"b": {"_c": 15}},
+            "d": 3,
+            "e": {1: 2, "a": {"f": 2}},
+            "i": 2,
+            "j": Counter({"z": 2}),
+            "z": Counter({"a": 2}),
+        }
+        c_copy = deepcopy(c)
+
+        actual = merge({}, a, b, c, strategy=Strategy.REPLACE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+    def test_should_merge_2_dicts_into_existing_dict_using_replace_strategy_and_only_mutate_target(self,):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "e": {1: 2, "a": {"f": 2}},
+            "f": [4, 5, 6],
+            "g": (100, 200),
+            "h": Counter({"a": 1, "b": 1, "c": 1}),
+            "i": 2,
+            "j": Counter({"z": 2}),
+        }
+
+        a = {
+            "a": {"b": {"c": 5}},
+            "d": 1,
+            "e": {2: 3},
+            "f": [1, 2, 3],
+            "g": (2, 4, 6),
+            "h": Counter({"a": 1, "b": 1}),
+            "j": 1,
+        }
+        a_copy = deepcopy(a)
+
+        b = {
+            "a": {"B": {"C": 10}},
+            "d": 2,
+            "e": 2,
+            "f": [4, 5, 6],
+            "g": (100, 200),
+            "h": Counter({"a": 1, "c": 1}),
+            "i": Counter({"a": 1}),
+        }
+        b_copy = deepcopy(b)
+
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "e": {1: 2, "a": {"f": 2}}, "i": 2, "j": Counter({"z": 2})}
+        c_copy = deepcopy(c)
+
+        actual = merge(a, b, c, strategy=Strategy.REPLACE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(actual, a)
+        self.assertNotEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+    def test_should_have_default_strategy_of_replace(self):
+        func_spec = inspect.getfullargspec(merge)
+        default_strategy = Strategy.REPLACE
+
+        self.assertEqual(func_spec.kwonlydefaults.get("strategy"), default_strategy)
+
+        # mock_merge.method.assert_called_with(target, source, strategy=Strategy.REPLACE)
+
+    ##############################################################################################################################
+    # ADDITIVE
+    ##############################################################################################################################
+
+    def test_should_merge_3_dicts_into_new_dict_using_additive_strategy_on_lists_and_only_mutate_target(self,):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "e": {1: 2, "a": {"f": 2}},
+            "f": [1, 2, 3, 4, 5, 6],
+        }
+
+        a = {"a": {"b": {"c": 5}}, "d": 1, "e": {2: 3}, "f": [1, 2, 3]}
+        a_copy = deepcopy(a)
+
+        b = {"a": {"B": {"C": 10}}, "d": 2, "e": 2, "f": [4, 5, 6]}
+        b_copy = deepcopy(b)
+
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "e": {1: 2, "a": {"f": 2}}}
+        c_copy = deepcopy(c)
+
+        actual = merge({}, a, b, c, strategy=Strategy.ADDITIVE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+    def test_should_merge_3_dicts_into_new_dict_using_additive_strategy_on_sets_and_only_mutate_target(self,):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "e": {1: 2, "a": {"f": 2}},
+            "f": {1, 2, 3, 4, 5, 6},
+        }
+
+        a = {"a": {"b": {"c": 5}}, "d": 1, "e": {2: 3}, "f": {1, 2, 3}}
+        a_copy = deepcopy(a)
+
+        b = {"a": {"B": {"C": 10}}, "d": 2, "e": 2, "f": {4, 5, 6}}
+        b_copy = deepcopy(b)
+
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "e": {1: 2, "a": {"f": 2}}}
+        c_copy = deepcopy(c)
+
+        actual = merge({}, a, b, c, strategy=Strategy.ADDITIVE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+    def test_should_merge_3_dicts_into_new_dict_using_additive_strategy_on_tuples_and_only_mutate_target(self,):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "e": {1: 2, "a": {"f": 2}},
+            "f": (1, 2, 3, 4, 5, 6),
+        }
+
+        a = {"a": {"b": {"c": 5}}, "d": 1, "e": {2: 3}, "f": (1, 2, 3)}
+        a_copy = deepcopy(a)
+
+        b = {"a": {"B": {"C": 10}}, "d": 2, "e": 2, "f": (4, 5, 6)}
+        b_copy = deepcopy(b)
+
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "e": {1: 2, "a": {"f": 2}}}
+        c_copy = deepcopy(c)
+
+        actual = merge({}, a, b, c, strategy=Strategy.ADDITIVE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+    def test_should_merge_3_dicts_into_new_dict_using_additive_strategy_on_counters_and_only_mutate_target(self,):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "e": {1: 2, "a": {"f": 2}},
+            "f": Counter({"a": 2, "c": 1, "b": 1}),
+            "i": 2,
+            "j": Counter({"z": 2}),
+            "z": Counter({"a": 4}),
+        }
+
+        a = {
+            "a": {"b": {"c": 5}},
+            "d": 1,
+            "e": {2: 3},
+            "f": Counter({"a": 1, "c": 1}),
+            "i": Counter({"f": 9}),
+            "j": Counter({"a": 1, "z": 4}),
+        }
+        a_copy = deepcopy(a)
+
+        b = {
+            "a": {"B": {"C": 10}},
+            "d": 2,
+            "e": 2,
+            "f": Counter({"a": 1, "b": 1}),
+            "j": [1, 2, 3],
+            "z": Counter({"a": 2}),
+        }
+        b_copy = deepcopy(b)
+
+        c = {
+            "a": {"b": {"_c": 15}},
+            "d": 3,
+            "e": {1: 2, "a": {"f": 2}},
+            "i": 2,
+            "j": Counter({"z": 2}),
+            "z": Counter({"a": 2}),
+        }
+        c_copy = deepcopy(c)
+
+        actual = merge({}, a, b, c, strategy=Strategy.ADDITIVE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+    def test_should_not_copy_references(self):
+        before = 1
+        after = 99
+
+        o1 = {"key1": before}
+        o2 = {"key2": before}
+
+        expected = {"list": deepcopy([o1, o2]), "tuple": deepcopy((o1, o2))}
+
+        a = {"list": [o1], "tuple": (o1,)}
+        b = {"list": [o2], "tuple": (o2,)}
+
+        actual = merge({}, a, b, strategy=Strategy.ADDITIVE)
+
+        o1["key1"] = after
+        o2["key2"] = after
+
+        self.assertEqual(actual, expected)
+
+        # Copied dicts should `not` mutate
+        self.assertEqual(actual["list"][0]["key1"], before)
+        self.assertEqual(actual["list"][1]["key2"], before)
+        self.assertEqual(actual["tuple"][0]["key1"], before)
+        self.assertEqual(actual["tuple"][1]["key2"], before)
+
+        # Non-copied dicts should mutate
+        self.assertEqual(a["list"][0]["key1"], after)
+        self.assertEqual(b["list"][0]["key2"], after)
+        self.assertEqual(a["tuple"][0]["key1"], after)
+        self.assertEqual(b["tuple"][0]["key2"], after)
+
+    ##############################################################################################################################
+    # TYPESAFE
+    # TYPESAFE_REPLACE
+    ##############################################################################################################################
+
+    def test_should_raise_TypeError_using_typesafe_strategy_if_types_differ(self):
+        a = {"a": {"b": {"c": 5}}, "d": 1, "e": {2: 3}, "f": [1, 2, 3]}
+        b = {"a": {"B": {"C": 10}}, "d": 2, "e": 2, "f": [4, 5, 6]}
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "e": {1: 2, "a": {"f": 2}}}
+
+        with self.assertRaises(TypeError):
+            merge({}, a, b, c, strategy=Strategy.TYPESAFE)
+
+    def test_should_raise_TypeError_using_typesafe_replace_strategy_if_types_differ(self,):
+        a = {"a": {"b": {"c": 5}}, "d": 1, "e": {2: 3}, "f": [1, 2, 3]}
+        b = {"a": {"B": {"C": 10}}, "d": 2, "e": 2, "f": [4, 5, 6]}
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "e": {1: 2, "a": {"f": 2}}}
+
+        with self.assertRaises(TypeError):
+            merge({}, a, b, c, strategy=Strategy.TYPESAFE_REPLACE)
+
+    def test_should_merge_3_dicts_into_new_dict_using_typesafe_strategy_and_only_mutate_target_if_types_are_compatible(
+        self,
+    ):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "f": [4, 5, 6],
+            "g": {2, 3, 4},
+            "h": (1, 3),
+            "z": Counter({"a": 1, "b": 1, "c": 1}),
+        }
+
+        a = {"a": {"b": {"c": 5}}, "d": 1, "f": [1, 2, 3], "g": {1, 2, 3}, "z": Counter({"a": 1, "b": 1})}
+        a_copy = deepcopy(a)
+
+        b = {"a": {"B": {"C": 10}}, "d": 2, "f": [4, 5, 6], "g": {2, 3, 4}, "h": (1,)}
+        b_copy = deepcopy(b)
+
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "h": (1, 3), "z": Counter({"a": 1, "c": 1})}
+        c_copy = deepcopy(c)
+
+        actual = merge({}, a, b, c, strategy=Strategy.TYPESAFE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+    def test_should_merge_3_dicts_into_new_dict_using_typesafe_replace_strategy_and_only_mutate_target_if_types_are_compatible(
+        self,
+    ):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "f": [4, 5, 6],
+            "g": {2, 3, 4},
+            "h": (1, 3),
+            "z": Counter({"a": 1, "b": 1, "c": 1}),
+        }
+
+        a = {"a": {"b": {"c": 5}}, "d": 1, "f": [1, 2, 3], "g": {1, 2, 3}, "z": Counter({"a": 1, "b": 1})}
+        a_copy = deepcopy(a)
+
+        b = {"a": {"B": {"C": 10}}, "d": 2, "f": [4, 5, 6], "g": {2, 3, 4}, "h": (1,)}
+        b_copy = deepcopy(b)
+
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "h": (1, 3), "z": Counter({"a": 1, "c": 1})}
+        c_copy = deepcopy(c)
+
+        actual = merge({}, a, b, c, strategy=Strategy.TYPESAFE_REPLACE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+    ##############################################################################################################################
+    # TYPESAFE_ADDITIVE
+    ##############################################################################################################################
+
+    def test_should_raise_TypeError_using_typesafe_additive_strategy_if_types_differ(self,):
+        a = {"a": {"b": {"c": 5}}, "d": 1, "e": {2: 3}, "f": [1, 2, 3]}
+        b = {"a": {"B": {"C": 10}}, "d": 2, "e": 2, "f": [4, 5, 6]}
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "e": {1: 2, "a": {"f": 2}}}
+
+        with self.assertRaises(TypeError):
+            merge({}, a, b, c, strategy=Strategy.TYPESAFE_ADDITIVE)
+
+    def test_should_merge_3_dicts_into_new_dict_using_typesafe_additive_strategy_and_only_mutate_target_if_types_are_compatible(
+        self,
+    ):
+        expected = {
+            "a": {"b": {"c": 5, "_c": 15}, "B": {"C": 10}},
+            "d": 3,
+            "f": [1, 2, 3, 4, 5, 6],
+            "g": {1, 2, 3, 4},
+            "h": (1, 1, 3),
+            "z": Counter({"a": 2, "b": 1, "c": 1}),
+        }
+
+        a = {"a": {"b": {"c": 5}}, "d": 1, "f": [1, 2, 3], "g": {1, 2, 3}, "z": Counter({"a": 1, "b": 1})}
+        a_copy = deepcopy(a)
+
+        b = {"a": {"B": {"C": 10}}, "d": 2, "f": [4, 5, 6], "g": {2, 3, 4}, "h": (1,)}
+        b_copy = deepcopy(b)
+
+        c = {"a": {"b": {"_c": 15}}, "d": 3, "h": (1, 3), "z": Counter({"a": 1, "c": 1})}
+        c_copy = deepcopy(c)
+
+        actual = merge({}, a, b, c, strategy=Strategy.TYPESAFE_ADDITIVE)
+
+        self.assertEqual(actual, expected)
+        self.assertEqual(a, a_copy)
+        self.assertEqual(b, b_copy)
+        self.assertEqual(c, c_copy)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/contrib/python/mergedeep/tests/ya.make b/contrib/python/mergedeep/tests/ya.make
new file mode 100644
index 000000000000..a0a227f788e1
--- /dev/null
+++ b/contrib/python/mergedeep/tests/ya.make
@@ -0,0 +1,17 @@
+PY3TEST()
+
+SUBSCRIBER(g:python-contrib)
+
+PEERDIR(
+    contrib/python/mergedeep
+)
+
+SRCDIR(contrib/python/mergedeep/mergedeep)
+
+TEST_SRCS(
+    test_mergedeep.py
+)
+
+NO_LINT()
+
+END()
diff --git a/contrib/python/mergedeep/ya.make b/contrib/python/mergedeep/ya.make
new file mode 100644
index 000000000000..ec7f03aaf4ad
--- /dev/null
+++ b/contrib/python/mergedeep/ya.make
@@ -0,0 +1,29 @@
+# Generated by devtools/yamaker (pypi).
+
+PY3_LIBRARY()
+
+SUBSCRIBER(g:python-contrib)
+
+VERSION(1.3.4)
+
+LICENSE(MIT)
+
+NO_LINT()
+
+PY_SRCS(
+    TOP_LEVEL
+    mergedeep/__init__.py
+    mergedeep/mergedeep.py
+)
+
+RESOURCE_FILES(
+    PREFIX contrib/python/mergedeep/
+    .dist-info/METADATA
+    .dist-info/top_level.txt
+)
+
+END()
+
+RECURSE_FOR_TESTS(
+    tests
+)

From 02ae2e7d31482b66d8965f0df459c2be5e96be69 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Tue, 6 Aug 2024 20:23:15 +0300
Subject: [PATCH 078/104] Intermediate changes

---
 yt/yt/library/column_converters/ya.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yt/yt/library/column_converters/ya.make b/yt/yt/library/column_converters/ya.make
index 55cd9f86c07a..3d141e591c6d 100644
--- a/yt/yt/library/column_converters/ya.make
+++ b/yt/yt/library/column_converters/ya.make
@@ -13,7 +13,7 @@ SRCS(
 )
 
 PEERDIR(
-    yt/yt/core
+    yt/yt/client
 )
 
 END()

From b42c0ae657e48443d35b4efe6d66127febe004d8 Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Tue, 6 Aug 2024 20:53:20 +0300
Subject: [PATCH 079/104] contrib/restricted/pjsip: patch less
 ed4b5ff678c163bb1b43ba4efd668c6719235a7e

---
 build/sysincl/darwin.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/build/sysincl/darwin.yml b/build/sysincl/darwin.yml
index 15b9092806e3..0aaac646e59a 100644
--- a/build/sysincl/darwin.yml
+++ b/build/sysincl/darwin.yml
@@ -181,21 +181,22 @@
   - AEObjects.h
   - AEPackObject.h
   - AERegistry.h
+  - AVFoundation/AVFoundation.h
   - Accelerate/Accelerate.h
-  - AppleEvents.h
   - AppKit/AppKit.h
   - AppKit/NSView.h
+  - AppleEvents.h
   - ApplicationServices/ApplicationServices.h
   - AudioToolbox/AudioToolbox.h
-  - AVFoundation/AVFoundation.h
-  - Carbon/Carbon.h
   - CFNetwork/CFNetwork.h
+  - Carbon/Carbon.h
   - Cocoa/Cocoa.h
   - CoreBluetooth/CoreBluetooth.h
   - CoreData/CoreData.h
   - CoreFoundation/CFArray.h
   - CoreFoundation/CFBase.h
   - CoreFoundation/CFBundle.h
+  - CoreFoundation/CFByteOrder.h
   - CoreFoundation/CFData.h
   - CoreFoundation/CFDictionary.h
   - CoreFoundation/CFLocale.h
@@ -219,12 +220,11 @@
   - Files.h
   - Foundation/Foundation.h
   - Foundation/NSException.h
-  - Foundation/NSString.h
   - Foundation/NSKeyValueObserving.h
   - Foundation/NSObject.h
-  - Gestalt.h
+  - Foundation/NSString.h
   - GLKit/GLKit.h
-  - ImageCompression.h
+  - Gestalt.h
   - IOKit/IOBSD.h
   - IOKit/IOCFPlugIn.h
   - IOKit/IOKitLib.h
@@ -244,9 +244,9 @@
   - IOKit/storage/IOBlockStorageDriver.h
   - IOKit/storage/IOMedia.h
   - IOSurface/IOSurfaceRef.h
+  - ImageCompression.h
   - Kernel/IOKit/hidsystem/IOHIDUsageTables.h
   - Metal/Metal.h
-  - metal_stdlib
   - Network/Network.h
   - OpenCL/cl.h
   - OpenCL/cl_gl.h
@@ -258,31 +258,32 @@
   - Palettes.h
   - PictUtils.h
   - Processes.h
-  - Speech/Speech.h
   - QDOffscreen.h
-  - QuartzCore/QuartzCore.h
   - QuartzCore/CAEAGLLayer.h
   - QuartzCore/CAMetalLayer.h
+  - QuartzCore/QuartzCore.h
   - QuickDraw.h
   - Security/SecCertificate.h
-  - Security/SecItem.h
   - Security/SecImportExport.h
+  - Security/SecItem.h
   - Security/SecKey.h
   - Security/SecRandom.h
   - Security/SecSignVerifyTransform.h
   - Security/SecureTransport.h
   - Security/Security.h
-  - SystemConfiguration/SystemConfiguration.h
+  - Speech/Speech.h
   - SystemConfiguration/SCDynamicStoreCopySpecific.h
   - SystemConfiguration/SCNetworkConfiguration.h
+  - SystemConfiguration/SystemConfiguration.h
   - TextUtils.h
   - Types.h
+  - UIKit/UIDevice.h
   - UIKit/UIImage.h
   - UIKit/UIKit.h
   - UIKit/UIScreen.h
-  - UIKit/UIWebView.h
   - UIKit/UIView.h
+  - UIKit/UIWebView.h
   - VideoDecodeAcceleration/VDADecoder.h
   - VideoToolbox/VideoToolbox.h
   - XCTest/XCTest.h
-  - CoreFoundation/CFByteOrder.h
+  - metal_stdlib

From 045f1ade465bf5af64ef1ceeeb94e23294c33437 Mon Sep 17 00:00:00 2001
From: pg <pg@yandex-team.com>
Date: Tue, 6 Aug 2024 22:59:44 +0300
Subject: [PATCH 080/104] b6ee53f9af602a963f352ed37c717dead1f8cef3

---
 build/conf/linkers/ld.conf    | 2 ++
 build/scripts/link_dyn_lib.py | 9 +++++++++
 build/ymake.core.conf         | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index 20dc87f5534a..0f4e38761993 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -227,6 +227,7 @@ REAL_LINK_EXE_TIDY=\
 
 REAL_LINK_EXEC_DYN_LIB_CMDLINE =\
     $YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"} \
+    ${hide;input:"build/scripts/link_exe.py"} \
     --target $TARGET
 REAL_LINK_EXEC_DYN_LIB_CMDLINE+=$_LD_LINKER_OUTPUT
 REAL_LINK_EXEC_DYN_LIB_CMDLINE+=\
@@ -253,6 +254,7 @@ LINK_DYN_LIB_FLAGS=
 
 REAL_LINK_DYN_LIB_CMDLINE =\
     $YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"} \
+    ${hide;input:"build/scripts/link_exe.py"} \
     --target $TARGET
 REAL_LINK_DYN_LIB_CMDLINE+=$_LD_LINKER_OUTPUT
 REAL_LINK_DYN_LIB_CMDLINE+=\
diff --git a/build/scripts/link_dyn_lib.py b/build/scripts/link_dyn_lib.py
index 3b7c0d3e51ce..72937544b638 100644
--- a/build/scripts/link_dyn_lib.py
+++ b/build/scripts/link_dyn_lib.py
@@ -7,6 +7,7 @@
 import pipes
 
 import thinlto_cache
+import link_exe
 
 from process_whole_archive_option import ProcessWholeArchiveOption
 from fix_py2_protobuf import fix_py2
@@ -215,6 +216,10 @@ def parse_args():
     parser.add_option('--linker-output')
     parser.add_option('--musl', action='store_true')
     parser.add_option('--dynamic-cuda', action='store_true')
+    parser.add_option('--cuda-architectures',
+                      help='List of supported CUDA architectures, separated by ":" (e.g. "sm_52:compute_70:lto_90a"')
+    parser.add_option('--nvprune-exe')
+    parser.add_option('--objcopy-exe')
     parser.add_option('--whole-archive-peers', action='append')
     parser.add_option('--whole-archive-libs', action='append')
     parser.add_option('--custom-step')
@@ -237,6 +242,10 @@ def parse_args():
         cmd = fix_cmd_for_musl(cmd)
     if opts.dynamic_cuda:
         cmd = fix_cmd_for_dynamic_cuda(cmd)
+    else:
+        cuda_manager = link_exe.CUDAManager(opts.cuda_architectures, opts.nvprune_exe)
+        cmd = link_exe.process_cuda_libraries_by_nvprune(cmd, cuda_manager, opts.build_root)
+        cmd = link_exe.process_cuda_libraries_by_objcopy(cmd, opts.build_root, opts.objcopy_exe)
 
     cmd = ProcessWholeArchiveOption(opts.arch, opts.whole_archive_peers, opts.whole_archive_libs).construct_cmd(cmd)
     thinlto_cache.preprocess(opts, cmd)
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 535da24a330b..9336ae809308 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1098,9 +1098,12 @@ module _LINK_UNIT: _BASE_UNIT {
 
     when ($USE_DYNAMIC_CUDA != "yes") {
         when ($CUDA_ARCHITECTURES) {
+            LINK_DYN_LIB_FLAGS+=--cuda-architectures $CUDA_ARCHITECTURES
             LINK_SCRIPT_EXE_FLAGS+=--cuda-architectures $CUDA_ARCHITECTURES
+            LINK_DYN_LIB_FLAGS+=--nvprune-exe $CUDA_ROOT/bin/nvprune
             LINK_SCRIPT_EXE_FLAGS+=--nvprune-exe $CUDA_ROOT/bin/nvprune
         }
+        LINK_DYN_LIB_FLAGS+=--objcopy-exe $OBJCOPY_TOOL
         LINK_SCRIPT_EXE_FLAGS+=--objcopy-exe $OBJCOPY_TOOL
     }
 

From 53824b7350c60052ccba408ced1643ad0b04ad69 Mon Sep 17 00:00:00 2001
From: shadchin <shadchin@yandex-team.com>
Date: Tue, 6 Aug 2024 23:50:05 +0300
Subject: [PATCH 081/104] Update flake8 binaries
 77852ab3af73d3886cdafe3a825fabf972399dad

---
 build/external_resources/flake8_py3/ya.make | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/external_resources/flake8_py3/ya.make b/build/external_resources/flake8_py3/ya.make
index be13e7104559..3b66251bae6e 100644
--- a/build/external_resources/flake8_py3/ya.make
+++ b/build/external_resources/flake8_py3/ya.make
@@ -12,12 +12,12 @@ ENDIF()
 
 DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
     FLAKE8_PY3
-    sbr:6760720256 FOR DARWIN-ARM64
-    sbr:6760720465 FOR DARWIN
+    sbr:6822862832 FOR DARWIN-ARM64
+    sbr:6822863322 FOR DARWIN
     sbr:6726869647 FOR LINUX-PPC64LE
-    sbr:6760721014 FOR LINUX
-    sbr:6760720046 FOR LINUX-AARCH64
-    sbr:6760720811 FOR WIN32
+    sbr:6822864509 FOR LINUX
+    sbr:6822862341 FOR LINUX-AARCH64
+    sbr:6822864007 FOR WIN32
 )
 
 END()

From 028ea52d7f2b0a374ac6492537e44576fc26713f Mon Sep 17 00:00:00 2001
From: lukyan <lukyan@yandex-team.com>
Date: Wed, 7 Aug 2024 00:06:52 +0300
Subject: [PATCH 082/104] YT-21484: Do not modify initial inferred ranges
 4d1fd9d9c09fa301dcfd1f1e7af394312c9dfa74

---
 yt/yt/client/table_client/unversioned_row.cpp | 23 +++++++++++--------
 yt/yt/client/table_client/unversioned_row.h   | 10 ++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/yt/yt/client/table_client/unversioned_row.cpp b/yt/yt/client/table_client/unversioned_row.cpp
index e3303daaf4a8..23878fea57c3 100644
--- a/yt/yt/client/table_client/unversioned_row.cpp
+++ b/yt/yt/client/table_client/unversioned_row.cpp
@@ -2083,18 +2083,23 @@ TUnversionedValueRange ToKeyRef(TUnversionedRow row, int prefixLength)
 
 ////////////////////////////////////////////////////////////////////////////////
 
+void FormatValue(TStringBuilderBase* builder, TUnversionedValueRange values, TStringBuf format)
+{
+    builder->AppendChar('[');
+    JoinToString(
+        builder,
+        values.Begin(),
+        values.End(),
+        [&] (TStringBuilderBase* builder, const TUnversionedValue& value) {
+            FormatValue(builder, value, format);
+        });
+    builder->AppendChar(']');
+}
+
 void FormatValue(TStringBuilderBase* builder, TUnversionedRow row, TStringBuf format)
 {
     if (row) {
-        builder->AppendChar('[');
-        JoinToString(
-            builder,
-            row.Begin(),
-            row.End(),
-            [&] (TStringBuilderBase* builder, const TUnversionedValue& value) {
-                FormatValue(builder, value, format);
-            });
-        builder->AppendChar(']');
+        FormatValue(builder, row.Elements(), format);
     } else {
         builder->AppendString("<null>");
     }
diff --git a/yt/yt/client/table_client/unversioned_row.h b/yt/yt/client/table_client/unversioned_row.h
index 02b242ce5213..3bbd4d6713d4 100644
--- a/yt/yt/client/table_client/unversioned_row.h
+++ b/yt/yt/client/table_client/unversioned_row.h
@@ -920,6 +920,7 @@ TKeyRef ToKeyRef(TUnversionedRow row, int prefixLength);
 
 ////////////////////////////////////////////////////////////////////////////////
 
+void FormatValue(TStringBuilderBase* builder, TUnversionedValueRange values, TStringBuf format);
 void FormatValue(TStringBuilderBase* builder, TUnversionedRow row, TStringBuf format);
 void FormatValue(TStringBuilderBase* builder, TMutableUnversionedRow row, TStringBuf format);
 void FormatValue(TStringBuilderBase* builder, const TUnversionedOwningRow& row, TStringBuf format);
@@ -1000,3 +1001,12 @@ struct NYT::TFormatArg<T>
     static constexpr auto FlagSpecifiers
         = TFormatArgBase::ExtendFlags</*Hot*/ true, 1, std::array{'k'}>();
 };
+
+template <class T>
+    requires std::derived_from<std::remove_cvref_t<T>, NYT::NTableClient::TUnversionedValueRange>
+struct NYT::TFormatArg<T>
+    : public NYT::TFormatArgBase
+{
+    static constexpr auto FlagSpecifiers
+        = TFormatArgBase::ExtendFlags</*Hot*/ true, 1, std::array{'k'}>();
+};

From cdaa807d2e96e0b0b8560eddf04d8f31a607c9ff Mon Sep 17 00:00:00 2001
From: swarmer <swarmer@yandex-team.com>
Date: Wed, 7 Aug 2024 00:19:10 +0300
Subject: [PATCH 083/104] check the lifetime bound of the yexception
 ef257805d160dd37ba7f8c65d1aad1f4040b223e

---
 util/generic/yexception.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/generic/yexception.h b/util/generic/yexception.h
index 526023f5420e..e6507e563f37 100644
--- a/util/generic/yexception.h
+++ b/util/generic/yexception.h
@@ -56,7 +56,7 @@ namespace NPrivateException {
             ZeroTerminate();
         }
 
-        TStringBuf AsStrBuf() const;
+        TStringBuf AsStrBuf() const Y_LIFETIME_BOUND;
 
     private:
         void ZeroTerminate() noexcept;
@@ -67,14 +67,14 @@ namespace NPrivateException {
 
     template <class E, class T>
     static inline std::enable_if_t<std::is_base_of<yexception, std::decay_t<E>>::value, E&&>
-    operator<<(E&& e, const T& t) {
+    operator<<(E&& e Y_LIFETIME_BOUND, const T& t) {
         e.Append(t);
 
         return std::forward<E>(e);
     }
 
     template <class T>
-    static inline T&& operator+(const TSourceLocation& sl, T&& t) {
+    static inline T&& operator+(const TSourceLocation& sl, T&& t Y_LIFETIME_BOUND) {
         return std::forward<T>(t << sl << TStringBuf(": "));
     }
 }

From a9c8987363503f0d434be8b1e7b494be65a2b477 Mon Sep 17 00:00:00 2001
From: swarmer <swarmer@yandex-team.com>
Date: Wed, 7 Aug 2024 00:19:42 +0300
Subject: [PATCH 084/104] check the lifetime of various algorithms  that return
 a substring of the input TStringBuf view
 e778480cb05d20fe1a3fbf5ff69858c8912ed2d6

---
 util/charset/utf8.cpp     | 2 +-
 util/charset/utf8.h       | 2 +-
 util/folder/pathsplit.cpp | 2 +-
 util/folder/pathsplit.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/util/charset/utf8.cpp b/util/charset/utf8.cpp
index efe3a52f6152..b1ccb00e2197 100644
--- a/util/charset/utf8.cpp
+++ b/util/charset/utf8.cpp
@@ -99,7 +99,7 @@ static const char* SkipUTF8Chars(const char* begin, const char* end, size_t numC
     return begin;
 }
 
-TStringBuf SubstrUTF8(const TStringBuf str, size_t pos, size_t len) {
+TStringBuf SubstrUTF8(const TStringBuf str Y_LIFETIME_BOUND, size_t pos, size_t len) {
     const char* start = SkipUTF8Chars(str.begin(), str.end(), pos);
     const char* end = SkipUTF8Chars(start, str.end(), len);
     return TStringBuf(start, end - start);
diff --git a/util/charset/utf8.h b/util/charset/utf8.h
index 76c1f94078a3..d0c45e9d06f8 100644
--- a/util/charset/utf8.h
+++ b/util/charset/utf8.h
@@ -388,7 +388,7 @@ inline void WriteUTF8Char(wchar32 rune, size_t& rune_len, unsigned char* s) {
     }
 }
 
-TStringBuf SubstrUTF8(const TStringBuf str, size_t pos, size_t len);
+TStringBuf SubstrUTF8(const TStringBuf str Y_LIFETIME_BOUND, size_t pos, size_t len);
 
 enum EUTF8Detect {
     NotUTF8,
diff --git a/util/folder/pathsplit.cpp b/util/folder/pathsplit.cpp
index 816f69602450..fd002b143a32 100644
--- a/util/folder/pathsplit.cpp
+++ b/util/folder/pathsplit.cpp
@@ -132,7 +132,7 @@ TString JoinPaths(const TPathSplit& p1, const TPathSplit& p2) {
     return TPathSplit(p1).AppendMany(p2.begin(), p2.end()).Reconstruct();
 }
 
-TStringBuf CutExtension(const TStringBuf fileName) {
+TStringBuf CutExtension(const TStringBuf fileName Y_LIFETIME_BOUND) {
     if (fileName.empty()) {
         return fileName;
     }
diff --git a/util/folder/pathsplit.h b/util/folder/pathsplit.h
index d134338e35d1..135457dbd06f 100644
--- a/util/folder/pathsplit.h
+++ b/util/folder/pathsplit.h
@@ -110,4 +110,4 @@ using TPathSplitWindows = TPathSplitBase<TPathSplitTraitsWindows>;
 
 TString JoinPaths(const TPathSplit& p1, const TPathSplit& p2);
 
-TStringBuf CutExtension(const TStringBuf fileName);
+TStringBuf CutExtension(const TStringBuf fileName Y_LIFETIME_BOUND);

From 1934894f381e2d6dff72600dfe60173c200f6067 Mon Sep 17 00:00:00 2001
From: swarmer <swarmer@yandex-team.com>
Date: Wed, 7 Aug 2024 00:19:47 +0300
Subject: [PATCH 085/104] check the lifetime bound of the ptr-store-policy
 143a81f1f8275b59d4a53b5978ec7777fc2e7b05

---
 util/generic/store_policy.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/generic/store_policy.h b/util/generic/store_policy.h
index 497b13f6c413..93608571af24 100644
--- a/util/generic/store_policy.h
+++ b/util/generic/store_policy.h
@@ -10,7 +10,7 @@ struct TWithRefCount: public TBase, public TRefCounted<TWithRefCount<TBase, TCou
 
 template <class T>
 struct TPtrPolicy {
-    inline TPtrPolicy(T* t)
+    inline TPtrPolicy(T* t Y_LIFETIME_BOUND)
         : T_(t)
     {
     }
@@ -93,7 +93,7 @@ template <class T, bool IsReference = std::is_reference<T>::value>
 struct TAutoEmbedOrPtrPolicy: TPtrPolicy<std::remove_reference_t<T>> {
     using TBase = TPtrPolicy<std::remove_reference_t<T>>;
 
-    TAutoEmbedOrPtrPolicy(T& reference)
+    TAutoEmbedOrPtrPolicy(T& reference Y_LIFETIME_BOUND)
         : TBase(&reference)
     {
     }

From 0d7c47ec48cc2d7664630b9cc19d2fddc03ec0e3 Mon Sep 17 00:00:00 2001
From: swarmer <swarmer@yandex-team.com>
Date: Wed, 7 Aug 2024 00:20:13 +0300
Subject: [PATCH 086/104] check the lifetime bound of the TStringBuf, 
 constructed from a TStringBuf with different char-traits
 8b52c36ebe25af42f8b0dae4d83fc067760600ba

---
 util/generic/strbuf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/generic/strbuf.h b/util/generic/strbuf.h
index fa11e39cf171..5c741f7d3b7a 100644
--- a/util/generic/strbuf.h
+++ b/util/generic/strbuf.h
@@ -137,13 +137,13 @@ class TBasicStringBuf: public std::basic_string_view<TCharType>,
     }
 
     template <typename TCharTraits>
-    constexpr TBasicStringBuf(std::basic_string_view<TCharType, TCharTraits> view) noexcept
+    constexpr TBasicStringBuf(std::basic_string_view<TCharType, TCharTraits> view Y_LIFETIME_BOUND) noexcept
         : TStringView(view)
     {
     }
 
     template <typename TCharTraits>
-    constexpr TBasicStringBuf(TBasicStringBuf<TCharType, TCharTraits> sb) noexcept
+    constexpr TBasicStringBuf(TBasicStringBuf<TCharType, TCharTraits> sb Y_LIFETIME_BOUND) noexcept
         : TStringView(sb)
     {
     }

From 0e66090a90e6a55094d0f535599682b4adc04046 Mon Sep 17 00:00:00 2001
From: swarmer <swarmer@yandex-team.com>
Date: Wed, 7 Aug 2024 00:20:28 +0300
Subject: [PATCH 087/104] check the lifetime bound of the TStringBuf, 
 constructed from a substring of an another TStringBuf view
 834bc8b5ef002eb217450def12b8887b071f3d5f

---
 util/generic/strbuf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/generic/strbuf.h b/util/generic/strbuf.h
index 5c741f7d3b7a..27237b1a32dd 100644
--- a/util/generic/strbuf.h
+++ b/util/generic/strbuf.h
@@ -159,13 +159,13 @@ class TBasicStringBuf: public std::basic_string_view<TCharType>,
          */
     }
 
-    inline TBasicStringBuf(const TBasicStringBuf& src, size_t pos, size_t n) noexcept
+    inline TBasicStringBuf(const TBasicStringBuf src Y_LIFETIME_BOUND, size_t pos, size_t n) noexcept
         : TBasicStringBuf(src)
     {
         Skip(pos).Trunc(n);
     }
 
-    inline TBasicStringBuf(const TBasicStringBuf& src, size_t pos) noexcept
+    inline TBasicStringBuf(const TBasicStringBuf src Y_LIFETIME_BOUND, size_t pos) noexcept
         : TBasicStringBuf(src, pos, TBase::npos)
     {
     }

From e9b0eaca4af5c9b51f48af4f8a24b5483b1e1fde Mon Sep 17 00:00:00 2001
From: snermolaev <snermolaev@yandex-team.com>
Date: Wed, 7 Aug 2024 07:41:10 +0300
Subject: [PATCH 088/104] collect .proto files by PROTO_DESCRIPTIONS
 479e79ff20f8b8551bc8a5505eb740dc61e7a854

---
 build/conf/proto.conf                  | 13 +++++----
 build/scripts/collect_rawproto.py      | 37 ++++++++++++++++++++++++
 build/scripts/desc_rawproto_wrapper.py | 34 ++++++++++++++++++++++
 build/scripts/merge_files.py           |  4 +--
 build/scripts/merge_protosrc.py        | 39 ++++++++++++++++++++++++++
 5 files changed, 119 insertions(+), 8 deletions(-)
 create mode 100644 build/scripts/collect_rawproto.py
 create mode 100644 build/scripts/desc_rawproto_wrapper.py
 create mode 100644 build/scripts/merge_protosrc.py

diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 89870fbe19b6..6bacb350e0a2 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -639,12 +639,12 @@ macro LIST_PROTO(TO="files.proto", Files...) {
 }
 
 # tag:proto
-macro _PROTO_DESC_CMD(File) {
-    .CMD=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --descriptor_set_out=${output;suf=.desc:File} --include_source_info $_PROTOC_FLAGS ${input;rootrel:File} ${hide:PROTO_FAKEID}
+macro _PROTO_DESC_RAWPROTO_CMD(File) {
+    .CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${output;norel;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${input;rootrel:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}
 }
 
-_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $AUTO_INPUT ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
-_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL}  ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
+_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET ${ext=.desc:AUTO_INPUT} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/collect_rawproto.py"} --output ${output;suf=.protosrc:REALPRJNAME} ${rootrel;ext=.rawproto:AUTO_INPUT}
+_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL}  ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/merge_protosrc.py"} --output ${output;suf=.tar:REALPRJNAME} ${rootrel:PEERS}
 
 NEED_GOOGLE_PROTO_PEERDIRS=yes
 
@@ -807,7 +807,7 @@ multimodule PROTO_LIBRARY {
     module DESC_PROTO: _BARE_UNIT {
         .CMD=_PROTO_DESC_MERGE_CMD
         .SEM=IGNORED
-        .EXTS=.desc
+        .EXTS=.desc .rawproto
         .NODE_TYPE=Library
         .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
         .ALIASES=SRCS=_SRCS_NO_GLOBAL
@@ -817,6 +817,7 @@ multimodule PROTO_LIBRARY {
         DISABLE(_NEED_SBOM_INFO)
         MODULE_SUFFIX=.self.protodesc
         SET(MODULE_TYPE LIBRARY)
+        SET(_MODDIR_HASH ${hash:MODDIR})
 
         _EVLOG_CMDLINE=$_PROTO_DESC_CMDLINE
         _PROTO_CMDLINE=$_PROTO_DESC_CMDLINE
@@ -870,6 +871,6 @@ _CPP_PROTO_EVLOG_CMDLINE=$_CPP_PROTO_EVLOG_CMD($SRC)
 _CPP_VANILLA_PROTO_CMDLINE=$_CPP_VANILLA_PROTO_CMD($SRC)
 _JAVA_EVLOG_CMDLINE=$_JAVA_EVLOG_CMD($SRC)
 _JAVA_PROTO_CMDLINE=$_JAVA_PROTO_CMD($SRC)
-_PROTO_DESC_CMDLINE=$_PROTO_DESC_CMD($SRC)
+_PROTO_DESC_CMDLINE=$_PROTO_DESC_RAWPROTO_CMD($SRC)
 _PY_EVLOG_CMDLINE=$_PY_EVLOG_CMD($SRC)
 _PY_PROTO_CMDLINE=$_PY_PROTO_CMD($SRC)
diff --git a/build/scripts/collect_rawproto.py b/build/scripts/collect_rawproto.py
new file mode 100644
index 000000000000..92086b4f7734
--- /dev/null
+++ b/build/scripts/collect_rawproto.py
@@ -0,0 +1,37 @@
+import argparse
+import os
+import tarfile
+import stat
+import sys
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--output', required=True)
+    parser.add_argument('args', nargs='*')
+    return parser.parse_args()
+
+
+def main(args):
+    rawprotos = args.args
+    with tarfile.open(args.output, 'w') as fout:
+        for rawproto in sorted(os.path.normpath(r).replace('\\', '/') for r in rawprotos):
+            assert rawproto.endswith('.rawproto')
+            arcname = os.path.splitext(rawproto[:-len('.rawproto')])[0]
+            with open(rawproto, 'rb') as fin:
+                tarinfo = fout.gettarinfo(rawproto, arcname)
+                tarinfo.mode = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH if tarinfo.mode | stat.S_IXUSR else 0
+                tarinfo.mode = (
+                    tarinfo.mode | stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP | stat.S_IROTH
+                )
+                tarinfo.mtime = 0
+                tarinfo.uid = 0
+                tarinfo.gid = 0
+                tarinfo.uname = 'dummy'
+                tarinfo.gname = 'dummy'
+                fout.addfile(tarinfo, fin)
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(parse_args()))
diff --git a/build/scripts/desc_rawproto_wrapper.py b/build/scripts/desc_rawproto_wrapper.py
new file mode 100644
index 000000000000..2c7eb56bb262
--- /dev/null
+++ b/build/scripts/desc_rawproto_wrapper.py
@@ -0,0 +1,34 @@
+import argparse
+import shutil
+import subprocess
+import sys
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--desc-output', required=True)
+    parser.add_argument('--rawproto-output', required=True)
+    parser.add_argument('--proto-file', required=True)
+    parser.add_argument('args', nargs='+')
+
+    return parser.parse_args()
+
+
+def main(args):
+    cmd = list(args.args)
+    cmd.append(f'--descriptor_set_out={args.desc_output}')
+    cmd.append(args.proto_file)
+
+    try:
+        subprocess.check_output(cmd, stdin=None, stderr=subprocess.STDOUT, text=True)
+    except subprocess.CalledProcessError as e:
+        sys.stderr.write(f'{e.cmd} returned non-zero exit code {e.returncode}.\n{e.output}\n')
+        return e.returncode
+
+    shutil.copyfile(args.proto_file, args.rawproto_output)
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(parse_args()))
diff --git a/build/scripts/merge_files.py b/build/scripts/merge_files.py
index d42d6a21392f..7d52a56f0f0b 100644
--- a/build/scripts/merge_files.py
+++ b/build/scripts/merge_files.py
@@ -2,7 +2,7 @@
 
 
 if __name__ == "__main__":
-    with open(sys.argv[1], "w") as f:
+    with open(sys.argv[1], "wb") as f:
         for appended in sys.argv[2:]:
-            with open(appended) as a:
+            with open(appended, "rb") as a:
                 f.write(a.read())
diff --git a/build/scripts/merge_protosrc.py b/build/scripts/merge_protosrc.py
new file mode 100644
index 000000000000..55e44c9063a4
--- /dev/null
+++ b/build/scripts/merge_protosrc.py
@@ -0,0 +1,39 @@
+import argparse
+import os
+import tarfile
+import sys
+
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--output', required=True)
+    parser.add_argument('args', nargs='+')
+    return parser.parse_args()
+
+
+def main(args):
+    peers = args.args
+
+    compression_mode = ''
+    if args.output.endswith(('.tar.gz', '.tgz')):
+        compression_mode = 'gz'
+    elif args.output.endswith('.bzip2'):
+        compression_mode = 'bz2'
+
+    files = set()
+    with tarfile.open(args.output, f'w:{compression_mode}') as dest:
+        for psrc in [p[:-len('.self.protodesc')]+'.protosrc' for p in peers if p.endswith('.self.protodesc')]:
+            with tarfile.open(psrc, 'r') as src:
+                for tarinfo in [m for m in src.getmembers() if m.name != '']:
+                    if tarinfo.name in files:
+                        continue
+                    files.add(tarinfo.name)
+                    if tarinfo.isdir():
+                        dest.addfile(tarinfo)
+                    else:
+                        dest.addfile(tarinfo, src.extractfile(tarinfo))
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main(parse_args()))

From 86696a40333309ebaa5205608466d1e4def42878 Mon Sep 17 00:00:00 2001
From: snermolaev <snermolaev@yandex-team.com>
Date: Wed, 7 Aug 2024 08:12:19 +0300
Subject: [PATCH 089/104] fix go_package_name
 2a65a73857642ee364242333b3ebdbc907043d19

---
 build/conf/go.conf       | 4 ++--
 build/plugins/gobuild.py | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/conf/go.conf b/build/conf/go.conf
index 93f1a65ac401..c75e3ec324ea 100644
--- a/build/conf/go.conf
+++ b/build/conf/go.conf
@@ -270,11 +270,11 @@ elsewhen ($CGO_ENABLED == "yes") {
 }
 
 # tag:go-specific
-GO_PACKAGE_VALUE=
+_GO_PACKAGE_VALUE=
 ### @usage: GO_PACKAGE_NAME(Name)
 ### Override name of a Go package.
 macro GO_PACKAGE_NAME(NAME) {
-    SET(GO_PACKAGE_VALUE $NAME)
+    SET(_GO_PACKAGE_VALUE $NAME)
 }
 
 # tag:go-specific tag:internal
diff --git a/build/plugins/gobuild.py b/build/plugins/gobuild.py
index 04603c2eb5fa..f5bb3ceaecf8 100644
--- a/build/plugins/gobuild.py
+++ b/build/plugins/gobuild.py
@@ -72,7 +72,9 @@ def last_index(version):
 
 
 def go_package_name(unit):
-    name = unit.get('GO_PACKAGE_VALUE')
+    name = unit.get('_GO_PACKAGE_VALUE')
+    if not name and unit.enabled('GO_TEST_MODULE'):
+        name = unit.get('GO_PACKAGE_VALUE')
     if not name:
         name = unit.get('GO_TEST_IMPORT_PATH')
         if name:

From 3c3fcfc0adbeeb1f013a18c1635644f2d551328a Mon Sep 17 00:00:00 2001
From: mikhnenko <mikhnenko@yandex-team.com>
Date: Wed, 7 Aug 2024 08:14:56 +0300
Subject: [PATCH 090/104] Turn on unused variables warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Если после это `pr` ломается сборка попробуйте способы решения:
* Починить unused-variable в коде
* Собрать с флагом `-DCFLAGS="-Wno-unused-parameter"`

Если не помогает - приходите в [DEVTOOLSSUPPORT](https://st.yandex-team.ru/createTicket?queue=DEVTOOLSSUPPORT&_form=6668786540e3616bc95905d3)
d45d3e8ee75f0694d7dc7ba4b68aff5b4d91abf7
---
 contrib/libs/protobuf/src/google/protobuf/port_def.inc   | 2 --
 contrib/libs/protobuf/src/google/protobuf/port_undef.inc | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/contrib/libs/protobuf/src/google/protobuf/port_def.inc b/contrib/libs/protobuf/src/google/protobuf/port_def.inc
index c9ddec03cbdc..b4d7fbe27875 100644
--- a/contrib/libs/protobuf/src/google/protobuf/port_def.inc
+++ b/contrib/libs/protobuf/src/google/protobuf/port_def.inc
@@ -867,9 +867,7 @@
 #endif // defined(__clang__) || PROTOBUF_GNUC_MIN(3, 0) || defined(_MSC_VER)
 
 #if defined(__clang__)
-#if defined(FIX_UNUSED_PARAMETR_PLS)
 #pragma clang diagnostic push
-#endif
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
 #endif // defined(__clang__)
diff --git a/contrib/libs/protobuf/src/google/protobuf/port_undef.inc b/contrib/libs/protobuf/src/google/protobuf/port_undef.inc
index fb22215ee8e0..042a75a7d3b1 100644
--- a/contrib/libs/protobuf/src/google/protobuf/port_undef.inc
+++ b/contrib/libs/protobuf/src/google/protobuf/port_undef.inc
@@ -154,7 +154,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#if defined(__clang__) && defined(FIX_UNUSED_PARAMETR_PLS)
+#if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
 

From 1ab50c87d63ae940155e59ce6f8ea619641596c4 Mon Sep 17 00:00:00 2001
From: robot-ya-builder <robot-ya-builder@yandex-team.com>
Date: Wed, 7 Aug 2024 10:09:51 +0300
Subject: [PATCH 091/104] YA-TC release 13

Update tools: ya-tc, os-ya-tc
de4e634c18d75888a757a6c562c7342463ed8586
---
 build/external_resources/ya-tc/public.resources.json | 8 ++++----
 build/mapping.conf.json                              | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/external_resources/ya-tc/public.resources.json b/build/external_resources/ya-tc/public.resources.json
index 7b81e8732a90..d3b70b16c012 100644
--- a/build/external_resources/ya-tc/public.resources.json
+++ b/build/external_resources/ya-tc/public.resources.json
@@ -1,16 +1,16 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:6512097221"
+            "uri": "sbr:6812263131"
         },
         "darwin-arm64": {
-            "uri": "sbr:6512096671"
+            "uri": "sbr:6812261994"
         },
         "linux": {
-            "uri": "sbr:6512096202"
+            "uri": "sbr:6812260917"
         },
         "linux-aarch64": {
-            "uri": "sbr:6512095667"
+            "uri": "sbr:6812259929"
         }
     }
 }
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index f4b822facf63..40789c7a71a6 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -230,12 +230,16 @@
         "3877388826": "https://devtools-registry.s3.yandex.net/3877388826",
         "6148089711": "https://devtools-registry.s3.yandex.net/6148089711",
         "6512097221": "https://devtools-registry.s3.yandex.net/6512097221",
+        "6812263131": "https://devtools-registry.s3.yandex.net/6812263131",
         "6148088723": "https://devtools-registry.s3.yandex.net/6148088723",
         "6512096671": "https://devtools-registry.s3.yandex.net/6512096671",
+        "6812261994": "https://devtools-registry.s3.yandex.net/6812261994",
         "6148087756": "https://devtools-registry.s3.yandex.net/6148087756",
         "6512096202": "https://devtools-registry.s3.yandex.net/6512096202",
+        "6812260917": "https://devtools-registry.s3.yandex.net/6812260917",
         "6148086856": "https://devtools-registry.s3.yandex.net/6148086856",
         "6512095667": "https://devtools-registry.s3.yandex.net/6512095667",
+        "6812259929": "https://devtools-registry.s3.yandex.net/6812259929",
         "6603784347": "https://devtools-registry.s3.yandex.net/6603784347",
         "6652224583": "https://devtools-registry.s3.yandex.net/6652224583",
         "6674734480": "https://devtools-registry.s3.yandex.net/6674734480",
@@ -972,12 +976,16 @@
         "3877388826": "devtools/huge_python3/python3 for win32-clang-cl",
         "6148089711": "devtools/local_cache/toolscache/server/ya-tc for darwin",
         "6512097221": "devtools/local_cache/toolscache/server/ya-tc for darwin",
+        "6812263131": "devtools/local_cache/toolscache/server/ya-tc for darwin",
         "6148088723": "devtools/local_cache/toolscache/server/ya-tc for darwin-arm64",
         "6512096671": "devtools/local_cache/toolscache/server/ya-tc for darwin-arm64",
+        "6812261994": "devtools/local_cache/toolscache/server/ya-tc for darwin-arm64",
         "6148087756": "devtools/local_cache/toolscache/server/ya-tc for linux",
         "6512096202": "devtools/local_cache/toolscache/server/ya-tc for linux",
+        "6812260917": "devtools/local_cache/toolscache/server/ya-tc for linux",
         "6148086856": "devtools/local_cache/toolscache/server/ya-tc for linux-aarch64",
         "6512095667": "devtools/local_cache/toolscache/server/ya-tc for linux-aarch64",
+        "6812259929": "devtools/local_cache/toolscache/server/ya-tc for linux-aarch64",
         "6603784347": "devtools/ya/test/programs/flake8/flake8 for darwin",
         "6652224583": "devtools/ya/test/programs/flake8/flake8 for darwin",
         "6674734480": "devtools/ya/test/programs/flake8/flake8 for darwin",

From dacef943277fa7047bdfbbe942c90bcebdbfe791 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Wed, 7 Aug 2024 10:37:11 +0300
Subject: [PATCH 092/104] Intermediate changes

---
 .../py3/.dist-info/METADATA                   |  4 +-
 .../py3/importlib_metadata/__init__.py        | 14 ++-
 .../py3/importlib_metadata/_itertools.py      | 98 +++++++++++++++++++
 contrib/python/importlib-metadata/py3/ya.make |  2 +-
 4 files changed, 113 insertions(+), 5 deletions(-)

diff --git a/contrib/python/importlib-metadata/py3/.dist-info/METADATA b/contrib/python/importlib-metadata/py3/.dist-info/METADATA
index d7dd4a31a2ed..691fb545bff7 100644
--- a/contrib/python/importlib-metadata/py3/.dist-info/METADATA
+++ b/contrib/python/importlib-metadata/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: importlib_metadata
-Version: 8.0.0
+Version: 8.1.0
 Summary: Read metadata from Python packages
 Author-email: "Jason R. Coombs" <jaraco@jaraco.com>
 Project-URL: Source, https://github.com/python/importlib_metadata
@@ -28,13 +28,13 @@ Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'test'
 Requires-Dist: pytest-cov ; extra == 'test'
 Requires-Dist: pytest-mypy ; extra == 'test'
 Requires-Dist: pytest-enabler >=2.2 ; extra == 'test'
-Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'test'
 Requires-Dist: packaging ; extra == 'test'
 Requires-Dist: pyfakefs ; extra == 'test'
 Requires-Dist: flufl.flake8 ; extra == 'test'
 Requires-Dist: pytest-perf >=0.9.2 ; extra == 'test'
 Requires-Dist: jaraco.test >=5.4 ; extra == 'test'
 Requires-Dist: importlib-resources >=1.3 ; (python_version < "3.9") and extra == 'test'
+Requires-Dist: pytest-ruff >=0.2.1 ; (sys_platform != "cygwin") and extra == 'test'
 
 .. image:: https://img.shields.io/pypi/v/importlib_metadata.svg
    :target: https://pypi.org/project/importlib_metadata
diff --git a/contrib/python/importlib-metadata/py3/importlib_metadata/__init__.py b/contrib/python/importlib-metadata/py3/importlib_metadata/__init__.py
index 6147ca9f5e76..c9730079926d 100644
--- a/contrib/python/importlib-metadata/py3/importlib_metadata/__init__.py
+++ b/contrib/python/importlib-metadata/py3/importlib_metadata/__init__.py
@@ -24,7 +24,7 @@
     install,
 )
 from ._functools import method_cache, pass_none
-from ._itertools import always_iterable, unique_everseen
+from ._itertools import always_iterable, bucket, unique_everseen
 from ._meta import PackageMetadata, SimplePath
 
 from contextlib import suppress
@@ -393,7 +393,7 @@ def from_name(cls, name: str) -> Distribution:
         if not name:
             raise ValueError("A distribution name is required.")
         try:
-            return next(iter(cls.discover(name=name)))
+            return next(iter(cls._prefer_valid(cls.discover(name=name))))
         except StopIteration:
             raise PackageNotFoundError(name)
 
@@ -417,6 +417,16 @@ def discover(
             resolver(context) for resolver in cls._discover_resolvers()
         )
 
+    @staticmethod
+    def _prefer_valid(dists: Iterable[Distribution]) -> Iterable[Distribution]:
+        """
+        Prefer (move to the front) distributions that have metadata.
+
+        Ref python/importlib_resources#489.
+        """
+        buckets = bucket(dists, lambda dist: bool(dist.metadata))
+        return itertools.chain(buckets[True], buckets[False])
+
     @staticmethod
     def at(path: str | os.PathLike[str]) -> Distribution:
         """Return a Distribution for the indicated metadata path.
diff --git a/contrib/python/importlib-metadata/py3/importlib_metadata/_itertools.py b/contrib/python/importlib-metadata/py3/importlib_metadata/_itertools.py
index d4ca9b9140e3..79d37198ce7a 100644
--- a/contrib/python/importlib-metadata/py3/importlib_metadata/_itertools.py
+++ b/contrib/python/importlib-metadata/py3/importlib_metadata/_itertools.py
@@ -1,3 +1,4 @@
+from collections import defaultdict, deque
 from itertools import filterfalse
 
 
@@ -71,3 +72,100 @@ def always_iterable(obj, base_type=(str, bytes)):
         return iter(obj)
     except TypeError:
         return iter((obj,))
+
+
+# Copied from more_itertools 10.3
+class bucket:
+    """Wrap *iterable* and return an object that buckets the iterable into
+    child iterables based on a *key* function.
+
+        >>> iterable = ['a1', 'b1', 'c1', 'a2', 'b2', 'c2', 'b3']
+        >>> s = bucket(iterable, key=lambda x: x[0])  # Bucket by 1st character
+        >>> sorted(list(s))  # Get the keys
+        ['a', 'b', 'c']
+        >>> a_iterable = s['a']
+        >>> next(a_iterable)
+        'a1'
+        >>> next(a_iterable)
+        'a2'
+        >>> list(s['b'])
+        ['b1', 'b2', 'b3']
+
+    The original iterable will be advanced and its items will be cached until
+    they are used by the child iterables. This may require significant storage.
+
+    By default, attempting to select a bucket to which no items belong  will
+    exhaust the iterable and cache all values.
+    If you specify a *validator* function, selected buckets will instead be
+    checked against it.
+
+        >>> from itertools import count
+        >>> it = count(1, 2)  # Infinite sequence of odd numbers
+        >>> key = lambda x: x % 10  # Bucket by last digit
+        >>> validator = lambda x: x in {1, 3, 5, 7, 9}  # Odd digits only
+        >>> s = bucket(it, key=key, validator=validator)
+        >>> 2 in s
+        False
+        >>> list(s[2])
+        []
+
+    """
+
+    def __init__(self, iterable, key, validator=None):
+        self._it = iter(iterable)
+        self._key = key
+        self._cache = defaultdict(deque)
+        self._validator = validator or (lambda x: True)
+
+    def __contains__(self, value):
+        if not self._validator(value):
+            return False
+
+        try:
+            item = next(self[value])
+        except StopIteration:
+            return False
+        else:
+            self._cache[value].appendleft(item)
+
+        return True
+
+    def _get_values(self, value):
+        """
+        Helper to yield items from the parent iterator that match *value*.
+        Items that don't match are stored in the local cache as they
+        are encountered.
+        """
+        while True:
+            # If we've cached some items that match the target value, emit
+            # the first one and evict it from the cache.
+            if self._cache[value]:
+                yield self._cache[value].popleft()
+            # Otherwise we need to advance the parent iterator to search for
+            # a matching item, caching the rest.
+            else:
+                while True:
+                    try:
+                        item = next(self._it)
+                    except StopIteration:
+                        return
+                    item_value = self._key(item)
+                    if item_value == value:
+                        yield item
+                        break
+                    elif self._validator(item_value):
+                        self._cache[item_value].append(item)
+
+    def __iter__(self):
+        for item in self._it:
+            item_value = self._key(item)
+            if self._validator(item_value):
+                self._cache[item_value].append(item)
+
+        yield from self._cache.keys()
+
+    def __getitem__(self, value):
+        if not self._validator(value):
+            return iter(())
+
+        return self._get_values(value)
diff --git a/contrib/python/importlib-metadata/py3/ya.make b/contrib/python/importlib-metadata/py3/ya.make
index ad2a140f18cd..8e7b3102b362 100644
--- a/contrib/python/importlib-metadata/py3/ya.make
+++ b/contrib/python/importlib-metadata/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(8.0.0)
+VERSION(8.1.0)
 
 LICENSE(Apache-2.0)
 

From 68416d4bbdbe0998ef2b88ddb20ea2d605824de3 Mon Sep 17 00:00:00 2001
From: robot-contrib <robot-contrib@yandex-team.com>
Date: Wed, 7 Aug 2024 10:37:13 +0300
Subject: [PATCH 093/104] Update contrib/restricted/fast_float to 6.1.3
 66dbd7831d117fa7cd10099442adf21f4d3e4694

---
 contrib/restricted/fast_float/README.md                       | 2 +-
 .../restricted/fast_float/include/fast_float/ascii_number.h   | 2 +-
 contrib/restricted/fast_float/ya.make                         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/restricted/fast_float/README.md b/contrib/restricted/fast_float/README.md
index 98da296fee3e..fdc3dc79134d 100644
--- a/contrib/restricted/fast_float/README.md
+++ b/contrib/restricted/fast_float/README.md
@@ -379,7 +379,7 @@ the command line help.
 
 You may directly download automatically generated single-header files:
 
-https://github.com/fastfloat/fast_float/releases/download/v6.1.2/fast_float.h
+https://github.com/fastfloat/fast_float/releases/download/v6.1.3/fast_float.h
 
 ## RFC 7159
 
diff --git a/contrib/restricted/fast_float/include/fast_float/ascii_number.h b/contrib/restricted/fast_float/include/fast_float/ascii_number.h
index 4c9da17a50af..4abe84b3e860 100644
--- a/contrib/restricted/fast_float/include/fast_float/ascii_number.h
+++ b/contrib/restricted/fast_float/include/fast_float/ascii_number.h
@@ -349,7 +349,7 @@ parsed_number_string_t<UC> parse_number_string(UC const *p, UC const * pend, par
       ++p;
     }
     if ((p == pend) || !is_integer(*p)) {
-      if(!(fmt & chars_format::fixed) || (fmt & FASTFLOAT_JSONFMT)) {
+      if(!(fmt & chars_format::fixed)) {
         // We are in error.
         return answer;
       }
diff --git a/contrib/restricted/fast_float/ya.make b/contrib/restricted/fast_float/ya.make
index 324d1643a9a5..8142033a0b81 100644
--- a/contrib/restricted/fast_float/ya.make
+++ b/contrib/restricted/fast_float/ya.make
@@ -10,9 +10,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(6.1.2)
+VERSION(6.1.3)
 
-ORIGINAL_SOURCE(https://github.com/fastfloat/fast_float/archive/v6.1.2.tar.gz)
+ORIGINAL_SOURCE(https://github.com/fastfloat/fast_float/archive/v6.1.3.tar.gz)
 
 NO_COMPILER_WARNINGS()
 

From a159873112d46d9c8a1822e0e61857bb939803c2 Mon Sep 17 00:00:00 2001
From: thegeorg <thegeorg@yandex-team.com>
Date: Wed, 7 Aug 2024 11:22:43 +0300
Subject: [PATCH 094/104] contrib/tools/bison: Further cleanup after rXXXXXX
 4ae644b897a128c8b05d5b4e7cf999a8142f85b4

---
 contrib/tools/bison/arcadia_root.cpp.in | 10 ----------
 contrib/tools/bison/arcadia_root.h      | 15 ---------------
 contrib/tools/bison/ya.make             |  2 --
 3 files changed, 27 deletions(-)
 delete mode 100644 contrib/tools/bison/arcadia_root.cpp.in
 delete mode 100644 contrib/tools/bison/arcadia_root.h

diff --git a/contrib/tools/bison/arcadia_root.cpp.in b/contrib/tools/bison/arcadia_root.cpp.in
deleted file mode 100644
index f4e9dd942969..000000000000
--- a/contrib/tools/bison/arcadia_root.cpp.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "arcadia_root.h"
-
-extern "C" {
-
-const char* ArcadiaRoot() THROWING {
-    return R"__weirdrawstr(@ARCADIA_ROOT@)__weirdrawstr";
-}
-
-}
-
diff --git a/contrib/tools/bison/arcadia_root.h b/contrib/tools/bison/arcadia_root.h
deleted file mode 100644
index 9c89539defa6..000000000000
--- a/contrib/tools/bison/arcadia_root.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#define THROWING
-
-#ifdef __cplusplus
-#define THROWING noexcept
-extern "C" {
-#endif
-
-const char* ArcadiaRoot() THROWING;
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/contrib/tools/bison/ya.make b/contrib/tools/bison/ya.make
index 975025a0e13f..c5fdd1053ed8 100644
--- a/contrib/tools/bison/ya.make
+++ b/contrib/tools/bison/ya.make
@@ -31,11 +31,9 @@ NO_RUNTIME()
 CFLAGS(
     -DEXEEXT=\"\"
     -DINSTALLDIR=\"/var/empty/bison-3.5.4/bin\"
-    -DBISON_DATA_DIR=contrib/tools/bison/data
 )
 
 SRCS(
-    arcadia_root.cpp.in
     src/AnnotationList.c
     src/InadequacyList.c
     src/Sbitset.c

From 2137507f9ec8a5b7c48cc521943ffa038262a679 Mon Sep 17 00:00:00 2001
From: robot-contrib <robot-contrib@yandex-team.com>
Date: Wed, 7 Aug 2024 11:23:56 +0300
Subject: [PATCH 095/104] Update contrib/libs/c-ares to 1.33.0
 023d295bf695dc8b9df70e1ee966dc423cdf62ca

---
 contrib/libs/c-ares/CHANGES                   |    7 -
 contrib/libs/c-ares/CHANGES.0                 | 1218 -----------------
 contrib/libs/c-ares/INSTALL.md                |   57 +-
 contrib/libs/c-ares/LICENSE.md                |    2 -
 contrib/libs/c-ares/NEWS                      |   21 -
 contrib/libs/c-ares/README.cares              |   15 -
 contrib/libs/c-ares/README.md                 |   56 +-
 contrib/libs/c-ares/RELEASE-NOTES.md          |   38 +-
 contrib/libs/c-ares/RELEASE-PROCEDURE.md      |   81 +-
 contrib/libs/c-ares/include/ares.h            |   77 +-
 .../libs/c-ares/include/ares_build-linux.h    |   10 +-
 contrib/libs/c-ares/include/ares_dns_record.h |   95 +-
 contrib/libs/c-ares/include/ares_rules.h      |  133 --
 contrib/libs/c-ares/include/ares_version.h    |   13 +-
 .../c-ares/src/lib/ares__addrinfo2hostent.c   |   70 +-
 .../c-ares/src/lib/ares__addrinfo_localhost.c |   35 +-
 .../libs/c-ares/src/lib/ares__close_sockets.c |  111 +-
 .../libs/c-ares/src/lib/ares__hosts_file.c    |  219 +--
 .../src/lib/ares__parse_into_addrinfo.c       |   26 +-
 contrib/libs/c-ares/src/lib/ares__socket.c    |  606 +++++---
 .../libs/c-ares/src/lib/ares__sortaddrinfo.c  |   14 +-
 contrib/libs/c-ares/src/lib/ares_android.c    |   33 +-
 contrib/libs/c-ares/src/lib/ares_cancel.c     |   18 +-
 .../libs/c-ares/src/lib/ares_config-linux.h   |  184 +--
 contrib/libs/c-ares/src/lib/ares_cookie.c     |  459 +++++++
 contrib/libs/c-ares/src/lib/ares_data.c       |    8 +-
 contrib/libs/c-ares/src/lib/ares_destroy.c    |   34 +-
 .../libs/c-ares/src/lib/ares_event_win32.c    |  601 --------
 .../libs/c-ares/src/lib/ares_free_hostent.c   |    6 +-
 .../libs/c-ares/src/lib/ares_free_string.c    |    3 -
 .../libs/c-ares/src/lib/ares_freeaddrinfo.c   |    5 +-
 .../libs/c-ares/src/lib/ares_getaddrinfo.c    |   41 +-
 contrib/libs/c-ares/src/lib/ares_getenv.c     |    2 +-
 contrib/libs/c-ares/src/lib/ares_getenv.h     |    2 -
 .../libs/c-ares/src/lib/ares_gethostbyaddr.c  |   28 +-
 .../libs/c-ares/src/lib/ares_gethostbyname.c  |   22 +-
 .../libs/c-ares/src/lib/ares_getnameinfo.c    |   27 +-
 contrib/libs/c-ares/src/lib/ares_init.c       |   77 +-
 .../libs/c-ares/src/lib/ares_library_init.c   |    5 +-
 contrib/libs/c-ares/src/lib/ares_metrics.c    |  261 ++++
 contrib/libs/c-ares/src/lib/ares_options.c    |   38 +-
 contrib/libs/c-ares/src/lib/ares_platform.c   |    9 +-
 contrib/libs/c-ares/src/lib/ares_platform.h   |    4 +-
 contrib/libs/c-ares/src/lib/ares_private.h    |  343 +++--
 contrib/libs/c-ares/src/lib/ares_process.c    |  699 +++++-----
 contrib/libs/c-ares/src/lib/ares_qcache.c     |  110 +-
 contrib/libs/c-ares/src/lib/ares_query.c      |   34 +-
 contrib/libs/c-ares/src/lib/ares_search.c     |   42 +-
 contrib/libs/c-ares/src/lib/ares_send.c       |  128 +-
 contrib/libs/c-ares/src/lib/ares_setup.h      |  295 ++--
 contrib/libs/c-ares/src/lib/ares_strerror.c   |    4 +-
 contrib/libs/c-ares/src/lib/ares_sysconfig.c  |  591 +-------
 .../c-ares/src/lib/ares_sysconfig_files.c     |   20 +-
 .../libs/c-ares/src/lib/ares_sysconfig_mac.c  |  108 +-
 .../libs/c-ares/src/lib/ares_sysconfig_win.c  |  619 +++++++++
 contrib/libs/c-ares/src/lib/ares_timeout.c    |   70 +-
 .../libs/c-ares/src/lib/ares_update_servers.c |  151 +-
 contrib/libs/c-ares/src/lib/ares_version.c    |    3 +-
 contrib/libs/c-ares/src/lib/config-win32.h    |   30 +-
 contrib/libs/c-ares/src/lib/dsa/ares__array.c |  356 +++++
 contrib/libs/c-ares/src/lib/dsa/ares__array.h |  223 +++
 .../c-ares/src/lib/{ => dsa}/ares__htable.c   |   10 +-
 .../c-ares/src/lib/{ => dsa}/ares__htable.h   |    0
 .../src/lib/{ => dsa}/ares__htable_asvp.c     |   14 +-
 .../src/lib/{ => dsa}/ares__htable_asvp.h     |    0
 .../src/lib/{ => dsa}/ares__htable_strvp.c    |    2 -
 .../src/lib/{ => dsa}/ares__htable_strvp.h    |    2 +-
 .../src/lib/{ => dsa}/ares__htable_szvp.c     |    8 +-
 .../src/lib/{ => dsa}/ares__htable_szvp.h     |    0
 .../src/lib/{ => dsa}/ares__htable_vpvp.c     |   10 +-
 .../src/lib/{ => dsa}/ares__htable_vpvp.h     |    0
 .../c-ares/src/lib/{ => dsa}/ares__llist.c    |   42 +-
 .../c-ares/src/lib/{ => dsa}/ares__llist.h    |   15 +
 .../c-ares/src/lib/{ => dsa}/ares__slist.c    |   12 +-
 .../c-ares/src/lib/{ => dsa}/ares__slist.h    |    0
 .../c-ares/src/lib/{ => event}/ares_event.h   |    2 -
 .../lib/{ => event}/ares_event_configchg.c    |  227 ++-
 .../src/lib/{ => event}/ares_event_epoll.c    |   28 +-
 .../src/lib/{ => event}/ares_event_kqueue.c   |   11 +-
 .../src/lib/{ => event}/ares_event_poll.c     |    8 +-
 .../src/lib/{ => event}/ares_event_select.c   |   13 +-
 .../src/lib/{ => event}/ares_event_thread.c   |  185 ++-
 .../lib/{ => event}/ares_event_wake_pipe.c    |   16 +-
 .../c-ares/src/lib/event/ares_event_win32.c   |  976 +++++++++++++
 .../src/lib/{ => event}/ares_event_win32.h    |   58 +-
 contrib/libs/c-ares/src/lib/inet_net_pton.c   |   26 +-
 contrib/libs/c-ares/src/lib/inet_ntop.c       |   56 +-
 .../src/lib/{ => legacy}/ares_create_query.c  |    2 -
 .../src/lib/{ => legacy}/ares_expand_name.c   |   25 +-
 .../src/lib/{ => legacy}/ares_expand_string.c |   10 +-
 .../c-ares/src/lib/{ => legacy}/ares_fds.c    |   13 +-
 .../src/lib/{ => legacy}/ares_getsock.c       |   15 +-
 .../src/lib/{ => legacy}/ares_parse_a_reply.c |   10 +-
 .../lib/{ => legacy}/ares_parse_aaaa_reply.c  |    9 +-
 .../lib/{ => legacy}/ares_parse_caa_reply.c   |   24 +-
 .../lib/{ => legacy}/ares_parse_mx_reply.c    |   16 +-
 .../lib/{ => legacy}/ares_parse_naptr_reply.c |   28 +-
 .../lib/{ => legacy}/ares_parse_ns_reply.c    |   31 +-
 .../lib/{ => legacy}/ares_parse_ptr_reply.c   |   20 +-
 .../lib/{ => legacy}/ares_parse_soa_reply.c   |   20 +-
 .../lib/{ => legacy}/ares_parse_srv_reply.c   |   16 +-
 .../lib/{ => legacy}/ares_parse_txt_reply.c   |   80 +-
 .../lib/{ => legacy}/ares_parse_uri_reply.c   |   12 +-
 .../src/lib/{ => record}/ares_dns_mapping.c   |   26 +-
 .../src/lib/record/ares_dns_multistring.c     |  224 +++
 .../src/lib/record/ares_dns_multistring.h     |   50 +
 .../src/lib/{ => record}/ares_dns_name.c      |  174 ++-
 .../src/lib/{ => record}/ares_dns_parse.c     |   54 +-
 .../src/lib/{ => record}/ares_dns_private.h   |   81 +-
 .../src/lib/{ => record}/ares_dns_record.c    |  650 +++++----
 .../src/lib/{ => record}/ares_dns_write.c     |  300 ++--
 contrib/libs/c-ares/src/lib/setup_once.h      |  469 -------
 .../libs/c-ares/src/lib/{ => str}/ares__buf.c |  203 ++-
 .../libs/c-ares/src/lib/{ => str}/ares__buf.h |   36 +-
 .../libs/c-ares/src/lib/{ => str}/ares_str.c  |   14 +-
 .../libs/c-ares/src/lib/{ => str}/ares_str.h  |   16 +-
 .../src/lib/{ => str}/ares_strcasecmp.c       |   10 +-
 .../src/lib/{ => str}/ares_strcasecmp.h       |    2 -
 .../c-ares/src/lib/{ => str}/ares_strsplit.c  |   21 +-
 .../c-ares/src/lib/{ => str}/ares_strsplit.h  |    2 -
 .../c-ares/src/lib/thirdparty/apple/README.md |   18 +-
 .../c-ares/src/lib/thirdparty/apple/dnsinfo.h |   40 +-
 .../src/lib/{ => util}/ares__iface_ips.c      |  168 ++-
 .../src/lib/{ => util}/ares__iface_ips.h      |    0
 .../c-ares/src/lib/{ => util}/ares__threads.c |   23 +-
 .../c-ares/src/lib/{ => util}/ares__threads.h |    0
 .../c-ares/src/lib/{ => util}/ares__timeval.c |   52 +-
 .../c-ares/src/lib/{ => util}/ares_math.c     |   21 +-
 .../c-ares/src/lib/{ => util}/ares_rand.c     |   46 +-
 contrib/libs/c-ares/src/lib/windows_port.c    |    4 +-
 contrib/libs/c-ares/ya.make                   |   99 +-
 131 files changed, 7468 insertions(+), 5984 deletions(-)
 delete mode 100644 contrib/libs/c-ares/CHANGES
 delete mode 100644 contrib/libs/c-ares/CHANGES.0
 delete mode 100644 contrib/libs/c-ares/NEWS
 delete mode 100644 contrib/libs/c-ares/README.cares
 delete mode 100644 contrib/libs/c-ares/include/ares_rules.h
 create mode 100644 contrib/libs/c-ares/src/lib/ares_cookie.c
 delete mode 100644 contrib/libs/c-ares/src/lib/ares_event_win32.c
 create mode 100644 contrib/libs/c-ares/src/lib/ares_metrics.c
 create mode 100644 contrib/libs/c-ares/src/lib/ares_sysconfig_win.c
 create mode 100644 contrib/libs/c-ares/src/lib/dsa/ares__array.c
 create mode 100644 contrib/libs/c-ares/src/lib/dsa/ares__array.h
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable.c (98%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable.h (100%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable_asvp.c (94%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable_asvp.h (100%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable_strvp.c (99%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable_strvp.h (99%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable_szvp.c (96%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable_szvp.h (100%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable_vpvp.c (95%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__htable_vpvp.h (100%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__llist.c (92%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__llist.h (93%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__slist.c (97%)
 rename contrib/libs/c-ares/src/lib/{ => dsa}/ares__slist.h (100%)
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event.h (99%)
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event_configchg.c (70%)
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event_epoll.c (88%)
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event_kqueue.c (95%)
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event_poll.c (96%)
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event_select.c (92%)
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event_thread.c (78%)
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event_wake_pipe.c (89%)
 create mode 100644 contrib/libs/c-ares/src/lib/event/ares_event_win32.c
 rename contrib/libs/c-ares/src/lib/{ => event}/ares_event_win32.h (62%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_create_query.c (98%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_expand_name.c (79%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_expand_string.c (94%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_fds.c (88%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_getsock.c (87%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_a_reply.c (96%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_aaaa_reply.c (96%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_caa_reply.c (85%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_mx_reply.c (88%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_naptr_reply.c (83%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_ns_reply.c (82%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_ptr_reply.c (91%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_soa_reply.c (86%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_srv_reply.c (89%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_txt_reply.c (69%)
 rename contrib/libs/c-ares/src/lib/{ => legacy}/ares_parse_uri_reply.c (92%)
 rename contrib/libs/c-ares/src/lib/{ => record}/ares_dns_mapping.c (96%)
 create mode 100644 contrib/libs/c-ares/src/lib/record/ares_dns_multistring.c
 create mode 100644 contrib/libs/c-ares/src/lib/record/ares_dns_multistring.h
 rename contrib/libs/c-ares/src/lib/{ => record}/ares_dns_name.c (79%)
 rename contrib/libs/c-ares/src/lib/{ => record}/ares_dns_parse.c (95%)
 rename contrib/libs/c-ares/src/lib/{ => record}/ares_dns_private.h (75%)
 rename contrib/libs/c-ares/src/lib/{ => record}/ares_dns_record.c (72%)
 rename contrib/libs/c-ares/src/lib/{ => record}/ares_dns_write.c (79%)
 delete mode 100644 contrib/libs/c-ares/src/lib/setup_once.h
 rename contrib/libs/c-ares/src/lib/{ => str}/ares__buf.c (84%)
 rename contrib/libs/c-ares/src/lib/{ => str}/ares__buf.h (95%)
 rename contrib/libs/c-ares/src/lib/{ => str}/ares_str.c (96%)
 rename contrib/libs/c-ares/src/lib/{ => str}/ares_str.h (82%)
 rename contrib/libs/c-ares/src/lib/{ => str}/ares_strcasecmp.c (89%)
 rename contrib/libs/c-ares/src/lib/{ => str}/ares_strcasecmp.h (98%)
 rename contrib/libs/c-ares/src/lib/{ => str}/ares_strsplit.c (88%)
 rename contrib/libs/c-ares/src/lib/{ => str}/ares_strsplit.h (98%)
 rename contrib/libs/c-ares/src/lib/{ => util}/ares__iface_ips.c (86%)
 rename contrib/libs/c-ares/src/lib/{ => util}/ares__iface_ips.h (100%)
 rename contrib/libs/c-ares/src/lib/{ => util}/ares__threads.c (95%)
 rename contrib/libs/c-ares/src/lib/{ => util}/ares__threads.h (100%)
 rename contrib/libs/c-ares/src/lib/{ => util}/ares__timeval.c (61%)
 rename contrib/libs/c-ares/src/lib/{ => util}/ares_math.c (93%)
 rename contrib/libs/c-ares/src/lib/{ => util}/ares_rand.c (88%)

diff --git a/contrib/libs/c-ares/CHANGES b/contrib/libs/c-ares/CHANGES
deleted file mode 100644
index f1426fda7977..000000000000
--- a/contrib/libs/c-ares/CHANGES
+++ /dev/null
@@ -1,7 +0,0 @@
-This file no longer holds the changelog. Now you can generate it yourself
-like this:
-
- $ git log --pretty=fuller --no-color --date=short --decorate=full -1000 |
-   ./git2changes.pl
-
-The older, manually edited, changelog is found in git named CHANGES.0
diff --git a/contrib/libs/c-ares/CHANGES.0 b/contrib/libs/c-ares/CHANGES.0
deleted file mode 100644
index 0da401eabe0d..000000000000
--- a/contrib/libs/c-ares/CHANGES.0
+++ /dev/null
@@ -1,1218 +0,0 @@
-  Changelog for the c-ares project
-
-Version 1.7.5 (August 16, 2011)
-
-Fixed:
-
- o detection of semicolon comments in resolv.conf
- o avoid using system's inet_net_pton affected by the WLB-2008080064 advisory
- o replacement ares_inet_net_pton affected by the WLB-2008080064 advisory
- o replacement ares_inet_ntop affected by potential out of bounds write
- o added install target to Makefile.msvc
- o only fall back to AF_INET searches when looking for AF_UNSPEC addresses
- o fixed ares_parse_*_reply memory leaks
- o Use correct sizeof in ares_getnameinfo()
- o IPv6-on-windows: find DNS servers correctly
- o man pages: docs for the c-ares utility programs
- o getservbyport replacement for Win CE
- o config_sortlist: (win32) missing else
- o advance_tcp_send_queue: avoid NULL ptr dereference
- o configure: fix a bashism
- o ares_expand_name: Fix encoded length for indirect root
-
-Version 1.7.4 (December 9, 2010)
-
-Changed:
-
- o local-bind: Support binding to local interface/IPs, see
-   ares_set_local_ip4, ares_set_local_ip6, ares_set_local_dev
-
-Fixed:
-
- o memory leak in ares_getnameinfo
- o add missing break that caused get_ares_servers to fail
- o ares_parse_a_reply: fix CNAME response parsing
- o init_by_options: don't copy an empty sortlist
- o Replaced uint32_t with unsigned int to fix broken builds
-   on a couple of platforms
- o Fix lookup with HOSTALIASES set
- o adig: fix NAPTR parsing
- o compiler warning cleanups
-
-Version 1.7.3 (June 11, 2010)
-
-Fixed:
-
- o builds on Android
- o now includes all files necessary to build it (1.7.2 lacked a file)
-
-Version 1.7.2 (June 10, 2010)
-
-Changed:
-
- o Added ares_parse_mx_reply()
-
-Fixed:
-
- o ares_init: Last, not first instance of domain or search should win
- o improve alternative definition of bool
- o fix VS2010 compiler warnings
-
-
-Version 1.7.1 (Mar 23, 2010)
-
-* May 31, 2010 (Jakub Hrozek)
-- Use the last instance of domain/search, not the first one
-
-* March 23, 2010 (Daniel Stenberg)
-- We switched from CVS to git. See http://github.com/bagder/c-ares
-
-* March 5, 2010 (Daniel Stenberg)
-- Daniel Johnson provided fixes for building with the clang compiler.
-
-* March 5, 2010 (Yang Tse)
-- Added IPv6 name servers support. Implementation has been based on code,
-  comments and feedback provided November and December of 2008 by Daniel
-  Stenberg, Gregor Jasny, Phil Blundell and myself, December 2009 by Cedric
-  Bail, and February 2010 by Jakub Hrozek on the c-ares mailing list. On
-  March I reviewed all that, selected the best of each, and adjusted or
-  extended parts of it to make the best fit.
-
-  The external and visible result of all this is that two new functions are
-  added to the external API, ares_get_servers() and ares_set_servers(), which
-  becomes now the preferred way of getting and setting name servers for any
-  ares channel as these support both IPv4 and IPv6 name servers.
-
-  In order to not break ABI compatibility, ares_init_options() with option
-  mask ARES_OPT_SERVERS and ares_save_options() may still be used in code
-  which is intended to run on IPv4-only stacks. But remember that these
-  functions do not support IPv6 name servers. This implies that if the user
-  is capable of defining or providing an IPv6 name server, and the app is
-  using ares_init_options() or ares_save_options() at some point to handle
-  the name servers, the app will likely lose IPv6 name servers.
-
-* January 28, 2010 (Daniel Stenberg)
-- Tommie Gannert pointed out a silly bug in ares_process_fd() since it didn't
-  check for broken connections like ares_process() did. Based on that, I
-  merged the two functions into a single generic one with two front-ends.
-
-* December 29, 2009 (Yang Tse)
-- Laszlo Tamas Szabo adjusted Makefile.msvc compiler options so that where
-  run-time error checks enabling compiler option /GZ was used it is replaced
-  with equivalent /RTCsu for Visual Studio 2003 and newer versions. Option
-  /GX is replaced with equivalent /EHsc for all versions. Also fixed socket
-  data type for internal configure_socket function.
-
-* December 21, 2009 (Yang Tse)
-- Ingmar Runge noticed that Windows config-win32.h configuration file
-  did not include a definition for HAVE_CLOSESOCKET which resulted in
-  function close() being inappropriately used to close sockets.
-
-Version 1.7.0 (Nov 30, 2009)
-
-* November 26, 2009 (Yang Tse)
-- Larry Lansing fixed ares_parse_srv_reply to properly parse replies
-  which might contain non-SRV answers, skipping over potential non-SRV
-  ones such as CNAMEs.
-
-* November 23, 2009 (Yang Tse)
-- Changed naming convention for c-ares libraries built with MSVC, details
-  and build instructions provided in README.msvc file.
-
-* November 22, 2009 (Yang Tse)
-- Jakub Hrozek fixed more function prototypes in man pages to sync them
-  with the ones declared in ares.h
-
-- Jakub Hrozek renamed addrttl and addr6ttl structs to ares_addrttl and
-  ares_addr6ttl in order to prevent name space pollution, along with
-  necessary changes to code base and man pages.This change does not break
-  ABI, there is no need to recompile existing applications. But existing
-  applications using these structs with the old name will need source code
-  adjustments when recompiled using c-ares 1.7.0.
-
-* November 21, 2009 (Yang Tse)
-- Added manifest stuff to Makefile.msvc.
-
-* November 20, 2009 (Yang Tse)
-- Fixed several function prototypes in man pages that were out of sync
-  with the ones declared in ares.h.  Added ares_free_data() along with
-  man page.  Updated ares_parse_srv_reply() and ares_parse_txt_reply()
-  with changes from Jakub Hrozek making these now return linked lists
-  instead of arrays, and merging the ares_free_data() adjustments.
-
-* November 10, 2009 (Yang Tse)
-- Updated MSVC 6.0 project files to match settings from Makefile.msvc.
-
-* November 9, 2009 (Yang Tse)
-- Makefile.msvc is now the reference method to build c-ares and sample
-  programs with any MSVC compiler or MS Visual Studio version.  If no
-  option or target are specified it builds dynamic and static c-ares
-  libraries in debug and release flavours and also builds all sample
-  programs using each of the different c-ares libraries.
-
-* November 2, 2009 (Yang Tse)
-- Renamed c-ares setup.h to ares_setup.h
-
-* October 31, 2009 (Yang Tse)
-- Symbol hiding configure options are named now --enable-symbol-hiding
-  and --disable-symbol-hiding in an attempt to make them less ambiguous.
-
-* October 30, 2009 (Yang Tse)
-- Many fixes for ares_parse_txt_reply()
-
-* October 29, 2009 (Daniel Stenberg)
-- Jakub Hrozek added ares_parse_txt_reply() for TXT parsing
-
-* October 29, 2009 (Yang Tse)
-- Updated MSVC 6.0 workspace and project files that allows building
-  dynamic and static c-ares libraries in debug and release flavours.
-  Additionally each of the three sample programs is built against
-  each of the four possible c-ares libraries, generating all this
-  a total number of 12 executables and 4 libraries.
-
-* October 28, 2009 (Yang Tse)
-- Initial step towards the ability to reduce c-ares exported symbols
-  when built as a shared library based on the 'visibility' attribute
-  for GNUC and Intel compilers and based on __global for Sun compilers,
-  taking also in account __declspec function decoration for Win32 and
-  Symbian DLL's.
-
-* October 27, 2009 (Yang Tse)
-- Fixed Pelles C Win32 target compilation issues.
-
-* October 23, 2009 (Yang Tse)
-- John Engelhart noticed an unreleased problem relative to a duplicate
-  ARES_ECANCELLED error code value and missing error code description.
-
-* October 7, 2009 (Yang Tse)
-- Overhauled ares__get_hostent() Fixing out of bounds memory overwrite
-  triggered with malformed /etc/hosts file. Improving parsing of /etc/hosts
-  file. Validating requested address family. Ensuring that failures always
-  return a NULL pointer. Adjusting header inclusions.
-
-* October 6, 2009 (Yang Tse)
-- Fix ssize_t redefinition errors on WIN64 reported by Alexey Simak.
-
-* September 29, 2009 (Yang Tse)
-- Make configure script also check if _REENTRANT definition is required to
-  make errno available as a preprocessor macro.
-
-* September 7, 2009 (Yang Tse)
-- Add T_SRV portability check to ares_parse_srv_reply.c
-
-* 4 Sep 2009 (Daniel Stenberg)
-- Jakub Hrozek added ares_parse_srv_reply() for SRV parsing
-
-* 3 Aug 2009 (Daniel Stenberg)
-- Joshua Kwan fixed the init routine to fill in the defaults for stuff that
-  fails to get inited by other means. This fixes a case of when the c-ares
-  init fails when internet access is fone.
-
-- Timo Teras changed the reason code used in the resolve callback done when
-  ares_cancel() is used, to be ARES_ECANCELLED instead of ARES_ETIMEOUT to
-  better allow the callback to know what's happening.
-
-* 14 Jul 2009 (Guenter Knauf)
-- renamed generated config.h to ares_config.h to avoid any future clashes
-  with config.h from other projects.
-
-* June 20 2009 (Yang Tse)
-- Refactor how libraries are checked for connect() function in configure
-  script and check for connect() as it is done for other functions.
-
-* June 19 2009 (Yang Tse)
-- Make sclose() function-like macro definition used to close a socket,
-  now solely based on HAVE_CLOSESOCKET and HAVE_CLOSESOCKET_CAMEL
-  config file preprocessor definitions
-
-* June 18 2009 (Yang Tse)
-- Add CloseSocket camel case function check for configure script.
-
-* June 17 2009 (Yang Tse)
-- Check for socket() and closesocket() as it is done for other functions
-  in configure script.
-
-* June 11 2009 (Yang Tse)
-- Modified buildconf so that when automake runs it copies missing files
-  instead of symlinking them.
-
-* June 8 2009 (Yang Tse)
-- Removed buildconf.bat from release and daily snapshot archives. This
-  file is only for CVS tree checkout builds.
-
-* May 26 2009 (Yang Tse)
-- Added --enable-curldebug configure option to enable and disable building
-  with the low-level curl debug memory tracking 'feature' to allow decoupled
-  setting from --enable-debug, allowing again to build c-ares independently
-  out of the CVS tree.
-
-  For the c-ares library option --enable-debug enables debug build features
-  which are _not_ related with memory tracking. For the c-ares library when
-  --enable-debug is given it does not enable the memory tracking feature. If
-  you wish to enable the curl debug memory tracking you must use configure
-  option --enable-curldebug explicitly to do so.
-
-  Internally, definition of preprocessor symbol DEBUGBUILD restricts code
-  which is only compiled for debug enabled builds. And symbol CURLDEBUG is
-  used to differentiate code which is _only_ used for memory tracking.
-
-  Make ares_init(), ares_dup() and ares_init_options() fail returning
-  ARES_ENOTINITIALIZED if library initialization has not been performed
-  calling ares_library_init().
-
-* May 20 2009 (Yang Tse)
-- Added ares_library_init() and ares_library_cleanup() man pages.
-
-* May 19 2009 (Yang Tse)
-- Introduced ares_library_init() and ares_library_cleanup() functions.
-
-  This is an API and ABI break for Win32/64 systems. Non-Win32/64 build targets
-  using c-ares 1.7.0 can still survive without calling these functions. Read all
-  the details on ares_library_init(3) and ares_library_cleanup(3) man pages that
-  are included.
-
-  curl/libcurl 7.19.5 is fully compatible with c-ares 1.7.0 on all systems.
-
-  In order to use c-ares 1.7.0 with curl/libcurl on Win32/64 systems it is
-  required that curl/libcurl is 7.19.5 or newer. In other words, it is not
-  possible on Win32/64 to use c-ares 1.7.0 with a curl/libcurl version less
-  than 7.19.5
-
-* May 11 2009 (Daniel Stenberg)
-- Gregor Jasny made c-ares link with libtool 's -export-symbols-regex option to
-  only expose functions starting with ares_.
-
-* May 7 2009 (Yang Tse)
-- Fix an m4 overquoting triggering a spurious 'AS_TR_CPP' symbol definition
-  attempt in generated config.h
-
-* May 2 2009 (Yang Tse)
-- Use a build-time configured ares_socklen_t data type instead of socklen_t.
-
-* April 21 2009 (Yang Tse)
-- Moved potential inclusion of system's malloc.h and memory.h header files to
-  setup_once.h.  Inclusion of each header file is based on the definition of
-  NEED_MALLOC_H and NEED_MEMORY_H respectively.
-
-* March 11 2009 (Yang Tse)
-- Japheth Cleaver fixed acountry.c replacing u_long with unsigned long.
-
-* February 20 2009 (Yang Tse)
-- Do not halt compilation when using VS2008 to build a Windows 2000 target.
-
-* February 3 2009 (Phil Blundell)
-- If the server returns garbage or nothing at all in response to an AAAA query,
-  go on and ask for A records anyway.
-
-* January 31 2009 (Daniel Stenberg)
-- ares_gethostbyname() now accepts 'AF_UNSPEC' as a family for resolving
-  either AF_INET6 or AF_INET. It works by accepting any of the looksups in the
-  hosts file, and it resolves the AAAA field with a fallback to A.
-
-* January 14 2009 (Daniel Stenberg)
-- ares.h no longer uses the HAVE_STRUCT_IN6_ADDR define check, but instead it
-  now declares the private struct ares_in6_addr for all systems instead of
-  relying on one possibly not present in the system.
-
-* January 13 2009 (Phil Blundell)
-- ares__send_query() now varies the retry timeout pseudo-randomly to avoid
-  packet storms when several queries were started at the same time.
-
-* January 11 2009 (Daniel Stenberg)
-- Phil Blundell added the internal function ares__expand_name_for_response()
-  that is now used by the ares_parse_*_reply() functions instead of the
-  ares_expand_name() simply to easier return ARES_EBADRESP for the cases where
-  the name expansion fails as in responses that really isn't expected.
-
-Version 1.6.0 (Dec 9, 2008)
-
-* December 9 2008 (Gisle Vanem)
-
-  Fixes for Win32 targets using the Watt-32 tcp/ip stack.
-
-* Dec 4 2008 (Daniel Stenberg)
-
-  Gregor Jasny provided the patch that introduces ares_set_socket_callback(),
-  and I edited it to also get duped by ares_dup().
-
-* Dec 3 2008 (Daniel Stenberg)
-
-  API changes:
-
-  I made sure the public ares_config struct looks like before and yet it
-  supports the ROTATE option thanks to c-ares now storing the "optmask"
-  internally. Thus we should be ABI compatible with the past release(s)
-  now. My efforts mentioned below should not break backwards ABI compliance.
-
-  Here's how I suggest we proceed with the API:
-
-  ares_init() will be primary "channel creator" function.
-
-  ares_init_options() will continue to work exactly like now and before. For
-  starters, it will be the (only) way to set the existing options.
-
-  ares_save_options() will continue to work like today, but will ONLY save
-  options that you can set today (including ARES_OPT_ROTATE actually) but new
-  options that we add may not be saved with this.
-
-  Instead we introduce:
-
-  ares_dup() that instead can make a new channel and clone the config used
-  from an existing channel. It will then clone all config options, including
-  future new things we add.
-
-  ares_set_*() style functions that set (new) config options. As a start we
-  simply add these for new functionality, but over time we can also introduce
-  them for existing "struct ares_options" so that we can eventually deprecate
-  the two ares_*_options() functions.
-
-  ares_get_*() style functions for extracting info from a channel handle that
-  should be used instead of ares_save_options().
-
-* Nov 26 2008 (Yang Tse)
-- Brad Spencer provided changes to allow buildconf to work on OS X.
-
-- Gerald Combs fixed a bug in ares_parse_ptr_reply() which would cause a
-  buffer to shrink instead of expand if a reply contained 8 or more records.
-
-* Nov 25 2008 (Yang Tse)
-- In preparation for the upcoming IPv6 nameservers patch, the internal
-  ares_addr union is now changed into an internal struct which also holds
-  the address family.
-
-* Nov 19 2008 (Daniel Stenberg)
-- Brad Spencer brought the new function ares_gethostbyname_file() which simply
-  resolves a host name from the given file, using the regular hosts syntax.
-
-* Nov 1 2008 (Daniel Stenberg)
-- Carlo Contavalli added support for the glibc "rotate" option, as documented
-  in man resolv.conf:
-
-  causes round robin selection of nameservers from among those listed.  This
-  has the effect of spreading the query load among all listed servers, rather
-  than having all clients try the first listed server first every time.
-
-  You can enable it with ARES_OPT_ROTATE
-
-* Oct 21 2008 (Yang Tse)
-  Charles Hardin added handling of EINPROGRESS for UDP connects.
-
-* Oct 18 2008 (Daniel Stenberg)
-  Charles Hardin made adig support a regular numerical dotted IP address for the
-  -s option as well.
-
-* Oct 7 2008 (Yang Tse)
-- Added --enable-optimize configure option to enable and disable compiler
-  optimizations to allow decoupled setting from --enable-debug.
-
-* Oct 2 2008 (Yang Tse)
-- Added --enable-warnings configure option to enable and disable strict
-  compiler warnings to allow decoupled setting from --enable-debug.
-
-* Sep 17 2008 (Yang Tse)
-- Code reorganization to allow internal/private use of "nameser.h" to any
-  system that lacks arpa/nameser.h or arpa/nameser_compat.h header files.
-
-* Sep 16 2008 (Yang Tse)
-- Code reorganization to allow internal/private use of ares_writev to any
-  system that lacks the writev function.
-
-* Sep 15 2008 (Yang Tse)
-- Code reorganization to allow internal/private use of ares_strcasecmp to any
-  system that lacks the strcasecmp function.
-
-- Improve configure detection of some string functions.
-
-* Sep 11 2008 (Yang Tse)
-- Code reorganization to allow internal/private use of ares_strdup to any
-  system that lacks the strdup function.
-
-Version 1.5.3 (Aug 29, 2008)
-
-* Aug 25 2008 (Yang Tse)
-- Improvement by Brad House:
-
-  This patch addresses an issue in which a response could be sent back to the
-  source port of a client from a different address than the request was made to.
-  This is one form of a DNS cache poisoning attack.
-
-  The patch simply uses recvfrom() rather than recv() and validates that the
-  address returned from recvfrom() matches the address of the server we have
-  connected to. Only necessary on UDP sockets as they are connection-less, TCP
-  is unaffected.
-
-- Fix by George Neill:
-  Fixed compilation of acountry sample application failure on some systems.
-
-* Aug 4 2008 (Daniel Stenberg)
-- Fix by Tofu Linden:
-
-  The symptom:
-  * Users (usually, but not always) on 2-Wire routers and the Comcast service
-  and a wired connection to their router would find that the second and
-  subsequent DNS lookups from fresh processes using c-ares to resolve the same
-  address would cause the process to never see a reply (it keeps polling for
-  around 1m15s before giving up).
-
-  The repro:
-  * On such a machine (and yeah, it took us a lot of QA to find the systems
-  that reproduce such a specific problem!), do 'ahost www.secondlife.com',
-  then do it again.  The first process's lookup will work, subsequent lookups
-  will time-out and fail.
-
-  The cause:
-  * init_id_key() was calling randomize_key() *before* it initialized
-  key->state, meaning that the randomness generated by randomize_key() is
-  immediately overwritten with deterministic values. (/dev/urandom was also
-  being read incorrectly in the c-ares version we were using, but this was
-  fixed in a later version.)
-  * This makes the stream of generated query-IDs from any new c-ares process
-  be an identical and predictable sequence of IDs.
-  * This makes the 2-Wire's default built-in DNS server detect these queries
-  as probable-duplicates and (erroneously) not respond at all.
-
-
-* Aug 4 2008 (Yang Tse)
-- Autoconf 2.62 has changed the behaviour of the AC_AIX macro which we use.
-  Prior versions of autoconf defined _ALL_SOURCE if _AIX was defined. 2.62
-  version of AC_AIX defines _ALL_SOURCE and other four preprocessor symbols
-  no matter if the system is AIX or not. To keep the traditional behaviour,
-  and an uniform one across autoconf versions AC_AIX is replaced with our
-  own internal macro CARES_CHECK_AIX_ALL_SOURCE.
-
-* Aug 1 2008 (Yang Tse)
-- Configure process now checks if the preprocessor _REENTRANT symbol is already
-  defined. If it isn't currently defined a set of checks are performed to test
-  if its definition is required to make visible to the compiler a set of *_r
-  functions. Finally, if _REENTRANT is already defined or needed it takes care
-  of making adjustments necessary to ensure that it is defined equally for the
-  configure process tests and generated config file.
-
-* Jul 20 2008 (Yang Tse)
-- When recvfrom prototype uses a void pointer for arguments 2, 5 or 6 this will
-  now cause the definition, as appropriate, of RECVFROM_TYPE_ARG2_IS_VOID,
-  RECVFROM_TYPE_ARG5_IS_VOID or RECVFROM_TYPE_ARG6_IS_VOID.
-
-* Jul 17 2008 (Yang Tse)
-- RECVFROM_TYPE_ARG2, RECVFROM_TYPE_ARG5 and RECVFROM_TYPE_ARG6 are now defined
-  to the data type pointed by its respective argument and not the pointer type.
-
-* Jul 16 2008 (Yang Tse)
-- Improved configure detection of number of arguments for getservbyport_r.
-  Detection is now based on compilation checks instead of linker ones.
-
-- Configure process now checks availability of recvfrom() socket function and
-  finds out its return type and the types of its arguments. Added definitions
-  for non-configure systems config files, and introduced macro sreadfrom which
-  will be used on udp sockets as a recvfrom() wrapper in the future.
-
-* Jul 15 2008 (Yang Tse)
-- Introduce definition of _REENTRANT symbol in setup.h to improve library
-  usability.  Previously the configure process only used the AC_SYS_LARGEFILE
-  macro for debug builds, now it is also used for non-debug ones enabling the
-  use of configure options --enable-largefile and --disable-largefile which
-  might be needed for library compatibility.  Remove checking the size of
-  curl_off_t, it is no longer needed.
-
-* Jul 3 2008 (Daniel Stenberg)
-- Phil Blundell: If you ask ares_gethostbyname() to do an AF_INET6 lookup and
-  the target host has only A records, it automatically falls back to an
-  AF_INET lookup and gives you the A results.  However, if the target host has
-  a CNAME record, this behaviour is defeated since the original query does
-  return some data even though ares_parse_aaa_reply() doesn't consider it
-  relevant. Here's a small patch to make it behave the same with and without
-  the CNAME.
-
-* Jul 2 2008 (Yang Tse)
-- Fallback to gettimeofday when monotonic clock is unavailable at run-time.
-
-* Jun 30 2008 (Daniel Stenberg)
-
-- As was pointed out to me by Andreas Schuldei, the MAXHOSTNAMELEN define is
-  not posix or anything and thus c-ares failed to build on hurd (and possibly
-  elsewhere). The define was also somewhat artificially used in the windows
-  port. Now, I instead rewrote the use of gethostbyname to enlarge the host
-  name buffer in case of need and totally avoid the use of the MAXHOSTNAMELEN
-  define. I thus also removed the define from the namser.h file where it was
-  once added for the windows build.
-
-  I also fixed init_by_defaults() function to not leak memory in case if
-  error.
-
-* Jun 9 2008 (Yang Tse)
-
-- Make libcares.pc generated file for pkg-config include information relative
-  to the libraries needed for the static linking of c-ares.
-
-* May 30 2008 (Yang Tse)
-
-- Brad House fixed a missing header file inclusion in adig sample program.
-
-Version 1.5.2 (May 29, 2008)
-
-* May 13 2008 (Daniel Stenberg)
-
-- Introducing millisecond resolution support for the timeout option. See
-  ares_init_options()'s ARES_OPT_TIMEOUTMS.
-
-* May 9 2008 (Yang Tse)
-
-- Use monotonic time source if available, for private function ares__tvnow()
-
-* May 7 2008 (Daniel Stenberg)
-
-- Sebastian made c-ares able to return all PTR-records when doing reverse
-  lookups. It is not common practice to have multiple PTR-Records for a single
-  IP, but its perfectly legal and some sites have those.
-
-- Doug Goldstein provided a configure patch: updates autoconf 2.13 usage to
-  autoconf 2.57 usage (which is the version you have specified as the minimum
-  version). It's a minor change but it does clean up some warnings with newer
-  autoconf (specifically 2.62).
-
-* May 5 2008 (Yang Tse)
-
-- Improved parsing of resolver configuration files.
-
-* April 4 2008 (Daniel Stenberg)
-
-- Eino Tuominen improved the code when a file is used to seed the randomizer.
-
-- Alexey Simak made adig support NAPTR records
-
-- Alexey Simak fixed the VC dsp file by adding the missing source file
-  ares_expand_string.c
-
-* December 11 2007 (Gisle Vanem)
-
-- Added another sample application; acountry.c which converts an
-  IPv4-address(es) and/or host-name(s) to country-name and country-code.
-  This uses the service of the DNSBL at countries.nerd.dk.
-
-* December 3 2007 (Daniel Stenberg)
-
-- Brad Spencer fixed the configure script to assume that there's no
-  /dev/urandom when built cross-compiled as then the script cannot check for
-  it.
-
-- Erik Kline cleaned up ares_gethostbyaddr.c:next_lookup() somewhat
-
-Version 1.5.1 (Nov 21, 2007)
-
-* November 21 2007 (Daniel Stenberg)
-
-- Robin Cornelius pointed out that ares_llist.h was missing in the release
-  archive for 1.5.0
-
-Version 1.5.0 (Nov 21, 2007)
-
-* October 2 2007 (Daniel Stenberg)
-
-- ares_strerror() segfaulted if the input error number was out of the currently
-  supported range.
-
-- Yang Tse: Avoid a segfault when generating a DNS "Transaction ID" in
-  internal function init_id_key() under low memory conditions.
-
-* September 28 2007 (Daniel Stenberg)
-
-- Bumped version to 1.5.0 for next release and soname bumped to 2 due to ABI
-  and API changes in the progress callback (and possibly more coming up from
-  Steinar)
-
-* September 28 2007 (Steinar H. Gunderson)
-
-- Don't skip a server if it's the only one. (Bugfix from the Google tree.)
-
-- Made the query callbacks receive the number of timeouts that happened during
-  the execution of a query, and updated documentation accordingly. (Patch from
-  the Google tree.)
-
-- Support a few more socket options: ARES_OPT_SOCK_SNDBUF and
-  ARES_OPT_SOCK_RCVBUF
-
-- Always register for TCP events even if there are no outstanding queries, as
-  the other side could always close the connection, which is a valid event
-  which should be responded to.
-
-* September 22 2007 (Daniel Stenberg)
-
-- Steinar H. Gunderson fixed: Correctly clear sockets from the fd_set on in
-  several functions (write_tcp_data, read_tcp_data, read_udp_packets) so that
-  if it fails and the socket is closed the following code doesn't try to use
-  the file descriptor.
-
-- Steinar H. Gunderson modified c-ares to now also do to DNS retries even when
-  TCP is used since there are several edge cases where it still makes sense.
-
-- Brad House provided a fix for ares_save_options():
-
-  Apparently I overlooked something with the ares_save_options() where it
-  would try to do a malloc(0) when no options of that type needed to be saved.
-  On most platforms, this was fine because malloc(0) doesn't actually return
-  NULL, but on AIX it does, so ares_save_options would return ARES_ENOMEM.
-
-* July 14 2007 (Daniel Stenberg)
-
-- Vlad Dinulescu fixed two outstanding valgrind reports:
-
-  1. In ares_query.c , in find_query_by_id we compare q->qid (which is a short
-  int variable) with qid, which is declared as an int variable.  Moreover,
-  DNS_HEADER_SET_QID is used to set the value of qid, but DNS_HEADER_SET_QID
-  sets only the first two bytes of qid. I think that qid should be declared as
-  "unsigned short" in this function.
-
-  2. The same problem occurs in ares_process.c, process_answer() .  query->qid
-  (an unsigned short integer variable) is compared with id, which is an
-  integer variable. Moreover, id is initialized from DNS_HEADER_QID which sets
-  only the first two bytes of id. I think that the id variable should be
-  declared as "unsigned short" in this function.
-
-  Even after declaring these variables as "unsigned short", the valgrind
-  errors are still there. Which brings us to the third problem.
-
-  3. The third problem is that Valgrind assumes that query->qid is not
-  initialised correctly. And it does that because query->qid is set from
-  DNS_HEADER_QID(qbuf); Valgrind says that qbuf has uninitialised bytes. And
-  qbuf has uninitialised bytes because of channel->next_id . And next_id is
-  set by ares_init.c:ares__generate_new_id() . I found that putting short r=0
-  in this function (instead of short r) makes all Valgrind warnings go away.
-  I have studied ares__rc4() too, and this is the offending line:
-
-        buffer_ptr[counter] ^= state[xorIndex];   (ares_query.c:62)
-
-  This is what triggers Valgrind.. buffer_ptr is uninitialised in this function,
-  and by applying ^= on it, it remains uninitialised.
-
-Version 1.4.0 (June 8, 2007)
-
-* June 4 2007 (Daniel Stenberg)
-
-- James Bursa reported a major memory problem when resolving multi-IP names
-  and I found and fixed the problem. It was added by Ashish Sharma's patch
-  two days ago.
-
-  When I then tried to verify multiple entries in /etc/hosts after my fix, I
-  got another segfault and decided this code was not ripe for inclusion and I
-  reverted the patch.
-
-* June 2 2007
-
-- Brad Spencer found and fixed three flaws in the code, found with the new
-  gcc 4.2.0 warning: -Waddress
-
-- Brad House fixed VS2005 compiler warnings due to time_t being 64bit.
-  He also made recent Microsoft compilers use _strdup() instead of strdup().
-
-- Brad House's man pages for ares_save_options() and ares_destroy_options()
-  were added.
-
-- Ashish Sharma provided a patch for supporting multiple entries in the
-  /etc/hosts file. Patch edited for coding style and functionality by me
-  (Daniel).
-
-* May 30 2007
-
-- Shmulik Regev brought cryptographically secure transaction IDs:
-
-  The c-ares library implementation uses a DNS "Transaction ID" field that is
-  seeded with a pseudo random number (based on gettimeofday) which is
-  incremented (++) between consecutive calls and is therefore rather
-  predictable. In general, predictability of DNS Transaction ID is a well
-  known security problem (e.g.
-  http://bak.spc.org/dms/archive/dns_id_attack.txt) and makes a c-ares based
-  implementation vulnerable to DNS poisoning. Credit goes to Amit Klein
-  (Trusteer) for identifying this problem.
-
-  The patch I wrote changes the implementation to use a more secure way of
-  generating unique IDs. It starts by obtaining a key with reasonable entropy
-  which is used with an RC4 stream to generate the cryptographically secure
-  transaction IDs.
-
-  Note that the key generation code (in ares_init:randomize_key) has two
-  versions, the Windows specific one uses a cryptographically safe function
-  provided (but undocumented :) by the operating system (described at
-  http://blogs.msdn.com/michael_howard/archive/2005/01/14/353379.aspx).  The
-  default implementation is a bit naive and uses the standard 'rand'
-  function. Surely a better way to generate random keys exists for other
-  platforms.
-
-  The patch can be tested by using the adig utility and using the '-s' option.
-
-- Brad House added ares_save_options() and ares_destroy_options() that can be
-  used to keep options for later re-usal when ares_init_options() is used.
-
-  Problem: Calling ares_init() for each lookup can be unnecessarily resource
-         intensive.  On windows, it must LoadLibrary() or search the registry
-         on each call to ares_init().  On unix, it must read and parse
-         multiple files to obtain the necessary configuration information.  In
-         a single-threaded environment, it would make sense to only
-         ares_init() once, but in a heavily multi-threaded environment, it is
-         undesirable to ares_init() and ares_destroy() for each thread created
-         and track that.
-
-  Solution: Create ares_save_options() and ares_destroy_options() functions to
-         retrieve and free options obtained from an initialized channel.  The
-         options populated can be used to pass back into ares_init_options(),
-         it should populate all needed fields and not retrieve any information
-         from the system.  Probably wise to destroy the cache every minute or
-         so to prevent the data from becoming stale.
-
-- Daniel S added ares_process_fd() to allow applications to ask for processing
-  on specific sockets and thus avoiding select() and associated
-  functions/macros.  This function will be used by upcoming libcurl releases
-  for this very reason. It also made me export the ares_socket_t type in the
-  public ares.h header file, since ares_process_fd() uses that type for two of
-  the arguments.
-
-* May 25 2007
-
-- Ravi Pratap fixed a flaw in the init_by_resolv_conf() function for windows
-  that could cause it to return a bad return code.
-
-* April 16 2007
-
-- Yang Tse: Provide ares_getopt() command-line parser function as a source
-  code helper function, not belonging to the actual c-ares library.
-
-* February 19 2007
-
-- Vlad Dinulescu added ares_parse_ns_reply().
-
-* February 13 2007
-
-- Yang Tse: Fix failure to get the search sequence of /etc/hosts and
-  DNS from /etc/nsswitch.conf, /etc/host.conf or /etc/svc.conf when
-  /etc/resolv.conf did not exist or was unable to read it.
-
-* November 22 2006
-
-- Install ares_dns.h too
-
-- Michael Wallner fixed this problem: When I set domains in the options
-  struct, and there are domain/search entries in /etc/resolv.conf, the domains
-  of the options struct will be overridden.
-
-* November 6 2006
-
-- Yang Tse removed a couple of potential zero size memory allocations.
-
-- Andreas Rieke fixed the line endings in the areslib.dsp file that I (Daniel)
-  broke in the 1.3.2 release. We should switch to a system where that file is
-  auto-generated. We could rip some code for that from curl...
-
-Version 1.3.2 (November 3, 2006)
-
-* October 12 2006
-
-- Prevent ares_getsock() to overflow if more than 16 sockets are used.
-
-* September 11 2006
-
-- Guilherme Balena Versiani: I noted a strange BUG in Win32 port
-  (ares_init.c/get_iphlpapi_dns_info() function): when I disable the network
-  by hand or disconnect the network cable in Windows 2000 or Windows XP, my
-  application gets 127.0.0.1 as the only name server. The problem comes from
-  'GetNetworkParams' function, that returns the empty string "" as the only
-  name server in that case. Moreover, the Windows implementation of
-  inet_addr() returns INADDR_LOOPBACK instead of INADDR_NONE.
-
-* August 29 2006
-
-- Brad Spencer did
-
-  o made ares_version.h use extern "C" for c++ compilers
-  o fixed compiler warnings in ares_getnameinfo.c
-  o fixed a buffer position init for TCP reads
-
-* August 3 2006
-
-- Ravi Pratap fixed ares_getsock() to actually return the proper bitmap and
-  not always zero!
-
-Version 1.3.1 (June 24, 2006)
-
-* July 23, 2006
-
-- Gisle Vanem added getopt() to the ahost program. Currently accepts
-  only [-t {a|aaaa}] to specify address family in ares_gethostbyname().
-
-* June 19, 2006
-
-- (wahern) Removed "big endian" DNS section and RR data integer parser
-  macros from ares_dns.h, which break c-ares on my Sparc64. Bit-wise
-  operations in C operate on logical values. And in any event the octets are
-  already in big-endian (aka network) byte order so they're being reversed
-  (thus the source of the breakage).
-
-* June 18, 2006
-
-- William Ahern handles EAGAIN/EWOULDBLOCK errors in most of the I/O calls
-  from area_process.c.
-
-  TODO: Handle one last EAGAIN for a UDP socket send(2) in
-  ares__send_query().
-
-* May 10, 2006
-
-- Bram Matthys brought my attention to a libtool peculiarity where detecting
-  things such as C++ compiler actually is a bad thing and since we don't need
-  that detection I added a work-around, much inspired by a previous patch by
-  Paolo Bonzini. This also shortens the configure script quite a lot.
-
-* May 3, 2006
-
-- Nick Mathewson added the ARES_OPT_SOCK_STATE_CB option that when set makes
-  c-ares call a callback on socket state changes. A better way than the
-  ares_getsock() to get full control over the socket state.
-
-* January 9, 2006
-
-- Alexander Lazic improved the getservbyport_r() configure check.
-
-* January 6, 2006
-
-- Alexander Lazic pointed out that the buildconf should use the ACLOCAL_FLAGS
-  variable for easier controlling what it does and how it runs.
-
-* January 5, 2006
-
-- James Bursa fixed c-ares to find the hosts file on RISC OS, and made it
-  build with newer gcc versions that no longer defines "riscos".
-
-* December 22
-
-- Daniel Stenberg added ares_getsock() that extracts the set of sockets to
-  wait for action on. Similar to ares_fds() but not restricted to using
-  select() for the waiting.
-
-* November 25
-
-- Yang Tse fixed some send() / recv() compiler warnings
-
-* September 18
-
-- Added constants that will be used by ares_getaddrinfo
-
-- Made ares_getnameinfo use the reentrant getservbyport (getservbyport_r) if it
-  is available to ensure it works properly in a threaded environment.
-
-* September 10
-
-- configure fix for detecting a member in the sockaddr_in6 struct which failed
-  on ipv6-enabled HP-UX 11.00
-
-Version 1.3.0 (August 29, 2005)
-
-* August 21
-
-- Alfredo Tupone provided a fix for the Windows code in get_iphlpapi_dns_info()
-  when getting the DNS server etc.
-
-* June 19
-
-- Added some checks for the addrinfo structure.
-
-* June 2
-
-- William Ahern:
-
-  Make UDP sockets non-blocking. I've confirmed that at least on Linux 2.4 a
-  read event can come back from poll() on a valid SOCK_DGRAM socket but
-  recv(2) will still block. This patch doesn't ignore EAGAIN in
-  read_udp_packets(), though maybe it should. (This patch was edited by Daniel
-  Stenberg and a new configure test was added (imported from curl's configure)
-  to properly detect what non-blocking socket approach to use.)
-
-  I'm not quite sure how this was happening, but I've been seeing PTR queries
-  which seem to return empty responses. At least, they were empty when calling
-  ares_expand_name() on the record. Here's a patch which guarantees to
-  NUL-terminate the expanded name. The old behavior failed to NUL-terminate if
-  len was 0, and this was causing strlen() to run past the end of the buffer
-  after calling ares_expand_name() and getting ARES_SUCCESS as the return
-  value. If q is not greater than *s then it's equal and *s is always
-  allocated with at least one byte.
-
-* May 16
-
-- Added ares_getnameinfo which mimics the getnameinfo API (another feature
-  that could use testing).
-
-* May 14
-
-- Added an inet_ntop function from BIND for systems that do not have it.
-
-* April 9
-
-- Made sortlist support IPv6 (this can probably use some testing).
-
-- Made sortlist support CIDR matching for IPv4.
-
-* April 8
-
-- Added preliminary IPv6 support to ares_gethostbyname. Currently, sortlist
-  does not work with IPv6. Also provided an implementation of bitncmp from
-  BIND for systems that do not supply this function. This will be used to add
-  IPv6 support to sortlist.
-
-- Made ares_gethostbyaddr support IPv6 by specifying AF_INET6 as the family.
-  The function can lookup IPv6 addresses both from files (/etc/hosts) and
-  DNS lookups.
-
-* April 7
-
-- Tupone Alfredo fixed includes of arpa/nameser_compat.h to build fine on Mac
-  OS X.
-
-* April 5
-
-- Dominick Meglio: Provided implementations of inet_net_pton and inet_pton
-  from BIND for systems that do not include these functions.
-
-* March 11, 2005
-
-- Dominick Meglio added ares_parse_aaaa_reply.c and did various
-  adjustments. The first little steps towards IPv6 support!
-
-* November 7
-
-- Fixed the VC project and makefile to use ares_cancel and ares_version
-
-* October 24
-
-- The released ares_version.h from 1.2.1 says 1.2.0 due to a maketgz flaw.
-  This is now fixed.
-
-Version 1.2.1 (October 20, 2004)
-
-* September 29
-
-- Henrik Stoerner fix: got a report that Tru64 Unix (the unix from Digital
-  when they made Alpha's) uses /etc/svc.conf for the purpose fixed below for
-  other OSes. He made c-ares check for and understand it if present.
-
-- Now c-ares will use local host name lookup _before_ DNS resolving by default
-  if nothing else is told.
-
-* September 26
-
-- Henrik Stoerner: found out that c-ares does not look at the /etc/host.conf
-  file to determine the sequence in which to search /etc/hosts and DNS.  So on
-  systems where this order is defined by /etc/host.conf instead of a "lookup"
-  entry in /etc/resolv.conf, c-ares will always default to looking in DNS
-  first, and /etc/hosts second.
-
-  c-ares now looks at
-
-  1) resolv.conf (for the "lookup" line);
-  2) nsswitch.fon (for the "hosts:" line);
-  3) host.conf (for the "order" line).
-
-  First match wins.
-
-- Dominick Meglio patched: C-ares on Windows assumed that the HOSTS file is
-  located in a static location. It assumed
-  C:\Windows\System32\Drivers\Etc. This is a poor assumption to make. In fact,
-  the location of the HOSTS file can be changed via a registry setting.
-
-  There is a key called DatabasePath which specifies the path to the HOSTS
-  file:
-  http://www.microsoft.com/technet/itsolutions/network/deploy/depovg/tcpip2k.mspx
-
-  The patch will make c-ares correctly consult the registry for the location
-  of this file.
-
-* August 29
-
-- Gisle Vanem fixed the MSVC build files.
-
-* August 20
-
-- Gisle Vanem made c-ares build and work with his Watt-32 TCP/IP stack.
-
-* August 13
-
-- Harshal Pradhan made a minor syntax change in ares_init.c to make it build
-  fine with MSVC 7.1
-
-* July 24
-
-- Made the lib get built static only if --enable-debug is used.
-
-- Gisle Vanem fixed:
-
-  Basically in loops like handle_errors(), 'query->next' was assigned a local
-  variable and then query was referenced after the memory was freed by
-  next_server(). I've changed that so next_server() and end_query() returns
-  the next query. So callers should use this ret-value.
-
-  The next problem was that 'server->tcp_buffer_pos' had a random value at
-  entry to 1st recv() (luckily causing Winsock to return ENOBUFS).
-
-  I've also added a ares_writev() for Windows to streamline the code a bit
-  more.
-
-* July 20
-- Fixed a few variable return types for some system calls. Made configure
-  check for ssize_t to make it possible to use that when receiving the send()
-  error code. This is necessary to prevent compiler warnings on some systems.
-
-- Made configure create config.h, and all source files now include setup.h that
-  might include the proper config.h (or a handicrafted alternative).
-
-- Switched to 'ares_socket_t' type for sockets in ares, since Windows don't
-  use 'int' for that.
-
-- automake-ified and libool-ified c-ares. Now it builds libcares as a shared
-  lib on most platforms if wanted. (This bloated the size of the release
-  archive with another 200K!)
-
-- Makefile.am now uses Makefile.inc for the c sources, h headers and man
-  pages, to make it easier for other makefiles to use the exact same set of
-  files.
-
-- Adjusted 'maketgz' to use the new automake magic when building distribution
-  archives.
-
-- Anyone desires HTML and/or PDF versions of the man pages in the release
-  archives?
-
-* July 3
-- G�nter Knauf made c-ares build and run on Novell Netware.
-
-* July 1
-- Gisle Vanem provided Makefile.dj to build with djgpp, added a few more djgpp
-  fixes and made ares not use 'errno' to provide further info on Windows.
-
-* June 30
-- Gisle Vanem made it build with djgpp and run fine with the Watt-32 stack.
-
-* June 10
-- Gisle Vanem's init patch for Windows:
-
-  The init_by_resolv_conf() function fetches the DNS-server(s)
-  from a series of registry branches.
-
-  This can be wrong in the case where DHCP has assigned nameservers, but the
-  user has overridden these servers with other preferred settings. Then it's
-  wrong to use the DHCPNAMESERVER setting in registry.
-
-  In the case of no global DHCP-assigned or fixed servers, but DNS server(s)
-  per adapter, one has to query the adapter branches.  But how can c-ares know
-  which adapter is valid for use? AFAICS it can't. There could be one adapter
-  that is down (e.g. a VPN adapter).
-
-  So it's better to leave this to the IP Helper API (iphlapi) available in
-  Win-98/2000 and later. My patch falls-back to the old way if not available.
-
-* June 8
-- James Bursa fixed an init issue for RISC OS.
-
-* May 11
-- Nico Stappenbelt reported that when processing domain and search lines in
-  the resolv.conf file, the first entry encountered is processed and used as
-  the search list. According to the manual pages for both Linux, Solaris and
-  Tru64, the last entry of either a domain or a search field is used.
-
-  This is now adjusted in the code
-
-Version 1.2.0 (April 13, 2004)
-
-* April 2, 2004
-- Updated various man pages to look nicer when converted to HTML on the web
-  site.
-
-* April 1, 2004
-- Dirk Manske provided a new function that is now named ares_cancel(). It is
-  used to cancel/cleanup a resolve/request made using ares functions on the
-  given ares channel. It does not destroy/kill the ares channel itself.
-
-- Dominick Meglio cleaned up the formatting in several man pages.
-
-* March 30, 2004
-- Dominick Meglio's new ares_expand_string. A helper function when decoding
-  incoming DNS packages.
-
-- Daniel Stenberg modified the Makefile.in to use a for loop for the man page
-  installation to improve overview and make it easier to add man pages.
-
-Version 1.1.0 (March 11, 2004)
-
-* March 9, 2004
-- Gisle Vanem improved build on Windows.
-
-* February 25, 2004
-- Dan Fandrich found a flaw in the Feb 22 fix.
-
-- Added better configure --enable-debug logic (taken from the curl configure
-  script). Added acinclude.m4 to the tarball.
-
-* February 23, 2004
-- Removed ares_free_errmem(), the function, the file and the man page. It was
-  not used and it did nothing.
-
-- Fixed a lot of code that wasn't "64bit clean" and thus caused a lot of
-  compiler warnings on picky compilers.
-
-* February 22, 2004
-- Dominick Meglio made ares init support multiple name servers in the
-  NameServer key on Windows.
-
-* February 16, 2004
-- Modified ares_private.h to include libcurl's memory debug header if
-  CURLDEBUG is set. This makes all the ares-functions supervised properly by
-  the curl test suite. This also forced me to add inclusion of the
-  ares_private.h header in a few more files that are using some kind of
-  memory-related resources.
-
-- Made the makefile only build ahost and adig if 'make demos' is used.
-
-* February 10, 2004
-- Dirk Manske made ares_version.h installed with 'make install'
-
-* February 4, 2004
-- ares_free_errmem() is subject for removal, it is simply present for future
-  purposes, and since we removed the extra parameter in strerror() it won't
-  be used by c-ares!
-- configure --enable-debug now enables picky compiler options if gcc is used
-- fixed several compiler warnings --enable-debug showed and Joerg Mueller-Tolk
-  reported
-
-Version 1.0.0 (February 3, 2004)
-
-* February 3, 2004
-- now we produce the libcares.a library instead of the previous libares.a
-  since we are no longer compatible
-
-* February 2, 2004
-
-- ares_strerror() has one argument less. This is the first official
-  modification of the existing provided ares API.
-
-* January 29, 2004
-
-- Dirk Manske fixed how the socket is set non-blocking.
-
-* January 4, 2004
-
-- Dominick Meglio made the private gettimeofday() become ares_gettimeofday()
-  instead in order to not pollute the name space and risk colliding with
-  other libraries' versions of this function.
-
-* October 24, 2003. Daniel Stenberg
-
-  Added ares_version().
-
-Version 1.0-pre1 (8 October 2003)
-
-- James Bursa made it run on RISC OS
-
-- Dominick Meglio made it run fine on NT4
-
-- Duncan Wilcox made it work fine on Mac OS X
-
-- Daniel Stenberg adjusted the windows port
-
-- liren at vivisimo.com made the initial windows port
-
-* Imported the sources from ares 1.1.1
diff --git a/contrib/libs/c-ares/INSTALL.md b/contrib/libs/c-ares/INSTALL.md
index de766aad283d..dc58ab8c0457 100644
--- a/contrib/libs/c-ares/INSTALL.md
+++ b/contrib/libs/c-ares/INSTALL.md
@@ -1,5 +1,3 @@
-** This file is adapted from libcurl and not yet fully rewritten for c-ares! **
-
 ```
                           ___       __ _ _ __ ___  ___
                          / __| ___ / _` | '__/ _ \/ __|
@@ -44,7 +42,7 @@ unpacked the source archive):
 You probably need to be root when doing the last command.
 
 If you have checked out the sources from the git repository, read the
-[GIT-INFO](GIT_INFO) on how to proceed.
+[GIT-INFO](GIT-INFO) on how to proceed.
 
 Get a full listing of all available configure options by invoking it like:
 
@@ -309,6 +307,16 @@ first to rebuild every single library your app uses as well as your
 app using the debug multithreaded dynamic C runtime.
 
 
+### MSYS
+
+Building is supported for native windows via both AutoTools and CMake.  When
+building with autotools, you can only build either a shared version or a static
+version (use `--disable-shared` or `--disable-static`).  CMake can build both
+simultaneously.
+
+All of the MSYS environments are supported: `MINGW32`, `MINGW64`, `UCRT64`,
+`CLANG32`, `CLANG64`, `CLANGARM64`.
+
 ### MingW32
 
 Make sure that MinGW32's bin dir is in the search path, for example:
@@ -341,6 +349,26 @@ add `-DCARES_STATICLIB` to your `CFLAGS`.  Otherwise the linker will look for
 dynamic import symbols.
 
 
+DOS
+---
+
+c-ares supports building as a 32bit protected mode application via
+[DJGPP](https://www.delorie.com/djgpp/).  It is recommended to use a DJGPP
+cross compiler from [Andrew Wu](https://github.com/andrewwutw/build-djgpp)
+as building directly in a DOS environment can be difficult.
+
+It is required to also have [Watt-32](https://www.watt-32.net/) available
+built using the same compiler.  It is recommended to build the latest `master`
+branch from [GitHub](https://github.com/sezero/watt32/tree/master).
+
+Finally, the `DJ_PREFIX` and `WATT_ROOT` environment variables must be set
+appropriately before calling `make Makefile.dj` to build c-ares.
+
+Please refer to our CI
+[GitHub Actions Workflow](https://github.com/c-ares/c-ares/blob/main/.github/workflows/djgpp.yml)
+for a full build example, including building the latest Watt-32 release.
+
+
 IBM OS/2
 --------
 
@@ -420,20 +448,25 @@ This is a probably incomplete list of known hardware and operating systems
 that c-ares has been compiled for. If you know a system c-ares compiles and
 runs on, that isn't listed, please let us know!
 
-     - Alpha Tru64 v5.0 5.1
-     - ARM Android 1.5, 2.1, 2.3
-     - MIPS IRIX 6.2, 6.5
-     - Power AIX 3.2.5, 4.2, 4.3.1, 4.3.2, 5.1, 5.2
-     - i386 Linux 1.3, 2.0, 2.2, 2.3, 2.4, 2.6
-     - i386 Novell NetWare
-     - i386 Windows 95, 98, ME, NT, 2000, XP, 2003
-     - x86_64 Linux
+     - Linux (i686, x86_64, AARCH64, and more)
+     - MacOS 10.4+
+     - iOS
+     - Windows 8+ (i686, x86_64)
+     - Android (ARM, AARCH64, x86_64)
+     - FreeBSD
+     - NetBSD
+     - OpenBSD
+     - Solaris (SPARC, x86_64)
+     - AIX (POWER)
+     - Tru64 (Alpha)
+     - IRIX (MIPS)
+     - Novell NetWare (i386)
 
 
 Useful URLs
 ===========
 
  - c-ares: https://c-ares.org/
- - MingW: http://www.mingw.org/
  - MinGW-w64: http://mingw-w64.sourceforge.net/
+ - MSYS2: https://msys2.org
  - OpenWatcom: http://www.openwatcom.org/
diff --git a/contrib/libs/c-ares/LICENSE.md b/contrib/libs/c-ares/LICENSE.md
index e27bae933fc7..910ddded5c7a 100644
--- a/contrib/libs/c-ares/LICENSE.md
+++ b/contrib/libs/c-ares/LICENSE.md
@@ -1,5 +1,3 @@
-# c-ares license
-
 MIT License
 
 Copyright (c) 1998 Massachusetts Institute of Technology  
diff --git a/contrib/libs/c-ares/NEWS b/contrib/libs/c-ares/NEWS
deleted file mode 100644
index 95a2eeea2742..000000000000
--- a/contrib/libs/c-ares/NEWS
+++ /dev/null
@@ -1,21 +0,0 @@
-Major changes since:
-* see the CHANGES file
-
-Major changes in release 1.1.1:
-* ares should now compile as C++ code (no longer uses reserved word
-  "class").
-* Added SRV support to adig test program.
-* Fixed a few error handling bugs in query processing.
-
-Major changes in release 1.1.0:
-* Added ares_free_string() function so that memory can be freed in the
-  same layer as it is allocated, a desirable feature in some
-  environments.
-* A few of the ares_dns.h macros are fixed to use the proper bitwise
-  operator.
-* Fixed a couple of fenceposts fixed in ares_expand_name()'s
-  bounds-checking.
-* In process_timeouts(), extract query->next before calling
-  next_server() and possibly freeing the query structure.
-* Casted arguments to ctype macros casted to unsigned char, since not
-  all char values are valid inputs to those macros according to ANSI.
diff --git a/contrib/libs/c-ares/README.cares b/contrib/libs/c-ares/README.cares
deleted file mode 100644
index ec809ab94836..000000000000
--- a/contrib/libs/c-ares/README.cares
+++ /dev/null
@@ -1,15 +0,0 @@
-c-ares
-======
-
-This package is based on ares 1.1.1 (written by Greg Hudson). Daniel Stenberg
-decided to fork and release a separate project since the original ares author
-didn't want the improvements that were vital for our use of it.
-
-This package is dubbed 'c-ares' since Daniel wanted this for use within the
-curl project (hence the letter C) and it makes a nice pun. c-ares is not API
-compatible with ares: a new name makes that more obvious to the public.
-
-The original libares was distributed at
-ftp://athena-dist.mit.edu:pub/ATHENA/ares (which seems to not be alive
-anymore).  A local copy of the original ares package is kept here:
-https://c-ares.org/download/ares-1.1.1.tar.gz
diff --git a/contrib/libs/c-ares/README.md b/contrib/libs/c-ares/README.md
index 5e022a85c154..c32d0677c834 100644
--- a/contrib/libs/c-ares/README.md
+++ b/contrib/libs/c-ares/README.md
@@ -2,12 +2,20 @@
 
 [![Build Status](https://api.cirrus-ci.com/github/c-ares/c-ares.svg?branch=main)](https://cirrus-ci.com/github/c-ares/c-ares)
 [![Windows Build Status](https://ci.appveyor.com/api/projects/status/aevgc5914tm72pvs/branch/main?svg=true)](https://ci.appveyor.com/project/c-ares/c-ares/branch/main)
-[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
+[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg?branch=main)](https://coveralls.io/github/c-ares/c-ares?branch=main)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/c-ares.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:c-ares)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=c-ares_c-ares&metric=bugs)](https://sonarcloud.io/summary/new_code?id=c-ares_c-ares)
 [![Coverity Scan Status](https://scan.coverity.com/projects/c-ares/badge.svg)](https://scan.coverity.com/projects/c-ares)
 
+- [Overview](#overview)
+- [Code](#code)
+- [Communication](#communication)
+- [Release Keys](#release-keys)
+  - [Verifying signatures](#verifying-signatures)
+- [Features](#features)
+  - [RFCs and Proposals](#supported-rfcs-and-proposals)
+
 ## Overview
 [c-ares](https://c-ares.org) is a modern DNS (stub) resolver library, written in
 C. It provides interfaces for asynchronous queries while trying to abstract the
@@ -39,7 +47,7 @@ best practices in regards to C coding standards.
 
 The full source code and revision history is available in our
 [GitHub  repository](https://github.com/c-ares/c-ares).  Our signed releases
-are available in the ['c-ares' release archives](https://c-ares.org/download/).
+are available in the [release archives](https://c-ares.org/download/).
 
 
 See the [INSTALL.md](INSTALL.md) file for build information.
@@ -99,3 +107,47 @@ gpg:          There is no indication that the signature belongs to the owner.
 Primary key fingerprint: 27ED EAF2 2F3A BCEB 50DB  9A12 5CC9 08FD B71E 12C2
 gpg: binary signature, digest algorithm SHA512, key algorithm rsa2048
 ```
+
+## Features
+### Supported RFCs and Proposals
+- [RFC1035](https://datatracker.ietf.org/doc/html/rfc7873).
+  Initial/Base DNS RFC
+- [RFC2671](https://datatracker.ietf.org/doc/html/rfc2671),
+  [RFC6891](https://datatracker.ietf.org/doc/html/rfc6891).
+  EDNS0 option (meta-RR)
+- [RFC3596](https://datatracker.ietf.org/doc/html/rfc3596).
+  IPv6 Address. `AAAA` Record.
+- [RFC2782](https://datatracker.ietf.org/doc/html/rfc2782).
+  Server Selection. `SRV` Record.
+- [RFC3403](https://datatracker.ietf.org/doc/html/rfc3403).
+  Naming Authority Pointer. `NAPTR` Record.
+- [RFC6698](https://datatracker.ietf.org/doc/html/rfc6698).
+  DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol.
+  `TLSA` Record.
+- [RFC9460](https://datatracker.ietf.org/doc/html/rfc9460).
+  General Purpose Service Binding, Service Binding type for use with HTTPS.
+  `SVCB` and `HTTPS` Records.
+- [RFC7553](https://datatracker.ietf.org/doc/html/rfc7553).
+  Uniform Resource Identifier. `URI` Record.
+- [RFC6844](https://datatracker.ietf.org/doc/html/rfc6844).
+  Certification Authority Authorization. `CAA` Record.
+- [RFC2535](https://datatracker.ietf.org/doc/html/rfc2535),
+  [RFC2931](https://datatracker.ietf.org/doc/html/rfc2931).
+  `SIG0` Record. Only basic parser, not full implementation.
+- [RFC7873](https://datatracker.ietf.org/doc/html/rfc7873),
+  [RFC9018](https://datatracker.ietf.org/doc/html/rfc9018).
+  DNS Cookie off-path dns poisoning and amplification mitigation.
+- [draft-vixie-dnsext-dns0x20-00](https://datatracker.ietf.org/doc/html/draft-vixie-dnsext-dns0x20-00).
+  DNS 0x20 query name case randomization to prevent cache poisioning attacks.
+- [RFC7686](https://datatracker.ietf.org/doc/html/rfc7686).
+  Reject queries for `.onion` domain names with `NXDOMAIN`.
+- [RFC2606](https://datatracker.ietf.org/doc/html/rfc2606),
+  [RFC6761](https://datatracker.ietf.org/doc/html/rfc6761).
+  Special case treatment for `localhost`/`.localhost`.
+- [RFC2308](https://datatracker.ietf.org/doc/html/rfc2308),
+  [RFC9520](https://datatracker.ietf.org/doc/html/rfc9520).
+  Negative Caching of DNS Resolution Failures.
+- [RFC6724](https://datatracker.ietf.org/doc/html/rfc6724).
+  IPv6 address sorting as used by `ares_getaddrinfo()`.
+- [RFC7413](https://datatracker.ietf.org/doc/html/rfc7413).
+  TCP FastOpen (TFO) for 0-RTT TCP Connection Resumption.
diff --git a/contrib/libs/c-ares/RELEASE-NOTES.md b/contrib/libs/c-ares/RELEASE-NOTES.md
index 7d30a3d4e755..b072feb29fde 100644
--- a/contrib/libs/c-ares/RELEASE-NOTES.md
+++ b/contrib/libs/c-ares/RELEASE-NOTES.md
@@ -1,33 +1,33 @@
-## c-ares version 1.30.0 - June 7 2024
+## c-ares version 1.33.0 - August 2 2024
 
-This is a maintenance and bugfix release.
+This is a feature and bugfix release.
 
 Features:
-
-* Basic support for SIG RR record (RFC 2931 / RFC 2535) [PR #773](https://github.com/c-ares/c-ares/pull/773)
+* Add DNS cookie support (RFC7873 + RFC9018) to help prevent off-path cache
+  poisoning attacks. [PR #833](https://github.com/c-ares/c-ares/pull/833)
+* Implement TCP FastOpen (TFO) RFC7413, which will make TCP reconnects 0-RTT
+  on supported systems. [PR #840](https://github.com/c-ares/c-ares/pull/840)
 
 Changes:
-
-* Validation that DNS strings can only consist of printable ascii characters
-  otherwise will trigger a parse failure.
-  [75de16c](https://github.com/c-ares/c-ares/commit/75de16c) and
-  [40fb125](https://github.com/c-ares/c-ares/commit/40fb125)
-* Windows: use `GetTickCount64()` for a monotonic timer that does not wrap. [1dff8f6](https://github.com/c-ares/c-ares/commit/1dff8f6)
+* Reorganize source tree. [PR #822](https://github.com/c-ares/c-ares/pull/822)
+* Refactoring of connection handling to prevent code duplication.
+  [PR #839](https://github.com/c-ares/c-ares/pull/839)
+* New dynamic array data structure to prevent simple logic flaws in array
+  handling in various code paths.
+  [PR #841](https://github.com/c-ares/c-ares/pull/841)
 
 Bugfixes:
+* `ares_destroy()` race condition during shutdown due to missing lock.
+  [PR #831](https://github.com/c-ares/c-ares/pull/831)
+* Android: Preserve thread name after attaching it to JVM.
+  [PR #838](https://github.com/c-ares/c-ares/pull/838)
+* Windows UWP (Store) support fix.
+  [PR #845](https://github.com/c-ares/c-ares/pull/845)
 
-* QueryCache: Fix issue where purging on server changes wasn't working. [a6c8fe6](https://github.com/c-ares/c-ares/commit/a6c8fe6)
-* Windows: Fix Y2K38 issue by creating our own `ares_timeval_t` datatype. [PR #772](https://github.com/c-ares/c-ares/pull/772)
-* Fix packaging issue affecting MacOS due to a missing header. [55afad6](https://github.com/c-ares/c-ares/commit/55afad6)
-* MacOS: Fix UBSAN warnings that are likely meaningless due to alignment issues
-  in new MacOS config reader.
-* Android: arm 32bit build failure due to missing symbol. [d1722e6](https://github.com/c-ares/c-ares/commit/d1722e6)
 
 Thanks go to these friendly people for their efforts and contributions for this
 release:
 
 * Brad House (@bradh352)
-* Daniel Stenberg (@bagder)
-
-
+* Yauheni Khnykin (@Hsilgos)
 
diff --git a/contrib/libs/c-ares/RELEASE-PROCEDURE.md b/contrib/libs/c-ares/RELEASE-PROCEDURE.md
index 1abc9a3822f3..c686a9f97b37 100644
--- a/contrib/libs/c-ares/RELEASE-PROCEDURE.md
+++ b/contrib/libs/c-ares/RELEASE-PROCEDURE.md
@@ -4,49 +4,74 @@ c-ares release procedure - how to do a release
 in the source code repo
 -----------------------
 
-- edit `RELEASE-NOTES` to be accurate
-
+- edit `RELEASE-NOTES.md` to be accurate
 - edit `configure.ac`'s `CARES_VERSION_INFO`, and `CMakeLists.txt`'s
   `CARES_LIB_VERSIONINFO` set to the same value to denote the current shared
   object versioning.
-
 - edit `include/ares_version.h` and set `ARES_VERSION_*` definitions to reflect
   the current version.
-
-- make sure all relevant changes are committed on the master branch
-
-- tag the git repo in this style: `git tag -a cares-1_14_0` -a annotates the
-  tag and we use underscores instead of dots in the version number.
-
-- run "./maketgz 1.14.0" to build the release tarball. It is important that
-  you run this on a machine with the correct set of autotools etc installed
-  as this is what then will be shipped and used by most users on *nix like
-  systems.
-
-- push the git commits and the new tag
-
-- gpg sign the tarball
-
-- upload the resulting files to https://c-ares.org/download/
+- All release tags need to be made off a release branch named `vX.Y`, where `X`
+  is the Major version number, and `Y` is the minor version number. We also
+  want to create an empty commit in the branch with a message, this ensures
+  when we tag a release from the branch, it gets tied to the branch itself and
+  not a commit which may be shared across this branch and `main`. Create the
+  branch like:
+```
+BRANCH=1.32
+git pull && \
+git checkout main && \
+git checkout -b v${BRANCH} main && \
+git commit --allow-empty -m "Created release branch v${BRANCH}" && \
+git push -u origin v${BRANCH}
+```
+- make sure all relevant changes are committed on the release branch
+- Create a signed tag for the release using a name of `vX.Y.Z` where `X` is the
+  Major version number, `Y` is the minor version number, and `Z` is the release.
+  This tag needs to be created from the release branch, for example:
+```
+BRANCH=1.32
+RELEASE=1.32.0
+git checkout v${BRANCH} && \
+git pull && \
+git tag -s v${RELEASE} -m 'c-ares release v${RELEASE}' v${BRANCH} && \
+git push origin --tags
+```
+- Create the release tarball using `make dist`, it is best to check out the
+  specific tag fresh and build from that:
+```
+RELEASE=1.32.0
+git clone --depth 1 --branch v${RELEASE} https://github.com/c-ares/c-ares c-ares-${RELEASE} && \
+cd c-ares-${RELEASE} && \
+autoreconf -fi && \
+./configure && \
+make && \
+make dist VERSION=${RELEASE}
+```
+- GPG sign the release with a detached signature. Valid signing keys are currently:
+  - Daniel Stenberg <daniel@haxx.se> - 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
+  - Brad House <brad@brad-house.com> - DA7D64E4C82C6294CB73A20E22E3D13B5411B7CA
+```
+gpg -ab c-ares-${RELEASE}.tar.gz
+```
+- Create a new release on GitHub using the `RELEASE-NOTES.md` as the body.
+  Upload the generated tarball and signature as an artifact.
 
 in the c-ares-www repo
 ----------------------
 
-- edit `index.t` (version number and date),
-
-- edit `changelog.t` (add the new release in there)
-
+- edit `index.md`, change version and date in frontmatter
+- edit `changelog.md`, copy `RELEASE-NOTES.md` content
+- edit `download.md`, add new version and date in frontmatter
 - commit all local changes
-
-- tag the repo with the same tag as used for the source repo
-
-- push the git commits and the new tag
+- push the git commits
 
 inform
 ------
 
-- send an email to the c-ares mailing list. Insert the RELEASE-NOTES into the
+- send an email to the c-ares mailing list. Insert the RELEASE-NOTES.md into the
   mail.
+- Create an announcement in the GitHub Discussions Announcements section:
+  https://github.com/c-ares/c-ares/discussions/categories/announcements
 
 celebrate
 ---------
diff --git a/contrib/libs/c-ares/include/ares.h b/contrib/libs/c-ares/include/ares.h
index 46cdf9fa8e5a..adb2fe8419dd 100644
--- a/contrib/libs/c-ares/include/ares.h
+++ b/contrib/libs/c-ares/include/ares.h
@@ -30,18 +30,43 @@
 
 #include "ares_version.h" /* c-ares version defines   */
 #include "ares_build.h"   /* c-ares build definitions */
-#include "ares_rules.h"   /* c-ares rules enforcement */
 
-/*
- * Define WIN32 when build target is Win32 API
- */
+#if defined(_WIN32)
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#endif
+
+#ifdef CARES_HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
+#ifdef CARES_HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+
+#ifdef CARES_HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
 
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) && \
-  !defined(__SYMBIAN32__)
-#  define WIN32
+#ifdef CARES_HAVE_WINSOCK2_H
+#  include <winsock2.h>
+/* To aid with linking against a static c-ares build, lets tell the microsoft
+ * compiler to pull in needed dependencies */
+#  ifdef _MSC_VER
+#    pragma comment(lib, "ws2_32")
+#    pragma comment(lib, "advapi32")
+#    pragma comment(lib, "iphlpapi")
+#  endif
+#endif
+
+#ifdef CARES_HAVE_WS2TCPIP_H
+#  include <ws2tcpip.h>
 #endif
 
-#include <sys/types.h>
+#ifdef CARES_HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
 
 /* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
    libc5-based Linux systems. Only include it on system that are known to
@@ -52,43 +77,26 @@
   defined(__QNXNTO__) || defined(__MVS__) || defined(__HAIKU__)
 #  include <sys/select.h>
 #endif
+
 #if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
 #  include <sys/bsdskt.h>
 #endif
 
-#if defined(WATT32)
+#if !defined(_WIN32)
 #  include <netinet/in.h>
-#  include <sys/socket.h>
+#endif
+
+#ifdef WATT32
 #  include <tcp.h>
-#elif defined(_WIN32_WCE)
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock.h>
-#elif defined(WIN32)
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-/* To aid with linking against a static c-ares build, lets tell the microsoft
- * compiler to pull in needed dependencies */
-#  ifdef _MSC_VER
-#    pragma comment(lib, "ws2_32")
-#    pragma comment(lib, "advapi32")
-#    pragma comment(lib, "iphlpapi")
-#  endif
-#else
-#  include <sys/socket.h>
-#  include <netinet/in.h>
 #endif
 
 #if defined(ANDROID) || defined(__ANDROID__)
 #  include <jni.h>
 #endif
 
+typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
+typedef CARES_TYPEOF_ARES_SSIZE_T   ares_ssize_t;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -230,6 +238,7 @@ typedef enum {
 #define ARES_FLAG_NOCHECKRESP (1 << 7)
 #define ARES_FLAG_EDNS        (1 << 8)
 #define ARES_FLAG_NO_DFLT_SVR (1 << 9)
+#define ARES_FLAG_DNS0x20     (1 << 10)
 
 /* Option mask values */
 #define ARES_OPT_FLAGS           (1 << 0)
@@ -315,7 +324,7 @@ typedef enum {
  */
 
 #ifndef ares_socket_typedef
-#  ifdef WIN32
+#  if defined(_WIN32) && !defined(WATT32)
 typedef SOCKET ares_socket_t;
 #    define ARES_SOCKET_BAD INVALID_SOCKET
 #  else
diff --git a/contrib/libs/c-ares/include/ares_build-linux.h b/contrib/libs/c-ares/include/ares_build-linux.h
index bf3692fbbebf..25bf2193b8ce 100644
--- a/contrib/libs/c-ares/include/ares_build-linux.h
+++ b/contrib/libs/c-ares/include/ares_build-linux.h
@@ -13,10 +13,10 @@
  * for C-Ares */
 #define CARES_HAVE_SYS_TYPES_H
 #define CARES_HAVE_SYS_SOCKET_H
+#define CARES_HAVE_SYS_SELECT_H
 /* #undef CARES_HAVE_WINDOWS_H */
 /* #undef CARES_HAVE_WS2TCPIP_H */
 /* #undef CARES_HAVE_WINSOCK2_H */
-/* #undef CARES_HAVE_WINDOWS_H */
 #define CARES_HAVE_ARPA_NAMESER_H
 #define CARES_HAVE_ARPA_NAMESER_COMPAT_H
 
@@ -28,6 +28,10 @@
 #  include <sys/socket.h>
 #endif
 
+#ifdef CARES_HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
+
 #ifdef CARES_HAVE_WINSOCK2_H
 #  include <winsock2.h>
 #endif
@@ -40,8 +44,4 @@
 #  include <windows.h>
 #endif
 
-
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-typedef CARES_TYPEOF_ARES_SSIZE_T ares_ssize_t;
-
 #endif /* __CARES_BUILD_H */
diff --git a/contrib/libs/c-ares/include/ares_dns_record.h b/contrib/libs/c-ares/include/ares_dns_record.h
index 5533929f65f2..2896eab24b34 100644
--- a/contrib/libs/c-ares/include/ares_dns_record.h
+++ b/contrib/libs/c-ares/include/ares_dns_record.h
@@ -94,7 +94,7 @@ typedef enum {
   ARES_OPCODE_IQUERY = 1, /*!< Inverse query. Obsolete. */
   ARES_OPCODE_STATUS = 2, /*!< Name server status query */
   ARES_OPCODE_NOTIFY = 4, /*!< Zone change notification (RFC 1996) */
-  ARES_OPCODE_UPDATE = 5, /*!< Zone update message (RFC2136) */
+  ARES_OPCODE_UPDATE = 5  /*!< Zone update message (RFC2136) */
 } ares_dns_opcode_t;
 
 /*! DNS Header flags */
@@ -108,7 +108,7 @@ typedef enum {
   ARES_FLAG_AD = 1 << 5, /*!< RFC 2065. Authentic Data bit indicates in a
                           * response that the data included has been verified by
                           * the server providing it */
-  ARES_FLAG_CD = 1 << 6, /*!< RFC 2065. Checking Disabled bit indicates in a
+  ARES_FLAG_CD = 1 << 6  /*!< RFC 2065. Checking Disabled bit indicates in a
                           * query that non-verified data is acceptable to the
                           * resolver sending the query. */
 } ares_dns_flags_t;
@@ -152,7 +152,7 @@ typedef enum {
   ARES_RCODE_BADNAME   = 20, /*!< RFC 2930. Duplicate Key Name */
   ARES_RCODE_BADALG    = 21, /*!< RFC 2930. Algorithm not supported */
   ARES_RCODE_BADTRUNC  = 22, /*!< RFC 8945. Bad Truncation */
-  ARES_RCODE_BADCOOKIE = 23, /*!< RVC 7973. Bad/missing Server Cookie */
+  ARES_RCODE_BADCOOKIE = 23  /*!< RFC 7873. Bad/missing Server Cookie */
 } ares_dns_rcode_t;
 
 /*! Data types used */
@@ -171,6 +171,9 @@ typedef enum {
                               *   length) */
   ARES_DATATYPE_OPT = 10,    /*!< Array of options.  16bit identifier, BIN
                               *   data. */
+  ARES_DATATYPE_ABINP = 11   /*!< Array of binary data, likely printable.
+                              *   Guaranteed to have a NULL terminator for
+                              *   convenience (not included in length) */
 } ares_dns_datatype_t;
 
 /*! Keys used for all RR Types.  We take the record type and multiply by 100
@@ -207,7 +210,7 @@ typedef enum {
   ARES_RR_MX_PREFERENCE = (ARES_REC_TYPE_MX * 100) + 1,
   /*! MX Record. Exchange, domain. Datatype: NAME */
   ARES_RR_MX_EXCHANGE = (ARES_REC_TYPE_MX * 100) + 2,
-  /*! TXT Record. Data. Datatype: BINP */
+  /*! TXT Record. Data. Datatype: ABINP */
   ARES_RR_TXT_DATA = (ARES_REC_TYPE_TXT * 100) + 1,
   /*! SIG Record. Type Covered. Datatype: U16 */
   ARES_RR_SIG_TYPE_COVERED = (ARES_REC_TYPE_SIG * 100) + 1,
@@ -292,7 +295,7 @@ typedef enum {
   /*! RAW Record. RR Type. Datatype: U16 */
   ARES_RR_RAW_RR_TYPE = (ARES_REC_TYPE_RAW_RR * 100) + 1,
   /*! RAW Record. RR Data. Datatype: BIN */
-  ARES_RR_RAW_RR_DATA = (ARES_REC_TYPE_RAW_RR * 100) + 2,
+  ARES_RR_RAW_RR_DATA = (ARES_REC_TYPE_RAW_RR * 100) + 2
 } ares_dns_rr_key_t;
 
 /*! TLSA Record ARES_RR_TLSA_CERT_USAGE known values */
@@ -372,7 +375,7 @@ typedef enum {
   /*! RFC 8145. Signaling Trust Anchor Knowledge in DNSSEC */
   ARES_OPT_PARAM_EDNS_KEY_TAG = 14,
   /*! RFC 8914. Extended ERROR code and message */
-  ARES_OPT_PARAM_EXTENDED_DNS_ERROR = 15,
+  ARES_OPT_PARAM_EXTENDED_DNS_ERROR = 15
 } ares_opt_param_t;
 
 /*! Data type for option records for keys like ARES_RR_OPT_OPTIONS and
@@ -600,6 +603,15 @@ CARES_EXTERN void          ares_dns_record_destroy(ares_dns_record_t *dnsrec);
 CARES_EXTERN unsigned short
   ares_dns_record_get_id(const ares_dns_record_t *dnsrec);
 
+/*! Overwrite the DNS query id
+ *
+ * \param[in] dnsrec  Initialized record object
+ * \param[in] id      DNS query id
+ * \return ARES_TRUE on success, ARES_FALSE on usage error
+ */
+CARES_EXTERN ares_bool_t ares_dns_record_set_id(ares_dns_record_t *dnsrec,
+                                                unsigned short     id);
+
 /*! Get the DNS Record Flags
  *
  *  \param[in] dnsrec  Initialized record object
@@ -863,6 +875,34 @@ CARES_EXTERN ares_status_t ares_dns_rr_set_bin(ares_dns_rr_t       *dns_rr,
                                                const unsigned char *val,
                                                size_t               len);
 
+/*! Add binary array value (ABINP) data for specified resource record and key.
+ *  Can only be used on keys with datatype ARES_DATATYPE_ABINP.  The value will
+ *  Be added as the last element in the array.
+ *
+ *  \param[in] dns_rr Pointer to resource record
+ *  \param[in] key    DNS Resource Record Key
+ *  \param[in] val    Pointer to binary data.
+ *  \param[in] len    Length of binary data
+ *  \return ARES_SUCCESS on success
+ */
+CARES_EXTERN ares_status_t ares_dns_rr_add_abin(ares_dns_rr_t       *dns_rr,
+                                                ares_dns_rr_key_t    key,
+                                                const unsigned char *val,
+                                                size_t               len);
+
+/*! Delete binary array value (ABINP) data for specified resource record and
+ *  key by specified index. Can only be used on keys with datatype
+ *  ARES_DATATYPE_ABINP.  The value at the index will be deleted.
+ *
+ *  \param[in] dns_rr Pointer to resource record
+ *  \param[in] key    DNS Resource Record Key
+ *  \param[in] idx    Index to delete
+ *  \return ARES_SUCCESS on success
+ */
+CARES_EXTERN ares_status_t ares_dns_rr_del_abin(ares_dns_rr_t    *dns_rr,
+                                                ares_dns_rr_key_t key,
+                                                size_t            idx);
+
 /*! Set the option for the RR
  *
  *  \param[in]  dns_rr   Pointer to resource record
@@ -878,6 +918,17 @@ CARES_EXTERN ares_status_t ares_dns_rr_set_opt(ares_dns_rr_t       *dns_rr,
                                                const unsigned char *val,
                                                size_t               val_len);
 
+/*! Delete the option for the RR by id
+ *
+ *  \param[in] dns_rr   Pointer to resource record
+ *  \param[in] key      DNS Resource Record Key
+ *  \param[in] opt      Option record key id.
+ *  \return ARES_SUCCESS if removed, ARES_ENOTFOUND if not found
+ */
+CARES_EXTERN ares_status_t ares_dns_rr_del_opt_byid(ares_dns_rr_t    *dns_rr,
+                                                    ares_dns_rr_key_t key,
+                                                    unsigned short    opt);
+
 /*! Retrieve a pointer to the ipv4 address.  Can only be used on keys with
  *  datatype ARES_DATATYPE_INADDR.
  *
@@ -939,8 +990,9 @@ CARES_EXTERN unsigned int   ares_dns_rr_get_u32(const ares_dns_rr_t *dns_rr,
                                                 ares_dns_rr_key_t    key);
 
 /*! Retrieve a pointer to the binary data.  Can only be used on keys with
- *  datatype ARES_DATATYPE_BIN or ARES_DATATYPE_BINP.  If BINP, the data is
- *  guaranteed to have a NULL terminator which is NOT included in the length.
+ *  datatype ARES_DATATYPE_BIN, ARES_DATATYPE_BINP, or ARES_DATATYPE_ABINP.
+ *  If BINP or ABINP, the data is guaranteed to have a NULL terminator which
+ *  is NOT included in the length.
  *
  *  \param[in]  dns_rr Pointer to resource record
  *  \param[in]  key    DNS Resource Record Key
@@ -951,6 +1003,33 @@ CARES_EXTERN const unsigned char *
   ares_dns_rr_get_bin(const ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
                       size_t *len);
 
+/*! Retrieve the count of the array of stored binary values. Can only be used on
+ *  keys with datatype ARES_DATATYPE_ABINP.
+ *
+ *  \param[in]  dns_rr Pointer to resource record
+ *  \param[in]  key    DNS Resource Record Key
+ *  \return count of values
+ */
+CARES_EXTERN size_t ares_dns_rr_get_abin_cnt(const ares_dns_rr_t *dns_rr,
+                                             ares_dns_rr_key_t    key);
+
+/*! Retrieve a pointer to the binary array data from the specified index.  Can
+ *  only be used on keys with datatype ARES_DATATYPE_ABINP.  If ABINP, the data
+ *  is guaranteed to have a NULL terminator which is NOT included in the length.
+ *  If want all array membersconcatenated, may use ares_dns_rr_get_bin()
+ *  instead.
+ *
+ *  \param[in]  dns_rr Pointer to resource record
+ *  \param[in]  key    DNS Resource Record Key
+ *  \param[in]  idx    Index of value to retrieve
+ *  \param[out] len    Length of binary data returned
+ *  \return pointer binary data or NULL on error
+ */
+CARES_EXTERN const unsigned char *
+  ares_dns_rr_get_abin(const ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
+                       size_t idx, size_t *len);
+
+
 /*! Retrieve the number of options stored for the RR.
  *
  *  \param[in] dns_rr Pointer to resource record
diff --git a/contrib/libs/c-ares/include/ares_rules.h b/contrib/libs/c-ares/include/ares_rules.h
deleted file mode 100644
index 450dc8ab2d5f..000000000000
--- a/contrib/libs/c-ares/include/ares_rules.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* MIT License
- *
- * Copyright (c) 2009 Daniel Stenberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * SPDX-License-Identifier: MIT
- */
-#ifndef __CARES_RULES_H
-#define __CARES_RULES_H
-
-/* ================================================================ */
-/*                    COMPILE TIME SANITY CHECKS                    */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * All checks done in this file are intentionally placed in a public
- * header file which is pulled by ares.h when an application is
- * being built using an already built c-ares library. Additionally
- * this file is also included and used when building the library.
- *
- * If compilation fails on this file it is certainly sure that the
- * problem is elsewhere. It could be a problem in the ares_build.h
- * header file, or simply that you are using different compilation
- * settings than those used to build the library.
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * Do not deactivate any check, these are done to make sure that the
- * library is properly built and used.
- *
- * You can find further help on the c-ares development mailing list:
- * http://lists.haxx.se/listinfo/c-ares/
- *
- * NOTE 2
- * ------
- *
- * Some of the following compile time checks are based on the fact
- * that the dimension of a constant array can not be a negative one.
- * In this way if the compile time verification fails, the compilation
- * will fail issuing an error. The error description wording is compiler
- * dependent but it will be quite similar to one of the following:
- *
- *   "negative subscript or subscript is too large"
- *   "array must have at least one element"
- *   "-1 is an illegal array size"
- *   "size of array is negative"
- *
- * If you are building an application which tries to use an already
- * built c-ares library and you are getting this kind of errors on
- * this file, it is a clear indication that there is a mismatch between
- * how the library was built and how you are trying to use it for your
- * application. Your already compiled or binary library provider is the
- * only one who can give you the details you need to properly use it.
- */
-
-/*
- * Verify that some macros are actually defined.
- */
-
-#ifndef CARES_TYPEOF_ARES_SOCKLEN_T
-#  error "CARES_TYPEOF_ARES_SOCKLEN_T definition is missing!"
-Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_is_missing
-#endif
-
-/*
- * Macros private to this header file.
- */
-
-#define CareschkszEQ(t, s) sizeof(t) == s ? 1 : -1
-
-#define CareschkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1
-
-  /*
-   * Verify that the size previously defined and expected for
-   * ares_socklen_t is actually the same as the one reported
-   * by sizeof() at compile time.
-   */
-
-  typedef char __cares_rule_02__[CareschkszEQ(
-    ares_socklen_t, sizeof(CARES_TYPEOF_ARES_SOCKLEN_T))];
-
-/*
- * Verify at compile time that the size of ares_socklen_t as reported
- * by sizeof() is greater or equal than the one reported for int for
- * the current compilation.
- */
-
-typedef char   __cares_rule_03__[CareschkszGE(ares_socklen_t, int)];
-
-/* ================================================================ */
-/*          EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS           */
-/* ================================================================ */
-
-/*
- * Get rid of macros private to this header file.
- */
-
-#undef CareschkszEQ
-#undef CareschkszGE
-
-/*
- * Get rid of macros not intended to exist beyond this point.
- */
-
-#undef CARES_PULL_WS2TCPIP_H
-#undef CARES_PULL_SYS_TYPES_H
-#undef CARES_PULL_SYS_SOCKET_H
-
-#undef CARES_TYPEOF_ARES_SOCKLEN_T
-
-#endif /* __CARES_RULES_H */
diff --git a/contrib/libs/c-ares/include/ares_version.h b/contrib/libs/c-ares/include/ares_version.h
index e791568e6bd8..fef66b739791 100644
--- a/contrib/libs/c-ares/include/ares_version.h
+++ b/contrib/libs/c-ares/include/ares_version.h
@@ -31,19 +31,14 @@
 #define ARES_COPYRIGHT "2004 - 2024 Daniel Stenberg, <daniel@haxx.se>."
 
 #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 30
+#define ARES_VERSION_MINOR 33
 #define ARES_VERSION_PATCH 0
 #define ARES_VERSION                                        \
   ((ARES_VERSION_MAJOR << 16) | (ARES_VERSION_MINOR << 8) | \
    (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.30.0"
+#define ARES_VERSION_STR "1.33.0"
 
-#if (ARES_VERSION >= 0x010700)
-#  define CARES_HAVE_ARES_LIBRARY_INIT    1
-#  define CARES_HAVE_ARES_LIBRARY_CLEANUP 1
-#else
-#  undef CARES_HAVE_ARES_LIBRARY_INIT
-#  undef CARES_HAVE_ARES_LIBRARY_CLEANUP
-#endif
+#define CARES_HAVE_ARES_LIBRARY_INIT    1
+#define CARES_HAVE_ARES_LIBRARY_CLEANUP 1
 
 #endif
diff --git a/contrib/libs/c-ares/src/lib/ares__addrinfo2hostent.c b/contrib/libs/c-ares/src/lib/ares__addrinfo2hostent.c
index 95717890c2ff..f7b6d1edd251 100644
--- a/contrib/libs/c-ares/src/lib/ares__addrinfo2hostent.c
+++ b/contrib/libs/c-ares/src/lib/ares__addrinfo2hostent.c
@@ -27,7 +27,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -39,8 +39,6 @@
 #  include <arpa/inet.h>
 #endif
 
-#include "ares_nameser.h"
-
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif
@@ -49,10 +47,6 @@
 #  include <limits.h>
 #endif
 
-#include "ares.h"
-#include "ares_dns.h"
-#include "ares_inet_net_pton.h"
-#include "ares_private.h"
 
 ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
                                      struct hostent **host)
@@ -67,7 +61,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
   size_t                      i;
 
   if (ai == NULL || host == NULL) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Use the first node of the response as the family, since hostent can only
@@ -78,12 +72,12 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
   }
 
   if (family != AF_INET && family != AF_INET6) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *host = ares_malloc(sizeof(**host));
   if (!(*host)) {
-    goto enomem;
+    goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   memset(*host, 0, sizeof(**host));
 
@@ -105,7 +99,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
 
   aliases = ares_malloc((naliases + 1) * sizeof(char *));
   if (!aliases) {
-    goto enomem;
+    goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   (*host)->h_aliases = aliases;
   memset(aliases, 0, (naliases + 1) * sizeof(char *));
@@ -118,7 +112,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
       }
       aliases[alias] = ares_strdup(next_cname->alias);
       if (!aliases[alias]) {
-        goto enomem;
+        goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
       }
       alias++;
     }
@@ -127,7 +121,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
 
   (*host)->h_addr_list = ares_malloc((naddrs + 1) * sizeof(char *));
   if (!(*host)->h_addr_list) {
-    goto enomem;
+    goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memset((*host)->h_addr_list, 0, (naddrs + 1) * sizeof(char *));
@@ -135,12 +129,12 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
   if (ai->cnames) {
     (*host)->h_name = ares_strdup(ai->cnames->name);
     if ((*host)->h_name == NULL && ai->cnames->name) {
-      goto enomem;
+      goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   } else {
     (*host)->h_name = ares_strdup(ai->name);
     if ((*host)->h_name == NULL && ai->name) {
-      goto enomem;
+      goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -157,7 +151,7 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
   if (naddrs) {
     addrs = ares_malloc(naddrs * (size_t)(*host)->h_length);
     if (!addrs) {
-      goto enomem;
+      goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     i = 0;
@@ -167,16 +161,16 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
       }
       (*host)->h_addr_list[i] = addrs + (i * (size_t)(*host)->h_length);
       if (family == AF_INET6) {
-        memcpy(
-          (*host)->h_addr_list[i],
-          &(CARES_INADDR_CAST(struct sockaddr_in6 *, next->ai_addr)->sin6_addr),
-          (size_t)(*host)->h_length);
+        memcpy((*host)->h_addr_list[i],
+               &(CARES_INADDR_CAST(const struct sockaddr_in6 *, next->ai_addr)
+                   ->sin6_addr),
+               (size_t)(*host)->h_length);
       }
       if (family == AF_INET) {
-        memcpy(
-          (*host)->h_addr_list[i],
-          &(CARES_INADDR_CAST(struct sockaddr_in *, next->ai_addr)->sin_addr),
-          (size_t)(*host)->h_length);
+        memcpy((*host)->h_addr_list[i],
+               &(CARES_INADDR_CAST(const struct sockaddr_in *, next->ai_addr)
+                   ->sin_addr),
+               (size_t)(*host)->h_length);
       }
       ++i;
     }
@@ -194,10 +188,12 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
 
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 enomem:
   ares_free_hostent(*host);
   *host = NULL;
   return ARES_ENOMEM;
+  /* LCOV_EXCL_STOP */
 }
 
 ares_status_t ares__addrinfo2addrttl(const struct ares_addrinfo *ai, int family,
@@ -211,23 +207,23 @@ ares_status_t ares__addrinfo2addrttl(const struct ares_addrinfo *ai, int family,
   int                         cname_ttl = INT_MAX;
 
   if (family != AF_INET && family != AF_INET6) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (ai == NULL || naddrttls == NULL) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (family == AF_INET && addrttls == NULL) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (family == AF_INET6 && addr6ttls == NULL) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (req_naddrttls == 0) {
-    return ARES_EBADQUERY;
+    return ARES_EBADQUERY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *naddrttls = 0;
@@ -256,20 +252,20 @@ ares_status_t ares__addrinfo2addrttl(const struct ares_addrinfo *ai, int family,
         addr6ttls[*naddrttls].ttl = next->ai_ttl;
       }
 
-      memcpy(
-        &addr6ttls[*naddrttls].ip6addr,
-        &(CARES_INADDR_CAST(struct sockaddr_in6 *, next->ai_addr)->sin6_addr),
-        sizeof(struct ares_in6_addr));
+      memcpy(&addr6ttls[*naddrttls].ip6addr,
+             &(CARES_INADDR_CAST(const struct sockaddr_in6 *, next->ai_addr)
+                 ->sin6_addr),
+             sizeof(struct ares_in6_addr));
     } else {
       if (next->ai_ttl > cname_ttl) {
         addrttls[*naddrttls].ttl = cname_ttl;
       } else {
         addrttls[*naddrttls].ttl = next->ai_ttl;
       }
-      memcpy(
-        &addrttls[*naddrttls].ipaddr,
-        &(CARES_INADDR_CAST(struct sockaddr_in *, next->ai_addr)->sin_addr),
-        sizeof(struct in_addr));
+      memcpy(&addrttls[*naddrttls].ipaddr,
+             &(CARES_INADDR_CAST(const struct sockaddr_in *, next->ai_addr)
+                 ->sin_addr),
+             sizeof(struct in_addr));
     }
     (*naddrttls)++;
   }
diff --git a/contrib/libs/c-ares/src/lib/ares__addrinfo_localhost.c b/contrib/libs/c-ares/src/lib/ares__addrinfo_localhost.c
index baa9b37212bb..e98dd4e277b0 100644
--- a/contrib/libs/c-ares/src/lib/ares__addrinfo_localhost.c
+++ b/contrib/libs/c-ares/src/lib/ares__addrinfo_localhost.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -37,11 +37,10 @@
 #  include <arpa/inet.h>
 #endif
 
-#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
-#  include <ws2ipdef.h>
-#endif
-
 #if defined(USE_WINSOCK)
+#  if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
+#    include <ws2ipdef.h>
+#  endif
 #  if defined(HAVE_IPHLPAPI_H)
 #    include <iphlpapi.h>
 #  endif
@@ -50,10 +49,6 @@
 #  endif
 #endif
 
-#include "ares.h"
-#include "ares_inet_net_pton.h"
-#include "ares_private.h"
-
 ares_status_t ares_append_ai_node(int aftype, unsigned short port,
                                   unsigned int ttl, const void *adata,
                                   struct ares_addrinfo_node **nodes)
@@ -62,7 +57,7 @@ ares_status_t ares_append_ai_node(int aftype, unsigned short port,
 
   node = ares__append_addrinfo_node(nodes);
   if (!node) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memset(node, 0, sizeof(*node));
@@ -70,7 +65,7 @@ ares_status_t ares_append_ai_node(int aftype, unsigned short port,
   if (aftype == AF_INET) {
     struct sockaddr_in *sin = ares_malloc(sizeof(*sin));
     if (!sin) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     memset(sin, 0, sizeof(*sin));
@@ -88,7 +83,7 @@ ares_status_t ares_append_ai_node(int aftype, unsigned short port,
   if (aftype == AF_INET6) {
     struct sockaddr_in6 *sin6 = ares_malloc(sizeof(*sin6));
     if (!sin6) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     memset(sin6, 0, sizeof(*sin6));
@@ -117,7 +112,7 @@ static ares_status_t
     ares_inet_pton(AF_INET6, "::1", &addr6);
     status = ares_append_ai_node(AF_INET6, port, 0, &addr6, nodes);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -126,7 +121,7 @@ static ares_status_t
     ares_inet_pton(AF_INET, "127.0.0.1", &addr4);
     status = ares_append_ai_node(AF_INET, port, 0, &addr4, nodes);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -137,11 +132,11 @@ static ares_status_t
   ares__system_loopback_addrs(int aftype, unsigned short port,
                               struct ares_addrinfo_node **nodes)
 {
-#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && \
+#if defined(USE_WINSOCK) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && \
   !defined(__WATCOMC__)
   PMIB_UNICASTIPADDRESS_TABLE table;
   unsigned int                i;
-  ares_status_t               status;
+  ares_status_t               status = ARES_ENOTFOUND;
 
   *nodes = NULL;
 
@@ -209,13 +204,13 @@ ares_status_t ares__addrinfo_localhost(const char *name, unsigned short port,
     case AF_INET6:
     case AF_UNSPEC:
       break;
-    default:
-      return ARES_EBADFAMILY;
+    default:                  /* LCOV_EXCL_LINE: DefensiveCoding */
+      return ARES_EBADFAMILY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ai->name = ares_strdup(name);
   if (!ai->name) {
-    goto enomem;
+    goto enomem; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__system_loopback_addrs(hints->ai_family, port, &nodes);
@@ -228,9 +223,11 @@ ares_status_t ares__addrinfo_localhost(const char *name, unsigned short port,
 
   return status;
 
+/* LCOV_EXCL_START: OutOfMemory */
 enomem:
   ares__freeaddrinfo_nodes(nodes);
   ares_free(ai->name);
   ai->name = NULL;
   return ARES_ENOMEM;
+  /* LCOV_EXCL_STOP */
 }
diff --git a/contrib/libs/c-ares/src/lib/ares__close_sockets.c b/contrib/libs/c-ares/src/lib/ares__close_sockets.c
index 03ba4abf89fb..27bbaacf0e89 100644
--- a/contrib/libs/c-ares/src/lib/ares__close_sockets.c
+++ b/contrib/libs/c-ares/src/lib/ares__close_sockets.c
@@ -25,33 +25,33 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include "ares.h"
 #include "ares_private.h"
 #include <assert.h>
 
-static void ares__requeue_queries(struct server_connection *conn)
+static void ares__requeue_queries(ares_conn_t  *conn,
+                                  ares_status_t requeue_status)
 {
-  struct query  *query;
-  ares_timeval_t now = ares__tvnow();
+  ares_query_t  *query;
+  ares_timeval_t now;
+
+  ares__tvnow(&now);
 
   while ((query = ares__llist_first_val(conn->queries_to_conn)) != NULL) {
-    ares__requeue_query(query, &now);
+    ares__requeue_query(query, &now, requeue_status, ARES_TRUE);
   }
 }
 
-void ares__close_connection(struct server_connection *conn)
+void ares__close_connection(ares_conn_t *conn, ares_status_t requeue_status)
 {
-  struct server_state *server  = conn->server;
-  ares_channel_t      *channel = server->channel;
+  ares_server_t  *server  = conn->server;
+  ares_channel_t *channel = server->channel;
 
   /* Unlink */
   ares__llist_node_claim(
     ares__htable_asvp_get_direct(channel->connnode_by_socket, conn->fd));
   ares__htable_asvp_remove(channel->connnode_by_socket, conn->fd);
 
-  if (conn->is_tcp) {
+  if (conn->flags & ARES_CONN_FLAG_TCP) {
     /* Reset any existing input and output buffer. */
     ares__buf_consume(server->tcp_parser, ares__buf_len(server->tcp_parser));
     ares__buf_consume(server->tcp_send, ares__buf_len(server->tcp_send));
@@ -59,7 +59,7 @@ void ares__close_connection(struct server_connection *conn)
   }
 
   /* Requeue queries to other connections */
-  ares__requeue_queries(conn);
+  ares__requeue_queries(conn, requeue_status);
 
   ares__llist_destroy(conn->queries_to_conn);
 
@@ -69,51 +69,68 @@ void ares__close_connection(struct server_connection *conn)
   ares_free(conn);
 }
 
-void ares__close_sockets(struct server_state *server)
+void ares__close_sockets(ares_server_t *server)
 {
   ares__llist_node_t *node;
 
   while ((node = ares__llist_node_first(server->connections)) != NULL) {
-    struct server_connection *conn = ares__llist_node_val(node);
-    ares__close_connection(conn);
+    ares_conn_t *conn = ares__llist_node_val(node);
+    ares__close_connection(conn, ARES_SUCCESS);
   }
 }
 
-void ares__check_cleanup_conn(const ares_channel_t     *channel,
-                              struct server_connection *conn)
+void ares__check_cleanup_conns(const ares_channel_t *channel)
 {
-  ares_bool_t do_cleanup = ARES_FALSE;
-
-  if (channel == NULL || conn == NULL) {
-    return;
-  }
-
-  if (ares__llist_len(conn->queries_to_conn)) {
-    return;
-  }
+  ares__slist_node_t *snode;
 
-  /* If we are configured not to stay open, close it out */
-  if (!(channel->flags & ARES_FLAG_STAYOPEN)) {
-    do_cleanup = ARES_TRUE;
+  if (channel == NULL) {
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
-  /* If the associated server has failures, close it out. Resetting the
-   * connection (and specifically the source port number) can help resolve
-   * situations where packets are being dropped.
-   */
-  if (conn->server->consec_failures > 0) {
-    do_cleanup = ARES_TRUE;
+  /* Iterate across each server */
+  for (snode = ares__slist_node_first(channel->servers); snode != NULL;
+       snode = ares__slist_node_next(snode)) {
+    ares_server_t      *server = ares__slist_node_val(snode);
+    ares__llist_node_t *cnode;
+
+    /* Iterate across each connection */
+    cnode = ares__llist_node_first(server->connections);
+    while (cnode != NULL) {
+      ares__llist_node_t *next       = ares__llist_node_next(cnode);
+      ares_conn_t        *conn       = ares__llist_node_val(cnode);
+      ares_bool_t         do_cleanup = ARES_FALSE;
+      cnode                          = next;
+
+      /* Has connections, not eligible */
+      if (ares__llist_len(conn->queries_to_conn)) {
+        continue;
+      }
+
+      /* If we are configured not to stay open, close it out */
+      if (!(channel->flags & ARES_FLAG_STAYOPEN)) {
+        do_cleanup = ARES_TRUE;
+      }
+
+      /* If the associated server has failures, close it out. Resetting the
+       * connection (and specifically the source port number) can help resolve
+       * situations where packets are being dropped.
+       */
+      if (conn->server->consec_failures > 0) {
+        do_cleanup = ARES_TRUE;
+      }
+
+      /* If the udp connection hit its max queries, always close it */
+      if (!(conn->flags & ARES_CONN_FLAG_TCP) && channel->udp_max_queries > 0 &&
+          conn->total_queries >= channel->udp_max_queries) {
+        do_cleanup = ARES_TRUE;
+      }
+
+      if (!do_cleanup) {
+        continue;
+      }
+
+      /* Clean it up */
+      ares__close_connection(conn, ARES_SUCCESS);
+    }
   }
-
-  /* If the udp connection hit its max queries, always close it */
-  if (!conn->is_tcp && channel->udp_max_queries > 0 &&
-      conn->total_queries >= channel->udp_max_queries) {
-    do_cleanup = ARES_TRUE;
-  }
-
-  if (!do_cleanup) {
-    return;
-  }
-
-  ares__close_connection(conn);
 }
diff --git a/contrib/libs/c-ares/src/lib/ares__hosts_file.c b/contrib/libs/c-ares/src/lib/ares__hosts_file.c
index e279623de37e..ae9c071d7aa9 100644
--- a/contrib/libs/c-ares/src/lib/ares__hosts_file.c
+++ b/contrib/libs/c-ares/src/lib/ares__hosts_file.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
@@ -105,7 +103,7 @@ const void *ares_dns_pton(const char *ipaddr, struct ares_addr *addr,
   size_t      ptr_len = 0;
 
   if (ipaddr == NULL || addr == NULL || out_len == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *out_len = 0;
@@ -150,7 +148,7 @@ static ares_bool_t ares__normalize_ipaddr(const char *ipaddr, char *out,
   }
 
   if (!ares_inet_ntop(data.family, addr, out, (ares_socklen_t)out_len)) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return ARES_TRUE;
@@ -315,8 +313,8 @@ static ares_status_t ares__hosts_file_add(ares_hosts_file_t  *hosts,
   if (matchtype != ARES_MATCH_NONE) {
     status = ares__hosts_file_merge_entry(hosts, match, entry, matchtype);
     if (status != ARES_SUCCESS) {
-      ares__hosts_entry_destroy(entry);
-      return status;
+      ares__hosts_entry_destroy(entry); /* LCOV_EXCL_LINE: DefensiveCoding */
+      return status;                    /* LCOV_EXCL_LINE: DefensiveCoding */
     }
     /* entry was invalidated above by merging */
     entry = match;
@@ -617,7 +615,8 @@ static ares_bool_t ares__hosts_expired(const char              *filename,
 
   /* Expire every 60s if we can't get a time */
   if (mod_ts == 0) {
-    mod_ts = time(NULL) - 60;
+    mod_ts =
+      time(NULL) - 60; /* LCOV_EXCL_LINE: only on systems without stat() */
   }
 
   /* If filenames are different, its expired */
@@ -642,7 +641,7 @@ static ares_status_t ares__hosts_path(const ares_channel_t *channel,
   if (channel->hosts_path) {
     path_hosts = ares_strdup(channel->hosts_path);
     if (!path_hosts) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -653,12 +652,12 @@ static ares_status_t ares__hosts_path(const ares_channel_t *channel,
 
     path_hosts = ares_strdup(getenv("CARES_HOSTS"));
     if (!path_hosts) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   if (!path_hosts) {
-#ifdef WIN32
+#if defined(USE_WINSOCK)
     char  PATH_HOSTS[MAX_PATH] = "";
     char  tmp[MAX_PATH];
     HKEY  hkeyHosts;
@@ -728,7 +727,7 @@ ares_status_t ares__hosts_search_ipaddr(ares_channel_t *channel,
   }
 
   if (channel->hf == NULL) {
-    return ARES_ENOTFOUND;
+    return ARES_ENOTFOUND; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (!ares__normalize_ipaddr(ipaddr, addr, sizeof(addr))) {
@@ -757,7 +756,7 @@ ares_status_t ares__hosts_search_host(ares_channel_t *channel,
   }
 
   if (channel->hf == NULL) {
-    return ARES_ENOTFOUND;
+    return ARES_ENOTFOUND; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *entry = ares__htable_strvp_get_direct(channel->hf->hosthash, host);
@@ -768,124 +767,6 @@ ares_status_t ares__hosts_search_host(ares_channel_t *channel,
   return ARES_SUCCESS;
 }
 
-ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
-                                           int family, struct hostent **hostent)
-{
-  ares_status_t       status;
-  size_t              naliases;
-  ares__llist_node_t *node;
-  size_t              idx;
-
-  *hostent = ares_malloc_zero(sizeof(**hostent));
-  if (*hostent == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
-  }
-
-  (*hostent)->h_addrtype = (HOSTENT_ADDRTYPE_TYPE)family;
-
-  /* Copy IP addresses that match the address family */
-  idx = 0;
-  for (node = ares__llist_node_first(entry->ips); node != NULL;
-       node = ares__llist_node_next(node)) {
-    struct ares_addr addr;
-    const void      *ptr     = NULL;
-    size_t           ptr_len = 0;
-    const char      *ipaddr  = ares__llist_node_val(node);
-    char           **temp    = NULL;
-
-    memset(&addr, 0, sizeof(addr));
-
-    addr.family = family;
-    ptr         = ares_dns_pton(ipaddr, &addr, &ptr_len);
-    if (ptr == NULL) {
-      continue;
-    }
-
-    /* If family == AF_UNSPEC, then we want to inherit this for future
-     * conversions as we can only support a single address class */
-    if (family == AF_UNSPEC) {
-      family                 = addr.family;
-      (*hostent)->h_addrtype = (HOSTENT_ADDRTYPE_TYPE)addr.family;
-    }
-
-    temp = ares_realloc_zero((*hostent)->h_addr_list,
-                             (idx + 1) * sizeof(*(*hostent)->h_addr_list),
-                             (idx + 2) * sizeof(*(*hostent)->h_addr_list));
-    if (temp == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
-    }
-
-    (*hostent)->h_addr_list = temp;
-
-    (*hostent)->h_addr_list[idx] = ares_malloc(ptr_len);
-    if ((*hostent)->h_addr_list[idx] == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
-    }
-
-    memcpy((*hostent)->h_addr_list[idx], ptr, ptr_len);
-    idx++;
-    (*hostent)->h_length = (HOSTENT_LENGTH_TYPE)ptr_len;
-  }
-
-  /* entry didn't match address class */
-  if (idx == 0) {
-    status = ARES_ENOTFOUND;
-    goto fail;
-  }
-
-  /* Copy main hostname */
-  (*hostent)->h_name = ares_strdup(ares__llist_first_val(entry->hosts));
-  if ((*hostent)->h_name == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
-  }
-
-  /* Copy aliases */
-  naliases = ares__llist_len(entry->hosts) - 1;
-
-  /* Cap at 100, some people use https://github.com/StevenBlack/hosts and we
-   * don't need 200k+ aliases */
-  if (naliases > 100) {
-    naliases = 100;
-  }
-
-  (*hostent)->h_aliases =
-    ares_malloc_zero((naliases + 1) * sizeof(*(*hostent)->h_aliases));
-  if ((*hostent)->h_aliases == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
-  }
-
-  /* Copy all entries to the alias except the first */
-  idx  = 0;
-  node = ares__llist_node_first(entry->hosts);
-  node = ares__llist_node_next(node);
-  while (node != NULL) {
-    (*hostent)->h_aliases[idx] = ares_strdup(ares__llist_node_val(node));
-    if ((*hostent)->h_aliases[idx] == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
-    }
-    idx++;
-
-    /* Break out if artificially capped */
-    if (idx == naliases) {
-      break;
-    }
-    node = ares__llist_node_next(node);
-  }
-
-  return ARES_SUCCESS;
-
-fail:
-  ares_free_hostent(*hostent);
-  *hostent = NULL;
-  return status;
-}
-
 static ares_status_t
   ares__hosts_ai_append_cnames(const ares_hosts_entry_t    *entry,
                                struct ares_addrinfo_cname **cnames_out)
@@ -909,25 +790,25 @@ static ares_status_t
      * https://github.com/StevenBlack/hosts and we don't need 200k+ aliases */
     cnt++;
     if (cnt > 100) {
-      break;
+      break; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     cname = ares__append_addrinfo_cname(&cnames);
     if (cname == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     cname->alias = ares_strdup(host);
     if (cname->alias == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     cname->name = ares_strdup(primaryhost);
     if (cname->name == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     node = ares__llist_node_next(node);
@@ -937,22 +818,22 @@ static ares_status_t
   if (cnames == NULL) {
     cname = ares__append_addrinfo_cname(&cnames);
     if (cname == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     cname->name = ares_strdup(primaryhost);
     if (cname->name == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
   status = ARES_SUCCESS;
 
 done:
   if (status != ARES_SUCCESS) {
-    ares__freeaddrinfo_cnames(cnames);
-    return status;
+    ares__freeaddrinfo_cnames(cnames); /* LCOV_EXCL_LINE: DefensiveCoding */
+    return status;                     /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *cnames_out = cnames;
@@ -975,14 +856,16 @@ ares_status_t ares__hosts_entry_to_addrinfo(const ares_hosts_entry_t *entry,
     case AF_INET6:
     case AF_UNSPEC:
       break;
-    default:
-      return ARES_EBADFAMILY;
+    default:                  /* LCOV_EXCL_LINE: DefensiveCoding */
+      return ARES_EBADFAMILY; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
-  ai->name = ares_strdup(name);
-  if (ai->name == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+  if (name != NULL) {
+    ai->name = ares_strdup(name);
+    if (ai->name == NULL) {
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
+    }
   }
 
   for (node = ares__llist_node_first(entry->ips); node != NULL;
@@ -1002,14 +885,14 @@ ares_status_t ares__hosts_entry_to_addrinfo(const ares_hosts_entry_t *entry,
 
     status = ares_append_ai_node(addr.family, port, 0, ptr, &ainodes);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   }
 
   if (want_cnames) {
     status = ares__hosts_ai_append_cnames(entry, &cnames);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   }
 
@@ -1017,14 +900,48 @@ ares_status_t ares__hosts_entry_to_addrinfo(const ares_hosts_entry_t *entry,
 
 done:
   if (status != ARES_SUCCESS) {
+    /* LCOV_EXCL_START: defensive coding */
     ares__freeaddrinfo_cnames(cnames);
     ares__freeaddrinfo_nodes(ainodes);
     ares_free(ai->name);
     ai->name = NULL;
     return status;
+    /* LCOV_EXCL_STOP */
   }
   ares__addrinfo_cat_cnames(&ai->cnames, cnames);
   ares__addrinfo_cat_nodes(&ai->nodes, ainodes);
 
   return status;
 }
+
+ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
+                                           int family, struct hostent **hostent)
+{
+  ares_status_t         status;
+  struct ares_addrinfo *ai = ares_malloc_zero(sizeof(*ai));
+
+  *hostent = NULL;
+
+  if (ai == NULL) {
+    return ARES_ENOMEM;
+  }
+
+  status = ares__hosts_entry_to_addrinfo(entry, NULL, family, 0, ARES_TRUE, ai);
+  if (status != ARES_SUCCESS) {
+    goto done;
+  }
+
+  status = ares__addrinfo2hostent(ai, family, hostent);
+  if (status != ARES_SUCCESS) {
+    goto done;
+  }
+
+done:
+  ares_freeaddrinfo(ai);
+  if (status != ARES_SUCCESS) {
+    ares_free_hostent(*hostent);
+    *hostent = NULL;
+  }
+
+  return status;
+}
diff --git a/contrib/libs/c-ares/src/lib/ares__parse_into_addrinfo.c b/contrib/libs/c-ares/src/lib/ares__parse_into_addrinfo.c
index 90e951c02f3f..65c94c040144 100644
--- a/contrib/libs/c-ares/src/lib/ares__parse_into_addrinfo.c
+++ b/contrib/libs/c-ares/src/lib/ares__parse_into_addrinfo.c
@@ -24,7 +24,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -44,8 +44,6 @@
 #  include <limits.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
 
 ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
                                         ares_bool_t    cname_only_is_enodata,
@@ -65,7 +63,7 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
   /* Save question hostname */
   status = ares_dns_record_query_get(dnsrec, 0, &hostname, NULL, NULL);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ancount = ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER);
@@ -107,19 +105,19 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
 
       cname = ares__append_addrinfo_cname(&cnames);
       if (cname == NULL) {
-        status = ARES_ENOMEM;
-        goto done;
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
       }
       cname->ttl   = (int)ares_dns_rr_get_ttl(rr);
       cname->alias = ares_strdup(ares_dns_rr_get_name(rr));
       if (cname->alias == NULL) {
-        status = ARES_ENOMEM;
-        goto done;
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
       }
       cname->name = ares_strdup(hostname);
       if (cname->name == NULL) {
-        status = ARES_ENOMEM;
-        goto done;
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
       }
     } else if (rtype == ARES_REC_TYPE_A) {
       got_a = ARES_TRUE;
@@ -127,7 +125,7 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
         ares_append_ai_node(AF_INET, port, ares_dns_rr_get_ttl(rr),
                             ares_dns_rr_get_addr(rr, ARES_RR_A_ADDR), &nodes);
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     } else if (rtype == ARES_REC_TYPE_AAAA) {
       got_aaaa = ARES_TRUE;
@@ -135,7 +133,7 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
                                      ares_dns_rr_get_addr6(rr, ARES_RR_AAAA_ADDR),
                                      &nodes);
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     } else {
       continue;
@@ -153,8 +151,8 @@ ares_status_t ares__parse_into_addrinfo(const ares_dns_record_t *dnsrec,
     ares_free(ai->name);
     ai->name = ares_strdup(hostname);
     if (ai->name == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares__socket.c b/contrib/libs/c-ares/src/lib/ares__socket.c
index d3990e7660e6..345ab95ba1d2 100644
--- a/contrib/libs/c-ares/src/lib/ares__socket.c
+++ b/contrib/libs/c-ares/src/lib/ares__socket.c
@@ -24,7 +24,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_SYS_UIO_H
 #  include <sys/uio.h>
@@ -56,8 +56,77 @@
 #include <fcntl.h>
 #include <limits.h>
 
-#include "ares.h"
-#include "ares_private.h"
+#if defined(__linux__) && defined(MSG_FASTOPEN)
+#  define TFO_SUPPORTED      1
+#  define TFO_SKIP_CONNECT   0
+#  define TFO_USE_SENDTO     0
+#  define TFO_USE_CONNECTX   0
+#  define TFO_CLIENT_SOCKOPT 0
+#elif defined(__FreeBSD__) && defined(TCP_FASTOPEN)
+#  define TFO_SUPPORTED      1
+#  define TFO_SKIP_CONNECT   1
+#  define TFO_USE_SENDTO     1
+#  define TFO_USE_CONNECTX   0
+#  define TFO_CLIENT_SOCKOPT TCP_FASTOPEN
+#elif defined(__APPLE__) && defined(HAVE_CONNECTX)
+#  define TFO_SUPPORTED    1
+#  define TFO_SKIP_CONNECT 0
+#  define TFO_USE_SENDTO   0
+#  define TFO_USE_CONNECTX 1
+#  undef TFO_CLIENT_SOCKOPT
+#else
+#  define TFO_SUPPORTED 0
+#endif
+
+
+#ifndef HAVE_WRITEV
+/* Structure for scatter/gather I/O. */
+struct iovec {
+  void  *iov_base; /* Pointer to data. */
+  size_t iov_len;  /* Length of data.  */
+};
+#endif
+
+
+/* Return 1 if the specified error number describes a readiness error, or 0
+ * otherwise. This is mostly for HP-UX, which could return EAGAIN or
+ * EWOULDBLOCK. See this man page
+ *
+ * http://devrsrc1.external.hp.com/STKS/cgi-bin/man2html?
+ *     manpage=/usr/share/man/man2.Z/send.2
+ */
+ares_bool_t ares__socket_try_again(int errnum)
+{
+#if !defined EWOULDBLOCK && !defined EAGAIN
+#  error "Neither EWOULDBLOCK nor EAGAIN defined"
+#endif
+
+#ifdef EWOULDBLOCK
+  if (errnum == EWOULDBLOCK) {
+    return ARES_TRUE;
+  }
+#endif
+
+#if defined EAGAIN && EAGAIN != EWOULDBLOCK
+  if (errnum == EAGAIN) {
+    return ARES_TRUE;
+  }
+#endif
+
+  return ARES_FALSE;
+}
+
+ares_ssize_t ares__socket_recv(ares_channel_t *channel, ares_socket_t s,
+                               void *data, size_t data_len)
+{
+  if (channel->sock_funcs && channel->sock_funcs->arecvfrom) {
+    return channel->sock_funcs->arecvfrom(s, data, data_len, 0, 0, 0,
+                                          channel->sock_func_cb_data);
+  }
+
+  return (ares_ssize_t)recv((RECV_TYPE_ARG1)s, (RECV_TYPE_ARG2)data,
+                            (RECV_TYPE_ARG3)data_len, (RECV_TYPE_ARG4)(0));
+}
 
 ares_ssize_t ares__socket_recvfrom(ares_channel_t *channel, ares_socket_t s,
                                    void *data, size_t data_len, int flags,
@@ -73,20 +142,142 @@ ares_ssize_t ares__socket_recvfrom(ares_channel_t *channel, ares_socket_t s,
   return (ares_ssize_t)recvfrom(s, data, (RECVFROM_TYPE_ARG3)data_len, flags,
                                 from, from_len);
 #else
-  return sread(s, data, data_len);
+  return ares__socket_recv(channel, s, data, data_len);
 #endif
 }
 
-ares_ssize_t ares__socket_recv(ares_channel_t *channel, ares_socket_t s,
-                               void *data, size_t data_len)
+/* Use like:
+ *   struct sockaddr_storage sa_storage;
+ *   ares_socklen_t          salen     = sizeof(sa_storage);
+ *   struct sockaddr        *sa        = (struct sockaddr *)&sa_storage;
+ *   ares__conn_set_sockaddr(conn, sa, &salen);
+ */
+static ares_status_t ares__conn_set_sockaddr(const ares_conn_t *conn,
+                                             struct sockaddr   *sa,
+                                             ares_socklen_t    *salen)
 {
-  if (channel->sock_funcs && channel->sock_funcs->arecvfrom) {
-    return channel->sock_funcs->arecvfrom(s, data, data_len, 0, 0, 0,
-                                          channel->sock_func_cb_data);
+  const ares_server_t *server = conn->server;
+  unsigned short       port =
+    conn->flags & ARES_CONN_FLAG_TCP ? server->tcp_port : server->udp_port;
+  struct sockaddr_in  *sin;
+  struct sockaddr_in6 *sin6;
+
+  switch (server->addr.family) {
+    case AF_INET:
+      sin = (struct sockaddr_in *)(void *)sa;
+      if (*salen < (ares_socklen_t)sizeof(*sin)) {
+        return ARES_EFORMERR;
+      }
+      *salen = sizeof(*sin);
+      memset(sin, 0, sizeof(*sin));
+      sin->sin_family = AF_INET;
+      sin->sin_port   = htons(port);
+      memcpy(&sin->sin_addr, &server->addr.addr.addr4, sizeof(sin->sin_addr));
+      return ARES_SUCCESS;
+    case AF_INET6:
+      sin6 = (struct sockaddr_in6 *)(void *)sa;
+      if (*salen < (ares_socklen_t)sizeof(*sin6)) {
+        return ARES_EFORMERR;
+      }
+      *salen = sizeof(*sin6);
+      memset(sin6, 0, sizeof(*sin6));
+      sin6->sin6_family = AF_INET6;
+      sin6->sin6_port   = htons(port);
+      memcpy(&sin6->sin6_addr, &server->addr.addr.addr6,
+             sizeof(sin6->sin6_addr));
+#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
+      sin6->sin6_scope_id = server->ll_scope;
+#endif
+      return ARES_SUCCESS;
+    default:
+      break;
   }
 
-  /* sread() is a wrapper for read() or recv() depending on the system */
-  return sread(s, data, data_len);
+  return ARES_EBADFAMILY;
+}
+
+static ares_status_t ares_conn_set_self_ip(ares_conn_t *conn, ares_bool_t early)
+{
+  struct sockaddr_storage sa_storage;
+  int                     rv;
+  ares_socklen_t          len = sizeof(sa_storage);
+
+  /* We call this twice on TFO, if we already have the IP we can go ahead and
+   * skip processing */
+  if (!early && conn->self_ip.family != AF_UNSPEC) {
+    return ARES_SUCCESS;
+  }
+
+  memset(&sa_storage, 0, sizeof(sa_storage));
+
+  rv = getsockname(conn->fd, (struct sockaddr *)(void *)&sa_storage, &len);
+  if (rv != 0) {
+    /* During TCP FastOpen, we can't get the IP this early since connect()
+     * may not be called.  That's ok, we'll try again later */
+    if (early && conn->flags & ARES_CONN_FLAG_TCP &&
+        conn->flags & ARES_CONN_FLAG_TFO) {
+      memset(&conn->self_ip, 0, sizeof(conn->self_ip));
+      return ARES_SUCCESS;
+    }
+    return ARES_ECONNREFUSED;
+  }
+
+  if (!ares_sockaddr_to_ares_addr(&conn->self_ip, NULL,
+                                  (struct sockaddr *)(void *)&sa_storage)) {
+    return ARES_ECONNREFUSED;
+  }
+
+  return ARES_SUCCESS;
+}
+
+ares_ssize_t ares__conn_write(ares_conn_t *conn, const void *data, size_t len)
+{
+  ares_channel_t *channel = conn->server->channel;
+  int             flags   = 0;
+
+#ifdef HAVE_MSG_NOSIGNAL
+  flags |= MSG_NOSIGNAL;
+#endif
+
+  if (channel->sock_funcs && channel->sock_funcs->asendv) {
+    struct iovec vec;
+    vec.iov_base = (void *)((size_t)data); /* Cast off const */
+    vec.iov_len  = len;
+    return channel->sock_funcs->asendv(conn->fd, &vec, 1,
+                                       channel->sock_func_cb_data);
+  }
+
+  if (conn->flags & ARES_CONN_FLAG_TFO_INITIAL) {
+    conn->flags &= ~((unsigned int)ARES_CONN_FLAG_TFO_INITIAL);
+
+#if defined(TFO_USE_SENDTO) && TFO_USE_SENDTO
+    {
+      struct sockaddr_storage sa_storage;
+      ares_socklen_t          salen = sizeof(sa_storage);
+      struct sockaddr        *sa    = (struct sockaddr *)&sa_storage;
+      ares_status_t           status;
+      ares_ssize_t            rv;
+
+      status = ares__conn_set_sockaddr(conn, sa, &salen);
+      if (status != ARES_SUCCESS) {
+        return status;
+      }
+
+      rv = (ares_ssize_t)sendto((SEND_TYPE_ARG1)conn->fd, (SEND_TYPE_ARG2)data,
+                                (SEND_TYPE_ARG3)len, (SEND_TYPE_ARG4)flags, sa,
+                                salen);
+
+      /* If using TFO, we might not have been able to get an IP earlier, since
+       * we hadn't informed the OS of the destination.  When using sendto()
+       * now we have so we should be able to fetch it */
+      ares_conn_set_self_ip(conn, ARES_TRUE);
+      return rv;
+    }
+#endif
+  }
+
+  return (ares_ssize_t)send((SEND_TYPE_ARG1)conn->fd, (SEND_TYPE_ARG2)data,
+                            (SEND_TYPE_ARG3)len, (SEND_TYPE_ARG4)flags);
 }
 
 /*
@@ -145,7 +336,7 @@ static int setsocknonblock(ares_socket_t sockfd, /* operate on this */
 #endif
 }
 
-#if defined(IPV6_V6ONLY) && defined(WIN32)
+#if defined(IPV6_V6ONLY) && defined(USE_WINSOCK)
 /* It makes support for IPv4-mapped IPv6 addresses.
  * Linux kernel, NetBSD, FreeBSD and Darwin: default is off;
  * Windows Vista and later: default is on;
@@ -161,7 +352,7 @@ static void set_ipv6_v6only(ares_socket_t sockfd, int on)
 #  define set_ipv6_v6only(s, v)
 #endif
 
-static int configure_socket(ares_socket_t s, struct server_state *server)
+static ares_status_t configure_socket(ares_conn_t *conn)
 {
   union {
     struct sockaddr     sa;
@@ -170,43 +361,53 @@ static int configure_socket(ares_socket_t s, struct server_state *server)
   } local;
 
   ares_socklen_t  bindlen = 0;
+  ares_server_t  *server  = conn->server;
   ares_channel_t *channel = server->channel;
 
   /* do not set options for user-managed sockets */
   if (channel->sock_funcs && channel->sock_funcs->asocket) {
-    return 0;
+    return ARES_SUCCESS;
   }
 
-  (void)setsocknonblock(s, 1);
+  (void)setsocknonblock(conn->fd, 1);
 
 #if defined(FD_CLOEXEC) && !defined(MSDOS)
   /* Configure the socket fd as close-on-exec. */
-  if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) {
-    return -1; /* LCOV_EXCL_LINE */
+  if (fcntl(conn->fd, F_SETFD, FD_CLOEXEC) != 0) {
+    return ARES_ECONNREFUSED; /* LCOV_EXCL_LINE */
+  }
+#endif
+
+  /* No need to emit SIGPIPE on socket errors */
+#if defined(SO_NOSIGPIPE)
+  {
+    int opt = 1;
+    (void)setsockopt(conn->fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&opt,
+                     sizeof(opt));
   }
 #endif
 
   /* Set the socket's send and receive buffer sizes. */
-  if ((channel->socket_send_buffer_size > 0) &&
-      setsockopt(s, SOL_SOCKET, SO_SNDBUF,
+  if (channel->socket_send_buffer_size > 0 &&
+      setsockopt(conn->fd, SOL_SOCKET, SO_SNDBUF,
                  (void *)&channel->socket_send_buffer_size,
-                 sizeof(channel->socket_send_buffer_size)) == -1) {
-    return -1;
+                 sizeof(channel->socket_send_buffer_size)) != 0) {
+    return ARES_ECONNREFUSED; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
-  if ((channel->socket_receive_buffer_size > 0) &&
-      setsockopt(s, SOL_SOCKET, SO_RCVBUF,
+  if (channel->socket_receive_buffer_size > 0 &&
+      setsockopt(conn->fd, SOL_SOCKET, SO_RCVBUF,
                  (void *)&channel->socket_receive_buffer_size,
-                 sizeof(channel->socket_receive_buffer_size)) == -1) {
-    return -1;
+                 sizeof(channel->socket_receive_buffer_size)) != 0) {
+    return ARES_ECONNREFUSED; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
 #ifdef SO_BINDTODEVICE
-  if (channel->local_dev_name[0] &&
-      setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE, channel->local_dev_name,
-                 sizeof(channel->local_dev_name))) {
-    /* Only root can do this, and usually not fatal if it doesn't work, so */
-    /* just continue on. */
+  if (ares_strlen(channel->local_dev_name)) {
+    /* Only root can do this, and usually not fatal if it doesn't work, so
+     * just continue on. */
+    (void)setsockopt(conn->fd, SOL_SOCKET, SO_BINDTODEVICE,
+                     channel->local_dev_name, sizeof(channel->local_dev_name));
   }
 #endif
 
@@ -226,130 +427,215 @@ static int configure_socket(ares_socket_t s, struct server_state *server)
     bindlen = sizeof(local.sa6);
   }
 
-  if (bindlen && bind(s, &local.sa, bindlen) < 0) {
-    return -1;
+  if (bindlen && bind(conn->fd, &local.sa, bindlen) < 0) {
+    return ARES_ECONNREFUSED;
   }
 
   if (server->addr.family == AF_INET6) {
-    set_ipv6_v6only(s, 0);
-  }
-
-  return 0;
-}
-
-ares_status_t ares__open_connection(ares_channel_t      *channel,
-                                    struct server_state *server,
-                                    ares_bool_t          is_tcp)
-{
-  ares_socket_t  s;
-  int            opt;
-  ares_socklen_t salen;
-
-  union {
-    struct sockaddr_in  sa4;
-    struct sockaddr_in6 sa6;
-  } saddr;
-  struct sockaddr          *sa;
-  struct server_connection *conn;
-  ares__llist_node_t       *node;
-  int                       type = is_tcp ? SOCK_STREAM : SOCK_DGRAM;
-
-  switch (server->addr.family) {
-    case AF_INET:
-      sa    = (void *)&saddr.sa4;
-      salen = sizeof(saddr.sa4);
-      memset(sa, 0, (size_t)salen);
-      saddr.sa4.sin_family = AF_INET;
-      saddr.sa4.sin_port = htons(is_tcp ? server->tcp_port : server->udp_port);
-      memcpy(&saddr.sa4.sin_addr, &server->addr.addr.addr4,
-             sizeof(saddr.sa4.sin_addr));
-      break;
-    case AF_INET6:
-      sa    = (void *)&saddr.sa6;
-      salen = sizeof(saddr.sa6);
-      memset(sa, 0, (size_t)salen);
-      saddr.sa6.sin6_family = AF_INET6;
-      saddr.sa6.sin6_port = htons(is_tcp ? server->tcp_port : server->udp_port);
-      memcpy(&saddr.sa6.sin6_addr, &server->addr.addr.addr6,
-             sizeof(saddr.sa6.sin6_addr));
-#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
-      saddr.sa6.sin6_scope_id = server->ll_scope;
-#endif
-      break;
-    default:
-      return ARES_EBADFAMILY; /* LCOV_EXCL_LINE */
-  }
-
-  /* Acquire a socket. */
-  s = ares__open_socket(channel, server->addr.family, type, 0);
-  if (s == ARES_SOCKET_BAD) {
-    return ARES_ECONNREFUSED;
+    set_ipv6_v6only(conn->fd, 0);
   }
 
-  /* Configure it. */
-  if (configure_socket(s, server) < 0) {
-    ares__close_socket(channel, s);
-    return ARES_ECONNREFUSED;
-  }
+  if (conn->flags & ARES_CONN_FLAG_TCP) {
+    int opt = 1;
 
 #ifdef TCP_NODELAY
-  if (is_tcp) {
     /*
      * Disable the Nagle algorithm (only relevant for TCP sockets, and thus not
      * in configure_socket). In general, in DNS lookups we're pretty much
      * interested in firing off a single request and then waiting for a reply,
      * so batching isn't very interesting.
      */
-    opt = 1;
-    if ((!channel->sock_funcs || !channel->sock_funcs->asocket) &&
-        setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (void *)&opt, sizeof(opt)) ==
-          -1) {
-      ares__close_socket(channel, s);
+    if (setsockopt(conn->fd, IPPROTO_TCP, TCP_NODELAY, (void *)&opt,
+                   sizeof(opt)) != 0) {
       return ARES_ECONNREFUSED;
     }
-  }
 #endif
 
-  if (channel->sock_config_cb) {
-    int err = channel->sock_config_cb(s, type, channel->sock_config_cb_data);
-    if (err < 0) {
-      ares__close_socket(channel, s);
-      return ARES_ECONNREFUSED;
+#if defined(TFO_CLIENT_SOCKOPT)
+    if (conn->flags & ARES_CONN_FLAG_TFO &&
+        setsockopt(conn->fd, IPPROTO_TCP, TFO_CLIENT_SOCKOPT, (void *)&opt,
+                   sizeof(opt)) != 0) {
+      /* Disable TFO if flag can't be set. */
+      conn->flags &= ~((unsigned int)ARES_CONN_FLAG_TFO);
     }
+#endif
   }
 
-  /* Connect to the server. */
-  if (ares__connect_socket(channel, s, sa, salen) == -1) {
-    int err = SOCKERRNO;
+  return ARES_SUCCESS;
+}
 
-    if (err != EINPROGRESS && err != EWOULDBLOCK) {
-      ares__close_socket(channel, s);
-      return ARES_ECONNREFUSED;
+ares_bool_t ares_sockaddr_to_ares_addr(struct ares_addr      *ares_addr,
+                                       unsigned short        *port,
+                                       const struct sockaddr *sockaddr)
+{
+  if (sockaddr->sa_family == AF_INET) {
+    /* NOTE: memcpy sockaddr_in due to alignment issues found by UBSAN due to
+     *       dnsinfo packing on MacOS */
+    struct sockaddr_in sockaddr_in;
+    memcpy(&sockaddr_in, sockaddr, sizeof(sockaddr_in));
+
+    ares_addr->family = AF_INET;
+    memcpy(&ares_addr->addr.addr4, &(sockaddr_in.sin_addr),
+           sizeof(ares_addr->addr.addr4));
+
+    if (port) {
+      *port = ntohs(sockaddr_in.sin_port);
     }
+    return ARES_TRUE;
   }
 
-  if (channel->sock_create_cb) {
-    int err = channel->sock_create_cb(s, type, channel->sock_create_cb_data);
-    if (err < 0) {
-      ares__close_socket(channel, s);
-      return ARES_ECONNREFUSED;
+  if (sockaddr->sa_family == AF_INET6) {
+    /* NOTE: memcpy sockaddr_in6 due to alignment issues found by UBSAN due to
+     *       dnsinfo packing on MacOS */
+    struct sockaddr_in6 sockaddr_in6;
+    memcpy(&sockaddr_in6, sockaddr, sizeof(sockaddr_in6));
+
+    ares_addr->family = AF_INET6;
+    memcpy(&ares_addr->addr.addr6, &(sockaddr_in6.sin6_addr),
+           sizeof(ares_addr->addr.addr6));
+    if (port) {
+      *port = ntohs(sockaddr_in6.sin6_port);
     }
+    return ARES_TRUE;
   }
 
+  return ARES_FALSE;
+}
+
+static ares_status_t ares__conn_connect(ares_conn_t *conn, struct sockaddr *sa,
+                                        ares_socklen_t salen)
+{
+  /* Normal non TCPFastOpen style connect */
+  if (!(conn->flags & ARES_CONN_FLAG_TFO)) {
+    return ares__connect_socket(conn->server->channel, conn->fd, sa, salen);
+  }
+
+  /* FreeBSD don't want any sort of connect() so skip */
+#if defined(TFO_SKIP_CONNECT) && TFO_SKIP_CONNECT
+  return ARES_SUCCESS;
+#elif defined(TFO_USE_CONNECTX) && TFO_USE_CONNECTX
+  {
+    int rv;
+    int err;
+
+    do {
+      sa_endpoints_t endpoints;
+      memset(&endpoints, 0, sizeof(endpoints));
+      endpoints.sae_dstaddr    = sa;
+      endpoints.sae_dstaddrlen = salen;
+
+      rv = connectx(conn->fd, &endpoints, SAE_ASSOCID_ANY,
+                    CONNECT_DATA_IDEMPOTENT | CONNECT_RESUME_ON_READ_WRITE,
+                    NULL, 0, NULL, NULL);
+
+      err = SOCKERRNO;
+      if (rv == -1 && err != EINPROGRESS && err != EWOULDBLOCK) {
+        return ARES_ECONNREFUSED;
+      }
+
+    } while (rv == -1 && err == EINTR);
+  }
+  return ARES_SUCCESS;
+#elif defined(TFO_SUPPORTED) && TFO_SUPPORTED
+  return ares__connect_socket(conn->server->channel, conn->fd, sa, salen);
+#else
+  /* Shouldn't be possible */
+  return ARES_ECONNREFUSED;
+#endif
+}
+
+ares_status_t ares__open_connection(ares_conn_t   **conn_out,
+                                    ares_channel_t *channel,
+                                    ares_server_t *server, ares_bool_t is_tcp)
+{
+  ares_status_t           status;
+  struct sockaddr_storage sa_storage;
+  ares_socklen_t          salen = sizeof(sa_storage);
+  struct sockaddr        *sa    = (struct sockaddr *)&sa_storage;
+  ares_conn_t            *conn;
+  ares__llist_node_t     *node  = NULL;
+  int                     stype = is_tcp ? SOCK_STREAM : SOCK_DGRAM;
+
+  *conn_out = NULL;
+
   conn = ares_malloc(sizeof(*conn));
   if (conn == NULL) {
-    ares__close_socket(channel, s);
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
+
   memset(conn, 0, sizeof(*conn));
-  conn->fd              = s;
+  conn->fd              = ARES_SOCKET_BAD;
   conn->server          = server;
   conn->queries_to_conn = ares__llist_create(NULL);
-  conn->is_tcp          = is_tcp;
+  conn->flags           = is_tcp ? ARES_CONN_FLAG_TCP : ARES_CONN_FLAG_NONE;
+
+  /* Enable TFO if the OS supports it and we were passed in data to send during
+   * the connect. It might be disabled later if an error is encountered. Make
+   * sure a user isn't overriding anything. */
+  if (conn->flags & ARES_CONN_FLAG_TCP && channel->sock_funcs == NULL &&
+      TFO_SUPPORTED) {
+    conn->flags |= ARES_CONN_FLAG_TFO;
+  }
+
   if (conn->queries_to_conn == NULL) {
-    ares__close_socket(channel, s);
-    ares_free(conn);
-    return ARES_ENOMEM;
+    /* LCOV_EXCL_START: OutOfMemory */
+    status = ARES_ENOMEM;
+    goto done;
+    /* LCOV_EXCL_STOP */
+  }
+
+  /* Convert into the struct sockaddr structure needed by the OS */
+  status = ares__conn_set_sockaddr(conn, sa, &salen);
+  if (status != ARES_SUCCESS) {
+    goto done;
+  }
+
+  /* Acquire a socket. */
+  conn->fd = ares__open_socket(channel, server->addr.family, stype, 0);
+  if (conn->fd == ARES_SOCKET_BAD) {
+    status = ARES_ECONNREFUSED;
+    goto done;
+  }
+
+  /* Configure it. */
+  status = configure_socket(conn);
+  if (status != ARES_SUCCESS) {
+    goto done;
+  }
+
+  if (channel->sock_config_cb) {
+    int err =
+      channel->sock_config_cb(conn->fd, stype, channel->sock_config_cb_data);
+    if (err < 0) {
+      status = ARES_ECONNREFUSED;
+      goto done;
+    }
+  }
+
+  /* Connect */
+  status = ares__conn_connect(conn, sa, salen);
+  if (status != ARES_SUCCESS) {
+    goto done;
+  }
+
+  if (channel->sock_create_cb) {
+    int err =
+      channel->sock_create_cb(conn->fd, stype, channel->sock_create_cb_data);
+    if (err < 0) {
+      status = ARES_ECONNREFUSED;
+      goto done;
+    }
+  }
+
+  /* Let the connection know we haven't written our first packet yet for TFO */
+  if (conn->flags & ARES_CONN_FLAG_TFO) {
+    conn->flags |= ARES_CONN_FLAG_TFO_INITIAL;
+  }
+
+  /* Need to store our own ip for DNS cookie support */
+  status = ares_conn_set_self_ip(conn, ARES_FALSE);
+  if (status != ARES_SUCCESS) {
+    goto done; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   /* TCP connections are thrown to the end as we don't spawn multiple TCP
@@ -361,29 +647,37 @@ ares_status_t ares__open_connection(ares_channel_t      *channel,
     node = ares__llist_insert_first(server->connections, conn);
   }
   if (node == NULL) {
-    ares__close_socket(channel, s);
-    ares__llist_destroy(conn->queries_to_conn);
-    ares_free(conn);
-    return ARES_ENOMEM;
+    /* LCOV_EXCL_START: OutOfMemory */
+    status = ARES_ENOMEM;
+    goto done;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Register globally to quickly map event on file descriptor to connection
    * node object */
-  if (!ares__htable_asvp_insert(channel->connnode_by_socket, s, node)) {
-    ares__close_socket(channel, s);
-    ares__llist_destroy(conn->queries_to_conn);
-    ares__llist_node_claim(node);
-    ares_free(conn);
-    return ARES_ENOMEM;
+  if (!ares__htable_asvp_insert(channel->connnode_by_socket, conn->fd, node)) {
+    /* LCOV_EXCL_START: OutOfMemory */
+    status = ARES_ENOMEM;
+    goto done;
+    /* LCOV_EXCL_STOP */
   }
 
-  SOCK_STATE_CALLBACK(channel, s, 1, 0);
+  SOCK_STATE_CALLBACK(channel, conn->fd, 1, is_tcp ? 1 : 0);
 
   if (is_tcp) {
     server->tcp_conn = conn;
   }
 
-  return ARES_SUCCESS;
+done:
+  if (status != ARES_SUCCESS) {
+    ares__llist_node_claim(node);
+    ares__llist_destroy(conn->queries_to_conn);
+    ares__close_socket(channel, conn->fd);
+    ares_free(conn);
+  } else {
+    *conn_out = conn;
+  }
+  return status;
 }
 
 ares_socket_t ares__open_socket(ares_channel_t *channel, int af, int type,
@@ -397,15 +691,31 @@ ares_socket_t ares__open_socket(ares_channel_t *channel, int af, int type,
   return socket(af, type, protocol);
 }
 
-int ares__connect_socket(ares_channel_t *channel, ares_socket_t sockfd,
-                         const struct sockaddr *addr, ares_socklen_t addrlen)
+ares_status_t ares__connect_socket(ares_channel_t        *channel,
+                                   ares_socket_t          sockfd,
+                                   const struct sockaddr *addr,
+                                   ares_socklen_t         addrlen)
 {
-  if (channel->sock_funcs && channel->sock_funcs->aconnect) {
-    return channel->sock_funcs->aconnect(sockfd, addr, addrlen,
+  int rv;
+  int err;
+
+  do {
+    if (channel->sock_funcs && channel->sock_funcs->aconnect) {
+      rv = channel->sock_funcs->aconnect(sockfd, addr, addrlen,
                                          channel->sock_func_cb_data);
-  }
+    } else {
+      rv = connect(sockfd, addr, addrlen);
+    }
+
+    err = SOCKERRNO;
+
+    if (rv == -1 && err != EINPROGRESS && err != EWOULDBLOCK) {
+      return ARES_ECONNREFUSED;
+    }
 
-  return connect(sockfd, addr, addrlen);
+  } while (rv == -1 && err == EINTR);
+
+  return ARES_SUCCESS;
 }
 
 void ares__close_socket(ares_channel_t *channel, ares_socket_t s)
@@ -421,26 +731,6 @@ void ares__close_socket(ares_channel_t *channel, ares_socket_t s)
   }
 }
 
-#ifndef HAVE_WRITEV
-/* Structure for scatter/gather I/O. */
-struct iovec {
-  void  *iov_base; /* Pointer to data. */
-  size_t iov_len;  /* Length of data.  */
-};
-#endif
-
-ares_ssize_t ares__socket_write(ares_channel_t *channel, ares_socket_t s,
-                                const void *data, size_t len)
-{
-  if (channel->sock_funcs && channel->sock_funcs->asendv) {
-    struct iovec vec;
-    vec.iov_base = (void *)((size_t)data); /* Cast off const */
-    vec.iov_len  = len;
-    return channel->sock_funcs->asendv(s, &vec, 1, channel->sock_func_cb_data);
-  }
-  return swrite(s, data, len);
-}
-
 void ares_set_socket_callback(ares_channel_t           *channel,
                               ares_sock_create_callback cb, void *data)
 {
diff --git a/contrib/libs/c-ares/src/lib/ares__sortaddrinfo.c b/contrib/libs/c-ares/src/lib/ares__sortaddrinfo.c
index 155cc8caf444..1aab81ecf84c 100644
--- a/contrib/libs/c-ares/src/lib/ares__sortaddrinfo.c
+++ b/contrib/libs/c-ares/src/lib/ares__sortaddrinfo.c
@@ -36,7 +36,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -51,9 +51,6 @@
 #include <assert.h>
 #include <limits.h>
 
-#include "ares.h"
-#include "ares_private.h"
-
 struct addrinfo_sort_elem {
   struct ares_addrinfo_node *ai;
   ares_bool_t                has_src_addr;
@@ -349,7 +346,6 @@ static int find_src_addr(ares_channel_t *channel, const struct sockaddr *addr,
                          struct sockaddr *src_addr)
 {
   ares_socket_t  sock;
-  int            ret;
   ares_socklen_t len;
 
   switch (addr->sa_family) {
@@ -366,18 +362,14 @@ static int find_src_addr(ares_channel_t *channel, const struct sockaddr *addr,
 
   sock = ares__open_socket(channel, addr->sa_family, SOCK_DGRAM, IPPROTO_UDP);
   if (sock == ARES_SOCKET_BAD) {
-    if (errno == EAFNOSUPPORT) {
+    if (SOCKERRNO == EAFNOSUPPORT) {
       return 0;
     } else {
       return -1;
     }
   }
 
-  do {
-    ret = ares__connect_socket(channel, sock, addr, len);
-  } while (ret == -1 && errno == EINTR);
-
-  if (ret == -1) {
+  if (ares__connect_socket(channel, sock, addr, len) != ARES_SUCCESS) {
     ares__close_socket(channel, sock);
     return 0;
   }
diff --git a/contrib/libs/c-ares/src/lib/ares_android.c b/contrib/libs/c-ares/src/lib/ares_android.c
index 778d4d10607f..4c0ffa04f7c3 100644
--- a/contrib/libs/c-ares/src/lib/ares_android.c
+++ b/contrib/libs/c-ares/src/lib/ares_android.c
@@ -24,13 +24,9 @@
  * SPDX-License-Identifier: MIT
  */
 #if defined(ANDROID) || defined(__ANDROID__)
-
-#  include <jni.h>
-
-#  include "ares_setup.h"
-#  include "ares.h"
-#  include "ares_android.h"
 #  include "ares_private.h"
+#  include <jni.h>
+#  include <sys/prctl.h>
 
 static JavaVM   *android_jvm                  = NULL;
 static jobject   android_connectivity_manager = NULL;
@@ -85,6 +81,23 @@ static jmethodID jni_get_method_id(JNIEnv *env, jclass cls,
   return mid;
 }
 
+static int jvm_attach(JNIEnv **env)
+{
+  char              name[17] = {0};
+
+  JavaVMAttachArgs  args;
+
+  args.version = JNI_VERSION_1_6;
+  if (prctl(PR_GET_NAME, name) == 0) {
+    args.name = name;
+  } else {
+    args.name = NULL;
+  }
+  args.group   = NULL;
+
+  return (*android_jvm)->AttachCurrentThread(android_jvm, env, &args);
+}
+
 void ares_library_init_jvm(JavaVM *jvm)
 {
   android_jvm = jvm;
@@ -105,7 +118,7 @@ int ares_library_init_android(jobject connectivity_manager)
   res = (*android_jvm)->GetEnv(android_jvm, (void **)&env, JNI_VERSION_1_6);
   if (res == JNI_EDETACHED) {
     env          = NULL;
-    res          = (*android_jvm)->AttachCurrentThread(android_jvm, &env, NULL);
+    res          = jvm_attach(&env);
     need_detatch = 1;
   }
   if (res != JNI_OK || env == NULL) {
@@ -238,7 +251,7 @@ void ares_library_cleanup_android(void)
   res = (*android_jvm)->GetEnv(android_jvm, (void **)&env, JNI_VERSION_1_6);
   if (res == JNI_EDETACHED) {
     env          = NULL;
-    res          = (*android_jvm)->AttachCurrentThread(android_jvm, &env, NULL);
+    res          = jvm_attach(&env);
     need_detatch = 1;
   }
   if (res != JNI_OK || env == NULL) {
@@ -290,7 +303,7 @@ char **ares_get_android_server_list(size_t max_servers, size_t *num_servers)
   res = (*android_jvm)->GetEnv(android_jvm, (void **)&env, JNI_VERSION_1_6);
   if (res == JNI_EDETACHED) {
     env          = NULL;
-    res          = (*android_jvm)->AttachCurrentThread(android_jvm, &env, NULL);
+    res          = jvm_attach(&env);
     need_detatch = 1;
   }
   if (res != JNI_OK || env == NULL) {
@@ -408,7 +421,7 @@ char *ares_get_android_search_domains_list(void)
   res = (*android_jvm)->GetEnv(android_jvm, (void **)&env, JNI_VERSION_1_6);
   if (res == JNI_EDETACHED) {
     env          = NULL;
-    res          = (*android_jvm)->AttachCurrentThread(android_jvm, &env, NULL);
+    res          = jvm_attach(&env);
     need_detatch = 1;
   }
   if (res != JNI_OK || env == NULL) {
diff --git a/contrib/libs/c-ares/src/lib/ares_cancel.c b/contrib/libs/c-ares/src/lib/ares_cancel.c
index 5a9fb722cb77..c29d8ef82f4d 100644
--- a/contrib/libs/c-ares/src/lib/ares_cancel.c
+++ b/contrib/libs/c-ares/src/lib/ares_cancel.c
@@ -24,10 +24,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include <assert.h>
-
-#include "ares.h"
 #include "ares_private.h"
 
 /*
@@ -57,35 +53,33 @@ void ares_cancel(ares_channel_t *channel)
     /* Out of memory, this function doesn't return a result code though so we
      * can't report to caller */
     if (channel->all_queries == NULL) {
-      channel->all_queries = list_copy;
-      goto done;
+      channel->all_queries = list_copy; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;                        /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     node = ares__llist_node_first(list_copy);
     while (node != NULL) {
-      struct query             *query;
-      struct server_connection *conn;
+      ares_query_t *query;
 
       /* Cache next since this node is being deleted */
       next = ares__llist_node_next(node);
 
       query                   = ares__llist_node_claim(node);
-      conn                    = query->conn;
       query->node_all_queries = NULL;
 
       /* NOTE: its possible this may enqueue new queries */
       query->callback(query->arg, ARES_ECANCELLED, 0, NULL);
       ares__free_query(query);
 
-      /* See if the connection should be cleaned up */
-      ares__check_cleanup_conn(channel, conn);
-
       node = next;
     }
 
     ares__llist_destroy(list_copy);
   }
 
+  /* See if the connections should be cleaned up */
+  ares__check_cleanup_conns(channel);
+
   ares_queue_notify_empty(channel);
 
 done:
diff --git a/contrib/libs/c-ares/src/lib/ares_config-linux.h b/contrib/libs/c-ares/src/lib/ares_config-linux.h
index ff485b0d38a3..d18434ea6382 100644
--- a/contrib/libs/c-ares/src/lib/ares_config-linux.h
+++ b/contrib/libs/c-ares/src/lib/ares_config-linux.h
@@ -41,22 +41,22 @@
 #define GETSERVBYNAME_R_ARGS 6
 
 /* Define to 1 if you have AF_INET6. */
-#define HAVE_AF_INET6
+#define HAVE_AF_INET6 1
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H
+#define HAVE_ARPA_INET_H 1
 
 /* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-#define HAVE_ARPA_NAMESER_COMPAT_H
+#define HAVE_ARPA_NAMESER_COMPAT_H 1
 
 /* Define to 1 if you have the <arpa/nameser.h> header file. */
-#define HAVE_ARPA_NAMESER_H
+#define HAVE_ARPA_NAMESER_H 1
 
 /* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H
+#define HAVE_ASSERT_H 1
 
 /* Define to 1 if you have the clock_gettime function and monotonic timer. */
-#define HAVE_CLOCK_GETTIME_MONOTONIC
+#define HAVE_CLOCK_GETTIME_MONOTONIC 1
 
 /* Define to 1 if you have the closesocket function. */
 /* #undef HAVE_CLOSESOCKET */
@@ -65,79 +65,82 @@
 /* #undef HAVE_CLOSESOCKET_CAMEL */
 
 /* Define to 1 if you have the connect function. */
-#define HAVE_CONNECT
+#define HAVE_CONNECT 1
+
+/* Define to 1 if you have the connectx function. */
+/* #undef HAVE_CONNECTX */
 
 /* define if the compiler supports basic C++11 syntax */
 /* #undef HAVE_CXX11 */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H
+#define HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H
+#define HAVE_ERRNO_H 1
 
 /* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_H
+#define HAVE_POLL_H 1
 
 /* Define to 1 if you have the poll function. */
-#define HAVE_POLL
+#define HAVE_POLL 1
 
 /* Define to 1 if you have the pipe function. */
-#define HAVE_PIPE
+#define HAVE_PIPE 1
 
 /* Define to 1 if you have the pipe2 function. */
-#define HAVE_PIPE2
+#define HAVE_PIPE2 1
 
 /* Define to 1 if you have the kqueue function. */
 /* #undef HAVE_KQUEUE */
 
 /* Define to 1 if you have the epoll{_create,ctl,wait} functions. */
-#define HAVE_EPOLL
+#define HAVE_EPOLL 1
 
 /* Define to 1 if you have the fcntl function. */
-#define HAVE_FCNTL
+#define HAVE_FCNTL 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H
+#define HAVE_FCNTL_H 1
 
 /* Define to 1 if you have a working fcntl O_NONBLOCK function. */
-#define HAVE_FCNTL_O_NONBLOCK
+#define HAVE_FCNTL_O_NONBLOCK 1
 
 /* Define to 1 if you have the freeaddrinfo function. */
-#define HAVE_FREEADDRINFO
+#define HAVE_FREEADDRINFO 1
 
 /* Define to 1 if you have a working getaddrinfo function. */
-#define HAVE_GETADDRINFO
+#define HAVE_GETADDRINFO 1
 
 /* Define to 1 if the getaddrinfo function is threadsafe. */
 /* #undef HAVE_GETADDRINFO_THREADSAFE */
 
 /* Define to 1 if you have the getenv function. */
-#define HAVE_GETENV
+#define HAVE_GETENV 1
 
 /* Define to 1 if you have the gethostname function. */
-#define HAVE_GETHOSTNAME
+#define HAVE_GETHOSTNAME 1
 
 /* Define to 1 if you have the getnameinfo function. */
-#define HAVE_GETNAMEINFO
+#define HAVE_GETNAMEINFO 1
 
 /* Define to 1 if you have the getrandom function. */
-#define HAVE_GETRANDOM
+#define HAVE_GETRANDOM 1
 
 /* Define to 1 if you have the getservbyport_r function. */
-#define HAVE_GETSERVBYPORT_R
+#define HAVE_GETSERVBYPORT_R 1
 
 /* Define to 1 if you have the getservbyname_r function. */
-#define HAVE_GETSERVBYNAME_R
+#define HAVE_GETSERVBYNAME_R 1
 
 /* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY
+#define HAVE_GETTIMEOFDAY 1
 
 /* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME
+#define HAVE_IF_INDEXTONAME 1
 
 /* Define to 1 if you have the `if_nametoindex' function. */
-#define HAVE_IF_NAMETOINDEX
+#define HAVE_IF_NAMETOINDEX 1
 
 /* Define to 1 if you have the `ConvertInterfaceIndexToLuid' function. */
 /* #undef HAVE_CONVERTINTERFACEINDEXTOLUID */
@@ -145,20 +148,26 @@
 /* Define to 1 if you have the `ConvertInterfaceLuidToNameA' function. */
 /* #undef HAVE_CONVERTINTERFACELUIDTONAMEA */
 
+/* Define to 1 if you have the `NotifyIpInterfaceChange' function. */
+/* #undef HAVE_NOTIFYIPINTERFACECHANGE */
+
+/* Define to 1 if you have the `RegisterWaitForSingleObject' function. */
+/* #undef HAVE_REGISTERWAITFORSINGLEOBJECT */
+
 /* Define to 1 if you have a IPv6 capable working inet_net_pton function. */
 /* #undef HAVE_INET_NET_PTON */
 
 /* Define to 1 if you have a IPv6 capable working inet_ntop function. */
-#define HAVE_INET_NTOP
+#define HAVE_INET_NTOP 1
 
 /* Define to 1 if you have a IPv6 capable working inet_pton function. */
-#define HAVE_INET_PTON
+#define HAVE_INET_PTON 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H
+#define HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the ioctl function. */
-#define HAVE_IOCTL
+#define HAVE_IOCTL 1
 
 /* Define to 1 if you have the ioctlsocket function. */
 /* #undef HAVE_IOCTLSOCKET */
@@ -174,10 +183,10 @@
 /* #undef HAVE_IOCTLSOCKET_FIONBIO */
 
 /* Define to 1 if you have a working ioctl FIONBIO function. */
-#define HAVE_IOCTL_FIONBIO
+#define HAVE_IOCTL_FIONBIO 1
 
 /* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-#define HAVE_IOCTL_SIOCGIFADDR
+#define HAVE_IOCTL_SIOCGIFADDR 1
 
 /* Define to 1 if you have the `resolve' library (-lresolve). */
 /* #undef HAVE_LIBRESOLV */
@@ -189,97 +198,97 @@
 /* #undef HAVE_NETIOAPI_H */
 
 /* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H
+#define HAVE_LIMITS_H 1
 
 /* Define to 1 if the compiler supports the 'long long' data type. */
-#define HAVE_LONGLONG
+#define HAVE_LONGLONG 1
 
 /* Define to 1 if you have the malloc.h header file. */
-#define HAVE_MALLOC_H
+#define HAVE_MALLOC_H 1
 
 /* Define to 1 if you have the memory.h header file. */
-#define HAVE_MEMORY_H
+#define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the AvailabilityMacros.h header file. */
 /* #undef HAVE_AVAILABILITYMACROS_H */
 
 /* Define to 1 if you have the MSG_NOSIGNAL flag. */
-#define HAVE_MSG_NOSIGNAL
+#define HAVE_MSG_NOSIGNAL 1
 
 /* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H
+#define HAVE_NETDB_H 1
 
 /* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H
+#define HAVE_NETINET_IN_H 1
 
 /* Define to 1 if you have the <netinet6/in6.h> header file. */
 /* #undef HAVE_NETINET6_IN6_H */
 
 /* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H
+#define HAVE_NETINET_TCP_H 1
 
 /* Define to 1 if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H
+#define HAVE_NET_IF_H 1
 
 /* Define to 1 if you have PF_INET6. */
-#define HAVE_PF_INET6
+#define HAVE_PF_INET6 1
 
 /* Define to 1 if you have the recv function. */
-#define HAVE_RECV
+#define HAVE_RECV 1
 
 /* Define to 1 if you have the recvfrom function. */
-#define HAVE_RECVFROM
+#define HAVE_RECVFROM 1
 
 /* Define to 1 if you have the send function. */
-#define HAVE_SEND
+#define HAVE_SEND 1
 
 /* Define to 1 if you have the setsockopt function. */
-#define HAVE_SETSOCKOPT
+#define HAVE_SETSOCKOPT 1
 
 /* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
 /* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
 
 /* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H
+#define HAVE_SIGNAL_H 1
 
 /* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
+#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
 
 /* Define to 1 if you have the socket function. */
-#define HAVE_SOCKET
+#define HAVE_SOCKET 1
 
 /* Define to 1 if you have the <socket.h> header file. */
 /* #undef HAVE_SOCKET_H */
 
 /* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H
+#define HAVE_STDBOOL_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H
+#define HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the strcasecmp function. */
-#define HAVE_STRCASECMP
+#define HAVE_STRCASECMP 1
 
 /* Define to 1 if you have the strcmpi function. */
 /* #undef HAVE_STRCMPI */
 
 /* Define to 1 if you have the strdup function. */
-#define HAVE_STRDUP
+#define HAVE_STRDUP 1
 
 /* Define to 1 if you have the stricmp function. */
 /* #undef HAVE_STRICMP */
 
 /* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H
+#define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H
+#define HAVE_STRING_H 1
 
 /* Define to 1 if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP
+#define HAVE_STRNCASECMP 1
 
 /* Define to 1 if you have the strncmpi function. */
 /* #undef HAVE_STRNCMPI */
@@ -291,61 +300,61 @@
 /* #undef HAVE_STROPTS_H */
 
 /* Define to 1 if you have struct addrinfo. */
-#define HAVE_STRUCT_ADDRINFO
+#define HAVE_STRUCT_ADDRINFO 1
 
 /* Define to 1 if you have struct in6_addr. */
-#define HAVE_STRUCT_IN6_ADDR
+#define HAVE_STRUCT_IN6_ADDR 1
 
 /* Define to 1 if you have struct sockaddr_in6. */
-#define HAVE_STRUCT_SOCKADDR_IN6
+#define HAVE_STRUCT_SOCKADDR_IN6 1
 
 /* if struct sockaddr_storage is defined */
-#define HAVE_STRUCT_SOCKADDR_STORAGE
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
 
 /* Define to 1 if you have the timeval struct. */
-#define HAVE_STRUCT_TIMEVAL
+#define HAVE_STRUCT_TIMEVAL 1
 
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H
+#define HAVE_SYS_IOCTL_H 1
 
 /* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H
+#define HAVE_SYS_PARAM_H 1
 
 /* Define to 1 if you have the <sys/random.h> header file. */
-#define HAVE_SYS_RANDOM_H
+#define HAVE_SYS_RANDOM_H 1
 
 /* Define to 1 if you have the <sys/event.h> header file. */
 /* #undef HAVE_SYS_EVENT_H */
 
 /* Define to 1 if you have the <sys/epoll.h> header file. */
-#define HAVE_SYS_EPOLL_H
+#define HAVE_SYS_EPOLL_H 1
 
 /* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H
+#define HAVE_SYS_SELECT_H 1
 
 /* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H
+#define HAVE_SYS_SOCKET_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H
+#define HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H
+#define HAVE_SYS_TIME_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H
+#define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H
+#define HAVE_SYS_UIO_H 1
 
 /* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H
+#define HAVE_TIME_H 1
 
 /* Define to 1 if you have the <ifaddrs.h> header file. */
-#define HAVE_IFADDRS_H
+#define HAVE_IFADDRS_H 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the windows.h header file. */
 /* #undef HAVE_WINDOWS_H */
@@ -369,7 +378,7 @@
 /* #undef HAVE_NTDEF_H */
 
 /* Define to 1 if you have the writev function. */
-#define HAVE_WRITEV
+#define HAVE_WRITEV 1
 
 /* Define to 1 if you have the ws2tcpip.h header file. */
 /* #undef HAVE_WS2TCPIP_H */
@@ -377,20 +386,14 @@
 /* Define to 1 if you have the __system_property_get function */
 /* #undef HAVE___SYSTEM_PROPERTY_GET */
 
-/* Define to 1 if you need the malloc.h header file even with stdlib.h */
-/* #undef NEED_MALLOC_H */
-
-/* Define to 1 if you need the memory.h header file even with stdlib.h */
-/* #undef NEED_MEMORY_H */
-
 /* Define if have arc4random_buf() */
 /* #undef HAVE_ARC4RANDOM_BUF */
 
 /* Define if have getifaddrs() */
-#define HAVE_GETIFADDRS
+#define HAVE_GETIFADDRS 1
 
 /* Define if have stat() */
-#define HAVE_STAT
+#define HAVE_STAT 1
 
 /* a suitable file/device to read random data from */
 #define CARES_RANDOM_FILE "/dev/urandom"
@@ -443,14 +446,11 @@
 /* Define to the function return type for recv. */
 #define RECV_TYPE_RETV ssize_t
 
-/* Define to the type qualifier of arg 2 for send. */
-#define SEND_QUAL_ARG2 
-
 /* Define to the type of arg 1 for send. */
 #define SEND_TYPE_ARG1 int
 
 /* Define to the type of arg 2 for send. */
-#define SEND_TYPE_ARG2 void *
+#define SEND_TYPE_ARG2 const void *
 
 /* Define to the type of arg 3 for send. */
 #define SEND_TYPE_ARG3 size_t
@@ -468,13 +468,13 @@
 #undef WIN32_LEAN_AND_MEAN
 
 /* Define to 1 if you have the pthread.h header file. */
-#define HAVE_PTHREAD_H
+#define HAVE_PTHREAD_H 1
 
 /* Define to 1 if you have the pthread_np.h header file. */
 /* #undef HAVE_PTHREAD_NP_H */
 
 /* Define to 1 if threads are enabled */
-#define CARES_THREADS
+#define CARES_THREADS 1
 
 /* Define to 1 if pthread_init() exists */
 /* #undef HAVE_PTHREAD_INIT */
diff --git a/contrib/libs/c-ares/src/lib/ares_cookie.c b/contrib/libs/c-ares/src/lib/ares_cookie.c
new file mode 100644
index 000000000000..0680fe9ec7b6
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/ares_cookie.c
@@ -0,0 +1,459 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/* DNS cookies are a simple form of learned mutual authentication supported by
+ * most DNS server implementations these days and can help prevent DNS Cache
+ * Poisoning attacks for clients and DNS amplification attacks for servers.
+ *
+ * A good overview is here:
+ * https://www.dotmagazine.online/issues/digital-responsibility-and-sustainability/dns-cookies-transaction-mechanism
+ *
+ * RFCs used for implementation are
+ * [RFC7873](https://datatracker.ietf.org/doc/html/rfc7873) which is extended by
+ * [RFC9018](https://datatracker.ietf.org/doc/html/rfc9018).
+ *
+ * Though this could be used on TCP, the likelihood of it being useful is small
+ * and could cause some issues.  TCP is better used as a fallback in case there
+ * are issues with DNS Cookie support in the upstream servers (e.g. AnyCast
+ * cluster issues).
+ *
+ * While most recursive DNS servers support DNS Cookies, public DNS servers like
+ * Google (8.8.8.8, 8.8.4.4) and CloudFlare (1.1.1.1, 1.0.0.1) don't seem to
+ * have this enabled yet for unknown reasons.
+ *
+ * The risk to having DNS Cookie support always enabled is nearly zero as there
+ * is built-in detection support and it will simply bypass using cookies if the
+ * remote server doesn't support it.  The problem arises if a remote server
+ * supports DNS cookies, then stops supporting them (such as if an administrator
+ * reconfigured the server, or maybe there are different servers in a cluster
+ * with different configurations).  We need to detect this behavior by tracking
+ * how much time has gone by since we received our last valid cookie reply, and
+ * if we exceed the threshold, reset all cookie parameters like we haven't
+ * attempted a request yet.
+ *
+ * ## Implementation Plan
+ *
+ * ### Constants:
+ *  - `COOKIE_CLIENT_TIMEOUT`: 86400s (1 day)
+ *     - How often to regenerate the per-server client cookie, even if our
+ *       source ip address hasn't changed.
+ *  - `COOKIE_UNSUPPORTED_TIMEOUT`: 300s (5 minutes)
+ *     - If a server responds without a cookie in the reply, this is how long to
+ *       wait before attempting to send a client cookie again.
+ *  - `COOKIE_REGRESSION_TIMEOUT`: 120s (2 minutes)
+ *     - If a server was once known to return cookies, and all of a sudden stops
+ *       returning cookies (but the reply is otherwise valid), this is how long
+ *       to continue to attempt to use cookies before giving up and resetting.
+ *       Such an event would cause an outage for this duration, but since a
+ *       cache poisoning attack should be dropping invalid replies we should be
+ *       able to still get the valid reply and not assume it is a server
+ *       regression just because we received replies without cookies.
+ *  - `COOKIE_RESEND_MAX`: 3
+ *    - Maximum times to resend a query to a server due to the server responding
+ *      with `BAD_COOKIE`, after this, we switch to TCP.
+ *
+ * ### Per-server variables:
+ *  - `cookie.state`: Known state of cookie support, enumeration.
+ *    - `INITIAL` (0): Initial state, not yet determined. Used during startup.
+ *    - `GENERATED` (1): Cookie has been generated and sent to a server, but no
+ *      validated response yet.
+ *    - `SUPPORTED` (2):  Server has been determined to properly support cookies
+ *    - `UNSUPPORTED` (3): Server has been determined to not support cookies
+ *  - `cookie.client` : 8 byte randomly generated client cookie
+ *  - `cookie.client_ts`: Timestamp client cookie was generated
+ *  - `cookie.client_ip`: IP address client used to connect to server
+ *  - `cookie.server`: 8 to 32 byte server cookie
+ *  - `cookie.server_len`: length of server cookie
+ *  - `cookie.unsupported_ts`: Timestamp of last attempt to use a cookies, but
+ *    it was determined that the server didn't support them.
+ *
+ * ### Per-query variables:
+ *  - `query.client_cookie`: Duplicate of `cookie.client` at the point in time
+ *    the query is put on the wire.  This should be available in the
+ *    `ares_dns_record_t` for the request for verification purposes so we don't
+ *    actually need to duplicate this, just naming it here for the ease of
+ *    documentation below.
+ * - `query.cookie_try_count`: Number of tries to send a cookie but receive
+ *   `BAD_COOKIE` responses.  Used to know when we need to switch to TCP.
+ *
+ * ### Procedure:
+ * **NOTE**: These steps will all be done after obtaining a connection handle as
+ * some of these steps depend on determining the source ip address for the
+ * connection.
+ *
+ * 1. If the query is not using EDNS, then **skip any remaining processing**.
+ * 2. If using TCP, ensure there is no EDNS cookie opt (10) set (there may have
+ *    been if this is a resend after upgrade to TCP), then **skip any remaining
+ *    processing**.
+ * 3. If `cookie.state == SUPPORTED`, `cookie.unsupported_ts` is non-zero, and
+ *    evaluates greater than `COOKIE_REGRESSION_TIMEOUT`, then clear all cookie
+ *    settings, set `cookie.state = INITIAL`. Continue to next step (4)
+ * 4. If `cookie.state == UNSUPPORTED`
+ *     - If `cookie.unsupported_ts` evaluates less than
+ *       `COOKIE_UNSUPPORTED_TIMEOUT`
+ *        - Ensure there is no EDNS cookie opt (10) set (shouldn't be unless
+ *          requestor had put this themselves), then **skip any remaining
+ *          processing** as we don't want to try to send cookies.
+ *     - Otherwise:
+ *       - clear all cookie settings, set `cookie.state = INITIAL`.
+ *       - Continue to next step (5) which will send a new cookie.
+ * 5. If `cookie.state == INITIAL`:
+ *    - randomly generate new `cookie.client`
+ *    - set `cookie.client_ts` to the current timestamp.
+ *    - set `cookie.state = GENERATED`.
+ *    - set `cookie.client_ip` to the current source ip address.
+ * 6. If `cookie.state == GENERATED || cookie.state == SUPPORTED` and
+ *    `cookie.client_ip` does not match the current source ip address:
+ *    - clear `cookie.server`
+ *    - randomly generate new `cookie.client`
+ *    - set `cookie.client_ts` to the current timestamp.
+ *    - set `cookie.client_ip` to the current source ip address.
+ *    - do not change the `cookie.state`
+ * 7. If `cookie.state == SUPPORTED` and `cookie.client_ts` evaluation exceeds
+ *    `COOKIE_CLIENT_TIMEOUT`:
+ *    - clear `cookie.server`
+ *    - randomly generate new `cookie.client`
+ *    - set `cookie.client_ts` to the current timestamp.
+ *    - set `cookie.client_ip` to the current source ip address.
+ *    - do not change the `cookie.state`
+ * 8. Generate EDNS OPT record (10) for client cookie.  The option value will be
+ *    the `cookie.client` concatenated with the `cookie.server`.  If there is no
+ *    known server cookie, it will not be appended. Copy `cookie.client` to
+ *    `query.client_cookie` to handle possible client cookie changes by other
+ *    queries before a reply is received (technically this is in the cached
+ *    `ares_dns_record_t` so no need to manually do this). Send request to
+ *    server.
+ * 9. Evaluate response:
+ *     1. If invalid EDNS OPT cookie (10) length sent back in response (valid
+ *        length is 16-40), or bad client cookie value (validate first 8 bytes
+ *        against `query.client_cookie` not `cookie.client`), **drop response**
+ *        as if it hadn't been received.  This is likely a spoofing attack.
+ *        Wait for valid response up to normal response timeout.
+ *     2. If a EDNS OPT cookie (10) server cookie is returned:
+ *         - set `cookie.unsupported_ts` to zero and `cookie.state = SUPPORTED`.
+ *           We can confirm this server supports cookies based on the existence
+ *           of this record.
+ *         - If a new EDNS OPT cookie (10) server cookie is in the response, and
+ *           the `client.cookie` matches the `query.client_cookie` still (hasn't
+ *           been rotated by some other parallel query), save it as
+ *           `cookie.server`.
+ *     3. If dns response `rcode` is `BAD_COOKIE`:
+ *         - Ensure a EDNS OPT cookie (10) is returned, otherwise **drop
+ *           response**, this is completely invalid and likely an spoof of some
+ *           sort.
+ *         - Otherwise
+ *           - Increment `query.cookie_try_count`
+ *           - If `query.cookie_try_count >= COOKIE_RESEND_MAX`, set
+ *             `query.using_tcp` to force the next attempt to use TCP.
+ *           - **Requeue the query**, but do not increment the normal
+ *             `try_count` as a `BAD_COOKIE` reply isn't a normal try failure.
+ *             This should end up going all the way back to step 1 on the next
+ *             attempt.
+ *     4. If EDNS OPT cookie (10) is **NOT** returned in the response:
+ *         - If `cookie.state == SUPPORTED`
+ *           - if `cookie.unsupported_ts` is zero, set to the current timestamp.
+ *           - Drop the response, wait for a valid response to be returned
+ *         - if `cookie.state == GENERATED`
+ *           - clear all cookie settings
+ *           - set `cookie.state = UNSUPPORTED`
+ *           - set `cookie.unsupported_ts` to the current time
+ *         - Accept response (state should be `UNSUPPORTED` if we're here)
+ */
+
+#include "ares_private.h"
+
+/* 1 day */
+#define COOKIE_CLIENT_TIMEOUT_MS (86400 * 1000)
+
+/* 5 minutes */
+#define COOKIE_UNSUPPORTED_TIMEOUT_MS (300 * 1000)
+
+/* 2 minutes */
+#define COOKIE_REGRESSION_TIMEOUT_MS (120 * 1000)
+
+#define COOKIE_RESEND_MAX 3
+
+static const unsigned char *
+  ares_dns_cookie_fetch(const ares_dns_record_t *dnsrec, size_t *len)
+{
+  const ares_dns_rr_t *rr  = ares_dns_get_opt_rr_const(dnsrec);
+  const unsigned char *val = NULL;
+  *len                     = 0;
+
+  if (rr == NULL) {
+    return NULL;
+  }
+
+  if (!ares_dns_rr_get_opt_byid(rr, ARES_RR_OPT_OPTIONS, ARES_OPT_PARAM_COOKIE,
+                                &val, len)) {
+    return NULL;
+  }
+
+  return val;
+}
+
+static ares_bool_t timeval_is_set(const ares_timeval_t *tv)
+{
+  if (tv->sec != 0 && tv->usec != 0) {
+    return ARES_TRUE;
+  }
+  return ARES_FALSE;
+}
+
+static ares_bool_t timeval_expired(const ares_timeval_t *tv,
+                                   const ares_timeval_t *now,
+                                   unsigned long         millsecs)
+{
+  ares_int64_t   tvdiff_ms;
+  ares_timeval_t tvdiff;
+  ares__timeval_diff(&tvdiff, tv, now);
+
+  tvdiff_ms = tvdiff.sec * 1000 + tvdiff.usec / 1000;
+  if (tvdiff_ms >= (ares_int64_t)millsecs) {
+    return ARES_TRUE;
+  }
+  return ARES_FALSE;
+}
+
+static void ares_cookie_clear(ares_cookie_t *cookie)
+{
+  memset(cookie, 0, sizeof(*cookie));
+  cookie->state = ARES_COOKIE_INITIAL;
+}
+
+static void ares_cookie_generate(ares_cookie_t *cookie, ares_conn_t *conn,
+                                 const ares_timeval_t *now)
+{
+  ares_channel_t *channel = conn->server->channel;
+
+  ares__rand_bytes(channel->rand_state, cookie->client, sizeof(cookie->client));
+  memcpy(&cookie->client_ts, now, sizeof(cookie->client_ts));
+  memcpy(&cookie->client_ip, &conn->self_ip, sizeof(cookie->client_ip));
+}
+
+static void ares_cookie_clear_server(ares_cookie_t *cookie)
+{
+  memset(cookie->server, 0, sizeof(cookie->server));
+  cookie->server_len = 0;
+}
+
+static ares_bool_t ares_addr_equal(const struct ares_addr *addr1,
+                                   const struct ares_addr *addr2)
+{
+  if (addr1->family != addr2->family) {
+    return ARES_FALSE;
+  }
+
+  switch (addr1->family) {
+    case AF_INET:
+      if (memcmp(&addr1->addr.addr4, &addr2->addr.addr4,
+                 sizeof(addr1->addr.addr4)) == 0) {
+        return ARES_TRUE;
+      }
+      break;
+    case AF_INET6:
+      /* This structure is weird, and due to padding SonarCloud complains if
+       * you don't punch all the way down.  At some point we should rework
+       * this structure */
+      if (memcmp(&addr1->addr.addr6._S6_un._S6_u8,
+                 &addr2->addr.addr6._S6_un._S6_u8,
+                 sizeof(addr1->addr.addr6._S6_un._S6_u8)) == 0) {
+        return ARES_TRUE;
+      }
+      break;
+    default:
+      break; /* LCOV_EXCL_LINE */
+  }
+
+  return ARES_FALSE;
+}
+
+ares_status_t ares_cookie_apply(ares_dns_record_t *dnsrec, ares_conn_t *conn,
+                                const ares_timeval_t *now)
+{
+  ares_server_t *server = conn->server;
+  ares_cookie_t *cookie = &server->cookie;
+  ares_dns_rr_t *rr     = ares_dns_get_opt_rr(dnsrec);
+  unsigned char  c[40];
+  size_t         c_len;
+
+  /* If there is no OPT record, then EDNS isn't supported, and therefore
+   * cookies can't be supported */
+  if (rr == NULL) {
+    return ARES_SUCCESS;
+  }
+
+  /* No cookies on TCP, make sure we remove one if one is present */
+  if (conn->flags & ARES_CONN_FLAG_TCP) {
+    ares_dns_rr_del_opt_byid(rr, ARES_RR_OPT_OPTIONS, ARES_OPT_PARAM_COOKIE);
+    return ARES_SUCCESS;
+  }
+
+  /* Look for regression */
+  if (cookie->state == ARES_COOKIE_SUPPORTED &&
+      timeval_is_set(&cookie->unsupported_ts) &&
+      timeval_expired(&cookie->unsupported_ts, now,
+                      COOKIE_REGRESSION_TIMEOUT_MS)) {
+    ares_cookie_clear(cookie);
+  }
+
+  /* Handle unsupported state */
+  if (cookie->state == ARES_COOKIE_UNSUPPORTED) {
+    /* If timer hasn't expired, just delete any possible cookie and return */
+    if (!timeval_expired(&cookie->unsupported_ts, now,
+                         COOKIE_REGRESSION_TIMEOUT_MS)) {
+      ares_dns_rr_del_opt_byid(rr, ARES_RR_OPT_OPTIONS, ARES_OPT_PARAM_COOKIE);
+      return ARES_SUCCESS;
+    }
+
+    /* We want to try to "learn" again */
+    ares_cookie_clear(cookie);
+  }
+
+  /* Generate a new cookie */
+  if (cookie->state == ARES_COOKIE_INITIAL) {
+    ares_cookie_generate(cookie, conn, now);
+    cookie->state = ARES_COOKIE_GENERATED;
+  }
+
+  /* Regenerate the cookie and clear the server cookie if the client ip has
+   * changed */
+  if ((cookie->state == ARES_COOKIE_GENERATED ||
+       cookie->state == ARES_COOKIE_SUPPORTED) &&
+      !ares_addr_equal(&conn->self_ip, &cookie->client_ip)) {
+    ares_cookie_clear_server(cookie);
+    ares_cookie_generate(cookie, conn, now);
+  }
+
+  /* If the client cookie has reached its maximum time, refresh it */
+  if (cookie->state == ARES_COOKIE_SUPPORTED &&
+      timeval_expired(&cookie->client_ts, now, COOKIE_CLIENT_TIMEOUT_MS)) {
+    ares_cookie_clear_server(cookie);
+    ares_cookie_generate(cookie, conn, now);
+  }
+
+  /* Generate the full cookie which is the client cookie concatenated with the
+   * server cookie (if there is one) and apply it. */
+  memcpy(c, cookie->client, sizeof(cookie->client));
+  if (cookie->server_len) {
+    memcpy(c + sizeof(cookie->client), cookie->server, cookie->server_len);
+  }
+  c_len = sizeof(cookie->client) + cookie->server_len;
+
+  return ares_dns_rr_set_opt(rr, ARES_RR_OPT_OPTIONS, ARES_OPT_PARAM_COOKIE, c,
+                             c_len);
+}
+
+ares_status_t ares_cookie_validate(ares_query_t            *query,
+                                   const ares_dns_record_t *dnsresp,
+                                   ares_conn_t *conn, const ares_timeval_t *now)
+{
+  ares_server_t           *server = conn->server;
+  ares_cookie_t           *cookie = &server->cookie;
+  const ares_dns_record_t *dnsreq = query->query;
+  const unsigned char     *resp_cookie;
+  size_t                   resp_cookie_len;
+  const unsigned char     *req_cookie;
+  size_t                   req_cookie_len;
+
+  resp_cookie = ares_dns_cookie_fetch(dnsresp, &resp_cookie_len);
+
+  /* Invalid cookie length, drop */
+  if (resp_cookie && (resp_cookie_len < 8 || resp_cookie_len > 40)) {
+    return ARES_EBADRESP;
+  }
+
+  req_cookie = ares_dns_cookie_fetch(dnsreq, &req_cookie_len);
+
+  /* Didn't request cookies, so we can stop evaluating */
+  if (req_cookie == NULL) {
+    return ARES_SUCCESS;
+  }
+
+  /* If 8-byte prefix for returned cookie doesn't match the requested cookie,
+   * drop for spoofing */
+  if (resp_cookie && memcmp(req_cookie, resp_cookie, 8) != 0) {
+    return ARES_EBADRESP;
+  }
+
+  if (resp_cookie && resp_cookie_len > 8) {
+    /* Make sure we record that we successfully received a cookie response */
+    cookie->state = ARES_COOKIE_SUPPORTED;
+    memset(&cookie->unsupported_ts, 0, sizeof(cookie->unsupported_ts));
+
+    /* If client cookie hasn't been rotated, save the returned server cookie */
+    if (memcmp(cookie->client, req_cookie, sizeof(cookie->client)) == 0) {
+      cookie->server_len = resp_cookie_len - 8;
+      memcpy(cookie->server, resp_cookie + 8, cookie->server_len);
+    }
+  }
+
+  if (ares_dns_record_get_rcode(dnsresp) == ARES_RCODE_BADCOOKIE) {
+    /* Illegal to return BADCOOKIE but no cookie, drop */
+    if (resp_cookie == NULL) {
+      return ARES_EBADRESP;
+    }
+
+    /* If we have too many attempts to send a cookie, we need to requeue as
+     * tcp */
+    query->cookie_try_count++;
+    if (query->cookie_try_count >= COOKIE_RESEND_MAX) {
+      query->using_tcp = ARES_TRUE;
+    }
+
+    /* Resend the request, hopefully it will work the next time as we should
+     * have recorded a server cookie */
+    ares__requeue_query(query, now, ARES_SUCCESS,
+                        ARES_FALSE /* Don't increment try count */);
+
+    /* Parent needs to drop this response */
+    return ARES_EBADRESP;
+  }
+
+  /* We've got a response with a server cookie, and we've done all the
+   * evaluation we can, return success */
+  if (resp_cookie_len > 8) {
+    return ARES_SUCCESS;
+  }
+
+  if (cookie->state == ARES_COOKIE_SUPPORTED) {
+    /* If we're not currently tracking an error time yet, start */
+    if (!timeval_is_set(&cookie->unsupported_ts)) {
+      memcpy(&cookie->unsupported_ts, now, sizeof(cookie->unsupported_ts));
+    }
+    /* Drop it since we expected a cookie */
+    return ARES_EBADRESP;
+  }
+
+  if (cookie->state == ARES_COOKIE_GENERATED) {
+    ares_cookie_clear(cookie);
+    cookie->state = ARES_COOKIE_UNSUPPORTED;
+    memcpy(&cookie->unsupported_ts, now, sizeof(cookie->unsupported_ts));
+  }
+
+  /* Cookie state should be UNSUPPORTED if we're here */
+  return ARES_SUCCESS;
+}
diff --git a/contrib/libs/c-ares/src/lib/ares_data.c b/contrib/libs/c-ares/src/lib/ares_data.c
index e37088283baf..d25c3fafff59 100644
--- a/contrib/libs/c-ares/src/lib/ares_data.c
+++ b/contrib/libs/c-ares/src/lib/ares_data.c
@@ -24,14 +24,10 @@
  * SPDX-License-Identifier: MIT
  */
 
-
-#include "ares_setup.h"
-
+#include "ares_private.h"
 #include <stddef.h>
-
-#include "ares.h"
+#include <assert.h>
 #include "ares_data.h"
-#include "ares_private.h"
 
 /*
 ** ares_free_data() - c-ares external API function.
diff --git a/contrib/libs/c-ares/src/lib/ares_destroy.c b/contrib/libs/c-ares/src/lib/ares_destroy.c
index 672f8b061842..d75b5e227cc2 100644
--- a/contrib/libs/c-ares/src/lib/ares_destroy.c
+++ b/contrib/libs/c-ares/src/lib/ares_destroy.c
@@ -25,13 +25,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include <assert.h>
-
-#include "ares.h"
 #include "ares_private.h"
-#include "ares_event.h"
+#include "event/ares_event.h"
+#include <assert.h>
 
 void ares_destroy(ares_channel_t *channel)
 {
@@ -42,7 +38,17 @@ void ares_destroy(ares_channel_t *channel)
     return;
   }
 
-  /* Disable configuration change monitoring */
+  /* Mark as being shutdown */
+  ares__channel_lock(channel);
+  channel->sys_up = ARES_FALSE;
+  ares__channel_unlock(channel);
+
+  /* Disable configuration change monitoring.  We can't hold a lock because
+   * some cleanup routines, such as on Windows, are synchronous operations.
+   * What we've observed is a system config change event was triggered right
+   * at shutdown time and it tries to take the channel lock and the destruction
+   * waits for that event to complete before it continues so we get a channel
+   * lock deadlock at shutdown if we hold a lock during this process. */
   if (channel->optmask & ARES_OPT_EVENT_THREAD) {
     ares_event_thread_t *e = channel->sock_state_cb_data;
     if (e && e->configchg) {
@@ -51,21 +57,23 @@ void ares_destroy(ares_channel_t *channel)
     }
   }
 
-  /* Wait for reinit thread to exit if there was one pending */
+  /* Wait for reinit thread to exit if there was one pending, can't be
+   * holding a lock as the thread may take locks. */
   if (channel->reinit_thread != NULL) {
     void *rv;
     ares__thread_join(channel->reinit_thread, &rv);
     channel->reinit_thread = NULL;
   }
 
-  /* Lock because callbacks will be triggered */
+  /* Lock because callbacks will be triggered, and any system-generated
+   * callbacks need to hold a channel lock. */
   ares__channel_lock(channel);
 
   /* Destroy all queries */
   node = ares__llist_node_first(channel->all_queries);
   while (node != NULL) {
     ares__llist_node_t *next  = ares__llist_node_next(node);
-    struct query       *query = ares__llist_node_claim(node);
+    ares_query_t       *query = ares__llist_node_claim(node);
 
     query->node_all_queries = NULL;
     query->callback(query->arg, ARES_EDESTRUCTION, 0, NULL);
@@ -126,10 +134,10 @@ void ares_destroy(ares_channel_t *channel)
   ares_free(channel);
 }
 
-void ares__destroy_server(struct server_state *server)
+void ares__destroy_server(ares_server_t *server)
 {
   if (server == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__close_sockets(server);
@@ -144,7 +152,7 @@ void ares__destroy_servers_state(ares_channel_t *channel)
   ares__slist_node_t *node;
 
   while ((node = ares__slist_node_first(channel->servers)) != NULL) {
-    struct server_state *server = ares__slist_node_claim(node);
+    ares_server_t *server = ares__slist_node_claim(node);
     ares__destroy_server(server);
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_event_win32.c b/contrib/libs/c-ares/src/lib/ares_event_win32.c
deleted file mode 100644
index 718e86508511..000000000000
--- a/contrib/libs/c-ares/src/lib/ares_event_win32.c
+++ /dev/null
@@ -1,601 +0,0 @@
-/* MIT License
- *
- * Copyright (c) 2024 Brad House
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * SPDX-License-Identifier: MIT
- */
-
-#include "ares_setup.h"
-#include "ares.h"
-#include "ares_private.h"
-#include "ares_event.h"
-#include "ares_event_win32.h"
-#ifdef HAVE_LIMITS_H
-#  include <limits.h>
-#endif
-
-#ifdef _WIN32
-
-/* IMPLEMENTATION NOTES
- * ====================
- *
- * This implementation uses some undocumented functionality within Windows for
- * monitoring sockets. The Ancillary Function Driver (AFD) is the low level
- * implementation that Winsock2 sits on top of.  Winsock2 unfortunately does
- * not expose the equivalent of epoll() or kqueue(), but it is possible to
- * access AFD directly and use along with IOCP to simulate the functionality.
- * We want to use IOCP if possible as it gives us the ability to monitor more
- * than just sockets (WSAPoll is not an option), and perform arbitrary callbacks
- * which means we can hook in non-socket related events.
- *
- * The information for this implementation was gathered from "wepoll" and
- * "libuv" which both use slight variants on this, but this implementation
- * doesn't directly follow either methodology.
- *
- * Initialization:
- *   1. Dynamically load the NtDeviceIoControlFile and NtCancelIoFileEx internal
- *      symbols from ntdll.dll.  These functions are used to submit the AFD POLL
- *      request and to cancel a prior request, respectively.
- *   2. Create an IO Completion Port base handle via CreateIoCompletionPort()
- *      that all socket events will be delivered through.
- *   3. Create a callback to be used to be able to interrupt waiting for IOCP
- *      events, this may be called for allowing enqueuing of additional socket
- *      events or removing socket events. PostQueuedCompletionStatus() is the
- *      obvious choice.  Use the same container structure as used with a Socket
- *      but tagged indicating it is not as the CompletionKey (important!).
- *
- * Socket Add:
- *   1. Create/Allocate a container for holding metadata about a socket:
- *      - SOCKET base_socket;
- *      - SOCKET peer_socket;
- *      - OVERLAPPED overlapped; -- Used by AFD POLL
- *      - AFD_POLL_INFO afd_poll_info; -- Used by AFD POLL
- *   2. Call WSAIoctl(..., SIO_BASE_HANDLE, ...) to unwrap the SOCKET and get
- *      the "base socket" we can use for polling.  It appears this may fail so
- *      we should call WSAIoctl(..., SIO_BSP_HANDLE_POLL, ...) as a fallback.
- *   3. The SOCKET handle we have is most likely not capable of supporting
- *      OVERLAPPED, and we need to have a way to unbind a socket from IOCP
- *      (which is done via a simple closesocket()) so we need to duplicate the
- *      "base socket" using WSADuplicateSocketW() followed by
- *      WSASocketW(..., WSA_FLAG_OVERLAPPED) to create this "peer socket" for
- *      submitting AFD POLL requests.
- *   4. Bind to IOCP using CreateIoCompletionPort() referencing the "peer
- *      socket" and the base IOCP handle from "Initialization".  Use the
- *      pointer to the socket container as the "CompletionKey" which will be
- *      returned when an event occurs.
- *   5. Submit AFD POLL request (see "AFD POLL Request" section)
- *
- * Socket Delete:
- *   1. Call "AFD Poll Cancel" (see Section of same name)
- *   2. If a cancel was requested (not bypassed due to no events, etc), tag the
- *      "container" for the socket as pending delete, and when the next IOCP
- *      event for the socket is dequeued, cleanup.
- *   3. Otherwise, call closesocket(peer_socket) then free() the container
- *      which will officially delete it.
- *   NOTE: Deferring delete may be completely unnecessary.  In theory closing
- *         the peer_socket() should guarantee no additional events will be
- *         delivered.  But maybe if there's a pending event that hasn't been
- *         read yet but already trigggered it would be an issue, so this is
- *         "safer" unless we can prove its not necessary.
- *
- * Socket Modify:
- *   1. Call "AFD Poll Cancel" (see Section of same name)
- *   2. If a cancel was not enqueued because there is no pending request,
- *      submit AFD POLL request (see "AFD POLL Request" section), otherwise
- *      defer until next socket event.
- *
- * Event Wait:
- *   1. Call GetQueuedCompletionStatusEx() with the base IOCP handle, a
- *      stack allocated array of OVERLAPPED_ENTRY's, and an appropriate
- *      timeout.
- *   2. Iterate across returned events, the CompletionKey is a pointer to the
- *      container registered with CreateIoCompletionPort() or
- *      PostQueuedCompletionStatus()
- *   3. If object indicates it is pending delete, go ahead and
- *      closesocket(peer_socket) and free() the container. Go to the next event.
- *   4. Submit AFD POLL Request (see "AFD POLL Request"). We must re-enable
- *      the request each time we receive a response, it is not persistent.
- *   5. Notify of any events received as indicated in the AFD_POLL_INFO
- *      Handles[0].Events (NOTE: check NumberOfHandles first, make sure it is
- *      > 0, otherwise we might not have events such as if our last request
- *      was cancelled).
- *
- * AFD Poll Request:
- *   1. Initialize the AFD_POLL_INFO structure:
- *      Exclusive         = TRUE; // Auto cancel duplicates for same socket
- *      NumberOfHandles   = 1;
- *      Timeout.QuadPart  = LLONG_MAX;
- *      Handles[0].Handle = (HANDLE)base_socket;
- *      Handles[0].Status = 0;
- *      Handles[0].Events = ... set as appropriate AFD_POLL_RECEIVE, etc;
- *   2. Zero out the OVERLAPPED structure
- *   3. Create an IO_STATUS_BLOCK pointer (iosb) and set it to the address of
- *      the OVERLAPPED "Internal" member.
- *   4. Set the "Status" member of IO_STATUS_BLOCK to STATUS_PENDING
- *   5. Call
- *      NtDeviceIoControlFile((HANDLE)peer_socket, NULL, NULL, &overlapped,
- *                            iosb, IOCTL_AFD_POLL
- *                            &afd_poll_info, sizeof(afd_poll_info),
- *                            &afd_poll_info, sizeof(afd_poll_info));
- *   NOTE: Its not clear to me if the IO_STATUS_BLOCK pointing to OVERLAPPED
- *         is for efficiency or if its a requirement for AFD.  This is what
- *         libuv does, so I'm doing it here too.
- *
- * AFD Poll Cancel:
- *   1. Check to see if the IO_STATUS_BLOCK "Status" member for the socket
- *      is still STATUS_PENDING, if not, no cancel request is necessary.
- *   2. Call
- *      NtCancelIoFileEx((HANDLE)peer_socket, iosb, &temp_iosb);
- *
- *
- * References:
- *   - https://github.com/piscisaureus/wepoll/
- *   - https://github.com/libuv/libuv/
- */
-
-typedef struct {
-  /* Dynamically loaded symbols */
-  NtDeviceIoControlFile_t NtDeviceIoControlFile;
-  NtCancelIoFileEx_t      NtCancelIoFileEx;
-
-  /* Implementation details */
-  HANDLE                  iocp_handle;
-} ares_evsys_win32_t;
-
-typedef struct {
-  /*! Pointer to parent event container */
-  ares_event_t *event;
-  /*! Socket passed in to monitor */
-  SOCKET        socket;
-  /*! Base socket derived from provided socket */
-  SOCKET        base_socket;
-  /*! New socket (duplicate base_socket handle) supporting OVERLAPPED operation
-   */
-  SOCKET        peer_socket;
-  /*! Structure for submitting AFD POLL requests (Internals!) */
-  AFD_POLL_INFO afd_poll_info;
-  /*! Overlapped structure submitted with AFD POLL requests and returned with
-   * IOCP results */
-  OVERLAPPED    overlapped;
-} ares_evsys_win32_eventdata_t;
-
-static void ares_iocpevent_signal(const ares_event_t *event)
-{
-  ares_event_thread_t *e  = event->e;
-  ares_evsys_win32_t  *ew = e->ev_sys_data;
-
-  if (e == NULL) {
-    return;
-  }
-
-  PostQueuedCompletionStatus(ew->iocp_handle, 0, (ULONG_PTR)event->data, NULL);
-}
-
-static void ares_iocpevent_cb(ares_event_thread_t *e, ares_socket_t fd,
-                              void *data, ares_event_flags_t flags)
-{
-  (void)e;
-  (void)data;
-  (void)fd;
-  (void)flags;
-}
-
-static ares_event_t *ares_iocpevent_create(ares_event_thread_t *e)
-{
-  ares_event_t *event = NULL;
-  ares_status_t status;
-
-  status =
-    ares_event_update(&event, e, ARES_EVENT_FLAG_OTHER, ares_iocpevent_cb,
-                      ARES_SOCKET_BAD, NULL, NULL, ares_iocpevent_signal);
-  if (status != ARES_SUCCESS) {
-    return NULL;
-  }
-
-  return event;
-}
-
-static void ares_evsys_win32_destroy(ares_event_thread_t *e)
-{
-  ares_evsys_win32_t *ew = NULL;
-
-  if (e == NULL) {
-    return;
-  }
-
-  ew = e->ev_sys_data;
-  if (ew == NULL) {
-    return;
-  }
-
-  if (ew->iocp_handle != NULL) {
-    CloseHandle(ew->iocp_handle);
-  }
-
-  ares_free(ew);
-  e->ev_sys_data = NULL;
-}
-
-static ares_bool_t ares_evsys_win32_init(ares_event_thread_t *e)
-{
-  ares_evsys_win32_t *ew = NULL;
-  HMODULE             ntdll;
-
-  ew = ares_malloc_zero(sizeof(*ew));
-  if (ew == NULL) {
-    return ARES_FALSE;
-  }
-
-  e->ev_sys_data = ew;
-
-  /* All apps should have ntdll.dll already loaded, so just get a handle to
-   * this */
-  ntdll = GetModuleHandleA("ntdll.dll");
-  if (ntdll == NULL) {
-    goto fail;
-  }
-
-  /* Load Internal symbols not typically accessible */
-  ew->NtDeviceIoControlFile = (NtDeviceIoControlFile_t)(void *)GetProcAddress(
-    ntdll, "NtDeviceIoControlFile");
-  ew->NtCancelIoFileEx =
-    (NtCancelIoFileEx_t)(void *)GetProcAddress(ntdll, "NtCancelIoFileEx");
-
-  if (ew->NtCancelIoFileEx == NULL || ew->NtDeviceIoControlFile == NULL) {
-    goto fail;
-  }
-
-  ew->iocp_handle = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
-  if (ew->iocp_handle == NULL) {
-    goto fail;
-  }
-
-  e->ev_signal = ares_iocpevent_create(e);
-  if (e->ev_signal == NULL) {
-    goto fail;
-  }
-
-  return ARES_TRUE;
-
-fail:
-  ares_evsys_win32_destroy(e);
-  return ARES_FALSE;
-}
-
-static ares_socket_t ares_evsys_win32_basesocket(ares_socket_t socket)
-{
-  while (1) {
-    DWORD         bytes; /* Not used */
-    ares_socket_t base_socket = ARES_SOCKET_BAD;
-    int           rv;
-
-    rv = WSAIoctl(socket, SIO_BASE_HANDLE, NULL, 0, &base_socket,
-                  sizeof(base_socket), &bytes, NULL, NULL);
-    if (rv != SOCKET_ERROR && base_socket != ARES_SOCKET_BAD) {
-      socket = base_socket;
-      break;
-    }
-
-    /* If we're here, an error occurred */
-    if (GetLastError() == WSAENOTSOCK) {
-      /* This is critical, exit */
-      return ARES_SOCKET_BAD;
-    }
-
-    /* Work around known bug in Komodia based LSPs, use ARES_BSP_HANDLE_POLL
-     * to retrieve the underlying socket to then loop and get the base socket:
-     *  https://docs.microsoft.com/en-us/windows/win32/winsock/winsock-ioctls
-     *  https://www.komodia.com/newwiki/index.php?title=Komodia%27s_Redirector_bug_fixes#Version_2.2.2.6
-     */
-    base_socket = ARES_SOCKET_BAD;
-    rv          = WSAIoctl(socket, SIO_BSP_HANDLE_POLL, NULL, 0, &base_socket,
-                           sizeof(base_socket), &bytes, NULL, NULL);
-
-    if (rv != SOCKET_ERROR && base_socket != ARES_SOCKET_BAD &&
-        base_socket != socket) {
-      socket = base_socket;
-      continue; /* loop! */
-    }
-
-    return ARES_SOCKET_BAD;
-  }
-
-  return socket;
-}
-
-static ares_bool_t ares_evsys_win32_afd_enqueue(ares_event_t      *event,
-                                                ares_event_flags_t flags)
-{
-  ares_event_thread_t          *e  = event->e;
-  ares_evsys_win32_t           *ew = e->ev_sys_data;
-  ares_evsys_win32_eventdata_t *ed = event->data;
-  NTSTATUS                      status;
-  IO_STATUS_BLOCK              *iosb_ptr;
-
-  if (e == NULL || ed == NULL || ew == NULL) {
-    return ARES_FALSE;
-  }
-
-  /* Enqueue AFD Poll */
-  ed->afd_poll_info.Exclusive         = TRUE;
-  ed->afd_poll_info.NumberOfHandles   = 1;
-  ed->afd_poll_info.Timeout.QuadPart  = LLONG_MAX;
-  ed->afd_poll_info.Handles[0].Handle = (HANDLE)ed->base_socket;
-  ed->afd_poll_info.Handles[0].Status = 0;
-  ed->afd_poll_info.Handles[0].Events = 0;
-
-  if (flags & ARES_EVENT_FLAG_READ) {
-    ed->afd_poll_info.Handles[0].Events |=
-      (AFD_POLL_RECEIVE | AFD_POLL_DISCONNECT | AFD_POLL_ACCEPT |
-       AFD_POLL_ABORT);
-  }
-  if (flags & ARES_EVENT_FLAG_WRITE) {
-    ed->afd_poll_info.Handles[0].Events |=
-      (AFD_POLL_SEND | AFD_POLL_CONNECT_FAIL);
-  }
-  if (flags == 0) {
-    ed->afd_poll_info.Handles[0].Events |= AFD_POLL_DISCONNECT;
-  }
-
-  memset(&ed->overlapped, 0, sizeof(ed->overlapped));
-  iosb_ptr         = (IO_STATUS_BLOCK *)&ed->overlapped.Internal;
-  iosb_ptr->Status = STATUS_PENDING;
-
-  status = ew->NtDeviceIoControlFile(
-    (HANDLE)ed->peer_socket, NULL, NULL, &ed->overlapped, iosb_ptr,
-    IOCTL_AFD_POLL, &ed->afd_poll_info, sizeof(ed->afd_poll_info),
-    &ed->afd_poll_info, sizeof(ed->afd_poll_info));
-  if (status != STATUS_SUCCESS && status != STATUS_PENDING) {
-    printf("%s(): failed to perform IOCTL_AFD_POLL operation\n", __FUNCTION__);
-    fflush(stdout);
-    return ARES_FALSE;
-  }
-
-  return ARES_TRUE;
-}
-
-static ares_bool_t ares_evsys_win32_afd_cancel(ares_evsys_win32_eventdata_t *ed)
-{
-  IO_STATUS_BLOCK    *iosb_ptr;
-  IO_STATUS_BLOCK     cancel_iosb;
-  ares_evsys_win32_t *ew;
-  NTSTATUS            status;
-
-  /* Detached due to destroy */
-  if (ed->event == NULL) {
-    return ARES_FALSE;
-  }
-
-  iosb_ptr = (IO_STATUS_BLOCK *)&ed->overlapped.Internal;
-  /* Not pending, nothing to do */
-  if (iosb_ptr->Status != STATUS_PENDING) {
-    return ARES_FALSE;
-  }
-
-  ew = ed->event->e->ev_sys_data;
-  status =
-    ew->NtCancelIoFileEx((HANDLE)ed->peer_socket, iosb_ptr, &cancel_iosb);
-
-  /* NtCancelIoFileEx() may return STATUS_NOT_FOUND if the operation completed
-   * just before calling NtCancelIoFileEx(), but we have not yet received the
-   * notifiction (but it should be queued for the next IOCP event).  */
-  if (status == STATUS_SUCCESS || status == STATUS_NOT_FOUND) {
-    return ARES_TRUE;
-  }
-
-  return ARES_FALSE;
-}
-
-static void ares_evsys_win32_eventdata_destroy(ares_evsys_win32_eventdata_t *ed)
-{
-  if (ed == NULL) {
-    return;
-  }
-
-  if (ed->peer_socket != ARES_SOCKET_BAD) {
-    closesocket(ed->peer_socket);
-  }
-
-  ares_free(ed);
-}
-
-static ares_bool_t ares_evsys_win32_event_add(ares_event_t *event)
-{
-  ares_event_thread_t          *e  = event->e;
-  ares_evsys_win32_t           *ew = e->ev_sys_data;
-  ares_evsys_win32_eventdata_t *ed;
-  WSAPROTOCOL_INFOW             protocol_info;
-
-  ed              = ares_malloc_zero(sizeof(*ed));
-  ed->event       = event;
-  ed->socket      = event->fd;
-  ed->base_socket = ARES_SOCKET_BAD;
-  ed->peer_socket = ARES_SOCKET_BAD;
-
-  /* Likely a signal event, not something we will directly handle.  We create
-   * the ares_evsys_win32_eventdata_t as the placeholder to use as the
-   * IOCP Completion Key */
-  if (ed->socket == ARES_SOCKET_BAD) {
-    event->data = ed;
-    return ARES_TRUE;
-  }
-
-  ed->base_socket = ares_evsys_win32_basesocket(ed->socket);
-  if (ed->base_socket == ARES_SOCKET_BAD) {
-    fprintf(stderr, "%s(): could not determine base socket for fd %d\n",
-            __FUNCTION__, (int)event->fd);
-    ares_evsys_win32_eventdata_destroy(ed);
-    return ARES_FALSE;
-  }
-
-  /* Create a peer socket that supports OVERLAPPED so we can use IOCP on the
-   * socket handle */
-  if (WSADuplicateSocketW(ed->base_socket, GetCurrentProcessId(),
-                          &protocol_info) != 0) {
-    fprintf(stderr,
-            "%s(): could not retrieve protocol info for creating peer socket\n",
-            __FUNCTION__);
-    ares_evsys_win32_eventdata_destroy(ed);
-    return ARES_FALSE;
-  }
-
-  ed->peer_socket =
-    WSASocketW(protocol_info.iAddressFamily, protocol_info.iSocketType,
-               protocol_info.iProtocol, &protocol_info, 0, WSA_FLAG_OVERLAPPED);
-  if (ed->peer_socket == ARES_SOCKET_BAD) {
-    fprintf(stderr, "%s(): could not create peer socket\n", __FUNCTION__);
-    ares_evsys_win32_eventdata_destroy(ed);
-    return ARES_FALSE;
-  }
-
-  SetHandleInformation((HANDLE)ed->peer_socket, HANDLE_FLAG_INHERIT, 0);
-
-  if (CreateIoCompletionPort((HANDLE)ed->peer_socket, ew->iocp_handle,
-                             (ULONG_PTR)ed, 0) == NULL) {
-    fprintf(stderr, "%s(): failed to bind peer socket to IOCP\n", __FUNCTION__);
-    ares_evsys_win32_eventdata_destroy(ed);
-    return ARES_FALSE;
-  }
-
-  event->data = ed;
-
-  if (!ares_evsys_win32_afd_enqueue(event, event->flags)) {
-    event->data = NULL;
-    ares_evsys_win32_eventdata_destroy(ed);
-    return ARES_FALSE;
-  }
-
-  return ARES_TRUE;
-}
-
-static void ares_evsys_win32_event_del(ares_event_t *event)
-{
-  ares_evsys_win32_eventdata_t *ed = event->data;
-  ares_event_thread_t          *e  = event->e;
-
-  if (event->fd == ARES_SOCKET_BAD || !e->isup || ed == NULL ||
-      !ares_evsys_win32_afd_cancel(ed)) {
-    /* Didn't need to enqueue a cancellation, for one of these reasons:
-     *  - Not an IOCP socket
-     *  - This is during shutdown of the event thread, no more signals can be
-     *    delivered.
-     *  - It has been determined there is no AFD POLL queued currently for the
-     *    socket.
-     */
-    ares_evsys_win32_eventdata_destroy(ed);
-    event->data = NULL;
-  } else {
-    /* Detach from event, so when the cancel event comes through,
-     * it will clean up */
-    ed->event   = NULL;
-    event->data = NULL;
-  }
-}
-
-static void ares_evsys_win32_event_mod(ares_event_t      *event,
-                                       ares_event_flags_t new_flags)
-{
-  ares_evsys_win32_eventdata_t *ed = event->data;
-
-  /* Not for us */
-  if (event->fd == ARES_SOCKET_BAD || ed == NULL) {
-    return;
-  }
-
-  /* Try to cancel any current outstanding poll, if one is not running,
-   * go ahead and queue it up */
-  if (!ares_evsys_win32_afd_cancel(ed)) {
-    ares_evsys_win32_afd_enqueue(event, new_flags);
-  }
-}
-
-static size_t ares_evsys_win32_wait(ares_event_thread_t *e,
-                                    unsigned long        timeout_ms)
-{
-  ares_evsys_win32_t *ew = e->ev_sys_data;
-  OVERLAPPED_ENTRY    entries[16];
-  ULONG               nentries = sizeof(entries) / sizeof(*entries);
-  BOOL                status;
-  size_t              i;
-  size_t              cnt = 0;
-
-  status = GetQueuedCompletionStatusEx(
-    ew->iocp_handle, entries, nentries, &nentries,
-    (timeout_ms == 0) ? INFINITE : (DWORD)timeout_ms, FALSE);
-
-  if (!status) {
-    return 0;
-  }
-
-  for (i = 0; i < (size_t)nentries; i++) {
-    ares_event_flags_t            flags = 0;
-    ares_evsys_win32_eventdata_t *ed =
-      (ares_evsys_win32_eventdata_t *)entries[i].lpCompletionKey;
-    ares_event_t *event = ed->event;
-
-    if (ed->socket == ARES_SOCKET_BAD) {
-      /* Some sort of signal event */
-      flags = ARES_EVENT_FLAG_OTHER;
-    } else {
-      /* Process events */
-      if (ed->afd_poll_info.NumberOfHandles > 0) {
-        if (ed->afd_poll_info.Handles[0].Events &
-            (AFD_POLL_RECEIVE | AFD_POLL_DISCONNECT | AFD_POLL_ACCEPT |
-             AFD_POLL_ABORT)) {
-          flags |= ARES_EVENT_FLAG_READ;
-        }
-        if (ed->afd_poll_info.Handles[0].Events &
-            (AFD_POLL_SEND | AFD_POLL_CONNECT_FAIL)) {
-          flags |= ARES_EVENT_FLAG_WRITE;
-        }
-
-        /* XXX: Handle ed->afd_poll_info.Handles[0].Events &
-         * AFD_POLL_LOCAL_CLOSE */
-      }
-
-      if (event == NULL) {
-        /* This means we need to cleanup the private event data as we've been
-         * detached */
-        ares_evsys_win32_eventdata_destroy(ed);
-      } else {
-        /* Re-enqueue so we can get more events on the socket */
-        ares_evsys_win32_afd_enqueue(event, event->flags);
-      }
-    }
-
-    if (event != NULL && flags != 0) {
-      cnt++;
-      event->cb(e, event->fd, event->data, flags);
-    }
-  }
-
-  return cnt;
-}
-
-const ares_event_sys_t ares_evsys_win32 = { "win32",
-                                            ares_evsys_win32_init,
-                                            ares_evsys_win32_destroy,
-                                            ares_evsys_win32_event_add,
-                                            ares_evsys_win32_event_del,
-                                            ares_evsys_win32_event_mod,
-                                            ares_evsys_win32_wait };
-#endif
diff --git a/contrib/libs/c-ares/src/lib/ares_free_hostent.c b/contrib/libs/c-ares/src/lib/ares_free_hostent.c
index a088c1b15cdf..bf2037238b55 100644
--- a/contrib/libs/c-ares/src/lib/ares_free_hostent.c
+++ b/contrib/libs/c-ares/src/lib/ares_free_hostent.c
@@ -24,16 +24,12 @@
  *
  * SPDX-License-Identifier: MIT
  */
-
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETDB_H
 #  include <netdb.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h" /* for memdebug */
-
 void ares_free_hostent(struct hostent *host)
 {
   char **p;
diff --git a/contrib/libs/c-ares/src/lib/ares_free_string.c b/contrib/libs/c-ares/src/lib/ares_free_string.c
index 39773067bd2d..048ad5d2ae24 100644
--- a/contrib/libs/c-ares/src/lib/ares_free_string.c
+++ b/contrib/libs/c-ares/src/lib/ares_free_string.c
@@ -25,9 +25,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include "ares.h"
 #include "ares_private.h"
 
 void ares_free_string(void *str)
diff --git a/contrib/libs/c-ares/src/lib/ares_freeaddrinfo.c b/contrib/libs/c-ares/src/lib/ares_freeaddrinfo.c
index 45d931a3f86f..2a49f57531e9 100644
--- a/contrib/libs/c-ares/src/lib/ares_freeaddrinfo.c
+++ b/contrib/libs/c-ares/src/lib/ares_freeaddrinfo.c
@@ -25,15 +25,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETDB_H
 #  include <netdb.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
-
 void ares__freeaddrinfo_cnames(struct ares_addrinfo_cname *head)
 {
   struct ares_addrinfo_cname *current;
diff --git a/contrib/libs/c-ares/src/lib/ares_getaddrinfo.c b/contrib/libs/c-ares/src/lib/ares_getaddrinfo.c
index cfc889c70a84..f67acdec2fac 100644
--- a/contrib/libs/c-ares/src/lib/ares_getaddrinfo.c
+++ b/contrib/libs/c-ares/src/lib/ares_getaddrinfo.c
@@ -26,7 +26,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_GETSERVBYNAME_R
 #  if !defined(GETSERVBYNAME_R_ARGS) || (GETSERVBYNAME_R_ARGS < 4) || \
@@ -56,14 +56,9 @@
 #  include <limits.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
 #include "ares_dns.h"
 
-#ifdef WATT32
-#  undef WIN32
-#endif
-#ifdef WIN32
+#ifdef _WIN32
 #  include "ares_platform.h"
 #endif
 
@@ -112,7 +107,7 @@ struct ares_addrinfo_cname *
   struct ares_addrinfo_cname *last = *head;
 
   if (tail == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (!last) {
@@ -152,7 +147,7 @@ struct ares_addrinfo_node *
   struct ares_addrinfo_node *last = *head;
 
   if (tail == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (!last) {
@@ -257,7 +252,7 @@ static ares_bool_t fake_addrinfo(const char *name, unsigned short port,
     ares_bool_t valid   = ARES_TRUE;
     const char *p;
     for (p = name; *p; p++) {
-      if (!ISDIGIT(*p) && *p != '.') {
+      if (!ares__isdigit(*p) && *p != '.') {
         valid = ARES_FALSE;
         break;
       } else if (*p == '.') {
@@ -277,8 +272,8 @@ static ares_bool_t fake_addrinfo(const char *name, unsigned short port,
       if (result) {
         status = ares_append_ai_node(AF_INET, port, 0, &addr4, &ai->nodes);
         if (status != ARES_SUCCESS) {
-          callback(arg, (int)status, 0, NULL);
-          return ARES_TRUE;
+          callback(arg, (int)status, 0, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+          return ARES_TRUE;                    /* LCOV_EXCL_LINE: OutOfMemory */
         }
       }
     }
@@ -291,8 +286,8 @@ static ares_bool_t fake_addrinfo(const char *name, unsigned short port,
     if (result) {
       status = ares_append_ai_node(AF_INET6, port, 0, &addr6, &ai->nodes);
       if (status != ARES_SUCCESS) {
-        callback(arg, (int)status, 0, NULL);
-        return ARES_TRUE;
+        callback(arg, (int)status, 0, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+        return ARES_TRUE;                    /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -304,9 +299,11 @@ static ares_bool_t fake_addrinfo(const char *name, unsigned short port,
   if (hints->ai_flags & ARES_AI_CANONNAME) {
     cname = ares__append_addrinfo_cname(&ai->cnames);
     if (!cname) {
+      /* LCOV_EXCL_START: OutOfMemory */
       ares_freeaddrinfo(ai);
       callback(arg, ARES_ENOMEM, 0, NULL);
       return ARES_TRUE;
+      /* LCOV_EXCL_STOP */
     }
 
     /* Duplicate the name, to avoid a constness violation. */
@@ -371,7 +368,7 @@ ares_bool_t ares__is_localhost(const char *name)
   size_t len;
 
   if (name == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (strcmp(name, "localhost") == 0) {
@@ -415,7 +412,7 @@ static ares_status_t file_lookup(struct host_query *hquery)
     hquery->ai);
 
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
 
@@ -472,7 +469,7 @@ static void terminate_retries(const struct host_query *hquery,
   unsigned short term_qid =
     (qid == hquery->qid_a) ? hquery->qid_aaaa : hquery->qid_a;
   const ares_channel_t *channel = hquery->channel;
-  struct query         *query   = NULL;
+  ares_query_t         *query   = NULL;
 
   /* No other outstanding queries, nothing to do */
   if (!hquery->remaining) {
@@ -497,7 +494,7 @@ static void host_callback(void *arg, ares_status_t status, size_t timeouts,
 
   if (status == ARES_SUCCESS) {
     if (dnsrec == NULL) {
-      addinfostatus = ARES_EBADRESP;
+      addinfostatus = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
     } else {
       addinfostatus =
         ares__parse_into_addrinfo(dnsrec, ARES_TRUE, hquery->port, hquery->ai);
@@ -675,20 +672,20 @@ static ares_bool_t next_dns_lookup(struct host_query *hquery)
   switch (hquery->hints.ai_family) {
     case AF_INET:
       hquery->remaining += 1;
-      ares_query_dnsrec(hquery->channel, name, ARES_CLASS_IN, ARES_REC_TYPE_A,
+      ares_query_nolock(hquery->channel, name, ARES_CLASS_IN, ARES_REC_TYPE_A,
                         host_callback, hquery, &hquery->qid_a);
       break;
     case AF_INET6:
       hquery->remaining += 1;
-      ares_query_dnsrec(hquery->channel, name, ARES_CLASS_IN,
+      ares_query_nolock(hquery->channel, name, ARES_CLASS_IN,
                         ARES_REC_TYPE_AAAA, host_callback, hquery,
                         &hquery->qid_aaaa);
       break;
     case AF_UNSPEC:
       hquery->remaining += 2;
-      ares_query_dnsrec(hquery->channel, name, ARES_CLASS_IN, ARES_REC_TYPE_A,
+      ares_query_nolock(hquery->channel, name, ARES_CLASS_IN, ARES_REC_TYPE_A,
                         host_callback, hquery, &hquery->qid_a);
-      ares_query_dnsrec(hquery->channel, name, ARES_CLASS_IN,
+      ares_query_nolock(hquery->channel, name, ARES_CLASS_IN,
                         ARES_REC_TYPE_AAAA, host_callback, hquery,
                         &hquery->qid_aaaa);
       break;
diff --git a/contrib/libs/c-ares/src/lib/ares_getenv.c b/contrib/libs/c-ares/src/lib/ares_getenv.c
index 08601a61e540..4f471673b9d3 100644
--- a/contrib/libs/c-ares/src/lib/ares_getenv.c
+++ b/contrib/libs/c-ares/src/lib/ares_getenv.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 #include "ares_getenv.h"
 
 #ifndef HAVE_GETENV
diff --git a/contrib/libs/c-ares/src/lib/ares_getenv.h b/contrib/libs/c-ares/src/lib/ares_getenv.h
index d8bd3a2195b4..490097fc8d35 100644
--- a/contrib/libs/c-ares/src/lib/ares_getenv.h
+++ b/contrib/libs/c-ares/src/lib/ares_getenv.h
@@ -27,8 +27,6 @@
 #ifndef HEADER_CARES_GETENV_H
 #define HEADER_CARES_GETENV_H
 
-#include "ares_setup.h"
-
 #ifndef HAVE_GETENV
 extern char *ares_getenv(const char *name);
 #endif
diff --git a/contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c b/contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c
index 453673260dce..1db81ec2b48b 100644
--- a/contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c
+++ b/contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -38,15 +38,8 @@
 #endif
 
 #include "ares_nameser.h"
-
-#include "ares.h"
 #include "ares_inet_net_pton.h"
 #include "ares_platform.h"
-#include "ares_private.h"
-
-#ifdef WATT32
-#  undef WIN32
-#endif
 
 struct addr_query {
   /* Arguments passed to ares_gethostbyaddr() */
@@ -68,9 +61,9 @@ static ares_status_t file_lookup(ares_channel_t         *channel,
                                  const struct ares_addr *addr,
                                  struct hostent        **host);
 
-static void ares_gethostbyaddr_int(ares_channel_t *channel, const void *addr,
-                                   int addrlen, int family,
-                                   ares_host_callback callback, void *arg)
+void ares_gethostbyaddr_nolock(ares_channel_t *channel, const void *addr,
+                               int addrlen, int family,
+                               ares_host_callback callback, void *arg)
 {
   struct addr_query *aquery;
 
@@ -92,9 +85,11 @@ static void ares_gethostbyaddr_int(ares_channel_t *channel, const void *addr,
   }
   aquery->lookups = ares_strdup(channel->lookups);
   if (aquery->lookups == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     ares_free(aquery);
     callback(arg, ARES_ENOMEM, 0, NULL);
     return;
+    /* LCOV_EXCL_STOP */
   }
   aquery->channel = channel;
   if (family == AF_INET) {
@@ -118,7 +113,7 @@ void ares_gethostbyaddr(ares_channel_t *channel, const void *addr, int addrlen,
     return;
   }
   ares__channel_lock(channel);
-  ares_gethostbyaddr_int(channel, addr, addrlen, family, callback, arg);
+  ares_gethostbyaddr_nolock(channel, addr, addrlen, family, callback, arg);
   ares__channel_unlock(channel);
 }
 
@@ -134,11 +129,12 @@ static void next_lookup(struct addr_query *aquery)
       case 'b':
         name = ares_dns_addr_to_ptr(&aquery->addr);
         if (name == NULL) {
-          end_aquery(aquery, ARES_ENOMEM, NULL);
-          return;
+          end_aquery(aquery, ARES_ENOMEM,
+                     NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+          return;           /* LCOV_EXCL_LINE: OutOfMemory */
         }
         aquery->remaining_lookups = p + 1;
-        ares_query_dnsrec(aquery->channel, name, ARES_CLASS_IN,
+        ares_query_nolock(aquery->channel, name, ARES_CLASS_IN,
                           ARES_REC_TYPE_PTR, addr_callback, aquery, NULL);
         ares_free(name);
         return;
@@ -227,7 +223,7 @@ static ares_status_t file_lookup(ares_channel_t         *channel,
 
   status = ares__hosts_entry_to_hostent(entry, addr->family, host);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
diff --git a/contrib/libs/c-ares/src/lib/ares_gethostbyname.c b/contrib/libs/c-ares/src/lib/ares_gethostbyname.c
index 299c35b4169c..6db86e0eed1c 100644
--- a/contrib/libs/c-ares/src/lib/ares_gethostbyname.c
+++ b/contrib/libs/c-ares/src/lib/ares_gethostbyname.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -43,10 +43,8 @@
 #  include <strings.h>
 #endif
 
-#include "ares.h"
 #include "ares_inet_net_pton.h"
 #include "ares_platform.h"
-#include "ares_private.h"
 
 static void   sort_addresses(const struct hostent  *host,
                              const struct apattern *sortlist, size_t nsort);
@@ -102,13 +100,17 @@ static void ares_gethostbyname_callback(void *arg, int status, int timeouts,
 void ares_gethostbyname(ares_channel_t *channel, const char *name, int family,
                         ares_host_callback callback, void *arg)
 {
-  const struct ares_addrinfo_hints hints = { ARES_AI_CANONNAME, family, 0, 0 };
-  struct host_query               *ghbn_arg;
+  struct ares_addrinfo_hints hints;
+  struct host_query         *ghbn_arg;
 
   if (!callback) {
     return;
   }
 
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_flags  = ARES_AI_CANONNAME;
+  hints.ai_family = family;
+
   ghbn_arg = ares_malloc(sizeof(*ghbn_arg));
   if (!ghbn_arg) {
     callback(arg, ARES_ENOMEM, 0, NULL);
@@ -248,18 +250,18 @@ static ares_status_t ares__hostent_localhost(const char *name, int family,
 
   ai = ares_malloc_zero(sizeof(*ai));
   if (ai == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__addrinfo_localhost(name, 0, &hints, ai);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__addrinfo2hostent(ai, family, host_out);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
 done:
@@ -298,7 +300,7 @@ static ares_status_t ares_gethostbyname_file_int(ares_channel_t *channel,
 
   status = ares__hosts_entry_to_hostent(entry, family, host);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
 done:
diff --git a/contrib/libs/c-ares/src/lib/ares_getnameinfo.c b/contrib/libs/c-ares/src/lib/ares_getnameinfo.c
index d4cf58ea5165..622c1adb1c73 100644
--- a/contrib/libs/c-ares/src/lib/ares_getnameinfo.c
+++ b/contrib/libs/c-ares/src/lib/ares_getnameinfo.c
@@ -23,7 +23,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_GETSERVBYPORT_R
 #  if !defined(GETSERVBYPORT_R_ARGS) || (GETSERVBYPORT_R_ARGS < 4) || \
@@ -51,9 +51,7 @@
 #  include <iphlpapi.h>
 #endif
 
-#include "ares.h"
 #include "ares_ipv6.h"
-#include "ares_private.h"
 
 struct nameinfo_query {
   ares_nameinfo_callback callback;
@@ -81,8 +79,8 @@ static void  nameinfo_callback(void *arg, int status, int timeouts,
 static char *lookup_service(unsigned short port, unsigned int flags, char *buf,
                             size_t buflen);
 #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
-static void append_scopeid(const struct sockaddr_in6 *addr6,
-                           unsigned int scopeid, char *buf, size_t buflen);
+static void append_scopeid(const struct sockaddr_in6 *addr6, unsigned int flags,
+                           char *buf, size_t buflen);
 #endif
 static char *ares_striendstr(const char *s1, const char *s2);
 
@@ -100,11 +98,11 @@ static void  ares_getnameinfo_int(ares_channel_t        *channel,
   /* Validate socket address family and length */
   if (sa && sa->sa_family == AF_INET &&
       salen >= (ares_socklen_t)sizeof(struct sockaddr_in)) {
-    addr = CARES_INADDR_CAST(struct sockaddr_in *, sa);
+    addr = CARES_INADDR_CAST(const struct sockaddr_in *, sa);
     port = addr->sin_port;
   } else if (sa && sa->sa_family == AF_INET6 &&
              salen >= (ares_socklen_t)sizeof(struct sockaddr_in6)) {
-    addr6 = CARES_INADDR_CAST(struct sockaddr_in6 *, sa);
+    addr6 = CARES_INADDR_CAST(const struct sockaddr_in6 *, sa);
     port  = addr6->sin6_port;
   } else {
     callback(arg, ARES_ENOTIMP, 0, NULL, NULL);
@@ -173,14 +171,15 @@ static void  ares_getnameinfo_int(ares_channel_t        *channel,
       if (sa->sa_family == AF_INET) {
         niquery->family = AF_INET;
         memcpy(&niquery->addr.addr4, addr, sizeof(niquery->addr.addr4));
-        ares_gethostbyaddr(channel, &addr->sin_addr, sizeof(struct in_addr),
-                           AF_INET, nameinfo_callback, niquery);
+        ares_gethostbyaddr_nolock(channel, &addr->sin_addr,
+                                  sizeof(struct in_addr), AF_INET,
+                                  nameinfo_callback, niquery);
       } else {
         niquery->family = AF_INET6;
         memcpy(&niquery->addr.addr6, addr6, sizeof(niquery->addr.addr6));
-        ares_gethostbyaddr(channel, &addr6->sin6_addr,
-                           sizeof(struct ares_in6_addr), AF_INET6,
-                           nameinfo_callback, niquery);
+        ares_gethostbyaddr_nolock(channel, &addr6->sin6_addr,
+                                  sizeof(struct ares_in6_addr), AF_INET6,
+                                  nameinfo_callback, niquery);
       }
     }
   }
@@ -411,8 +410,8 @@ static char *ares_striendstr(const char *s1, const char *s2)
   c1       = c1_begin;
   c2       = s2;
   while (c2 < s2 + s2_len) {
-    lo1 = TOLOWER(*c1);
-    lo2 = TOLOWER(*c2);
+    lo1 = ares__tolower((unsigned char)*c1);
+    lo2 = ares__tolower((unsigned char)*c2);
     if (lo1 != lo2) {
       return NULL;
     } else {
diff --git a/contrib/libs/c-ares/src/lib/ares_init.c b/contrib/libs/c-ares/src/lib/ares_init.c
index c8b4c3456411..6dc5f4f9353c 100644
--- a/contrib/libs/c-ares/src/lib/ares_init.c
+++ b/contrib/libs/c-ares/src/lib/ares_init.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
@@ -61,16 +61,9 @@
 #  include <iphlpapi.h>
 #endif
 
-#include "ares.h"
 #include "ares_inet_net_pton.h"
 #include "ares_platform.h"
-#include "ares_private.h"
-#include "ares_event.h"
-
-#ifdef WATT32
-#  undef WIN32 /* Redefined in MingW/MSVC headers */
-#endif
-
+#include "event/ares_event.h"
 
 int ares_init(ares_channel_t **channelptr)
 {
@@ -79,8 +72,8 @@ int ares_init(ares_channel_t **channelptr)
 
 static int ares_query_timeout_cmp_cb(const void *arg1, const void *arg2)
 {
-  const struct query *q1 = arg1;
-  const struct query *q2 = arg2;
+  const ares_query_t *q1 = arg1;
+  const ares_query_t *q2 = arg2;
 
   if (q1->timeout.sec > q2->timeout.sec) {
     return 1;
@@ -101,8 +94,8 @@ static int ares_query_timeout_cmp_cb(const void *arg1, const void *arg2)
 
 static int server_sort_cb(const void *data1, const void *data2)
 {
-  const struct server_state *s1 = data1;
-  const struct server_state *s2 = data2;
+  const ares_server_t *s1 = data1;
+  const ares_server_t *s2 = data2;
 
   if (s1->consec_failures < s2->consec_failures) {
     return -1;
@@ -122,7 +115,7 @@ static int server_sort_cb(const void *data1, const void *data2)
 static void server_destroy_cb(void *data)
 {
   if (data == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   ares__destroy_server(data);
 }
@@ -167,7 +160,7 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
 
     rc = ares__sconfig_append(&sconfig, &addr, 0, 0, NULL);
     if (rc != ARES_SUCCESS) {
-      goto error;
+      goto error; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     rc = ares__servers_update(channel, sconfig, ARES_FALSE);
@@ -201,8 +194,8 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
 
     hostname = ares_malloc(len);
     if (!hostname) {
-      rc = ARES_ENOMEM;
-      goto error;
+      rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto error;       /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     do {
@@ -214,8 +207,8 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
         lenv *= 2;
         p     = ares_realloc(hostname, len);
         if (!p) {
-          rc = ARES_ENOMEM;
-          goto error;
+          rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+          goto error;       /* LCOV_EXCL_LINE: OutOfMemory */
         }
         hostname = p;
         continue;
@@ -233,13 +226,13 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
       /* a dot was found */
       channel->domains = ares_malloc(sizeof(char *));
       if (!channel->domains) {
-        rc = ARES_ENOMEM;
-        goto error;
+        rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto error;       /* LCOV_EXCL_LINE: OutOfMemory */
       }
       channel->domains[0] = ares_strdup(dot + 1);
       if (!channel->domains[0]) {
-        rc = ARES_ENOMEM;
-        goto error;
+        rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto error;       /* LCOV_EXCL_LINE: OutOfMemory */
       }
       channel->ndomains = 1;
     }
@@ -253,7 +246,7 @@ static ares_status_t init_by_defaults(ares_channel_t *channel)
   if (!channel->lookups) {
     channel->lookups = ares_strdup("fb");
     if (!channel->lookups) {
-      rc = ARES_ENOMEM;
+      rc = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -287,6 +280,9 @@ int ares_init_options(ares_channel_t           **channelptr,
     return ARES_ENOMEM;
   }
 
+  /* We are in a good state */
+  channel->sys_up = ARES_TRUE;
+
   /* One option where zero is valid, so set default value here */
   channel->ndots = 1;
 
@@ -351,12 +347,13 @@ int ares_init_options(ares_channel_t           **channelptr,
     goto done;
   }
 
-  if (channel->qcache_max_ttl > 0) {
-    status = ares__qcache_create(channel->rand_state, channel->qcache_max_ttl,
-                                 &channel->qcache);
-    if (status != ARES_SUCCESS) {
-      goto done;
-    }
+  /* Go ahead and let it initialize the query cache even if the ttl is 0 and
+   * completely unused.  This reduces the number of different code paths that
+   * might be followed even if there is a minor performance hit. */
+  status = ares__qcache_create(channel->rand_state, channel->qcache_max_ttl,
+                               &channel->qcache);
+  if (status != ARES_SUCCESS) {
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (status == ARES_SUCCESS) {
@@ -384,7 +381,7 @@ int ares_init_options(ares_channel_t           **channelptr,
 
     status = ares_event_thread_init(channel);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: UntestablePath */
     }
 
     /* Initialize monitor for configuration changes.  In some rare cases,
@@ -392,7 +389,7 @@ int ares_init_options(ares_channel_t           **channelptr,
     e      = channel->sock_state_cb_data;
     status = ares_event_configchg_init(&e->configchg, e);
     if (status != ARES_SUCCESS && status != ARES_ENOTIMP) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: UntestablePath */
     }
     status = ARES_SUCCESS;
   }
@@ -443,8 +440,9 @@ ares_status_t ares_reinit(ares_channel_t *channel)
 
   ares__channel_lock(channel);
 
-  /* If a reinit is already in process, lets not do it again */
-  if (channel->reinit_pending) {
+  /* If a reinit is already in process, lets not do it again. Or if we are
+   * shutting down, skip. */
+  if (!channel->sys_up || channel->reinit_pending) {
     ares__channel_unlock(channel);
     return ARES_SUCCESS;
   }
@@ -464,9 +462,11 @@ ares_status_t ares_reinit(ares_channel_t *channel)
     status =
       ares__thread_create(&channel->reinit_thread, ares_reinit_thread, channel);
     if (status != ARES_SUCCESS) {
+      /* LCOV_EXCL_START: UntestablePath */
       ares__channel_lock(channel);
       channel->reinit_pending = ARES_FALSE;
       ares__channel_unlock(channel);
+      /* LCOV_EXCL_STOP */
     }
   } else {
     /* Threading support not available, call directly */
@@ -490,7 +490,6 @@ int ares_dup(ares_channel_t **dest, const ares_channel_t *src)
 
   *dest = NULL; /* in case of failure return NULL explicitly */
 
-  ares__channel_lock(src);
   /* First get the options supported by the old ares_save_options() function,
      which is most of them */
   rc = (ares_status_t)ares_save_options(src, &opts, &optmask);
@@ -509,6 +508,7 @@ int ares_dup(ares_channel_t **dest, const ares_channel_t *src)
     goto done;
   }
 
+  ares__channel_lock(src);
   /* Now clone the options that ares_save_options() doesn't support, but are
    * user-provided */
   (*dest)->sock_create_cb       = src->sock_create_cb;
@@ -524,7 +524,7 @@ int ares_dup(ares_channel_t **dest, const ares_channel_t *src)
               sizeof((*dest)->local_dev_name));
   (*dest)->local_ip4 = src->local_ip4;
   memcpy((*dest)->local_ip6, src->local_ip6, sizeof(src->local_ip6));
-
+  ares__channel_unlock(src);
 
   /* Servers are a bit unique as ares_init_options() only allows ipv4 servers
    * and not a port per server, but there are other user specified ways, that
@@ -539,24 +539,27 @@ int ares_dup(ares_channel_t **dest, const ares_channel_t *src)
   if (optmask & ARES_OPT_SERVERS) {
     char *csv = ares_get_servers_csv(src);
     if (csv == NULL) {
+      /* LCOV_EXCL_START: OutOfMemory */
       ares_destroy(*dest);
       *dest = NULL;
       rc    = ARES_ENOMEM;
       goto done;
+      /* LCOV_EXCL_STOP */
     }
 
     rc = (ares_status_t)ares_set_servers_ports_csv(*dest, csv);
     ares_free_string(csv);
     if (rc != ARES_SUCCESS) {
+      /* LCOV_EXCL_START: OutOfMemory */
       ares_destroy(*dest);
       *dest = NULL;
       goto done;
+      /* LCOV_EXCL_STOP */
     }
   }
 
   rc = ARES_SUCCESS;
 done:
-  ares__channel_unlock(src);
   return (int)rc; /* everything went fine */
 }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_library_init.c b/contrib/libs/c-ares/src/lib/ares_library_init.c
index 5d8abf10a079..01d8ff1a44fc 100644
--- a/contrib/libs/c-ares/src/lib/ares_library_init.c
+++ b/contrib/libs/c-ares/src/lib/ares_library_init.c
@@ -25,9 +25,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include "ares.h"
 #include "ares_private.h"
 
 /* library-private global and unique instance vars */
@@ -55,7 +52,7 @@ static void        *default_malloc(size_t size)
   return malloc(size);
 }
 
-#if defined(WIN32)
+#if defined(_WIN32)
 /* We need indirections to handle Windows DLL rules. */
 static void *default_realloc(void *p, size_t size)
 {
diff --git a/contrib/libs/c-ares/src/lib/ares_metrics.c b/contrib/libs/c-ares/src/lib/ares_metrics.c
new file mode 100644
index 000000000000..aa0ea8c01707
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/ares_metrics.c
@@ -0,0 +1,261 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+
+/* IMPLEMENTATION NOTES
+ * ====================
+ *
+ * With very little effort we should be able to determine fairly proper timeouts
+ * we can use based on prior query history.  We track in order to be able to
+ * auto-scale when network conditions change (e.g. maybe there is a provider
+ * failover and timings change due to that).  Apple appears to do this within
+ * their system resolver in MacOS.  Obviously we should have a minimum, maximum,
+ * and initial value to make sure the algorithm doesn't somehow go off the
+ * rails.
+ *
+ * Values:
+ * - Minimum Timeout: 250ms (approximate RTT half-way around the globe)
+ * - Maximum Timeout: 5000ms (Recommended timeout in RFC 1123), can be reduced
+ *   by ARES_OPT_MAXTIMEOUTMS, but otherwise the bound specified by the option
+ *   caps the retry timeout.
+ * - Initial Timeout: User-specified via configuration or ARES_OPT_TIMEOUTMS
+ * - Average latency multiplier: 5x (a local DNS server returning a cached value
+ *   will be quicker than if it needs to recurse so we need to account for this)
+ * - Minimum Count for Average: 3.  This is the minimum number of queries we
+ *   need to form an average for the bucket.
+ *
+ * Per-server buckets for tracking latency over time (these are ephemeral
+ * meaning they don't persist once a channel is destroyed).  We record both the
+ * current timespan for the bucket and the immediate preceding timespan in case
+ * of roll-overs we can still maintain recent metrics for calculations:
+ * - 1 minute
+ * - 15 minutes
+ * - 1 hr
+ * - 1 day
+ * - since inception
+ *
+ * Each bucket would contain:
+ * - timestamp (divided by interval)
+ * - minimum latency
+ * - maximum latency
+ * - total time
+ * - count
+ * NOTE: average latency is (total time / count), we will calculate this
+ *       dynamically when needed
+ *
+ * Basic algorithm for calculating timeout to use would be:
+ * - Scan from most recent bucket to least recent
+ * - Check timestamp of bucket, if doesn't match current time, continue to next
+ *   bucket
+ * - Check count of bucket, if its not at least the "Minimum Count for Average",
+ *   check the previous bucket, otherwise continue to next bucket
+ * - If we reached the end with no bucket match, use "Initial Timeout"
+ * - If bucket is selected, take ("total time" / count) as Average latency,
+ *   multiply by "Average Latency Multiplier", bound by "Minimum Timeout" and
+ *   "Maximum Timeout"
+ * NOTE: The timeout calculated may not be the timeout used.  If we are retrying
+ * the query on the same server another time, then it will use a larger value
+ *
+ * On each query reply where the response is legitimate (proper response or
+ * NXDOMAIN) and not something like a server error:
+ * - Cycle through each bucket in order
+ * - Check timestamp of bucket against current timestamp, if out of date
+ *   overwrite previous entry with values, clear current values
+ * - Compare current minimum and maximum recorded latency against query time and
+ *   adjust if necessary
+ * - Increment "count" by 1 and "total time" by the query time
+ *
+ * Other Notes:
+ * - This is always-on, the only user-configurable value is the initial
+ *   timeout which will simply re-uses the current option.
+ * - Minimum and Maximum latencies for a bucket are currently unused but are
+ *   there in case we find a need for them in the future.
+ */
+
+#include "ares_private.h"
+
+/*! Minimum timeout value. Chosen due to it being approximately RTT half-way
+ *  around the world */
+#define MIN_TIMEOUT_MS 250
+
+/*! Multiplier to apply to average latency to come up with an initial timeout */
+#define AVG_TIMEOUT_MULTIPLIER 5
+
+/*! Upper timeout bounds, only used if channel->maxtimeout not set */
+#define MAX_TIMEOUT_MS 5000
+
+/*! Minimum queries required to form an average */
+#define MIN_COUNT_FOR_AVERAGE 3
+
+static time_t ares_metric_timestamp(ares_server_bucket_t  bucket,
+                                    const ares_timeval_t *now,
+                                    ares_bool_t           is_previous)
+{
+  time_t divisor = 1; /* Silence bogus MSVC warning by setting default value */
+
+  switch (bucket) {
+    case ARES_METRIC_1MINUTE:
+      divisor = 60;
+      break;
+    case ARES_METRIC_15MINUTES:
+      divisor = 15 * 60;
+      break;
+    case ARES_METRIC_1HOUR:
+      divisor = 60 * 60;
+      break;
+    case ARES_METRIC_1DAY:
+      divisor = 24 * 60 * 60;
+      break;
+    case ARES_METRIC_INCEPTION:
+      return is_previous ? 0 : 1;
+    case ARES_METRIC_COUNT:
+      return 0; /* Invalid! */
+  }
+
+  if (is_previous) {
+    if (divisor >= now->sec) {
+      return 0;
+    }
+    return (time_t)((now->sec - divisor) / divisor);
+  }
+
+  return (time_t)(now->sec / divisor);
+}
+
+void ares_metrics_record(const ares_query_t *query, ares_server_t *server,
+                         ares_status_t status, const ares_dns_record_t *dnsrec)
+{
+  ares_timeval_t       now;
+  ares_timeval_t       tvdiff;
+  unsigned int         query_ms;
+  ares_dns_rcode_t     rcode;
+  ares_server_bucket_t i;
+
+  if (status != ARES_SUCCESS) {
+    return;
+  }
+
+  if (server == NULL) {
+    return;
+  }
+
+  ares__tvnow(&now);
+
+  rcode = ares_dns_record_get_rcode(dnsrec);
+  if (rcode != ARES_RCODE_NOERROR && rcode != ARES_RCODE_NXDOMAIN) {
+    return;
+  }
+
+  ares__timeval_diff(&tvdiff, &query->ts, &now);
+  query_ms = (unsigned int)(tvdiff.sec + (tvdiff.usec / 1000));
+  if (query_ms == 0) {
+    query_ms = 1;
+  }
+
+  /* Place in each bucket */
+  for (i = 0; i < ARES_METRIC_COUNT; i++) {
+    time_t ts = ares_metric_timestamp(i, &now, ARES_FALSE);
+
+    /* Copy metrics to prev and clear */
+    if (ts != server->metrics[i].ts) {
+      server->metrics[i].prev_ts          = server->metrics[i].ts;
+      server->metrics[i].prev_total_ms    = server->metrics[i].total_ms;
+      server->metrics[i].prev_total_count = server->metrics[i].total_count;
+      server->metrics[i].ts               = ts;
+      server->metrics[i].latency_min_ms   = 0;
+      server->metrics[i].latency_max_ms   = 0;
+      server->metrics[i].total_ms         = 0;
+      server->metrics[i].total_count      = 0;
+    }
+
+    if (server->metrics[i].latency_min_ms == 0 ||
+        server->metrics[i].latency_min_ms > query_ms) {
+      server->metrics[i].latency_min_ms = query_ms;
+    }
+
+    if (query_ms > server->metrics[i].latency_max_ms) {
+      server->metrics[i].latency_min_ms = query_ms;
+    }
+
+    server->metrics[i].total_count++;
+    server->metrics[i].total_ms += (ares_uint64_t)query_ms;
+  }
+}
+
+size_t ares_metrics_server_timeout(const ares_server_t  *server,
+                                   const ares_timeval_t *now)
+{
+  const ares_channel_t *channel = server->channel;
+  ares_server_bucket_t  i;
+  size_t                timeout_ms = 0;
+  size_t                max_timeout_ms;
+
+  for (i = 0; i < ARES_METRIC_COUNT; i++) {
+    time_t ts = ares_metric_timestamp(i, now, ARES_FALSE);
+
+    /* This ts has been invalidated, see if we should use the previous
+     * time period */
+    if (ts != server->metrics[i].ts ||
+        server->metrics[i].total_count < MIN_COUNT_FOR_AVERAGE) {
+      time_t prev_ts = ares_metric_timestamp(i, now, ARES_TRUE);
+      if (prev_ts != server->metrics[i].prev_ts ||
+          server->metrics[i].prev_total_count < MIN_COUNT_FOR_AVERAGE) {
+        /* Move onto next bucket */
+        continue;
+      }
+      /* Calculate average time for previous bucket */
+      timeout_ms = (size_t)(server->metrics[i].prev_total_ms /
+                            server->metrics[i].prev_total_count);
+    } else {
+      /* Calculate average time for current bucket*/
+      timeout_ms =
+        (size_t)(server->metrics[i].total_ms / server->metrics[i].total_count);
+    }
+
+    /* Multiply average by constant to get timeout value */
+    timeout_ms *= AVG_TIMEOUT_MULTIPLIER;
+    break;
+  }
+
+  /* If we're here, that means its the first query for the server, so we just
+   * use the initial default timeout */
+  if (timeout_ms == 0) {
+    timeout_ms = channel->timeout;
+  }
+
+  /* don't go below lower bounds */
+  if (timeout_ms < MIN_TIMEOUT_MS) {
+    timeout_ms = MIN_TIMEOUT_MS;
+  }
+
+  /* don't go above upper bounds */
+  max_timeout_ms = channel->maxtimeout ? channel->maxtimeout : MAX_TIMEOUT_MS;
+  if (timeout_ms > max_timeout_ms) {
+    timeout_ms = max_timeout_ms;
+  }
+
+  return timeout_ms;
+}
diff --git a/contrib/libs/c-ares/src/lib/ares_options.c b/contrib/libs/c-ares/src/lib/ares_options.c
index 6f50f2e49813..9aeb4bad3d74 100644
--- a/contrib/libs/c-ares/src/lib/ares_options.c
+++ b/contrib/libs/c-ares/src/lib/ares_options.c
@@ -25,16 +25,14 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_ARPA_INET_H
 #  include <arpa/inet.h>
 #endif
 
-#include "ares.h"
 #include "ares_data.h"
 #include "ares_inet_net_pton.h"
-#include "ares_private.h"
 
 void ares_destroy_options(struct ares_options *options)
 {
@@ -68,7 +66,7 @@ static struct in_addr *ares_save_opt_servers(const ares_channel_t *channel,
 
   for (snode = ares__slist_node_first(channel->servers); snode != NULL;
        snode = ares__slist_node_next(snode)) {
-    const struct server_state *server = ares__slist_node_val(snode);
+    const ares_server_t *server = ares__slist_node_val(snode);
 
     if (server->addr.family != AF_INET) {
       continue;
@@ -249,7 +247,7 @@ static ares_status_t ares__init_options_servers(ares_channel_t       *channel,
 
   status = ares_in_addr_to_server_config_llist(servers, nservers, &slist);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__servers_update(channel, slist, ARES_TRUE);
@@ -266,12 +264,12 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
   size_t i;
 
   if (channel == NULL) {
-    return ARES_ENODATA;
+    return ARES_ENODATA; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (options == NULL) {
     if (optmask != 0) {
-      return ARES_ENODATA;
+      return ARES_ENODATA; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
     return ARES_SUCCESS;
   }
@@ -389,13 +387,13 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     channel->domains =
       ares_malloc_zero((size_t)options->ndomains * sizeof(char *));
     if (!channel->domains) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     channel->ndomains = (size_t)options->ndomains;
     for (i = 0; i < (size_t)options->ndomains; i++) {
       channel->domains[i] = ares_strdup(options->domains[i]);
       if (!channel->domains[i]) {
-        return ARES_ENOMEM;
+        return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -407,7 +405,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     } else {
       channel->lookups = ares_strdup(options->lookups);
       if (!channel->lookups) {
-        return ARES_ENOMEM;
+        return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -418,7 +416,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     channel->sortlist =
       ares_malloc((size_t)options->nsort * sizeof(struct apattern));
     if (!channel->sortlist) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     for (i = 0; i < (size_t)options->nsort; i++) {
       channel->sortlist[i] = options->sortlist[i];
@@ -432,7 +430,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     } else {
       channel->resolvconf_path = ares_strdup(options->resolvconf_path);
       if (channel->resolvconf_path == NULL) {
-        return ARES_ENOMEM;
+        return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -444,7 +442,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     } else {
       channel->hosts_path = ares_strdup(options->hosts_path);
       if (channel->hosts_path == NULL) {
-        return ARES_ENOMEM;
+        return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -457,13 +455,15 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
     }
   }
 
+  /* As of c-ares 1.31.0, the Query Cache is on by default.  The only way to
+   * disable it is to set options->qcache_max_ttl = 0 while specifying the
+   * ARES_OPT_QUERY_CACHE which will actually disable it completely. */
   if (optmask & ARES_OPT_QUERY_CACHE) {
     /* qcache_max_ttl is unsigned unlike the others */
-    if (options->qcache_max_ttl == 0) {
-      optmask &= ~(ARES_OPT_QUERY_CACHE);
-    } else {
-      channel->qcache_max_ttl = options->qcache_max_ttl;
-    }
+    channel->qcache_max_ttl = options->qcache_max_ttl;
+  } else {
+    optmask                 |= ARES_OPT_QUERY_CACHE;
+    channel->qcache_max_ttl  = 3600;
   }
 
   /* Initialize the ipv4 servers if provided */
@@ -475,7 +475,7 @@ ares_status_t ares__init_by_options(ares_channel_t            *channel,
       status = ares__init_options_servers(channel, options->servers,
                                           (size_t)options->nservers);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
diff --git a/contrib/libs/c-ares/src/lib/ares_platform.c b/contrib/libs/c-ares/src/lib/ares_platform.c
index 58a50198713d..8f0a1dbffb81 100644
--- a/contrib/libs/c-ares/src/lib/ares_platform.c
+++ b/contrib/libs/c-ares/src/lib/ares_platform.c
@@ -25,13 +25,10 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include "ares.h"
-#include "ares_platform.h"
 #include "ares_private.h"
+#include "ares_platform.h"
 
-#if defined(WIN32) && !defined(MSDOS)
+#if defined(_WIN32) && !defined(MSDOS)
 
 #  define V_PLATFORM_WIN32s        0
 #  define V_PLATFORM_WIN32_WINDOWS 1
@@ -78,7 +75,7 @@ win_platform ares__getplatform(void)
   }
 }
 
-#endif /* WIN32 && ! MSDOS */
+#endif /* _WIN32 && ! MSDOS */
 
 #if defined(_WIN32_WCE)
 
diff --git a/contrib/libs/c-ares/src/lib/ares_platform.h b/contrib/libs/c-ares/src/lib/ares_platform.h
index 44b2c036443c..768eaddddd9c 100644
--- a/contrib/libs/c-ares/src/lib/ares_platform.h
+++ b/contrib/libs/c-ares/src/lib/ares_platform.h
@@ -27,9 +27,7 @@
 #ifndef HEADER_CARES_PLATFORM_H
 #define HEADER_CARES_PLATFORM_H
 
-#include "ares_setup.h"
-
-#if defined(WIN32) && !defined(MSDOS)
+#if defined(_WIN32) && !defined(MSDOS)
 
 typedef enum {
   WIN_UNKNOWN,
diff --git a/contrib/libs/c-ares/src/lib/ares_private.h b/contrib/libs/c-ares/src/lib/ares_private.h
index 6d9fc117712d..b85ecb5e14d7 100644
--- a/contrib/libs/c-ares/src/lib/ares_private.h
+++ b/contrib/libs/c-ares/src/lib/ares_private.h
@@ -27,23 +27,19 @@
 #ifndef __ARES_PRIVATE_H
 #define __ARES_PRIVATE_H
 
-/*
- * Define WIN32 when build target is Win32 API
+/* ============================================================================
+ * NOTE: All c-ares source files should include ares_private.h as the first
+ *       header.
+ * ============================================================================
  */
 
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
+#include "ares_setup.h"
+#include "ares.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
 
-#ifdef WATT32
-#  include <tcp.h>
-#  include <sys/ioctl.h>
-#endif
-
 #define DEFAULT_TIMEOUT 2000 /* milliseconds */
 #define DEFAULT_TRIES   3
 #ifndef INADDR_NONE
@@ -54,9 +50,9 @@
  * warning: cast from 'const struct sockaddr *' to 'const struct sockaddr_in6 *'
  * increases required alignment from 1 to 4 [-Wcast-align]
  */
-#define CARES_INADDR_CAST(type, var) ((type)((void *)var))
+#define CARES_INADDR_CAST(type, var) ((type)((const void *)var))
 
-#if defined(WIN32) && !defined(WATT32)
+#if defined(USE_WINSOCK)
 
 #  define WIN_NS_9X     "System\\CurrentControlSet\\Services\\VxD\\MSTCP"
 #  define WIN_NS_NT_KEY "System\\CurrentControlSet\\Services\\Tcpip\\Parameters"
@@ -109,32 +105,34 @@ W32_FUNC const char *_w32_GetHostsFile(void);
 struct ares_rand_state;
 typedef struct ares_rand_state ares_rand_state;
 
-#include "ares__llist.h"
-#include "ares__slist.h"
-#include "ares__htable_strvp.h"
-#include "ares__htable_szvp.h"
-#include "ares__htable_asvp.h"
-#include "ares__htable_vpvp.h"
-#include "ares__buf.h"
-#include "ares_dns_private.h"
-#include "ares__iface_ips.h"
-#include "ares__threads.h"
+#include "dsa/ares__array.h"
+#include "dsa/ares__llist.h"
+#include "dsa/ares__slist.h"
+#include "dsa/ares__htable_strvp.h"
+#include "dsa/ares__htable_szvp.h"
+#include "dsa/ares__htable_asvp.h"
+#include "dsa/ares__htable_vpvp.h"
+#include "record/ares_dns_multistring.h"
+#include "str/ares__buf.h"
+#include "record/ares_dns_private.h"
+#include "util/ares__iface_ips.h"
+#include "util/ares__threads.h"
 
 #ifndef HAVE_GETENV
 #  include "ares_getenv.h"
 #  define getenv(ptr) ares_getenv(ptr)
 #endif
 
-#include "ares_str.h"
-#include "ares_strsplit.h"
+#include "str/ares_str.h"
+#include "str/ares_strsplit.h"
 
 #ifndef HAVE_STRCASECMP
-#  include "ares_strcasecmp.h"
+#  include "str/ares_strcasecmp.h"
 #  define strcasecmp(p1, p2) ares_strcasecmp(p1, p2)
 #endif
 
 #ifndef HAVE_STRNCASECMP
-#  include "ares_strcasecmp.h"
+#  include "str/ares_strcasecmp.h"
 #  define strncasecmp(p1, p2, n) ares_strncasecmp(p1, p2, n)
 #endif
 
@@ -153,18 +151,36 @@ typedef struct ares_rand_state ares_rand_state;
 #define DEFAULT_SERVER_RETRY_CHANCE 10
 #define DEFAULT_SERVER_RETRY_DELAY  5000
 
-struct query;
-
-struct server_state;
-
-struct server_connection {
-  struct server_state *server;
-  ares_socket_t        fd;
-  ares_bool_t          is_tcp;
+struct ares_query;
+typedef struct ares_query ares_query_t;
+
+struct ares_server;
+typedef struct ares_server ares_server_t;
+
+struct ares_conn;
+typedef struct ares_conn ares_conn_t;
+
+typedef enum {
+  /*! No flags */
+  ARES_CONN_FLAG_NONE = 0,
+  /*! TCP connection, not UDP */
+  ARES_CONN_FLAG_TCP = 1 << 0,
+  /*! TCP Fast Open is enabled and being used if supported by the OS */
+  ARES_CONN_FLAG_TFO = 1 << 1,
+  /*! TCP Fast Open has not yet sent its first packet. Gets unset on first
+   *  write to a connection */
+  ARES_CONN_FLAG_TFO_INITIAL = 1 << 2
+} ares_conn_flags_t;
+
+struct ares_conn {
+  ares_server_t    *server;
+  ares_socket_t     fd;
+  struct ares_addr  self_ip;
+  ares_conn_flags_t flags;
   /* total number of queries run on this connection since it was established */
-  size_t               total_queries;
+  size_t            total_queries;
   /* list of outstanding queries to this connection */
-  ares__llist_t       *queries_to_conn;
+  ares__llist_t    *queries_to_conn;
 };
 
 #ifdef _MSC_VER
@@ -183,67 +199,128 @@ typedef struct {
   unsigned int usec; /*!< Microseconds. Can't be negative. */
 } ares_timeval_t;
 
-struct server_state {
+/*! Various buckets for grouping history */
+typedef enum {
+  ARES_METRIC_1MINUTE = 0, /*!< Bucket for tracking over the last minute */
+  ARES_METRIC_15MINUTES,   /*!< Bucket for tracking over the last 15 minutes */
+  ARES_METRIC_1HOUR,       /*!< Bucket for tracking over the last hour */
+  ARES_METRIC_1DAY,        /*!< Bucket for tracking over the last day */
+  ARES_METRIC_INCEPTION,   /*!< Bucket for tracking since inception */
+  ARES_METRIC_COUNT        /*!< Count of buckets, not a real bucket */
+} ares_server_bucket_t;
+
+/*! Data metrics collected for each bucket */
+typedef struct {
+  time_t        ts;             /*!< Timestamp divided by bucket divisor */
+  unsigned int  latency_min_ms; /*!< Minimum latency for queries */
+  unsigned int  latency_max_ms; /*!< Maximum latency for queries */
+  ares_uint64_t total_ms;       /*!< Cumulative query time for bucket */
+  ares_uint64_t total_count;    /*!< Number of queries for bucket */
+
+  time_t        prev_ts;        /*!< Previous period bucket timestamp */
+  ares_uint64_t
+    prev_total_ms; /*!< Previous period bucket cumulative query time */
+  ares_uint64_t prev_total_count; /*!< Previous period bucket query count */
+} ares_server_metrics_t;
+
+typedef enum {
+  ARES_COOKIE_INITIAL     = 0,
+  ARES_COOKIE_GENERATED   = 1,
+  ARES_COOKIE_SUPPORTED   = 2,
+  ARES_COOKIE_UNSUPPORTED = 3
+} ares_cookie_state_t;
+
+/*! Structure holding tracking data for RFC 7873/9018 DNS cookies.
+ *  Implementation plan for this feature is here:
+ *  https://github.com/c-ares/c-ares/issues/620
+ */
+typedef struct {
+  /*! starts at INITIAL, transitions as needed. */
+  ares_cookie_state_t state;
+  /*! randomly-generate client cookie */
+  unsigned char       client[8];
+  /*! timestamp client cookie was generated, used for rotation purposes */
+  ares_timeval_t      client_ts;
+  /*! IP address last used for client to connect to server.  If this changes
+   *  The client cookie gets invalidated */
+  struct ares_addr    client_ip;
+  /*! Server Cookie last received, 8-32 bytes in length */
+  unsigned char       server[32];
+  /*! Length of server cookie on file. */
+  size_t              server_len;
+  /*! Timestamp of last attempt to use cookies, but it was determined that the
+   *  server didn't support them */
+  ares_timeval_t      unsupported_ts;
+} ares_cookie_t;
+
+struct ares_server {
   /* Configuration */
-  size_t                    idx; /* index for server in system configuration */
-  struct ares_addr          addr;
-  unsigned short            udp_port;        /* host byte order */
-  unsigned short            tcp_port;        /* host byte order */
-  char                      ll_iface[64];    /* IPv6 Link Local Interface */
-  unsigned int              ll_scope;        /* IPv6 Link Local Scope */
-
-  size_t                    consec_failures; /* Consecutive query failure count
-                                              * can be hard errors or timeouts
-                                              */
-  ares__llist_t            *connections;
-  struct server_connection *tcp_conn;
+  size_t                idx;      /* index for server in system configuration */
+  struct ares_addr      addr;
+  unsigned short        udp_port; /* host byte order */
+  unsigned short        tcp_port; /* host byte order */
+  char                  ll_iface[64];    /* IPv6 Link Local Interface */
+  unsigned int          ll_scope;        /* IPv6 Link Local Scope */
+
+  size_t                consec_failures; /* Consecutive query failure count
+                                          * can be hard errors or timeouts
+                                          */
+  ares__llist_t        *connections;
+  ares_conn_t          *tcp_conn;
 
   /* The next time when we will retry this server if it has hit failures */
-  ares_timeval_t            next_retry_time;
+  ares_timeval_t        next_retry_time;
 
   /* TCP buffer since multiple responses can come back in one read, or partial
    * in a read */
-  ares__buf_t              *tcp_parser;
+  ares__buf_t          *tcp_parser;
 
   /* TCP output queue */
-  ares__buf_t              *tcp_send;
+  ares__buf_t          *tcp_send;
+
+  /*! Buckets for collecting metrics about the server */
+  ares_server_metrics_t metrics[ARES_METRIC_COUNT];
+
+  /*! RFC 7873/9018 DNS Cookies */
+  ares_cookie_t         cookie;
 
   /* Link back to owning channel */
-  ares_channel_t           *channel;
+  ares_channel_t       *channel;
 };
 
 /* State to represent a DNS query */
-struct query {
+struct ares_query {
   /* Query ID from qbuf, for faster lookup, and current timeout */
-  unsigned short            qid; /* host byte order */
-  ares_timeval_t            timeout;
-  ares_channel_t           *channel;
+  unsigned short       qid; /* host byte order */
+  ares_timeval_t       ts;  /*!< Timestamp query was sent */
+  ares_timeval_t       timeout;
+  ares_channel_t      *channel;
 
   /*
    * Node object for each list entry the query belongs to in order to
    * make removal operations O(1).
    */
-  ares__slist_node_t       *node_queries_by_timeout;
-  ares__llist_node_t       *node_queries_to_conn;
-  ares__llist_node_t       *node_all_queries;
+  ares__slist_node_t  *node_queries_by_timeout;
+  ares__llist_node_t  *node_queries_to_conn;
+  ares__llist_node_t  *node_all_queries;
 
   /* connection handle query is associated with */
-  struct server_connection *conn;
+  ares_conn_t         *conn;
 
-  /* Arguments passed to ares_send() */
-  unsigned char            *qbuf;
-  size_t                    qlen;
+  /* Query */
+  ares_dns_record_t   *query;
 
-  ares_callback_dnsrec      callback;
-  void                     *arg;
+  ares_callback_dnsrec callback;
+  void                *arg;
 
   /* Query status */
   size_t        try_count; /* Number of times we tried this query already. */
+  size_t        cookie_try_count; /* Attempt count for cookie resends */
   ares_bool_t   using_tcp;
   ares_status_t error_status;
-  size_t        timeouts; /* number of timeouts we saw for this request */
-  ares_bool_t no_retries; /* do not perform any additional retries, this is set
-                           * when a query is to be canceled */
+  size_t        timeouts;   /* number of timeouts we saw for this request */
+  ares_bool_t   no_retries; /* do not perform any additional retries, this is
+                             * set when a query is to be canceled */
 };
 
 struct apattern {
@@ -361,6 +438,12 @@ struct ares_channeldata {
    * exit. */
   ares_bool_t                         reinit_pending;
   ares__thread_t                     *reinit_thread;
+
+  /* Whether the system is up or not.  This is mainly to prevent deadlocks
+   * and access violations during the cleanup process.  Some things like
+   * system config changes might get triggered and we need a flag to make
+   * sure we don't take action. */
+  ares_bool_t                         sys_up;
 };
 
 /* Does the domain end in ".onion" or ".onion."? Case-insensitive. */
@@ -378,9 +461,11 @@ ares_bool_t   ares__timedout(const ares_timeval_t *now,
                              const ares_timeval_t *check);
 
 /* Returns one of the normal ares status codes like ARES_SUCCESS */
-ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now);
-ares_status_t ares__requeue_query(struct query         *query,
-                                  const ares_timeval_t *now);
+ares_status_t ares__send_query(ares_query_t *query, const ares_timeval_t *now);
+ares_status_t ares__requeue_query(ares_query_t         *query,
+                                  const ares_timeval_t *now,
+                                  ares_status_t         status,
+                                  ares_bool_t           inc_try_count);
 
 /*! Retrieve a list of names to use for searching.  The first successful
  *  query in the list wins.  This function also uses the HOSTSALIASES file
@@ -408,38 +493,34 @@ void         *ares__dnsrec_convert_arg(ares_callback callback, void *arg);
 void ares__dnsrec_convert_cb(void *arg, ares_status_t status, size_t timeouts,
                              const ares_dns_record_t *dnsrec);
 
-void ares__close_connection(struct server_connection *conn);
-void ares__close_sockets(struct server_state *server);
-void ares__check_cleanup_conn(const ares_channel_t     *channel,
-                              struct server_connection *conn);
-void ares__free_query(struct query *query);
+void ares__close_connection(ares_conn_t *conn, ares_status_t requeue_status);
+void ares__close_sockets(ares_server_t *server);
+void ares__check_cleanup_conns(const ares_channel_t *channel);
+void ares__free_query(ares_query_t *query);
 
 ares_rand_state *ares__init_rand_state(void);
 void             ares__destroy_rand_state(ares_rand_state *state);
 void ares__rand_bytes(ares_rand_state *state, unsigned char *buf, size_t len);
 
 unsigned short ares__generate_new_id(ares_rand_state *state);
-ares_timeval_t ares__tvnow(void);
+void           ares__tvnow(ares_timeval_t *now);
 void           ares__timeval_remaining(ares_timeval_t       *remaining,
                                        const ares_timeval_t *now,
                                        const ares_timeval_t *tout);
-ares_status_t  ares__expand_name_validated(const unsigned char *encoded,
-                                           const unsigned char *abuf,
-                                           size_t alen, char **s, size_t *enclen,
-                                           ares_bool_t is_hostname);
-ares_status_t  ares__expand_name_for_response(const unsigned char *encoded,
-                                              const unsigned char *abuf,
-                                              size_t alen, char **s,
-                                              size_t     *enclen,
-                                              ares_bool_t is_hostname);
-ares_status_t  ares_expand_string_ex(const unsigned char *encoded,
-                                     const unsigned char *abuf, size_t alen,
-                                     unsigned char **s, size_t *enclen);
-ares_status_t  ares__init_servers_state(ares_channel_t *channel);
-ares_status_t  ares__init_by_options(ares_channel_t            *channel,
-                                     const struct ares_options *options,
-                                     int                        optmask);
-ares_status_t  ares__init_by_sysconfig(ares_channel_t *channel);
+void ares__timeval_diff(ares_timeval_t *tvdiff, const ares_timeval_t *tvstart,
+                        const ares_timeval_t *tvstop);
+ares_status_t ares__expand_name_validated(const unsigned char *encoded,
+                                          const unsigned char *abuf,
+                                          size_t alen, char **s, size_t *enclen,
+                                          ares_bool_t is_hostname);
+ares_status_t ares_expand_string_ex(const unsigned char *encoded,
+                                    const unsigned char *abuf, size_t alen,
+                                    unsigned char **s, size_t *enclen);
+ares_status_t ares__init_servers_state(ares_channel_t *channel);
+ares_status_t ares__init_by_options(ares_channel_t            *channel,
+                                    const struct ares_options *options,
+                                    int                        optmask);
+ares_status_t ares__init_by_sysconfig(ares_channel_t *channel);
 
 typedef struct {
   ares__llist_t   *sconfig;
@@ -465,6 +546,9 @@ ares_status_t ares__init_sysconfig_files(const ares_channel_t *channel,
 #ifdef __APPLE__
 ares_status_t ares__init_sysconfig_macos(ares_sysconfig_t *sysconfig);
 #endif
+#ifdef USE_WINSOCK
+ares_status_t ares__init_sysconfig_windows(ares_sysconfig_t *sysconfig);
+#endif
 
 ares_status_t ares__parse_sortlist(struct apattern **sortlist, size_t *nsort,
                                    const char *str);
@@ -519,23 +603,28 @@ ares_status_t ares__addrinfo2addrttl(const struct ares_addrinfo *ai, int family,
 ares_status_t ares__addrinfo_localhost(const char *name, unsigned short port,
                                        const struct ares_addrinfo_hints *hints,
                                        struct ares_addrinfo             *ai);
-ares_status_t ares__open_connection(ares_channel_t      *channel,
-                                    struct server_state *server,
-                                    ares_bool_t          is_tcp);
+ares_status_t ares__open_connection(ares_conn_t   **conn_out,
+                                    ares_channel_t *channel,
+                                    ares_server_t *server, ares_bool_t is_tcp);
+ares_bool_t   ares_sockaddr_to_ares_addr(struct ares_addr      *ares_addr,
+                                         unsigned short        *port,
+                                         const struct sockaddr *sockaddr);
 ares_socket_t ares__open_socket(ares_channel_t *channel, int af, int type,
                                 int protocol);
-ares_ssize_t  ares__socket_write(ares_channel_t *channel, ares_socket_t s,
-                                 const void *data, size_t len);
+ares_bool_t   ares__socket_try_again(int errnum);
+ares_ssize_t  ares__conn_write(ares_conn_t *conn, const void *data, size_t len);
 ares_ssize_t  ares__socket_recvfrom(ares_channel_t *channel, ares_socket_t s,
                                     void *data, size_t data_len, int flags,
                                     struct sockaddr *from,
                                     ares_socklen_t  *from_len);
 ares_ssize_t  ares__socket_recv(ares_channel_t *channel, ares_socket_t s,
                                 void *data, size_t data_len);
-void          ares__close_socket(ares_channel, ares_socket_t);
-int  ares__connect_socket(ares_channel_t *channel, ares_socket_t sockfd,
-                          const struct sockaddr *addr, ares_socklen_t addrlen);
-void ares__destroy_server(struct server_state *server);
+void          ares__close_socket(ares_channel_t *channel, ares_socket_t s);
+ares_status_t ares__connect_socket(ares_channel_t        *channel,
+                                   ares_socket_t          sockfd,
+                                   const struct sockaddr *addr,
+                                   ares_socklen_t         addrlen);
+void          ares__destroy_server(ares_server_t *server);
 
 ares_status_t ares__servers_update(ares_channel_t *channel,
                                    ares__llist_t  *server_list,
@@ -551,8 +640,8 @@ ares_status_t ares__sconfig_append_fromstr(ares__llist_t **sconfig,
 ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
                                                   size_t          nservers,
                                                   ares__llist_t **llist);
-ares_status_t ares_get_server_addr(const struct server_state *server,
-                                   ares__buf_t               *buf);
+ares_status_t ares_get_server_addr(const ares_server_t *server,
+                                   ares__buf_t         *buf);
 
 struct ares_hosts_entry;
 typedef struct ares_hosts_entry ares_hosts_entry_t;
@@ -573,6 +662,26 @@ ares_status_t ares__hosts_entry_to_addrinfo(const ares_hosts_entry_t *entry,
                                             ares_bool_t           want_cnames,
                                             struct ares_addrinfo *ai);
 
+/* Same as ares_query_dnsrec() except does not take a channel lock.  Use this
+ * if a channel lock is already held */
+ares_status_t ares_query_nolock(ares_channel_t *channel, const char *name,
+                                ares_dns_class_t     dnsclass,
+                                ares_dns_rec_type_t  type,
+                                ares_callback_dnsrec callback, void *arg,
+                                unsigned short *qid);
+
+/* Same as ares_send_dnsrec() except does not take a channel lock.  Use this
+ * if a channel lock is already held */
+ares_status_t ares_send_nolock(ares_channel_t          *channel,
+                               const ares_dns_record_t *dnsrec,
+                               ares_callback_dnsrec callback, void *arg,
+                               unsigned short *qid);
+
+/* Same as ares_gethostbyaddr() except does not take a channel lock.  Use this
+ * if a channel lock is already held */
+void ares_gethostbyaddr_nolock(ares_channel_t *channel, const void *addr,
+                               int addrlen, int family,
+                               ares_host_callback callback, void *arg);
 
 /*! Parse a compressed DNS name as defined in RFC1035 starting at the current
  *  offset within the buffer.
@@ -622,13 +731,6 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
 void          ares_queue_notify_empty(ares_channel_t *channel);
 
 
-#define ARES_SWAP_BYTE(a, b)           \
-  do {                                 \
-    unsigned char swapByte = *(a);     \
-    *(a)                   = *(b);     \
-    *(b)                   = swapByte; \
-  } while (0)
-
 #define SOCK_STATE_CALLBACK(c, s, r, w)                           \
   do {                                                            \
     if ((c)->sock_state_cb) {                                     \
@@ -645,6 +747,7 @@ ares_bool_t   ares__subnet_match(const struct ares_addr *addr,
                                  unsigned char           netmask);
 ares_bool_t   ares__addr_is_linklocal(const struct ares_addr *addr);
 
+ares_bool_t   ares__is_64bit(void);
 size_t        ares__round_up_pow2(size_t n);
 size_t        ares__log2(size_t n);
 size_t        ares__pow(size_t x, size_t y);
@@ -658,13 +761,25 @@ ares_status_t ares__qcache_create(ares_rand_state *rand_state,
 void          ares__qcache_flush(ares__qcache_t *cache);
 ares_status_t ares_qcache_insert(ares_channel_t       *channel,
                                  const ares_timeval_t *now,
-                                 const struct query   *query,
+                                 const ares_query_t   *query,
                                  ares_dns_record_t    *dnsrec);
 ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
                                 const ares_timeval_t     *now,
                                 const ares_dns_record_t  *dnsrec,
                                 const ares_dns_record_t **dnsrec_resp);
 
+void   ares_metrics_record(const ares_query_t *query, ares_server_t *server,
+                           ares_status_t status, const ares_dns_record_t *dnsrec);
+size_t ares_metrics_server_timeout(const ares_server_t  *server,
+                                   const ares_timeval_t *now);
+
+ares_status_t ares_cookie_apply(ares_dns_record_t *dnsrec, ares_conn_t *conn,
+                                const ares_timeval_t *now);
+ares_status_t ares_cookie_validate(ares_query_t            *query,
+                                   const ares_dns_record_t *dnsresp,
+                                   ares_conn_t             *conn,
+                                   const ares_timeval_t    *now);
+
 ares_status_t ares__channel_threading_init(ares_channel_t *channel);
 void          ares__channel_threading_destroy(ares_channel_t *channel);
 void          ares__channel_lock(const ares_channel_t *channel);
diff --git a/contrib/libs/c-ares/src/lib/ares_process.c b/contrib/libs/c-ares/src/lib/ares_process.c
index 0d8f3ca9ed0b..65ee673f6edc 100644
--- a/contrib/libs/c-ares/src/lib/ares_process.c
+++ b/contrib/libs/c-ares/src/lib/ares_process.c
@@ -25,8 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
+#include "ares_private.h"
 
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
@@ -45,13 +44,8 @@
 #include <fcntl.h>
 #include <limits.h>
 
-#include "ares.h"
-#include "ares_private.h"
-#include "ares_nameser.h"
-#include "ares_dns.h"
 
 static void          timeadd(ares_timeval_t *now, size_t millisecs);
-static ares_bool_t   try_again(int errnum);
 static void          write_tcp_data(ares_channel_t *channel, fd_set *write_fds,
                                     ares_socket_t write_fd);
 static void          read_packets(ares_channel_t *channel, fd_set *read_fds,
@@ -60,21 +54,32 @@ static void          process_timeouts(ares_channel_t       *channel,
                                       const ares_timeval_t *now);
 static ares_status_t process_answer(ares_channel_t      *channel,
                                     const unsigned char *abuf, size_t alen,
-                                    struct server_connection *conn,
-                                    ares_bool_t tcp, const ares_timeval_t *now);
-static void          handle_conn_error(struct server_connection *conn,
-                                       ares_bool_t               critical_failure);
-
-static ares_bool_t   same_questions(const ares_dns_record_t *qrec,
-                                    const ares_dns_record_t *arec);
-static ares_bool_t   same_address(const struct sockaddr  *sa,
-                                  const struct ares_addr *aa);
-static void          end_query(ares_channel_t *channel, struct query *query,
-                               ares_status_t status, const ares_dns_record_t *dnsrec);
+                                    ares_conn_t *conn, ares_bool_t tcp,
+                                    const ares_timeval_t *now);
+static void handle_conn_error(ares_conn_t *conn, ares_bool_t critical_failure,
+                              ares_status_t failure_status);
+
+static ares_bool_t same_questions(const ares_query_t      *query,
+                                  const ares_dns_record_t *arec);
+static ares_bool_t same_address(const struct sockaddr  *sa,
+                                const struct ares_addr *aa);
+static void        end_query(ares_channel_t *channel, ares_server_t *server,
+                             ares_query_t *query, ares_status_t status,
+                             const ares_dns_record_t *dnsrec);
+
+static void        ares__query_disassociate_from_conn(ares_query_t *query)
+{
+  /* If its not part of a connection, it can't be tracked for timeouts either */
+  ares__slist_node_destroy(query->node_queries_by_timeout);
+  ares__llist_node_destroy(query->node_queries_to_conn);
+  query->node_queries_by_timeout = NULL;
+  query->node_queries_to_conn    = NULL;
+  query->conn                    = NULL;
+}
 
 /* Invoke the server state callback after a success or failure */
-static void          invoke_server_state_cb(const struct server_state *server,
-                                            ares_bool_t success, int flags)
+static void invoke_server_state_cb(const ares_server_t *server,
+                                   ares_bool_t success, int flags)
 {
   const ares_channel_t *channel = server->channel;
   ares__buf_t          *buf;
@@ -87,19 +92,19 @@ static void          invoke_server_state_cb(const struct server_state *server,
 
   buf = ares__buf_create();
   if (buf == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares_get_server_addr(server, buf);
   if (status != ARES_SUCCESS) {
-    ares__buf_destroy(buf);
-    return;
+    ares__buf_destroy(buf); /* LCOV_EXCL_LINE: OutOfMemory */
+    return;                 /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   server_string = ares__buf_finish_str(buf, NULL);
   buf           = NULL;
   if (server_string == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   channel->server_state_cb(server_string, success, flags,
@@ -107,8 +112,8 @@ static void          invoke_server_state_cb(const struct server_state *server,
   ares_free(server_string);
 }
 
-static void server_increment_failures(struct server_state *server,
-                                      ares_bool_t          used_tcp)
+static void server_increment_failures(ares_server_t *server,
+                                      ares_bool_t    used_tcp)
 {
   ares__slist_node_t   *node;
   const ares_channel_t *channel = server->channel;
@@ -116,13 +121,13 @@ static void server_increment_failures(struct server_state *server,
 
   node = ares__slist_node_find(channel->servers, server);
   if (node == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   server->consec_failures++;
   ares__slist_node_reinsert(node);
 
-  next_retry_time = ares__tvnow();
+  ares__tvnow(&next_retry_time);
   timeadd(&next_retry_time, channel->server_retry_delay);
   server->next_retry_time = next_retry_time;
 
@@ -131,14 +136,14 @@ static void server_increment_failures(struct server_state *server,
                                                : ARES_SERV_STATE_UDP);
 }
 
-static void server_set_good(struct server_state *server, ares_bool_t used_tcp)
+static void server_set_good(ares_server_t *server, ares_bool_t used_tcp)
 {
   ares__slist_node_t   *node;
   const ares_channel_t *channel = server->channel;
 
   node = ares__slist_node_find(channel->servers, server);
   if (node == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (server->consec_failures > 0) {
@@ -195,17 +200,19 @@ static void processfds(ares_channel_t *channel, fd_set *read_fds,
   ares_timeval_t now;
 
   if (channel == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__channel_lock(channel);
 
-  now = ares__tvnow();
+  ares__tvnow(&now);
   read_packets(channel, read_fds, read_fd, &now);
   process_timeouts(channel, &now);
   /* Write last as the other 2 operations might have triggered writes */
   write_tcp_data(channel, write_fds, write_fd);
 
+  /* See if any connections should be cleaned up */
+  ares__check_cleanup_conns(channel);
   ares__channel_unlock(channel);
 }
 
@@ -228,34 +235,6 @@ void ares_process_fd(ares_channel_t *channel,
   processfds(channel, NULL, read_fd, NULL, write_fd);
 }
 
-/* Return 1 if the specified error number describes a readiness error, or 0
- * otherwise. This is mostly for HP-UX, which could return EAGAIN or
- * EWOULDBLOCK. See this man page
- *
- * http://devrsrc1.external.hp.com/STKS/cgi-bin/man2html?
- *     manpage=/usr/share/man/man2.Z/send.2
- */
-static ares_bool_t try_again(int errnum)
-{
-#if !defined EWOULDBLOCK && !defined EAGAIN
-#  error "Neither EWOULDBLOCK nor EAGAIN defined"
-#endif
-
-#ifdef EWOULDBLOCK
-  if (errnum == EWOULDBLOCK) {
-    return ARES_TRUE;
-  }
-#endif
-
-#if defined EAGAIN && EAGAIN != EWOULDBLOCK
-  if (errnum == EAGAIN) {
-    return ARES_TRUE;
-  }
-#endif
-
-  return ARES_FALSE;
-}
-
 /* If any TCP sockets select true for writing, write out queued data
  * we have for them.
  */
@@ -271,7 +250,7 @@ static void write_tcp_data(ares_channel_t *channel, fd_set *write_fds,
 
   for (node = ares__slist_node_first(channel->servers); node != NULL;
        node = ares__slist_node_next(node)) {
-    struct server_state *server = ares__slist_node_val(node);
+    ares_server_t       *server = ares__slist_node_val(node);
     const unsigned char *data;
     size_t               data_len;
     ares_ssize_t         count;
@@ -302,10 +281,10 @@ static void write_tcp_data(ares_channel_t *channel, fd_set *write_fds,
     }
 
     data  = ares__buf_peek(server->tcp_send, &data_len);
-    count = ares__socket_write(channel, server->tcp_conn->fd, data, data_len);
+    count = ares__conn_write(server->tcp_conn, data, data_len);
     if (count <= 0) {
-      if (!try_again(SOCKERRNO)) {
-        handle_conn_error(server->tcp_conn, ARES_TRUE);
+      if (!ares__socket_try_again(SOCKERRNO)) {
+        handle_conn_error(server->tcp_conn, ARES_TRUE, ARES_ECONNREFUSED);
       }
       continue;
     }
@@ -324,21 +303,21 @@ static void write_tcp_data(ares_channel_t *channel, fd_set *write_fds,
  * allocate a buffer if we finish reading the length word, and process
  * a packet if we finish reading one.
  */
-static void read_tcp_data(ares_channel_t           *channel,
-                          struct server_connection *conn,
-                          const ares_timeval_t     *now)
+static void read_tcp_data(ares_channel_t *channel, ares_conn_t *conn,
+                          const ares_timeval_t *now)
 {
-  ares_ssize_t         count;
-  struct server_state *server = conn->server;
+  ares_ssize_t   count;
+  ares_server_t *server = conn->server;
 
   /* Fetch buffer to store data we are reading */
-  size_t               ptr_len = 65535;
-  unsigned char       *ptr;
+  size_t         ptr_len = 65535;
+  unsigned char *ptr;
 
   ptr = ares__buf_append_start(server->tcp_parser, &ptr_len);
 
   if (ptr == NULL) {
-    handle_conn_error(conn, ARES_FALSE /* not critical to connection */);
+    handle_conn_error(conn, ARES_FALSE /* not critical to connection */,
+                      ARES_SUCCESS);
     return; /* bail out on malloc failure. TODO: make this
                function return error codes */
   }
@@ -347,8 +326,8 @@ static void read_tcp_data(ares_channel_t           *channel,
   count = ares__socket_recv(channel, conn->fd, ptr, ptr_len);
   if (count <= 0) {
     ares__buf_append_finish(server->tcp_parser, 0);
-    if (!(count == -1 && try_again(SOCKERRNO))) {
-      handle_conn_error(conn, ARES_TRUE);
+    if (!(count == -1 && ares__socket_try_again(SOCKERRNO))) {
+      handle_conn_error(conn, ARES_TRUE, ARES_ECONNREFUSED);
     }
     return;
   }
@@ -380,7 +359,7 @@ static void read_tcp_data(ares_channel_t           *channel,
 
     /* Can't fail except for misuse */
     data = ares__buf_tag_fetch(server->tcp_parser, &data_len);
-    if (data == NULL) {
+    if (data == NULL || data_len < 2) {
       ares__buf_tag_clear(server->tcp_parser);
       break;
     }
@@ -392,80 +371,57 @@ static void read_tcp_data(ares_channel_t           *channel,
     /* We finished reading this answer; process it */
     status = process_answer(channel, data, data_len, conn, ARES_TRUE, now);
     if (status != ARES_SUCCESS) {
-      handle_conn_error(conn, ARES_TRUE);
+      handle_conn_error(conn, ARES_TRUE, status);
       return;
     }
 
     /* Since we processed the answer, clear the tag so space can be reclaimed */
     ares__buf_tag_clear(server->tcp_parser);
   }
-
-  ares__check_cleanup_conn(channel, conn);
-}
-
-static int socket_list_append(ares_socket_t **socketlist, ares_socket_t fd,
-                              size_t *alloc_cnt, size_t *num)
-{
-  if (*num >= *alloc_cnt) {
-    /* Grow by powers of 2 */
-    size_t         new_alloc = (*alloc_cnt) << 1;
-    ares_socket_t *new_list =
-      ares_realloc(socketlist, new_alloc * sizeof(*new_list));
-    if (new_list == NULL) {
-      return 0;
-    }
-    *alloc_cnt  = new_alloc;
-    *socketlist = new_list;
-  }
-
-  (*socketlist)[(*num)++] = fd;
-  return 1;
 }
 
 static ares_socket_t *channel_socket_list(const ares_channel_t *channel,
                                           size_t               *num)
 {
-  size_t              alloc_cnt = 1 << 4;
-  ares_socket_t      *out       = ares_malloc(alloc_cnt * sizeof(*out));
   ares__slist_node_t *snode;
+  ares__array_t      *arr = ares__array_create(sizeof(ares_socket_t), NULL);
 
   *num = 0;
 
-  if (out == NULL) {
-    return NULL;
+  if (arr == NULL) {
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (snode = ares__slist_node_first(channel->servers); snode != NULL;
        snode = ares__slist_node_next(snode)) {
-    struct server_state *server = ares__slist_node_val(snode);
-    ares__llist_node_t  *node;
+    ares_server_t      *server = ares__slist_node_val(snode);
+    ares__llist_node_t *node;
 
     for (node = ares__llist_node_first(server->connections); node != NULL;
          node = ares__llist_node_next(node)) {
-      const struct server_connection *conn = ares__llist_node_val(node);
+      const ares_conn_t *conn = ares__llist_node_val(node);
+      ares_socket_t     *sptr;
+      ares_status_t      status;
 
       if (conn->fd == ARES_SOCKET_BAD) {
         continue;
       }
 
-      if (!socket_list_append(&out, conn->fd, &alloc_cnt, num)) {
-        goto fail;
+      status = ares__array_insert_last((void **)&sptr, arr);
+      if (status != ARES_SUCCESS) {
+        ares__array_destroy(arr); /* LCOV_EXCL_LINE: OutOfMemory */
+        return NULL;              /* LCOV_EXCL_LINE: OutOfMemory */
       }
+      *sptr = conn->fd;
     }
   }
 
-  return out;
-
-fail:
-  ares_free(out);
-  *num = 0;
-  return NULL;
+  return ares__array_finish(arr, num);
 }
 
 /* If any UDP sockets select true for reading, process them. */
-static void read_udp_packets_fd(ares_channel_t           *channel,
-                                struct server_connection *conn,
-                                const ares_timeval_t     *now)
+static void read_udp_packets_fd(ares_channel_t *channel, ares_conn_t *conn,
+                                const ares_timeval_t *now)
 {
   ares_ssize_t  read_len;
   unsigned char buf[MAXENDSSZ + 1];
@@ -503,11 +459,11 @@ static void read_udp_packets_fd(ares_channel_t           *channel,
        * tcp */
       continue;
     } else if (read_len < 0) {
-      if (try_again(SOCKERRNO)) {
+      if (ares__socket_try_again(SOCKERRNO)) {
         break;
       }
 
-      handle_conn_error(conn, ARES_TRUE);
+      handle_conn_error(conn, ARES_TRUE, ARES_ECONNREFUSED);
       return;
 #ifdef HAVE_RECVFROM
     } else if (!same_address(&from.sa, &conn->server->addr)) {
@@ -524,18 +480,16 @@ static void read_udp_packets_fd(ares_channel_t           *channel,
     /* Try to read again only if *we* set up the socket, otherwise it may be
      * a blocking socket and would cause recvfrom to hang. */
   } while (read_len >= 0 && channel->sock_funcs == NULL);
-
-  ares__check_cleanup_conn(channel, conn);
 }
 
 static void read_packets(ares_channel_t *channel, fd_set *read_fds,
                          ares_socket_t read_fd, const ares_timeval_t *now)
 {
-  size_t                    i;
-  ares_socket_t            *socketlist  = NULL;
-  size_t                    num_sockets = 0;
-  struct server_connection *conn        = NULL;
-  ares__llist_node_t       *node        = NULL;
+  size_t              i;
+  ares_socket_t      *socketlist  = NULL;
+  size_t              num_sockets = 0;
+  ares_conn_t        *conn        = NULL;
+  ares__llist_node_t *node        = NULL;
 
   if (!read_fds && (read_fd == ARES_SOCKET_BAD)) {
     /* no possible action */
@@ -551,7 +505,7 @@ static void read_packets(ares_channel_t *channel, fd_set *read_fds,
 
     conn = ares__llist_node_val(node);
 
-    if (conn->is_tcp) {
+    if (conn->flags & ARES_CONN_FLAG_TCP) {
       read_tcp_data(channel, conn, now);
     } else {
       read_udp_packets_fd(channel, conn, now);
@@ -585,7 +539,7 @@ static void read_packets(ares_channel_t *channel, fd_set *read_fds,
 
     conn = ares__llist_node_val(node);
 
-    if (conn->is_tcp) {
+    if (conn->flags & ARES_CONN_FLAG_TCP) {
       read_tcp_data(channel, conn, now);
     } else {
       read_udp_packets_fd(channel, conn, now);
@@ -598,47 +552,42 @@ static void read_packets(ares_channel_t *channel, fd_set *read_fds,
 /* If any queries have timed out, note the timeout and move them on. */
 static void process_timeouts(ares_channel_t *channel, const ares_timeval_t *now)
 {
-  ares__slist_node_t *node =
-    ares__slist_node_first(channel->queries_by_timeout);
-  while (node != NULL) {
-    struct query             *query = ares__slist_node_val(node);
-    /* Node might be removed, cache next */
-    ares__slist_node_t       *next = ares__slist_node_next(node);
-    struct server_connection *conn;
+  ares__slist_node_t *node;
+
+  /* Just keep popping off the first as this list will re-sort as things come
+   * and go.  We don't want to try to rely on 'next' as some operation might
+   * cause a cleanup of that pointer and would become invalid */
+  while ((node = ares__slist_node_first(channel->queries_by_timeout)) != NULL) {
+    ares_query_t *query = ares__slist_node_val(node);
+    ares_conn_t  *conn;
+
     /* Since this is sorted, as soon as we hit a query that isn't timed out,
      * break */
     if (!ares__timedout(now, &query->timeout)) {
       break;
     }
 
-    query->error_status = ARES_ETIMEOUT;
     query->timeouts++;
 
     conn = query->conn;
     server_increment_failures(conn->server, query->using_tcp);
-    ares__requeue_query(query, now);
-    ares__check_cleanup_conn(channel, conn);
-
-    node = next;
+    ares__requeue_query(query, now, ARES_ETIMEOUT, ARES_TRUE);
   }
 }
 
-static ares_status_t rewrite_without_edns(ares_dns_record_t *qdnsrec,
-                                          struct query      *query)
+static ares_status_t rewrite_without_edns(ares_query_t *query)
 {
-  ares_status_t  status;
-  size_t         i;
-  ares_bool_t    found_opt_rr = ARES_FALSE;
-  unsigned char *msg          = NULL;
-  size_t         msglen       = 0;
+  ares_status_t status = ARES_SUCCESS;
+  size_t        i;
+  ares_bool_t   found_opt_rr = ARES_FALSE;
 
   /* Find and remove the OPT RR record */
-  for (i = 0; i < ares_dns_record_rr_cnt(qdnsrec, ARES_SECTION_ADDITIONAL);
+  for (i = 0; i < ares_dns_record_rr_cnt(query->query, ARES_SECTION_ADDITIONAL);
        i++) {
     const ares_dns_rr_t *rr;
-    rr = ares_dns_record_rr_get(qdnsrec, ARES_SECTION_ADDITIONAL, i);
+    rr = ares_dns_record_rr_get(query->query, ARES_SECTION_ADDITIONAL, i);
     if (ares_dns_rr_get_type(rr) == ARES_REC_TYPE_OPT) {
-      ares_dns_record_rr_del(qdnsrec, ARES_SECTION_ADDITIONAL, i);
+      ares_dns_record_rr_del(query->query, ARES_SECTION_ADDITIONAL, i);
       found_opt_rr = ARES_TRUE;
       break;
     }
@@ -649,16 +598,6 @@ static ares_status_t rewrite_without_edns(ares_dns_record_t *qdnsrec,
     goto done;
   }
 
-  /* Rewrite the DNS message */
-  status = ares_dns_write(qdnsrec, &msg, &msglen);
-  if (status != ARES_SUCCESS) {
-    goto done;
-  }
-
-  ares_free(query->qbuf);
-  query->qbuf = msg;
-  query->qlen = msglen;
-
 done:
   return status;
 }
@@ -668,17 +607,16 @@ static ares_status_t rewrite_without_edns(ares_dns_record_t *qdnsrec,
  * the connection to be terminated after this call. */
 static ares_status_t process_answer(ares_channel_t      *channel,
                                     const unsigned char *abuf, size_t alen,
-                                    struct server_connection *conn,
-                                    ares_bool_t tcp, const ares_timeval_t *now)
+                                    ares_conn_t *conn, ares_bool_t tcp,
+                                    const ares_timeval_t *now)
 {
-  struct query        *query;
+  ares_query_t      *query;
   /* Cache these as once ares__send_query() gets called, it may end up
    * invalidating the connection all-together */
-  struct server_state *server  = conn->server;
-  ares_dns_record_t   *rdnsrec = NULL;
-  ares_dns_record_t   *qdnsrec = NULL;
-  ares_status_t        status;
-  ares_bool_t          is_cached = ARES_FALSE;
+  ares_server_t     *server  = conn->server;
+  ares_dns_record_t *rdnsrec = NULL;
+  ares_status_t      status;
+  ares_bool_t        is_cached = ARES_FALSE;
 
   /* Parse the response */
   status = ares_dns_parse(abuf, alen, 0, &rdnsrec);
@@ -699,21 +637,22 @@ static ares_status_t process_answer(ares_channel_t      *channel,
     goto cleanup;
   }
 
-  /* Parse the question we sent as we use it to compare */
-  status = ares_dns_parse(query->qbuf, query->qlen, 0, &qdnsrec);
-  if (status != ARES_SUCCESS) {
-    end_query(channel, query, status, NULL);
-    goto cleanup;
-  }
-
   /* Both the query id and the questions must be the same. We will drop any
    * replies that aren't for the same query as this is considered invalid. */
-  if (!same_questions(qdnsrec, rdnsrec)) {
+  if (!same_questions(query, rdnsrec)) {
     /* Possible qid conflict due to delayed response, that's ok */
     status = ARES_SUCCESS;
     goto cleanup;
   }
 
+  /* Validate DNS cookie in response. This function may need to requeue the
+   * query. */
+  if (ares_cookie_validate(query, rdnsrec, conn, now) != ARES_SUCCESS) {
+    /* Drop response and return */
+    status = ARES_SUCCESS;
+    goto cleanup;
+  }
+
   /* At this point we know we've received an answer for this query, so we should
    * remove it from the connection's queue so we can possibly invalidate the
    * connection. Delay cleaning up the connection though as we may enqueue
@@ -725,10 +664,11 @@ static ares_status_t process_answer(ares_channel_t      *channel,
    * protocol extension is not understood by the responder. We must retry the
    * query without EDNS enabled. */
   if (ares_dns_record_get_rcode(rdnsrec) == ARES_RCODE_FORMERR &&
-      ares_dns_has_opt_rr(qdnsrec) && !ares_dns_has_opt_rr(rdnsrec)) {
-    status = rewrite_without_edns(qdnsrec, query);
+      ares_dns_get_opt_rr_const(query->query) != NULL &&
+      ares_dns_get_opt_rr_const(rdnsrec) == NULL) {
+    status = rewrite_without_edns(query);
     if (status != ARES_SUCCESS) {
-      end_query(channel, query, status, NULL);
+      end_query(channel, server, query, status, NULL);
       goto cleanup;
     }
 
@@ -758,20 +698,20 @@ static ares_status_t process_answer(ares_channel_t      *channel,
         rcode == ARES_RCODE_REFUSED) {
       switch (rcode) {
         case ARES_RCODE_SERVFAIL:
-          query->error_status = ARES_ESERVFAIL;
+          status = ARES_ESERVFAIL;
           break;
         case ARES_RCODE_NOTIMP:
-          query->error_status = ARES_ENOTIMP;
+          status = ARES_ENOTIMP;
           break;
         case ARES_RCODE_REFUSED:
-          query->error_status = ARES_EREFUSED;
+          status = ARES_EREFUSED;
           break;
         default:
           break;
       }
 
       server_increment_failures(server, query->using_tcp);
-      ares__requeue_query(query, now);
+      ares__requeue_query(query, now, status, ARES_TRUE);
 
       /* Should any of these cause a connection termination?
        * Maybe SERVER_FAILURE? */
@@ -787,7 +727,7 @@ static ares_status_t process_answer(ares_channel_t      *channel,
   }
 
   server_set_good(server, query->using_tcp);
-  end_query(channel, query, ARES_SUCCESS, rdnsrec);
+  end_query(channel, server, query, ARES_SUCCESS, rdnsrec);
 
   status = ARES_SUCCESS;
 
@@ -797,32 +737,42 @@ static ares_status_t process_answer(ares_channel_t      *channel,
     ares_dns_record_destroy(rdnsrec);
   }
 
-  ares_dns_record_destroy(qdnsrec);
   return status;
 }
 
-static void handle_conn_error(struct server_connection *conn,
-                              ares_bool_t               critical_failure)
+static void handle_conn_error(ares_conn_t *conn, ares_bool_t critical_failure,
+                              ares_status_t failure_status)
 {
-  struct server_state *server = conn->server;
+  ares_server_t *server = conn->server;
 
   /* Increment failures first before requeue so it is unlikely to requeue
    * to the same server */
   if (critical_failure) {
-    server_increment_failures(server, conn->is_tcp);
+    server_increment_failures(
+      server, (conn->flags & ARES_CONN_FLAG_TCP) ? ARES_TRUE : ARES_FALSE);
   }
 
   /* This will requeue any connections automatically */
-  ares__close_connection(conn);
+  ares__close_connection(conn, failure_status);
 }
 
-ares_status_t ares__requeue_query(struct query         *query,
-                                  const ares_timeval_t *now)
+ares_status_t ares__requeue_query(ares_query_t         *query,
+                                  const ares_timeval_t *now,
+                                  ares_status_t         status,
+                                  ares_bool_t           inc_try_count)
 {
   ares_channel_t *channel = query->channel;
   size_t max_tries        = ares__slist_len(channel->servers) * channel->tries;
 
-  query->try_count++;
+  ares__query_disassociate_from_conn(query);
+
+  if (status != ARES_SUCCESS) {
+    query->error_status = status;
+  }
+
+  if (inc_try_count) {
+    query->try_count++;
+  }
 
   if (query->try_count < max_tries && !query->no_retries) {
     return ares__send_query(query, now);
@@ -833,14 +783,14 @@ ares_status_t ares__requeue_query(struct query         *query,
     query->error_status = ARES_ETIMEOUT;
   }
 
-  end_query(channel, query, query->error_status, NULL);
+  end_query(channel, NULL, query, query->error_status, NULL);
   return ARES_ETIMEOUT;
 }
 
 /* Pick a random server from the list, we first get a random number in the
  * range of the number of servers, then scan until we find that server in
  * the list */
-static struct server_state *ares__random_server(ares_channel_t *channel)
+static ares_server_t *ares__random_server(ares_channel_t *channel)
 {
   unsigned char       c;
   size_t              cnt;
@@ -884,16 +834,15 @@ static struct server_state *ares__random_server(ares_channel_t *channel)
  * To resolve this, with some probability we select a failed server to retry
  * instead.
  */
-static struct server_state *ares__failover_server(ares_channel_t *channel)
+static ares_server_t *ares__failover_server(ares_channel_t *channel)
 {
-  struct server_state *first_server = ares__slist_first_val(channel->servers);
-  const struct server_state *last_server =
-    ares__slist_last_val(channel->servers);
-  unsigned short r;
+  ares_server_t       *first_server = ares__slist_first_val(channel->servers);
+  const ares_server_t *last_server  = ares__slist_last_val(channel->servers);
+  unsigned short       r;
 
   /* Defensive code against no servers being available on the channel. */
   if (first_server == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* If no servers have failures, then prefer the first server in the list. */
@@ -916,11 +865,13 @@ static struct server_state *ares__failover_server(ares_channel_t *channel)
   ares__rand_bytes(channel->rand_state, (unsigned char *)&r, sizeof(r));
   if (r % channel->server_retry_chance == 0) {
     /* Select a suitable failed server to retry. */
-    ares_timeval_t      now = ares__tvnow();
+    ares_timeval_t      now;
     ares__slist_node_t *node;
+
+    ares__tvnow(&now);
     for (node = ares__slist_node_first(channel->servers); node != NULL;
          node = ares__slist_node_next(node)) {
-      struct server_state *node_val = ares__slist_node_val(node);
+      ares_server_t *node_val = ares__slist_node_val(node);
       if (node_val != NULL && node_val->consec_failures > 0 &&
           ares__timedout(&now, &node_val->next_retry_time)) {
         return node_val;
@@ -932,27 +883,18 @@ static struct server_state *ares__failover_server(ares_channel_t *channel)
   return first_server;
 }
 
-static ares_status_t ares__append_tcpbuf(struct server_state *server,
-                                         const struct query  *query)
-{
-  ares_status_t status;
-
-  status = ares__buf_append_be16(server->tcp_send, (unsigned short)query->qlen);
-  if (status != ARES_SUCCESS) {
-    return status;
-  }
-  return ares__buf_append(server->tcp_send, query->qbuf, query->qlen);
-}
-
-static size_t ares__calc_query_timeout(const struct query *query)
+static size_t ares__calc_query_timeout(const ares_query_t   *query,
+                                       const ares_server_t  *server,
+                                       const ares_timeval_t *now)
 {
   const ares_channel_t *channel  = query->channel;
-  size_t                timeplus = channel->timeout;
+  size_t                timeout  = ares_metrics_server_timeout(server, now);
+  size_t                timeplus = timeout;
   size_t                rounds;
   size_t                num_servers = ares__slist_len(channel->servers);
 
   if (num_servers == 0) {
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* For each trip through the entire server list, we want to double the
@@ -986,159 +928,211 @@ static size_t ares__calc_query_timeout(const struct query *query)
 
   /* We want explicitly guarantee that timeplus is greater or equal to timeout
    * specified in channel options. */
-  if (timeplus < channel->timeout) {
-    timeplus = channel->timeout;
+  if (timeplus < timeout) {
+    timeplus = timeout;
   }
 
   return timeplus;
 }
 
-ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now)
+static ares_conn_t *ares__fetch_connection(const ares_channel_t *channel,
+                                           ares_server_t        *server,
+                                           const ares_query_t   *query)
 {
-  ares_channel_t           *channel = query->channel;
-  struct server_state      *server;
-  struct server_connection *conn;
-  size_t                    timeplus;
-  ares_status_t             status;
-  ares_bool_t               new_connection = ARES_FALSE;
-
-  query->conn = NULL;
+  ares__llist_node_t *node;
+  ares_conn_t        *conn;
 
-  /* Choose the server to send the query to */
-  if (channel->rotate) {
-    /* Pull random server */
-    server = ares__random_server(channel);
-  } else {
-    /* Pull server with failover behavior */
-    server = ares__failover_server(channel);
+  if (query->using_tcp) {
+    return server->tcp_conn;
   }
 
-  if (server == NULL) {
-    end_query(channel, query, ARES_ENOSERVER /* ? */, NULL);
-    return ARES_ENOSERVER;
+  /* Fetch existing UDP connection */
+  node = ares__llist_node_first(server->connections);
+  if (node == NULL) {
+    return NULL;
   }
 
-  if (query->using_tcp) {
-    size_t prior_len = 0;
-    /* Make sure the TCP socket for this server is set up and queue
-     * a send request.
-     */
-    if (server->tcp_conn == NULL) {
-      new_connection = ARES_TRUE;
-      status         = ares__open_connection(channel, server, ARES_TRUE);
-      switch (status) {
-        /* Good result, continue on */
-        case ARES_SUCCESS:
-          break;
+  conn = ares__llist_node_val(node);
+  /* Not UDP, skip */
+  if (conn->flags & ARES_CONN_FLAG_TCP) {
+    return NULL;
+  }
 
-        /* These conditions are retryable as they are server-specific
-         * error codes */
-        case ARES_ECONNREFUSED:
-        case ARES_EBADFAMILY:
-          server_increment_failures(server, query->using_tcp);
-          query->error_status = status;
-          return ares__requeue_query(query, now);
+  /* Used too many times */
+  if (channel->udp_max_queries > 0 &&
+      conn->total_queries >= channel->udp_max_queries) {
+    return NULL;
+  }
 
-        /* Anything else is not retryable, likely ENOMEM */
-        default:
-          end_query(channel, query, status, NULL);
-          return status;
-      }
-    }
+  return conn;
+}
 
-    conn = server->tcp_conn;
+static ares_status_t ares__conn_query_write(ares_conn_t          *conn,
+                                            ares_query_t         *query,
+                                            const ares_timeval_t *now)
+{
+  unsigned char  *qbuf     = NULL;
+  size_t          qbuf_len = 0;
+  ares_ssize_t    len;
+  ares_server_t  *server  = conn->server;
+  ares_channel_t *channel = server->channel;
+  ares_status_t   status;
+
+  status = ares_cookie_apply(query->query, conn, now);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
 
-    prior_len = ares__buf_len(server->tcp_send);
+  if (conn->flags & ARES_CONN_FLAG_TCP) {
+    size_t prior_len = ares__buf_len(server->tcp_send);
 
-    status = ares__append_tcpbuf(server, query);
+    status = ares_dns_write_buf_tcp(query->query, server->tcp_send);
     if (status != ARES_SUCCESS) {
-      end_query(channel, query, status, NULL);
+      return status;
+    }
 
-      /* Only safe to kill connection if it was new, otherwise it should be
-       * cleaned up by another process later */
-      if (new_connection) {
-        ares__close_connection(conn);
+    if (conn->flags & ARES_CONN_FLAG_TFO_INITIAL) {
+      /* When using TFO, we need to put it on the wire immediately. */
+      size_t               data_len;
+      const unsigned char *data = NULL;
+
+      data = ares__buf_peek(server->tcp_send, &data_len);
+      len  = ares__conn_write(conn, data, data_len);
+      if (len <= 0) {
+        if (ares__socket_try_again(SOCKERRNO)) {
+          /* This means we must not have qualified for TFO, keep the data
+           * buffered, wait on write signal. */
+          return ARES_SUCCESS;
+        }
+
+        /* TCP TFO might delay failure.  Reflect that here */
+        return ARES_ECONNREFUSED;
       }
-      return status;
+
+      /* Consume what was written */
+      ares__buf_consume(server->tcp_send, (size_t)len);
+      return ARES_SUCCESS;
     }
 
     if (prior_len == 0) {
       SOCK_STATE_CALLBACK(channel, conn->fd, 1, 1);
     }
 
-  } else {
-    ares__llist_node_t *node = ares__llist_node_first(server->connections);
-
-    /* Don't use the found connection if we've gone over the maximum number
-     * of queries. Also, skip over the TCP connection if it is the first in
-     * the list */
-    if (node != NULL) {
-      conn = ares__llist_node_val(node);
-      if (conn->is_tcp) {
-        node = NULL;
-      } else if (channel->udp_max_queries > 0 &&
-                 conn->total_queries >= channel->udp_max_queries) {
-        node = NULL;
-      }
+    return ARES_SUCCESS;
+  }
+
+  /* UDP Here */
+  status = ares_dns_write(query->query, &qbuf, &qbuf_len);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  len = ares__conn_write(conn, qbuf, qbuf_len);
+  ares_free(qbuf);
+
+  if (len == -1) {
+    if (ares__socket_try_again(SOCKERRNO)) {
+      return ARES_ESERVFAIL;
     }
+    /* UDP is connection-less, but we might receive an ICMP unreachable which
+     * means we can't talk to the remote host at all and that will be
+     * reflected here */
+    return ARES_ECONNREFUSED;
+  }
 
-    if (node == NULL) {
-      new_connection = ARES_TRUE;
-      status         = ares__open_connection(channel, server, ARES_FALSE);
-      switch (status) {
-        /* Good result, continue on */
-        case ARES_SUCCESS:
-          break;
+  return ARES_SUCCESS;
+}
+
+ares_status_t ares__send_query(ares_query_t *query, const ares_timeval_t *now)
+{
+  ares_channel_t *channel = query->channel;
+  ares_server_t  *server;
+  ares_conn_t    *conn;
+  size_t          timeplus;
+  ares_status_t   status;
 
-        /* These conditions are retryable as they are server-specific
-         * error codes */
-        case ARES_ECONNREFUSED:
-        case ARES_EBADFAMILY:
-          server_increment_failures(server, query->using_tcp);
-          query->error_status = status;
-          return ares__requeue_query(query, now);
+  /* Choose the server to send the query to */
+  if (channel->rotate) {
+    /* Pull random server */
+    server = ares__random_server(channel);
+  } else {
+    /* Pull server with failover behavior */
+    server = ares__failover_server(channel);
+  }
 
-        /* Anything else is not retryable, likely ENOMEM */
-        default:
-          end_query(channel, query, status, NULL);
-          return status;
-      }
-      node = ares__llist_node_first(server->connections);
+  if (server == NULL) {
+    end_query(channel, server, query, ARES_ENOSERVER /* ? */, NULL);
+    return ARES_ENOSERVER;
+  }
+
+  conn = ares__fetch_connection(channel, server, query);
+  if (conn == NULL) {
+    status = ares__open_connection(&conn, channel, server, query->using_tcp);
+    switch (status) {
+      /* Good result, continue on */
+      case ARES_SUCCESS:
+        break;
+
+      /* These conditions are retryable as they are server-specific
+       * error codes */
+      case ARES_ECONNREFUSED:
+      case ARES_EBADFAMILY:
+        server_increment_failures(server, query->using_tcp);
+        return ares__requeue_query(query, now, status, ARES_TRUE);
+
+      /* Anything else is not retryable, likely ENOMEM */
+      default:
+        end_query(channel, server, query, status, NULL);
+        return status;
     }
+  }
 
-    conn = ares__llist_node_val(node);
-    if (ares__socket_write(channel, conn->fd, query->qbuf, query->qlen) == -1) {
-      /* FIXME: Handle EAGAIN here since it likely can happen. */
-      server_increment_failures(server, query->using_tcp);
-      status = ares__requeue_query(query, now);
+  /* Write the query */
+  status = ares__conn_query_write(conn, query, now);
+  switch (status) {
+    /* Good result, continue on */
+    case ARES_SUCCESS:
+      break;
 
-      /* Only safe to kill connection if it was new, otherwise it should be
-       * cleaned up by another process later */
-      if (new_connection) {
-        ares__close_connection(conn);
+    case ARES_ENOMEM:
+      /* Not retryable */
+      end_query(channel, server, query, status, NULL);
+      return status;
+
+    /* These conditions are retryable as they are server-specific
+     * error codes */
+    case ARES_ECONNREFUSED:
+    case ARES_EBADFAMILY:
+      handle_conn_error(conn, ARES_TRUE, status);
+      status = ares__requeue_query(query, now, status, ARES_TRUE);
+      if (status == ARES_ETIMEOUT) {
+        status = ARES_ECONNREFUSED;
       }
+      return status;
 
+    /* FIXME: Handle EAGAIN here since it likely can happen. Right now we
+     * just requeue to a different server/connection. */
+    default:
+      server_increment_failures(server, query->using_tcp);
+      status = ares__requeue_query(query, now, status, ARES_TRUE);
       return status;
-    }
   }
 
-  timeplus = ares__calc_query_timeout(query);
+  timeplus = ares__calc_query_timeout(query, server, now);
   /* Keep track of queries bucketed by timeout, so we can process
    * timeout events quickly.
    */
   ares__slist_node_destroy(query->node_queries_by_timeout);
+  query->ts      = *now;
   query->timeout = *now;
   timeadd(&query->timeout, timeplus);
   query->node_queries_by_timeout =
     ares__slist_insert(channel->queries_by_timeout, query);
   if (!query->node_queries_by_timeout) {
-    end_query(channel, query, ARES_ENOMEM, NULL);
-    /* Only safe to kill connection if it was new, otherwise it should be
-     * cleaned up by another process later */
-    if (new_connection) {
-      ares__close_connection(conn);
-    }
+    /* LCOV_EXCL_START: OutOfMemory */
+    end_query(channel, server, query, ARES_ENOMEM, NULL);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Keep track of queries bucketed by connection, so we can process errors
@@ -1148,13 +1142,10 @@ ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now)
     ares__llist_insert_last(conn->queries_to_conn, query);
 
   if (query->node_queries_to_conn == NULL) {
-    end_query(channel, query, ARES_ENOMEM, NULL);
-    /* Only safe to kill connection if it was new, otherwise it should be
-     * cleaned up by another process later */
-    if (new_connection) {
-      ares__close_connection(conn);
-    }
+    /* LCOV_EXCL_START: OutOfMemory */
+    end_query(channel, server, query, ARES_ENOMEM, NULL);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   query->conn = conn;
@@ -1162,11 +1153,13 @@ ares_status_t ares__send_query(struct query *query, const ares_timeval_t *now)
   return ARES_SUCCESS;
 }
 
-static ares_bool_t same_questions(const ares_dns_record_t *qrec,
+static ares_bool_t same_questions(const ares_query_t      *query,
                                   const ares_dns_record_t *arec)
 {
-  size_t      i;
-  ares_bool_t rv = ARES_FALSE;
+  size_t                   i;
+  ares_bool_t              rv      = ARES_FALSE;
+  const ares_dns_record_t *qrec    = query->query;
+  const ares_channel_t    *channel = query->channel;
 
 
   if (ares_dns_record_query_cnt(qrec) != ares_dns_record_query_cnt(arec)) {
@@ -1192,9 +1185,26 @@ static ares_bool_t same_questions(const ares_dns_record_t *qrec,
         aname == NULL) {
       goto done;
     }
-    if (strcasecmp(qname, aname) != 0 || qtype != atype || qclass != aclass) {
+
+    if (qtype != atype || qclass != aclass) {
       goto done;
     }
+
+    if (channel->flags & ARES_FLAG_DNS0x20 && !query->using_tcp) {
+      /* NOTE: for DNS 0x20, part of the protection is to use a case-sensitive
+       *       comparison of the DNS query name.  This expects the upstream DNS
+       *       server to preserve the case of the name in the response packet.
+       *       https://datatracker.ietf.org/doc/html/draft-vixie-dnsext-dns0x20-00
+       */
+      if (strcmp(qname, aname) != 0) {
+        goto done;
+      }
+    } else {
+      /* without DNS0x20 use case-insensitive matching */
+      if (strcasecmp(qname, aname) != 0) {
+        goto done;
+      }
+    }
   }
 
   rv = ARES_TRUE;
@@ -1213,14 +1223,15 @@ static ares_bool_t same_address(const struct sockaddr  *sa,
     switch (aa->family) {
       case AF_INET:
         addr1 = &aa->addr.addr4;
-        addr2 = &(CARES_INADDR_CAST(struct sockaddr_in *, sa))->sin_addr;
+        addr2 = &(CARES_INADDR_CAST(const struct sockaddr_in *, sa))->sin_addr;
         if (memcmp(addr1, addr2, sizeof(aa->addr.addr4)) == 0) {
           return ARES_TRUE; /* match */
         }
         break;
       case AF_INET6:
         addr1 = &aa->addr.addr6;
-        addr2 = &(CARES_INADDR_CAST(struct sockaddr_in6 *, sa))->sin6_addr;
+        addr2 =
+          &(CARES_INADDR_CAST(const struct sockaddr_in6 *, sa))->sin6_addr;
         if (memcmp(addr1, addr2, sizeof(aa->addr.addr6)) == 0) {
           return ARES_TRUE; /* match */
         }
@@ -1232,21 +1243,21 @@ static ares_bool_t same_address(const struct sockaddr  *sa,
   return ARES_FALSE; /* different */
 }
 
-static void ares_detach_query(struct query *query)
+static void ares_detach_query(ares_query_t *query)
 {
   /* Remove the query from all the lists in which it is linked */
+  ares__query_disassociate_from_conn(query);
   ares__htable_szvp_remove(query->channel->queries_by_qid, query->qid);
-  ares__slist_node_destroy(query->node_queries_by_timeout);
-  ares__llist_node_destroy(query->node_queries_to_conn);
   ares__llist_node_destroy(query->node_all_queries);
-  query->node_queries_by_timeout = NULL;
-  query->node_queries_to_conn    = NULL;
-  query->node_all_queries        = NULL;
+  query->node_all_queries = NULL;
 }
 
-static void end_query(ares_channel_t *channel, struct query *query,
-                      ares_status_t status, const ares_dns_record_t *dnsrec)
+static void end_query(ares_channel_t *channel, ares_server_t *server,
+                      ares_query_t *query, ares_status_t status,
+                      const ares_dns_record_t *dnsrec)
 {
+  ares_metrics_record(query, server, status, dnsrec);
+
   /* Invoke the callback. */
   query->callback(query->arg, status, query->timeouts, dnsrec);
   ares__free_query(query);
@@ -1259,14 +1270,14 @@ static void end_query(ares_channel_t *channel, struct query *query,
   ares_queue_notify_empty(channel);
 }
 
-void ares__free_query(struct query *query)
+void ares__free_query(ares_query_t *query)
 {
   ares_detach_query(query);
   /* Zero out some important stuff, to help catch bugs */
   query->callback = NULL;
   query->arg      = NULL;
   /* Deallocate the memory associated with the query */
-  ares_free(query->qbuf);
+  ares_dns_record_destroy(query->query);
 
   ares_free(query);
 }
diff --git a/contrib/libs/c-ares/src/lib/ares_qcache.c b/contrib/libs/c-ares/src/lib/ares_qcache.c
index 087518d7b808..aee1328b51c7 100644
--- a/contrib/libs/c-ares/src/lib/ares_qcache.c
+++ b/contrib/libs/c-ares/src/lib/ares_qcache.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 struct ares__qcache {
@@ -48,7 +46,7 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
   ares_dns_flags_t flags;
 
   if (dnsrec == NULL || buf == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Format is OPCODE|FLAGS[|QTYPE1|QCLASS1|QNAME1]... */
@@ -56,12 +54,12 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
   status = ares__buf_append_str(
     buf, ares_dns_opcode_tostr(ares_dns_record_get_opcode(dnsrec)));
   if (status != ARES_SUCCESS) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, '|');
   if (status != ARES_SUCCESS) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   flags = ares_dns_record_get_flags(dnsrec);
@@ -69,13 +67,13 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
   if (flags & ARES_FLAG_RD) {
     status = ares__buf_append_str(buf, "rd");
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
   if (flags & ARES_FLAG_CD) {
     status = ares__buf_append_str(buf, "cd");
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -87,32 +85,32 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
 
     status = ares_dns_record_query_get(dnsrec, i, &name, &qtype, &qclass);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     status = ares__buf_append_byte(buf, '|');
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_str(buf, ares_dns_rec_type_tostr(qtype));
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_byte(buf, '|');
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_str(buf, ares_dns_class_tostr(qclass));
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_byte(buf, '|');
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* On queries, a '.' may be appended to the name to indicate an explicit
@@ -125,15 +123,17 @@ static char *ares__qcache_calc_key(const ares_dns_record_t *dnsrec)
 
     status = ares__buf_append(buf, (const unsigned char *)name, name_len);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   return ares__buf_finish_str(buf, NULL);
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__buf_destroy(buf);
   return NULL;
+  /* LCOV_EXCL_STOP */
 }
 
 static void ares__qcache_expire(ares__qcache_t       *cache,
@@ -194,7 +194,7 @@ static void ares__qcache_entry_destroy_cb(void *arg)
 {
   ares__qcache_entry_t *entry = arg;
   if (entry == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares_free(entry->key);
@@ -211,21 +211,21 @@ ares_status_t ares__qcache_create(ares_rand_state *rand_state,
 
   cache = ares_malloc_zero(sizeof(*cache));
   if (cache == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   cache->cache = ares__htable_strvp_create(NULL);
   if (cache->cache == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   cache->expire = ares__slist_create(rand_state, ares__qcache_entry_sort_cb,
                                      ares__qcache_entry_destroy_cb);
   if (cache->expire == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   cache->max_ttl = max_ttl;
@@ -299,37 +299,18 @@ static unsigned int ares__qcache_soa_minimum(ares_dns_record_t *dnsrec)
   return 0;
 }
 
-static char *ares__qcache_calc_key_frombuf(const unsigned char *qbuf,
-                                           size_t               qlen)
-{
-  ares_status_t      status;
-  ares_dns_record_t *dnsrec = NULL;
-  char              *key    = NULL;
-
-  status = ares_dns_parse(qbuf, qlen, 0, &dnsrec);
-  if (status != ARES_SUCCESS) {
-    goto done;
-  }
-
-  key = ares__qcache_calc_key(dnsrec);
-
-done:
-  ares_dns_record_destroy(dnsrec);
-  return key;
-}
-
 /* On success, takes ownership of dnsrec */
-static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
-                                         ares_dns_record_t   *dnsrec,
-                                         const unsigned char *qbuf, size_t qlen,
-                                         const ares_timeval_t *now)
+static ares_status_t ares__qcache_insert(ares__qcache_t          *qcache,
+                                         ares_dns_record_t       *qresp,
+                                         const ares_dns_record_t *qreq,
+                                         const ares_timeval_t    *now)
 {
   ares__qcache_entry_t *entry;
   unsigned int          ttl;
-  ares_dns_rcode_t      rcode = ares_dns_record_get_rcode(dnsrec);
-  ares_dns_flags_t      flags = ares_dns_record_get_flags(dnsrec);
+  ares_dns_rcode_t      rcode = ares_dns_record_get_rcode(qresp);
+  ares_dns_flags_t      flags = ares_dns_record_get_flags(qresp);
 
-  if (qcache == NULL || dnsrec == NULL) {
+  if (qcache == NULL || qresp == NULL) {
     return ARES_EFORMERR;
   }
 
@@ -345,9 +326,13 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
 
   /* Look at SOA for NXDOMAIN for minimum */
   if (rcode == ARES_RCODE_NXDOMAIN) {
-    ttl = ares__qcache_soa_minimum(dnsrec);
+    ttl = ares__qcache_soa_minimum(qresp);
   } else {
-    ttl = ares__qcache_calc_minttl(dnsrec);
+    ttl = ares__qcache_calc_minttl(qresp);
+  }
+
+  if (ttl > qcache->max_ttl) {
+    ttl = qcache->max_ttl;
   }
 
   /* Don't cache something that is already expired */
@@ -355,16 +340,12 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
     return ARES_EREFUSED;
   }
 
-  if (ttl > qcache->max_ttl) {
-    ttl = qcache->max_ttl;
-  }
-
   entry = ares_malloc_zero(sizeof(*entry));
   if (entry == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
-  entry->dnsrec    = dnsrec;
+  entry->dnsrec    = qresp;
   entry->expire_ts = now->sec + (time_t)ttl;
   entry->insert_ts = now->sec;
 
@@ -372,21 +353,22 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
    * request had, so we have to re-parse the request in order to generate the
    * key for caching, but we'll only do this once we know for sure we really
    * want to cache it */
-  entry->key = ares__qcache_calc_key_frombuf(qbuf, qlen);
+  entry->key = ares__qcache_calc_key(qreq);
   if (entry->key == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (!ares__htable_strvp_insert(qcache->cache, entry->key, entry)) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (ares__slist_insert(qcache->expire, entry) == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   if (entry != NULL && entry->key != NULL) {
     ares__htable_strvp_remove(qcache->cache, entry->key);
@@ -394,6 +376,7 @@ static ares_status_t ares__qcache_insert(ares__qcache_t      *qcache,
     ares_free(entry);
   }
   return ARES_ENOMEM;
+  /* LCOV_EXCL_STOP */
 }
 
 ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
@@ -417,8 +400,8 @@ ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
 
   key = ares__qcache_calc_key(dnsrec);
   if (key == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   entry = ares__htable_strvp_get_direct(channel->qcache->cache, key);
@@ -439,9 +422,8 @@ ares_status_t ares_qcache_fetch(ares_channel_t           *channel,
 
 ares_status_t ares_qcache_insert(ares_channel_t       *channel,
                                  const ares_timeval_t *now,
-                                 const struct query   *query,
+                                 const ares_query_t   *query,
                                  ares_dns_record_t    *dnsrec)
 {
-  return ares__qcache_insert(channel->qcache, dnsrec, query->qbuf, query->qlen,
-                             now);
+  return ares__qcache_insert(channel->qcache, dnsrec, query->query, now);
 }
diff --git a/contrib/libs/c-ares/src/lib/ares_query.c b/contrib/libs/c-ares/src/lib/ares_query.c
index 0eea80e7fc1e..4d0861a5f52d 100644
--- a/contrib/libs/c-ares/src/lib/ares_query.c
+++ b/contrib/libs/c-ares/src/lib/ares_query.c
@@ -25,18 +25,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
 
-#include "ares_nameser.h"
-
-#include "ares.h"
-#include "ares_dns.h"
-#include "ares_private.h"
-
 typedef struct {
   ares_callback_dnsrec callback;
   void                *arg;
@@ -64,11 +58,11 @@ static void ares_query_dnsrec_cb(void *arg, ares_status_t status,
   ares_free(qquery);
 }
 
-static ares_status_t ares_query_int(ares_channel_t *channel, const char *name,
-                                    ares_dns_class_t     dnsclass,
-                                    ares_dns_rec_type_t  type,
-                                    ares_callback_dnsrec callback, void *arg,
-                                    unsigned short *qid)
+ares_status_t ares_query_nolock(ares_channel_t *channel, const char *name,
+                                ares_dns_class_t     dnsclass,
+                                ares_dns_rec_type_t  type,
+                                ares_callback_dnsrec callback, void *arg,
+                                unsigned short *qid)
 {
   ares_status_t            status;
   ares_dns_record_t       *dnsrec = NULL;
@@ -76,11 +70,13 @@ static ares_status_t ares_query_int(ares_channel_t *channel, const char *name,
   ares_query_dnsrec_arg_t *qquery = NULL;
 
   if (channel == NULL || name == NULL || callback == NULL) {
+    /* LCOV_EXCL_START: DefensiveCoding */
     status = ARES_EFORMERR;
     if (callback != NULL) {
       callback(arg, status, 0, NULL);
     }
     return status;
+    /* LCOV_EXCL_STOP */
   }
 
   if (!(channel->flags & ARES_FLAG_NORECURSE)) {
@@ -91,23 +87,25 @@ static ares_status_t ares_query_int(ares_channel_t *channel, const char *name,
     &dnsrec, name, dnsclass, type, 0, flags,
     (size_t)(channel->flags & ARES_FLAG_EDNS) ? channel->ednspsz : 0);
   if (status != ARES_SUCCESS) {
-    callback(arg, status, 0, NULL);
-    return status;
+    callback(arg, status, 0, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+    return status;                  /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   qquery = ares_malloc(sizeof(*qquery));
   if (qquery == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     status = ARES_ENOMEM;
     callback(arg, status, 0, NULL);
     ares_dns_record_destroy(dnsrec);
     return status;
+    /* LCOV_EXCL_STOP */
   }
 
   qquery->callback = callback;
   qquery->arg      = arg;
 
   /* Send it off.  qcallback will be called when we get an answer. */
-  status = ares_send_dnsrec(channel, dnsrec, ares_query_dnsrec_cb, qquery, qid);
+  status = ares_send_nolock(channel, dnsrec, ares_query_dnsrec_cb, qquery, qid);
 
   ares_dns_record_destroy(dnsrec);
   return status;
@@ -126,7 +124,7 @@ ares_status_t ares_query_dnsrec(ares_channel_t *channel, const char *name,
   }
 
   ares__channel_lock(channel);
-  status = ares_query_int(channel, name, dnsclass, type, callback, arg, qid);
+  status = ares_query_nolock(channel, name, dnsclass, type, callback, arg, qid);
   ares__channel_unlock(channel);
   return status;
 }
@@ -142,8 +140,8 @@ void ares_query(ares_channel_t *channel, const char *name, int dnsclass,
 
   carg = ares__dnsrec_convert_arg(callback, arg);
   if (carg == NULL) {
-    callback(arg, ARES_ENOMEM, 0, NULL, 0);
-    return;
+    callback(arg, ARES_ENOMEM, 0, NULL, 0); /* LCOV_EXCL_LINE: OutOfMemory */
+    return;                                 /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   ares_query_dnsrec(channel, name, (ares_dns_class_t)dnsclass,
diff --git a/contrib/libs/c-ares/src/lib/ares_search.c b/contrib/libs/c-ares/src/lib/ares_search.c
index 4fd909cd4f8b..ae98df39a80a 100644
--- a/contrib/libs/c-ares/src/lib/ares_search.c
+++ b/contrib/libs/c-ares/src/lib/ares_search.c
@@ -25,16 +25,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
-#include "ares_dns.h"
-
 struct search_query {
   /* Arguments passed to ares_search_dnsrec() */
   ares_channel_t      *channel;
@@ -57,7 +53,7 @@ struct search_query {
 static void squery_free(struct search_query *squery)
 {
   if (squery == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   ares__strsplit_free(squery->names, squery->names_cnt);
   ares_dns_record_destroy(squery->dnsrec);
@@ -87,7 +83,7 @@ static ares_status_t ares_search_next(ares_channel_t      *channel,
 
   /* Misuse check */
   if (squery->next_name_idx >= squery->names_cnt) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   status = ares_dns_record_query_set_name(
@@ -97,7 +93,7 @@ static ares_status_t ares_search_next(ares_channel_t      *channel,
   }
 
   status =
-    ares_send_dnsrec(channel, squery->dnsrec, search_callback, squery, NULL);
+    ares_send_nolock(channel, squery->dnsrec, search_callback, squery, NULL);
 
   if (status != ARES_EFORMERR) {
     *skip_cleanup = ARES_TRUE;
@@ -200,8 +196,8 @@ ares_status_t ares__search_name_list(const ares_channel_t *channel,
     list_len = 1;
     list     = ares_malloc_zero(sizeof(*list) * list_len);
     if (list == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
     list[0] = alias;
     alias   = NULL;
@@ -215,12 +211,12 @@ ares_status_t ares__search_name_list(const ares_channel_t *channel,
     list_len = 1;
     list     = ares_malloc_zero(sizeof(*list) * list_len);
     if (list == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
     list[0] = ares_strdup(name);
     if (list[0] == NULL) {
-      status = ARES_ENOMEM;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     } else {
       status = ARES_SUCCESS;
     }
@@ -322,8 +318,8 @@ static ares_status_t ares_search_int(ares_channel_t          *channel,
    */
   squery = ares_malloc_zero(sizeof(*squery));
   if (squery == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   squery->channel = channel;
@@ -331,8 +327,8 @@ static ares_status_t ares_search_int(ares_channel_t          *channel,
   /* Duplicate DNS record since, name will need to be rewritten */
   squery->dnsrec = ares_dns_record_duplicate(dnsrec);
   if (squery->dnsrec == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   squery->callback        = callback;
@@ -456,7 +452,7 @@ ares_status_t ares_search_dnsrec(ares_channel_t          *channel,
   ares_status_t status;
 
   if (channel == NULL || dnsrec == NULL || callback == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__channel_lock(channel);
@@ -498,7 +494,7 @@ ares_status_t ares__lookup_hostaliases(const ares_channel_t *channel,
   ares__llist_node_t *node;
 
   if (channel == NULL || name == NULL || alias == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *alias = NULL;
@@ -521,8 +517,8 @@ ares_status_t ares__lookup_hostaliases(const ares_channel_t *channel,
 
   buf = ares__buf_create();
   if (buf == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_load_file(hostaliases, buf);
@@ -581,8 +577,8 @@ ares_status_t ares__lookup_hostaliases(const ares_channel_t *channel,
 
     *alias = ares_strdup(fqdn);
     if (*alias == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Good! */
diff --git a/contrib/libs/c-ares/src/lib/ares_send.c b/contrib/libs/c-ares/src/lib/ares_send.c
index 8bbc6e758b47..944153440496 100644
--- a/contrib/libs/c-ares/src/lib/ares_send.c
+++ b/contrib/libs/c-ares/src/lib/ares_send.c
@@ -25,18 +25,13 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
-
 #include "ares_nameser.h"
 
-#include "ares.h"
-#include "ares_dns.h"
-#include "ares_private.h"
-
 static unsigned short generate_unique_qid(ares_channel_t *channel)
 {
   unsigned short id;
@@ -48,18 +43,77 @@ static unsigned short generate_unique_qid(ares_channel_t *channel)
   return id;
 }
 
-static ares_status_t ares_send_dnsrec_int(ares_channel_t          *channel,
-                                          const ares_dns_record_t *dnsrec,
-                                          ares_callback_dnsrec     callback,
-                                          void *arg, unsigned short *qid)
+/* https://datatracker.ietf.org/doc/html/draft-vixie-dnsext-dns0x20-00 */
+static ares_status_t ares_apply_dns0x20(ares_channel_t    *channel,
+                                        ares_dns_record_t *dnsrec)
+{
+  ares_status_t status = ARES_SUCCESS;
+  const char   *name   = NULL;
+  char          dns0x20name[256];
+  unsigned char randdata[256 / 8];
+  size_t        len;
+  size_t        remaining_bits;
+  size_t        total_bits;
+  size_t        i;
+
+  status = ares_dns_record_query_get(dnsrec, 0, &name, NULL, NULL);
+  if (status != ARES_SUCCESS) {
+    goto done;
+  }
+
+  len = ares_strlen(name);
+  if (len == 0 || len >= sizeof(dns0x20name)) {
+    status = ARES_EBADNAME;
+    goto done;
+  }
+
+  memset(dns0x20name, 0, sizeof(dns0x20name));
+
+  /* Fetch the minimum amount of random data we'd need for the string, which
+   * is 1 bit per byte */
+  total_bits     = ((len + 7) / 8) * 8;
+  remaining_bits = total_bits;
+  ares__rand_bytes(channel->rand_state, randdata, total_bits / 8);
+
+  /* Randomly apply 0x20 to name */
+  for (i = 0; i < len; i++) {
+    size_t bit;
+
+    /* Only apply 0x20 to alpha characters */
+    if (!ares__isalpha(name[i])) {
+      dns0x20name[i] = name[i];
+      continue;
+    }
+
+    /* coin flip */
+    bit = total_bits - remaining_bits;
+    if (randdata[bit / 8] & (1 << (bit % 8))) {
+      dns0x20name[i] = name[i] | 0x20;                          /* Set 0x20 */
+    } else {
+      dns0x20name[i] = (char)(((unsigned char)name[i]) & 0xDF); /* Unset 0x20 */
+    }
+    remaining_bits--;
+  }
+
+  status = ares_dns_record_query_set_name(dnsrec, 0, dns0x20name);
+
+done:
+  return status;
+}
+
+ares_status_t ares_send_nolock(ares_channel_t          *channel,
+                               const ares_dns_record_t *dnsrec,
+                               ares_callback_dnsrec callback, void *arg,
+                               unsigned short *qid)
 {
-  struct query            *query;
-  size_t                   packetsz;
-  ares_timeval_t           now = ares__tvnow();
+  ares_query_t            *query;
+  ares_timeval_t           now;
   ares_status_t            status;
   unsigned short           id          = generate_unique_qid(channel);
   const ares_dns_record_t *dnsrec_resp = NULL;
 
+  ares__tvnow(&now);
+
   if (ares__slist_len(channel->servers) == 0) {
     callback(arg, ARES_ENOSERVER, 0, NULL);
     return ARES_ENOSERVER;
@@ -75,29 +129,40 @@ static ares_status_t ares_send_dnsrec_int(ares_channel_t          *channel,
   }
 
   /* Allocate space for query and allocated fields. */
-  query = ares_malloc(sizeof(struct query));
+  query = ares_malloc(sizeof(ares_query_t));
   if (!query) {
-    callback(arg, ARES_ENOMEM, 0, NULL);
-    return ARES_ENOMEM;
+    callback(arg, ARES_ENOMEM, 0, NULL); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM;                  /* LCOV_EXCL_LINE: OutOfMemory */
   }
   memset(query, 0, sizeof(*query));
 
-  query->channel = channel;
+  query->channel      = channel;
+  query->qid          = id;
+  query->timeout.sec  = 0;
+  query->timeout.usec = 0;
+  query->using_tcp =
+    (channel->flags & ARES_FLAG_USEVC) ? ARES_TRUE : ARES_FALSE;
 
-  status = ares_dns_write(dnsrec, &query->qbuf, &query->qlen);
+  /* Duplicate Query */
+  status = ares_dns_record_duplicate_ex(&query->query, dnsrec);
   if (status != ARES_SUCCESS) {
     ares_free(query);
     callback(arg, status, 0, NULL);
     return status;
   }
 
-  query->qid          = id;
-  query->timeout.sec  = 0;
-  query->timeout.usec = 0;
-
-  /* Ignore first 2 bytes, assign our own query id */
-  query->qbuf[0] = (unsigned char)((id >> 8) & 0xFF);
-  query->qbuf[1] = (unsigned char)(id & 0xFF);
+  ares_dns_record_set_id(query->query, id);
+
+  if (channel->flags & ARES_FLAG_DNS0x20 && !query->using_tcp) {
+    status = ares_apply_dns0x20(channel, query->query);
+    if (status != ARES_SUCCESS) {
+      /* LCOV_EXCL_START: OutOfMemory */
+      callback(arg, status, 0, NULL);
+      ares__free_query(query);
+      return status;
+      /* LCOV_EXCL_STOP */
+    }
+  }
 
   /* Fill in query arguments. */
   query->callback = callback;
@@ -106,9 +171,6 @@ static ares_status_t ares_send_dnsrec_int(ares_channel_t          *channel,
   /* Initialize query status. */
   query->try_count = 0;
 
-  packetsz = (channel->flags & ARES_FLAG_EDNS) ? channel->ednspsz : PACKETSZ;
-  query->using_tcp =
-    (channel->flags & ARES_FLAG_USEVC) || query->qlen > packetsz;
 
   query->error_status = ARES_SUCCESS;
   query->timeouts     = 0;
@@ -121,18 +183,22 @@ static ares_status_t ares_send_dnsrec_int(ares_channel_t          *channel,
   query->node_all_queries =
     ares__llist_insert_last(channel->all_queries, query);
   if (query->node_all_queries == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     callback(arg, ARES_ENOMEM, 0, NULL);
     ares__free_query(query);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Keep track of queries bucketed by qid, so we can process DNS
    * responses quickly.
    */
   if (!ares__htable_szvp_insert(channel->queries_by_qid, query->qid, query)) {
+    /* LCOV_EXCL_START: OutOfMemory */
     callback(arg, ARES_ENOMEM, 0, NULL);
     ares__free_query(query);
     return ARES_ENOMEM;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Perform the first query action. */
@@ -152,12 +218,12 @@ ares_status_t ares_send_dnsrec(ares_channel_t          *channel,
   ares_status_t status;
 
   if (channel == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__channel_lock(channel);
 
-  status = ares_send_dnsrec_int(channel, dnsrec, callback, arg, qid);
+  status = ares_send_nolock(channel, dnsrec, callback, arg, qid);
 
   ares__channel_unlock(channel);
 
@@ -189,10 +255,12 @@ void ares_send(ares_channel_t *channel, const unsigned char *qbuf, int qlen,
 
   carg = ares__dnsrec_convert_arg(callback, arg);
   if (carg == NULL) {
+    /* LCOV_EXCL_START: OutOfMemory */
     status = ARES_ENOMEM;
     ares_dns_record_destroy(dnsrec);
     callback(arg, (int)status, 0, NULL, 0);
     return;
+    /* LCOV_EXCL_STOP */
   }
 
   ares_send_dnsrec(channel, dnsrec, ares__dnsrec_convert_cb, carg, NULL);
diff --git a/contrib/libs/c-ares/src/lib/ares_setup.h b/contrib/libs/c-ares/src/lib/ares_setup.h
index c506449dbdee..d771e4e14175 100644
--- a/contrib/libs/c-ares/src/lib/ares_setup.h
+++ b/contrib/libs/c-ares/src/lib/ares_setup.h
@@ -23,17 +23,17 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#ifndef HEADER_CARES_SETUP_H
-#define HEADER_CARES_SETUP_H
-
-/*
- * Define WIN32 when build target is Win32 API
+#ifndef __ARES_SETUP_H
+#define __ARES_SETUP_H
+
+/* ============================================================================
+ * NOTE: This file is automatically included by ares_private.h and should not
+ *       typically be included directly.
+ *       All c-ares source files should include ares_private.h as the
+ *       first header.
+ * ============================================================================
  */
 
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-
 /*
  * Include configuration script results or hand-crafted
  * configuration file for platforms which lack config tool.
@@ -42,62 +42,17 @@
 #if defined(HAVE_CONFIG_H) && !defined(_MSC_VER)
 #  include "ares_config.h"
 #else
-
-#  ifdef WIN32
+#  ifdef _WIN32
 #    include "config-win32.h"
 #  endif
-
 #endif /* HAVE_CONFIG_H */
 
-/* ================================================================ */
-/* Definition of preprocessor macros/symbols which modify compiler  */
-/* behaviour or generated code characteristics must be done here,   */
-/* as appropriate, before any system header file is included. It is */
-/* also possible to have them defined in the config file included   */
-/* before this point. As a result of all this we frown inclusion of */
-/* system header files in our config files, avoid this at any cost. */
-/* ================================================================ */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-#  ifndef _THREAD_SAFE
-#    define _THREAD_SAFE
-#  endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-#  ifndef _REENTRANT
-#    define _REENTRANT
-#  endif
-#endif
-
-/* ================================================================ */
-/*  If you need to include a system header file for your platform,  */
-/*  please, do it beyond the point further indicated in this file.  */
-/* ================================================================ */
-
 /*
  * c-ares external interface definitions are also used internally,
  * and might also include required system header files to define them.
  */
 
-#include <ares_build.h>
-
-/*
- * Compile time sanity checks must also be done when building the library.
- */
-
-#include <ares_rules.h>
+#include "ares_build.h"
 
 /* ================================================================= */
 /* No system header file shall be included in this file before this  */
@@ -115,6 +70,10 @@
  * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
  */
 
+#ifdef USE_WINSOCK
+#  undef USE_WINSOCK
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
@@ -122,52 +81,56 @@
 #  include <windows.h>
 #  ifdef HAVE_WINSOCK2_H
 #    include <winsock2.h>
+#    define USE_WINSOCK 2
 #    ifdef HAVE_WS2TCPIP_H
 #      include <ws2tcpip.h>
 #    endif
 #  else
 #    ifdef HAVE_WINSOCK_H
 #      include <winsock.h>
+#      define USE_WINSOCK 1
 #    endif
 #  endif
 #endif
 
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK  API, else
- * undefine USE_WINSOCK.
- */
 
-#ifdef USE_WINSOCK
-#  undef USE_WINSOCK
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <ctype.h>
+
+#ifdef HAVE_ERRNO_H
+#  include <errno.h>
 #endif
-#ifdef HAVE_WINSOCK2_H
-#  define USE_WINSOCK 2
-#else
-#  ifdef HAVE_WINSOCK_H
-#    define USE_WINSOCK 1
-#  endif
+
+#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
 #endif
 
-/*
- * Work-arounds for systems without configure support
- */
+#ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+#endif
 
-#ifndef HAVE_CONFIG_H
+#ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+#endif
 
-#  if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#    define HAVE_SYS_TIME_H
-#  endif
+#ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+#endif
 
-#  if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#    define HAVE_UNISTD_H 1
-#  endif
+#ifdef HAVE_TIME_H
+#  include <time.h>
+#endif
 
-#  if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#    define HAVE_SYS_UIO_H
-#  endif
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 
-#endif /* HAVE_CONFIG_H */
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
 
 /*
  * Arg 2 type for gethostname in case it hasn't been defined in config file.
@@ -235,12 +198,170 @@
 #  endif
 #endif
 
+
+#ifdef __hpux
+#  if !defined(_XOPEN_SOURCE_EXTENDED) || defined(_KERNEL)
+#    ifdef _APP32_64BIT_OFF_T
+#      define OLD_APP32_64BIT_OFF_T _APP32_64BIT_OFF_T
+#      undef _APP32_64BIT_OFF_T
+#    else
+#      undef OLD_APP32_64BIT_OFF_T
+#    endif
+#  endif
+#endif
+
+#ifdef __hpux
+#  if !defined(_XOPEN_SOURCE_EXTENDED) || defined(_KERNEL)
+#    ifdef OLD_APP32_64BIT_OFF_T
+#      define _APP32_64BIT_OFF_T OLD_APP32_64BIT_OFF_T
+#      undef OLD_APP32_64BIT_OFF_T
+#    endif
+#  endif
+#endif
+
+
+/*
+ * Definition of timeval struct for platforms that don't have it.
+ */
+
+#ifndef HAVE_STRUCT_TIMEVAL
+struct timeval {
+  long tv_sec;
+  long tv_usec;
+};
+#endif
+
+/*
+ * Function-like macro definition used to close a socket.
+ */
+
+#if defined(HAVE_CLOSESOCKET)
+#  define sclose(x) closesocket((x))
+#elif defined(HAVE_CLOSESOCKET_CAMEL)
+#  define sclose(x) CloseSocket((x))
+#elif defined(HAVE_CLOSE_S)
+#  define sclose(x) close_s((x))
+#else
+#  define sclose(x) close((x))
+#endif
+
 /*
- * Include macros and defines that should only be processed once.
+ * Macro used to include code only in debug builds.
  */
 
-#ifndef __SETUP_ONCE_H
-#  include "setup_once.h"
+#ifdef DEBUGBUILD
+#  define DEBUGF(x) x
+#else
+#  define DEBUGF(x) \
+    do {            \
+    } while (0)
+#endif
+
+/*
+ * Macro SOCKERRNO / SET_SOCKERRNO() returns / sets the *socket-related* errno
+ * (or equivalent) on this platform to hide platform details to code using it.
+ */
+
+#ifdef USE_WINSOCK
+#  define SOCKERRNO        ((int)WSAGetLastError())
+#  define SET_SOCKERRNO(x) (WSASetLastError((int)(x)))
+#else
+#  define SOCKERRNO        (errno)
+#  define SET_SOCKERRNO(x) (errno = (x))
+#endif
+
+
+/*
+ * Macro ERRNO / SET_ERRNO() returns / sets the NOT *socket-related* errno
+ * (or equivalent) on this platform to hide platform details to code using it.
+ */
+
+#if defined(WIN32) && !defined(WATT32)
+#  define ERRNO        ((int)GetLastError())
+#  define SET_ERRNO(x) (SetLastError((DWORD)(x)))
+#else
+#  define ERRNO        (errno)
+#  define SET_ERRNO(x) (errno = (x))
+#endif
+
+
+/*
+ * Portable error number symbolic names defined to Winsock error codes.
+ */
+
+#ifdef USE_WINSOCK
+#  undef EBADF           /* override definition in errno.h */
+#  define EBADF WSAEBADF
+#  undef EINTR           /* override definition in errno.h */
+#  define EINTR WSAEINTR
+#  undef EINVAL          /* override definition in errno.h */
+#  define EINVAL WSAEINVAL
+#  undef EWOULDBLOCK     /* override definition in errno.h */
+#  define EWOULDBLOCK WSAEWOULDBLOCK
+#  undef EINPROGRESS     /* override definition in errno.h */
+#  define EINPROGRESS WSAEINPROGRESS
+#  undef EALREADY        /* override definition in errno.h */
+#  define EALREADY WSAEALREADY
+#  undef ENOTSOCK        /* override definition in errno.h */
+#  define ENOTSOCK WSAENOTSOCK
+#  undef EDESTADDRREQ    /* override definition in errno.h */
+#  define EDESTADDRREQ WSAEDESTADDRREQ
+#  undef EMSGSIZE        /* override definition in errno.h */
+#  define EMSGSIZE WSAEMSGSIZE
+#  undef EPROTOTYPE      /* override definition in errno.h */
+#  define EPROTOTYPE WSAEPROTOTYPE
+#  undef ENOPROTOOPT     /* override definition in errno.h */
+#  define ENOPROTOOPT WSAENOPROTOOPT
+#  undef EPROTONOSUPPORT /* override definition in errno.h */
+#  define EPROTONOSUPPORT WSAEPROTONOSUPPORT
+#  define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
+#  undef EOPNOTSUPP /* override definition in errno.h */
+#  define EOPNOTSUPP   WSAEOPNOTSUPP
+#  define EPFNOSUPPORT WSAEPFNOSUPPORT
+#  undef EAFNOSUPPORT  /* override definition in errno.h */
+#  define EAFNOSUPPORT WSAEAFNOSUPPORT
+#  undef EADDRINUSE    /* override definition in errno.h */
+#  define EADDRINUSE WSAEADDRINUSE
+#  undef EADDRNOTAVAIL /* override definition in errno.h */
+#  define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#  undef ENETDOWN      /* override definition in errno.h */
+#  define ENETDOWN WSAENETDOWN
+#  undef ENETUNREACH   /* override definition in errno.h */
+#  define ENETUNREACH WSAENETUNREACH
+#  undef ENETRESET     /* override definition in errno.h */
+#  define ENETRESET WSAENETRESET
+#  undef ECONNABORTED  /* override definition in errno.h */
+#  define ECONNABORTED WSAECONNABORTED
+#  undef ECONNRESET    /* override definition in errno.h */
+#  define ECONNRESET WSAECONNRESET
+#  undef ENOBUFS       /* override definition in errno.h */
+#  define ENOBUFS WSAENOBUFS
+#  undef EISCONN       /* override definition in errno.h */
+#  define EISCONN WSAEISCONN
+#  undef ENOTCONN      /* override definition in errno.h */
+#  define ENOTCONN     WSAENOTCONN
+#  define ESHUTDOWN    WSAESHUTDOWN
+#  define ETOOMANYREFS WSAETOOMANYREFS
+#  undef ETIMEDOUT     /* override definition in errno.h */
+#  define ETIMEDOUT WSAETIMEDOUT
+#  undef ECONNREFUSED  /* override definition in errno.h */
+#  define ECONNREFUSED WSAECONNREFUSED
+#  undef ELOOP         /* override definition in errno.h */
+#  define ELOOP WSAELOOP
+#  ifndef ENAMETOOLONG /* possible previous definition in errno.h */
+#    define ENAMETOOLONG WSAENAMETOOLONG
+#  endif
+#  define EHOSTDOWN WSAEHOSTDOWN
+#  undef EHOSTUNREACH /* override definition in errno.h */
+#  define EHOSTUNREACH WSAEHOSTUNREACH
+#  ifndef ENOTEMPTY   /* possible previous definition in errno.h */
+#    define ENOTEMPTY WSAENOTEMPTY
+#  endif
+#  define EPROCLIM WSAEPROCLIM
+#  define EUSERS   WSAEUSERS
+#  define EDQUOT   WSAEDQUOT
+#  define ESTALE   WSAESTALE
+#  define EREMOTE  WSAEREMOTE
 #endif
 
-#endif /* HEADER_CARES_SETUP_H */
+#endif /* __ARES_SETUP_H */
diff --git a/contrib/libs/c-ares/src/lib/ares_strerror.c b/contrib/libs/c-ares/src/lib/ares_strerror.c
index ae94f9619efa..d9f641162026 100644
--- a/contrib/libs/c-ares/src/lib/ares_strerror.c
+++ b/contrib/libs/c-ares/src/lib/ares_strerror.c
@@ -25,9 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include <assert.h>
-#include "ares.h"
+#include "ares_private.h"
 
 const char *ares_strerror(int code)
 {
diff --git a/contrib/libs/c-ares/src/lib/ares_sysconfig.c b/contrib/libs/c-ares/src/lib/ares_sysconfig.c
index d56ee22e0888..2cd3df28235e 100644
--- a/contrib/libs/c-ares/src/lib/ares_sysconfig.c
+++ b/contrib/libs/c-ares/src/lib/ares_sysconfig.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
@@ -43,8 +43,6 @@
 #  include <arpa/inet.h>
 #endif
 
-#include "ares_nameser.h"
-
 #if defined(ANDROID) || defined(__ANDROID__)
 #  include <sys/system_properties.h>
 #  include "ares_android.h"
@@ -57,586 +55,9 @@
 #  include <resolv.h>
 #endif
 
-#if defined(USE_WINSOCK)
-#  if defined(HAVE_IPHLPAPI_H)
-#    include <iphlpapi.h>
-#  endif
-#  if defined(HAVE_NETIOAPI_H)
-#    include <netioapi.h>
-#  endif
-#endif
-
-#include "ares.h"
 #include "ares_inet_net_pton.h"
 #include "ares_platform.h"
-#include "ares_private.h"
-
-#ifdef WATT32
-#  undef WIN32 /* Redefined in MingW/MSVC headers */
-#endif
-
-
-#ifdef WIN32
-/*
- * get_REG_SZ()
- *
- * Given a 'hKey' handle to an open registry key and a 'leafKeyName' pointer
- * to the name of the registry leaf key to be queried, fetch it's string
- * value and return a pointer in *outptr to a newly allocated memory area
- * holding it as a null-terminated string.
- *
- * Returns 0 and nullifies *outptr upon inability to return a string value.
- *
- * Returns 1 and sets *outptr when returning a dynamically allocated string.
- *
- * Supported on Windows NT 3.5 and newer.
- */
-static ares_bool_t get_REG_SZ(HKEY hKey, const char *leafKeyName, char **outptr)
-{
-  DWORD size = 0;
-  int   res;
-
-  *outptr = NULL;
-
-  /* Find out size of string stored in registry */
-  res = RegQueryValueExA(hKey, leafKeyName, 0, NULL, NULL, &size);
-  if ((res != ERROR_SUCCESS && res != ERROR_MORE_DATA) || !size) {
-    return ARES_FALSE;
-  }
-
-  /* Allocate buffer of indicated size plus one given that string
-     might have been stored without null termination */
-  *outptr = ares_malloc(size + 1);
-  if (!*outptr) {
-    return ARES_FALSE;
-  }
-
-  /* Get the value for real */
-  res = RegQueryValueExA(hKey, leafKeyName, 0, NULL, (unsigned char *)*outptr,
-                         &size);
-  if ((res != ERROR_SUCCESS) || (size == 1)) {
-    ares_free(*outptr);
-    *outptr = NULL;
-    return ARES_FALSE;
-  }
-
-  /* Null terminate buffer always */
-  *(*outptr + size) = '\0';
-
-  return ARES_TRUE;
-}
-
-static void commanjoin(char **dst, const char * const src, const size_t len)
-{
-  char  *newbuf;
-  size_t newsize;
-
-  /* 1 for terminating 0 and 2 for , and terminating 0 */
-  newsize = len + (*dst ? (ares_strlen(*dst) + 2) : 1);
-  newbuf  = ares_realloc(*dst, newsize);
-  if (!newbuf) {
-    return;
-  }
-  if (*dst == NULL) {
-    *newbuf = '\0';
-  }
-  *dst = newbuf;
-  if (ares_strlen(*dst) != 0) {
-    strcat(*dst, ",");
-  }
-  strncat(*dst, src, len);
-}
-
-/*
- * commajoin()
- *
- * RTF code.
- */
-static void commajoin(char **dst, const char *src)
-{
-  commanjoin(dst, src, ares_strlen(src));
-}
 
-/* A structure to hold the string form of IPv4 and IPv6 addresses so we can
- * sort them by a metric.
- */
-typedef struct {
-  /* The metric we sort them by. */
-  ULONG  metric;
-
-  /* Original index of the item, used as a secondary sort parameter to make
-   * qsort() stable if the metrics are equal */
-  size_t orig_idx;
-
-  /* Room enough for the string form of any IPv4 or IPv6 address that
-   * ares_inet_ntop() will create.  Based on the existing c-ares practice.
-   */
-  char   text[INET6_ADDRSTRLEN + 8 + 64]; /* [%s]:NNNNN%iface */
-} Address;
-
-/* Sort Address values \a left and \a right by metric, returning the usual
- * indicators for qsort().
- */
-static int compareAddresses(const void *arg1, const void *arg2)
-{
-  const Address * const left  = arg1;
-  const Address * const right = arg2;
-  /* Lower metric the more preferred */
-  if (left->metric < right->metric) {
-    return -1;
-  }
-  if (left->metric > right->metric) {
-    return 1;
-  }
-  /* If metrics are equal, lower original index more preferred */
-  if (left->orig_idx < right->orig_idx) {
-    return -1;
-  }
-  if (left->orig_idx > right->orig_idx) {
-    return 1;
-  }
-  return 0;
-}
-
-/* There can be multiple routes to "the Internet".  And there can be different
- * DNS servers associated with each of the interfaces that offer those routes.
- * We have to assume that any DNS server can serve any request.  But, some DNS
- * servers may only respond if requested over their associated interface.  But
- * we also want to use "the preferred route to the Internet" whenever possible
- * (and not use DNS servers on a non-preferred route even by forcing request
- * to go out on the associated non-preferred interface).  i.e. We want to use
- * the DNS servers associated with the same interface that we would use to
- * make a general request to anything else.
- *
- * But, Windows won't sort the DNS servers by the metrics associated with the
- * routes and interfaces _even_ though it obviously sends IP packets based on
- * those same routes and metrics.  So, we must do it ourselves.
- *
- * So, we sort the DNS servers by the same metric values used to determine how
- * an outgoing IP packet will go, thus effectively using the DNS servers
- * associated with the interface that the DNS requests themselves will
- * travel.  This gives us optimal routing and avoids issues where DNS servers
- * won't respond to requests that don't arrive via some specific subnetwork
- * (and thus some specific interface).
- *
- * This function computes the metric we use to sort.  On the interface
- * identified by \a luid, it determines the best route to \a dest and combines
- * that route's metric with \a interfaceMetric to compute a metric for the
- * destination address on that interface.  This metric can be used as a weight
- * to sort the DNS server addresses associated with each interface (lower is
- * better).
- *
- * Note that by restricting the route search to the specific interface with
- * which the DNS servers are associated, this function asks the question "What
- * is the metric for sending IP packets to this DNS server?" which allows us
- * to sort the DNS servers correctly.
- */
-static ULONG getBestRouteMetric(IF_LUID * const luid, /* Can't be const :( */
-                                const SOCKADDR_INET * const dest,
-                                const ULONG                 interfaceMetric)
-{
-  /* On this interface, get the best route to that destination. */
-#  if defined(__WATCOMC__)
-  /* OpenWatcom's builtin Windows SDK does not have a definition for
-   * MIB_IPFORWARD_ROW2, and also does not allow the usage of SOCKADDR_INET
-   * as a variable. Let's work around this by returning the worst possible
-   * metric, but only when using the OpenWatcom compiler.
-   * It may be worth investigating using a different version of the Windows
-   * SDK with OpenWatcom in the future, though this may be fixed in OpenWatcom
-   * 2.0.
-   */
-  return (ULONG)-1;
-#  else
-  MIB_IPFORWARD_ROW2 row;
-  SOCKADDR_INET      ignored;
-  if (GetBestRoute2(/* The interface to use.  The index is ignored since we are
-                     * passing a LUID.
-                     */
-                    luid, 0,
-                    /* No specific source address. */
-                    NULL,
-                    /* Our destination address. */
-                    dest,
-                    /* No options. */
-                    0,
-                    /* The route row. */
-                    &row,
-                    /* The best source address, which we don't need. */
-                    &ignored) != NO_ERROR
-      /* If the metric is "unused" (-1) or too large for us to add the two
-       * metrics, use the worst possible, thus sorting this last.
-       */
-      || row.Metric == (ULONG)-1 ||
-      row.Metric > ((ULONG)-1) - interfaceMetric) {
-    /* Return the worst possible metric. */
-    return (ULONG)-1;
-  }
-
-  /* Return the metric value from that row, plus the interface metric.
-   *
-   * See
-   * http://msdn.microsoft.com/en-us/library/windows/desktop/aa814494(v=vs.85).aspx
-   * which describes the combination as a "sum".
-   */
-  return row.Metric + interfaceMetric;
-#  endif /* __WATCOMC__ */
-}
-
-/*
- * get_DNS_Windows()
- *
- * Locates DNS info using GetAdaptersAddresses() function from the Internet
- * Protocol Helper (IP Helper) API. When located, this returns a pointer
- * in *outptr to a newly allocated memory area holding a null-terminated
- * string with a space or comma separated list of DNS IP addresses.
- *
- * Returns 0 and nullifies *outptr upon inability to return DNSes string.
- *
- * Returns 1 and sets *outptr when returning a dynamically allocated string.
- *
- * Implementation supports Windows XP and newer.
- */
-#  define IPAA_INITIAL_BUF_SZ 15 * 1024
-#  define IPAA_MAX_TRIES      3
-
-static ares_bool_t get_DNS_Windows(char **outptr)
-{
-  IP_ADAPTER_DNS_SERVER_ADDRESS *ipaDNSAddr;
-  IP_ADAPTER_ADDRESSES          *ipaa;
-  IP_ADAPTER_ADDRESSES          *newipaa;
-  IP_ADAPTER_ADDRESSES          *ipaaEntry;
-  ULONG                          ReqBufsz  = IPAA_INITIAL_BUF_SZ;
-  ULONG                          Bufsz     = IPAA_INITIAL_BUF_SZ;
-  ULONG                          AddrFlags = 0;
-  int                            trying    = IPAA_MAX_TRIES;
-  ULONG                          res;
-
-  /* The capacity of addresses, in elements. */
-  size_t                         addressesSize;
-  /* The number of elements in addresses. */
-  size_t                         addressesIndex = 0;
-  /* The addresses we will sort. */
-  Address                       *addresses;
-
-  union {
-    struct sockaddr     *sa;
-    struct sockaddr_in  *sa4;
-    struct sockaddr_in6 *sa6;
-  } namesrvr;
-
-  *outptr = NULL;
-
-  ipaa = ares_malloc(Bufsz);
-  if (!ipaa) {
-    return ARES_FALSE;
-  }
-
-  /* Start with enough room for a few DNS server addresses and we'll grow it
-   * as we encounter more.
-   */
-  addressesSize = 4;
-  addresses     = (Address *)ares_malloc(sizeof(Address) * addressesSize);
-  if (addresses == NULL) {
-    /* We need room for at least some addresses to function. */
-    ares_free(ipaa);
-    return ARES_FALSE;
-  }
-
-  /* Usually this call succeeds with initial buffer size */
-  res = GetAdaptersAddresses(AF_UNSPEC, AddrFlags, NULL, ipaa, &ReqBufsz);
-  if ((res != ERROR_BUFFER_OVERFLOW) && (res != ERROR_SUCCESS)) {
-    goto done;
-  }
-
-  while ((res == ERROR_BUFFER_OVERFLOW) && (--trying)) {
-    if (Bufsz < ReqBufsz) {
-      newipaa = ares_realloc(ipaa, ReqBufsz);
-      if (!newipaa) {
-        goto done;
-      }
-      Bufsz = ReqBufsz;
-      ipaa  = newipaa;
-    }
-    res = GetAdaptersAddresses(AF_UNSPEC, AddrFlags, NULL, ipaa, &ReqBufsz);
-    if (res == ERROR_SUCCESS) {
-      break;
-    }
-  }
-  if (res != ERROR_SUCCESS) {
-    goto done;
-  }
-
-  for (ipaaEntry = ipaa; ipaaEntry; ipaaEntry = ipaaEntry->Next) {
-    if (ipaaEntry->OperStatus != IfOperStatusUp) {
-      continue;
-    }
-
-    /* For each interface, find any associated DNS servers as IPv4 or IPv6
-     * addresses.  For each found address, find the best route to that DNS
-     * server address _on_ _that_ _interface_ (at this moment in time) and
-     * compute the resulting total metric, just as Windows routing will do.
-     * Then, sort all the addresses found by the metric.
-     */
-    for (ipaDNSAddr = ipaaEntry->FirstDnsServerAddress; ipaDNSAddr;
-         ipaDNSAddr = ipaDNSAddr->Next) {
-      char ipaddr[INET6_ADDRSTRLEN] = "";
-      namesrvr.sa                   = ipaDNSAddr->Address.lpSockaddr;
-
-      if (namesrvr.sa->sa_family == AF_INET) {
-        if ((namesrvr.sa4->sin_addr.S_un.S_addr == INADDR_ANY) ||
-            (namesrvr.sa4->sin_addr.S_un.S_addr == INADDR_NONE)) {
-          continue;
-        }
-
-        /* Allocate room for another address, if necessary, else skip. */
-        if (addressesIndex == addressesSize) {
-          const size_t    newSize = addressesSize + 4;
-          Address * const newMem =
-            (Address *)ares_realloc(addresses, sizeof(Address) * newSize);
-          if (newMem == NULL) {
-            continue;
-          }
-          addresses     = newMem;
-          addressesSize = newSize;
-        }
-
-        addresses[addressesIndex].metric = getBestRouteMetric(
-          &ipaaEntry->Luid, (SOCKADDR_INET *)((void *)(namesrvr.sa)),
-          ipaaEntry->Ipv4Metric);
-
-        /* Record insertion index to make qsort stable */
-        addresses[addressesIndex].orig_idx = addressesIndex;
-
-        if (!ares_inet_ntop(AF_INET, &namesrvr.sa4->sin_addr, ipaddr,
-                            sizeof(ipaddr))) {
-          continue;
-        }
-        snprintf(addresses[addressesIndex].text,
-                 sizeof(addresses[addressesIndex].text), "[%s]:%u", ipaddr,
-                 ntohs(namesrvr.sa4->sin_port));
-        ++addressesIndex;
-      } else if (namesrvr.sa->sa_family == AF_INET6) {
-        unsigned int     ll_scope = 0;
-        struct ares_addr addr;
-
-        if (memcmp(&namesrvr.sa6->sin6_addr, &ares_in6addr_any,
-                   sizeof(namesrvr.sa6->sin6_addr)) == 0) {
-          continue;
-        }
-
-        /* Allocate room for another address, if necessary, else skip. */
-        if (addressesIndex == addressesSize) {
-          const size_t    newSize = addressesSize + 4;
-          Address * const newMem =
-            (Address *)ares_realloc(addresses, sizeof(Address) * newSize);
-          if (newMem == NULL) {
-            continue;
-          }
-          addresses     = newMem;
-          addressesSize = newSize;
-        }
-
-        /* See if its link-local */
-        memset(&addr, 0, sizeof(addr));
-        addr.family = AF_INET6;
-        memcpy(&addr.addr.addr6, &namesrvr.sa6->sin6_addr, 16);
-        if (ares__addr_is_linklocal(&addr)) {
-          ll_scope = ipaaEntry->Ipv6IfIndex;
-        }
-
-        addresses[addressesIndex].metric = getBestRouteMetric(
-          &ipaaEntry->Luid, (SOCKADDR_INET *)((void *)(namesrvr.sa)),
-          ipaaEntry->Ipv6Metric);
-
-        /* Record insertion index to make qsort stable */
-        addresses[addressesIndex].orig_idx = addressesIndex;
-
-        if (!ares_inet_ntop(AF_INET6, &namesrvr.sa6->sin6_addr, ipaddr,
-                            sizeof(ipaddr))) {
-          continue;
-        }
-
-        if (ll_scope) {
-          snprintf(addresses[addressesIndex].text,
-                   sizeof(addresses[addressesIndex].text), "[%s]:%u%%%u",
-                   ipaddr, ntohs(namesrvr.sa6->sin6_port), ll_scope);
-        } else {
-          snprintf(addresses[addressesIndex].text,
-                   sizeof(addresses[addressesIndex].text), "[%s]:%u", ipaddr,
-                   ntohs(namesrvr.sa6->sin6_port));
-        }
-        ++addressesIndex;
-      } else {
-        /* Skip non-IPv4/IPv6 addresses completely. */
-        continue;
-      }
-    }
-  }
-
-  /* Sort all of the textual addresses by their metric (and original index if
-   * metrics are equal). */
-  qsort(addresses, addressesIndex, sizeof(*addresses), compareAddresses);
-
-  /* Join them all into a single string, removing duplicates. */
-  {
-    size_t i;
-    for (i = 0; i < addressesIndex; ++i) {
-      size_t j;
-      /* Look for this address text appearing previously in the results. */
-      for (j = 0; j < i; ++j) {
-        if (strcmp(addresses[j].text, addresses[i].text) == 0) {
-          break;
-        }
-      }
-      /* Iff we didn't emit this address already, emit it now. */
-      if (j == i) {
-        /* Add that to outptr (if we can). */
-        commajoin(outptr, addresses[i].text);
-      }
-    }
-  }
-
-done:
-  ares_free(addresses);
-
-  if (ipaa) {
-    ares_free(ipaa);
-  }
-
-  if (!*outptr) {
-    return ARES_FALSE;
-  }
-
-  return ARES_TRUE;
-}
-
-/*
- * get_SuffixList_Windows()
- *
- * Reads the "DNS Suffix Search List" from registry and writes the list items
- * whitespace separated to outptr. If the Search List is empty, the
- * "Primary Dns Suffix" is written to outptr.
- *
- * Returns 0 and nullifies *outptr upon inability to return the suffix list.
- *
- * Returns 1 and sets *outptr when returning a dynamically allocated string.
- *
- * Implementation supports Windows Server 2003 and newer
- */
-static ares_bool_t get_SuffixList_Windows(char **outptr)
-{
-  HKEY  hKey;
-  HKEY  hKeyEnum;
-  char  keyName[256];
-  DWORD keyNameBuffSize;
-  DWORD keyIdx = 0;
-  char *p      = NULL;
-
-  *outptr = NULL;
-
-  if (ares__getplatform() != WIN_NT) {
-    return ARES_FALSE;
-  }
-
-  /* 1. Global DNS Suffix Search List */
-  if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hKey) ==
-      ERROR_SUCCESS) {
-    get_REG_SZ(hKey, SEARCHLIST_KEY, outptr);
-    if (get_REG_SZ(hKey, DOMAIN_KEY, &p)) {
-      commajoin(outptr, p);
-      ares_free(p);
-      p = NULL;
-    }
-    RegCloseKey(hKey);
-  }
-
-  if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NT_DNSCLIENT, 0, KEY_READ, &hKey) ==
-      ERROR_SUCCESS) {
-    if (get_REG_SZ(hKey, SEARCHLIST_KEY, &p)) {
-      commajoin(outptr, p);
-      ares_free(p);
-      p = NULL;
-    }
-    RegCloseKey(hKey);
-  }
-
-  /* 2. Connection Specific Search List composed of:
-   *  a. Primary DNS Suffix */
-  if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_DNSCLIENT, 0, KEY_READ, &hKey) ==
-      ERROR_SUCCESS) {
-    if (get_REG_SZ(hKey, PRIMARYDNSSUFFIX_KEY, &p)) {
-      commajoin(outptr, p);
-      ares_free(p);
-      p = NULL;
-    }
-    RegCloseKey(hKey);
-  }
-
-  /*  b. Interface SearchList, Domain, DhcpDomain */
-  if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY "\\" INTERFACES_KEY, 0,
-                    KEY_READ, &hKey) == ERROR_SUCCESS) {
-    for (;;) {
-      keyNameBuffSize = sizeof(keyName);
-      if (RegEnumKeyExA(hKey, keyIdx++, keyName, &keyNameBuffSize, 0, NULL,
-                        NULL, NULL) != ERROR_SUCCESS) {
-        break;
-      }
-      if (RegOpenKeyExA(hKey, keyName, 0, KEY_QUERY_VALUE, &hKeyEnum) !=
-          ERROR_SUCCESS) {
-        continue;
-      }
-      /* p can be comma separated (SearchList) */
-      if (get_REG_SZ(hKeyEnum, SEARCHLIST_KEY, &p)) {
-        commajoin(outptr, p);
-        ares_free(p);
-        p = NULL;
-      }
-      if (get_REG_SZ(hKeyEnum, DOMAIN_KEY, &p)) {
-        commajoin(outptr, p);
-        ares_free(p);
-        p = NULL;
-      }
-      if (get_REG_SZ(hKeyEnum, DHCPDOMAIN_KEY, &p)) {
-        commajoin(outptr, p);
-        ares_free(p);
-        p = NULL;
-      }
-      RegCloseKey(hKeyEnum);
-    }
-    RegCloseKey(hKey);
-  }
-
-  return *outptr != NULL ? ARES_TRUE : ARES_FALSE;
-}
-
-static ares_status_t ares__init_sysconfig_windows(ares_sysconfig_t *sysconfig)
-{
-  char         *line   = NULL;
-  ares_status_t status = ARES_SUCCESS;
-
-  if (get_DNS_Windows(&line)) {
-    status = ares__sconfig_append_fromstr(&sysconfig->sconfig, line, ARES_TRUE);
-    ares_free(line);
-    if (status != ARES_SUCCESS) {
-      goto done;
-    }
-  }
-
-  if (get_SuffixList_Windows(&line)) {
-    sysconfig->domains = ares__strsplit(line, ", ", &sysconfig->ndomains);
-    ares_free(line);
-    if (sysconfig->domains == NULL) {
-      status = ARES_EFILE;
-    }
-    if (status != ARES_SUCCESS) {
-      goto done;
-    }
-  }
-
-done:
-  return status;
-}
-#endif
 
 #if defined(__MVS__)
 static ares_status_t ares__init_sysconfig_mvs(ares_sysconfig_t *sysconfig)
@@ -1012,7 +433,7 @@ static ares_status_t ares_sysconfig_apply(ares_channel_t         *channel,
     char **temp =
       ares__strsplit_duplicate(sysconfig->domains, sysconfig->ndomains);
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     ares__strsplit_free(channel->domains, channel->ndomains);
@@ -1023,7 +444,7 @@ static ares_status_t ares_sysconfig_apply(ares_channel_t         *channel,
   if (sysconfig->lookups && !(channel->optmask & ARES_OPT_LOOKUPS)) {
     char *temp = ares_strdup(sysconfig->lookups);
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     ares_free(channel->lookups);
@@ -1034,7 +455,7 @@ static ares_status_t ares_sysconfig_apply(ares_channel_t         *channel,
     struct apattern *temp =
       ares_malloc(sizeof(*channel->sortlist) * sysconfig->nsortlist);
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     memcpy(temp, sysconfig->sortlist,
            sizeof(*channel->sortlist) * sysconfig->nsortlist);
@@ -1044,7 +465,7 @@ static ares_status_t ares_sysconfig_apply(ares_channel_t         *channel,
     channel->nsort    = sysconfig->nsortlist;
   }
 
-  if (sysconfig->ndots && !(channel->optmask & ARES_OPT_NDOTS)) {
+  if (!(channel->optmask & ARES_OPT_NDOTS)) {
     channel->ndots = sysconfig->ndots;
   }
 
@@ -1074,7 +495,7 @@ ares_status_t ares__init_by_sysconfig(ares_channel_t *channel)
 
   memset(&sysconfig, 0, sizeof(sysconfig));
 
-#ifdef _WIN32
+#if defined(USE_WINSOCK)
   status = ares__init_sysconfig_windows(&sysconfig);
 #elif defined(__MVS__)
   status = ares__init_sysconfig_mvs(&sysconfig);
diff --git a/contrib/libs/c-ares/src/lib/ares_sysconfig_files.c b/contrib/libs/c-ares/src/lib/ares_sysconfig_files.c
index 5771a581db5e..7b8bdbe41879 100644
--- a/contrib/libs/c-ares/src/lib/ares_sysconfig_files.c
+++ b/contrib/libs/c-ares/src/lib/ares_sysconfig_files.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
@@ -43,8 +43,6 @@
 #  include <arpa/inet.h>
 #endif
 
-#include "ares_nameser.h"
-
 #if defined(ANDROID) || defined(__ANDROID__)
 #  include <sys/system_properties.h>
 #  include "ares_android.h"
@@ -61,10 +59,8 @@
 #  include <iphlpapi.h>
 #endif
 
-#include "ares.h"
 #include "ares_inet_net_pton.h"
 #include "ares_platform.h"
-#include "ares_private.h"
 
 static unsigned char ip_natural_mask(const struct ares_addr *addr)
 {
@@ -103,7 +99,7 @@ static ares_bool_t sortlist_append(struct apattern **sortlist, size_t *nsort,
 
   newsort = ares_realloc(*sortlist, (*nsort + 1) * sizeof(*newsort));
   if (newsort == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   *sortlist = newsort;
@@ -223,7 +219,7 @@ ares_status_t ares__parse_sortlist(struct apattern **sortlist, size_t *nsort,
   ares__llist_node_t *node   = NULL;
 
   if (sortlist == NULL || nsort == NULL || str == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (*sortlist != NULL) {
@@ -262,8 +258,8 @@ ares_status_t ares__parse_sortlist(struct apattern **sortlist, size_t *nsort,
     }
 
     if (!sortlist_append(sortlist, nsort, &pat)) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -371,7 +367,7 @@ static ares_status_t config_lookup(ares_sysconfig_t *sysconfig,
     ares_free(sysconfig->lookups);
     sysconfig->lookups = ares_strdup(lookupstr);
     if (sysconfig->lookups == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -462,7 +458,7 @@ ares_status_t ares__sysconfig_set_options(ares_sysconfig_t *sysconfig,
     status = process_option(sysconfig, valbuf);
     /* Out of memory is the only fatal condition */
     if (status == ARES_ENOMEM) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -484,7 +480,7 @@ ares_status_t ares__init_by_environment(ares_sysconfig_t *sysconfig)
   if (localdomain) {
     char *temp = ares_strdup(localdomain);
     if (temp == NULL) {
-      return ARES_ENOMEM;
+      return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     status = config_search(sysconfig, temp, 1);
     ares_free(temp);
diff --git a/contrib/libs/c-ares/src/lib/ares_sysconfig_mac.c b/contrib/libs/c-ares/src/lib/ares_sysconfig_mac.c
index 302bd0d34491..38ac451ca5f4 100644
--- a/contrib/libs/c-ares/src/lib/ares_sysconfig_mac.c
+++ b/contrib/libs/c-ares/src/lib/ares_sysconfig_mac.c
@@ -45,16 +45,24 @@
  * private header extracted from:
  * https://opensource.apple.com/source/configd/configd-1109.140.1/dnsinfo/dnsinfo.h
  */
-#  include "ares_setup.h"
+
+/* The apple header uses anonymous unions which came with C11 */
+#  if defined(__clang__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wc11-extensions"
+#  endif
+
+#  include "ares_private.h"
 #  include <stdio.h>
 #  include <stdlib.h>
 #  include <string.h>
 #  include <dlfcn.h>
 #  include <arpa/inet.h>
 #  include "thirdparty/apple/dnsinfo.h"
-#  include <SystemConfiguration/SCNetworkConfiguration.h>
-#  include "ares.h"
-#  include "ares_private.h"
+#  include <AvailabilityMacros.h>
+#  if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 /* MacOS 10.8 */
+#    include <SystemConfiguration/SCNetworkConfiguration.h>
+#  endif
 
 typedef struct {
   void *handle;
@@ -79,6 +87,13 @@ static ares_status_t dnsinfo_init(dnsinfo_t **dnsinfo_out)
 {
   dnsinfo_t    *dnsinfo = NULL;
   ares_status_t status  = ARES_SUCCESS;
+  size_t        i;
+  const char   *searchlibs[] = {
+    "/usr/lib/libSystem.dylib",
+    "/System/Library/Frameworks/SystemConfiguration.framework/"
+      "SystemConfiguration",
+    NULL
+  };
 
   if (dnsinfo_out == NULL) {
     status = ARES_EFORMERR;
@@ -88,22 +103,34 @@ static ares_status_t dnsinfo_init(dnsinfo_t **dnsinfo_out)
   *dnsinfo_out = NULL;
 
   dnsinfo = ares_malloc_zero(sizeof(*dnsinfo));
-
   if (dnsinfo == NULL) {
     status = ARES_ENOMEM;
     goto done;
   }
 
-  dnsinfo->handle = dlopen("/usr/lib/libSystem.dylib", RTLD_LAZY | RTLD_NOLOAD);
-  if (dnsinfo->handle == NULL) {
-    status = ARES_ESERVFAIL;
-    goto done;
+  for (i = 0; searchlibs[i] != NULL; i++) {
+    dnsinfo->handle = dlopen(searchlibs[i], RTLD_LAZY /* | RTLD_NOLOAD */);
+    if (dnsinfo->handle == NULL) {
+      /* Fail, loop */
+      continue;
+    }
+
+    dnsinfo->dns_configuration_copy = (dns_config_t * (*)(void))
+      dlsym(dnsinfo->handle, "dns_configuration_copy");
+
+    dnsinfo->dns_configuration_free = (void (*)(dns_config_t *))dlsym(
+      dnsinfo->handle, "dns_configuration_free");
+
+    if (dnsinfo->dns_configuration_copy != NULL &&
+        dnsinfo->dns_configuration_free != NULL) {
+      break;
+    }
+
+    /* Fail, loop */
+    dlclose(dnsinfo->handle);
+    dnsinfo->handle = NULL;
   }
 
-  dnsinfo->dns_configuration_copy =
-    dlsym(dnsinfo->handle, "dns_configuration_copy");
-  dnsinfo->dns_configuration_free =
-    dlsym(dnsinfo->handle, "dns_configuration_free");
 
   if (dnsinfo->dns_configuration_copy == NULL ||
       dnsinfo->dns_configuration_free == NULL) {
@@ -141,13 +168,19 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
   unsigned short port   = 0;
   ares_status_t  status = ARES_SUCCESS;
 
+#  if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 /* MacOS 10.8 */
   /* XXX: resolver->domain is for domain-specific servers.  When we implement
    *      this support, we'll want to use this.  But for now, we're going to
-   *      skip any servers which set this since we can't properly route. */
+   *      skip any servers which set this since we can't properly route.
+   *      MacOS used to use this setting for a different purpose in the
+   *      past however, so on versions of MacOS < 10.8 just ignore this
+   *      completely. */
   if (resolver->domain != NULL) {
     return ARES_SUCCESS;
   }
+#  endif
 
+#  if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 /* MacOS 10.8 */
   /* Check to see if DNS server should be used, base this on if the server is
    * reachable or can be reachable automatically if we send traffic that
    * direction. */
@@ -156,6 +189,7 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
          kSCNetworkReachabilityFlagsConnectionOnTraffic))) {
     return ARES_SUCCESS;
   }
+#  endif
 
   /* NOTE: it doesn't look like resolver->flags is relevant */
 
@@ -219,7 +253,8 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
    *   - resolver->timeout appears unused, always 0, so we ignore this
    *   - resolver->service_identifier doesn't appear relevant to us
    *   - resolver->cid also isn't relevant
-   *   - resolver->if_index we don't need, if_name is used instead.
+   *   - resolver->if_name we won't use since it isn't available in MacOS 10.8
+   *     or earlier, use resolver->if_index instead to then lookup the name.
    */
 
   /* XXX: resolver->search_order appears like it might be relevant, we might
@@ -233,37 +268,24 @@ static ares_status_t read_resolver(const dns_resolver_t *resolver,
     struct ares_addr       addr;
     unsigned short         addrport;
     const struct sockaddr *sockaddr;
+    char                   if_name_str[256] = "";
+    const char            *if_name;
 
     /* UBSAN alignment workaround to fetch memory address */
     memcpy(&sockaddr, resolver->nameserver + i, sizeof(sockaddr));
 
-    if (sockaddr->sa_family == AF_INET) {
-      /* NOTE: memcpy sockaddr_in due to alignment issues found by UBSAN due to
-       *       dnsinfo packing */
-      struct sockaddr_in addr_in;
-      memcpy(&addr_in, sockaddr, sizeof(addr_in));
-
-      addr.family = AF_INET;
-      memcpy(&addr.addr.addr4, &(addr_in.sin_addr), sizeof(addr.addr.addr4));
-      addrport = ntohs(addr_in.sin_port);
-    } else if (sockaddr->sa_family == AF_INET6) {
-      /* NOTE: memcpy sockaddr_in6 due to alignment issues found by UBSAN due to
-       *       dnsinfo packing */
-      struct sockaddr_in6 addr_in6;
-      memcpy(&addr_in6, sockaddr, sizeof(addr_in6));
-
-      addr.family = AF_INET6;
-      memcpy(&addr.addr.addr6, &(addr_in6.sin6_addr), sizeof(addr.addr.addr6));
-      addrport = ntohs(addr_in6.sin6_port);
-    } else {
+    if (!ares_sockaddr_to_ares_addr(&addr, &addrport, sockaddr)) {
       continue;
     }
 
     if (addrport == 0) {
       addrport = port;
     }
-    status = ares__sconfig_append(&sysconfig->sconfig, &addr, addrport,
-                                  addrport, resolver->if_name);
+
+    if_name = ares__if_indextoname(resolver->if_index, if_name_str,
+                                   sizeof(if_name_str));
+    status  = ares__sconfig_append(&sysconfig->sconfig, &addr, addrport,
+                                   addrport, if_name);
     if (status != ARES_SUCCESS) {
       return status;
     }
@@ -280,7 +302,6 @@ static ares_status_t read_resolvers(dns_resolver_t **resolvers, int nresolvers,
 
   for (i = 0; status == ARES_SUCCESS && i < nresolvers; i++) {
     const dns_resolver_t *resolver_ptr;
-    dns_resolver_t        resolver;
 
     /* UBSAN doesn't like that this is unaligned, lets use memcpy to get the
      * address.  Equivalent to:
@@ -288,10 +309,7 @@ static ares_status_t read_resolvers(dns_resolver_t **resolvers, int nresolvers,
      */
     memcpy(&resolver_ptr, resolvers + i, sizeof(resolver_ptr));
 
-    /* UBSAN. If the pointer is misaligned, try to use memcpy to get the data
-     * into a new structure that is hopefully aligned properly */
-    memcpy(&resolver, resolver_ptr, sizeof(resolver));
-    status = read_resolver(&resolver, sysconfig);
+    status = read_resolver(resolver_ptr, sysconfig);
   }
 
   return status;
@@ -335,5 +353,13 @@ ares_status_t ares__init_sysconfig_macos(ares_sysconfig_t *sysconfig)
   return status;
 }
 
+#  if defined(__clang__)
+#    pragma GCC diagnostic pop
+#  endif
+
+#else
+
+/* Prevent compiler warnings due to empty translation unit */
+typedef int make_iso_compilers_happy;
 
 #endif
diff --git a/contrib/libs/c-ares/src/lib/ares_sysconfig_win.c b/contrib/libs/c-ares/src/lib/ares_sysconfig_win.c
new file mode 100644
index 000000000000..ce2a261cec82
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/ares_sysconfig_win.c
@@ -0,0 +1,619 @@
+/* MIT License
+ *
+ * Copyright (c) 1998 Massachusetts Institute of Technology
+ * Copyright (c) 2007 Daniel Stenberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "ares_private.h"
+
+#ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>
+#endif
+
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#  include <arpa/inet.h>
+#endif
+
+#if defined(USE_WINSOCK)
+#  if defined(HAVE_IPHLPAPI_H)
+#    include <iphlpapi.h>
+#  endif
+#  if defined(HAVE_NETIOAPI_H)
+#    include <netioapi.h>
+#  endif
+#endif
+
+#include "ares_inet_net_pton.h"
+#include "ares_platform.h"
+
+#if defined(USE_WINSOCK)
+/*
+ * get_REG_SZ()
+ *
+ * Given a 'hKey' handle to an open registry key and a 'leafKeyName' pointer
+ * to the name of the registry leaf key to be queried, fetch it's string
+ * value and return a pointer in *outptr to a newly allocated memory area
+ * holding it as a null-terminated string.
+ *
+ * Returns 0 and nullifies *outptr upon inability to return a string value.
+ *
+ * Returns 1 and sets *outptr when returning a dynamically allocated string.
+ *
+ * Supported on Windows NT 3.5 and newer.
+ */
+static ares_bool_t get_REG_SZ(HKEY hKey, const char *leafKeyName, char **outptr)
+{
+  DWORD size = 0;
+  int   res;
+
+  *outptr = NULL;
+
+  /* Find out size of string stored in registry */
+  res = RegQueryValueExA(hKey, leafKeyName, 0, NULL, NULL, &size);
+  if ((res != ERROR_SUCCESS && res != ERROR_MORE_DATA) || !size) {
+    return ARES_FALSE;
+  }
+
+  /* Allocate buffer of indicated size plus one given that string
+     might have been stored without null termination */
+  *outptr = ares_malloc(size + 1);
+  if (!*outptr) {
+    return ARES_FALSE;
+  }
+
+  /* Get the value for real */
+  res = RegQueryValueExA(hKey, leafKeyName, 0, NULL, (unsigned char *)*outptr,
+                         &size);
+  if ((res != ERROR_SUCCESS) || (size == 1)) {
+    ares_free(*outptr);
+    *outptr = NULL;
+    return ARES_FALSE;
+  }
+
+  /* Null terminate buffer always */
+  *(*outptr + size) = '\0';
+
+  return ARES_TRUE;
+}
+
+static void commanjoin(char **dst, const char * const src, const size_t len)
+{
+  char  *newbuf;
+  size_t newsize;
+
+  /* 1 for terminating 0 and 2 for , and terminating 0 */
+  newsize = len + (*dst ? (ares_strlen(*dst) + 2) : 1);
+  newbuf  = ares_realloc(*dst, newsize);
+  if (!newbuf) {
+    return;
+  }
+  if (*dst == NULL) {
+    *newbuf = '\0';
+  }
+  *dst = newbuf;
+  if (ares_strlen(*dst) != 0) {
+    strcat(*dst, ",");
+  }
+  strncat(*dst, src, len);
+}
+
+/*
+ * commajoin()
+ *
+ * RTF code.
+ */
+static void commajoin(char **dst, const char *src)
+{
+  commanjoin(dst, src, ares_strlen(src));
+}
+
+/* A structure to hold the string form of IPv4 and IPv6 addresses so we can
+ * sort them by a metric.
+ */
+typedef struct {
+  /* The metric we sort them by. */
+  ULONG  metric;
+
+  /* Original index of the item, used as a secondary sort parameter to make
+   * qsort() stable if the metrics are equal */
+  size_t orig_idx;
+
+  /* Room enough for the string form of any IPv4 or IPv6 address that
+   * ares_inet_ntop() will create.  Based on the existing c-ares practice.
+   */
+  char   text[INET6_ADDRSTRLEN + 8 + 64]; /* [%s]:NNNNN%iface */
+} Address;
+
+/* Sort Address values \a left and \a right by metric, returning the usual
+ * indicators for qsort().
+ */
+static int compareAddresses(const void *arg1, const void *arg2)
+{
+  const Address * const left  = arg1;
+  const Address * const right = arg2;
+  /* Lower metric the more preferred */
+  if (left->metric < right->metric) {
+    return -1;
+  }
+  if (left->metric > right->metric) {
+    return 1;
+  }
+  /* If metrics are equal, lower original index more preferred */
+  if (left->orig_idx < right->orig_idx) {
+    return -1;
+  }
+  if (left->orig_idx > right->orig_idx) {
+    return 1;
+  }
+  return 0;
+}
+
+/* There can be multiple routes to "the Internet".  And there can be different
+ * DNS servers associated with each of the interfaces that offer those routes.
+ * We have to assume that any DNS server can serve any request.  But, some DNS
+ * servers may only respond if requested over their associated interface.  But
+ * we also want to use "the preferred route to the Internet" whenever possible
+ * (and not use DNS servers on a non-preferred route even by forcing request
+ * to go out on the associated non-preferred interface).  i.e. We want to use
+ * the DNS servers associated with the same interface that we would use to
+ * make a general request to anything else.
+ *
+ * But, Windows won't sort the DNS servers by the metrics associated with the
+ * routes and interfaces _even_ though it obviously sends IP packets based on
+ * those same routes and metrics.  So, we must do it ourselves.
+ *
+ * So, we sort the DNS servers by the same metric values used to determine how
+ * an outgoing IP packet will go, thus effectively using the DNS servers
+ * associated with the interface that the DNS requests themselves will
+ * travel.  This gives us optimal routing and avoids issues where DNS servers
+ * won't respond to requests that don't arrive via some specific subnetwork
+ * (and thus some specific interface).
+ *
+ * This function computes the metric we use to sort.  On the interface
+ * identified by \a luid, it determines the best route to \a dest and combines
+ * that route's metric with \a interfaceMetric to compute a metric for the
+ * destination address on that interface.  This metric can be used as a weight
+ * to sort the DNS server addresses associated with each interface (lower is
+ * better).
+ *
+ * Note that by restricting the route search to the specific interface with
+ * which the DNS servers are associated, this function asks the question "What
+ * is the metric for sending IP packets to this DNS server?" which allows us
+ * to sort the DNS servers correctly.
+ */
+static ULONG getBestRouteMetric(IF_LUID * const luid, /* Can't be const :( */
+                                const SOCKADDR_INET * const dest,
+                                const ULONG                 interfaceMetric)
+{
+  /* On this interface, get the best route to that destination. */
+#  if defined(__WATCOMC__)
+  /* OpenWatcom's builtin Windows SDK does not have a definition for
+   * MIB_IPFORWARD_ROW2, and also does not allow the usage of SOCKADDR_INET
+   * as a variable. Let's work around this by returning the worst possible
+   * metric, but only when using the OpenWatcom compiler.
+   * It may be worth investigating using a different version of the Windows
+   * SDK with OpenWatcom in the future, though this may be fixed in OpenWatcom
+   * 2.0.
+   */
+  return (ULONG)-1;
+#  else
+  MIB_IPFORWARD_ROW2 row;
+  SOCKADDR_INET      ignored;
+  if (GetBestRoute2(/* The interface to use.  The index is ignored since we are
+                     * passing a LUID.
+                     */
+                    luid, 0,
+                    /* No specific source address. */
+                    NULL,
+                    /* Our destination address. */
+                    dest,
+                    /* No options. */
+                    0,
+                    /* The route row. */
+                    &row,
+                    /* The best source address, which we don't need. */
+                    &ignored) != NO_ERROR
+      /* If the metric is "unused" (-1) or too large for us to add the two
+       * metrics, use the worst possible, thus sorting this last.
+       */
+      || row.Metric == (ULONG)-1 ||
+      row.Metric > ((ULONG)-1) - interfaceMetric) {
+    /* Return the worst possible metric. */
+    return (ULONG)-1;
+  }
+
+  /* Return the metric value from that row, plus the interface metric.
+   *
+   * See
+   * http://msdn.microsoft.com/en-us/library/windows/desktop/aa814494(v=vs.85).aspx
+   * which describes the combination as a "sum".
+   */
+  return row.Metric + interfaceMetric;
+#  endif /* __WATCOMC__ */
+}
+
+/*
+ * get_DNS_Windows()
+ *
+ * Locates DNS info using GetAdaptersAddresses() function from the Internet
+ * Protocol Helper (IP Helper) API. When located, this returns a pointer
+ * in *outptr to a newly allocated memory area holding a null-terminated
+ * string with a space or comma separated list of DNS IP addresses.
+ *
+ * Returns 0 and nullifies *outptr upon inability to return DNSes string.
+ *
+ * Returns 1 and sets *outptr when returning a dynamically allocated string.
+ *
+ * Implementation supports Windows XP and newer.
+ */
+#  define IPAA_INITIAL_BUF_SZ 15 * 1024
+#  define IPAA_MAX_TRIES      3
+
+static ares_bool_t get_DNS_Windows(char **outptr)
+{
+  IP_ADAPTER_DNS_SERVER_ADDRESS *ipaDNSAddr;
+  IP_ADAPTER_ADDRESSES          *ipaa;
+  IP_ADAPTER_ADDRESSES          *newipaa;
+  IP_ADAPTER_ADDRESSES          *ipaaEntry;
+  ULONG                          ReqBufsz  = IPAA_INITIAL_BUF_SZ;
+  ULONG                          Bufsz     = IPAA_INITIAL_BUF_SZ;
+  ULONG                          AddrFlags = 0;
+  int                            trying    = IPAA_MAX_TRIES;
+  ULONG                          res;
+
+  /* The capacity of addresses, in elements. */
+  size_t                         addressesSize;
+  /* The number of elements in addresses. */
+  size_t                         addressesIndex = 0;
+  /* The addresses we will sort. */
+  Address                       *addresses;
+
+  union {
+    struct sockaddr     *sa;
+    struct sockaddr_in  *sa4;
+    struct sockaddr_in6 *sa6;
+  } namesrvr;
+
+  *outptr = NULL;
+
+  ipaa = ares_malloc(Bufsz);
+  if (!ipaa) {
+    return ARES_FALSE;
+  }
+
+  /* Start with enough room for a few DNS server addresses and we'll grow it
+   * as we encounter more.
+   */
+  addressesSize = 4;
+  addresses     = (Address *)ares_malloc(sizeof(Address) * addressesSize);
+  if (addresses == NULL) {
+    /* We need room for at least some addresses to function. */
+    ares_free(ipaa);
+    return ARES_FALSE;
+  }
+
+  /* Usually this call succeeds with initial buffer size */
+  res = GetAdaptersAddresses(AF_UNSPEC, AddrFlags, NULL, ipaa, &ReqBufsz);
+  if ((res != ERROR_BUFFER_OVERFLOW) && (res != ERROR_SUCCESS)) {
+    goto done;
+  }
+
+  while ((res == ERROR_BUFFER_OVERFLOW) && (--trying)) {
+    if (Bufsz < ReqBufsz) {
+      newipaa = ares_realloc(ipaa, ReqBufsz);
+      if (!newipaa) {
+        goto done;
+      }
+      Bufsz = ReqBufsz;
+      ipaa  = newipaa;
+    }
+    res = GetAdaptersAddresses(AF_UNSPEC, AddrFlags, NULL, ipaa, &ReqBufsz);
+    if (res == ERROR_SUCCESS) {
+      break;
+    }
+  }
+  if (res != ERROR_SUCCESS) {
+    goto done;
+  }
+
+  for (ipaaEntry = ipaa; ipaaEntry; ipaaEntry = ipaaEntry->Next) {
+    if (ipaaEntry->OperStatus != IfOperStatusUp) {
+      continue;
+    }
+
+    /* For each interface, find any associated DNS servers as IPv4 or IPv6
+     * addresses.  For each found address, find the best route to that DNS
+     * server address _on_ _that_ _interface_ (at this moment in time) and
+     * compute the resulting total metric, just as Windows routing will do.
+     * Then, sort all the addresses found by the metric.
+     */
+    for (ipaDNSAddr = ipaaEntry->FirstDnsServerAddress; ipaDNSAddr != NULL;
+         ipaDNSAddr = ipaDNSAddr->Next) {
+      char ipaddr[INET6_ADDRSTRLEN] = "";
+
+      namesrvr.sa = ipaDNSAddr->Address.lpSockaddr;
+
+      if (namesrvr.sa->sa_family == AF_INET) {
+        if ((namesrvr.sa4->sin_addr.S_un.S_addr == INADDR_ANY) ||
+            (namesrvr.sa4->sin_addr.S_un.S_addr == INADDR_NONE)) {
+          continue;
+        }
+
+        /* Allocate room for another address, if necessary, else skip. */
+        if (addressesIndex == addressesSize) {
+          const size_t    newSize = addressesSize + 4;
+          Address * const newMem =
+            (Address *)ares_realloc(addresses, sizeof(Address) * newSize);
+          if (newMem == NULL) {
+            continue;
+          }
+          addresses     = newMem;
+          addressesSize = newSize;
+        }
+
+        addresses[addressesIndex].metric = getBestRouteMetric(
+          &ipaaEntry->Luid, (SOCKADDR_INET *)((void *)(namesrvr.sa)),
+          ipaaEntry->Ipv4Metric);
+
+        /* Record insertion index to make qsort stable */
+        addresses[addressesIndex].orig_idx = addressesIndex;
+
+        if (!ares_inet_ntop(AF_INET, &namesrvr.sa4->sin_addr, ipaddr,
+                            sizeof(ipaddr))) {
+          continue;
+        }
+        snprintf(addresses[addressesIndex].text,
+                 sizeof(addresses[addressesIndex].text), "[%s]:%u", ipaddr,
+                 ntohs(namesrvr.sa4->sin_port));
+        ++addressesIndex;
+      } else if (namesrvr.sa->sa_family == AF_INET6) {
+        unsigned int     ll_scope = 0;
+        struct ares_addr addr;
+
+        if (memcmp(&namesrvr.sa6->sin6_addr, &ares_in6addr_any,
+                   sizeof(namesrvr.sa6->sin6_addr)) == 0) {
+          continue;
+        }
+
+        /* Allocate room for another address, if necessary, else skip. */
+        if (addressesIndex == addressesSize) {
+          const size_t    newSize = addressesSize + 4;
+          Address * const newMem =
+            (Address *)ares_realloc(addresses, sizeof(Address) * newSize);
+          if (newMem == NULL) {
+            continue;
+          }
+          addresses     = newMem;
+          addressesSize = newSize;
+        }
+
+        /* See if its link-local */
+        memset(&addr, 0, sizeof(addr));
+        addr.family = AF_INET6;
+        memcpy(&addr.addr.addr6, &namesrvr.sa6->sin6_addr, 16);
+        if (ares__addr_is_linklocal(&addr)) {
+          ll_scope = ipaaEntry->Ipv6IfIndex;
+        }
+
+        addresses[addressesIndex].metric = getBestRouteMetric(
+          &ipaaEntry->Luid, (SOCKADDR_INET *)((void *)(namesrvr.sa)),
+          ipaaEntry->Ipv6Metric);
+
+        /* Record insertion index to make qsort stable */
+        addresses[addressesIndex].orig_idx = addressesIndex;
+
+        if (!ares_inet_ntop(AF_INET6, &namesrvr.sa6->sin6_addr, ipaddr,
+                            sizeof(ipaddr))) {
+          continue;
+        }
+
+        if (ll_scope) {
+          snprintf(addresses[addressesIndex].text,
+                   sizeof(addresses[addressesIndex].text), "[%s]:%u%%%u",
+                   ipaddr, ntohs(namesrvr.sa6->sin6_port), ll_scope);
+        } else {
+          snprintf(addresses[addressesIndex].text,
+                   sizeof(addresses[addressesIndex].text), "[%s]:%u", ipaddr,
+                   ntohs(namesrvr.sa6->sin6_port));
+        }
+        ++addressesIndex;
+      } else {
+        /* Skip non-IPv4/IPv6 addresses completely. */
+        continue;
+      }
+    }
+  }
+
+  /* Sort all of the textual addresses by their metric (and original index if
+   * metrics are equal). */
+  qsort(addresses, addressesIndex, sizeof(*addresses), compareAddresses);
+
+  /* Join them all into a single string, removing duplicates. */
+  {
+    size_t i;
+    for (i = 0; i < addressesIndex; ++i) {
+      size_t j;
+      /* Look for this address text appearing previously in the results. */
+      for (j = 0; j < i; ++j) {
+        if (strcmp(addresses[j].text, addresses[i].text) == 0) {
+          break;
+        }
+      }
+      /* Iff we didn't emit this address already, emit it now. */
+      if (j == i) {
+        /* Add that to outptr (if we can). */
+        commajoin(outptr, addresses[i].text);
+      }
+    }
+  }
+
+done:
+  ares_free(addresses);
+
+  if (ipaa) {
+    ares_free(ipaa);
+  }
+
+  if (!*outptr) {
+    return ARES_FALSE;
+  }
+
+  return ARES_TRUE;
+}
+
+/*
+ * get_SuffixList_Windows()
+ *
+ * Reads the "DNS Suffix Search List" from registry and writes the list items
+ * whitespace separated to outptr. If the Search List is empty, the
+ * "Primary Dns Suffix" is written to outptr.
+ *
+ * Returns 0 and nullifies *outptr upon inability to return the suffix list.
+ *
+ * Returns 1 and sets *outptr when returning a dynamically allocated string.
+ *
+ * Implementation supports Windows Server 2003 and newer
+ */
+static ares_bool_t get_SuffixList_Windows(char **outptr)
+{
+  HKEY  hKey;
+  HKEY  hKeyEnum;
+  char  keyName[256];
+  DWORD keyNameBuffSize;
+  DWORD keyIdx = 0;
+  char *p      = NULL;
+
+  *outptr = NULL;
+
+  if (ares__getplatform() != WIN_NT) {
+    return ARES_FALSE;
+  }
+
+  /* 1. Global DNS Suffix Search List */
+  if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, &hKey) ==
+      ERROR_SUCCESS) {
+    get_REG_SZ(hKey, SEARCHLIST_KEY, outptr);
+    if (get_REG_SZ(hKey, DOMAIN_KEY, &p)) {
+      commajoin(outptr, p);
+      ares_free(p);
+      p = NULL;
+    }
+    RegCloseKey(hKey);
+  }
+
+  if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NT_DNSCLIENT, 0, KEY_READ, &hKey) ==
+      ERROR_SUCCESS) {
+    if (get_REG_SZ(hKey, SEARCHLIST_KEY, &p)) {
+      commajoin(outptr, p);
+      ares_free(p);
+      p = NULL;
+    }
+    RegCloseKey(hKey);
+  }
+
+  /* 2. Connection Specific Search List composed of:
+   *  a. Primary DNS Suffix */
+  if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_DNSCLIENT, 0, KEY_READ, &hKey) ==
+      ERROR_SUCCESS) {
+    if (get_REG_SZ(hKey, PRIMARYDNSSUFFIX_KEY, &p)) {
+      commajoin(outptr, p);
+      ares_free(p);
+      p = NULL;
+    }
+    RegCloseKey(hKey);
+  }
+
+  /*  b. Interface SearchList, Domain, DhcpDomain */
+  if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY "\\" INTERFACES_KEY, 0,
+                    KEY_READ, &hKey) == ERROR_SUCCESS) {
+    for (;;) {
+      keyNameBuffSize = sizeof(keyName);
+      if (RegEnumKeyExA(hKey, keyIdx++, keyName, &keyNameBuffSize, 0, NULL,
+                        NULL, NULL) != ERROR_SUCCESS) {
+        break;
+      }
+      if (RegOpenKeyExA(hKey, keyName, 0, KEY_QUERY_VALUE, &hKeyEnum) !=
+          ERROR_SUCCESS) {
+        continue;
+      }
+      /* p can be comma separated (SearchList) */
+      if (get_REG_SZ(hKeyEnum, SEARCHLIST_KEY, &p)) {
+        commajoin(outptr, p);
+        ares_free(p);
+        p = NULL;
+      }
+      if (get_REG_SZ(hKeyEnum, DOMAIN_KEY, &p)) {
+        commajoin(outptr, p);
+        ares_free(p);
+        p = NULL;
+      }
+      if (get_REG_SZ(hKeyEnum, DHCPDOMAIN_KEY, &p)) {
+        commajoin(outptr, p);
+        ares_free(p);
+        p = NULL;
+      }
+      RegCloseKey(hKeyEnum);
+    }
+    RegCloseKey(hKey);
+  }
+
+  return *outptr != NULL ? ARES_TRUE : ARES_FALSE;
+}
+
+ares_status_t ares__init_sysconfig_windows(ares_sysconfig_t *sysconfig)
+{
+  char         *line   = NULL;
+  ares_status_t status = ARES_SUCCESS;
+
+  if (get_DNS_Windows(&line)) {
+    status = ares__sconfig_append_fromstr(&sysconfig->sconfig, line, ARES_TRUE);
+    ares_free(line);
+    if (status != ARES_SUCCESS) {
+      goto done;
+    }
+  }
+
+  if (get_SuffixList_Windows(&line)) {
+    sysconfig->domains = ares__strsplit(line, ", ", &sysconfig->ndomains);
+    ares_free(line);
+    if (sysconfig->domains == NULL) {
+      status = ARES_EFILE;
+    }
+    if (status != ARES_SUCCESS) {
+      goto done;
+    }
+  }
+
+done:
+  return status;
+}
+#endif
diff --git a/contrib/libs/c-ares/src/lib/ares_timeout.c b/contrib/libs/c-ares/src/lib/ares_timeout.c
index 3acc66a87fe2..5ed8b553a3c5 100644
--- a/contrib/libs/c-ares/src/lib/ares_timeout.c
+++ b/contrib/libs/c-ares/src/lib/ares_timeout.c
@@ -25,14 +25,12 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
 
 void ares__timeval_remaining(ares_timeval_t       *remaining,
                              const ares_timeval_t *now,
@@ -55,30 +53,42 @@ void ares__timeval_remaining(ares_timeval_t       *remaining,
   }
 }
 
-static struct timeval ares_timeval_to_struct_timeval(const ares_timeval_t *atv)
+void ares__timeval_diff(ares_timeval_t *tvdiff, const ares_timeval_t *tvstart,
+                        const ares_timeval_t *tvstop)
 {
-  struct timeval tv;
-
-  tv.tv_sec  = (time_t)atv->sec;
-  tv.tv_usec = (int)atv->usec;
-
-  return tv;
+  tvdiff->sec = tvstop->sec - tvstart->sec;
+  if (tvstop->usec > tvstart->usec) {
+    tvdiff->usec = tvstop->usec - tvstart->usec;
+  } else {
+    tvdiff->sec  -= 1;
+    tvdiff->usec  = tvstop->usec + 1000000 - tvstart->usec;
+  }
 }
 
-static ares_timeval_t struct_timeval_to_ares_timeval(const struct timeval *tv)
+static void ares_timeval_to_struct_timeval(struct timeval       *tv,
+                                           const ares_timeval_t *atv)
 {
-  ares_timeval_t atv;
+#ifdef USE_WINSOCK
+  tv->tv_sec = (long)atv->sec;
+#else
+  tv->tv_sec = (time_t)atv->sec;
+#endif
 
-  atv.sec  = (ares_int64_t)tv->tv_sec;
-  atv.usec = (unsigned int)tv->tv_usec;
+  tv->tv_usec = (int)atv->usec;
+}
 
-  return atv;
+static void struct_timeval_to_ares_timeval(ares_timeval_t       *atv,
+                                           const struct timeval *tv)
+{
+  atv->sec  = (ares_int64_t)tv->tv_sec;
+  atv->usec = (unsigned int)tv->tv_usec;
 }
 
-struct timeval *ares_timeout(const ares_channel_t *channel,
-                             struct timeval *maxtv, struct timeval *tvbuf)
+static struct timeval *ares_timeout_int(const ares_channel_t *channel,
+                                        struct timeval       *maxtv,
+                                        struct timeval       *tvbuf)
 {
-  const struct query *query;
+  const ares_query_t *query;
   ares__slist_node_t *node;
   ares_timeval_t      now;
   ares_timeval_t      atvbuf;
@@ -94,18 +104,18 @@ struct timeval *ares_timeout(const ares_channel_t *channel,
 
   query = ares__slist_node_val(node);
 
-  now = ares__tvnow();
+  ares__tvnow(&now);
 
   ares__timeval_remaining(&atvbuf, &now, &query->timeout);
 
-  *tvbuf = ares_timeval_to_struct_timeval(&atvbuf);
+  ares_timeval_to_struct_timeval(tvbuf, &atvbuf);
 
   if (maxtv == NULL) {
     return tvbuf;
   }
 
   /* Return the minimum time between maxtv and tvbuf */
-  amaxtv = struct_timeval_to_ares_timeval(maxtv);
+  struct_timeval_to_ares_timeval(&amaxtv, maxtv);
 
   if (atvbuf.sec > amaxtv.sec) {
     return maxtv;
@@ -121,3 +131,21 @@ struct timeval *ares_timeout(const ares_channel_t *channel,
 
   return tvbuf;
 }
+
+struct timeval *ares_timeout(const ares_channel_t *channel,
+                             struct timeval *maxtv, struct timeval *tvbuf)
+{
+  struct timeval *rv;
+
+  if (channel == NULL || tvbuf == NULL) {
+    return NULL;
+  }
+
+  ares__channel_lock(channel);
+
+  rv = ares_timeout_int(channel, maxtv, tvbuf);
+
+  ares__channel_unlock(channel);
+
+  return rv;
+}
diff --git a/contrib/libs/c-ares/src/lib/ares_update_servers.c b/contrib/libs/c-ares/src/lib/ares_update_servers.c
index 8075b1d1c0d3..639f79d81591 100644
--- a/contrib/libs/c-ares/src/lib/ares_update_servers.c
+++ b/contrib/libs/c-ares/src/lib/ares_update_servers.c
@@ -25,7 +25,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_ARPA_INET_H
 #  include <arpa/inet.h>
@@ -49,10 +49,8 @@
 #  endif
 #endif
 
-#include "ares.h"
 #include "ares_data.h"
 #include "ares_inet_net_pton.h"
-#include "ares_private.h"
 
 typedef struct {
   struct ares_addr addr;
@@ -67,11 +65,11 @@ static ares_bool_t ares__addr_match(const struct ares_addr *addr1,
                                     const struct ares_addr *addr2)
 {
   if (addr1 == NULL && addr2 == NULL) {
-    return ARES_TRUE;
+    return ARES_TRUE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (addr1 == NULL || addr2 == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (addr1->family != addr2->family) {
@@ -102,7 +100,7 @@ ares_bool_t ares__subnet_match(const struct ares_addr *addr,
   size_t               i;
 
   if (addr == NULL || subnet == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (addr->family != subnet->family) {
@@ -115,7 +113,7 @@ ares_bool_t ares__subnet_match(const struct ares_addr *addr,
     len        = 4;
 
     if (netmask > 32) {
-      return ARES_FALSE;
+      return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   } else if (addr->family == AF_INET6) {
     addr_ptr   = (const unsigned char *)&addr->addr.addr6;
@@ -123,10 +121,10 @@ ares_bool_t ares__subnet_match(const struct ares_addr *addr,
     len        = 16;
 
     if (netmask > 128) {
-      return ARES_FALSE;
+      return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   } else {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   for (i = 0; i < len && netmask > 0; i++) {
@@ -380,7 +378,7 @@ ares_status_t ares__sconfig_append(ares__llist_t         **sconfig,
   ares_status_t   status;
 
   if (sconfig == NULL || addr == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Silently skip blacklisted IPv6 servers. */
@@ -390,14 +388,14 @@ ares_status_t ares__sconfig_append(ares__llist_t         **sconfig,
 
   s = ares_malloc_zero(sizeof(*s));
   if (s == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (*sconfig == NULL) {
     *sconfig = ares__llist_create(ares_free);
     if (*sconfig == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -422,8 +420,8 @@ ares_status_t ares__sconfig_append(ares__llist_t         **sconfig,
   }
 
   if (ares__llist_insert_last(*sconfig, s) == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -491,7 +489,7 @@ ares_status_t ares__sconfig_append_fromstr(ares__llist_t **sconfig,
     status = ares__sconfig_append(sconfig, &s.addr, s.udp_port, s.tcp_port,
                                   s.ll_iface);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -527,7 +525,7 @@ static ares__slist_node_t *ares__server_find(ares_channel_t       *channel,
 
   for (node = ares__slist_node_first(channel->servers); node != NULL;
        node = ares__slist_node_next(node)) {
-    const struct server_state *server = ares__slist_node_val(node);
+    const ares_server_t *server = ares__slist_node_val(node);
 
     if (!ares__addr_match(&server->addr, &s->addr)) {
       continue;
@@ -581,11 +579,11 @@ static ares_status_t ares__server_create(ares_channel_t       *channel,
                                          const ares_sconfig_t *sconfig,
                                          size_t                idx)
 {
-  ares_status_t        status;
-  struct server_state *server = ares_malloc_zero(sizeof(*server));
+  ares_status_t  status;
+  ares_server_t *server = ares_malloc_zero(sizeof(*server));
 
   if (server == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   server->idx         = idx;
@@ -612,39 +610,39 @@ static ares_status_t ares__server_create(ares_channel_t       *channel,
 
   server->tcp_parser = ares__buf_create();
   if (server->tcp_parser == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   server->tcp_send = ares__buf_create();
   if (server->tcp_send == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   server->connections = ares__llist_create(NULL);
   if (server->connections == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (ares__slist_insert(channel->servers, server) == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ARES_SUCCESS;
 
 done:
   if (status != ARES_SUCCESS) {
-    ares__destroy_server(server);
+    ares__destroy_server(server); /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return status;
 }
 
-static ares_bool_t ares__server_in_newconfig(const struct server_state *server,
-                                             ares__llist_t             *srvlist)
+static ares_bool_t ares__server_in_newconfig(const ares_server_t *server,
+                                             ares__llist_t       *srvlist)
 {
   ares__llist_node_t   *node;
   const ares_channel_t *channel = server->channel;
@@ -678,8 +676,8 @@ static ares_bool_t ares__servers_remove_stale(ares_channel_t *channel,
   ares__slist_node_t *snode         = ares__slist_node_first(channel->servers);
 
   while (snode != NULL) {
-    ares__slist_node_t        *snext  = ares__slist_node_next(snode);
-    const struct server_state *server = ares__slist_node_val(snode);
+    ares__slist_node_t  *snext  = ares__slist_node_next(snode);
+    const ares_server_t *server = ares__slist_node_val(snode);
     if (!ares__server_in_newconfig(server, srvlist)) {
       /* This will clean up all server state via the destruction callback and
        * move any queries to new servers */
@@ -708,11 +706,9 @@ ares_status_t ares__servers_update(ares_channel_t *channel,
   ares_bool_t         list_changed = ARES_FALSE;
 
   if (channel == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
-  ares__channel_lock(channel);
-
   /* NOTE: a NULL or zero entry server list is considered valid due to
    *       real-world people needing support for this for their test harnesses
    */
@@ -730,7 +726,7 @@ ares_status_t ares__servers_update(ares_channel_t *channel,
 
     snode = ares__server_find(channel, sconfig);
     if (snode != NULL) {
-      struct server_state *server = ares__slist_node_val(snode);
+      ares_server_t *server = ares__slist_node_val(snode);
 
       /* Copy over link-local settings.  Its possible some of this data has
        * changed, maybe ...  */
@@ -781,7 +777,6 @@ ares_status_t ares__servers_update(ares_channel_t *channel,
   status = ARES_SUCCESS;
 
 done:
-  ares__channel_unlock(channel);
   return status;
 }
 
@@ -796,7 +791,7 @@ static ares_status_t
 
   s = ares__llist_create(ares_free);
   if (s == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = servers; node != NULL; node = node->next) {
@@ -809,7 +804,7 @@ static ares_status_t
 
     sconfig = ares_malloc_zero(sizeof(*sconfig));
     if (sconfig == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     sconfig->addr.family = node->family;
@@ -822,17 +817,19 @@ static ares_status_t
     }
 
     if (ares__llist_insert_last(s, sconfig) == NULL) {
-      ares_free(sconfig);
-      goto fail;
+      ares_free(sconfig); /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail;          /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   *llist = s;
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__llist_destroy(s);
   return ARES_ENOMEM;
+  /* LCOV_EXCL_STOP */
 }
 
 static ares_status_t ares_addr_port_node_to_server_config_llist(
@@ -845,7 +842,7 @@ static ares_status_t ares_addr_port_node_to_server_config_llist(
 
   s = ares__llist_create(ares_free);
   if (s == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = servers; node != NULL; node = node->next) {
@@ -858,7 +855,7 @@ static ares_status_t ares_addr_port_node_to_server_config_llist(
 
     sconfig = ares_malloc_zero(sizeof(*sconfig));
     if (sconfig == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     sconfig->addr.family = node->family;
@@ -874,17 +871,19 @@ static ares_status_t ares_addr_port_node_to_server_config_llist(
     sconfig->udp_port = (unsigned short)node->udp_port;
 
     if (ares__llist_insert_last(s, sconfig) == NULL) {
-      ares_free(sconfig);
-      goto fail;
+      ares_free(sconfig); /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail;          /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   *llist = s;
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__llist_destroy(s);
   return ARES_ENOMEM;
+  /* LCOV_EXCL_STOP */
 }
 
 ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
@@ -898,7 +897,7 @@ ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
 
   s = ares__llist_create(ares_free);
   if (s == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; servers != NULL && i < nservers; i++) {
@@ -906,7 +905,7 @@ ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
 
     sconfig = ares_malloc_zero(sizeof(*sconfig));
     if (sconfig == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     sconfig->addr.family = AF_INET;
@@ -914,21 +913,23 @@ ares_status_t ares_in_addr_to_server_config_llist(const struct in_addr *servers,
            sizeof(sconfig->addr.addr.addr4));
 
     if (ares__llist_insert_last(s, sconfig) == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   *llist = s;
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__llist_destroy(s);
   return ARES_ENOMEM;
+  /* LCOV_EXCL_STOP */
 }
 
 /* Write out the details of a server to a buffer */
-ares_status_t ares_get_server_addr(const struct server_state *server,
-                                   ares__buf_t               *buf)
+ares_status_t ares_get_server_addr(const ares_server_t *server,
+                                   ares__buf_t         *buf)
 {
   ares_status_t status;
   char          addr[INET6_ADDRSTRLEN];
@@ -937,7 +938,7 @@ ares_status_t ares_get_server_addr(const struct server_state *server,
   if (server->addr.family == AF_INET6) {
     status = ares__buf_append_byte(buf, '[');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -945,37 +946,37 @@ ares_status_t ares_get_server_addr(const struct server_state *server,
 
   status = ares__buf_append_str(buf, addr);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (server->addr.family == AF_INET6) {
     status = ares__buf_append_byte(buf, ']');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   /* :port */
   status = ares__buf_append_byte(buf, ':');
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_num_dec(buf, server->udp_port, 0);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* %iface */
   if (ares_strlen(server->ll_iface)) {
     status = ares__buf_append_byte(buf, '%');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_str(buf, server->ll_iface);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -999,7 +1000,7 @@ int ares_get_servers(const ares_channel_t   *channel,
 
   for (node = ares__slist_node_first(channel->servers); node != NULL;
        node = ares__slist_node_next(node)) {
-    const struct server_state *server = ares__slist_node_val(node);
+    const ares_server_t *server = ares__slist_node_val(node);
 
     /* Allocate storage for this server node appending it to the list */
     srvr_curr = ares_malloc_data(ARES_DATATYPE_ADDR_NODE);
@@ -1054,7 +1055,7 @@ int ares_get_servers_ports(const ares_channel_t        *channel,
 
   for (node = ares__slist_node_first(channel->servers); node != NULL;
        node = ares__slist_node_next(node)) {
-    const struct server_state *server = ares__slist_node_val(node);
+    const ares_server_t *server = ares__slist_node_val(node);
 
     /* Allocate storage for this server node appending it to the list */
     srvr_curr = ares_malloc_data(ARES_DATATYPE_ADDR_PORT_NODE);
@@ -1109,8 +1110,9 @@ int ares_set_servers(ares_channel_t              *channel,
     return (int)status;
   }
 
-  /* NOTE: lock is in ares__servers_update() */
+  ares__channel_lock(channel);
   status = ares__servers_update(channel, slist, ARES_TRUE);
+  ares__channel_unlock(channel);
 
   ares__llist_destroy(slist);
 
@@ -1132,8 +1134,9 @@ int ares_set_servers_ports(ares_channel_t                   *channel,
     return (int)status;
   }
 
-  /* NOTE: lock is in ares__servers_update() */
+  ares__channel_lock(channel);
   status = ares__servers_update(channel, slist, ARES_TRUE);
+  ares__channel_unlock(channel);
 
   ares__llist_destroy(slist);
 
@@ -1151,11 +1154,12 @@ static ares_status_t set_servers_csv(ares_channel_t *channel, const char *_csv)
     return ARES_ENODATA;
   }
 
-  /* NOTE: lock is in ares__servers_update() */
-
   if (ares_strlen(_csv) == 0) {
     /* blank all servers */
-    return ares__servers_update(channel, NULL, ARES_TRUE);
+    ares__channel_lock(channel);
+    status = ares__servers_update(channel, NULL, ARES_TRUE);
+    ares__channel_unlock(channel);
+    return status;
   }
 
   status = ares__sconfig_append_fromstr(&slist, _csv, ARES_FALSE);
@@ -1164,8 +1168,9 @@ static ares_status_t set_servers_csv(ares_channel_t *channel, const char *_csv)
     return status;
   }
 
-  /* NOTE: lock is in ares__servers_update() */
+  ares__channel_lock(channel);
   status = ares__servers_update(channel, slist, ARES_TRUE);
+  ares__channel_unlock(channel);
 
   ares__llist_destroy(slist);
 
@@ -1175,13 +1180,11 @@ static ares_status_t set_servers_csv(ares_channel_t *channel, const char *_csv)
 /* We'll go ahead and honor ports anyhow */
 int ares_set_servers_csv(ares_channel_t *channel, const char *_csv)
 {
-  /* NOTE: lock is in ares__servers_update() */
   return (int)set_servers_csv(channel, _csv);
 }
 
 int ares_set_servers_ports_csv(ares_channel_t *channel, const char *_csv)
 {
-  /* NOTE: lock is in ares__servers_update() */
   return (int)set_servers_csv(channel, _csv);
 }
 
@@ -1195,24 +1198,24 @@ char *ares_get_servers_csv(const ares_channel_t *channel)
 
   buf = ares__buf_create();
   if (buf == NULL) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = ares__slist_node_first(channel->servers); node != NULL;
        node = ares__slist_node_next(node)) {
-    ares_status_t              status;
-    const struct server_state *server = ares__slist_node_val(node);
+    ares_status_t        status;
+    const ares_server_t *server = ares__slist_node_val(node);
 
     if (ares__buf_len(buf)) {
       status = ares__buf_append_byte(buf, ',');
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
     status = ares_get_server_addr(server, buf);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1229,7 +1232,7 @@ void ares_set_server_state_callback(ares_channel_t            *channel,
                                     ares_server_state_callback cb, void *data)
 {
   if (channel == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   channel->server_state_cb      = cb;
   channel->server_state_cb_data = data;
diff --git a/contrib/libs/c-ares/src/lib/ares_version.c b/contrib/libs/c-ares/src/lib/ares_version.c
index ca15fa77dcfb..f50f65b0d613 100644
--- a/contrib/libs/c-ares/src/lib/ares_version.c
+++ b/contrib/libs/c-ares/src/lib/ares_version.c
@@ -24,8 +24,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
+#include "ares_private.h"
 
 const char *ares_version(int *version)
 {
diff --git a/contrib/libs/c-ares/src/lib/config-win32.h b/contrib/libs/c-ares/src/lib/config-win32.h
index 752e17afe6b3..003f3937e57b 100644
--- a/contrib/libs/c-ares/src/lib/config-win32.h
+++ b/contrib/libs/c-ares/src/lib/config-win32.h
@@ -88,7 +88,7 @@
 #define HAVE_IPHLPAPI_H 1
 
 /* Define if you have <netioapi.h> header file */
-#ifndef __WATCOMC__
+#if !defined(__WATCOMC__) && !defined(WATT32)
 #  define HAVE_NETIOAPI_H 1
 #endif
 
@@ -196,11 +196,8 @@
 /* Define to the type of arg 1 for send. */
 #define SEND_TYPE_ARG1 SOCKET
 
-/* Define to the type qualifier of arg 2 for send. */
-#define SEND_QUAL_ARG2 const
-
 /* Define to the type of arg 2 for send. */
-#define SEND_TYPE_ARG2 char *
+#define SEND_TYPE_ARG2 const char *
 
 /* Define to the type of arg 3 for send. */
 #define SEND_TYPE_ARG3 int
@@ -213,21 +210,34 @@
 
 /* Specifics for the Watt-32 tcp/ip stack. */
 #ifdef WATT32
-#  define SOCKET                   int
+#  undef RECV_TYPE_ARG1
+#  define RECV_TYPE_ARG1 int
+#  undef SEND_TYPE_ARG1
+#  define SEND_TYPE_ARG1 int
+#  undef RECVFROM_TYPE_ARG1
+#  define RECVFROM_TYPE_ARG1       int
 #  define NS_INADDRSZ              4
 #  define HAVE_ARPA_NAMESER_H      1
 #  define HAVE_ARPA_INET_H         1
 #  define HAVE_NETDB_H             1
 #  define HAVE_NETINET_IN_H        1
 #  define HAVE_SYS_SOCKET_H        1
+#  define HAVE_SYS_IOCTL_H         1
 #  define HAVE_NETINET_TCP_H       1
 #  define HAVE_AF_INET6            1
 #  define HAVE_PF_INET6            1
 #  define HAVE_STRUCT_IN6_ADDR     1
 #  define HAVE_STRUCT_SOCKADDR_IN6 1
+#  define HAVE_WRITEV              1
+#  define HAVE_IF_NAMETOINDEX      1
+#  define HAVE_IF_INDEXTONAME      1
+#  define HAVE_GETSERVBYPORT_R     1
+#  define GETSERVBYPORT_R_ARGS     6
 #  undef HAVE_WINSOCK_H
 #  undef HAVE_WINSOCK2_H
 #  undef HAVE_WS2TCPIP_H
+#  undef HAVE_IPHLPAPI_H
+#  undef HAVE_NETIOAPI_H
 #endif
 
 /* Threading support enabled */
@@ -348,7 +358,11 @@
 #  define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
 #endif
 
-#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) && !defined(__WATCOMC__)
+/* Define to 1 if you have the `RegisterWaitForSingleObject' function. */
+#define HAVE_REGISTERWAITFORSINGLEOBJECT 1
+
+#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) && \
+  !defined(__WATCOMC__) && !defined(WATT32)
 /* Define if you have if_nametoindex() */
 #  define HAVE_IF_NAMETOINDEX 1
 /* Define if you have if_indextoname() */
@@ -357,6 +371,8 @@
 #  define HAVE_CONVERTINTERFACEINDEXTOLUID 1
 /* Define to 1 if you have the `ConvertInterfaceLuidToNameA' function. */
 #  define HAVE_CONVERTINTERFACELUIDTONAMEA 1
+/* Define to 1 if you have the `NotifyIpInterfaceChange' function. */
+#  define HAVE_NOTIFYIPINTERFACECHANGE 1
 #endif
 
 /* ---------------------------------------------------------------- */
diff --git a/contrib/libs/c-ares/src/lib/dsa/ares__array.c b/contrib/libs/c-ares/src/lib/dsa/ares__array.c
new file mode 100644
index 000000000000..0c724248bf2e
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__array.c
@@ -0,0 +1,356 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#include "ares_private.h"
+#include "ares__array.h"
+
+#define ARES__ARRAY_MIN 4
+
+struct ares__array {
+  ares__array_destructor_t destruct;
+  void                    *arr;
+  size_t                   member_size;
+  size_t                   cnt;
+  size_t                   offset;
+  size_t                   alloc_cnt;
+};
+
+ares__array_t *ares__array_create(size_t                   member_size,
+                                  ares__array_destructor_t destruct)
+{
+  ares__array_t *arr;
+
+  if (member_size == 0) {
+    return NULL;
+  }
+
+  arr = ares_malloc_zero(sizeof(*arr));
+  if (arr == NULL) {
+    return NULL;
+  }
+
+  arr->member_size = member_size;
+  arr->destruct    = destruct;
+  return arr;
+}
+
+size_t ares__array_len(const ares__array_t *arr)
+{
+  if (arr == NULL) {
+    return 0;
+  }
+  return arr->cnt;
+}
+
+void *ares__array_at(ares__array_t *arr, size_t idx)
+{
+  if (arr == NULL || idx >= arr->cnt) {
+    return NULL;
+  }
+  return (unsigned char *)arr->arr + ((idx + arr->offset) * arr->member_size);
+}
+
+const void *ares__array_at_const(const ares__array_t *arr, size_t idx)
+{
+  if (arr == NULL || idx >= arr->cnt) {
+    return NULL;
+  }
+  return (unsigned char *)arr->arr + ((idx + arr->offset) * arr->member_size);
+}
+
+ares_status_t ares__array_sort(ares__array_t *arr, ares__array_cmp_t cmp)
+{
+  if (arr == NULL || cmp == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  /* Nothing to sort */
+  if (arr->cnt < 2) {
+    return ARES_SUCCESS;
+  }
+
+  qsort((unsigned char *)arr->arr + (arr->offset * arr->member_size), arr->cnt,
+        arr->member_size, cmp);
+  return ARES_SUCCESS;
+}
+
+void ares__array_destroy(ares__array_t *arr)
+{
+  size_t i;
+
+  if (arr == NULL) {
+    return;
+  }
+
+  if (arr->destruct != NULL) {
+    for (i = 0; i < arr->cnt; i++) {
+      arr->destruct(ares__array_at(arr, i));
+    }
+  }
+
+  ares_free(arr->arr);
+  ares_free(arr);
+}
+
+/* NOTE: this function operates on actual indexes, NOT indexes using the
+ *       arr->offset */
+static ares_status_t ares__array_move(ares__array_t *arr, size_t dest_idx,
+                                      size_t src_idx)
+{
+  void       *dest_ptr;
+  const void *src_ptr;
+  size_t      nmembers;
+
+  if (arr == NULL || dest_idx >= arr->alloc_cnt || src_idx >= arr->alloc_cnt) {
+    return ARES_EFORMERR;
+  }
+
+  /* Nothing to do */
+  if (dest_idx == src_idx) {
+    return ARES_SUCCESS;
+  }
+
+  dest_ptr = (unsigned char *)arr->arr + (dest_idx * arr->member_size);
+  src_ptr  = (unsigned char *)arr->arr + (src_idx * arr->member_size);
+
+  /* Check to make sure shifting to the right won't overflow our allocation
+   * boundary */
+  if (dest_idx > src_idx && arr->cnt + (dest_idx - src_idx) > arr->alloc_cnt) {
+    return ARES_EFORMERR;
+  }
+  if (dest_idx < src_idx) {
+    nmembers = arr->cnt - dest_idx;
+  } else {
+    nmembers = arr->cnt - src_idx;
+  }
+
+  memmove(dest_ptr, src_ptr, nmembers * arr->member_size);
+
+  return ARES_SUCCESS;
+}
+
+void *ares__array_finish(ares__array_t *arr, size_t *num_members)
+{
+  void *ptr;
+
+  if (arr == NULL || num_members == NULL) {
+    return NULL;
+  }
+
+  /* Make sure we move data to beginning of allocation */
+  if (arr->offset != 0) {
+    if (ares__array_move(arr, 0, arr->offset) != ARES_SUCCESS) {
+      return NULL;
+    }
+    arr->offset = 0;
+  }
+
+  ptr          = arr->arr;
+  *num_members = arr->cnt;
+  ares_free(arr);
+  return ptr;
+}
+
+ares_status_t ares__array_set_size(ares__array_t *arr, size_t size)
+{
+  void *temp;
+
+  if (arr == NULL || size == 0 || size < arr->cnt) {
+    return ARES_EFORMERR;
+  }
+
+  /* Always operate on powers of 2 */
+  size = ares__round_up_pow2(size);
+
+  if (size < ARES__ARRAY_MIN) {
+    size = ARES__ARRAY_MIN;
+  }
+
+  /* If our allocation size is already large enough, skip */
+  if (size <= arr->alloc_cnt) {
+    return ARES_SUCCESS;
+  }
+
+  temp = ares_realloc_zero(arr->arr, arr->alloc_cnt * arr->member_size,
+                           size * arr->member_size);
+  if (temp == NULL) {
+    return ARES_ENOMEM;
+  }
+  arr->alloc_cnt = size;
+  arr->arr       = temp;
+  return ARES_SUCCESS;
+}
+
+ares_status_t ares__array_insert_at(void **elem_ptr, ares__array_t *arr,
+                                    size_t idx)
+{
+  void         *ptr;
+  ares_status_t status;
+
+  if (arr == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  /* Not >= since we are allowed to append to the end */
+  if (idx > arr->cnt) {
+    return ARES_EFORMERR;
+  }
+
+  /* Allocate more if needed */
+  status = ares__array_set_size(arr, arr->cnt + 1);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  /* Shift if we have memory but not enough room at the end */
+  if (arr->cnt + 1 + arr->offset > arr->alloc_cnt) {
+    status = ares__array_move(arr, 0, arr->offset);
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+    arr->offset = 0;
+  }
+
+  /* If we're inserting anywhere other than the end, we need to move some
+   * elements out of the way */
+  if (idx != arr->cnt) {
+    status = ares__array_move(arr, idx + arr->offset + 1, idx + arr->offset);
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+  }
+
+  /* Ok, we're guaranteed to have a gap where we need it, lets zero it out,
+   * and return it */
+  ptr = (unsigned char *)arr->arr + ((idx + arr->offset) * arr->member_size);
+  memset(ptr, 0, arr->member_size);
+  arr->cnt++;
+
+  if (elem_ptr) {
+    *elem_ptr = ptr;
+  }
+
+  return ARES_SUCCESS;
+}
+
+ares_status_t ares__array_insert_last(void **elem_ptr, ares__array_t *arr)
+{
+  return ares__array_insert_at(elem_ptr, arr, ares__array_len(arr));
+}
+
+ares_status_t ares__array_insert_first(void **elem_ptr, ares__array_t *arr)
+{
+  return ares__array_insert_at(elem_ptr, arr, 0);
+}
+
+void *ares__array_first(ares__array_t *arr)
+{
+  return ares__array_at(arr, 0);
+}
+
+void *ares__array_last(ares__array_t *arr)
+{
+  size_t cnt = ares__array_len(arr);
+  if (cnt == 0) {
+    return NULL;
+  }
+  return ares__array_at(arr, cnt - 1);
+}
+
+const void *ares__array_first_const(const ares__array_t *arr)
+{
+  return ares__array_at_const(arr, 0);
+}
+
+const void *ares__array_last_const(const ares__array_t *arr)
+{
+  size_t cnt = ares__array_len(arr);
+  if (cnt == 0) {
+    return NULL;
+  }
+  return ares__array_at_const(arr, cnt - 1);
+}
+
+ares_status_t ares__array_claim_at(void *dest, size_t dest_size,
+                                   ares__array_t *arr, size_t idx)
+{
+  ares_status_t status;
+
+  if (arr == NULL || idx >= arr->cnt) {
+    return ARES_EFORMERR;
+  }
+
+  if (dest != NULL && dest_size < arr->member_size) {
+    return ARES_EFORMERR;
+  }
+
+  if (dest) {
+    memcpy(dest, ares__array_at(arr, idx), arr->member_size);
+  }
+
+  if (idx == 0) {
+    /* Optimization, if first element, just increment offset, makes removing a
+     * lot from the start quick */
+    arr->offset++;
+  } else if (idx != arr->cnt - 1) {
+    /* Must shift entire array if removing an element from the middle. Does
+     * nothing if removing last element other than decrement count. */
+    status = ares__array_move(arr, idx + arr->offset, idx + arr->offset + 1);
+    if (status != ARES_SUCCESS) {
+      return status;
+    }
+  }
+
+  arr->cnt--;
+  return ARES_SUCCESS;
+}
+
+ares_status_t ares__array_remove_at(ares__array_t *arr, size_t idx)
+{
+  void *ptr = ares__array_at(arr, idx);
+  if (arr == NULL || ptr == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  if (arr->destruct != NULL) {
+    arr->destruct(ptr);
+  }
+
+  return ares__array_claim_at(NULL, 0, arr, idx);
+}
+
+ares_status_t ares__array_remove_first(ares__array_t *arr)
+{
+  return ares__array_remove_at(arr, 0);
+}
+
+ares_status_t ares__array_remove_last(ares__array_t *arr)
+{
+  size_t cnt = ares__array_len(arr);
+  if (cnt == 0) {
+    return ARES_EFORMERR;
+  }
+  return ares__array_remove_at(arr, cnt - 1);
+}
diff --git a/contrib/libs/c-ares/src/lib/dsa/ares__array.h b/contrib/libs/c-ares/src/lib/dsa/ares__array.h
new file mode 100644
index 000000000000..6fa1c0e15e93
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__array.h
@@ -0,0 +1,223 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef __ARES__ARRAY_H
+#define __ARES__ARRAY_H
+
+/*! \addtogroup ares__array Array Data Structure
+ *
+ * This is an array with helpers.  It is meant to have as little overhead
+ * as possible over direct array management by applications but to provide
+ * safety and some optimization features.  It can also return the array in
+ * native form once all manipulation has been performed.
+ *
+ * @{
+ */
+
+struct ares__array;
+
+/*! Opaque data structure for array */
+typedef struct ares__array ares__array_t;
+
+/*! Callback to free user-defined member data
+ *
+ *  \param[in] data  pointer to member of array to be destroyed. The pointer
+ *                   itself must not be destroyed, just the data it contains.
+ */
+typedef void (*ares__array_destructor_t)(void *data);
+
+/*! Callback to compare two array elements used for sorting
+ *
+ *  \param[in] data1 array member 1
+ *  \param[in] data2 array member 2
+ *  \return < 0 if data1 < data2, > 0 if data1 > data2, 0 if data1 == data2
+ */
+typedef int (*ares__array_cmp_t)(const void *data1, const void *data2);
+
+/*! Create an array object
+ *
+ *  NOTE: members of the array are typically going to be an going to be a
+ *        struct with compiler/ABI specific padding to ensure proper alignment.
+ *        Care needs to be taken if using primitive types, especially floating
+ *        point numbers which size may not indicate the required alignment.
+ *        For example, a double may be 80 bits (10 bytes), but required
+ *        alignment of 16 bytes.  In such a case, a member_size of 16 would be
+ *        required to be used.
+ *
+ *  \param[in] destruct     Optional. Destructor to call on a removed member
+ *  \param[in] member_size  Size of array member, usually determined using
+ *                          sizeof() for the member such as a struct.
+ *
+ *  \return array object or NULL on out of memory
+ */
+ares__array_t *ares__array_create(size_t                   member_size,
+                                  ares__array_destructor_t destruct);
+
+
+/*! Request the array be at least the requested size.  Useful if the desired
+ *  array size is known prior to populating the array to prevent reallocations.
+ *
+ *  \param[in] arr  Initialized array object.
+ *  \param[in] size Minimum number of members
+ *  \return ARES_SUCCESS on success, ARES_EFORMERR on misuse,
+ *    ARES_ENOMEM on out of memory */
+ares_status_t  ares__array_set_size(ares__array_t *arr, size_t size);
+
+/*! Sort the array using the given comparison function.  This is not
+ *  persistent, any future elements inserted will not maintain this sort.
+ *
+ *  \param[in]  arr      Initialized array object.
+ *  \param[in]  cb       Sort callback
+ *  \return ARES_SUCCESS on success
+ */
+ares_status_t  ares__array_sort(ares__array_t *arr, ares__array_cmp_t cmp);
+
+/*! Destroy an array object.  If a destructor is set, will be called on each
+ *  member of the array.
+ *
+ *  \param[in] arr     Initialized array object.
+ */
+void           ares__array_destroy(ares__array_t *arr);
+
+/*! Retrieve the array in the native format.  This will also destroy the
+ *  container.  It is the responsibility of the caller to free the returned
+ *  pointer and also any data within each array element.
+ *
+ *  \param[in] arr  Initialized array object
+ *  \param[out] num_members the number of members in the returned array
+ *  \return pointer to native array on success, NULL on failure.
+ */
+void          *ares__array_finish(ares__array_t *arr, size_t *num_members);
+
+/*! Retrieve the number of members in the array
+ *
+ *  \param[in] arr     Initialized array object.
+ *  \return numbrer of members
+ */
+size_t         ares__array_len(const ares__array_t *arr);
+
+/*! Insert a new array member at the given index
+ *
+ *  \param[out] elem_ptr Optional. Pointer to the returned array element.
+ *  \param[in]  arr      Initialized array object.
+ *  \param[in]  idx      Index in array to place new element, will shift any
+ *                       elements down that exist after this point.
+ *  \return ARES_SUCCESS on success, ARES_EFORMERR on bad index,
+ *          ARES_ENOMEM on out of memory.
+ */
+ares_status_t  ares__array_insert_at(void **elem_ptr, ares__array_t *arr,
+                                     size_t idx);
+
+/*! Insert a new array member at the end of the array
+ *
+ *  \param[out] elem_ptr Optional. Pointer to the returned array element.
+ *  \param[in]  arr      Initialized array object.
+ *  \return ARES_SUCCESS on success, ARES_ENOMEM on out of memory.
+ */
+ares_status_t  ares__array_insert_last(void **elem_ptr, ares__array_t *arr);
+
+/*! Insert a new array member at the beginning of the array
+ *
+ *  \param[out] elem_ptr Optional. Pointer to the returned array element.
+ *  \param[in]  arr      Initialized array object.
+ *  \return ARES_SUCCESS on success, ARES_ENOMEM on out of memory.
+ */
+ares_status_t  ares__array_insert_first(void **elem_ptr, ares__array_t *arr);
+
+/*! Fetch a pointer to the given element in the array
+ *  \param[in]  array  Initialized array object
+ *  \param[in]  idx    Index to fetch
+ *  \return pointer on success, NULL on failure */
+void          *ares__array_at(ares__array_t *arr, size_t idx);
+
+/*! Fetch a pointer to the first element in the array
+ *  \param[in]  array  Initialized array object
+ *  \return pointer on success, NULL on failure */
+void          *ares__array_first(ares__array_t *arr);
+
+/*! Fetch a pointer to the last element in the array
+ *  \param[in]  array  Initialized array object
+ *  \return pointer on success, NULL on failure */
+void          *ares__array_last(ares__array_t *arr);
+
+/*! Fetch a constant pointer to the given element in the array
+ *  \param[in]  array  Initialized array object
+ *  \param[in]  idx    Index to fetch
+ *  \return pointer on success, NULL on failure */
+const void    *ares__array_at_const(const ares__array_t *arr, size_t idx);
+
+/*! Fetch a constant pointer to the first element in the array
+ *  \param[in]  array  Initialized array object
+ *  \return pointer on success, NULL on failure */
+const void    *ares__array_first_const(const ares__array_t *arr);
+
+/*! Fetch a constant pointer to the last element in the array
+ *  \param[in]  array  Initialized array object
+ *  \return pointer on success, NULL on failure */
+const void    *ares__array_last_const(const ares__array_t *arr);
+
+/*! Claim the data from the specified array index, copying it to the buffer
+ *  provided by the caller.  The index specified in the array will then be
+ *  removed (without calling any possible destructor)
+ *
+ *  \param[in,out] dest      Optional. Buffer to hold array member. Pass NULL
+ *                           if not needed.  This could leak memory if array
+ *                           member needs destructor if not provided.
+ *  \param[in]     dest_size Size of buffer provided, used as a sanity check.
+ *                           Must match member_size provided to
+ *                           ares__array_create() if dest_size specified.
+ *  \param[in]     arr       Initialized array object
+ *  \param[in]     idx       Index to claim
+ *  \return ARES_SUCCESS on success, ARES_EFORMERR on usage failure.
+ */
+ares_status_t  ares__array_claim_at(void *dest, size_t dest_size,
+                                    ares__array_t *arr, size_t idx);
+
+/*! Remove the member at the specified array index.  The destructor will be
+ *  called.
+ *
+ *  \param[in] arr  Initialized array object
+ *  \param[in] idx  Index to remove
+ *  \return ARES_SUCCESS if removed, ARES_EFORMERR on invalid use
+ */
+ares_status_t  ares__array_remove_at(ares__array_t *arr, size_t idx);
+
+/*! Remove the first member of the array.
+ *
+ *  \param[in] arr  Initialized array object
+ *  \return ARES_SUCCESS if removed, ARES_EFORMERR on invalid use
+ */
+ares_status_t  ares__array_remove_first(ares__array_t *arr);
+
+/*! Remove the last member of the array.
+ *
+ *  \param[in] arr  Initialized array object
+ *  \return ARES_SUCCESS if removed, ARES_EFORMERR on invalid use
+ */
+ares_status_t  ares__array_remove_last(ares__array_t *arr);
+
+/*! @} */
+
+#endif /* __ARES__ARRAY_H */
diff --git a/contrib/libs/c-ares/src/lib/ares__htable.c b/contrib/libs/c-ares/src/lib/dsa/ares__htable.c
similarity index 98%
rename from contrib/libs/c-ares/src/lib/ares__htable.c
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable.c
index f09c9ea2951d..d608d60ce3a5 100644
--- a/contrib/libs/c-ares/src/lib/ares__htable.c
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__htable.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__llist.h"
 #include "ares__htable.h"
@@ -207,7 +205,7 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
    * middle, we wouldn't be able to recover. */
   buckets = ares_malloc_zero(sizeof(*buckets) * htable->size);
   if (buckets == NULL) {
-    goto done;  /* LCOV_EXCL_LINE */
+    goto done; /* LCOV_EXCL_LINE */
   }
 
   /* The maximum number of new llists we'll need is the number of collisions
@@ -270,7 +268,7 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
       if (buckets[idx] == NULL) {
         /* Silence static analysis, this isn't possible but it doesn't know */
         if (prealloc_llist == NULL || prealloc_llist_len == 0) {
-          goto done;  /* LCOV_EXCL_LINE */
+          goto done; /* LCOV_EXCL_LINE */
         }
         buckets[idx] = prealloc_llist[prealloc_llist_len - 1];
         prealloc_llist_len--;
@@ -304,7 +302,7 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
 
   /* On failure, we need to restore the htable size */
   if (rv != ARES_TRUE) {
-    htable->size = old_size;  /* LCOV_EXCL_LINE */
+    htable->size = old_size; /* LCOV_EXCL_LINE */
   }
 
   return rv;
@@ -336,7 +334,7 @@ ares_bool_t ares__htable_insert(ares__htable_t *htable, void *bucket)
   if (htable->num_keys + 1 >
       (htable->size * ARES__HTABLE_EXPAND_PERCENT) / 100) {
     if (!ares__htable_expand(htable)) {
-      return ARES_FALSE;  /* LCOV_EXCL_LINE */
+      return ARES_FALSE; /* LCOV_EXCL_LINE */
     }
     /* If we expanded, need to calculate a new index */
     idx = HASH_IDX(htable, key);
diff --git a/contrib/libs/c-ares/src/lib/ares__htable.h b/contrib/libs/c-ares/src/lib/dsa/ares__htable.h
similarity index 100%
rename from contrib/libs/c-ares/src/lib/ares__htable.h
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable.h
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_asvp.c b/contrib/libs/c-ares/src/lib/dsa/ares__htable_asvp.c
similarity index 94%
rename from contrib/libs/c-ares/src/lib/ares__htable_asvp.c
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable_asvp.c
index 3c1d2a336fad..4b9267ff6c14 100644
--- a/contrib/libs/c-ares/src/lib/ares__htable_asvp.c
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__htable_asvp.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__htable.h"
 #include "ares__htable_asvp.h"
@@ -121,7 +119,7 @@ ares_socket_t *ares__htable_asvp_keys(const ares__htable_asvp_t *htable,
   size_t         i;
 
   if (htable == NULL || num == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *num = 0;
@@ -133,8 +131,8 @@ ares_socket_t *ares__htable_asvp_keys(const ares__htable_asvp_t *htable,
 
   out = ares_malloc_zero(sizeof(*out) * cnt);
   if (out == NULL) {
-    ares_free(buckets);
-    return NULL;
+    ares_free(buckets); /* LCOV_EXCL_LINE: OutOfMemory */
+    return NULL;        /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; i < cnt; i++) {
@@ -157,7 +155,7 @@ ares_bool_t ares__htable_asvp_insert(ares__htable_asvp_t *htable,
 
   bucket = ares_malloc(sizeof(*bucket));
   if (bucket == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   bucket->parent = htable;
@@ -165,14 +163,14 @@ ares_bool_t ares__htable_asvp_insert(ares__htable_asvp_t *htable,
   bucket->val    = val;
 
   if (!ares__htable_insert(htable->hash, bucket)) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_TRUE;
 
 fail:
   if (bucket) {
-    ares_free(bucket);
+    ares_free(bucket); /* LCOV_EXCL_LINE: OutOfMemory */
   }
   return ARES_FALSE;
 }
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_asvp.h b/contrib/libs/c-ares/src/lib/dsa/ares__htable_asvp.h
similarity index 100%
rename from contrib/libs/c-ares/src/lib/ares__htable_asvp.h
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable_asvp.h
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_strvp.c b/contrib/libs/c-ares/src/lib/dsa/ares__htable_strvp.c
similarity index 99%
rename from contrib/libs/c-ares/src/lib/ares__htable_strvp.c
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable_strvp.c
index bfae4c362289..d73a1928a75f 100644
--- a/contrib/libs/c-ares/src/lib/ares__htable_strvp.c
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__htable_strvp.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__htable.h"
 #include "ares__htable_strvp.h"
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_strvp.h b/contrib/libs/c-ares/src/lib/dsa/ares__htable_strvp.h
similarity index 99%
rename from contrib/libs/c-ares/src/lib/ares__htable_strvp.h
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable_strvp.h
index 25dd2b90777d..878c71869a92 100644
--- a/contrib/libs/c-ares/src/lib/ares__htable_strvp.h
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__htable_strvp.h
@@ -115,4 +115,4 @@ size_t      ares__htable_strvp_num_keys(const ares__htable_strvp_t *htable);
 
 /*! @} */
 
-#endif /* __ARES__HTABLE_STVP_H */
+#endif /* __ARES__HTABLE_STRVP_H */
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_szvp.c b/contrib/libs/c-ares/src/lib/dsa/ares__htable_szvp.c
similarity index 96%
rename from contrib/libs/c-ares/src/lib/ares__htable_szvp.c
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable_szvp.c
index 2ff64784bcd6..b3e88d8b9a43 100644
--- a/contrib/libs/c-ares/src/lib/ares__htable_szvp.c
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__htable_szvp.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__htable.h"
 #include "ares__htable_szvp.h"
@@ -123,7 +121,7 @@ ares_bool_t ares__htable_szvp_insert(ares__htable_szvp_t *htable, size_t key,
 
   bucket = ares_malloc(sizeof(*bucket));
   if (bucket == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   bucket->parent = htable;
@@ -131,14 +129,14 @@ ares_bool_t ares__htable_szvp_insert(ares__htable_szvp_t *htable, size_t key,
   bucket->val    = val;
 
   if (!ares__htable_insert(htable->hash, bucket)) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_TRUE;
 
 fail:
   if (bucket) {
-    ares_free(bucket);
+    ares_free(bucket); /* LCOV_EXCL_LINE: OutOfMemory */
   }
   return ARES_FALSE;
 }
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_szvp.h b/contrib/libs/c-ares/src/lib/dsa/ares__htable_szvp.h
similarity index 100%
rename from contrib/libs/c-ares/src/lib/ares__htable_szvp.h
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable_szvp.h
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_vpvp.c b/contrib/libs/c-ares/src/lib/dsa/ares__htable_vpvp.c
similarity index 95%
rename from contrib/libs/c-ares/src/lib/ares__htable_vpvp.c
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable_vpvp.c
index 3558fa5a9b77..9042c48dd7fb 100644
--- a/contrib/libs/c-ares/src/lib/ares__htable_vpvp.c
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__htable_vpvp.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__htable.h"
 #include "ares__htable_vpvp.h"
@@ -44,7 +42,7 @@ typedef struct {
 void ares__htable_vpvp_destroy(ares__htable_vpvp_t *htable)
 {
   if (htable == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__htable_destroy(htable->hash);
@@ -93,13 +91,13 @@ ares__htable_vpvp_t *
 {
   ares__htable_vpvp_t *htable = ares_malloc(sizeof(*htable));
   if (htable == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   htable->hash =
     ares__htable_create(hash_func, bucket_key, bucket_free, key_eq);
   if (htable->hash == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   htable->free_key = key_free;
@@ -107,12 +105,14 @@ ares__htable_vpvp_t *
 
   return htable;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   if (htable) {
     ares__htable_destroy(htable->hash);
     ares_free(htable);
   }
   return NULL;
+  /* LCOV_EXCL_STOP */
 }
 
 ares_bool_t ares__htable_vpvp_insert(ares__htable_vpvp_t *htable, void *key,
diff --git a/contrib/libs/c-ares/src/lib/ares__htable_vpvp.h b/contrib/libs/c-ares/src/lib/dsa/ares__htable_vpvp.h
similarity index 100%
rename from contrib/libs/c-ares/src/lib/ares__htable_vpvp.h
rename to contrib/libs/c-ares/src/lib/dsa/ares__htable_vpvp.h
diff --git a/contrib/libs/c-ares/src/lib/ares__llist.c b/contrib/libs/c-ares/src/lib/dsa/ares__llist.c
similarity index 92%
rename from contrib/libs/c-ares/src/lib/ares__llist.c
rename to contrib/libs/c-ares/src/lib/dsa/ares__llist.c
index d175da2bd3ba..96936c1abe7c 100644
--- a/contrib/libs/c-ares/src/lib/ares__llist.c
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__llist.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__llist.h"
 
@@ -77,7 +75,7 @@ static void ares__llist_attach_at(ares__llist_t            *list,
                                   ares__llist_node_t       *node)
 {
   if (list == NULL || node == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   node->parent = list;
@@ -127,7 +125,7 @@ static ares__llist_node_t *ares__llist_insert_at(ares__llist_t            *list,
   ares__llist_node_t *node = NULL;
 
   if (list == NULL || val == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   node = ares_malloc_zero(sizeof(*node));
@@ -186,6 +184,26 @@ ares__llist_node_t *ares__llist_node_first(ares__llist_t *list)
   return list->head;
 }
 
+ares__llist_node_t *ares__llist_node_idx(ares__llist_t *list, size_t idx)
+{
+  ares__llist_node_t *node;
+  size_t              cnt;
+
+  if (list == NULL) {
+    return NULL;
+  }
+  if (idx >= list->cnt) {
+    return NULL;
+  }
+
+  node = list->head;
+  for (cnt = 0; node != NULL && cnt < idx; cnt++) {
+    node = node->next;
+  }
+
+  return node;
+}
+
 ares__llist_node_t *ares__llist_node_last(ares__llist_t *list)
 {
   if (list == NULL) {
@@ -250,7 +268,7 @@ static void ares__llist_node_detach(ares__llist_node_t *node)
   ares__llist_t *list;
 
   if (node == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   list = node->parent;
@@ -323,7 +341,7 @@ void ares__llist_node_replace(ares__llist_node_t *node, void *val)
   node->data = val;
 }
 
-void ares__llist_destroy(ares__llist_t *list)
+void ares__llist_clear(ares__llist_t *list)
 {
   ares__llist_node_t *node;
 
@@ -334,6 +352,14 @@ void ares__llist_destroy(ares__llist_t *list)
   while ((node = ares__llist_node_first(list)) != NULL) {
     ares__llist_node_destroy(node);
   }
+}
+
+void ares__llist_destroy(ares__llist_t *list)
+{
+  if (list == NULL) {
+    return;
+  }
+  ares__llist_clear(list);
   ares_free(list);
 }
 
@@ -341,7 +367,7 @@ void ares__llist_node_move_parent_last(ares__llist_node_t *node,
                                        ares__llist_t      *new_parent)
 {
   if (node == NULL || new_parent == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__llist_node_detach(node);
@@ -352,7 +378,7 @@ void ares__llist_node_move_parent_first(ares__llist_node_t *node,
                                         ares__llist_t      *new_parent)
 {
   if (node == NULL || new_parent == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__llist_node_detach(node);
diff --git a/contrib/libs/c-ares/src/lib/ares__llist.h b/contrib/libs/c-ares/src/lib/dsa/ares__llist.h
similarity index 93%
rename from contrib/libs/c-ares/src/lib/ares__llist.h
rename to contrib/libs/c-ares/src/lib/dsa/ares__llist.h
index 7d57bdab3b07..213f54134bcb 100644
--- a/contrib/libs/c-ares/src/lib/ares__llist.h
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__llist.h
@@ -122,6 +122,14 @@ ares__llist_node_t *ares__llist_node_first(ares__llist_t *list);
  */
 ares__llist_node_t *ares__llist_node_last(ares__llist_t *list);
 
+/*! Obtain a node based on its index.  This is an O(n) operation.
+ *
+ *  \param[in] list Initialized list object
+ *  \param[in] idx  Index of node to retrieve
+ *  \return node at index or NULL if invalid index
+ */
+ares__llist_node_t *ares__llist_node_idx(ares__llist_t *list, size_t idx);
+
 /*! Obtain next node in respect to specified node
  *
  *  \param[in] node  Node referenced
@@ -136,6 +144,7 @@ ares__llist_node_t *ares__llist_node_next(ares__llist_node_t *node);
  */
 ares__llist_node_t *ares__llist_node_prev(ares__llist_node_t *node);
 
+
 /*! Obtain value from node
  *
  *  \param[in] node  Node referenced
@@ -150,6 +159,12 @@ void               *ares__llist_node_val(ares__llist_node_t *node);
  */
 size_t              ares__llist_len(const ares__llist_t *list);
 
+/*! Clear all entries in the list, but don't destroy the list object.
+ *
+ *  \param[in] list  Initialized list object
+ */
+void                ares__llist_clear(ares__llist_t *list);
+
 /*! Obtain list object from referenced node
  *
  *  \param[in] node  Node referenced
diff --git a/contrib/libs/c-ares/src/lib/ares__slist.c b/contrib/libs/c-ares/src/lib/dsa/ares__slist.c
similarity index 97%
rename from contrib/libs/c-ares/src/lib/ares__slist.c
rename to contrib/libs/c-ares/src/lib/dsa/ares__slist.c
index 5b8098435513..f0e3f8b14a98 100644
--- a/contrib/libs/c-ares/src/lib/ares__slist.c
+++ b/contrib/libs/c-ares/src/lib/dsa/ares__slist.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__slist.h"
 
@@ -206,7 +204,7 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
   node = ares_malloc_zero(sizeof(*node));
 
   if (node == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   node->data   = val;
@@ -218,12 +216,12 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
   /* Allocate array of next and prev nodes for linking each level */
   node->next = ares_malloc_zero(sizeof(*node->next) * node->levels);
   if (node->next == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   node->prev = ares_malloc_zero(sizeof(*node->prev) * node->levels);
   if (node->prev == NULL) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* If the number of levels is greater than we currently support in the slist,
@@ -233,7 +231,7 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
       ares_realloc_zero(list->head, sizeof(*list->head) * list->levels,
                         sizeof(*list->head) * node->levels);
     if (ptr == NULL) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     list->head   = ptr;
@@ -246,6 +244,7 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
 
   return node;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   if (node) {
     ares_free(node->prev);
@@ -253,6 +252,7 @@ ares__slist_node_t *ares__slist_insert(ares__slist_t *list, void *val)
     ares_free(node);
   }
   return NULL;
+  /* LCOV_EXCL_STOP */
 }
 
 static void ares__slist_node_pop(ares__slist_node_t *node)
diff --git a/contrib/libs/c-ares/src/lib/ares__slist.h b/contrib/libs/c-ares/src/lib/dsa/ares__slist.h
similarity index 100%
rename from contrib/libs/c-ares/src/lib/ares__slist.h
rename to contrib/libs/c-ares/src/lib/dsa/ares__slist.h
diff --git a/contrib/libs/c-ares/src/lib/ares_event.h b/contrib/libs/c-ares/src/lib/event/ares_event.h
similarity index 99%
rename from contrib/libs/c-ares/src/lib/ares_event.h
rename to contrib/libs/c-ares/src/lib/event/ares_event.h
index f5d044d2a6ca..317731fc4289 100644
--- a/contrib/libs/c-ares/src/lib/ares_event.h
+++ b/contrib/libs/c-ares/src/lib/event/ares_event.h
@@ -26,8 +26,6 @@
 #ifndef __ARES__EVENT_H
 #define __ARES__EVENT_H
 
-#include "ares_setup.h"
-
 struct ares_event;
 typedef struct ares_event ares_event_t;
 
diff --git a/contrib/libs/c-ares/src/lib/ares_event_configchg.c b/contrib/libs/c-ares/src/lib/event/ares_event_configchg.c
similarity index 70%
rename from contrib/libs/c-ares/src/lib/ares_event_configchg.c
rename to contrib/libs/c-ares/src/lib/event/ares_event_configchg.c
index c7bc9ffd58b4..030c76c69c91 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_configchg.c
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_configchg.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 
@@ -54,7 +52,7 @@ struct ares_event_configchg {
 void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
 {
   if (configchg == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Tell event system to stop monitoring for changes.  This will cause the
@@ -67,7 +65,7 @@ static void ares_event_configchg_free(void *data)
 {
   ares_event_configchg_t *configchg = data;
   if (configchg == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (configchg->inotify_fd >= 0) {
@@ -142,22 +140,22 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
 
   c = ares_malloc_zero(sizeof(*c));
   if (c == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   c->e          = e;
   c->inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
   if (c->inotify_fd == -1) {
-    status = ARES_ESERVFAIL;
-    goto done;
+    status = ARES_ESERVFAIL; /* LCOV_EXCL_LINE: UntestablePath */
+    goto done;               /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   /* We need to monitor /etc/resolv.conf, /etc/nsswitch.conf */
   if (inotify_add_watch(c->inotify_fd, "/etc",
                         IN_CREATE | IN_MODIFY | IN_MOVED_TO | IN_ONLYDIR) ==
       -1) {
-    status = ARES_ESERVFAIL;
-    goto done;
+    status = ARES_ESERVFAIL; /* LCOV_EXCL_LINE: UntestablePath */
+    goto done;               /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   status =
@@ -173,7 +171,7 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
   return status;
 }
 
-#elif defined(_WIN32)
+#elif defined(USE_WINSOCK)
 
 #  include <winsock2.h>
 #  include <iphlpapi.h>
@@ -182,31 +180,68 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
 
 struct ares_event_configchg {
   HANDLE               ifchg_hnd;
+  HKEY                 regip4;
+  HANDLE               regip4_event;
+  HANDLE               regip4_wait;
+  HKEY                 regip6;
+  HANDLE               regip6_event;
+  HANDLE               regip6_wait;
   ares_event_thread_t *e;
 };
 
 void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
 {
-#  ifdef __WATCOMC__
-  /* Not supported */
-#  else
   if (configchg == NULL) {
     return;
   }
 
+#  ifdef HAVE_NOTIFYIPINTERFACECHANGE
   if (configchg->ifchg_hnd != NULL) {
     CancelMibChangeNotify2(configchg->ifchg_hnd);
     configchg->ifchg_hnd = NULL;
   }
+#  endif
+
+#  ifdef HAVE_REGISTERWAITFORSINGLEOBJECT
+  if (configchg->regip4_wait != NULL) {
+    UnregisterWait(configchg->regip4_wait);
+    configchg->regip4_wait = NULL;
+  }
 
-  ares_free(configchg);
+  if (configchg->regip6_wait != NULL) {
+    UnregisterWait(configchg->regip6_wait);
+    configchg->regip6_wait = NULL;
+  }
+
+  if (configchg->regip4 != NULL) {
+    RegCloseKey(configchg->regip4);
+    configchg->regip4 = NULL;
+  }
+
+  if (configchg->regip6 != NULL) {
+    RegCloseKey(configchg->regip6);
+    configchg->regip6 = NULL;
+  }
+
+  if (configchg->regip4_event != NULL) {
+    CloseHandle(configchg->regip4_event);
+    configchg->regip4_event = NULL;
+  }
+
+  if (configchg->regip6_event != NULL) {
+    CloseHandle(configchg->regip6_event);
+    configchg->regip6_event = NULL;
+  }
 #  endif
+
+  ares_free(configchg);
 }
 
-#  ifndef __WATCOMC__
-static void ares_event_configchg_cb(PVOID                 CallerContext,
-                                    PMIB_IPINTERFACE_ROW  Row,
-                                    MIB_NOTIFICATION_TYPE NotificationType)
+
+#  ifdef HAVE_NOTIFYIPINTERFACECHANGE
+static void NETIOAPI_API_
+  ares_event_configchg_ip_cb(PVOID CallerContext, PMIB_IPINTERFACE_ROW Row,
+                             MIB_NOTIFICATION_TYPE NotificationType)
 {
   ares_event_configchg_t *configchg = CallerContext;
   (void)Row;
@@ -215,43 +250,130 @@ static void ares_event_configchg_cb(PVOID                 CallerContext,
 }
 #  endif
 
+static ares_bool_t
+  ares_event_configchg_regnotify(ares_event_configchg_t *configchg)
+{
+#  ifdef HAVE_REGISTERWAITFORSINGLEOBJECT
+#    if defined(__WATCOMC__) && !defined(REG_NOTIFY_THREAD_AGNOSTIC)
+#      define REG_NOTIFY_THREAD_AGNOSTIC 0x10000000L
+#    endif
+  DWORD flags = REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_LAST_SET |
+                REG_NOTIFY_THREAD_AGNOSTIC;
+
+  if (RegNotifyChangeKeyValue(configchg->regip4, TRUE, flags,
+                              configchg->regip4_event, TRUE) != ERROR_SUCCESS) {
+    return ARES_FALSE;
+  }
+
+  if (RegNotifyChangeKeyValue(configchg->regip6, TRUE, flags,
+                              configchg->regip6_event, TRUE) != ERROR_SUCCESS) {
+    return ARES_FALSE;
+  }
+#  else
+  (void)configchg;
+#  endif
+  return ARES_TRUE;
+}
+
+static VOID CALLBACK ares_event_configchg_reg_cb(PVOID   lpParameter,
+                                                 BOOLEAN TimerOrWaitFired)
+{
+  ares_event_configchg_t *configchg = lpParameter;
+  (void)TimerOrWaitFired;
+
+  ares_reinit(configchg->e->channel);
+
+  /* Re-arm, as its single-shot.  However, we don't know which one needs to
+   * be re-armed, so we just do both */
+  ares_event_configchg_regnotify(configchg);
+}
 
 ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
                                         ares_event_thread_t     *e)
 {
-#  ifdef __WATCOMC__
-  return ARES_ENOTIMP;
-#  else
-  ares_status_t status = ARES_SUCCESS;
+  ares_status_t           status = ARES_SUCCESS;
+  ares_event_configchg_t *c      = NULL;
 
-  *configchg = ares_malloc_zero(sizeof(**configchg));
-  if (*configchg == NULL) {
+  c = ares_malloc_zero(sizeof(**configchg));
+  if (c == NULL) {
     return ARES_ENOMEM;
   }
 
-  (*configchg)->e = e;
+  c->e = e;
 
+#  ifdef HAVE_NOTIFYIPINTERFACECHANGE
   /* NOTE: If a user goes into the control panel and changes the network
    *       adapter DNS addresses manually, this will NOT trigger a notification.
    *       We've also tried listening on NotifyUnicastIpAddressChange(), but
    *       that didn't get triggered either.
    */
+  if (NotifyIpInterfaceChange(AF_UNSPEC, ares_event_configchg_ip_cb, c, FALSE,
+                              &c->ifchg_hnd) != NO_ERROR) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+#  endif
+
+#  ifdef HAVE_REGISTERWAITFORSINGLEOBJECT
+  /* Monitor HKLM\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters\Interfaces
+   * and HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces
+   * for changes via RegNotifyChangeKeyValue() */
+  if (RegOpenKeyExW(
+        HKEY_LOCAL_MACHINE,
+        L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces",
+        0, KEY_NOTIFY, &c->regip4) != ERROR_SUCCESS) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  if (RegOpenKeyExW(
+        HKEY_LOCAL_MACHINE,
+        L"SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters\\Interfaces",
+        0, KEY_NOTIFY, &c->regip6) != ERROR_SUCCESS) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  c->regip4_event = CreateEvent(NULL, TRUE, FALSE, NULL);
+  if (c->regip4_event == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  c->regip6_event = CreateEvent(NULL, TRUE, FALSE, NULL);
+  if (c->regip6_event == NULL) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  if (!RegisterWaitForSingleObject(&c->regip4_wait, c->regip4_event,
+                                   ares_event_configchg_reg_cb, c, INFINITE,
+                                   WT_EXECUTEDEFAULT)) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+
+  if (!RegisterWaitForSingleObject(&c->regip6_wait, c->regip6_event,
+                                   ares_event_configchg_reg_cb, c, INFINITE,
+                                   WT_EXECUTEDEFAULT)) {
+    status = ARES_ESERVFAIL;
+    goto done;
+  }
+#  endif
 
-  if (NotifyIpInterfaceChange(
-        AF_UNSPEC, (PIPINTERFACE_CHANGE_CALLBACK)ares_event_configchg_cb,
-        *configchg, FALSE, &(*configchg)->ifchg_hnd) != NO_ERROR) {
+  if (!ares_event_configchg_regnotify(c)) {
     status = ARES_ESERVFAIL;
     goto done;
   }
 
 done:
   if (status != ARES_SUCCESS) {
-    ares_event_configchg_destroy(*configchg);
-    *configchg = NULL;
+    ares_event_configchg_destroy(c);
+  } else {
+    *configchg = c;
   }
 
   return status;
-#  endif
 }
 
 #elif defined(__APPLE__)
@@ -260,6 +382,7 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
 #  include <unistd.h>
 #  include <notify.h>
 #  include <dlfcn.h>
+#  include <fcntl.h>
 
 struct ares_event_configchg {
   int fd;
@@ -333,6 +456,13 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
   const char *(*pdns_configuration_notify_key)(void) = NULL;
   const char *notify_key                             = NULL;
   int         flags;
+  size_t      i;
+  const char *searchlibs[] = {
+    "/usr/lib/libSystem.dylib",
+    "/System/Library/Frameworks/SystemConfiguration.framework/"
+    "SystemConfiguration",
+    NULL
+  };
 
   *configchg = ares_malloc_zero(sizeof(**configchg));
   if (*configchg == NULL) {
@@ -340,13 +470,23 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
   }
 
   /* Load symbol as it isn't normally public */
-  handle = dlopen("/usr/lib/libSystem.dylib", RTLD_LAZY | RTLD_NOLOAD);
-  if (handle == NULL) {
-    status = ARES_ESERVFAIL;
-    goto done;
-  }
+  for (i = 0; searchlibs[i] != NULL; i++) {
+    handle = dlopen(searchlibs[i], RTLD_LAZY);
+    if (handle == NULL) {
+      /* Fail, loop! */
+      continue;
+    }
 
-  pdns_configuration_notify_key = dlsym(handle, "dns_configuration_notify_key");
+    pdns_configuration_notify_key =
+      (const char *(*)(void))dlsym(handle, "dns_configuration_notify_key");
+    if (pdns_configuration_notify_key != NULL) {
+      break;
+    }
+
+    /* Fail, loop! */
+    dlclose(handle);
+    handle = NULL;
+  }
 
   if (pdns_configuration_notify_key == NULL) {
     status = ARES_ESERVFAIL;
@@ -388,7 +528,7 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
   return status;
 }
 
-#elif defined(HAVE_STAT)
+#elif defined(HAVE_STAT) && !defined(_WIN32)
 #  ifdef HAVE_SYS_TYPES_H
 #    include <sys/types.h>
 #  endif
@@ -415,9 +555,14 @@ static ares_status_t config_change_check(ares__htable_strvp_t *filestat,
                                          const char           *resolvconf_path)
 {
   size_t      i;
-  const char *configfiles[] = { resolvconf_path, "/etc/nsswitch.conf",
-                                "/etc/netsvc.conf", "/etc/svc.conf", NULL };
-  ares_bool_t changed       = ARES_FALSE;
+  const char *configfiles[5];
+  ares_bool_t changed = ARES_FALSE;
+
+  configfiles[0] = resolvconf_path;
+  configfiles[1] = "/etc/nsswitch.conf";
+  configfiles[2] = "/etc/netsvc.conf";
+  configfiles[3] = "/etc/svc.conf";
+  configfiles[4] = NULL;
 
   for (i = 0; configfiles[i] != NULL; i++) {
     fileinfo_t *fi = ares__htable_strvp_get_direct(filestat, configfiles[i]);
diff --git a/contrib/libs/c-ares/src/lib/ares_event_epoll.c b/contrib/libs/c-ares/src/lib/event/ares_event_epoll.c
similarity index 88%
rename from contrib/libs/c-ares/src/lib/ares_event_epoll.c
rename to contrib/libs/c-ares/src/lib/event/ares_event_epoll.c
index 78cbbc368c8e..5eb25cccc9ed 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_epoll.c
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_epoll.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 
@@ -46,12 +44,12 @@ static void ares_evsys_epoll_destroy(ares_event_thread_t *e)
   ares_evsys_epoll_t *ep = NULL;
 
   if (e == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ep = e->ev_sys_data;
   if (ep == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (ep->epoll_fd != -1) {
@@ -68,25 +66,21 @@ static ares_bool_t ares_evsys_epoll_init(ares_event_thread_t *e)
 
   ep = ares_malloc_zero(sizeof(*ep));
   if (ep == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->ev_sys_data = ep;
 
-  ep->epoll_fd = epoll_create1(0);
+  ep->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
   if (ep->epoll_fd == -1) {
-    ares_evsys_epoll_destroy(e);
-    return ARES_FALSE;
+    ares_evsys_epoll_destroy(e); /* LCOV_EXCL_LINE: UntestablePath */
+    return ARES_FALSE;           /* LCOV_EXCL_LINE: UntestablePath */
   }
 
-#  ifdef FD_CLOEXEC
-  fcntl(ep->epoll_fd, F_SETFD, FD_CLOEXEC);
-#  endif
-
   e->ev_signal = ares_pipeevent_create(e);
   if (e->ev_signal == NULL) {
-    ares_evsys_epoll_destroy(e);
-    return ARES_FALSE;
+    ares_evsys_epoll_destroy(e); /* LCOV_EXCL_LINE: UntestablePath */
+    return ARES_FALSE;           /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   return ARES_TRUE;
@@ -108,7 +102,7 @@ static ares_bool_t ares_evsys_epoll_event_add(ares_event_t *event)
     epev.events |= EPOLLOUT;
   }
   if (epoll_ctl(ep->epoll_fd, EPOLL_CTL_ADD, event->fd, &epev) != 0) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: UntestablePath */
   }
   return ARES_TRUE;
 }
@@ -158,7 +152,7 @@ static size_t ares_evsys_epoll_wait(ares_event_thread_t *e,
   rv = epoll_wait(ep->epoll_fd, events, (int)nevents,
                   (timeout_ms == 0) ? -1 : (int)timeout_ms);
   if (rv < 0) {
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   nevents = (size_t)rv;
@@ -170,7 +164,7 @@ static size_t ares_evsys_epoll_wait(ares_event_thread_t *e,
     ev = ares__htable_asvp_get_direct(e->ev_sock_handles,
                                       (ares_socket_t)events[i].data.fd);
     if (ev == NULL || ev->cb == NULL) {
-      continue;
+      continue; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     cnt++;
diff --git a/contrib/libs/c-ares/src/lib/ares_event_kqueue.c b/contrib/libs/c-ares/src/lib/event/ares_event_kqueue.c
similarity index 95%
rename from contrib/libs/c-ares/src/lib/ares_event_kqueue.c
rename to contrib/libs/c-ares/src/lib/event/ares_event_kqueue.c
index 7e2c60abf518..1c35c14f1656 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_kqueue.c
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_kqueue.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 
@@ -95,7 +93,7 @@ static ares_bool_t ares_evsys_kqueue_init(ares_event_thread_t *e)
 
   kq->nchanges_alloc = 8;
   kq->changelist =
-    ares_malloc_zero(sizeof(*kq->changelist) * kq->nchanges_alloc);
+    ares_malloc_zero(kq->nchanges_alloc * sizeof(*kq->changelist));
   if (kq->changelist == NULL) {
     ares_evsys_kqueue_destroy(e);
     return ARES_FALSE;
@@ -125,8 +123,9 @@ static void ares_evsys_kqueue_enqueue(ares_evsys_kqueue_t *kq, int fd,
 
   if (kq->nchanges > kq->nchanges_alloc) {
     kq->nchanges_alloc <<= 1;
-    kq->changelist = ares_realloc_zero(kq->changelist, kq->nchanges_alloc >> 1,
-                                       kq->nchanges_alloc);
+    kq->changelist       = ares_realloc_zero(
+      kq->changelist, (kq->nchanges_alloc >> 1) * sizeof(*kq->changelist),
+      kq->nchanges_alloc * sizeof(*kq->changelist));
   }
 
   EV_SET(&kq->changelist[idx], fd, filter, flags, 0, 0, 0);
@@ -197,7 +196,7 @@ static size_t ares_evsys_kqueue_wait(ares_event_thread_t *e,
   size_t               cnt     = 0;
 
   if (timeout_ms != 0) {
-    ts.tv_sec  = timeout_ms / 1000;
+    ts.tv_sec  = (time_t)timeout_ms / 1000;
     ts.tv_nsec = (timeout_ms % 1000) * 1000 * 1000;
     timeout    = &ts;
   }
diff --git a/contrib/libs/c-ares/src/lib/ares_event_poll.c b/contrib/libs/c-ares/src/lib/event/ares_event_poll.c
similarity index 96%
rename from contrib/libs/c-ares/src/lib/ares_event_poll.c
rename to contrib/libs/c-ares/src/lib/event/ares_event_poll.c
index a06c6e3fc410..42ffd912e95c 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_poll.c
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_poll.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 #ifdef HAVE_POLL_H
@@ -37,7 +35,7 @@ static ares_bool_t ares_evsys_poll_init(ares_event_thread_t *e)
 {
   e->ev_signal = ares_pipeevent_create(e);
   if (e->ev_signal == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: UntestablePath */
   }
   return ARES_TRUE;
 }
@@ -78,7 +76,7 @@ static size_t ares_evsys_poll_wait(ares_event_thread_t *e,
   if (fdlist != NULL && num_fds) {
     pollfd = ares_malloc_zero(sizeof(*pollfd) * num_fds);
     if (pollfd == NULL) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
     for (i = 0; i < num_fds; i++) {
       const ares_event_t *ev =
@@ -111,7 +109,7 @@ static size_t ares_evsys_poll_wait(ares_event_thread_t *e,
 
     ev = ares__htable_asvp_get_direct(e->ev_sock_handles, pollfd[i].fd);
     if (ev == NULL || ev->cb == NULL) {
-      continue;
+      continue; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (pollfd[i].revents & (POLLERR | POLLHUP | POLLIN)) {
diff --git a/contrib/libs/c-ares/src/lib/ares_event_select.c b/contrib/libs/c-ares/src/lib/event/ares_event_select.c
similarity index 92%
rename from contrib/libs/c-ares/src/lib/ares_event_select.c
rename to contrib/libs/c-ares/src/lib/event/ares_event_select.c
index 57a4271ea7da..e1266ea99056 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_select.c
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_select.c
@@ -29,8 +29,6 @@
  * anyhow */
 #define FD_SETSIZE 4096
 
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 #ifdef HAVE_SYS_SELECT_H
@@ -45,7 +43,7 @@ static ares_bool_t ares_evsys_select_init(ares_event_thread_t *e)
 {
   e->ev_signal = ares_pipeevent_create(e);
   if (e->ev_signal == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: UntestablePath */
   }
   return ARES_TRUE;
 }
@@ -83,12 +81,14 @@ static size_t ares_evsys_select_wait(ares_event_thread_t *e,
   size_t          i;
   fd_set          read_fds;
   fd_set          write_fds;
+  fd_set          except_fds;
   int             nfds = 0;
   struct timeval  tv;
   struct timeval *tout = NULL;
 
   FD_ZERO(&read_fds);
   FD_ZERO(&write_fds);
+  FD_ZERO(&except_fds);
 
   for (i = 0; i < num_fds; i++) {
     const ares_event_t *ev =
@@ -99,6 +99,7 @@ static size_t ares_evsys_select_wait(ares_event_thread_t *e,
     if (ev->flags & ARES_EVENT_FLAG_WRITE) {
       FD_SET(ev->fd, &write_fds);
     }
+    FD_SET(ev->fd, &except_fds);
     if (ev->fd + 1 > nfds) {
       nfds = ev->fd + 1;
     }
@@ -110,7 +111,7 @@ static size_t ares_evsys_select_wait(ares_event_thread_t *e,
     tout       = &tv;
   }
 
-  rv = select(nfds, &read_fds, &write_fds, NULL, tout);
+  rv = select(nfds, &read_fds, &write_fds, &except_fds, tout);
   if (rv > 0) {
     for (i = 0; i < num_fds; i++) {
       ares_event_t      *ev;
@@ -118,10 +119,10 @@ static size_t ares_evsys_select_wait(ares_event_thread_t *e,
 
       ev = ares__htable_asvp_get_direct(e->ev_sock_handles, fdlist[i]);
       if (ev == NULL || ev->cb == NULL) {
-        continue;
+        continue; /* LCOV_EXCL_LINE: DefensiveCoding */
       }
 
-      if (FD_ISSET(fdlist[i], &read_fds)) {
+      if (FD_ISSET(fdlist[i], &read_fds) || FD_ISSET(fdlist[i], &except_fds)) {
         flags |= ARES_EVENT_FLAG_READ;
       }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_event_thread.c b/contrib/libs/c-ares/src/lib/event/ares_event_thread.c
similarity index 78%
rename from contrib/libs/c-ares/src/lib/ares_event_thread.c
rename to contrib/libs/c-ares/src/lib/event/ares_event_thread.c
index d9d904f29ba9..8b332e9b0193 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_thread.c
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_thread.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 
@@ -32,7 +30,7 @@ static void ares_event_destroy_cb(void *arg)
 {
   ares_event_t *event = arg;
   if (event == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Unregister from the event thread if it was registered with one */
@@ -49,6 +47,23 @@ static void ares_event_destroy_cb(void *arg)
   ares_free(event);
 }
 
+static void ares_event_signal(const ares_event_t *event)
+{
+  if (event == NULL || event->signal_cb == NULL) {
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
+  }
+  event->signal_cb(event);
+}
+
+static void ares_event_thread_wake(const ares_event_thread_t *e)
+{
+  if (e == NULL) {
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
+  }
+
+  ares_event_signal(e->ev_signal);
+}
+
 /* See if a pending update already exists. We don't want to enqueue multiple
  * updates for the same event handle. Right now this is O(n) based on number
  * of updates already enqueued.  In the future, it might make sense to make
@@ -88,9 +103,10 @@ ares_status_t ares_event_update(ares_event_t **event, ares_event_thread_t *e,
                                 ares_event_signal_cb_t signal_cb)
 {
   ares_event_t *ev = NULL;
+  ares_status_t status;
 
   if (e == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Callback must be specified if not a removal event. */
@@ -118,18 +134,22 @@ ares_status_t ares_event_update(ares_event_t **event, ares_event_thread_t *e,
 
   /* That's all the validation we can really do */
 
+  ares__thread_mutex_lock(e->mutex);
+
   /* See if we have a queued update already */
   ev = ares_event_update_find(e, fd, data);
   if (ev == NULL) {
     /* Allocate a new one */
     ev = ares_malloc_zero(sizeof(*ev));
     if (ev == NULL) {
-      return ARES_ENOMEM;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     if (ares__llist_insert_last(e->ev_updates, ev) == NULL) {
-      ares_free(ev);
-      return ARES_ENOMEM;
+      ares_free(ev);        /* LCOV_EXCL_LINE: OutOfMemory */
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -152,24 +172,17 @@ ares_status_t ares_event_update(ares_event_t **event, ares_event_thread_t *e,
     *event = ev;
   }
 
-  return ARES_SUCCESS;
-}
+  status = ARES_SUCCESS;
 
-static void ares_event_signal(const ares_event_t *event)
-{
-  if (event == NULL || event->signal_cb == NULL) {
-    return;
+done:
+  if (status == ARES_SUCCESS) {
+    /* Wake event thread if successful so it can pull the updates */
+    ares_event_thread_wake(e);
   }
-  event->signal_cb(event);
-}
 
-static void ares_event_thread_wake(const ares_event_thread_t *e)
-{
-  if (e == NULL) {
-    return;
-  }
+  ares__thread_mutex_unlock(e->mutex);
 
-  ares_event_signal(e->ev_signal);
+  return status;
 }
 
 static void ares_event_thread_process_fd(ares_event_thread_t *e,
@@ -197,15 +210,10 @@ static void ares_event_thread_sockstate_cb(void *data, ares_socket_t socket_fd,
     flags |= ARES_EVENT_FLAG_WRITE;
   }
 
-  /* Update channel fd */
-  ares__thread_mutex_lock(e->mutex);
+  /* Update channel fd.  This function will lock e->mutex and also wake the
+   * event thread to process the update */
   ares_event_update(NULL, e, flags, ares_event_thread_process_fd, socket_fd,
                     NULL, NULL, NULL);
-
-  /* Wake the event thread so it properly enqueues any updates */
-  ares_event_thread_wake(e);
-
-  ares__thread_mutex_unlock(e->mutex);
 }
 
 static void ares_event_process_updates(ares_event_thread_t *e)
@@ -264,6 +272,35 @@ static void ares_event_process_updates(ares_event_thread_t *e)
   }
 }
 
+static void ares_event_thread_cleanup(ares_event_thread_t *e)
+{
+  /* Manually free any updates that weren't processed */
+  if (e->ev_updates != NULL) {
+    ares__llist_node_t *node;
+
+    while ((node = ares__llist_node_first(e->ev_updates)) != NULL) {
+      ares_event_destroy_cb(ares__llist_node_claim(node));
+    }
+    ares__llist_destroy(e->ev_updates);
+    e->ev_updates = NULL;
+  }
+
+  if (e->ev_sock_handles != NULL) {
+    ares__htable_asvp_destroy(e->ev_sock_handles);
+    e->ev_sock_handles = NULL;
+  }
+
+  if (e->ev_cust_handles != NULL) {
+    ares__htable_vpvp_destroy(e->ev_cust_handles);
+    e->ev_cust_handles = NULL;
+  }
+
+  if (e->ev_sys != NULL && e->ev_sys->destroy != NULL) {
+    e->ev_sys->destroy(e);
+    e->ev_sys = NULL;
+  }
+}
+
 static void *ares_event_thread(void *arg)
 {
   ares_event_thread_t *e = arg;
@@ -274,16 +311,19 @@ static void *ares_event_thread(void *arg)
     const struct timeval *tvout;
     unsigned long         timeout_ms = 0; /* 0 = unlimited */
 
+    ares_event_process_updates(e);
+
+    /* Don't hold a mutex while waiting on events or calling into anything
+     * that might require a c-ares channel lock since a callback could be
+     * triggered cross-thread */
+    ares__thread_mutex_unlock(e->mutex);
+
     tvout = ares_timeout(e->channel, NULL, &tv);
     if (tvout != NULL) {
       timeout_ms =
         (unsigned long)((tvout->tv_sec * 1000) + (tvout->tv_usec / 1000) + 1);
     }
 
-    ares_event_process_updates(e);
-
-    /* Don't hold a mutex while waiting on events */
-    ares__thread_mutex_unlock(e->mutex);
     e->ev_sys->wait(e, timeout_ms);
 
     /* Each iteration should do timeout processing */
@@ -295,14 +335,16 @@ static void *ares_event_thread(void *arg)
     ares__thread_mutex_lock(e->mutex);
   }
 
+  /* Lets cleanup while we're in the thread itself */
+  ares_event_thread_cleanup(e);
+
   ares__thread_mutex_unlock(e->mutex);
+
   return NULL;
 }
 
 static void ares_event_thread_destroy_int(ares_event_thread_t *e)
 {
-  ares__llist_node_t *node;
-
   /* Wake thread and tell it to shutdown if it exists */
   ares__thread_mutex_lock(e->mutex);
   if (e->isup) {
@@ -313,26 +355,14 @@ static void ares_event_thread_destroy_int(ares_event_thread_t *e)
 
   /* Wait for thread to shutdown */
   if (e->thread) {
-    ares__thread_join(e->thread, NULL);
+    void *rv = NULL;
+    ares__thread_join(e->thread, &rv);
     e->thread = NULL;
   }
 
-  /* Manually free any updates that weren't processed */
-  while ((node = ares__llist_node_first(e->ev_updates)) != NULL) {
-    ares_event_destroy_cb(ares__llist_node_claim(node));
-  }
-  ares__llist_destroy(e->ev_updates);
-  e->ev_updates = NULL;
-
-  ares__htable_asvp_destroy(e->ev_sock_handles);
-  e->ev_sock_handles = NULL;
-
-  ares__htable_vpvp_destroy(e->ev_cust_handles);
-  e->ev_cust_handles = NULL;
-
-  if (e->ev_sys && e->ev_sys->destroy) {
-    e->ev_sys->destroy(e);
-  }
+  /* If the event thread ever got to the point of starting, this is a no-op
+   * as it runs this same cleanup when it shuts down */
+  ares_event_thread_cleanup(e);
 
   ares__thread_mutex_destroy(e->mutex);
   e->mutex = NULL;
@@ -345,17 +375,19 @@ void ares_event_thread_destroy(ares_channel_t *channel)
   ares_event_thread_t *e = channel->sock_state_cb_data;
 
   if (e == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares_event_thread_destroy_int(e);
+  channel->sock_state_cb_data = NULL;
+  channel->sock_state_cb      = NULL;
 }
 
 static const ares_event_sys_t *ares_event_fetch_sys(ares_evsys_t evsys)
 {
   switch (evsys) {
     case ARES_EVSYS_WIN32:
-#if defined(_WIN32)
+#if defined(USE_WINSOCK)
       return &ares_evsys_win32;
 #else
       return NULL;
@@ -391,22 +423,23 @@ static const ares_event_sys_t *ares_event_fetch_sys(ares_evsys_t evsys)
 
     /* case ARES_EVSYS_DEFAULT: */
     default:
-#if defined(_WIN32)
-      return &ares_evsys_win32;
+      break;
+  }
+
+    /* default */
+#if defined(USE_WINSOCK)
+  return &ares_evsys_win32;
 #elif defined(HAVE_KQUEUE)
-      return &ares_evsys_kqueue;
+  return &ares_evsys_kqueue;
 #elif defined(HAVE_EPOLL)
-      return &ares_evsys_epoll;
+  return &ares_evsys_epoll;
 #elif defined(HAVE_POLL)
-      return &ares_evsys_poll;
+  return &ares_evsys_poll;
 #elif defined(HAVE_PIPE)
-      return &ares_evsys_select;
+  return &ares_evsys_select;
 #else
-      break;
-#endif
-  }
-
   return NULL;
+#endif
 }
 
 ares_status_t ares_event_thread_init(ares_channel_t *channel)
@@ -415,49 +448,51 @@ ares_status_t ares_event_thread_init(ares_channel_t *channel)
 
   e = ares_malloc_zero(sizeof(*e));
   if (e == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->mutex = ares__thread_mutex_create();
   if (e->mutex == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOMEM;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM;               /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->ev_updates = ares__llist_create(NULL);
   if (e->ev_updates == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOMEM;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM;               /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->ev_sock_handles = ares__htable_asvp_create(ares_event_destroy_cb);
   if (e->ev_sock_handles == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOMEM;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM;               /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->ev_cust_handles = ares__htable_vpvp_create(NULL, ares_event_destroy_cb);
   if (e->ev_cust_handles == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOMEM;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM;               /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   e->channel = channel;
   e->isup    = ARES_TRUE;
   e->ev_sys  = ares_event_fetch_sys(channel->evsys);
   if (e->ev_sys == NULL) {
-    ares_event_thread_destroy_int(e);
-    return ARES_ENOTIMP;
+    ares_event_thread_destroy_int(e); /* LCOV_EXCL_LINE: UntestablePath */
+    return ARES_ENOTIMP;              /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   channel->sock_state_cb      = ares_event_thread_sockstate_cb;
   channel->sock_state_cb_data = e;
 
   if (!e->ev_sys->init(e)) {
+    /* LCOV_EXCL_START: UntestablePath */
     ares_event_thread_destroy_int(e);
     channel->sock_state_cb      = NULL;
     channel->sock_state_cb_data = NULL;
     return ARES_ESERVFAIL;
+    /* LCOV_EXCL_STOP */
   }
 
   /* Before starting the thread, process any possible events the initialization
@@ -469,10 +504,12 @@ ares_status_t ares_event_thread_init(ares_channel_t *channel)
 
   /* Start thread */
   if (ares__thread_create(&e->thread, ares_event_thread, e) != ARES_SUCCESS) {
+    /* LCOV_EXCL_START: UntestablePath */
     ares_event_thread_destroy_int(e);
     channel->sock_state_cb      = NULL;
     channel->sock_state_cb_data = NULL;
     return ARES_ESERVFAIL;
+    /* LCOV_EXCL_STOP */
   }
 
   return ARES_SUCCESS;
diff --git a/contrib/libs/c-ares/src/lib/ares_event_wake_pipe.c b/contrib/libs/c-ares/src/lib/event/ares_event_wake_pipe.c
similarity index 89%
rename from contrib/libs/c-ares/src/lib/ares_event_wake_pipe.c
rename to contrib/libs/c-ares/src/lib/event/ares_event_wake_pipe.c
index a2cd6f609a4c..282d013dc62b 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_wake_pipe.c
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_wake_pipe.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares_event.h"
 #ifdef HAVE_UNISTD_H
@@ -60,7 +58,7 @@ static ares_pipeevent_t *ares_pipeevent_init(void)
 {
   ares_pipeevent_t *p = ares_malloc_zero(sizeof(*p));
   if (p == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   p->filedes[0] = -1;
@@ -68,8 +66,8 @@ static ares_pipeevent_t *ares_pipeevent_init(void)
 
 #  ifdef HAVE_PIPE2
   if (pipe2(p->filedes, O_NONBLOCK | O_CLOEXEC) != 0) {
-    ares_pipeevent_destroy(p);
-    return NULL;
+    ares_pipeevent_destroy(p); /* LCOV_EXCL_LINE: UntestablePath */
+    return NULL;               /* LCOV_EXCL_LINE: UntestablePath */
   }
 #  else
   if (pipe(p->filedes) != 0) {
@@ -113,7 +111,7 @@ static void ares_pipeevent_signal(const ares_event_t *e)
   const ares_pipeevent_t *p;
 
   if (e == NULL || e->data == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   p = e->data;
@@ -131,7 +129,7 @@ static void ares_pipeevent_cb(ares_event_thread_t *e, ares_socket_t fd,
   (void)flags;
 
   if (data == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   p = data;
@@ -156,8 +154,8 @@ ares_event_t *ares_pipeevent_create(ares_event_thread_t *e)
                              p->filedes[0], p, ares_pipeevent_destroy_cb,
                              ares_pipeevent_signal);
   if (status != ARES_SUCCESS) {
-    ares_pipeevent_destroy(p);
-    return NULL;
+    ares_pipeevent_destroy(p); /* LCOV_EXCL_LINE: DefensiveCoding */
+    return NULL;               /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return event;
diff --git a/contrib/libs/c-ares/src/lib/event/ares_event_win32.c b/contrib/libs/c-ares/src/lib/event/ares_event_win32.c
new file mode 100644
index 000000000000..0b7e535bbbf5
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_win32.c
@@ -0,0 +1,976 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/* Uses an anonymous union */
+#if defined(__clang__) || defined(__GNUC__)
+#  pragma GCC diagnostic push
+#  if defined(__clang__)
+#    pragma GCC diagnostic ignored "-Wc11-extensions"
+#  else
+#    pragma GCC diagnostic ignored "-Wpedantic"
+#  endif
+#endif
+
+#include "ares_private.h"
+#include "ares_event.h"
+#include "ares_event_win32.h"
+#ifdef HAVE_LIMITS_H
+#  include <limits.h>
+#endif
+
+#if defined(USE_WINSOCK)
+
+/* IMPLEMENTATION NOTES
+ * ====================
+ *
+ * This implementation uses some undocumented functionality within Windows for
+ * monitoring sockets. The Ancillary Function Driver (AFD) is the low level
+ * implementation that Winsock2 sits on top of.  Winsock2 unfortunately does
+ * not expose the equivalent of epoll() or kqueue(), but it is possible to
+ * access AFD directly and use along with IOCP to simulate the functionality.
+ * We want to use IOCP if possible as it gives us the ability to monitor more
+ * than just sockets (WSAPoll is not an option), and perform arbitrary callbacks
+ * which means we can hook in non-socket related events.
+ *
+ * The information for this implementation was gathered from "wepoll" and
+ * "libuv" which both use slight variants on this.  We originally went with
+ * an implementation methodology more similar to "libuv", but we had a few
+ * user reports of crashes during shutdown and memory leaks due to some
+ * events not being delivered for cleanup of closed sockets.
+ *
+ * Initialization:
+ *   1. Dynamically load the NtDeviceIoControlFile, NtCreateFile, and
+ *      NtCancelIoFileEx internal symbols from ntdll.dll. (Don't believe
+ *      Microsoft's documentation for NtCancelIoFileEx as it documents an
+ *      invalid prototype). These functions are to open a reference to the
+ *      Ancillary Function Driver (AFD), and to submit and cancel POLL
+ *      requests.
+ *   2. Create an IO Completion Port base handle via CreateIoCompletionPort()
+ *      that all socket events will be delivered through.
+ *   3. Create a list of AFD Handles and track the number of poll requests
+ *      per AFD handle.  When we exceed a pre-determined limit of poll requests
+ *      for a handle (128), we will automatically create a new handle.  The
+ *      reason behind this is NtCancelIoFileEx uses a horrible algorithm for
+ *      issuing cancellations.  See:
+ *      https://github.com/python-trio/trio/issues/52#issuecomment-548215128
+ *   4. Create a callback to be used to be able to interrupt waiting for IOCP
+ *      events, this may be called for allowing enqueuing of additional socket
+ *      events or removing socket events. PostQueuedCompletionStatus() is the
+ *      obvious choice.  We can use the same container format, the event
+ *      delivered won't have an OVERLAPPED pointer so we can differentiate from
+ *      socket events.  Use the container as the completion key.
+ *
+ * Socket Add:
+ *   1. Create/Allocate a container for holding metadata about a socket
+ *      including:
+ *      - SOCKET base_socket;
+ *      - IO_STATUS_BLOCK iosb; -- Used by AFD POLL, returned as OVERLAPPED
+ *      - AFD_POLL_INFO afd_poll_info; -- Used by AFD POLL
+ *      - afd list node -- for tracking which AFD handle a POLL request was
+ *        submitted to.
+ *   2. Call WSAIoctl(..., SIO_BASE_HANDLE, ...) to unwrap the SOCKET and get
+ *      the "base socket" we can use for polling.  It appears this may fail so
+ *      we should call WSAIoctl(..., SIO_BSP_HANDLE_POLL, ...) as a fallback.
+ *   3. Submit AFD POLL request (see "AFD POLL Request" section)
+ *   4. Record a mapping between the "IO Status Block" and the socket container
+ *      so when events are delivered we can dereference.
+ *
+ * Socket Delete:
+ *   1. Call
+ *      NtCancelIoFileEx(afd, iosb, &temp_iosb);
+ *      to cancel any pending operations.
+ *   2. Tag the socket container as being queued for deletion
+ *   3. Wait for an event to be delivered for the socket (cancel isn't
+ *      immediate, it delivers an event to know its complete). Delete only once
+ *      that event has been delivered.  If we don't do this we could try to
+ *      access free()'d memory at a later point.
+ *
+ * Socket Modify:
+ *   1. Call
+ *      NtCancelIoFileEx(afd, iosb, &temp_iosb)
+ *      to cancel any pending operation.
+ *   2. When the event comes through that the cancel is complete, enqueue
+ *      another "AFD Poll Request" for the desired events.
+ *
+ * Event Wait:
+ *   1. Call GetQueuedCompletionStatusEx() with the base IOCP handle, a
+ *      stack allocated array of OVERLAPPED_ENTRY's, and an appropriate
+ *      timeout.
+ *   2. Iterate across returned events, if the lpOverlapped is NULL, then the
+ *      the CompletionKey is a pointer to the container registered via
+ *      PostQueuedCompletionStatus(), otherwise it is the "IO Status Block"
+ *      registered with the "AFD Poll Request" which needs to be dereferenced
+ *      to the "socket container".
+ *   3. If it is a "socket container", disassociate it from the afd list node
+ *      it was previously submitted to.
+ *   4. If it is a "socket container" check to see if we are cleaning up, if so,
+ *      clean it up.
+ *   5. If it is a "socket container" that is still valid, Submit an
+ *      AFD POLL Request (see "AFD POLL Request"). We must re-enable the request
+ *      each time we receive a response, it is not persistent.
+ *   6. Notify of any events received as indicated in the AFD_POLL_INFO
+ *      Handles[0].Events (NOTE: check NumberOfHandles > 0, and the status in
+ *      the IO_STATUS_BLOCK.  If we received an AFD_POLL_LOCAL_CLOSE, clean up
+ *      the connection like the integrator requested it to be cleaned up.
+ *
+ * AFD Poll Request:
+ *   1. Find an afd poll handle in the list that has fewer pending requests than
+ *      the limit.
+ *   2. If an afd poll handle was not associated (e.g. due to all being over
+ *      limit), create a new afd poll handle by calling NtCreateFile()
+ *      with path \Device\Afd , then add the AFD handle to the IO Completion
+ *      Port.  We can leave the completion key as blank since events for
+ *      multiple sockets will be delivered through this and we need to
+ *      differentiate via the OVERLAPPED member returned.  Add the new AFD
+ *      handle to the list of handles.
+ *   3. Initialize the AFD_POLL_INFO structure:
+ *      Exclusive         = FALSE; // allow multiple requests
+ *      NumberOfHandles   = 1;
+ *      Timeout.QuadPart  = LLONG_MAX;
+ *      Handles[0].Handle = (HANDLE)base_socket;
+ *      Handles[0].Status = 0;
+ *      Handles[0].Events = AFD_POLL_LOCAL_CLOSE + additional events to wait for
+ *                          such as AFD_POLL_RECEIVE, etc;
+ *   4. Zero out the IO_STATUS_BLOCK structures
+ *   5. Set the "Status" member of IO_STATUS_BLOCK to STATUS_PENDING
+ *   6. Call
+ *      NtDeviceIoControlFile(afd, NULL, NULL, &iosb,
+ *                            &iosb, IOCTL_AFD_POLL
+ *                            &afd_poll_info, sizeof(afd_poll_info),
+ *                            &afd_poll_info, sizeof(afd_poll_info));
+ *
+ *
+ * References:
+ *   - https://github.com/piscisaureus/wepoll/
+ *   - https://github.com/libuv/libuv/
+ */
+
+/* Cap the number of outstanding AFD poll requests per AFD handle due to known
+ * slowdowns with large lists and NtCancelIoFileEx() */
+#  define AFD_POLL_PER_HANDLE 128
+
+#  include <stdarg.h>
+
+/* #  define CARES_DEBUG 1 */
+
+#  ifdef __GNUC__
+#    define CARES_PRINTF_LIKE(fmt, args) \
+      __attribute__((format(printf, fmt, args)))
+#  else
+#    define CARES_PRINTF_LIKE(fmt, args)
+#  endif
+
+static void CARES_DEBUG_LOG(const char *fmt, ...) CARES_PRINTF_LIKE(1, 2);
+
+static void CARES_DEBUG_LOG(const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start(ap, fmt);
+#  ifdef CARES_DEBUG
+  vfprintf(stderr, fmt, ap);
+  fflush(stderr);
+#  endif
+  va_end(ap);
+}
+
+typedef struct {
+  /* Dynamically loaded symbols */
+  NtCreateFile_t          NtCreateFile;
+  NtDeviceIoControlFile_t NtDeviceIoControlFile;
+  NtCancelIoFileEx_t      NtCancelIoFileEx;
+
+  /* Implementation details */
+  ares__slist_t          *afd_handles;
+  HANDLE                  iocp_handle;
+
+  /* IO_STATUS_BLOCK * -> ares_evsys_win32_eventdata_t * mapping.  There is
+   * no completion key passed to IOCP with this method so we have to look
+   * up based on the lpOverlapped returned (which is mapped to IO_STATUS_BLOCK)
+   */
+  ares__htable_vpvp_t    *sockets;
+
+  /* Flag about whether or not we are shutting down */
+  ares_bool_t             is_shutdown;
+} ares_evsys_win32_t;
+
+typedef enum {
+  POLL_STATUS_NONE    = 0,
+  POLL_STATUS_PENDING = 1,
+  POLL_STATUS_CANCEL  = 2,
+  POLL_STATUS_DESTROY = 3
+} poll_status_t;
+
+typedef struct {
+  /*! Pointer to parent event container */
+  ares_event_t         *event;
+  /*! Socket passed in to monitor */
+  SOCKET                socket;
+  /*! Base socket derived from provided socket */
+  SOCKET                base_socket;
+  /*! Structure for submitting AFD POLL requests (Internals!) */
+  AFD_POLL_INFO         afd_poll_info;
+  /*! Status of current polling operation */
+  poll_status_t         poll_status;
+  /*! IO Status Block structure submitted with AFD POLL requests and returned
+   *  with IOCP results as lpOverlapped (even though its a different structure)
+   */
+  IO_STATUS_BLOCK       iosb;
+  /*! AFD handle node an outstanding poll request is associated with */
+  ares__slist_node_t   *afd_handle_node;
+  /* Lock is only for PostQueuedCompletionStatus() to prevent multiple
+   * signals. Tracking via POLL_STATUS_PENDING/POLL_STATUS_NONE */
+  ares__thread_mutex_t *lock;
+} ares_evsys_win32_eventdata_t;
+
+static size_t ares_evsys_win32_wait(ares_event_thread_t *e,
+                                    unsigned long        timeout_ms);
+
+static void   ares_iocpevent_signal(const ares_event_t *event)
+{
+  ares_event_thread_t          *e           = event->e;
+  ares_evsys_win32_t           *ew          = e->ev_sys_data;
+  ares_evsys_win32_eventdata_t *ed          = event->data;
+  ares_bool_t                   queue_event = ARES_FALSE;
+
+  ares__thread_mutex_lock(ed->lock);
+  if (ed->poll_status != POLL_STATUS_PENDING) {
+    ed->poll_status = POLL_STATUS_PENDING;
+    queue_event     = ARES_TRUE;
+  }
+  ares__thread_mutex_unlock(ed->lock);
+
+  if (!queue_event) {
+    return;
+  }
+
+  PostQueuedCompletionStatus(ew->iocp_handle, 0, (ULONG_PTR)event->data, NULL);
+}
+
+static void ares_iocpevent_cb(ares_event_thread_t *e, ares_socket_t fd,
+                              void *data, ares_event_flags_t flags)
+{
+  ares_evsys_win32_eventdata_t *ed = data;
+  (void)e;
+  (void)fd;
+  (void)flags;
+  ares__thread_mutex_lock(ed->lock);
+  ed->poll_status = POLL_STATUS_NONE;
+  ares__thread_mutex_unlock(ed->lock);
+}
+
+static ares_event_t *ares_iocpevent_create(ares_event_thread_t *e)
+{
+  ares_event_t *event = NULL;
+  ares_status_t status;
+
+  status =
+    ares_event_update(&event, e, ARES_EVENT_FLAG_OTHER, ares_iocpevent_cb,
+                      ARES_SOCKET_BAD, NULL, NULL, ares_iocpevent_signal);
+  if (status != ARES_SUCCESS) {
+    return NULL;
+  }
+
+  return event;
+}
+
+static void ares_evsys_win32_destroy(ares_event_thread_t *e)
+{
+  ares_evsys_win32_t *ew = NULL;
+
+  if (e == NULL) {
+    return;
+  }
+
+  CARES_DEBUG_LOG("** Win32 Event Destroy\n");
+
+  ew = e->ev_sys_data;
+  if (ew == NULL) {
+    return;
+  }
+
+  ew->is_shutdown = ARES_TRUE;
+  CARES_DEBUG_LOG("  ** waiting on %lu remaining sockets to be destroyed\n",
+                  (unsigned long)ares__htable_vpvp_num_keys(ew->sockets));
+  while (ares__htable_vpvp_num_keys(ew->sockets)) {
+    ares_evsys_win32_wait(e, 0);
+  }
+  CARES_DEBUG_LOG("  ** all sockets cleaned up\n");
+
+
+  if (ew->iocp_handle != NULL) {
+    CloseHandle(ew->iocp_handle);
+  }
+
+  ares__slist_destroy(ew->afd_handles);
+
+  ares__htable_vpvp_destroy(ew->sockets);
+
+  ares_free(ew);
+  e->ev_sys_data = NULL;
+}
+
+typedef struct {
+  size_t poll_cnt;
+  HANDLE afd_handle;
+} ares_afd_handle_t;
+
+static void ares_afd_handle_destroy(void *arg)
+{
+  ares_afd_handle_t *hnd = arg;
+  if (hnd != NULL && hnd->afd_handle != NULL) {
+    CloseHandle(hnd->afd_handle);
+  }
+  ares_free(hnd);
+}
+
+static int ares_afd_handle_cmp(const void *data1, const void *data2)
+{
+  const ares_afd_handle_t *hnd1 = data1;
+  const ares_afd_handle_t *hnd2 = data2;
+
+  if (hnd1->poll_cnt > hnd2->poll_cnt) {
+    return 1;
+  }
+  if (hnd1->poll_cnt < hnd2->poll_cnt) {
+    return -1;
+  }
+  return 0;
+}
+
+static void fill_object_attributes(OBJECT_ATTRIBUTES *attr,
+                                   UNICODE_STRING *name, ULONG attributes)
+{
+  memset(attr, 0, sizeof(*attr));
+  attr->Length     = sizeof(*attr);
+  attr->ObjectName = name;
+  attr->Attributes = attributes;
+}
+
+#  define UNICODE_STRING_CONSTANT(s) \
+    { (sizeof(s) - 1) * sizeof(wchar_t), sizeof(s) * sizeof(wchar_t), L##s }
+
+static ares__slist_node_t *ares_afd_handle_create(ares_evsys_win32_t *ew)
+{
+  UNICODE_STRING     afd_device_name = UNICODE_STRING_CONSTANT("\\Device\\Afd");
+  OBJECT_ATTRIBUTES  afd_attributes;
+  NTSTATUS           status;
+  IO_STATUS_BLOCK    iosb;
+  ares_afd_handle_t *afd   = ares_malloc_zero(sizeof(*afd));
+  ares__slist_node_t *node = NULL;
+  if (afd == NULL) {
+    goto fail;
+  }
+
+  /* Open a handle to the AFD subsystem */
+  fill_object_attributes(&afd_attributes, &afd_device_name, 0);
+  memset(&iosb, 0, sizeof(iosb));
+  iosb.Status = STATUS_PENDING;
+  status      = ew->NtCreateFile(&afd->afd_handle, SYNCHRONIZE, &afd_attributes,
+                                 &iosb, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE,
+                                 FILE_OPEN, 0, NULL, 0);
+  if (status != STATUS_SUCCESS) {
+    CARES_DEBUG_LOG("** Failed to create AFD endpoint\n");
+    goto fail;
+  }
+
+  if (CreateIoCompletionPort(afd->afd_handle, ew->iocp_handle,
+                             0 /* CompletionKey */, 0) == NULL) {
+    goto fail;
+  }
+
+  if (!SetFileCompletionNotificationModes(afd->afd_handle,
+                                          FILE_SKIP_SET_EVENT_ON_HANDLE)) {
+    goto fail;
+  }
+
+  node = ares__slist_insert(ew->afd_handles, afd);
+  if (node == NULL) {
+    goto fail;
+  }
+
+  return node;
+
+fail:
+
+  ares_afd_handle_destroy(afd);
+  return NULL;
+}
+
+/* Fetch the lowest poll count entry, but if it exceeds the limit, create a
+ * new one and return that */
+static ares__slist_node_t *ares_afd_handle_fetch(ares_evsys_win32_t *ew)
+{
+  ares__slist_node_t *node = ares__slist_node_first(ew->afd_handles);
+  ares_afd_handle_t  *afd  = ares__slist_node_val(node);
+
+  if (afd != NULL && afd->poll_cnt < AFD_POLL_PER_HANDLE) {
+    return node;
+  }
+
+  return ares_afd_handle_create(ew);
+}
+
+static ares_bool_t ares_evsys_win32_init(ares_event_thread_t *e)
+{
+  ares_evsys_win32_t *ew = NULL;
+  HMODULE             ntdll;
+
+  CARES_DEBUG_LOG("** Win32 Event Init\n");
+
+  ew = ares_malloc_zero(sizeof(*ew));
+  if (ew == NULL) {
+    return ARES_FALSE;
+  }
+
+  e->ev_sys_data = ew;
+
+  /* All apps should have ntdll.dll already loaded, so just get a handle to
+   * this */
+  ntdll = GetModuleHandleA("ntdll.dll");
+  if (ntdll == NULL) {
+    goto fail;
+  }
+
+#  ifdef __GNUC__
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wpedantic"
+/* Without the (void *) cast we get:
+ *  warning: cast between incompatible function types from 'FARPROC' {aka 'long
+ * long int (*)()'} to 'NTSTATUS (*)(...)'} [-Wcast-function-type] but with it
+ * we get: warning: ISO C forbids conversion of function pointer to object
+ * pointer type [-Wpedantic] look unsolvable short of killing the warning.
+ */
+#  endif
+
+  /* Load Internal symbols not typically accessible */
+  ew->NtCreateFile =
+    (NtCreateFile_t)(void *)GetProcAddress(ntdll, "NtCreateFile");
+  ew->NtDeviceIoControlFile = (NtDeviceIoControlFile_t)(void *)GetProcAddress(
+    ntdll, "NtDeviceIoControlFile");
+  ew->NtCancelIoFileEx =
+    (NtCancelIoFileEx_t)(void *)GetProcAddress(ntdll, "NtCancelIoFileEx");
+
+#  ifdef __GNUC__
+#    pragma GCC diagnostic pop
+#  endif
+
+  if (ew->NtCreateFile == NULL || ew->NtCancelIoFileEx == NULL ||
+      ew->NtDeviceIoControlFile == NULL) {
+    goto fail;
+  }
+
+  ew->iocp_handle = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
+  if (ew->iocp_handle == NULL) {
+    goto fail;
+  }
+
+  ew->afd_handles = ares__slist_create(
+    e->channel->rand_state, ares_afd_handle_cmp, ares_afd_handle_destroy);
+  if (ew->afd_handles == NULL) {
+    goto fail;
+  }
+
+  /* Create at least the first afd handle, so we know of any critical system
+   * issues during startup */
+  if (ares_afd_handle_create(ew) == NULL) {
+    goto fail;
+  }
+
+  e->ev_signal = ares_iocpevent_create(e);
+  if (e->ev_signal == NULL) {
+    goto fail;
+  }
+
+  ew->sockets = ares__htable_vpvp_create(NULL, NULL);
+  if (ew->sockets == NULL) {
+    goto fail;
+  }
+
+  return ARES_TRUE;
+
+fail:
+  ares_evsys_win32_destroy(e);
+  return ARES_FALSE;
+}
+
+static ares_socket_t ares_evsys_win32_basesocket(ares_socket_t socket)
+{
+  while (1) {
+    DWORD         bytes; /* Not used */
+    ares_socket_t base_socket = ARES_SOCKET_BAD;
+    int           rv;
+
+    rv = WSAIoctl(socket, SIO_BASE_HANDLE, NULL, 0, &base_socket,
+                  sizeof(base_socket), &bytes, NULL, NULL);
+    if (rv != SOCKET_ERROR && base_socket != ARES_SOCKET_BAD) {
+      socket = base_socket;
+      break;
+    }
+
+    /* If we're here, an error occurred */
+    if (GetLastError() == WSAENOTSOCK) {
+      /* This is critical, exit */
+      return ARES_SOCKET_BAD;
+    }
+
+    /* Work around known bug in Komodia based LSPs, use ARES_BSP_HANDLE_POLL
+     * to retrieve the underlying socket to then loop and get the base socket:
+     *  https://docs.microsoft.com/en-us/windows/win32/winsock/winsock-ioctls
+     *  https://www.komodia.com/newwiki/index.php?title=Komodia%27s_Redirector_bug_fixes#Version_2.2.2.6
+     */
+    base_socket = ARES_SOCKET_BAD;
+    rv          = WSAIoctl(socket, SIO_BSP_HANDLE_POLL, NULL, 0, &base_socket,
+                           sizeof(base_socket), &bytes, NULL, NULL);
+
+    if (rv != SOCKET_ERROR && base_socket != ARES_SOCKET_BAD &&
+        base_socket != socket) {
+      socket = base_socket;
+      continue; /* loop! */
+    }
+
+    return ARES_SOCKET_BAD;
+  }
+
+  return socket;
+}
+
+static ares_bool_t ares_evsys_win32_afd_enqueue(ares_event_t      *event,
+                                                ares_event_flags_t flags)
+{
+  ares_event_thread_t          *e  = event->e;
+  ares_evsys_win32_t           *ew = e->ev_sys_data;
+  ares_evsys_win32_eventdata_t *ed = event->data;
+  ares_afd_handle_t            *afd;
+  NTSTATUS                      status;
+
+  if (e == NULL || ed == NULL || ew == NULL) {
+    return ARES_FALSE;
+  }
+
+  /* Misuse */
+  if (ed->poll_status != POLL_STATUS_NONE) {
+    return ARES_FALSE;
+  }
+
+  ed->afd_handle_node = ares_afd_handle_fetch(ew);
+  /* System resource issue? */
+  if (ed->afd_handle_node == NULL) {
+    return ARES_FALSE;
+  }
+
+  afd = ares__slist_node_val(ed->afd_handle_node);
+
+  /* Enqueue AFD Poll */
+  ed->afd_poll_info.Exclusive         = FALSE;
+  ed->afd_poll_info.NumberOfHandles   = 1;
+  ed->afd_poll_info.Timeout.QuadPart  = LLONG_MAX;
+  ed->afd_poll_info.Handles[0].Handle = (HANDLE)ed->base_socket;
+  ed->afd_poll_info.Handles[0].Status = 0;
+  ed->afd_poll_info.Handles[0].Events = AFD_POLL_LOCAL_CLOSE;
+
+  if (flags & ARES_EVENT_FLAG_READ) {
+    ed->afd_poll_info.Handles[0].Events |=
+      (AFD_POLL_RECEIVE | AFD_POLL_DISCONNECT | AFD_POLL_ACCEPT |
+       AFD_POLL_ABORT);
+  }
+  if (flags & ARES_EVENT_FLAG_WRITE) {
+    ed->afd_poll_info.Handles[0].Events |=
+      (AFD_POLL_SEND | AFD_POLL_CONNECT_FAIL);
+  }
+  if (flags == 0) {
+    ed->afd_poll_info.Handles[0].Events |= AFD_POLL_DISCONNECT;
+  }
+
+  memset(&ed->iosb, 0, sizeof(ed->iosb));
+  ed->iosb.Status = STATUS_PENDING;
+
+  status = ew->NtDeviceIoControlFile(
+    afd->afd_handle, NULL, NULL, &ed->iosb, &ed->iosb, IOCTL_AFD_POLL,
+    &ed->afd_poll_info, sizeof(ed->afd_poll_info), &ed->afd_poll_info,
+    sizeof(ed->afd_poll_info));
+  if (status != STATUS_SUCCESS && status != STATUS_PENDING) {
+    CARES_DEBUG_LOG("** afd_enqueue ed=%p FAILED\n", (void *)ed);
+    ed->afd_handle_node = NULL;
+    return ARES_FALSE;
+  }
+
+  /* Record that we submitted a poll request to this handle and tell it to
+   * re-sort the node since we changed its sort value */
+  afd->poll_cnt++;
+  ares__slist_node_reinsert(ed->afd_handle_node);
+
+  ed->poll_status = POLL_STATUS_PENDING;
+  CARES_DEBUG_LOG("++ afd_enqueue ed=%p flags=%X\n", (void *)ed,
+                  (unsigned int)flags);
+  return ARES_TRUE;
+}
+
+static ares_bool_t ares_evsys_win32_afd_cancel(ares_evsys_win32_eventdata_t *ed)
+{
+  IO_STATUS_BLOCK     cancel_iosb;
+  ares_evsys_win32_t *ew;
+  NTSTATUS            status;
+  ares_afd_handle_t  *afd;
+
+  ew = ed->event->e->ev_sys_data;
+
+  /* Misuse */
+  if (ed->poll_status != POLL_STATUS_PENDING) {
+    return ARES_FALSE;
+  }
+
+  afd = ares__slist_node_val(ed->afd_handle_node);
+
+  /* Misuse */
+  if (afd == NULL) {
+    return ARES_FALSE;
+  }
+
+  ed->poll_status = POLL_STATUS_CANCEL;
+
+  /* Not pending, nothing to do. Most likely that means there is a pending
+   * event that hasn't yet been delivered otherwise it would be re-armed
+   * already */
+  if (ed->iosb.Status != STATUS_PENDING) {
+    CARES_DEBUG_LOG("** cancel not needed for ed=%p\n", (void *)ed);
+    return ARES_FALSE;
+  }
+
+  status = ew->NtCancelIoFileEx(afd->afd_handle, &ed->iosb, &cancel_iosb);
+
+  CARES_DEBUG_LOG("** Enqueued cancel for ed=%p, status = %lX\n", (void *)ed,
+                  status);
+
+  /* NtCancelIoFileEx() may return STATUS_NOT_FOUND if the operation completed
+   * just before calling NtCancelIoFileEx(), but we have not yet received the
+   * notifiction (but it should be queued for the next IOCP event).  */
+  if (status == STATUS_SUCCESS || status == STATUS_NOT_FOUND) {
+    return ARES_TRUE;
+  }
+
+  return ARES_FALSE;
+}
+
+static void ares_evsys_win32_eventdata_destroy(ares_evsys_win32_t           *ew,
+                                               ares_evsys_win32_eventdata_t *ed)
+{
+  if (ew == NULL || ed == NULL) {
+    return;
+  }
+  CARES_DEBUG_LOG("-- deleting ed=%p (%s)\n", (void *)ed,
+                  (ed->socket == ARES_SOCKET_BAD) ? "data" : "socket");
+  /* These type of handles are deferred destroy. Update tracking. */
+  if (ed->socket != ARES_SOCKET_BAD) {
+    ares__htable_vpvp_remove(ew->sockets, &ed->iosb);
+  }
+
+  ares__thread_mutex_destroy(ed->lock);
+
+  if (ed->event != NULL) {
+    ed->event->data = NULL;
+  }
+
+  ares_free(ed);
+}
+
+static ares_bool_t ares_evsys_win32_event_add(ares_event_t *event)
+{
+  ares_event_thread_t          *e  = event->e;
+  ares_evsys_win32_t           *ew = e->ev_sys_data;
+  ares_evsys_win32_eventdata_t *ed;
+  ares_bool_t                   rc = ARES_FALSE;
+
+  ed              = ares_malloc_zero(sizeof(*ed));
+  ed->event       = event;
+  ed->socket      = event->fd;
+  ed->base_socket = ARES_SOCKET_BAD;
+  event->data     = ed;
+
+  CARES_DEBUG_LOG("++ add ed=%p (%s) flags=%X\n", (void *)ed,
+                  (ed->socket == ARES_SOCKET_BAD) ? "data" : "socket",
+                  (unsigned int)event->flags);
+
+  /* Likely a signal event, not something we will directly handle.  We create
+   * the ares_evsys_win32_eventdata_t as the placeholder to use as the
+   * IOCP Completion Key */
+  if (ed->socket == ARES_SOCKET_BAD) {
+    ed->lock = ares__thread_mutex_create();
+    if (ed->lock == NULL) {
+      goto done;
+    }
+    rc = ARES_TRUE;
+    goto done;
+  }
+
+  ed->base_socket = ares_evsys_win32_basesocket(ed->socket);
+  if (ed->base_socket == ARES_SOCKET_BAD) {
+    goto done;
+  }
+
+  if (!ares__htable_vpvp_insert(ew->sockets, &ed->iosb, ed)) {
+    goto done;
+  }
+
+  if (!ares_evsys_win32_afd_enqueue(event, event->flags)) {
+    goto done;
+  }
+
+  rc = ARES_TRUE;
+
+done:
+  if (!rc) {
+    ares_evsys_win32_eventdata_destroy(ew, ed);
+    event->data = NULL;
+  }
+  return rc;
+}
+
+static void ares_evsys_win32_event_del(ares_event_t *event)
+{
+  ares_evsys_win32_eventdata_t *ed = event->data;
+
+  /* Already cleaned up, likely a LOCAL_CLOSE */
+  if (ed == NULL) {
+    return;
+  }
+
+  CARES_DEBUG_LOG("-- DELETE requested for ed=%p (%s)\n", (void *)ed,
+                  (ed->socket != ARES_SOCKET_BAD) ? "socket" : "data");
+
+  /*
+   * Cancel pending AFD Poll operation.
+   */
+  if (ed->socket != ARES_SOCKET_BAD) {
+    ares_evsys_win32_afd_cancel(ed);
+    ed->poll_status = POLL_STATUS_DESTROY;
+    ed->event       = NULL;
+  } else {
+    ares_evsys_win32_eventdata_destroy(event->e->ev_sys_data, ed);
+  }
+
+  event->data = NULL;
+}
+
+static void ares_evsys_win32_event_mod(ares_event_t      *event,
+                                       ares_event_flags_t new_flags)
+{
+  ares_evsys_win32_eventdata_t *ed = event->data;
+
+  /* Not for us */
+  if (event->fd == ARES_SOCKET_BAD || ed == NULL) {
+    return;
+  }
+
+  CARES_DEBUG_LOG("** mod ed=%p new_flags=%X\n", (void *)ed,
+                  (unsigned int)new_flags);
+
+  /* All we need to do is cancel the pending operation.  When the event gets
+   * delivered for the cancellation, it will automatically re-enqueue a new
+   * event */
+  ares_evsys_win32_afd_cancel(ed);
+}
+
+static ares_bool_t ares_evsys_win32_process_other_event(
+  ares_evsys_win32_t *ew, ares_evsys_win32_eventdata_t *ed, size_t i)
+{
+  ares_event_t *event;
+
+  /* NOTE: do NOT dereference 'ed' if during shutdown as this could be an
+   * invalid pointer if the signal handle was cleaned up, but there was still a
+   * pending event! */
+
+  if (ew->is_shutdown) {
+    CARES_DEBUG_LOG("\t\t** i=%lu, skip non-socket handle during shutdown\n",
+                    (unsigned long)i);
+    return ARES_FALSE;
+  }
+
+  event = ed->event;
+  CARES_DEBUG_LOG("\t\t** i=%lu, ed=%p (data)\n", (unsigned long)i, (void *)ed);
+
+  event->cb(event->e, event->fd, event->data, ARES_EVENT_FLAG_OTHER);
+  return ARES_TRUE;
+}
+
+static ares_bool_t ares_evsys_win32_process_socket_event(
+  ares_evsys_win32_t *ew, ares_evsys_win32_eventdata_t *ed, size_t i)
+{
+  ares_event_flags_t flags = 0;
+  ares_event_t      *event = NULL;
+  ares_afd_handle_t *afd   = NULL;
+
+  /* Shouldn't be possible */
+  if (ed == NULL) {
+    CARES_DEBUG_LOG("\t\t** i=%lu, Invalid handle.\n", (unsigned long)i);
+    return ARES_FALSE;
+  }
+
+  event = ed->event;
+
+  CARES_DEBUG_LOG("\t\t** i=%lu, ed=%p (socket)\n", (unsigned long)i,
+                  (void *)ed);
+
+  /* Process events */
+  if (ed->poll_status == POLL_STATUS_PENDING &&
+      ed->iosb.Status == STATUS_SUCCESS &&
+      ed->afd_poll_info.NumberOfHandles > 0) {
+    if (ed->afd_poll_info.Handles[0].Events &
+        (AFD_POLL_RECEIVE | AFD_POLL_DISCONNECT | AFD_POLL_ACCEPT |
+         AFD_POLL_ABORT)) {
+      flags |= ARES_EVENT_FLAG_READ;
+    }
+    if (ed->afd_poll_info.Handles[0].Events &
+        (AFD_POLL_SEND | AFD_POLL_CONNECT_FAIL)) {
+      flags |= ARES_EVENT_FLAG_WRITE;
+    }
+    if (ed->afd_poll_info.Handles[0].Events & AFD_POLL_LOCAL_CLOSE) {
+      CARES_DEBUG_LOG("\t\t** ed=%p LOCAL CLOSE\n", (void *)ed);
+      ed->poll_status = POLL_STATUS_DESTROY;
+    }
+  }
+
+  CARES_DEBUG_LOG("\t\t** ed=%p, iosb status=%lX, poll_status=%d, flags=%X\n",
+                  (void *)ed, (unsigned long)ed->iosb.Status,
+                  (int)ed->poll_status, (unsigned int)flags);
+
+  /* Decrement poll count for AFD handle then resort, also disassociate
+   * with socket */
+  afd = ares__slist_node_val(ed->afd_handle_node);
+  afd->poll_cnt--;
+  ares__slist_node_reinsert(ed->afd_handle_node);
+  ed->afd_handle_node = NULL;
+
+  /* Pending destroy, go ahead and kill it */
+  if (ed->poll_status == POLL_STATUS_DESTROY) {
+    ares_evsys_win32_eventdata_destroy(ew, ed);
+    return ARES_FALSE;
+  }
+
+  ed->poll_status = POLL_STATUS_NONE;
+
+  /* Mask flags against current desired flags.  We could have an event
+   * queued that is outdated. */
+  flags &= event->flags;
+
+  /* Don't actually do anything with the event that was delivered as we are
+   * in a shutdown/cleanup process.  Mostly just handling the delayed
+   * destruction of sockets */
+  if (ew->is_shutdown) {
+    return ARES_FALSE;
+  }
+
+  /* Re-enqueue so we can get more events on the socket, we either
+   * received a real event, or a cancellation notice.  Both cases we
+   * re-queue using the current configured event flags.
+   *
+   * If we can't re-enqueue, that likely means the socket has been
+   * closed, so we want to kill our reference to it
+   */
+  if (!ares_evsys_win32_afd_enqueue(event, event->flags)) {
+    ares_evsys_win32_eventdata_destroy(ew, ed);
+    return ARES_FALSE;
+  }
+
+  /* No events we recognize to deliver */
+  if (flags == 0) {
+    return ARES_FALSE;
+  }
+
+  event->cb(event->e, event->fd, event->data, flags);
+  return ARES_TRUE;
+}
+
+static size_t ares_evsys_win32_wait(ares_event_thread_t *e,
+                                    unsigned long        timeout_ms)
+{
+  ares_evsys_win32_t *ew = e->ev_sys_data;
+  OVERLAPPED_ENTRY    entries[16];
+  ULONG               maxentries = sizeof(entries) / sizeof(*entries);
+  ULONG               nentries;
+  BOOL                status;
+  size_t              i;
+  size_t              cnt  = 0;
+  DWORD               tout = (timeout_ms == 0) ? INFINITE : (DWORD)timeout_ms;
+
+  CARES_DEBUG_LOG("** Wait Enter\n");
+  /* Process in a loop for as long as it fills the entire entries buffer, and
+   * on subsequent attempts, ensure the timeout is 0 */
+  do {
+    nentries = maxentries;
+    status   = GetQueuedCompletionStatusEx(ew->iocp_handle, entries, nentries,
+                                           &nentries, tout, FALSE);
+
+    /* Next loop around, we want to return instantly if there are no events to
+     * be processed */
+    tout = 0;
+
+    if (!status) {
+      break;
+    }
+
+    CARES_DEBUG_LOG("\t** GetQueuedCompletionStatusEx returned %lu entries\n",
+                    (unsigned long)nentries);
+    for (i = 0; i < (size_t)nentries; i++) {
+      ares_evsys_win32_eventdata_t *ed = NULL;
+      ares_bool_t                   rc;
+
+      /* For things triggered via PostQueuedCompletionStatus() we have an
+       * lpCompletionKey we can just use.  Otherwise we need to dereference the
+       * pointer returned in lpOverlapped to determine the referenced
+       * socket */
+      if (entries[i].lpCompletionKey) {
+        ed = (ares_evsys_win32_eventdata_t *)entries[i].lpCompletionKey;
+        rc = ares_evsys_win32_process_other_event(ew, ed, i);
+      } else {
+        ed = ares__htable_vpvp_get_direct(ew->sockets, entries[i].lpOverlapped);
+        rc = ares_evsys_win32_process_socket_event(ew, ed, i);
+      }
+
+      /* We processed actual events */
+      if (rc) {
+        cnt++;
+      }
+    }
+  } while (nentries == maxentries);
+
+  CARES_DEBUG_LOG("** Wait Exit\n");
+
+  return cnt;
+}
+
+const ares_event_sys_t ares_evsys_win32 = { "win32",
+                                            ares_evsys_win32_init,
+                                            ares_evsys_win32_destroy,
+                                            ares_evsys_win32_event_add,
+                                            ares_evsys_win32_event_del,
+                                            ares_evsys_win32_event_mod,
+                                            ares_evsys_win32_wait };
+#endif
+
+#if defined(__clang__) || defined(__GNUC__)
+#  pragma GCC diagnostic pop
+#endif
diff --git a/contrib/libs/c-ares/src/lib/ares_event_win32.h b/contrib/libs/c-ares/src/lib/event/ares_event_win32.h
similarity index 62%
rename from contrib/libs/c-ares/src/lib/ares_event_win32.h
rename to contrib/libs/c-ares/src/lib/event/ares_event_win32.h
index 99cd5c90f359..5d0274cd85cd 100644
--- a/contrib/libs/c-ares/src/lib/ares_event_win32.h
+++ b/contrib/libs/c-ares/src/lib/event/ares_event_win32.h
@@ -67,17 +67,53 @@ typedef VOID(NTAPI *PIO_APC_ROUTINE)(PVOID            ApcContext,
 #  define STATUS_CANCELLED ((NTSTATUS)0xC0000120L)
 #  define STATUS_NOT_FOUND ((NTSTATUS)0xC0000225L)
 
+typedef struct _UNICODE_STRING {
+  USHORT  Length;
+  USHORT  MaximumLength;
+  LPCWSTR Buffer;
+} UNICODE_STRING, *PUNICODE_STRING;
+
+typedef struct _OBJECT_ATTRIBUTES {
+  ULONG           Length;
+  HANDLE          RootDirectory;
+  PUNICODE_STRING ObjectName;
+  ULONG           Attributes;
+  PVOID           SecurityDescriptor;
+  PVOID           SecurityQualityOfService;
+} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
+
+#  ifndef FILE_OPEN
+#    define FILE_OPEN 0x00000001UL
+#  endif
+
 /* Not sure what headers might have these */
 #  define IOCTL_AFD_POLL 0x00012024
 
-#  define AFD_POLL_RECEIVE           0x0001
-#  define AFD_POLL_RECEIVE_EXPEDITED 0x0002
-#  define AFD_POLL_SEND              0x0004
-#  define AFD_POLL_DISCONNECT        0x0008
-#  define AFD_POLL_ABORT             0x0010
-#  define AFD_POLL_LOCAL_CLOSE       0x0020
-#  define AFD_POLL_ACCEPT            0x0080
-#  define AFD_POLL_CONNECT_FAIL      0x0100
+#  define AFD_POLL_RECEIVE_BIT           0
+#  define AFD_POLL_RECEIVE               (1 << AFD_POLL_RECEIVE_BIT)
+#  define AFD_POLL_RECEIVE_EXPEDITED_BIT 1
+#  define AFD_POLL_RECEIVE_EXPEDITED     (1 << AFD_POLL_RECEIVE_EXPEDITED_BIT)
+#  define AFD_POLL_SEND_BIT              2
+#  define AFD_POLL_SEND                  (1 << AFD_POLL_SEND_BIT)
+#  define AFD_POLL_DISCONNECT_BIT        3
+#  define AFD_POLL_DISCONNECT            (1 << AFD_POLL_DISCONNECT_BIT)
+#  define AFD_POLL_ABORT_BIT             4
+#  define AFD_POLL_ABORT                 (1 << AFD_POLL_ABORT_BIT)
+#  define AFD_POLL_LOCAL_CLOSE_BIT       5
+#  define AFD_POLL_LOCAL_CLOSE           (1 << AFD_POLL_LOCAL_CLOSE_BIT)
+#  define AFD_POLL_CONNECT_BIT           6
+#  define AFD_POLL_CONNECT               (1 << AFD_POLL_CONNECT_BIT)
+#  define AFD_POLL_ACCEPT_BIT            7
+#  define AFD_POLL_ACCEPT                (1 << AFD_POLL_ACCEPT_BIT)
+#  define AFD_POLL_CONNECT_FAIL_BIT      8
+#  define AFD_POLL_CONNECT_FAIL          (1 << AFD_POLL_CONNECT_FAIL_BIT)
+#  define AFD_POLL_QOS_BIT               9
+#  define AFD_POLL_QOS                   (1 << AFD_POLL_QOS_BIT)
+#  define AFD_POLL_GROUP_QOS_BIT         10
+#  define AFD_POLL_GROUP_QOS             (1 << AFD_POLL_GROUP_QOS_BIT)
+
+#  define AFD_NUM_POLL_EVENTS 11
+#  define AFD_POLL_ALL        ((1 << AFD_NUM_POLL_EVENTS) - 1)
 
 typedef struct _AFD_POLL_HANDLE_INFO {
   HANDLE   Handle;
@@ -101,6 +137,12 @@ typedef NTSTATUS(NTAPI *NtDeviceIoControlFile_t)(
   PIO_STATUS_BLOCK IoStatusBlock, ULONG IoControlCode, PVOID InputBuffer,
   ULONG InputBufferLength, PVOID OutputBuffer, ULONG OutputBufferLength);
 
+typedef NTSTATUS(NTAPI *NtCreateFile_t)(
+  PHANDLE FileHandle, ACCESS_MASK DesiredAccess,
+  POBJECT_ATTRIBUTES ObjectAttributes, PIO_STATUS_BLOCK IoStatusBlock,
+  PLARGE_INTEGER AllocationSize, ULONG FileAttributes, ULONG ShareAccess,
+  ULONG CreateDisposition, ULONG CreateOptions, PVOID EaBuffer, ULONG EaLength);
+
 /* On UWP/Windows Store, these definitions aren't there for some reason */
 #  ifndef SIO_BSP_HANDLE_POLL
 #    define SIO_BSP_HANDLE_POLL 0x4800001D
diff --git a/contrib/libs/c-ares/src/lib/inet_net_pton.c b/contrib/libs/c-ares/src/lib/inet_net_pton.c
index 19429f205d86..5356778c47b8 100644
--- a/contrib/libs/c-ares/src/lib/inet_net_pton.c
+++ b/contrib/libs/c-ares/src/lib/inet_net_pton.c
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -29,11 +29,8 @@
 
 #include "ares_nameser.h"
 
-#include "ares.h"
 #include "ares_ipv6.h"
 #include "ares_inet_net_pton.h"
-#include "ares_private.h"
-
 
 const struct ares_in6_addr ares_in6addr_any = { { { 0, 0, 0, 0, 0, 0, 0, 0, 0,
                                                     0, 0, 0, 0, 0, 0, 0 } } };
@@ -72,17 +69,17 @@ static int ares_inet_net_pton_ipv4(const char *src, unsigned char *dst,
   const unsigned char *odst = dst;
 
   ch = *src++;
-  if (ch == '0' && (src[0] == 'x' || src[0] == 'X') && ISASCII(src[1]) &&
-      ISXDIGIT(src[1])) {
+  if (ch == '0' && (src[0] == 'x' || src[0] == 'X') && ares__isascii(src[1]) &&
+      ares__isxdigit(src[1])) {
     /* Hexadecimal: Eat nybble string. */
     if (!size) {
       goto emsgsize;
     }
     dirty = 0;
     src++; /* skip x or X. */
-    while ((ch = *src++) != '\0' && ISASCII(ch) && ISXDIGIT(ch)) {
-      if (ISUPPER(ch)) {
-        ch = tolower(ch);
+    while ((ch = *src++) != '\0' && ares__isascii(ch) && ares__isxdigit(ch)) {
+      if (ares__isupper(ch)) {
+        ch = ares__tolower((unsigned char)ch);
       }
       n = (int)(strchr(xdigits, ch) - xdigits);
       if (dirty == 0) {
@@ -104,7 +101,7 @@ static int ares_inet_net_pton_ipv4(const char *src, unsigned char *dst,
       }
       *dst++ = (unsigned char)(tmp << 4);
     }
-  } else if (ISASCII(ch) && ISDIGIT(ch)) {
+  } else if (ares__isascii(ch) && ares__isdigit(ch)) {
     /* Decimal: eat dotted digit string. */
     for (;;) {
       tmp = 0;
@@ -115,7 +112,7 @@ static int ares_inet_net_pton_ipv4(const char *src, unsigned char *dst,
         if (tmp > 255) {
           goto enoent;
         }
-      } while ((ch = *src++) != '\0' && ISASCII(ch) && ISDIGIT(ch));
+      } while ((ch = *src++) != '\0' && ares__isascii(ch) && ares__isdigit(ch));
       if (!size--) {
         goto emsgsize;
       }
@@ -127,7 +124,7 @@ static int ares_inet_net_pton_ipv4(const char *src, unsigned char *dst,
         goto enoent;
       }
       ch = *src++;
-      if (!ISASCII(ch) || !ISDIGIT(ch)) {
+      if (!ares__isascii(ch) || !ares__isdigit(ch)) {
         goto enoent;
       }
     }
@@ -136,7 +133,8 @@ static int ares_inet_net_pton_ipv4(const char *src, unsigned char *dst,
   }
 
   bits = -1;
-  if (ch == '/' && ISASCII(src[0]) && ISDIGIT(src[0]) && dst > odst) {
+  if (ch == '/' && ares__isascii(src[0]) && ares__isdigit(src[0]) &&
+      dst > odst) {
     /* CIDR width specifier.  Nothing can follow it. */
     ch   = *src++; /* Skip over the /. */
     bits = 0;
@@ -147,7 +145,7 @@ static int ares_inet_net_pton_ipv4(const char *src, unsigned char *dst,
       if (bits > 32) {
         goto enoent;
       }
-    } while ((ch = *src++) != '\0' && ISASCII(ch) && ISDIGIT(ch));
+    } while ((ch = *src++) != '\0' && ares__isascii(ch) && ares__isdigit(ch));
     if (ch != '\0') {
       goto enoent;
     }
diff --git a/contrib/libs/c-ares/src/lib/inet_ntop.c b/contrib/libs/c-ares/src/lib/inet_ntop.c
index 622befa99582..6f96b92ccccd 100644
--- a/contrib/libs/c-ares/src/lib/inet_ntop.c
+++ b/contrib/libs/c-ares/src/lib/inet_ntop.c
@@ -17,7 +17,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -27,12 +27,7 @@
 #endif
 
 #include "ares_nameser.h"
-
-#include "ares.h"
 #include "ares_ipv6.h"
-#include "ares_private.h"
-
-#ifndef HAVE_INET_NTOP
 
 /*
  * WARNING: Don't even consider trying to compile this on a system where
@@ -60,14 +55,14 @@ const char        *ares_inet_ntop(int af, const void *src, char *dst,
 {
   switch (af) {
     case AF_INET:
-      return (inet_ntop4(src, dst, (size_t)size));
+      return inet_ntop4(src, dst, (size_t)size);
     case AF_INET6:
-      return (inet_ntop6(src, dst, (size_t)size));
+      return inet_ntop6(src, dst, (size_t)size);
     default:
-      SET_ERRNO(EAFNOSUPPORT);
-      return (NULL);
+      break;
   }
-  /* NOTREACHED */
+  SET_ERRNO(EAFNOSUPPORT);
+  return NULL;
 }
 
 /* const char *
@@ -86,13 +81,18 @@ static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size)
   static const char fmt[] = "%u.%u.%u.%u";
   char              tmp[sizeof("255.255.255.255")];
 
+  if (size < sizeof(tmp)) {
+    SET_ERRNO(ENOSPC);
+    return NULL;
+  }
+
   if ((size_t)snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]) >=
       size) {
     SET_ERRNO(ENOSPC);
-    return (NULL);
+    return NULL;
   }
   ares_strcpy(dst, tmp, size);
-  return (dst);
+  return dst;
 }
 
 /* const char *
@@ -114,11 +114,12 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size)
   char *tp;
 
   struct {
-    int base, len;
+    ares_ssize_t base;
+    size_t       len;
   } best, cur;
 
   unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];
-  int          i;
+  size_t       i;
 
   /*
    * Preprocess:
@@ -136,7 +137,8 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size)
   for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
     if (words[i] == 0) {
       if (cur.base == -1) {
-        cur.base = i, cur.len = 1;
+        cur.base = (ares_ssize_t)i;
+        cur.len  = 1;
       } else {
         cur.len++;
       }
@@ -164,8 +166,9 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size)
   tp = tmp;
   for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
     /* Are we inside the best run of 0x00's? */
-    if (best.base != -1 && i >= best.base && i < (best.base + best.len)) {
-      if (i == best.base) {
+    if (best.base != -1 && i >= (size_t)best.base &&
+        i < ((size_t)best.base + best.len)) {
+      if (i == (size_t)best.base) {
         *tp++ = ':';
       }
       continue;
@@ -188,7 +191,7 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size)
   }
   /* Was it a trailing run of 0x00's? */
   if (best.base != -1 &&
-      (best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ)) {
+      ((size_t)best.base + best.len) == (NS_IN6ADDRSZ / NS_INT16SZ)) {
     *tp++ = ':';
   }
   *tp++ = '\0';
@@ -198,19 +201,8 @@ static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size)
    */
   if ((size_t)(tp - tmp) > size) {
     SET_ERRNO(ENOSPC);
-    return (NULL);
+    return NULL;
   }
   ares_strcpy(dst, tmp, size);
-  return (dst);
-}
-
-#else  /* HAVE_INET_NTOP */
-
-const char *ares_inet_ntop(int af, const void *src, char *dst,
-                           ares_socklen_t size)
-{
-  /* just relay this to the underlying function */
-  return inet_ntop(af, src, dst, size);
+  return dst;
 }
-
-#endif /* HAVE_INET_NTOP */
diff --git a/contrib/libs/c-ares/src/lib/ares_create_query.c b/contrib/libs/c-ares/src/lib/legacy/ares_create_query.c
similarity index 98%
rename from contrib/libs/c-ares/src/lib/ares_create_query.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_create_query.c
index a2f2caac6e95..f71a71c95136 100644
--- a/contrib/libs/c-ares/src/lib/ares_create_query.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_create_query.c
@@ -24,8 +24,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 static int ares_create_query_int(const char *name, int dnsclass, int type,
diff --git a/contrib/libs/c-ares/src/lib/ares_expand_name.c b/contrib/libs/c-ares/src/lib/legacy/ares_expand_name.c
similarity index 79%
rename from contrib/libs/c-ares/src/lib/ares_expand_name.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_expand_name.c
index 280490b86a33..63bd64516682 100644
--- a/contrib/libs/c-ares/src/lib/ares_expand_name.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_expand_name.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -33,9 +33,6 @@
 
 #include "ares_nameser.h"
 
-#include "ares.h"
-#include "ares_private.h" /* for the memdebug */
-
 ares_status_t ares__expand_name_validated(const unsigned char *encoded,
                                           const unsigned char *abuf,
                                           size_t alen, char **s, size_t *enclen,
@@ -91,8 +88,8 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
   size_t        enclen_temp = 0;
   ares_status_t status;
 
-  if (alen < 0) {
-    return ARES_EBADRESP;
+  if (encoded == NULL || abuf == NULL || alen <= 0 || enclen == NULL) {
+    return ARES_EBADNAME;
   }
 
   status  = ares__expand_name_validated(encoded, abuf, (size_t)alen, s,
@@ -100,19 +97,3 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
   *enclen = (long)enclen_temp;
   return (int)status;
 }
-
-/* Like ares_expand_name_validated  but returns EBADRESP in case of invalid
- * input. */
-ares_status_t ares__expand_name_for_response(const unsigned char *encoded,
-                                             const unsigned char *abuf,
-                                             size_t alen, char **s,
-                                             size_t     *enclen,
-                                             ares_bool_t is_hostname)
-{
-  ares_status_t status =
-    ares__expand_name_validated(encoded, abuf, alen, s, enclen, is_hostname);
-  if (status == ARES_EBADNAME) {
-    status = ARES_EBADRESP;
-  }
-  return status;
-}
diff --git a/contrib/libs/c-ares/src/lib/ares_expand_string.c b/contrib/libs/c-ares/src/lib/legacy/ares_expand_string.c
similarity index 94%
rename from contrib/libs/c-ares/src/lib/ares_expand_string.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_expand_string.c
index be7034e2719d..b3e99daa54b3 100644
--- a/contrib/libs/c-ares/src/lib/ares_expand_string.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_expand_string.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -33,9 +33,6 @@
 
 #include "ares_nameser.h"
 
-#include "ares.h"
-#include "ares_private.h" /* for the memdebug */
-
 /* Simply decodes a length-encoded character string. The first byte of the
  * input is the length of the string to be returned and the bytes thereafter
  * are the characters of the string. The returned result will be NULL
@@ -77,8 +74,7 @@ ares_status_t ares_expand_string_ex(const unsigned char *encoded,
   }
 
   start_len = ares__buf_len(buf);
-  status =
-    ares__buf_parse_dns_binstr(buf, ares__buf_len(buf), s, &len, ARES_FALSE);
+  status    = ares__buf_parse_dns_binstr(buf, ares__buf_len(buf), s, &len);
   /* hrm, no way to pass back 'len' with the prototype */
   if (status != ARES_SUCCESS) {
     goto done;
@@ -100,7 +96,7 @@ int ares_expand_string(const unsigned char *encoded, const unsigned char *abuf,
   ares_status_t status;
   size_t        temp_enclen = 0;
 
-  if (alen < 0) {
+  if (encoded == NULL || abuf == NULL || alen <= 0 || enclen == NULL) {
     return ARES_EBADRESP;
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_fds.c b/contrib/libs/c-ares/src/lib/legacy/ares_fds.c
similarity index 88%
rename from contrib/libs/c-ares/src/lib/ares_fds.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_fds.c
index e39823304a70..3aedd2c90e23 100644
--- a/contrib/libs/c-ares/src/lib/ares_fds.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_fds.c
@@ -25,9 +25,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include "ares.h"
 #include "ares_private.h"
 
 int ares_fds(const ares_channel_t *channel, fd_set *read_fds, fd_set *write_fds)
@@ -48,14 +45,14 @@ int ares_fds(const ares_channel_t *channel, fd_set *read_fds, fd_set *write_fds)
   nfds = 0;
   for (snode = ares__slist_node_first(channel->servers); snode != NULL;
        snode = ares__slist_node_next(snode)) {
-    struct server_state *server = ares__slist_node_val(snode);
-    ares__llist_node_t  *node;
+    ares_server_t      *server = ares__slist_node_val(snode);
+    ares__llist_node_t *node;
 
     for (node = ares__llist_node_first(server->connections); node != NULL;
          node = ares__llist_node_next(node)) {
-      const struct server_connection *conn = ares__llist_node_val(node);
+      const ares_conn_t *conn = ares__llist_node_val(node);
 
-      if (!active_queries && !conn->is_tcp) {
+      if (!active_queries && !(conn->flags & ARES_CONN_FLAG_TCP)) {
         continue;
       }
 
@@ -72,7 +69,7 @@ int ares_fds(const ares_channel_t *channel, fd_set *read_fds, fd_set *write_fds)
       }
 
       /* TCP only wait on write if we have buffered data */
-      if (conn->is_tcp && ares__buf_len(server->tcp_send)) {
+      if (conn->flags & ARES_CONN_FLAG_TCP && ares__buf_len(server->tcp_send)) {
         FD_SET(conn->fd, write_fds);
       }
     }
diff --git a/contrib/libs/c-ares/src/lib/ares_getsock.c b/contrib/libs/c-ares/src/lib/legacy/ares_getsock.c
similarity index 87%
rename from contrib/libs/c-ares/src/lib/ares_getsock.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_getsock.c
index b64c075572de..8c8476fa9510 100644
--- a/contrib/libs/c-ares/src/lib/ares_getsock.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_getsock.c
@@ -24,9 +24,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-
-#include "ares.h"
 #include "ares_private.h"
 
 int ares_getsock(const ares_channel_t *channel, ares_socket_t *socks,
@@ -50,12 +47,12 @@ int ares_getsock(const ares_channel_t *channel, ares_socket_t *socks,
 
   for (snode = ares__slist_node_first(channel->servers); snode != NULL;
        snode = ares__slist_node_next(snode)) {
-    struct server_state *server = ares__slist_node_val(snode);
-    ares__llist_node_t  *node;
+    ares_server_t      *server = ares__slist_node_val(snode);
+    ares__llist_node_t *node;
 
     for (node = ares__llist_node_first(server->connections); node != NULL;
          node = ares__llist_node_next(node)) {
-      const struct server_connection *conn = ares__llist_node_val(node);
+      const ares_conn_t *conn = ares__llist_node_val(node);
 
       if (sockindex >= (size_t)numsocks || sockindex >= ARES_GETSOCK_MAXNUM) {
         break;
@@ -64,17 +61,17 @@ int ares_getsock(const ares_channel_t *channel, ares_socket_t *socks,
       /* We only need to register interest in UDP sockets if we have
        * outstanding queries.
        */
-      if (!active_queries && !conn->is_tcp) {
+      if (!active_queries && !(conn->flags & ARES_CONN_FLAG_TCP)) {
         continue;
       }
 
       socks[sockindex] = conn->fd;
 
-      if (active_queries || conn->is_tcp) {
+      if (active_queries || conn->flags & ARES_CONN_FLAG_TCP) {
         bitmap |= ARES_GETSOCK_READABLE(setbits, sockindex);
       }
 
-      if (conn->is_tcp && ares__buf_len(server->tcp_send)) {
+      if (conn->flags & ARES_CONN_FLAG_TCP && ares__buf_len(server->tcp_send)) {
         /* then the tcp socket is also writable! */
         bitmap |= ARES_GETSOCK_WRITABLE(setbits, sockindex);
       }
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_a_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_a_reply.c
similarity index 96%
rename from contrib/libs/c-ares/src/lib/ares_parse_a_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_a_reply.c
index da841f0da9af..0981b90eeaf5 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_a_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_a_reply.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -37,8 +37,6 @@
 #  include <arpa/inet.h>
 #endif
 
-#include "ares_nameser.h"
-
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif
@@ -47,10 +45,6 @@
 #  include <limits.h>
 #endif
 
-#include "ares.h"
-#include "ares_dns.h"
-#include "ares_private.h"
-
 int ares_parse_a_reply(const unsigned char *abuf, int alen,
                        struct hostent **host, struct ares_addrttl *addrttls,
                        int *naddrttls)
@@ -85,7 +79,7 @@ int ares_parse_a_reply(const unsigned char *abuf, int alen,
   if (host != NULL) {
     status = ares__addrinfo2hostent(&ai, AF_INET, host);
     if (status != ARES_SUCCESS && status != ARES_ENODATA) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_aaaa_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_aaaa_reply.c
similarity index 96%
rename from contrib/libs/c-ares/src/lib/ares_parse_aaaa_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_aaaa_reply.c
index b3eba166be6a..3f6932643b24 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_aaaa_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_aaaa_reply.c
@@ -26,7 +26,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -38,8 +38,6 @@
 #  include <arpa/inet.h>
 #endif
 
-#include "ares_nameser.h"
-
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif
@@ -48,10 +46,7 @@
 #  include <limits.h>
 #endif
 
-#include "ares.h"
-#include "ares_dns.h"
 #include "ares_inet_net_pton.h"
-#include "ares_private.h"
 
 int ares_parse_aaaa_reply(const unsigned char *abuf, int alen,
                           struct hostent **host, struct ares_addr6ttl *addrttls,
@@ -87,7 +82,7 @@ int ares_parse_aaaa_reply(const unsigned char *abuf, int alen,
   if (host != NULL) {
     status = ares__addrinfo2hostent(&ai, AF_INET6, host);
     if (status != ARES_SUCCESS && status != ARES_ENODATA) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_caa_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_caa_reply.c
similarity index 85%
rename from contrib/libs/c-ares/src/lib/ares_parse_caa_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_caa_reply.c
index 6c30305ee189..f74358f45669 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_caa_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_caa_reply.c
@@ -24,10 +24,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
-#include "ares_data.h"
 #include "ares_private.h"
+#include "ares_data.h"
 
 int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
                          struct ares_caa_reply **caa_out)
@@ -66,8 +64,8 @@ int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     /* XXX: Why do we allow Chaos class? */
@@ -84,8 +82,8 @@ int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this CAA answer appending it to the list */
     caa_curr = ares_malloc_data(ARES_DATATYPE_CAA_REPLY);
     if (caa_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -100,8 +98,8 @@ int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
     caa_curr->property =
       (unsigned char *)ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_CAA_TAG));
     if (caa_curr->property == NULL) {
-      status = ARES_ENOMEM;
-      break;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      break;                /* LCOV_EXCL_LINE: OutOfMemory */
     }
     /* RFC6844 says this can only be ascii, so not sure why we're recording a
      * length */
@@ -109,15 +107,15 @@ int ares_parse_caa_reply(const unsigned char *abuf, int alen_int,
 
     ptr = ares_dns_rr_get_bin(rr, ARES_RR_CAA_VALUE, &ptr_len);
     if (ptr == NULL) {
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     /* Wants NULL termination for some reason */
     caa_curr->value = ares_malloc(ptr_len + 1);
     if (caa_curr->value == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
     memcpy(caa_curr->value, ptr, ptr_len);
     caa_curr->value[ptr_len] = 0;
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_mx_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_mx_reply.c
similarity index 88%
rename from contrib/libs/c-ares/src/lib/ares_parse_mx_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_mx_reply.c
index db7155d2e8fe..480074f670c6 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_mx_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_mx_reply.c
@@ -24,10 +24,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
-#include "ares_data.h"
 #include "ares_private.h"
+#include "ares_data.h"
 
 int ares_parse_mx_reply(const unsigned char *abuf, int alen_int,
                         struct ares_mx_reply **mx_out)
@@ -64,8 +62,8 @@ int ares_parse_mx_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -76,8 +74,8 @@ int ares_parse_mx_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this MX answer appending it to the list */
     mx_curr = ares_malloc_data(ARES_DATATYPE_MX_REPLY);
     if (mx_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -92,8 +90,8 @@ int ares_parse_mx_reply(const unsigned char *abuf, int alen_int,
     mx_curr->host = ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_MX_EXCHANGE));
 
     if (mx_curr->host == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_naptr_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_naptr_reply.c
similarity index 83%
rename from contrib/libs/c-ares/src/lib/ares_parse_naptr_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_naptr_reply.c
index 1a304ccdd3a1..c00ce710666a 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_naptr_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_naptr_reply.c
@@ -23,10 +23,8 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
-#include "ares_data.h"
 #include "ares_private.h"
+#include "ares_data.h"
 
 int ares_parse_naptr_reply(const unsigned char *abuf, int alen_int,
                            struct ares_naptr_reply **naptr_out)
@@ -63,8 +61,8 @@ int ares_parse_naptr_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -75,8 +73,8 @@ int ares_parse_naptr_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this NAPTR answer appending it to the list */
     naptr_curr = ares_malloc_data(ARES_DATATYPE_NAPTR_REPLY);
     if (naptr_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -94,28 +92,28 @@ int ares_parse_naptr_reply(const unsigned char *abuf, int alen_int,
     naptr_curr->flags = (unsigned char *)ares_strdup(
       ares_dns_rr_get_str(rr, ARES_RR_NAPTR_FLAGS));
     if (naptr_curr->flags == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
     /* XXX: Why is this unsigned char * ? */
     naptr_curr->service = (unsigned char *)ares_strdup(
       ares_dns_rr_get_str(rr, ARES_RR_NAPTR_SERVICES));
     if (naptr_curr->service == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
     /* XXX: Why is this unsigned char * ? */
     naptr_curr->regexp = (unsigned char *)ares_strdup(
       ares_dns_rr_get_str(rr, ARES_RR_NAPTR_REGEXP));
     if (naptr_curr->regexp == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
     naptr_curr->replacement =
       ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_NAPTR_REPLACEMENT));
     if (naptr_curr->replacement == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_ns_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_ns_reply.c
similarity index 82%
rename from contrib/libs/c-ares/src/lib/ares_parse_ns_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_ns_reply.c
index 18fda82f4121..fc9ab9219d39 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_ns_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_ns_reply.c
@@ -24,7 +24,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -36,9 +36,6 @@
 #  include <arpa/inet.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
-
 int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
                         struct hostent **host)
 {
@@ -73,16 +70,16 @@ int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
   /* Response structure */
   hostent = ares_malloc(sizeof(*hostent));
   if (hostent == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memset(hostent, 0, sizeof(*hostent));
 
   hostent->h_addr_list = ares_malloc(sizeof(*hostent->h_addr_list));
   if (hostent->h_addr_list == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
   hostent->h_addr_list[0] = NULL;
   hostent->h_addrtype     = AF_INET;
@@ -91,19 +88,19 @@ int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
   /* Fill in hostname */
   status = ares_dns_record_query_get(dnsrec, 0, &hostname, NULL, NULL);
   if (status != ARES_SUCCESS) {
-    goto done;
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   hostent->h_name = ares_strdup(hostname);
   if (hostent->h_name == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Preallocate the maximum number + 1 */
   hostent->h_aliases = ares_malloc((ancount + 1) * sizeof(*hostent->h_aliases));
   if (hostent->h_aliases == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
   memset(hostent->h_aliases, 0, (ancount + 1) * sizeof(*hostent->h_aliases));
 
@@ -113,8 +110,8 @@ int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -124,8 +121,8 @@ int ares_parse_ns_reply(const unsigned char *abuf, int alen_int,
 
     hostname = ares_dns_rr_get_str(rr, ARES_RR_NS_NSDNAME);
     if (hostname == NULL) {
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     hostent->h_aliases[nscount] = ares_strdup(hostname);
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_ptr_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_ptr_reply.c
similarity index 91%
rename from contrib/libs/c-ares/src/lib/ares_parse_ptr_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_ptr_reply.c
index 6ee20f722e3d..56a7b5f94eb3 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_ptr_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_ptr_reply.c
@@ -24,7 +24,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
@@ -33,8 +33,6 @@
 #  include <netdb.h>
 #endif
 
-#include "ares.h"
-#include "ares_private.h"
 
 ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
                                           const void *addr, int addrlen,
@@ -105,8 +103,8 @@ ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN) {
@@ -117,8 +115,8 @@ ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
     if (ares_dns_rr_get_type(rr) == ARES_REC_TYPE_CNAME) {
       ptrname = ares_dns_rr_get_str(rr, ARES_RR_CNAME_CNAME);
       if (ptrname == NULL) {
-        status = ARES_EBADRESP;
-        goto done;
+        status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+        goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
       }
     }
 
@@ -145,8 +143,8 @@ ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
     /* Save most recent PTR record as the hostname */
     hostname = ares_dns_rr_get_str(rr, ARES_RR_PTR_DNAME);
     if (hostname == NULL) {
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     /* Append as an alias */
@@ -168,8 +166,8 @@ ares_status_t ares_parse_ptr_reply_dnsrec(const ares_dns_record_t *dnsrec,
   /* Fill in hostname */
   hostent->h_name = ares_strdup(hostname);
   if (hostent->h_name == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
 done:
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_soa_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_soa_reply.c
similarity index 86%
rename from contrib/libs/c-ares/src/lib/ares_parse_soa_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_soa_reply.c
index 2777dbcb0bbe..46b40dedc4d3 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_soa_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_soa_reply.c
@@ -24,10 +24,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
-#include "ares_data.h"
 #include "ares_private.h"
+#include "ares_data.h"
 
 int ares_parse_soa_reply(const unsigned char *abuf, int alen_int,
                          struct ares_soa_reply **soa_out)
@@ -62,8 +60,8 @@ int ares_parse_soa_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -74,8 +72,8 @@ int ares_parse_soa_reply(const unsigned char *abuf, int alen_int,
     /* allocate result struct */
     soa = ares_malloc_data(ARES_DATATYPE_SOA_REPLY);
     if (soa == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     soa->serial  = ares_dns_rr_get_u32(rr, ARES_RR_SOA_SERIAL);
@@ -85,13 +83,13 @@ int ares_parse_soa_reply(const unsigned char *abuf, int alen_int,
     soa->minttl  = ares_dns_rr_get_u32(rr, ARES_RR_SOA_MINIMUM);
     soa->nsname  = ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_SOA_MNAME));
     if (soa->nsname == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
     soa->hostmaster = ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_SOA_RNAME));
     if (soa->hostmaster == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
     break;
   }
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_srv_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_srv_reply.c
similarity index 89%
rename from contrib/libs/c-ares/src/lib/ares_parse_srv_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_srv_reply.c
index f27bcce7330e..3f9fd95ebf68 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_srv_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_srv_reply.c
@@ -24,10 +24,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
-#include "ares_data.h"
 #include "ares_private.h"
+#include "ares_data.h"
 
 int ares_parse_srv_reply(const unsigned char *abuf, int alen_int,
                          struct ares_srv_reply **srv_out)
@@ -64,8 +62,8 @@ int ares_parse_srv_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -76,8 +74,8 @@ int ares_parse_srv_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this SRV answer appending it to the list */
     srv_curr = ares_malloc_data(ARES_DATATYPE_SRV_REPLY);
     if (srv_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
@@ -96,8 +94,8 @@ int ares_parse_srv_reply(const unsigned char *abuf, int alen_int,
     srv_curr->host = ares_strdup(ares_dns_rr_get_str(rr, ARES_RR_SRV_TARGET));
 
     if (srv_curr->host == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_txt_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_txt_reply.c
similarity index 69%
rename from contrib/libs/c-ares/src/lib/ares_parse_txt_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_txt_reply.c
index 85c3644b8cbf..71ee0841119b 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_txt_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_txt_reply.c
@@ -24,10 +24,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
-#include "ares_data.h"
 #include "ares_private.h"
+#include "ares_data.h"
 
 static int ares__parse_txt_reply(const unsigned char *abuf, size_t alen,
                                  ares_bool_t ex, void **txt_out)
@@ -54,13 +52,14 @@ static int ares__parse_txt_reply(const unsigned char *abuf, size_t alen,
   for (i = 0; i < ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER); i++) {
     const ares_dns_rr_t *rr =
       ares_dns_record_rr_get(dnsrec, ARES_SECTION_ANSWER, i);
-    const unsigned char *ptr;
-    size_t               ptr_len;
+    size_t j;
+    size_t cnt;
+
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     /* XXX: Why Chaos? */
@@ -70,37 +69,44 @@ static int ares__parse_txt_reply(const unsigned char *abuf, size_t alen,
       continue;
     }
 
-    /* Allocate storage for this TXT answer appending it to the list */
-    txt_curr =
-      ares_malloc_data(ex ? ARES_DATATYPE_TXT_EXT : ARES_DATATYPE_TXT_REPLY);
-    if (txt_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
-    }
-
-    /* Link in the record */
-    if (txt_last) {
-      txt_last->next = txt_curr;
-    } else {
-      txt_head = txt_curr;
-    }
-    txt_last = txt_curr;
-
-    /* These days, records are joined, always tag as start */
-    if (ex) {
-      txt_curr->record_start = 1;
-    }
-
-    ptr = ares_dns_rr_get_bin(rr, ARES_RR_TXT_DATA, &ptr_len);
-
-    txt_curr->txt = ares_malloc(ptr_len + 1);
-    if (txt_curr->txt == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+    cnt = ares_dns_rr_get_abin_cnt(rr, ARES_RR_TXT_DATA);
+
+    for (j = 0; j < cnt; j++) {
+      const unsigned char *ptr;
+      size_t               ptr_len;
+
+      /* Allocate storage for this TXT answer appending it to the list */
+      txt_curr =
+        ares_malloc_data(ex ? ARES_DATATYPE_TXT_EXT : ARES_DATATYPE_TXT_REPLY);
+      if (txt_curr == NULL) {
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
+      }
+
+      /* Link in the record */
+      if (txt_last) {
+        txt_last->next = txt_curr;
+      } else {
+        txt_head = txt_curr;
+      }
+      txt_last = txt_curr;
+
+      /* Tag start on first for each TXT record */
+      if (ex && j == 0) {
+        txt_curr->record_start = 1;
+      }
+
+      ptr = ares_dns_rr_get_abin(rr, ARES_RR_TXT_DATA, j, &ptr_len);
+
+      txt_curr->txt = ares_malloc(ptr_len + 1);
+      if (txt_curr->txt == NULL) {
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
+      }
+      memcpy(txt_curr->txt, ptr, ptr_len);
+      txt_curr->txt[ptr_len] = 0;
+      txt_curr->length       = ptr_len;
     }
-    memcpy(txt_curr->txt, ptr, ptr_len);
-    txt_curr->txt[ptr_len] = 0;
-    txt_curr->length       = ptr_len;
   }
 
 done:
diff --git a/contrib/libs/c-ares/src/lib/ares_parse_uri_reply.c b/contrib/libs/c-ares/src/lib/legacy/ares_parse_uri_reply.c
similarity index 92%
rename from contrib/libs/c-ares/src/lib/ares_parse_uri_reply.c
rename to contrib/libs/c-ares/src/lib/legacy/ares_parse_uri_reply.c
index bff7023f78a2..317e204d5d80 100644
--- a/contrib/libs/c-ares/src/lib/ares_parse_uri_reply.c
+++ b/contrib/libs/c-ares/src/lib/legacy/ares_parse_uri_reply.c
@@ -24,10 +24,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
-#include "ares_data.h"
 #include "ares_private.h"
+#include "ares_data.h"
 
 int ares_parse_uri_reply(const unsigned char *abuf, int alen_int,
                          struct ares_uri_reply **uri_out)
@@ -64,8 +62,8 @@ int ares_parse_uri_reply(const unsigned char *abuf, int alen_int,
 
     if (rr == NULL) {
       /* Shouldn't be possible */
-      status = ARES_EBADRESP;
-      goto done;
+      status = ARES_EBADRESP; /* LCOV_EXCL_LINE: DefensiveCoding */
+      goto done;              /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (ares_dns_rr_get_class(rr) != ARES_CLASS_IN ||
@@ -76,8 +74,8 @@ int ares_parse_uri_reply(const unsigned char *abuf, int alen_int,
     /* Allocate storage for this URI answer appending it to the list */
     uri_curr = ares_malloc_data(ARES_DATATYPE_URI_REPLY);
     if (uri_curr == NULL) {
-      status = ARES_ENOMEM;
-      goto done;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Link in the record */
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_mapping.c b/contrib/libs/c-ares/src/lib/record/ares_dns_mapping.c
similarity index 96%
rename from contrib/libs/c-ares/src/lib/ares_dns_mapping.c
rename to contrib/libs/c-ares/src/lib/record/ares_dns_mapping.c
index 6c4362f000b7..738d2f3795ab 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_mapping.c
+++ b/contrib/libs/c-ares/src/lib/record/ares_dns_mapping.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 ares_bool_t ares_dns_opcode_isvalid(ares_dns_opcode_t opcode)
@@ -518,9 +516,11 @@ ares_dns_datatype_t ares_dns_rr_key_datatype(ares_dns_rr_key_t key)
       return ARES_DATATYPE_U8;
 
     case ARES_RR_CAA_VALUE:
-    case ARES_RR_TXT_DATA:
       return ARES_DATATYPE_BINP;
 
+    case ARES_RR_TXT_DATA:
+      return ARES_DATATYPE_ABINP;
+
     case ARES_RR_SIG_SIGNATURE:
     case ARES_RR_TLSA_DATA:
     case ARES_RR_RAW_RR_DATA:
@@ -548,18 +548,14 @@ static const ares_dns_rr_key_t rr_hinfo_keys[] = { ARES_RR_HINFO_CPU,
                                                    ARES_RR_HINFO_OS };
 static const ares_dns_rr_key_t rr_mx_keys[]    = { ARES_RR_MX_PREFERENCE,
                                                    ARES_RR_MX_EXCHANGE };
-static const ares_dns_rr_key_t rr_sig_keys[]   = { ARES_RR_SIG_TYPE_COVERED,
-                                                   ARES_RR_SIG_ALGORITHM,
-                                                   ARES_RR_SIG_LABELS,
-                                                   ARES_RR_SIG_ORIGINAL_TTL,
-                                                   ARES_RR_SIG_EXPIRATION,
-                                                   ARES_RR_SIG_INCEPTION,
-                                                   ARES_RR_SIG_KEY_TAG,
-                                                   ARES_RR_SIG_SIGNERS_NAME,
-                                                   ARES_RR_SIG_SIGNATURE };
-static const ares_dns_rr_key_t rr_txt_keys[]   = { ARES_RR_TXT_DATA };
-static const ares_dns_rr_key_t rr_aaaa_keys[]  = { ARES_RR_AAAA_ADDR };
-static const ares_dns_rr_key_t rr_srv_keys[]   = {
+static const ares_dns_rr_key_t rr_sig_keys[]   = {
+  ARES_RR_SIG_TYPE_COVERED, ARES_RR_SIG_ALGORITHM,    ARES_RR_SIG_LABELS,
+  ARES_RR_SIG_ORIGINAL_TTL, ARES_RR_SIG_EXPIRATION,   ARES_RR_SIG_INCEPTION,
+  ARES_RR_SIG_KEY_TAG,      ARES_RR_SIG_SIGNERS_NAME, ARES_RR_SIG_SIGNATURE
+};
+static const ares_dns_rr_key_t rr_txt_keys[]  = { ARES_RR_TXT_DATA };
+static const ares_dns_rr_key_t rr_aaaa_keys[] = { ARES_RR_AAAA_ADDR };
+static const ares_dns_rr_key_t rr_srv_keys[]  = {
   ARES_RR_SRV_PRIORITY, ARES_RR_SRV_WEIGHT, ARES_RR_SRV_PORT, ARES_RR_SRV_TARGET
 };
 static const ares_dns_rr_key_t rr_naptr_keys[] = {
diff --git a/contrib/libs/c-ares/src/lib/record/ares_dns_multistring.c b/contrib/libs/c-ares/src/lib/record/ares_dns_multistring.c
new file mode 100644
index 000000000000..bff5afb9f2a0
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/record/ares_dns_multistring.c
@@ -0,0 +1,224 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#include "ares_private.h"
+#include "ares_dns_private.h"
+
+typedef struct {
+  unsigned char *data;
+  size_t         len;
+} multistring_data_t;
+
+struct ares__dns_multistring {
+  /*! whether or not cached concatenated string is valid */
+  ares_bool_t    cache_invalidated;
+  /*! combined/concatenated string cache */
+  unsigned char *cache_str;
+  /*! length of combined/concatenated string */
+  size_t         cache_str_len;
+  /*! Data making up strings */
+  ares__array_t *strs; /*!< multistring_data_t type */
+};
+
+static void ares__dns_multistring_free_cb(void *arg)
+{
+  multistring_data_t *data = arg;
+  if (data == NULL) {
+    return;
+  }
+  ares_free(data->data);
+}
+
+ares__dns_multistring_t *ares__dns_multistring_create(void)
+{
+  ares__dns_multistring_t *strs = ares_malloc_zero(sizeof(*strs));
+  if (strs == NULL) {
+    return NULL;
+  }
+
+  strs->strs = ares__array_create(sizeof(multistring_data_t),
+                                  ares__dns_multistring_free_cb);
+  if (strs->strs == NULL) {
+    ares_free(strs);
+    return NULL;
+  }
+
+  return strs;
+}
+
+void ares__dns_multistring_clear(ares__dns_multistring_t *strs)
+{
+  if (strs == NULL) {
+    return;
+  }
+
+  while (ares__array_len(strs->strs)) {
+    ares__array_remove_last(strs->strs);
+  }
+}
+
+void ares__dns_multistring_destroy(ares__dns_multistring_t *strs)
+{
+  if (strs == NULL) {
+    return;
+  }
+  ares__dns_multistring_clear(strs);
+  ares__array_destroy(strs->strs);
+  ares_free(strs->cache_str);
+  ares_free(strs);
+}
+
+ares_status_t ares__dns_multistring_replace_own(ares__dns_multistring_t *strs,
+                                                size_t idx, unsigned char *str,
+                                                size_t len)
+{
+  multistring_data_t *data;
+
+  if (strs == NULL || str == NULL || len == 0) {
+    return ARES_EFORMERR;
+  }
+
+  strs->cache_invalidated = ARES_TRUE;
+
+  data = ares__array_at(strs->strs, idx);
+  if (data == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  ares_free(data->data);
+  data->data = str;
+  data->len  = len;
+  return ARES_SUCCESS;
+}
+
+ares_status_t ares__dns_multistring_del(ares__dns_multistring_t *strs,
+                                        size_t                   idx)
+{
+  if (strs == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  strs->cache_invalidated = ARES_TRUE;
+
+  return ares__array_remove_at(strs->strs, idx);
+}
+
+ares_status_t ares__dns_multistring_add_own(ares__dns_multistring_t *strs,
+                                            unsigned char *str, size_t len)
+{
+  multistring_data_t *data;
+  ares_status_t       status;
+
+  if (strs == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  strs->cache_invalidated = ARES_TRUE;
+
+  /* NOTE: its ok to have an empty string added */
+  if (str == NULL && len != 0) {
+    return ARES_EFORMERR;
+  }
+
+  status = ares__array_insert_last((void **)&data, strs->strs);
+  if (status != ARES_SUCCESS) {
+    return status;
+  }
+
+  data->data = str;
+  data->len  = len;
+
+  return ARES_SUCCESS;
+}
+
+size_t ares__dns_multistring_cnt(const ares__dns_multistring_t *strs)
+{
+  if (strs == NULL) {
+    return 0;
+  }
+  return ares__array_len(strs->strs);
+}
+
+const unsigned char *
+  ares__dns_multistring_get(const ares__dns_multistring_t *strs, size_t idx,
+                            size_t *len)
+{
+  const multistring_data_t *data;
+
+  if (strs == NULL || len == NULL) {
+    return NULL;
+  }
+
+  data = ares__array_at_const(strs->strs, idx);
+  if (data == NULL) {
+    return NULL;
+  }
+
+  *len = data->len;
+  return data->data;
+}
+
+const unsigned char *
+  ares__dns_multistring_get_combined(ares__dns_multistring_t *strs, size_t *len)
+{
+  ares__buf_t *buf = NULL;
+  size_t       i;
+
+  if (strs == NULL || len == NULL) {
+    return NULL;
+  }
+
+  *len = 0;
+
+  /* Return cache if possible */
+  if (!strs->cache_invalidated) {
+    *len = strs->cache_str_len;
+    return strs->cache_str;
+  }
+
+  /* Clear cache */
+  ares_free(strs->cache_str);
+  strs->cache_str     = NULL;
+  strs->cache_str_len = 0;
+
+  buf = ares__buf_create();
+
+  for (i = 0; i < ares__array_len(strs->strs); i++) {
+    const multistring_data_t *data = ares__array_at_const(strs->strs, i);
+    if (data == NULL ||
+        ares__buf_append(buf, data->data, data->len) != ARES_SUCCESS) {
+      ares__buf_destroy(buf);
+      return NULL;
+    }
+  }
+
+  strs->cache_str =
+    (unsigned char *)ares__buf_finish_str(buf, &strs->cache_str_len);
+  if (strs->cache_str != NULL) {
+    strs->cache_invalidated = ARES_FALSE;
+  }
+  *len = strs->cache_str_len;
+  return strs->cache_str;
+}
diff --git a/contrib/libs/c-ares/src/lib/record/ares_dns_multistring.h b/contrib/libs/c-ares/src/lib/record/ares_dns_multistring.h
new file mode 100644
index 000000000000..d9aa7ae37847
--- /dev/null
+++ b/contrib/libs/c-ares/src/lib/record/ares_dns_multistring.h
@@ -0,0 +1,50 @@
+/* MIT License
+ *
+ * Copyright (c) 2024 Brad House
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#ifndef __ARES_DNS_MULTISTRING_H
+#define __ARES_DNS_MULTISTRING_H
+
+struct ares__dns_multistring;
+typedef struct ares__dns_multistring ares__dns_multistring_t;
+
+ares__dns_multistring_t             *ares__dns_multistring_create(void);
+void          ares__dns_multistring_clear(ares__dns_multistring_t *strs);
+void          ares__dns_multistring_destroy(ares__dns_multistring_t *strs);
+ares_status_t ares__dns_multistring_replace_own(ares__dns_multistring_t *strs,
+                                                size_t idx, unsigned char *str,
+                                                size_t len);
+ares_status_t ares__dns_multistring_del(ares__dns_multistring_t *strs,
+                                        size_t                   idx);
+ares_status_t ares__dns_multistring_add_own(ares__dns_multistring_t *strs,
+                                            unsigned char *str, size_t len);
+size_t        ares__dns_multistring_cnt(const ares__dns_multistring_t *strs);
+const unsigned char *
+  ares__dns_multistring_get(const ares__dns_multistring_t *strs, size_t idx,
+                            size_t *len);
+const unsigned char *
+  ares__dns_multistring_get_combined(ares__dns_multistring_t *strs,
+                                     size_t                  *len);
+
+#endif
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_name.c b/contrib/libs/c-ares/src/lib/record/ares_dns_name.c
similarity index 79%
rename from contrib/libs/c-ares/src/lib/ares_dns_name.c
rename to contrib/libs/c-ares/src/lib/record/ares_dns_name.c
index 85e26cd25b57..a437553b0f29 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_name.c
+++ b/contrib/libs/c-ares/src/lib/record/ares_dns_name.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 typedef struct {
@@ -37,7 +35,7 @@ static void ares__nameoffset_free(void *arg)
 {
   ares_nameoffset_t *off = arg;
   if (off == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   ares_free(off->name);
   ares_free(off);
@@ -51,20 +49,20 @@ static ares_status_t ares__nameoffset_create(ares__llist_t **list,
 
   if (list == NULL || name == NULL || ares_strlen(name) == 0 ||
       ares_strlen(name) > 255) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (*list == NULL) {
     *list = ares__llist_create(ares__nameoffset_free);
   }
   if (*list == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   off = ares_malloc_zero(sizeof(*off));
   if (off == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   off->name     = ares_strdup(name);
@@ -72,15 +70,17 @@ static ares_status_t ares__nameoffset_create(ares__llist_t **list,
   off->idx      = idx;
 
   if (ares__llist_insert_last(*list, off) == NULL) {
-    status = ARES_ENOMEM;
-    goto fail;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto fail;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
 
+/* LCOV_EXCL_START: OutOfMemory */
 fail:
   ares__nameoffset_free(off);
   return status;
+  /* LCOV_EXCL_STOP */
 }
 
 static const ares_nameoffset_t *ares__nameoffset_find(ares__llist_t *list,
@@ -111,7 +111,10 @@ static const ares_nameoffset_t *ares__nameoffset_find(ares__llist_t *list,
 
     prefix_len = name_len - val->name_len;
 
-    if (strcasecmp(val->name, name + prefix_len) != 0) {
+    /* Due to DNS 0x20, lets not inadvertently mangle things, use case-sensitive
+     * matching instead of case-insensitive.  This may result in slightly
+     * larger DNS queries overall. */
+    if (strcmp(val->name, name + prefix_len) != 0) {
       continue;
     }
 
@@ -128,72 +131,62 @@ static const ares_nameoffset_t *ares__nameoffset_find(ares__llist_t *list,
   return longest_match;
 }
 
-typedef struct {
-  ares__buf_t **label;
-  size_t        num;
-} ares_dns_labels_t;
-
-static void ares_dns_labels_free(ares_dns_labels_t *labels)
+static void ares_dns_labels_free_cb(void *arg)
 {
-  size_t i;
-
-  if (labels == NULL) {
+  ares__buf_t **buf = arg;
+  if (buf == NULL) {
     return;
   }
 
-  for (i = 0; i < labels->num; i++) {
-    ares__buf_destroy(labels->label[i]);
-    labels->label[i] = NULL;
-  }
-  ares_free(labels->label);
-  labels->label = NULL;
-  labels->num   = 0;
+  ares__buf_destroy(*buf);
 }
 
-static ares__buf_t *ares_dns_labels_add(ares_dns_labels_t *labels)
+static ares__buf_t *ares_dns_labels_add(ares__array_t *labels)
 {
-  void *temp;
+  ares__buf_t **buf;
 
   if (labels == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
-  temp = ares_realloc_zero(labels->label, sizeof(*labels->label) * labels->num,
-                           sizeof(*labels->label) * (labels->num + 1));
-  if (temp == NULL) {
+  if (ares__array_insert_last((void **)&buf, labels) != ARES_SUCCESS) {
     return NULL;
   }
 
-  labels->label = temp;
-
-  labels->label[labels->num] = ares__buf_create();
-  if (labels->label[labels->num] == NULL) {
+  *buf = ares__buf_create();
+  if (*buf == NULL) {
+    ares__array_remove_last(labels);
     return NULL;
   }
 
-  labels->num++;
-  return labels->label[labels->num - 1];
+  return *buf;
 }
 
-static const ares__buf_t *
-  ares_dns_labels_get_last(const ares_dns_labels_t *labels)
+static ares__buf_t *ares_dns_labels_get_last(ares__array_t *labels)
 {
-  if (labels == NULL || labels->num == 0) {
+  ares__buf_t **buf = ares__array_last(labels);
+
+  if (buf == NULL) {
     return NULL;
   }
 
-  return labels->label[labels->num - 1];
+  return *buf;
 }
 
-static void ares_dns_name_labels_del_last(ares_dns_labels_t *labels)
+static ares__buf_t *ares_dns_labels_get_at(ares__array_t *labels, size_t idx)
 {
-  if (labels == NULL || labels->num == 0) {
-    return;
+  ares__buf_t **buf = ares__array_at(labels, idx);
+
+  if (buf == NULL) {
+    return NULL;
   }
 
-  ares__buf_destroy(labels->label[labels->num - 1]);
-  labels->label[labels->num - 1] = NULL;
-  labels->num--;
+  return *buf;
+}
+
+static void ares_dns_name_labels_del_last(ares__array_t *labels)
+{
+  ares__array_remove_last(labels);
 }
 
 static ares_status_t ares_parse_dns_name_escape(ares__buf_t *namebuf,
@@ -209,7 +202,7 @@ static ares_status_t ares_parse_dns_name_escape(ares__buf_t *namebuf,
   }
 
   /* If next character is a digit, read 2 more digits */
-  if (isdigit(c)) {
+  if (ares__isdigit(c)) {
     size_t       i;
     unsigned int val = 0;
 
@@ -221,7 +214,7 @@ static ares_status_t ares_parse_dns_name_escape(ares__buf_t *namebuf,
         return ARES_EBADNAME;
       }
 
-      if (!isdigit(c)) {
+      if (!ares__isdigit(c)) {
         return ARES_EBADNAME;
       }
       val *= 10;
@@ -248,9 +241,9 @@ static ares_status_t ares_parse_dns_name_escape(ares__buf_t *namebuf,
   return ares__buf_append_byte(label, c);
 }
 
-static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
-                                         ares_bool_t        validate_hostname,
-                                         const char        *name)
+static ares_status_t ares_split_dns_name(ares__array_t *labels,
+                                         ares_bool_t    validate_hostname,
+                                         const char    *name)
 {
   ares_status_t status;
   ares__buf_t  *label   = NULL;
@@ -260,29 +253,29 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
   unsigned char c;
 
   if (name == NULL || labels == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Put name into a buffer for parsing */
   namebuf = ares__buf_create();
   if (namebuf == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (*name != '\0') {
     status =
       ares__buf_append(namebuf, (const unsigned char *)name, ares_strlen(name));
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   /* Start with 1 label */
   label = ares_dns_labels_add(labels);
   if (label == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   while (ares__buf_fetch_bytes(namebuf, &c, 1) == ARES_SUCCESS) {
@@ -290,8 +283,8 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
     if (c == '.') {
       label = ares_dns_labels_add(labels);
       if (label == NULL) {
-        status = ARES_ENOMEM;
-        goto done;
+        status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+        goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
       }
       continue;
     }
@@ -313,7 +306,7 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
 
     status = ares__buf_append_byte(label, c);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -324,14 +317,15 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
 
   /* If someone passed in "." there could have been 2 blank labels, check for
    * that */
-  if (labels->num == 1 &&
+  if (ares__array_len(labels) == 1 &&
       ares__buf_len(ares_dns_labels_get_last(labels)) == 0) {
     ares_dns_name_labels_del_last(labels);
   }
 
   /* Scan to make sure label lengths are valid */
-  for (i = 0; i < labels->num; i++) {
-    size_t len = ares__buf_len(labels->label[i]);
+  for (i = 0; i < ares__array_len(labels); i++) {
+    const ares__buf_t *buf = ares_dns_labels_get_at(labels, i);
+    size_t             len = ares__buf_len(buf);
     /* No 0-length labels, and no labels over 63 bytes */
     if (len == 0 || len > 63) {
       status = ARES_EBADNAME;
@@ -341,7 +335,8 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
   }
 
   /* Can't exceed maximum (unescaped) length */
-  if (labels->num && total_len + labels->num - 1 > 255) {
+  if (ares__array_len(labels) &&
+      total_len + ares__array_len(labels) - 1 > 255) {
     status = ARES_EBADNAME;
     goto done;
   }
@@ -350,9 +345,6 @@ static ares_status_t ares_split_dns_name(ares_dns_labels_t *labels,
 
 done:
   ares__buf_destroy(namebuf);
-  if (status != ARES_SUCCESS) {
-    ares_dns_labels_free(labels);
-  }
   return status;
 }
 
@@ -363,16 +355,19 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
   const ares_nameoffset_t *off = NULL;
   size_t                   name_len;
   size_t                   orig_name_len;
-  size_t                   pos = ares__buf_len(buf);
-  ares_dns_labels_t        labels;
+  size_t                   pos    = ares__buf_len(buf);
+  ares__array_t           *labels = NULL;
   char                     name_copy[512];
   ares_status_t            status;
 
   if (buf == NULL || name == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
-  memset(&labels, 0, sizeof(labels));
+  labels = ares__array_create(sizeof(ares__buf_t *), ares_dns_labels_free_cb);
+  if (labels == NULL) {
+    return ARES_ENOMEM;
+  }
 
   /* NOTE: due to possible escaping, name_copy buffer is > 256 to allow for
    *       this */
@@ -393,23 +388,24 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
   if (off == NULL || off->name_len != orig_name_len) {
     size_t i;
 
-    status = ares_split_dns_name(&labels, validate_hostname, name_copy);
+    status = ares_split_dns_name(labels, validate_hostname, name_copy);
     if (status != ARES_SUCCESS) {
       goto done;
     }
 
-    for (i = 0; i < labels.num; i++) {
-      size_t               len = 0;
-      const unsigned char *ptr = ares__buf_peek(labels.label[i], &len);
+    for (i = 0; i < ares__array_len(labels); i++) {
+      size_t               len  = 0;
+      const ares__buf_t   *lbuf = ares_dns_labels_get_at(labels, i);
+      const unsigned char *ptr  = ares__buf_peek(lbuf, &len);
 
       status = ares__buf_append_byte(buf, (unsigned char)(len & 0xFF));
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
 
       status = ares__buf_append(buf, ptr, len);
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
@@ -417,7 +413,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
     if (off == NULL) {
       status = ares__buf_append_byte(buf, 0);
       if (status != ARES_SUCCESS) {
-        goto done;
+        goto done; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -428,7 +424,7 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
       (unsigned short)0xC000 | (unsigned short)(off->idx & 0x3FFF);
     status = ares__buf_append_be16(buf, u16);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -438,14 +434,14 @@ ares_status_t ares__dns_name_write(ares__buf_t *buf, ares__llist_t **list,
       name_len > 0) {
     status = ares__nameoffset_create(list, name /* not truncated copy! */, pos);
     if (status != ARES_SUCCESS) {
-      goto done;
+      goto done; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   status = ARES_SUCCESS;
 
 done:
-  ares_dns_labels_free(&labels);
+  ares__array_destroy(labels);
   return status;
 }
 
@@ -509,7 +505,7 @@ static ares_status_t ares__fetch_dnsname_into_buf(ares__buf_t *buf,
 
       status = ares__buf_append(dest, escape, sizeof(escape));
       if (status != ARES_SUCCESS) {
-        goto fail;
+        goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
       }
 
       continue;
@@ -519,13 +515,13 @@ static ares_status_t ares__fetch_dnsname_into_buf(ares__buf_t *buf,
     if (is_reservedch(c)) {
       status = ares__buf_append_byte(dest, '\\');
       if (status != ARES_SUCCESS) {
-        goto fail;
+        goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
     status = ares__buf_append_byte(dest, c);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -641,7 +637,7 @@ ares_status_t ares__dns_name_parse(ares__buf_t *buf, char **name,
     if (ares__buf_len(namebuf) != 0 && name != NULL) {
       status = ares__buf_append_byte(namebuf, '.');
       if (status != ARES_SUCCESS) {
-        goto fail;
+        goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
@@ -660,8 +656,8 @@ ares_status_t ares__dns_name_parse(ares__buf_t *buf, char **name,
   if (name != NULL) {
     *name = ares__buf_finish_str(namebuf, NULL);
     if (*name == NULL) {
-      status = ARES_ENOMEM;
-      goto fail;
+      status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+      goto fail;            /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_parse.c b/contrib/libs/c-ares/src/lib/record/ares_dns_parse.c
similarity index 95%
rename from contrib/libs/c-ares/src/lib/ares_dns_parse.c
rename to contrib/libs/c-ares/src/lib/record/ares_dns_parse.c
index 8b771ee1faf3..57cb0f714e12 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_parse.c
+++ b/contrib/libs/c-ares/src/lib/record/ares_dns_parse.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include <limits.h>
 #ifdef HAVE_STDINT_H
@@ -62,14 +60,16 @@ static ares_status_t ares_dns_parse_and_set_dns_name(ares__buf_t   *buf,
   return ARES_SUCCESS;
 }
 
-static ares_status_t ares_dns_parse_and_set_dns_str(
-  ares__buf_t *buf, size_t max_len, ares_bool_t allow_multiple,
-  ares_dns_rr_t *rr, ares_dns_rr_key_t key, ares_bool_t blank_allowed)
+static ares_status_t ares_dns_parse_and_set_dns_str(ares__buf_t      *buf,
+                                                    size_t            max_len,
+                                                    ares_dns_rr_t    *rr,
+                                                    ares_dns_rr_key_t key,
+                                                    ares_bool_t blank_allowed)
 {
   ares_status_t status;
   char         *str = NULL;
 
-  status = ares__buf_parse_dns_str(buf, max_len, &str, allow_multiple);
+  status = ares__buf_parse_dns_str(buf, max_len, &str);
   if (status != ARES_SUCCESS) {
     return status;
   }
@@ -88,23 +88,21 @@ static ares_status_t ares_dns_parse_and_set_dns_str(
 }
 
 static ares_status_t
-  ares_dns_parse_and_set_dns_binstr(ares__buf_t *buf, size_t max_len,
-                                    ares_bool_t    allow_multiple,
-                                    ares_dns_rr_t *rr, ares_dns_rr_key_t key)
+  ares_dns_parse_and_set_dns_abin(ares__buf_t *buf, size_t max_len,
+                                  ares_dns_rr_t *rr, ares_dns_rr_key_t key,
+                                  ares_bool_t validate_printable)
 {
-  ares_status_t  status;
-  unsigned char *bin     = NULL;
-  size_t         bin_len = 0;
+  ares_status_t            status;
+  ares__dns_multistring_t *strs = NULL;
 
-  status =
-    ares__buf_parse_dns_binstr(buf, max_len, &bin, &bin_len, allow_multiple);
+  status = ares__buf_parse_dns_abinstr(buf, max_len, &strs, validate_printable);
   if (status != ARES_SUCCESS) {
     return status;
   }
 
-  status = ares_dns_rr_set_bin_own(rr, key, bin, bin_len);
+  status = ares_dns_rr_set_abin_own(rr, key, strs);
   if (status != ARES_SUCCESS) {
-    ares_free(bin);
+    ares__dns_multistring_destroy(strs);
     return status;
   }
   return ARES_SUCCESS;
@@ -257,7 +255,7 @@ static ares_status_t ares_dns_parse_rr_hinfo(ares__buf_t   *buf,
 
   /* CPU */
   status = ares_dns_parse_and_set_dns_str(
-    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), ARES_FALSE, rr,
+    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), rr,
     ARES_RR_HINFO_CPU, ARES_TRUE);
   if (status != ARES_SUCCESS) {
     return status;
@@ -265,7 +263,7 @@ static ares_status_t ares_dns_parse_rr_hinfo(ares__buf_t   *buf,
 
   /* OS */
   status = ares_dns_parse_and_set_dns_str(
-    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), ARES_FALSE, rr,
+    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), rr,
     ARES_RR_HINFO_OS, ARES_TRUE);
 
   return status;
@@ -292,8 +290,8 @@ static ares_status_t ares_dns_parse_rr_mx(ares__buf_t *buf, ares_dns_rr_t *rr,
 static ares_status_t ares_dns_parse_rr_txt(ares__buf_t *buf, ares_dns_rr_t *rr,
                                            size_t rdlength)
 {
-  return ares_dns_parse_and_set_dns_binstr(buf, rdlength, ARES_TRUE, rr,
-                                           ARES_RR_TXT_DATA);
+  return ares_dns_parse_and_set_dns_abin(buf, rdlength, rr, ARES_RR_TXT_DATA,
+                                         ARES_FALSE);
 }
 
 static ares_status_t ares_dns_parse_rr_sig(ares__buf_t *buf, ares_dns_rr_t *rr,
@@ -430,7 +428,7 @@ static ares_status_t ares_dns_parse_rr_naptr(ares__buf_t   *buf,
 
   /* FLAGS */
   status = ares_dns_parse_and_set_dns_str(
-    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), ARES_FALSE, rr,
+    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), rr,
     ARES_RR_NAPTR_FLAGS, ARES_TRUE);
   if (status != ARES_SUCCESS) {
     return status;
@@ -438,7 +436,7 @@ static ares_status_t ares_dns_parse_rr_naptr(ares__buf_t   *buf,
 
   /* SERVICES */
   status = ares_dns_parse_and_set_dns_str(
-    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), ARES_FALSE, rr,
+    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), rr,
     ARES_RR_NAPTR_SERVICES, ARES_TRUE);
   if (status != ARES_SUCCESS) {
     return status;
@@ -446,7 +444,7 @@ static ares_status_t ares_dns_parse_rr_naptr(ares__buf_t   *buf,
 
   /* REGEXP */
   status = ares_dns_parse_and_set_dns_str(
-    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), ARES_FALSE, rr,
+    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), rr,
     ARES_RR_NAPTR_REGEXP, ARES_TRUE);
   if (status != ARES_SUCCESS) {
     return status;
@@ -731,7 +729,7 @@ static ares_status_t ares_dns_parse_rr_caa(ares__buf_t *buf, ares_dns_rr_t *rr,
 
   /* Tag */
   status = ares_dns_parse_and_set_dns_str(
-    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), ARES_FALSE, rr,
+    buf, ares_dns_rr_remaining_len(buf, orig_len, rdlength), rr,
     ARES_RR_CAA_TAG, ARES_FALSE);
   if (status != ARES_SUCCESS) {
     return status;
@@ -925,7 +923,7 @@ static ares_status_t ares_dns_parse_header(ares__buf_t *buf, unsigned int flags,
     status =
       ares_dns_record_rr_prealloc(*dnsrec, ARES_SECTION_ANSWER, *ancount);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -933,7 +931,7 @@ static ares_status_t ares_dns_parse_header(ares__buf_t *buf, unsigned int flags,
     status =
       ares_dns_record_rr_prealloc(*dnsrec, ARES_SECTION_AUTHORITY, *nscount);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -941,7 +939,7 @@ static ares_status_t ares_dns_parse_header(ares__buf_t *buf, unsigned int flags,
     status =
       ares_dns_record_rr_prealloc(*dnsrec, ARES_SECTION_ADDITIONAL, *arcount);
     if (status != ARES_SUCCESS) {
-      goto fail;
+      goto fail; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1216,7 +1214,7 @@ static ares_status_t ares_dns_parse_buf(ares__buf_t *buf, unsigned int flags,
   unsigned short i;
 
   if (buf == NULL || dnsrec == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Maximum DNS packet size is 64k, even over TCP */
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_private.h b/contrib/libs/c-ares/src/lib/record/ares_dns_private.h
similarity index 75%
rename from contrib/libs/c-ares/src/lib/ares_dns_private.h
rename to contrib/libs/c-ares/src/lib/record/ares_dns_private.h
index e8e783d559ca..5b86fed51f98 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_private.h
+++ b/contrib/libs/c-ares/src/lib/record/ares_dns_private.h
@@ -26,6 +26,8 @@
 #ifndef __ARES_DNS_PRIVATE_H
 #define __ARES_DNS_PRIVATE_H
 
+ares_status_t ares_dns_record_duplicate_ex(ares_dns_record_t      **dest,
+                                           const ares_dns_record_t *src);
 ares_bool_t ares_dns_rec_type_allow_name_compression(ares_dns_rec_type_t type);
 ares_bool_t ares_dns_opcode_isvalid(ares_dns_opcode_t opcode);
 ares_bool_t ares_dns_rcode_isvalid(ares_dns_rcode_t rcode);
@@ -36,20 +38,32 @@ ares_bool_t ares_dns_class_isvalid(ares_dns_class_t    qclass,
                                    ares_dns_rec_type_t type,
                                    ares_bool_t         is_query);
 ares_bool_t ares_dns_section_isvalid(ares_dns_section_t sect);
-ares_status_t ares_dns_rr_set_str_own(ares_dns_rr_t    *dns_rr,
-                                      ares_dns_rr_key_t key, char *val);
-ares_status_t ares_dns_rr_set_bin_own(ares_dns_rr_t    *dns_rr,
-                                      ares_dns_rr_key_t key, unsigned char *val,
-                                      size_t len);
-ares_status_t ares_dns_rr_set_opt_own(ares_dns_rr_t    *dns_rr,
-                                      ares_dns_rr_key_t key, unsigned short opt,
-                                      unsigned char *val, size_t val_len);
-ares_status_t ares_dns_record_rr_prealloc(ares_dns_record_t *dnsrec,
-                                          ares_dns_section_t sect, size_t cnt);
-ares_bool_t   ares_dns_has_opt_rr(const ares_dns_record_t *rec);
+ares_status_t        ares_dns_rr_set_str_own(ares_dns_rr_t    *dns_rr,
+                                             ares_dns_rr_key_t key, char *val);
+ares_status_t        ares_dns_rr_set_bin_own(ares_dns_rr_t    *dns_rr,
+                                             ares_dns_rr_key_t key, unsigned char *val,
+                                             size_t len);
+ares_status_t        ares_dns_rr_set_abin_own(ares_dns_rr_t           *dns_rr,
+                                              ares_dns_rr_key_t        key,
+                                              ares__dns_multistring_t *strs);
+ares_status_t        ares_dns_rr_set_opt_own(ares_dns_rr_t    *dns_rr,
+                                             ares_dns_rr_key_t key, unsigned short opt,
+                                             unsigned char *val, size_t val_len);
+ares_status_t        ares_dns_record_rr_prealloc(ares_dns_record_t *dnsrec,
+                                                 ares_dns_section_t sect, size_t cnt);
+ares_dns_rr_t       *ares_dns_get_opt_rr(ares_dns_record_t *rec);
+const ares_dns_rr_t *ares_dns_get_opt_rr_const(const ares_dns_record_t *rec);
 void          ares_dns_record_write_ttl_decrement(ares_dns_record_t *dnsrec,
                                                   unsigned int       ttl_decrement);
 
+/* Same as ares_dns_write() but appends to an existing buffer object */
+ares_status_t ares_dns_write_buf(const ares_dns_record_t *dnsrec,
+                                 ares__buf_t             *buf);
+
+/* Same as ares_dns_write_buf(), but prepends a 16bit length */
+ares_status_t ares_dns_write_buf_tcp(const ares_dns_record_t *dnsrec,
+                                     ares__buf_t             *buf);
+
 /*! Create a DNS record object for a query. The arguments are the same as
  *  those for ares_create_query().
  *
@@ -120,8 +134,7 @@ typedef struct {
 } ares__dns_mx_t;
 
 typedef struct {
-  char  *data;
-  size_t data_len;
+  ares__dns_multistring_t *strs;
 } ares__dns_txt_t;
 
 typedef struct {
@@ -164,18 +177,11 @@ typedef struct {
 } ares__dns_optval_t;
 
 typedef struct {
-  ares__dns_optval_t *optval; /*!< Attribute/value pairs */
-  size_t              cnt;    /*!< Count of Attribute/Value pairs */
-  size_t              alloc;  /*!< Allocated count of attribute/value
-                               *   pairs */
-} ares__dns_options_t;
-
-typedef struct {
-  unsigned short       udp_size; /*!< taken from class */
-  unsigned char        version;  /*!< taken from bits 8-16 of ttl */
-  unsigned short       flags;    /*!< Flags, remaining 16 bits, though only
-                                  *   1 currently defined */
-  ares__dns_options_t *options;  /*!< Attribute/Value pairs */
+  unsigned short udp_size; /*!< taken from class */
+  unsigned char  version;  /*!< taken from bits 8-16 of ttl */
+  unsigned short flags;    /*!< Flags, remaining 16 bits, though only
+                            *   1 currently defined */
+  ares__array_t *options;  /*!< Type is ares__dns_optval_t */
 } ares__dns_opt_t;
 
 typedef struct {
@@ -187,9 +193,9 @@ typedef struct {
 } ares__dns_tlsa_t;
 
 typedef struct {
-  unsigned short       priority;
-  char                *target;
-  ares__dns_options_t *params;
+  unsigned short priority;
+  char          *target;
+  ares__array_t *params; /*!< Type is ares__dns_optval_t */
 } ares__dns_svcb_t;
 
 typedef struct {
@@ -258,21 +264,10 @@ struct ares_dns_record {
                                     *   the ttl of any resource records by
                                     *   this amount.  Used for cache */
 
-  ares_dns_qd_t    *qd;
-  size_t            qdcount;
-  size_t            qdalloc;
-
-  ares_dns_rr_t    *an;
-  size_t            ancount;
-  size_t            analloc;
-
-  ares_dns_rr_t    *ns;
-  size_t            nscount;
-  size_t            nsalloc;
-
-  ares_dns_rr_t    *ar;
-  size_t            arcount;
-  size_t            aralloc;
+  ares__array_t    *qd;            /*!< Type is ares_dns_qd_t */
+  ares__array_t    *an;            /*!< Type is ares_dns_rr_t */
+  ares__array_t    *ns;            /*!< Type is ares_dns_rr_t */
+  ares__array_t    *ar;            /*!< Type is ares_dns_rr_t */
 };
 
 #endif
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_record.c b/contrib/libs/c-ares/src/lib/record/ares_dns_record.c
similarity index 72%
rename from contrib/libs/c-ares/src/lib/ares_dns_record.c
rename to contrib/libs/c-ares/src/lib/record/ares_dns_record.c
index e6b7bf7fe1d9..147049490943 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_record.c
+++ b/contrib/libs/c-ares/src/lib/record/ares_dns_record.c
@@ -23,14 +23,31 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include <limits.h>
 #ifdef HAVE_STDINT_H
 #  include <stdint.h>
 #endif
 
+static void ares__dns_rr_free(ares_dns_rr_t *rr);
+
+static void ares_dns_qd_free_cb(void *arg)
+{
+  ares_dns_qd_t *qd = arg;
+  if (qd == NULL) {
+    return;
+  }
+  ares_free(qd->name);
+}
+
+static void ares_dns_rr_free_cb(void *arg)
+{
+  ares_dns_rr_t *rr = arg;
+  if (rr == NULL) {
+    return;
+  }
+  ares__dns_rr_free(rr);
+}
 
 ares_status_t ares_dns_record_create(ares_dns_record_t **dnsrec,
                                      unsigned short id, unsigned short flags,
@@ -57,6 +74,22 @@ ares_status_t ares_dns_record_create(ares_dns_record_t **dnsrec,
   (*dnsrec)->flags  = flags;
   (*dnsrec)->opcode = opcode;
   (*dnsrec)->rcode  = rcode;
+  (*dnsrec)->qd =
+    ares__array_create(sizeof(ares_dns_qd_t), ares_dns_qd_free_cb);
+  (*dnsrec)->an =
+    ares__array_create(sizeof(ares_dns_rr_t), ares_dns_rr_free_cb);
+  (*dnsrec)->ns =
+    ares__array_create(sizeof(ares_dns_rr_t), ares_dns_rr_free_cb);
+  (*dnsrec)->ar =
+    ares__array_create(sizeof(ares_dns_rr_t), ares_dns_rr_free_cb);
+
+  if ((*dnsrec)->qd == NULL || (*dnsrec)->an == NULL || (*dnsrec)->ns == NULL ||
+      (*dnsrec)->ar == NULL) {
+    ares_dns_record_destroy(*dnsrec);
+    *dnsrec = NULL;
+    return ARES_ENOMEM;
+  }
+
   return ARES_SUCCESS;
 }
 
@@ -68,6 +101,15 @@ unsigned short ares_dns_record_get_id(const ares_dns_record_t *dnsrec)
   return dnsrec->id;
 }
 
+ares_bool_t ares_dns_record_set_id(ares_dns_record_t *dnsrec, unsigned short id)
+{
+  if (dnsrec == NULL) {
+    return ARES_FALSE;
+  }
+  dnsrec->id = id;
+  return ARES_TRUE;
+}
+
 unsigned short ares_dns_record_get_flags(const ares_dns_record_t *dnsrec)
 {
   if (dnsrec == NULL) {
@@ -92,21 +134,6 @@ ares_dns_rcode_t ares_dns_record_get_rcode(const ares_dns_record_t *dnsrec)
   return dnsrec->rcode;
 }
 
-static void ares__dns_options_free(ares__dns_options_t *options)
-{
-  size_t i;
-
-  if (options == NULL) {
-    return;
-  }
-
-  for (i = 0; i < options->cnt; i++) {
-    ares_free(options->optval[i].val);
-  }
-  ares_free(options->optval);
-  ares_free(options);
-}
-
 static void ares__dns_rr_free(ares_dns_rr_t *rr)
 {
   ares_free(rr->name);
@@ -145,7 +172,7 @@ static void ares__dns_rr_free(ares_dns_rr_t *rr)
       break;
 
     case ARES_REC_TYPE_TXT:
-      ares_free(rr->r.txt.data);
+      ares__dns_multistring_destroy(rr->r.txt.strs);
       break;
 
     case ARES_REC_TYPE_SIG:
@@ -165,7 +192,7 @@ static void ares__dns_rr_free(ares_dns_rr_t *rr)
       break;
 
     case ARES_REC_TYPE_OPT:
-      ares__dns_options_free(rr->r.opt.options);
+      ares__array_destroy(rr->r.opt.options);
       break;
 
     case ARES_REC_TYPE_TLSA:
@@ -174,12 +201,12 @@ static void ares__dns_rr_free(ares_dns_rr_t *rr)
 
     case ARES_REC_TYPE_SVCB:
       ares_free(rr->r.svcb.target);
-      ares__dns_options_free(rr->r.svcb.params);
+      ares__array_destroy(rr->r.svcb.params);
       break;
 
     case ARES_REC_TYPE_HTTPS:
       ares_free(rr->r.https.target);
-      ares__dns_options_free(rr->r.https.params);
+      ares__array_destroy(rr->r.https.params);
       break;
 
     case ARES_REC_TYPE_URI:
@@ -199,35 +226,21 @@ static void ares__dns_rr_free(ares_dns_rr_t *rr)
 
 void ares_dns_record_destroy(ares_dns_record_t *dnsrec)
 {
-  size_t i;
-
   if (dnsrec == NULL) {
     return;
   }
 
   /* Free questions */
-  for (i = 0; i < dnsrec->qdcount; i++) {
-    ares_free(dnsrec->qd[i].name);
-  }
-  ares_free(dnsrec->qd);
+  ares__array_destroy(dnsrec->qd);
 
   /* Free answers */
-  for (i = 0; i < dnsrec->ancount; i++) {
-    ares__dns_rr_free(&dnsrec->an[i]);
-  }
-  ares_free(dnsrec->an);
+  ares__array_destroy(dnsrec->an);
 
   /* Free authority */
-  for (i = 0; i < dnsrec->nscount; i++) {
-    ares__dns_rr_free(&dnsrec->ns[i]);
-  }
-  ares_free(dnsrec->ns);
+  ares__array_destroy(dnsrec->ns);
 
   /* Free additional */
-  for (i = 0; i < dnsrec->arcount; i++) {
-    ares__dns_rr_free(&dnsrec->ar[i]);
-  }
-  ares_free(dnsrec->ar);
+  ares__array_destroy(dnsrec->ar);
 
   ares_free(dnsrec);
 }
@@ -237,7 +250,7 @@ size_t ares_dns_record_query_cnt(const ares_dns_record_t *dnsrec)
   if (dnsrec == NULL) {
     return 0;
   }
-  return dnsrec->qdcount;
+  return ares__array_len(dnsrec->qd);
 }
 
 ares_status_t ares_dns_record_query_add(ares_dns_record_t  *dnsrec,
@@ -245,8 +258,9 @@ ares_status_t ares_dns_record_query_add(ares_dns_record_t  *dnsrec,
                                         ares_dns_rec_type_t qtype,
                                         ares_dns_class_t    qclass)
 {
-  ares_dns_qd_t *temp = NULL;
   size_t         idx;
+  ares_dns_qd_t *qd;
+  ares_status_t  status;
 
   if (dnsrec == NULL || name == NULL ||
       !ares_dns_rec_type_isvalid(qtype, ARES_TRUE) ||
@@ -254,46 +268,39 @@ ares_status_t ares_dns_record_query_add(ares_dns_record_t  *dnsrec,
     return ARES_EFORMERR;
   }
 
-  if (dnsrec->qdcount >= dnsrec->qdalloc) {
-    size_t alloc_cnt = ares__round_up_pow2(dnsrec->qdcount + 1);
-
-    temp = ares_realloc_zero(dnsrec->qd, sizeof(*temp) * (dnsrec->qdalloc),
-                             sizeof(*temp) * alloc_cnt);
-    if (temp == NULL) {
-      return ARES_ENOMEM;
-    }
-
-    dnsrec->qdalloc = alloc_cnt;
-    dnsrec->qd      = temp;
+  idx    = ares__array_len(dnsrec->qd);
+  status = ares__array_insert_last((void **)&qd, dnsrec->qd);
+  if (status != ARES_SUCCESS) {
+    return status;
   }
 
-  idx = dnsrec->qdcount;
-
-  dnsrec->qd[idx].name = ares_strdup(name);
-  if (dnsrec->qd[idx].name == NULL) {
-    /* No need to clean up anything */
+  qd->name = ares_strdup(name);
+  if (qd->name == NULL) {
+    ares__array_remove_at(dnsrec->qd, idx);
     return ARES_ENOMEM;
   }
-
-  dnsrec->qd[idx].qtype  = qtype;
-  dnsrec->qd[idx].qclass = qclass;
-  dnsrec->qdcount++;
+  qd->qtype  = qtype;
+  qd->qclass = qclass;
   return ARES_SUCCESS;
 }
 
 ares_status_t ares_dns_record_query_set_name(ares_dns_record_t *dnsrec,
                                              size_t idx, const char *name)
 {
-  char *orig_name = NULL;
+  char          *orig_name = NULL;
+  ares_dns_qd_t *qd;
 
-  if (dnsrec == NULL || idx >= dnsrec->qdcount || name == NULL) {
+  if (dnsrec == NULL || idx >= ares__array_len(dnsrec->qd) || name == NULL) {
     return ARES_EFORMERR;
   }
-  orig_name            = dnsrec->qd[idx].name;
-  dnsrec->qd[idx].name = ares_strdup(name);
-  if (dnsrec->qd[idx].name == NULL) {
-    dnsrec->qd[idx].name = orig_name;
-    return ARES_ENOMEM;
+
+  qd = ares__array_at(dnsrec->qd, idx);
+
+  orig_name = qd->name;
+  qd->name  = ares_strdup(name);
+  if (qd->name == NULL) {
+    qd->name = orig_name; /* LCOV_EXCL_LINE: OutOfMemory */
+    return ARES_ENOMEM;   /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   ares_free(orig_name);
@@ -304,12 +311,15 @@ ares_status_t ares_dns_record_query_set_type(ares_dns_record_t  *dnsrec,
                                              size_t              idx,
                                              ares_dns_rec_type_t qtype)
 {
-  if (dnsrec == NULL || idx >= dnsrec->qdcount ||
+  ares_dns_qd_t *qd;
+
+  if (dnsrec == NULL || idx >= ares__array_len(dnsrec->qd) ||
       !ares_dns_rec_type_isvalid(qtype, ARES_TRUE)) {
     return ARES_EFORMERR;
   }
 
-  dnsrec->qd[idx].qtype = qtype;
+  qd        = ares__array_at(dnsrec->qd, idx);
+  qd->qtype = qtype;
 
   return ARES_SUCCESS;
 }
@@ -319,20 +329,22 @@ ares_status_t ares_dns_record_query_get(const ares_dns_record_t *dnsrec,
                                         ares_dns_rec_type_t *qtype,
                                         ares_dns_class_t    *qclass)
 {
-  if (dnsrec == NULL || idx >= dnsrec->qdcount) {
+  const ares_dns_qd_t *qd;
+  if (dnsrec == NULL || idx >= ares__array_len(dnsrec->qd)) {
     return ARES_EFORMERR;
   }
 
+  qd = ares__array_at(dnsrec->qd, idx);
   if (name != NULL) {
-    *name = dnsrec->qd[idx].name;
+    *name = qd->name;
   }
 
   if (qtype != NULL) {
-    *qtype = dnsrec->qd[idx].qtype;
+    *qtype = qd->qtype;
   }
 
   if (qclass != NULL) {
-    *qclass = dnsrec->qd[idx].qclass;
+    *qclass = qd->qclass;
   }
 
   return ARES_SUCCESS;
@@ -347,59 +359,42 @@ size_t ares_dns_record_rr_cnt(const ares_dns_record_t *dnsrec,
 
   switch (sect) {
     case ARES_SECTION_ANSWER:
-      return dnsrec->ancount;
+      return ares__array_len(dnsrec->an);
     case ARES_SECTION_AUTHORITY:
-      return dnsrec->nscount;
+      return ares__array_len(dnsrec->ns);
     case ARES_SECTION_ADDITIONAL:
-      return dnsrec->arcount;
+      return ares__array_len(dnsrec->ar);
   }
 
-  return 0;
+  return 0; /* LCOV_EXCL_LINE: DefensiveCoding */
 }
 
 ares_status_t ares_dns_record_rr_prealloc(ares_dns_record_t *dnsrec,
                                           ares_dns_section_t sect, size_t cnt)
 {
-  ares_dns_rr_t **rr_ptr   = NULL;
-  size_t         *rr_alloc = NULL;
-  ares_dns_rr_t  *temp     = NULL;
+  ares__array_t *arr = NULL;
 
-  if (dnsrec == NULL || cnt == 0 || !ares_dns_section_isvalid(sect)) {
+  if (dnsrec == NULL || !ares_dns_section_isvalid(sect)) {
     return ARES_EFORMERR;
   }
 
   switch (sect) {
     case ARES_SECTION_ANSWER:
-      rr_ptr   = &dnsrec->an;
-      rr_alloc = &dnsrec->analloc;
+      arr = dnsrec->an;
       break;
     case ARES_SECTION_AUTHORITY:
-      rr_ptr   = &dnsrec->ns;
-      rr_alloc = &dnsrec->nsalloc;
+      arr = dnsrec->ns;
       break;
     case ARES_SECTION_ADDITIONAL:
-      rr_ptr   = &dnsrec->ar;
-      rr_alloc = &dnsrec->aralloc;
+      arr = dnsrec->ar;
       break;
   }
 
-  /* Round up cnt to a power of 2 */
-  cnt = ares__round_up_pow2(cnt);
-
-  /* Already have that */
-  if (cnt <= *rr_alloc) {
-    return ARES_SUCCESS;
-  }
-
-  temp = ares_realloc_zero(*rr_ptr, sizeof(*temp) * (*rr_alloc),
-                           sizeof(*temp) * cnt);
-  if (temp == NULL) {
-    return ARES_ENOMEM;
+  if (cnt < ares__array_len(arr)) {
+    return ARES_EFORMERR;
   }
 
-  *rr_alloc = cnt;
-  *rr_ptr   = temp;
-  return ARES_SUCCESS;
+  return ares__array_set_size(arr, cnt);
 }
 
 ares_status_t ares_dns_record_rr_add(ares_dns_rr_t    **rr_out,
@@ -408,11 +403,10 @@ ares_status_t ares_dns_record_rr_add(ares_dns_rr_t    **rr_out,
                                      ares_dns_rec_type_t type,
                                      ares_dns_class_t rclass, unsigned int ttl)
 {
-  ares_dns_rr_t **rr_ptr = NULL;
-  ares_dns_rr_t  *rr     = NULL;
-  size_t         *rr_len = NULL;
-  ares_status_t   status;
-  size_t          idx;
+  ares_dns_rr_t *rr  = NULL;
+  ares__array_t *arr = NULL;
+  ares_status_t  status;
+  size_t         idx;
 
   if (dnsrec == NULL || name == NULL || rr_out == NULL ||
       !ares_dns_section_isvalid(sect) ||
@@ -425,30 +419,25 @@ ares_status_t ares_dns_record_rr_add(ares_dns_rr_t    **rr_out,
 
   switch (sect) {
     case ARES_SECTION_ANSWER:
-      rr_ptr = &dnsrec->an;
-      rr_len = &dnsrec->ancount;
+      arr = dnsrec->an;
       break;
     case ARES_SECTION_AUTHORITY:
-      rr_ptr = &dnsrec->ns;
-      rr_len = &dnsrec->nscount;
+      arr = dnsrec->ns;
       break;
     case ARES_SECTION_ADDITIONAL:
-      rr_ptr = &dnsrec->ar;
-      rr_len = &dnsrec->arcount;
+      arr = dnsrec->ar;
       break;
   }
 
-  status = ares_dns_record_rr_prealloc(dnsrec, sect, *rr_len + 1);
+  idx    = ares__array_len(arr);
+  status = ares__array_insert_last((void **)&rr, arr);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
-  idx = *rr_len;
-  rr  = &(*rr_ptr)[idx];
-
   rr->name = ares_strdup(name);
   if (rr->name == NULL) {
-    /* No need to clean up anything */
+    ares__array_remove_at(arr, idx);
     return ARES_ENOMEM;
   }
 
@@ -456,7 +445,6 @@ ares_status_t ares_dns_record_rr_add(ares_dns_rr_t    **rr_out,
   rr->type   = type;
   rr->rclass = rclass;
   rr->ttl    = ttl;
-  (*rr_len)++;
 
   *rr_out = rr;
 
@@ -466,9 +454,7 @@ ares_status_t ares_dns_record_rr_add(ares_dns_rr_t    **rr_out,
 ares_status_t ares_dns_record_rr_del(ares_dns_record_t *dnsrec,
                                      ares_dns_section_t sect, size_t idx)
 {
-  ares_dns_rr_t *rr_ptr = NULL;
-  size_t        *rr_len = NULL;
-  size_t         cnt_after;
+  ares__array_t *arr = NULL;
 
   if (dnsrec == NULL || !ares_dns_section_isvalid(sect)) {
     return ARES_EFORMERR;
@@ -476,40 +462,23 @@ ares_status_t ares_dns_record_rr_del(ares_dns_record_t *dnsrec,
 
   switch (sect) {
     case ARES_SECTION_ANSWER:
-      rr_ptr = dnsrec->an;
-      rr_len = &dnsrec->ancount;
+      arr = dnsrec->an;
       break;
     case ARES_SECTION_AUTHORITY:
-      rr_ptr = dnsrec->ns;
-      rr_len = &dnsrec->nscount;
+      arr = dnsrec->ns;
       break;
     case ARES_SECTION_ADDITIONAL:
-      rr_ptr = dnsrec->ar;
-      rr_len = &dnsrec->arcount;
+      arr = dnsrec->ar;
       break;
   }
 
-  if (idx >= *rr_len) {
-    return ARES_EFORMERR;
-  }
-
-  ares__dns_rr_free(&rr_ptr[idx]);
-
-  cnt_after = *rr_len - idx - 1;
-
-  if (cnt_after) {
-    memmove(&rr_ptr[idx], &rr_ptr[idx + 1], sizeof(*rr_ptr) * cnt_after);
-  }
-
-  (*rr_len)--;
-  return ARES_SUCCESS;
+  return ares__array_remove_at(arr, idx);
 }
 
 ares_dns_rr_t *ares_dns_record_rr_get(ares_dns_record_t *dnsrec,
                                       ares_dns_section_t sect, size_t idx)
 {
-  ares_dns_rr_t *rr_ptr = NULL;
-  size_t         rr_len = 0;
+  ares__array_t *arr = NULL;
 
   if (dnsrec == NULL || !ares_dns_section_isvalid(sect)) {
     return NULL;
@@ -517,24 +486,17 @@ ares_dns_rr_t *ares_dns_record_rr_get(ares_dns_record_t *dnsrec,
 
   switch (sect) {
     case ARES_SECTION_ANSWER:
-      rr_ptr = dnsrec->an;
-      rr_len = dnsrec->ancount;
+      arr = dnsrec->an;
       break;
     case ARES_SECTION_AUTHORITY:
-      rr_ptr = dnsrec->ns;
-      rr_len = dnsrec->nscount;
+      arr = dnsrec->ns;
       break;
     case ARES_SECTION_ADDITIONAL:
-      rr_ptr = dnsrec->ar;
-      rr_len = dnsrec->arcount;
+      arr = dnsrec->ar;
       break;
   }
 
-  if (idx >= rr_len) {
-    return NULL;
-  }
-
-  return &rr_ptr[idx];
+  return ares__array_at(arr, idx);
 }
 
 const ares_dns_rr_t *
@@ -580,7 +542,7 @@ static void *ares_dns_rr_data_ptr(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
                                   size_t **lenptr)
 {
   if (dns_rr == NULL || dns_rr->type != ares_dns_rr_key_to_rec_type(key)) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   switch (key) {
@@ -664,11 +626,7 @@ static void *ares_dns_rr_data_ptr(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
       return &dns_rr->r.sig.signature;
 
     case ARES_RR_TXT_DATA:
-      if (lenptr == NULL) {
-        return NULL;
-      }
-      *lenptr = &dns_rr->r.txt.data_len;
-      return &dns_rr->r.txt.data;
+      return &dns_rr->r.txt.strs;
 
     case ARES_RR_SRV_PRIORITY:
       return &dns_rr->r.srv.priority;
@@ -883,26 +841,138 @@ const unsigned char *ares_dns_rr_get_bin(const ares_dns_rr_t *dns_rr,
   size_t const          *bin_len = NULL;
 
   if ((ares_dns_rr_key_datatype(key) != ARES_DATATYPE_BIN &&
-       ares_dns_rr_key_datatype(key) != ARES_DATATYPE_BINP) ||
+       ares_dns_rr_key_datatype(key) != ARES_DATATYPE_BINP &&
+       ares_dns_rr_key_datatype(key) != ARES_DATATYPE_ABINP) ||
       len == NULL) {
     return NULL;
   }
 
+  /* Array of strings, return concatenated version */
+  if (ares_dns_rr_key_datatype(key) == ARES_DATATYPE_ABINP) {
+    ares__dns_multistring_t * const *strs =
+      ares_dns_rr_data_ptr_const(dns_rr, key, NULL);
+
+    if (strs == NULL) {
+      return NULL;
+    }
+
+    return ares__dns_multistring_get_combined(*strs, len);
+  }
+
+  /* Not a multi-string, just straight binary data */
   bin = ares_dns_rr_data_ptr_const(dns_rr, key, &bin_len);
   if (bin == NULL) {
-    return 0;
+    return NULL;
   }
 
   /* Shouldn't be possible */
   if (bin_len == NULL) {
     return NULL;
   }
-
   *len = *bin_len;
 
   return *bin;
 }
 
+size_t ares_dns_rr_get_abin_cnt(const ares_dns_rr_t *dns_rr,
+                                ares_dns_rr_key_t    key)
+{
+  ares__dns_multistring_t * const *strs;
+
+  if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_ABINP) {
+    return 0;
+  }
+
+  strs = ares_dns_rr_data_ptr_const(dns_rr, key, NULL);
+  if (strs == NULL) {
+    return 0;
+  }
+
+  return ares__dns_multistring_cnt(*strs);
+}
+
+const unsigned char *ares_dns_rr_get_abin(const ares_dns_rr_t *dns_rr,
+                                          ares_dns_rr_key_t key, size_t idx,
+                                          size_t *len)
+{
+  ares__dns_multistring_t * const *strs;
+
+  if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_ABINP) {
+    return NULL;
+  }
+
+  strs = ares_dns_rr_data_ptr_const(dns_rr, key, NULL);
+  if (strs == NULL) {
+    return NULL;
+  }
+
+  return ares__dns_multistring_get(*strs, idx, len);
+}
+
+ares_status_t ares_dns_rr_del_abin(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
+                                   size_t idx)
+{
+  ares__dns_multistring_t **strs;
+
+  if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_ABINP) {
+    return ARES_EFORMERR;
+  }
+
+  strs = ares_dns_rr_data_ptr(dns_rr, key, NULL);
+  if (strs == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  return ares__dns_multistring_del(*strs, idx);
+}
+
+ares_status_t ares_dns_rr_add_abin(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
+                                   const unsigned char *val, size_t len)
+{
+  ares_status_t       status;
+  ares_dns_datatype_t datatype = ares_dns_rr_key_datatype(key);
+  ares_bool_t         is_nullterm =
+    (datatype == ARES_DATATYPE_ABINP) ? ARES_TRUE : ARES_FALSE;
+  size_t                    alloclen = is_nullterm ? len + 1 : len;
+  unsigned char            *temp;
+  ares__dns_multistring_t **strs;
+
+  if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_ABINP) {
+    return ARES_EFORMERR;
+  }
+
+  strs = ares_dns_rr_data_ptr(dns_rr, key, NULL);
+  if (strs == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  if (*strs == NULL) {
+    *strs = ares__dns_multistring_create();
+    if (*strs == NULL) {
+      return ARES_ENOMEM;
+    }
+  }
+
+  temp = ares_malloc(alloclen);
+  if (temp == NULL) {
+    return ARES_ENOMEM;
+  }
+
+  memcpy(temp, val, len);
+
+  /* NULL-term ABINP */
+  if (is_nullterm) {
+    temp[len] = 0;
+  }
+
+  status = ares__dns_multistring_add_own(*strs, temp, len);
+  if (status != ARES_SUCCESS) {
+    ares_free(temp);
+  }
+
+  return status;
+}
+
 const char *ares_dns_rr_get_str(const ares_dns_rr_t *dns_rr,
                                 ares_dns_rr_key_t    key)
 {
@@ -924,7 +994,7 @@ const char *ares_dns_rr_get_str(const ares_dns_rr_t *dns_rr,
 size_t ares_dns_rr_get_opt_cnt(const ares_dns_rr_t *dns_rr,
                                ares_dns_rr_key_t    key)
 {
-  ares__dns_options_t * const *opts;
+  ares__array_t * const *opts;
 
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_OPT) {
     return 0;
@@ -935,14 +1005,15 @@ size_t ares_dns_rr_get_opt_cnt(const ares_dns_rr_t *dns_rr,
     return 0;
   }
 
-  return (*opts)->cnt;
+  return ares__array_len(*opts);
 }
 
 unsigned short ares_dns_rr_get_opt(const ares_dns_rr_t *dns_rr,
                                    ares_dns_rr_key_t key, size_t idx,
                                    const unsigned char **val, size_t *val_len)
 {
-  ares__dns_options_t * const *opts;
+  ares__array_t * const    *opts;
+  const ares__dns_optval_t *opt;
 
   if (val) {
     *val = NULL;
@@ -960,26 +1031,29 @@ unsigned short ares_dns_rr_get_opt(const ares_dns_rr_t *dns_rr,
     return 65535;
   }
 
-  if (idx >= (*opts)->cnt) {
+  opt = ares__array_at(*opts, idx);
+  if (opt == NULL) {
     return 65535;
   }
 
   if (val) {
-    *val = (*opts)->optval[idx].val;
+    *val = opt->val;
   }
   if (val_len) {
-    *val_len = (*opts)->optval[idx].val_len;
+    *val_len = opt->val_len;
   }
 
-  return (*opts)->optval[idx].opt;
+  return opt->opt;
 }
 
 ares_bool_t ares_dns_rr_get_opt_byid(const ares_dns_rr_t *dns_rr,
                                      ares_dns_rr_key_t key, unsigned short opt,
                                      const unsigned char **val, size_t *val_len)
 {
-  ares__dns_options_t * const *opts;
-  size_t                       i;
+  ares__array_t * const    *opts;
+  size_t                    i;
+  size_t                    cnt;
+  const ares__dns_optval_t *optptr = NULL;
 
   if (val) {
     *val = NULL;
@@ -997,21 +1071,26 @@ ares_bool_t ares_dns_rr_get_opt_byid(const ares_dns_rr_t *dns_rr,
     return ARES_FALSE;
   }
 
-  for (i = 0; i < (*opts)->cnt; i++) {
-    if ((*opts)->optval[i].opt == opt) {
+  cnt = ares__array_len(*opts);
+  for (i = 0; i < cnt; i++) {
+    optptr = ares__array_at(*opts, i);
+    if (optptr == NULL) {
+      return ARES_FALSE;
+    }
+    if (optptr->opt == opt) {
       break;
     }
   }
 
-  if (i >= (*opts)->cnt) {
+  if (i >= cnt || optptr == NULL) {
     return ARES_FALSE;
   }
 
   if (val) {
-    *val = (*opts)->optval[i].val;
+    *val = optptr->val;
   }
   if (val_len) {
-    *val_len = (*opts)->optval[i].val_len;
+    *val_len = optptr->val_len;
   }
   return ARES_TRUE;
 }
@@ -1115,10 +1194,30 @@ ares_status_t ares_dns_rr_set_bin_own(ares_dns_rr_t    *dns_rr,
   size_t         *bin_len = NULL;
 
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_BIN &&
-      ares_dns_rr_key_datatype(key) != ARES_DATATYPE_BINP) {
+      ares_dns_rr_key_datatype(key) != ARES_DATATYPE_BINP &&
+      ares_dns_rr_key_datatype(key) != ARES_DATATYPE_ABINP) {
     return ARES_EFORMERR;
   }
 
+  if (ares_dns_rr_key_datatype(key) == ARES_DATATYPE_ABINP) {
+    ares__dns_multistring_t **strs = ares_dns_rr_data_ptr(dns_rr, key, NULL);
+    if (strs == NULL) {
+      return ARES_EFORMERR;
+    }
+
+    if (*strs == NULL) {
+      *strs = ares__dns_multistring_create();
+      if (*strs == NULL) {
+        return ARES_ENOMEM;
+      }
+    }
+
+    /* Clear all existing entries as this is an override */
+    ares__dns_multistring_clear(*strs);
+
+    return ares__dns_multistring_add_own(*strs, val, len);
+  }
+
   bin = ares_dns_rr_data_ptr(dns_rr, key, &bin_len);
   if (bin == NULL || bin_len == NULL) {
     return ARES_EFORMERR;
@@ -1138,7 +1237,11 @@ ares_status_t ares_dns_rr_set_bin(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
 {
   ares_status_t       status;
   ares_dns_datatype_t datatype = ares_dns_rr_key_datatype(key);
-  size_t         alloclen = (datatype == ARES_DATATYPE_BINP) ? len + 1 : len;
+  ares_bool_t         is_nullterm =
+    (datatype == ARES_DATATYPE_BINP || datatype == ARES_DATATYPE_ABINP)
+              ? ARES_TRUE
+              : ARES_FALSE;
+  size_t         alloclen = is_nullterm ? len + 1 : len;
   unsigned char *temp     = ares_malloc(alloclen);
 
   if (temp == NULL) {
@@ -1148,7 +1251,7 @@ ares_status_t ares_dns_rr_set_bin(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
   memcpy(temp, val, len);
 
   /* NULL-term BINP */
-  if (datatype == ARES_DATATYPE_BINP) {
+  if (is_nullterm) {
     temp[len] = 0;
   }
 
@@ -1204,12 +1307,47 @@ ares_status_t ares_dns_rr_set_str(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
   return status;
 }
 
+ares_status_t ares_dns_rr_set_abin_own(ares_dns_rr_t           *dns_rr,
+                                       ares_dns_rr_key_t        key,
+                                       ares__dns_multistring_t *strs)
+{
+  ares__dns_multistring_t **strs_ptr;
+
+  if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_ABINP) {
+    return ARES_EFORMERR;
+  }
+
+  strs_ptr = ares_dns_rr_data_ptr(dns_rr, key, NULL);
+  if (strs_ptr == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  if (*strs_ptr != NULL) {
+    ares__dns_multistring_destroy(*strs_ptr);
+  }
+  *strs_ptr = strs;
+
+  return ARES_SUCCESS;
+}
+
+static void ares__dns_opt_free_cb(void *arg)
+{
+  ares__dns_optval_t *opt = arg;
+  if (opt == NULL) {
+    return;
+  }
+  ares_free(opt->val);
+}
+
 ares_status_t ares_dns_rr_set_opt_own(ares_dns_rr_t    *dns_rr,
                                       ares_dns_rr_key_t key, unsigned short opt,
                                       unsigned char *val, size_t val_len)
 {
-  ares__dns_options_t **options;
-  size_t                idx;
+  ares__array_t     **options;
+  ares__dns_optval_t *optptr = NULL;
+  size_t              idx;
+  size_t              cnt;
+  ares_status_t       status;
 
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_OPT) {
     return ARES_EFORMERR;
@@ -1221,54 +1359,39 @@ ares_status_t ares_dns_rr_set_opt_own(ares_dns_rr_t    *dns_rr,
   }
 
   if (*options == NULL) {
-    *options = ares_malloc_zero(sizeof(**options));
+    *options =
+      ares__array_create(sizeof(ares__dns_optval_t), ares__dns_opt_free_cb);
   }
   if (*options == NULL) {
     return ARES_ENOMEM;
   }
 
-  for (idx = 0; idx < (*options)->cnt; idx++) {
-    if ((*options)->optval[idx].opt == opt) {
+  cnt = ares__array_len(*options);
+  for (idx = 0; idx < cnt; idx++) {
+    optptr = ares__array_at(*options, idx);
+    if (optptr == NULL) {
+      return ARES_EFORMERR;
+    }
+    if (optptr->opt == opt) {
       break;
     }
   }
 
   /* Duplicate entry, replace */
-  if (idx != (*options)->cnt) {
+  if (idx != cnt && optptr != NULL) {
     goto done;
   }
 
-  idx = (*options)->cnt;
-
-  /* Expand by powers of 2 */
-  if (idx >= (*options)->alloc) {
-    size_t alloc_size = (*options)->alloc;
-    void  *temp;
-
-    if (alloc_size == 0) {
-      alloc_size = 1;
-    } else {
-      alloc_size <<= 1;
-    }
-
-    temp = ares_realloc_zero((*options)->optval,
-                             (*options)->alloc * sizeof(*(*options)->optval),
-                             alloc_size * sizeof(*(*options)->optval));
-    if (temp == NULL) {
-      return ARES_ENOMEM;
-    }
-
-    (*options)->optval = temp;
-    (*options)->alloc  = alloc_size;
+  status = ares__array_insert_last((void **)&optptr, *options);
+  if (status != ARES_SUCCESS) {
+    return status;
   }
 
-  (*options)->cnt++;
-
 done:
-  ares_free((*options)->optval[idx].val);
-  (*options)->optval[idx].opt     = opt;
-  (*options)->optval[idx].val     = val;
-  (*options)->optval[idx].val_len = val_len;
+  ares_free(optptr->val);
+  optptr->opt     = opt;
+  optptr->val     = val;
+  optptr->val_len = val_len;
 
   return ARES_SUCCESS;
 }
@@ -1297,6 +1420,43 @@ ares_status_t ares_dns_rr_set_opt(ares_dns_rr_t *dns_rr, ares_dns_rr_key_t key,
   return status;
 }
 
+ares_status_t ares_dns_rr_del_opt_byid(ares_dns_rr_t    *dns_rr,
+                                       ares_dns_rr_key_t key,
+                                       unsigned short    opt)
+{
+  ares__array_t           **options;
+  const ares__dns_optval_t *optptr;
+  size_t                    idx;
+  size_t                    cnt;
+
+  if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_OPT) {
+    return ARES_EFORMERR;
+  }
+
+  options = ares_dns_rr_data_ptr(dns_rr, key, NULL);
+  if (options == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  /* No options */
+  if (*options == NULL) {
+    return ARES_SUCCESS;
+  }
+
+  cnt = ares__array_len(*options);
+  for (idx = 0; idx < cnt; idx++) {
+    optptr = ares__array_at_const(*options, idx);
+    if (optptr == NULL) {
+      return ARES_ENOTFOUND;
+    }
+    if (optptr->opt == opt) {
+      return ares__array_remove_at(*options, idx);
+    }
+  }
+
+  return ARES_ENOTFOUND;
+}
+
 char *ares_dns_addr_to_ptr(const struct ares_addr *addr)
 {
   ares__buf_t               *buf     = NULL;
@@ -1369,8 +1529,20 @@ char *ares_dns_addr_to_ptr(const struct ares_addr *addr)
   return NULL;
 }
 
-/* search for an OPT RR in the response */
-ares_bool_t ares_dns_has_opt_rr(const ares_dns_record_t *rec)
+ares_dns_rr_t *ares_dns_get_opt_rr(ares_dns_record_t *rec)
+{
+  size_t i;
+  for (i = 0; i < ares_dns_record_rr_cnt(rec, ARES_SECTION_ADDITIONAL); i++) {
+    ares_dns_rr_t *rr = ares_dns_record_rr_get(rec, ARES_SECTION_ADDITIONAL, i);
+
+    if (ares_dns_rr_get_type(rr) == ARES_REC_TYPE_OPT) {
+      return rr;
+    }
+  }
+  return NULL;
+}
+
+const ares_dns_rr_t *ares_dns_get_opt_rr_const(const ares_dns_record_t *rec)
 {
   size_t i;
   for (i = 0; i < ares_dns_record_rr_cnt(rec, ARES_SECTION_ADDITIONAL); i++) {
@@ -1378,10 +1550,10 @@ ares_bool_t ares_dns_has_opt_rr(const ares_dns_record_t *rec)
       ares_dns_record_rr_get_const(rec, ARES_SECTION_ADDITIONAL, i);
 
     if (ares_dns_rr_get_type(rr) == ARES_REC_TYPE_OPT) {
-      return ARES_TRUE;
+      return rr;
     }
   }
-  return ARES_FALSE;
+  return NULL;
 }
 
 /* Construct a DNS record for a name with given class and type. Used internally
@@ -1460,26 +1632,34 @@ ares_status_t
   return status;
 }
 
-ares_dns_record_t *ares_dns_record_duplicate(const ares_dns_record_t *dnsrec)
+ares_status_t ares_dns_record_duplicate_ex(ares_dns_record_t      **dest,
+                                           const ares_dns_record_t *src)
 {
-  unsigned char     *data     = NULL;
-  size_t             data_len = 0;
-  ares_dns_record_t *out      = NULL;
-  ares_status_t      status;
+  unsigned char *data     = NULL;
+  size_t         data_len = 0;
+  ares_status_t  status;
 
-  if (dnsrec == NULL) {
-    return NULL;
+  if (dest == NULL || src == NULL) {
+    return ARES_EFORMERR;
   }
 
-  status = ares_dns_write(dnsrec, &data, &data_len);
+  *dest = NULL;
+
+  status = ares_dns_write(src, &data, &data_len);
   if (status != ARES_SUCCESS) {
-    return NULL;
+    return status;
   }
 
-  status = ares_dns_parse(data, data_len, 0, &out);
+  status = ares_dns_parse(data, data_len, 0, dest);
   ares_free(data);
-  if (status != ARES_SUCCESS) {
-    return NULL;
-  }
-  return out;
+
+  return status;
+}
+
+ares_dns_record_t *ares_dns_record_duplicate(const ares_dns_record_t *dnsrec)
+{
+  ares_dns_record_t *dest = NULL;
+
+  ares_dns_record_duplicate_ex(&dest, dnsrec);
+  return dest;
 }
diff --git a/contrib/libs/c-ares/src/lib/ares_dns_write.c b/contrib/libs/c-ares/src/lib/record/ares_dns_write.c
similarity index 79%
rename from contrib/libs/c-ares/src/lib/ares_dns_write.c
rename to contrib/libs/c-ares/src/lib/record/ares_dns_write.c
index 1643f0810322..8a3addd9f01b 100644
--- a/contrib/libs/c-ares/src/lib/ares_dns_write.c
+++ b/contrib/libs/c-ares/src/lib/record/ares_dns_write.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include <limits.h>
 #ifdef HAVE_STDINT_H
@@ -44,7 +42,7 @@ static ares_status_t ares_dns_write_header(const ares_dns_record_t *dnsrec,
   /* ID */
   status = ares__buf_append_be16(buf, dnsrec->id);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Flags */
@@ -93,7 +91,7 @@ static ares_status_t ares_dns_write_header(const ares_dns_record_t *dnsrec,
   }
 
   /* RCODE */
-  if (dnsrec->rcode > 15 && !ares_dns_has_opt_rr(dnsrec)) {
+  if (dnsrec->rcode > 15 && ares_dns_get_opt_rr_const(dnsrec) == NULL) {
     /* Must have OPT RR in order to write extended error codes */
     rcode = ARES_RCODE_SERVFAIL;
   } else {
@@ -103,31 +101,35 @@ static ares_status_t ares_dns_write_header(const ares_dns_record_t *dnsrec,
 
   status = ares__buf_append_be16(buf, u16);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* QDCOUNT */
-  status = ares__buf_append_be16(buf, (unsigned short)dnsrec->qdcount);
+  status = ares__buf_append_be16(
+    buf, (unsigned short)ares_dns_record_query_cnt(dnsrec));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* ANCOUNT */
-  status = ares__buf_append_be16(buf, (unsigned short)dnsrec->ancount);
+  status = ares__buf_append_be16(
+    buf, (unsigned short)ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* NSCOUNT */
-  status = ares__buf_append_be16(buf, (unsigned short)dnsrec->nscount);
+  status = ares__buf_append_be16(buf, (unsigned short)ares_dns_record_rr_cnt(
+                                        dnsrec, ARES_SECTION_AUTHORITY));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* ARCOUNT */
-  status = ares__buf_append_be16(buf, (unsigned short)dnsrec->arcount);
+  status = ares__buf_append_be16(buf, (unsigned short)ares_dns_record_rr_cnt(
+                                        dnsrec, ARES_SECTION_ADDITIONAL));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -159,13 +161,13 @@ static ares_status_t ares_dns_write_questions(const ares_dns_record_t *dnsrec,
     /* Type */
     status = ares__buf_append_be16(buf, (unsigned short)qtype);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Class */
     status = ares__buf_append_be16(buf, (unsigned short)qclass);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -182,7 +184,7 @@ static ares_status_t ares_dns_write_rr_name(ares__buf_t         *buf,
 
   name = ares_dns_rr_get_str(rr, key);
   if (name == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return ares__dns_name_write(buf, namelist, validate_hostname, name);
@@ -198,7 +200,7 @@ static ares_status_t ares_dns_write_rr_str(ares__buf_t         *buf,
 
   str = ares_dns_rr_get_str(rr, key);
   if (str == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   len = ares_strlen(str);
@@ -209,7 +211,7 @@ static ares_status_t ares_dns_write_rr_str(ares__buf_t         *buf,
   /* Write 1 byte length */
   status = ares__buf_append_byte(buf, (unsigned char)(len & 0xFF));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   if (len == 0) {
@@ -220,20 +222,14 @@ static ares_status_t ares_dns_write_rr_str(ares__buf_t         *buf,
   return ares__buf_append(buf, (const unsigned char *)str, len);
 }
 
-static ares_status_t ares_dns_write_rr_binstrs(ares__buf_t         *buf,
-                                               const ares_dns_rr_t *rr,
-                                               ares_dns_rr_key_t    key)
+static ares_status_t ares_dns_write_binstr(ares__buf_t         *buf,
+                                           const unsigned char *bin,
+                                           size_t               bin_len)
 {
-  const unsigned char *bin;
   const unsigned char *ptr;
-  size_t               bin_len;
   size_t               ptr_len;
   ares_status_t        status;
 
-  bin = ares_dns_rr_get_bin(rr, key, &bin_len);
-  if (bin == NULL) {
-    return ARES_EFORMERR;
-  }
   /* split into possible multiple 255-byte or less length strings */
   ptr     = bin;
   ptr_len = bin_len;
@@ -246,14 +242,14 @@ static ares_status_t ares_dns_write_rr_binstrs(ares__buf_t         *buf,
     /* Length */
     status = ares__buf_append_byte(buf, (unsigned char)(len & 0xFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* String */
     if (len) {
       status = ares__buf_append(buf, ptr, len);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
 
@@ -264,12 +260,39 @@ static ares_status_t ares_dns_write_rr_binstrs(ares__buf_t         *buf,
   return ARES_SUCCESS;
 }
 
+static ares_status_t ares_dns_write_rr_abin(ares__buf_t         *buf,
+                                            const ares_dns_rr_t *rr,
+                                            ares_dns_rr_key_t    key)
+{
+  ares_status_t status = ARES_EFORMERR;
+  size_t        i;
+  size_t        cnt = ares_dns_rr_get_abin_cnt(rr, key);
+
+  if (cnt == 0) {
+    return ARES_EFORMERR;
+  }
+
+  for (i = 0; i < cnt; i++) {
+    const unsigned char *bin;
+    size_t               bin_len;
+
+    bin = ares_dns_rr_get_abin(rr, key, i, &bin_len);
+
+    status = ares_dns_write_binstr(buf, bin, bin_len);
+    if (status != ARES_SUCCESS) {
+      break;
+    }
+  }
+
+  return status;
+}
+
 static ares_status_t ares_dns_write_rr_be32(ares__buf_t         *buf,
                                             const ares_dns_rr_t *rr,
                                             ares_dns_rr_key_t    key)
 {
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_U32) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   return ares__buf_append_be32(buf, ares_dns_rr_get_u32(rr, key));
 }
@@ -279,7 +302,7 @@ static ares_status_t ares_dns_write_rr_be16(ares__buf_t         *buf,
                                             ares_dns_rr_key_t    key)
 {
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_U16) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   return ares__buf_append_be16(buf, ares_dns_rr_get_u16(rr, key));
 }
@@ -289,7 +312,7 @@ static ares_status_t ares_dns_write_rr_u8(ares__buf_t         *buf,
                                           ares_dns_rr_key_t    key)
 {
   if (ares_dns_rr_key_datatype(key) != ARES_DATATYPE_U8) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   return ares__buf_append_byte(buf, ares_dns_rr_get_u8(rr, key));
 }
@@ -303,7 +326,7 @@ static ares_status_t ares_dns_write_rr_a(ares__buf_t         *buf,
 
   addr = ares_dns_rr_get_addr(rr, ARES_RR_A_ADDR);
   if (addr == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return ares__buf_append(buf, (const unsigned char *)addr, sizeof(*addr));
@@ -348,25 +371,25 @@ static ares_status_t ares_dns_write_rr_soa(ares__buf_t         *buf,
   /* SERIAL */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SOA_SERIAL);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* REFRESH */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SOA_REFRESH);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* RETRY */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SOA_RETRY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* EXPIRE */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SOA_EXPIRE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* MINIMUM */
@@ -408,7 +431,7 @@ static ares_status_t ares_dns_write_rr_mx(ares__buf_t         *buf,
   /* PREFERENCE */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_MX_PREFERENCE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* EXCHANGE */
@@ -421,7 +444,7 @@ static ares_status_t ares_dns_write_rr_txt(ares__buf_t         *buf,
                                            ares__llist_t      **namelist)
 {
   (void)namelist;
-  return ares_dns_write_rr_binstrs(buf, rr, ARES_RR_TXT_DATA);
+  return ares_dns_write_rr_abin(buf, rr, ARES_RR_TXT_DATA);
 }
 
 static ares_status_t ares_dns_write_rr_sig(ares__buf_t         *buf,
@@ -437,43 +460,43 @@ static ares_status_t ares_dns_write_rr_sig(ares__buf_t         *buf,
   /* TYPE COVERED */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SIG_TYPE_COVERED);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* ALGORITHM */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_SIG_ALGORITHM);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* LABELS */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_SIG_LABELS);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* ORIGINAL TTL */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_ORIGINAL_TTL);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* EXPIRATION */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_EXPIRATION);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* INCEPTION */
   status = ares_dns_write_rr_be32(buf, rr, ARES_RR_SIG_INCEPTION);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* KEY TAG */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SIG_KEY_TAG);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* SIGNERS NAME */
@@ -501,7 +524,7 @@ static ares_status_t ares_dns_write_rr_aaaa(ares__buf_t         *buf,
 
   addr = ares_dns_rr_get_addr6(rr, ARES_RR_AAAA_ADDR);
   if (addr == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   return ares__buf_append(buf, (const unsigned char *)addr, sizeof(*addr));
@@ -516,19 +539,19 @@ static ares_status_t ares_dns_write_rr_srv(ares__buf_t         *buf,
   /* PRIORITY */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SRV_PRIORITY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* WEIGHT */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SRV_WEIGHT);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* PORT */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SRV_PORT);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TARGET */
@@ -545,31 +568,31 @@ static ares_status_t ares_dns_write_rr_naptr(ares__buf_t         *buf,
   /* ORDER */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_NAPTR_ORDER);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* PREFERENCE */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_NAPTR_PREFERENCE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* FLAGS */
   status = ares_dns_write_rr_str(buf, rr, ARES_RR_NAPTR_FLAGS);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* SERVICES */
   status = ares_dns_write_rr_str(buf, rr, ARES_RR_NAPTR_SERVICES);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* REGEXP */
   status = ares_dns_write_rr_str(buf, rr, ARES_RR_NAPTR_REGEXP);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* REPLACEMENT */
@@ -589,6 +612,12 @@ static ares_status_t ares_dns_write_rr_opt(ares__buf_t         *buf,
 
   (void)namelist;
 
+  /* Coverity reports on this even though its not possible when taken
+   * into context */
+  if (len == 0) {
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
+  }
+
   /* We need to go back and overwrite the class and ttl that were emitted as
    * the OPT record overloads them for its own use (yes, very strange!) */
   status = ares__buf_set_length(buf, len - 2 /* RDLENGTH */
@@ -601,7 +630,7 @@ static ares_status_t ares_dns_write_rr_opt(ares__buf_t         *buf,
   /* Class -> UDP Size */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_OPT_UDP_SIZE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TTL -> rcode (u8) << 24 | version (u8) << 16 | flags (u16) */
@@ -611,7 +640,7 @@ static ares_status_t ares_dns_write_rr_opt(ares__buf_t         *buf,
 
   status = ares__buf_append_be32(buf, ttl);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Now go back to real end */
@@ -631,20 +660,20 @@ static ares_status_t ares_dns_write_rr_opt(ares__buf_t         *buf,
     /* BE16 option */
     status = ares__buf_append_be16(buf, opt);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* BE16 length */
     status = ares__buf_append_be16(buf, (unsigned short)(val_len & 0xFFFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Value */
     if (val && val_len) {
       status = ares__buf_append(buf, val, val_len);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -665,19 +694,19 @@ static ares_status_t ares_dns_write_rr_tlsa(ares__buf_t         *buf,
   /* CERT_USAGE */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_TLSA_CERT_USAGE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* SELECTOR */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_TLSA_SELECTOR);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* MATCH */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_TLSA_MATCH);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* DATA -- binary, rest of buffer, required to be non-zero length */
@@ -699,7 +728,7 @@ static ares_status_t ares_dns_write_rr_svcb(ares__buf_t         *buf,
   /* PRIORITY */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_SVCB_PRIORITY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TARGET */
@@ -720,20 +749,20 @@ static ares_status_t ares_dns_write_rr_svcb(ares__buf_t         *buf,
     /* BE16 option */
     status = ares__buf_append_be16(buf, opt);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* BE16 length */
     status = ares__buf_append_be16(buf, (unsigned short)(val_len & 0xFFFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Value */
     if (val && val_len) {
       status = ares__buf_append(buf, val, val_len);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -750,7 +779,7 @@ static ares_status_t ares_dns_write_rr_https(ares__buf_t         *buf,
   /* PRIORITY */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_HTTPS_PRIORITY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TARGET */
@@ -771,20 +800,20 @@ static ares_status_t ares_dns_write_rr_https(ares__buf_t         *buf,
     /* BE16 option */
     status = ares__buf_append_be16(buf, opt);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* BE16 length */
     status = ares__buf_append_be16(buf, (unsigned short)(val_len & 0xFFFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Value */
     if (val && val_len) {
       status = ares__buf_append(buf, val, val_len);
       if (status != ARES_SUCCESS) {
-        return status;
+        return status; /* LCOV_EXCL_LINE: OutOfMemory */
       }
     }
   }
@@ -803,13 +832,13 @@ static ares_status_t ares_dns_write_rr_uri(ares__buf_t         *buf,
   /* PRIORITY */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_URI_PRIORITY);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* WEIGHT */
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_URI_WEIGHT);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* TARGET -- not in DNS string format, rest of buffer, required to be
@@ -836,13 +865,13 @@ static ares_status_t ares_dns_write_rr_caa(ares__buf_t         *buf,
   /* CRITICAL */
   status = ares_dns_write_rr_u8(buf, rr, ARES_RR_CAA_CRITICAL);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Tag */
   status = ares_dns_write_rr_str(buf, rr, ARES_RR_CAA_TAG);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Value - binary! (remaining buffer */
@@ -865,6 +894,12 @@ static ares_status_t ares_dns_write_rr_raw_rr(ares__buf_t         *buf,
 
   (void)namelist;
 
+  /* Coverity reports on this even though its not possible when taken
+   * into context */
+  if (len == 0) {
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
+  }
+
   /* We need to go back and overwrite the type that was emitted by the parent
    * function */
   status = ares__buf_set_length(buf, len - 2 /* RDLENGTH */
@@ -877,7 +912,7 @@ static ares_status_t ares_dns_write_rr_raw_rr(ares__buf_t         *buf,
 
   status = ares_dns_write_rr_be16(buf, rr, ARES_RR_RAW_RR_TYPE);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* Now go back to real end */
@@ -919,7 +954,7 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
 
     rr = ares_dns_record_rr_get_const(dnsrec, section, i);
     if (rr == NULL) {
-      return ARES_EFORMERR;
+      return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     type           = ares_dns_rr_get_type(rr);
@@ -938,14 +973,14 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
     /* Type */
     status = ares__buf_append_be16(buf, (unsigned short)type);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Class */
     status =
       ares__buf_append_be16(buf, (unsigned short)ares_dns_rr_get_class(rr));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* TTL */
@@ -957,14 +992,14 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
     }
     status = ares__buf_append_be32(buf, ttl);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Length */
     pos_len = ares__buf_len(buf); /* Save to write real length later */
     status  = ares__buf_append_be16(buf, 0);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     /* Data */
@@ -1047,7 +1082,7 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
 
     status = ares__buf_append_be16(buf, (unsigned short)(rdlength & 0xFFFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_set_length(buf, end_length);
@@ -1059,52 +1094,121 @@ static ares_status_t ares_dns_write_rr(const ares_dns_record_t *dnsrec,
   return ARES_SUCCESS;
 }
 
-ares_status_t ares_dns_write(const ares_dns_record_t *dnsrec,
-                             unsigned char **buf, size_t *buf_len)
+ares_status_t ares_dns_write_buf(const ares_dns_record_t *dnsrec,
+                                 ares__buf_t             *buf)
 {
-  ares__buf_t   *b = NULL;
-  ares_status_t  status;
   ares__llist_t *namelist = NULL;
+  size_t         orig_len;
+  ares_status_t  status;
 
-  if (buf == NULL || buf_len == NULL || dnsrec == NULL) {
+  if (dnsrec == NULL || buf == NULL) {
     return ARES_EFORMERR;
   }
 
-  *buf     = NULL;
-  *buf_len = 0;
+  orig_len = ares__buf_len(buf);
 
-  b = ares__buf_create();
-  if (b == NULL) {
-    return ARES_ENOMEM;
+  status = ares_dns_write_header(dnsrec, buf);
+  if (status != ARES_SUCCESS) {
+    goto done;
   }
 
-  status = ares_dns_write_header(dnsrec, b);
+  status = ares_dns_write_questions(dnsrec, &namelist, buf);
   if (status != ARES_SUCCESS) {
     goto done;
   }
 
-  status = ares_dns_write_questions(dnsrec, &namelist, b);
+  status = ares_dns_write_rr(dnsrec, &namelist, ARES_SECTION_ANSWER, buf);
   if (status != ARES_SUCCESS) {
     goto done;
   }
 
-  status = ares_dns_write_rr(dnsrec, &namelist, ARES_SECTION_ANSWER, b);
+  status = ares_dns_write_rr(dnsrec, &namelist, ARES_SECTION_AUTHORITY, buf);
   if (status != ARES_SUCCESS) {
     goto done;
   }
 
-  status = ares_dns_write_rr(dnsrec, &namelist, ARES_SECTION_AUTHORITY, b);
+  status = ares_dns_write_rr(dnsrec, &namelist, ARES_SECTION_ADDITIONAL, buf);
   if (status != ARES_SUCCESS) {
     goto done;
   }
 
-  status = ares_dns_write_rr(dnsrec, &namelist, ARES_SECTION_ADDITIONAL, b);
+done:
+  ares__llist_destroy(namelist);
   if (status != ARES_SUCCESS) {
+    ares__buf_set_length(buf, orig_len);
+  }
+
+  return status;
+}
+
+ares_status_t ares_dns_write_buf_tcp(const ares_dns_record_t *dnsrec,
+                                     ares__buf_t             *buf)
+{
+  ares_status_t status;
+  size_t        orig_len;
+  size_t        msg_len;
+  size_t        len;
+
+  if (dnsrec == NULL || buf == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  orig_len = ares__buf_len(buf);
+
+  /* Write placeholder for length */
+  status = ares__buf_append_be16(buf, 0);
+  if (status != ARES_SUCCESS) {
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
+  }
+
+  /* Write message */
+  status = ares_dns_write_buf(dnsrec, buf);
+  if (status != ARES_SUCCESS) {
+    goto done; /* LCOV_EXCL_LINE: OutOfMemory */
+  }
+
+  len     = ares__buf_len(buf);
+  msg_len = len - orig_len - 2;
+  if (msg_len > 65535) {
+    status = ARES_EBADQUERY;
     goto done;
   }
 
+  /* Now we need to overwrite the length, so we jump back to the original
+   * message length, overwrite the section and jump back */
+  ares__buf_set_length(buf, orig_len);
+  status = ares__buf_append_be16(buf, (unsigned short)(msg_len & 0xFFFF));
+  if (status != ARES_SUCCESS) {
+    goto done; /* LCOV_EXCL_LINE: UntestablePath */
+  }
+  ares__buf_set_length(buf, len);
+
 done:
-  ares__llist_destroy(namelist);
+  if (status != ARES_SUCCESS) {
+    ares__buf_set_length(buf, orig_len);
+  }
+  return status;
+}
+
+ares_status_t ares_dns_write(const ares_dns_record_t *dnsrec,
+                             unsigned char **buf, size_t *buf_len)
+{
+  ares__buf_t  *b = NULL;
+  ares_status_t status;
+
+  if (buf == NULL || buf_len == NULL || dnsrec == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  *buf     = NULL;
+  *buf_len = 0;
+
+  b = ares__buf_create();
+  if (b == NULL) {
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+  }
+
+  status = ares_dns_write_buf(dnsrec, b);
 
   if (status != ARES_SUCCESS) {
     ares__buf_destroy(b);
diff --git a/contrib/libs/c-ares/src/lib/setup_once.h b/contrib/libs/c-ares/src/lib/setup_once.h
deleted file mode 100644
index 38527ec44228..000000000000
--- a/contrib/libs/c-ares/src/lib/setup_once.h
+++ /dev/null
@@ -1,469 +0,0 @@
-/* MIT License
- *
- * Copyright (c) 2004 Daniel Stenberg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * SPDX-License-Identifier: MIT
- */
-#ifndef __SETUP_ONCE_H
-#define __SETUP_ONCE_H
-
-
-/********************************************************************
- *                              NOTICE                              *
- *                             ========                             *
- *                                                                  *
- *  Content of header files lib/setup_once.h and ares/setup_once.h  *
- *  must be kept in sync. Modify the other one if you change this.  *
- *                                                                  *
- ********************************************************************/
-
-
-/*
- * Inclusion of common header files.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <ctype.h>
-
-#ifdef HAVE_ERRNO_H
-#  include <errno.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#  include <sys/types.h>
-#endif
-
-#ifdef NEED_MALLOC_H
-#  include <malloc.h>
-#endif
-
-#ifdef NEED_MEMORY_H
-#  include <memory.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#  include <sys/stat.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
-
-#ifdef HAVE_TIME_H
-#  include <time.h>
-#endif
-
-#ifdef WIN32
-#  include <io.h>
-#  include <fcntl.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
-#ifdef __hpux
-#  if !defined(_XOPEN_SOURCE_EXTENDED) || defined(_KERNEL)
-#    ifdef _APP32_64BIT_OFF_T
-#      define OLD_APP32_64BIT_OFF_T _APP32_64BIT_OFF_T
-#      undef _APP32_64BIT_OFF_T
-#    else
-#      undef OLD_APP32_64BIT_OFF_T
-#    endif
-#  endif
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
-
-#ifdef __hpux
-#  if !defined(_XOPEN_SOURCE_EXTENDED) || defined(_KERNEL)
-#    ifdef OLD_APP32_64BIT_OFF_T
-#      define _APP32_64BIT_OFF_T OLD_APP32_64BIT_OFF_T
-#      undef OLD_APP32_64BIT_OFF_T
-#    endif
-#  endif
-#endif
-
-
-/*
- * Definition of timeval struct for platforms that don't have it.
- */
-
-#ifndef HAVE_STRUCT_TIMEVAL
-struct timeval {
-  long tv_sec;
-  long tv_usec;
-};
-#endif
-
-
-/*
- * If we have the MSG_NOSIGNAL define, make sure we use
- * it as the fourth argument of function send()
- */
-
-#if defined(HAVE_MSG_NOSIGNAL) && defined(MSG_NOSIGNAL)
-#  define SEND_4TH_ARG MSG_NOSIGNAL
-#else
-#  define SEND_4TH_ARG 0
-#endif
-
-
-#if defined(__minix)
-/* Minix doesn't support recv on TCP sockets */
-#  define sread(x, y, z) \
-    (ares_ssize_t)       \
-      read((RECV_TYPE_ARG1)(x), (RECV_TYPE_ARG2)(y), (RECV_TYPE_ARG3)(z))
-
-#elif defined(HAVE_RECV)
-/*
- * The definitions for the return type and arguments types
- * of functions recv() and send() belong and come from the
- * configuration file. Do not define them in any other place.
- *
- * HAVE_RECV is defined if you have a function named recv()
- * which is used to read incoming data from sockets. If your
- * function has another name then don't define HAVE_RECV.
- *
- * If HAVE_RECV is defined then RECV_TYPE_ARG1, RECV_TYPE_ARG2,
- * RECV_TYPE_ARG3, RECV_TYPE_ARG4 and RECV_TYPE_RETV must also
- * be defined.
- *
- * HAVE_SEND is defined if you have a function named send()
- * which is used to write outgoing data on a connected socket.
- * If yours has another name then don't define HAVE_SEND.
- *
- * If HAVE_SEND is defined then SEND_TYPE_ARG1, SEND_QUAL_ARG2,
- * SEND_TYPE_ARG2, SEND_TYPE_ARG3, SEND_TYPE_ARG4 and
- * SEND_TYPE_RETV must also be defined.
- */
-
-#  if !defined(RECV_TYPE_ARG1) || !defined(RECV_TYPE_ARG2) || \
-    !defined(RECV_TYPE_ARG3) || !defined(RECV_TYPE_ARG4) ||   \
-    !defined(RECV_TYPE_RETV)
-/* */
-Error Missing_definition_of_return_and_arguments_types_of_recv
-/* */
-#  else
-#    define sread(x, y, z)                                          \
-      (ares_ssize_t) recv((RECV_TYPE_ARG1)(x), (RECV_TYPE_ARG2)(y), \
-                          (RECV_TYPE_ARG3)(z), (RECV_TYPE_ARG4)(0))
-#  endif
-#else /* HAVE_RECV */
-#  ifndef sread
-/* */
-Error Missing_definition_of_macro_sread
-/* */
-#  endif
-#endif /* HAVE_RECV */
-
-
-#if defined(__minix)
-/* Minix doesn't support send on TCP sockets */
-#  define swrite(x, y, z) \
-    (ares_ssize_t)        \
-      write((SEND_TYPE_ARG1)(x), (SEND_TYPE_ARG2)(y), (SEND_TYPE_ARG3)(z))
-
-#elif defined(HAVE_SEND)
-#  if !defined(SEND_TYPE_ARG1) || !defined(SEND_QUAL_ARG2) || \
-    !defined(SEND_TYPE_ARG2) || !defined(SEND_TYPE_ARG3) ||   \
-    !defined(SEND_TYPE_ARG4) || !defined(SEND_TYPE_RETV)
-  /* */
-  Error Missing_definition_of_return_and_arguments_types_of_send
-/* */
-#  else
-#    define swrite(x, y, z)                                         \
-      (ares_ssize_t) send((SEND_TYPE_ARG1)(x), (SEND_TYPE_ARG2)(y), \
-                          (SEND_TYPE_ARG3)(z), (SEND_TYPE_ARG4)(SEND_4TH_ARG))
-#  endif
-#else /* HAVE_SEND */
-#  ifndef swrite
-  /* */
-  Error Missing_definition_of_macro_swrite
-/* */
-#  endif
-#endif /* HAVE_SEND */
-
-
-#if 0
-#  if defined(HAVE_RECVFROM)
-/*
- * Currently recvfrom is only used on udp sockets.
- */
-#    if !defined(RECVFROM_TYPE_ARG1) || !defined(RECVFROM_TYPE_ARG2) || \
-      !defined(RECVFROM_TYPE_ARG3) || !defined(RECVFROM_TYPE_ARG4) ||   \
-      !defined(RECVFROM_TYPE_ARG5) || !defined(RECVFROM_TYPE_ARG6) ||   \
-      !defined(RECVFROM_TYPE_RETV)
-  /* */
-  Error Missing_definition_of_return_and_arguments_types_of_recvfrom
-  /* */
-#    else
-#      define sreadfrom(s, b, bl, f, fl)                               \
-        (ares_ssize_t)                                                 \
-          recvfrom((RECVFROM_TYPE_ARG1)(s), (RECVFROM_TYPE_ARG2 *)(b), \
-                   (RECVFROM_TYPE_ARG3)(bl), (RECVFROM_TYPE_ARG4)(0),  \
-                   (RECVFROM_TYPE_ARG5 *)(f), (RECVFROM_TYPE_ARG6 *)(fl))
-#    endif
-#  else /* HAVE_RECVFROM */
-#    ifndef sreadfrom
-  /* */
-  Error Missing_definition_of_macro_sreadfrom
-  /* */
-#    endif
-#  endif /* HAVE_RECVFROM */
-
-
-#  ifdef RECVFROM_TYPE_ARG6_IS_VOID
-#    define RECVFROM_ARG6_T int
-#  else
-#    define RECVFROM_ARG6_T RECVFROM_TYPE_ARG6
-#  endif
-#endif /* if 0 */
-
-
-/*
- * Function-like macro definition used to close a socket.
- */
-
-#if defined(HAVE_CLOSESOCKET)
-#  define sclose(x) closesocket((x))
-#elif defined(HAVE_CLOSESOCKET_CAMEL)
-#  define sclose(x) CloseSocket((x))
-#elif defined(HAVE_CLOSE_S)
-#  define sclose(x) close_s((x))
-#else
-#  define sclose(x) close((x))
-#endif
-
-
-/*
- * Uppercase macro versions of ANSI/ISO is*() functions/macros which
- * avoid negative number inputs with argument byte codes > 127.
- */
-
-#define ISSPACE(x)  (isspace((int)((unsigned char)x)))
-#define ISDIGIT(x)  (isdigit((int)((unsigned char)x)))
-#define ISALNUM(x)  (isalnum((int)((unsigned char)x)))
-#define ISXDIGIT(x) (isxdigit((int)((unsigned char)x)))
-#define ISGRAPH(x)  (isgraph((int)((unsigned char)x)))
-#define ISALPHA(x)  (isalpha((int)((unsigned char)x)))
-#define ISPRINT(x)  (isprint((int)((unsigned char)x)))
-#define ISUPPER(x)  (isupper((int)((unsigned char)x)))
-#define ISLOWER(x)  (islower((int)((unsigned char)x)))
-#define ISASCII(x)  (((unsigned char)x) <= 127 ? 1 : 0)
-
-#define ISBLANK(x) \
-  (int)((((unsigned char)x) == ' ') || (((unsigned char)x) == '\t'))
-
-#define TOLOWER(x) (tolower((int)((unsigned char)x)))
-
-
-/*
- * Macro WHILE_FALSE may be used to build single-iteration do-while loops,
- * avoiding compiler warnings. Mostly intended for other macro definitions.
- */
-
-#define WHILE_FALSE while (0)
-
-#if defined(_MSC_VER) && !defined(__POCC__)
-#  undef WHILE_FALSE
-#  if (_MSC_VER < 1500)
-#    define WHILE_FALSE while (1, 0)
-#  else
-#    define WHILE_FALSE                                                   \
-      __pragma(warning(push)) __pragma(warning(disable : 4127)) while (0) \
-        __pragma(warning(pop))
-#  endif
-#endif
-
-
-/*
- * Macro used to include code only in debug builds.
- */
-
-#ifdef DEBUGBUILD
-#  define DEBUGF(x) x
-#else
-#  define DEBUGF(x) \
-    do {            \
-    }               \
-    WHILE_FALSE
-#endif
-
-
-/*
- * Macro used to include assertion code only in debug builds.
- */
-
-#if defined(DEBUGBUILD) && defined(HAVE_ASSERT_H)
-#  define DEBUGASSERT(x) assert(x)
-#else
-#  define DEBUGASSERT(x) \
-    do {                 \
-    }                    \
-    WHILE_FALSE
-#endif
-
-
-/*
- * Macro SOCKERRNO / SET_SOCKERRNO() returns / sets the *socket-related* errno
- * (or equivalent) on this platform to hide platform details to code using it.
- */
-
-#ifdef USE_WINSOCK
-#  define SOCKERRNO        ((int)WSAGetLastError())
-#  define SET_SOCKERRNO(x) (WSASetLastError((int)(x)))
-#else
-#  define SOCKERRNO        (errno)
-#  define SET_SOCKERRNO(x) (errno = (x))
-#endif
-
-
-/*
- * Macro ERRNO / SET_ERRNO() returns / sets the NOT *socket-related* errno
- * (or equivalent) on this platform to hide platform details to code using it.
- */
-
-#if defined(WIN32) && !defined(WATT32)
-#  define ERRNO        ((int)GetLastError())
-#  define SET_ERRNO(x) (SetLastError((DWORD)(x)))
-#else
-#  define ERRNO        (errno)
-#  define SET_ERRNO(x) (errno = (x))
-#endif
-
-
-/*
- * Portable error number symbolic names defined to Winsock error codes.
- */
-
-#ifdef USE_WINSOCK
-#  undef EBADF           /* override definition in errno.h */
-#  define EBADF WSAEBADF
-#  undef EINTR           /* override definition in errno.h */
-#  define EINTR WSAEINTR
-#  undef EINVAL          /* override definition in errno.h */
-#  define EINVAL WSAEINVAL
-#  undef EWOULDBLOCK     /* override definition in errno.h */
-#  define EWOULDBLOCK WSAEWOULDBLOCK
-#  undef EINPROGRESS     /* override definition in errno.h */
-#  define EINPROGRESS WSAEINPROGRESS
-#  undef EALREADY        /* override definition in errno.h */
-#  define EALREADY WSAEALREADY
-#  undef ENOTSOCK        /* override definition in errno.h */
-#  define ENOTSOCK WSAENOTSOCK
-#  undef EDESTADDRREQ    /* override definition in errno.h */
-#  define EDESTADDRREQ WSAEDESTADDRREQ
-#  undef EMSGSIZE        /* override definition in errno.h */
-#  define EMSGSIZE WSAEMSGSIZE
-#  undef EPROTOTYPE      /* override definition in errno.h */
-#  define EPROTOTYPE WSAEPROTOTYPE
-#  undef ENOPROTOOPT     /* override definition in errno.h */
-#  define ENOPROTOOPT WSAENOPROTOOPT
-#  undef EPROTONOSUPPORT /* override definition in errno.h */
-#  define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-#  define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
-#  undef EOPNOTSUPP /* override definition in errno.h */
-#  define EOPNOTSUPP   WSAEOPNOTSUPP
-#  define EPFNOSUPPORT WSAEPFNOSUPPORT
-#  undef EAFNOSUPPORT  /* override definition in errno.h */
-#  define EAFNOSUPPORT WSAEAFNOSUPPORT
-#  undef EADDRINUSE    /* override definition in errno.h */
-#  define EADDRINUSE WSAEADDRINUSE
-#  undef EADDRNOTAVAIL /* override definition in errno.h */
-#  define EADDRNOTAVAIL WSAEADDRNOTAVAIL
-#  undef ENETDOWN      /* override definition in errno.h */
-#  define ENETDOWN WSAENETDOWN
-#  undef ENETUNREACH   /* override definition in errno.h */
-#  define ENETUNREACH WSAENETUNREACH
-#  undef ENETRESET     /* override definition in errno.h */
-#  define ENETRESET WSAENETRESET
-#  undef ECONNABORTED  /* override definition in errno.h */
-#  define ECONNABORTED WSAECONNABORTED
-#  undef ECONNRESET    /* override definition in errno.h */
-#  define ECONNRESET WSAECONNRESET
-#  undef ENOBUFS       /* override definition in errno.h */
-#  define ENOBUFS WSAENOBUFS
-#  undef EISCONN       /* override definition in errno.h */
-#  define EISCONN WSAEISCONN
-#  undef ENOTCONN      /* override definition in errno.h */
-#  define ENOTCONN     WSAENOTCONN
-#  define ESHUTDOWN    WSAESHUTDOWN
-#  define ETOOMANYREFS WSAETOOMANYREFS
-#  undef ETIMEDOUT     /* override definition in errno.h */
-#  define ETIMEDOUT WSAETIMEDOUT
-#  undef ECONNREFUSED  /* override definition in errno.h */
-#  define ECONNREFUSED WSAECONNREFUSED
-#  undef ELOOP         /* override definition in errno.h */
-#  define ELOOP WSAELOOP
-#  ifndef ENAMETOOLONG /* possible previous definition in errno.h */
-#    define ENAMETOOLONG WSAENAMETOOLONG
-#  endif
-#  define EHOSTDOWN WSAEHOSTDOWN
-#  undef EHOSTUNREACH /* override definition in errno.h */
-#  define EHOSTUNREACH WSAEHOSTUNREACH
-#  ifndef ENOTEMPTY   /* possible previous definition in errno.h */
-#    define ENOTEMPTY WSAENOTEMPTY
-#  endif
-#  define EPROCLIM WSAEPROCLIM
-#  define EUSERS   WSAEUSERS
-#  define EDQUOT   WSAEDQUOT
-#  define ESTALE   WSAESTALE
-#  define EREMOTE  WSAEREMOTE
-#endif
-
-
-/*
- *  Actually use __32_getpwuid() on 64-bit VMS builds for getpwuid()
- */
-
-#if defined(__VMS) && defined(__INITIAL_POINTER_SIZE) && \
-  (__INITIAL_POINTER_SIZE == 64)
-#  define getpwuid __32_getpwuid
-#endif
-
-
-/*
- * Macro argv_item_t hides platform details to code using it.
- */
-
-#ifdef __VMS
-#  define argv_item_t __char_ptr32
-#else
-#  define argv_item_t char *
-#endif
-
-
-/*
- * We use this ZERO_NULL to avoid picky compiler warnings,
- * when assigning a NULL pointer to a function pointer var.
- */
-
-#define ZERO_NULL 0
-
-
-#endif /* __SETUP_ONCE_H */
diff --git a/contrib/libs/c-ares/src/lib/ares__buf.c b/contrib/libs/c-ares/src/lib/str/ares__buf.c
similarity index 84%
rename from contrib/libs/c-ares/src/lib/ares__buf.c
rename to contrib/libs/c-ares/src/lib/str/ares__buf.c
index 2203662fab53..b855260ab373 100644
--- a/contrib/libs/c-ares/src/lib/ares__buf.c
+++ b/contrib/libs/c-ares/src/lib/str/ares__buf.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include "ares__buf.h"
 #include <limits.h>
@@ -87,7 +85,7 @@ void ares__buf_destroy(ares__buf_t *buf)
 static ares_bool_t ares__buf_is_const(const ares__buf_t *buf)
 {
   if (buf == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (buf->data != NULL && buf->alloc_buf == NULL) {
@@ -107,7 +105,7 @@ void ares__buf_reclaim(ares__buf_t *buf)
   }
 
   if (ares__buf_is_const(buf)) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Silence coverity.  All lengths are zero so would bail out later but
@@ -135,8 +133,6 @@ void ares__buf_reclaim(ares__buf_t *buf)
   if (buf->tag_offset != SIZE_MAX) {
     buf->tag_offset -= prefix_size;
   }
-
-  return;
 }
 
 static ares_status_t ares__buf_ensure_space(ares__buf_t *buf,
@@ -151,7 +147,7 @@ static ares_status_t ares__buf_ensure_space(ares__buf_t *buf,
   }
 
   if (ares__buf_is_const(buf)) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* When calling ares__buf_finish_str() we end up adding a null terminator,
@@ -201,14 +197,14 @@ static ares_status_t ares__buf_ensure_space(ares__buf_t *buf,
 ares_status_t ares__buf_set_length(ares__buf_t *buf, size_t len)
 {
   if (buf == NULL || ares__buf_is_const(buf)) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (len >= buf->alloc_buf_len - buf->offset) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
-  buf->data_len = len;
+  buf->data_len = len + buf->offset;
   return ARES_SUCCESS;
 }
 
@@ -231,9 +227,9 @@ ares_status_t ares__buf_append(ares__buf_t *buf, const unsigned char *data,
   return ARES_SUCCESS;
 }
 
-ares_status_t ares__buf_append_byte(ares__buf_t *buf, unsigned char byte)
+ares_status_t ares__buf_append_byte(ares__buf_t *buf, unsigned char b)
 {
-  return ares__buf_append(buf, &byte, 1);
+  return ares__buf_append(buf, &b, 1);
 }
 
 ares_status_t ares__buf_append_be16(ares__buf_t *buf, unsigned short u16)
@@ -242,12 +238,12 @@ ares_status_t ares__buf_append_be16(ares__buf_t *buf, unsigned short u16)
 
   status = ares__buf_append_byte(buf, (unsigned char)((u16 >> 8) & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, (unsigned char)(u16 & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -259,22 +255,22 @@ ares_status_t ares__buf_append_be32(ares__buf_t *buf, unsigned int u32)
 
   status = ares__buf_append_byte(buf, ((unsigned char)(u32 >> 24) & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, ((unsigned char)(u32 >> 16) & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, ((unsigned char)(u32 >> 8) & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__buf_append_byte(buf, ((unsigned char)u32 & 0xff));
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -319,7 +315,7 @@ unsigned char *ares__buf_finish_bin(ares__buf_t *buf, size_t *len)
   /* We don't want to return NULL except on failure, may be zero-length */
   if (buf->alloc_buf == NULL &&
       ares__buf_ensure_space(buf, 1) != ARES_SUCCESS) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   ptr  = buf->alloc_buf;
   *len = buf->data_len;
@@ -540,7 +536,7 @@ ares_status_t ares__buf_fetch_bytes_dup(ares__buf_t *buf, size_t len,
 
   *bytes = ares_malloc(null_term ? len + 1 : len);
   if (*bytes == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memcpy(*bytes, ptr, len);
@@ -561,7 +557,7 @@ ares_status_t ares__buf_fetch_str_dup(ares__buf_t *buf, size_t len, char **str)
 
   *str = ares_malloc(len + 1);
   if (*str == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   memcpy(*str, ptr, len);
@@ -787,7 +783,7 @@ ares_status_t ares__buf_split(ares__buf_t *buf, const unsigned char *delims,
   ares_bool_t   first  = ARES_TRUE;
 
   if (buf == NULL || delims == NULL || delims_len == 0 || list == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *list = ares__llist_create(ares__buf_destroy_cb);
@@ -825,7 +821,7 @@ ares_status_t ares__buf_split(ares__buf_t *buf, const unsigned char *delims,
 
     /* Shouldn't be possible */
     if (ptr == NULL) {
-      status = ARES_EFORMERR;
+      status = ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
       goto done;
     }
 
@@ -841,7 +837,7 @@ ares_status_t ares__buf_split(ares__buf_t *buf, const unsigned char *delims,
     }
 
     if (flags & ARES_BUF_SPLIT_RTRIM) {
-      while (len && ares__is_whitespace(ptr[len - 1], ARES_TRUE)) {
+      while (len > 0 && ares__is_whitespace(ptr[len - 1], ARES_TRUE)) {
         len--;
       }
     }
@@ -934,20 +930,20 @@ ares_status_t ares__buf_set_position(ares__buf_t *buf, size_t idx)
   }
 
   if (idx > buf->data_len) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   buf->offset = idx;
   return ARES_SUCCESS;
 }
 
-static ares_status_t ares__buf_parse_dns_binstr_int(
-  ares__buf_t *buf, size_t remaining_len, unsigned char **bin, size_t *bin_len,
-  ares_bool_t allow_multiple, ares_bool_t validate_printable)
+ares_status_t ares__buf_parse_dns_abinstr(ares__buf_t *buf,
+                                          size_t       remaining_len,
+                                          ares__dns_multistring_t **strs,
+                                          ares_bool_t validate_printable)
 {
   unsigned char len;
-  ares_status_t status;
-  ares__buf_t  *binbuf   = NULL;
+  ares_status_t status   = ARES_EBADRESP;
   size_t        orig_len = ares__buf_len(buf);
 
   if (buf == NULL) {
@@ -958,15 +954,17 @@ static ares_status_t ares__buf_parse_dns_binstr_int(
     return ARES_EBADRESP;
   }
 
-  binbuf = ares__buf_create();
-  if (binbuf == NULL) {
-    return ARES_ENOMEM;
+  if (strs != NULL) {
+    *strs = ares__dns_multistring_create();
+    if (*strs == NULL) {
+      return ARES_ENOMEM;
+    }
   }
 
   while (orig_len - ares__buf_len(buf) < remaining_len) {
     status = ares__buf_fetch_bytes(buf, &len, 1);
     if (status != ARES_SUCCESS) {
-      break;
+      break; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     if (len) {
@@ -981,22 +979,88 @@ static ares_status_t ares__buf_parse_dns_binstr_int(
         }
       }
 
-      if (bin != NULL) {
-        status = ares__buf_fetch_bytes_into_buf(buf, binbuf, len);
+      if (strs != NULL) {
+        unsigned char *data = NULL;
+        status = ares__buf_fetch_bytes_dup(buf, len, ARES_TRUE, &data);
+        if (status != ARES_SUCCESS) {
+          break;
+        }
+        status = ares__dns_multistring_add_own(*strs, data, len);
+        if (status != ARES_SUCCESS) {
+          ares_free(data);
+          break;
+        }
       } else {
         status = ares__buf_consume(buf, len);
+        if (status != ARES_SUCCESS) {
+          break;
+        }
       }
-      if (status != ARES_SUCCESS) {
-        break;
+    }
+  }
+
+  if (status != ARES_SUCCESS && strs != NULL) {
+    ares__dns_multistring_destroy(*strs);
+    *strs = NULL;
+  }
+
+  return status;
+}
+
+static ares_status_t
+  ares__buf_parse_dns_binstr_int(ares__buf_t *buf, size_t remaining_len,
+                                 unsigned char **bin, size_t *bin_len,
+                                 ares_bool_t validate_printable)
+{
+  unsigned char len;
+  ares_status_t status = ARES_EBADRESP;
+  ares__buf_t  *binbuf = NULL;
+
+  if (buf == NULL) {
+    return ARES_EFORMERR;
+  }
+
+  if (remaining_len == 0) {
+    return ARES_EBADRESP;
+  }
+
+  binbuf = ares__buf_create();
+  if (binbuf == NULL) {
+    return ARES_ENOMEM;
+  }
+
+  status = ares__buf_fetch_bytes(buf, &len, 1);
+  if (status != ARES_SUCCESS) {
+    goto done; /* LCOV_EXCL_LINE: DefensiveCoding */
+  }
+
+  remaining_len--;
+
+  if (len > remaining_len) {
+    status = ARES_EBADRESP;
+    goto done;
+  }
+
+  if (len) {
+    /* When used by the _str() parser, it really needs to be validated to
+     * be a valid printable ascii string.  Do that here */
+    if (validate_printable && ares__buf_len(buf) >= len) {
+      size_t      mylen;
+      const char *data = (const char *)ares__buf_peek(buf, &mylen);
+      if (!ares__str_isprint(data, len)) {
+        status = ARES_EBADSTR;
+        goto done;
       }
     }
 
-    if (!allow_multiple) {
-      break;
+    if (bin != NULL) {
+      status = ares__buf_fetch_bytes_into_buf(buf, binbuf, len);
+    } else {
+      status = ares__buf_consume(buf, len);
     }
   }
 
-
+done:
   if (status != ARES_SUCCESS) {
     ares__buf_destroy(binbuf);
   } else {
@@ -1014,20 +1078,19 @@ static ares_status_t ares__buf_parse_dns_binstr_int(
 }
 
 ares_status_t ares__buf_parse_dns_binstr(ares__buf_t *buf, size_t remaining_len,
-                                         unsigned char **bin, size_t *bin_len,
-                                         ares_bool_t allow_multiple)
+                                         unsigned char **bin, size_t *bin_len)
 {
   return ares__buf_parse_dns_binstr_int(buf, remaining_len, bin, bin_len,
-                                        allow_multiple, ARES_FALSE);
+                                        ARES_FALSE);
 }
 
 ares_status_t ares__buf_parse_dns_str(ares__buf_t *buf, size_t remaining_len,
-                                      char **str, ares_bool_t allow_multiple)
+                                      char **str)
 {
   size_t len;
 
-  return ares__buf_parse_dns_binstr_int(
-    buf, remaining_len, (unsigned char **)str, &len, allow_multiple, ARES_TRUE);
+  return ares__buf_parse_dns_binstr_int(buf, remaining_len,
+                                        (unsigned char **)str, &len, ARES_TRUE);
 }
 
 ares_status_t ares__buf_append_num_dec(ares__buf_t *buf, size_t num, size_t len)
@@ -1049,13 +1112,13 @@ ares_status_t ares__buf_append_num_dec(ares__buf_t *buf, size_t num, size_t len)
 
     /* Silence coverity.  Shouldn't be possible since we calculate it above */
     if (mod == 0) {
-      return ARES_EFORMERR;
+      return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
     }
 
     digit  /= mod;
     status  = ares__buf_append_byte(buf, '0' + (unsigned char)(digit & 0xFF));
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
   return ARES_SUCCESS;
@@ -1074,7 +1137,7 @@ ares_status_t ares__buf_append_num_hex(ares__buf_t *buf, size_t num, size_t len)
     ares_status_t status;
     status = ares__buf_append_byte(buf, hexbytes[(num >> ((i - 1) * 4)) & 0xF]);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
   return ARES_SUCCESS;
@@ -1095,13 +1158,13 @@ static ares_status_t ares__buf_hexdump_line(ares__buf_t *buf, size_t idx,
   /* Address */
   status = ares__buf_append_num_hex(buf, idx, 6);
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   /* | */
   status = ares__buf_append_str(buf, " | ");
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; i < 16; i++) {
@@ -1111,19 +1174,19 @@ static ares_status_t ares__buf_hexdump_line(ares__buf_t *buf, size_t idx,
       status = ares__buf_append_num_hex(buf, data[i], 2);
     }
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
 
     status = ares__buf_append_byte(buf, ' ');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
   /* | */
   status = ares__buf_append_str(buf, " | ");
   if (status != ARES_SUCCESS) {
-    return status;
+    return status; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; i < 16; i++) {
@@ -1132,7 +1195,7 @@ static ares_status_t ares__buf_hexdump_line(ares__buf_t *buf, size_t idx,
     }
     status = ares__buf_append_byte(buf, ares__isprint(data[i]) ? data[i] : '.');
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1149,7 +1212,7 @@ ares_status_t ares__buf_hexdump(ares__buf_t *buf, const unsigned char *data,
     ares_status_t status;
     status = ares__buf_hexdump_line(buf, i, data + i, len - i);
     if (status != ARES_SUCCESS) {
-      return status;
+      return status; /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -1166,7 +1229,7 @@ ares_status_t ares__buf_load_file(const char *filename, ares__buf_t *buf)
   ares_status_t  status;
 
   if (filename == NULL || buf == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   fp = fopen(filename, "rb");
@@ -1188,39 +1251,39 @@ ares_status_t ares__buf_load_file(const char *filename, ares__buf_t *buf)
 
   /* Get length portably, fstat() is POSIX, not C */
   if (fseek(fp, 0, SEEK_END) != 0) {
-    status = ARES_EFILE;
-    goto done;
+    status = ARES_EFILE; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done;           /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ftell_len = ftell(fp);
   if (ftell_len < 0) {
-    status = ARES_EFILE;
-    goto done;
+    status = ARES_EFILE; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done;           /* LCOV_EXCL_LINE: DefensiveCoding */
   }
   len = (size_t)ftell_len;
 
   if (fseek(fp, 0, SEEK_SET) != 0) {
-    status = ARES_EFILE;
-    goto done;
+    status = ARES_EFILE; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done;           /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   if (len == 0) {
-    status = ARES_SUCCESS;
-    goto done;
+    status = ARES_SUCCESS; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done;             /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Read entire data into buffer */
   ptr_len = len;
   ptr     = ares__buf_append_start(buf, &ptr_len);
   if (ptr == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   ptr_len = fread(ptr, 1, len, fp);
   if (ptr_len != len) {
-    status = ARES_EFILE;
-    goto done;
+    status = ARES_EFILE; /* LCOV_EXCL_LINE: DefensiveCoding */
+    goto done;           /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   ares__buf_append_finish(buf, len);
diff --git a/contrib/libs/c-ares/src/lib/ares__buf.h b/contrib/libs/c-ares/src/lib/str/ares__buf.h
similarity index 95%
rename from contrib/libs/c-ares/src/lib/ares__buf.h
rename to contrib/libs/c-ares/src/lib/str/ares__buf.h
index 4298814f7b43..cb887aa27edc 100644
--- a/contrib/libs/c-ares/src/lib/ares__buf.h
+++ b/contrib/libs/c-ares/src/lib/str/ares__buf.h
@@ -85,10 +85,10 @@ ares_status_t  ares__buf_append(ares__buf_t *buf, const unsigned char *data,
 /*! Append a single byte to the dynamic buffer object
  *
  *  \param[in] buf      Initialized buffer object
- *  \param[in] byte     Single byte to append to buffer object.
+ *  \param[in] b        Single byte to append to buffer object.
  *  \return ARES_SUCCESS or one of the c-ares error codes
  */
-ares_status_t  ares__buf_append_byte(ares__buf_t *buf, unsigned char byte);
+ares_status_t  ares__buf_append_byte(ares__buf_t *buf, unsigned char b);
 
 /*! Append a null-terminated string to the dynamic buffer object
  *
@@ -554,13 +554,31 @@ size_t               ares__buf_get_position(const ares__buf_t *buf);
  *  \param[out] name           Pointer passed by reference to be filled in with
  *                             allocated string of the parsed that must be
  *                             ares_free()'d by the caller.
- *  \param[in]  allow_multiple ARES_TRUE if it should attempt to parse multiple
- *                             strings back to back, and will concatenate in
- *                             the returned str.
  *  \return ARES_SUCCESS on success
  */
 ares_status_t ares__buf_parse_dns_str(ares__buf_t *buf, size_t remaining_len,
-                                      char **name, ares_bool_t allow_multiple);
+                                      char **name);
+
+/*! Parse an array of character strings as defined in RFC1035, as binary,
+ *  however, for convenience this does guarantee a NULL terminator (that is
+ *  not included in the length for each value).
+ *
+ *  \param[in]  buf                initialized buffer object
+ *  \param[in]  remaining_len      maximum length that should be used for
+ *                                 parsing the string, this is often less than
+ *                                 the remaining buffer and is based on the RR
+ *                                 record length.
+ *  \param[out] strs               Pointer passed by reference to be filled in
+ *                                 with
+ *                                 the array of values.
+ *  \param[out] validate_printable Validate the strings contain only printable
+ *                                 data.
+ *  \return ARES_SUCCESS on success
+ */
+ares_status_t ares__buf_parse_dns_abinstr(ares__buf_t *buf,
+                                          size_t       remaining_len,
+                                          ares__dns_multistring_t **strs,
+                                          ares_bool_t validate_printable);
 
 /*! Parse a character-string as defined in RFC1035, as binary, however for
  *  convenience this does guarantee a NULL terminator (that is not included
@@ -574,14 +592,10 @@ ares_status_t ares__buf_parse_dns_str(ares__buf_t *buf, size_t remaining_len,
  *                             allocated string of the parsed that must be
  *                             ares_free()'d by the caller.
  *  \param[out] bin_len        Length of returned string.
- *  \param[in]  allow_multiple ARES_TRUE if it should attempt to parse multiple
- *                             strings back to back, and will concatenate in
- *                             the returned str.
  *  \return ARES_SUCCESS on success
  */
 ares_status_t ares__buf_parse_dns_binstr(ares__buf_t *buf, size_t remaining_len,
-                                         unsigned char **bin, size_t *bin_len,
-                                         ares_bool_t allow_multiple);
+                                         unsigned char **bin, size_t *bin_len);
 
 /*! Load data from specified file path into provided buffer.  The entire file
  *  is loaded into memory.
diff --git a/contrib/libs/c-ares/src/lib/ares_str.c b/contrib/libs/c-ares/src/lib/str/ares_str.c
similarity index 96%
rename from contrib/libs/c-ares/src/lib/ares_str.c
rename to contrib/libs/c-ares/src/lib/str/ares_str.c
index 44a5e452fb88..ade61041eb92 100644
--- a/contrib/libs/c-ares/src/lib/ares_str.c
+++ b/contrib/libs/c-ares/src/lib/str/ares_str.c
@@ -25,10 +25,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares_str.h"
-#include "ares.h"
 #include "ares_private.h"
+#include "ares_str.h"
 
 #ifdef HAVE_STDINT_H
 #  include <stdint.h>
@@ -56,7 +54,7 @@ char *ares_strdup(const char *s1)
 
   /* Don't see how this is possible */
   if (len == SIZE_MAX) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   out = ares_malloc(len + 1);
@@ -77,7 +75,7 @@ size_t ares_strcpy(char *dest, const char *src, size_t dest_size)
   size_t len = 0;
 
   if (dest == NULL || dest_size == 0) {
-    return 0;
+    return 0; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   len = ares_strlen(src);
@@ -116,7 +114,7 @@ void ares__str_rtrim(char *str)
   size_t i;
 
   if (str == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   len = ares_strlen(str);
@@ -134,7 +132,7 @@ void ares__str_ltrim(char *str)
   size_t len;
 
   if (str == NULL) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   for (i = 0; str[i] != 0 && ares__isspace(str[i]); i++) {
@@ -262,7 +260,7 @@ ares_bool_t ares__is_hostname(const char *str)
   size_t i;
 
   if (str == NULL) {
-    return ARES_FALSE;
+    return ARES_FALSE; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   for (i = 0; str[i] != 0; i++) {
diff --git a/contrib/libs/c-ares/src/lib/ares_str.h b/contrib/libs/c-ares/src/lib/str/ares_str.h
similarity index 82%
rename from contrib/libs/c-ares/src/lib/ares_str.h
rename to contrib/libs/c-ares/src/lib/str/ares_str.h
index 526a927a6286..440758c21be6 100644
--- a/contrib/libs/c-ares/src/lib/ares_str.h
+++ b/contrib/libs/c-ares/src/lib/str/ares_str.h
@@ -27,9 +27,6 @@
 #ifndef __ARES_STR_H
 #define __ARES_STR_H
 
-#include "ares_setup.h"
-#include "ares.h"
-
 char         *ares_strdup(const char *s1);
 
 size_t        ares_strlen(const char *str);
@@ -75,5 +72,18 @@ ares_bool_t   ares__is_hostname(const char *str);
  */
 ares_bool_t   ares__str_isprint(const char *str, size_t len);
 
+/* We only care about ASCII rules */
+#define ares__isascii(x) (((unsigned char)x) <= 127)
+#define ares__isdigit(x) \
+  (((unsigned char)x) >= '0' && ((unsigned char)x) <= '9')
+#define ares__isxdigit(x)                                      \
+  (ares__isdigit(x) ||                                         \
+   (((unsigned char)x) >= 'a' && ((unsigned char)x) <= 'f') || \
+   (((unsigned char)x) >= 'A' && ((unsigned char)x) <= 'F'))
+#define ares__isupper(x) \
+  (((unsigned char)x) >= 'A' && ((unsigned char)x) <= 'Z')
+#define ares__islower(x) \
+  (((unsigned char)x) >= 'a' && ((unsigned char)x) <= 'z')
+#define ares__isalpha(x) (ares__islower(x) || ares__isupper(x))
 
 #endif /* __ARES_STR_H */
diff --git a/contrib/libs/c-ares/src/lib/ares_strcasecmp.c b/contrib/libs/c-ares/src/lib/str/ares_strcasecmp.c
similarity index 89%
rename from contrib/libs/c-ares/src/lib/ares_strcasecmp.c
rename to contrib/libs/c-ares/src/lib/str/ares_strcasecmp.c
index b91cbbe1544a..76b835fd8e92 100644
--- a/contrib/libs/c-ares/src/lib/ares_strcasecmp.c
+++ b/contrib/libs/c-ares/src/lib/str/ares_strcasecmp.c
@@ -25,7 +25,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
+#include "ares_private.h"
 #include "ares_strcasecmp.h"
 
 #ifndef HAVE_STRCASECMP
@@ -39,8 +39,8 @@ int ares_strcasecmp(const char *a, const char *b)
   size_t i;
 
   for (i = 0; i < (size_t)-1; i++) {
-    int c1 = ISUPPER(a[i]) ? tolower(a[i]) : a[i];
-    int c2 = ISUPPER(b[i]) ? tolower(b[i]) : b[i];
+    int c1 = ares__tolower(a[i]);
+    int c2 = ares__tolower(b[i]);
     if (c1 != c2) {
       return c1 - c2;
     }
@@ -64,8 +64,8 @@ int ares_strncasecmp(const char *a, const char *b, size_t n)
   size_t i;
 
   for (i = 0; i < n; i++) {
-    int c1 = ISUPPER(a[i]) ? tolower(a[i]) : a[i];
-    int c2 = ISUPPER(b[i]) ? tolower(b[i]) : b[i];
+    int c1 = ares__tolower(a[i]);
+    int c2 = ares__tolower(b[i]);
     if (c1 != c2) {
       return c1 - c2;
     }
diff --git a/contrib/libs/c-ares/src/lib/ares_strcasecmp.h b/contrib/libs/c-ares/src/lib/str/ares_strcasecmp.h
similarity index 98%
rename from contrib/libs/c-ares/src/lib/ares_strcasecmp.h
rename to contrib/libs/c-ares/src/lib/str/ares_strcasecmp.h
index 31a66be7179d..a8097d2219e3 100644
--- a/contrib/libs/c-ares/src/lib/ares_strcasecmp.h
+++ b/contrib/libs/c-ares/src/lib/str/ares_strcasecmp.h
@@ -27,8 +27,6 @@
 #ifndef HEADER_CARES_STRCASECMP_H
 #define HEADER_CARES_STRCASECMP_H
 
-#include "ares_setup.h"
-
 #ifndef HAVE_STRCASECMP
 extern int ares_strcasecmp(const char *a, const char *b);
 #endif
diff --git a/contrib/libs/c-ares/src/lib/ares_strsplit.c b/contrib/libs/c-ares/src/lib/str/ares_strsplit.c
similarity index 88%
rename from contrib/libs/c-ares/src/lib/ares_strsplit.c
rename to contrib/libs/c-ares/src/lib/str/ares_strsplit.c
index 395bf1ebb9a5..dee307d7799f 100644
--- a/contrib/libs/c-ares/src/lib/ares_strsplit.c
+++ b/contrib/libs/c-ares/src/lib/str/ares_strsplit.c
@@ -23,13 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-
-#if defined(__MVS__)
-#  include <strings.h>
-#endif
-
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 void ares__strsplit_free(char **elms, size_t num_elm)
@@ -52,19 +45,19 @@ char **ares__strsplit_duplicate(char **elms, size_t num_elm)
   char **out;
 
   if (elms == NULL || num_elm == 0) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   out = ares_malloc_zero(sizeof(*elms) * num_elm);
   if (out == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (i = 0; i < num_elm; i++) {
     out[i] = ares_strdup(elms[i]);
     if (out[i] == NULL) {
-      ares__strsplit_free(out, num_elm);
-      return NULL;
+      ares__strsplit_free(out, num_elm); /* LCOV_EXCL_LINE: OutOfMemory */
+      return NULL;                       /* LCOV_EXCL_LINE: OutOfMemory */
     }
   }
 
@@ -82,7 +75,7 @@ char **ares__strsplit(const char *in, const char *delms, size_t *num_elm)
   size_t              idx = 0;
 
   if (in == NULL || delms == NULL || num_elm == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   *num_elm = 0;
@@ -108,8 +101,8 @@ char **ares__strsplit(const char *in, const char *delms, size_t *num_elm)
 
   out = ares_malloc_zero(cnt * sizeof(*out));
   if (out == NULL) {
-    status = ARES_ENOMEM;
-    goto done;
+    status = ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
+    goto done;            /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   for (node = ares__llist_node_first(llist); node != NULL;
diff --git a/contrib/libs/c-ares/src/lib/ares_strsplit.h b/contrib/libs/c-ares/src/lib/str/ares_strsplit.h
similarity index 98%
rename from contrib/libs/c-ares/src/lib/ares_strsplit.h
rename to contrib/libs/c-ares/src/lib/str/ares_strsplit.h
index af650eee5348..ee997804f012 100644
--- a/contrib/libs/c-ares/src/lib/ares_strsplit.h
+++ b/contrib/libs/c-ares/src/lib/str/ares_strsplit.h
@@ -26,8 +26,6 @@
 #ifndef HEADER_CARES_STRSPLIT_H
 #define HEADER_CARES_STRSPLIT_H
 
-#include "ares_setup.h"
-
 /* Split a string on delms skipping empty or duplicate elements.
  *
  * param in String to split.
diff --git a/contrib/libs/c-ares/src/lib/thirdparty/apple/README.md b/contrib/libs/c-ares/src/lib/thirdparty/apple/README.md
index e0915f4a431b..8cef22ed7ed5 100644
--- a/contrib/libs/c-ares/src/lib/thirdparty/apple/README.md
+++ b/contrib/libs/c-ares/src/lib/thirdparty/apple/README.md
@@ -1,4 +1,18 @@
 The `dnsinfo.h` header was extracted from Apple's OpenSource repository:
-[https://opensource.apple.com/source/configd/configd-1109.140.1/dnsinfo/dnsinfo.h](https://opensource.apple.com/source/configd/configd-1109.140.1/dnsinfo/dnsinfo.h)
+[https://opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h](https://opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h)
 
-This is needed to call into `dns_configuration_copy()` and `dns_configuration_free()`.
+We then had to make a few edits to this file:
+1. Add `AvailabilityMacros.h` header file
+2. conditionalize `reach_flags` in `dns_resolver_t` on MacOS 10.8 or higher, in
+   order to maintain compatibility with the last MacOS PPC release, 10.6.
+3. conditionalize `_dns_configuration_ack()` on MacOS 10.8 or higher.
+4. Update parameter list to `(void)` for both `dns_configuration_notify_key()`
+   and `dns_configuration_copy()` to sidestep compiler warnings in this old
+   header.
+
+We had tried initially to use the latest 1109.140.1 which only worked on
+MacOS 11+, then downgraded to 963.50.8 for MacOS 10.8+ support, then finally
+to 453.19 with additional patches.
+
+This is needed to call into `dns_configuration_copy()` and
+`dns_configuration_free()`.
diff --git a/contrib/libs/c-ares/src/lib/thirdparty/apple/dnsinfo.h b/contrib/libs/c-ares/src/lib/thirdparty/apple/dnsinfo.h
index d5a0e70e2f31..d92a1d80305d 100644
--- a/contrib/libs/c-ares/src/lib/thirdparty/apple/dnsinfo.h
+++ b/contrib/libs/c-ares/src/lib/thirdparty/apple/dnsinfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2006, 2008, 2009, 2011-2013, 2015-2018 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2006, 2008, 2009, 2011 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -28,14 +28,15 @@
  * These routines provide access to the systems DNS configuration
  */
 
-#include <os/availability.h>
+#include <Availability.h>
 #include <sys/cdefs.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <AvailabilityMacros.h>
 
-#define	DNSINFO_VERSION		20170629
+#define	DNSINFO_VERSION		20111104
 
 #define DEFAULT_SEARCH_ORDER    200000   /* search order for the "default" resolver domain name */
 
@@ -72,23 +73,17 @@ typedef struct {
 	DNS_VAR(uint32_t,		search_order);	/* search_order */
 	DNS_VAR(uint32_t,		if_index);
 	DNS_VAR(uint32_t,		flags);
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 /* MacOS 10.8 */
+	DNS_VAR(uint32_t,		reserved[6]);
+#else
 	DNS_VAR(uint32_t,		reach_flags);	/* SCNetworkReachabilityFlags */
-	DNS_VAR(uint32_t,		service_identifier);
-	DNS_PTR(char *,			cid);		/* configuration identifer */
-	DNS_PTR(char *,			if_name);	/* if_index interface name */
+	DNS_VAR(uint32_t,		reserved[5]);
+#endif
 } dns_resolver_t;
 #pragma pack()
 
 
-#define DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS	0x0002		/* always requesting for A dns records in queries */
-#define DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS	0x0004		/* always requesting for AAAA dns records in queries */
-
-#define	DNS_RESOLVER_FLAGS_REQUEST_ALL_RECORDS	\
-	(DNS_RESOLVER_FLAGS_REQUEST_A_RECORDS | DNS_RESOLVER_FLAGS_REQUEST_AAAA_RECORDS)
-
-#define DNS_RESOLVER_FLAGS_SCOPED		0x1000		/* configuration is for scoped questions */
-#define DNS_RESOLVER_FLAGS_SERVICE_SPECIFIC	0x2000		/* configuration is service-specific */
-#define DNS_RESOLVER_FLAGS_SUPPLEMENTAL		0x4000		/* supplemental match configuration */
+#define DNS_RESOLVER_FLAGS_SCOPED	1		/* configuration is for scoped questions */
 
 
 #pragma pack(4)
@@ -97,10 +92,7 @@ typedef struct {
 	DNS_PTR(dns_resolver_t **,	resolver);
 	DNS_VAR(int32_t,		n_scoped_resolver);	/* "scoped" resolver configurations */
 	DNS_PTR(dns_resolver_t **,	scoped_resolver);
-	DNS_VAR(uint64_t,		generation);
-	DNS_VAR(int32_t,		n_service_specific_resolver);
-	DNS_PTR(dns_resolver_t **,	service_specific_resolver);
-	DNS_VAR(uint32_t,		version);
+	DNS_VAR(uint32_t,		reserved[5]);
 } dns_config_t;
 #pragma pack()
 
@@ -111,17 +103,19 @@ __BEGIN_DECLS
  * DNS configuration access APIs
  */
 const char *
-dns_configuration_notify_key    (void)				API_AVAILABLE(macos(10.4), ios(2.0));
+dns_configuration_notify_key    (void)				__OSX_AVAILABLE_STARTING(__MAC_10_4,__IPHONE_2_0);
 
 dns_config_t *
-dns_configuration_copy		(void)				API_AVAILABLE(macos(10.4), ios(2.0));
+dns_configuration_copy		(void)				__OSX_AVAILABLE_STARTING(__MAC_10_4,__IPHONE_2_0);
 
 void
-dns_configuration_free		(dns_config_t	*config)	API_AVAILABLE(macos(10.4), ios(2.0));
+dns_configuration_free		(dns_config_t	*config)	__OSX_AVAILABLE_STARTING(__MAC_10_4,__IPHONE_2_0);
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
 void
 _dns_configuration_ack		(dns_config_t	*config,
-				 const char	*bundle_id)	API_AVAILABLE(macos(10.8), ios(6.0));
+				 const char	*bundle_id)	__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
+#endif
 
 __END_DECLS
 
diff --git a/contrib/libs/c-ares/src/lib/ares__iface_ips.c b/contrib/libs/c-ares/src/lib/util/ares__iface_ips.c
similarity index 86%
rename from contrib/libs/c-ares/src/lib/ares__iface_ips.c
rename to contrib/libs/c-ares/src/lib/util/ares__iface_ips.c
index b252a7ab4921..56dc25790412 100644
--- a/contrib/libs/c-ares/src/lib/ares__iface_ips.c
+++ b/contrib/libs/c-ares/src/lib/util/ares__iface_ips.c
@@ -23,8 +23,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-
+#include "ares_private.h"
 
 #ifdef USE_WINSOCK
 #  include <winsock2.h>
@@ -55,9 +54,10 @@
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
 
-#include "ares.h"
-#include "ares_private.h"
 
 static ares_status_t ares__iface_ips_enumerate(ares__iface_ips_t *ips,
                                                const char        *name);
@@ -71,51 +71,43 @@ typedef struct {
 } ares__iface_ip_t;
 
 struct ares__iface_ips {
-  ares__iface_ip_t      *ips;
-  size_t                 cnt;
-  size_t                 alloc_size;
+  ares__array_t         *ips; /*!< Type is ares__iface_ip_t */
   ares__iface_ip_flags_t enum_flags;
 };
 
+static void ares__iface_ip_free_cb(void *arg)
+{
+  ares__iface_ip_t *ip = arg;
+  if (ip == NULL) {
+    return;
+  }
+  ares_free(ip->name);
+}
+
 static ares__iface_ips_t *ares__iface_ips_alloc(ares__iface_ip_flags_t flags)
 {
   ares__iface_ips_t *ips = ares_malloc_zero(sizeof(*ips));
   if (ips == NULL) {
-    return NULL;
+    return NULL; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
-  /* Prealloc 4 entries */
-  ips->alloc_size = 4;
-  ips->ips        = ares_malloc_zero(ips->alloc_size * sizeof(*ips->ips));
+  ips->enum_flags = flags;
+  ips->ips =
+    ares__array_create(sizeof(ares__iface_ip_t), ares__iface_ip_free_cb);
   if (ips->ips == NULL) {
-    ares_free(ips);
-    return NULL;
+    ares_free(ips); /* LCOV_EXCL_LINE: OutOfMemory */
+    return NULL;    /* LCOV_EXCL_LINE: OutOfMemory */
   }
-  ips->enum_flags = flags;
   return ips;
 }
 
-static void ares__iface_ip_destroy(ares__iface_ip_t *ip)
-{
-  if (ip == NULL) {
-    return;
-  }
-  ares_free(ip->name);
-  memset(ip, 0, sizeof(*ip));
-}
-
 void ares__iface_ips_destroy(ares__iface_ips_t *ips)
 {
-  size_t i;
-
   if (ips == NULL) {
     return;
   }
 
-  for (i = 0; i < ips->cnt; i++) {
-    ares__iface_ip_destroy(&ips->ips[i]);
-  }
-  ares_free(ips->ips);
+  ares__array_destroy(ips->ips);
   ares_free(ips);
 }
 
@@ -130,14 +122,16 @@ ares_status_t ares__iface_ips(ares__iface_ips_t    **ips,
 
   *ips = ares__iface_ips_alloc(flags);
   if (*ips == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   status = ares__iface_ips_enumerate(*ips, name);
   if (status != ARES_SUCCESS) {
+    /* LCOV_EXCL_START: UntestablePath */
     ares__iface_ips_destroy(*ips);
     *ips = NULL;
     return status;
+    /* LCOV_EXCL_STOP */
   }
 
   return ARES_SUCCESS;
@@ -148,10 +142,11 @@ static ares_status_t
                       const char *name, const struct ares_addr *addr,
                       unsigned char netmask, unsigned int ll_scope)
 {
-  size_t idx;
+  ares__iface_ip_t *ip;
+  ares_status_t     status;
 
   if (ips == NULL || name == NULL || addr == NULL) {
-    return ARES_EFORMERR;
+    return ARES_EFORMERR; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   /* Don't want loopback */
@@ -195,31 +190,21 @@ static ares_status_t
     }
   }
 
-  /* Allocate more ips */
-  if (ips->cnt + 1 > ips->alloc_size) {
-    void  *temp;
-    size_t alloc_size;
-
-    alloc_size = ares__round_up_pow2(ips->alloc_size + 1);
-    temp = ares_realloc_zero(ips->ips, ips->alloc_size * sizeof(*ips->ips),
-                             alloc_size * sizeof(*ips->ips));
-    if (temp == NULL) {
-      return ARES_ENOMEM;
-    }
-    ips->ips        = temp;
-    ips->alloc_size = alloc_size;
+  status = ares__array_insert_last((void **)&ip, ips->ips);
+  if (status != ARES_SUCCESS) {
+    return status;
   }
 
-  /* Add */
-  idx = ips->cnt++;
-
-  ips->ips[idx].flags    = flags;
-  ips->ips[idx].netmask  = netmask;
-  ips->ips[idx].ll_scope = ll_scope;
-  memcpy(&ips->ips[idx].addr, addr, sizeof(*addr));
-  ips->ips[idx].name = ares_strdup(name);
-  if (ips->ips[idx].name == NULL) {
-    return ARES_ENOMEM;
+  ip->flags   = flags;
+  ip->netmask = netmask;
+  if (flags & ARES_IFACE_IP_LINKLOCAL) {
+    ip->ll_scope = ll_scope;
+  }
+  memcpy(&ip->addr, addr, sizeof(*addr));
+  ip->name = ares_strdup(name);
+  if (ip->name == NULL) {
+    ares__array_remove_last(ips->ips);
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
 
   return ARES_SUCCESS;
@@ -230,51 +215,91 @@ size_t ares__iface_ips_cnt(const ares__iface_ips_t *ips)
   if (ips == NULL) {
     return 0;
   }
-  return ips->cnt;
+  return ares__array_len(ips->ips);
 }
 
 const char *ares__iface_ips_get_name(const ares__iface_ips_t *ips, size_t idx)
 {
-  if (ips == NULL || idx >= ips->cnt) {
+  const ares__iface_ip_t *ip;
+
+  if (ips == NULL) {
+    return NULL;
+  }
+
+  ip = ares__array_at_const(ips->ips, idx);
+  if (ip == NULL) {
     return NULL;
   }
-  return ips->ips[idx].name;
+
+  return ip->name;
 }
 
 const struct ares_addr *ares__iface_ips_get_addr(const ares__iface_ips_t *ips,
                                                  size_t                   idx)
 {
-  if (ips == NULL || idx >= ips->cnt) {
+  const ares__iface_ip_t *ip;
+
+  if (ips == NULL) {
     return NULL;
   }
-  return &ips->ips[idx].addr;
+
+  ip = ares__array_at_const(ips->ips, idx);
+  if (ip == NULL) {
+    return NULL;
+  }
+
+  return &ip->addr;
 }
 
 ares__iface_ip_flags_t ares__iface_ips_get_flags(const ares__iface_ips_t *ips,
                                                  size_t                   idx)
 {
-  if (ips == NULL || idx >= ips->cnt) {
+  const ares__iface_ip_t *ip;
+
+  if (ips == NULL) {
     return 0;
   }
-  return ips->ips[idx].flags;
+
+  ip = ares__array_at_const(ips->ips, idx);
+  if (ip == NULL) {
+    return 0;
+  }
+
+  return ip->flags;
 }
 
 unsigned char ares__iface_ips_get_netmask(const ares__iface_ips_t *ips,
                                           size_t                   idx)
 {
-  if (ips == NULL || idx >= ips->cnt) {
+  const ares__iface_ip_t *ip;
+
+  if (ips == NULL) {
     return 0;
   }
-  return ips->ips[idx].netmask;
+
+  ip = ares__array_at_const(ips->ips, idx);
+  if (ip == NULL) {
+    return 0;
+  }
+
+  return ip->netmask;
 }
 
 unsigned int ares__iface_ips_get_ll_scope(const ares__iface_ips_t *ips,
                                           size_t                   idx)
 {
-  if (ips == NULL || idx >= ips->cnt) {
+  const ares__iface_ip_t *ip;
+
+  if (ips == NULL) {
+    return 0;
+  }
+
+  ip = ares__array_at_const(ips->ips, idx);
+  if (ip == NULL) {
     return 0;
   }
-  return ips->ips[idx].ll_scope;
+
+  return ip->ll_scope;
 }
 
 
@@ -490,7 +515,7 @@ static ares_status_t ares__iface_ips_enumerate(ares__iface_ips_t *ips,
     }
 
     /* Name mismatch */
-    if (strcasecmp(ifa->ifa_name, name) != 0) {
+    if (name != NULL && strcasecmp(ifa->ifa_name, name) != 0) {
       continue;
     }
 
@@ -522,6 +547,9 @@ static ares_status_t ares__iface_ips_enumerate(ares__iface_ips_t *ips,
 unsigned int ares__if_nametoindex(const char *name)
 {
 #ifdef HAVE_IF_NAMETOINDEX
+  if (name == NULL) {
+    return 0;
+  }
   return if_nametoindex(name);
 #else
   ares_status_t      status;
@@ -529,6 +557,10 @@ unsigned int ares__if_nametoindex(const char *name)
   size_t             i;
   unsigned int       index = 0;
 
+  if (name == NULL) {
+    return 0;
+  }
+
   status =
     ares__iface_ips(&ips, ARES_IFACE_IP_V6 | ARES_IFACE_IP_LINKLOCAL, name);
   if (status != ARES_SUCCESS) {
@@ -562,7 +594,7 @@ const char *ares__if_indextoname(unsigned int index, char *name,
   size_t             i;
   const char        *ptr = NULL;
 
-  if (name_len < IF_NAMESIZE) {
+  if (name == NULL || name_len < IF_NAMESIZE) {
     goto done;
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares__iface_ips.h b/contrib/libs/c-ares/src/lib/util/ares__iface_ips.h
similarity index 100%
rename from contrib/libs/c-ares/src/lib/ares__iface_ips.h
rename to contrib/libs/c-ares/src/lib/util/ares__iface_ips.h
diff --git a/contrib/libs/c-ares/src/lib/ares__threads.c b/contrib/libs/c-ares/src/lib/util/ares__threads.c
similarity index 95%
rename from contrib/libs/c-ares/src/lib/ares__threads.c
rename to contrib/libs/c-ares/src/lib/util/ares__threads.c
index 53c81d41b287..b47544451d9d 100644
--- a/contrib/libs/c-ares/src/lib/ares__threads.c
+++ b/contrib/libs/c-ares/src/lib/util/ares__threads.c
@@ -23,8 +23,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
 #ifdef CARES_THREADS
@@ -226,25 +224,27 @@ ares__thread_mutex_t *ares__thread_mutex_create(void)
   }
 
   if (pthread_mutexattr_init(&attr) != 0) {
-    ares_free(mut);
-    return NULL;
+    ares_free(mut); /* LCOV_EXCL_LINE: UntestablePath */
+    return NULL;    /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   if (pthread_mutex_init(&mut->mutex, &attr) != 0) {
-    goto fail;
+    goto fail; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   pthread_mutexattr_destroy(&attr);
   return mut;
 
+/* LCOV_EXCL_START: UntestablePath */
 fail:
   pthread_mutexattr_destroy(&attr);
   ares_free(mut);
   return NULL;
+  /* LCOV_EXCL_STOP */
 }
 
 void ares__thread_mutex_destroy(ares__thread_mutex_t *mut)
@@ -379,11 +379,11 @@ ares_status_t ares__thread_create(ares__thread_t    **thread,
 
   thr = ares_malloc_zero(sizeof(*thr));
   if (thr == NULL) {
-    return ARES_ENOMEM;
+    return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
   }
   if (pthread_create(&thr->thread, NULL, func, arg) != 0) {
-    ares_free(thr);
-    return ARES_ESERVFAIL;
+    ares_free(thr);        /* LCOV_EXCL_LINE: UntestablePath */
+    return ARES_ESERVFAIL; /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   *thread = thr;
@@ -562,7 +562,7 @@ ares_status_t ares_queue_wait_empty(ares_channel_t *channel, int timeout_ms)
   }
 
   if (timeout_ms >= 0) {
-    tout       = ares__tvnow();
+    ares__tvnow(&tout);
     tout.sec  += (ares_int64_t)(timeout_ms / 1000);
     tout.usec += (unsigned int)(timeout_ms % 1000) * 1000;
   }
@@ -573,9 +573,10 @@ ares_status_t ares_queue_wait_empty(ares_channel_t *channel, int timeout_ms)
       ares__thread_cond_wait(channel->cond_empty, channel->lock);
     } else {
       ares_timeval_t tv_remaining;
-      ares_timeval_t tv_now = ares__tvnow();
+      ares_timeval_t tv_now;
       unsigned long  tms;
 
+      ares__tvnow(&tv_now);
       ares__timeval_remaining(&tv_remaining, &tv_now, &tout);
       tms =
         (unsigned long)((tv_remaining.sec * 1000) + (tv_remaining.usec / 1000));
diff --git a/contrib/libs/c-ares/src/lib/ares__threads.h b/contrib/libs/c-ares/src/lib/util/ares__threads.h
similarity index 100%
rename from contrib/libs/c-ares/src/lib/ares__threads.h
rename to contrib/libs/c-ares/src/lib/util/ares__threads.h
diff --git a/contrib/libs/c-ares/src/lib/ares__timeval.c b/contrib/libs/c-ares/src/lib/util/ares__timeval.c
similarity index 61%
rename from contrib/libs/c-ares/src/lib/ares__timeval.c
rename to contrib/libs/c-ares/src/lib/util/ares__timeval.c
index fae5ad7e871a..e3a989dca87a 100644
--- a/contrib/libs/c-ares/src/lib/ares__timeval.c
+++ b/contrib/libs/c-ares/src/lib/util/ares__timeval.c
@@ -24,62 +24,68 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 
-#if defined(WIN32) && !defined(MSDOS)
+#if defined(_WIN32) && !defined(MSDOS)
 
-ares_timeval_t ares__tvnow(void)
+void ares__tvnow(ares_timeval_t *now)
 {
-  /* GetTickCount64() is available on Windows Vista and higher */
-  ares_timeval_t now;
-  ULONGLONG      milliseconds = GetTickCount64();
+  /* QueryPerformanceCounters() has been around since Windows 2000, though
+   * significant fixes were made in later versions.  Documentation states
+   * 1 microsecond or better resolution with a rollover not less than 100 years.
+   * This differs from GetTickCount{64}() which has a resolution between 10 and
+   * 16 ms. */
+  LARGE_INTEGER freq;
+  LARGE_INTEGER current;
 
-  now.sec  = (ares_int64_t)milliseconds / 1000;
-  now.usec = (unsigned int)(milliseconds % 1000) * 1000;
-  return now;
+  /* Not sure how long it takes to get the frequency, I see it recommended to
+   * cache it */
+  QueryPerformanceFrequency(&freq);
+  QueryPerformanceCounter(&current);
+
+  now->sec = current.QuadPart / freq.QuadPart;
+  /* We want to prevent overflows so we get the remainder, then multiply to
+   * microseconds before dividing */
+  now->usec = (unsigned int)(((current.QuadPart % freq.QuadPart) * 1000000) /
+                             freq.QuadPart);
 }
 
 #elif defined(HAVE_CLOCK_GETTIME_MONOTONIC)
 
-ares_timeval_t ares__tvnow(void)
+void ares__tvnow(ares_timeval_t *now)
 {
   /* clock_gettime() is guaranteed to be increased monotonically when the
    * monotonic clock is queried. Time starting point is unspecified, it
    * could be the system start-up time, the Epoch, or something else,
    * in any case the time starting point does not change once that the
    * system has started up. */
-  ares_timeval_t  now;
   struct timespec tsnow;
 
   if (clock_gettime(CLOCK_MONOTONIC, &tsnow) == 0) {
-    now.sec  = (ares_int64_t)tsnow.tv_sec;
-    now.usec = (unsigned int)(tsnow.tv_nsec / 1000);
+    now->sec  = (ares_int64_t)tsnow.tv_sec;
+    now->usec = (unsigned int)(tsnow.tv_nsec / 1000);
   } else {
+    /* LCOV_EXCL_START: FallbackCode */
     struct timeval tv;
     (void)gettimeofday(&tv, NULL);
-    now.sec  = (ares_int64_t)tv.tv_sec;
-    now.usec = (unsigned int)tv.tv_usec;
+    now->sec  = (ares_int64_t)tv.tv_sec;
+    now->usec = (unsigned int)tv.tv_usec;
+    /* LCOV_EXCL_STOP */
   }
-  return now;
 }
 
 #elif defined(HAVE_GETTIMEOFDAY)
 
-ares_timeval_t ares__tvnow(void)
+void ares__tvnow(ares_timeval_t *now)
 {
   /* gettimeofday() is not granted to be increased monotonically, due to
    * clock drifting and external source time synchronization it can jump
    * forward or backward in time. */
-  ares_timeval_t now;
   struct timeval tv;
 
   (void)gettimeofday(&tv, NULL);
-  now.sec  = (ares_int64_t)tv.tv_sec;
-  now.usec = (unsigned int)tv.tv_usec;
-
-  return now;
+  now->sec  = (ares_int64_t)tv.tv_sec;
+  now->usec = (unsigned int)tv.tv_usec;
 }
 
 #else
diff --git a/contrib/libs/c-ares/src/lib/ares_math.c b/contrib/libs/c-ares/src/lib/util/ares_math.c
similarity index 93%
rename from contrib/libs/c-ares/src/lib/ares_math.c
rename to contrib/libs/c-ares/src/lib/util/ares_math.c
index eaefd6c5de7f..45999bdeabab 100644
--- a/contrib/libs/c-ares/src/lib/ares_math.c
+++ b/contrib/libs/c-ares/src/lib/util/ares_math.c
@@ -23,8 +23,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-#include "ares_setup.h"
-#include "ares.h"
+
 #include "ares_private.h"
 
 /* Uses public domain code snippets from
@@ -57,9 +56,23 @@ static ares_int64_t ares__round_up_pow2_u64(ares_int64_t n)
   return n;
 }
 
+ares_bool_t ares__is_64bit(void)
+{
+#ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable : 4127)
+#endif
+
+  return (sizeof(size_t) == 4) ? ARES_FALSE : ARES_TRUE;
+
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
+}
+
 size_t ares__round_up_pow2(size_t n)
 {
-  if (sizeof(size_t) > 4) {
+  if (ares__is_64bit()) {
     return (size_t)ares__round_up_pow2_u64((ares_int64_t)n);
   }
 
@@ -79,7 +92,7 @@ size_t ares__log2(size_t n)
     56, 45, 25, 31, 35, 16, 9,  12, 44, 24, 15, 8,  23, 7,  6,  5
   };
 
-  if (sizeof(size_t) == 4) {
+  if (!ares__is_64bit()) {
     return tab32[(n * 0x077CB531) >> 27];
   }
 
diff --git a/contrib/libs/c-ares/src/lib/ares_rand.c b/contrib/libs/c-ares/src/lib/util/ares_rand.c
similarity index 88%
rename from contrib/libs/c-ares/src/lib/ares_rand.c
rename to contrib/libs/c-ares/src/lib/util/ares_rand.c
index bf3a695c9c24..c57bb706e68e 100644
--- a/contrib/libs/c-ares/src/lib/ares_rand.c
+++ b/contrib/libs/c-ares/src/lib/util/ares_rand.c
@@ -24,8 +24,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ares_setup.h"
-#include "ares.h"
 #include "ares_private.h"
 #include <stdlib.h>
 
@@ -43,7 +41,7 @@
 typedef enum {
   ARES_RAND_OS   = 1 << 0, /* OS-provided such as RtlGenRandom or arc4random */
   ARES_RAND_FILE = 1 << 1, /* OS file-backed random number generator */
-  ARES_RAND_RC4  = 1 << 2, /* Internal RC4 based PRNG */
+  ARES_RAND_RC4  = 1 << 2  /* Internal RC4 based PRNG */
 } ares_rand_backend;
 
 #define ARES_RC4_KEY_LEN 32 /* 256 bits */
@@ -56,17 +54,20 @@ typedef struct ares_rand_rc4 {
 
 static unsigned int ares_u32_from_ptr(void *addr)
 {
-  if (sizeof(void *) == 8) {
+  /* LCOV_EXCL_START: FallbackCode */
+  if (ares__is_64bit()) {
     return (unsigned int)((((ares_uint64_t)addr >> 32) & 0xFFFFFFFF) |
                           ((ares_uint64_t)addr & 0xFFFFFFFF));
   }
   return (unsigned int)((size_t)addr & 0xFFFFFFFF);
+  /* LCOV_EXCL_STOP */
 }
 
 /* initialize an rc4 key as the last possible fallback. */
 static void ares_rc4_generate_key(ares_rand_rc4 *rc4_state, unsigned char *key,
                                   size_t key_len)
 {
+  /* LCOV_EXCL_START: FallbackCode */
   size_t         i;
   size_t         len = 0;
   unsigned int   data;
@@ -88,7 +89,7 @@ static void ares_rc4_generate_key(ares_rand_rc4 *rc4_state, unsigned char *key,
   memcpy(key + len, &data, sizeof(data));
   len += sizeof(data);
 
-  tv   = ares__tvnow();
+  ares__tvnow(&tv);
   data = (unsigned int)((tv.sec | tv.usec) & 0xFFFFFFFF);
   memcpy(key + len, &data, sizeof(data));
   len += sizeof(data);
@@ -99,10 +100,19 @@ static void ares_rc4_generate_key(ares_rand_rc4 *rc4_state, unsigned char *key,
   for (i = len; i < key_len; i++) {
     key[i] = (unsigned char)(rand() % 256); /* LCOV_EXCL_LINE */
   }
+  /* LCOV_EXCL_STOP */
 }
 
+#define ARES_SWAP_BYTE(a, b)           \
+  do {                                 \
+    unsigned char swapByte = *(a);     \
+    *(a)                   = *(b);     \
+    *(b)                   = swapByte; \
+  } while (0)
+
 static void ares_rc4_init(ares_rand_rc4 *rc4_state)
 {
+  /* LCOV_EXCL_START: FallbackCode */
   unsigned char key[ARES_RC4_KEY_LEN];
   size_t        i;
   size_t        j;
@@ -120,6 +130,7 @@ static void ares_rc4_init(ares_rand_rc4 *rc4_state)
 
   rc4_state->i = 0;
   rc4_state->j = 0;
+  /* LCOV_EXCL_STOP */
 }
 
 /* Just outputs the key schedule, no need to XOR with any data since we have
@@ -127,6 +138,7 @@ static void ares_rc4_init(ares_rand_rc4 *rc4_state)
 static void ares_rc4_prng(ares_rand_rc4 *rc4_state, unsigned char *buf,
                           size_t len)
 {
+  /* LCOV_EXCL_START: FallbackCode */
   unsigned char *S = rc4_state->S;
   size_t         i = rc4_state->i;
   size_t         j = rc4_state->j;
@@ -142,6 +154,7 @@ static void ares_rc4_prng(ares_rand_rc4 *rc4_state, unsigned char *buf,
 
   rc4_state->i = i;
   rc4_state->j = j;
+  /* LCOV_EXCL_STOP */
 }
 
 struct ares_rand_state {
@@ -187,6 +200,7 @@ static ares_bool_t ares__init_rand_engine(ares_rand_state *state)
 #endif
 
 #if defined(CARES_RANDOM_FILE)
+  /* LCOV_EXCL_START: FallbackCode */
   if (!(state->bad_backends & ARES_RAND_FILE)) {
     state->type            = ARES_RAND_FILE;
     state->state.rand_file = fopen(CARES_RANDOM_FILE, "rb");
@@ -195,14 +209,18 @@ static ares_bool_t ares__init_rand_engine(ares_rand_state *state)
       return ARES_TRUE;
     }
   }
+  /* LCOV_EXCL_STOP */
+
   /* Fall-Thru on failure to RC4 */
 #endif
 
+  /* LCOV_EXCL_START: FallbackCode */
   state->type = ARES_RAND_RC4;
   ares_rc4_init(&state->state.rc4);
+  /* LCOV_EXCL_STOP */
 
   /* Currently cannot fail */
-  return ARES_TRUE;
+  return ARES_TRUE; /* LCOV_EXCL_LINE: UntestablePath */
 }
 
 ares_rand_state *ares__init_rand_state(void)
@@ -215,8 +233,8 @@ ares_rand_state *ares__init_rand_state(void)
   }
 
   if (!ares__init_rand_engine(state)) {
-    ares_free(state);
-    return NULL;
+    ares_free(state); /* LCOV_EXCL_LINE: UntestablePath */
+    return NULL;      /* LCOV_EXCL_LINE: UntestablePath */
   }
 
   return state;
@@ -225,24 +243,28 @@ ares_rand_state *ares__init_rand_state(void)
 static void ares__clear_rand_state(ares_rand_state *state)
 {
   if (!state) {
-    return;
+    return; /* LCOV_EXCL_LINE: DefensiveCoding */
   }
 
   switch (state->type) {
     case ARES_RAND_OS:
       break;
+    /* LCOV_EXCL_START: FallbackCode */
     case ARES_RAND_FILE:
       fclose(state->state.rand_file);
       break;
     case ARES_RAND_RC4:
       break;
+      /* LCOV_EXCL_STOP */
   }
 }
 
 static void ares__reinit_rand(ares_rand_state *state)
 {
+  /* LCOV_EXCL_START: UntestablePath */
   ares__clear_rand_state(state);
   ares__init_rand_engine(state);
+  /* LCOV_EXCL_STOP */
 }
 
 void ares__destroy_rand_state(ares_rand_state *state)
@@ -296,6 +318,8 @@ static void ares__rand_bytes_fetch(ares_rand_state *state, unsigned char *buf,
         break;
 #endif
 
+        /* LCOV_EXCL_START: FallbackCode */
+
       case ARES_RAND_FILE:
         while (1) {
           size_t rv = fread(buf + bytes_read, 1, len - bytes_read,
@@ -314,11 +338,13 @@ static void ares__rand_bytes_fetch(ares_rand_state *state, unsigned char *buf,
       case ARES_RAND_RC4:
         ares_rc4_prng(&state->state.rc4, buf, len);
         return;
+
+        /* LCOV_EXCL_STOP */
     }
 
     /* If we didn't return before we got here, that means we had a critical rand
      * failure and need to reinitialized */
-    ares__reinit_rand(state);
+    ares__reinit_rand(state); /* LCOV_EXCL_LINE: UntestablePath */
   }
 }
 
diff --git a/contrib/libs/c-ares/src/lib/windows_port.c b/contrib/libs/c-ares/src/lib/windows_port.c
index d5f0ad3abf60..22f0dc020a07 100644
--- a/contrib/libs/c-ares/src/lib/windows_port.c
+++ b/contrib/libs/c-ares/src/lib/windows_port.c
@@ -6,12 +6,12 @@
  * SPDX-License-Identifier: MIT
  *
  */
-#include "ares_setup.h"
+#include "ares_private.h"
 
 
 /* only do the following on windows
  */
-#if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS)
+#if defined(_WIN32) && !defined(MSDOS)
 
 #  ifdef __WATCOMC__
 /*
diff --git a/contrib/libs/c-ares/ya.make b/contrib/libs/c-ares/ya.make
index 7850b6718587..864edf40a543 100644
--- a/contrib/libs/c-ares/ya.make
+++ b/contrib/libs/c-ares/ya.make
@@ -12,9 +12,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(1.30.0)
+VERSION(1.33.0)
 
-ORIGINAL_SOURCE(https://github.com/c-ares/c-ares/archive/v1.30.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/c-ares/c-ares/archive/v1.33.0.tar.gz)
 
 PEERDIR(
     contrib/libs/libc_compat
@@ -50,43 +50,16 @@ ENDIF()
 SRCS(
     src/lib/ares__addrinfo2hostent.c
     src/lib/ares__addrinfo_localhost.c
-    src/lib/ares__buf.c
     src/lib/ares__close_sockets.c
     src/lib/ares__hosts_file.c
-    src/lib/ares__htable.c
-    src/lib/ares__htable_asvp.c
-    src/lib/ares__htable_strvp.c
-    src/lib/ares__htable_szvp.c
-    src/lib/ares__htable_vpvp.c
-    src/lib/ares__iface_ips.c
-    src/lib/ares__llist.c
     src/lib/ares__parse_into_addrinfo.c
-    src/lib/ares__slist.c
     src/lib/ares__socket.c
     src/lib/ares__sortaddrinfo.c
-    src/lib/ares__threads.c
-    src/lib/ares__timeval.c
     src/lib/ares_android.c
     src/lib/ares_cancel.c
-    src/lib/ares_create_query.c
+    src/lib/ares_cookie.c
     src/lib/ares_data.c
     src/lib/ares_destroy.c
-    src/lib/ares_dns_mapping.c
-    src/lib/ares_dns_name.c
-    src/lib/ares_dns_parse.c
-    src/lib/ares_dns_record.c
-    src/lib/ares_dns_write.c
-    src/lib/ares_event_configchg.c
-    src/lib/ares_event_epoll.c
-    src/lib/ares_event_kqueue.c
-    src/lib/ares_event_poll.c
-    src/lib/ares_event_select.c
-    src/lib/ares_event_thread.c
-    src/lib/ares_event_wake_pipe.c
-    src/lib/ares_event_win32.c
-    src/lib/ares_expand_name.c
-    src/lib/ares_expand_string.c
-    src/lib/ares_fds.c
     src/lib/ares_free_hostent.c
     src/lib/ares_free_string.c
     src/lib/ares_freeaddrinfo.c
@@ -95,42 +68,74 @@ SRCS(
     src/lib/ares_gethostbyaddr.c
     src/lib/ares_gethostbyname.c
     src/lib/ares_getnameinfo.c
-    src/lib/ares_getsock.c
     src/lib/ares_init.c
     src/lib/ares_library_init.c
-    src/lib/ares_math.c
+    src/lib/ares_metrics.c
     src/lib/ares_options.c
-    src/lib/ares_parse_a_reply.c
-    src/lib/ares_parse_aaaa_reply.c
-    src/lib/ares_parse_caa_reply.c
-    src/lib/ares_parse_mx_reply.c
-    src/lib/ares_parse_naptr_reply.c
-    src/lib/ares_parse_ns_reply.c
-    src/lib/ares_parse_ptr_reply.c
-    src/lib/ares_parse_soa_reply.c
-    src/lib/ares_parse_srv_reply.c
-    src/lib/ares_parse_txt_reply.c
-    src/lib/ares_parse_uri_reply.c
     src/lib/ares_platform.c
     src/lib/ares_process.c
     src/lib/ares_qcache.c
     src/lib/ares_query.c
-    src/lib/ares_rand.c
     src/lib/ares_search.c
     src/lib/ares_send.c
-    src/lib/ares_str.c
-    src/lib/ares_strcasecmp.c
     src/lib/ares_strerror.c
-    src/lib/ares_strsplit.c
     src/lib/ares_sysconfig.c
     src/lib/ares_sysconfig_files.c
     src/lib/ares_sysconfig_mac.c
+    src/lib/ares_sysconfig_win.c
     src/lib/ares_timeout.c
     src/lib/ares_update_servers.c
     src/lib/ares_version.c
     src/lib/atomic.cpp
+    src/lib/dsa/ares__array.c
+    src/lib/dsa/ares__htable.c
+    src/lib/dsa/ares__htable_asvp.c
+    src/lib/dsa/ares__htable_strvp.c
+    src/lib/dsa/ares__htable_szvp.c
+    src/lib/dsa/ares__htable_vpvp.c
+    src/lib/dsa/ares__llist.c
+    src/lib/dsa/ares__slist.c
+    src/lib/event/ares_event_configchg.c
+    src/lib/event/ares_event_epoll.c
+    src/lib/event/ares_event_kqueue.c
+    src/lib/event/ares_event_poll.c
+    src/lib/event/ares_event_select.c
+    src/lib/event/ares_event_thread.c
+    src/lib/event/ares_event_wake_pipe.c
+    src/lib/event/ares_event_win32.c
     src/lib/inet_net_pton.c
     src/lib/inet_ntop.c
+    src/lib/legacy/ares_create_query.c
+    src/lib/legacy/ares_expand_name.c
+    src/lib/legacy/ares_expand_string.c
+    src/lib/legacy/ares_fds.c
+    src/lib/legacy/ares_getsock.c
+    src/lib/legacy/ares_parse_a_reply.c
+    src/lib/legacy/ares_parse_aaaa_reply.c
+    src/lib/legacy/ares_parse_caa_reply.c
+    src/lib/legacy/ares_parse_mx_reply.c
+    src/lib/legacy/ares_parse_naptr_reply.c
+    src/lib/legacy/ares_parse_ns_reply.c
+    src/lib/legacy/ares_parse_ptr_reply.c
+    src/lib/legacy/ares_parse_soa_reply.c
+    src/lib/legacy/ares_parse_srv_reply.c
+    src/lib/legacy/ares_parse_txt_reply.c
+    src/lib/legacy/ares_parse_uri_reply.c
+    src/lib/record/ares_dns_mapping.c
+    src/lib/record/ares_dns_multistring.c
+    src/lib/record/ares_dns_name.c
+    src/lib/record/ares_dns_parse.c
+    src/lib/record/ares_dns_record.c
+    src/lib/record/ares_dns_write.c
+    src/lib/str/ares__buf.c
+    src/lib/str/ares_str.c
+    src/lib/str/ares_strcasecmp.c
+    src/lib/str/ares_strsplit.c
+    src/lib/util/ares__iface_ips.c
+    src/lib/util/ares__threads.c
+    src/lib/util/ares__timeval.c
+    src/lib/util/ares_math.c
+    src/lib/util/ares_rand.c
     src/lib/windows_port.c
 )
 

From fea13201b3e0dda1db0a5a833f6e6d52ca0f07e3 Mon Sep 17 00:00:00 2001
From: shakurov <shakurov@yandex-team.com>
Date: Wed, 7 Aug 2024 11:36:58 +0300
Subject: [PATCH 096/104] Prevent potential use of moved-from context. Minor
 optimizations around RPC method handlers.
 e19616151587f112b19ea960a9cb1aadb2d3923c

---
 yt/yt/core/rpc/service_detail.cpp | 8 ++++----
 yt/yt/core/rpc/service_detail.h   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yt/yt/core/rpc/service_detail.cpp b/yt/yt/core/rpc/service_detail.cpp
index 285fd3b8f547..5726abe41060 100644
--- a/yt/yt/core/rpc/service_detail.cpp
+++ b/yt/yt/core/rpc/service_detail.cpp
@@ -1515,12 +1515,12 @@ void TRequestQueue::RunRequest(TServiceBase::TServiceContextPtr context)
     options.SetHeavy(RuntimeInfo_->Heavy.load(std::memory_order::relaxed));
 
     if (options.Heavy) {
-        BIND([this, this_ = MakeStrong(this), context, options] {
-            return RuntimeInfo_->Descriptor.HeavyHandler.Run(context, options);
+        BIND([context, options, heavyHandler = RuntimeInfo_->Descriptor.HeavyHandler] {
+            return heavyHandler.Run(context, options);
         })
             .AsyncVia(TDispatcher::Get()->GetHeavyInvoker())
             .Run()
-            .Subscribe(BIND(&TServiceBase::TServiceContext::CheckAndRun, std::move(context)));
+            .Subscribe(BIND(&TServiceBase::TServiceContext::CheckAndRun, context));
     } else {
         context->Run(RuntimeInfo_->Descriptor.LiteHandler);
     }
@@ -2409,7 +2409,7 @@ void TServiceBase::DecrementActiveRequestCount()
     }
 }
 
-void TServiceBase::InitContext(IServiceContextPtr /*context*/)
+void TServiceBase::InitContext(IServiceContext* /*context*/)
 { }
 
 void TServiceBase::RegisterDiscoverRequest(const TCtxDiscoverPtr& context)
diff --git a/yt/yt/core/rpc/service_detail.h b/yt/yt/core/rpc/service_detail.h
index f731ed845457..6fd62e085f69 100644
--- a/yt/yt/core/rpc/service_detail.h
+++ b/yt/yt/core/rpc/service_detail.h
@@ -411,7 +411,7 @@ class TGenericTypedServiceContext
         if (!typedContext->DeserializeRequest()) { \
             return; \
         } \
-        InitContext(typedContext); \
+        InitContext(typedContext.Get());          \
         auto* request = &typedContext->Request(); \
         auto* response = &typedContext->Response(); \
         this->method(request, response, typedContext); \
@@ -426,11 +426,11 @@ class TGenericTypedServiceContext
             return ::NYT::NRpc::TServiceBase::TLiteHandler(); \
         } \
         return \
-            BIND([=, this] ( \
+            BIND([this, typedContext = std::move(typedContext)] ( \
                 const ::NYT::NRpc::IServiceContextPtr&, \
                 const ::NYT::NRpc::THandlerInvocationOptions&) \
             { \
-                InitContext(typedContext); \
+                InitContext(typedContext.Get());          \
                 auto* request = &typedContext->Request(); \
                 auto* response = &typedContext->Response(); \
                 this->method(request, response, typedContext); \
@@ -550,7 +550,7 @@ class TServiceBase
     //! By default, this method does nothing. You may hide this method by a custom implementation
     //! (possibly switching argument type to a proper typed context class) in order to customize
     //! specific service context before invoking method handler.
-    void InitContext(IServiceContextPtr context);
+    void InitContext(IServiceContext* context);
 
     //! Information needed to a register a service method.
     struct TMethodDescriptor

From b40ff5999af2b70c1d06d37d4e9f7cebd80a8646 Mon Sep 17 00:00:00 2001
From: nastprol <nastprol@yandex-team.com>
Date: Wed, 7 Aug 2024 11:55:52 +0300
Subject: [PATCH 097/104] Move MaxUserAgentLength into a constant
 002ce6c06cb0196add5488c10782e765b9b08cad

---
 yt/yt/core/rpc/service_detail.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yt/yt/core/rpc/service_detail.cpp b/yt/yt/core/rpc/service_detail.cpp
index 5726abe41060..50d1cf88458c 100644
--- a/yt/yt/core/rpc/service_detail.cpp
+++ b/yt/yt/core/rpc/service_detail.cpp
@@ -49,6 +49,7 @@ using NYT::ToProto;
 static const auto InfiniteRequestThrottlerConfig = New<TThroughputThrottlerConfig>();
 static const auto DefaultLoggingSuppressionFailedRequestThrottlerConfig = TThroughputThrottlerConfig::Create(1'000);
 
+constexpr int MaxUserAgentLength = 200;
 constexpr auto ServiceLivenessCheckPeriod = TDuration::MilliSeconds(100);
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -745,7 +746,7 @@ class TServiceBase::TServiceContext
         auto userAgent = RequestHeader_->has_user_agent()
             ? TStringBuf(RequestHeader_->user_agent())
             : UnknownUserAgent;
-        PerformanceCounters_->IncrementRequestsPerUserAgent(userAgent.SubString(0, 200));
+        PerformanceCounters_->IncrementRequestsPerUserAgent(userAgent.SubString(0, MaxUserAgentLength));
 
         MethodPerformanceCounters_->RequestCounter.Increment();
         MethodPerformanceCounters_->RequestMessageBodySizeCounter.Increment(

From 933bb8d7a12d3881898904226e8884e8695275ef Mon Sep 17 00:00:00 2001
From: bulatman <bulatman@yandex-team.com>
Date: Wed, 7 Aug 2024 11:57:47 +0300
Subject: [PATCH 098/104] Make Apply just alias to std::apply
 d8970078eca52675e02aa3cb811e07f99ef5115a

---
 util/generic/function.h | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/util/generic/function.h b/util/generic/function.h
index 859cc3f84931..0ad42b40b642 100644
--- a/util/generic/function.h
+++ b/util/generic/function.h
@@ -100,19 +100,7 @@ using TFunctionArg = typename TFunctionArgImpl<C, N>::TResult;
 
 // temporary before std::apply appearance
 
-template <typename F, typename Tuple, size_t... I>
-auto ApplyImpl(F&& f, Tuple&& t, std::index_sequence<I...>) {
-    return f(std::get<I>(std::forward<Tuple>(t))...);
-}
-
-// change to std::apply after c++ 17
 template <typename F, typename Tuple>
-auto Apply(F&& f, Tuple&& t) {
-    return ApplyImpl(f, t, std::make_index_sequence<std::tuple_size<std::decay_t<Tuple>>::value>{});
-}
-
-// change to std::apply after c++ 17
-template <typename F>
-auto Apply(F&& f, std::tuple<>) {
-    return f();
+constexpr decltype(auto) Apply(F&& f, Tuple&& t) {
+    return std::apply(std::forward<F>(f), std::forward<Tuple>(t));
 }

From b92a4e77b0ee24fc7ae9d4488d97999ac39f48e3 Mon Sep 17 00:00:00 2001
From: arkady-e1ppa <arkady-e1ppa@yandex-team.com>
Date: Wed, 7 Aug 2024 13:31:32 +0300
Subject: [PATCH 099/104] YT-22473: Enable for-each formatting in known ranges
 5a3405e64b730f0056e381af07658d6c2edcb92b

---
 library/cpp/yt/string/format-inl.h            |  87 ++++++++++++---
 library/cpp/yt/string/format_analyser.h       |   2 +-
 library/cpp/yt/string/format_string.h         |   4 +-
 library/cpp/yt/string/string.h                |  19 ++++
 library/cpp/yt/string/unittests/format_ut.cpp | 102 ++++++++++++++++++
 5 files changed, 197 insertions(+), 17 deletions(-)

diff --git a/library/cpp/yt/string/format-inl.h b/library/cpp/yt/string/format-inl.h
index 4eaa70bef2f2..67c8affa6e4b 100644
--- a/library/cpp/yt/string/format-inl.h
+++ b/library/cpp/yt/string/format-inl.h
@@ -222,24 +222,67 @@ void FormatPointerValue(
 // so that someone doesn't accidentally implement the
 // "SimpleRange" concept and have a non-trivial
 // formatting procedure at the same time.
+// Sadly, clang is bugged and thus we must do implementation by hand
+// if we want to use this concept in class specializations.
 
 template <class R>
-concept CKnownRange =
-    requires (R r) { [] <class... Ts> (std::vector<Ts...>) { } (r); } ||
-    requires (R r) { [] <class T, size_t E> (std::span<T, E>) { } (r); } ||
-    requires (R r) { [] <class T, size_t N> (TCompactVector<T, N>) { } (r); } ||
-    requires (R r) { [] <class... Ts> (std::set<Ts...>) { } (r); } ||
-    requires (R r) { [] <class... Ts> (THashSet<Ts...>) { } (r); } ||
-    requires (R r) { [] <class... Ts> (THashMultiSet<Ts...>) { } (r); };
+constexpr bool CKnownRange = false;
+
+template <class T>
+    requires requires (T* t) { [] <class... Ts> (std::vector<Ts...>*) {} (t); }
+constexpr bool CKnownRange<T> = true;
+template <class T, size_t E>
+constexpr bool CKnownRange<std::span<T, E>> = true;
+template <class T, size_t N>
+constexpr bool CKnownRange<std::array<T, N>> = true;
+template <class T, size_t N>
+constexpr bool CKnownRange<TCompactVector<T, N>> = true;
+template <class T>
+    requires requires (T* t) { [] <class... Ts> (std::set<Ts...>*) {} (t); }
+constexpr bool CKnownRange<T> = true;
+template <class T>
+    requires requires (T* t) { [] <class... Ts> (std::multiset<Ts...>*) {} (t); }
+constexpr bool CKnownRange<T> = true;
+template <class... Ts>
+constexpr bool CKnownRange<THashSet<Ts...>> = true;
+template <class... Ts>
+constexpr bool CKnownRange<THashMultiSet<Ts...>> = true;
 
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class R>
-concept CKnownKVRange =
-    requires (R r) { [] <class... Ts> (std::map<Ts...>) { } (r); } ||
-    requires (R r) { [] <class... Ts> (std::multimap<Ts...>) { } (r); } ||
-    requires (R r) { [] <class... Ts> (THashMap<Ts...>) { } (r); } ||
-    requires (R r) { [] <class... Ts> (THashMultiMap<Ts...>) { } (r); };
+constexpr bool CKnownKVRange = false;
+
+template <class T>
+    requires requires (T* t) { [] <class... Ts> (std::map<Ts...>*) {} (t); }
+constexpr bool CKnownKVRange<T> = true;
+template <class T>
+    requires requires (T* t) { [] <class... Ts> (std::multimap<Ts...>*) {} (t); }
+constexpr bool CKnownKVRange<T> = true;
+template <class... Ts>
+constexpr bool CKnownKVRange<THashMap<Ts...>> = true;
+template <class... Ts>
+constexpr bool CKnownKVRange<THashMultiMap<Ts...>> = true;
+
+// TODO(arkady-e1ppa): Uncomment me when
+// https://github.com/llvm/llvm-project/issues/58534 is shipped.
+// template <class R>
+// concept CKnownRange =
+//     requires (R r) { [] <class... Ts> (std::vector<Ts...>) { } (r); } ||
+//     requires (R r) { [] <class T, size_t E> (std::span<T, E>) { } (r); } ||
+//     requires (R r) { [] <class T, size_t N> (TCompactVector<T, N>) { } (r); } ||
+//     requires (R r) { [] <class... Ts> (std::set<Ts...>) { } (r); } ||
+//     requires (R r) { [] <class... Ts> (THashSet<Ts...>) { } (r); } ||
+//     requires (R r) { [] <class... Ts> (THashMultiSet<Ts...>) { } (r); };
+
+// ////////////////////////////////////////////////////////////////////////////////
+
+// template <class R>
+// concept CKnownKVRange =
+//     requires (R r) { [] <class... Ts> (std::map<Ts...>) { } (r); } ||
+//     requires (R r) { [] <class... Ts> (std::multimap<Ts...>) { } (r); } ||
+//     requires (R r) { [] <class... Ts> (THashMap<Ts...>) { } (r); } ||
+//     requires (R r) { [] <class... Ts> (THashMultiMap<Ts...>) { } (r); };
 
 } // namespace NDetail
 
@@ -300,6 +343,22 @@ concept CFormattableKVRange =
     CFormattable<typename R::key_type> &&
     CFormattable<typename R::value_type>;
 
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Specializations of TFormatArg for ranges
+template <class R>
+    requires CFormattableRange<std::remove_cvref_t<R>>
+struct TFormatArg<R>
+    : public TFormatArgBase
+{
+    using TUnderlying = typename std::remove_cvref_t<R>::value_type;
+
+    static constexpr auto ConversionSpecifiers = TFormatArg<TUnderlying>::ConversionSpecifiers;
+
+    static constexpr auto FlagSpecifiers = TFormatArg<TUnderlying>::FlagSpecifiers;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class TRange, class TFormatter>
@@ -740,9 +799,9 @@ void FormatValue(TStringBuilderBase* builder, const TEnumIndexedArray<E, T>& col
 
 // One-valued ranges
 template <CFormattableRange TRange>
-void FormatValue(TStringBuilderBase* builder, const TRange& collection, TStringBuf /*spec*/)
+void FormatValue(TStringBuilderBase* builder, const TRange& collection, TStringBuf spec)
 {
-    NYT::FormatRange(builder, collection, TDefaultFormatter());
+    NYT::FormatRange(builder, collection, TSpecBoundFormatter(spec));
 }
 
 // Two-valued ranges
diff --git a/library/cpp/yt/string/format_analyser.h b/library/cpp/yt/string/format_analyser.h
index 9a05e3eb8cf1..3dd1ba4cd386 100644
--- a/library/cpp/yt/string/format_analyser.h
+++ b/library/cpp/yt/string/format_analyser.h
@@ -15,7 +15,7 @@ struct TFormatAnalyser
     template <class... TArgs>
     static consteval void ValidateFormat(std::string_view fmt);
 
-private:
+public:
     // Non-constexpr function call will terminate compilation.
     // Purposefully undefined and non-constexpr/consteval
     template <class T>
diff --git a/library/cpp/yt/string/format_string.h b/library/cpp/yt/string/format_string.h
index 0c3476377324..ebef9d704220 100644
--- a/library/cpp/yt/string/format_string.h
+++ b/library/cpp/yt/string/format_string.h
@@ -27,7 +27,7 @@ class TRuntimeFormat
 
 // This class used to properly bind to
 // string literals and allow compile-time parsing/checking
-// of those. If you need a runtime format, use TRuntimeFormat
+// of those. If you need a runtime format, use TRuntimeFormat.
 template <class... TArgs>
 class TBasicFormatString
 {
@@ -50,7 +50,7 @@ class TBasicFormatString
     static void CrashCompilerClassIsNotFormattable();
 };
 
-// Used to properly infer template arguments if Format.
+// Used to properly infer template arguments in Format.
 template <class... TArgs>
 using TFormatString = TBasicFormatString<std::type_identity_t<TArgs>...>;
 
diff --git a/library/cpp/yt/string/string.h b/library/cpp/yt/string/string.h
index 8257c1a5ead7..b91d1b38054c 100644
--- a/library/cpp/yt/string/string.h
+++ b/library/cpp/yt/string/string.h
@@ -27,6 +27,25 @@ struct TDefaultFormatter
     }
 };
 
+//! Bind spec to a formatter.
+//! Used in ranges processing.
+class TSpecBoundFormatter
+{
+public:
+    explicit TSpecBoundFormatter(TStringBuf spec)
+        : Spec_(spec)
+    { }
+
+    template <class T>
+    void operator()(TStringBuilderBase* builder, const T& obj) const
+    {
+        FormatValue(builder, obj, Spec_);
+    }
+
+private:
+    TStringBuf Spec_;
+};
+
 static constexpr TStringBuf DefaultJoinToStringDelimiter = ", ";
 static constexpr TStringBuf DefaultKeyValueDelimiter = ": ";
 static constexpr TStringBuf DefaultRangeEllipsisFormat = "...";
diff --git a/library/cpp/yt/string/unittests/format_ut.cpp b/library/cpp/yt/string/unittests/format_ut.cpp
index 4083338c44a5..aa820fd5afa0 100644
--- a/library/cpp/yt/string/unittests/format_ut.cpp
+++ b/library/cpp/yt/string/unittests/format_ut.cpp
@@ -13,6 +13,44 @@ namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+struct TWithCustomFlags
+{
+    [[maybe_unused]]
+    friend void FormatValue(TStringBuilderBase* builder, const TWithCustomFlags&, TStringBuf spec)
+    {
+        if (spec.Contains('R')) {
+            builder->AppendString("R");
+        }
+        if (spec.Contains('N')) {
+            builder->AppendString("N");
+        }
+
+        builder->AppendString("P");
+    }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+} // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+
+template <>
+struct TFormatArg<TWithCustomFlags>
+{
+    [[maybe_unused]] static constexpr std::array ConversionSpecifiers = {
+        'v',
+    };
+
+    [[maybe_unused]] static constexpr std::array FlagSpecifiers = {
+        'R', 'N',
+    };
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+namespace {
+
 // Some compile-time sanity checks.
 static_assert(CFormattable<int>);
 static_assert(CFormattable<double>);
@@ -22,6 +60,7 @@ static_assert(CFormattable<TStringBuf>);
 static_assert(CFormattable<TString>);
 static_assert(CFormattable<std::span<int>>);
 static_assert(CFormattable<std::vector<int>>);
+static_assert(CFormattable<std::array<int, 5>>);
 
 // N.B. TCompactVector<int, 1> is not buildable on Windows
 static_assert(CFormattable<TCompactVector<int, 2>>);
@@ -40,6 +79,8 @@ struct TUnformattable
 { };
 static_assert(!CFormattable<TUnformattable>);
 
+static_assert(CFormattable<TWithCustomFlags>);
+
 ////////////////////////////////////////////////////////////////////////////////
 
 TEST(TFormatTest, Nothing)
@@ -223,6 +264,67 @@ TEST(TFormatTest, RuntimeFormat)
     EXPECT_EQ(Format(TRuntimeFormat(format), "World"), "Hello World");
 }
 
+TEST(TFormatTest, CustomFlagsSimple)
+{
+    EXPECT_EQ(Format("%v", TWithCustomFlags{}), TString("P"));
+    EXPECT_EQ(Format("%Rv", TWithCustomFlags{}), TString("RP"));
+    EXPECT_EQ(Format("%Nv", TWithCustomFlags{}), TString("NP"));
+    EXPECT_EQ(Format("%RNv", TWithCustomFlags{}), TString("RNP"));
+    EXPECT_EQ(Format("%NRv", TWithCustomFlags{}), TString("RNP"));
+}
+
+TEST(TFormatTest, CustomFlagsCollection)
+{
+    constexpr int elementCount = 5;
+    auto toCollection = [] (TString pattern) {
+        TString ret = "[";
+        for (int i = 0; i < elementCount - 1; ++i) {
+            ret += pattern + ", ";
+        }
+
+        ret += pattern + "]";
+
+        return ret;
+    };
+
+    std::vector vec(elementCount, TWithCustomFlags{});
+
+    EXPECT_EQ(Format("%v", vec), toCollection("P"));
+    EXPECT_EQ(Format("%Rv", vec), toCollection("RP"));
+    EXPECT_EQ(Format("%Nv", vec), toCollection("NP"));
+    EXPECT_EQ(Format("%RNv", vec), toCollection("RNP"));
+    EXPECT_EQ(Format("%NRv", vec), toCollection("RNP"));
+}
+
+TEST(TFormatTest, CustomFlagsCollectionTwoLevels)
+{
+    constexpr int elementCount1 = 5;
+    constexpr int elementCount2 = 3;
+    auto toCollection = [] (int count, TString pattern) {
+        TString ret = "[";
+        for (int i = 0; i < count - 1; ++i) {
+            ret += pattern + ", ";
+        }
+
+        ret += pattern + "]";
+
+        return ret;
+    };
+    auto toCollectionD2 = [&] (TString pattern) {
+        return toCollection(elementCount2, toCollection(elementCount1, std::move(pattern)));
+    };
+
+    std::vector vec(elementCount1, TWithCustomFlags{});
+    std::array<decltype(vec), elementCount2> arr;
+    std::ranges::fill(arr, vec);
+
+    EXPECT_EQ(Format("%v", arr), toCollectionD2("P"));
+    EXPECT_EQ(Format("%Rv", arr), toCollectionD2("RP"));
+    EXPECT_EQ(Format("%Nv", arr), toCollectionD2("NP"));
+    EXPECT_EQ(Format("%RNv", arr), toCollectionD2("RNP"));
+    EXPECT_EQ(Format("%NRv", arr), toCollectionD2("RNP"));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 } // namespace

From c59a2427a037c1a04a24ed46497ab3a298ffa5d1 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Wed, 7 Aug 2024 14:16:26 +0300
Subject: [PATCH 100/104] Intermediate changes

---
 .../llvm/DebugInfo/DWARF/DWARFContext.h       | 11 ++++++++-
 .../lib/DebugInfo/DWARF/DWARFContext.cpp      | 23 +++++++++++--------
 contrib/libs/protobuf/ya.make                 |  4 ----
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/contrib/libs/llvm16/include/llvm/DebugInfo/DWARF/DWARFContext.h b/contrib/libs/llvm16/include/llvm/DebugInfo/DWARF/DWARFContext.h
index 82da8b032dce..490bf5ff3cba 100644
--- a/contrib/libs/llvm16/include/llvm/DebugInfo/DWARF/DWARFContext.h
+++ b/contrib/libs/llvm16/include/llvm/DebugInfo/DWARF/DWARFContext.h
@@ -452,7 +452,16 @@ class DWARFContext : public DIContext {
   /// address.
   /// TODO: change input parameter from "uint64_t Address"
   ///       into "SectionedAddress Address"
-  DWARFCompileUnit *getCompileUnitForAddress(uint64_t Address);
+  DWARFCompileUnit *getCompileUnitForCodeAddress(uint64_t Address);
+
+  /// Return the compile unit which contains data with the provided address.
+  /// Note: This is more expensive than `getCompileUnitForAddress`, as if
+  /// `Address` isn't found in the CU ranges (which is cheap), then it falls
+  /// back to an expensive O(n) walk of all CU's looking for data that spans the
+  /// address.
+  /// TODO: change input parameter from "uint64_t Address" into
+  ///       "SectionedAddress Address"
+  DWARFCompileUnit *getCompileUnitForDataAddress(uint64_t Address);
 
   /// Returns whether CU/TU should be populated manually. TU Index populated
   /// manually only for DWARF5.
diff --git a/contrib/libs/llvm16/lib/DebugInfo/DWARF/DWARFContext.cpp b/contrib/libs/llvm16/lib/DebugInfo/DWARF/DWARFContext.cpp
index dd86144d16e0..f648ef8ff770 100644
--- a/contrib/libs/llvm16/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/contrib/libs/llvm16/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -1118,14 +1118,17 @@ DWARFCompileUnit *DWARFContext::getCompileUnitForOffset(uint64_t Offset) {
       NormalUnits.getUnitForOffset(Offset));
 }
 
-DWARFCompileUnit *DWARFContext::getCompileUnitForAddress(uint64_t Address) {
-  // First, get the offset of the compile unit.
+DWARFCompileUnit *DWARFContext::getCompileUnitForCodeAddress(uint64_t Address) {
+  uint64_t CUOffset = getDebugAranges()->findAddress(Address);
+  return getCompileUnitForOffset(CUOffset);
+}
+
+DWARFCompileUnit *DWARFContext::getCompileUnitForDataAddress(uint64_t Address) {
   uint64_t CUOffset = getDebugAranges()->findAddress(Address);
-  // Retrieve the compile unit.
   if (DWARFCompileUnit *OffsetCU = getCompileUnitForOffset(CUOffset))
     return OffsetCU;
 
-  // Global variables are often not found by the above search, for one of two
+  // Global variables are often missed by the above search, for one of two
   // reasons:
   //   1. .debug_aranges may not include global variables. On clang, it seems we
   //      put the globals in the aranges, but this isn't true for gcc.
@@ -1146,7 +1149,7 @@ DWARFCompileUnit *DWARFContext::getCompileUnitForAddress(uint64_t Address) {
 DWARFContext::DIEsForAddress DWARFContext::getDIEsForAddress(uint64_t Address) {
   DIEsForAddress Result;
 
-  DWARFCompileUnit *CU = getCompileUnitForAddress(Address);
+  DWARFCompileUnit *CU = getCompileUnitForCodeAddress(Address);
   if (!CU)
     return Result;
 
@@ -1297,7 +1300,7 @@ void DWARFContext::addLocalsForDie(DWARFCompileUnit *CU, DWARFDie Subprogram,
 std::vector<DILocal>
 DWARFContext::getLocalsForAddress(object::SectionedAddress Address) {
   std::vector<DILocal> Result;
-  DWARFCompileUnit *CU = getCompileUnitForAddress(Address.Address);
+  DWARFCompileUnit *CU = getCompileUnitForCodeAddress(Address.Address);
   if (!CU)
     return Result;
 
@@ -1310,7 +1313,7 @@ DWARFContext::getLocalsForAddress(object::SectionedAddress Address) {
 DILineInfo DWARFContext::getLineInfoForAddress(object::SectionedAddress Address,
                                                DILineInfoSpecifier Spec) {
   DILineInfo Result;
-  DWARFCompileUnit *CU = getCompileUnitForAddress(Address.Address);
+  DWARFCompileUnit *CU = getCompileUnitForCodeAddress(Address.Address);
   if (!CU)
     return Result;
 
@@ -1331,7 +1334,7 @@ DILineInfo DWARFContext::getLineInfoForAddress(object::SectionedAddress Address,
 DILineInfo
 DWARFContext::getLineInfoForDataAddress(object::SectionedAddress Address) {
   DILineInfo Result;
-  DWARFCompileUnit *CU = getCompileUnitForAddress(Address.Address);
+  DWARFCompileUnit *CU = getCompileUnitForDataAddress(Address.Address);
   if (!CU)
     return Result;
 
@@ -1346,7 +1349,7 @@ DWARFContext::getLineInfoForDataAddress(object::SectionedAddress Address) {
 DILineInfoTable DWARFContext::getLineInfoForAddressRange(
     object::SectionedAddress Address, uint64_t Size, DILineInfoSpecifier Spec) {
   DILineInfoTable Lines;
-  DWARFCompileUnit *CU = getCompileUnitForAddress(Address.Address);
+  DWARFCompileUnit *CU = getCompileUnitForCodeAddress(Address.Address);
   if (!CU)
     return Lines;
 
@@ -1402,7 +1405,7 @@ DWARFContext::getInliningInfoForAddress(object::SectionedAddress Address,
                                         DILineInfoSpecifier Spec) {
   DIInliningInfo InliningInfo;
 
-  DWARFCompileUnit *CU = getCompileUnitForAddress(Address.Address);
+  DWARFCompileUnit *CU = getCompileUnitForCodeAddress(Address.Address);
   if (!CU)
     return InliningInfo;
 
diff --git a/contrib/libs/protobuf/ya.make b/contrib/libs/protobuf/ya.make
index 5c676496d22f..ec90ec4cd640 100644
--- a/contrib/libs/protobuf/ya.make
+++ b/contrib/libs/protobuf/ya.make
@@ -57,10 +57,6 @@ IF (OS_ANDROID)
     EXTRALIBS(log)
 ENDIF()
 
-IF (FIX_UNUSED_PARAMETR_PLS)
-    GLOBAL_CFLAGS(-DFIX_UNUSED_PARAMETR_PLS=yes)
-ENDIF()
-
 SRCS(
     GLOBAL src/google/protobuf/generated_message_util.cc
     src/google/protobuf/any.cc

From 9b8b737f3b9ece767624afde5c161b7fc8d00cf6 Mon Sep 17 00:00:00 2001
From: osidorkin <osidorkin@yandex-team.com>
Date: Wed, 7 Aug 2024 14:16:43 +0300
Subject: [PATCH 101/104] YT-22451: request timestamp provider feature for
 alien requests. Add fallback to direct connection to remote cluster to
 TRemoteClusterTimestampProvider 4545626d60064b5bb9389f27a1daebe8ea395461

---
 yt/yt/client/transaction_client/public.h      |  4 ++
 .../remote_timestamp_provider.cpp             | 63 +++++++++++++++++--
 .../remote_timestamp_provider.h               |  5 ++
 3 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/yt/yt/client/transaction_client/public.h b/yt/yt/client/transaction_client/public.h
index fd3f41b3705d..c910c3d6ecba 100644
--- a/yt/yt/client/transaction_client/public.h
+++ b/yt/yt/client/transaction_client/public.h
@@ -31,6 +31,10 @@ DEFINE_ENUM(ECommitOrdering,
     ((Strong)          (1)) // Rows are appended to tablet in order of timestamps
 );
 
+DEFINE_ENUM(ETimestampProviderFeature,
+    ((AlienClocks)     (0))
+);
+
 YT_DEFINE_ERROR_ENUM(
     ((NoSuchTransaction)                (11000))
     ((NestedExternalTransactionExists)  (11001))
diff --git a/yt/yt/client/transaction_client/remote_timestamp_provider.cpp b/yt/yt/client/transaction_client/remote_timestamp_provider.cpp
index 00def063ee9a..a29cea5eceae 100644
--- a/yt/yt/client/transaction_client/remote_timestamp_provider.cpp
+++ b/yt/yt/client/transaction_client/remote_timestamp_provider.cpp
@@ -66,9 +66,11 @@ class TRemoteTimestampProvider
 public:
     TRemoteTimestampProvider(
         IChannelPtr channel,
-        TRemoteTimestampProviderConfigPtr config)
+        TRemoteTimestampProviderConfigPtr config,
+        bool allowOldClocks)
         : TTimestampProviderBase(config->LatestTimestampUpdatePeriod)
         , Config_(std::move(config))
+        , AllowOldClocks_(allowOldClocks)
         , Proxy_(std::move(channel))
     {
         Proxy_.SetDefaultTimeout(Config_->RpcTimeout);
@@ -76,6 +78,7 @@ class TRemoteTimestampProvider
 
 private:
     const TRemoteTimestampProviderConfigPtr Config_;
+    const bool AllowOldClocks_ = false;
 
     TTimestampServiceProxy Proxy_;
 
@@ -85,8 +88,13 @@ class TRemoteTimestampProvider
         req->SetResponseHeavy(true);
         req->set_count(count);
         if (clockClusterTag != InvalidCellTag) {
+            if (!AllowOldClocks_) {
+                req->RequireServerFeature(ETimestampProviderFeature::AlienClocks);
+            }
+
             req->set_clock_cluster_tag(ToProto<int>(clockClusterTag));
         }
+
         return req->Invoke().Apply(
             BIND([clockClusterTag] (const TTimestampServiceProxy::TRspGenerateTimestampsPtr& rsp) {
             auto responseClockClusterTag = rsp->has_clock_cluster_tag()
@@ -109,30 +117,70 @@ class TRemoteTimestampProvider
 
 ////////////////////////////////////////////////////////////////////////////////
 
+ITimestampProviderPtr CreateRemoteTimestampProvider(
+    TRemoteTimestampProviderConfigPtr config,
+    IChannelPtr channel,
+    bool allowOldClocks)
+{
+    return New<TRemoteTimestampProvider>(
+        std::move(channel),
+        std::move(config),
+        allowOldClocks);
+}
+
 ITimestampProviderPtr CreateRemoteTimestampProvider(
     TRemoteTimestampProviderConfigPtr config,
     IChannelPtr channel)
 {
-    return New<TRemoteTimestampProvider>(std::move(channel), std::move(config));
+    return CreateRemoteTimestampProvider(
+        std::move(config),
+        std::move(channel),
+        false);
 }
 
 ITimestampProviderPtr CreateBatchingRemoteTimestampProvider(
     TRemoteTimestampProviderConfigPtr config,
-    IChannelPtr channel)
+    IChannelPtr channel,
+    bool allowOldClocks)
 {
-    auto underlying = CreateRemoteTimestampProvider(config, std::move(channel));
+    auto underlying = CreateRemoteTimestampProvider(
+        config,
+        std::move(channel),
+        allowOldClocks);
     return CreateBatchingTimestampProvider(
         std::move(underlying),
         config->BatchPeriod);
 }
 
+ITimestampProviderPtr CreateBatchingRemoteTimestampProvider(
+    TRemoteTimestampProviderConfigPtr config,
+    IChannelPtr channel)
+{
+    return CreateBatchingRemoteTimestampProvider(
+        std::move(config),
+        std::move(channel),
+        false);
+}
+
+ITimestampProviderPtr CreateBatchingRemoteTimestampProvider(
+    const TRemoteTimestampProviderConfigPtr& config,
+    const IChannelFactoryPtr& channelFactory,
+    bool allowOldClocks)
+{
+    return CreateBatchingRemoteTimestampProvider(
+        config,
+        CreateTimestampProviderChannel(config, channelFactory),
+        allowOldClocks);
+}
+
 ITimestampProviderPtr CreateBatchingRemoteTimestampProvider(
     const TRemoteTimestampProviderConfigPtr& config,
     const IChannelFactoryPtr& channelFactory)
 {
     return CreateBatchingRemoteTimestampProvider(
         config,
-        CreateTimestampProviderChannel(config, channelFactory));
+        channelFactory,
+        false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -164,7 +212,10 @@ TAlienRemoteTimestampProvidersMap CreateAlienTimestampProvidersMap(
         EmplaceOrCrash(
             alienProvidersMap,
             alienClockCellTag,
-            CreateBatchingRemoteTimestampProvider(foreignProviderConfig->TimestampProvider, channelFactory));
+            CreateBatchingRemoteTimestampProvider(
+                foreignProviderConfig->TimestampProvider,
+                channelFactory,
+                true));
     }
 
     return alienProvidersMap;
diff --git a/yt/yt/client/transaction_client/remote_timestamp_provider.h b/yt/yt/client/transaction_client/remote_timestamp_provider.h
index 41a4a3d707d2..806f47a5b3ae 100644
--- a/yt/yt/client/transaction_client/remote_timestamp_provider.h
+++ b/yt/yt/client/transaction_client/remote_timestamp_provider.h
@@ -37,6 +37,11 @@ ITimestampProviderPtr CreateBatchingRemoteTimestampProvider(
     const TRemoteTimestampProviderConfigPtr& config,
     const NRpc::IChannelFactoryPtr& channelFactory);
 
+ITimestampProviderPtr CreateBatchingRemoteTimestampProvider(
+    const TRemoteTimestampProviderConfigPtr& config,
+    const NRpc::IChannelFactoryPtr& channelFactory,
+    bool allowOldClocks);
+
 TAlienRemoteTimestampProvidersMap CreateAlienTimestampProvidersMap(
     const std::vector<TAlienTimestampProviderConfigPtr>& configs,
     ITimestampProviderPtr nativeProvider,

From b0f6cd904ffb99526b40483bd2738c6c78fa0e88 Mon Sep 17 00:00:00 2001
From: robot-piglet <robot-piglet@yandex-team.com>
Date: Wed, 7 Aug 2024 15:46:40 +0300
Subject: [PATCH 102/104] Intermediate changes

---
 build/mapping.conf.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 40789c7a71a6..f7c6a997b9ac 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -180,14 +180,19 @@
         "6113424629": "https://devtools-registry.s3.yandex.net/6113424629",
         "5599878022": "https://devtools-registry.s3.yandex.net/5599878022",
         "6635026187": "https://devtools-registry.s3.yandex.net/6635026187",
+        "6816406420": "https://devtools-registry.s3.yandex.net/6816406420",
         "5599877541": "https://devtools-registry.s3.yandex.net/5599877541",
         "6635026071": "https://devtools-registry.s3.yandex.net/6635026071",
+        "6816406079": "https://devtools-registry.s3.yandex.net/6816406079",
         "5599878769": "https://devtools-registry.s3.yandex.net/5599878769",
         "6635026422": "https://devtools-registry.s3.yandex.net/6635026422",
+        "6816407233": "https://devtools-registry.s3.yandex.net/6816407233",
         "5599877008": "https://devtools-registry.s3.yandex.net/5599877008",
         "6635025898": "https://devtools-registry.s3.yandex.net/6635025898",
+        "6816405372": "https://devtools-registry.s3.yandex.net/6816405372",
         "5599878473": "https://devtools-registry.s3.yandex.net/5599878473",
         "6635026287": "https://devtools-registry.s3.yandex.net/6635026287",
+        "6816406896": "https://devtools-registry.s3.yandex.net/6816406896",
         "5841616607": "https://devtools-registry.s3.yandex.net/5841616607",
         "6255592114": "https://devtools-registry.s3.yandex.net/6255592114",
         "6607396810": "https://devtools-registry.s3.yandex.net/6607396810",
@@ -245,21 +250,25 @@
         "6674734480": "https://devtools-registry.s3.yandex.net/6674734480",
         "6726871384": "https://devtools-registry.s3.yandex.net/6726871384",
         "6760720465": "https://devtools-registry.s3.yandex.net/6760720465",
+        "6822863322": "https://devtools-registry.s3.yandex.net/6822863322",
         "6603781997": "https://devtools-registry.s3.yandex.net/6603781997",
         "6652223452": "https://devtools-registry.s3.yandex.net/6652223452",
         "6674733966": "https://devtools-registry.s3.yandex.net/6674733966",
         "6726867988": "https://devtools-registry.s3.yandex.net/6726867988",
         "6760720256": "https://devtools-registry.s3.yandex.net/6760720256",
+        "6822862832": "https://devtools-registry.s3.yandex.net/6822862832",
         "6603787904": "https://devtools-registry.s3.yandex.net/6603787904",
         "6652225714": "https://devtools-registry.s3.yandex.net/6652225714",
         "6674734993": "https://devtools-registry.s3.yandex.net/6674734993",
         "6726875537": "https://devtools-registry.s3.yandex.net/6726875537",
         "6760721014": "https://devtools-registry.s3.yandex.net/6760721014",
+        "6822864509": "https://devtools-registry.s3.yandex.net/6822864509",
         "6603780916": "https://devtools-registry.s3.yandex.net/6603780916",
         "6652222817": "https://devtools-registry.s3.yandex.net/6652222817",
         "6674733653": "https://devtools-registry.s3.yandex.net/6674733653",
         "6726866588": "https://devtools-registry.s3.yandex.net/6726866588",
         "6760720046": "https://devtools-registry.s3.yandex.net/6760720046",
+        "6822862341": "https://devtools-registry.s3.yandex.net/6822862341",
         "6603783079": "https://devtools-registry.s3.yandex.net/6603783079",
         "6652224021": "https://devtools-registry.s3.yandex.net/6652224021",
         "6674734285": "https://devtools-registry.s3.yandex.net/6674734285",
@@ -269,6 +278,7 @@
         "6674734716": "https://devtools-registry.s3.yandex.net/6674734716",
         "6726873745": "https://devtools-registry.s3.yandex.net/6726873745",
         "6760720811": "https://devtools-registry.s3.yandex.net/6760720811",
+        "6822864007": "https://devtools-registry.s3.yandex.net/6822864007",
         "3961412335": "https://devtools-registry.s3.yandex.net/3961412335",
         "3961411314": "https://devtools-registry.s3.yandex.net/3961411314",
         "3961413236": "https://devtools-registry.s3.yandex.net/3961413236",
@@ -926,14 +936,19 @@
         "6113424629": "contrib/libs/clang16/tools/clang-format/clang-format for win32",
         "5599878022": "contrib/python/black/bin/black for darwin",
         "6635026187": "contrib/python/black/bin/black for darwin",
+        "6816406420": "contrib/python/black/bin/black for darwin",
         "5599877541": "contrib/python/black/bin/black for darwin-arm64",
         "6635026071": "contrib/python/black/bin/black for darwin-arm64",
+        "6816406079": "contrib/python/black/bin/black for darwin-arm64",
         "5599878769": "contrib/python/black/bin/black for linux",
         "6635026422": "contrib/python/black/bin/black for linux",
+        "6816407233": "contrib/python/black/bin/black for linux",
         "5599877008": "contrib/python/black/bin/black for linux-aarch64",
         "6635025898": "contrib/python/black/bin/black for linux-aarch64",
+        "6816405372": "contrib/python/black/bin/black for linux-aarch64",
         "5599878473": "contrib/python/black/bin/black for win32",
         "6635026287": "contrib/python/black/bin/black for win32",
+        "6816406896": "contrib/python/black/bin/black for win32",
         "5841616607": "contrib/tools/protoc/bin/protoc for linux",
         "6255592114": "contrib/tools/python3/bin/python3 for darwin",
         "6607396810": "contrib/tools/python3/bin/python3 for darwin",
@@ -991,21 +1006,25 @@
         "6674734480": "devtools/ya/test/programs/flake8/flake8 for darwin",
         "6726871384": "devtools/ya/test/programs/flake8/flake8 for darwin",
         "6760720465": "devtools/ya/test/programs/flake8/flake8 for darwin",
+        "6822863322": "devtools/ya/test/programs/flake8/flake8 for darwin",
         "6603781997": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
         "6652223452": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
         "6674733966": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
         "6726867988": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
         "6760720256": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
+        "6822862832": "devtools/ya/test/programs/flake8/flake8 for darwin-arm64",
         "6603787904": "devtools/ya/test/programs/flake8/flake8 for linux",
         "6652225714": "devtools/ya/test/programs/flake8/flake8 for linux",
         "6674734993": "devtools/ya/test/programs/flake8/flake8 for linux",
         "6726875537": "devtools/ya/test/programs/flake8/flake8 for linux",
         "6760721014": "devtools/ya/test/programs/flake8/flake8 for linux",
+        "6822864509": "devtools/ya/test/programs/flake8/flake8 for linux",
         "6603780916": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
         "6652222817": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
         "6674733653": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
         "6726866588": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
         "6760720046": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
+        "6822862341": "devtools/ya/test/programs/flake8/flake8 for linux-aarch64",
         "6603783079": "devtools/ya/test/programs/flake8/flake8 for linux-ppc64le",
         "6652224021": "devtools/ya/test/programs/flake8/flake8 for linux-ppc64le",
         "6674734285": "devtools/ya/test/programs/flake8/flake8 for linux-ppc64le",
@@ -1015,6 +1034,7 @@
         "6674734716": "devtools/ya/test/programs/flake8/flake8 for win32",
         "6726873745": "devtools/ya/test/programs/flake8/flake8 for win32",
         "6760720811": "devtools/ya/test/programs/flake8/flake8 for win32",
+        "6822864007": "devtools/ya/test/programs/flake8/flake8 for win32",
         "3961412335": "devtools/ya/test/programs/flake8/py2/flake8 for darwin",
         "3961411314": "devtools/ya/test/programs/flake8/py2/flake8 for darwin-arm64",
         "3961413236": "devtools/ya/test/programs/flake8/py2/flake8 for linux",

From 51849a344a8003346df1ac45bffd62214f50e617 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <alex@ydb.tech>
Date: Wed, 7 Aug 2024 13:12:43 +0000
Subject: [PATCH 103/104] Import libraries 240807-1311

---
 ydb/ci/rightlib.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ydb/ci/rightlib.txt b/ydb/ci/rightlib.txt
index 0af2038cc719..357c5b44b827 100644
--- a/ydb/ci/rightlib.txt
+++ b/ydb/ci/rightlib.txt
@@ -1 +1 @@
-f7ca71b582e2347ec55857b493d6bccf55bbc3df
+b0f6cd904ffb99526b40483bd2738c6c78fa0e88

From 88460fbe6a25478b8144261e2918a4713dd7dd2d Mon Sep 17 00:00:00 2001
From: Maxim Yurchuk <maxim-yurchuk@ydb.tech>
Date: Wed, 14 Aug 2024 14:10:54 +0000
Subject: [PATCH 104/104] Fix from
 https://github.com/grpc/grpc/commit/abbaa20223c95255f36a1bc70b3505e9daa006a2

https://a.yandex-team.ru/review/6516660
---
 contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc b/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc
index 720cf269f2cf..4e437e034cbd 100644
--- a/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc
+++ b/contrib/libs/grpc/src/core/lib/iomgr/tcp_client_posix.cc
@@ -329,6 +329,7 @@ int64_t grpc_tcp_client_create_from_prepared_fd(
     err = connect(fd, reinterpret_cast<const grpc_sockaddr*>(addr->addr),
                   addr->len);
   } while (err < 0 && errno == EINTR);
+  int connect_errno = (err < 0) ? errno : 0;
 
   auto addr_uri = grpc_sockaddr_to_uri(addr);
   if (!addr_uri.ok()) {
@@ -340,7 +341,7 @@ int64_t grpc_tcp_client_create_from_prepared_fd(
   TString name = y_absl::StrCat("tcp-client:", addr_uri.value());
   grpc_fd* fdobj = grpc_fd_create(fd, name.c_str(), true);
   int64_t connection_id = 0;
-  if (errno == EWOULDBLOCK || errno == EINPROGRESS) {
+  if (connect_errno == EWOULDBLOCK || connect_errno == EINPROGRESS) {
     // Connection is still in progress.
     connection_id = g_connection_id.fetch_add(1, std::memory_order_acq_rel);
   }
@@ -352,10 +353,10 @@ int64_t grpc_tcp_client_create_from_prepared_fd(
     grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, y_absl::OkStatus());
     return 0;
   }
-  if (errno != EWOULDBLOCK && errno != EINPROGRESS) {
+  if (connect_errno != EWOULDBLOCK && connect_errno != EINPROGRESS) {
     // Connection already failed. Return 0 to discourage any cancellation
     // attempts.
-    grpc_error_handle error = GRPC_OS_ERROR(errno, "connect");
+    grpc_error_handle error = GRPC_OS_ERROR(connect_errno, "connect");
     error = grpc_error_set_str(
         error, grpc_core::StatusStrProperty::kTargetAddress, addr_uri.value());
     grpc_fd_orphan(fdobj, nullptr, nullptr, "tcp_client_connect_error");