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/cosine.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/cosine.c')
| -rw-r--r-- | wiretap/cosine.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/cosine.c b/wiretap/cosine.c index d121e2bd4c..eb3bbb70cb 100644 --- a/wiretap/cosine.c +++ b/wiretap/cosine.c @@ -1,6 +1,6 @@ /* cosine.c * - * $Id: cosine.c,v 1.9 2004/02/09 00:06:30 guy Exp $ + * $Id: cosine.c,v 1.10 2004/03/03 22:24:51 guy Exp $ * * CoSine IPNOS L2 debug output parsing * Copyright (c) 2002 by Motonori Shindo <mshindo@mshindo.net> @@ -421,7 +421,6 @@ parse_cosine_rec_hdr(wtap *wth, const char *line, wth->phdr.ts.tv_sec = mktime(&tm); wth->phdr.ts.tv_usec = csec * 10000; wth->phdr.len = pkt_len; - wth->phdr.pkt_encap = WTAP_ENCAP_COSINE; } /* XXX need to handle other encapsulations like Cisco HDLC, Frame Relay and ATM */ |