chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: implicitly handle peer commands Ping() and GetMachineId()
[elogind.git]
/
src
/
libsystemd-bus
/
bus-control.c
diff --git
a/src/libsystemd-bus/bus-control.c
b/src/libsystemd-bus/bus-control.c
index e4cc251a4b2937046fc159d6a6f7c089e4be3c54..9d242dc41384a117d255c4ef80c401aee33726c2 100644
(file)
--- a/
src/libsystemd-bus/bus-control.c
+++ b/
src/libsystemd-bus/bus-control.c
@@
-59,7
+59,7
@@
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m,
(uint64_t) -1
, NULL, &reply);
+ r = sd_bus_send_with_reply_and_block(bus, m,
0
, NULL, &reply);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-94,7
+94,7
@@
int sd_bus_release_name(sd_bus *bus, const char *name) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m,
(uint64_t) -1
, NULL, &reply);
+ r = sd_bus_send_with_reply_and_block(bus, m,
0
, NULL, &reply);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-107,7
+107,6
@@
int sd_bus_release_name(sd_bus *bus, const char *name) {
int sd_bus_list_names(sd_bus *bus, char ***l) {
_cleanup_bus_message_unref_ sd_bus_message *m1 = NULL, *reply1 = NULL, *m2 = NULL, *reply2 = NULL;
int sd_bus_list_names(sd_bus *bus, char ***l) {
_cleanup_bus_message_unref_ sd_bus_message *m1 = NULL, *reply1 = NULL, *m2 = NULL, *reply2 = NULL;
- _cleanup_strv_free_ char **a = NULL, **b = NULL;
char **x = NULL;
int r;
char **x = NULL;
int r;
@@
-136,25
+135,25
@@
int sd_bus_list_names(sd_bus *bus, char ***l) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m1,
(uint64_t) -1
, NULL, &reply1);
+ r = sd_bus_send_with_reply_and_block(bus, m1,
0
, NULL, &reply1);
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m2,
(uint64_t) -1
, NULL, &reply2);
+ r = sd_bus_send_with_reply_and_block(bus, m2,
0
, NULL, &reply2);
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_message_read(reply1, "as", &a);
- if (r < 0)
+ r = bus_message_read_strv_extend(reply1, &x);
+ if (r < 0) {
+ strv_free(x);
return r;
return r;
+ }
- r = sd_bus_message_read(reply2, "as", &b);
- if (r < 0)
+ r = bus_message_read_strv_extend(reply2, &x);
+ if (r < 0) {
+ strv_free(x);
return r;
return r;
-
- x = strv_merge(a, b);
- if (!x)
- return -ENOMEM;
+ }
*l = strv_uniq(x);
return 0;
*l = strv_uniq(x);
return 0;
@@
-162,6
+161,7
@@
int sd_bus_list_names(sd_bus *bus, char ***l) {
int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
_cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL;
+ const char *found;
int r;
if (!bus)
int r;
if (!bus)
@@
-183,11
+183,25
@@
int sd_bus_get_owner(sd_bus *bus, const char *name, char **owner) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m, (uint64_t) -1, NULL, &reply);
+ r = sd_bus_send_with_reply_and_block(bus, m, 0, NULL, &reply);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_read(reply, "s", &found);
if (r < 0)
return r;
if (r < 0)
return r;
- return sd_bus_message_read(reply, "s", owner);
+ if (owner) {
+ char *t;
+
+ t = strdup(found);
+ if (!t)
+ return -ENOMEM;
+
+ *owner = t;
+ }
+
+ return 0;
}
int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
}
int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
@@
-216,7
+230,7
@@
int sd_bus_get_owner_uid(sd_bus *bus, const char *name, uid_t *uid) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m,
(uint64_t) -1
, NULL, &reply);
+ r = sd_bus_send_with_reply_and_block(bus, m,
0
, NULL, &reply);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-245,7
+259,7
@@
int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
"org.freedesktop.DBus",
"/",
"org.freedesktop.DBus",
- "GetConnectionUnix
User
",
+ "GetConnectionUnix
ProcessID
",
&m);
if (r < 0)
return r;
&m);
if (r < 0)
return r;
@@
-254,7
+268,7
@@
int sd_bus_get_owner_pid(sd_bus *bus, const char *name, pid_t *pid) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_send_with_reply_and_block(bus, m,
(uint64_t) -1
, NULL, &reply);
+ r = sd_bus_send_with_reply_and_block(bus, m,
0
, NULL, &reply);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-292,7
+306,7
@@
int sd_bus_add_match(sd_bus *bus, const char *match) {
if (r < 0)
return r;
if (r < 0)
return r;
- return sd_bus_send_with_reply_and_block(bus, m,
(uint64_t) -1
, NULL, &reply);
+ return sd_bus_send_with_reply_and_block(bus, m,
0
, NULL, &reply);
}
int sd_bus_remove_match(sd_bus *bus, const char *match) {
}
int sd_bus_remove_match(sd_bus *bus, const char *match) {
@@
-318,5
+332,5
@@
int sd_bus_remove_match(sd_bus *bus, const char *match) {
if (r < 0)
return r;
if (r < 0)
return r;
- return sd_bus_send_with_reply_and_block(bus, m,
(uint64_t) -1
, NULL, &reply);
+ return sd_bus_send_with_reply_and_block(bus, m,
0
, NULL, &reply);
}
}