Add properties for WiFi services

[connman] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index 7cbd72b..1b57365 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2008  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -33,29 +33,46 @@ static GSList *plugins = NULL;
 
 struct connman_plugin {
        void *handle;
+       gboolean active;
        struct connman_plugin_desc *desc;
 };
 
+static gint compare_priority(gconstpointer a, gconstpointer b)
+{
+       const struct connman_plugin *plugin1 = a;
+       const struct connman_plugin *plugin2 = b;
+
+       return plugin2->desc->priority - plugin1->desc->priority;
+}
+
 static gboolean add_plugin(void *handle, struct connman_plugin_desc *desc)
 {
        struct connman_plugin *plugin;
 
+       if (desc->init == NULL)
+               return FALSE;
+
+       if (g_str_equal(desc->version, CONNMAN_VERSION) == FALSE) {
+               DBG("version mismatch for %s", desc->description);
+               return FALSE;
+       }
+
        plugin = g_try_new0(struct connman_plugin, 1);
        if (plugin == NULL)
                return FALSE;
 
        plugin->handle = handle;
+       plugin->active = FALSE;
        plugin->desc = desc;
 
-       plugins = g_slist_append(plugins, plugin);
-
-       desc->init();
+       plugins = g_slist_insert_sorted(plugins, plugin, compare_priority);
 
        return TRUE;
 }
 
-int __connman_plugin_init(void)
+int __connman_plugin_init(const char *pattern, const char *exclude)
 {
+       GSList *list;
        GDir *dir;
        const gchar *file;
        gchar *filename;
@@ -74,10 +91,11 @@ int __connman_plugin_init(void)
 
                        filename = g_build_filename(PLUGINDIR, file, NULL);
 
-                       handle = dlopen(filename, RTLD_LAZY);
+                       handle = dlopen(filename, RTLD_NOW);
                        if (handle == NULL) {
                                g_warning("Can't load %s: %s", filename,
                                                                dlerror());
+                               g_free(filename);
                                continue;
                        }
 
@@ -85,12 +103,21 @@ int __connman_plugin_init(void)
 
                        desc = dlsym(handle, "connman_plugin_desc");
                        if (desc == NULL) {
-                               g_warning("Can't load symbol");
+                               g_warning("Can't load symbol: %s", dlerror());
                                dlclose(handle);
                                continue;
                        }
 
-                       if (desc->init == NULL) {
+                       if (exclude != NULL && g_pattern_match_simple(exclude,
+                                                       desc->name) == TRUE) {
+                               DBG("excluding %s", desc->description);
+                               dlclose(handle);
+                               continue;
+                       }
+
+                       if (pattern != NULL && g_pattern_match_simple(pattern,
+                                                       desc->name) == FALSE) {
+                               DBG("ignoring %s", desc->description);
                                dlclose(handle);
                                continue;
                        }
@@ -102,6 +129,15 @@ int __connman_plugin_init(void)
                g_dir_close(dir);
        }
 
+       for (list = plugins; list; list = list->next) {
+               struct connman_plugin *plugin = list->data;
+
+               if (plugin->desc->init() < 0)
+                       continue;
+
+               plugin->active = TRUE;
+       }
+
        return 0;
 }
 
@@ -114,7 +150,7 @@ void __connman_plugin_cleanup(void)
        for (list = plugins; list; list = list->next) {
                struct connman_plugin *plugin = list->data;
 
-               if (plugin->desc->exit)
+               if (plugin->active == TRUE && plugin->desc->exit)
                        plugin->desc->exit();
 
                dlclose(plugin->handle);