diff options
Diffstat (limited to 'Source/charon/sa')
| -rw-r--r-- | Source/charon/sa/authenticator.c | 2 | ||||
| -rw-r--r-- | Source/charon/sa/ike_sa.c | 9 | ||||
| -rw-r--r-- | Source/charon/sa/ike_sa.h | 10 | ||||
| -rw-r--r-- | Source/charon/sa/states/ike_auth_requested.c | 2 | ||||
| -rw-r--r-- | Source/charon/sa/states/ike_sa_established.c | 3 | ||||
| -rw-r--r-- | Source/charon/sa/states/ike_sa_init_requested.c | 2 | ||||
| -rw-r--r-- | Source/charon/sa/states/ike_sa_init_responded.c | 2 | ||||
| -rw-r--r-- | Source/charon/sa/states/initiator_init.c | 2 | ||||
| -rw-r--r-- | Source/charon/sa/states/responder_init.c | 2 |
9 files changed, 8 insertions, 26 deletions
diff --git a/Source/charon/sa/authenticator.c b/Source/charon/sa/authenticator.c index 92dee5c62..2ec1733e1 100644 --- a/Source/charon/sa/authenticator.c +++ b/Source/charon/sa/authenticator.c @@ -388,7 +388,7 @@ authenticator_t *authenticator_create(protected_ike_sa_t *ike_sa) /* private data */ this->ike_sa = ike_sa; this->prf = this->ike_sa->get_prf(this->ike_sa); - this->logger = this->ike_sa->get_logger(this->ike_sa); + this->logger = charon->logger_manager->get_logger(charon->logger_manager, IKE_SA); return &(this->public); } diff --git a/Source/charon/sa/ike_sa.c b/Source/charon/sa/ike_sa.c index 622ea3402..cbdd22a84 100644 --- a/Source/charon/sa/ike_sa.c +++ b/Source/charon/sa/ike_sa.c @@ -412,14 +412,6 @@ static void set_new_state (private_ike_sa_t *this, state_t *state) } /** - * Implementation of protected_ike_sa_t.get_logger. - */ -static logger_t *get_logger (private_ike_sa_t *this) -{ - return this->logger; -} - -/** * Implementation of protected_ike_sa_t.get_connection. */ static connection_t *get_connection (private_ike_sa_t *this) @@ -1050,7 +1042,6 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id) this->protected.get_prf_auth_i = (prf_t *(*) (protected_ike_sa_t *)) get_prf_auth_i; this->protected.get_prf_auth_r = (prf_t *(*) (protected_ike_sa_t *)) get_prf_auth_r; this->protected.add_child_sa = (void (*) (protected_ike_sa_t*,child_sa_t*)) add_child_sa; - this->protected.get_logger = (logger_t *(*) (protected_ike_sa_t *)) get_logger; this->protected.set_connection = (void (*) (protected_ike_sa_t *,connection_t *)) set_connection; this->protected.get_connection = (connection_t *(*) (protected_ike_sa_t *)) get_connection; this->protected.set_policy = (void (*) (protected_ike_sa_t *,policy_t *)) set_policy; diff --git a/Source/charon/sa/ike_sa.h b/Source/charon/sa/ike_sa.h index 2bf697889..0a2661541 100644 --- a/Source/charon/sa/ike_sa.h +++ b/Source/charon/sa/ike_sa.h @@ -171,16 +171,6 @@ struct protected_ike_sa_t { void (*build_message) (protected_ike_sa_t *this, exchange_type_t type, bool request, message_t **message); /** - * @brief Get the internal stored logger_t object for given ike_sa_t object. - * - * @warning Returned logger_t object is original one and managed by this object. - * - * @param this calling object - * @return pointer to the internal stored logger_t object - */ - logger_t *(*get_logger) (protected_ike_sa_t *this); - - /** * @brief Get the internal stored connection_t object. * * @param this calling object diff --git a/Source/charon/sa/states/ike_auth_requested.c b/Source/charon/sa/states/ike_auth_requested.c index eecfaab1e..16eea7b03 100644 --- a/Source/charon/sa/states/ike_auth_requested.c +++ b/Source/charon/sa/states/ike_auth_requested.c @@ -660,7 +660,7 @@ ike_auth_requested_t *ike_auth_requested_create(protected_ike_sa_t *ike_sa,chunk this->received_nonce = received_nonce; this->sent_nonce = sent_nonce; this->ike_sa_init_reply_data = ike_sa_init_reply_data; - this->logger = this->ike_sa->get_logger(this->ike_sa); + this->logger = charon->logger_manager->get_logger(charon->logger_manager, IKE_SA); this->my_ts = NULL; this->other_ts = NULL; this->proposal = NULL; diff --git a/Source/charon/sa/states/ike_sa_established.c b/Source/charon/sa/states/ike_sa_established.c index 37b69c29c..f96734423 100644 --- a/Source/charon/sa/states/ike_sa_established.c +++ b/Source/charon/sa/states/ike_sa_established.c @@ -22,6 +22,7 @@ #include "ike_sa_established.h" +#include <daemon.h> #include <utils/allocator.h> #include <encoding/payloads/delete_payload.h> @@ -233,7 +234,7 @@ ike_sa_established_t *ike_sa_established_create(protected_ike_sa_t *ike_sa) /* private data */ this->ike_sa = ike_sa; - this->logger = ike_sa->get_logger(ike_sa); + this->logger = charon->logger_manager->get_logger(charon->logger_manager, IKE_SA); return &(this->public); } diff --git a/Source/charon/sa/states/ike_sa_init_requested.c b/Source/charon/sa/states/ike_sa_init_requested.c index 904dadf05..a5b7fbcbd 100644 --- a/Source/charon/sa/states/ike_sa_init_requested.c +++ b/Source/charon/sa/states/ike_sa_init_requested.c @@ -748,7 +748,7 @@ ike_sa_init_requested_t *ike_sa_init_requested_create(protected_ike_sa_t *ike_sa /* private data */ this->ike_sa = ike_sa; this->received_nonce = CHUNK_INITIALIZER; - this->logger = this->ike_sa->get_logger(this->ike_sa); + this->logger = charon->logger_manager->get_logger(charon->logger_manager, IKE_SA); this->diffie_hellman = diffie_hellman; this->proposal = NULL; this->sent_nonce = sent_nonce; diff --git a/Source/charon/sa/states/ike_sa_init_responded.c b/Source/charon/sa/states/ike_sa_init_responded.c index da3b68ce6..eef8ea3c4 100644 --- a/Source/charon/sa/states/ike_sa_init_responded.c +++ b/Source/charon/sa/states/ike_sa_init_responded.c @@ -696,7 +696,7 @@ ike_sa_init_responded_t *ike_sa_init_responded_create(protected_ike_sa_t *ike_sa this->my_ts = NULL; this->other_ts = NULL; this->child_sa = NULL; - this->logger = this->ike_sa->get_logger(this->ike_sa); + this->logger = charon->logger_manager->get_logger(charon->logger_manager, IKE_SA); return &(this->public); } diff --git a/Source/charon/sa/states/initiator_init.c b/Source/charon/sa/states/initiator_init.c index e23cd7a44..18ffe0e0a 100644 --- a/Source/charon/sa/states/initiator_init.c +++ b/Source/charon/sa/states/initiator_init.c @@ -342,7 +342,7 @@ initiator_init_t *initiator_init_create(protected_ike_sa_t *ike_sa) /* private data */ this->ike_sa = ike_sa; - this->logger = this->ike_sa->get_logger(this->ike_sa); + this->logger = charon->logger_manager->get_logger(charon->logger_manager, IKE_SA); this->sent_nonce = CHUNK_INITIALIZER; this->diffie_hellman = NULL; diff --git a/Source/charon/sa/states/responder_init.c b/Source/charon/sa/states/responder_init.c index a1d951b5f..2710080a0 100644 --- a/Source/charon/sa/states/responder_init.c +++ b/Source/charon/sa/states/responder_init.c @@ -553,7 +553,7 @@ responder_init_t *responder_init_create(protected_ike_sa_t *ike_sa) /* private data */ this->ike_sa = ike_sa; - this->logger = this->ike_sa->get_logger(this->ike_sa); + this->logger = charon->logger_manager->get_logger(charon->logger_manager, IKE_SA); this->sent_nonce = CHUNK_INITIALIZER; this->received_nonce = CHUNK_INITIALIZER; this->dh_group_number = MODP_UNDEFINED; |