Updated pkcs1 plugin to the new builder API

[strongswan.git] / src / medsrv / main.c

diff --git a/src/medsrv/main.c b/src/medsrv/main.c
index 00975e9..d66d01e 100644 (file)
--- a/src/medsrv/main.c
+++ b/src/medsrv/main.c
@@ -12,8 +12,6 @@
  * 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.
  * 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$

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -34,14 +32,17 @@ int main(int arc, char *argv[])
        bool debug;
        char *uri;
        int timeout, threads;
        bool debug;
        char *uri;
        int timeout, threads;

-       
+

        library_init(STRONGSWAN_CONF);
        library_init(STRONGSWAN_CONF);

-       lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
-           lib->settings->get_str(lib->settings, "medsrv.load", PLUGINS));
-       
+       if (!lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR,
+                       lib->settings->get_str(lib->settings, "medsrv.load", PLUGINS)))
+       {
+               return 1;
+       }
+

        socket = lib->settings->get_str(lib->settings, "medsrv.socket", NULL);
        debug = lib->settings->get_bool(lib->settings, "medsrv.debug", FALSE);
        socket = lib->settings->get_str(lib->settings, "medsrv.socket", NULL);
        debug = lib->settings->get_bool(lib->settings, "medsrv.debug", FALSE);

-       timeout = lib->settings->get_int(lib->settings, "medsrv.timeout", 900);
+       timeout = lib->settings->get_time(lib->settings, "medsrv.timeout", 900);

        threads = lib->settings->get_int(lib->settings, "medsrv.threads", 5);
        uri = lib->settings->get_str(lib->settings, "medsrv.database", NULL);
        if (uri == NULL)
        threads = lib->settings->get_int(lib->settings, "medsrv.threads", 5);
        uri = lib->settings->get_str(lib->settings, "medsrv.database", NULL);
        if (uri == NULL)


@@ -49,14 +50,14 @@ int main(int arc, char *argv[])
                fprintf(stderr, "database URI medsrv.database not defined.\n");
                return 1;
        }
                fprintf(stderr, "database URI medsrv.database not defined.\n");
                return 1;
        }

-       
+

        db = lib->db->create(lib->db, uri);
        if (db == NULL)
        {
                fprintf(stderr, "opening database failed.\n");
                return 1;
        }
        db = lib->db->create(lib->db, uri);
        if (db == NULL)
        {
                fprintf(stderr, "opening database failed.\n");
                return 1;
        }

-       
+

        dispatcher = dispatcher_create(socket, debug, timeout,
                                                                   (context_constructor_t)user_create, db);
        dispatcher->add_filter(dispatcher,
        dispatcher = dispatcher_create(socket, debug, timeout,
                                                                   (context_constructor_t)user_create, db);
        dispatcher->add_filter(dispatcher,


@@ -65,13 +66,13 @@ int main(int arc, char *argv[])
                                                (controller_constructor_t)user_controller_create, db);
        dispatcher->add_controller(dispatcher,
                                                (controller_constructor_t)peer_controller_create, db);
                                                (controller_constructor_t)user_controller_create, db);
        dispatcher->add_controller(dispatcher,
                                                (controller_constructor_t)peer_controller_create, db);

-       
+

        dispatcher->run(dispatcher, threads);
        dispatcher->run(dispatcher, threads);

-       
+

        dispatcher->waitsignal(dispatcher);
        dispatcher->destroy(dispatcher);
        db->destroy(db);
        dispatcher->waitsignal(dispatcher);
        dispatcher->destroy(dispatcher);
        db->destroy(db);

-       
+

        library_deinit();
        return 0;
 }
        library_deinit();
        return 0;
 }