merged the modularization branch (credentials) back to trunk

src/charon/sa/tasks/child_rekey.h

@@ -1,10 +1,3 @@
-/**
- * @file child_rekey.h
- * 
- * @brief Interface child_rekey_t.
- * 
- */
-
 /*
  * Copyright (C) 2007 Martin Willi
  * Hochschule fuer Technik Rapperswil
@@ -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$
+ */
+
+/**
+ * @defgroup child_rekey child_rekey
+ * @{ @ingroup tasks
  */
 
 #ifndef CHILD_REKEY_H_
@@ -31,12 +31,7 @@ typedef struct child_rekey_t child_rekey_t;
 #include <sa/tasks/task.h>
 
 /**
- * @brief Task of type CHILD_REKEY, rekey an established CHILD_SA.
- *
- * @b Constructors:
- *  - child_rekey_create()
- * 
- * @ingroup tasks
+ * Task of type CHILD_REKEY, rekey an established CHILD_SA.
  */
 struct child_rekey_t {
 
@@ -46,20 +41,19 @@ struct child_rekey_t {
 	task_t task;
 	
 	/**
-	 * @brief Register a rekeying task which collides with this one
+	 * Register a rekeying task which collides with this one
 	 *
 	 * If two peers initiate rekeying at the same time, the collision must
 	 * be handled gracefully. The task manager is aware of what exchanges
 	 * are going on and notifies the outgoing task by passing the incoming.
 	 *
-	 * @param this		task initated by us
 	 * @param other		incoming task
 	 */
 	void (*collide)(child_rekey_t* this, task_t *other);
 };
 
 /**
- * @brief Create a new CHILD_REKEY task.
+ * Create a new CHILD_REKEY task.
  *
  * @param ike_sa		IKE_SA this task works for
  * @param child_sa 		child_sa to rekey, NULL if responder
@@ -67,4 +61,4 @@ struct child_rekey_t {
  */
 child_rekey_t *child_rekey_create(ike_sa_t *ike_sa, child_sa_t *child_sa);
 
-#endif /* CHILD_REKEY_H_ */
+#endif /* CHILD_REKEY_H_ @} */