diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-21 08:02:26 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-26 21:17:10 +0000 |
| commit | 3d3f97320b90296bdb3649929bcc73a55823dee9 (patch) | |
| tree | 4b906cf0a1e6e25371fc6eecbef89461d90c0cff /epan/dissectors/packet-nsip.c | |
| parent | b68fb9b659b0debd7286195f9ad194be998cc3ff (diff) | |
| download | wireshark-3d3f97320b90296bdb3649929bcc73a55823dee9.tar.gz | |
Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-nsip.c')
| -rw-r--r-- | epan/dissectors/packet-nsip.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index 697e0cb9c6..e08b819e7a 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -383,7 +383,6 @@ decode_iei_bvci(nsip_ie_t *ie, build_info_t *bi, int ie_start_offset) { static proto_item * decode_ip_element(nsip_ip_element_info_t *element, build_info_t *bi, proto_tree * element_tree) { guint16 udp_port; - guint32 ip4_addr; struct e_in6_addr ip6_addr; proto_item *tf; proto_tree *field_tree; @@ -395,12 +394,11 @@ decode_ip_element(nsip_ip_element_info_t *element, build_info_t *bi, proto_tree /* IP address */ switch (element->version) { case NSIP_IP_VERSION_4: - ip4_addr = tvb_get_ipv4(bi->tvb, bi->offset); proto_tree_add_item(field_tree, hf_nsip_ip_address_ipv4, bi->tvb, bi->offset, element->address_length, ENC_BIG_ENDIAN); proto_item_append_text(tf, ": IP address: %s", - ip_to_str((guint8 *)&ip4_addr)); + tvb_ip_to_str(bi->tvb, bi->offset)); break; case NSIP_IP_VERSION_6: |