bus: make bus_print_all_properties work for non machinectl cases

add a destination parameter and skip properties we can't read

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 13ad4442ba261f5f0342f0d9a6e818cc90600fe4..bf8fb409059d95266f926fcc69e62a52038bf99b 100644 (file)
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -628,7 +628,7 @@ int bus_print_property(const char *name, sd_bus_message *property, bool all) {
         return 0;
 }
 
         return 0;
 }
 

-int bus_print_all_properties(sd_bus *bus, const char *path, char **filter, bool all) {
+int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, char **filter, bool all) {

         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;


@@ -637,7 +637,7 @@ int bus_print_all_properties(sd_bus *bus, const char *path, char **filter, bool
         assert(path);
 
         r = sd_bus_call_method(bus,
         assert(path);
 
         r = sd_bus_call_method(bus,

-                        "org.freedesktop.machine1",
+                        dest,

                         path,
                         "org.freedesktop.DBus.Properties",
                         "GetAll",
                         path,
                         "org.freedesktop.DBus.Properties",
                         "GetAll",


@@ -671,8 +671,14 @@ int bus_print_all_properties(sd_bus *bus, const char *path, char **filter, bool
                         r = bus_print_property(name, reply, all);
                         if (r < 0)
                                 return r;
                         r = bus_print_property(name, reply, all);
                         if (r < 0)
                                 return r;

-                        if (r == 0 && all)
-                                printf("%s=[unprintable]\n", name);
+                        if (r == 0) {
+                                if (all)
+                                        printf("%s=[unprintable]\n", name);
+                                /* skip what we didn't read */
+                                r = sd_bus_message_skip(reply, contents);
+                                if (r < 0)
+                                        return r;
+                        }

 
                         r = sd_bus_message_exit_container(reply);
                         if (r < 0)
 
                         r = sd_bus_message_exit_container(reply);
                         if (r < 0)


@@ -866,7 +872,7 @@ int bus_map_all_properties(sd_bus *bus,
                                 return r;
 
                         v = (uint8_t *)userdata + prop->offset;
                                 return r;
 
                         v = (uint8_t *)userdata + prop->offset;

-                                if (map[i].set)
+                        if (map[i].set)

                                 r = prop->set(bus, member, m, &error, v);
                         else
                                 r = map_basic(bus, member, m, &error, v);
                                 r = prop->set(bus, member, m, &error, v);
                         else
                                 r = map_basic(bus, member, m, &error, v);

diff --git a/src/libsystemd-bus/bus-util.h b/src/libsystemd-bus/bus-util.h
index 101a2ec2e02da72bdc0a95220e050803200f0273..f982e08ecd6bfc99a509df783225a2f4a9dee5c5 100644 (file)
--- a/src/libsystemd-bus/bus-util.h
+++ b/src/libsystemd-bus/bus-util.h
@@ -67,7 +67,7 @@ int bus_open_system_systemd(sd_bus **_bus);
 int bus_open_transport(BusTransport transport, const char *host, bool user, sd_bus **bus);
 
 int bus_print_property(const char *name, sd_bus_message *property, bool all);
 int bus_open_transport(BusTransport transport, const char *host, bool user, sd_bus **bus);
 
 int bus_print_property(const char *name, sd_bus_message *property, bool all);

-int bus_print_all_properties(sd_bus *bus, const char *path, char **filter, bool all);
+int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, char **filter, bool all);

 
 int bus_property_get_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, sd_bus_error *error, void *userdata);
 int bus_property_get_uid(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, sd_bus_error *error, void *userdata);
 
 int bus_property_get_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, sd_bus_error *error, void *userdata);
 int bus_property_get_uid(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, sd_bus_error *error, void *userdata);

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 6234f6add238a5e04c591cab6325c08264867cb7..aa2b0986eda0a1f98b9b0833410507019f5c7afb 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -284,7 +284,7 @@ static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
 
         *new_line = true;
 
 
         *new_line = true;
 

-        r = bus_print_all_properties(bus, path, arg_property, arg_all);
+        r = bus_print_all_properties(bus, "org.freedesktop.machine1", path, arg_property, arg_all);

         if (r < 0)
                 log_error("Could not get properties: %s", strerror(-r));
 
         if (r < 0)
                 log_error("Could not get properties: %s", strerror(-r));