Repository navigation
Commit a01fc0d
committed
pcapfile 0.12.0's Ethernet.payload_type decodes EtherType 0x0800 only, and
_transport() read the IPv4 payload to the end of the frame whatever its
fragment offset, so the engine's TCP disagreed with the default engine's.
- _network() reads past 802.1Q and 802.1ad tags, stacked to any depth, and
decodes the IPv4 behind them with pcapfile's own IP decoder; one that
will not decode warns as an untagged one does, once per frame (#1537).
- TCP over IPv6 behind tags gets #1535's warn-once; TCP tunnelled in IP
(4in4, 6in4, 6in6, 4in6) gets one of its own rather than being read
through, as the default engine keys such a flow by the outer addresses.
Either fires only where the default engine's own dissection of the
rebuilt frame finds the TCP (#1537).
- A later IPv4 fragment is never read as a TCP header (#1576).
- The TCP segment ends at the IPv4 Total Length, so Ethernet padding is no
longer payload; 0 (TSO) keeps the rest of the frame (#1577).
- Docs: the engines table and the toolkit note.
Closes #1537
Closes #1576
Closes #1577
1 parent e9f3340 commit a01fc0d
5 files changed
Lines changed: 924 additions & 115 deletions
File tree
- docs/source/pcapkit
- foundation/engines
- toolkit
- pcapkit/toolkit
- tests/toolkit
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
96 | | - | |
97 | | - | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
98 | 100 | | |
99 | 101 | | |
100 | 102 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
184 | 184 | | |
185 | 185 | | |
186 | 186 | | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
187 | 194 | | |
188 | 195 | | |
189 | 196 | | |
| |||
0 commit comments