1 files changed, 41 insertions, 43 deletions
diff --git a/src/charon/encoding/payloads/encodings.c b/src/charon/encoding/payloads/encodings.c
index 8e0f30b2e..9ec0a94f9 100644
--- a/src/charon/encoding/payloads/encodings.c
+++ b/src/charon/encoding/payloads/encodings.c
@@ -24,46 +24,44 @@
 
 #include "encodings.h"
 
-
-mapping_t encoding_type_m[] = {
-	{U_INT_4, "U_INT_4"},
-	{U_INT_8, "U_INT_8"},
-	{U_INT_16, "U_INT_16"},
-	{U_INT_32, "U_INT_32"},
-	{U_INT_64, "U_INT_64"},
-	{IKE_SPI, "IKE_SPI"},
-	{RESERVED_BIT, "RESERVED_BIT"},
-	{RESERVED_BYTE, "RESERVED_BYTE"},
-	{FLAG, "FLAG"},
-	{PAYLOAD_LENGTH, "PAYLOAD_LENGTH"},
-	{HEADER_LENGTH, "HEADER_LENGTH"},
-	{SPI_SIZE, "SPI_SIZE"},
-	{SPI, "SPI"},
-	{KEY_EXCHANGE_DATA, "KEY_EXCHANGE_DATA"},
-	{NOTIFICATION_DATA, "NOTIFICATION_DATA"},
-	{PROPOSALS, "PROPOSALS"},
-	{TRANSFORMS, "TRANSFORMS"},
-	{TRANSFORM_ATTRIBUTES, "TRANSFORM_ATTRIBUTES"},
-	{ATTRIBUTE_FORMAT, "ATTRIBUTE_FORMAT"},
-	{ATTRIBUTE_TYPE, "ATTRIBUTE_TYPE"},
-	{ATTRIBUTE_LENGTH_OR_VALUE, "ATTRIBUTE_LENGTH_OR_VALUE"},
-	{ATTRIBUTE_VALUE, "ATTRIBUTE_VALUE"},
-	{NONCE_DATA, "NONCE_DATA"},
-	{ID_DATA, "ID_DATA"},
-	{AUTH_DATA, "AUTH_DATA"},
-	{ENCRYPTED_DATA, "ENCRYPTED_DATA"},
-	{TS_TYPE, "TS_TYPE"},
-	{ADDRESS, "ADDRESS"},
-	{TRAFFIC_SELECTORS, "TRAFFIC_SELECTORS"},
-	{CERT_DATA, "CERT_DATA"},
-	{CERTREQ_DATA, "CERTREQ_DATA"},
-	{SPIS, "SPIS"},
-	{VID_DATA, "VID_DATA"},
-	{VID_DATA, "VID_DATA"},	
-	{CONFIGURATION_ATTRIBUTES, "CONFIGURATION_ATTRIBUTES"},
-	{CONFIGURATION_ATTRIBUTE_LENGTH, "CONFIGURATION_ATTRIBUTE_LENGTH"},
-	{CONFIGURATION_ATTRIBUTE_VALUE, "CONFIGURATION_ATTRIBUTE_VALUE"},	
-	{EAP_MESSAGE, "EAP_MESSAGE"},
-	{UNKNOWN_DATA,"UNKNOWN_DATA"},
-	{MAPPING_END, NULL}
-};
+ENUM(encoding_type_names, U_INT_4, UNKNOWN_DATA,
+	"U_INT_4",
+	"U_INT_8",
+	"U_INT_16",
+	"U_INT_32",
+	"U_INT_64",
+	"IKE_SPI",
+	"RESERVED_BIT",
+	"RESERVED_BYTE",
+	"FLAG",
+	"PAYLOAD_LENGTH",
+	"HEADER_LENGTH",
+	"SPI_SIZE",
+	"SPI",
+	"KEY_EXCHANGE_DATA",
+	"NOTIFICATION_DATA",
+	"PROPOSALS",
+	"TRANSFORMS",
+	"TRANSFORM_ATTRIBUTES",
+	"ATTRIBUTE_FORMAT",
+	"ATTRIBUTE_TYPE",
+	"ATTRIBUTE_LENGTH_OR_VALUE",
+	"ATTRIBUTE_VALUE",
+	"NONCE_DATA",
+	"ID_DATA",
+	"AUTH_DATA",
+	"ENCRYPTED_DATA",
+	"TS_TYPE",
+	"ADDRESS",
+	"TRAFFIC_SELECTORS",
+	"CERT_DATA",
+	"CERTREQ_DATA",
+	"SPIS",
+	"VID_DATA",
+	"VID_DATA",
+	"CONFIGURATION_ATTRIBUTES",
+	"CONFIGURATION_ATTRIBUTE_LENGTH",
+	"CONFIGURATION_ATTRIBUTE_VALUE",
+	"EAP_MESSAGE",
+	"UNKNOWN_DATA",
+);