diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-14 18:01:53 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-02-22 02:53:48 +0000 |
| commit | 8d5da72ff9255a3fd494fb2d842a7ecb9d2c7c14 (patch) | |
| tree | 3e48036d26dedf29361132faec1682c9aa6fb24a /epan/dissectors/packet-ospf.c | |
| parent | ddafa7e381c188f0f282908003518be44130a3b6 (diff) | |
| download | wireshark-8d5da72ff9255a3fd494fb2d842a7ecb9d2c7c14.tar.gz | |
Add tvb_address_with_resolution_to_str.
Convert dissectors to using the API where appropriate.
Change-Id: I059582f73a75635d4a0338d02d4c4b212162480b
Reviewed-on: https://code.wireshark.org/review/7296
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ospf.c')
| -rw-r--r-- | epan/dissectors/packet-ospf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 0863be69fb..e66a2940ad 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -2205,7 +2205,6 @@ static void dissect_ospf_lsa_grace_tlv (tvbuff_t *tvb, int offset, and length fields and any padding */ guint32 grace_period; guint8 restart_reason; - guint32 restart_ip; proto_tree *tlv_tree; proto_item *tree_item; proto_item *grace_tree_item; @@ -2245,11 +2244,10 @@ static void dissect_ospf_lsa_grace_tlv (tvbuff_t *tvb, int offset, restart_reason); break; case GRACE_TLV_IP: - restart_ip = tvb_get_ipv4(tvb, offset + 4); proto_tree_add_item(tlv_tree, hf_ospf_v2_grace_ip, tvb, offset + 4, tlv_length, ENC_BIG_ENDIAN); - proto_item_set_text(tree_item, "Restart IP: %s (%s)", - get_hostname(restart_ip), tvb_ip_to_str(tvb, offset + 4)); + proto_item_set_text(tree_item, "Restart IP: %s", + tvb_address_with_resolution_to_str(wmem_packet_scope(), tvb, AT_IPv4, offset + 4)); break; default: proto_item_set_text(tree_item, "Unknown grace-LSA TLV"); |