Permalink
Browse files

Put the public libpcap headers into a pcap subdirectory in both the

source directory and the target include directory, and have include
files at the top-level directory to include those headers, for backwards
compatibility.

Update the FILES and INSTALL.txt files to reflect current reality.
  • Loading branch information...
1 parent 74e5b53 commit 084bcf12eae044b2d7f426bf12d64ec26433c874 @yuguy yuguy committed Oct 4, 2006
Showing with 1,231 additions and 1,204 deletions.
  1. +6 −1 FILES
  2. +12 −8 INSTALL.txt
  3. +19 −3 Makefile.in
  4. +2 −2 bpf/net/bpf_filter.c
  5. +2 −2 etherent.c
  6. +3 −3 gencode.c
  7. +2 −2 grammar.y
  8. +2 −2 nametoaddr.c
  9. +3 −3 pcap-bpf.c
  10. +2 −700 pcap-bpf.h
  11. +2 −2 pcap-enet.c
  12. +2 −2 pcap-linux.c
  13. +3 −53 pcap-namedb.h
  14. +3 −3 pcap-pf.c
  15. +1 −1 pcap-usb-linux.c
  16. +8 −287 pcap.h
  17. +740 −0 pcap/bpf.h
  18. +89 −0 pcap/namedb.h
  19. +324 −0 pcap/pcap.h
  20. 0 pcap-usb.h → pcap/usb.h
  21. +2 −2 pcap1.h
  22. +2 −2 savefile.c
  23. +2 −2 scanner.l
  24. +0 −124 sll.h
View
@@ -74,6 +74,11 @@ nlpid.h
optimize.c
packaging/pcap.spec
packaging/pcap.spec.in
+pcap/bpf.h
+pcap/namedb.h
+pcap/pcap.h
+pcap/sll.h
+pcap/usb.h
pcap-bpf.c
pcap-bpf.h
pcap-dag.c
@@ -95,6 +100,7 @@ pcap-septel.h
pcap-stdinc.h
pcap-snit.c
pcap-snoop.c
+pcap-usb-linux.c
pcap-win32.c
pcap.3
pcap.c
@@ -103,7 +109,6 @@ pf.h
ppp.h
savefile.c
scanner.l
-sll.h
sunatmpos.h
Win32/Include/Gnuc.h
Win32/Include/addrinfo.h
View
@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.15 2005-08-10 06:19:06 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.16 2006-10-04 18:09:22 guy Exp $ (LBL)
To build libpcap, run "./configure" (a shell script). The configure
script will determine your system attributes and generate an
@@ -350,8 +350,13 @@ nlpid.h - OSI network layer protocol identifier definitions
net - symlink to bpf/net
optimize.c - BPF optimization routines
packaging - packaging information for building libpcap RPMs
+pcap/pcap-bpf.h - BPF definitions
+pcap/namedb.h - public libpcap name database definitions
+pcap/pcap.h - public libpcap definitions
+pcap/sll.h - public definition of DLT_LINUX_SLL header
+pcap/usb.h - public definition of DLT_USB headeer
pcap-bpf.c - BSD Packet Filter support
-pcap-bpf.h - BPF definitions
+pcap-bpf.h - header for backwards compatibility
pcap-dag.c - Endace DAG device capture support
pcap-dag.h - Endace DAG device capture support
pcap-dlpi.c - Data Link Provider Interface support
@@ -360,26 +365,25 @@ pcap-dos.h - headers for MS-DOS capture support
pcap-enet.c - enet support
pcap-int.h - internal libpcap definitions
pcap-linux.c - Linux packet socket support
-pcap-namedb.h - public libpcap name database definitions
+pcap-namedb.h - header for backwards compatibility
pcap-nit.c - SunOS Network Interface Tap support
pcap-nit.h - SunOS Network Interface Tap definitions
pcap-null.c - dummy monitor support (allows offline use of libpcap)
pcap-pf.c - Ultrix and Digital/Tru64 UNIX Packet Filter support
pcap-pf.h - Ultrix and Digital/Tru64 UNIX Packet Filter definitions
-pcap-septel.c - INTEL/Septel device capture support
-pcap-septel.h - INTEL/Septel device capture support
+pcap-septel.c - Intel/Septel device capture support
+pcap-septel.h - Intel/Septel device capture support
pcap-stdinc.h - includes and #defines for compiling on Win32 systems
pcap-snit.c - SunOS 4.x STREAMS-based Network Interface Tap support
pcap-snoop.c - IRIX Snoop network monitoring support
+pcap-usb-linux.c - USB capture support for Linux
pcap-win32.c - WinPcap capture support
pcap.3 - manual entry
pcap.c - pcap utility routines
-pcap.h - public libpcap definitions
+pcap.h - header for backwards compatibility
pf.h - OpenBSD DLT_PFLOG definitions
ppp.h - Point to Point Protocol definitions
-rawss7.h - information on DLT_ types for SS7
savefile.c - offline support
scanner.l - filter string scanner
-sll.h - definitions for Linux cooked mode fake link-layer header
sunatmpos.h - definitions for SunATM capturing
Win32 - headers and routines for building on Win32 systems
View
@@ -17,7 +17,7 @@
# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.103 2006-10-04 16:50:33 guy Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.104 2006-10-04 18:09:22 guy Exp $ (LBL)
#
# Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -186,13 +186,23 @@ install: libpcap.a
$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
[ -d $(DESTDIR)$(includedir) ] || \
(mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
+ [ -d $(DESTDIR)$(includedir)/pcap ] || \
+ (mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap)
+ $(INSTALL_DATA) $(srcdir)/pcap/pcap.h \
+ $(DESTDIR)$(includedir)/pcap/pcap.h
+ $(INSTALL_DATA) $(srcdir)/pcap/bpf.h \
+ $(DESTDIR)$(includedir)/pcap/bpf.h
+ $(INSTALL_DATA) $(srcdir)/pcap/namedb.h \
+ $(DESTDIR)$(includedir)/pcap/namedb.h
+ $(INSTALL_DATA) $(srcdir)/pcap/sll.h \
+ $(DESTDIR)$(includedir)/pcap/sll.h
+ $(INSTALL_DATA) $(srcdir)/pcap/usb.h \
+ $(DESTDIR)$(includedir)/pcap/usb.h
$(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
$(INSTALL_DATA) $(srcdir)/pcap-bpf.h \
$(DESTDIR)$(includedir)/pcap-bpf.h
$(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
$(DESTDIR)$(includedir)/pcap-namedb.h
- $(INSTALL_DATA) $(srcdir)/pcap-usb.h \
- $(DESTDIR)$(includedir)/pcap-usb.h
[ -d $(DESTDIR)$(mandir)/man3 ] || \
(mkdir -p $(DESTDIR)$(mandir)/man3; chmod 755 $(DESTDIR)$(mandir)/man3)
$(INSTALL_DATA) $(srcdir)/pcap.3 \
@@ -207,6 +217,12 @@ install-shared-dylib: libpcap.dylib
uninstall:
rm -f $(DESTDIR)$(libdir)/libpcap.a
+ rm -f $(DESTDIR)$(includedir)/pcap/pcap.h
+ rm -f $(DESTDIR)$(includedir)/pcap/bpf.h
+ rm -f $(DESTDIR)$(includedir)/pcap/namedb.h
+ rm -f $(DESTDIR)$(includedir)/pcap/sll.h
+ rm -f $(DESTDIR)$(includedir)/pcap/usb.h
+ -rmdir $(DESTDIR)$(includedir)/pcap
rm -f $(DESTDIR)$(includedir)/pcap.h
rm -f $(DESTDIR)$(includedir)/pcap-bpf.h
rm -f $(DESTDIR)$(includedir)/pcap-namedb.h
@@ -40,7 +40,7 @@
#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.44 2003-11-15 23:24:07 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.45 2006-10-04 18:09:22 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -71,7 +71,7 @@ static const char rcsid[] _U_ =
#endif /* WIN32 */
-#include <pcap-bpf.h>
+#include <pcap/bpf.h>
#if !defined(KERNEL) && !defined(_KERNEL)
#include <stdlib.h>
View
@@ -21,7 +21,7 @@
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/etherent.c,v 1.22 2003-11-15 23:23:57 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/etherent.c,v 1.23 2006-10-04 18:09:22 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -37,7 +37,7 @@ static const char rcsid[] _U_ =
#include "pcap-int.h"
-#include <pcap-namedb.h>
+#include <pcap/namedb.h>
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
View
@@ -21,7 +21,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.271 2006-10-04 16:47:46 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.272 2006-10-04 18:09:22 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -71,7 +71,7 @@ static const char rcsid[] _U_ =
#include "atmuni31.h"
#include "sunatmpos.h"
#include "ppp.h"
-#include "sll.h"
+#include "pcap/sll.h"
#include "arcnet.h"
#include "pf.h"
#ifndef offsetof
@@ -82,7 +82,7 @@ static const char rcsid[] _U_ =
#include <netdb.h> /* for "struct addrinfo" */
#endif /* WIN32 */
#endif /*INET6*/
-#include <pcap-namedb.h>
+#include <pcap/namedb.h>
#define ETHERMTU 1500
View
@@ -22,7 +22,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.92 2006-05-16 08:30:05 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.93 2006-10-04 18:09:22 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -53,7 +53,7 @@ struct rtentry;
#include "gencode.h"
#include "pf.h"
-#include <pcap-namedb.h>
+#include <pcap/namedb.h>
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
View
@@ -24,7 +24,7 @@
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.80 2005-04-20 11:12:36 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.81 2006-10-04 18:09:22 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -80,7 +80,7 @@ struct rtentry; /* declarations in <net/if.h> */
#include "pcap-int.h"
#include "gencode.h"
-#include <pcap-namedb.h>
+#include <pcap/namedb.h>
#ifdef HAVE_OS_PROTO_H
#include "os-proto.h"
View
@@ -20,7 +20,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.95 2006-01-22 05:28:12 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.96 2006-10-04 18:09:22 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -40,7 +40,7 @@ static const char rcsid[] _U_ =
#ifdef _AIX
/*
- * Make "pcap.h" not include "pcap-bpf.h"; we are going to include the
+ * Make "pcap.h" not include "pcap/bpf.h"; we are going to include the
* native OS version, as we need "struct bpf_config" from it.
*/
#define PCAP_DONT_INCLUDE_PCAP_BPF_H
@@ -571,7 +571,7 @@ bpf_open(pcap_t *p, char *errbuf)
}
/*
- * We include the OS's <net/bpf.h>, not our "pcap-bpf.h", so we probably
+ * We include the OS's <net/bpf.h>, not our "pcap/bpf.h", so we probably
* don't get DLT_DOCSIS defined.
*/
#ifndef DLT_DOCSIS
Oops, something went wrong.

0 comments on commit 084bcf1

Please sign in to comment.