From 7881ac141e7009fd1f1b6189dd8bf22d20108905 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 19 May 2006 06:46:22 +0000 Subject: [PATCH] - applied patch from the NAT-T team fixing several typos --- src/charon/sa/child_sa.c | 2 +- src/charon/sa/child_sa.h | 2 +- src/charon/sa/ike_sa.c | 12 ++++++------ src/charon/sa/ike_sa.h | 2 +- src/charon/sa/states/ike_sa_init_requested.c | 2 +- src/charon/sa/states/ike_sa_init_responded.c | 6 +++--- src/charon/threads/thread_pool.c | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/charon/sa/child_sa.c b/src/charon/sa/child_sa.c index a678ea9b8..90cd0014a 100644 --- a/src/charon/sa/child_sa.c +++ b/src/charon/sa/child_sa.c @@ -513,7 +513,7 @@ static void log_status(private_child_sa_t *this, logger_t *logger, char* name) */ static void destroy(private_child_sa_t *this) { - /* delete all policys in the kernel */ + /* delete all policies in the kernel */ sa_policy_t *policy; while (this->policies->remove_last(this->policies, (void**)&policy) == SUCCESS) { diff --git a/src/charon/sa/child_sa.h b/src/charon/sa/child_sa.h index 6ccbff13f..bb5224f26 100644 --- a/src/charon/sa/child_sa.h +++ b/src/charon/sa/child_sa.h @@ -102,7 +102,7 @@ struct child_sa_t { /** * @brief Install the policies using some traffic selectors. * - * Spplied lists of traffic_selector_t's specify the policies + * Supplied lists of traffic_selector_t's specify the policies * to use for this child sa. * * @param this calling object diff --git a/src/charon/sa/ike_sa.c b/src/charon/sa/ike_sa.c index 6322eb8e9..5290bde64 100644 --- a/src/charon/sa/ike_sa.c +++ b/src/charon/sa/ike_sa.c @@ -936,7 +936,7 @@ static message_t * get_last_requested_message (private_ike_sa_t *this) } /** - * Implementation of protected_ike_sa_t.get_state. + * Implementation of ike_sa_t.get_state. */ static ike_sa_state_t get_state (private_ike_sa_t *this) { @@ -944,7 +944,7 @@ static ike_sa_state_t get_state (private_ike_sa_t *this) } /** - * Implementation of protected_ike_sa_t.get_state. + * Implementation of protected_ike_sa_t.add_child_sa. */ static void add_child_sa (private_ike_sa_t *this, child_sa_t *child_sa) { @@ -1149,12 +1149,12 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id) this->protected.build_transforms = (status_t (*) (protected_ike_sa_t *,proposal_t*,diffie_hellman_t*,chunk_t,chunk_t)) build_transforms; this->protected.set_new_state = (void (*) (protected_ike_sa_t *,state_t *)) set_new_state; this->protected.get_crypter_initiator = (crypter_t *(*) (protected_ike_sa_t *)) get_crypter_initiator; - this->protected.get_signer_initiator = (signer_t *(*) (protected_ike_sa_t *)) get_signer_initiator; + this->protected.get_signer_initiator = (signer_t *(*) (protected_ike_sa_t *)) get_signer_initiator; this->protected.get_crypter_responder = (crypter_t *(*) (protected_ike_sa_t *)) get_crypter_responder; - this->protected.get_signer_responder = (signer_t *(*) (protected_ike_sa_t *)) get_signer_responder; + this->protected.get_signer_responder = (signer_t *(*) (protected_ike_sa_t *)) get_signer_responder; this->protected.reset_message_buffers = (void (*) (protected_ike_sa_t *)) reset_message_buffers; - this->protected.get_last_responded_message = (message_t * (*) (protected_ike_sa_t *this)) get_last_responded_message; - this->protected.get_last_requested_message = (message_t * (*) (protected_ike_sa_t *this)) get_last_requested_message; + this->protected.get_last_responded_message = (message_t * (*) (protected_ike_sa_t *)) get_last_responded_message; + this->protected.get_last_requested_message = (message_t * (*) (protected_ike_sa_t *)) get_last_requested_message; this->protected.set_last_replied_message_id = (void (*) (protected_ike_sa_t *,u_int32_t)) set_last_replied_message_id; diff --git a/src/charon/sa/ike_sa.h b/src/charon/sa/ike_sa.h index c526c6347..a4ab82cef 100644 --- a/src/charon/sa/ike_sa.h +++ b/src/charon/sa/ike_sa.h @@ -267,7 +267,7 @@ struct protected_ike_sa_t { * * Keys are derived using the diffie hellman secret, nonces and internal * stored SPIs. - * Allready existing objects get destroyed. + * Already existing objects get destroyed. * * @param this calling object * @param proposal proposal which contains algorithms to use diff --git a/src/charon/sa/states/ike_sa_init_requested.c b/src/charon/sa/states/ike_sa_init_requested.c index 311cdf0a0..04fef3d94 100644 --- a/src/charon/sa/states/ike_sa_init_requested.c +++ b/src/charon/sa/states/ike_sa_init_requested.c @@ -273,7 +273,7 @@ static status_t process_message(private_ike_sa_init_requested_t *this, message_t /* Iterate over all payloads. * - * The message is allready checked for the right payload types. + * The message is already checked for the right payload types. */ payloads = ike_sa_init_reply->get_payload_iterator(ike_sa_init_reply); while (payloads->has_next(payloads)) diff --git a/src/charon/sa/states/ike_sa_init_responded.c b/src/charon/sa/states/ike_sa_init_responded.c index e40b0cf22..84187f027 100644 --- a/src/charon/sa/states/ike_sa_init_responded.c +++ b/src/charon/sa/states/ike_sa_init_responded.c @@ -207,14 +207,14 @@ static status_t process_message(private_ike_sa_init_responded_t *this, message_t { if (status == NOT_SUPPORTED) { - this->logger->log(this->logger, ERROR | LEVEL1, "IKE_AUTH request contains unsupported payload with critical flag set." + this->logger->log(this->logger, ERROR | LEVEL1, "IKE_AUTH request contains unsupported payload with critical flag set. " "Deleting IKE_SA"); this->ike_sa->send_notify(this->ike_sa, IKE_AUTH, UNSUPPORTED_CRITICAL_PAYLOAD, CHUNK_INITIALIZER); return DELETE_ME; } else { - this->logger->log(this->logger, AUDIT, "IKE_AUTH request decryption faild. Ignoring message"); + this->logger->log(this->logger, AUDIT, "IKE_AUTH request decryption failed. Ignoring message"); } return status; } @@ -298,7 +298,7 @@ static status_t process_message(private_ike_sa_init_responded_t *this, message_t this->ike_sa->build_message(this->ike_sa, IKE_AUTH, FALSE, &response); /* add payloads to it */ - status = this->build_idr_payload(this, idi_request, idr_request, response,&idr_response); + status = this->build_idr_payload(this, idi_request, idr_request, response, &idr_response); if (status != SUCCESS) { response->destroy(response); diff --git a/src/charon/threads/thread_pool.c b/src/charon/threads/thread_pool.c index 0a39c2e9e..57b2539cb 100644 --- a/src/charon/threads/thread_pool.c +++ b/src/charon/threads/thread_pool.c @@ -373,7 +373,7 @@ static void process_delete_half_open_ike_sa_job(private_thread_pool_t *this, del status = charon->ike_sa_manager->checkout(charon->ike_sa_manager,ike_sa_id, &ike_sa); if ((status != SUCCESS) && (status != CREATED)) { - this->worker_logger->log(this->worker_logger, CONTROL | LEVEL3, "IKE SA seems to be allready deleted and so doesn't have to be deleted"); + this->worker_logger->log(this->worker_logger, CONTROL | LEVEL3, "IKE SA seems to be already deleted and so doesn't have to be deleted"); return; } @@ -418,7 +418,7 @@ static void process_delete_established_ike_sa_job(private_thread_pool_t *this, d status = charon->ike_sa_manager->checkout(charon->ike_sa_manager,ike_sa_id, &ike_sa); if ((status != SUCCESS) && (status != CREATED)) { - this->worker_logger->log(this->worker_logger, CONTROL | LEVEL3, "IKE SA seems to be allready deleted and so doesn't have to be deleted"); + this->worker_logger->log(this->worker_logger, CONTROL | LEVEL3, "IKE SA seems to be already deleted and so doesn't have to be deleted"); return; } @@ -470,7 +470,7 @@ static void process_retransmit_request_job(private_thread_pool_t *this, retransm if ((status != SUCCESS) && (status != CREATED)) { job->destroy(job); - this->worker_logger->log(this->worker_logger, ERROR, "IKE SA could not be checked out. Allready deleted?"); + this->worker_logger->log(this->worker_logger, ERROR, "IKE SA could not be checked out. Already deleted?"); return; }