Thread-safe wrapper around strerror(3)/strerror_r(3) added

diff --git a/configure.in b/configure.in
index 7c2342c3e741036e19cc09be24f45e5c4122a25b..363a584c15a2762695d16bf7a76abccd1ff4adf8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -301,6 +301,7 @@ dnl ===========================================
 
 AC_HEADER_STDBOOL
 AC_FUNC_ALLOCA
+AC_FUNC_STRERROR_R
 
 dnl libraries needed on some platforms but not on others
 dnl ====================================================

diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c
index f76245a195c0229a137791f7176acb34ef01cfad..f613b0c647749c8a4a133c7c0214cd58c94d0c0f 100644 (file)
--- a/src/libstrongswan/utils.c
+++ b/src/libstrongswan/utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011 Tobias Brunner
+ * Copyright (C) 2008-2012 Tobias Brunner
  * Copyright (C) 2005-2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -25,6 +25,7 @@
 #include <limits.h>
 #include <dirent.h>
 #include <time.h>
+#include <pthread.h>
 
 #include "enum.h"
 #include "debug.h"
@@ -194,6 +195,83 @@ bool mkdir_p(const char *path, mode_t mode)
        return TRUE;
 }
 
+
+/**
+ * The size of the thread-specific error buffer
+ */
+#define STRERROR_BUF_LEN 256
+
+/**
+ * Key to store thread-specific error buffer
+ */
+static pthread_key_t strerror_buf_key;
+
+/**
+ * Only initialize the key above once
+ */
+static pthread_once_t strerror_buf_key_once = PTHREAD_ONCE_INIT;
+
+/**
+ * Create the key used for the thread-specific error buffer
+ */
+static void create_strerror_buf_key()
+{
+       pthread_key_create(&strerror_buf_key, free);
+}
+
+/**
+ * Retrieve the error buffer assigned to the current thread (or create it)
+ */
+static inline char *get_strerror_buf()
+{
+       char *buf;
+
+       pthread_once(&strerror_buf_key_once, create_strerror_buf_key);
+       buf = pthread_getspecific(strerror_buf_key);
+       if (!buf)
+       {
+               buf = malloc(STRERROR_BUF_LEN);
+               pthread_setspecific(strerror_buf_key, buf);
+       }
+       return buf;
+}
+
+#ifdef HAVE_STRERROR_R
+/*
+ * Described in header.
+ */
+const char *safe_strerror(int errnum)
+{
+       char *buf = get_strerror_buf(), *msg;
+
+#ifdef STRERROR_R_CHAR_P
+       /* char* version which may or may not return the original buffer */
+       msg = strerror_r(errnum, buf, STRERROR_BUF_LEN);
+#else
+       /* int version returns 0 on success */
+       msg = strerror_r(errnum, buf, STRERROR_BUF_LEN) ? "Unknown error" : buf;
+#endif
+       return msg;
+}
+#else /* HAVE_STRERROR_R */
+/*
+ * Described in header.
+ */
+const char *safe_strerror(int errnum)
+{
+       static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+       char *buf = get_strerror_buf();
+
+       /* use a mutex to ensure calling strerror(3) is thread-safe */
+       pthread_mutex_lock(&mutex);
+       strncpy(buf, strerror(errnum), STRERROR_BUF_LEN);
+       pthread_mutex_unlock(&mutex);
+       buf[STRERROR_BUF_LEN - 1] = '\0';
+       return buf;
+}
+#endif /* HAVE_STRERROR_R */
+
+
 #ifndef HAVE_CLOSEFROM
 /**
  * Described in header.
@@ -315,7 +393,6 @@ void nop()
 }
 
 #ifndef HAVE_GCC_ATOMIC_OPERATIONS
-#include <pthread.h>
 
 /**
  * We use a single mutex for all refcount variables.

diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index aeaa4e74b7f4dd6838b04189dce1110a1501c986..954925dab7c5205285ece361aa446a6409444613 100644 (file)
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011 Tobias Brunner
+ * Copyright (C) 2008-2012 Tobias Brunner
  * Copyright (C) 2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -410,6 +410,18 @@ char *translate(char *str, const char *from, const char *to);
  */
 bool mkdir_p(const char *path, mode_t mode);
 
+/**
+ * Thread-safe wrapper around strerror and strerror_r.
+ *
+ * This is required because the first is not thread-safe (on some platforms)
+ * and the second uses two different signatures (POSIX/GNU) and is impractical
+ * to use anyway.
+ *
+ * @param errnum       error code (i.e. errno)
+ * @return                     error message
+ */
+const char *safe_strerror(int errnum);
+
 #ifndef HAVE_CLOSEFROM
 /**
  * Close open file descriptors greater than or equal to lowfd.
@@ -628,7 +640,6 @@ bool cas_bool(bool *ptr, bool oldval, bool newval);
  */
 bool cas_ptr(void **ptr, void *oldval, void *newval);
 
-
 #endif /* HAVE_GCC_ATOMIC_OPERATIONS */
 
 /**