better split up of library files "types.h" & "definitions.h"

centralized all printf specifier character definitions
reuse of arginfo handlers
more cleanups
fixed more AMD64 issues
added DEBUG_LEVEL compile flag to exclude DBGn() statements

38 files changed, 42 insertions, 46 deletions

diff --git a/src/charon/encoding/payloads/auth_payload.c b/src/charon/encoding/payloads/auth_payload.c
index 5e3569750..256d6c8a4 100644
--- a/src/charon/encoding/payloads/auth_payload.c
+++ b/src/charon/encoding/payloads/auth_payload.c
@@ -259,7 +259,7 @@ auth_payload_t *auth_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length =AUTH_PAYLOAD_HEADER_LENGTH;
-	this->auth_data = CHUNK_INITIALIZER;
+	this->auth_data = chunk_empty;
 
 	return (&(this->public));
 }
diff --git a/src/charon/encoding/payloads/auth_payload.h b/src/charon/encoding/payloads/auth_payload.h
index 7616a6ed2..2db82ec0b 100644
--- a/src/charon/encoding/payloads/auth_payload.h
+++ b/src/charon/encoding/payloads/auth_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct auth_payload_t auth_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <sa/authenticators/authenticator.h>
 
diff --git a/src/charon/encoding/payloads/cert_payload.c b/src/charon/encoding/payloads/cert_payload.c
index f5a5655ae..2e690b45d 100644
--- a/src/charon/encoding/payloads/cert_payload.c
+++ b/src/charon/encoding/payloads/cert_payload.c
@@ -271,7 +271,7 @@ cert_payload_t *cert_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length =CERT_PAYLOAD_HEADER_LENGTH;
-	this->cert_data = CHUNK_INITIALIZER;
+	this->cert_data = chunk_empty;
 
 	return (&(this->public));
 }
diff --git a/src/charon/encoding/payloads/cert_payload.h b/src/charon/encoding/payloads/cert_payload.h
index c1ba0bdc0..fb0cf684c 100644
--- a/src/charon/encoding/payloads/cert_payload.h
+++ b/src/charon/encoding/payloads/cert_payload.h
@@ -27,7 +27,7 @@
 typedef enum cert_encoding_t cert_encoding_t;
 typedef struct cert_payload_t cert_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <crypto/x509.h>
 #include <encoding/payloads/payload.h>
 
diff --git a/src/charon/encoding/payloads/certreq_payload.c b/src/charon/encoding/payloads/certreq_payload.c
index 4001712b8..07d3ce2bc 100644
--- a/src/charon/encoding/payloads/certreq_payload.c
+++ b/src/charon/encoding/payloads/certreq_payload.c
@@ -258,7 +258,7 @@ certreq_payload_t *certreq_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length =CERTREQ_PAYLOAD_HEADER_LENGTH;
-	this->certreq_data = CHUNK_INITIALIZER;
+	this->certreq_data = chunk_empty;
 
 	return (&(this->public));
 }
diff --git a/src/charon/encoding/payloads/certreq_payload.h b/src/charon/encoding/payloads/certreq_payload.h
index e00d673e7..2985fdae1 100644
--- a/src/charon/encoding/payloads/certreq_payload.h
+++ b/src/charon/encoding/payloads/certreq_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct certreq_payload_t certreq_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/cert_payload.h>
 
diff --git a/src/charon/encoding/payloads/configuration_attribute.c b/src/charon/encoding/payloads/configuration_attribute.c
index 5982214ac..e7000e1b5 100644
--- a/src/charon/encoding/payloads/configuration_attribute.c
+++ b/src/charon/encoding/payloads/configuration_attribute.c
@@ -26,7 +26,7 @@
 #include "configuration_attribute.h"
 
 #include <encoding/payloads/encodings.h>
-#include <types.h>
+#include <library.h>
 
 
 typedef struct private_configuration_attribute_t private_configuration_attribute_t;
@@ -272,7 +272,7 @@ configuration_attribute_t *configuration_attribute_create()
 	
 	/* set default values of the fields */
 	this->attribute_type = 0;
-	this->attribute_value = CHUNK_INITIALIZER;
+	this->attribute_value = chunk_empty;
 	this->attribute_length = 0;
 
 	return (&(this->public));
diff --git a/src/charon/encoding/payloads/configuration_attribute.h b/src/charon/encoding/payloads/configuration_attribute.h
index 51abab61e..5a11d0a35 100644
--- a/src/charon/encoding/payloads/configuration_attribute.h
+++ b/src/charon/encoding/payloads/configuration_attribute.h
@@ -27,7 +27,7 @@
 typedef enum configuration_attribute_type_t configuration_attribute_type_t;
 typedef struct configuration_attribute_t configuration_attribute_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 
 
diff --git a/src/charon/encoding/payloads/cp_payload.h b/src/charon/encoding/payloads/cp_payload.h
index 1978b69cf..af36b48a3 100644
--- a/src/charon/encoding/payloads/cp_payload.h
+++ b/src/charon/encoding/payloads/cp_payload.h
@@ -27,7 +27,7 @@
 typedef enum config_type_t config_type_t;
 typedef struct cp_payload_t cp_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/configuration_attribute.h>
 #include <utils/linked_list.h>
diff --git a/src/charon/encoding/payloads/delete_payload.c b/src/charon/encoding/payloads/delete_payload.c
index dcc66e8fa..81436e2a8 100644
--- a/src/charon/encoding/payloads/delete_payload.c
+++ b/src/charon/encoding/payloads/delete_payload.c
@@ -355,7 +355,7 @@ delete_payload_t *delete_payload_create(protocol_id_t protocol_id)
 	this->protocol_id = protocol_id;
 	this->spi_size = protocol_id == PROTO_AH || protocol_id == PROTO_ESP ? 4 : 0;
 	this->spi_count = 0;
-	this->spis = CHUNK_INITIALIZER;
+	this->spis = chunk_empty;
 	this->spi_list = NULL;
 
 	return (&this->public);
diff --git a/src/charon/encoding/payloads/delete_payload.h b/src/charon/encoding/payloads/delete_payload.h
index 3484f0235..9fc558f09 100644
--- a/src/charon/encoding/payloads/delete_payload.h
+++ b/src/charon/encoding/payloads/delete_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct delete_payload_t delete_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/proposal_substructure.h>
 
diff --git a/src/charon/encoding/payloads/eap_payload.c b/src/charon/encoding/payloads/eap_payload.c
index e31c4b2b9..aa886e9c4 100644
--- a/src/charon/encoding/payloads/eap_payload.c
+++ b/src/charon/encoding/payloads/eap_payload.c
@@ -222,7 +222,7 @@ eap_payload_t *eap_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length = EAP_PAYLOAD_HEADER_LENGTH;
-	this->message = CHUNK_INITIALIZER;
+	this->message = chunk_empty;
 
 	return (&(this->public));
 }
diff --git a/src/charon/encoding/payloads/eap_payload.h b/src/charon/encoding/payloads/eap_payload.h
index 17af03d40..bf493eb7f 100644
--- a/src/charon/encoding/payloads/eap_payload.h
+++ b/src/charon/encoding/payloads/eap_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct eap_payload_t eap_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 
 /**
diff --git a/src/charon/encoding/payloads/encodings.h b/src/charon/encoding/payloads/encodings.h
index d69de4f1d..ed5596ecd 100644
--- a/src/charon/encoding/payloads/encodings.h
+++ b/src/charon/encoding/payloads/encodings.h
@@ -27,9 +27,7 @@
 typedef enum encoding_type_t encoding_type_t;
 typedef struct encoding_rule_t encoding_rule_t;
 
-
-#include <types.h>
-#include <definitions.h>
+#include <library.h>
 
 /**
  * @brief All different kinds of encoding types. 
diff --git a/src/charon/encoding/payloads/encryption_payload.c b/src/charon/encoding/payloads/encryption_payload.c
index 908de3d30..23b6e8d9f 100644
--- a/src/charon/encoding/payloads/encryption_payload.c
+++ b/src/charon/encoding/payloads/encryption_payload.c
@@ -293,7 +293,7 @@ static void generate(private_encryption_payload_t *this)
 		/* no paylads? */
 		DBG2(DBG_ENC, "generating contained payloads, but none available");
 		free(this->decrypted.ptr);
-		this->decrypted = CHUNK_INITIALIZER;
+		this->decrypted = chunk_empty;
 		iterator->destroy(iterator);
 		return;
 	}
@@ -636,8 +636,8 @@ encryption_payload_t *encryption_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length = ENCRYPTION_PAYLOAD_HEADER_LENGTH;
-	this->encrypted = CHUNK_INITIALIZER;
-	this->decrypted = CHUNK_INITIALIZER;
+	this->encrypted = chunk_empty;
+	this->decrypted = chunk_empty;
 	this->signer = NULL;
 	this->crypter = NULL;
 	this->payloads = linked_list_create();
diff --git a/src/charon/encoding/payloads/encryption_payload.h b/src/charon/encoding/payloads/encryption_payload.h
index c0b476b73..7cf53619f 100644
--- a/src/charon/encoding/payloads/encryption_payload.h
+++ b/src/charon/encoding/payloads/encryption_payload.h
@@ -25,7 +25,7 @@
 
 typedef struct encryption_payload_t encryption_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <crypto/crypters/crypter.h>
 #include <crypto/signers/signer.h>
 #include <encoding/payloads/payload.h>
diff --git a/src/charon/encoding/payloads/id_payload.c b/src/charon/encoding/payloads/id_payload.c
index 954336a22..1a8293a76 100644
--- a/src/charon/encoding/payloads/id_payload.c
+++ b/src/charon/encoding/payloads/id_payload.c
@@ -303,7 +303,7 @@ id_payload_t *id_payload_create(bool is_initiator)
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length =ID_PAYLOAD_HEADER_LENGTH;
-	this->id_data = CHUNK_INITIALIZER;
+	this->id_data = chunk_empty;
 	this->is_initiator = is_initiator;
 
 	return (&(this->public));
diff --git a/src/charon/encoding/payloads/id_payload.h b/src/charon/encoding/payloads/id_payload.h
index 01c6a4e1d..b67d85d2e 100644
--- a/src/charon/encoding/payloads/id_payload.h
+++ b/src/charon/encoding/payloads/id_payload.h
@@ -27,7 +27,7 @@
 
 typedef struct id_payload_t id_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <utils/identification.h>
 #include <encoding/payloads/payload.h>
 
diff --git a/src/charon/encoding/payloads/ike_header.h b/src/charon/encoding/payloads/ike_header.h
index 4cf253f80..95c20f810 100644
--- a/src/charon/encoding/payloads/ike_header.h
+++ b/src/charon/encoding/payloads/ike_header.h
@@ -27,7 +27,7 @@
 typedef enum exchange_type_t exchange_type_t;
 typedef struct ike_header_t ike_header_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 
 /**
diff --git a/src/charon/encoding/payloads/ke_payload.c b/src/charon/encoding/payloads/ke_payload.c
index fc875517c..5a83fd0a2 100644
--- a/src/charon/encoding/payloads/ke_payload.c
+++ b/src/charon/encoding/payloads/ke_payload.c
@@ -256,7 +256,7 @@ ke_payload_t *ke_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length = KE_PAYLOAD_HEADER_LENGTH;
-	this->key_exchange_data = CHUNK_INITIALIZER;
+	this->key_exchange_data = chunk_empty;
 	this->dh_group_number = MODP_NONE;
 
 	return &this->public;
diff --git a/src/charon/encoding/payloads/ke_payload.h b/src/charon/encoding/payloads/ke_payload.h
index 18f9dece7..52be8ffe3 100644
--- a/src/charon/encoding/payloads/ke_payload.h
+++ b/src/charon/encoding/payloads/ke_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct ke_payload_t ke_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/transform_substructure.h>
 #include <utils/linked_list.h>
diff --git a/src/charon/encoding/payloads/nonce_payload.h b/src/charon/encoding/payloads/nonce_payload.h
index 444110a99..96d83b028 100644
--- a/src/charon/encoding/payloads/nonce_payload.h
+++ b/src/charon/encoding/payloads/nonce_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct nonce_payload_t nonce_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 
 /**
diff --git a/src/charon/encoding/payloads/notify_payload.h b/src/charon/encoding/payloads/notify_payload.h
index df956334b..2b419bb98 100644
--- a/src/charon/encoding/payloads/notify_payload.h
+++ b/src/charon/encoding/payloads/notify_payload.h
@@ -29,7 +29,7 @@
 typedef enum notify_type_t notify_type_t;
 typedef struct notify_payload_t notify_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/proposal_substructure.h>
 #include <utils/linked_list.h>
diff --git a/src/charon/encoding/payloads/payload.h b/src/charon/encoding/payloads/payload.h
index dfc30542f..9a8c2f482 100644
--- a/src/charon/encoding/payloads/payload.h
+++ b/src/charon/encoding/payloads/payload.h
@@ -27,8 +27,7 @@
 typedef enum payload_type_t payload_type_t;
 typedef struct payload_t payload_t;
 
-#include <types.h>
-#include <definitions.h>
+#include <library.h>
 #include <encoding/payloads/encodings.h>
 
 
diff --git a/src/charon/encoding/payloads/proposal_substructure.c b/src/charon/encoding/payloads/proposal_substructure.c
index bb18c799b..182d2b6e8 100644
--- a/src/charon/encoding/payloads/proposal_substructure.c
+++ b/src/charon/encoding/payloads/proposal_substructure.c
@@ -27,7 +27,7 @@
 
 #include <encoding/payloads/encodings.h>
 #include <encoding/payloads/transform_substructure.h>
-#include <types.h>
+#include <library.h>
 #include <utils/linked_list.h>
 #include <daemon.h>
 
diff --git a/src/charon/encoding/payloads/proposal_substructure.h b/src/charon/encoding/payloads/proposal_substructure.h
index f1ce5bc47..93a8d7b2f 100644
--- a/src/charon/encoding/payloads/proposal_substructure.h
+++ b/src/charon/encoding/payloads/proposal_substructure.h
@@ -26,7 +26,7 @@
 
 typedef struct proposal_substructure_t proposal_substructure_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/transform_substructure.h>
 #include <config/proposal.h>
diff --git a/src/charon/encoding/payloads/sa_payload.h b/src/charon/encoding/payloads/sa_payload.h
index 90ded9a0f..67d687857 100644
--- a/src/charon/encoding/payloads/sa_payload.h
+++ b/src/charon/encoding/payloads/sa_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct sa_payload_t sa_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/proposal_substructure.h>
 #include <utils/linked_list.h>
diff --git a/src/charon/encoding/payloads/traffic_selector_substructure.c b/src/charon/encoding/payloads/traffic_selector_substructure.c
index 4a1404244..573139bf3 100644
--- a/src/charon/encoding/payloads/traffic_selector_substructure.c
+++ b/src/charon/encoding/payloads/traffic_selector_substructure.c
@@ -255,8 +255,8 @@ traffic_selector_substructure_t *traffic_selector_substructure_create()
 	this->payload_length = TRAFFIC_SELECTOR_HEADER_LENGTH;
 	this->start_port = 0;
 	this->end_port = 0;
-	this->starting_address = CHUNK_INITIALIZER;
-	this->ending_address = CHUNK_INITIALIZER;
+	this->starting_address = chunk_empty;
+	this->ending_address = chunk_empty;
 	this->ip_protocol_id = 0;
 	/* must be set to be valid */
 	this->ts_type = TS_IPV4_ADDR_RANGE;
diff --git a/src/charon/encoding/payloads/traffic_selector_substructure.h b/src/charon/encoding/payloads/traffic_selector_substructure.h
index 5fc7dced6..14efccc89 100644
--- a/src/charon/encoding/payloads/traffic_selector_substructure.h
+++ b/src/charon/encoding/payloads/traffic_selector_substructure.h
@@ -27,7 +27,7 @@
 
 typedef struct traffic_selector_substructure_t traffic_selector_substructure_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <utils/host.h>
 #include <config/traffic_selector.h>
diff --git a/src/charon/encoding/payloads/transform_attribute.c b/src/charon/encoding/payloads/transform_attribute.c
index eddad000a..066885c55 100644
--- a/src/charon/encoding/payloads/transform_attribute.c
+++ b/src/charon/encoding/payloads/transform_attribute.c
@@ -27,7 +27,7 @@
 #include "transform_attribute.h"
 
 #include <encoding/payloads/encodings.h>
-#include <types.h>
+#include <library.h>
 
 typedef struct private_transform_attribute_t private_transform_attribute_t;
 
diff --git a/src/charon/encoding/payloads/transform_attribute.h b/src/charon/encoding/payloads/transform_attribute.h
index 1588b8f57..30583b23f 100644
--- a/src/charon/encoding/payloads/transform_attribute.h
+++ b/src/charon/encoding/payloads/transform_attribute.h
@@ -27,7 +27,7 @@
 typedef enum transform_attribute_type_t transform_attribute_type_t;
 typedef struct transform_attribute_t transform_attribute_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 
 
diff --git a/src/charon/encoding/payloads/transform_substructure.c b/src/charon/encoding/payloads/transform_substructure.c
index 4ad1948f9..d64d6c754 100644
--- a/src/charon/encoding/payloads/transform_substructure.c
+++ b/src/charon/encoding/payloads/transform_substructure.c
@@ -27,7 +27,7 @@
 
 #include <encoding/payloads/transform_attribute.h>
 #include <encoding/payloads/encodings.h>
-#include <types.h>
+#include <library.h>
 #include <utils/linked_list.h>
 #include <daemon.h>
 
diff --git a/src/charon/encoding/payloads/transform_substructure.h b/src/charon/encoding/payloads/transform_substructure.h
index ee297f826..97f587d5d 100644
--- a/src/charon/encoding/payloads/transform_substructure.h
+++ b/src/charon/encoding/payloads/transform_substructure.h
@@ -26,8 +26,7 @@
 
 typedef struct transform_substructure_t transform_substructure_t;
 
-#include <types.h>
-#include <definitions.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/transform_attribute.h>
 #include <utils/linked_list.h>
diff --git a/src/charon/encoding/payloads/ts_payload.h b/src/charon/encoding/payloads/ts_payload.h
index a5595c98a..1addee22c 100644
--- a/src/charon/encoding/payloads/ts_payload.h
+++ b/src/charon/encoding/payloads/ts_payload.h
@@ -27,7 +27,7 @@
 
 typedef struct ts_payload_t ts_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <utils/linked_list.h>
 #include <config/traffic_selector.h>
 #include <encoding/payloads/payload.h>
diff --git a/src/charon/encoding/payloads/unknown_payload.c b/src/charon/encoding/payloads/unknown_payload.c
index df126b50b..bbe736085 100644
--- a/src/charon/encoding/payloads/unknown_payload.c
+++ b/src/charon/encoding/payloads/unknown_payload.c
@@ -202,7 +202,7 @@ unknown_payload_t *unknown_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length = UNKNOWN_PAYLOAD_HEADER_LENGTH;
-	this->data = CHUNK_INITIALIZER;
+	this->data = chunk_empty;
 
 	return (&(this->public));
 }
diff --git a/src/charon/encoding/payloads/unknown_payload.h b/src/charon/encoding/payloads/unknown_payload.h
index 23cf421a6..8d13a03a3 100644
--- a/src/charon/encoding/payloads/unknown_payload.h
+++ b/src/charon/encoding/payloads/unknown_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct unknown_payload_t unknown_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 
 /**
diff --git a/src/charon/encoding/payloads/vendor_id_payload.c b/src/charon/encoding/payloads/vendor_id_payload.c
index ef704007c..e3a4d2e1f 100644
--- a/src/charon/encoding/payloads/vendor_id_payload.c
+++ b/src/charon/encoding/payloads/vendor_id_payload.c
@@ -222,7 +222,7 @@ vendor_id_payload_t *vendor_id_payload_create()
 	this->critical = FALSE;
 	this->next_payload = NO_PAYLOAD;
 	this->payload_length = VENDOR_ID_PAYLOAD_HEADER_LENGTH;
-	this->vendor_id_data = CHUNK_INITIALIZER;
+	this->vendor_id_data = chunk_empty;
 
 	return (&(this->public));
 }
diff --git a/src/charon/encoding/payloads/vendor_id_payload.h b/src/charon/encoding/payloads/vendor_id_payload.h
index 8972eaa03..c7eebc155 100644
--- a/src/charon/encoding/payloads/vendor_id_payload.h
+++ b/src/charon/encoding/payloads/vendor_id_payload.h
@@ -26,7 +26,7 @@
 
 typedef struct vendor_id_payload_t vendor_id_payload_t;
 
-#include <types.h>
+#include <library.h>
 #include <encoding/payloads/payload.h>
 
 /**