1 files changed, 154 insertions, 57 deletions

diff --git a/src/libcharon/encoding/payloads/configuration_attribute.c b/src/libcharon/encoding/payloads/configuration_attribute.c
index e608497bd..482eca882 100644
--- a/src/libcharon/encoding/payloads/configuration_attribute.c
+++ b/src/libcharon/encoding/payloads/configuration_attribute.c
@@ -36,41 +36,48 @@ struct private_configuration_attribute_t {
 	configuration_attribute_t public;
 
 	/**
-	 * Reserved bit
+	 * Value encoded in length field?
+	 */
+	bool af_flag;
+
+	/**
+	 * Reserved bit (af_flag in IKEv2)
 	 */
 	bool reserved;
 
 	/**
 	 * Type of the attribute.
 	 */
-	u_int16_t type;
+	u_int16_t attr_type;
 
 	/**
-	 * Length of the attribute.
+	 * Length of the attribute, value if af_flag set.
 	 */
-	u_int16_t length;
+	u_int16_t length_or_value;
 
 	/**
 	 * Attribute value as chunk.
 	 */
 	chunk_t value;
+
+	/**
+	 * Payload type, CONFIGURATION_ATTRIBUTE or DATA_ATTRIBUTE_V1
+	 */
+	payload_type_t type;
 };
 
 /**
- * Encoding rules to parse or generate a configuration attribute.
- *
- * The defined offsets are the positions in a object of type
- * private_configuration_attribute_t.
+ * Encoding rules for a IKEv2 configuration attribute / IKEv1 data attribute
  */
-encoding_rule_t configuration_attribute_encodings[] = {
+static encoding_rule_t encodings_v2[] = {
 	/* 1 reserved bit */
-	{ RESERVED_BIT,						offsetof(private_configuration_attribute_t, reserved)},
+	{ RESERVED_BIT,					offsetof(private_configuration_attribute_t, reserved)		},
 	/* type of the attribute as 15 bit unsigned integer */
-	{ ATTRIBUTE_TYPE,					offsetof(private_configuration_attribute_t, type)	},
+	{ ATTRIBUTE_TYPE,				offsetof(private_configuration_attribute_t, attr_type)		},
 	/* Length of attribute value */
-	{ CONFIGURATION_ATTRIBUTE_LENGTH,	offsetof(private_configuration_attribute_t, length)	},
+	{ ATTRIBUTE_LENGTH,				offsetof(private_configuration_attribute_t, length_or_value)},
 	/* Value of attribute if attribute format flag is zero */
-	{ CONFIGURATION_ATTRIBUTE_VALUE,	offsetof(private_configuration_attribute_t, value)	}
+	{ ATTRIBUTE_VALUE,				offsetof(private_configuration_attribute_t, value)			},
 };
 
 /*
@@ -85,87 +92,142 @@ encoding_rule_t configuration_attribute_encodings[] = {
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 
+/**
+ * Encoding rules for a IKEv1 data attribute
+ */
+static encoding_rule_t encodings_v1[] = {
+	/* AF Flag */
+	{ ATTRIBUTE_FORMAT,				offsetof(private_configuration_attribute_t, af_flag)		},
+	/* type of the attribute as 15 bit unsigned integer */
+	{ ATTRIBUTE_TYPE,				offsetof(private_configuration_attribute_t, attr_type)		},
+	/* Length of attribute value */
+	{ ATTRIBUTE_LENGTH_OR_VALUE,	offsetof(private_configuration_attribute_t, length_or_value)},
+	/* Value of attribute if attribute format flag is zero */
+	{ ATTRIBUTE_VALUE,				offsetof(private_configuration_attribute_t, value)			},
+};
+
+/*
+                           1                   2                   3
+       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !F|         Attribute Type      !            Length             |
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      |                                                               |
+      ~                             Value                             ~
+      |                                                               |
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+*/
+
+
 METHOD(payload_t, verify, status_t,
 	private_configuration_attribute_t *this)
 {
 	bool failed = FALSE;
 
-	if (this->length != this->value.len)
-	{
-		DBG1(DBG_ENC, "invalid attribute length");
-		return FAILED;
-	}
-
-	switch (this->type)
+	switch (this->attr_type)
 	{
-		 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->length != 0 && this->length != 4)
+		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->length_or_value != 0 && this->length_or_value != 4)
 			{
 				failed = TRUE;
 			}
 			break;
-		 case INTERNAL_IP4_SUBNET:
-			if (this->length != 0 && this->length != 8)
+		case INTERNAL_IP4_SUBNET:
+			if (this->length_or_value != 0 && this->length_or_value != 8)
 			{
 				failed = TRUE;
 			}
 			break;
-		 case INTERNAL_IP6_ADDRESS:
-		 case INTERNAL_IP6_SUBNET:
-			if (this->length != 0 && this->length != 17)
+		case INTERNAL_IP6_ADDRESS:
+		case INTERNAL_IP6_SUBNET:
+			if (this->length_or_value != 0 && this->length_or_value != 17)
 			{
 				failed = TRUE;
 			}
 			break;
-		 case INTERNAL_IP6_DNS:
-		 case INTERNAL_IP6_NBNS:
-		 case INTERNAL_IP6_DHCP:
-			if (this->length != 0 && this->length != 16)
+		case INTERNAL_IP6_DNS:
+		case INTERNAL_IP6_NBNS:
+		case INTERNAL_IP6_DHCP:
+			if (this->length_or_value != 0 && this->length_or_value != 16)
 			{
 				failed = TRUE;
 			}
 			break;
-		 case SUPPORTED_ATTRIBUTES:
-			if (this->length % 2)
+		case SUPPORTED_ATTRIBUTES:
+			if (this->length_or_value % 2)
 			{
 				failed = TRUE;
 			}
 			break;
-		 case APPLICATION_VERSION:
+		case APPLICATION_VERSION:
+		case INTERNAL_IP4_SERVER:
+		case INTERNAL_IP6_SERVER:
+		case XAUTH_TYPE:
+		case XAUTH_USER_NAME:
+		case XAUTH_USER_PASSWORD:
+		case XAUTH_PASSCODE:
+		case XAUTH_MESSAGE:
+		case XAUTH_CHALLENGE:
+		case XAUTH_DOMAIN:
+		case XAUTH_STATUS:
+		case XAUTH_NEXT_PIN:
+		case XAUTH_ANSWER:
+		case UNITY_BANNER:
+		case UNITY_SAVE_PASSWD:
+		case UNITY_DEF_DOMAIN:
+		case UNITY_SPLITDNS_NAME:
+		case UNITY_SPLIT_INCLUDE:
+		case UNITY_NATT_PORT:
+		case UNITY_LOCAL_LAN:
+		case UNITY_PFS:
+		case UNITY_FW_TYPE:
+		case UNITY_BACKUP_SERVERS:
+		case UNITY_DDNS_HOSTNAME:
 			/* any length acceptable */
 			break;
-		 default:
+		default:
 			DBG1(DBG_ENC, "unknown attribute type %N",
-				 configuration_attribute_type_names, this->type);
+				 configuration_attribute_type_names, this->attr_type);
 			break;
 	}
 
 	if (failed)
 	{
 		DBG1(DBG_ENC, "invalid attribute length %d for %N",
-			 this->length, configuration_attribute_type_names, this->type);
+			 this->length_or_value, configuration_attribute_type_names,
+			 this->attr_type);
 		return FAILED;
 	}
 	return SUCCESS;
 }
 
-METHOD(payload_t, get_encoding_rules, void,
-	private_configuration_attribute_t *this, encoding_rule_t **rules,
-	size_t *rule_count)
+METHOD(payload_t, get_encoding_rules, int,
+	private_configuration_attribute_t *this, encoding_rule_t **rules)
+{
+	if (this->type == CONFIGURATION_ATTRIBUTE)
+	{
+		*rules = encodings_v2;
+		return countof(encodings_v2);
+	}
+	*rules = encodings_v1;
+	return countof(encodings_v1);
+}
+
+METHOD(payload_t, get_header_length, int,
+	private_configuration_attribute_t *this)
 {
-	*rules = configuration_attribute_encodings;
-	*rule_count = countof(configuration_attribute_encodings);
+	return 4;
 }
 
 METHOD(payload_t, get_type, payload_type_t,
 	private_configuration_attribute_t *this)
 {
-	return CONFIGURATION_ATTRIBUTE;
+	return this->type;
 }
 
 METHOD(payload_t, get_next_type, payload_type_t,
@@ -182,21 +244,35 @@ METHOD(payload_t, set_next_type, void,
 METHOD(payload_t, get_length, size_t,
 	private_configuration_attribute_t *this)
 {
-	return this->value.len + CONFIGURATION_ATTRIBUTE_HEADER_LENGTH;
+	return get_header_length(this) + this->value.len;
 }
 
 METHOD(configuration_attribute_t, get_cattr_type, configuration_attribute_type_t,
 	private_configuration_attribute_t *this)
 {
-	return this->type;
+	return this->attr_type;
 }
 
-METHOD(configuration_attribute_t, get_value, chunk_t,
+METHOD(configuration_attribute_t, get_chunk, chunk_t,
 	private_configuration_attribute_t *this)
 {
+	if (this->af_flag)
+	{
+		return chunk_from_thing(this->length_or_value);
+	}
 	return this->value;
 }
 
+METHOD(configuration_attribute_t, get_value, u_int16_t,
+	private_configuration_attribute_t *this)
+{
+	if (this->af_flag)
+	{
+		return this->length_or_value;
+	}
+	return 0;
+}
+
 METHOD2(payload_t, configuration_attribute_t, destroy, void,
 	private_configuration_attribute_t *this)
 {
@@ -207,7 +283,7 @@ METHOD2(payload_t, configuration_attribute_t, destroy, void,
 /*
  * Described in header.
  */
-configuration_attribute_t *configuration_attribute_create()
+configuration_attribute_t *configuration_attribute_create(payload_type_t type)
 {
 	private_configuration_attribute_t *this;
 
@@ -216,16 +292,19 @@ configuration_attribute_t *configuration_attribute_create()
 			.payload_interface = {
 				.verify = _verify,
 				.get_encoding_rules = _get_encoding_rules,
+				.get_header_length = _get_header_length,
 				.get_length = _get_length,
 				.get_next_type = _get_next_type,
 				.set_next_type = _set_next_type,
 				.get_type = _get_type,
 				.destroy = _destroy,
 			},
+			.get_chunk = _get_chunk,
 			.get_value = _get_value,
 			.get_type = _get_cattr_type,
 			.destroy = _destroy,
 		},
+		.type = type
 	);
 	return &this->public;
 }
@@ -233,15 +312,33 @@ configuration_attribute_t *configuration_attribute_create()
 /*
  * Described in header.
  */
+configuration_attribute_t *configuration_attribute_create_chunk(
+	payload_type_t type, configuration_attribute_type_t attr_type, chunk_t chunk)
+{
+	private_configuration_attribute_t *this;
+
+	this = (private_configuration_attribute_t*)
+							configuration_attribute_create(type);
+	this->attr_type = ((u_int16_t)attr_type) & 0x7FFF;
+	this->value = chunk_clone(chunk);
+	this->length_or_value = chunk.len;
+
+	return &this->public;
+}
+
+/*
+ * Described in header.
+ */
 configuration_attribute_t *configuration_attribute_create_value(
-							configuration_attribute_type_t type, chunk_t value)
+					configuration_attribute_type_t attr_type, u_int16_t value)
 {
 	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;
+	this = (private_configuration_attribute_t*)
+					configuration_attribute_create(CONFIGURATION_ATTRIBUTE_V1);
+	this->attr_type = ((u_int16_t)attr_type) & 0x7FFF;
+	this->length_or_value = value;
+	this->af_flag = TRUE;
 
 	return &this->public;
 }