diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-03-03 22:24:53 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-03-03 22:24:53 +0000 |
| commit | df6e9b4b4715773fae03134c648f4ff6c8bef6f9 (patch) | |
| tree | efb280a0c42fb616c066a4c6fd5a220bce732508 /wiretap/etherpeek.c | |
| parent | 04ed748d387bf26969bfc3204af1a2b445590be4 (diff) | |
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).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10290 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap/etherpeek.c')
| -rw-r--r-- | wiretap/etherpeek.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c index 3096cf3786..18decfa48a 100644 --- a/wiretap/etherpeek.c +++ b/wiretap/etherpeek.c @@ -3,7 +3,7 @@ * and V7 files * Copyright (c) 2001, Daniel Thompson <d.thompson@gmx.net> * - * $Id: etherpeek.c,v 1.28 2004/02/06 02:09:11 guy Exp $ + * $Id: etherpeek.c,v 1.29 2004/03/03 22:24:51 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -466,7 +466,6 @@ static gboolean etherpeek_read_v7(wtap *wth, int *err, gchar **err_info, wth->phdr.caplen -= 4; } - wth->phdr.pkt_encap = wth->file_encap; return TRUE; } |