|
[-]
[+]
|
Changed |
daq.spec
|
|
|
|
|
Deleted |
daq-0.4.tar.gz
^
|
|
|
Deleted |
daq-0.5.tar.gz
^
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/Makefile.in
^
|
| @@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -120,6 +120,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DNET_LDFLAGS = @DNET_LDFLAGS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -163,6 +164,7 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STATIC_LIBS = @STATIC_LIBS@
STRIP = @STRIP@
VERSION = @VERSION@
V_LEX = @V_LEX@
@@ -299,7 +301,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -324,7 +326,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -488,7 +490,8 @@
fi; \
done
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -532,17 +535,17 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/README
^
|
| @@ -124,7 +124,7 @@
[--daq-var queue=<qid>]
<dev> ::= ip | eth0, etc; default is IP injection
- <proto> ::= ip4 | ip6 | ip*; default is ip4
+ <proto> ::= ip4 | ip6 |; default is ip4
<qid> ::= 0..65535; default is 0
This module can not run unprivileged so ./snort -u -g will produce a warning
@@ -261,11 +261,14 @@
and then install the module you want:
- modprobe -r ip_queue
+ modprobe ip_queue
or:
- modprobe -r nfnetlink_queue
+ modprobe nfnetlink_queue
+
+These DAQs should be run with a snaplen of 65535 since the kernel defrags the
+packets before queuing. Also, no need to configure frag3.
Notes on FreeBSD::IPFW
@@ -277,7 +280,7 @@
Here is a brief example to divert icmp packets to Snort at port 8000:
-To enable support for divert sockets, place the following lines in the
+To enable support for divert sockets, place the following lines in the
kernel configuration file:
options IPFIREWALL
@@ -293,8 +296,8 @@
$ kldload -v ipdivert
Loaded ipdivert, id=4
-$ ipfw add 75 divert 8000 icmp from any to any
-00075 divert 8000 icmp from any to any
+$ ipfw add 75 divert 8000 icmp from any to any
+00075 divert 8000 icmp from any to any
$ ipfw list
...
@@ -309,12 +312,12 @@
https://forums.snort.org/forums/support/topics/snort-inline-on-freebsd-ipfw
http://freebsd.rogness.net/snort_inline/
-NAT gateway can be used with divert sockets if the network environment is
+NAT gateway can be used with divert sockets if the network environment is
conducive to using NAT.
The steps to set up NAT with ipfw are as follows:
-1. Set up NAT with two interface em0 and em1 by adding
+1. Set up NAT with two interface em0 and em1 by adding
the following to /etc/rc.conf
gateway_enable="YES"
@@ -331,7 +334,7 @@
Here em0 is connected to external network and em1 to host-only LAN.
-2. Add the following divert rules to divert packets to Snort above and
+2. Add the following divert rules to divert packets to Snort above and
below the NAT rule in the "Simple" section of /etc/rc.firewall.
...
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/aclocal.m4
^
|
| @@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -34,7 +34,7 @@
[am__api_version='1.11'
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.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,7 +50,7 @@
# 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.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/api/Makefile.in
^
|
| @@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -120,6 +120,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DNET_LDFLAGS = @DNET_LDFLAGS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -163,6 +164,7 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STATIC_LIBS = @STATIC_LIBS@
STRIP = @STRIP@
VERSION = @VERSION@
V_LEX = @V_LEX@
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/api/daq_common.h
^
|
| @@ -21,51 +21,51 @@
#ifndef _DAQ_COMMON_H
#define _DAQ_COMMON_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <stdint.h>
#include <unistd.h>
#ifndef WIN32
#include <sys/time.h>
+#else
+/* for struct timeavl */
+#include <winsock2.h>
+#include <windows.h>
#endif
-#ifndef SO_PUBLIC
+#ifndef DAQ_SO_PUBLIC
#if defined _WIN32 || defined __CYGWIN__
# if defined DAQ_DLL
# ifdef __GNUC__
-# define SO_PUBLIC __attribute__((dllexport))
+# define DAQ_SO_PUBLIC __attribute__((dllexport))
# else
-# define SO_PUBLIC __declspec(dllexport)
+# define DAQ_SO_PUBLIC __declspec(dllexport)
# endif
# else
# ifdef __GNUC__
-# define SO_PUBLIC __attribute__((dllimport))
+# define DAQ_SO_PUBLIC __attribute__((dllimport))
# else
-# define SO_PUBLIC __declspec(dllimport)
+# define DAQ_SO_PUBLIC __declspec(dllimport)
# endif
# endif
# define DLL_LOCAL
#else
# ifdef HAVE_VISIBILITY
-# define SO_PUBLIC __attribute__ ((visibility("default")))
-# define SO_PRIVATE __attribute__ ((visibility("hidden")))
+# define DAQ_SO_PUBLIC __attribute__ ((visibility("default")))
+# define DAQ_SO_PRIVATE __attribute__ ((visibility("hidden")))
# else
-# define SO_PUBLIC
-# define SO_PRIVATE
+# define DAQ_SO_PUBLIC
+# define DAQ_SO_PRIVATE
# endif
#endif
#endif
#ifdef _WIN32
# ifdef DAQ_DLL
-# define DAQ_LINKAGE SO_PUBLIC
+# define DAQ_LINKAGE DAQ_SO_PUBLIC
# else
# define DAQ_LINKAGE
# endif
#else
-# define DAQ_LINKAGE SO_PUBLIC
+# define DAQ_LINKAGE DAQ_SO_PUBLIC
#endif
#define DAQ_SUCCESS 0 /* Success! */
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/config.guess
^
|
| @@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-27'
+timestamp='2009-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,8 +56,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -170,7 +171,7 @@
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -333,6 +334,9 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
@@ -656,7 +660,7 @@
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
+ grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
@@ -807,12 +811,12 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
+ *:Interix*:*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -822,6 +826,9 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +858,20 @@
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +894,17 @@
frv:Linux:*:*)
echo frv-unknown-linux-gnu
exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -882,78 +914,34 @@
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef mips64
- #undef mips64el
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
+ CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +950,11 @@
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +977,6 @@
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
- s/.*supported targets: *//
- s/ .*//
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
- }
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1005,7 @@
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1182,7 +1113,7 @@
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1206,16 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/config.h.in
^
|
| @@ -6,6 +6,9 @@
/* Define to 1 if you have the <dnet.h> header file. */
#undef HAVE_DNET_H
+/* Define to 1 if you have the <dumbnet.h> header file. */
+#undef HAVE_DUMBNET_H
+
/* Define to 1 if you have the `gethostbyname' function. */
#undef HAVE_GETHOSTBYNAME
@@ -15,6 +18,12 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `dnet' library (-ldnet). */
+#undef HAVE_LIBDNET
+
+/* Define to 1 if you have the `dumbnet' library (-ldumbnet). */
+#undef HAVE_LIBDUMBNET
+
/* Define to 1 if you have the <libipq.h> header file. */
#undef HAVE_LIBIPQ_H
@@ -22,6 +31,9 @@
header file. */
#undef HAVE_LIBNETFILTER_QUEUE_LIBNETFILTER_QUEUE_H
+/* Define to 1 if you have the `pcap' library (-lpcap). */
+#undef HAVE_LIBPCAP
+
/* Define to 1 if you have the <linux/if_ether.h> header file. */
#undef HAVE_LINUX_IF_ETHER_H
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/config.sub
^
|
| @@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-17'
+timestamp='2010-01-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -72,8 +75,9 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,10 +153,13 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
+ -bluegene*)
+ os=-cnk
+ ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -281,6 +288,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -288,13 +296,14 @@
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
+ | ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
@@ -337,7 +346,7 @@
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -365,15 +374,17 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
- | romp-* | rs6000-* \
+ | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile-* | tilegx-* \
| tron-* \
+ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +478,10 @@
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -719,6 +734,9 @@
basic_machine=ns32k-utek
os=-sysv
;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -1069,6 +1087,11 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ # This must be matched before tile*.
+ tilegx*)
+ basic_machine=tilegx-unknown
+ os=-linux-gnu
+ ;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
@@ -1240,6 +1263,9 @@
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1260,9 +1286,9 @@
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1309,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1416,6 +1442,8 @@
-dicos*)
os=-dicos
;;
+ -nacl*)
+ ;;
-none)
;;
*)
@@ -1613,7 +1641,7 @@
-sunos*)
vendor=sun
;;
- -aix*)
+ -cnk*|-aix*)
vendor=ibm
;;
-beos*)
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/configure
^
|
| @@ -1,13 +1,15 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for daq 0.2.
+# Generated by GNU Autoconf 2.67 for daq 0.6.1.
#
# Report bugs to <snort-team@sourcefire.com>.
#
+#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
# Foundation, Inc.
#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## -------------------- ##
@@ -317,7 +319,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -357,19 +359,19 @@
fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -676,10 +678,11 @@
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -698,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='daq'
PACKAGE_TARNAME='daq'
-PACKAGE_VERSION='0.2'
-PACKAGE_STRING='daq 0.2'
+PACKAGE_VERSION='0.6.1'
+PACKAGE_STRING='daq 0.6.1'
PACKAGE_BUGREPORT='snort-team@sourcefire.com'
PACKAGE_URL=''
@@ -740,14 +743,17 @@
# include <unistd.h>
#endif"
+ac_header_list=
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBDL
XCCFLAGS
LIBOBJS
+STATIC_LIBS
BUILD_MODULES_FALSE
BUILD_MODULES_TRUE
+DNET_LDFLAGS
BUILD_PCAP_MODULE_FALSE
BUILD_PCAP_MODULE_TRUE
BUILD_NFQ_MODULE_FALSE
@@ -963,8 +969,9 @@
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1009,7 +1016,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1035,7 +1042,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1239,7 +1246,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1255,7 +1262,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1285,8 +1292,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
@@ -1294,7 +1301,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1312,13 +1319,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error "missing argument to $ac_option"
+ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1341,7 +1348,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1355,8 +1362,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1371,9 +1378,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error "working directory cannot be determined"
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error "pwd does not report name of working directory"
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1412,11 +1419,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1442,7 +1449,7 @@
# 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 daq 0.2 to adapt to many kinds of systems.
+\`configure' configures daq 0.6.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1456,7 +1463,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1512,7 +1519,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of daq 0.2:";;
+ short | recursive ) echo "Configuration of daq 0.6.1:";;
esac
cat <<\_ACEOF
@@ -1559,7 +1566,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
@@ -1629,10 +1636,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-daq configure 0.2
-generated by GNU Autoconf 2.64
+daq configure 0.6.1
+generated by GNU Autoconf 2.67
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1677,7 +1684,7 @@
ac_retval=1
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1723,7 +1730,7 @@
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -1736,7 +1743,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1779,7 +1786,7 @@
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
+ test $ac_status = 0; } > conftest.i && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -1791,7 +1798,7 @@
ac_retval=1
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1833,7 +1840,7 @@
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -1845,7 +1852,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1912,10 +1919,10 @@
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -1951,7 +1958,7 @@
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
@@ -1974,17 +1981,15 @@
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ---------------------------------------- ##
+( $as_echo "## ---------------------------------------- ##
## Report this to snort-team@sourcefire.com ##
-## ---------------------------------------- ##
-_ASBOX
+## ---------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2006,7 +2011,7 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@ -2060,10 +2065,12 @@
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
$as_echo_n "checking for uint$2_t... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
+ # Order is important - never check a type that is potentially smaller
+ # than half of the expected target width.
for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
'unsigned long long int' 'unsigned short int' 'unsigned char'; do
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2072,7 +2079,7 @@
int
main ()
{
-static int test_array [1 - 2 * !(($ac_type) -1 >> ($2 - 1) == 1)];
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
test_array [0] = 0
;
@@ -2088,8 +2095,7 @@
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- eval as_val=\$$3
- if test "x$as_val" = x""no; then :
+ if eval test \"x\$"$3"\" = x"no"; then :
else
break
@@ -2106,8 +2112,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by daq $as_me 0.2, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+It was created by daq $as_me 0.6.1, which was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2217,11 +2223,9 @@
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2255,11 +2259,9 @@
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@ -2272,11 +2274,9 @@
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
@@ -2290,11 +2290,9 @@
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
@@ -2349,7 +2347,12 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2360,18 +2363,22 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -2385,6 +2392,9 @@
>$cache_file
fi
+as_fn_append ac_header_list " stdlib.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/param.h"
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -2440,7 +2450,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2457,16 +2467,22 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- for ac_t in install-sh install.sh shtool; do
- if test -f "$ac_dir/$ac_t"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
- break 2
- fi
- done
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2582,11 +2598,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2608,7 +2624,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2618,7 +2634,7 @@
# Ok.
:
else
- as_fn_error "newly created file is older than distributed files!
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2790,6 +2806,7 @@
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -2797,7 +2814,6 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -2856,7 +2872,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2864,7 +2880,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2898,7 +2914,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -2914,7 +2930,7 @@
# Define the identity of the package.
PACKAGE=daq
- VERSION=0.2
+ VERSION=0.6.1
cat >>confdefs.h <<_ACEOF
@@ -3260,8 +3276,8 @@
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3282,32 +3298,30 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
+
int
main ()
{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -3369,62 +3383,28 @@
else
ac_file=''
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
if { { ac_try="$ac_link"
@@ -3454,16 +3434,75 @@
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then :
@@ -3506,8 +3545,8 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -3924,8 +3963,8 @@
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
@@ -3943,7 +3982,7 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -3954,16 +3993,16 @@
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -3988,7 +4027,7 @@
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -3996,7 +4035,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -4069,7 +4108,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -4145,7 +4184,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4211,7 +4250,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4278,7 +4317,7 @@
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -4394,7 +4433,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -4596,13 +4635,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4599: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4638: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4602: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4641: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4605: output\"" >&5)
+ (eval echo "\"\$as_me:4644: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5068,7 +5107,7 @@
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5808,7 +5847,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5811 "configure"' > conftest.$ac_ext
+ echo '#line 5850 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6597,7 +6636,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -6613,11 +6652,11 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -6656,7 +6695,7 @@
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -6672,18 +6711,18 @@
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
@@ -6812,8 +6851,7 @@
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7338,11 +7376,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7341: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7379: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7345: \$? = $ac_status" >&5
+ echo "$as_me:7383: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7507,7 +7545,7 @@
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -7677,11 +7715,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7680: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7718: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7684: \$? = $ac_status" >&5
+ echo "$as_me:7722: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7782,11 +7820,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7785: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7823: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7789: \$? = $ac_status" >&5
+ echo "$as_me:7827: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7837,11 +7875,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7840: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7878: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7844: \$? = $ac_status" >&5
+ echo "$as_me:7882: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7980,6 +8018,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -8071,7 +8110,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -9533,7 +9572,7 @@
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -10220,7 +10259,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10223 "configure"
+#line 10262 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10316,7 +10355,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10319 "configure"
+#line 10358 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10640,7 +10679,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__Wall=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__Wall=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -10655,22 +10694,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__Wall" >&5
$as_echo "$ax_cv_cflags_gcc_option__Wall" >&6; }
-case ".$ax_cv_cflags_gcc_option__Wall" in
+var=$ax_cv_cflags_gcc_option__Wall
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__Wall " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__Wall"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__Wall) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__Wall\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wall") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wall"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -10703,7 +10743,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__Wwrite_strings=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__Wwrite_strings=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -10718,22 +10758,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__Wwrite_strings" >&5
$as_echo "$ax_cv_cflags_gcc_option__Wwrite_strings" >&6; }
-case ".$ax_cv_cflags_gcc_option__Wwrite_strings" in
+var=$ax_cv_cflags_gcc_option__Wwrite_strings
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__Wwrite_strings " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__Wwrite_strings"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__Wwrite_strings) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__Wwrite_strings\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wwrite_strings") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wwrite_strings"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -10766,7 +10807,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__Wsign_compare=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__Wsign_compare=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -10781,22 +10822,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__Wsign_compare" >&5
$as_echo "$ax_cv_cflags_gcc_option__Wsign_compare" >&6; }
-case ".$ax_cv_cflags_gcc_option__Wsign_compare" in
+var=$ax_cv_cflags_gcc_option__Wsign_compare
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__Wsign_compare " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__Wsign_compare"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__Wsign_compare) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__Wsign_compare\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wsign_compare") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wsign_compare"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -10829,7 +10871,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__Wcast_align=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__Wcast_align=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -10844,22 +10886,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__Wcast_align" >&5
$as_echo "$ax_cv_cflags_gcc_option__Wcast_align" >&6; }
-case ".$ax_cv_cflags_gcc_option__Wcast_align" in
+var=$ax_cv_cflags_gcc_option__Wcast_align
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__Wcast_align " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__Wcast_align"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__Wcast_align) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__Wcast_align\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wcast_align") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wcast_align"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -10892,7 +10935,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__Wextra=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__Wextra=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -10907,22 +10950,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__Wextra" >&5
$as_echo "$ax_cv_cflags_gcc_option__Wextra" >&6; }
-case ".$ax_cv_cflags_gcc_option__Wextra" in
+var=$ax_cv_cflags_gcc_option__Wextra
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__Wextra " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__Wextra"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__Wextra) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__Wextra\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wextra") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wextra"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -10955,7 +10999,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__Wformat=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__Wformat=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -10970,22 +11014,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__Wformat" >&5
$as_echo "$ax_cv_cflags_gcc_option__Wformat" >&6; }
-case ".$ax_cv_cflags_gcc_option__Wformat" in
+var=$ax_cv_cflags_gcc_option__Wformat
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__Wformat " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__Wformat"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__Wformat) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__Wformat\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wformat") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wformat"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -11018,7 +11063,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__Wformat_security=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__Wformat_security=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -11033,22 +11078,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__Wformat_security" >&5
$as_echo "$ax_cv_cflags_gcc_option__Wformat_security" >&6; }
-case ".$ax_cv_cflags_gcc_option__Wformat_security" in
+var=$ax_cv_cflags_gcc_option__Wformat_security
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__Wformat_security " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__Wformat_security"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__Wformat_security) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__Wformat_security\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wformat_security") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wformat_security"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -11081,7 +11127,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__Wno_unused_parameter=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__Wno_unused_parameter=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -11096,22 +11142,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__Wno_unused_parameter" >&5
$as_echo "$ax_cv_cflags_gcc_option__Wno_unused_parameter" >&6; }
-case ".$ax_cv_cflags_gcc_option__Wno_unused_parameter" in
+var=$ax_cv_cflags_gcc_option__Wno_unused_parameter
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__Wno_unused_parameter " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__Wno_unused_parameter"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__Wno_unused_parameter) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__Wno_unused_parameter\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wno_unused_parameter") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__Wno_unused_parameter"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -11144,7 +11191,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__fno_strict_aliasing=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__fno_strict_aliasing=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -11159,22 +11206,23 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__fno_strict_aliasing" >&5
$as_echo "$ax_cv_cflags_gcc_option__fno_strict_aliasing" >&6; }
-case ".$ax_cv_cflags_gcc_option__fno_strict_aliasing" in
+var=$ax_cv_cflags_gcc_option__fno_strict_aliasing
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__fno_strict_aliasing " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__fno_strict_aliasing"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__fno_strict_aliasing) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__fno_strict_aliasing\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__fno_strict_aliasing") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__fno_strict_aliasing"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -11207,7 +11255,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__fdiagnostics_show_option=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ ax_cv_cflags_gcc_option__fdiagnostics_show_option=`echo $ac_arg | sed -e 's,.*% *,,'`; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -11222,32 +11270,34 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__fdiagnostics_show_option" >&5
$as_echo "$ax_cv_cflags_gcc_option__fdiagnostics_show_option" >&6; }
-case ".$ax_cv_cflags_gcc_option__fdiagnostics_show_option" in
+var=$ax_cv_cflags_gcc_option__fdiagnostics_show_option
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__fdiagnostics_show_option " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__fdiagnostics_show_option"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__fdiagnostics_show_option) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__fdiagnostics_show_option\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__fdiagnostics_show_option") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__fdiagnostics_show_option"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -pedantic -std=c99 -D_GNU_SOURCE" >&5
+ as_VAR=`$as_echo "ax_cv_cflags_gcc_option_-pedantic -std=c99 -D_GNU_SOURCE" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for gcc -pedantic -std=c99 -D_GNU_SOURCE" >&5
$as_echo_n "checking CFLAGS for gcc -pedantic -std=c99 -D_GNU_SOURCE... " >&6; }
-if test "${ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE+set}" = set; then :
+if eval "test \"\${$as_VAR+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
- ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE="no, unknown"
+ eval "$as_VAR=\"no, unknown\""
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -11270,7 +11320,7 @@
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ eval "$as_VAR=\`echo \$ac_arg | sed -e 's,.*% *,,'\`"; break
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
@@ -11283,24 +11333,26 @@
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE" >&5
-$as_echo "$ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE" >&6; }
-case ".$ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE" in
+eval ac_res=\$$as_VAR
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval var=\$$as_VAR
+case ".$var" in
.ok|.ok,*) ;;
.|.no|.no,*) ;;
*)
- if echo " $CFLAGS " | grep " $ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE " 2>&1 >/dev/null
- then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE"; } >&5
- (: CFLAGS does contain $ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE) 2>&5
+ if echo " $CFLAGS " | grep " $var " 2>&1 >/dev/null
+ then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS does contain \$var"; } >&5
+ (: CFLAGS does contain $var) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE\""; } >&5
- (: CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE") 2>&5
+ else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$var\""; } >&5
+ (: CFLAGS="$CFLAGS $var") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- CFLAGS="$CFLAGS $ax_cv_cflags_gcc_option__pedantic__std_c99__D_GNU_SOURCE"
+ CFLAGS="$CFLAGS $var"
fi
;;
esac
@@ -11329,8 +11381,8 @@
if test "$enable_ipv6" != "ifavailable"; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "--enable-ipv6 was given, but getaddrinfo isn't available
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "--enable-ipv6 was given, but getaddrinfo isn't available
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
fi
@@ -11497,13 +11549,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sf_cv_capable_lex" >&5
$as_echo "$sf_cv_capable_lex" >&6; }
if test $sf_cv_capable_lex = insufficient ; then
- as_fn_error "Your operating system's lex is insufficient to compile
- libsfbpf. flex is a lex replacement that has many advantages,
+ as_fn_error $? "Your operating system's lex is insufficient to compile
+ libsfbpf. You should install both bison and flex.
+ flex is a lex replacement that has many advantages,
including being able to compile libsfbpf. For more
information, see http://www.gnu.org/software/flex/flex.html ." "$LINENO" 5
fi
fi
+save_LIBS=${LIBS}
+
# Checks for libraries.
# Check whether --with-libpcap_includes was given.
@@ -11551,10 +11606,14 @@
if test "x$with_dnet_includes" != "xno"; then
CPPFLAGS="${CPPFLAGS} -I${with_dnet_includes}"
+else
+ CPPFLAGS="${CPPFLAGS} `dnet-config --cflags 2>/dev/null`"
fi
if test "x$with_dnet_libraries" != "xno"; then
- LDFLAGS="${LDFLAGS} -L${with_dnet_libraries}"
+ DNET_LDFLAGS="-L${with_dnet_libraries}"
+else
+ DNET_LDFLAGS="`dnet-config --libs 2>/dev/null`"
fi
DEFAULT_ENABLE=yes
@@ -11587,8 +11646,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -11599,6 +11657,9 @@
done
+ if test "$enable_afpacket_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lsfbpf"
+ fi
fi
if test "$enable_afpacket_module" = yes; then
BUILD_AFPACKET_MODULE_TRUE=
@@ -11626,6 +11687,56 @@
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_lib_version in -lpcap" >&5
+$as_echo_n "checking for pcap_lib_version in -lpcap... " >&6; }
+if test "${ac_cv_lib_pcap_pcap_lib_version+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcap $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcap_lib_version ();
+int
+main ()
+{
+return pcap_lib_version ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_pcap_pcap_lib_version=yes
+else
+ ac_cv_lib_pcap_pcap_lib_version=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_lib_version" >&5
+$as_echo "$ac_cv_lib_pcap_pcap_lib_version" >&6; }
+if test "x$ac_cv_lib_pcap_pcap_lib_version" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPCAP 1
+_ACEOF
+
+ LIBS="-lpcap $LIBS"
+
+else
+ enable_dump_module="no"
+fi
+
+ if test "$enable_dump_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lpcap"
+ fi
fi
if test "$enable_dump_module" = yes; then
BUILD_DUMP_MODULE_TRUE=
@@ -11644,6 +11755,9 @@
enable_ipfw_module="$DEFAULT_ENABLE"
fi
+if test "$enable_ipfw_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lsfbpf"
+fi
if test "$enable_ipfw_module" = yes; then
BUILD_IPFW_MODULE_TRUE=
BUILD_IPFW_MODULE_FALSE='#'
@@ -11662,12 +11776,11 @@
fi
if test "$enable_ipq_module" = yes; then
- for ac_header in dnet.h netinet/in.h libipq.h
+ for ac_header in netinet/in.h libipq.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -11689,6 +11802,9 @@
fi
+ if test "$enable_ipq_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lipq ${DNET_LDFLAGS} -lsfbpf"
+ fi
fi
if test "$enable_ipq_module" = yes; then
BUILD_IPQ_MODULE_TRUE=
@@ -11708,12 +11824,11 @@
fi
if test "$enable_nfq_module" = yes; then
- for ac_header in dnet.h netinet/in.h libnetfilter_queue/libnetfilter_queue.h
+ for ac_header in netinet/in.h libnetfilter_queue/libnetfilter_queue.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -11735,6 +11850,9 @@
fi
+ if test "$enable_nfq_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lnfnetlink -lnetfilter_queue ${DNET_LDFLAGS} -lsfbpf"
+ fi
fi
if test "$enable_nfq_module" = yes; then
BUILD_NFQ_MODULE_TRUE=
@@ -11820,8 +11938,8 @@
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5 ; }
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -11863,6 +11981,9 @@
$as_echo "yes" >&6; }
fi
+ if test "$enable_pcap_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lpcap"
+ fi
fi
if test "$enable_pcap_module" = yes; then
BUILD_PCAP_MODULE_TRUE=
@@ -11873,11 +11994,166 @@
fi
+if test "$enable_ipq_module" = yes -o "$enable_nfq_module" = yes ; then
+ save_LDFLAGS=${LDFLAGS}
+ LDFLAGS="${LDFLAGS} ${DNET_LDFLAGS}"
+
+ for ac_header in dnet.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "dnet.h" "ac_cv_header_dnet_h" "$ac_includes_default"
+if test "x$ac_cv_header_dnet_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DNET_H 1
+_ACEOF
+
+else
+ DNET_H="no"
+fi
+
+done
+
+ for ac_header in dumbnet.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "dumbnet.h" "ac_cv_header_dumbnet_h" "$ac_includes_default"
+if test "x$ac_cv_header_dumbnet_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DUMBNET_H 1
+_ACEOF
+
+else
+ DUMBNET_H="no"
+fi
+
+done
+
+
+ if test "x$DNET_H" = "xno" -a "x$DUMBNET_H" = "xno"; then
+ echo
+ echo " ERROR! dnet header not found, go get it from"
+ echo " http://code.google.com/p/libdnet/ or use the --with-dnet-*"
+ echo " options, if you have it installed in an unusual place"
+ exit
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eth_set in -ldnet" >&5
+$as_echo_n "checking for eth_set in -ldnet... " >&6; }
+if test "${ac_cv_lib_dnet_eth_set+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char eth_set ();
+int
+main ()
+{
+return eth_set ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_eth_set=yes
+else
+ ac_cv_lib_dnet_eth_set=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_eth_set" >&5
+$as_echo "$ac_cv_lib_dnet_eth_set" >&6; }
+if test "x$ac_cv_lib_dnet_eth_set" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDNET 1
+_ACEOF
+
+ LIBS="-ldnet $LIBS"
+
+else
+ DNET="no"
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for eth_set in -ldumbnet" >&5
+$as_echo_n "checking for eth_set in -ldumbnet... " >&6; }
+if test "${ac_cv_lib_dumbnet_eth_set+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldumbnet $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char eth_set ();
+int
+main ()
+{
+return eth_set ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dumbnet_eth_set=yes
+else
+ ac_cv_lib_dumbnet_eth_set=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dumbnet_eth_set" >&5
+$as_echo "$ac_cv_lib_dumbnet_eth_set" >&6; }
+if test "x$ac_cv_lib_dumbnet_eth_set" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDUMBNET 1
+_ACEOF
+
+ LIBS="-ldumbnet $LIBS"
+
+else
+ DUMBNET="no"
+fi
+
+
+ if test "x$DNET" = "xno" -a "x$DUMBNET" = "xno"; then
+ echo
+ echo " ERROR! dnet library not found, go get it from"
+ echo " http://code.google.com/p/libdnet/ or use the --with-dnet-*"
+ echo " options, if you have it installed in an unusual place"
+ exit
+ fi
+
+ if test "x$DNET" = "xno"; then
+ DNET_LDFLAGS="${DNET_LDFLAGS} -ldumbnet"
+ else
+ DNET_LDFLAGS="${DNET_LDFLAGS} -ldnet"
+ fi
+ LDFLAGS=${save_LDFLAGS}
+fi
+
+
+
if test "$enable_afpacket_module" = yes -o \
"$enable_dump_module" = yes -o \
"$enable_ipfw_module" = yes -o \
"$enable_ipq_module" = yes -o \
- "$enable_nfq_module" = yes; then
+ "$enable_nfq_module" = yes -o \
+ "$enable_pcap_module" = yes; then
BUILD_MODULES_TRUE=
BUILD_MODULES_FALSE='#'
else
@@ -11886,6 +12162,10 @@
fi
+LIBS=${save_LIBS}
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
@@ -11932,8 +12212,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -12120,12 +12399,15 @@
fi
-for ac_header in stdlib.h unistd.h
+
+
+
+ for ac_header in $ac_header_list
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -12134,6 +12416,13 @@
done
+
+
+
+
+
+
+
for ac_func in getpagesize
do :
ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
@@ -12190,11 +12479,6 @@
/* This mess was copied from the GNU getpagesize.h. */
#ifndef HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h. */
-# ifndef HAVE_SYS_PARAM_H
-# define HAVE_SYS_PARAM_H 1
-# endif
-
# ifdef _SC_PAGESIZE
# define getpagesize() sysconf(_SC_PAGESIZE)
# else /* no _SC_PAGESIZE */
@@ -12229,8 +12513,9 @@
main ()
{
char *data, *data2, *data3;
+ const char *cdata2;
int i, pagesize;
- int fd;
+ int fd, fd2;
pagesize = getpagesize ();
@@ -12243,27 +12528,41 @@
umask (0);
fd = creat ("conftest.mmap", 0600);
if (fd < 0)
- return 1;
+ return 2;
if (write (fd, data, pagesize) != pagesize)
- return 1;
+ return 3;
close (fd);
+ /* Next, check that the tail of a page is zero-filled. File must have
+ non-zero length, otherwise we risk SIGBUS for entire page. */
+ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+ if (fd2 < 0)
+ return 4;
+ cdata2 = "";
+ if (write (fd2, cdata2, 1) != 1)
+ return 5;
+ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+ if (data2 == MAP_FAILED)
+ return 6;
+ for (i = 0; i < pagesize; ++i)
+ if (*(data2 + i))
+ return 7;
+ close (fd2);
+ if (munmap (data2, pagesize))
+ return 8;
+
/* Next, try to mmap the file at a fixed address which already has
something else allocated at it. If we can, also make sure that
we see the same garbage. */
fd = open ("conftest.mmap", O_RDWR);
if (fd < 0)
- return 1;
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
- return 1;
- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+ return 9;
if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_FIXED, fd, 0L))
- return 1;
+ return 10;
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data2 + i))
- return 1;
+ return 11;
/* Finally, make sure that changes to the mapped area do not
percolate back to the file as seen by read(). (This is a bug on
@@ -12272,12 +12571,12 @@
*(data2 + i) = *(data2 + i) + 1;
data3 = (char *) malloc (pagesize);
if (!data3)
- return 1;
+ return 12;
if (read (fd, data3, pagesize) != pagesize)
- return 1;
+ return 13;
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data3 + i))
- return 1;
+ return 14;
close (fd);
return 0;
}
@@ -12299,14 +12598,13 @@
$as_echo "#define HAVE_MMAP 1" >>confdefs.h
fi
-rm -f conftest.mmap
+rm -f conftest.mmap conftest.txt
for ac_func in gethostbyname getpagesize memset munmap socket strchr strcspn strdup strerror strrchr strstr strtoul
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12321,7 +12619,7 @@
-ac_config_files="$ac_config_files Makefile api/Makefile os-daq-modules/Makefile sfbpf/Makefile"
+ac_config_files="$ac_config_files Makefile api/Makefile os-daq-modules/Makefile os-daq-modules/daq-modules-config sfbpf/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -12406,6 +12704,7 @@
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -12429,39 +12728,39 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error "conditional \"AMDEP\" was never defined.
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_AFPACKET_MODULE_TRUE}" && test -z "${BUILD_AFPACKET_MODULE_FALSE}"; then
- as_fn_error "conditional \"BUILD_AFPACKET_MODULE\" was never defined.
+ as_fn_error $? "conditional \"BUILD_AFPACKET_MODULE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_DUMP_MODULE_TRUE}" && test -z "${BUILD_DUMP_MODULE_FALSE}"; then
- as_fn_error "conditional \"BUILD_DUMP_MODULE\" was never defined.
+ as_fn_error $? "conditional \"BUILD_DUMP_MODULE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_IPFW_MODULE_TRUE}" && test -z "${BUILD_IPFW_MODULE_FALSE}"; then
- as_fn_error "conditional \"BUILD_IPFW_MODULE\" was never defined.
+ as_fn_error $? "conditional \"BUILD_IPFW_MODULE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_IPQ_MODULE_TRUE}" && test -z "${BUILD_IPQ_MODULE_FALSE}"; then
- as_fn_error "conditional \"BUILD_IPQ_MODULE\" was never defined.
+ as_fn_error $? "conditional \"BUILD_IPQ_MODULE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_NFQ_MODULE_TRUE}" && test -z "${BUILD_NFQ_MODULE_FALSE}"; then
- as_fn_error "conditional \"BUILD_NFQ_MODULE\" was never defined.
+ as_fn_error $? "conditional \"BUILD_NFQ_MODULE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_PCAP_MODULE_TRUE}" && test -z "${BUILD_PCAP_MODULE_FALSE}"; then
- as_fn_error "conditional \"BUILD_PCAP_MODULE\" was never defined.
+ as_fn_error $? "conditional \"BUILD_PCAP_MODULE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_MODULES_TRUE}" && test -z "${BUILD_MODULES_FALSE}"; then
- as_fn_error "conditional \"BUILD_MODULES\" was never defined.
+ as_fn_error $? "conditional \"BUILD_MODULES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -12611,19 +12910,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -12819,7 +13118,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -12872,8 +13171,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by daq $as_me 0.2, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+This file was extended by daq $as_me 0.6.1, which was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -12913,6 +13212,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -12935,12 +13235,13 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-daq config.status 0.2
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+daq config.status 0.6.1
+configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -12958,11 +13259,16 @@
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -12976,12 +13282,15 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -12994,7 +13303,7 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error "ambiguous option: \`$1'
+ as_fn_error $? "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -13003,7 +13312,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error "unrecognized option: \`$1'
+ -*) as_fn_error $? "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -13318,9 +13627,10 @@
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"api/Makefile") CONFIG_FILES="$CONFIG_FILES api/Makefile" ;;
"os-daq-modules/Makefile") CONFIG_FILES="$CONFIG_FILES os-daq-modules/Makefile" ;;
+ "os-daq-modules/daq-modules-config") CONFIG_FILES="$CONFIG_FILES os-daq-modules/daq-modules-config" ;;
"sfbpf/Makefile") CONFIG_FILES="$CONFIG_FILES sfbpf/Makefile" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -13358,7 +13668,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -13375,7 +13685,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\r'
+ ac_cs_awk_cr='\\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -13389,18 +13699,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -13422,7 +13732,7 @@
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -13436,7 +13746,7 @@
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -13489,20 +13799,28 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -13530,7 +13848,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -13615,7 +13933,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -13628,7 +13946,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -13656,7 +13974,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -13683,7 +14001,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -13820,22 +14138,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
+which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
+which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -13846,19 +14164,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error "could not create -" "$LINENO" 5
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -14643,7 +14961,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -14664,7 +14982,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit $?
+ $ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/configure.ac
^
|
| @@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.62)
-AC_INIT([daq], [0.2], [snort-team@sourcefire.com])
-AM_INIT_AUTOMAKE([daq], [0.2])
+AC_INIT([daq], [0.6.1], [snort-team@sourcefire.com])
+AM_INIT_AUTOMAKE([daq], [0.6.1])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([sfbpf/gencode.h])
AC_CONFIG_HEADERS([config.h])
@@ -48,12 +48,15 @@
if test $sf_cv_capable_lex = insufficient ; then
AC_MSG_ERROR(
[Your operating system's lex is insufficient to compile
- libsfbpf. flex is a lex replacement that has many advantages,
+ libsfbpf. You should install both bison and flex.
+ flex is a lex replacement that has many advantages,
including being able to compile libsfbpf. For more
information, see http://www.gnu.org/software/flex/flex.html .])
fi
fi
+save_LIBS=${LIBS}
+
# Checks for libraries.
AC_ARG_WITH(libpcap_includes,
[ --with-libpcap-includes=DIR libpcap include directory],
@@ -81,10 +84,14 @@
if test "x$with_dnet_includes" != "xno"; then
CPPFLAGS="${CPPFLAGS} -I${with_dnet_includes}"
+else
+ CPPFLAGS="${CPPFLAGS} `dnet-config --cflags 2>/dev/null`"
fi
if test "x$with_dnet_libraries" != "xno"; then
- LDFLAGS="${LDFLAGS} -L${with_dnet_libraries}"
+ DNET_LDFLAGS="-L${with_dnet_libraries}"
+else
+ DNET_LDFLAGS="`dnet-config --libs 2>/dev/null`"
fi
DEFAULT_ENABLE=yes
@@ -106,6 +113,9 @@
[enable_afpacket_module="$enableval"], [enable_afpacket_module="$DEFAULT_ENABLE"])
if test "$enable_afpacket_module" = yes; then
AC_CHECK_HEADERS([linux/if_ether.h linux/if_packet.h], [], [enable_afpacket_module=no])
+ if test "$enable_afpacket_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lsfbpf"
+ fi
fi
AM_CONDITIONAL([BUILD_AFPACKET_MODULE], [test "$enable_afpacket_module" = yes])
@@ -115,6 +125,10 @@
[enable_dump_module="$enableval"], [enable_dump_module="$DEFAULT_ENABLE"])
if test "$enable_dump_module" = yes; then
AC_CHECK_HEADER([pcap.h], [], [enable_dump_module=no])
+ AC_CHECK_LIB([pcap],[pcap_lib_version],,[enable_dump_module="no"],[])
+ if test "$enable_dump_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lpcap"
+ fi
fi
AM_CONDITIONAL([BUILD_DUMP_MODULE], [test "$enable_dump_module" = yes])
@@ -122,6 +136,9 @@
AC_ARG_ENABLE(ipfw-module,
AC_HELP_STRING([--disable-ipfw-module],[don't build the bundled IPFW module]),
[enable_ipfw_module="$enableval"], [enable_ipfw_module="$DEFAULT_ENABLE"])
+if test "$enable_ipfw_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lsfbpf"
+fi
AM_CONDITIONAL([BUILD_IPFW_MODULE], [test "$enable_ipfw_module" = yes])
# IPQ Module
@@ -129,11 +146,14 @@
AC_HELP_STRING([--disable-ipq-module],[don't build the bundled IPQ module]),
[enable_ipq_module="$enableval"], [enable_ipq_module="$DEFAULT_ENABLE"])
if test "$enable_ipq_module" = yes; then
- AC_CHECK_HEADERS([dnet.h netinet/in.h libipq.h], [], [enable_ipq_module=no])
+ AC_CHECK_HEADERS([netinet/in.h libipq.h], [], [enable_ipq_module=no])
AC_CHECK_HEADER([linux/netfilter.h], [], [enable_ipq_module=no],
[
#include <netinet/in.h>
])
+ if test "$enable_ipq_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lipq ${DNET_LDFLAGS} -lsfbpf"
+ fi
fi
AM_CONDITIONAL([BUILD_IPQ_MODULE], [test "$enable_ipq_module" = yes])
@@ -142,11 +162,14 @@
AC_HELP_STRING([--disable-nfq-module],[don't build the bundled NFQ module]),
[enable_nfq_module="$enableval"], [enable_nfq_module="$DEFAULT_ENABLE"])
if test "$enable_nfq_module" = yes; then
- AC_CHECK_HEADERS([dnet.h netinet/in.h libnetfilter_queue/libnetfilter_queue.h], [], [enable_nfq_module=no])
+ AC_CHECK_HEADERS([netinet/in.h libnetfilter_queue/libnetfilter_queue.h], [], [enable_nfq_module=no])
AC_CHECK_HEADER([linux/netfilter.h], [], [enable_nfq_module=no],
[
#include <netinet/in.h>
])
+ if test "$enable_nfq_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lnfnetlink -lnetfilter_queue ${DNET_LDFLAGS} -lsfbpf"
+ fi
fi
AM_CONDITIONAL([BUILD_NFQ_MODULE], [test "$enable_nfq_module" = yes])
@@ -157,14 +180,58 @@
if test "$enable_pcap_module" = yes; then
AC_CHECK_HEADER([pcap.h], [], [enable_pcap_module=no])
AC_CHECK_PCAP_VER("1.0.0")
+ if test "$enable_pcap_module" = yes; then
+ STATIC_LIBS="${STATIC_LIBS} -lpcap"
+ fi
fi
AM_CONDITIONAL([BUILD_PCAP_MODULE], [test "$enable_pcap_module" = yes])
+if test "$enable_ipq_module" = yes -o "$enable_nfq_module" = yes ; then
+ save_LDFLAGS=${LDFLAGS}
+ LDFLAGS="${LDFLAGS} ${DNET_LDFLAGS}"
+
+ AC_CHECK_HEADERS(dnet.h,,DNET_H="no")
+ AC_CHECK_HEADERS(dumbnet.h,,DUMBNET_H="no")
+
+ if test "x$DNET_H" = "xno" -a "x$DUMBNET_H" = "xno"; then
+ echo
+ echo " ERROR! dnet header not found, go get it from"
+ echo " http://code.google.com/p/libdnet/ or use the --with-dnet-*"
+ echo " options, if you have it installed in an unusual place"
+ exit
+ fi
+
+ AC_CHECK_LIB(dnet, eth_set,,[DNET="no"])
+ AC_CHECK_LIB(dumbnet, eth_set,,[DUMBNET="no"])
+
+ if test "x$DNET" = "xno" -a "x$DUMBNET" = "xno"; then
+ echo
+ echo " ERROR! dnet library not found, go get it from"
+ echo " http://code.google.com/p/libdnet/ or use the --with-dnet-*"
+ echo " options, if you have it installed in an unusual place"
+ exit
+ fi
+
+ if test "x$DNET" = "xno"; then
+ DNET_LDFLAGS="${DNET_LDFLAGS} -ldumbnet"
+ else
+ DNET_LDFLAGS="${DNET_LDFLAGS} -ldnet"
+ fi
+ LDFLAGS=${save_LDFLAGS}
+fi
+
+AC_SUBST(DNET_LDFLAGS)
+
AM_CONDITIONAL([BUILD_MODULES], [test "$enable_afpacket_module" = yes -o \
"$enable_dump_module" = yes -o \
"$enable_ipfw_module" = yes -o \
"$enable_ipq_module" = yes -o \
- "$enable_nfq_module" = yes])
+ "$enable_nfq_module" = yes -o \
+ "$enable_pcap_module" = yes])
+
+LIBS=${save_LIBS}
+
+AC_SUBST(STATIC_LIBS)
AC_CHECK_LIB([dl], [dlopen], [LIBDL="-ldl"])
@@ -193,6 +260,7 @@
AC_CONFIG_FILES([Makefile
api/Makefile
os-daq-modules/Makefile
+ os-daq-modules/daq-modules-config
sfbpf/Makefile])
AC_OUTPUT
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/daq.dsp
^
|
| @@ -35,15 +35,15 @@
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
+# PROP Use_MFC 2
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "api" /I "sfbpf" /I "../src/win32/WIN32-Includes" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DAQ_DLL" /D "HAVE_CONFIG_H" /D "BUILD_PCAP_MODULE" /D "STATIC_MODULE_LIST" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "api" /I "sfbpf" /I "../src/win32/WIN32-Includes" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DAQ_DLL" /D "HAVE_CONFIG_H" /D "BUILD_PCAP_MODULE" /D "STATIC_MODULE_LIST" /D "_AFXDLL" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -58,15 +58,15 @@
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
+# PROP Use_MFC 2
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "api" /I "sfbpf" /I "../src/win32/WIN32-Includes" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DAQ_DLL" /D "HAVE_CONFIG_H" /D "BUILD_PCAP_MODULE" /D "STATIC_MODULE_LIST" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "api" /I "sfbpf" /I "../src/win32/WIN32-Includes" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "DAQ_DLL" /D "HAVE_CONFIG_H" /D "BUILD_PCAP_MODULE" /D "STATIC_MODULE_LIST" /D "_AFXDLL" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/ltmain.sh
^
|
| @@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/m4/ax_cflags_gcc_option.m4
^
|
| @@ -1,5 +1,5 @@
# ===========================================================================
-# http://www.nongnu.org/autoconf-archive/ax_cflags_gcc_option.html
+# http://www.gnu.org/software/autoconf-archive/ax_cflags_gcc_option.html
# ===========================================================================
#
# SYNOPSIS
@@ -8,11 +8,11 @@
#
# DESCRIPTION
#
-# AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
-# "checking CFLAGS for gcc -fvomit-frame ... yes" and adds the optionflag
-# to CFLAGS if it is understood. You can override the shellvar-default of
-# CFLAGS of course. The order of arguments stems from the explicit macros
-# like AX_CFLAGS_WARN_ALL.
+# AX_CFLAGS_GCC_OPTION(-fomit-frame-pointer) would show a message like
+# "checking CFLAGS for gcc -fomit-frame-pointer ... yes" and add the
+# optionflag to CFLAGS if it is understood. You can override the
+# shellvar-default of CFLAGS of course. The order of arguments stems from
+# the explicit macros like AX_CFLAGS_WARN_ALL.
#
# The cousin AX_CXXFLAGS_GCC_OPTION would check for an option to add to
# CXXFLAGS - and it uses the autoconf setup for C++ instead of C (since it
@@ -48,7 +48,7 @@
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
+# Free Software Foundation; either version 3 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -72,13 +72,13 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 7
+#serial 13
AC_DEFUN([AX_CFLAGS_GCC_OPTION_OLD], [dnl
AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$2])dnl
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
+VAR,[AS_VAR_SET([VAR],["no, unknown"])
AC_LANG_SAVE
AC_LANG_C
ac_save_[]FLAGS="$[]FLAGS"
@@ -88,19 +88,20 @@
#
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;],
- [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+ [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break])
done
FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE
])
-case ".$VAR" in
+m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])])
+case ".$var" in
.ok|.ok,*) m4_ifvaln($3,$3) ;;
.|.no|.no,*) m4_ifvaln($4,$4) ;;
*) m4_ifvaln($3,$3,[
- if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
- then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
- else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+ if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $var " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $var])
+ else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"
fi ]) ;;
esac
AS_VAR_POPDEF([VAR])dnl
@@ -114,7 +115,7 @@
AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$2])dnl
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
-VAR,[VAR="no, unknown"
+VAR,[AS_VAR_SET([VAR],["no, unknown"])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_save_[]FLAGS="$[]FLAGS"
@@ -124,19 +125,20 @@
#
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;],
- [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+ [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break])
done
FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE
])
-case ".$VAR" in
+m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])])
+case ".$var" in
.ok|.ok,*) m4_ifvaln($3,$3) ;;
.|.no|.no,*) m4_ifvaln($4,$4) ;;
*) m4_ifvaln($3,$3,[
- if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
- then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $VAR])
- else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"])
- m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $VAR"
+ if echo " $[]m4_ifval($1,$1,FLAGS) " | grep " $var " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($1,$1,FLAGS) does contain $var])
+ else AC_RUN_LOG([: m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"])
+ m4_ifval($1,$1,FLAGS)="$m4_ifval($1,$1,FLAGS) $var"
fi ]) ;;
esac
AS_VAR_POPDEF([VAR])dnl
@@ -149,7 +151,7 @@
AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ax_cv_cflags_gcc_option_$1])dnl
AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
+VAR,[AS_VAR_SET([VAR],["no, unknown"])
AC_LANG_SAVE
AC_LANG_C
ac_save_[]FLAGS="$[]FLAGS"
@@ -159,19 +161,20 @@
#
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;],
- [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+ [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break])
done
FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE
])
-case ".$VAR" in
+m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])])
+case ".$var" in
.ok|.ok,*) m4_ifvaln($3,$3) ;;
.|.no|.no,*) m4_ifvaln($4,$4) ;;
*) m4_ifvaln($3,$3,[
- if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
- then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
- else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
- m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
+ if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var])
+ else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"])
+ m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"
fi ]) ;;
esac
AS_VAR_POPDEF([VAR])dnl
@@ -185,7 +188,7 @@
AS_VAR_PUSHDEF([FLAGS],[CXXFLAGS])dnl
AS_VAR_PUSHDEF([VAR],[ax_cv_cxxflags_gcc_option_$1])dnl
AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
-VAR,[VAR="no, unknown"
+VAR,[AS_VAR_SET([VAR],["no, unknown"])
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_save_[]FLAGS="$[]FLAGS"
@@ -195,19 +198,20 @@
#
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
AC_TRY_COMPILE([],[return 0;],
- [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+ [AS_VAR_SET([VAR],[`echo $ac_arg | sed -e 's,.*% *,,'`]); break])
done
FLAGS="$ac_save_[]FLAGS"
AC_LANG_RESTORE
])
-case ".$VAR" in
+m4_ifdef([AS_VAR_COPY],[AS_VAR_COPY([var],[VAR])],[var=AS_VAR_GET([VAR])])
+case ".$var" in
.ok|.ok,*) m4_ifvaln($3,$3) ;;
.|.no|.no,*) m4_ifvaln($4,$4) ;;
*) m4_ifvaln($3,$3,[
- if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $VAR " 2>&1 >/dev/null
- then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $VAR])
- else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"])
- m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $VAR"
+ if echo " $[]m4_ifval($2,$2,FLAGS) " | grep " $var " 2>&1 >/dev/null
+ then AC_RUN_LOG([: m4_ifval($2,$2,FLAGS) does contain $var])
+ else AC_RUN_LOG([: m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"])
+ m4_ifval($2,$2,FLAGS)="$m4_ifval($2,$2,FLAGS) $var"
fi ]) ;;
esac
AS_VAR_POPDEF([VAR])dnl
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/m4/libtool.m4
^
|
| @@ -2445,7 +2445,7 @@
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -3084,7 +3084,7 @@
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3705,7 +3705,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -3989,7 +3989,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4285,6 +4285,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4376,7 +4377,7 @@
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -5860,7 +5861,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/m4/ltversion.m4
^
|
| @@ -9,15 +9,15 @@
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/Makefile.am
^
|
| @@ -6,7 +6,7 @@
pkglib_LTLIBRARIES =
-STATIC_LIBS =
+STATIC_LIBS = @STATIC_LIBS@
lib_LTLIBRARIES = libdaq_static_modules.la
libdaq_static_modules_la_SOURCES = \
@@ -20,76 +20,63 @@
pkglib_LTLIBRARIES += daq_afpacket.la
daq_afpacket_la_SOURCES = daq_afpacket.c
daq_afpacket_la_CFLAGS = -DBUILDING_SO
- daq_afpacket_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
- daq_afpacket_la_LIBADD = $(top_srcdir)/sfbpf/libsfbpf.la
+ daq_afpacket_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+ daq_afpacket_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
libdaq_static_modules_la_SOURCES += daq_afpacket.c
libdaq_static_modules_la_CFLAGS += -DBUILD_AFPACKET_MODULE
- libdaq_static_modules_la_LIBADD += $(top_srcdir)/sfbpf/libsfbpf.la
- STATIC_LIBS += -lsfbpf
endif
if BUILD_PCAP_MODULE
pkglib_LTLIBRARIES += daq_pcap.la
daq_pcap_la_SOURCES = daq_pcap.c
daq_pcap_la_CFLAGS = -DBUILDING_SO
- daq_pcap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
+ daq_pcap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
daq_pcap_la_LIBADD = -lpcap
libdaq_static_modules_la_SOURCES += daq_pcap.c
libdaq_static_modules_la_CFLAGS += -DBUILD_PCAP_MODULE
- libdaq_static_modules_la_LIBADD += -lpcap
- STATIC_LIBS += -lpcap
endif
if BUILD_DUMP_MODULE
pkglib_LTLIBRARIES += daq_dump.la
daq_dump_la_SOURCES = daq_dump.c
daq_dump_la_CFLAGS = -DBUILDING_SO
- daq_dump_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
+ daq_dump_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
daq_dump_la_LIBADD = -lpcap
libdaq_static_modules_la_SOURCES += daq_dump.c
libdaq_static_modules_la_CFLAGS += -DBUILD_DUMP_MODULE
- libdaq_static_modules_la_LIBADD += -lpcap
- STATIC_LIBS += -lpcap
endif
if BUILD_IPFW_MODULE
pkglib_LTLIBRARIES += daq_ipfw.la
daq_ipfw_la_SOURCES = daq_ipfw.c
daq_ipfw_la_CFLAGS = -DBUILDING_SO
- daq_ipfw_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
- daq_ipfw_la_LIBADD = $(top_srcdir)/sfbpf/libsfbpf.la
+ daq_ipfw_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+ daq_ipfw_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
libdaq_static_modules_la_SOURCES += daq_ipfw.c
libdaq_static_modules_la_CFLAGS += -DBUILD_IPFW_MODULE
- STATIC_LIBS += -lsfbpf
endif
if BUILD_IPQ_MODULE
pkglib_LTLIBRARIES += daq_ipq.la
daq_ipq_la_SOURCES = daq_ipq.c
daq_ipq_la_CFLAGS = -DBUILDING_SO
- daq_ipq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
- daq_ipq_la_LIBADD = -lipq -ldnet $(top_srcdir)/sfbpf/libsfbpf.la
+ daq_ipq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@
+ daq_ipq_la_LIBADD = -lipq @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la
libdaq_static_modules_la_SOURCES += daq_ipq.c
libdaq_static_modules_la_CFLAGS += -DBUILD_IPQ_MODULE
- STATIC_LIBS += -lipq -ldnet -lsfbpf
endif
if BUILD_NFQ_MODULE
pkglib_LTLIBRARIES += daq_nfq.la
daq_nfq_la_SOURCES = daq_nfq.c
daq_nfq_la_CFLAGS = -DBUILDING_SO
- daq_nfq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
- daq_nfq_la_LIBADD = -lnfnetlink -lnetfilter_queue -ldnet $(top_srcdir)/sfbpf/libsfbpf.la
+ daq_nfq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@
+ daq_nfq_la_LIBADD = -lnfnetlink -lnetfilter_queue @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la
libdaq_static_modules_la_SOURCES += daq_nfq.c
libdaq_static_modules_la_CFLAGS += -DBUILD_NFQ_MODULE
- STATIC_LIBS += -lnfnetlink -lnetfilter_queue -ldnet -lsfbpf
endif
-INCLUDES = -I$(top_srcdir)/api -I$(top_srcdir)/sfbpf
-
-CLEANFILES = daq-modules-config
+INCLUDES = -I$(top_srcdir)/api -I$(top_srcdir)/sfbpf -I$(top_builddir)/sfbpf
EXTRA_DIST = daq-modules-config.in
-daq-modules-config:
- sed -e 's|@LIBDIR@|@libdir@|g' -e 's|@STATIC_LIBS@|"$(sort $(STATIC_LIBS))"|g' daq-modules-config.in > daq-modules-config
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/Makefile.in
^
|
| @@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38,32 +38,24 @@
@BUILD_AFPACKET_MODULE_TRUE@am__append_1 = daq_afpacket.la
@BUILD_AFPACKET_MODULE_TRUE@am__append_2 = daq_afpacket.c
@BUILD_AFPACKET_MODULE_TRUE@am__append_3 = -DBUILD_AFPACKET_MODULE
-@BUILD_AFPACKET_MODULE_TRUE@am__append_4 = $(top_srcdir)/sfbpf/libsfbpf.la
-@BUILD_AFPACKET_MODULE_TRUE@am__append_5 = -lsfbpf
-@BUILD_PCAP_MODULE_TRUE@am__append_6 = daq_pcap.la
-@BUILD_PCAP_MODULE_TRUE@am__append_7 = daq_pcap.c
-@BUILD_PCAP_MODULE_TRUE@am__append_8 = -DBUILD_PCAP_MODULE
-@BUILD_PCAP_MODULE_TRUE@am__append_9 = -lpcap
-@BUILD_PCAP_MODULE_TRUE@am__append_10 = -lpcap
-@BUILD_DUMP_MODULE_TRUE@am__append_11 = daq_dump.la
-@BUILD_DUMP_MODULE_TRUE@am__append_12 = daq_dump.c
-@BUILD_DUMP_MODULE_TRUE@am__append_13 = -DBUILD_DUMP_MODULE
-@BUILD_DUMP_MODULE_TRUE@am__append_14 = -lpcap
-@BUILD_DUMP_MODULE_TRUE@am__append_15 = -lpcap
-@BUILD_IPFW_MODULE_TRUE@am__append_16 = daq_ipfw.la
-@BUILD_IPFW_MODULE_TRUE@am__append_17 = daq_ipfw.c
-@BUILD_IPFW_MODULE_TRUE@am__append_18 = -DBUILD_IPFW_MODULE
-@BUILD_IPFW_MODULE_TRUE@am__append_19 = -lsfbpf
-@BUILD_IPQ_MODULE_TRUE@am__append_20 = daq_ipq.la
-@BUILD_IPQ_MODULE_TRUE@am__append_21 = daq_ipq.c
-@BUILD_IPQ_MODULE_TRUE@am__append_22 = -DBUILD_IPQ_MODULE
-@BUILD_IPQ_MODULE_TRUE@am__append_23 = -lipq -ldnet -lsfbpf
-@BUILD_NFQ_MODULE_TRUE@am__append_24 = daq_nfq.la
-@BUILD_NFQ_MODULE_TRUE@am__append_25 = daq_nfq.c
-@BUILD_NFQ_MODULE_TRUE@am__append_26 = -DBUILD_NFQ_MODULE
-@BUILD_NFQ_MODULE_TRUE@am__append_27 = -lnfnetlink -lnetfilter_queue -ldnet -lsfbpf
+@BUILD_PCAP_MODULE_TRUE@am__append_4 = daq_pcap.la
+@BUILD_PCAP_MODULE_TRUE@am__append_5 = daq_pcap.c
+@BUILD_PCAP_MODULE_TRUE@am__append_6 = -DBUILD_PCAP_MODULE
+@BUILD_DUMP_MODULE_TRUE@am__append_7 = daq_dump.la
+@BUILD_DUMP_MODULE_TRUE@am__append_8 = daq_dump.c
+@BUILD_DUMP_MODULE_TRUE@am__append_9 = -DBUILD_DUMP_MODULE
+@BUILD_IPFW_MODULE_TRUE@am__append_10 = daq_ipfw.la
+@BUILD_IPFW_MODULE_TRUE@am__append_11 = daq_ipfw.c
+@BUILD_IPFW_MODULE_TRUE@am__append_12 = -DBUILD_IPFW_MODULE
+@BUILD_IPQ_MODULE_TRUE@am__append_13 = daq_ipq.la
+@BUILD_IPQ_MODULE_TRUE@am__append_14 = daq_ipq.c
+@BUILD_IPQ_MODULE_TRUE@am__append_15 = -DBUILD_IPQ_MODULE
+@BUILD_NFQ_MODULE_TRUE@am__append_16 = daq_nfq.la
+@BUILD_NFQ_MODULE_TRUE@am__append_17 = daq_nfq.c
+@BUILD_NFQ_MODULE_TRUE@am__append_18 = -DBUILD_NFQ_MODULE
subdir = os-daq-modules
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/daq-modules-config.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -74,7 +66,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = daq-modules-config
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -101,7 +93,7 @@
"$(DESTDIR)$(bindir)"
LTLIBRARIES = $(lib_LTLIBRARIES) $(pkglib_LTLIBRARIES)
@BUILD_AFPACKET_MODULE_TRUE@daq_afpacket_la_DEPENDENCIES = \
-@BUILD_AFPACKET_MODULE_TRUE@ $(top_srcdir)/sfbpf/libsfbpf.la
+@BUILD_AFPACKET_MODULE_TRUE@ $(top_builddir)/sfbpf/libsfbpf.la
am__daq_afpacket_la_SOURCES_DIST = daq_afpacket.c
@BUILD_AFPACKET_MODULE_TRUE@am_daq_afpacket_la_OBJECTS = \
@BUILD_AFPACKET_MODULE_TRUE@ daq_afpacket_la-daq_afpacket.lo
@@ -121,7 +113,7 @@
$(CFLAGS) $(daq_dump_la_LDFLAGS) $(LDFLAGS) -o $@
@BUILD_DUMP_MODULE_TRUE@am_daq_dump_la_rpath = -rpath $(pkglibdir)
@BUILD_IPFW_MODULE_TRUE@daq_ipfw_la_DEPENDENCIES = \
-@BUILD_IPFW_MODULE_TRUE@ $(top_srcdir)/sfbpf/libsfbpf.la
+@BUILD_IPFW_MODULE_TRUE@ $(top_builddir)/sfbpf/libsfbpf.la
am__daq_ipfw_la_SOURCES_DIST = daq_ipfw.c
@BUILD_IPFW_MODULE_TRUE@am_daq_ipfw_la_OBJECTS = \
@BUILD_IPFW_MODULE_TRUE@ daq_ipfw_la-daq_ipfw.lo
@@ -131,7 +123,7 @@
$(CFLAGS) $(daq_ipfw_la_LDFLAGS) $(LDFLAGS) -o $@
@BUILD_IPFW_MODULE_TRUE@am_daq_ipfw_la_rpath = -rpath $(pkglibdir)
@BUILD_IPQ_MODULE_TRUE@daq_ipq_la_DEPENDENCIES = \
-@BUILD_IPQ_MODULE_TRUE@ $(top_srcdir)/sfbpf/libsfbpf.la
+@BUILD_IPQ_MODULE_TRUE@ $(top_builddir)/sfbpf/libsfbpf.la
am__daq_ipq_la_SOURCES_DIST = daq_ipq.c
@BUILD_IPQ_MODULE_TRUE@am_daq_ipq_la_OBJECTS = daq_ipq_la-daq_ipq.lo
daq_ipq_la_OBJECTS = $(am_daq_ipq_la_OBJECTS)
@@ -140,7 +132,7 @@
$(CFLAGS) $(daq_ipq_la_LDFLAGS) $(LDFLAGS) -o $@
@BUILD_IPQ_MODULE_TRUE@am_daq_ipq_la_rpath = -rpath $(pkglibdir)
@BUILD_NFQ_MODULE_TRUE@daq_nfq_la_DEPENDENCIES = \
-@BUILD_NFQ_MODULE_TRUE@ $(top_srcdir)/sfbpf/libsfbpf.la
+@BUILD_NFQ_MODULE_TRUE@ $(top_builddir)/sfbpf/libsfbpf.la
am__daq_nfq_la_SOURCES_DIST = daq_nfq.c
@BUILD_NFQ_MODULE_TRUE@am_daq_nfq_la_OBJECTS = daq_nfq_la-daq_nfq.lo
daq_nfq_la_OBJECTS = $(am_daq_nfq_la_OBJECTS)
@@ -157,9 +149,7 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(daq_pcap_la_CFLAGS) \
$(CFLAGS) $(daq_pcap_la_LDFLAGS) $(LDFLAGS) -o $@
@BUILD_PCAP_MODULE_TRUE@am_daq_pcap_la_rpath = -rpath $(pkglibdir)
-am__DEPENDENCIES_1 =
-libdaq_static_modules_la_DEPENDENCIES = $(am__append_4) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libdaq_static_modules_la_DEPENDENCIES =
am__libdaq_static_modules_la_SOURCES_DIST = daq_static_modules.c \
daq_static_modules.h daq_afpacket.c daq_pcap.c daq_dump.c \
daq_ipfw.c daq_ipq.c daq_nfq.c
@@ -225,6 +215,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DNET_LDFLAGS = @DNET_LDFLAGS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -268,6 +259,7 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STATIC_LIBS = @STATIC_LIBS@
STRIP = @STRIP@
VERSION = @VERSION@
V_LEX = @V_LEX@
@@ -328,47 +320,43 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
bin_SCRIPTS = daq-modules-config
-pkglib_LTLIBRARIES = $(am__append_1) $(am__append_6) $(am__append_11) \
- $(am__append_16) $(am__append_20) $(am__append_24)
-STATIC_LIBS = $(am__append_5) $(am__append_10) $(am__append_15) \
- $(am__append_19) $(am__append_23) $(am__append_27)
+pkglib_LTLIBRARIES = $(am__append_1) $(am__append_4) $(am__append_7) \
+ $(am__append_10) $(am__append_13) $(am__append_16)
lib_LTLIBRARIES = libdaq_static_modules.la
libdaq_static_modules_la_SOURCES = daq_static_modules.c \
- daq_static_modules.h $(am__append_2) $(am__append_7) \
- $(am__append_12) $(am__append_17) $(am__append_21) \
- $(am__append_25)
-libdaq_static_modules_la_CFLAGS = $(am__append_3) $(am__append_8) \
- $(am__append_13) $(am__append_18) $(am__append_22) \
- $(am__append_26)
+ daq_static_modules.h $(am__append_2) $(am__append_5) \
+ $(am__append_8) $(am__append_11) $(am__append_14) \
+ $(am__append_17)
+libdaq_static_modules_la_CFLAGS = $(am__append_3) $(am__append_6) \
+ $(am__append_9) $(am__append_12) $(am__append_15) \
+ $(am__append_18)
libdaq_static_modules_la_LDFLAGS = -static -avoid-version
-libdaq_static_modules_la_LIBADD = $(am__append_4) $(am__append_9) \
- $(am__append_14)
+libdaq_static_modules_la_LIBADD =
@BUILD_AFPACKET_MODULE_TRUE@daq_afpacket_la_SOURCES = daq_afpacket.c
@BUILD_AFPACKET_MODULE_TRUE@daq_afpacket_la_CFLAGS = -DBUILDING_SO
-@BUILD_AFPACKET_MODULE_TRUE@daq_afpacket_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
-@BUILD_AFPACKET_MODULE_TRUE@daq_afpacket_la_LIBADD = $(top_srcdir)/sfbpf/libsfbpf.la
+@BUILD_AFPACKET_MODULE_TRUE@daq_afpacket_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+@BUILD_AFPACKET_MODULE_TRUE@daq_afpacket_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
@BUILD_PCAP_MODULE_TRUE@daq_pcap_la_SOURCES = daq_pcap.c
@BUILD_PCAP_MODULE_TRUE@daq_pcap_la_CFLAGS = -DBUILDING_SO
-@BUILD_PCAP_MODULE_TRUE@daq_pcap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
+@BUILD_PCAP_MODULE_TRUE@daq_pcap_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
@BUILD_PCAP_MODULE_TRUE@daq_pcap_la_LIBADD = -lpcap
@BUILD_DUMP_MODULE_TRUE@daq_dump_la_SOURCES = daq_dump.c
@BUILD_DUMP_MODULE_TRUE@daq_dump_la_CFLAGS = -DBUILDING_SO
-@BUILD_DUMP_MODULE_TRUE@daq_dump_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
+@BUILD_DUMP_MODULE_TRUE@daq_dump_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
@BUILD_DUMP_MODULE_TRUE@daq_dump_la_LIBADD = -lpcap
@BUILD_IPFW_MODULE_TRUE@daq_ipfw_la_SOURCES = daq_ipfw.c
@BUILD_IPFW_MODULE_TRUE@daq_ipfw_la_CFLAGS = -DBUILDING_SO
-@BUILD_IPFW_MODULE_TRUE@daq_ipfw_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
-@BUILD_IPFW_MODULE_TRUE@daq_ipfw_la_LIBADD = $(top_srcdir)/sfbpf/libsfbpf.la
+@BUILD_IPFW_MODULE_TRUE@daq_ipfw_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @XCCFLAGS@
+@BUILD_IPFW_MODULE_TRUE@daq_ipfw_la_LIBADD = $(top_builddir)/sfbpf/libsfbpf.la
@BUILD_IPQ_MODULE_TRUE@daq_ipq_la_SOURCES = daq_ipq.c
@BUILD_IPQ_MODULE_TRUE@daq_ipq_la_CFLAGS = -DBUILDING_SO
-@BUILD_IPQ_MODULE_TRUE@daq_ipq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
-@BUILD_IPQ_MODULE_TRUE@daq_ipq_la_LIBADD = -lipq -ldnet $(top_srcdir)/sfbpf/libsfbpf.la
+@BUILD_IPQ_MODULE_TRUE@daq_ipq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@
+@BUILD_IPQ_MODULE_TRUE@daq_ipq_la_LIBADD = -lipq @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la
@BUILD_NFQ_MODULE_TRUE@daq_nfq_la_SOURCES = daq_nfq.c
@BUILD_NFQ_MODULE_TRUE@daq_nfq_la_CFLAGS = -DBUILDING_SO
-@BUILD_NFQ_MODULE_TRUE@daq_nfq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
-@BUILD_NFQ_MODULE_TRUE@daq_nfq_la_LIBADD = -lnfnetlink -lnetfilter_queue -ldnet $(top_srcdir)/sfbpf/libsfbpf.la
-INCLUDES = -I$(top_srcdir)/api -I$(top_srcdir)/sfbpf
-CLEANFILES = daq-modules-config
+@BUILD_NFQ_MODULE_TRUE@daq_nfq_la_LDFLAGS = -module -export-dynamic -avoid-version -shared @DNET_LDFLAGS@ @XCCFLAGS@
+@BUILD_NFQ_MODULE_TRUE@daq_nfq_la_LIBADD = -lnfnetlink -lnetfilter_queue @DNET_LDFLAGS@ $(top_builddir)/sfbpf/libsfbpf.la
+INCLUDES = -I$(top_srcdir)/api -I$(top_srcdir)/sfbpf -I$(top_builddir)/sfbpf
EXTRA_DIST = daq-modules-config.in
all: all-am
@@ -404,6 +392,8 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+daq-modules-config: $(top_builddir)/config.status $(srcdir)/daq-modules-config.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@@ -759,7 +749,6 @@
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -861,9 +850,6 @@
uninstall-pkglibLTLIBRARIES
-daq-modules-config:
- sed -e 's|@LIBDIR@|@libdir@|g' -e 's|@STATIC_LIBS@|"$(sort $(STATIC_LIBS))"|g' daq-modules-config.in > daq-modules-config
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/daq-modules-config.in
^
|
| @@ -5,8 +5,10 @@
# to use when building code that uses LibDAQ modules.
#
-LIBDIR=@LIBDIR@
-STATIC_LIBS=@STATIC_LIBS@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+LIBDIR=@libdir@
+STATIC_LIBS="@STATIC_LIBS@"
static=0
show_libs=0
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/daq_afpacket.c
^
|
| @@ -41,21 +41,37 @@
#include "daq_api.h"
#include "sfbpf.h"
-#define DAQ_AFPACKET_VERSION 2
+#define DAQ_AFPACKET_VERSION 4
-#define AF_PACKET_MAX_BUFFER_SIZE 128
+#define AF_PACKET_DEFAULT_BUFFER_SIZE 128
#define AF_PACKET_MAX_INTERFACES 32
+#ifdef TPACKET2_HDRLEN
+#define HAVE_TPACKET2
+#else
+#define TPACKET_V1 0
+#endif
+
+union thdr
+{
+ struct tpacket_hdr *h1;
+ struct tpacket2_hdr *h2;
+ const uint8_t *raw;
+};
+
typedef struct _af_packet_entry
{
struct _af_packet_entry *next;
- struct tpacket_hdr *hdr;
- const u_int8_t *begin;
+ union thdr hdr;
+ const uint8_t *begin;
} AFPacketEntry;
typedef struct _af_packet_instance
{
struct _af_packet_instance *next;
+ unsigned tp_version;
+ unsigned tp_hdrlen;
+ uint32_t frames_per_block;
struct tpacket_req layout;
AFPacketEntry *ring;
AFPacketEntry *entry;
@@ -73,12 +89,12 @@
char *filter;
int snaplen;
int timeout;
+ uint32_t size;
+ int debug;
AFPacketInstance *instances;
- struct tpacket_req layout;
- uint32_t frames_per_block;
uint32_t intf_count;
struct sfbpf_program fcode;
- int break_loop;
+ volatile int break_loop;
DAQ_Stats_t stats;
DAQ_State state;
char errbuf[256];
@@ -163,18 +179,10 @@
}
}
-static int create_rx_ring(AFPacket_Context_t *afpc, AFPacketInstance *instance)
+static int set_up_rx_ring(AFPacket_Context_t *afpc, AFPacketInstance *instance)
{
unsigned idx, block, frame, ringsize;
- /* Ask the kernel to create the ring. */
- if (setsockopt(instance->fd, SOL_PACKET, PACKET_RX_RING, (void*) &instance->layout, sizeof(struct tpacket_req)))
- {
- DPE(afpc->errbuf, "%s: Couldn't create kernel RX ring on packet socket: %s",
- __FUNCTION__, strerror(errno));
- return DAQ_ERROR_NOMEM;
- }
-
/* Memory map the RX ring. */
ringsize = instance->layout.tp_block_nr * instance->layout.tp_block_size;
instance->buffer = mmap(0, ringsize, PROT_READ | PROT_WRITE, MAP_SHARED, instance->fd, 0);
@@ -200,10 +208,10 @@
idx = 0;
for (block = 0; block < instance->layout.tp_block_nr; block++)
{
- for (frame = 0; frame < afpc->frames_per_block; frame++)
+ for (frame = 0; frame < instance->frames_per_block && idx < instance->layout.tp_frame_nr; frame++)
{
instance->ring[idx].begin = (uint8_t *) instance->buffer + (block * instance->layout.tp_block_size) + (frame * instance->layout.tp_frame_size);
- instance->ring[idx].hdr = (struct tpacket_hdr *)instance->ring[idx].begin;
+ instance->ring[idx].hdr.raw = instance->ring[idx].begin;
instance->ring[idx].next = &instance->ring[idx + 1];
idx++;
}
@@ -292,6 +300,110 @@
return NULL;
}
+/* The function below was heavily influenced by LibPCAP's pcap-linux.c. Thanks! */
+static int determine_version(AFPacket_Context_t *afpc, AFPacketInstance *instance)
+{
+#ifdef HAVE_TPACKET2
+ socklen_t len;
+ int val;
+#endif
+
+ instance->tp_version = TPACKET_V1;
+ instance->tp_hdrlen = sizeof(struct tpacket_hdr);
+
+#ifdef HAVE_TPACKET2
+ /* Probe whether kernel supports TPACKET_V2 */
+ val = TPACKET_V2;
+ len = sizeof(val);
+ if (getsockopt(instance->fd, SOL_PACKET, PACKET_HDRLEN, &val, &len) < 0)
+ {
+ /* Version 2 is not supported, stick with V1. */
+ if (errno == ENOPROTOOPT)
+ return DAQ_SUCCESS;
+
+ DPE(afpc->errbuf, "Couldn't retrieve TPACKET_V2 header length: %s", strerror(errno));
+ return -1;
+ }
+ instance->tp_hdrlen = val;
+
+ val = TPACKET_V2;
+ if (setsockopt(instance->fd, SOL_PACKET, PACKET_VERSION, &val, sizeof(val)) < 0)
+ {
+ DPE(afpc->errbuf, "Couldn't activate TPACKET_V2 on packet socket: %s", strerror(errno));
+ return -1;
+ }
+ instance->tp_version = TPACKET_V2;
+
+#endif /* HAVE_TPACKET2 */
+ return DAQ_SUCCESS;
+}
+
+static int calculate_layout(AFPacket_Context_t *afpc, AFPacketInstance *instance, int order)
+{
+ /* Calculate the frame size and minimum block size required. */
+ instance->layout.tp_frame_size = TPACKET_ALIGN(afpc->snaplen + TPACKET_ALIGN(TPACKET_ALIGN(instance->tp_hdrlen) + sizeof(struct sockaddr_ll) + ETH_HLEN) - ETH_HLEN);
+ instance->layout.tp_block_size = getpagesize() << order;
+ while (instance->layout.tp_block_size < instance->layout.tp_frame_size)
+ instance->layout.tp_block_size <<= 1;
+ instance->frames_per_block = instance->layout.tp_block_size / instance->layout.tp_frame_size;
+ if (instance->frames_per_block == 0)
+ {
+ DPE(afpc->errbuf, "%s: Invalid frames per block (%u/%u) for %s",
+ __FUNCTION__, instance->layout.tp_block_size, instance->layout.tp_frame_size, afpc->device);
+ return DAQ_ERROR;
+ }
+
+ /* Find the total number of frames required to amount to the requested per-interface memory.
+ Then find the number of blocks required to hold those packet buffer frames. */
+ instance->layout.tp_frame_nr = afpc->size / instance->layout.tp_frame_size;
+ instance->layout.tp_block_nr = instance->layout.tp_frame_nr / instance->frames_per_block;
+ /* afpc->layout.tp_frame_nr is requested to match frames_per_block*n_blocks */
+ instance->layout.tp_frame_nr = instance->layout.tp_block_nr * instance->frames_per_block;
+ if (afpc->debug)
+ {
+ printf("AFPacket Layout:\n");
+ printf(" Frame Size: %u\n", instance->layout.tp_frame_size);
+ printf(" Frames: %u\n", instance->layout.tp_frame_nr);
+ printf(" Block Size: %u (Order %d)\n", instance->layout.tp_block_size, order);
+ printf(" Blocks: %u\n", instance->layout.tp_block_nr);
+ }
+
+ return DAQ_SUCCESS;
+}
+
+#define DEFAULT_ORDER 3
+static int create_rx_ring(AFPacket_Context_t *afpc, AFPacketInstance *instance)
+{
+ int rc, order;
+
+ /* Starting with page allocations of order 3, try to allocate an RX ring in the kernel. */
+ for (order = DEFAULT_ORDER; order >= 0; order--)
+ {
+ if (calculate_layout(afpc, instance, order))
+ return DAQ_ERROR;
+
+ /* Ask the kernel to create the ring. */
+ rc = setsockopt(instance->fd, SOL_PACKET, PACKET_RX_RING, (void*) &instance->layout, sizeof(struct tpacket_req));
+ if (rc)
+ {
+ if (errno == ENOMEM)
+ {
+ if (afpc->debug)
+ printf("%s: Allocation of kernel packet RX ring failed with order %d, retrying...\n", instance->name, order);
+ continue;
+ }
+ DPE(afpc->errbuf, "%s: Couldn't create kernel RX ring on packet socket: %s",
+ __FUNCTION__, strerror(errno));
+ return DAQ_ERROR;
+ }
+ return DAQ_SUCCESS;
+ }
+
+ /* If we got here, it means we failed allocation on order 0. */
+ DPE(afpc->errbuf, "%s: Couldn't allocate enough memory for the kernel RX ring!", instance->name);
+ return DAQ_ERROR;
+}
+
static int start_instance(AFPacket_Context_t *afpc, AFPacketInstance *instance)
{
struct packet_mreq mr;
@@ -327,9 +439,22 @@
return -1;
}
+ /* Determine which versions of TPACKET the socket supports. */
+ if (determine_version(afpc, instance) != DAQ_SUCCESS)
+ return -1;
+
+ if (afpc->debug)
+ {
+ printf("Version: %u\n", instance->tp_version);
+ printf("Header Length: %u\n", instance->tp_hdrlen);
+ }
+
if (create_rx_ring(afpc, instance) != DAQ_SUCCESS)
return -1;
+ if (set_up_rx_ring(afpc, instance) != DAQ_SUCCESS)
+ return -1;
+
return 0;
}
@@ -344,7 +469,8 @@
memset(&kstats, 0, len);
if (getsockopt(instance->fd, SOL_PACKET, PACKET_STATISTICS, &kstats, &len) > -1)
{
- afpc->stats.hw_packets_received += kstats.tp_packets;
+ /* The IOCTL adds tp_drops to tp_packets in the returned structure for some mind-boggling reason... */
+ afpc->stats.hw_packets_received += kstats.tp_packets - kstats.tp_drops;
afpc->stats.hw_packets_dropped += kstats.tp_drops;
}
else
@@ -420,7 +546,6 @@
size_t len;
int num_intfs = 0;
int rval = DAQ_ERROR;
- int debug = 0;
DAQ_Dict *entry;
afpc = calloc(1, sizeof(AFPacket_Context_t));
@@ -440,12 +565,12 @@
}
afpc->snaplen = config->snaplen;
- afpc->timeout = config->timeout;
+ afpc->timeout = (config->timeout > 0) ? (int) config->timeout : -1;
dev = afpc->device;
if (*dev == ':' || ((len = strlen(dev)) > 0 && *(dev + len - 1) == ':') || (config->mode == DAQ_MODE_PASSIVE && strstr(dev, "::")))
{
- snprintf(errbuf, errlen, "%s: Invalid interface specification: %s!", __FUNCTION__, afpc->device);
+ snprintf(errbuf, errlen, "%s: Invalid interface specification: '%s'!", __FUNCTION__, afpc->device);
goto err;
}
@@ -497,13 +622,13 @@
}
/* If there are any leftover unbridged interfaces and we're not in Passive mode, error out. */
- if (config->mode != DAQ_MODE_PASSIVE && num_intfs != 0)
+ if (!afpc->instances || (config->mode != DAQ_MODE_PASSIVE && num_intfs != 0))
{
- snprintf(errbuf, errlen, "%s: Invalid interface specification: %s!", __FUNCTION__, afpc->device);
+ snprintf(errbuf, errlen, "%s: Invalid interface specification: '%s'!", __FUNCTION__, afpc->device);
goto err;
}
- /*
+ /*
* Determine the dimensions of the kernel RX ring(s) to request.
*/
/* 1. Find the total desired packet buffer memory for all instances. */
@@ -512,19 +637,15 @@
if (!strcmp(entry->key, "buffer_size_mb"))
size_str = entry->value;
else if (!strcmp(entry->key, "debug"))
- debug = 1;
+ afpc->debug = 1;
}
/* Fall back to the environment variable. */
if (!size_str)
size_str = getenv("AF_PACKET_BUFFER_SIZE");
if (size_str && strcmp("max", size_str) != 0)
- {
size = strtoul(size_str, NULL, 10);
- if (size > AF_PACKET_MAX_BUFFER_SIZE)
- size = AF_PACKET_MAX_BUFFER_SIZE;
- }
else
- size = AF_PACKET_MAX_BUFFER_SIZE;
+ size = AF_PACKET_DEFAULT_BUFFER_SIZE;
/* The size is specified in megabytes. */
size = size * 1024 * 1024;
@@ -532,39 +653,7 @@
num_intfs = 0;
for (instance = afpc->instances; instance; instance = instance->next)
num_intfs++;
- size /= num_intfs;
-
- /* 3. Calculate the frame size and minimum block size required. */
- afpc->layout.tp_frame_size = TPACKET_ALIGN(afpc->snaplen + TPACKET_HDRLEN);
- afpc->layout.tp_block_size = getpagesize();
- while (afpc->layout.tp_block_size < afpc->layout.tp_frame_size)
- afpc->layout.tp_block_size <<= 1;
- afpc->frames_per_block = afpc->layout.tp_block_size / afpc->layout.tp_frame_size;
- if (afpc->frames_per_block == 0)
- {
- snprintf(errbuf, errlen, "%s: invalid frames per block (%u/%u) for %s",
- __FUNCTION__, afpc->layout.tp_block_size, afpc->layout.tp_frame_size, afpc->device);
- goto err;
- }
-
- /* 4. Find the total number of frames required to amount to the requested per-interface memory.
- Then find the number of blocks required to hold those packet buffer frames. */
- afpc->layout.tp_frame_nr = size / afpc->layout.tp_frame_size;
- afpc->layout.tp_block_nr = afpc->layout.tp_frame_nr / afpc->frames_per_block;
- /* afpc->layout.tp_frame_nr is requested to match frames_per_block*n_blocks */
- afpc->layout.tp_frame_nr = afpc->layout.tp_block_nr * afpc->frames_per_block;
- if (debug)
- {
- printf("AFPacket Layout:\n");
- printf(" Frame Size: %u\n", afpc->layout.tp_frame_size);
- printf(" Frames: %u\n", afpc->layout.tp_frame_nr);
- printf(" Block Size: %u\n", afpc->layout.tp_block_size);
- printf(" Blocks: %u\n", afpc->layout.tp_block_nr);
- }
-
- /* Propagate the calculated ring layout to the instances. */
- for (instance = afpc->instances; instance; instance = instance->next)
- memcpy(&instance->layout, &afpc->layout, sizeof(struct tpacket_req));
+ afpc->size = size / num_intfs;
afpc->state = DAQ_STATE_INITIALIZED;
@@ -643,7 +732,7 @@
AFPacketInstance *instance;
DAQ_PktHdr_t daqhdr;
DAQ_Verdict verdict;
- struct tpacket_hdr *hdr;
+ union thdr hdr;
struct pollfd pfd[AF_PACKET_MAX_INTERFACES];
const uint8_t *data;
uint32_t i;
@@ -651,6 +740,7 @@
int result, c = 0;
struct sockaddr_ll *sll;
const struct ethhdr *eth;
+ unsigned int tp_len, tp_mac, tp_snaplen, tp_sec, tp_usec;
while (cnt <= 0 || c < cnt)
{
@@ -666,22 +756,49 @@
}
hdr = instance->entry->hdr;
- if (hdr->tp_status)
+ if ((instance->tp_version == TPACKET_V1 && hdr.h1->tp_status)
+#ifdef HAVE_TPACKET2
+ || (instance->tp_version == TPACKET_V2 && hdr.h2->tp_status)
+#endif
+ )
{
- data = instance->entry->begin + hdr->tp_mac;
+ switch (instance->tp_version)
+ {
+ case TPACKET_V1:
+ tp_len = hdr.h1->tp_len;
+ tp_mac = hdr.h1->tp_mac;
+ tp_snaplen = hdr.h1->tp_snaplen;
+ tp_sec = hdr.h1->tp_sec;
+ tp_usec = hdr.h1->tp_usec;
+ break;
+#ifdef HAVE_TPACKET2
+ case TPACKET_V2:
+ tp_len = hdr.h2->tp_len;
+ tp_mac = hdr.h2->tp_mac;
+ tp_snaplen = hdr.h2->tp_snaplen;
+ tp_sec = hdr.h2->tp_sec;
+ tp_usec = hdr.h2->tp_nsec / 1000;
+ break;
+#endif
+ default:
+ DPE(afpc->errbuf, "%s: Unknown TPACKET version: %u!", __FUNCTION__, instance->tp_version);
+ return DAQ_ERROR;
+ }
+ data = instance->entry->begin + tp_mac;
verdict = DAQ_VERDICT_PASS;
- if (afpc->fcode.bf_insns && sfbpf_filter(afpc->fcode.bf_insns, data, hdr->tp_len, hdr->tp_snaplen) == 0)
+ if (afpc->fcode.bf_insns && sfbpf_filter(afpc->fcode.bf_insns, data, tp_len, tp_snaplen) == 0)
{
ignored_one = 1;
afpc->stats.packets_filtered++;
goto send_packet;
}
got_one = 1;
- daqhdr.caplen = hdr->tp_snaplen;
- daqhdr.pktlen = hdr->tp_len;
- daqhdr.ts.tv_sec = hdr->tp_sec;
- daqhdr.ts.tv_usec = hdr->tp_usec;
+
+ daqhdr.caplen = tp_snaplen;
+ daqhdr.pktlen = tp_len;
+ daqhdr.ts.tv_sec = tp_sec;
+ daqhdr.ts.tv_usec = tp_usec;
daqhdr.device_index = instance->index;
daqhdr.flags = 0;
@@ -701,9 +818,19 @@
eth = (const struct ethhdr *)data;
sll = &instance->peer->sll;
sll->sll_protocol = eth->h_proto;
- sendto(instance->peer->fd, data, hdr->tp_snaplen, 0, (struct sockaddr *) sll, sizeof(*sll));
+ sendto(instance->peer->fd, data, tp_snaplen, 0, (struct sockaddr *) sll, sizeof(*sll));
+ }
+ switch (instance->tp_version)
+ {
+ case TPACKET_V1:
+ hdr.h1->tp_status = TP_STATUS_KERNEL;
+ break;
+#ifdef HAVE_TPACKET2
+ case TPACKET_V2:
+ hdr.h2->tp_status = TP_STATUS_KERNEL;
+ break;
+#endif
}
- hdr->tp_status = TP_STATUS_KERNEL;
instance->entry = instance->entry->next;
}
}
@@ -718,7 +845,10 @@
result = poll(pfd, afpc->intf_count, afpc->timeout);
if (result < 0)
{
- DPE(afpc->errbuf, "%s: Poll failed: %s", __FUNCTION__, strerror(errno));
+ /* If we were interrupted by a signal, just return without error. */
+ if (errno == EINTR)
+ break;
+ DPE(afpc->errbuf, "%s: Poll failed: %s (%d)", __FUNCTION__, strerror(errno), errno);
return DAQ_ERROR;
}
else if (result == 0)
@@ -860,9 +990,9 @@
}
#ifdef BUILDING_SO
-SO_PUBLIC const DAQ_Module_t DAQ_MODULE_DATA =
+DAQ_SO_PUBLIC const DAQ_Module_t DAQ_MODULE_DATA =
#else
-const DAQ_Module_t afpacket_daq_module_data =
+const DAQ_Module_t afpacket_daq_module_data =
#endif
{
.api_version = DAQ_API_VERSION,
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/daq_dump.c
^
|
| @@ -1,4 +1,3 @@
-/* $Id: daq_dump.c,v 1.6 2010/06/10 19:32:04 rcombs Exp $*/
/****************************************************************************
*
* Copyright (C) 2007-2010 Sourcefire, Inc.
@@ -56,28 +55,6 @@
static int dump_daq_stop(void*);
-#if 0
-static int daq_dump_get_vars (
- DumpImpl* impl, DAQ_Config_t* cfg, char* errBuf, size_t errMax
-) {
- int i;
- const char* s = daq_config_get_value(cfg, "load-mode");
-
- if ( !s )
- return 1;
-
- for ( i = 0; i < MAX_DAQ_MODE; i++ )
- {
- if ( !strcasecmp(daq_mode_string((DAQ_Mode)i), s) )
- {
- cfg->mode = (DAQ_Mode)i;
- return 1;
- }
- }
- snprintf(errBuf, errMax, "invalid load-mode (%s)", s);
- return 0;
-}
-#else
static int daq_dump_get_vars (
DumpImpl* impl, DAQ_Config_t* cfg, char* errBuf, size_t errMax
) {
@@ -116,7 +93,6 @@
snprintf(errBuf, errMax, "invalid load-mode (%s)", s);
return 0;
}
-#endif
//-------------------------------------------------------------------------
// constructor / destructor
@@ -354,9 +330,9 @@
//-------------------------------------------------------------------------
#ifdef BUILDING_SO
-SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
+DAQ_SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
#else
-DAQ_Module_t dump_daq_module_data =
+DAQ_Module_t dump_daq_module_data =
#endif
{
.api_version = DAQ_API_VERSION,
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/daq_ipfw.c
^
|
| @@ -1,4 +1,3 @@
-/* $Id: daq_ipfw.c,v 1.11 2010/09/23 19:12:29 bbantwal Exp $ */
/*
** Portions Copyright (C) 1998-2010 Sourcefire, Inc.
**
@@ -81,7 +80,7 @@
{
DAQ_Dict* entry;
- impl->proto = PF_INET;
+ impl->proto = PF_INET; // TBD add ip6 support when ipfw does
impl->port = DEFAULT_PORT;
for ( entry = cfg->values; entry; entry = entry->next)
@@ -138,7 +137,7 @@
__FUNCTION__);
return DAQ_ERROR_NOMEM;
}
-
+
if ( ipfw_daq_get_setup(impl, cfg, errBuf, errMax) != DAQ_SUCCESS )
{
ipfw_daq_shutdown(impl);
@@ -180,14 +179,14 @@
{
IpfwImpl* impl = (IpfwImpl*)handle;
struct sfbpf_program fcode;
-
- if ( sfbpf_compile(impl->snaplen, DLT_RAW, &fcode, filter, 1, 0) < 0 )
+
+ if ( sfbpf_compile(impl->snaplen, DLT_IPV4, &fcode, filter, 1, 0) < 0 )
{
// FIXTHIS is errno set?
// XICHE: No, which is why relying on strerror for everything is bad.
return DAQ_ERROR;
}
-
+
if ( impl->filter )
free((void *)impl->filter);
@@ -213,7 +212,7 @@
return DAQ_ERROR;
}
- if ( bind(impl->sock, (struct sockaddr *)&impl->sin, sizeof(impl->sin)) == -1 )
+ if ( bind(impl->sock, (struct sockaddr *)&impl->sin, sizeof(impl->sin)) == -1 )
{
DPE(impl->error, "%s: can't bind divert socket (%s)\n",
__FUNCTION__, strerror(errno));
@@ -293,11 +292,11 @@
struct timeval tv;
tv.tv_usec = 0;
- // If cnt is <= 0, don't limit the packets acquired. However,
+ // If cnt is <= 0, don't limit the packets acquired. However,
// impl->count = 0 has a special meaning, so interpret accordingly.
impl->count = (cnt == 0) ? -1 : cnt;
- while ( impl->count < 0 || n < impl->count )
+ while ( impl->count < 0 || n < impl->count )
{
FD_ZERO(&fdset);
FD_SET(impl->sock, &fdset);
@@ -312,7 +311,7 @@
return DAQ_ERROR;
}
- if (FD_ISSET(impl->sock, &fdset))
+ if (FD_ISSET(impl->sock, &fdset))
{
socklen_t sinlen = sizeof(impl->sin);
ssize_t pktlen;
@@ -399,7 +398,7 @@
static int ipfw_daq_get_datalink_type(void *handle)
{
- return DLT_RAW;
+ return DLT_IPV4;
}
static const char* ipfw_daq_get_errbuf (void* handle)
@@ -422,7 +421,7 @@
//-------------------------------------------------------------------------
#ifdef BUILDING_SO
-SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
+DAQ_SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
#else
DAQ_Module_t ipfw_daq_module_data =
#endif
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/daq_ipq.c
^
|
| @@ -1,4 +1,3 @@
-/* $Id: daq_ipq.c,v 1.17 2010/09/23 19:12:29 bbantwal Exp $ */
/*
** Portions Copyright (C) 1998-2010 Sourcefire, Inc.
**
@@ -32,18 +31,24 @@
#include <netinet/ip.h>
+#ifdef HAVE_DUMBNET_H
+#include <dumbnet.h>
+#else
#include <dnet.h>
+#endif
#include <linux/netfilter.h>
#include <libipq.h>
#include "daq_api.h"
#include "sfbpf.h"
-#define DAQ_MOD_VERSION 2
+#define DAQ_MOD_VERSION 5
#define DAQ_TYPE (DAQ_TYPE_INTF_CAPABLE | DAQ_TYPE_INLINE_CAPABLE | \
DAQ_TYPE_MULTI_INSTANCE | DAQ_TYPE_NO_UNPRIV)
+#define MSG_BUF_SIZE (sizeof(ipq_packet_msg_t) + IP_MAXPACKET)
+
typedef struct {
int proto;
char* device;
@@ -58,16 +63,15 @@
uint8_t* buf;
char error[DAQ_ERRBUF_SIZE];
- int count;
+ volatile int count;
int passive;
- unsigned snaplen;
+ uint32_t snaplen;
unsigned timeout;
DAQ_State state;
DAQ_Stats_t stats;
} IpqImpl;
-static void SetPktHdr(ipq_packet_msg_t*, DAQ_PktHdr_t*);
static void ipq_daq_shutdown(void* handle);
//-------------------------------------------------------------------------
@@ -153,11 +157,11 @@
IpqImpl* impl = calloc(1, sizeof(*impl));
if ( !impl )
- {
+ {
snprintf(errBuf, errMax, "%s: failed to allocate the ipq context!",
__FUNCTION__);
return DAQ_ERROR_NOMEM;
- }
+ }
if ( ipq_daq_get_setup(impl, cfg, errBuf, errMax) != DAQ_SUCCESS )
{
@@ -165,15 +169,15 @@
return DAQ_ERROR;
}
- impl->buf = malloc(sizeof(ipq_packet_msg_t) + impl->snaplen);
+ impl->buf = malloc(MSG_BUF_SIZE);
if ( !impl->buf )
- {
+ {
snprintf(errBuf, errMax, "%s: failed to allocate the ipq buffer!",
__FUNCTION__);
ipq_daq_shutdown(impl);
return DAQ_ERROR_NOMEM;
- }
+ }
// remember to also link in, eg:
// iptables -A OUTPUT -p icmp -j QUEUE
@@ -186,8 +190,10 @@
ipq_daq_shutdown(impl);
return DAQ_ERROR;
}
-
- status = ipq_set_mode(impl->ipqh, IPQ_COPY_PACKET, impl->snaplen);
+
+ // copy both packet metadata and packet payload
+ // paket payload is limited to IP_MAXPACKET
+ status = ipq_set_mode(impl->ipqh, IPQ_COPY_PACKET, IP_MAXPACKET);
if ( status < 0 )
{
@@ -253,9 +259,15 @@
//-------------------------------------------------------------------------
static void SetPktHdr(
- ipq_packet_msg_t* m, DAQ_PktHdr_t* phdr)
+ IpqImpl* impl, ipq_packet_msg_t* m, DAQ_PktHdr_t* phdr)
{
- if ( !m->timestamp_sec )
+ // if ipq fails to provide a timestamp, we fall back on tod
+ if ( m->timestamp_sec && (m->timestamp_sec != 0) )
+ {
+ phdr->ts.tv_sec = m->timestamp_sec;
+ phdr->ts.tv_usec = m->timestamp_usec;
+ }
+ else
{
struct timeval t;
gettimeofday(&t, NULL);
@@ -263,12 +275,7 @@
phdr->ts.tv_sec = t.tv_sec;
phdr->ts.tv_usec = t.tv_usec;
}
- else
- {
- phdr->ts.tv_sec = m->timestamp_sec;
- phdr->ts.tv_usec = m->timestamp_usec;
- }
- phdr->caplen = m->data_len;
+ phdr->caplen = (m->data_len <= impl->snaplen) ? m->data_len : impl->snaplen;
phdr->pktlen = m->data_len;
}
@@ -283,7 +290,7 @@
int n = 0;
DAQ_PktHdr_t hdr;
- // If cnt is <= 0, don't limit the packets acquired. However,
+ // If cnt is <= 0, don't limit the packets acquired. However,
// impl->count = 0 has a special meaning, so interpret accordingly.
impl->count = (cnt == 0) ? -1 : cnt;
hdr.device_index = 0;
@@ -292,7 +299,7 @@
while ( impl->count < 0 || n < impl->count )
{
int ipqt, status = ipq_read(
- impl->ipqh, impl->buf, impl->snaplen, impl->timeout);
+ impl->ipqh, impl->buf, MSG_BUF_SIZE, impl->timeout);
if ( status <= 0 )
{
@@ -311,7 +318,7 @@
{
DAQ_Verdict verdict;
ipq_packet_msg_t* ipqm = ipq_get_packet(impl->buf);
- SetPktHdr(ipqm, &hdr);
+ SetPktHdr(impl, ipqm, &hdr);
impl->stats.hw_packets_received++;
if (
@@ -387,7 +394,7 @@
else if ( impl->net )
sent = ip_send(impl->net, buf, len);
- if ( sent != len )
+ if ( (uint32_t)sent != len )
{
DPE(impl->error, "%s: failed to send",
__FUNCTION__);
@@ -403,14 +410,15 @@
{
IpqImpl* impl = (IpqImpl*)handle;
struct sfbpf_program fcode;
-
- if (sfbpf_compile(impl->snaplen, DLT_RAW, &fcode, filter, 1, 0) < 0)
+ int dlt = (impl->proto == PF_INET) ? DLT_IPV4 : DLT_IPV6;
+
+ if (sfbpf_compile(impl->snaplen, dlt, &fcode, filter, 1, 0) < 0)
{
DPE(impl->error, "%s: failed to compile '%s'",
__FUNCTION__, filter);
return DAQ_ERROR;
}
-
+
if ( impl->filter )
free((void *)impl->filter);
@@ -482,7 +490,9 @@
static int ipq_daq_get_datalink_type(void *handle)
{
- return DLT_RAW;
+ IpqImpl* impl = (IpqImpl*)handle;
+ int dlt = (impl->proto == PF_INET) ? DLT_IPV4 : DLT_IPV6;
+ return dlt;
}
static const char* ipq_daq_get_errbuf (void* handle)
@@ -505,7 +515,7 @@
//-------------------------------------------------------------------------
#ifdef BUILDING_SO
-SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
+DAQ_SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
#else
DAQ_Module_t ipq_daq_module_data =
#endif
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/daq_nfq.c
^
|
| @@ -1,4 +1,3 @@
-/* $Id: daq_nfq.c,v 1.15 2010/09/23 19:12:29 bbantwal Exp $ */
/*
** Portions Copyright (C) 1998-2010 Sourcefire, Inc.
**
@@ -32,31 +31,42 @@
#include <netinet/ip.h>
+#ifdef HAVE_DUMBNET_H
+#include <dumbnet.h>
+#else
#include <dnet.h>
+#endif
#include <linux/netfilter.h>
#include <libnetfilter_queue/libnetfilter_queue.h>
#include "daq_api.h"
#include "sfbpf.h"
-#define DAQ_MOD_VERSION 2
+#define DAQ_MOD_VERSION 6
#define DAQ_NAME "nfq"
#define DAQ_TYPE (DAQ_TYPE_INTF_CAPABLE | DAQ_TYPE_INLINE_CAPABLE | \
DAQ_TYPE_MULTI_INSTANCE | DAQ_TYPE_NO_UNPRIV)
+// FIXTHIS meta data is 80 bytes on my test platform but who knows?
+// documentation is poor; need correct way to size meta data
+// erring on the high side here to avoid truncation errors
+#define META_DATA_SIZE 512
+
+#define MSG_BUF_SIZE META_DATA_SIZE + IP_MAXPACKET
+
typedef struct
{
int protos, sock, qid;
int qlen;
-
+
struct nfq_handle* nf_handle;
struct nfq_q_handle* nf_queue;
-
+
const char* device;
char* filter;
struct sfbpf_program fcode;
-
+
ip_t* net;
eth_t* link;
@@ -64,9 +74,9 @@
void* user_data;
DAQ_Analysis_Func_t user_func;
- int count;
+ volatile int count;
int passive;
- unsigned snaplen;
+ uint32_t snaplen;
unsigned timeout;
char error[DAQ_ERRBUF_SIZE];
@@ -95,10 +105,11 @@
if ( !strncasecmp(s, "ip6", 3) )
return 0x2;
-
+#if 0
+ // doesn't look like both can be handled simultaneously
if ( !strncasecmp(s, "ip*", 3) )
return 0x3;
-
+#endif
return 0;
}
@@ -175,7 +186,7 @@
}
impl->snaplen = cfg->snaplen ? cfg->snaplen : IP_MAXPACKET;
- impl->timeout = cfg->timeout;
+ impl->timeout = cfg->timeout / 1000; // convert ms to secs
impl->passive = ( cfg->mode == DAQ_MODE_PASSIVE );
return DAQ_SUCCESS;
@@ -193,7 +204,7 @@
}
// setup internal stuff
NfqImpl *impl = calloc(1, sizeof(*impl));
-
+
if ( !impl )
{
snprintf(errBuf, errMax, "%s: failed to allocate nfq context\n",
@@ -207,7 +218,7 @@
return DAQ_ERROR;
}
- if ( (impl->buf = malloc(impl->snaplen)) == NULL )
+ if ( (impl->buf = malloc(MSG_BUF_SIZE)) == NULL )
{
snprintf(errBuf, errMax, "%s: failed to allocate nfq buffer\n",
__FUNCTION__);
@@ -224,14 +235,14 @@
nfq_daq_shutdown(impl);
return DAQ_ERROR;
}
-
+
// 2. now use the new q handle to rip the rug out from other
- // nfq users / handles? actually that doesn't seem to
+ // nfq users / handles? actually that doesn't seem to
// happen which is good, but then why is this *supposed*
// to be necessary? especially since we haven't bound to
// a qid yet, and that is exclusive anyway.
if (
- (IP4(impl) && nfq_unbind_pf(impl->nf_handle, PF_INET) < 0) ||
+ (IP4(impl) && nfq_unbind_pf(impl->nf_handle, PF_INET) < 0) ||
(IP6(impl) && nfq_unbind_pf(impl->nf_handle, PF_INET6) < 0) )
{
snprintf(errBuf, errMax, "%s: failed to unbind protocols for nfq\n",
@@ -239,7 +250,7 @@
//nfq_daq_shutdown(impl);
//return DAQ_ERROR;
}
-
+
// 3. select protocols for the q handle
// this is necessary but insufficient because we still
// must configure iptables externally, eg:
@@ -250,9 +261,9 @@
// :( iptables rules should be managed automatically to avoid
// queueing packets to nowhere or waiting for packets that
// will never come. (ie this bind should take the -p, -s,
- // etc args you can pass to iptables and create the dang
+ // etc args you can pass to iptables and create the dang
// rule!)
- if (
+ if (
(IP4(impl) && nfq_bind_pf(impl->nf_handle, PF_INET) < 0) ||
(IP6(impl) && nfq_bind_pf(impl->nf_handle, PF_INET6) < 0) )
{
@@ -275,16 +286,16 @@
nfq_daq_shutdown(impl);
return DAQ_ERROR;
}
-
+
// 5. configure copying for maximum overhead
- if ( nfq_set_mode(impl->nf_queue, NFQNL_COPY_PACKET, 0xffff) < 0 )
+ if ( nfq_set_mode(impl->nf_queue, NFQNL_COPY_PACKET, IP_MAXPACKET) < 0 )
{
snprintf(errBuf, errMax, "%s: unable to set packet copy mode\n",
__FUNCTION__);
nfq_daq_shutdown(impl);
return DAQ_ERROR;
}
-
+
// 6. set queue length (optional)
if ( impl->qlen > 0 &&
nfq_set_queue_maxlen(impl->nf_queue, impl->qlen))
@@ -298,12 +309,12 @@
// 7. get the q socket descriptor
// (after getting not 1 but 2 handles!)
impl->sock = nfq_fd(impl->nf_handle);
-
+
// setup output stuff
// we've got 2 handles and a socket descriptor but, incredibly,
// no way to inject?
if ( impl->device && strcasecmp(impl->device, "ip") )
- {
+ {
impl->link = eth_open(impl->device);
if ( !impl->link )
@@ -313,9 +324,9 @@
nfq_daq_shutdown(impl);
return DAQ_ERROR;
}
- }
+ }
else
- {
+ {
impl->net = ip_open();
if ( !impl->net )
@@ -324,7 +335,17 @@
nfq_daq_shutdown(impl);
return DAQ_ERROR;
}
- }
+ }
+
+ // from Florign Westphal ...
+ // tell kernel that we do not need to know about queue overflows.
+ // Without this, read operations on the netlink socket will fail
+ // with ENOBUFS on queue overrun.
+ {
+ int option = 1;
+ setsockopt(impl->sock, SOL_NETLINK, NETLINK_NO_ENOBUFS,
+ &option, sizeof(option));
+ }
impl->state = DAQ_STATE_INITIALIZED;
@@ -337,10 +358,11 @@
static void nfq_daq_shutdown (void* handle)
{
NfqImpl *impl = (NfqImpl*)handle;
-
+ impl->state = DAQ_STATE_UNINITIALIZED;
+
if (impl->nf_queue)
nfq_destroy_queue(impl->nf_queue);
-
+
// note that we don't unbind here because
// we will unbind other programs too
@@ -365,7 +387,8 @@
//-------------------------------------------------------------------------
static inline int SetPktHdr (
- struct nfq_data* nfad,
+ NfqImpl* impl,
+ struct nfq_data* nfad,
DAQ_PktHdr_t* hdr,
uint8_t** pkt
) {
@@ -374,11 +397,14 @@
if ( len <= 0 )
return -1;
- hdr->caplen = len;
- hdr->pktlen = len;
+ hdr->caplen = ((uint32_t)len <= impl->snaplen) ? (uint32_t)len : impl->snaplen;
+ hdr->pktlen = len;
hdr->flags = 0;
- nfq_get_timestamp(nfad, &hdr->ts);
+ // if nfq fails to provide a timestamp, we fall back on tod
+ if ( nfq_get_timestamp(nfad, &hdr->ts) )
+ gettimeofday(&hdr->ts, NULL);
+
hdr->device_index = nfq_get_physindev(nfad);
return 0;
@@ -392,7 +418,7 @@
static int daq_nfq_callback(
struct nfq_q_handle* qh,
struct nfgenmsg* nfmsg,
- struct nfq_data* nfad,
+ struct nfq_data* nfad,
void* data)
{
NfqImpl *impl = (NfqImpl*)data;
@@ -404,7 +430,10 @@
int nf_verdict;
uint32_t data_len;
- if ( !ph || SetPktHdr(nfad, &hdr, &pkt) )
+ if ( impl->state != DAQ_STATE_STARTED )
+ return -1;
+
+ if ( !ph || SetPktHdr(impl, nfad, &hdr, &pkt) )
{
DPE(impl->error, "%s: can't setup packet header",
__FUNCTION__);
@@ -428,7 +457,7 @@
data_len = ( verdict == DAQ_VERDICT_REPLACE ) ? hdr.caplen : 0;
nfq_set_verdict(
- impl->nf_queue, ntohl(ph->packet_id),
+ impl->nf_queue, ntohl(ph->packet_id),
nf_verdict, data_len, pkt);
return 0;
@@ -460,7 +489,7 @@
struct timeval tv;
tv.tv_usec = 0;
- // If c is <= 0, don't limit the packets acquired. However,
+ // If c is <= 0, don't limit the packets acquired. However,
// impl->count = 0 has a special meaning, so interpret accordingly.
impl->count = (c == 0) ? -1 : c;
impl->user_data = user;
@@ -485,9 +514,9 @@
return DAQ_ERROR;
}
- if (FD_ISSET(impl->sock, &fdset))
+ if (FD_ISSET(impl->sock, &fdset))
{
- int len = recv(impl->sock, impl->buf, impl->snaplen, 0);
+ int len = recv(impl->sock, impl->buf, MSG_BUF_SIZE, 0);
if ( len > 0)
{
@@ -504,7 +533,7 @@
}
n++;
}
- }
+ }
}
return 0;
}
@@ -540,14 +569,15 @@
{
NfqImpl* impl = (NfqImpl*)handle;
struct sfbpf_program fcode;
-
- if (sfbpf_compile(impl->snaplen, DLT_RAW, &fcode, filter, 1, 0) < 0)
+ int dlt = IP4(impl) ? DLT_IPV4 : DLT_IPV6;
+
+ if (sfbpf_compile(impl->snaplen, dlt, &fcode, filter, 1, 0) < 0)
{
DPE(impl->error, "%s: failed to compile bpf '%s'",
__FUNCTION__, filter);
return DAQ_ERROR;
}
-
+
if ( impl->filter )
free((void *)impl->filter);
@@ -619,7 +649,9 @@
static int nfq_daq_get_datalink_type(void *handle)
{
- return DLT_RAW;
+ NfqImpl* impl = (NfqImpl*)handle;
+ int dlt = IP4(impl) ? DLT_IPV4 : DLT_IPV6;
+ return dlt;
}
static const char* nfq_daq_get_errbuf (void* handle)
@@ -642,7 +674,7 @@
//-------------------------------------------------------------------------
#ifdef BUILDING_SO
-SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
+DAQ_SO_PUBLIC DAQ_Module_t DAQ_MODULE_DATA =
#else
DAQ_Module_t nfq_daq_module_data =
#endif
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/os-daq-modules/daq_pcap.c
^
|
| @@ -216,7 +216,7 @@
for (entry = config->values; entry; entry = entry->next)
{
if (!strcmp(entry->key, "buffer_size"))
- context->buffer_size = strtol(entry->key, NULL, 10);
+ context->buffer_size = strtol(entry->value, NULL, 10);
}
/* Try to account for legacy PCAP_FRAMES environment variable if we weren't passed a buffer size. */
if (context->buffer_size == 0)
@@ -332,7 +332,7 @@
free(context->filter_string);
context->filter_string = NULL;
}
-
+
context->state = DAQ_STATE_STARTED;
return DAQ_SUCCESS;
@@ -544,9 +544,9 @@
}
#ifdef BUILDING_SO
-SO_PUBLIC const DAQ_Module_t DAQ_MODULE_DATA =
+DAQ_SO_PUBLIC const DAQ_Module_t DAQ_MODULE_DATA =
#else
-const DAQ_Module_t pcap_daq_module_data =
+const DAQ_Module_t pcap_daq_module_data =
#endif
{
#ifndef WIN32
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/sfbpf/Makefile.am
^
|
| @@ -37,20 +37,20 @@
sfbpf-int.c \
runlex.sh
-nodist_libsfbpf_la_SOURCES = sf_grammar.c sf_scanner.c tokdefs.h
+nodist_libsfbpf_la_SOURCES = ${builddir}/sf_grammar.c ${builddir}/sf_scanner.c ${builddir}/tokdefs.h
libsfbpf_la_CFLAGS = -Dyylval=sfbpf_lval
libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
# use of $@ and $< here is a GNU idiom that borks BSD
-sf_scanner.c: scanner.l
- @rm -f sf_scanner.c
- ./runlex.sh $(V_LEX) -osf_scanner.c scanner.l
+${builddir}/sf_scanner.c: scanner.l
+ @rm -f ${builddir}/sf_scanner.c
+ ${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c $<
-tokdefs.h sf_grammar.c: grammar.y
- @rm -f sf_grammar.c tokdefs.h
- $(V_YACC) -d grammar.y
+${builddir}/tokdefs.h ${builddir}/sf_grammar.c: grammar.y
+ @rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h
+ $(V_YACC) -d $<
mv y.tab.c sf_grammar.c
mv y.tab.h tokdefs.h
-CLEANFILES = sf_scanner.c sf_grammar.c tokdefs.h sf_scanner.h
+CLEANFILES = ${builddir}/sf_scanner.c ${builddir}/sf_grammar.c ${builddir}/tokdefs.h ${builddir}/sf_scanner.h
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/sfbpf/Makefile.in
^
|
| @@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -119,6 +119,7 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DNET_LDFLAGS = @DNET_LDFLAGS@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -162,6 +163,7 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STATIC_LIBS = @STATIC_LIBS@
STRIP = @STRIP@
VERSION = @VERSION@
V_LEX = @V_LEX@
@@ -254,10 +256,10 @@
sfbpf-int.c \
runlex.sh
-nodist_libsfbpf_la_SOURCES = sf_grammar.c sf_scanner.c tokdefs.h
+nodist_libsfbpf_la_SOURCES = ${builddir}/sf_grammar.c ${builddir}/sf_scanner.c ${builddir}/tokdefs.h
libsfbpf_la_CFLAGS = -Dyylval=sfbpf_lval
libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
-CLEANFILES = sf_scanner.c sf_grammar.c tokdefs.h sf_scanner.h
+CLEANFILES = ${builddir}/sf_scanner.c ${builddir}/sf_grammar.c ${builddir}/tokdefs.h ${builddir}/sf_scanner.h
all: all-am
.SUFFIXES:
@@ -404,19 +406,19 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -c -o libsfbpf_la-sfbpf-int.lo `test -f 'sfbpf-int.c' || echo '$(srcdir)/'`sfbpf-int.c
-libsfbpf_la-sf_grammar.lo: sf_grammar.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -MT libsfbpf_la-sf_grammar.lo -MD -MP -MF $(DEPDIR)/libsfbpf_la-sf_grammar.Tpo -c -o libsfbpf_la-sf_grammar.lo `test -f 'sf_grammar.c' || echo '$(srcdir)/'`sf_grammar.c
+libsfbpf_la-sf_grammar.lo: ${builddir}/sf_grammar.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -MT libsfbpf_la-sf_grammar.lo -MD -MP -MF $(DEPDIR)/libsfbpf_la-sf_grammar.Tpo -c -o libsfbpf_la-sf_grammar.lo `test -f '${builddir}/sf_grammar.c' || echo '$(srcdir)/'`${builddir}/sf_grammar.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsfbpf_la-sf_grammar.Tpo $(DEPDIR)/libsfbpf_la-sf_grammar.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sf_grammar.c' object='libsfbpf_la-sf_grammar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${builddir}/sf_grammar.c' object='libsfbpf_la-sf_grammar.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -c -o libsfbpf_la-sf_grammar.lo `test -f 'sf_grammar.c' || echo '$(srcdir)/'`sf_grammar.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -c -o libsfbpf_la-sf_grammar.lo `test -f '${builddir}/sf_grammar.c' || echo '$(srcdir)/'`${builddir}/sf_grammar.c
-libsfbpf_la-sf_scanner.lo: sf_scanner.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -MT libsfbpf_la-sf_scanner.lo -MD -MP -MF $(DEPDIR)/libsfbpf_la-sf_scanner.Tpo -c -o libsfbpf_la-sf_scanner.lo `test -f 'sf_scanner.c' || echo '$(srcdir)/'`sf_scanner.c
+libsfbpf_la-sf_scanner.lo: ${builddir}/sf_scanner.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -MT libsfbpf_la-sf_scanner.lo -MD -MP -MF $(DEPDIR)/libsfbpf_la-sf_scanner.Tpo -c -o libsfbpf_la-sf_scanner.lo `test -f '${builddir}/sf_scanner.c' || echo '$(srcdir)/'`${builddir}/sf_scanner.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libsfbpf_la-sf_scanner.Tpo $(DEPDIR)/libsfbpf_la-sf_scanner.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sf_scanner.c' object='libsfbpf_la-sf_scanner.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${builddir}/sf_scanner.c' object='libsfbpf_la-sf_scanner.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -c -o libsfbpf_la-sf_scanner.lo `test -f 'sf_scanner.c' || echo '$(srcdir)/'`sf_scanner.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsfbpf_la_CFLAGS) $(CFLAGS) -c -o libsfbpf_la-sf_scanner.lo `test -f '${builddir}/sf_scanner.c' || echo '$(srcdir)/'`${builddir}/sf_scanner.c
mostlyclean-libtool:
-rm -f *.lo
@@ -649,13 +651,13 @@
# use of $@ and $< here is a GNU idiom that borks BSD
-sf_scanner.c: scanner.l
- @rm -f sf_scanner.c
- ./runlex.sh $(V_LEX) -osf_scanner.c scanner.l
-
-tokdefs.h sf_grammar.c: grammar.y
- @rm -f sf_grammar.c tokdefs.h
- $(V_YACC) -d grammar.y
+${builddir}/sf_scanner.c: scanner.l
+ @rm -f ${builddir}/sf_scanner.c
+ ${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c $<
+
+${builddir}/tokdefs.h ${builddir}/sf_grammar.c: grammar.y
+ @rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h
+ $(V_YACC) -d $<
mv y.tab.c sf_grammar.c
mv y.tab.h tokdefs.h
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/sfbpf/sf-redefines.h
^
|
| @@ -1,10 +1,6 @@
#ifndef _SF_REDEFINES
#define _SF_REDEFINES
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#define gen_loadi sf_gen_loadi
#define gen_load sf_gen_load
#define gen_loadlen sf_gen_loadlen
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/sfbpf/sf_bpf_filter.c
^
|
| @@ -42,7 +42,7 @@
#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
static const char rcsid[] =
- "@(#) $Header: /usr/cvsroot/sfeng/ims/src/libraries/daq/daq/sfbpf/sf_bpf_filter.c,v 1.2 2010/05/06 19:13:25 maltizer Exp $ (LBL)";
+ "@(#) $Header: /usr/cvsroot/sfeng/ims/src/libraries/daq/daq/sfbpf/sf_bpf_filter.c,v 1.2.28.1 2011/05/13 19:50:42 rdempster Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -210,7 +210,7 @@
* For the kernel, p is assumed to be a pointer to an mbuf if buflen is 0,
* in all other cases, p is a pointer to a buffer and buflen is its size.
*/
-SO_PUBLIC u_int bpf_filter(pc, p, wirelen, buflen)
+DAQ_SO_PUBLIC u_int bpf_filter(pc, p, wirelen, buflen)
register const struct bpf_insn *pc;
register const u_char *p;
u_int wirelen;
@@ -545,7 +545,7 @@
* The kernel needs to be able to verify an application's filter code.
* Otherwise, a bogus program could easily crash the system.
*/
-SO_PUBLIC int bpf_validate(f, len)
+DAQ_SO_PUBLIC int bpf_validate(f, len)
const struct bpf_insn *f;
int len;
{
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/sfbpf/sf_bpf_printer.c
^
|
| @@ -361,7 +361,7 @@
printf(" jt=%u jf=%u k=%u\n", inst->jt, inst->jf, inst->k);
}
-SO_PUBLIC void sfbpf_print(struct bpf_program *fp, int verbose)
+DAQ_SO_PUBLIC void sfbpf_print(struct bpf_program *fp, int verbose)
{
struct bpf_insn *bi;
unsigned int i;
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/sfbpf/sf_gencode.c
^
|
| @@ -23,7 +23,7 @@
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /usr/cvsroot/sfeng/ims/src/libraries/daq/daq/sfbpf/sf_gencode.c,v 1.3 2010/05/06 22:33:33 maltizer Exp $ (LBL)";
+ "@(#) $Header: /usr/cvsroot/sfeng/ims/src/libraries/daq/daq/sfbpf/sf_gencode.c,v 1.3.28.1 2011/05/13 19:50:42 rdempster Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -380,7 +380,7 @@
static int snaplen;
int no_optimize;
-SO_PUBLIC int pcap_compile(int snaplen_arg, int linktype_arg, struct bpf_program *program, const char *buf, int optimize, bpf_u_int32 mask)
+DAQ_SO_PUBLIC int pcap_compile(int snaplen_arg, int linktype_arg, struct bpf_program *program, const char *buf, int optimize, bpf_u_int32 mask)
{
extern int n_errors;
const char *volatile xbuf = buf;
@@ -441,7 +441,7 @@
* Clean up a "struct bpf_program" by freeing all the memory allocated
* in it.
*/
-SO_PUBLIC void pcap_freecode(struct bpf_program *program)
+DAQ_SO_PUBLIC void pcap_freecode(struct bpf_program *program)
{
program->bf_len = 0;
if (program->bf_insns != NULL)
@@ -1051,7 +1051,7 @@
return;
case DLT_PPI:
- /*
+ /*
* At the moment we treat PPI the same way that we treat
* normal Radiotap encoded packets. The difference is in
* the function that generates the code at the beginning
@@ -2358,7 +2358,7 @@
return (NULL);
}
-/*
+/*
* At the moment we treat PPI as normal Radiotap encoded
* packets. The difference is in the function that generates
* the code at the beginning to compute the header length.
@@ -2806,7 +2806,7 @@
return s;
}
-/*
+/*
* At the moment we treat PPI as normal Radiotap encoded
* packets. The difference is in the function that generates
* the code at the beginning to compute the header length.
@@ -8068,7 +8068,7 @@
return b1;
}
-/*
+/*
* Filtering for MTP2 messages based on li value
* FISU, length is null
* LSSU, length is 1 or 2
|
|
[-]
[+]
|
Changed |
daq-0.6.1.tar.bz2/sfbpf/sfbpf-int.h
^
|
| @@ -24,16 +24,12 @@
#ifndef _SFBPF_INT_H
#define _SFBPF_INT_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#ifdef HAVE_VISIBILITY
-# define SO_PUBLIC __attribute__ ((visibility("default")))
-# define SO_PRIVATE __attribute__ ((visibility("hidden")))
+# define DAQ_SO_PUBLIC __attribute__ ((visibility("default")))
+# define DAQ_SO_PRIVATE __attribute__ ((visibility("hidden")))
#else
-# define SO_PUBLIC
-# define SO_PRIVATE
+# define DAQ_SO_PUBLIC
+# define DAQ_SO_PRIVATE
#endif
#include "sfbpf.h"
|
