From 911121a7c837040454c5d0422e2a225a8d799eef Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2013 01:23:08 +0100 Subject: bus: add sd_bus_send_to() API call --- src/libsystemd-bus/libsystemd-bus.sym | 4 +--- src/libsystemd-bus/sd-bus.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) (limited to 'src/libsystemd-bus') diff --git a/src/libsystemd-bus/libsystemd-bus.sym b/src/libsystemd-bus/libsystemd-bus.sym index a1ffc439c1..8fa2cdec6d 100644 --- a/src/libsystemd-bus/libsystemd-bus.sym +++ b/src/libsystemd-bus/libsystemd-bus.sym @@ -43,9 +43,7 @@ global: sd_bus_can_send; sd_bus_get_server_id; sd_bus_send; - sd_bus_call; - sd_bus_call_async; - sd_bus_call_async_cancel; + sd_bus_send_to; sd_bus_get_fd; sd_bus_get_events; sd_bus_get_timeout; diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c index 0be5a29f36..c8248e19aa 100644 --- a/src/libsystemd-bus/sd-bus.c +++ b/src/libsystemd-bus/sd-bus.c @@ -1435,6 +1435,27 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) { return 1; } +_public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *serial) { + int r; + + assert_return(bus, -EINVAL); + assert_return(BUS_IS_OPEN(bus->state), -ENOTCONN); + assert_return(m, -EINVAL); + assert_return(!bus_pid_changed(bus), -ECHILD); + + if (!streq_ptr(m->destination, destination)) { + + if (!destination) + return -EEXIST; + + r = sd_bus_message_set_destination(m, destination); + if (r < 0) + return r; + } + + return sd_bus_send(bus, m, serial); +} + static usec_t calc_elapse(uint64_t usec) { if (usec == (uint64_t) -1) return 0; -- cgit v1.2.3-54-g00ecf