1 files changed, 17 insertions, 21 deletions
diff --git a/src/charon/encoding/payloads/configuration_attribute.c b/src/charon/encoding/payloads/configuration_attribute.c
index 88adbd66f..5982214ac 100644
--- a/src/charon/encoding/payloads/configuration_attribute.c
+++ b/src/charon/encoding/payloads/configuration_attribute.c
@@ -58,27 +58,23 @@ struct private_configuration_attribute_t {
 	chunk_t attribute_value;
 };
 
-/** 
- * String mappings for configuration_attribute_type_t.
- */
-mapping_t configuration_attribute_type_m[] = {
-	{INTERNAL_IP4_ADDRESS, "INTERNAL_IP4_ADDRESS"},
-	{INTERNAL_IP4_NETMASK, "INTERNAL_IP4_NETMASK"},
-	{INTERNAL_IP4_DNS, "INTERNAL_IP4_DNS"},
-	{INTERNAL_IP4_NBNS, "INTERNAL_IP4_NBNS"},
-	{INTERNAL_ADDRESS_EXPIRY, "INTERNAL_ADDRESS_EXPIRY"},
-	{INTERNAL_IP4_DHCP, "INTERNAL_IP4_DHCP"},
-	{APPLICATION_VERSION, "APPLICATION_VERSION"},
-	{INTERNAL_IP6_ADDRESS, "INTERNAL_IP6_ADDRESS"},
-	{INTERNAL_IP6_DNS, "INTERNAL_IP6_DNS"},
-	{INTERNAL_IP6_NBNS, "INTERNAL_IP6_NBNS"},
-	{INTERNAL_IP6_DHCP, "INTERNAL_IP6_DHCP"},
-	{INTERNAL_IP4_SUBNET, "INTERNAL_IP4_SUBNET"},
-	{SUPPORTED_ATTRIBUTES, "SUPPORTED_ATTRIBUTES"},
-	{INTERNAL_IP6_SUBNET, "INTERNAL_IP6_SUBNET"},
-	{MAPPING_END, NULL}
-};
-
+ENUM_BEGIN(configuration_attribute_type_name, 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_name, 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_END(configuration_attribute_type_name, INTERNAL_IP6_SUBNET);
 
 /**
  * Encoding rules to parse or generate a configuration attribute.