struct _DRouteContext
{
- DBusConnection *bus;
GPtrArray *registered_paths;
gchar *introspect_string;
struct _DRoutePath
{
DRouteContext *cnx;
+ gchar *path;
+ gboolean prefix;
GStringChunk *chunks;
GPtrArray *interfaces;
GPtrArray *introspection;
GHashTable *methods;
GHashTable *properties;
+ DRouteIntrospectChildrenFunction introspect_children_cb;
+ void *introspect_children_data;
void *user_data;
DRouteGetDatumFunction get_datum;
};
static DRoutePath *
path_new (DRouteContext *cnx,
+ const char *path,
+ gboolean prefix,
void *user_data,
+ DRouteIntrospectChildrenFunction introspect_children_cb,
+ void *introspect_children_data,
DRouteGetDatumFunction get_datum)
{
DRoutePath *new_path;
new_path = g_new0 (DRoutePath, 1);
new_path->cnx = cnx;
+ new_path->path = g_strdup (path);
+ new_path->prefix = prefix;
new_path->chunks = g_string_chunk_new (CHUNKS_DEFAULT);
new_path->interfaces = g_ptr_array_new ();
new_path->introspection = g_ptr_array_new ();
g_free,
NULL);
+ new_path->introspect_children_cb = introspect_children_cb;
+ new_path->introspect_children_data = introspect_children_data;
new_path->user_data = user_data;
new_path->get_datum = get_datum;
static void
path_free (DRoutePath *path, gpointer user_data)
{
+ g_free (path->path);
g_string_chunk_free (path->chunks);
g_ptr_array_free (path->interfaces, TRUE);
g_ptr_array_free (path->introspection, FALSE);
/*---------------------------------------------------------------------------*/
DRouteContext *
-droute_new (DBusConnection *bus)
+droute_new ()
{
DRouteContext *cnx;
cnx = g_new0 (DRouteContext, 1);
- cnx->bus = bus;
cnx->registered_paths = g_ptr_array_new ();
return cnx;
/*---------------------------------------------------------------------------*/
-DBusConnection *
-droute_get_bus (DRouteContext *cnx)
-{
- return cnx->bus;
-}
-
/*---------------------------------------------------------------------------*/
static DBusObjectPathVTable droute_vtable =
DRoutePath *new_path;
gboolean registered;
- new_path = path_new (cnx, (void *) data, NULL);
-
- registered = dbus_connection_register_object_path (cnx->bus, path, &droute_vtable, new_path);
- if (!registered)
- {
- path_free (new_path, NULL);
- return NULL;
- }
+ new_path = path_new (cnx, path, FALSE, (void *)data, NULL, NULL, NULL);
g_ptr_array_add (cnx->registered_paths, new_path);
return new_path;
droute_add_many (DRouteContext *cnx,
const char *path,
const void *data,
+ DRouteIntrospectChildrenFunction introspect_children_cb,
+ void *introspect_children_data,
const DRouteGetDatumFunction get_datum)
{
DRoutePath *new_path;
- new_path = path_new (cnx, (void *) data, get_datum);
-
- if (!dbus_connection_register_fallback (cnx->bus, path, &droute_vtable, new_path))
- oom();
+ new_path = path_new (cnx, path, TRUE, (void *) data,
+ introspect_children_cb, introspect_children_data,
+ get_datum);
g_ptr_array_add (cnx->registered_paths, new_path);
return new_path;
(&iter_dict, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict_entry))
oom ();
dbus_message_iter_append_basic (&iter_dict_entry, DBUS_TYPE_STRING,
- key->two);
+ &key->two);
(value->get) (&iter_dict_entry, datum);
if (!dbus_message_iter_close_container (&iter_dict, &iter_dict_entry))
oom ();
}
static DBusHandlerResult
+handle_dbus (DBusConnection *bus,
+ DBusMessage *message,
+ const gchar *iface,
+ const gchar *member,
+ const gchar *pathstr)
+{
+ static int id = 1;
+ char *id_str = (char *) g_malloc(40);
+ DBusMessage *reply;
+
+ if (strcmp (iface, DBUS_INTERFACE_DBUS) != 0 ||
+ strcmp (member, "Hello") != 0)
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ /* TODO: Fix this hack (we don't handle wrap-around, for instance) */
+ sprintf (id_str, ":1.%d", id++);
+ reply = dbus_message_new_method_return (message);
+ dbus_message_append_args (reply, DBUS_TYPE_STRING, &id_str, DBUS_TYPE_INVALID);
+ dbus_connection_send (bus, reply, NULL);
+ dbus_connection_flush (bus);
+ dbus_message_unref (reply);
+ g_free (id_str);
+ return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static DBusHandlerResult
handle_properties (DBusConnection *bus,
DBusMessage *message,
DRoutePath *path,
g_string_append_printf(output, introspection_node_element, pathstr);
- for (i=0; i < path->introspection->len; i++)
+ if (!path->get_datum || path_get_datum (path, pathstr))
+ {
+ for (i=0; i < path->introspection->len; i++)
+ {
+ gchar *introspect = (gchar *) g_ptr_array_index (path->introspection, i);
+ g_string_append (output, introspect);
+ }
+ }
+
+ if (path->introspect_children_cb)
{
- gchar *introspect = (gchar *) g_ptr_array_index (path->introspection, i);
- g_string_append (output, introspect);
+ gchar *children = (*path->introspect_children_cb) (pathstr, path->introspect_children_data);
+ if (children)
+ {
+ g_string_append (output, children);
+ g_free (children);
+ }
}
g_string_append(output, introspection_footer);
iface == NULL)
return result;
- if (!strcmp (iface, "org.freedesktop.DBus.Properties"))
+ if (!strcmp (pathstr, DBUS_PATH_DBUS))
+ result = handle_dbus (bus, message, iface, member, pathstr);
+ else if (!strcmp (iface, "org.freedesktop.DBus.Properties"))
result = handle_properties (bus, message, path, iface, member, pathstr);
else if (!strcmp (iface, "org.freedesktop.DBus.Introspectable"))
result = handle_introspection (bus, message, path, iface, member, pathstr);
return reply;
}
+void
+droute_path_register (DRoutePath *path, DBusConnection *bus)
+{
+ if (path->prefix)
+ dbus_connection_register_fallback (bus, path->path, &droute_vtable, path);
+ else
+ dbus_connection_register_object_path (bus, path->path,
+ &droute_vtable, path);
+}
+
+void
+droute_context_register (DRouteContext *cnx, DBusConnection *bus)
+{
+ g_ptr_array_foreach (cnx->registered_paths, (GFunc) droute_path_register,
+ bus);
+}
+
+void
+droute_intercept_dbus (DBusConnection *bus)
+{
+ dbus_connection_register_object_path (bus, DBUS_PATH_DBUS,
+ &droute_vtable, NULL);
+}
/*END------------------------------------------------------------------------*/