diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-06 14:52:54 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 12:38:07 +0000 |
| commit | ed9a9be5df40de6aa1f2eb8da1fff08c23680baf (patch) | |
| tree | 618abe46dd6d17597f2849a6564e34ba912f9ccb /epan/dissectors/packet-acn.c | |
| parent | 4088a8286d9e2dfd8f2b1c316472d768cbefec8e (diff) | |
Use tvb_address_to_str as an optimization
Change-Id: Ic79d8bdc58b84087531b298b3b27273c1afccd4f
Reviewed-on: https://code.wireshark.org/review/6357
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-acn.c')
| -rw-r--r-- | epan/dissectors/packet-acn.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index 95c97c5db5..8f90d9af06 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -597,13 +597,8 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off proto_item *pi; proto_tree *addr_tree = NULL; guint8 ip_address_type; - address addr; - guint32 IPv4; guint32 port; - struct e_in6_addr IPv6; - - /* Get type */ ip_address_type = tvb_get_guint8(tvb, offset); @@ -624,9 +619,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off /* Add Address */ proto_tree_add_item(addr_tree, hf_acn_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); /* Append port and address to tree item */ - IPv4 = tvb_get_ipv4(tvb, offset); - SET_ADDRESS(&addr, AT_IPv4, sizeof(IPv4), &IPv4); - proto_item_append_text(pi, " %s, Port %d", address_to_str(wmem_packet_scope(), &addr), port); + proto_item_append_text(pi, " %s, Port %d", tvb_address_to_str(wmem_packet_scope(), tvb, AT_IPv4, offset), port); offset += 4; break; case ACN_ADDR_IPV6: @@ -641,9 +634,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off /* Add Address */ proto_tree_add_item(addr_tree, hf_acn_ipv6, tvb, offset, 16, ENC_NA); /* Append port and address to tree item */ - tvb_get_ipv6(tvb, offset, &IPv6); - SET_ADDRESS(&addr, AT_IPv6, sizeof(struct e_in6_addr), &IPv6); - proto_item_append_text(pi, " %s, Port %d", address_to_str(wmem_packet_scope(), &addr), port); + proto_item_append_text(pi, " %s, Port %d", tvb_address_to_str(wmem_packet_scope(), tvb, AT_IPv6, offset), port); offset += 16; break; case ACN_ADDR_IPPORT: @@ -655,7 +646,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off port = tvb_get_ntohs(tvb, offset); proto_tree_add_item(addr_tree, hf_acn_port, tvb, offset, 2, ENC_BIG_ENDIAN); /* Append port to tree item */ - proto_item_append_text(pi, " %s Port %d", address_to_str(wmem_packet_scope(), &addr), port); + proto_item_append_text(pi, " Port %d", port); offset += 2; break; } |