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/csids.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'wiretap/csids.c') diff --git a/wiretap/csids.c b/wiretap/csids.c index 5b19959627..be747386dc 100644 --- a/wiretap/csids.c +++ b/wiretap/csids.c @@ -1,6 +1,6 @@ /* csids.c * - * $Id: csids.c,v 1.16 2004/01/25 21:55:12 guy Exp $ + * $Id: csids.c,v 1.17 2004/03/03 22:24:51 guy Exp $ * * Copyright (c) 2000 by Mike Hall * Copyright (c) 2000 by Cisco Systems @@ -182,7 +182,6 @@ static gboolean csids_read(wtap *wth, int *err, gchar **err_info _U_, wth->phdr.caplen = hdr.caplen; wth->phdr.ts.tv_sec = hdr.seconds; wth->phdr.ts.tv_usec = 0; - wth->phdr.pkt_encap = WTAP_ENCAP_RAW_IP; if( wth->capture.csids->byteswapped == TRUE ) { guint16* swap = (guint16*)buf; -- cgit v1.2.3