aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/charon/control/controller.h6
-rw-r--r--src/charon/sa/ike_sa_manager.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/charon/control/controller.h b/src/charon/control/controller.h
index 0dd6aec7c..083b26f27 100644
--- a/src/charon/control/controller.h
+++ b/src/charon/control/controller.h
@@ -42,7 +42,7 @@ typedef bool(*controller_cb_t)(void* param, debug_t group, level_t level,
/**
* Empty callback function for controller_t functions.
*
- * If you want to do a syncrhonous call, but don't need a callback, pass
+ * If you want to do a synchronous call, but don't need a callback, pass
* this function to the controllers methods.
*/
bool controller_cb_empty(void *param, debug_t group, level_t level,
@@ -57,7 +57,7 @@ typedef struct controller_t controller_t;
* evaluate the result of the operation by listening on the bus.
*
* Passing NULL as callback to the managers function calls them asynchronously.
- * If a callback is specified, they are called synchronoulsy. There is a default
+ * If a callback is specified, they are called synchronously. There is a default
* callback "controller_cb_empty" if you wan't to call a function
* synchronously, but don't need a callback.
*/
@@ -76,7 +76,7 @@ struct controller_t {
/**
* Initiate a CHILD_SA, and if required, an IKE_SA.
*
- * The inititate() function is synchronous and thus blocks until the
+ * The initiate() function is synchronous and thus blocks until the
* IKE_SA is established or failed. Because of this, the initiate() function
* contains a thread cancellation point.
*
diff --git a/src/charon/sa/ike_sa_manager.h b/src/charon/sa/ike_sa_manager.h
index 8fc243e3f..601427107 100644
--- a/src/charon/sa/ike_sa_manager.h
+++ b/src/charon/sa/ike_sa_manager.h
@@ -59,7 +59,7 @@ struct ike_sa_manager_t {
* Create and check out a new IKE_SA.
*
* @param initiator TRUE for initiator, FALSE otherwise
- * @returns created andchecked out IKE_SA
+ * @returns created and checked out IKE_SA
*/
ike_sa_t* (*checkout_new) (ike_sa_manager_t* this, bool initiator);
@@ -67,13 +67,13 @@ struct ike_sa_manager_t {
* Checkout an IKE_SA by a message.
*
* In some situations, it is necessary that the manager knows the
- * message to use for the checkout. This has the folloing reasons:
+ * message to use for the checkout. This has the following reasons:
*
* 1. If the targeted IKE_SA is already processing a message, we do not
* check it out if the message ID is the same.
* 2. If it is an IKE_SA_INIT request, we have to check if it is a
* retransmission. If so, we have to drop the message, we would
- * create another unneded IKE_SA for each retransmitted packet.
+ * create another unneeded IKE_SA for each retransmitted packet.
*
* A call to checkout_by_message() returns a (maybe new created) IKE_SA.
* If processing the message does not make sense (for the reasons above),