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-aeron.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-aeron.c')
| -rw-r--r-- | epan/dissectors/packet-aeron.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index ca3261fd9f..82f5e6abdd 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -430,8 +430,8 @@ static aeron_transport_t * aeron_transport_add(const aeron_conversation_info_t * transport->channel_id = aeron_channel_id_assign(); transport->stream = wmem_map_new(wmem_file_scope(), aeron_guint32_hash_func, aeron_guint32_compare_func); transport->last_frame = NULL; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(transport->addr1), cinfo->addr1); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(transport->addr2), cinfo->addr2); + copy_address_wmem(wmem_file_scope(), &(transport->addr1), cinfo->addr1); + copy_address_wmem(wmem_file_scope(), &(transport->addr2), cinfo->addr2); transport->session_id = session_id; transport->port1 = cinfo->port1; transport->port2 = cinfo->port2; @@ -547,7 +547,7 @@ static aeron_stream_rcv_t * aeron_stream_rcv_add(aeron_stream_t * stream, const return (rcv); } rcv = wmem_new0(wmem_file_scope(), aeron_stream_rcv_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(rcv->addr), addr); + copy_address_wmem(wmem_file_scope(), &(rcv->addr), addr); rcv->port = port; rcv->completed.term_id = 0; rcv->completed.term_offset = 0; @@ -908,17 +908,17 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in case HDR_TYPE_DATA: case HDR_TYPE_SETUP: /* Destination is a receiver */ - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr1, &(pinfo->src)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr1, &(pinfo->src)); cinfo->port1 = pinfo->srcport; - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr2, &(pinfo->dst)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr2, &(pinfo->dst)); cinfo->port2 = pinfo->destport; break; case HDR_TYPE_NAK: case HDR_TYPE_SM: /* Destination is the source */ - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr1, &(pinfo->dst)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr1, &(pinfo->dst)); cinfo->port1 = pinfo->destport; - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr2, &(pinfo->src)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr2, &(pinfo->src)); cinfo->port2 = pinfo->srcport; break; default: @@ -965,17 +965,17 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in case HDR_TYPE_DATA: case HDR_TYPE_SETUP: /* Destination is a receiver */ - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr1, &(pinfo->src)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr1, &(pinfo->src)); cinfo->port1 = pinfo->srcport; - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr2, &(pinfo->dst)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr2, &(pinfo->dst)); cinfo->port2 = pinfo->destport; break; case HDR_TYPE_NAK: case HDR_TYPE_SM: /* Destination is the source */ - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr1, &(pinfo->dst)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr1, &(pinfo->dst)); cinfo->port1 = pinfo->destport; - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr2, &(pinfo->src)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr2, &(pinfo->src)); cinfo->port2 = pinfo->srcport; break; default: |