diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index bd98d4e868..5f3d5ddf39 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -1158,7 +1158,7 @@ static int introspect(int argc, char **argv, void *userdata) { } static int message_dump(sd_bus_message *m, FILE *f) { - return bus_message_dump(m, f, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + return sd_bus_message_dump(m, f, SD_BUS_MESSAGE_DUMP_WITH_HEADER); } static int message_pcap(sd_bus_message *m, FILE *f) { @@ -2052,7 +2052,7 @@ static int call(int argc, char **argv, void *userdata) { } else if (arg_verbose) { (void) pager_open(arg_pager_flags); - r = bus_message_dump(reply, stdout, 0); + r = sd_bus_message_dump(reply, stdout, 0); if (r < 0) return r; } else { @@ -2158,7 +2158,7 @@ static int get_property(int argc, char **argv, void *userdata) { } else if (arg_verbose) { (void) pager_open(arg_pager_flags); - r = bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY); + r = sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY); if (r < 0) return r; } else { diff --git a/src/fuzz/fuzz-bus-message.c b/src/fuzz/fuzz-bus-message.c index a9a939a6cc..3d1ac7e68a 100644 --- a/src/fuzz/fuzz-bus-message.c +++ b/src/fuzz/fuzz-bus-message.c @@ -36,7 +36,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (getenv_bool("SYSTEMD_FUZZ_OUTPUT") <= 0) assert_se(g = open_memstream_unlocked(&out, &out_size)); - bus_message_dump(m, g ?: stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(m, g ?: stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); r = sd_bus_message_rewind(m, true); assert_se(r >= 0); diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym index a3dd9f68b7..d689ce3664 100644 --- a/src/libsystemd/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym @@ -685,6 +685,7 @@ global: LIBSYSTEMD_245 { global: + sd_bus_message_dump; sd_bus_message_sensitive; sd_event_add_child_pidfd; sd_event_source_get_child_pidfd; diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index 398ca7162c..caab5e5ebe 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -45,7 +45,7 @@ static char *indent(unsigned level, uint64_t flags) { return p; } -int bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) { +_public_ int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) { unsigned level = 1; int r; diff --git a/src/libsystemd/sd-bus/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h index 47b9f81a22..f138791c04 100644 --- a/src/libsystemd/sd-bus/bus-dump.h +++ b/src/libsystemd/sd-bus/bus-dump.h @@ -6,8 +6,6 @@ #include "sd-bus.h" -int bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags); - int bus_creds_dump(sd_bus_creds *c, FILE *f, bool terse); int bus_pcap_header(size_t snaplen, FILE *f); diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c index d9716ae745..05127f0e0c 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -145,7 +145,7 @@ static int server(sd_bus *bus) { strna(sd_bus_message_get_member(m)), pid, strna(label)); - /* bus_message_dump(m); */ + /* sd_bus_message_dump(m); */ /* sd_bus_message_rewind(m, true); */ if (sd_bus_message_is_method_call(m, "org.freedesktop.systemd.test", "LowerCase")) { diff --git a/src/libsystemd/sd-bus/test-bus-gvariant.c b/src/libsystemd/sd-bus/test-bus-gvariant.c index e76925d489..d248bd4da1 100644 --- a/src/libsystemd/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/sd-bus/test-bus-gvariant.c @@ -175,7 +175,7 @@ static int test_marshal(void) { } #endif - assert_se(bus_message_dump(m, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0); + assert_se(sd_bus_message_dump(m, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0); assert_se(bus_message_get_blob(m, &blob, &sz) >= 0); @@ -196,7 +196,7 @@ static int test_marshal(void) { assert_se(bus_message_from_malloc(bus, blob, sz, NULL, 0, NULL, &n) >= 0); blob = NULL; - assert_se(bus_message_dump(n, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0); + assert_se(sd_bus_message_dump(n, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0); m = sd_bus_message_unref(m); @@ -205,7 +205,7 @@ static int test_marshal(void) { assert_se(sd_bus_message_append(m, "as", 0) >= 0); assert_se(sd_bus_message_seal(m, 4712, 0) >= 0); - assert_se(bus_message_dump(m, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0); + assert_se(sd_bus_message_dump(m, NULL, SD_BUS_MESSAGE_DUMP_WITH_HEADER) >= 0); return EXIT_SUCCESS; } diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c index 4cb4e26867..107eea390e 100644 --- a/src/libsystemd/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/sd-bus/test-bus-marshal.c @@ -188,10 +188,10 @@ int main(int argc, char *argv[]) { r = sd_bus_message_seal(m, 4711, 0); assert_se(r >= 0); - bus_message_dump(m, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(m, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); ms = open_memstream_unlocked(&first, &first_size); - bus_message_dump(m, ms, 0); + sd_bus_message_dump(m, ms, 0); fflush(ms); assert_se(!ferror(ms)); @@ -244,11 +244,11 @@ int main(int argc, char *argv[]) { r = bus_message_from_malloc(bus, buffer, sz, NULL, 0, NULL, &m); assert_se(r >= 0); - bus_message_dump(m, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(m, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); fclose(ms); ms = open_memstream_unlocked(&second, &second_size); - bus_message_dump(m, ms, 0); + sd_bus_message_dump(m, ms, 0); fflush(ms); assert_se(!ferror(ms)); assert_se(first_size == second_size); @@ -354,7 +354,7 @@ int main(int argc, char *argv[]) { fclose(ms); ms = open_memstream_unlocked(&third, &third_size); - bus_message_dump(copy, ms, 0); + sd_bus_message_dump(copy, ms, 0); fflush(ms); assert_se(!ferror(ms)); diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c index a2fdaae9cb..41cf8c1670 100644 --- a/src/libsystemd/sd-bus/test-bus-objects.c +++ b/src/libsystemd/sd-bus/test-bus-objects.c @@ -399,7 +399,7 @@ static int client(struct context *c) { r = sd_bus_call_method(bus, "org.freedesktop.systemd.test", "/foo", "org.freedesktop.DBus.Properties", "GetAll", &error, &reply, "s", ""); assert_se(r >= 0); - bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); sd_bus_message_unref(reply); reply = NULL; @@ -417,7 +417,7 @@ static int client(struct context *c) { r = sd_bus_call_method(bus, "org.freedesktop.systemd.test", "/value", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects", &error, &reply, ""); assert_se(r >= 0); - bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); sd_bus_message_unref(reply); reply = NULL; @@ -429,7 +429,7 @@ static int client(struct context *c) { assert_se(r > 0); assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.Properties", "PropertiesChanged")); - bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); sd_bus_message_unref(reply); reply = NULL; @@ -441,7 +441,7 @@ static int client(struct context *c) { assert_se(r > 0); assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.Properties", "PropertiesChanged")); - bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); sd_bus_message_unref(reply); reply = NULL; @@ -453,7 +453,7 @@ static int client(struct context *c) { assert_se(r > 0); assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded")); - bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); sd_bus_message_unref(reply); reply = NULL; @@ -465,7 +465,7 @@ static int client(struct context *c) { assert_se(r > 0); assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.ObjectManager", "InterfacesRemoved")); - bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); sd_bus_message_unref(reply); reply = NULL; @@ -477,7 +477,7 @@ static int client(struct context *c) { assert_se(r > 0); assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded")); - bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); sd_bus_message_unref(reply); reply = NULL; @@ -489,7 +489,7 @@ static int client(struct context *c) { assert_se(r > 0); assert_se(sd_bus_message_is_signal(reply, "org.freedesktop.DBus.ObjectManager", "InterfacesRemoved")); - bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); + sd_bus_message_dump(reply, stdout, SD_BUS_MESSAGE_DUMP_WITH_HEADER); sd_bus_message_unref(reply); reply = NULL; diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 8d3f869680..ff2c0e9ef0 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -335,6 +336,8 @@ int sd_bus_message_at_end(sd_bus_message *m, int complete); int sd_bus_message_rewind(sd_bus_message *m, int complete); int sd_bus_message_sensitive(sd_bus_message *m); +int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags); + /* Bus management */ int sd_bus_get_unique_name(sd_bus *bus, const char **unique);