From ba72e955dc1b42da73e3a25eecd4bd336ffbf1b7 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 3 Mar 2004 22:24:53 +0000 Subject: 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 --- wiretap/lanalyzer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'wiretap/lanalyzer.c') diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 51bec6af0b..1755ae4ec9 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -1,6 +1,6 @@ /* lanalyzer.c * - * $Id: lanalyzer.c,v 1.46 2004/01/25 21:55:15 guy Exp $ + * $Id: lanalyzer.c,v 1.47 2004/03/03 22:24:51 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -385,7 +385,6 @@ static gboolean lanalyzer_read(wtap *wth, int *err, gchar **err_info, } wth->phdr.len = true_size; wth->phdr.caplen = packet_size; - wth->phdr.pkt_encap = wth->file_encap; switch (wth->file_encap) { -- cgit v1.2.3