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-jxta.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-jxta.c')
| -rw-r--r-- | epan/dissectors/packet-jxta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 3a69017bb7..39737b9d01 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -602,7 +602,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* The initiator welcome frame */ tpt_conv_data->tpt_ptype = pinfo->ptype; tpt_conv_data->initiator_welcome_frame = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->initiator_address; @@ -615,7 +615,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tpt_conv_data->receiver_tpt_port = tpt_conv_data->initiator_tpt_port; tpt_conv_data->receiver_address = tpt_conv_data->initiator_address; tpt_conv_data->initiator_welcome_frame = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->initiator_address; @@ -624,7 +624,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* The receiver welcome frame */ tpt_conv_data->tpt_ptype = pinfo->ptype; tpt_conv_data->receiver_welcome_frame = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->src); tpt_conv_data->receiver_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->receiver_address; @@ -765,14 +765,14 @@ static jxta_stream_conversation_data *get_tpt_conversation(packet_info * pinfo) tpt_conv_data = wmem_new(wmem_file_scope(), jxta_stream_conversation_data); tpt_conv_data->tpt_ptype = pinfo->ptype; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; tpt_conv_data->initiator_welcome_frame = 0; tpt_conv_data->initiator_address.type = AT_NONE; tpt_conv_data->initiator_address.len = 0; tpt_conv_data->initiator_address.data = NULL; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->dst); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->dst); tpt_conv_data->receiver_tpt_port = pinfo->destport; tpt_conv_data->receiver_welcome_frame = 0; tpt_conv_data->receiver_address.type = AT_NONE; |