- reworked usage of IDs in various states

- using ID_ANY for any, not NULL as before
- initiator sends IDr payload in IKE_AUTH when ID unique

5 files changed, 123 insertions, 81 deletions

diff --git a/Source/lib/utils/identification.c b/Source/lib/utils/identification.c
index d99d0e453..33f3d92cd 100644
--- a/Source/lib/utils/identification.c
+++ b/Source/lib/utils/identification.c
@@ -808,6 +808,19 @@ static char *get_string(private_identification_t *this)
 }
 
 /**
+ * Implementation of identification_t.contains_wildcards.
+ */
+static bool contains_wildcards(private_identification_t *this)
+{
+	if (this->type == ID_ANY ||
+		memchr(this->encoded.ptr, '*', this->encoded.len) != NULL)
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
  * Default implementation of identification_t.equals and identification_t.belongs_to.
  * compares encoded chunk for equality.
  */
@@ -840,6 +853,11 @@ static bool belongs_to_wc_string(private_identification_t *this, private_identif
 {
 	char *this_str, *other_str, *pos;
 	
+	if (other->type == ID_ANY)
+	{
+		return TRUE;
+	}
+	
 	if (this->type == other->type)
 	{
 		/* try a binary comparison first */
@@ -875,11 +893,15 @@ static bool belongs_to_wc_string(private_identification_t *this, private_identif
 
 /**
  * Special implementation of identification_t.belongs_to for ID_ANY.
- * ANY matches any, even ANY, thats why its there...
+ * ANY matches only another ANY, but nothing other
  */
 static bool belongs_to_any(private_identification_t *this, private_identification_t *other)
-{
-	return TRUE;
+{	
+	if (other->type == ID_ANY)
+	{
+		return TRUE;
+	}
+	return FALSE;
 }
 
 /**
@@ -890,6 +912,11 @@ static bool belongs_to_dn(private_identification_t *this, private_identification
 {
 	int wildcards;
 	
+	if (other->type == ID_ANY)
+	{
+		return TRUE;
+	}
+	
 	if (this->type == other->type)
 	{
 		return match_dn(this->encoded, other->encoded, &wildcards);
@@ -932,6 +959,7 @@ static private_identification_t *identification_create()
 	this->public.get_encoding = (chunk_t (*) (identification_t*))get_encoding;
 	this->public.get_type = (id_type_t (*) (identification_t*))get_type;
 	this->public.get_string = (char* (*) (identification_t*))get_string;
+	this->public.contains_wildcards = (bool (*) (identification_t *this))contains_wildcards;
 	this->public.clone = (identification_t* (*) (identification_t*))clone;
 	this->public.destroy = (void (*) (identification_t*))destroy;
 	/* we use these as defaults, the may be overloaded for special ID types */
diff --git a/Source/lib/utils/identification.h b/Source/lib/utils/identification.h
index 4df665c09..309b6858c 100644
--- a/Source/lib/utils/identification.h
+++ b/Source/lib/utils/identification.h
@@ -171,6 +171,18 @@ struct identification_t {
 	bool (*belongs_to) (identification_t *this, identification_t *other);
 	
 	/**
+	 * @brief Check if an ID is a wildcard ID.
+	 *
+	 * If the ID represents multiple IDs (with wildcards, or
+	 * as the type ID_ANY), TRUE is returned. If it is unique,
+	 * FALSE is returned.
+	 * 
+	 * @param this		identification_t object
+	 * @return 			TRUE if ID contains wildcards
+	 */
+	bool (*contains_wildcards) (identification_t *this);
+	
+	/**
 	 * @brief Clone a identification_t instance.
 	 * 
 	 * @param this		the identification_t object to clone
diff --git a/Source/lib/utils/leak_detective.c b/Source/lib/utils/leak_detective.c
index a6a5c9a91..780ba4c05 100644
--- a/Source/lib/utils/leak_detective.c
+++ b/Source/lib/utils/leak_detective.c
@@ -253,7 +253,7 @@ void free_hook(void *ptr, const void *caller)
 	{
 		pthread_mutex_unlock(&mutex);
 		/* TODO: since pthread_join cannot be excluded cleanly, we are not whining about bad frees */
-		//return;
+		return;
 		logger->log(logger, ERROR, "freeing of invalid memory (%p)", ptr);
 		stack_frame_count = backtrace(stack_frames, STACK_FRAMES_COUNT);
 		log_stack_frames(stack_frames, stack_frame_count);
@@ -404,41 +404,41 @@ char *inet_ntoa(struct in_addr in)
 	return result;
 }
 
-// int pthread_create(pthread_t *__restrict __threadp, __const pthread_attr_t *__restrict __attr, 
-// 					void *(*__start_routine) (void *), void *__restrict __arg)
-// {
-// 	int (*_pthread_create) (pthread_t *__restrict __threadp,
-// 						__const pthread_attr_t *__restrict __attr,
-// 						void *(*__start_routine) (void *),
-// 						void *__restrict __arg) = excluded_functions[PTHREAD_CREATE].lib_function;
-// 	int result;
-// 	
-// 	pthread_mutex_lock(&mutex);
-// 	uninstall_hooks();
-// 	
-// 	result = _pthread_create(__threadp, __attr, __start_routine, __arg);
-// 	
-// 	install_hooks();
-// 	pthread_mutex_unlock(&mutex);
-// 	return result;
-// }
-// 
-// 
-// int pthread_cancel(pthread_t __th)
-// {
-// 	int (*_pthread_cancel) (pthread_t) = excluded_functions[PTHREAD_CANCEL].lib_function;
-// 	int result;
-// 	
-// 	pthread_mutex_lock(&mutex);
-// 	uninstall_hooks();
-// 	
-// 	result = _pthread_cancel(__th);
-// 	
-// 	install_hooks();
-// 	pthread_mutex_unlock(&mutex);
-// 	return result;
-// }
-// 
+int pthread_create(pthread_t *__restrict __threadp, __const pthread_attr_t *__restrict __attr, 
+					void *(*__start_routine) (void *), void *__restrict __arg)
+{
+	int (*_pthread_create) (pthread_t *__restrict __threadp,
+						__const pthread_attr_t *__restrict __attr,
+						void *(*__start_routine) (void *),
+						void *__restrict __arg) = excluded_functions[PTHREAD_CREATE].lib_function;
+	int result;
+	
+	pthread_mutex_lock(&mutex);
+	uninstall_hooks();
+	
+	result = _pthread_create(__threadp, __attr, __start_routine, __arg);
+	
+	install_hooks();
+	pthread_mutex_unlock(&mutex);
+	return result;
+}
+
+
+int pthread_cancel(pthread_t __th)
+{
+	int (*_pthread_cancel) (pthread_t) = excluded_functions[PTHREAD_CANCEL].lib_function;
+	int result;
+	
+	pthread_mutex_lock(&mutex);
+	uninstall_hooks();
+	
+	result = _pthread_cancel(__th);
+	
+	install_hooks();
+	pthread_mutex_unlock(&mutex);
+	return result;
+}
+
 // /* TODO: join has probs, since it dellocates memory 
 //  * allocated (somewhere) with leak_detective :-(.
 //  * We should exclude all pthread_ functions to fix it !? */
diff --git a/Source/lib/utils/logger.c b/Source/lib/utils/logger.c
index 413d3019c..fdaeddff0 100644
--- a/Source/lib/utils/logger.c
+++ b/Source/lib/utils/logger.c
@@ -36,7 +36,7 @@
 #define MAX_LOG 8192
 
 /**
- * Maximum number of logged bytes pre line
+ * Maximum number of logged bytes per line
  */
 #define MAX_BYTES 16
 
@@ -68,40 +68,35 @@ struct private_logger_t {
 	 * Should a thread_id be included in the log?
 	 */
 	bool log_thread_id;
-	
-	/**
-	 * Applies a prefix to string and stores it in buffer.
-	 * 
-	 * @warning: buffer must be at least have MAX_LOG size.
-	 */
-	void (*prepend_prefix) (private_logger_t *this, log_level_t loglevel, const char *string, char *buffer);
 };
 
 /**
- * Implementation of private_logger_t.prepend_prefix.
+ * prepend the logging prefix to string and store it in buffer
  */
 static void prepend_prefix(private_logger_t *this, log_level_t loglevel, const char *string, char *buffer)
 {
 	char log_type, log_details;
+	char thread_id[10] = "";
+
 	if (loglevel & CONTROL)
 	{
-		log_type = '~';
+		log_type = 'C';
 	}
 	else if (loglevel & ERROR)
 	{
-		log_type = '!';
+		log_type = 'E';
 	}
 	else if (loglevel & RAW)
 	{
-		log_type = '#';
+		log_type = 'R';
 	}
 	else if (loglevel & PRIVATE)
 	{
-		log_type = '?';
+		log_type = 'P';
 	}
 	else if (loglevel & AUDIT)
 	{
-		log_type = '>';
+		log_type = 'A';
 	}
 	else
 	{
@@ -127,20 +122,29 @@ static void prepend_prefix(private_logger_t *this, log_level_t loglevel, const c
 	
 	if (this->log_thread_id)
 	{
-		snprintf(buffer, MAX_LOG, "[%c%c:%s] @%u %s", log_type, log_details, this->name, (int)pthread_self(), string);
+		snprintf(thread_id, sizeof(thread_id), " @%d", (int)pthread_self());
 	}
-	else
+	snprintf(buffer, MAX_LOG, "[%c%c:%s]%s %s", log_type, log_details, this->name, thread_id, string);
+}
+
+/**
+ * Convert a charon-loglevel to a syslog priority
+ */
+static int get_priority(log_level_t loglevel)
+{
+	if (loglevel & AUDIT)
 	{
-		snprintf(buffer, MAX_LOG, "[%c%c:%s] %s", log_type, log_details, this->name, string);
+		return LOG_AUTHPRIV|LOG_INFO;
 	}
+	return LOG_DAEMON|LOG_DEBUG;
 }
 
 /**
  * Implementation of logger_t.log.
  *
- * Yes, logg is wrong written :-).
+ * Yes, logg is written wrong :-).
  */
-static void logg(private_logger_t *this, log_level_t loglevel, char *format, ...)
+static void logg(private_logger_t *this, log_level_t loglevel, const char *format, ...)
 {
 	if ((this->level & loglevel) == loglevel)
 	{
@@ -151,15 +155,15 @@ static void logg(private_logger_t *this, log_level_t loglevel, char *format, ...
 		if (this->output == NULL)
 		{
 			/* syslog */
-			this->prepend_prefix(this, loglevel, format, buffer);
+			prepend_prefix(this, loglevel, format, buffer);
 			va_start(args, format);
-			vsyslog(LOG_INFO, buffer, args);
+			vsyslog(get_priority(loglevel), buffer, args);
 			va_end(args);
 		}
 		else
 		{
 			/* File output */
-			this->prepend_prefix(this, loglevel, format, buffer);
+			prepend_prefix(this, loglevel, format, buffer);
 			va_start(args, format);
 			vfprintf(this->output, buffer, args);
 			va_end(args);
@@ -178,28 +182,34 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, const char *
 
 	if ((this->level & loglevel) == loglevel)
 	{
+		char thread_id[10] = "";
 		char buffer[MAX_LOG];
 		char ascii_buffer[MAX_BYTES+1];
 
 		char *buffer_pos = buffer;
-		const char format[] = "%s   %d bytes @ %p";
+		const char format[] = "%s  %d bytes @ %p";
 		const char *bytes_pos  = bytes;
 		const char *bytes_roof = bytes + len;
 
 		int line_start = 0;
 		int i = 0;
 
+		if (this->log_thread_id)
+		{
+			snprintf(thread_id, sizeof(thread_id), " @%d", (int)pthread_self());
+		}
+
 		/* since me can't do multi-line output to syslog, 
 		* we must do multiple syslogs. To avoid
 		* problems in output order, lock this by a mutex.
 		*/
 		pthread_mutex_lock(&mutex);
 
-		this->prepend_prefix(this, loglevel, format, buffer);
+		prepend_prefix(this, loglevel, format, buffer);
 
 		if (this->output == NULL)
 		{
-			syslog(LOG_INFO, buffer, label, len, bytes);
+			syslog(get_priority(loglevel), buffer, label, len, bytes);
 		}
 		else
 		{
@@ -230,14 +240,14 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, const char *
 
 				if (this->output == NULL)
 				{
-					syslog(LOG_INFO, "[  :%5d] %s %s", line_start, buffer, ascii_buffer);	
+					syslog(get_priority(loglevel), "[  :%5d]%s   %s  %s", line_start, thread_id, buffer, ascii_buffer);	
 				}
 				else
 				{
-					fprintf(this->output, "[  :%5d] %s %s\n", line_start, buffer, ascii_buffer);
+					fprintf(this->output, "[  :%5d]%s   %s  %s\n", line_start, thread_id, buffer, ascii_buffer);
 				}
 				buffer_pos = buffer;
-				line_start += 16;
+				line_start += MAX_BYTES;
 				i = 0;
 			}
 			else 
@@ -252,7 +262,7 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, const char *
 /**
  * Implementation of logger_t.log_chunk.
  */
-static void log_chunk(logger_t *this, log_level_t loglevel, char *label, chunk_t chunk)
+static void log_chunk(logger_t *this, log_level_t loglevel, const char *label, chunk_t chunk)
 {
 	this->log_bytes(this, loglevel, label, chunk.ptr, chunk.len);
 }
@@ -306,8 +316,8 @@ logger_t *logger_create(char *logger_name, log_level_t log_level, bool log_threa
 	private_logger_t *this = malloc_thing(private_logger_t);
 	
 	/* public functions */
-	this->public.log = (void(*)(logger_t*,log_level_t,char*,...))logg;
-	this->public.log_bytes = (void(*)(logger_t*, log_level_t, char*,char*,size_t))log_bytes;
+	this->public.log = (void(*)(logger_t*,log_level_t,const char*,...))logg;
+	this->public.log_bytes = (void(*)(logger_t*, log_level_t, const char*, const char*,size_t))log_bytes;
 	this->public.log_chunk = log_chunk;
 	this->public.enable_level = (void(*)(logger_t*,log_level_t))enable_level;
 	this->public.disable_level = (void(*)(logger_t*,log_level_t))disable_level;
@@ -315,9 +325,6 @@ logger_t *logger_create(char *logger_name, log_level_t log_level, bool log_threa
 	this->public.set_output = (void(*)(logger_t*,FILE*))set_output;
 	this->public.destroy = (void(*)(logger_t*))destroy;
 
-	/* private functions */
-	this->prepend_prefix = prepend_prefix;
-
 	if (logger_name == NULL)
 	{
 		logger_name = "";
@@ -331,10 +338,5 @@ logger_t *logger_create(char *logger_name, log_level_t log_level, bool log_threa
 	strcpy(this->name,logger_name);
 	this->output = output;
 	
-	if (output == NULL)
-	{
-		//openlog(DAEMON_NAME, 0, LOG_DAEMON);
-	}
-	
 	return (logger_t*)this;
 }
diff --git a/Source/lib/utils/logger.h b/Source/lib/utils/logger.h
index 322bb3264..dec73078e 100644
--- a/Source/lib/utils/logger.h
+++ b/Source/lib/utils/logger.h
@@ -110,7 +110,7 @@ struct logger_t {
 	 * @param format 	printf like format string
 	 * @param ... 		printf like parameters
 	 */
-	void (*log) (logger_t *this, log_level_t log_level, char *format, ...);
+	void (*log) (logger_t *this, log_level_t log_level, const char *format, ...);
 
 	/**
 	 * @brief Log some bytes, useful for debugging.
@@ -124,7 +124,7 @@ struct logger_t {
 	 * @param bytes 	pointer to the bytes to dump
 	 * @param len	 	number of bytes to dump
 	 */
-	void (*log_bytes) (logger_t *this, log_level_t loglevel, char *label, char *bytes, size_t len);
+	void (*log_bytes) (logger_t *this, log_level_t loglevel, const char *label, const char *bytes, size_t len);
 
 	/**
 	 * @brief Log a chunk, useful for debugging.
@@ -137,7 +137,7 @@ struct logger_t {
 	 * @param label 	a labeling name, logged with the bytes
 	 * @param chunk		chunk to log
 	 */
-	void (*log_chunk) (logger_t *this, log_level_t loglevel, char *label, chunk_t chunk);
+	void (*log_chunk) (logger_t *this, log_level_t loglevel, const char *label, chunk_t chunk);
 
 	/**
 	 * @brief Enables a loglevel for the current logger_t object.