diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-29 03:12:53 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-03 12:20:34 +0000 |
commit | 3df2333155abf8fdfdedc51aca0fe962499f10b5 (patch) | |
tree | f241cb1777aaf99492eeb12c8365c96e705cfe4e /epan/dissectors/packet-p_mul.c | |
parent | 8571dbb908e13d63a80e6465ea19566162dad9c1 (diff) |
Remaining ADDRESS macro to address function conversions
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788
Reviewed-on: https://code.wireshark.org/review/11463
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-p_mul.c')
-rw-r--r-- | epan/dissectors/packet-p_mul.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index cccf3895e0..d97c74146d 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -331,7 +331,7 @@ static p_mul_seq_val *lookup_seq_val (guint32 message_id, guint16 seq_no, p_mul_key->id = message_id; p_mul_key->seq = seq_no; - WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr); + copy_address_wmem(wmem_file_scope(), &p_mul_key->addr, addr); pkg_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key); @@ -391,7 +391,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin /* Try to match corresponding address PDU */ p_mul_key->id = message_id; p_mul_key->seq = 0; - WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr); + copy_address_wmem(wmem_file_scope(), &p_mul_key->addr, addr); need_set_address = TRUE; p_mul_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key); @@ -445,7 +445,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin p_mul_key->id = message_id; p_mul_key->seq = seq_no; if (!need_set_address) { - WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr); + copy_address_wmem(wmem_file_scope(), &p_mul_key->addr, addr); } p_mul_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key); @@ -949,7 +949,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v if (pdu_type == Ack_PDU) { /* Source ID of Ack Sender */ - TVB_SET_ADDRESS (&dst, AT_IPv4, tvb, offset, 4); + set_address_tvb (&dst, AT_IPv4, 4, tvb, offset); proto_tree_add_item (p_mul_tree, hf_source_id_ack, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -959,7 +959,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v offset += 2; } else { /* Source Id */ - TVB_SET_ADDRESS (&src, AT_IPv4, tvb, offset, 4); + set_address_tvb (&src, AT_IPv4, 4, tvb, offset); proto_tree_add_item (p_mul_tree, hf_source_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1034,7 +1034,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v field_tree = proto_item_add_subtree (en, ett_dest_entry); /* Destination Id */ - TVB_SET_ADDRESS (&dst, AT_IPv4, tvb, offset, 4); + set_address_tvb (&dst, AT_IPv4, 4, tvb, offset); proto_tree_add_item (field_tree, hf_dest_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1095,7 +1095,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v } /* Source Id */ - TVB_SET_ADDRESS (&src, AT_IPv4, tvb, offset, 4); + set_address_tvb (&src, AT_IPv4, 4, tvb, offset); proto_tree_add_item (field_tree, hf_source_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; |