- fixed doxygen build

- seperates now in lib and charon

Source/lib/utils/identification.h

@@ -84,21 +84,6 @@ enum id_type_t {
 	ID_KEY_ID = 11
 };
 
-/**
- * Old pluto id format
- * 
- * @deprecated Do not use any more, only here for pluto.
- */
-// struct id {
-// 	/** ID_* value, pluto pendant to id_type_t */
-// 	int kind;
-// 	/** ID_IPV4_ADDR, ID_IPV6_ADDR */
-// 	ip_address ip_addr;
-// 	/** ID_FQDN, ID_USER_FQDN (with @) */
-// 	/** ID_KEY_ID, ID_DER_ASN_DN       */
-// 	chunk_t name;
-// };
-
 /**
  * String mappings for id_type_t.
  */
@@ -158,17 +143,6 @@ struct identification_t {
 	 */
 	char *(*get_string) (identification_t *this);
 	
-	/**
-	 * @brief Get the id in the format used in pluto.
-	 * 
-	 * We do this in pluto style here, which means no memory
-	 * is allocated.
-	 * 
-	 * @param this		the identification_t object
-	 * @return 			string
-	 */
-	// void (*get_pluto_id) (identification_t *this, struct id *pluto_id);
-	
 	/**
 	 * @brief Check if two identification_t objects are equal.
 	 * 
@@ -232,18 +206,5 @@ identification_t * identification_create_from_string(id_type_t type, char *strin
  */
 identification_t * identification_create_from_encoding(id_type_t type, chunk_t encoded);
 
-/**
- * @brief Creates an identification_t object from the old pluto id format.
- * 
- * Pluto uses struct id for identification stuff. Since we need to convert from
- * this format to our identification_t, we need this special constructor.
- * 
- * @param id		old pluto format id
- * @return			identification_t object
- * 
- * @ingroup utils
- */
-// identification_t * identification_create_from_pluto_id(struct id *pluto_id);
-
 
 #endif /* IDENTIFICATION_H_ */

Source/lib/utils/leak_detective.c

@@ -1,7 +1,7 @@
 /**
  * @file leak_detective.c
  * 
- * @brief Implementation of leak_detective_t.
+ * @brief Allocation hooks to find memory leaks.
  */
 
 /*
@@ -31,7 +31,6 @@
 #include <dlfcn.h>
 #include <unistd.h>
 #include <syslog.h>
-#define __USE_GNU /* needed for recursiv mutex initializer */
 #include <pthread.h>
 
 #include "leak_detective.h"
@@ -120,8 +119,7 @@ static bool installed = FALSE;
 /**
  * Mutex to exclusivly uninstall hooks, access heap list
  */
-static pthread_mutex_t mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 
 /**

Source/lib/utils/logger_manager.h

@@ -145,8 +145,16 @@ struct logger_manager_t {
  */
 extern logger_manager_t *logger_manager;
 
+/**
+ * Initialize the logger manager with all its logger.
+ * Has to be called before logger_manager is accessed.
+ */
 void logger_manager_init();
 
+/**
+ * Free any resources hold by the logger manager. Do
+ * not access logger_manager after this call.
+ */
 void logger_manager_cleanup();
 
 #endif /*LOGGER_MANAGER_H_*/