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 /asn1 | |
| parent | 8571dbb908e13d63a80e6465ea19566162dad9c1 (diff) | |
| download | wireshark-3df2333155abf8fdfdedc51aca0fe962499f10b5.tar.gz | |
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 'asn1')
| -rw-r--r-- | asn1/nbap/nbap.cnf | 18 | ||||
| -rw-r--r-- | asn1/nbap/packet-nbap-template.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index f912b250d8..403b2888c6 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -764,7 +764,7 @@ transportFormatSet_type = NBAP_CPCH; umts_fp_conversation_info->channel = CHANNEL_RACH_FDD; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -857,7 +857,7 @@ num_items = 1; umts_fp_conversation_info->channel = CHANNEL_PCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->paging_indications = paging_indications; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -966,7 +966,7 @@ transportFormatSet_type = NBAP_CPCH; umts_fp_conversation_info->channel = CHANNEL_FACH_FDD; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; /*Save unique UE-identifier */ @@ -1173,7 +1173,7 @@ dch_id = 0xFFFFFFFF; umts_fp_conversation_info->channel = CHANNEL_DCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -1289,7 +1289,7 @@ BindingID_port = 0; umts_fp_conversation_info->channel = CHANNEL_EDCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; @@ -1462,7 +1462,7 @@ BindingID_port = 0; umts_fp_conversation_info->channel = CHANNEL_EDCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; @@ -1810,7 +1810,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ @@ -1927,7 +1927,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ @@ -2050,7 +2050,7 @@ int i; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_common_channel_info[i].crnc_port; /*umts_fp_conversation_info->hsdsch_macdflow_id = i ;*/ /*hsdsch_macdflow_ids[i];*/ /* hsdsch_macdflow_id;*/ diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 6b024a4641..b8646f3d5d 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -374,7 +374,7 @@ static void add_hsdsch_bind(packet_info *pinfo){ umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ |