osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

IPv4: Fix display of Fragment Offset field 

Bug: 16344
Change-Id: I0fe0bec606a103e0cb96c6b6da0f98f9b12097b7
Fixes: v3.1.0rc0-916-g237ec1349f ("IP: Make dissection of ip.frag_offset RFC 791 compliant")
Reviewed-on: https://code.wireshark.org/review/35918
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
João Valverde 2020-01-23 02:13:40 +00:00 committed by Anders Broman
parent fd1dd72d8e
commit 89beba7ea6
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ip.c
View File

@ -2604,7 +2604,7 @@ proto_register_ip(void)
{ &hf_ip_frag_offset,
{ "Fragment offset", "ip.frag_offset", FT_UINT16, BASE_DEC,
NULL, 0x1fff, FRAG_OFFSET_WIDTH_MSG(IP_OFFSET_WIDTH), HFILL }},
NULL, 0x0, FRAG_OFFSET_WIDTH_MSG(IP_OFFSET_WIDTH), HFILL }},
{ &hf_ip_ttl,
{ "Time to live", "ip.ttl", FT_UINT8, BASE_DEC,

8
test/baseline/dhcp-raw.ek
View File

File diff suppressed because one or more lines are too long

16
test/baseline/dhcp.jsonraw
View File

@ -369,10 +369,10 @@
]
},
"ip.frag_offset_raw": [
"0",
"0000",
20,
2,
8191,
0,
5
],
"ip.ttl_raw": [
@ -1243,10 +1243,10 @@
]
},
"ip.frag_offset_raw": [
"0",
"0000",
20,
2,
8191,
0,
5
],
"ip.ttl_raw": [
@ -2135,10 +2135,10 @@
]
},
"ip.frag_offset_raw": [
"0",
"0000",
20,
2,
8191,
0,
5
],
"ip.ttl_raw": [
@ -3039,10 +3039,10 @@
]
},
"ip.frag_offset_raw": [
"0",
"0000",
20,
2,
8191,
0,
5
],
"ip.ttl_raw": [