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/netmon.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/netmon.c')
| -rw-r--r-- | wiretap/netmon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index c5c48411e9..b6be16ce5b 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -1,6 +1,6 @@ /* netmon.c * - * $Id: netmon.c,v 1.68 2004/01/25 21:55:15 guy Exp $ + * $Id: netmon.c,v 1.69 2004/03/03 22:24:51 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -452,7 +452,6 @@ static gboolean netmon_read(wtap *wth, int *err, gchar **err_info, wth->phdr.ts.tv_usec = usecs; wth->phdr.caplen = packet_size; wth->phdr.len = orig_size; - wth->phdr.pkt_encap = wth->file_encap; /* * Attempt to guess from the packet data, the VPI, and the VCI |