aboutsummaryrefslogtreecommitdiffstats
path: root/Source/charon/encoding/payloads/configuration_attribute.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/configuration_attribute.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/configuration_attribute.c')
-rw-r--r--Source/charon/encoding/payloads/configuration_attribute.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/charon/encoding/payloads/configuration_attribute.c b/Source/charon/encoding/payloads/configuration_attribute.c
index 4f3294832..489d7f372 100644
--- a/Source/charon/encoding/payloads/configuration_attribute.c
+++ b/Source/charon/encoding/payloads/configuration_attribute.c
@@ -19,15 +19,13 @@
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
-
-/* offsetof macro */
+
#include <stddef.h>
#include "configuration_attribute.h"
#include <encoding/payloads/encodings.h>
#include <types.h>
-#include <utils/allocator.h>
typedef struct private_configuration_attribute_t private_configuration_attribute_t;
@@ -196,10 +194,10 @@ static void set_value(private_configuration_attribute_t *this, chunk_t value)
if (this->attribute_value.ptr != NULL)
{
/* free existing value */
- allocator_free_chunk(&(this->attribute_value));
+ chunk_free(&(this->attribute_value));
}
- this->attribute_value.ptr = allocator_clone_bytes(value.ptr,value.len);
+ this->attribute_value.ptr = clalloc(value.ptr,value.len);
this->attribute_value.len = value.len;
this->attribute_length = this->attribute_value.len;
@@ -246,9 +244,9 @@ static void destroy(private_configuration_attribute_t *this)
{
if (this->attribute_value.ptr != NULL)
{
- allocator_free(this->attribute_value.ptr);
+ free(this->attribute_value.ptr);
}
- allocator_free(this);
+ free(this);
}
/*
@@ -256,7 +254,7 @@ static void destroy(private_configuration_attribute_t *this)
*/
configuration_attribute_t *configuration_attribute_create()
{
- private_configuration_attribute_t *this = allocator_alloc_thing(private_configuration_attribute_t);
+ private_configuration_attribute_t *this = malloc_thing(private_configuration_attribute_t);
/* payload interface */
this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;