URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a7169168060443e8e3f2c2875f08ce81f551a0dd
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark
Commits:
a716916 by Anthony Coddington (anthony.coddington@xxxxxxxxxx):
pcap-common: Fix several serious ENCAP_ERF extension header writing issues
Write ERF subheader after extension headers, especially important for Ethernet
(other types predate extension headers for the most part).
Add missing ERF_TYPE_MC_AAL2 and ERF_TYPE_COLOR_HASH_ETH.
Truncate final ERF extension header when too many. Rlen is not currently
adjusted so may be incorrect (see followup patch). Existing tools generally
check against PCAP incl_len anyway as there are other scenarios where this can
happen like naive snapping or Wireshark ERF-to-PCAP.
Properly fixing this will involve getting rid of the ERF pseudoheader.
Consistent with the ERF wiretap (except for different padding behaviour).
Bug: 3606
Change-Id: I9373ef5234dcf6c0165e0a92fef42aae6d9f175a
Reviewed-on: https://code.wireshark.org/review/15393
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from e9cb583 Fix signature of dissect_eth_maybefcs().
adds a716916 pcap-common: Fix several serious ENCAP_ERF extension header writing issues
Summary of changes:
wiretap/pcap-common.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)