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/airopeek9.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/airopeek9.c')
-rw-r--r-- | wiretap/airopeek9.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/airopeek9.c b/wiretap/airopeek9.c index 68d5368d21..7d8be7563d 100644 --- a/wiretap/airopeek9.c +++ b/wiretap/airopeek9.c @@ -1,7 +1,7 @@ /* airopeek9.c * Routines for opening EtherPeek and AiroPeek V9 files * - * $Id: airopeek9.c,v 1.11 2004/02/06 20:50:44 guy Exp $ + * $Id: airopeek9.c,v 1.12 2004/03/03 22:24:50 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -545,7 +545,6 @@ static gboolean airopeekv9_read(wtap *wth, int *err, gchar **err_info, break; } - wth->phdr.pkt_encap = wth->file_encap; return TRUE; } |