From 63e5ee71e4fc230c8813f6649028330fd9f1a22c Mon Sep 17 00:00:00 2001 From: Peter Haag Date: Sun, 13 Nov 2016 15:59:41 +0100 Subject: [PATCH] Push fixes --- autom4te.cache/requests | 522 ++++++++++++++++++++-------------------- bin/Makefile.am | 14 +- bin/Makefile.in | 27 ++- bin/ipfix.c | 8 +- bin/netflow_v9.c | 12 +- 5 files changed, 303 insertions(+), 280 deletions(-) diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 86f90a0..3a60015 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -34,47 +34,47 @@ 'configure.ac' ], { - 'AC_DEFUN' => 1, - '_AM_PROG_CC_C_O' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'AM_SANITY_CHECK' => 1, '_AM_AUTOCONF_VERSION' => 1, - 'AC_DEFUN_ONCE' => 1, - 'AM_CONDITIONAL' => 1, - 'include' => 1, - 'AM_SET_DEPDIR' => 1, - 'm4_pattern_forbid' => 1, - '_AM_DEPENDENCIES' => 1, - '_AM_IF_OPTION' => 1, - 'AM_DEP_TRACK' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AM_PROG_INSTALL_SH' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AU_DEFUN' => 1, - '_AM_SET_OPTIONS' => 1, - 'AM_MISSING_PROG' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AM_RUN_LOG' => 1, - 'm4_pattern_allow' => 1, - '_m4_warn' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'AM_MAKE_INCLUDE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, 'AC_CONFIG_MACRO_DIR' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AM_PROG_INSTALL_SH' => 1, + '_m4_warn' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AM_SANITY_CHECK' => 1, 'm4_include' => 1, - '_AM_MANGLE_OPTION' => 1, - '_AM_PROG_TAR' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'AM_RUN_LOG' => 1, '_AM_SUBST_NOTMAKE' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - '_AM_SET_OPTION' => 1, + '_AM_PROG_CC_C_O' => 1, + 'm4_pattern_forbid' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AM_DEP_TRACK' => 1, + 'AU_DEFUN' => 1, + '_AM_IF_OPTION' => 1, + '_AM_PROG_TAR' => 1, + 'AM_MISSING_PROG' => 1, + 'AC_DEFUN' => 1, + 'AM_SILENT_RULES' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AM_MISSING_HAS_RUN' => 1, + '_AM_SET_OPTIONS' => 1, + 'm4_pattern_allow' => 1, + 'AM_SUBST_NOTMAKE' => 1, + '_AM_DEPENDENCIES' => 1, 'AM_PROG_CC_C_O' => 1, - 'AM_SET_LEADING_DOT' => 1 + 'include' => 1, + 'AM_SET_DEPDIR' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_AM_SET_OPTION' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -89,65 +89,65 @@ 'configure.ac' ], { - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_SUBST' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_SUBST_TRACE' => 1, - 'AM_PROG_AR' => 1, - 'AH_OUTPUT' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - '_m4_warn' => 1, - 'm4_pattern_allow' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AM_NLS' => 1, - 'AC_FC_FREEFORM' => 1, - 'AM_PATH_GUILE' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'm4_include' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AM_CONDITIONAL' => 1, - '_AM_COND_ELSE' => 1, - 'AM_POT_TOOLS' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_PROG_MOC' => 1, - 'sinclude' => 1, - 'AM_PROG_CXX_C_O' => 1, '_AM_COND_ENDIF' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AC_LIBSOURCE' => 1, - 'm4_pattern_forbid' => 1, - 'include' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'AC_CONFIG_LINKS' => 1, 'AM_MAINTAINER_MODE' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_FC_PP_DEFINE' => 1, - '_AM_COND_IF' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, 'AC_CONFIG_FILES' => 1, - 'AC_FC_SRCEXT' => 1, - 'AC_INIT' => 1, - 'LT_INIT' => 1, + 'AM_PROG_FC_C_O' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AM_PROG_MOC' => 1, 'AM_GNU_GETTEXT' => 1, - 'm4_sinclude' => 1 + '_m4_warn' => 1, + 'AM_CONDITIONAL' => 1, + 'm4_sinclude' => 1, + 'AC_FC_SRCEXT' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'm4_include' => 1, + 'AC_SUBST' => 1, + 'sinclude' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'm4_pattern_forbid' => 1, + 'AM_PROG_F77_C_O' => 1, + '_LT_AC_TAGCONFIG' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_PATH_GUILE' => 1, + 'AC_LIBSOURCE' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AC_FC_FREEFORM' => 1, + 'AM_POT_TOOLS' => 1, + '_AM_COND_IF' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'm4_pattern_allow' => 1, + 'AC_INIT' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AH_OUTPUT' => 1, + '_AM_COND_ELSE' => 1, + 'AM_SILENT_RULES' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AC_SUBST_TRACE' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_NLS' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'include' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_AR' => 1, + 'LT_INIT' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -188,185 +188,185 @@ 'configure.ac' ], { - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - '_m4_warn' => 1, - '_LT_AC_TAGVAR' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'LTDL_CONVENIENCE' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, - '_AM_MANGLE_OPTION' => 1, - '_AM_SET_OPTION' => 1, - 'AC_DISABLE_SHARED' => 1, - 'AM_PROG_LIBTOOL' => 1, - '_LT_AC_TAGCONFIG' => 1, - '_LT_LIBOBJ' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_PROG_LD' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'AM_PROG_NM' => 1, - 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'LT_LIB_DLLOAD' => 1, - '_AM_DEPENDENCIES' => 1, - 'LTDL_INSTALLABLE' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - 'AC_CHECK_LIBM' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'AC_DEFUN_ONCE' => 1, - 'LT_AC_PROG_SED' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'LTSUGAR_VERSION' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'LT_OUTPUT' => 1, - 'LT_INIT' => 1, - 'AM_MISSING_PROG' => 1, - 'AC_LTDL_SHLIBPATH' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, - '_LT_PROG_LTMAIN' => 1, - '_LT_AC_LANG_CXX' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_F77' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'LT_LANG' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'AC_LTDL_SHLIBEXT' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - '_LT_CC_BASENAME' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'LT_PROG_GO' => 1, - 'LT_PATH_LD' => 1, - 'AC_LTDL_SYMBOL_USCORE' => 1, - '_AM_PROG_TAR' => 1, - 'LT_FUNC_DLSYM_USCORE' => 1, - 'm4_include' => 1, - 'AM_ENABLE_SHARED' => 1, - 'AC_LIBLTDL_CONVENIENCE' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - '_LT_AC_LANG_GCJ' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'AC_LIBTOOL_OBJDIR' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, - 'AM_DEP_TRACK' => 1, - '_AM_IF_OPTION' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'AM_SANITY_CHECK' => 1, - 'AM_CONDITIONAL' => 1, + '_LT_PROG_CXX' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'AC_DEFUN' => 1, - 'AU_DEFUN' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'LT_LIB_M' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AC_LTDL_DLLIB' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - 'AC_LIBTOOL_RC' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'LTOPTIONS_VERSION' => 1, - 'LT_PATH_NM' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'm4_pattern_allow' => 1, - 'AM_RUN_LOG' => 1, - 'LT_PROG_RC' => 1, - '_LT_WITH_SYSROOT' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_PROG_NM' => 1, - '_LT_DLL_DEF_P' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - '_LT_AC_LANG_C_CONFIG' => 1, - 'AM_PROG_CC_C_O' => 1, - '_AM_SUBST_NOTMAKE' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - '_LT_PROG_F77' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'AC_LTDL_SYSSEARCHPATH' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'LT_WITH_LTDL' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'LT_SYS_MODULE_EXT' => 1, '_LT_AC_SYS_COMPILER' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - 'LT_AC_PROG_RC' => 1, - 'LTOBSOLETE_VERSION' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + 'LT_PATH_LD' => 1, + 'LT_LIB_M' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, 'AM_MAKE_INCLUDE' => 1, - 'AC_PROG_LD' => 1, - 'LT_FUNC_ARGZ' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - 'LT_AC_PROG_EGREP' => 1, - '_LT_AC_LANG_F77' => 1, + '_LT_AC_TAGVAR' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + '_AM_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'AC_LIBTOOL_FC' => 1, + '_AM_PROG_TAR' => 1, + 'AM_DEP_TRACK' => 1, + 'LT_SYS_DLSEARCH_PATH' => 1, + '_LT_PROG_LTMAIN' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'AC_ENABLE_SHARED' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'AM_ENABLE_STATIC' => 1, + 'AM_ENABLE_SHARED' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + '_LT_AC_LANG_CXX' => 1, + 'AC_PROG_EGREP' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'LTOPTIONS_VERSION' => 1, 'AM_SET_DEPDIR' => 1, 'include' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - 'm4_pattern_forbid' => 1, - 'LT_SYS_DLSEARCH_PATH' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_PROG_EGREP' => 1, - 'AC_LTDL_DLSYM_USCORE' => 1, - 'AM_DISABLE_STATIC' => 1, - '_LT_LINKER_OPTION' => 1, - 'LT_SYS_SYMBOL_USCORE' => 1, - 'AC_LTDL_PREOPEN' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - '_LT_PROG_FC' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'LT_PROG_GCJ' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'AC_WITH_LTDL' => 1, - 'LT_WITH_LTDL' => 1, - 'AC_LIB_LTDL' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'AC_DISABLE_STATIC' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_LTDL_SETUP' => 1, - '_LT_COMPILER_OPTION' => 1, - '_LT_PROG_CXX' => 1, - 'LT_SYS_MODULE_EXT' => 1, - '_LT_AC_LOCK' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_ENABLE_SHARED' => 1, - 'AC_PROG_LD_GNU' => 1, - '_LT_AC_SHELL_INIT' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - '_AM_PROG_CC_C_O' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'AC_LIBTOOL_FC' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'LTVERSION_VERSION' => 1, - 'AM_ENABLE_STATIC' => 1, - '_AM_SET_OPTIONS' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + '_LT_CC_BASENAME' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, - 'AM_DISABLE_SHARED' => 1, - 'LT_SYS_MODULE_PATH' => 1, + '_LT_AC_LANG_GCJ' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'LT_OUTPUT' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'AM_PROG_INSTALL_SH' => 1, + 'AC_CHECK_LIBM' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AC_DEFUN_ONCE' => 1, + '_LT_LIBOBJ' => 1, + 'AM_INIT_AUTOMAKE' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'AM_PROG_LD' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_PROG_NM' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'LT_LANG' => 1, + 'm4_pattern_forbid' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + '_LT_WITH_SYSROOT' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'LT_PROG_GCJ' => 1, + 'AC_ENABLE_STATIC' => 1, + 'LTVERSION_VERSION' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AC_LTDL_SHLIBPATH' => 1, + 'LT_PROG_GO' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'm4_pattern_allow' => 1, + '_LT_DLL_DEF_P' => 1, + 'AM_MISSING_HAS_RUN' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_LTDL_SYSSEARCHPATH' => 1, + '_AM_DEPENDENCIES' => 1, + '_AM_SET_OPTION' => 1, + 'AC_LIBTOOL_RC' => 1, + 'AC_PATH_MAGIC' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'LT_INIT' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + 'AC_PROG_LD' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AC_DISABLE_SHARED' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'AM_DISABLE_STATIC' => 1, + '_AM_AUTOCONF_VERSION' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'LT_PATH_NM' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, + '_LT_AC_LOCK' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'AC_LIBTOOL_F77' => 1, + 'LT_AC_PROG_RC' => 1, + 'AM_RUN_LOG' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AC_DEFUN' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + '_AM_IF_OPTION' => 1, + '_AM_MANGLE_OPTION' => 1, + '_AM_SET_OPTIONS' => 1, + '_LT_AC_SHELL_INIT' => 1, + '_LT_PROG_FC' => 1, + '_LT_COMPILER_OPTION' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AC_LIB_LTDL' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'LT_FUNC_ARGZ' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'LT_PROG_RC' => 1, + 'AC_LIBTOOL_SETUP' => 1, + '_LT_AC_LANG_F77' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + '_LT_LINKER_OPTION' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AC_LIBLTDL_CONVENIENCE' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'LT_SYS_SYMBOL_USCORE' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + '_m4_warn' => 1, + 'LT_LIB_DLLOAD' => 1, + 'm4_include' => 1, + 'AM_SANITY_CHECK' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_WITH_LTDL' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + 'AM_DISABLE_SHARED' => 1, + 'AM_PROG_NM' => 1, + 'LTDL_CONVENIENCE' => 1, + 'LT_AC_PROG_SED' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'AM_MISSING_PROG' => 1, + 'AU_DEFUN' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'LT_SYS_MODULE_PATH' => 1, + 'AC_LTDL_DLLIB' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + 'AM_SILENT_RULES' => 1, + '_LTDL_SETUP' => 1, + 'AC_PROG_LD_GNU' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + '_LT_PROG_F77' => 1, + 'AC_LTDL_SHLIBEXT' => 1, 'LTDL_INIT' => 1, - 'AC_LIBTOOL_SETUP' => 1 + 'AC_DISABLE_STATIC' => 1, + 'LTSUGAR_VERSION' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'LT_CMD_MAX_LEN' => 1, + 'LTDL_INSTALLABLE' => 1, + 'LT_AC_PROG_EGREP' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'AC_LTDL_DLSYM_USCORE' => 1 } ], 'Autom4te::Request' ) ); diff --git a/bin/Makefile.am b/bin/Makefile.am index 73c28a7..73f426c 100755 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -66,30 +66,36 @@ libnfdump_la_LDFLAGS = -release 1.6.15 nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \ $(nflowcache) $(nfprof) nfdump_LDADD = -lnfdump +nfdump_DEPENDENCIES = libnfdump.la nfreplay_SOURCES = nfreplay.c $(nfprof) \ $(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix) nfreplay_LDADD = -lnfdump +nfreplay_DEPENDENCIES = libnfdump.la nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) nfprofile_LDADD = -lnfdump -lrrd +nfprofile_DEPENDENCIES = libnfdump.la nftrack_SOURCES = ../extra/nftrack/nftrack.c \ ../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \ ../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h nftrack_CFLAGS = -I ../extra/nftrack nftrack_LDADD = -lnfdump -lrrd +nftrack_DEPENDENCIES = libnfdump.la nfcapd_SOURCES = nfcapd.c \ $(nfstatfile) $(launch) \ $(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire) nfcapd_LDADD = -lnfdump +nfcapd_DEPENDENCIES = libnfdump.la nfpcapd_SOURCES = nfpcapd.c \ $(pcaproc) $(netflow_pcap) \ $(nfstatfile) $(launch) \ $(nfnet) $(collector) $(bookkeeper) $(expire) $(content) nfpcapd_LDADD = -lnfdump +nfpcapd_DEPENDENCIES = libnfdump.la if READPCAP nfcapd_CFLAGS = -DPCAP @@ -108,6 +114,7 @@ sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h \ $(nfstatfile) $(launch) \ $(nfnet) $(collector) $(bookkeeper) $(expire) sfcapd_LDADD = -lnfdump +sfcapd_DEPENDENCIES = libnfdump.la if READPCAP sfcapd_CFLAGS = -DPCAP @@ -117,26 +124,31 @@ endif nfreader_SOURCES = nfreader.c nfreader_LDADD = -lnfdump +nfreader_DEPENDENCIES = libnfdump.la nfanon_SOURCES = nfanon.c $(anon) nfanon_LDADD = -lnfdump +nfanon_DEPENDENCIES = libnfdump.la nfgen_SOURCES = nfgen.c nfgen_LDADD = -lnfdump +nfgen_DEPENDENCIES = libnfdump.la nfexpire_SOURCES = nfexpire.c \ $(bookkeeper) $(expire) $(nfstatfile) nfexpire_LDADD = -lnfdump @FTS_OBJ@ +nfexpire_DEPENDENCIES = libnfdump.la nftest_SOURCES = nftest.c nftest_LDADD = -lnfdump -nftest_DEPENDENCIES = nfgen +nftest_DEPENDENCIES = nfgen libnfdump.la if FT2NFDUMP ft2nfdump_SOURCES = ft2nfdump.c ft2nfdump_CFLAGS = @FT_INCLUDES@ ft2nfdump_LDADD = -lnfdump -lft -lz ft2nfdump_LDADD += @FT_LDFLAGS@ +ft2nfdump_DEPENDENCIES = libnfdump.la endif check_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c diff --git a/bin/Makefile.in b/bin/Makefile.in index 9569c0d..d6a6dbf 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -105,6 +105,7 @@ TESTS = nftest$(EXEEXT) test.sh @BUILDNFPCAPD_TRUE@am__append_8 = -lpcap @READPCAP_TRUE@am__append_9 = pcap_reader.c pcap_reader.h @READPCAP_TRUE@am__append_10 = -lpcap +@FT2NFDUMP_FALSE@ft2nfdump_DEPENDENCIES = subdir = bin ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -171,14 +172,12 @@ PROGRAMS = $(bin_PROGRAMS) am__ft2nfdump_SOURCES_DIST = ft2nfdump.c @FT2NFDUMP_TRUE@am_ft2nfdump_OBJECTS = ft2nfdump-ft2nfdump.$(OBJEXT) ft2nfdump_OBJECTS = $(am_ft2nfdump_OBJECTS) -ft2nfdump_DEPENDENCIES = ft2nfdump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ft2nfdump_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am__objects_7 = panonymizer.$(OBJEXT) rijndael.$(OBJEXT) am_nfanon_OBJECTS = nfanon.$(OBJEXT) $(am__objects_7) nfanon_OBJECTS = $(am_nfanon_OBJECTS) -nfanon_DEPENDENCIES = am__nfcapd_SOURCES_DIST = nfcapd.c nfstatfile.c nfstatfile.h launch.c \ launch.h nfnet.c nfnet.h collector.c collector.h netflow_v1.c \ netflow_v1.h netflow_v5_v7.c netflow_v5_v7.h netflow_v9.c \ @@ -202,7 +201,6 @@ am_nfcapd_OBJECTS = nfcapd-nfcapd.$(OBJEXT) $(am__objects_8) \ $(am__objects_18) nfcapd_OBJECTS = $(am_nfcapd_OBJECTS) am__DEPENDENCIES_1 = -nfcapd_DEPENDENCIES = $(am__DEPENDENCIES_1) nfcapd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(nfcapd_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -211,17 +209,14 @@ am__objects_20 = nfprof.$(OBJEXT) am_nfdump_OBJECTS = nfdump.$(OBJEXT) nfstat.$(OBJEXT) \ nfexport.$(OBJEXT) $(am__objects_19) $(am__objects_20) nfdump_OBJECTS = $(am_nfdump_OBJECTS) -nfdump_DEPENDENCIES = am__objects_21 = bookkeeper.$(OBJEXT) am__objects_22 = expire.$(OBJEXT) am__objects_23 = nfstatfile.$(OBJEXT) am_nfexpire_OBJECTS = nfexpire.$(OBJEXT) $(am__objects_21) \ $(am__objects_22) $(am__objects_23) nfexpire_OBJECTS = $(am_nfexpire_OBJECTS) -nfexpire_DEPENDENCIES = am_nfgen_OBJECTS = nfgen.$(OBJEXT) nfgen_OBJECTS = $(am_nfgen_OBJECTS) -nfgen_DEPENDENCIES = am__objects_24 = nfpcapd-pcaproc.$(OBJEXT) nfpcapd-flowtree.$(OBJEXT) \ nfpcapd-ipfrag.$(OBJEXT) am__objects_25 = nfpcapd-netflow_pcap.$(OBJEXT) @@ -237,17 +232,14 @@ am_nfpcapd_OBJECTS = nfpcapd-nfpcapd.$(OBJEXT) $(am__objects_24) \ $(am__objects_28) $(am__objects_29) $(am__objects_30) \ $(am__objects_31) $(am__objects_32) nfpcapd_OBJECTS = $(am_nfpcapd_OBJECTS) -nfpcapd_DEPENDENCIES = $(am__DEPENDENCIES_1) nfpcapd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(nfpcapd_CFLAGS) \ $(CFLAGS) $(nfpcapd_LDFLAGS) $(LDFLAGS) -o $@ am_nfprofile_OBJECTS = nfprofile.$(OBJEXT) profile.$(OBJEXT) \ $(am__objects_23) nfprofile_OBJECTS = $(am_nfprofile_OBJECTS) -nfprofile_DEPENDENCIES = am_nfreader_OBJECTS = nfreader.$(OBJEXT) nfreader_OBJECTS = $(am_nfreader_OBJECTS) -nfreader_DEPENDENCIES = am__objects_33 = nfnet.$(OBJEXT) am__objects_34 = collector.$(OBJEXT) am__objects_35 = netflow_v1.$(OBJEXT) @@ -258,7 +250,6 @@ am_nfreplay_OBJECTS = nfreplay.$(OBJEXT) $(am__objects_20) \ $(am__objects_33) $(am__objects_34) $(am__objects_35) \ $(am__objects_36) $(am__objects_37) $(am__objects_38) nfreplay_OBJECTS = $(am_nfreplay_OBJECTS) -nfreplay_DEPENDENCIES = am_nftest_OBJECTS = nftest.$(OBJEXT) nftest_OBJECTS = $(am_nftest_OBJECTS) am__dirstamp = $(am__leading_dot)dirstamp @@ -266,7 +257,6 @@ am_nftrack_OBJECTS = ../extra/nftrack/nftrack-nftrack.$(OBJEXT) \ ../extra/nftrack/nftrack-nftrack_rrd.$(OBJEXT) \ ../extra/nftrack/nftrack-nftrack_stat.$(OBJEXT) nftrack_OBJECTS = $(am_nftrack_OBJECTS) -nftrack_DEPENDENCIES = nftrack_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(nftrack_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -286,7 +276,6 @@ am_sfcapd_OBJECTS = sfcapd-sfcapd.$(OBJEXT) sfcapd-sflow.$(OBJEXT) \ $(am__objects_42) $(am__objects_43) $(am__objects_44) \ $(am__objects_45) sfcapd_OBJECTS = $(am_sfcapd_OBJECTS) -sfcapd_DEPENDENCIES = $(am__DEPENDENCIES_1) sfcapd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(sfcapd_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -724,28 +713,34 @@ nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \ $(nflowcache) $(nfprof) nfdump_LDADD = -lnfdump +nfdump_DEPENDENCIES = libnfdump.la nfreplay_SOURCES = nfreplay.c $(nfprof) \ $(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix) nfreplay_LDADD = -lnfdump +nfreplay_DEPENDENCIES = libnfdump.la nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) nfprofile_LDADD = -lnfdump -lrrd +nfprofile_DEPENDENCIES = libnfdump.la nftrack_SOURCES = ../extra/nftrack/nftrack.c \ ../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \ ../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h nftrack_CFLAGS = -I ../extra/nftrack nftrack_LDADD = -lnfdump -lrrd +nftrack_DEPENDENCIES = libnfdump.la nfcapd_SOURCES = nfcapd.c $(nfstatfile) $(launch) $(nfnet) \ $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) \ $(expire) $(am__append_5) nfcapd_LDADD = -lnfdump $(am__append_6) +nfcapd_DEPENDENCIES = libnfdump.la nfpcapd_SOURCES = nfpcapd.c \ $(pcaproc) $(netflow_pcap) \ $(nfstatfile) $(launch) \ $(nfnet) $(collector) $(bookkeeper) $(expire) $(content) nfpcapd_LDADD = -lnfdump $(am__append_8) +nfpcapd_DEPENDENCIES = libnfdump.la @READPCAP_TRUE@nfcapd_CFLAGS = -DPCAP @BUILDNFPCAPD_TRUE@nfpcapd_CFLAGS = -D_BSD_SOURCE @BUILDNFPCAPD_TRUE@nfpcapd_LDFLAGS = -pthread @@ -753,23 +748,29 @@ sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h $(nfstatfile) \ $(launch) $(nfnet) $(collector) $(bookkeeper) $(expire) \ $(am__append_9) sfcapd_LDADD = -lnfdump $(am__append_10) +sfcapd_DEPENDENCIES = libnfdump.la @READPCAP_TRUE@sfcapd_CFLAGS = -DPCAP nfreader_SOURCES = nfreader.c nfreader_LDADD = -lnfdump +nfreader_DEPENDENCIES = libnfdump.la nfanon_SOURCES = nfanon.c $(anon) nfanon_LDADD = -lnfdump +nfanon_DEPENDENCIES = libnfdump.la nfgen_SOURCES = nfgen.c nfgen_LDADD = -lnfdump +nfgen_DEPENDENCIES = libnfdump.la nfexpire_SOURCES = nfexpire.c \ $(bookkeeper) $(expire) $(nfstatfile) nfexpire_LDADD = -lnfdump @FTS_OBJ@ +nfexpire_DEPENDENCIES = libnfdump.la nftest_SOURCES = nftest.c nftest_LDADD = -lnfdump -nftest_DEPENDENCIES = nfgen +nftest_DEPENDENCIES = nfgen libnfdump.la @FT2NFDUMP_TRUE@ft2nfdump_SOURCES = ft2nfdump.c @FT2NFDUMP_TRUE@ft2nfdump_CFLAGS = @FT_INCLUDES@ @FT2NFDUMP_TRUE@ft2nfdump_LDADD = -lnfdump -lft -lz @FT_LDFLAGS@ +@FT2NFDUMP_TRUE@ft2nfdump_DEPENDENCIES = libnfdump.la check_DIST = inline.c collector_inline.c nffile_inline.c \ nfdump_inline.c heapsort_inline.c applybits_inline.c test.sh \ nfdump.test.out parse_csv.pl AddExtension.txt nfdump.test.diff diff --git a/bin/ipfix.c b/bin/ipfix.c index f998b72..a3c10a5 100644 --- a/bin/ipfix.c +++ b/bin/ipfix.c @@ -1625,8 +1625,10 @@ ipfix_header_t *ipfix_header; void *flowset_header; #ifdef DEVEL static uint32_t packet_cntr = 0; -#endif + packet_cntr++; + dbg_printf("Next packet: %u\n", packet_cntr); +#endif size_left = in_buff_cnt; if ( size_left < IPFIX_HEADER_LENGTH ) { LogError("Process_ipfix: Too little data for ipfix packet: '%lli'", (long long)size_left); @@ -1648,8 +1650,8 @@ static uint32_t packet_cntr = 0; flowset_header = (void *)ipfix_header + IPFIX_HEADER_LENGTH; size_left -= IPFIX_HEADER_LENGTH; - dbg_printf("\n[%u] Next packet: %u, exported: %s, TemplateRecords: %llu, DataRecords: %llu, buffer: %li \n", - ObservationDomain, packet_cntr++, UNIX2ISO(ExportTime), (long long unsigned)exporter->TemplateRecords, + dbg_printf("\n[%u] process packet: %u, exported: %s, TemplateRecords: %llu, DataRecords: %llu, buffer: %li \n", + ObservationDomain, packet_cntr, UNIX2ISO(ExportTime), (long long unsigned)exporter->TemplateRecords, (long long unsigned)exporter->DataRecords, size_left); dbg_printf("[%u] Sequence: %u\n", ObservationDomain, Sequence); diff --git a/bin/netflow_v9.c b/bin/netflow_v9.c index fd80124..b1a7be5 100644 --- a/bin/netflow_v9.c +++ b/bin/netflow_v9.c @@ -1529,6 +1529,7 @@ char *string; common_record_t *data_record; if ( table->input_record_size == 0 ) { + dbg_printf("Process_v9: Corrupt data flowset? table input_record_sizei = 0\n"); LogError("Process_v9: Corrupt data flowset? table input_record_sizei = 0 "); size_left = 0; continue; @@ -2031,7 +2032,10 @@ uint32_t flowset_id, flowset_length, exporter_id; ssize_t size_left; static int pkg_num = 0; +printf("Enter Process_v9\n"); pkg_num++; + dbg_printf("Process_v9: Next packet: %i\n", pkg_num); + size_left = in_buff_cnt; if ( size_left < NETFLOW_V9_HEADER_LENGTH ) { LogError( "Process_v9: Too little data for v9 packet: '%lli'", (long long)size_left); @@ -2060,7 +2064,8 @@ static int pkg_num = 0; #ifdef DEVEL uint32_t expected_records = ntohs(v9_header->count); - printf("\n[%u] Next packet: %i %u records, buffer: %li \n", exporter_id, pkg_num, expected_records, size_left); + uint32_t skip = 0; + printf("\n[%u] Process next packet: %i %u records, buffer: %li \n", exporter_id, pkg_num, expected_records, size_left); #endif // sequence check @@ -2161,6 +2166,9 @@ static int pkg_num = 0; // maybe a flowset with option data dbg_printf("Process v9: [%u] No table for id %u -> Skip record\n", exporter->info.id, flowset_id); +#ifdef DEVEL + skip = 1; +#endif } } } @@ -2172,7 +2180,7 @@ static int pkg_num = 0; } // End of while #ifdef DEVEL - if ( processed_records != expected_records ) { + if ( skip == 0 && processed_records != expected_records ) { LogError( "Process_v9: Processed records %u, expected %u", processed_records, expected_records); printf("Process_v9: Processed records %u, expected %u\n", processed_records, expected_records); }