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

1 files changed, 33 insertions, 41 deletions

diff --git a/src/charon/sa/connect_manager.h b/src/charon/sa/connect_manager.h
index 2f3e9109b..38d8e7a49 100644
--- a/src/charon/sa/connect_manager.h
+++ b/src/charon/sa/connect_manager.h
@@ -1,12 +1,5 @@
-/**
- * @file connect_manager.h
- * 
- * @brief Interface of connect_manager_t.
- * 
- */
-
 /*
- * Copyright (C) 2007 Tobias Brunner
+ * Copyright (C) 2007-2008 Tobias Brunner
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -18,6 +11,13 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
+ *
+ * $Id: connect_manager.h 3792 2008-04-10 12:51:04Z tobias $
+ */
+
+/**
+ * @defgroup connect_manager connect_manager
+ * @{ @ingroup sa
  */
 
 #ifndef CONNECT_MANAGER_H_
@@ -26,43 +26,33 @@
 typedef struct connect_manager_t connect_manager_t;
 
 #include <encoding/message.h>
-#include <config/child_cfg.h>
 #include <sa/ike_sa_id.h>
 #include <utils/identification.h>
 
 /**
- * @brief The connection manager is responsible for establishing a direct
+ * The connection manager is responsible for establishing a direct
  * connection with another peer.
- * 
- * @b Constructors:
- * - connect_manager_create()
- * 
- * @ingroup sa
  */
 struct connect_manager_t {
 	
 	/**
-	 * @brief Checks if a there is already a mediated connection registered
+	 * Checks if a there is already a mediated connection registered
 	 * between two peers.
 	 * 
-	 * @param this 				the manager object
 	 * @param id				my id
 	 * @param peer_id			the other peer's id
 	 * @param mediated_sa		the IKE_SA ID of the mediated connection
-	 * @param child				the CHILD_SA config of the mediated connection 
 	 * @returns 				
 	 * 							- TRUE, if there was already a mediated connection registered
 	 * 							- FALSE, otherwise
 	 */
 	bool (*check_and_register) (connect_manager_t *this,
-			identification_t *id, identification_t *peer_id,
-			ike_sa_id_t *mediated_sa, child_cfg_t *child);
+			identification_t *id, identification_t *peer_id, ike_sa_id_t *mediated_sa);
 	
 	/**
-	 * @brief Checks if there are waiting connections with a specific peer.
+	 * Checks if there are waiting connections with a specific peer.
 	 * If so, reinitiate them.
 	 * 
-	 * @param this 				the manager object
 	 * @param id				my id
 	 * @param peer_id			the other peer's id
 	 */
@@ -70,29 +60,26 @@ struct connect_manager_t {
 			identification_t *id, identification_t *peer_id);
 	
 	/**
-	 * @brief Creates a checklist and sets the initiator's data.
+	 * Creates a checklist and sets the initiator's data.
 	 * 
-	 * @param this 				the manager object
 	 * @param initiator			ID of the initiator
 	 * @param responder			ID of the responder
-	 * @param session_id		the session ID provided by the initiator
+	 * @param connect_id		the connect ID provided by the initiator
 	 * @param key				the initiator's key
 	 * @param endpoints			the initiator's endpoints
 	 * @param is_initiator		TRUE, if the caller of this method is the initiator
 	 * 							FALSE, otherwise
-	 * @returns
-	 * 							SUCCESS
+	 * @returns					SUCCESS
 	 */
 	status_t (*set_initiator_data) (connect_manager_t *this,
 		identification_t *initiator, identification_t *responder,
-		chunk_t session_id, chunk_t key, linked_list_t *endpoints, bool is_initiator);
+		chunk_t connect_id, chunk_t key, linked_list_t *endpoints, bool is_initiator);
 	
 	/**
-	 * @brief Updates a checklist and sets the responder's data. The checklist's
+	 * Updates a checklist and sets the responder's data. The checklist's
 	 * state is advanced to WAITING which means that checks will be sent.
 	 * 
-	 * @param this 				the manager object
-	 * @param session_id		the session ID
+	 * @param connect_id		the connect ID
 	 * @param chunk_t			the responder's key
 	 * @param endpoints			the responder's endpoints 
 	 * @returns 				
@@ -100,32 +87,37 @@ struct connect_manager_t {
 	 * 							- SUCCESS, otherwise
 	 */
 	status_t (*set_responder_data) (connect_manager_t *this,
-		chunk_t session_id, chunk_t key, linked_list_t *endpoints);
+		chunk_t connect_id, chunk_t key, linked_list_t *endpoints);
 	
+	/**
+	 * Stops checks for a checklist. Used after the responder received an IKE_SA_INIT
+	 * request which contains a ME_CONNECTID payload.
+	 * 
+	 * @param connect_id		the connect ID
+	 * @returns
+	 * 							- NOT_FOUND, if the checklist has not been found
+	 * 							- SUCCESS, otherwise
+	 */
+	status_t (*stop_checks) (connect_manager_t *this, chunk_t connect_id);
 	
 	/**
-	 * @brief Processes a connectivity check
+	 * Processes a connectivity check
 	 * 
-	 * @param this				the manager object
 	 * @param message			the received message
 	 */
 	void (*process_check) (connect_manager_t *this, message_t *message);
 	
 	/**
-	 * @brief Destroys the manager with all data.
-	 * 
-	 * @param this				 the manager object
+	 * Destroys the manager with all data.
 	 */
 	void (*destroy) (connect_manager_t *this);
 };
 
 /**
- * @brief Create a manager.
+ * Create a manager.
  * 
  * @returns 	connect_manager_t object
- * 
- * @ingroup sa
  */
 connect_manager_t *connect_manager_create(void);
 
-#endif /*CONNECT_MANAGER_H_*/
+#endif /*CONNECT_MANAGER_H_ @} */