removed some raw EAP debug output
[strongswan.git] / src / manager / manager.c
index 39c8d99..fb89c6b 100644 (file)
@@ -1,10 +1,3 @@
-/**
- * @file manager.c
- *
- * @brief Implementation of manager_t.
- *
- */
-
 /*
  * Copyright (C) 2007 Martin Willi
  * Hochschule fuer Technik Rapperswil
@@ -37,29 +30,29 @@ struct private_manager_t {
         * public functions
         */
        manager_t public;
-       
+
        /**
-        * underlying database
+        * underlying storage database
         */
-       database_t *db;
-       
+       storage_t *store;
+
        /**
         * user id, if we are logged in
         */
        int user;
-       
+
        /**
         * selected gateway
         */
        gateway_t *gateway;
-};     
-       
+};
+
 /**
  * Implementation of manager_t.create_gateway_enumerator.
  */
 static enumerator_t* create_gateway_enumerator(private_manager_t *this)
 {
-       return this->db->create_gateway_enumerator(this->db, this->user);
+       return this->store->create_gateway_enumerator(this->store, this->user);
 }
 
 /**
@@ -73,11 +66,11 @@ static gateway_t* select_gateway(private_manager_t *this, int select_id)
                int id, port;
                char *name, *address;
                host_t *host;
-               
+
                if (this->gateway) this->gateway->destroy(this->gateway);
                this->gateway = NULL;
-               
-               enumerator = this->db->create_gateway_enumerator(this->db, this->user);
+
+               enumerator = this->store->create_gateway_enumerator(this->store, this->user);
                while (enumerator->enumerate(enumerator, &id, &name, &port, &address))
                {
                        if (select_id == id)
@@ -117,7 +110,7 @@ static bool login(private_manager_t *this, char *username, char *password)
 {
        if (!this->user)
        {
-               this->user = this->db->login(this->db, username, password);
+               this->user = this->store->login(this->store, username, password);
        }
        return this->user != 0;
 }
@@ -147,21 +140,21 @@ static void destroy(private_manager_t *this)
 /*
  * see header file
  */
-manager_t *manager_create(database_t *database)
+manager_t *manager_create(storage_t *storage)
 {
        private_manager_t *this = malloc_thing(private_manager_t);
-       
+
        this->public.login = (bool(*)(manager_t*, char *username, char *password))login;
        this->public.logged_in = (bool(*)(manager_t*))logged_in;
        this->public.logout = (void(*)(manager_t*))logout;
        this->public.create_gateway_enumerator = (enumerator_t*(*)(manager_t*))create_gateway_enumerator;
        this->public.select_gateway = (gateway_t*(*)(manager_t*, int id))select_gateway;
        this->public.context.destroy = (void(*)(context_t*))destroy;
-       
+
        this->user = 0;
-       this->db = database;
+       this->store = storage;
        this->gateway = NULL;
-       
+
        return &this->public;
 }