Remove inlcuded libpcap.

* libpcap: Remove
* INSTALL: Remove
* Makefile.am (SUBDIRS): Remove libpcap
* configure.ac: Remove libpcap
Use LOG_FACILITY instead of --with-log-facility
Raise version no. to 1.0.
* ylwrap: Remove.
* src/Makefile.am (ipacct_LDADD): Use -lpcap.
* src/ipacct.h: Do not include ip_var.h
* src/main.c: Do not include pcap-int.h
* src/run.c: Do not include pcap-int.h
(run): Use pcap_fileno.
* AUTHORS: Update
* ylwrap, INSTALL: Remove.

8 files changed, 45 insertions, 160 deletions

diff --git a/AUTHORS b/AUTHORS
index 73237d8..db7f07f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1 @@
-Sergey Poznyakoff <gray@farlep.net>
-
-NOTE: ipacct is distributed with the subdirectory libpcap, which is 
-      a separate package, not a part of ipacct proper. See file
-      libpcap/COPYING for details.	
+Sergey Poznyakoff <gray@gnu.org.ua>
diff --git a/ChangeLog b/ChangeLog
index 9c7468d..c4dfba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,2 +2,16 @@
 
+	Remove inlcuded libpcap.
+	
+	* libpcap: Remove
+	* INSTALL: Remove
+	* Makefile.am (SUBDIRS): Remove libpcap
+	* configure.ac: Remove libpcap
+	Use LOG_FACILITY instead of --with-log-facility
+	* ylwrap: Remove.
+	* src/Makefile.am (ipacct_LDADD): Use -lpcap.
+	* src/ipacct.h: Do not include ip_var.h
+	* src/main.c: Do not include pcap-int.h
+	* src/run.c: Do not include pcap-int.h
+	(run): Use pcap_fileno.
+
 	* src/main.c (parse_opt): Remove leftover uses of optarg.
diff --git a/Makefile.am b/Makefile.am
index 1ba1e23..4101da5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,3 +3,3 @@ ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS=libpcap lib src m4
+SUBDIRS=lib src m4
 EXTRA_DIST=ipacct.conf.example
diff --git a/configure.ac b/configure.ac
index 10fa942..a244400 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,3 +18,3 @@
 AC_PREREQ(2.53)
-AC_INIT(ipacct, 0.2, bug-ipacct@cvs.farlep.net) 
+AC_INIT(ipacct, 1.0, bug-ipacct@gnu.org.ua) 
 AC_CONFIG_SRCDIR(src/ipacct.h)
@@ -37,7 +37,5 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h malloc.h sys/ioccom.h sys/sockio.h getopt.h)
-AC_SUBST(INCLUDES)
-AC_CHECK_HEADERS(netinet/if_ether.h netinet/ip_var.h,
-	         [],
-		 [INCLUDES=-I'$(top_srcdir)/libpcap/linux-include'; break]) 
-
+AC_CHECK_HEADER(pcap.h,:,
+                [AC_MSG_ERROR([Required header pcap.h not found])])
+				  
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -55,2 +53,5 @@ AC_CHECK_LIB(socket, main)
 AC_CHECK_LIB(nsl, main)
+AC_CHECK_LIB(pcap, pcap_init,
+	     [LIBS="-lpcap $LIBS"],
+	     [AC_MSG_ERROR([Required library libpcap not found])])
 
@@ -99,140 +100,21 @@ fi
 
-dnl libpcap stuff
-dnl All the stuff below has been shamelessly stolen from libpcap-0.4
-dnl configure.in
-dnl
-dnl Not all versions of test support -c (character special) but it's a
-dnl better way of testing since the device might be protected. So we
-dnl check in our normal order using -r and then check the for the /dev
-dnl guys again using -c.
-dnl
-AC_SUBST(V_PCAP)
-AC_ARG_WITH(pcap, [  --with-pcap=TYPE        use packet capture TYPE])
-AC_MSG_CHECKING(packet capture type)
-if test ! -z "$with_pcap" ; then
-	V_PCAP="$withval"
-elif test -r /dev/bpf0 ; then
-	V_PCAP=bpf
-elif test -r /usr/include/net/pfilt.h ; then
-	V_PCAP=pf
-elif test -r /dev/enet ; then
-	V_PCAP=enet
-elif test -r /dev/nit ; then
-	V_PCAP=snit
-elif test -r /usr/include/sys/net/nit.h ; then
-	V_PCAP=nit
-elif test -r /usr/include/net/raw.h ; then
-	V_PCAP=snoop
-elif test -r /usr/include/sys/dlpi.h ; then
-	V_PCAP=dlpi
-elif test -r /usr/include/linux/socket.h ; then
-	V_PCAP=linux
-elif test -c /dev/bpf0 ; then		# check again in case not readable
-	V_PCAP=bpf
-elif test -c /dev/enet ; then		# check again in case not readable
-	V_PCAP=enet
-elif test -c /dev/nit ; then		# check again in case not readable
-	V_PCAP=snit
-else
-	V_PCAP=null
-fi
-AC_MSG_RESULT($V_PCAP)
-
-case "$V_PCAP" in
-
-dlpi)
-	AC_CHECK_HEADERS(sys/bufmod.h sys/dlpi_ext.h)
-	AC_MSG_CHECKING(for /dev/dlpi device)
-	if test -c /dev/dlpi ; then
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_DEV_DLPI,1,[Define this if you have /dev/dlpi])
-	else
-		AC_MSG_RESULT(no)
-		dir="/dev/dlpi"
-		AC_MSG_CHECKING(for $dir directory)
-		if test -d $dir ; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE_UNQUOTED(PCAP_DEV_PREFIX, "$dir",
-                                           [Path to pcap device])
-		else
-			AC_MSG_RESULT(no)
-		fi
-	fi
-	;;
-
-linux)
-	AC_CHECK_HEADERS(net/if_arp.h)
-	AC_MSG_CHECKING(Linux kernel version)
-	AC_CACHE_VAL(ac_cv_linux_vers,
-	    ac_cv_linux_vers=`uname -r 2>&1 | \
-		sed -n -e '$s/.* //' -e '$s/\..*//p'`)
-	AC_MSG_RESULT($ac_cv_linux_vers)
-	if test $ac_cv_linux_vers -lt 2 ; then
-		AC_MSG_ERROR(version 2 or higher required; see the INSTALL doc for more info)
-	fi
-	;;
-
-null)
-	AC_MSG_WARN(cannot determine packet capture interface)
-	AC_MSG_WARN((see the INSTALL doc for more info))
-	;;
-
-esac
-
-case "$target_os" in
-
-aix*)
-	AC_DEFINE(_SUN,1,[workarounds to enable certain features])
-	;;
-
-hpux9*)
-	AC_DEFINE(HAVE_HPUX9,1,[Define this if we are on a HP-UX 9 system])
-	;;
-
-hpux10.0*)
-	;;
-
-hpux10.1*)
-	;;
-
-hpux*)
-	dnl HPUX 10.20 and above is similar to HPUX 9...
-	AC_DEFINE(HAVE_HPUX10_20,1,[Define this if we are on a HP-UX 10.20 system])
-	;;
-
-sinix*)
-	AC_MSG_CHECKING(if SINIX compiler defines sinix)
-	AC_CACHE_VAL(ac_cv_cc_sinix_defined,
-		AC_TRY_COMPILE(
-		    [],
-		    [int i = sinix;],
-		    ac_cv_cc_sinix_defined=yes,
-		    ac_cv_cc_sinix_defined=no))
-	    AC_MSG_RESULT($ac_cv_cc_sinix_defined)
-	    if test $ac_cv_cc_sinix_defined = no ; then
-		    AC_DEFINE(sinix,1,[Define this if we are on a sinix system])
-	    fi
-	;;
-
-solaris*)
-	AC_DEFINE(HAVE_SOLARIS,1,[Define this if we are on a Solaris])
-	;;
-
-linux*)
-	V_INCLS="$V_INCLS -Ilinux-include"
-	;;
-esac
-
 AC_MSG_CHECKING(for log facility)
-log_facility="LOG_DAEMON"
-AC_ARG_WITH(log-facility,
- [  --with-log-facility=facility   enable logging to the given facility],
- AC_TRY_COMPILE([#include <syslog.h>], int lf = $withval,
-	log_facility=$withval))
-AC_DEFINE_UNQUOTED(LOGFACILITY, $log_facility,
+LOG_FACILITY="LOG_DAEMON"
+AC_ARG_VAR([LOG_FACILITY],
+	   [Default syslog facility])
+if test -n "$LOG_FACILITY"; then
+   logfacility=`echo $LOG_FACILITY | tr a-z A-Z`
+   case $logfacility in
+   USER|DAEMON|AUTH|AUTHPRIV|MAIL|CRON|LOCAL[[0-7]])
+      LOG_FACILITY=LOG_$logfacility;;
+   LOG_USER|LOG_DAEMON|LOG_AUTH|LOG_AUTHPRIV|LOG_MAIL|LOG_CRON|LOG_LOCAL[[0-7]])
+      LOG_FACILITY=$logfacility;;
+   *) AC_MSG_ERROR([Invalid value of LOG_FACILITY]);;
+   esac
+fi		      
+AC_DEFINE_UNQUOTED(LOGFACILITY, $LOG_FACILITY,
                    [The syslog facility to be used for diagnostics])
-AC_MSG_RESULT($log_facility)
-
+AC_MSG_RESULT($LOG_FACILITY)
 
-AC_OUTPUT(libpcap/Makefile lib/Makefile src/Makefile m4/Makefile Makefile)
+AC_OUTPUT(lib/Makefile src/Makefile m4/Makefile Makefile)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 46bbc49..34104d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,5 +4,5 @@ ipacct_SOURCES = main.c run.c utils.c iputil.c bpf_dump.c cons_raw.c \
                  config.y list.c 
-ipacct_LDADD = ../lib/libipacct.a ../libpcap/libpcap.a
+ipacct_LDADD = ../lib/libipacct.a
 noinst_HEADERS = ipacct.h report.h list.h
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/libpcap @INCLUDES@
+INCLUDES = -I$(top_srcdir)/lib 
 AM_CFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
diff --git a/src/ipacct.h b/src/ipacct.h
index df8869d..406dd90 100644
--- a/src/ipacct.h
+++ b/src/ipacct.h
@@ -16,3 +16,3 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* $Id: ipacct.h,v 1.6 2005/05/20 12:55:18 gray Exp $ */
+/* $Id: ipacct.h,v 1.7 2008/07/07 14:06:30 gray Exp $ */
 #include <sys/types.h>
@@ -22,5 +22,3 @@
 #include <netinet/ip.h>
-#include <netinet/ip_var.h>
 #include <netinet/udp.h>
-/*#include <netinet/udp_var.h>*/
 #include <net/if.h>
diff --git a/src/main.c b/src/main.c
index 6c72c38..9ad3d7e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,3 +16,3 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* $Id: main.c,v 1.10 2008/07/07 13:27:02 gray Exp $ */
+/* $Id: main.c,v 1.11 2008/07/07 14:06:30 gray Exp $ */
 #if defined(HAVE_CONFIG_H)
@@ -37,3 +37,2 @@
 #include <pcap.h>
-#include <pcap-int.h>
 #include <argp.h>
@@ -340,5 +339,2 @@ main(argc, argv)
 
-	if (pcap->fd < 0) 
-		die(1, "can't listen to %d", pcap->fd);
-
 	start_time = time(NULL);
diff --git a/src/run.c b/src/run.c
index 2a58ec5..b9c5356 100644
--- a/src/run.c
+++ b/src/run.c
@@ -16,3 +16,3 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* $Id: run.c,v 1.1 2001/05/31 13:40:56 gray Exp $ */
+/* $Id: run.c,v 1.2 2008/07/07 14:06:30 gray Exp $ */
 #if defined(HAVE_CONFIG_H)
@@ -27,3 +27,2 @@
 #include <pcap.h>
-#include <pcap-int.h>
 #include <netinet/in.h>
@@ -64,3 +63,3 @@ run(p, callback)
 
-	pfd = p->fd;
+	pfd = pcap_fileno(p);