sflow: fix timestamp overflow. Build: cleanup check files.

This commit is contained in:
Peter Haag 2016-01-10 11:24:24 +01:00
parent cc8315eab5
commit 3b72bdac13
4 changed files with 291 additions and 279 deletions

View File

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

View File

@ -1,6 +1,6 @@
bin_PROGRAMS = nfcapd nfdump nfreplay nfexpire nfanon
EXTRA_PROGRAMS = nftest nfgen nfreader
check_PROGRAMS = nftest nfgen nfreader
check_PROGRAMMS = test.sh
TESTS = nftest test.sh
@ -137,6 +137,6 @@ ft2nfdump_LDADD = -lnfdump -lft -lz
ft2nfdump_LDADD += @FT_LDFLAGS@
endif
EXTRA_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c
EXTRA_DIST += test.sh nfdump.test.out parse_csv.pl AddExtension.txt nfdump.test.diff
CLEANFILES = lex.yy.c grammar.c grammar.h scanner.c scanner.h
check_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c
check_DIST += test.sh nfdump.test.out parse_csv.pl AddExtension.txt nfdump.test.diff
CLEANFILES = lex.yy.c grammar.c grammar.h scanner.c scanner.h $(check_PROGRAMS)

View File

@ -93,7 +93,7 @@ bin_PROGRAMS = nfcapd$(EXEEXT) nfdump$(EXEEXT) nfreplay$(EXEEXT) \
nfexpire$(EXEEXT) nfanon$(EXEEXT) $(am__EXEEXT_1) \
$(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
$(am__EXEEXT_5)
EXTRA_PROGRAMS = nftest$(EXEEXT) nfgen$(EXEEXT) nfreader$(EXEEXT)
check_PROGRAMS = nftest$(EXEEXT) nfgen$(EXEEXT) nfreader$(EXEEXT)
TESTS = nftest$(EXEEXT) test.sh
@SFLOW_TRUE@am__append_1 = sfcapd
@NFPROFILE_TRUE@am__append_2 = nfprofile
@ -768,10 +768,10 @@ nftest_DEPENDENCIES = nfgen
@FT2NFDUMP_TRUE@ft2nfdump_SOURCES = ft2nfdump.c
@FT2NFDUMP_TRUE@ft2nfdump_CFLAGS = @FT_INCLUDES@
@FT2NFDUMP_TRUE@ft2nfdump_LDADD = -lnfdump -lft -lz @FT_LDFLAGS@
EXTRA_DIST = inline.c collector_inline.c nffile_inline.c \
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
CLEANFILES = lex.yy.c grammar.c grammar.h scanner.c scanner.h
CLEANFILES = lex.yy.c grammar.c grammar.h scanner.c scanner.h $(check_PROGRAMS)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@ -897,6 +897,15 @@ clean-binPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
ft2nfdump$(EXEEXT): $(ft2nfdump_OBJECTS) $(ft2nfdump_DEPENDENCIES) $(EXTRA_ft2nfdump_DEPENDENCIES)
@rm -f ft2nfdump$(EXEEXT)
$(AM_V_CCLD)$(ft2nfdump_LINK) $(ft2nfdump_OBJECTS) $(ft2nfdump_LDADD) $(LIBS)
@ -1782,7 +1791,7 @@ check-TESTS:
log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all
recheck: all $(check_PROGRAMS)
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
@ -1853,6 +1862,7 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
@ -1906,8 +1916,8 @@ maintainer-clean-generic:
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
clean-libtool mostlyclean-am
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
clean-libLTLIBRARIES clean-libtool mostlyclean-am
distclean: distclean-am
-rm -rf ../extra/nftrack/$(DEPDIR) ./$(DEPDIR)
@ -1978,20 +1988,21 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
.MAKE: all check check-am install install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
clean-libtool cscopelist-am ctags ctags-am distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-libLTLIBRARIES install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-libLTLIBRARIES
clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-libLTLIBRARIES \
install-man install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-libLTLIBRARIES
.PRECIOUS: Makefile

View File

@ -1,4 +1,5 @@
/*
* Copyright (c) 2016, Peter Haag
* Copyright (c) 2014, Peter Haag
* Copyright (c) 2009, Peter Haag
* Copyright (c) 2004-2008, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
@ -1101,7 +1102,7 @@ uint64_t _bytes, _packets, _t; // tmp buffers
common_record->last = common_record->first;
common_record->msec_first = now.tv_usec / 1000;
common_record->msec_last = common_record->msec_first;
_t = 1000*now.tv_sec + common_record->msec_first; // tmp buff for first_seen
_t = 1000LL * now.tv_sec + common_record->msec_first; // tmp buff for first_seen
common_record->fwd_status = 0;
common_record->reserved = 0;