Commit 0037dba
committed
Fix adapter-backed PCAP writes through generic path
When protocol-specific capture adapters were enabled, protocolToLinkType() selected the adapter link type but the generic packet overload still used the legacy match-and-convert path. IEEE 802.11 therefore selected Radiotap, failed the link-type match, and aborted because no generic Radiotap converter exists.
Delegate adapter-backed packet writes to the existing observation overload so the adapter creates complete prefixed records. Preserve the legacy matching and conversion behavior when either feature flag is disabled or no adapter is registered.
Extend PcapRecorderIeee80211Ampdu_1 with a direct packet-overload regression that verifies the Radiotap header fields and exact payload suffix. This catches both the original abort and invalid prefix-less link-type-127 output.
Validation: release and debug builds pass; the focused PcapRecorder regression passes. Both PcapRecorder tests also pass in the broader unit run, whose remaining failures match pre-existing unrelated failures.1 parent 2cca845 commit 0037dba
2 files changed
Lines changed: 26 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
221 | 226 | | |
222 | 227 | | |
223 | 228 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
105 | 112 | | |
106 | 113 | | |
107 | 114 | | |
| |||
167 | 174 | | |
168 | 175 | | |
169 | 176 | | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
170 | 191 | | |
171 | 192 | | |
172 | 193 | | |
| |||
0 commit comments