chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ed205a6
)
bus: also finish connection before returning from sd_bus_get_unique_name()
author
Lennart Poettering
<lennart@poettering.net>
Fri, 22 Mar 2013 02:34:29 +0000
(
03:34
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 22 Mar 2013 02:37:10 +0000
(
03:37
+0100)
src/libsystemd-bus/bus-control.c
patch
|
blob
|
history
src/libsystemd-bus/bus-internal.h
patch
|
blob
|
history
src/libsystemd-bus/sd-bus.c
patch
|
blob
|
history
src/libsystemd-bus/sd-bus.h
patch
|
blob
|
history
src/libsystemd-bus/test-bus-chat.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/bus-control.c
b/src/libsystemd-bus/bus-control.c
index 9d242dc41384a117d255c4ef80c401aee33726c2..06afaf3c7698f9e931da3be0de9c467611d531bc 100644
(file)
--- a/
src/libsystemd-bus/bus-control.c
+++ b/
src/libsystemd-bus/bus-control.c
@@
-28,11
+28,20
@@
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-internal.h"
#include "bus-message.h"
-const char *sd_bus_get_unique_name(sd_bus *bus) {
+int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
+ int r;
+
if (!bus)
if (!bus)
- return NULL;
+ return -EINVAL;
+ if (!unique)
+ return -EINVAL;
- return bus->unique_name;
+ r = bus_ensure_running(bus);
+ if (r < 0)
+ return r;
+
+ *unique = bus->unique_name;
+ return 0;
}
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
}
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
diff --git
a/src/libsystemd-bus/bus-internal.h
b/src/libsystemd-bus/bus-internal.h
index d0b7b5658dbc479f4336dd80eb9e21560c31a905..c5bd3788b47b68f1b460b4cfa9680139fadde8d7 100644
(file)
--- a/
src/libsystemd-bus/bus-internal.h
+++ b/
src/libsystemd-bus/bus-internal.h
@@
-130,3
+130,5
@@
bool service_name_is_valid(const char *p);
bool member_name_is_valid(const char *p);
#define error_name_is_valid interface_name_is_valid
bool member_name_is_valid(const char *p);
#define error_name_is_valid interface_name_is_valid
+
+int bus_ensure_running(sd_bus *bus);
diff --git
a/src/libsystemd-bus/sd-bus.c
b/src/libsystemd-bus/sd-bus.c
index 9408806a4e85bfa1df00f35b1a5cb099fa4b3e3d..09ea01b951545283b365740d54f9d84affb7fde1 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.c
+++ b/
src/libsystemd-bus/sd-bus.c
@@
-35,7
+35,6
@@
#include "bus-message.h"
#include "bus-type.h"
#include "bus-message.h"
#include "bus-type.h"
-static int ensure_running(sd_bus *bus);
static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec);
static void bus_free(sd_bus *b) {
static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec);
static void bus_free(sd_bus *b) {
@@
-789,7
+788,7
@@
int sd_bus_can_send(sd_bus *bus, char type) {
return -EINVAL;
if (type == SD_BUS_TYPE_UNIX_FD) {
return -EINVAL;
if (type == SD_BUS_TYPE_UNIX_FD) {
- r = ensure_running(bus);
+ r =
bus_
ensure_running(bus);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-807,7
+806,7
@@
int sd_bus_get_peer(sd_bus *bus, sd_id128_t *peer) {
if (!peer)
return -EINVAL;
if (!peer)
return -EINVAL;
- r = ensure_running(bus);
+ r =
bus_
ensure_running(bus);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1252,7
+1251,7
@@
int sd_bus_send_with_reply_cancel(sd_bus *bus, uint64_t serial) {
return 1;
}
return 1;
}
-
static int
ensure_running(sd_bus *bus) {
+
int bus_
ensure_running(sd_bus *bus) {
int r;
assert(bus);
int r;
assert(bus);
@@
-1300,7
+1299,7
@@
int sd_bus_send_with_reply_and_block(
if (bus_error_is_dirty(error))
return -EINVAL;
if (bus_error_is_dirty(error))
return -EINVAL;
- r = ensure_running(bus);
+ r =
bus_
ensure_running(bus);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1747,7
+1746,7
@@
int sd_bus_flush(sd_bus *bus) {
if (bus->fd < 0)
return -ENOTCONN;
if (bus->fd < 0)
return -ENOTCONN;
- r = ensure_running(bus);
+ r =
bus_
ensure_running(bus);
if (r < 0)
return r;
if (r < 0)
return r;
diff --git
a/src/libsystemd-bus/sd-bus.h
b/src/libsystemd-bus/sd-bus.h
index 8af1e85aae719f0ee38a5623f7cee9e8166ce025..60f2913d6927c5ce2a11e6e540ee1ea3015a64da 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.h
+++ b/
src/libsystemd-bus/sd-bus.h
@@
-128,7
+128,7
@@
int sd_bus_message_rewind(sd_bus_message *m, int complete);
/* Bus management */
/* Bus management */
-
const char *sd_bus_get_unique_name(sd_bus *bus
);
+
int sd_bus_get_unique_name(sd_bus *bus, const char **unique
);
int sd_bus_request_name(sd_bus *bus, const char *name, int flags);
int sd_bus_release_name(sd_bus *bus, const char *name);
int sd_bus_list_names(sd_bus *bus, char ***l);
int sd_bus_request_name(sd_bus *bus, const char *name, int flags);
int sd_bus_release_name(sd_bus *bus, const char *name);
int sd_bus_list_names(sd_bus *bus, char ***l);
diff --git
a/src/libsystemd-bus/test-bus-chat.c
b/src/libsystemd-bus/test-bus-chat.c
index 5f533cc6d075ebefc26ed0f1c7768f839bfc0a3c..24a194327ed8b16f3c98e1eaf3010c38e8a58226 100644
(file)
--- a/
src/libsystemd-bus/test-bus-chat.c
+++ b/
src/libsystemd-bus/test-bus-chat.c
@@
-35,6
+35,7
@@
static int server_init(sd_bus **_bus) {
sd_bus *bus = NULL;
sd_id128_t id;
int r;
sd_bus *bus = NULL;
sd_id128_t id;
int r;
+ const char *unique;
assert(_bus);
assert(_bus);
@@
-50,9
+51,15
@@
static int server_init(sd_bus **_bus) {
goto fail;
}
goto fail;
}
+ r = sd_bus_get_unique_name(bus, &unique);
+ if (r < 0) {
+ log_error("Failed to get unique name: %s", strerror(-r));
+ goto fail;
+ }
+
log_info("Peer ID is " SD_ID128_FORMAT_STR ".", SD_ID128_FORMAT_VAL(id));
log_info("Peer ID is " SD_ID128_FORMAT_STR ".", SD_ID128_FORMAT_VAL(id));
+ log_info("Unique ID: %s", unique);
log_info("Can send file handles: %i", sd_bus_can_send(bus, 'h'));
log_info("Can send file handles: %i", sd_bus_can_send(bus, 'h'));
- log_info("Unique ID: %s", strna(sd_bus_get_unique_name(bus)));
r = sd_bus_request_name(bus, "org.freedesktop.systemd.test", 0);
if (r < 0) {
r = sd_bus_request_name(bus, "org.freedesktop.systemd.test", 0);
if (r < 0) {