Skip to content

Commit 77cade9

Browse files
committed
From Jesper Peterson <jesper@endace.com>: support for capturing from
Endace DAG devices.
1 parent 69c370f commit 77cade9

14 files changed

+906
-111
lines changed

CREDITS

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Additional people who have contributed patches:
3939
Jason R. Thorpe <thorpej@netbsd.org>
4040
Javier Achirica <achirica@ttd.net>
4141
Jefferson Ogata <jogata@nodc.noaa.gov>
42+
Jesper Peterson <jesper@endace.com>
4243
John Bankier <jbankier@rainfinity.com>
4344
Jon Lindgren <jonl@yubyub.net>
4445
Kazushi Sugyo <sugyo@pb.jp.nec.com>

FILES

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ nlpid.h
5050
optimize.c
5151
pcap-bpf.c
5252
pcap-bpf.h
53+
pcap-dag.c
54+
pcap-dag.h
5355
pcap-dlpi.c
5456
pcap-enet.c
5557
pcap-int.h

INSTALL.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.5 2003-03-11 06:23:52 guy Exp $ (LBL)
1+
@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.6 2003-07-23 05:29:19 guy Exp $ (LBL)
22

33
To build libpcap, run "./configure" (a shell script). The configure
44
script will determine your system attributes and generate an
@@ -334,6 +334,9 @@ nlpid.h - OSI network layer protocol identifier definitions
334334
net - symlink to bpf/net
335335
optimize.c - BPF optimization routines
336336
pcap-bpf.c - BSD Packet Filter support
337+
pcap-bpf.h - BPF definitions
338+
pcap-dag.c - Endace DAG device capture support
339+
pcap-dag.h - Endace DAG device capture support
337340
pcap-dlpi.c - Data Link Provider Interface support
338341
pcap-enet.c - enet support
339342
pcap-int.h - internal libpcap definitions

Makefile.in

+7-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
1818
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
1919
#
20-
# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.95 2003-02-21 03:19:19 guy Exp $ (LBL)
20+
# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.96 2003-07-23 05:29:20 guy Exp $ (LBL)
2121

2222
#
2323
# Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -44,7 +44,8 @@ VPATH = @srcdir@
4444
CC = @CC@
4545
CCOPT = @V_CCOPT@
4646
INCLS = -I. @V_INCLS@
47-
DEFS = @DEFS@
47+
DEFS = @DEFS@ @V_DEFS@
48+
LIBS = @V_LIBS@
4849

4950
# Standard CFLAGS
5051
CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
@@ -71,16 +72,17 @@ YACC = @V_YACC@
7172

7273
PSRC = pcap-@V_PCAP@.c
7374
FSRC = fad-@V_FINDALLDEVS@.c
75+
SSRC = @SSRC@
7476
CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \
7577
etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c
7678
GENSRC = scanner.c grammar.c version.c
7779
LIBOBJS = @LIBOBJS@
7880

79-
SRC = $(PSRC) $(FSRC) $(CSRC) $(GENSRC)
81+
SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
8082

8183
# We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
8284
# hack the extra indirection
83-
OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(GENSRC:.c=.o) # $(LIBOBJS)
85+
OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) # $(LIBOBJS)
8486
HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
8587
ethertype.h gencode.h gnuc.h
8688
GENHDR = \
@@ -98,7 +100,7 @@ all: libpcap.a
98100

99101
libpcap.a: $(OBJ)
100102
@rm -f $@
101-
ar rc $@ $(OBJ)
103+
ar rc $@ $(OBJ) $(LIBS)
102104
$(RANLIB) $@
103105

104106
scanner.c: $(srcdir)/scanner.l

config.h.in

+3
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@
8383
/* define if you have a /proc/net/dev */
8484
#undef HAVE_PROC_NET_DEV
8585

86+
/* define if you have a DAG API */
87+
#undef HAVE_DAG_API
88+
8689
/* define on AIX to get certain functions */
8790
#undef _SUN
8891

0 commit comments

Comments
 (0)