diff options
author | João Valverde <j@v6e.pt> | 2016-02-08 00:43:56 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-02-08 00:44:22 +0000 |
commit | ef929dc8eb8c61d5829132d2da2a3061df44bba9 (patch) | |
tree | 6dc7fb0abec832c1b336580bfeaec70717f0a76f /asn1 | |
parent | 8df2857bc1082797cc7052eb5a6ebb45ac92e4b9 (diff) |
Revert "Add free_address_wmem() and other extensions to address API"
This reverts commit 13ec77a9fc3af3b0b502820d0b55796c89997896.
This commit introduces a segmentation fault for Lua code (uncovered by the test suite).
Change-Id: Ibc273d1915cda9632697b9f138f0ae104d3fb65e
Reviewed-on: https://code.wireshark.org/review/13813
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/mpeg-audio/packet-mpeg-audio-template.c | 4 | ||||
-rw-r--r-- | asn1/nbap/nbap.cnf | 24 | ||||
-rw-r--r-- | asn1/nbap/packet-nbap-template.c | 2 | ||||
-rw-r--r-- | asn1/t38/packet-t38-template.c | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index e9218f433b..4f8e20bffd 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -71,10 +71,10 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Audio Layer %d", mpa_layer(&mpa) + 1); if (MPA_BITRATE_VALID(&mpa) && MPA_FREQUENCY_VALID(&mpa)) { data_size = (int)(MPA_DATA_BYTES(&mpa) - sizeof mpa); - clear_address(&pinfo->src); + set_address(&pinfo->src, AT_NONE, 0, NULL); col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "%d kb/s", mpa_bitrate(&mpa) / 1000); - clear_address(&pinfo->dst); + set_address(&pinfo->dst, AT_NONE, 0, NULL); col_add_fstr(pinfo->cinfo, COL_DEF_DST, "%g kHz", mpa_frequency(&mpa) / (float)1000); } diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index e5251c21b2..c4e968863a 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -740,7 +740,7 @@ transportFormatSet_type = NBAP_CPCH; { return offset; } - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); @@ -833,7 +833,7 @@ num_items = 1; { return offset; } - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); @@ -942,7 +942,7 @@ transportFormatSet_type = NBAP_CPCH; { return offset; } - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); @@ -1148,7 +1148,7 @@ dch_id = 0xFFFFFFFF; return offset; } - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); @@ -1256,7 +1256,7 @@ BindingID_port = 0; { return offset; } - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); @@ -1365,7 +1365,7 @@ guint32 no_ddi_entries, i; } /* Check if we have conversation info */ - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); p_conv = find_conversation(actx->pinfo->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr, PT_UDP, nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B); @@ -1425,7 +1425,7 @@ BindingID_port = 0; * Basically the idea here is that we create a new converation (Which is ok? maybe?) * And then hijack the old conversation and let lower tree items configure that hijacked data. * */ - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); @@ -1547,7 +1547,7 @@ num_items = 1; /*Do the configurations*/ /* Check if we have conversation info */ - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); p_conv = find_conversation(actx->pinfo->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr, PT_UDP, nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B); @@ -1783,7 +1783,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; } /* Set port to zero use that as an indication of whether we have data or not */ - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ nbap_debug("Frame %%u HSDSCH-MACdFlows-Information:hsdsch_macdflow_id %%u Look for conv on IP %%s Port %%u", @@ -1896,7 +1896,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; } /* Set port to zero use that as an indication of whether we have data or not */ - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); nbap_debug("Frame %%u HSDSCH-MACdFlows-Information Start", actx->pinfo->num); @@ -2030,7 +2030,7 @@ int i; return offset; } /* Set port to zero use that as an indication of whether we have data or not */ - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfCommonMACFlows; i++) { if (nbap_common_channel_info[i].crnc_port != 0){ @@ -2125,7 +2125,7 @@ int i; } /*Find the conversations assoicated with the HS-DSCH flows in this packet and set proper H-RNTI*/ - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ conversation = find_conversation(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr, diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 9e66d242eb..7838181e67 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -346,7 +346,7 @@ static void add_hsdsch_bind(packet_info *pinfo){ } /* Set port to zero use that as an indication of whether we have data or not */ - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ conversation = find_conversation(pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr, diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index b224b664fe..41fa55d757 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -229,7 +229,7 @@ void t38_add_address(packet_info *pinfo, return; } - clear_address(&null_addr); + set_address(&null_addr, AT_NONE, 0, NULL); /* * Check if the ip address and port combination is not |