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>

1 files changed, 12 insertions, 12 deletions

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,