X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fplugin.c;h=e5e24647af1776c924803659df0fb7b7839f5129;hb=cbd27635e12481b9f3eef2167ec62d111fdb4b70;hp=7f8b16c422fdbf8e739de986c734a916e8f7d232;hpb=29e32b19209edcead937e85b0da62746c19ee625;p=connman

diff --git a/src/plugin.c b/src/plugin.c
index 7f8b16c..e5e2464 100644
--- 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
@@ -23,97 +23,145 @@
 #include <config.h>
 #endif
 
-#include <dbus/dbus.h>
+#include <dlfcn.h>
 
 #include <glib.h>
-#include <gmodule.h>
 
-#include <connman/plugin.h>
+#ifdef CONNMAN_PLUGIN_BUILTIN
+#undef CONNMAN_PLUGIN_BUILTIN
+#endif
 
 #include "connman.h"
 
 static GSList *plugins = NULL;
 
 struct connman_plugin {
-	GModule *module;
+	void *handle;
+	gboolean active;
 	struct connman_plugin_desc *desc;
 };
 
-static gboolean add_plugin(GModule *module, 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) {
+		connman_error("Version mismatch for %s", desc->description);
+		return FALSE;
+	}
+
 	plugin = g_try_new0(struct connman_plugin, 1);
 	if (plugin == NULL)
 		return FALSE;
 
-	plugin->module = module;
+	plugin->handle = handle;
+	plugin->active = FALSE;
 	plugin->desc = desc;
 
-	plugins = g_slist_append(plugins, plugin);
+	plugins = g_slist_insert_sorted(plugins, plugin, compare_priority);
 
-	desc->init();
+	return TRUE;
+}
+
+static gboolean check_plugin(struct connman_plugin_desc *desc,
+				const char *pattern, const char *exclude)
+{
+	if (exclude != NULL &&
+			g_pattern_match_simple(exclude, desc->name) == TRUE) {
+		connman_info("Excluding %s", desc->description);
+		return FALSE;
+	}
+
+	if (pattern != NULL &&
+			g_pattern_match_simple(pattern, desc->name) == FALSE) {
+		connman_info("Ignoring %s", desc->description);
+		return FALSE;
+	}
 
 	return TRUE;
 }
 
-static void load_plugins(const gchar *path)
+#include "builtin.h"
+
+int __connman_plugin_init(const char *pattern, const char *exclude)
 {
+	GSList *list;
 	GDir *dir;
 	const gchar *file;
 	gchar *filename;
+	unsigned int i;
+
+	DBG("");
 
-	dir = g_dir_open(path, 0, NULL);
+	for (i = 0; __connman_builtin[i]; i++) {
+		if (check_plugin(__connman_builtin[i],
+						pattern, exclude) == FALSE)
+			continue;
+
+		add_plugin(NULL, __connman_builtin[i]);
+	}
+
+	dir = g_dir_open(PLUGINDIR, 0, NULL);
 	if (dir != NULL) {
 		while ((file = g_dir_read_name(dir)) != NULL) {
-			GModule *module;
+			void *handle;
 			struct connman_plugin_desc *desc;
 
-			if (g_str_has_suffix(file, ".so") == FALSE)
+			if (g_str_has_prefix(file, "lib") == TRUE ||
+					g_str_has_suffix(file, ".so") == FALSE)
 				continue;
 
-			filename = g_build_filename(path, file, NULL);
+			filename = g_build_filename(PLUGINDIR, file, NULL);
 
-			module = g_module_open(filename, 0);
-			if (module == NULL) {
-				g_warning("Can't load %s", filename);
+			handle = dlopen(filename, RTLD_NOW);
+			if (handle == NULL) {
+				connman_error("Can't load %s: %s",
+							filename, dlerror());
+				g_free(filename);
 				continue;
 			}
 
 			g_free(filename);
 
-			DBG("%s", g_module_name(module));
-
-			if (g_module_symbol(module, "connman_plugin_desc",
-						(gpointer) &desc) == FALSE) {
-				g_warning("Can't load symbol");
-				g_module_close(module);
+			desc = dlsym(handle, "connman_plugin_desc");
+			if (desc == NULL) {
+				connman_error("Can't load symbol: %s",
+								dlerror());
+				dlclose(handle);
 				continue;
 			}
 
-			if (desc == NULL || desc->init == NULL) {
-				g_module_close(module);
+			if (check_plugin(desc, pattern, exclude) == FALSE) {
+				dlclose(handle);
 				continue;
 			}
 
-			if (add_plugin(module, desc) == FALSE)
-				g_module_close(module);
+			if (add_plugin(handle, desc) == FALSE)
+				dlclose(handle);
 		}
 
 		g_dir_close(dir);
 	}
-}
 
-int __connman_plugin_init(void)
-{
-	DBG("");
+	for (list = plugins; list; list = list->next) {
+		struct connman_plugin *plugin = list->data;
 
-	if (g_module_supported() == FALSE) {
-		g_warning("Modules not supported: %s", g_module_error());
-		return FALSE;
-	}
+		if (plugin->desc->init() < 0)
+			continue;
 
-	load_plugins(PLUGINDIR);
+		plugin->active = TRUE;
+	}
 
 	return 0;
 }
@@ -127,12 +175,11 @@ void __connman_plugin_cleanup(void)
 	for (list = plugins; list; list = list->next) {
 		struct connman_plugin *plugin = list->data;
 
-		DBG("%s", g_module_name(plugin->module));
-
-		if (plugin->desc->exit)
+		if (plugin->active == TRUE && plugin->desc->exit)
 			plugin->desc->exit();
 
-		g_module_close(plugin->module);
+		if (plugin->handle != NULL)
+			dlclose(plugin->handle);
 
 		g_free(plugin);
 	}