Content-Type: multipart/mixed; boundary="===============1621667249341686293==" MIME-Version: 1.0 From: Denis Kenzior Subject: Re: [PATCH] dbus: emit DBus.Introspectable for real objects only Date: Mon, 19 Apr 2021 11:22:50 -0500 Message-ID: <9454b109-e29d-766b-35a0-8540a8c53fdd@gmail.com> In-Reply-To: <20210419071119.117008-1-ar@cs.msu.ru> List-Id: To: ell@lists.01.org --===============1621667249341686293== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Hi Arseny, On 4/19/21 2:11 AM, Arseny Maslennikov wrote: > From: Arseny Maslennikov > = > In a similar vein to GDBus, we now explicitly declare > org.freedesktop.DBus.Introspectable in the introspection output for > registered objects only, not for every node. This removes clutter from > introspection trees. > = > For example, if a service exports the following object paths on the bus: > * /org/freedesktop/LogControl1 > * /org/bluez > * /org/bluez/hci0 > then /org is now described in the introspection output as a node > containing two subnodes "bluez" and "freedesktop" and no interface > elements. > Inspection tools like d-feet only list the objects themselves, while > before this change they would uselessly list: > * / > * /org > * /org/bluez > * /org/bluez/hci0 > * /org/freedesktop > * /org/freedesktop/LogControl1 > = > We still conform to the spec by responding to > org.freedesktop.DBus.Introspectable.Introspect calls on every node =E2=80= =94 we > just don't advertise the interface in the xml response. > --- > ell/dbus-service.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > = For some reason this patch came through base64 encoded and with en= dings = in the payload. This confused git am and I had to do some post-processing = to = fix it up. Not sure why this occurred..? > diff --git a/ell/dbus-service.c b/ell/dbus-service.c > index 84fca3a..94afc14 100644 > --- a/ell/dbus-service.c > +++ b/ell/dbus-service.c > @@ -1709,16 +1709,28 @@ void _dbus_object_tree_introspect(struct _dbus_ob= ject_tree *tree, > { > struct object_node *node; > struct child_node *child; > + bool path_is_object =3D true; > = > node =3D l_hashmap_lookup(tree->objects, path); > - if (!node) > + if (!node) { > + path_is_object =3D false; > node =3D _dbus_object_tree_lookup(tree, path); > + } > = > l_string_append(buf, XML_HEAD); > l_string_append(buf, "\n"); > = > if (node) { > - l_string_append(buf, static_introspectable); > + /* We emit org.freedesktop.DBus.Introspectable only in case the Nit: multiline comments should follow doc/coding-style.txt item M2. I fixe= d = this up for you. > + * object node corresponds to a registered object, i. e. > + * exposes anything other than: > + * - org.freedesktop.DBus.Introspectable > + * - org.freedesktop.DBus.Peer > + * - org.freedesktop.DBus.Properties > + */ > + if (path_is_object) > + l_string_append(buf, static_introspectable); > + > l_queue_foreach(node->instances, > generate_interface_instance, buf); > = > = Applied, thanks. Regards, -Denis --===============1621667249341686293==--