[svn-upgrade] Integrating new upstream version, strongswan (4.3.6)

1 files changed, 22 insertions, 21 deletions

diff --git a/src/charon/sa/mediation_manager.h b/src/charon/sa/mediation_manager.h
index 29e16d84f..31a16f69c 100644
--- a/src/charon/sa/mediation_manager.h
+++ b/src/charon/sa/mediation_manager.h
@@ -31,48 +31,49 @@ typedef struct mediation_manager_t mediation_manager_t;
  * peers and registered requests for offline peers on the mediation server.
  */
 struct mediation_manager_t {
-	
+
 	/**
 	 * Remove the IKE_SA of a peer.
-	 * 
+	 *
 	 * @param ike_sa_id			the IKE_SA ID of the peer's SA
 	 */
 	void (*remove) (mediation_manager_t* this, ike_sa_id_t *ike_sa_id);
-	
+
 	/**
 	 * Update the ike_sa_id that is assigned to a peer's ID. If the peer
-	 * is new, it gets a new record assigned. 
-	 * 
+	 * is new, it gets a new record assigned.
+	 *
 	 * @param peer_id			the peer's ID
 	 * @param ike_sa_id			the IKE_SA ID of the peer's SA
 	 */
 	void (*update_sa_id) (mediation_manager_t* this, identification_t *peer_id,
-			ike_sa_id_t *ike_sa_id);
-	
+						  ike_sa_id_t *ike_sa_id);
+
 	/**
 	 * Checks if a specific peer is online.
-	 * 
+	 *
 	 * @param peer_id			the peer's ID
-	 * @returns 					
-	 * 							- IKE_SA ID of the peer's SA.
-	 * 							- NULL, if the peer is not online.
+	 * @returns
+	 *							- IKE_SA ID of the peer's SA.
+	 *							- NULL, if the peer is not online.
 	 */
 	ike_sa_id_t* (*check) (mediation_manager_t* this,
-			identification_t *peer_id);
-	
+						   identification_t *peer_id);
+
 	/**
 	 * Checks if a specific peer is online and registers the requesting
 	 * peer if it is not.
-	 * 
+	 *
 	 * @param peer_id			the peer's ID
 	 * @param requester			the requesters ID
-	 * @returns 					
-	 * 							- IKE_SA ID of the peer's SA.
-	 * 							- NULL, if the peer is not online.
+	 * @returns
+	 *							- IKE_SA ID of the peer's SA.
+	 *							- NULL, if the peer is not online.
 	 */
 	ike_sa_id_t* (*check_and_register) (mediation_manager_t* this,
-			identification_t *peer_id, identification_t *requester);
-	
+										identification_t *peer_id,
+										identification_t *requester);
+
 	/**
 	 * Destroys the manager with all data.
 	 */
@@ -81,8 +82,8 @@ struct mediation_manager_t {
 
 /**
  * Create a manager.
- * 
- * @returns 	mediation_manager_t object
+ *
+ * @returns	mediation_manager_t object
  */
 mediation_manager_t *mediation_manager_create(void);