3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Fix parsing of Dot11 packets encapsulated on PPI having FCS-at-end

Browse Source
This commit is contained in:
Matias Fontanini
2015-09-21 20:49:17 -07:00
parent 9d0a2d4f3e
commit 693cef04df
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ppi.cpp
View File

@@ -63,7 +63,7 @@ PPI::PPI(const uint8_t *buffer, uint32_t total_sz) {
switch(dlt()) {
case DLT_IEEE802_11:
#ifdef HAVE_DOT11
inner_pdu(Dot11::from_bytes(buffer, total_sz));
parse_80211(buffer, total_sz);
#else
throw protocol_disabled();
#endif
@@ -99,4 +99,18 @@ void PPI::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *) {
throw std::runtime_error("PPI serialization not supported");
}
void PPI::parse_80211(const uint8_t* buffer, uint32_t total_sz) {
if (_data.size() >= 13) {
// Is FCS-at-end on?
if ((_data[12] & 1) == 1) {
// We need to reduce the total size since we're skipping the FCS
if (total_sz < sizeof(uint32_t)) {
throw malformed_packet();
}
total_sz -= sizeof(uint32_t);
}
}
inner_pdu(Dot11::from_bytes(buffer, total_sz));
}
} // Tins