diff options
| author | Guy Harris <guy@alum.mit.edu> | 1998-11-15 05:29:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1998-11-15 05:29:17 +0000 |
| commit | 86bf1fc851b5564f5700a937de3213e8354aa52e (patch) | |
| tree | 46a497072e194a9ed5f20733549362347c4d6eef /wiretap/Makefile.in | |
| parent | 8efdf8a74c3f0c32a380d15aeed0a3f6aff56a29 (diff) | |
Add support to wiretap for reading Sun "snoop" capture files.
That requires that, in the packet-reading loop, we pass to the callback
routine the offset in the file of a packet's data, because we can no
longer compute that offset by subtracting the size of the captured
packet data from the offset in the file after the data was read -
"snoop" may stick padding in after the packet data to align packet
headers on 4-byte boundaries.
Doing that required that we arrange that we do that for "libpcap"
capture files as well; the cleanest way to do that was to write our own
code for reading "libpcap" capture files, rather than using the
"libpcap" code to do it.
Make "wtap_dispatch_cb()" and "pcap_dispatch_cb()" static to "file.c",
as they're not used elsewhere.
If we're using wiretap, don't define in "file.h" stuff used only when
we're not using wiretap.
Update the wiretap README to reflect Gilbert's and my recent changes.
Clean up some memory leaks in "wiretap/lanalyzer.c" and
"wiretap/ngsniffer.c", where the capture-file-format-specific data
wasn't freed if the open failed.
svn path=/trunk/; revision=91
Diffstat (limited to 'wiretap/Makefile.in')
| -rw-r--r-- | wiretap/Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wiretap/Makefile.in b/wiretap/Makefile.in index 8faf818bb2..a26da4054b 100644 --- a/wiretap/Makefile.in +++ b/wiretap/Makefile.in @@ -72,7 +72,9 @@ libwiretap_a_SOURCES = \ buffer.c \ file.c \ lanalyzer.c \ + libpcap.c \ ngsniffer.c \ + snoop.c \ wtap.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs @@ -86,7 +88,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libwiretap_a_LIBADD = -libwiretap_a_OBJECTS = buffer.o file.o lanalyzer.o ngsniffer.o wtap.o +libwiretap_a_OBJECTS = buffer.o file.o lanalyzer.o libpcap.o \ +ngsniffer.o snoop.o wtap.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -101,7 +104,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best DEP_FILES = .deps/buffer.P .deps/file.P .deps/lanalyzer.P \ -.deps/ngsniffer.P .deps/wtap.P +.deps/libpcap.P .deps/ngsniffer.P .deps/snoop.P .deps/wtap.P SOURCES = $(libwiretap_a_SOURCES) OBJECTS = $(libwiretap_a_OBJECTS) |