aboutsummaryrefslogtreecommitdiffstats
path: root/src/libstrongswan
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstrongswan')
-rw-r--r--src/libstrongswan/Makefile.am2
-rw-r--r--src/libstrongswan/attributes/attribute_manager.c2
-rw-r--r--src/libstrongswan/credentials/credential_factory.c2
-rw-r--r--src/libstrongswan/credentials/keys/key_encoding.c2
-rw-r--r--src/libstrongswan/crypto/crypto_factory.c2
-rw-r--r--src/libstrongswan/database/database_factory.c2
-rw-r--r--src/libstrongswan/fetcher/fetcher_manager.c2
-rw-r--r--src/libstrongswan/library.h3
-rw-r--r--src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c2
-rw-r--r--src/libstrongswan/plugins/mysql/mysql_database.c2
-rw-r--r--src/libstrongswan/plugins/openssl/openssl_plugin.c2
-rw-r--r--src/libstrongswan/plugins/sqlite/sqlite_database.c2
-rw-r--r--src/libstrongswan/threading.h (renamed from src/libstrongswan/utils/mutex.h)12
-rw-r--r--src/libstrongswan/threading/mutex.c (renamed from src/libstrongswan/utils/mutex.c)5
14 files changed, 22 insertions, 20 deletions
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 2ed9f7dc7..bf5a1123c 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -43,6 +43,7 @@ credentials/ietf_attributes/ietf_attributes.c credentials/ietf_attributes/ietf_a
database/database.h database/database_factory.h database/database_factory.c \
fetcher/fetcher.h fetcher/fetcher_manager.h fetcher/fetcher_manager.c \
selectors/traffic_selector.c selectors/traffic_selector.h \
+threading.h threading/mutex.c \
utils.h utils.c \
utils/host.c utils/host.h \
utils/identification.c utils/identification.h \
@@ -52,7 +53,6 @@ utils/linked_list.c utils/linked_list.h \
utils/hashtable.c utils/hashtable.h \
utils/enumerator.c utils/enumerator.h \
utils/optionsfrom.c utils/optionsfrom.h \
-utils/mutex.c utils/mutex.h \
utils/backtrace.c utils/backtrace.h \
plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
diff --git a/src/libstrongswan/attributes/attribute_manager.c b/src/libstrongswan/attributes/attribute_manager.c
index 66f1d27e8..4b0c50921 100644
--- a/src/libstrongswan/attributes/attribute_manager.c
+++ b/src/libstrongswan/attributes/attribute_manager.c
@@ -17,7 +17,7 @@
#include <debug.h>
#include <utils/linked_list.h>
-#include <utils/mutex.h>
+#include <threading.h>
typedef struct private_attribute_manager_t private_attribute_manager_t;
diff --git a/src/libstrongswan/credentials/credential_factory.c b/src/libstrongswan/credentials/credential_factory.c
index 0de0946ed..7e94b9d14 100644
--- a/src/libstrongswan/credentials/credential_factory.c
+++ b/src/libstrongswan/credentials/credential_factory.c
@@ -20,7 +20,7 @@
#include <debug.h>
#include <utils/linked_list.h>
-#include <utils/mutex.h>
+#include <threading.h>
#include <credentials/certificates/x509.h>
ENUM(credential_type_names, CRED_PRIVATE_KEY, CRED_CERTIFICATE,
diff --git a/src/libstrongswan/credentials/keys/key_encoding.c b/src/libstrongswan/credentials/keys/key_encoding.c
index 7c09b9f95..b9bd89f60 100644
--- a/src/libstrongswan/credentials/keys/key_encoding.c
+++ b/src/libstrongswan/credentials/keys/key_encoding.c
@@ -19,7 +19,7 @@
#include <utils/linked_list.h>
#include <utils/hashtable.h>
-#include <utils/mutex.h>
+#include <threading.h>
typedef struct private_key_encoding_t private_key_encoding_t;
diff --git a/src/libstrongswan/crypto/crypto_factory.c b/src/libstrongswan/crypto/crypto_factory.c
index 9bc986f68..218108646 100644
--- a/src/libstrongswan/crypto/crypto_factory.c
+++ b/src/libstrongswan/crypto/crypto_factory.c
@@ -16,7 +16,7 @@
#include "crypto_factory.h"
#include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
#include <utils/linked_list.h>
#include <crypto/crypto_tester.h>
diff --git a/src/libstrongswan/database/database_factory.c b/src/libstrongswan/database/database_factory.c
index c0c666138..a0f50c80c 100644
--- a/src/libstrongswan/database/database_factory.c
+++ b/src/libstrongswan/database/database_factory.c
@@ -16,7 +16,7 @@
#include "database_factory.h"
#include <utils/linked_list.h>
-#include <utils/mutex.h>
+#include <threading.h>
typedef struct private_database_factory_t private_database_factory_t;
diff --git a/src/libstrongswan/fetcher/fetcher_manager.c b/src/libstrongswan/fetcher/fetcher_manager.c
index 7a31f17c3..fd3b0eef9 100644
--- a/src/libstrongswan/fetcher/fetcher_manager.c
+++ b/src/libstrongswan/fetcher/fetcher_manager.c
@@ -16,7 +16,7 @@
#include "fetcher_manager.h"
#include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
#include <utils/linked_list.h>
typedef struct private_fetcher_manager_t private_fetcher_manager_t;
diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index 2673afa4b..78a6fe0a9 100644
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -40,6 +40,9 @@
* @defgroup plugins plugins
* @ingroup libstrongswan
*
+ * @defgroup threading threading
+ * @ingroup libstrongswan
+ *
* @defgroup utils utils
* @ingroup libstrongswan
*/
diff --git a/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c b/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
index 083cab536..66481da38 100644
--- a/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
+++ b/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c
@@ -24,7 +24,7 @@
#include <library.h>
#include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
#include <errno.h>
#include <gcrypt.h>
diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c
index 9775a8685..f01321fb5 100644
--- a/src/libstrongswan/plugins/mysql/mysql_database.c
+++ b/src/libstrongswan/plugins/mysql/mysql_database.c
@@ -21,7 +21,7 @@
#include "mysql_database.h"
#include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
#include <utils/linked_list.h>
/* Older mysql.h headers do not define it, but we need it. It is not returned
diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c
index 7d941348f..0cb526d89 100644
--- a/src/libstrongswan/plugins/openssl/openssl_plugin.c
+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c
@@ -23,7 +23,7 @@
#include "openssl_plugin.h"
#include <library.h>
-#include <utils/mutex.h>
+#include <threading.h>
#include "openssl_util.h"
#include "openssl_crypter.h"
#include "openssl_hasher.h"
diff --git a/src/libstrongswan/plugins/sqlite/sqlite_database.c b/src/libstrongswan/plugins/sqlite/sqlite_database.c
index 4e18de1c2..afe67f62a 100644
--- a/src/libstrongswan/plugins/sqlite/sqlite_database.c
+++ b/src/libstrongswan/plugins/sqlite/sqlite_database.c
@@ -19,7 +19,7 @@
#include <unistd.h>
#include <library.h>
#include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
typedef struct private_sqlite_database_t private_sqlite_database_t;
diff --git a/src/libstrongswan/utils/mutex.h b/src/libstrongswan/threading.h
index 8e53c82ca..8b9f37fab 100644
--- a/src/libstrongswan/utils/mutex.h
+++ b/src/libstrongswan/threading.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Tobias Brunner
+ * Copyright (C) 2008-2009 Tobias Brunner
* Copyright (C) 2008 Martin Willi
* Hochschule fuer Technik Rapperswil
*
@@ -15,12 +15,12 @@
*/
/**
- * @defgroup mutex mutex
- * @{ @ingroup utils
+ * @defgroup threading threading
+ * @{ @ingroup libstrongswan
*/
-#ifndef MUTEX_H_
-#define MUTEX_H_
+#ifndef THREADING_H_
+#define THREADING_H_
typedef struct mutex_t mutex_t;
typedef struct condvar_t condvar_t;
@@ -213,4 +213,4 @@ condvar_t *condvar_create(condvar_type_t type);
*/
rwlock_t *rwlock_create(rwlock_type_t type);
-#endif /** MUTEX_H_ @}*/
+#endif /** THREADING_H_ @}*/
diff --git a/src/libstrongswan/utils/mutex.c b/src/libstrongswan/threading/mutex.c
index 3e1885a42..336340233 100644
--- a/src/libstrongswan/utils/mutex.c
+++ b/src/libstrongswan/threading/mutex.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Tobias Brunner
+ * Copyright (C) 2008-2009 Tobias Brunner
* Copyright (C) 2008 Martin Willi
* Hochschule fuer Technik Rapperswil
*
@@ -20,8 +20,7 @@
#include <time.h>
#include <errno.h>
-#include "mutex.h"
-
+#include <threading.h>
#include <library.h>
#include <debug.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-01 02:08:38 +0000