aboutsummaryrefslogtreecommitdiffstats
path: root/Source/charon/encoding/payloads/traffic_selector_substructure.c
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2006-04-10 08:07:38 +0000
committerMartin Willi <martin@strongswan.org>2006-04-10 08:07:38 +0000
commit5113680f95e522c677cdd37072cfffbdca06831e (patch)
tree973ac57accbc66b042e5307942c6cbbbf4f19579 /Source/charon/encoding/payloads/traffic_selector_substructure.c
parent6862128151fb78f63685a8da5575783c426d64a7 (diff)
downloadstrongswan-5113680f95e522c677cdd37072cfffbdca06831e.tar.bz2
strongswan-5113680f95e522c677cdd37072cfffbdca06831e.tar.xz
- split up in libstrong, charon, stroke, testing done
- new leak detective with malloc hook in library - useable, but needs improvements - logger_manager has now a single instance per library - allows use of loggers from any linking prog - a LOT of other things
Diffstat (limited to 'Source/charon/encoding/payloads/traffic_selector_substructure.c')
-rw-r--r--Source/charon/encoding/payloads/traffic_selector_substructure.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/charon/encoding/payloads/traffic_selector_substructure.c b/Source/charon/encoding/payloads/traffic_selector_substructure.c
index 874b87e43..c1a461e8a 100644
--- a/Source/charon/encoding/payloads/traffic_selector_substructure.c
+++ b/Source/charon/encoding/payloads/traffic_selector_substructure.c
@@ -23,7 +23,6 @@
#include "traffic_selector_substructure.h"
#include <encoding/payloads/encodings.h>
-#include <utils/allocator.h>
#include <utils/linked_list.h>
/**
@@ -254,7 +253,7 @@ static void set_start_host (private_traffic_selector_substructure_t *this,host_t
this->start_port = start_host->get_port(start_host);
if (this->starting_address.ptr != NULL)
{
- allocator_free_chunk(&(this->starting_address));
+ chunk_free(&(this->starting_address));
}
this->starting_address = start_host->get_address_as_chunk(start_host);
this->compute_length(this);
@@ -276,7 +275,7 @@ static void set_end_host (private_traffic_selector_substructure_t *this,host_t *
this->end_port = end_host->get_port(end_host);
if (this->ending_address.ptr != NULL)
{
- allocator_free_chunk(&(this->ending_address));
+ chunk_free(&(this->ending_address));
}
this->ending_address = end_host->get_address_as_chunk(end_host);
this->compute_length(this);
@@ -307,9 +306,9 @@ void compute_length(private_traffic_selector_substructure_t *this)
*/
static void destroy(private_traffic_selector_substructure_t *this)
{
- allocator_free(this->starting_address.ptr);
- allocator_free(this->ending_address.ptr);
- allocator_free(this);
+ free(this->starting_address.ptr);
+ free(this->ending_address.ptr);
+ free(this);
}
/*
@@ -317,7 +316,7 @@ static void destroy(private_traffic_selector_substructure_t *this)
*/
traffic_selector_substructure_t *traffic_selector_substructure_create()
{
- private_traffic_selector_substructure_t *this = allocator_alloc_thing(private_traffic_selector_substructure_t);
+ private_traffic_selector_substructure_t *this = malloc_thing(private_traffic_selector_substructure_t);
/* interface functions */
this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;