dc46dbc971
Fixed tcpdump.c to trace IP packets buried under VLAN headers. Changes 6.6.3: Added a function MissingData() in trace.c to check if TCP segments were missing or were truncated when the -e option is given to extract contents. Changes 6.6.4: Adding in the INBOUNDS module into the main tcptrace development tree. It is NOT built in by default though; you need to uncomment a line in Makefile.in to enable it. Changes 6.6.5: * Josh fixed the file format searching order, putting tcpdump format to the end in file_formats.h as a work around for libpcap brokenness. * Fixed Mfopen() in mfiles.c to open content data files that we generate in "binary" mode - by changing fopen mode from "w" to "wb+" and "a" to "ab+". The 'b' is dummy in UNIX systems, but seems to have some semantic in the Windows world. * Fixed QuitSig() function in tcptrace.c by adding a call to udptrace_done() so that we print out UDP connection stats too (if one were piping live tcpdump traffic to tcptrace and "ctrl-c"-ed it in the middle, for example). On the way, also fixed the arbitrary "buf[4096]" declaration to be written correctly as "buf[COMP_HDR_SIZE]" in the PipeFitting() function. Changes 6.6.6: Fixed the callback function in tcpdump.c to prevent garbage data from getting into the ip_buf buffer. Changes 6.6.7: Fixed bugs found in the AVL search function that had major bugs / complexity issues.
50 lines
1.6 KiB
Text
50 lines
1.6 KiB
Text
$NetBSD: patch-aa,v 1.8 2005/08/26 08:32:13 adam Exp $
|
|
|
|
--- Makefile.in.orig 2004-03-04 20:33:56.000000000 +0000
|
|
+++ Makefile.in
|
|
@@ -1,4 +1,4 @@
|
|
-#
|
|
+#
|
|
# Makefile for tcptrace
|
|
#
|
|
srcdir = @srcdir@
|
|
@@ -34,8 +34,8 @@ DEFINES += -DBUNZIP2="\"bunzip2\""
|
|
#
|
|
##################################################################
|
|
PCAP_LDLIBS = @V_PCAP_LDLIBS@
|
|
-PCAP_INCS = -I/usr/local/include -I. -I../pcap -I/usr/include/pcap
|
|
-PCAP_LDFLAGS = -L/usr/local/lib -Llib -Lpcap -L../pcap -L./cygwin-libs
|
|
+PCAP_INCS = -I.
|
|
+PCAP_LDFLAGS = -Llib -L./cygwin-libs
|
|
|
|
|
|
|
|
@@ -129,8 +129,8 @@ DEFINES += -DGROK_ERF
|
|
#
|
|
##################################################################
|
|
# Pathname of directory to install the binary
|
|
-BINDIR = /usr/local/bin
|
|
-MANDIR = /usr/local/man/
|
|
+BINDIR = ${PREFIX}/bin
|
|
+MANDIR = ${PREFIX}/man
|
|
|
|
|
|
##################################################################
|
|
@@ -151,7 +151,7 @@ INCLS = -I. @V_INCLS@ ${PCAP_INCS}
|
|
# Probably want full optimization
|
|
# FreeBSD needs -Ae
|
|
# HP needs -Ae
|
|
-CFLAGS = $(CCOPT) $(DEFINES) @DEFS@ @V_DEFINES@ $(INCLS)
|
|
+CFLAGS += $(CCOPT) $(DEFINES) @DEFS@ @V_DEFINES@ $(INCLS)
|
|
|
|
# Standard LIBS
|
|
LDLIBS = @LIBS@ ${PCAP_LDLIBS}
|
|
@@ -196,7 +196,7 @@ tcptrace: ${OFILES}
|
|
# your machine, just hack in a quick string below in place of the command.
|
|
version.o: ${CFILES} Makefile
|
|
${CC} ${CFLAGS} -o version.o -c $(srcdir)/version.c \
|
|
- -DBUILT_USER="\"`whoami`\"" -DBUILT_HOST="\"`hostname`\"" -DBUILT_DATE="\"`date`\""
|
|
+ -DBUILT_USER="\"${USER}\"" -DBUILT_HOST="\"${HOST}\"" -DBUILT_DATE="\"`date`\""
|
|
|
|
#
|
|
# special rules for scanner/parser
|