farrokhi/nfdump
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile issues on some platforms

Browse Source
This commit is contained in:
Peter Haag 2017-03-18 02:46:58 +01:00
parent f67d99e2e0
commit f0666be488
9 changed files with 278 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

522
autom4te.cache/requests
View File

@ -34,47 +34,47 @@
'configure.ac'
],
{
'_AM_AUTOCONF_VERSION' => 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_PROG_INSTALL_STRIP' => 1,
'AM_RUN_LOG' => 1,
'_AM_SUBST_NOTMAKE' => 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,
'include' => 1,
'AM_SET_DEPDIR' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'_AM_SET_OPTIONS' => 1,
'm4_include' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_CONFIG_MACRO_DIR' => 1,
'AM_SANITY_CHECK' => 1,
'AM_PROG_INSTALL_SH' => 1,
'AU_DEFUN' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'AM_SET_DEPDIR' => 1,
'_AM_PROG_TAR' => 1,
'include' => 1,
'AM_SILENT_RULES' => 1,
'm4_pattern_forbid' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
'AC_DEFUN' => 1,
'_AM_IF_OPTION' => 1,
'_AM_MANGLE_OPTION' => 1,
'm4_pattern_allow' => 1,
'AM_RUN_LOG' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AM_CONDITIONAL' => 1,
'_m4_warn' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'_AM_SET_OPTION' => 1
'AM_DEP_TRACK' => 1,
'_AM_DEPENDENCIES' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'_AM_SET_OPTION' => 1,
'AC_DEFUN_ONCE' => 1,
'AM_MISSING_PROG' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AM_MAKE_INCLUDE' => 1,
'AM_SET_LEADING_DOT' => 1
}
], 'Autom4te::Request' ),
bless( [
@ -89,64 +89,64 @@
'configure.ac'
],
{
'_AM_COND_ENDIF' => 1,
'AM_MAINTAINER_MODE' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'AC_CONFIG_FILES' => 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_warn' => 1,
'AM_CONDITIONAL' => 1,
'm4_sinclude' => 1,
'AC_FC_SRCEXT' => 1,
'AC_FC_PP_SRCEXT' => 1,
'm4_include' => 1,
'm4_pattern_allow' => 1,
'AM_PROG_MOC' => 1,
'AC_LIBSOURCE' => 1,
'_m4_warn' => 1,
'_LT_AC_TAGCONFIG' => 1,
'AM_INIT_AUTOMAKE' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'm4_pattern_forbid' => 1,
'include' => 1,
'AM_SILENT_RULES' => 1,
'AC_FC_PP_DEFINE' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AM_POT_TOOLS' => 1,
'AC_SUBST' => 1,
'sinclude' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_INIT' => 1,
'_AM_COND_IF' => 1,
'AM_PROG_MKDIR_P' => 1,
'AC_FC_PP_SRCEXT' => 1,
'AM_PROG_F77_C_O' => 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_SUBST_NOTMAKE' => 1,
'sinclude' => 1,
'AM_PROG_CXX_C_O' => 1,
'AM_XGETTEXT_OPTION' => 1,
'AC_FC_FREEFORM' => 1,
'AM_PROG_CC_C_O' => 1,
'm4_include' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'AC_CANONICAL_TARGET' => 1,
'AM_PATH_GUILE' => 1,
'AM_PROG_AR' => 1,
'AH_OUTPUT' => 1,
'AM_GNU_GETTEXT' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
'm4_sinclude' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_ENABLE_MULTILIB' => 1,
'LT_SUPPORTED_TAG' => 1,
'AC_CANONICAL_HOST' => 1,
'AM_NLS' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'_AM_COND_ENDIF' => 1,
'AM_MAINTAINER_MODE' => 1,
'AC_SUBST_TRACE' => 1,
'AC_CONFIG_LINKS' => 1,
'AC_CONFIG_HEADERS' => 1,
'_AM_COND_ELSE' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
'AC_CONFIG_FILES' => 1,
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'LT_INIT' => 1
}
], 'Autom4te::Request' ),
@ -188,185 +188,185 @@
'configure.ac'
],
{
'_LT_PROG_CXX' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 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,
'LT_PATH_LD' => 1,
'LT_LIB_M' => 1,
'_LT_PREPARE_SED_QUOTE_VARS' => 1,
'AM_MAKE_INCLUDE' => 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,
'AC_PROG_LIBTOOL' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'_LT_CC_BASENAME' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1,
'_LT_PROG_ECHO_BACKSLASH' => 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,
'_AM_AUTOCONF_VERSION' => 1,
'LTVERSION_VERSION' => 1,
'AM_DEP_TRACK' => 1,
'_LT_AC_LOCK' => 1,
'_AM_DEPENDENCIES' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AC_LIBTOOL_COMPILER_OPTION' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
'_LT_LINKER_OPTION' => 1,
'_AM_SET_OPTION' => 1,
'AC_DEFUN_ONCE' => 1,
'LT_PROG_GCJ' => 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_DLOPEN_SELF' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AM_INIT_AUTOMAKE' => 1,
'_LT_AC_LANG_CXX_CONFIG' => 1,
'm4_pattern_forbid' => 1,
'LT_SYS_DLSEARCH_PATH' => 1,
'_AM_MANGLE_OPTION' => 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_DISABLE_SHARED' => 1,
'_LT_AC_TRY_DLOPEN_SELF' => 1,
'AM_DISABLE_SHARED' => 1,
'LT_AC_PROG_RC' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
'AC_LIBTOOL_LINKER_OPTION' => 1,
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
'_AM_PROG_TAR' => 1,
'AM_SET_DEPDIR' => 1,
'AC_LIBLTDL_CONVENIENCE' => 1,
'LT_INIT' => 1,
'LT_LIB_M' => 1,
'AC_PROG_NM' => 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_DISABLE_STATIC' => 1,
'LTSUGAR_VERSION' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'LT_CMD_MAX_LEN' => 1,
'LTDL_INSTALLABLE' => 1,
'AC_LTDL_DLSYM_USCORE' => 1,
'AM_SANITY_CHECK' => 1,
'AC_WITH_LTDL' => 1,
'_LT_COMPILER_OPTION' => 1,
'LT_LANG' => 1,
'AC_LIBTOOL_PICMODE' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1,
'AC_LIBTOOL_F77' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_PROG_GO' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'AC_LTDL_SYSSEARCHPATH' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
'_LT_LINKER_OPTION' => 1,
'AC_LIBTOOL_DLOPEN' => 1,
'AC_LTDL_DLLIB' => 1,
'LT_AC_PROG_EGREP' => 1,
'_LT_AC_LANG_C_CONFIG' => 1,
'LT_FUNC_DLSYM_USCORE' => 1,
'LTOPTIONS_VERSION' => 1,
'AM_RUN_LOG' => 1,
'AM_CONDITIONAL' => 1,
'_LT_AC_SHELL_INIT' => 1,
'include' => 1,
'LTDL_INIT' => 1,
'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
'AC_LTDL_ENABLE_INSTALL' => 1,
'LTOBSOLETE_VERSION' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_PROG_EGREP' => 1,
'AM_PROG_INSTALL_SH' => 1,
'_LT_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_SETUP' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
'_LT_PROG_ECHO_BACKSLASH' => 1,
'AM_ENABLE_SHARED' => 1,
'AC_DISABLE_FAST_INSTALL' => 1,
'LT_SYS_MODULE_PATH' => 1,
'AM_DISABLE_STATIC' => 1,
'_LT_WITH_SYSROOT' => 1,
'AC_LIB_LTDL' => 1,
'LT_WITH_LTDL' => 1,
'AM_PROG_LD' => 1,
'LT_SYS_MODULE_EXT' => 1,
'm4_include' => 1,
'_LT_AC_LANG_F77' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
'_LT_AC_LANG_RC_CONFIG' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
'AM_MISSING_PROG' => 1,
'AC_LIBTOOL_GCJ' => 1,
'_LT_AC_LANG_GCJ' => 1,
'_LT_AC_LANG_CXX' => 1,
'AM_PROG_NM' => 1,
'AM_SET_LEADING_DOT' => 1,
'_LT_PROG_F77' => 1,
'_LT_PREPARE_SED_QUOTE_VARS' => 1,
'_LT_PROG_LTMAIN' => 1,
'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
'AC_ENABLE_STATIC' => 1,
'LT_PATH_NM' => 1,
'_LT_DLL_DEF_P' => 1,
'AC_LIBTOOL_OBJDIR' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
'LTDL_CONVENIENCE' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'AC_DEFUN' => 1,
'AC_LIBTOOL_FC' => 1,
'_AM_IF_OPTION' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
'AC_LIBTOOL_RC' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1,
'LT_PATH_LD' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'_LT_REQUIRED_DARWIN_CHECKS' => 1,
'_LTDL_SETUP' => 1,
'AC_CONFIG_MACRO_DIR' => 1,
'AM_ENABLE_STATIC' => 1,
'LT_FUNC_ARGZ' => 1,
'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
'_LT_PROG_CXX' => 1,
'AC_CHECK_LIBM' => 1,
'LTSUGAR_VERSION' => 1,
'_AM_SET_OPTIONS' => 1,
'_LT_CC_BASENAME' => 1,
'LT_SYS_SYMBOL_USCORE' => 1,
'AC_ENABLE_SHARED' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'LTDL_INSTALLABLE' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_MAKE_INCLUDE' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'_LT_LIBOBJ' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
'AC_LIBTOOL_PROG_CC_C_O' => 1,
'AC_PATH_MAGIC' => 1,
'LT_AC_PROG_GCJ' => 1,
'AC_LTDL_DLSYM_USCORE' => 1
'_AM_SUBST_NOTMAKE' => 1,
'LT_SYS_DLOPEN_SELF' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
'm4_pattern_allow' => 1,
'LT_OUTPUT' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'LT_AC_PROG_SED' => 1,
'_LT_AC_TAGCONFIG' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'LT_LIB_DLLOAD' => 1,
'_m4_warn' => 1,
'AM_SILENT_RULES' => 1,
'AC_LTDL_PREOPEN' => 1,
'_LT_PROG_FC' => 1,
'_AM_CONFIG_MACRO_DIRS' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'_LT_AC_SYS_COMPILER' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'_LT_AC_TAGVAR' => 1,
'AC_PATH_TOOL_PREFIX' => 1,
'AU_DEFUN' => 1,
'AM_PROG_LIBTOOL' => 1,
'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'LT_SUPPORTED_TAG' => 1,
'AC_LTDL_SHLIBPATH' => 1,
'AC_LTDL_SHLIBEXT' => 1,
'AC_PROG_LD' => 1,
'AC_LTDL_OBJDIR' => 1,
'_LT_AC_CHECK_DLFCN' => 1,
'AC_ENABLE_FAST_INSTALL' => 1,
'_AC_PROG_LIBTOOL' => 1,
'AC_LIBTOOL_CXX' => 1,
'AM_PROG_CC_C_O' => 1,
'LT_CMD_MAX_LEN' => 1,
'_AM_PROG_CC_C_O' => 1,
'AC_DISABLE_STATIC' => 1,
'AM_SUBST_NOTMAKE' => 1
}
], 'Autom4te::Request' )
);

2
bin/Makefile.am
View File

@ -105,7 +105,7 @@ endif
if BUILDNFPCAPD
bin_PROGRAMS += nfpcapd
nfpcapd_CFLAGS = -D_BSD_SOURCE
nfpcapd_CFLAGS = -D_BSD_SOURCE -D_DEFAULT_SOURCE
nfpcapd_LDADD += -lpcap
nfpcapd_LDFLAGS = -pthread
endif

2
bin/Makefile.in
View File

@ -742,7 +742,7 @@ nfpcapd_SOURCES = nfpcapd.c \
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_CFLAGS = -D_BSD_SOURCE -D_DEFAULT_SOURCE
@BUILDNFPCAPD_TRUE@nfpcapd_LDFLAGS = -pthread
sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h $(nfstatfile) \
$(launch) $(nfnet) $(collector) $(bookkeeper) $(expire) \

1
bin/flowtree.h
View File

@ -42,6 +42,7 @@
#endif
#include <time.h>
#include <signal.h>
#include "rbtree.h"
#include "nffile.h"

5
bin/heapsort_inline.c
View File

@ -50,10 +50,11 @@ int32_t i, maxindex;
* we are only interested in the first top N => skip sorting the rest
* For topN == 0 -> all flows gets sorted
*/
if ( (topN >= (array_size - 1)) || topN == 0 )
if ( (topN >= (array_size - 1)) || topN == 0 ) {
maxindex = 0;
else
} else {
maxindex = array_size - 1 - topN;
}
for(i = array_size-1; i > maxindex; i-- ) {
SortElement_t temp = SortElement[0];

4
bin/ipfix.c
View File

@ -881,14 +881,14 @@ size_t size_required;
static inline void Process_ipfix_templates(exporter_ipfix_domain_t *exporter, void *flowset_header, uint32_t size_left, FlowSource_t *fs) {
ipfix_template_record_t *ipfix_template_record;
void *DataPtr;
uint32_t id, count;
uint32_t count;
size_left -= 4; // subtract message header
DataPtr = flowset_header + 4;
ipfix_template_record = (ipfix_template_record_t *)DataPtr;
id = ntohs(ipfix_template_record->TemplateID);
// uint32_t id = ntohs(ipfix_template_record->TemplateID);
count = ntohs(ipfix_template_record->FieldCount);
if ( count == 0 ) {

8
bin/netflow_v9.c
View File

@ -2025,7 +2025,6 @@ uint8_t *in;
void Process_v9(void *in_buff, ssize_t in_buff_cnt, FlowSource_t *fs) {
exporter_v9_domain_t *exporter;
void *flowset_header;
option_template_flowset_t *option_flowset;
netflow_v9_header_t *v9_header;
int64_t distance;
uint32_t flowset_id, flowset_length, exporter_id;
@ -2143,11 +2142,14 @@ printf("Enter Process_v9\n");
case NF9_TEMPLATE_FLOWSET_ID:
Process_v9_templates(exporter, flowset_header, fs);
break;
case NF9_OPTIONS_FLOWSET_ID:
case NF9_OPTIONS_FLOWSET_ID: {
#ifdef DEVEL
option_template_flowset_t *option_flowset;
option_flowset = (option_template_flowset_t *)flowset_header;
dbg_printf("Process_v9: Found options flowset: template %u", ntohs(option_flowset->template_id));
#endif
Process_v9_option_templates(exporter, flowset_header, fs);
break;
} break;
default: {
input_translation_t *table;
if ( flowset_id < NF9_MIN_RECORD_FLOWSET_ID ) {

9
bin/nfcapd.c
View File

@ -758,7 +758,7 @@ srecord_t *commbuff;
int main(int argc, char **argv) {
char *bindhost, *filter, *datadir, pidstr[32], *launch_process;
char *bindhost, *datadir, pidstr[32], *launch_process;
char *userid, *groupid, *checkptr, *listenport, *mcastgroup, *extension_tags;
char *Ident, *dynsrcdir, *time_extension, pidfile[MAXPATHLEN];
struct stat fstat;
@ -788,7 +788,6 @@ char *pcap_file;
bindhost = NULL;
mcastgroup = NULL;
pidfile[0] = 0;
filter = NULL;
launch_process = NULL;
userid = groupid = NULL;
twin = TIME_WINDOW;
@ -1121,11 +1120,7 @@ char *pcap_file;
usage(argv[0]);
close(sock);
exit(255);
} else {
/* user specified a pcap filter */
filter = argv[optind];
}
}
t_start = time(NULL);
if ( synctime )

2
bin/nfstat.c
View File

@ -404,6 +404,7 @@ static inline uint64_t bps_record(FlowTableRecord_t *record, int inout);
static inline uint64_t bpp_record(FlowTableRecord_t *record, int inout);
static inline uint64_t tstart_record(FlowTableRecord_t *record, int inout);
static inline uint64_t tend_record(FlowTableRecord_t *record, int inout);
// static inline uint64_t clat_record(FlowTableRecord_t *record, int inout);
static inline uint64_t null_element(StatRecord_t *record, int inout);
static inline uint64_t flows_element(StatRecord_t *record, int inout);
@ -441,6 +442,7 @@ struct order_mode_s {
{ "obpp", OUT, DESCENDING, bpp_record, bpp_element},
{ "tstart", 0, ASCENDING, tstart_record, null_element},
{ "tend", 0, ASCENDING, tend_record, null_element},
// { "clat", 0, DESCENDING, clat_record, null_element},
{ NULL, 0, 0, NULL, NULL}
};
#define Default_PrintOrder 1 // order_mode[0].val