diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-03-10 06:33:58 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-03-10 06:33:58 +0000 |
| commit | a251addb63587c5e064bcc58422c0951c4dc4c97 (patch) | |
| tree | c5e776c62f153404ad4617c940bafc4c4fb4d74f /wiretap/libpcap.c | |
| parent | 9b1133892b4a545eb142ce4529a53de353f41410 (diff) | |
Obliging every capture file reader's "open()" routine to seek to the
beginning of the file before reading anything from the file is bogus -
do that in the loop that tries each of the open routines, instead.
(They may have to reset the seek pointer later if, for example, the
capture file begins with the first packet, and the "open()" routine
looks at that packet to try to guess whether the packet is in the file
format in question.)
Set "wth->data_offset" to 0 while you're at it, so capture file readers
don't have to do that, either.
svn path=/trunk/; revision=3123
Diffstat (limited to 'wiretap/libpcap.c')
| -rw-r--r-- | wiretap/libpcap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 52b65bed73..27dce446fd 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.45 2000/12/23 08:06:15 guy Exp $ + * $Id: libpcap.c,v 1.46 2001/03/10 06:33:57 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org> @@ -357,8 +357,6 @@ int libpcap_open(wtap *wth, int *err) int file_encap; /* Read in the number that should be at the start of a "libpcap" file */ - file_seek(wth->fh, 0, SEEK_SET); - wth->data_offset = 0; errno = WTAP_ERR_CANT_READ; bytes_read = file_read(&magic, 1, sizeof magic, wth->fh); if (bytes_read != sizeof magic) { |