#include "bus-util.h"
#include "bus-dump.h"
#include "bus-signature.h"
+#include "bus-type.h"
+#include "busctl-introspect.h"
static bool arg_no_pager = false;
static bool arg_legend = true;
static size_t arg_snaplen = 4096;
static bool arg_list = false;
static bool arg_quiet = false;
+static bool arg_verbose = false;
static void pager_open_if_enabled(void) {
return;
}
- if (!strv_isempty(l))
- printf("%s/\n", prefix);
+ if (strv_isempty(l)) {
+ printf("No objects discovered.\n");
+ return;
+ }
+
+ if (streq(l[0], "/") && !l[1]) {
+ printf("Only root object discovered.\n");
+ return;
+ }
print_subtree(prefix, "/", l);
}
-static int parse_xml_annotation(
- const char **p,
- void **xml_state) {
+static int on_path(const char *path, void *userdata) {
+ Set *paths = userdata;
+ int r;
+ assert(paths);
- enum {
- STATE_ANNOTATION,
- STATE_NAME,
- STATE_VALUE
- } state = STATE_ANNOTATION;
+ r = set_put_strdup(paths, path);
+ if (r < 0)
+ return log_oom();
- for (;;) {
- _cleanup_free_ char *name = NULL;
+ return 0;
+}
- int t;
+static int find_nodes(sd_bus *bus, const char *service, const char *path, Set *paths, bool many) {
+ static const XMLIntrospectOps ops = {
+ .on_path = on_path,
+ };
- t = xml_tokenize(p, &name, xml_state, NULL);
- if (t < 0) {
- log_error("XML parse error.");
- return t;
- }
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ const char *xml;
+ int r;
- if (t == XML_END) {
- log_error("Premature end of XML data.");
- return -EBADMSG;
- }
+ r = sd_bus_call_method(bus, service, path, "org.freedesktop.DBus.Introspectable", "Introspect", &error, &reply, "");
+ if (r < 0) {
+ if (many)
+ printf("Failed to introspect object %s of service %s: %s\n", path, service, bus_error_message(&error, r));
+ else
+ log_error("Failed to introspect object %s of service %s: %s", path, service, bus_error_message(&error, r));
+ return r;
+ }
- switch (state) {
+ r = sd_bus_message_read(reply, "s", &xml);
+ if (r < 0)
+ return bus_log_parse_error(r);
- case STATE_ANNOTATION:
+ return parse_xml_introspect(path, xml, &ops, paths);
+}
- if (t == XML_ATTRIBUTE_NAME) {
+static int tree_one(sd_bus *bus, const char *service, const char *prefix, bool many) {
+ _cleanup_set_free_free_ Set *paths = NULL, *done = NULL, *failed = NULL;
+ _cleanup_free_ char **l = NULL;
+ char *m;
+ int r;
- if (streq_ptr(name, "name"))
- state = STATE_NAME;
+ paths = set_new(&string_hash_ops);
+ if (!paths)
+ return log_oom();
- else if (streq_ptr(name, "value"))
- state = STATE_VALUE;
+ done = set_new(&string_hash_ops);
+ if (!done)
+ return log_oom();
- else {
- log_error("Unexpected <annotation> attribute %s.", name);
- return -EBADMSG;
- }
+ failed = set_new(&string_hash_ops);
+ if (!failed)
+ return log_oom();
- } else if (t == XML_TAG_CLOSE_EMPTY ||
- (t == XML_TAG_CLOSE && streq_ptr(name, "annotation")))
+ m = strdup("/");
+ if (!m)
+ return log_oom();
- return 0;
+ r = set_put(paths, m);
+ if (r < 0) {
+ free(m);
+ return log_oom();
+ }
- else if (t != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token in <annotation>. (1)");
- return -EINVAL;
- }
+ for (;;) {
+ _cleanup_free_ char *p = NULL;
+ int q;
+ p = set_steal_first(paths);
+ if (!p)
break;
- case STATE_NAME:
-
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_ANNOTATION;
- else {
- log_error("Unexpected token in <annotation>. (2)");
- return -EINVAL;
- }
-
- break;
+ if (set_contains(done, p) ||
+ set_contains(failed, p))
+ continue;
- case STATE_VALUE:
+ q = find_nodes(bus, service, p, paths, many);
+ if (q < 0) {
+ if (r >= 0)
+ r = q;
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_ANNOTATION;
- else {
- log_error("Unexpected token in <annotation>. (3)");
- return -EINVAL;
- }
+ q = set_put(failed, p);
+ } else
+ q = set_put(done, p);
- break;
+ if (q < 0)
+ return log_oom();
- default:
- assert_not_reached("Bad state");
- }
+ assert(q != 0);
+ p = NULL;
}
-}
-static int parse_xml_node(
- const char *prefix,
- Set *paths,
- const char **p,
- void **xml_state) {
+ pager_open_if_enabled();
- enum {
- STATE_NODE,
- STATE_NODE_NAME,
- STATE_INTERFACE,
- STATE_INTERFACE_NAME,
- STATE_METHOD,
- STATE_METHOD_NAME,
- STATE_METHOD_ARG,
- STATE_METHOD_ARG_NAME,
- STATE_METHOD_ARG_TYPE,
- STATE_METHOD_ARG_DIRECTION,
- STATE_SIGNAL,
- STATE_SIGNAL_NAME,
- STATE_SIGNAL_ARG,
- STATE_SIGNAL_ARG_NAME,
- STATE_SIGNAL_ARG_TYPE,
- STATE_PROPERTY,
- STATE_PROPERTY_NAME,
- STATE_PROPERTY_TYPE,
- STATE_PROPERTY_ACCESS,
- } state = STATE_NODE;
-
- _cleanup_free_ char *node_path = NULL;
- const char *np = prefix;
- int r;
+ l = set_get_strv(done);
+ if (!l)
+ return log_oom();
- for (;;) {
- _cleanup_free_ char *name = NULL;
- int t;
+ strv_sort(l);
+ print_tree(prefix, l);
- t = xml_tokenize(p, &name, xml_state, NULL);
- if (t < 0) {
- log_error("XML parse error.");
- return t;
- }
+ fflush(stdout);
- if (t == XML_END) {
- log_error("Premature end of XML data.");
- return -EBADMSG;
- }
+ return r;
+}
- switch (state) {
+static int tree(sd_bus *bus, char **argv) {
+ char **i;
+ int r = 0;
- case STATE_NODE:
- if (t == XML_ATTRIBUTE_NAME) {
+ if (!arg_unique && !arg_acquired)
+ arg_acquired = true;
- if (streq_ptr(name, "name"))
- state = STATE_NODE_NAME;
- else {
- log_error("Unexpected <node> attribute %s.", name);
- return -EBADMSG;
- }
+ if (strv_length(argv) <= 1) {
+ _cleanup_strv_free_ char **names = NULL;
+ bool not_first = false;
- } else if (t == XML_TAG_OPEN) {
+ r = sd_bus_list_names(bus, &names, NULL);
+ if (r < 0) {
+ log_error("Failed to get name list: %s", strerror(-r));
+ return r;
+ }
- if (streq_ptr(name, "interface"))
- state = STATE_INTERFACE;
+ pager_open_if_enabled();
- else if (streq_ptr(name, "node")) {
+ STRV_FOREACH(i, names) {
+ int q;
- r = parse_xml_node(np, paths, p, xml_state);
- if (r < 0)
- return r;
- } else {
- log_error("Unexpected <node> tag %s.", name);
- return -EBADMSG;
- }
- } else if (t == XML_TAG_CLOSE_EMPTY ||
- (t == XML_TAG_CLOSE && streq_ptr(name, "node"))) {
+ if (!arg_unique && (*i)[0] == ':')
+ continue;
- if (paths) {
- if (!node_path) {
- node_path = strdup(np);
- if (!node_path)
- return log_oom();
- }
+ if (!arg_acquired && (*i)[0] == ':')
+ continue;
- r = set_put(paths, node_path);
- if (r < 0)
- return log_oom();
- else if (r > 0)
- node_path = NULL;
- }
+ if (not_first)
+ printf("\n");
- return 0;
+ printf("Service %s%s%s:\n", ansi_highlight(), *i, ansi_highlight_off());
- } else if (t != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token in <node>. (1)");
- return -EINVAL;
- }
+ q = tree_one(bus, *i, NULL, true);
+ if (q < 0 && r >= 0)
+ r = q;
- break;
+ not_first = true;
+ }
+ } else {
+ STRV_FOREACH(i, argv+1) {
+ int q;
- case STATE_NODE_NAME:
+ if (i > argv+1)
+ printf("\n");
+
+ if (argv[2]) {
+ pager_open_if_enabled();
+ printf("Service %s%s%s:\n", ansi_highlight(), *i, ansi_highlight_off());
+ }
- if (t == XML_ATTRIBUTE_VALUE) {
+ q = tree_one(bus, *i, NULL, !!argv[2]);
+ if (q < 0 && r >= 0)
+ r = q;
+ }
+ }
- free(node_path);
+ return r;
+}
- if (name[0] == '/') {
- node_path = name;
- name = NULL;
- } else {
+static int format_cmdline(sd_bus_message *m, FILE *f, bool needs_space) {
+ int r;
- if (endswith(prefix, "/"))
- node_path = strappend(prefix, name);
- else
- node_path = strjoin(prefix, "/", name, NULL);
- if (!node_path)
- return log_oom();
- }
+ for (;;) {
+ const char *contents = NULL;
+ char type;
+ union {
+ uint8_t u8;
+ uint16_t u16;
+ int16_t s16;
+ uint32_t u32;
+ int32_t s32;
+ uint64_t u64;
+ int64_t s64;
+ double d64;
+ const char *string;
+ int i;
+ } basic;
+
+ r = sd_bus_message_peek_type(m, &type, &contents);
+ if (r <= 0)
+ return r;
- np = node_path;
- state = STATE_NODE;
- } else {
- log_error("Unexpected token in <node>. (2)");
- return -EINVAL;
- }
+ if (bus_type_is_container(type) > 0) {
- break;
+ r = sd_bus_message_enter_container(m, type, contents);
+ if (r < 0)
+ return r;
- case STATE_INTERFACE:
+ if (type == SD_BUS_TYPE_ARRAY) {
+ unsigned n = 0;
- if (t == XML_ATTRIBUTE_NAME) {
- if (streq_ptr(name, "name"))
- state = STATE_INTERFACE_NAME;
- else {
- log_error("Unexpected <interface> attribute %s.", name);
- return -EBADMSG;
- }
+ /* count array entries */
+ for (;;) {
- } else if (t == XML_TAG_OPEN) {
- if (streq_ptr(name, "method"))
- state = STATE_METHOD;
- else if (streq_ptr(name, "signal"))
- state = STATE_SIGNAL;
- else if (streq_ptr(name, "property"))
- state = STATE_PROPERTY;
- else if (streq_ptr(name, "annotation")) {
- r = parse_xml_annotation(p, xml_state);
+ r = sd_bus_message_skip(m, contents);
if (r < 0)
return r;
- } else {
- log_error("Unexpected <interface> tag %s.", name);
- return -EINVAL;
+ if (r == 0)
+ break;
+
+ n++;
}
- } else if (t == XML_TAG_CLOSE_EMPTY ||
- (t == XML_TAG_CLOSE && streq_ptr(name, "interface")))
- state = STATE_NODE;
+ r = sd_bus_message_rewind(m, false);
+ if (r < 0)
+ return r;
- else if (t != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token in <interface>. (1)");
- return -EINVAL;
- }
+ if (needs_space)
+ fputc(' ', f);
- break;
+ fprintf(f, "%u", n);
+ } else if (type == SD_BUS_TYPE_VARIANT) {
- case STATE_INTERFACE_NAME:
+ if (needs_space)
+ fputc(' ', f);
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_INTERFACE;
- else {
- log_error("Unexpected token in <interface>. (2)");
- return -EINVAL;
+ fprintf(f, "%s", contents);
}
- break;
+ r = format_cmdline(m, f, true);
+ if (r < 0)
+ return r;
- case STATE_METHOD:
+ r = sd_bus_message_exit_container(m);
+ if (r < 0)
+ return r;
- if (t == XML_ATTRIBUTE_NAME) {
- if (streq_ptr(name, "name"))
- state = STATE_METHOD_NAME;
- else {
- log_error("Unexpected <method> attribute %s", name);
- return -EBADMSG;
- }
- } else if (t == XML_TAG_OPEN) {
- if (streq_ptr(name, "arg"))
- state = STATE_METHOD_ARG;
- else if (streq_ptr(name, "annotation")) {
- r = parse_xml_annotation(p, xml_state);
- if (r < 0)
- return r;
- } else {
- log_error("Unexpected <method> tag %s.", name);
- return -EINVAL;
- }
- } else if (t == XML_TAG_CLOSE_EMPTY ||
- (t == XML_TAG_CLOSE && streq_ptr(name, "method")))
+ continue;
+ }
- state = STATE_INTERFACE;
+ r = sd_bus_message_read_basic(m, type, &basic);
+ if (r < 0)
+ return r;
- else if (t != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token in <method> (1).");
- return -EINVAL;
- }
+ if (needs_space)
+ fputc(' ', f);
+ switch (type) {
+ case SD_BUS_TYPE_BYTE:
+ fprintf(f, "%u", basic.u8);
break;
- case STATE_METHOD_NAME:
-
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_METHOD;
- else {
- log_error("Unexpected token in <method> (2).");
- return -EINVAL;
- }
-
+ case SD_BUS_TYPE_BOOLEAN:
+ fputs(true_false(basic.i), f);
break;
- case STATE_METHOD_ARG:
-
- if (t == XML_ATTRIBUTE_NAME) {
- if (streq_ptr(name, "name"))
- state = STATE_METHOD_ARG_NAME;
- else if (streq_ptr(name, "type"))
- state = STATE_METHOD_ARG_TYPE;
- else if (streq_ptr(name, "direction"))
- state = STATE_METHOD_ARG_DIRECTION;
- else {
- log_error("Unexpected method <arg> attribute %s.", name);
- return -EBADMSG;
- }
- } else if (t == XML_TAG_OPEN) {
- if (streq_ptr(name, "annotation")) {
- r = parse_xml_annotation(p, xml_state);
- if (r < 0)
- return r;
- } else {
- log_error("Unexpected method <arg> tag %s.", name);
- return -EINVAL;
- }
- } else if (t == XML_TAG_CLOSE_EMPTY ||
- (t == XML_TAG_CLOSE && streq_ptr(name, "arg")))
+ case SD_BUS_TYPE_INT16:
+ fprintf(f, "%i", basic.s16);
+ break;
- state = STATE_METHOD;
+ case SD_BUS_TYPE_UINT16:
+ fprintf(f, "%u", basic.u16);
+ break;
- else if (t != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token in method <arg>. (1)");
- return -EINVAL;
- }
+ case SD_BUS_TYPE_INT32:
+ fprintf(f, "%i", basic.s32);
+ break;
+ case SD_BUS_TYPE_UINT32:
+ fprintf(f, "%u", basic.u32);
break;
- case STATE_METHOD_ARG_NAME:
+ case SD_BUS_TYPE_INT64:
+ fprintf(f, "%" PRIi64, basic.s64);
+ break;
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_METHOD_ARG;
- else {
- log_error("Unexpected token in method <arg>. (2)");
- return -EINVAL;
- }
+ case SD_BUS_TYPE_UINT64:
+ fprintf(f, "%" PRIu64, basic.u64);
+ break;
+ case SD_BUS_TYPE_DOUBLE:
+ fprintf(f, "%g", basic.d64);
break;
- case STATE_METHOD_ARG_TYPE:
+ case SD_BUS_TYPE_STRING:
+ case SD_BUS_TYPE_OBJECT_PATH:
+ case SD_BUS_TYPE_SIGNATURE: {
+ _cleanup_free_ char *b = NULL;
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_METHOD_ARG;
- else {
- log_error("Unexpected token in method <arg>. (3)");
- return -EINVAL;
- }
+ b = cescape(basic.string);
+ if (!b)
+ return -ENOMEM;
+ fprintf(f, "\"%s\"", b);
break;
+ }
- case STATE_METHOD_ARG_DIRECTION:
+ case SD_BUS_TYPE_UNIX_FD:
+ fprintf(f, "%i", basic.i);
+ break;
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_METHOD_ARG;
- else {
- log_error("Unexpected token in method <arg>. (4)");
- return -EINVAL;
- }
+ default:
+ assert_not_reached("Unknown basic type.");
+ }
- break;
+ }
+}
- case STATE_SIGNAL:
+typedef struct Member {
+ const char *type;
+ char *interface;
+ char *name;
+ char *signature;
+ char *result;
+ char *value;
+ bool writable;
+ uint64_t flags;
+} Member;
+
+static unsigned long member_hash_func(const void *p, const uint8_t hash_key[]) {
+ const Member *m = p;
+ unsigned long ul;
- if (t == XML_ATTRIBUTE_NAME) {
- if (streq_ptr(name, "name"))
- state = STATE_SIGNAL_NAME;
- else {
- log_error("Unexpected <signal> attribute %s.", name);
- return -EBADMSG;
- }
- } else if (t == XML_TAG_OPEN) {
- if (streq_ptr(name, "arg"))
- state = STATE_SIGNAL_ARG;
- else if (streq_ptr(name, "annotation")) {
- r = parse_xml_annotation(p, xml_state);
- if (r < 0)
- return r;
- } else {
- log_error("Unexpected <signal> tag %s.", name);
- return -EINVAL;
- }
- } else if (t == XML_TAG_CLOSE_EMPTY ||
- (t == XML_TAG_CLOSE && streq_ptr(name, "signal")))
+ assert(m);
+ assert(m->type);
- state = STATE_INTERFACE;
+ ul = string_hash_func(m->type, hash_key);
- else if (t != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token in <signal>. (1)");
- return -EINVAL;
- }
+ if (m->name)
+ ul ^= string_hash_func(m->name, hash_key);
- break;
+ if (m->interface)
+ ul ^= string_hash_func(m->interface, hash_key);
- case STATE_SIGNAL_NAME:
+ return ul;
+}
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_SIGNAL;
- else {
- log_error("Unexpected token in <signal>. (2)");
- return -EINVAL;
- }
+static int member_compare_func(const void *a, const void *b) {
+ const Member *x = a, *y = b;
+ int d;
- break;
+ assert(x);
+ assert(y);
+ assert(x->type);
+ assert(y->type);
+
+ if (!x->interface && y->interface)
+ return -1;
+ if (x->interface && !y->interface)
+ return 1;
+ if (x->interface && y->interface) {
+ d = strcmp(x->interface, y->interface);
+ if (d != 0)
+ return d;
+ }
+ d = strcmp(x->type, y->type);
+ if (d != 0)
+ return d;
- case STATE_SIGNAL_ARG:
+ if (!x->name && y->name)
+ return -1;
+ if (x->name && !y->name)
+ return 1;
+ if (x->name && y->name)
+ return strcmp(x->name, y->name);
- if (t == XML_ATTRIBUTE_NAME) {
- if (streq_ptr(name, "name"))
- state = STATE_SIGNAL_ARG_NAME;
- else if (streq_ptr(name, "type"))
- state = STATE_SIGNAL_ARG_TYPE;
- else {
- log_error("Unexpected signal <arg> attribute %s.", name);
- return -EBADMSG;
- }
- } else if (t == XML_TAG_OPEN) {
- if (streq_ptr(name, "annotation")) {
- r = parse_xml_annotation(p, xml_state);
- if (r < 0)
- return r;
- } else {
- log_error("Unexpected signal <arg> tag %s.", name);
- return -EINVAL;
- }
- } else if (t == XML_TAG_CLOSE_EMPTY ||
- (t == XML_TAG_CLOSE && streq_ptr(name, "arg")))
+ return 0;
+}
- state = STATE_SIGNAL;
+static int member_compare_funcp(const void *a, const void *b) {
+ const Member *const * x = (const Member *const *) a, * const *y = (const Member *const *) b;
- else if (t != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token in signal <arg> (1).");
- return -EINVAL;
- }
+ return member_compare_func(*x, *y);
+}
- break;
+static void member_free(Member *m) {
+ if (!m)
+ return;
- case STATE_SIGNAL_ARG_NAME:
+ free(m->interface);
+ free(m->name);
+ free(m->signature);
+ free(m->result);
+ free(m->value);
+ free(m);
+}
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_SIGNAL_ARG;
- else {
- log_error("Unexpected token in signal <arg> (2).");
- return -EINVAL;
- }
+DEFINE_TRIVIAL_CLEANUP_FUNC(Member*, member_free);
- break;
+static void member_set_free(Set *s) {
+ Member *m;
- case STATE_SIGNAL_ARG_TYPE:
+ while ((m = set_steal_first(s)))
+ member_free(m);
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_SIGNAL_ARG;
- else {
- log_error("Unexpected token in signal <arg> (3).");
- return -EINVAL;
- }
+ set_free(s);
+}
- break;
+DEFINE_TRIVIAL_CLEANUP_FUNC(Set*, member_set_free);
- case STATE_PROPERTY:
-
- if (t == XML_ATTRIBUTE_NAME) {
- if (streq_ptr(name, "name"))
- state = STATE_PROPERTY_NAME;
- else if (streq_ptr(name, "type"))
- state = STATE_PROPERTY_TYPE;
- else if (streq_ptr(name, "access"))
- state = STATE_PROPERTY_ACCESS;
- else {
- log_error("Unexpected <property> attribute %s.", name);
- return -EBADMSG;
- }
- } else if (t == XML_TAG_OPEN) {
+static int on_interface(const char *interface, uint64_t flags, void *userdata) {
+ _cleanup_(member_freep) Member *m;
+ Set *members = userdata;
+ int r;
- if (streq_ptr(name, "annotation")) {
- r = parse_xml_annotation(p, xml_state);
- if (r < 0)
- return r;
- } else {
- log_error("Unexpected <property> tag %s.", name);
- return -EINVAL;
- }
+ assert(interface);
+ assert(members);
- } else if (t == XML_TAG_CLOSE_EMPTY ||
- (t == XML_TAG_CLOSE && streq_ptr(name, "property")))
+ m = new0(Member, 1);
+ if (!m)
+ return log_oom();
- state = STATE_INTERFACE;
+ m->type = "interface";
+ m->flags = flags;
- else if (t != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token in <property>. (1)");
- return -EINVAL;
- }
+ r = free_and_strdup(&m->interface, interface);
+ if (r < 0)
+ return log_oom();
- break;
+ r = set_put(members, m);
+ if (r <= 0) {
+ log_error("Duplicate interface");
+ return -EINVAL;
+ }
- case STATE_PROPERTY_NAME:
+ m = NULL;
+ return 0;
+}
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_PROPERTY;
- else {
- log_error("Unexpected token in <property>. (2)");
- return -EINVAL;
- }
+static int on_method(const char *interface, const char *name, const char *signature, const char *result, uint64_t flags, void *userdata) {
+ _cleanup_(member_freep) Member *m;
+ Set *members = userdata;
+ int r;
- break;
+ assert(interface);
+ assert(name);
- case STATE_PROPERTY_TYPE:
+ m = new0(Member, 1);
+ if (!m)
+ return log_oom();
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_PROPERTY;
- else {
- log_error("Unexpected token in <property>. (3)");
- return -EINVAL;
- }
+ m->type = "method";
+ m->flags = flags;
- break;
+ r = free_and_strdup(&m->interface, interface);
+ if (r < 0)
+ return log_oom();
- case STATE_PROPERTY_ACCESS:
+ r = free_and_strdup(&m->name, name);
+ if (r < 0)
+ return log_oom();
- if (t == XML_ATTRIBUTE_VALUE)
- state = STATE_PROPERTY;
- else {
- log_error("Unexpected token in <property>. (4)");
- return -EINVAL;
- }
+ r = free_and_strdup(&m->signature, signature);
+ if (r < 0)
+ return log_oom();
- break;
- }
+ r = free_and_strdup(&m->result, result);
+ if (r < 0)
+ return log_oom();
+
+ r = set_put(members, m);
+ if (r <= 0) {
+ log_error("Duplicate method");
+ return -EINVAL;
}
+
+ m = NULL;
+ return 0;
}
-static int find_nodes(sd_bus *bus, const char *service, const char *path, Set *paths) {
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
- _cleanup_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- const char *xml, *p;
- void *xml_state = NULL;
+static int on_signal(const char *interface, const char *name, const char *signature, uint64_t flags, void *userdata) {
+ _cleanup_(member_freep) Member *m;
+ Set *members = userdata;
int r;
- r = sd_bus_call_method(bus, service, path, "org.freedesktop.DBus.Introspectable", "Introspect", &error, &reply, "");
- if (r < 0) {
- log_error("Failed to introspect object %s of service %s: %s", path, service, bus_error_message(&error, r));
- return r;
- }
-
- r = sd_bus_message_read(reply, "s", &xml);
- if (r < 0)
- return bus_log_parse_error(r);
+ assert(interface);
+ assert(name);
- /* fputs(xml, stdout); */
+ m = new0(Member, 1);
+ if (!m)
+ return log_oom();
- p = xml;
- for (;;) {
- _cleanup_free_ char *name = NULL;
+ m->type = "signal";
+ m->flags = flags;
- r = xml_tokenize(&p, &name, &xml_state, NULL);
- if (r < 0) {
- log_error("XML parse error");
- return r;
- }
+ r = free_and_strdup(&m->interface, interface);
+ if (r < 0)
+ return log_oom();
- if (r == XML_END)
- break;
+ r = free_and_strdup(&m->name, name);
+ if (r < 0)
+ return log_oom();
- if (r == XML_TAG_OPEN) {
+ r = free_and_strdup(&m->signature, signature);
+ if (r < 0)
+ return log_oom();
- if (streq(name, "node")) {
- r = parse_xml_node(path, paths, &p, &xml_state);
- if (r < 0)
- return r;
- } else {
- log_error("Unexpected tag '%s' in introspection data.", name);
- return -EBADMSG;
- }
- } else if (r != XML_TEXT || !in_charset(name, WHITESPACE)) {
- log_error("Unexpected token.");
- return -EINVAL;
- }
+ r = set_put(members, m);
+ if (r <= 0) {
+ log_error("Duplicate signal");
+ return -EINVAL;
}
+ m = NULL;
return 0;
}
-static int tree_one(sd_bus *bus, const char *service, const char *prefix) {
- _cleanup_set_free_free_ Set *paths = NULL, *done = NULL, *failed = NULL;
- _cleanup_free_ char **l = NULL;
- char *m;
+static int on_property(const char *interface, const char *name, const char *signature, bool writable, uint64_t flags, void *userdata) {
+ _cleanup_(member_freep) Member *m;
+ Set *members = userdata;
int r;
- paths = set_new(&string_hash_ops);
- if (!paths)
- return log_oom();
+ assert(interface);
+ assert(name);
- done = set_new(&string_hash_ops);
- if (!done)
+ m = new0(Member, 1);
+ if (!m)
return log_oom();
- failed = set_new(&string_hash_ops);
- if (!failed)
+ m->type = "property";
+ m->flags = flags;
+ m->writable = writable;
+
+ r = free_and_strdup(&m->interface, interface);
+ if (r < 0)
return log_oom();
- m = strdup("/");
- if (!m)
+ r = free_and_strdup(&m->name, name);
+ if (r < 0)
return log_oom();
- r = set_put(paths, m);
- if (r < 0) {
- free(m);
+ r = free_and_strdup(&m->signature, signature);
+ if (r < 0)
return log_oom();
- }
- for (;;) {
- _cleanup_free_ char *p = NULL;
- int q;
+ r = set_put(members, m);
+ if (r <= 0) {
+ log_error("Duplicate property");
+ return -EINVAL;
+ }
- p = set_steal_first(paths);
- if (!p)
- break;
+ m = NULL;
+ return 0;
+}
- if (set_contains(done, p) ||
- set_contains(failed, p))
- continue;
+static const char *strdash(const char *x) {
+ return isempty(x) ? "-" : x;
+}
- q = find_nodes(bus, service, p, paths);
- if (q < 0) {
- if (r >= 0)
- r = q;
+static int introspect(sd_bus *bus, char **argv) {
+ static const struct hash_ops member_hash_ops = {
+ .hash = member_hash_func,
+ .compare = member_compare_func,
+ };
- q = set_put(failed, p);
- } else
- q = set_put(done, p);
+ static const XMLIntrospectOps ops = {
+ .on_interface = on_interface,
+ .on_method = on_method,
+ .on_signal = on_signal,
+ .on_property = on_property,
+ };
- if (q < 0)
- return log_oom();
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_(member_set_freep) Set *members = NULL;
+ Iterator i;
+ Member *m;
+ const char *xml;
+ int r;
+ unsigned name_width, type_width, signature_width, result_width;
+ Member **sorted = NULL;
+ unsigned k = 0, j;
- assert(q != 0);
- p = NULL;
+ if (strv_length(argv) != 3) {
+ log_error("Requires service and object path argument.");
+ return -EINVAL;
}
- l = set_get_strv(done);
- if (!l)
+ members = set_new(&member_hash_ops);
+ if (!members)
return log_oom();
- strv_sort(l);
- print_tree(prefix, l);
+ r = sd_bus_call_method(bus, argv[1], argv[2], "org.freedesktop.DBus.Introspectable", "Introspect", &error, &reply, "");
+ if (r < 0) {
+ log_error("Failed to introspect object %s of service %s: %s", argv[2], argv[1], bus_error_message(&error, r));
+ return r;
+ }
- fflush(stdout);
+ r = sd_bus_message_read(reply, "s", &xml);
+ if (r < 0)
+ return bus_log_parse_error(r);
- return r;
-}
+ /* First, get list of all properties */
+ r = parse_xml_introspect(argv[2], xml, &ops, members);
+ if (r < 0)
+ return r;
-static int tree(sd_bus *bus, char **argv) {
- char **i;
- int r = 0;
+ /* Second, find the current values for them */
+ SET_FOREACH(m, members, i) {
- if (!arg_unique && !arg_acquired)
- arg_acquired = true;
+ if (!streq(m->type, "property"))
+ continue;
- if (strv_length(argv) <= 1) {
- _cleanup_strv_free_ char **names = NULL;
- bool not_first = true;
+ if (m->value)
+ continue;
- r = sd_bus_list_names(bus, &names, NULL);
+ r = sd_bus_call_method(bus, argv[1], argv[2], "org.freedesktop.DBus.Properties", "GetAll", &error, &reply, "s", m->interface);
if (r < 0) {
- log_error("Failed to get name list: %s", strerror(-r));
+ log_error("%s", bus_error_message(&error, r));
return r;
}
- pager_open_if_enabled();
+ r = sd_bus_message_enter_container(reply, 'a', "{sv}");
+ if (r < 0)
+ return bus_log_parse_error(r);
- STRV_FOREACH(i, names) {
- int q;
+ for (;;) {
+ Member *z;
+ _cleanup_free_ char *buf = NULL;
+ _cleanup_fclose_ FILE *mf = NULL;
+ size_t sz = 0;
+ const char *name;
- if (!arg_unique && (*i)[0] == ':')
- continue;
+ r = sd_bus_message_enter_container(reply, 'e', "sv");
+ if (r < 0)
+ return bus_log_parse_error(r);
- if (!arg_acquired && (*i)[0] == ':')
- continue;
+ if (r == 0)
+ break;
- if (not_first)
- printf("\n");
+ r = sd_bus_message_read(reply, "s", &name);
+ if (r < 0)
+ return bus_log_parse_error(r);
- printf("Service %s:\n", *i);
+ r = sd_bus_message_enter_container(reply, 'v', NULL);
+ if (r < 0)
+ return bus_log_parse_error(r);
- q = tree_one(bus, *i, "\t");
- if (q < 0 && r >= 0)
- r = q;
+ mf = open_memstream(&buf, &sz);
+ if (!mf)
+ return log_oom();
- not_first = true;
+ r = format_cmdline(reply, mf, false);
+ if (r < 0)
+ return bus_log_parse_error(r);
+
+ fclose(mf);
+ mf = NULL;
+
+ z = set_get(members, &((Member) {
+ .type = "property",
+ .interface = m->interface,
+ .name = (char*) name }));
+ if (z) {
+ free(z->value);
+ z->value = buf;
+ buf = NULL;
+ }
+
+ r = sd_bus_message_exit_container(reply);
+ if (r < 0)
+ return bus_log_parse_error(r);
+
+ r = sd_bus_message_exit_container(reply);
+ if (r < 0)
+ return bus_log_parse_error(r);
}
- } else {
- pager_open_if_enabled();
- STRV_FOREACH(i, argv+1) {
- int q;
+ r = sd_bus_message_exit_container(reply);
+ if (r < 0)
+ return bus_log_parse_error(r);
+ }
- if (i > argv+1)
- printf("\n");
+ pager_open_if_enabled();
- if (argv[2])
- printf("Service %s:\n", *i);
+ name_width = strlen("NAME");
+ type_width = strlen("TYPE");
+ signature_width = strlen("SIGNATURE");
+ result_width = strlen("RESULT/VALUE");
+
+ sorted = newa(Member*, set_size(members));
+
+ SET_FOREACH(m, members, i) {
+ if (m->interface)
+ name_width = MAX(name_width, strlen(m->interface));
+ if (m->name)
+ name_width = MAX(name_width, strlen(m->name) + 1);
+ if (m->type)
+ type_width = MAX(type_width, strlen(m->type));
+ if (m->signature)
+ signature_width = MAX(signature_width, strlen(m->signature));
+ if (m->result)
+ result_width = MAX(result_width, strlen(m->result));
+ if (m->value)
+ result_width = MAX(result_width, strlen(m->value));
+
+ sorted[k++] = m;
+ }
- q = tree_one(bus, *i, NULL);
- if (q < 0 && r >= 0)
- r = q;
- }
+ if (result_width > 40)
+ result_width = 40;
+
+ assert(k == set_size(members));
+ qsort(sorted, k, sizeof(Member*), member_compare_funcp);
+
+ if (arg_legend) {
+ printf("%-*s %-*s %-*s %-*s %s\n",
+ (int) name_width, "NAME",
+ (int) type_width, "TYPE",
+ (int) signature_width, "SIGNATURE",
+ (int) result_width, "RESULT/VALUE",
+ "FLAGS");
}
- return r;
+ for (j = 0; j < k; j++) {
+ _cleanup_free_ char *ellipsized = NULL;
+ const char *rv;
+ bool is_interface;
+
+ m = sorted[j];
+
+ is_interface = streq(m->type, "interface");
+
+ if (m->value) {
+ ellipsized = ellipsize(m->value, result_width, 100);
+ if (!ellipsized)
+ return log_oom();
+
+ rv = ellipsized;
+ } else
+ rv = strdash(m->result);
+
+ printf("%s%s%-*s%s %-*s %-*s %-*s%s%s%s%s%s%s\n",
+ is_interface ? ansi_highlight() : "",
+ is_interface ? "" : ".",
+ - !is_interface + (int) name_width, strdash(streq_ptr(m->type, "interface") ? m->interface : m->name),
+ is_interface ? ansi_highlight_off() : "",
+ (int) type_width, strdash(m->type),
+ (int) signature_width, strdash(m->signature),
+ (int) result_width, rv,
+ (m->flags & SD_BUS_VTABLE_DEPRECATED) ? " deprecated" : (m->flags || m->writable ? "" : " -"),
+ (m->flags & SD_BUS_VTABLE_METHOD_NO_REPLY) ? " no-reply" : "",
+ (m->flags & SD_BUS_VTABLE_PROPERTY_CONST) ? " const" : "",
+ (m->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE) ? " emits-change" : "",
+ (m->flags & SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION) ? " emits-invalidation" : "",
+ m->writable ? " writable" : "");
+ }
+
+ return 0;
}
static int message_dump(sd_bus_message *m, FILE *f) {
- return bus_message_dump(m, f, true);
+ return bus_message_dump(m, f, BUS_MESSAGE_DUMP_WITH_HEADER);
}
static int message_pcap(sd_bus_message *m, FILE *f) {
return r;
}
- bus_creds_dump(creds, NULL);
+ bus_creds_dump(creds, NULL, false);
return 0;
}
}
r = sd_bus_message_new_method_call(bus, &m, argv[1], argv[2], argv[3], argv[4]);
- if (r < 0) {
- log_error("Failed to prepare bus message: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return bus_log_create_error(r);
if (!isempty(argv[5])) {
char **p;
r = sd_bus_message_is_empty(reply);
if (r < 0)
return bus_log_parse_error(r);
+
if (r == 0 && !arg_quiet) {
- pager_open_if_enabled();
- bus_message_dump(reply, stdout, false);
+
+ if (arg_verbose) {
+ pager_open_if_enabled();
+
+ r = bus_message_dump(reply, stdout, 0);
+ if (r < 0)
+ return r;
+ } else {
+
+ fputs(sd_bus_message_get_signature(reply, true), stdout);
+ fputc(' ', stdout);
+
+ r = format_cmdline(reply, stdout, false);
+ if (r < 0)
+ return bus_log_parse_error(r);
+
+ fputc('\n', stdout);
+ }
+ }
+
+ return 0;
+}
+
+static int get_property(sd_bus *bus, char *argv[]) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ unsigned n;
+ char **i;
+ int r;
+
+ assert(bus);
+
+ n = strv_length(argv);
+ if (n < 5) {
+ log_error("Expects at least four arguments.");
+ return -EINVAL;
+ }
+
+ STRV_FOREACH(i, argv + 4) {
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ const char *contents = NULL;
+ char type;
+
+ r = sd_bus_call_method(bus, argv[1], argv[2], "org.freedesktop.DBus.Properties", "Get", &error, &reply, "ss", argv[3], *i);
+ if (r < 0) {
+ log_error("%s", bus_error_message(&error, r));
+ return r;
+ }
+
+ r = sd_bus_message_peek_type(reply, &type, &contents);
+ if (r < 0)
+ return bus_log_parse_error(r);
+
+ r = sd_bus_message_enter_container(reply, 'v', contents);
+ if (r < 0)
+ return bus_log_parse_error(r);
+
+ if (arg_verbose) {
+ pager_open_if_enabled();
+
+ r = bus_message_dump(reply, stdout, BUS_MESSAGE_DUMP_SUBTREE_ONLY);
+ if (r < 0)
+ return r;
+ } else {
+ fputs(contents, stdout);
+ fputc(' ', stdout);
+
+ r = format_cmdline(reply, stdout, false);
+ if (r < 0)
+ return bus_log_parse_error(r);
+
+ fputc('\n', stdout);
+ }
+
+ r = sd_bus_message_exit_container(reply);
+ if (r < 0)
+ return bus_log_parse_error(r);
+ }
+
+ return 0;
+}
+
+static int set_property(sd_bus *bus, char *argv[]) {
+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ unsigned n;
+ char **p;
+ int r;
+
+ assert(bus);
+
+ n = strv_length(argv);
+ if (n < 6) {
+ log_error("Expects at least five arguments.");
+ return -EINVAL;
+ }
+
+ r = sd_bus_message_new_method_call(bus, &m, argv[1], argv[2], "org.freedesktop.DBus.Properties", "Set");
+ if (r < 0)
+ return bus_log_create_error(r);
+
+ r = sd_bus_message_append(m, "ss", argv[3], argv[4]);
+ if (r < 0)
+ return bus_log_create_error(r);
+
+ r = sd_bus_message_open_container(m, 'v', argv[5]);
+ if (r < 0)
+ return bus_log_create_error(r);
+
+ p = argv+6;
+ r = message_append_cmdline(m, argv[5], &p);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_close_container(m);
+ if (r < 0)
+ return bus_log_create_error(r);
+
+ if (*p) {
+ log_error("Too many parameters for signature.");
+ return -EINVAL;
+ }
+
+ r = sd_bus_call(bus, m, 0, &error, NULL);
+ if (r < 0) {
+ log_error("%s", bus_error_message(&error, r));
+ return r;
}
return 0;
" --activatable Only show activatable names\n"
" --match=MATCH Only show matching messages\n"
" --list Don't show tree, but simple object path list\n"
- " --quiet Don't show method call reply\n\n"
+ " --quiet Don't show method call reply\n"
+ " --verbose Show result values in long format\n\n"
"Commands:\n"
" list List bus names\n"
- " tree [SERVICE...] Show object tree of service\n"
+ " status SERVICE Show service name status\n"
" monitor [SERVICE...] Show bus traffic\n"
" capture [SERVICE...] Capture bus traffic as pcap\n"
- " status SERVICE Show service name status\n"
- " call SERVICE PATH INTERFACE METHOD [SIGNATURE] [ARGUMENTS...]\n"
+ " tree [SERVICE...] Show object tree of service\n"
+ " introspect SERVICE OBJECT\n"
+ " call SERVICE OBJECT INTERFACE METHOD [SIGNATURE [ARGUMENT...]]\n"
" Call a method\n"
+ " get-property SERVICE OBJECT INTERFACE PROPERTY...\n"
+ " Get property value\n"
+ " set-property SERVICE OBJECT INTERFACE PROPERTY SIGNATURE ARGUMENT...\n"
+ " Set property value\n"
" help Show this help\n"
, program_invocation_short_name);
ARG_ACTIVATABLE,
ARG_SIZE,
ARG_LIST,
+ ARG_VERBOSE,
};
static const struct option options[] = {
{ "size", required_argument, NULL, ARG_SIZE },
{ "list", no_argument, NULL, ARG_LIST },
{ "quiet", no_argument, NULL, 'q' },
+ { "verbose", no_argument, NULL, ARG_VERBOSE },
{},
};
arg_quiet = true;
break;
+ case ARG_VERBOSE:
+ arg_verbose = true;
+ break;
+
case '?':
return -EINVAL;
if (streq(argv[optind], "tree"))
return tree(bus, argv + optind);
+ if (streq(argv[optind], "introspect"))
+ return introspect(bus, argv + optind);
+
if (streq(argv[optind], "call"))
return call(bus, argv + optind);
+ if (streq(argv[optind], "get-property"))
+ return get_property(bus, argv + optind);
+
+ if (streq(argv[optind], "set-property"))
+ return set_property(bus, argv + optind);
+
if (streq(argv[optind], "help"))
return help();
if (arg_address)
r = sd_bus_set_address(bus, arg_address);
else {
+ r = sd_bus_set_bus_client(bus, true);
+ if (r < 0) {
+ log_error("Failed to set bus client: %s", strerror(-r));
+ goto finish;
+ }
+
switch (arg_transport) {
case BUS_TRANSPORT_LOCAL:
goto finish;
}
- r = sd_bus_set_bus_client(bus, true);
- if (r < 0) {
- log_error("Failed to set bus client: %s", strerror(-r));
- goto finish;
- }
-
r = sd_bus_start(bus);
if (r < 0) {
log_error("Failed to connect to bus: %s", strerror(-r));