From 14f7091280b8d12fcbc58a4ff986e94915ecd638 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 7 Dec 2009 15:56:04 +0100 Subject: [PATCH] Moved mutex.c to a separate folder in order to cleanly wrap other threading primitives (and utils/mutex.h is now threading.h). --- src/charon/bus/bus.c | 2 +- src/charon/config/backend_manager.c | 2 +- src/charon/config/peer_cfg.c | 2 +- src/charon/credentials/credential_manager.c | 2 +- src/charon/credentials/sets/cert_cache.c | 2 +- src/charon/network/sender.c | 2 +- src/charon/plugins/eap_radius/radius_client.c | 2 +- .../plugins/eap_sim_file/eap_sim_file_triplets.c | 2 +- src/charon/plugins/kernel_klips/kernel_klips_ipsec.c | 2 +- .../plugins/kernel_netlink/kernel_netlink_ipsec.c | 2 +- .../plugins/kernel_netlink/kernel_netlink_net.c | 2 +- .../plugins/kernel_netlink/kernel_netlink_shared.c | 2 +- src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 2 +- .../plugins/kernel_pfroute/kernel_pfroute_net.c | 2 +- src/charon/plugins/load_tester/load_tester_plugin.c | 2 +- src/charon/plugins/nm/nm_creds.c | 2 +- src/charon/plugins/resolve/resolve_handler.c | 2 +- src/charon/plugins/stroke/stroke_attribute.c | 2 +- src/charon/plugins/stroke/stroke_ca.c | 2 +- src/charon/plugins/stroke/stroke_config.c | 2 +- src/charon/plugins/stroke/stroke_cred.c | 2 +- src/charon/plugins/stroke/stroke_socket.c | 2 +- src/charon/plugins/unit_tester/tests/test_mutex.c | 2 +- src/charon/processing/jobs/callback_job.c | 2 +- src/charon/processing/processor.c | 2 +- src/charon/processing/scheduler.c | 2 +- src/charon/sa/authenticators/eap/eap_manager.c | 2 +- src/charon/sa/connect_manager.c | 2 +- src/charon/sa/ike_sa_manager.c | 2 +- src/charon/sa/mediation_manager.c | 2 +- src/charon/sa/trap_manager.c | 2 +- src/libfast/dispatcher.c | 2 +- src/libstrongswan/Makefile.am | 2 +- src/libstrongswan/attributes/attribute_manager.c | 2 +- src/libstrongswan/credentials/credential_factory.c | 2 +- src/libstrongswan/credentials/keys/key_encoding.c | 2 +- src/libstrongswan/crypto/crypto_factory.c | 2 +- src/libstrongswan/database/database_factory.c | 2 +- src/libstrongswan/fetcher/fetcher_manager.c | 2 +- src/libstrongswan/library.h | 3 +++ src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c | 2 +- src/libstrongswan/plugins/mysql/mysql_database.c | 2 +- src/libstrongswan/plugins/openssl/openssl_plugin.c | 2 +- src/libstrongswan/plugins/sqlite/sqlite_database.c | 2 +- src/libstrongswan/{utils/mutex.h => threading.h} | 12 ++++++------ src/libstrongswan/{utils => threading}/mutex.c | 5 ++--- 46 files changed, 54 insertions(+), 52 deletions(-) rename src/libstrongswan/{utils/mutex.h => threading.h} (96%) rename src/libstrongswan/{utils => threading}/mutex.c (99%) diff --git a/src/charon/bus/bus.c b/src/charon/bus/bus.c index 1dd3aee976..c2184234ba 100644 --- a/src/charon/bus/bus.c +++ b/src/charon/bus/bus.c @@ -19,7 +19,7 @@ #include #include -#include +#include ENUM(debug_names, DBG_DMN, DBG_LIB, "DMN", diff --git a/src/charon/config/backend_manager.c b/src/charon/config/backend_manager.c index 0665d8e2f8..dabae342ce 100644 --- a/src/charon/config/backend_manager.c +++ b/src/charon/config/backend_manager.c @@ -20,7 +20,7 @@ #include #include -#include +#include typedef struct private_backend_manager_t private_backend_manager_t; diff --git a/src/charon/config/peer_cfg.c b/src/charon/config/peer_cfg.c index df946b73a0..cf5d00621d 100644 --- a/src/charon/config/peer_cfg.c +++ b/src/charon/config/peer_cfg.c @@ -21,7 +21,7 @@ #include -#include +#include #include #include diff --git a/src/charon/credentials/credential_manager.c b/src/charon/credentials/credential_manager.c index 1d20a1e1eb..36d634c036 100644 --- a/src/charon/credentials/credential_manager.c +++ b/src/charon/credentials/credential_manager.c @@ -18,7 +18,7 @@ #include "credential_manager.h" #include -#include +#include #include #include #include diff --git a/src/charon/credentials/sets/cert_cache.c b/src/charon/credentials/sets/cert_cache.c index de8994b828..037f102fd7 100644 --- a/src/charon/credentials/sets/cert_cache.c +++ b/src/charon/credentials/sets/cert_cache.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include /** cache size, a power of 2 for fast modulo */ diff --git a/src/charon/network/sender.c b/src/charon/network/sender.c index 402773f890..dc7b0624e6 100644 --- a/src/charon/network/sender.c +++ b/src/charon/network/sender.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include typedef struct private_sender_t private_sender_t; diff --git a/src/charon/plugins/eap_radius/radius_client.c b/src/charon/plugins/eap_radius/radius_client.c index 63c3b849f0..5d4779c651 100644 --- a/src/charon/plugins/eap_radius/radius_client.c +++ b/src/charon/plugins/eap_radius/radius_client.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include /** * Default RADIUS server port, when not configured diff --git a/src/charon/plugins/eap_sim_file/eap_sim_file_triplets.c b/src/charon/plugins/eap_sim_file/eap_sim_file_triplets.c index 12d3a6fe2b..cda0c0ff4b 100644 --- a/src/charon/plugins/eap_sim_file/eap_sim_file_triplets.c +++ b/src/charon/plugins/eap_sim_file/eap_sim_file_triplets.c @@ -20,7 +20,7 @@ #include #include -#include +#include typedef struct private_eap_sim_file_triplets_t private_eap_sim_file_triplets_t; diff --git a/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c b/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c index e0e4a7670f..dfa79f4d7a 100644 --- a/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c +++ b/src/charon/plugins/kernel_klips/kernel_klips_ipsec.c @@ -30,7 +30,7 @@ #include "kernel_klips_ipsec.h" #include -#include +#include #include #include #include diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c index 9cebd4627d..691bab7918 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -36,7 +36,7 @@ #include "kernel_netlink_shared.h" #include -#include +#include #include #include #include diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c index 609a5c3b67..67e7c820f4 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c @@ -26,7 +26,7 @@ #include "kernel_netlink_shared.h" #include -#include +#include #include #include #include diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_shared.c b/src/charon/plugins/kernel_netlink/kernel_netlink_shared.c index 3d8ca88070..e4bdbb1c52 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_shared.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_shared.c @@ -22,7 +22,7 @@ #include "kernel_netlink_shared.h" #include -#include +#include typedef struct private_netlink_socket_t private_netlink_socket_t; diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index b26a2bc0a9..98f7a57927 100644 --- a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/charon/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/charon/plugins/kernel_pfroute/kernel_pfroute_net.c index 7688104110..814fbad832 100644 --- a/src/charon/plugins/kernel_pfroute/kernel_pfroute_net.c +++ b/src/charon/plugins/kernel_pfroute/kernel_pfroute_net.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/charon/plugins/load_tester/load_tester_plugin.c b/src/charon/plugins/load_tester/load_tester_plugin.c index 63c39b7ee9..de721e05d8 100644 --- a/src/charon/plugins/load_tester/load_tester_plugin.c +++ b/src/charon/plugins/load_tester/load_tester_plugin.c @@ -24,7 +24,7 @@ #include #include -#include +#include typedef struct private_load_tester_plugin_t private_load_tester_plugin_t; diff --git a/src/charon/plugins/nm/nm_creds.c b/src/charon/plugins/nm/nm_creds.c index 4f90fd6733..68ef61fce5 100644 --- a/src/charon/plugins/nm/nm_creds.c +++ b/src/charon/plugins/nm/nm_creds.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include typedef struct private_nm_creds_t private_nm_creds_t; diff --git a/src/charon/plugins/resolve/resolve_handler.c b/src/charon/plugins/resolve/resolve_handler.c index 1d18335bed..7f7e024741 100644 --- a/src/charon/plugins/resolve/resolve_handler.c +++ b/src/charon/plugins/resolve/resolve_handler.c @@ -18,7 +18,7 @@ #include #include -#include +#include typedef struct private_resolve_handler_t private_resolve_handler_t; diff --git a/src/charon/plugins/stroke/stroke_attribute.c b/src/charon/plugins/stroke/stroke_attribute.c index db8b53e961..d013528231 100644 --- a/src/charon/plugins/stroke/stroke_attribute.c +++ b/src/charon/plugins/stroke/stroke_attribute.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #define POOL_LIMIT (sizeof(uintptr_t)*8) diff --git a/src/charon/plugins/stroke/stroke_ca.c b/src/charon/plugins/stroke/stroke_ca.c index 152ef748f1..ebcd9ac3be 100644 --- a/src/charon/plugins/stroke/stroke_ca.c +++ b/src/charon/plugins/stroke/stroke_ca.c @@ -17,7 +17,7 @@ #include "stroke_ca.h" #include "stroke_cred.h" -#include +#include #include #include diff --git a/src/charon/plugins/stroke/stroke_config.c b/src/charon/plugins/stroke/stroke_config.c index 08dafd2060..c03349ac96 100644 --- a/src/charon/plugins/stroke/stroke_config.c +++ b/src/charon/plugins/stroke/stroke_config.c @@ -16,7 +16,7 @@ #include "stroke_config.h" #include -#include +#include #include typedef struct private_stroke_config_t private_stroke_config_t; diff --git a/src/charon/plugins/stroke/stroke_cred.c b/src/charon/plugins/stroke/stroke_cred.c index 627418bd36..91830985a9 100644 --- a/src/charon/plugins/stroke/stroke_cred.c +++ b/src/charon/plugins/stroke/stroke_cred.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include /* configuration directories and files */ diff --git a/src/charon/plugins/stroke/stroke_socket.c b/src/charon/plugins/stroke/stroke_socket.c index 2faa2353ba..f834f8e158 100644 --- a/src/charon/plugins/stroke/stroke_socket.c +++ b/src/charon/plugins/stroke/stroke_socket.c @@ -27,7 +27,7 @@ #include #include -#include /* for Mac OS X compatible accept */ +#include /* for Mac OS X compatible accept */ #include "stroke_config.h" #include "stroke_control.h" diff --git a/src/charon/plugins/unit_tester/tests/test_mutex.c b/src/charon/plugins/unit_tester/tests/test_mutex.c index cfe00cc7cd..900b652157 100644 --- a/src/charon/plugins/unit_tester/tests/test_mutex.c +++ b/src/charon/plugins/unit_tester/tests/test_mutex.c @@ -14,7 +14,7 @@ */ #include -#include +#include #include #include diff --git a/src/charon/processing/jobs/callback_job.c b/src/charon/processing/jobs/callback_job.c index ad51dc55dd..e4299af6b6 100644 --- a/src/charon/processing/jobs/callback_job.c +++ b/src/charon/processing/jobs/callback_job.c @@ -18,7 +18,7 @@ #include #include -#include +#include typedef struct private_callback_job_t private_callback_job_t; diff --git a/src/charon/processing/processor.c b/src/charon/processing/processor.c index a364017c2b..248bba1453 100644 --- a/src/charon/processing/processor.c +++ b/src/charon/processing/processor.c @@ -22,7 +22,7 @@ #include "processor.h" #include -#include +#include #include diff --git a/src/charon/processing/scheduler.c b/src/charon/processing/scheduler.c index d09b384c39..36ccb14683 100644 --- a/src/charon/processing/scheduler.c +++ b/src/charon/processing/scheduler.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include /* the initial size of the heap */ #define HEAP_SIZE_DEFAULT 64 diff --git a/src/charon/sa/authenticators/eap/eap_manager.c b/src/charon/sa/authenticators/eap/eap_manager.c index eb4cb0c2d1..3738cb9485 100644 --- a/src/charon/sa/authenticators/eap/eap_manager.c +++ b/src/charon/sa/authenticators/eap/eap_manager.c @@ -16,7 +16,7 @@ #include "eap_manager.h" #include -#include +#include typedef struct private_eap_manager_t private_eap_manager_t; typedef struct eap_entry_t eap_entry_t; diff --git a/src/charon/sa/connect_manager.c b/src/charon/sa/connect_manager.c index fe95c03701..e26c6c60c7 100644 --- a/src/charon/sa/connect_manager.c +++ b/src/charon/sa/connect_manager.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/src/charon/sa/ike_sa_manager.c b/src/charon/sa/ike_sa_manager.c index 0ad39f3e55..bb8a4e0ab9 100644 --- a/src/charon/sa/ike_sa_manager.c +++ b/src/charon/sa/ike_sa_manager.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/charon/sa/mediation_manager.c b/src/charon/sa/mediation_manager.c index 2b05df1f4c..5161a71477 100644 --- a/src/charon/sa/mediation_manager.c +++ b/src/charon/sa/mediation_manager.c @@ -16,7 +16,7 @@ #include "mediation_manager.h" #include -#include +#include #include #include diff --git a/src/charon/sa/trap_manager.c b/src/charon/sa/trap_manager.c index ec68e94d05..edcba3a8b9 100644 --- a/src/charon/sa/trap_manager.c +++ b/src/charon/sa/trap_manager.c @@ -16,7 +16,7 @@ #include "trap_manager.h" #include -#include +#include #include diff --git a/src/libfast/dispatcher.c b/src/libfast/dispatcher.c index 04fa33961e..a4d23bf7b6 100644 --- a/src/libfast/dispatcher.c +++ b/src/libfast/dispatcher.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 2ed9f7dc7c..bf5a1123c1 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 66f1d27e84..4b0c509214 100644 --- a/src/libstrongswan/attributes/attribute_manager.c +++ b/src/libstrongswan/attributes/attribute_manager.c @@ -17,7 +17,7 @@ #include #include -#include +#include 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 0de0946ed2..7e94b9d14b 100644 --- a/src/libstrongswan/credentials/credential_factory.c +++ b/src/libstrongswan/credentials/credential_factory.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include 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 7c09b9f950..b9bd89f606 100644 --- a/src/libstrongswan/credentials/keys/key_encoding.c +++ b/src/libstrongswan/credentials/keys/key_encoding.c @@ -19,7 +19,7 @@ #include #include -#include +#include 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 9bc986f684..2181086466 100644 --- a/src/libstrongswan/crypto/crypto_factory.c +++ b/src/libstrongswan/crypto/crypto_factory.c @@ -16,7 +16,7 @@ #include "crypto_factory.h" #include -#include +#include #include #include diff --git a/src/libstrongswan/database/database_factory.c b/src/libstrongswan/database/database_factory.c index c0c666138d..a0f50c80c1 100644 --- a/src/libstrongswan/database/database_factory.c +++ b/src/libstrongswan/database/database_factory.c @@ -16,7 +16,7 @@ #include "database_factory.h" #include -#include +#include 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 7a31f17c36..fd3b0eef9a 100644 --- a/src/libstrongswan/fetcher/fetcher_manager.c +++ b/src/libstrongswan/fetcher/fetcher_manager.c @@ -16,7 +16,7 @@ #include "fetcher_manager.h" #include -#include +#include #include typedef struct private_fetcher_manager_t private_fetcher_manager_t; diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h index 2673afa4bb..78a6fe0a9a 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 083cab5369..66481da389 100644 --- a/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c +++ b/src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c index 9775a8685f..f01321fb55 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 -#include +#include #include /* 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 7d941348f5..0cb526d891 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 -#include +#include #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 4e18de1c24..afe67f62a6 100644 --- a/src/libstrongswan/plugins/sqlite/sqlite_database.c +++ b/src/libstrongswan/plugins/sqlite/sqlite_database.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include typedef struct private_sqlite_database_t private_sqlite_database_t; diff --git a/src/libstrongswan/utils/mutex.h b/src/libstrongswan/threading.h similarity index 96% rename from src/libstrongswan/utils/mutex.h rename to src/libstrongswan/threading.h index 8e53c82ca0..8b9f37faba 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 similarity index 99% rename from src/libstrongswan/utils/mutex.c rename to src/libstrongswan/threading/mutex.c index 3e1885a424..3363402339 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 #include -#include "mutex.h" - +#include #include #include