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/dbs-etherwatch.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/dbs-etherwatch.c')
| -rw-r--r-- | wiretap/dbs-etherwatch.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c index e59e1e7bd6..d247112b5e 100644 --- a/wiretap/dbs-etherwatch.c +++ b/wiretap/dbs-etherwatch.c @@ -1,6 +1,6 @@ /* dbs-etherwatch.c * - * $Id: dbs-etherwatch.c,v 1.16 2004/02/09 00:06:30 guy Exp $ + * $Id: dbs-etherwatch.c,v 1.17 2004/03/03 22:24:51 guy Exp $ * * Wiretap Library * Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net> @@ -479,7 +479,6 @@ parse_dbs_etherwatch_packet(wtap *wth, FILE_T fh, guint8* buf, int *err, wth->phdr.ts.tv_usec = csec * 10000; wth->phdr.caplen = eth_hdr_len + pkt_len; wth->phdr.len = eth_hdr_len + pkt_len; - wth->phdr.pkt_encap = wth->file_encap; } /* Parse the hex dump */ |