From f7a4bc566a6943586aa1426133d86c660fa1f3aa Mon Sep 17 00:00:00 2001 From: Peter Haag Date: Sun, 5 Nov 2017 13:25:17 +0100 Subject: [PATCH] Add 8byte timestamps exported by Nexus 7k family --- ChangeLog | 3 + Makefile.in | 14 +- aclocal.m4 | 44 ++-- autom4te.cache/output.1 | 20 +- autom4te.cache/output.2 | 20 +- autom4te.cache/requests | 522 ++++++++++++++++++++-------------------- autom4te.cache/traces.1 | 4 +- autom4te.cache/traces.2 | 6 +- bin/Makefile.am | 1 + bin/Makefile.in | 5 +- bin/flowtree.c | 2 +- bin/ipfrag.c | 10 +- bin/netflow_v9.c | 60 +++-- bin/pcaproc.c | 6 + configure | 20 +- configure.ac | 2 +- man/Makefile.in | 4 +- 17 files changed, 383 insertions(+), 360 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7622d62..8129340 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2017-10-22 +- Add support for CISCO IOS 8 bytes timestamps ID 21/22 + 2016-11-25 - Add latency extension to nfpcapd - Smaller bug fixes to nfpcapd diff --git a/Makefile.in b/Makefile.in index ac8514f..9919a90 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -159,7 +159,7 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ COPYING ChangeLog INSTALL NEWS README compile config.guess \ - config.sub install-sh ltmain.sh missing ylwrap + config.sub depcomp install-sh ltmain.sh missing ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -563,7 +563,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -589,7 +589,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -607,7 +607,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -617,7 +617,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff --git a/aclocal.m4 b/aclocal.m4 index 1b8890b..ced7b0e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9049,7 +9049,7 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9064,7 +9064,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9080,14 +9080,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9139,7 +9139,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9170,7 +9170,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9361,7 +9361,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9437,7 +9437,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9634,7 +9634,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9655,7 +9655,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9676,7 +9676,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9726,7 +9726,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9765,7 +9765,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9794,7 +9794,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9841,7 +9841,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9860,7 +9860,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9941,7 +9941,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10001,7 +10001,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10029,7 +10029,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10048,7 +10048,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index 064c1ba..eef38b5 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -1,7 +1,7 @@ @%:@! /bin/sh @%:@ From configure.ac Revision: 243 . @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.15. +@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.15-20171105. @%:@ @%:@ Report bugs to . @%:@ @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='nfdump' PACKAGE_TARNAME='nfdump' -PACKAGE_VERSION='1.6.15' -PACKAGE_STRING='nfdump 1.6.15' +PACKAGE_VERSION='1.6.15-20171105' +PACKAGE_STRING='nfdump 1.6.15-20171105' PACKAGE_BUGREPORT='peter@people.ops-trust.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nfdump 1.6.15 to adapt to many kinds of systems. +\`configure' configures nfdump 1.6.15-20171105 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nfdump 1.6.15:";; + short | recursive ) echo "Configuration of nfdump 1.6.15-20171105:";; esac cat <<\_ACEOF @@ -1554,7 +1554,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nfdump configure 1.6.15 +nfdump configure 1.6.15-20171105 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nfdump $as_me 1.6.15, which was +It was created by nfdump $as_me 1.6.15-20171105, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3087,7 +3087,7 @@ fi # Define the identity of the package. PACKAGE='nfdump' - VERSION='1.6.15' + VERSION='1.6.15-20171105' cat >>confdefs.h <<_ACEOF @@ -17242,7 +17242,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nfdump $as_me 1.6.15, which was +This file was extended by nfdump $as_me 1.6.15-20171105, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17308,7 +17308,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nfdump config.status 1.6.15 +nfdump config.status 1.6.15-20171105 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2 index df58a44..b5be911 100644 --- a/autom4te.cache/output.2 +++ b/autom4te.cache/output.2 @@ -1,7 +1,7 @@ @%:@! /bin/sh @%:@ From configure.ac Revision: 243 . @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.15. +@%:@ Generated by GNU Autoconf 2.69 for nfdump 1.6.15-20171105. @%:@ @%:@ Report bugs to . @%:@ @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='nfdump' PACKAGE_TARNAME='nfdump' -PACKAGE_VERSION='1.6.15' -PACKAGE_STRING='nfdump 1.6.15' +PACKAGE_VERSION='1.6.15-20171105' +PACKAGE_STRING='nfdump 1.6.15-20171105' PACKAGE_BUGREPORT='peter@people.ops-trust.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nfdump 1.6.15 to adapt to many kinds of systems. +\`configure' configures nfdump 1.6.15-20171105 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nfdump 1.6.15:";; + short | recursive ) echo "Configuration of nfdump 1.6.15-20171105:";; esac cat <<\_ACEOF @@ -1554,7 +1554,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nfdump configure 1.6.15 +nfdump configure 1.6.15-20171105 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nfdump $as_me 1.6.15, which was +It was created by nfdump $as_me 1.6.15-20171105, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3087,7 +3087,7 @@ fi # Define the identity of the package. PACKAGE='nfdump' - VERSION='1.6.15' + VERSION='1.6.15-20171105' cat >>confdefs.h <<_ACEOF @@ -17246,7 +17246,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nfdump $as_me 1.6.15, which was +This file was extended by nfdump $as_me 1.6.15-20171105, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17312,7 +17312,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nfdump config.status 1.6.15 +nfdump config.status 1.6.15-20171105 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 6c3b788..6f71e53 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -34,47 +34,47 @@ 'configure.ac' ], { - '_AM_PROG_CC_C_O' => 1, - 'AM_SUBST_NOTMAKE' => 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_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_MAKE_INCLUDE' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + '_AM_IF_OPTION' => 1, + 'AM_CONDITIONAL' => 1, + '_AM_PROG_TAR' => 1, + 'AM_PROG_INSTALL_SH' => 1, 'AM_MISSING_PROG' => 1, '_AM_AUTOCONF_VERSION' => 1, + '_AM_MANGLE_OPTION' => 1, + 'AM_SILENT_RULES' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'm4_pattern_allow' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_RUN_LOG' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'm4_include' => 1, + 'AM_MISSING_HAS_RUN' => 1, + 'AU_DEFUN' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + '_AM_DEPENDENCIES' => 1, + 'AC_DEFUN_ONCE' => 1, + '_m4_warn' => 1, + 'AM_SANITY_CHECK' => 1, + '_AM_SET_OPTION' => 1, + 'AM_SET_DEPDIR' => 1, + '_AM_SET_OPTIONS' => 1, + 'include' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + '_AM_PROG_CC_C_O' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AM_AUX_DIR_EXPAND' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_DEFUN' => 1, + 'm4_pattern_forbid' => 1, 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'AM_MAKE_INCLUDE' => 1, - 'AM_SET_LEADING_DOT' => 1 + 'AM_INIT_AUTOMAKE' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AM_AUX_DIR_EXPAND' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -89,65 +89,65 @@ 'configure.ac' ], { - 'AC_FC_SRCEXT' => 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_CANONICAL_BUILD' => 1, + 'AC_FC_FREEFORM' => 1, + 'AC_CANONICAL_SYSTEM' => 1, 'AC_CONFIG_SUBDIRS' => 1, - 'm4_pattern_forbid' => 1, - 'include' => 1, - 'AM_SILENT_RULES' => 1, + 'sinclude' => 1, 'AC_FC_PP_DEFINE' => 1, - 'AC_PROG_LIBTOOL' => 1, + '_AM_COND_ELSE' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_PROG_FC_C_O' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AC_FC_SRCEXT' => 1, + 'm4_sinclude' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AM_SILENT_RULES' => 1, + 'AM_AUTOMAKE_VERSION' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_POT_TOOLS' => 1, - 'AC_SUBST' => 1, - 'AC_INIT' => 1, + 'AM_NLS' => 1, + 'AC_SUBST_TRACE' => 1, '_AM_COND_IF' => 1, + 'm4_pattern_allow' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_PROG_AR' => 1, + 'm4_include' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AC_SUBST' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + '_m4_warn' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'AC_LIBSOURCE' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, 'AM_PROG_MKDIR_P' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_CONFIG_FILES' => 1, + 'include' => 1, + 'AM_PATH_GUILE' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AM_POT_TOOLS' => 1, + 'AC_CANONICAL_HOST' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AH_OUTPUT' => 1, 'AC_FC_PP_SRCEXT' => 1, + 'LT_INIT' => 1, + 'AM_PROG_MOC' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, 'AM_PROG_F77_C_O' => 1, 'AC_CONFIG_AUX_DIR' => 1, - 'AC_CANONICAL_BUILD' => 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 + 'LT_SUPPORTED_TAG' => 1, + 'AC_INIT' => 1, + 'm4_pattern_forbid' => 1, + 'AC_CANONICAL_TARGET' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_CONFIG_HEADERS' => 1, + '_AM_COND_ENDIF' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -188,185 +188,185 @@ 'configure.ac' ], { - 'LT_PROG_RC' => 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, - '_AM_SET_OPTION' => 1, - 'AC_DEFUN_ONCE' => 1, - 'LT_PROG_GCJ' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 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, - '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_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, - '_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, + 'LT_SYS_DLSEARCH_PATH' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + 'm4_include' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + 'AC_PROG_LD_GNU' => 1, + '_AM_MANGLE_OPTION' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + '_AM_IF_OPTION' => 1, + 'AM_DISABLE_STATIC' => 1, + 'LTOBSOLETE_VERSION' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LIBTOOL_FC' => 1, + 'AC_ENABLE_SHARED' => 1, + 'LT_FUNC_ARGZ' => 1, + 'AM_MAKE_INCLUDE' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + '_LT_PROG_F77' => 1, + 'LT_PATH_LD' => 1, + 'LTDL_CONVENIENCE' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + 'AC_PROG_LD' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + 'LTSUGAR_VERSION' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + '_m4_warn' => 1, + '_AM_SET_OPTION' => 1, + 'LT_LANG' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, + 'AC_DISABLE_SHARED' => 1, + 'AC_ENABLE_STATIC' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'LT_PROG_GO' => 1, + '_LT_LINKER_OPTION' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, + 'LT_PROG_RC' => 1, + 'LT_AC_PROG_SED' => 1, + 'AC_PROG_NM' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + 'AC_LTDL_SHLIBEXT' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LTDL_PREOPEN' => 1, + '_AM_AUTOCONF_VERSION' => 1, + '_LT_COMPILER_OPTION' => 1, + 'AM_PROG_NM' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, + 'LT_AC_PROG_EGREP' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AM_INIT_AUTOMAKE' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'm4_pattern_forbid' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_LTDL_SYSSEARCHPATH' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'LTVERSION_VERSION' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, '_AM_PROG_CC_C_O' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + '_LT_PROG_CXX' => 1, + 'AC_LIBTOOL_SETUP' => 1, + 'AM_DISABLE_SHARED' => 1, + '_LT_AC_SYS_COMPILER' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_LTDL_SHLIBPATH' => 1, + '_LT_AC_TAGVAR' => 1, + '_LT_AC_LANG_CXX' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_LIBTOOL_F77' => 1, + 'LT_PROG_GCJ' => 1, + 'AU_DEFUN' => 1, + 'AM_MISSING_HAS_RUN' => 1, + 'AC_LIBLTDL_CONVENIENCE' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'LT_SYS_MODULE_EXT' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'm4_pattern_allow' => 1, 'AC_DISABLE_STATIC' => 1, - 'AM_SUBST_NOTMAKE' => 1 + '_LTDL_SETUP' => 1, + 'AC_LIB_LTDL' => 1, + 'AM_ENABLE_SHARED' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'AM_MISSING_PROG' => 1, + 'LTDL_INSTALLABLE' => 1, + 'AM_ENABLE_STATIC' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'AM_PROG_INSTALL_SH' => 1, + '_AM_PROG_TAR' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'AC_PATH_MAGIC' => 1, + 'AC_LIBTOOL_RC' => 1, + 'AC_WITH_LTDL' => 1, + 'LTOPTIONS_VERSION' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'include' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_LTDL_DLLIB' => 1, + 'AM_SET_DEPDIR' => 1, + 'LT_LIB_M' => 1, + '_LT_LIBOBJ' => 1, + 'LT_WITH_LTDL' => 1, + '_LT_AC_LANG_F77' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + 'AM_PROG_LIBTOOL' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'AC_CHECK_LIBM' => 1, + '_LT_PROG_FC' => 1, + 'LT_AC_PROG_RC' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'AM_PROG_CC_C_O' => 1, + '_LT_PROG_LTMAIN' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + 'AM_SILENT_RULES' => 1, + 'AC_LTDL_DLSYM_USCORE' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AM_CONDITIONAL' => 1, + '_LT_AC_LANG_C_CONFIG' => 1, + '_LT_CC_BASENAME' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AM_PROG_LD' => 1, + 'AM_DEP_TRACK' => 1, + 'LT_SYS_SYMBOL_USCORE' => 1, + 'LTDL_INIT' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_LT_DLL_DEF_P' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + 'AC_DEFUN' => 1, + '_LT_AC_LOCK' => 1, + 'LT_SYS_MODULE_PATH' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'LT_PATH_NM' => 1, + 'LT_INIT' => 1, + 'LT_AC_PROG_GCJ' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'LT_LIB_DLLOAD' => 1, + '_LT_AC_SHELL_INIT' => 1, + '_AM_SET_OPTIONS' => 1, + '_LT_AC_LANG_GCJ' => 1, + 'AC_PROG_EGREP' => 1, + '_LT_WITH_SYSROOT' => 1, + 'LT_OUTPUT' => 1, + '_AM_DEPENDENCIES' => 1, + 'AM_SANITY_CHECK' => 1 } ], 'Autom4te::Request' ) ); diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index 3613fe6..97cd119 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -1,4 +1,4 @@ -m4trace:configure.ac:6: -1- AC_INIT([nfdump], [1.6.15], [peter@people.ops-trust.net]) +m4trace:configure.ac:6: -1- AC_INIT([nfdump], [1.6.15-20171105], [peter@people.ops-trust.net]) m4trace:configure.ac:6: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:6: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:6: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) @@ -149,7 +149,7 @@ m4trace:configure.ac:6: -1- m4_pattern_allow([^target_alias$]) m4trace:configure.ac:9: -1- AC_CONFIG_HEADERS([config.h]) m4trace:configure.ac:10: -1- AM_INIT_AUTOMAKE([subdir-objects]) m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) -m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.15]) +m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.15.1]) m4trace:configure.ac:10: -1- AC_REQUIRE_AUX_FILE([install-sh]) m4trace:configure.ac:10: -1- AC_SUBST([INSTALL_PROGRAM]) m4trace:configure.ac:10: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) diff --git a/autom4te.cache/traces.2 b/autom4te.cache/traces.2 index f83c390..19b3d45 100644 --- a/autom4te.cache/traces.2 +++ b/autom4te.cache/traces.2 @@ -1687,10 +1687,10 @@ m4trace:/opt/local/share/aclocal/lt~obsolete.m4:99: -1- AC_DEFUN([_LT_PROG_CXX]) m4trace:/opt/local/share/aclocal-1.15/amversion.m4:20: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) -m4trace:/opt/local/share/aclocal-1.15/amversion.m4:37: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.15])dnl +m4trace:/opt/local/share/aclocal-1.15/amversion.m4:37: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -2490,7 +2490,7 @@ m4trace:configure.ac:6: -1- m4_pattern_allow([^target_alias$]) m4trace:configure.ac:10: -1- AM_INIT_AUTOMAKE([subdir-objects]) m4trace:configure.ac:10: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) m4trace:configure.ac:10: -1- AM_SET_CURRENT_AUTOMAKE_VERSION -m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.15]) +m4trace:configure.ac:10: -1- AM_AUTOMAKE_VERSION([1.15.1]) m4trace:configure.ac:10: -1- _AM_AUTOCONF_VERSION([2.69]) m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) m4trace:configure.ac:10: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) diff --git a/bin/Makefile.am b/bin/Makefile.am index c15da9b..14cdc27 100755 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -46,6 +46,7 @@ anon = panonymizer.c panonymizer.h rijndael.c rijndael.h collector = collector.c collector.h nfv1 = netflow_v1.c netflow_v1.h nfv9 = netflow_v9.c netflow_v9.h +# pcaproc = pcaproc.c pcaproc.h flowtree.c flowtree.h ipfrag.c ipfrag.h malloc_hook.c pcaproc = pcaproc.c pcaproc.h flowtree.c flowtree.h ipfrag.c ipfrag.h content = content_dns.c content_dns.h netflow_pcap = netflow_pcap.c netflow_pcap.h diff --git a/bin/Makefile.in b/bin/Makefile.in index e3fa656..039a5ec 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -695,6 +695,7 @@ anon = panonymizer.c panonymizer.h rijndael.c rijndael.h collector = collector.c collector.h nfv1 = netflow_v1.c netflow_v1.h nfv9 = netflow_v9.c netflow_v9.h +# pcaproc = pcaproc.c pcaproc.h flowtree.c flowtree.h ipfrag.c ipfrag.h malloc_hook.c pcaproc = pcaproc.c pcaproc.h flowtree.c flowtree.h ipfrag.c ipfrag.h content = content_dns.c content_dns.h netflow_pcap = netflow_pcap.c netflow_pcap.h diff --git a/bin/flowtree.c b/bin/flowtree.c index f44363c..fc8b5fe 100644 --- a/bin/flowtree.c +++ b/bin/flowtree.c @@ -147,7 +147,7 @@ struct FlowNode *node; return node; -} // End of New_node +} // End of New_Node // return node into free list void Free_Node(struct FlowNode *node) { diff --git a/bin/ipfrag.c b/bin/ipfrag.c index 4ba35e5..7be4a15 100644 --- a/bin/ipfrag.c +++ b/bin/ipfrag.c @@ -67,7 +67,7 @@ #define KEYLEN (offsetof(IPFragNode_t,data_size) - offsetof(IPFragNode_t, src_addr)) static int IPFragNodeCMP(struct IPFragNode *e1, struct IPFragNode *e2); -static struct IPFragNode *New_node(void); +static struct IPFragNode *New_frag_node(void); static void Free_node(struct IPFragNode *node, int free_data); @@ -89,7 +89,7 @@ int i; } // End of IPFragNodeCMP -static struct IPFragNode *New_node(void) { +static struct IPFragNode *New_frag_node(void) { struct IPFragNode *node; node = malloc(sizeof(struct IPFragNode)); @@ -122,7 +122,7 @@ struct IPFragNode *node; return node; -} // End of New_node +} // End of New_frag_node static void Free_node(struct IPFragNode *node, int free_data) { hole_t *hole, *h; @@ -133,7 +133,7 @@ hole_t *hole, *h; free(hole); hole = h; } - if ( free_data) + if (free_data) free(node->data); free(node); @@ -185,7 +185,7 @@ int found_hole; FindNode.ident = ident; n = RB_FIND(IPFragTree, IPFragTree, &FindNode); if ( !n ) { - n = New_node(); + n = New_frag_node(); n->src_addr = src; n->dst_addr = dst; n->ident = ident; diff --git a/bin/netflow_v9.c b/bin/netflow_v9.c index 936d350..9407cfc 100644 --- a/bin/netflow_v9.c +++ b/bin/netflow_v9.c @@ -103,25 +103,26 @@ typedef struct sequence_map_s { #define move48 5 #define move56 6 #define move64 7 -#define move96 8 -#define move128 9 -#define move32_sampling 10 -#define move64_sampling 11 -#define move_mac 12 -#define move_mpls 13 -#define move_ulatency 14 -#define move_slatency 15 -#define move_user_20 16 -#define move_user_65 17 -#define TimeMsec 18 -#define PushTimeMsec 19 -#define saveICMP 20 -#define zero8 21 -#define zero16 22 -#define zero32 23 -#define zero64 24 -#define zero96 25 -#define zero128 26 +#define move64_32 8 +#define move96 9 +#define move128 10 +#define move32_sampling 11 +#define move64_sampling 12 +#define move_mac 13 +#define move_mpls 14 +#define move_ulatency 15 +#define move_slatency 16 +#define move_user_20 17 +#define move_user_65 18 +#define TimeMsec 19 +#define PushTimeMsec 20 +#define saveICMP 21 +#define zero8 22 +#define zero16 23 +#define zero32 24 +#define zero64 25 +#define zero96 26 +#define zero128 27 uint32_t id; // sequence ID as defined above uint16_t input_offset; // copy/process data at this input offset @@ -205,7 +206,7 @@ static struct v9_element_map_s { char *name; // name string uint16_t length; // type of this element ( input length ) uint16_t out_length; // type of this element ( output length ) - uint32_t sequence; // output length + uint32_t sequence; // sequencer ID uint32_t zero_sequence; // uint16_t extension; // maps into nfdump extension ID } v9_element_map[] = { @@ -237,8 +238,10 @@ static struct v9_element_map_s { { NF9_DST_AS, "dst AS", _2bytes, _2bytes, move16, zero16, EX_AS_2 }, { NF9_DST_AS, "dst AS", _4bytes, _4bytes, move32, zero32, EX_AS_4 }, { NF9_BGP_V4_NEXT_HOP, "V4 BGP next hop", _4bytes, _4bytes, move32, zero32, EX_NEXT_HOP_BGP_v4 }, - { NF9_LAST_SWITCHED, "time sec end", _4bytes, _4bytes, move32, zero32, COMMON_BLOCK }, { NF9_FIRST_SWITCHED, "time sec create", _4bytes, _4bytes, move32, zero32, COMMON_BLOCK }, + { NF9_FIRST_SWITCHED, "time sec create", _8bytes, _4bytes, move64_32, zero32, COMMON_BLOCK }, + { NF9_LAST_SWITCHED, "time sec end", _4bytes, _4bytes, move32, zero32, COMMON_BLOCK }, + { NF9_LAST_SWITCHED, "time sec end", _8bytes, _4bytes, move64_32, zero32, COMMON_BLOCK }, { NF_F_FLOW_CREATE_TIME_MSEC, "time msec start",_8bytes, _8bytes, TimeMsec, nop, COMMON_BLOCK }, { NF_F_FLOW_END_TIME_MSEC, "time msec end", _8bytes, _8bytes, TimeMsec, nop, COMMON_BLOCK }, { NF9_OUT_BYTES, "out bytes", _4bytes, _8bytes, move32_sampling, zero64, EX_OUT_BYTES_8 }, @@ -464,7 +467,7 @@ int i; } cache.max_v9_elements = i; - dbg_printf("Init v9: Max number of v9 tags: %u", cache.max_v9_elements); + dbg_printf("Init v9: Max number of v9 tags: %u\n", cache.max_v9_elements); return 1; @@ -546,7 +549,12 @@ int index; } index++; } - } +#ifdef DEVEL + printf("=> known type: %u(%s), at index: %i, length: %u not supported\n", + Type, v9_element_map[index].name, index, Length); + +#endif + } dbg_printf("Skip unknown element type: %u, Length: %u\n", Type, Length); @@ -1628,6 +1636,11 @@ char *string; *((uint32_t *)&out[output_offset]) = t.val.val32[0]; *((uint32_t *)&out[output_offset+4]) = t.val.val32[1]; } break; + case move64_32: + { type_mask_t t; + t.val.val64 = Get_val64((void *)&in[input_offset]); + *((uint32_t *)&out[output_offset]) = t.val.val32[1]; + } break; case move96: { *((uint32_t *)&out[output_offset]) = Get_val32((void *)&in[input_offset]); *((uint32_t *)&out[output_offset+4]) = Get_val32((void *)&in[input_offset+4]); @@ -2031,7 +2044,6 @@ 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); diff --git a/bin/pcaproc.c b/bin/pcaproc.c index e8cce16..53c6a03 100644 --- a/bin/pcaproc.c +++ b/bin/pcaproc.c @@ -790,6 +790,12 @@ pkt->vlans[pkt->vlan_count].pcp = (p[0] >> 5) & 7; break; } + if ( defragmented ) { + LogError("Defragmented buffer not freed for proto %u", proto); + free(defragmented); + defragmented = NULL; + } + } // End of ProcessPacket diff --git a/configure b/configure index 41cb248..1f90e2d 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision: 243 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for nfdump 1.6.15. +# Generated by GNU Autoconf 2.69 for nfdump 1.6.15-20171105. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='nfdump' PACKAGE_TARNAME='nfdump' -PACKAGE_VERSION='1.6.15' -PACKAGE_STRING='nfdump 1.6.15' +PACKAGE_VERSION='1.6.15-20171105' +PACKAGE_STRING='nfdump 1.6.15-20171105' PACKAGE_BUGREPORT='peter@people.ops-trust.net' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nfdump 1.6.15 to adapt to many kinds of systems. +\`configure' configures nfdump 1.6.15-20171105 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nfdump 1.6.15:";; + short | recursive ) echo "Configuration of nfdump 1.6.15-20171105:";; esac cat <<\_ACEOF @@ -1554,7 +1554,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nfdump configure 1.6.15 +nfdump configure 1.6.15-20171105 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nfdump $as_me 1.6.15, which was +It was created by nfdump $as_me 1.6.15-20171105, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3087,7 +3087,7 @@ fi # Define the identity of the package. PACKAGE='nfdump' - VERSION='1.6.15' + VERSION='1.6.15-20171105' cat >>confdefs.h <<_ACEOF @@ -17242,7 +17242,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nfdump $as_me 1.6.15, which was +This file was extended by nfdump $as_me 1.6.15-20171105, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17308,7 +17308,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nfdump config.status 1.6.15 +nfdump config.status 1.6.15-20171105 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index aacfa18..9365c86 100755 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_REVISION($Revision: 243 $)dnl -AC_INIT(nfdump, 1.6.15, peter@people.ops-trust.net) +AC_INIT(nfdump, 1.6.15-20171105, peter@people.ops-trust.net) # $Date: 2014-11-16 14:10:20 +0100 (Sun, 16 Nov 2014) $ #AC_CONFIG_SRCDIR([grammar.y]) AC_CONFIG_HEADER([config.h]) diff --git a/man/Makefile.in b/man/Makefile.in index 8e7808e..ece0cb5 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it,