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

DHCP: For IPv4 options, append address to option root 

Change-Id: I739db9d841394582b3ff2f296050a9a1d350f9bc
Reviewed-on: https://code.wireshark.org/review/29907
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Martin Mathieson 2018-09-28 20:50:52 +01:00 committed by Peter Wu
parent 45be966822
commit 47eb71d876
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-dhcp.c
View File

@ -1664,6 +1664,9 @@ dhcp_handle_basic_types(packet_info *pinfo, proto_tree *tree, proto_item *item,
proto_tree_add_item(tree, *hf, tvb, offset, 4, ENC_BIG_ENDIAN);
else if (hf_default->ipv4 != NULL)
proto_tree_add_item(tree, *hf_default->ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
/* Show IP address in root of option */
proto_item_append_text(tree, " (%s)", tvb_ip_to_str(tvb, offset));
consumed = 4;
break;