diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-03-03 22:24:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-03-03 22:24:53 +0000 |
| commit | ba72e955dc1b42da73e3a25eecd4bd336ffbf1b7 (patch) | |
| tree | efb280a0c42fb616c066a4c6fd5a220bce732508 /wiretap/snoop.c | |
| parent | 76ff7e4a66cc2e45a25a3ac815e5520195ea3ae4 (diff) | |
| download | wireshark-ba72e955dc1b42da73e3a25eecd4bd336ffbf1b7.tar.gz | |
Have "wtap_read()" set "wth->phdr.pkt_encap" to "wth->file_encap",
rather than requiring individual capture file type handlers to do it
(unless they're doing per-packet encapsulation, in which case we check
to make sure they didn't *leave* it as WTAP_ENCAP_PER_PACKET).
svn path=/trunk/; revision=10290
Diffstat (limited to 'wiretap/snoop.c')
| -rw-r--r-- | wiretap/snoop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/snoop.c b/wiretap/snoop.c index bc3a8811c4..676f4f9d85 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -1,6 +1,6 @@ /* snoop.c * - * $Id: snoop.c,v 1.68 2004/01/25 21:55:17 guy Exp $ + * $Id: snoop.c,v 1.69 2004/03/03 22:24:52 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -505,7 +505,6 @@ static gboolean snoop_read(wtap *wth, int *err, gchar **err_info, wth->phdr.ts.tv_usec = g_ntohl(hdr.ts_usec); wth->phdr.caplen = packet_size; wth->phdr.len = orig_size; - wth->phdr.pkt_encap = wth->file_encap; /* * If this is ATM LANE traffic, try to guess what type of LANE |