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/csids.c | |
| parent | 76ff7e4a66cc2e45a25a3ac815e5520195ea3ae4 (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).
svn path=/trunk/; revision=10290
Diffstat (limited to 'wiretap/csids.c')
| -rw-r--r-- | wiretap/csids.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 <mlh@io.com> * 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; |