This email list is read-only. Emails sent to this list will be discarded
----------------------------------
configure.ac | 8 ++----
src/Makefile.am | 6 ++--
src/manager.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++-----
src/plugin.c | 60 ++++++++++++++++++------------------------------
4 files changed, 90 insertions(+), 52 deletions(-)
New commits:
commit 0af74f53a3dfd5d4aa93326d5900b8562b019687
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Oct 14 17:55:52 2008 +0200
Force symbol resolving and fix memory leak
commit 2ad81f8d0508e33cbace70a591d5fdd96b21c5e7
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Oct 14 17:54:21 2008 +0200
Add dynamic export linker flag
commit a8f986749e6ae18eadc1a681fc9d9b534200e559
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Oct 14 17:39:39 2008 +0200
Use dynamic linking loader directly
commit 2be75e86beed6bee061266354854dd5bd5d0204b
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Tue Oct 14 17:13:42 2008 +0200
Add method and signal for property handling
Diff in this email is a maximum of 400 lines.
diff --git a/configure.ac b/configure.ac
index 1d438b1..1107896 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,9 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
AC_PATH_PROG(DHCLIENT, [dhclient], ,$PATH:/sbin:/usr/sbin)
AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant], ,$PATH:/sbin:/usr/sbin)
+AC_CHECK_LIB(dl, dlopen, dummy=yes,
+ AC_MSG_ERROR(dynamic linking loader is required))
+
PKG_CHECK_MODULES(GLIB, glib-2.0, dummy=yes,
AC_MSG_ERROR(glib is required))
AC_SUBST(GLIB_CFLAGS)
@@ -58,11 +61,6 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0, dummy=yes,
AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS)
-PKG_CHECK_MODULES(GMODULE, gmodule-2.0, dummy=yes,
- AC_MSG_ERROR(gmodule is required))
-AC_SUBST(GMODULE_CFLAGS)
-AC_SUBST(GMODULE_LIBS)
-
PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes,
AC_MSG_ERROR(libdbus is required))
AC_SUBST(DBUS_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c12a8b..52082cd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,9 +14,9 @@ sbin_PROGRAMS = connmand
connmand_SOURCES = main.c connman.h log.c error.c plugin.c profile.c \
element.c security.c storage.c manager.c agent.c rtnl.c
-connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GMODULE_LIBS@ @GTHREAD_LIBS@
+connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl
-connmand_LDFLAGS = -Wl,--version-script=connman.ver
+connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=connman.ver
connmand_DEPENDENCIES = connman.ver
@@ -32,7 +32,7 @@ else
plugindir = $(libdir)/connman/plugins
endif
-AM_CFLAGS = @GTHREAD_CFLAGS@ @GMODULE_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
+AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \
-DSTATEDIR=\""$(statedir)"\" \
-DSTORAGEDIR=\""$(storagedir)\"" \
-DPLUGINDIR=\""$(plugindir)"\"
diff --git a/src/manager.c b/src/manager.c
index 27f6fc5..d4098da 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -27,6 +27,58 @@
#include "connman.h"
+static void append_elements(DBusMessageIter *dict)
+{
+ DBusMessageIter entry, value, iter;
+ const char *key = "Elements";
+
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
+ &value);
+
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
+
+ __connman_element_list(CONNMAN_ELEMENT_TYPE_UNKNOWN, &iter);
+
+ dbus_message_iter_close_container(&value, &iter);
+
+ dbus_message_iter_close_container(&entry, &value);
+
+ dbus_message_iter_close_container(dict, &entry);
+}
+
+static DBusMessage *get_properties(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ DBusMessage *reply;
+ DBusMessageIter array, dict;
+
+ DBG("conn %p", conn);
+
+ reply = dbus_message_new_method_return(msg);
+ if (reply == NULL)
+ return NULL;
+
+ dbus_message_iter_init_append(reply, &array);
+
+ dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
+ DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
+ DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+
+ append_elements(&dict);
+
+ dbus_message_iter_close_container(&array, &dict);
+
+ return reply;
+}
+
static DBusMessage *register_agent(DBusConnection *conn,
DBusMessage *msg, void *data)
{
@@ -124,17 +176,19 @@ static DBusMessage *list_elements(DBusConnection *conn,
}
static GDBusMethodTable manager_methods[] = {
- { "RegisterAgent", "o", "", register_agent },
- { "UnregisterAgent", "o", "", unregister_agent },
- { "ListProfiles", "", "ao", list_profiles },
- { "ListElements", "", "ao", list_elements },
+ { "GetProperties", "", "a{sv}", get_properties },
+ { "RegisterAgent", "o", "", register_agent },
+ { "UnregisterAgent", "o", "", unregister_agent },
+ { "ListProfiles", "", "ao", list_profiles },
+ { "ListElements", "", "ao", list_elements },
{ },
};
static GDBusSignalTable manager_signals[] = {
- { "ElementAdded", "o" },
- { "ElementUpdated", "o" },
- { "ElementRemoved", "o" },
+ { "PropertyChanged", "sv" },
+ { "ElementAdded", "o" },
+ { "ElementUpdated", "o" },
+ { "ElementRemoved", "o" },
{ },
};
diff --git a/src/plugin.c b/src/plugin.c
index 12ed917..0d90fd9 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -23,21 +23,20 @@
#include <config.h>
#endif
-#include <dbus/dbus.h>
+#include <dlfcn.h>
#include <glib.h>
-#include <gmodule.h>
#include "connman.h"
static GSList *plugins = NULL;
struct connman_plugin {
- GModule *module;
+ void *handle;
struct connman_plugin_desc *desc;
};
-static gboolean add_plugin(GModule *module, struct connman_plugin_desc *desc)
+static gboolean add_plugin(void *handle, struct connman_plugin_desc *desc)
{
struct connman_plugin *plugin;
@@ -45,7 +44,7 @@ static gboolean add_plugin(GModule *module, struct
connman_plugin_desc *desc)
if (plugin == NULL)
return FALSE;
- plugin->module = module;
+ plugin->handle = handle;
plugin->desc = desc;
plugins = g_slist_append(plugins, plugin);
@@ -55,65 +54,54 @@ static gboolean add_plugin(GModule *module, struct
connman_plugin_desc *desc)
return TRUE;
}
-static void load_plugins(const gchar *path)
+int __connman_plugin_init(void)
{
GDir *dir;
const gchar *file;
gchar *filename;
- dir = g_dir_open(path, 0, NULL);
+ DBG("");
+
+ 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_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) {
+ handle = dlopen(filename, RTLD_NOW);
+ if (handle == NULL) {
g_warning("Can't load %s: %s", filename,
- g_module_error());
+ 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) {
+ g_warning("Can't load symbol: %s", dlerror());
+ dlclose(handle);
continue;
}
- if (desc == NULL || desc->init == NULL) {
- g_module_close(module);
+ if (desc->init == NULL) {
+ 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("");
-
- if (g_module_supported() == FALSE) {
- g_warning("Modules not supported: %s", g_module_error());
- return FALSE;
- }
-
- load_plugins(PLUGINDIR);
return 0;
}
@@ -127,12 +115,10 @@ 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)
plugin->desc->exit();
- g_module_close(plugin->module);
+ dlclose(plugin->handle);
g_free(plugin);
}
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
