diff options
Diffstat (limited to 'src/charon')
31 files changed, 33 insertions, 32 deletions
diff --git a/src/charon/bus/bus.c b/src/charon/bus/bus.c index c2184234b..d77797e92 100644 --- a/src/charon/bus/bus.c +++ b/src/charon/bus/bus.c @@ -19,7 +19,7 @@ #include <stdint.h> #include <daemon.h> -#include <threading.h> +#include <threading/mutex.h> 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 dabae342c..938927cd4 100644 --- a/src/charon/config/backend_manager.c +++ b/src/charon/config/backend_manager.c @@ -20,7 +20,7 @@ #include <daemon.h> #include <utils/linked_list.h> -#include <threading.h> +#include <threading/rwlock.h> 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 cf5d00621..9df14c9ae 100644 --- a/src/charon/config/peer_cfg.c +++ b/src/charon/config/peer_cfg.c @@ -21,7 +21,7 @@ #include <daemon.h> -#include <threading.h> +#include <threading/mutex.h> #include <utils/linked_list.h> #include <utils/identification.h> diff --git a/src/charon/credentials/credential_manager.c b/src/charon/credentials/credential_manager.c index 36d634c03..1e851779c 100644 --- a/src/charon/credentials/credential_manager.c +++ b/src/charon/credentials/credential_manager.c @@ -18,7 +18,7 @@ #include "credential_manager.h" #include <daemon.h> -#include <threading.h> +#include <threading/rwlock.h> #include <utils/linked_list.h> #include <credentials/sets/cert_cache.h> #include <credentials/sets/auth_cfg_wrapper.h> @@ -1140,7 +1140,7 @@ static bool verify_trust_chain(private_credential_manager_t *this, { auth->add(auth, AUTH_RULE_CA_CERT, issuer->get_ref(issuer)); DBG1(DBG_CFG, " using trusted ca certificate \"%Y\"", - issuer->get_subject(issuer)); + issuer->get_subject(issuer)); trusted = TRUE; } else diff --git a/src/charon/credentials/sets/cert_cache.c b/src/charon/credentials/sets/cert_cache.c index 037f102fd..176accce2 100644 --- a/src/charon/credentials/sets/cert_cache.c +++ b/src/charon/credentials/sets/cert_cache.c @@ -19,7 +19,7 @@ #include <sched.h> #include <daemon.h> -#include <threading.h> +#include <threading/rwlock.h> #include <utils/linked_list.h> /** cache size, a power of 2 for fast modulo */ diff --git a/src/charon/network/sender.c b/src/charon/network/sender.c index dc7b0624e..c644f1d41 100644 --- a/src/charon/network/sender.c +++ b/src/charon/network/sender.c @@ -22,7 +22,7 @@ #include <daemon.h> #include <network/socket.h> #include <processing/jobs/callback_job.h> -#include <threading.h> +#include <threading/mutex.h> 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 5d4779c65..e6d68c920 100644 --- a/src/charon/plugins/eap_radius/radius_client.c +++ b/src/charon/plugins/eap_radius/radius_client.c @@ -21,7 +21,7 @@ #include <daemon.h> #include <utils/host.h> #include <utils/linked_list.h> -#include <threading.h> +#include <threading/mutex.h> /** * 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 cda0c0ff4..6b7d99fb7 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 <daemon.h> #include <utils/linked_list.h> -#include <threading.h> +#include <threading/mutex.h> 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 dfa79f4d7..29a77de8b 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 <daemon.h> -#include <threading.h> +#include <threading/mutex.h> #include <processing/jobs/callback_job.h> #include <processing/jobs/acquire_job.h> #include <processing/jobs/rekey_child_sa_job.h> diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c index 691bab791..c7f005a32 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 <daemon.h> -#include <threading.h> +#include <threading/mutex.h> #include <utils/hashtable.h> #include <processing/jobs/callback_job.h> #include <processing/jobs/acquire_job.h> diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c index 67e7c820f..4447dc096 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 <daemon.h> -#include <threading.h> +#include <threading/mutex.h> #include <utils/linked_list.h> #include <processing/jobs/callback_job.h> #include <processing/jobs/roam_job.h> diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_shared.c b/src/charon/plugins/kernel_netlink/kernel_netlink_shared.c index e4bdbb1c5..b96186a3a 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 <daemon.h> -#include <threading.h> +#include <threading/mutex.h> 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 98f7a5792..8dc03b80b 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 <daemon.h> #include <utils/host.h> -#include <threading.h> +#include <threading/mutex.h> #include <processing/jobs/callback_job.h> #include <processing/jobs/acquire_job.h> #include <processing/jobs/migrate_job.h> diff --git a/src/charon/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/charon/plugins/kernel_pfroute/kernel_pfroute_net.c index 814fbad83..9aee53928 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 <daemon.h> #include <utils/host.h> -#include <threading.h> +#include <threading/mutex.h> #include <utils/linked_list.h> #include <processing/jobs/callback_job.h> #include <processing/jobs/roam_job.h> diff --git a/src/charon/plugins/load_tester/load_tester_plugin.c b/src/charon/plugins/load_tester/load_tester_plugin.c index de721e05d..9c6cc9974 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 <daemon.h> #include <processing/jobs/callback_job.h> -#include <threading.h> +#include <threading/mutex.h> 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 68ef61fce..193838e6b 100644 --- a/src/charon/plugins/nm/nm_creds.c +++ b/src/charon/plugins/nm/nm_creds.c @@ -20,7 +20,7 @@ #include <unistd.h> #include <daemon.h> -#include <threading.h> +#include <threading/rwlock.h> #include <credentials/certificates/x509.h> 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 7f7e02474..714c751a6 100644 --- a/src/charon/plugins/resolve/resolve_handler.c +++ b/src/charon/plugins/resolve/resolve_handler.c @@ -18,7 +18,7 @@ #include <unistd.h> #include <daemon.h> -#include <threading.h> +#include <threading/mutex.h> 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 d01352823..7a5ce683e 100644 --- a/src/charon/plugins/stroke/stroke_attribute.c +++ b/src/charon/plugins/stroke/stroke_attribute.c @@ -18,7 +18,7 @@ #include <daemon.h> #include <utils/linked_list.h> #include <utils/hashtable.h> -#include <threading.h> +#include <threading/mutex.h> #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 ebcd9ac3b..49146f18b 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 <threading.h> +#include <threading/rwlock.h> #include <utils/linked_list.h> #include <crypto/hashers/hasher.h> diff --git a/src/charon/plugins/stroke/stroke_config.c b/src/charon/plugins/stroke/stroke_config.c index c03349ac9..1f585f72b 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 <daemon.h> -#include <threading.h> +#include <threading/mutex.h> #include <utils/lexparser.h> 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 91830985a..bc0b2f6fc 100644 --- a/src/charon/plugins/stroke/stroke_cred.c +++ b/src/charon/plugins/stroke/stroke_cred.c @@ -27,7 +27,7 @@ #include <credentials/certificates/ac.h> #include <utils/linked_list.h> #include <utils/lexparser.h> -#include <threading.h> +#include <threading/rwlock.h> #include <daemon.h> /* configuration directories and files */ diff --git a/src/charon/plugins/stroke/stroke_socket.c b/src/charon/plugins/stroke/stroke_socket.c index f834f8e15..6a599992e 100644 --- a/src/charon/plugins/stroke/stroke_socket.c +++ b/src/charon/plugins/stroke/stroke_socket.c @@ -27,7 +27,7 @@ #include <processing/jobs/callback_job.h> #include <daemon.h> -#include <threading.h> /* for Mac OS X compatible accept */ +#include <threading/mutex.h> /* 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 900b65215..77085cb2f 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 <library.h> -#include <threading.h> +#include <threading/mutex.h> #include <unistd.h> #include <sched.h> diff --git a/src/charon/processing/jobs/callback_job.c b/src/charon/processing/jobs/callback_job.c index e4299af6b..145481c0b 100644 --- a/src/charon/processing/jobs/callback_job.c +++ b/src/charon/processing/jobs/callback_job.c @@ -18,7 +18,7 @@ #include <pthread.h> #include <daemon.h> -#include <threading.h> +#include <threading/mutex.h> 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 248bba145..620c01c9c 100644 --- a/src/charon/processing/processor.c +++ b/src/charon/processing/processor.c @@ -22,7 +22,7 @@ #include "processor.h" #include <daemon.h> -#include <threading.h> +#include <threading/mutex.h> #include <utils/linked_list.h> diff --git a/src/charon/processing/scheduler.c b/src/charon/processing/scheduler.c index 36ccb1468..69c54900c 100644 --- a/src/charon/processing/scheduler.c +++ b/src/charon/processing/scheduler.c @@ -23,7 +23,7 @@ #include <daemon.h> #include <processing/processor.h> #include <processing/jobs/callback_job.h> -#include <threading.h> +#include <threading/mutex.h> /* 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 3738cb948..f795183f0 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 <utils/linked_list.h> -#include <threading.h> +#include <threading/rwlock.h> 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 e26c6c60c..b78ba070d 100644 --- a/src/charon/sa/connect_manager.c +++ b/src/charon/sa/connect_manager.c @@ -18,7 +18,7 @@ #include <math.h> #include <daemon.h> -#include <threading.h> +#include <threading/mutex.h> #include <utils/linked_list.h> #include <crypto/hashers/hasher.h> diff --git a/src/charon/sa/ike_sa_manager.c b/src/charon/sa/ike_sa_manager.c index bb8a4e0ab..6eb9d14bb 100644 --- a/src/charon/sa/ike_sa_manager.c +++ b/src/charon/sa/ike_sa_manager.c @@ -22,7 +22,8 @@ #include <daemon.h> #include <sa/ike_sa_id.h> #include <bus/bus.h> -#include <threading.h> +#include <threading/mutex.h> +#include <threading/rwlock.h> #include <utils/linked_list.h> #include <crypto/hashers/hasher.h> diff --git a/src/charon/sa/mediation_manager.c b/src/charon/sa/mediation_manager.c index 5161a7147..035f49053 100644 --- a/src/charon/sa/mediation_manager.c +++ b/src/charon/sa/mediation_manager.c @@ -16,7 +16,7 @@ #include "mediation_manager.h" #include <daemon.h> -#include <threading.h> +#include <threading/mutex.h> #include <utils/linked_list.h> #include <processing/jobs/mediation_job.h> diff --git a/src/charon/sa/trap_manager.c b/src/charon/sa/trap_manager.c index edcba3a8b..ed758995a 100644 --- a/src/charon/sa/trap_manager.c +++ b/src/charon/sa/trap_manager.c @@ -16,7 +16,7 @@ #include "trap_manager.h" #include <daemon.h> -#include <threading.h> +#include <threading/rwlock.h> #include <utils/linked_list.h> |