summaryrefslogtreecommitdiff
path: root/wiretap/wtap.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-07-18 22:10:34 +0000
committerGuy Harris <guy@alum.mit.edu>2012-07-18 22:10:34 +0000
commitb40db9cf4c84a4b5a0b753298d13616d9bd2b5f9 (patch)
treec32d1298d4668842deb67bbbc6076a18330a3212 /wiretap/wtap.h
parent1e7c2d7d51595a8d962cf584af96d19abc21c91d (diff)
downloadwireshark-b40db9cf4c84a4b5a0b753298d13616d9bd2b5f9.tar.gz
Add to the 802.11 pseudo-header a "this is already decrypted" flag, set
it as appropriate in the code to read Network Instruments Observer captures (rather than tweaking the "protected" flag in the packet data), and use that flag in the 802.11 dissector. Fix indentation while we're at it (tabs are not *ipso facto* 4 spaces). svn path=/trunk/; revision=43795
Diffstat (limited to 'wiretap/wtap.h')
-rw-r--r--wiretap/wtap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index c7f0a46c89..70b974b274 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -519,6 +519,7 @@ struct p2p_phdr {
*/
struct ieee_802_11_phdr {
gint fcs_len; /* Number of bytes of FCS - -1 means "unknown" */
+ gboolean decrypted; /* TRUE if frame is decrypted even if "protected" bit is set */
guint8 channel; /* Channel number */
guint16 data_rate; /* in .5 Mb/s units */
guint8 signal_level; /* percentage */