aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-01-22 20:01:07 +0000
committerGuy Harris <guy@alum.mit.edu>2002-01-22 20:01:07 +0000
commit8d1812f93cc7020ce5dd804ec7f31eaf0e5779cb (patch)
treebd26c42aad1f15e0fec2016b155accf16ef551e5 /wiretap
parent5a3591c6f859a67450d867c02982edbfeec7f663 (diff)
downloadwireshark-8d1812f93cc7020ce5dd804ec7f31eaf0e5779cb.tar.gz
wireshark-8d1812f93cc7020ce5dd804ec7f31eaf0e5779cb.tar.bz2
wireshark-8d1812f93cc7020ce5dd804ec7f31eaf0e5779cb.zip
From Alan Harrison: set "wth->phdr.pkt_encap" to "wth->file_encap" in
the V7-format read routine. svn path=/trunk/; revision=4597
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/etherpeek.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c
index ec1b368172..bcf9fbbd83 100644
--- a/wiretap/etherpeek.c
+++ b/wiretap/etherpeek.c
@@ -2,7 +2,7 @@
* Routines for opening EtherPeek (and TokenPeek?) files
* Copyright (c) 2001, Daniel Thompson <d.thompson@gmx.net>
*
- * $Id: etherpeek.c,v 1.11 2002/01/21 23:45:58 guy Exp $
+ * $Id: etherpeek.c,v 1.12 2002/01/22 20:01:07 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -323,6 +323,7 @@ static gboolean etherpeek_read_m7(wtap *wth, int *err, long *data_offset)
wth->phdr.ts.tv_usec = (guint32) (t - (double) wth->phdr.ts.tv_sec *
1000000.0);
+ wth->phdr.pkt_encap = wth->file_encap;
return TRUE;
}