network: Check radiotap fields are set in expected order

sderonne · sderonne · commit ee07327d21da · 2026-02-12T19:47:53.000+01:00
diff --git a/src/network/utils/radiotap-header.cc b/src/network/utils/radiotap-header.cc
@@ -522,6 +522,12 @@ RadiotapHeader::UpdatePresentField(uint32_t field)
         NS_ASSERT_MSG(!(m_present.at(bitmaskIdx) & flag),
                       "Radiotap field " << field << " already set in present field at index "
                                         << bitmaskIdx);
+        NS_ASSERT_MSG((m_present.at(bitmaskIdx) < flag) &&
+                          ((m_present.size() == (bitmaskIdx + 1)) ||
+                           std::all_of(m_present.begin() + bitmaskIdx + 1,
+                                       m_present.end(),
+                                       [](uint32_t present) { return present == 0; })),
+                      "Radiotap fields not set in correct order");
     }
     if (const uint32_t morePresentWordFlag = (1 << RADIOTAP_MORE_PRESENT); bitmaskIdx > 0)
     {

Original file line number	Diff line number	Diff line change
`@@ -522,6 +522,12 @@ RadiotapHeader::UpdatePresentField(uint32_t field)`
`522`	`522`	`NS_ASSERT_MSG(!(m_present.at(bitmaskIdx) & flag),`
`523`	`523`	`"Radiotap field " << field << " already set in present field at index "`
`524`	`524`	`<< bitmaskIdx);`
	`525`	`+ NS_ASSERT_MSG((m_present.at(bitmaskIdx) < flag) &&`
	`526`	`+ ((m_present.size() == (bitmaskIdx + 1)) \|\|`
	`527`	`+ std::all_of(m_present.begin() + bitmaskIdx + 1,`
	`528`	`+ m_present.end(),`
	`529`	`+ [](uint32_t present) { return present == 0; })),`
	`530`	`+ "Radiotap fields not set in correct order");`
`525`	`531`	`}`
`526`	`532`	`if (const uint32_t morePresentWordFlag = (1 << RADIOTAP_MORE_PRESENT); bitmaskIdx > 0)`
`527`	`533`	`{`