diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-28 23:55:49 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-29 07:56:28 +0000 |
| commit | 72a9a439338f07522571b69656df9a7066930d74 (patch) | |
| tree | 75a2e95ac8e0f263d9000c9df1ded3b78a06081b /wiretap | |
| parent | 0450cfa50f7c43e873ee3fe96a437960510c696b (diff) | |
Add A-MPDU reassembly information to the radio metadata.
Change-Id: I338e7fb60ff62d1d26ca0b32468ada4294d52d8d
Reviewed-on: https://code.wireshark.org/review/13594
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/wtap.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 5c7b7afa52..0b9dbcb620 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -779,6 +779,7 @@ struct ieee_802_11_phdr { guint has_signal_dbm:1; guint has_noise_dbm:1; guint has_tsf_timestamp:1; + guint has_aggregate_info:1; /* aggregate flags and ID */ guint16 channel; /* Channel number */ guint32 frequency; /* Channel center frequency */ @@ -788,8 +789,16 @@ struct ieee_802_11_phdr { gint8 signal_dbm; /* Signal level, in dBm */ gint8 noise_dbm; /* Noise level, in dBm */ guint64 tsf_timestamp; + guint32 aggregate_flags; /* A-MPDU flags */ + guint32 aggregate_id; /* ID for A-MPDU reassembly */ }; +/* + * A-MPDU flags. + */ +#define PHDR_802_11_LAST_PART_OF_A_MPDU 0x00000001 /* this is the last part of an A-MPDU */ +#define PHDR_802_11_A_MPDU_DELIM_CRC_ERROR 0x00000002 /* delimiter CRC error after this part */ + /* Packet "pseudo-header" for the output from CoSine L2 debug output. */ #define COSINE_MAX_IF_NAME_LEN 128 |