diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-07-24 19:11:01 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-07-25 10:04:49 +0000 |
| commit | 77915051685fee048571031769bbed05531fd852 (patch) | |
| tree | 1c9bad7b813fc84ccdb142177b5e6a331581aa4e /epan/dissectors/packet-ip.h | |
| parent | 6cf9616df68a4db7e436bb77392586ff9ad84feb (diff) | |
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@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/packet-ip.h')
| -rw-r--r-- | epan/dissectors/packet-ip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ip.h b/epan/dissectors/packet-ip.h index adb84a0e5f..04ac8b0716 100644 --- a/epan/dissectors/packet-ip.h +++ b/epan/dissectors/packet-ip.h @@ -33,7 +33,7 @@ typedef struct _ws_ip guint8 ip_ver; /* 4 or 6 */ guint8 ip_tos; /* IPv4: type of service; IPv6: traffic class */ guint32 ip_flw; /* IPv4: (zero); IPv6: flow label */ - guint32 ip_len; /* IPv4: total length; IPv6: payload length (minus extensions) */ + guint32 ip_len; /* IPv4: total length; IPv6: payload length */ guint16 ip_id; /* IPv4: identification; IPv6: (zero) */ guint16 ip_off; /* IPv4: fragment offset; IPv6: (zero) */ guint8 ip_ttl; /* IPv4: time-to-live; IPv6: hop limit */ |