diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-11 21:32:53 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-16 15:25:18 +0000 |
| commit | ada1eec702ff44dc89670a1aa25c1e34d370bebb (patch) | |
| tree | cb754fdadbad9312340bbbc2e0a13d4ff71d2349 /epan/dissectors/packet-jxta.c | |
| parent | 260b19e98d02b92afe9a1d361fa6f98b3a63efb4 (diff) | |
SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS
Copy addresses with wmem-scope instead of (forced) seasonal scope. All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes.
Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2
Reviewed-on: https://code.wireshark.org/review/6564
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 75a309d34f..682f9517c4 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -581,7 +581,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; - SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); + WMEM_COPY_ADDRESS(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; @@ -594,7 +594,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; - SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); + WMEM_COPY_ADDRESS(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; @@ -603,7 +603,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; - SE_COPY_ADDRESS(&tpt_conv_data->receiver_tpt_address, &pinfo->src); + WMEM_COPY_ADDRESS(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; @@ -744,14 +744,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; - SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src); + WMEM_COPY_ADDRESS(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; - SE_COPY_ADDRESS(&tpt_conv_data->receiver_tpt_address, &pinfo->dst); + WMEM_COPY_ADDRESS(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; |