1 files changed, 86 insertions, 131 deletions

diff --git a/src/charon/encoding/payloads/configuration_attribute.c b/src/charon/encoding/payloads/configuration_attribute.c
index 674feeddd..9094fd44d 100644
--- a/src/charon/encoding/payloads/configuration_attribute.c
+++ b/src/charon/encoding/payloads/configuration_attribute.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Martin Willi
+ * Copyright (C) 2005-2009 Martin Willi
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
  *
@@ -27,67 +27,45 @@ typedef struct private_configuration_attribute_t private_configuration_attribute
 
 /**
  * Private data of an configuration_attribute_t object.
- * 
+ *
  */
 struct private_configuration_attribute_t {
 	/**
 	 * Public configuration_attribute_t interface.
 	 */
 	configuration_attribute_t public;
-	
+
 	/**
 	 * Type of the attribute.
 	 */
-	u_int16_t attribute_type;
-	
+	u_int16_t type;
+
 	/**
 	 * Length of the attribute.
 	 */
-	u_int16_t attribute_length;
+	u_int16_t length;
 
 	/**
 	 * Attribute value as chunk.
 	 */
-	chunk_t attribute_value;
+	chunk_t value;
 };
 
-ENUM_BEGIN(configuration_attribute_type_names, INTERNAL_IP4_ADDRESS, INTERNAL_IP6_ADDRESS,
-	"INTERNAL_IP4_ADDRESS",
-	"INTERNAL_IP4_NETMASK",
-	"INTERNAL_IP4_DNS",
-	"INTERNAL_IP4_NBNS",
-	"INTERNAL_ADDRESS_EXPIRY",
-	"INTERNAL_IP4_DHCP",
-	"APPLICATION_VERSION",
-	"INTERNAL_IP6_ADDRESS");
-ENUM_NEXT(configuration_attribute_type_names, INTERNAL_IP6_DNS, INTERNAL_IP6_SUBNET, INTERNAL_IP6_ADDRESS,
-	"INTERNAL_IP6_DNS",
-	"INTERNAL_IP6_NBNS",
-	"INTERNAL_IP6_DHCP",
-	"INTERNAL_IP4_SUBNET",
-	"SUPPORTED_ATTRIBUTES",
-	"INTERNAL_IP6_SUBNET");
-ENUM_NEXT(configuration_attribute_type_names, INTERNAL_IP4_SERVER, INTERNAL_IP6_SERVER, INTERNAL_IP6_SUBNET,
-	"INTERNAL_IP4_SERVER",
-	"INTERNAL_IP6_SERVER");
-ENUM_END(configuration_attribute_type_names, INTERNAL_IP6_SERVER);
-
 /**
  * Encoding rules to parse or generate a configuration attribute.
- * 
- * The defined offsets are the positions in a object of type 
+ *
+ * The defined offsets are the positions in a object of type
  * private_configuration_attribute_t.
- * 
  */
 encoding_rule_t configuration_attribute_encodings[] = {
 
-	{ RESERVED_BIT,	0																					},
+	{ RESERVED_BIT,						0													},
 	/* type of the attribute as 15 bit unsigned integer */
-	{ ATTRIBUTE_TYPE,			offsetof(private_configuration_attribute_t, attribute_type)				},	
+	{ ATTRIBUTE_TYPE,					offsetof(private_configuration_attribute_t, type)	},
 	/* Length of attribute value */
-	{ CONFIGURATION_ATTRIBUTE_LENGTH,		offsetof(private_configuration_attribute_t, attribute_length)},
+	{ CONFIGURATION_ATTRIBUTE_LENGTH,	offsetof(private_configuration_attribute_t, length)	},
 	/* Value of attribute if attribute format flag is zero */
-	{ CONFIGURATION_ATTRIBUTE_VALUE,		offsetof(private_configuration_attribute_t, attribute_value)}
+	{ CONFIGURATION_ATTRIBUTE_VALUE,	offsetof(private_configuration_attribute_t, value)	}
 };
 
 /*
@@ -109,66 +87,65 @@ static status_t verify(private_configuration_attribute_t *this)
 {
 	bool failed = FALSE;
 
-	if (this->attribute_length != this->attribute_value.len)
+	if (this->length != this->value.len)
 	{
 		DBG1(DBG_ENC, "invalid attribute length");
 		return FAILED;
 	}
 
-	switch (this->attribute_type)
+	switch (this->type)
 	{
-         case INTERNAL_IP4_ADDRESS:
-         case INTERNAL_IP4_NETMASK:
+		 case INTERNAL_IP4_ADDRESS:
+		 case INTERNAL_IP4_NETMASK:
 		 case INTERNAL_IP4_DNS:
 		 case INTERNAL_IP4_NBNS:
 		 case INTERNAL_ADDRESS_EXPIRY:
 		 case INTERNAL_IP4_DHCP:
-		 	if (this->attribute_length != 0 && this->attribute_length != 4)
-		 	{
+			if (this->length != 0 && this->length != 4)
+			{
 				failed = TRUE;
-		 	}
+			}
 			break;
 		 case INTERNAL_IP4_SUBNET:
-		 	if (this->attribute_length != 0 && this->attribute_length != 8)
-		 	{
+			if (this->length != 0 && this->length != 8)
+			{
 				failed = TRUE;
-		 	}
+			}
 			break;
 		 case INTERNAL_IP6_ADDRESS:
 		 case INTERNAL_IP6_SUBNET:
-		 	if (this->attribute_length != 0 && this->attribute_length != 17)
-		 	{
+			if (this->length != 0 && this->length != 17)
+			{
 				failed = TRUE;
-		 	}
+			}
 			break;
 		 case INTERNAL_IP6_DNS:
 		 case INTERNAL_IP6_NBNS:
 		 case INTERNAL_IP6_DHCP:
-		 	if (this->attribute_length != 0 && this->attribute_length != 16)
-		 	{
+			if (this->length != 0 && this->length != 16)
+			{
 				failed = TRUE;
-		 	}
+			}
 			break;
 		 case SUPPORTED_ATTRIBUTES:
-		 	if (this->attribute_length % 2)
-		 	{
+			if (this->length % 2)
+			{
 				failed = TRUE;
-		 	}
+			}
 			break;
 		 case APPLICATION_VERSION:
-		 	/* any length acceptable */
-		 	break;
+			/* any length acceptable */
+			break;
 		 default:
-			DBG1(DBG_ENC, "unknown attribute type %N", 
-				 configuration_attribute_type_names, this->attribute_type);
-		 	break;
+			DBG1(DBG_ENC, "unknown attribute type %N",
+				 configuration_attribute_type_names, this->type);
+			break;
 	}
-	
+
 	if (failed)
 	{
 		DBG1(DBG_ENC, "invalid attribute length %d for %N",
-			 this->attribute_length, configuration_attribute_type_names,
-			 this->attribute_type);
+			 this->length, configuration_attribute_type_names, this->type);
 		return FAILED;
 	}
 	return SUCCESS;
@@ -177,7 +154,8 @@ static status_t verify(private_configuration_attribute_t *this)
 /**
  * Implementation of payload_t.get_encoding_rules.
  */
-static void get_encoding_rules(private_configuration_attribute_t *this, encoding_rule_t **rules, size_t *rule_count)
+static void get_encoding_rules(private_configuration_attribute_t *this,
+							   encoding_rule_t **rules, size_t *rule_count)
 {
 	*rules = configuration_attribute_encodings;
 	*rule_count = sizeof(configuration_attribute_encodings) / sizeof(encoding_rule_t);
@@ -196,13 +174,14 @@ static payload_type_t get_type(private_configuration_attribute_t *this)
  */
 static payload_type_t get_next_type(private_configuration_attribute_t *this)
 {
-	return (NO_PAYLOAD);
+	return NO_PAYLOAD;
 }
 
 /**
  * Implementation of payload_t.set_next_type.
  */
-static void set_next_type(private_configuration_attribute_t *this,payload_type_t type)
+static void set_next_type(private_configuration_attribute_t *this,
+						  payload_type_t type)
 {
 }
 
@@ -211,99 +190,75 @@ static void set_next_type(private_configuration_attribute_t *this,payload_type_t
  */
 static size_t get_length(private_configuration_attribute_t *this)
 {
-	return (this->attribute_value.len + CONFIGURATION_ATTRIBUTE_HEADER_LENGTH);
+	return this->value.len + CONFIGURATION_ATTRIBUTE_HEADER_LENGTH;
 }
 
 /**
- * Implementation of configuration_attribute_t.set_value.
+ * Implementation of configuration_attribute_t.get_type.
  */
-static void set_value(private_configuration_attribute_t *this, chunk_t value)
+static configuration_attribute_type_t get_configuration_attribute_type(
+									private_configuration_attribute_t *this)
 {
-	if (this->attribute_value.ptr != NULL)
-	{
-		/* free existing value */
-		chunk_free(&(this->attribute_value));		
-	}
-	
-	this->attribute_value.ptr = clalloc(value.ptr,value.len);
-	this->attribute_value.len = value.len;
-	
-	this->attribute_length = this->attribute_value.len;
+	return this->type;
 }
 
 /**
  * Implementation of configuration_attribute_t.get_value.
  */
-static chunk_t get_value (private_configuration_attribute_t *this)
+static chunk_t get_value(private_configuration_attribute_t *this)
 {
-	return this->attribute_value;
+	return this->value;
 }
 
 /**
- * Implementation of configuration_attribute_t.set_type.
+ * Implementation of configuration_attribute_t.destroy and payload_t.destroy.
  */
-static void set_attribute_type (private_configuration_attribute_t *this, u_int16_t type)
+static void destroy(private_configuration_attribute_t *this)
 {
-	this->attribute_type = type & 0x7FFF;
+	free(this->value.ptr);
+	free(this);
 }
 
-/**
- * Implementation of configuration_attribute_t.get_type.
+/*
+ * Described in header.
  */
-static u_int16_t get_attribute_type (private_configuration_attribute_t *this)
+configuration_attribute_t *configuration_attribute_create()
 {
-	return this->attribute_type;
-}
+	private_configuration_attribute_t *this;
 
-/**
- * Implementation of configuration_attribute_t.get_length.
- */
-static u_int16_t get_attribute_length (private_configuration_attribute_t *this)
-{
-	return this->attribute_length;
-}
+	this = malloc_thing(private_configuration_attribute_t);
+	this->public.payload_interface.verify = (status_t(*)(payload_t *))verify;
+	this->public.payload_interface.get_encoding_rules = (void(*)(payload_t *, encoding_rule_t **, size_t *) )get_encoding_rules;
+	this->public.payload_interface.get_length = (size_t(*)(payload_t *))get_length;
+	this->public.payload_interface.get_next_type = (payload_type_t(*)(payload_t *))get_next_type;
+	this->public.payload_interface.set_next_type = (void(*)(payload_t *,payload_type_t))set_next_type;
+	this->public.payload_interface.get_type = (payload_type_t(*)(payload_t *))get_type;
+	this->public.payload_interface.destroy = (void(*)(payload_t*))destroy;
 
+	this->public.get_value = (chunk_t(*)(configuration_attribute_t *))get_value;
+	this->public.get_type = (configuration_attribute_type_t(*)(configuration_attribute_t *))get_configuration_attribute_type;
+	this->public.destroy = (void (*)(configuration_attribute_t*))destroy;
 
-/**
- * Implementation of configuration_attribute_t.destroy and payload_t.destroy.
- */
-static void destroy(private_configuration_attribute_t *this)
-{
-	if (this->attribute_value.ptr != NULL)
-	{
-		free(this->attribute_value.ptr);
-	}	
-	free(this);
+	this->type = 0;
+	this->value = chunk_empty;
+	this->length = 0;
+
+	return &this->public;
 }
 
 /*
  * Described in header.
  */
-configuration_attribute_t *configuration_attribute_create()
+configuration_attribute_t *configuration_attribute_create_value(
+							configuration_attribute_type_t type, chunk_t value)
 {
-	private_configuration_attribute_t *this = malloc_thing(private_configuration_attribute_t);
-
-	/* payload interface */
-	this->public.payload_interface.verify = (status_t (*) (payload_t *))verify;
-	this->public.payload_interface.get_encoding_rules = (void (*) (payload_t *, encoding_rule_t **, size_t *) ) get_encoding_rules;
-	this->public.payload_interface.get_length = (size_t (*) (payload_t *)) get_length;
-	this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t *)) get_next_type;
-	this->public.payload_interface.set_next_type = (void (*) (payload_t *,payload_type_t)) set_next_type;
-	this->public.payload_interface.get_type = (payload_type_t (*) (payload_t *)) get_type;
-	this->public.payload_interface.destroy = (void (*) (payload_t *))destroy;
-	
-	/* public functions */
-	this->public.set_value = (void (*) (configuration_attribute_t *,chunk_t)) set_value;
-	this->public.get_value = (chunk_t (*) (configuration_attribute_t *)) get_value;
-	this->public.set_type = (void (*) (configuration_attribute_t *,u_int16_t type)) set_attribute_type;
-	this->public.get_type = (u_int16_t (*) (configuration_attribute_t *)) get_attribute_type;
-	this->public.get_length = (u_int16_t (*) (configuration_attribute_t *)) get_attribute_length;
-	this->public.destroy = (void (*) (configuration_attribute_t *)) destroy;
-	
-	/* set default values of the fields */
-	this->attribute_type = 0;
-	this->attribute_value = chunk_empty;
-	this->attribute_length = 0;
-
-	return (&(this->public));
+	private_configuration_attribute_t *this;
+
+	this = (private_configuration_attribute_t*)configuration_attribute_create();
+	this->type = ((u_int16_t)type) & 0x7FFF;
+	this->value = chunk_clone(value);
+	this->length = value.len;
+
+	return &this->public;
 }
+