Wireshark-commits: [Wireshark-commits] master 7791505: IPv6: Use ipv6_pinfo_t instead of ws_ip to k
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=77915051685fee048571031769bbed05531fd852
Submitter: João Valverde (j@xxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
7791505 by João Valverde (joao.valverde@xxxxxxxxxxxxxxxxxx):
IPv6: Use ipv6_pinfo_t instead of ws_ip to keep some state
To perform IPv6 defragmentation we need to compute the IPv6 fragment header
payload length by subtracting the length of intermediate extension headers
from the IPv6 payload length.
Add a new frag_plen field to ipv6_pinfo_t to do that instead of (ab)using
struct ws_ip.
Note: The RFC 2460 rules for fragment header order are stricter than the code
suggests but that shouldn't be a problem here.
Change-Id: I76f3cb3a1a29d96b080d3d53c0f493f9d0b2786c
Reviewed-on: https://code.wireshark.org/review/16637
Petri-Dish: João Valverde <j@xxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: João Valverde <j@xxxxxx>
Actions performed:
from 6cf9616 RLC: fix a variable overflow in rlc_decode_li function
adds 7791505 IPv6: Use ipv6_pinfo_t instead of ws_ip to keep some state
Summary of changes:
epan/dissectors/packet-ip.h | 2 +-
epan/dissectors/packet-ipsec.c | 9 ++-------
epan/dissectors/packet-ipv6.c | 31 +++++++++++--------------------
epan/dissectors/packet-ipv6.h | 1 +
epan/dissectors/packet-mip6.c | 21 +++------------------
epan/dissectors/packet-shim6.c | 8 ++------
6 files changed, 20 insertions(+), 52 deletions(-)
