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/5views.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/5views.c')
| -rw-r--r-- | wiretap/5views.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c index 23f63445f5..43b533c7e6 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -1,6 +1,6 @@ /* 5views.c * - * $Id: 5views.c,v 1.4 2004/01/25 21:55:11 guy Exp $ + * $Id: 5views.c,v 1.5 2004/03/03 22:24:50 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -254,7 +254,6 @@ _5views_read(wtap *wth, int *err, gchar **err_info _U_, long *data_offset) wth->phdr.ts.tv_usec = TimeStamped_Header.NanoSecondes/1000; wth->phdr.caplen = packet_size; wth->phdr.len = orig_size; - wth->phdr.pkt_encap = wth->file_encap; switch (wth->file_encap) { |