Merge branch 'stroke-timeout'

[strongswan.git] / src / manager / manager.h

diff --git a/src/manager/manager.h b/src/manager/manager.h
index dc5fc18..a72801f 100644 (file)
--- a/src/manager/manager.h
+++ b/src/manager/manager.h
@@ -16,7 +16,7 @@
 /**
  * @defgroup manager manager
  *
- * @defgroup controller controller
+ * @defgroup manager_controller controller
  * @ingroup manager
  *
  * @defgroup manager_i manager
@@ -31,8 +31,6 @@
 
 #include <context.h>
 
-#include <utils/iterator.h>
-
 typedef struct manager_t manager_t;
 
 /**
@@ -44,9 +42,9 @@ struct manager_t {
         * implements context_t interface
         */
        context_t context;
-       
+
        /**
-        * Create an iterator over all configured gateways.
+        * Create an enumerator over all configured gateways.
         *
         * enumerate() arguments: int id, char *name, int port, char *address
         * If port is 0, address is a Unix socket address.
@@ -54,7 +52,7 @@ struct manager_t {
         * @return                      enumerator
         */
        enumerator_t* (*create_gateway_enumerator)(manager_t *this);
-       
+
        /**
         * Select a gateway.
         *
@@ -65,7 +63,7 @@ struct manager_t {
         * @return                      selected gateway, or NULL
         */
        gateway_t* (*select_gateway)(manager_t *this, int id);
-       
+
        /**
         * Try to log in.
         *
@@ -74,14 +72,14 @@ struct manager_t {
         * @return                      TRUE if login successful
         */
        bool (*login)(manager_t *this, char *username, char *password);
-       
+
        /**
         * Check if user logged in.
         *
         * @return                      TRUE if logged in
         */
        bool (*logged_in)(manager_t *this);
-       
+
        /**
         * Log out.
         */