From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 15 Sep 2009 11:13:25 +0000 (+0200)
Subject: Some whitespace and code cleanups concerning the mediation extension.
X-Git-Tag: 4.3.6~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41faec079116d2945ab05aa96724ae5395955502;p=thirdparty%2Fstrongswan.git

Some whitespace and code cleanups concerning the mediation extension.
---

diff --git a/src/charon/plugins/nm/nm_service.c b/src/charon/plugins/nm/nm_service.c
index 3cc0867642..b05383c2b6 100644
--- a/src/charon/plugins/nm/nm_service.c
+++ b/src/charon/plugins/nm/nm_service.c
@@ -462,10 +462,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
 	{
 		ike_sa->set_peer_cfg(ike_sa, peer_cfg);
 	}
-	else
-	{
-		peer_cfg->destroy(peer_cfg);
-	}
+	peer_cfg->destroy(peer_cfg);
 
 	/**
 	 * Register listener, enable  initiate-failure-detection hooks
diff --git a/src/charon/processing/jobs/initiate_mediation_job.c b/src/charon/processing/jobs/initiate_mediation_job.c
index 3dc1b0dbfc..ffe8755e23 100644
--- a/src/charon/processing/jobs/initiate_mediation_job.c
+++ b/src/charon/processing/jobs/initiate_mediation_job.c
@@ -80,6 +80,7 @@ static void initiate(private_initiate_mediation_job_t *this)
 												   this->mediated_sa_id);
 	if (mediated_sa)
 	{
+		DBG1(DBG_IKE, "initiating mediation connection");
 		mediated_cfg = mediated_sa->get_peer_cfg(mediated_sa);
 		mediated_cfg->get_ref(mediated_cfg);
 
@@ -99,6 +100,7 @@ static void initiate(private_initiate_mediation_job_t *this)
 			destroy(this);
 			return;
 		}
+		enumerator->destroy(enumerator);
 
 		if (charon->connect_manager->check_and_register(charon->connect_manager,
 				auth_cfg->get(auth_cfg, AUTH_RULE_IDENTITY),
@@ -142,8 +144,7 @@ static void initiate(private_initiate_mediation_job_t *this)
 		mediation_cfg->destroy(mediation_cfg);
 
 		mediation_sa = charon->ike_sa_manager->checkout(charon->ike_sa_manager,
-				this->mediation_sa_id);
-
+														this->mediation_sa_id);
 		if (mediation_sa)
 		{
 			if (mediation_sa->initiate_mediation(mediation_sa,
@@ -163,10 +164,9 @@ static void initiate(private_initiate_mediation_job_t *this)
 				destroy(this);
 				return;
 			}
-
-			charon->ike_sa_manager->checkin(charon->ike_sa_manager, mediation_sa);
+			charon->ike_sa_manager->checkin(charon->ike_sa_manager,
+											mediation_sa);
 		}
-
 		mediated_cfg->destroy(mediated_cfg);
 	}
 	destroy(this);
@@ -214,7 +214,8 @@ static void reinitiate(private_initiate_mediation_job_t *this)
 				destroy(this);
 				return;
 			}
-			charon->ike_sa_manager->checkin(charon->ike_sa_manager, mediation_sa);
+			charon->ike_sa_manager->checkin(charon->ike_sa_manager,
+											mediation_sa);
 		}
 
 		mediated_cfg->destroy(mediated_cfg);
diff --git a/src/charon/sa/task_manager.h b/src/charon/sa/task_manager.h
index 720b7527ef..731ed48982 100644
--- a/src/charon/sa/task_manager.h
+++ b/src/charon/sa/task_manager.h
@@ -95,7 +95,7 @@ struct task_manager_t {
 	 *
 	 * @param message		message to add payloads to
 	 * @return
-	 * 						- DESTROY_ME if IKE_SA must be closed
+	 *						- DESTROY_ME if IKE_SA must be closed
 	 *						- SUCCESS otherwise
 	 */
 	status_t (*process_message) (task_manager_t *this, message_t *message);
@@ -121,7 +121,7 @@ struct task_manager_t {
 	 *
 	 * @param message_id	ID of the message to retransmit
 	 * @return
-	 * 						- INVALID_STATE if retransmission not required
+	 *						- INVALID_STATE if retransmission not required
 	 *						- SUCCESS if retransmission sent
 	 */
 	status_t (*retransmit) (task_manager_t *this, u_int32_t message_id);