picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add sd_bus_message_new and sd_bus_message_seal as public functions (#6609)

Browse source
This commit is contained in:
aeywalee 2017-10-30 16:08:46 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent ecd9ded89b
commit 75bcbcf2e7
8 changed files with 63 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libsystemd/libsystemd.sym
View file

@ -522,3 +522,9 @@ LIBSYSTEMD_234 {
global: global:
sd_bus_message_appendv; sd_bus_message_appendv;
} LIBSYSTEMD_233; } LIBSYSTEMD_233;
LIBSYSTEMD_236 {
global:
sd_bus_message_new;
sd_bus_message_seal;
} LIBSYSTEMD_234;

77
src/libsystemd/sd-bus/bus-message.c
View file

@ -573,28 +573,35 @@ fail:
return r; return r;
} }
static sd_bus_message *message_new(sd_bus *bus, uint8_t type) { _public_ int sd_bus_message_new(
sd_bus_message *m; sd_bus *bus,
sd_bus_message **m,
uint8_t type) {
assert(bus); sd_bus_message *t;
m = malloc0(ALIGN(sizeof(sd_bus_message)) + sizeof(struct bus_header)); assert_return(bus, -ENOTCONN);
if (!m) assert_return(bus->state != BUS_UNSET, -ENOTCONN);
return NULL; assert_return(m, -EINVAL);
m->n_ref = 1; t = malloc0(ALIGN(sizeof(sd_bus_message)) + sizeof(struct bus_header));
m->header = (struct bus_header*) ((uint8_t*) m + ALIGN(sizeof(struct sd_bus_message))); if (!t)
m->header->endian = BUS_NATIVE_ENDIAN; return -ENOMEM;
m->header->type = type;
m->header->version = bus->message_version; t->n_ref = 1;
m->allow_fds = bus->can_fds || !IN_SET(bus->state, BUS_HELLO, BUS_RUNNING); t->header = (struct bus_header*) ((uint8_t*) t + ALIGN(sizeof(struct sd_bus_message)));
m->root_container.need_offsets = BUS_MESSAGE_IS_GVARIANT(m); t->header->endian = BUS_NATIVE_ENDIAN;
m->bus = sd_bus_ref(bus); t->header->type = type;
t->header->version = bus->message_version;
t->allow_fds = bus->can_fds || !IN_SET(bus->state, BUS_HELLO, BUS_RUNNING);
t->root_container.need_offsets = BUS_MESSAGE_IS_GVARIANT(t);
t->bus = sd_bus_ref(bus);
if (bus->allow_interactive_authorization) if (bus->allow_interactive_authorization)
m->header->flags |= BUS_MESSAGE_ALLOW_INTERACTIVE_AUTHORIZATION; t->header->flags |= BUS_MESSAGE_ALLOW_INTERACTIVE_AUTHORIZATION;
return m; *m = t;
return 0;
} }
_public_ int sd_bus_message_new_signal( _public_ int sd_bus_message_new_signal(
@ -614,10 +621,12 @@ _public_ int sd_bus_message_new_signal(
assert_return(member_name_is_valid(member), -EINVAL); assert_return(member_name_is_valid(member), -EINVAL);
assert_return(m, -EINVAL); assert_return(m, -EINVAL);
t = message_new(bus, SD_BUS_MESSAGE_SIGNAL); r = sd_bus_message_new(bus, &t, SD_BUS_MESSAGE_SIGNAL);
if (!t) if (r < 0)
return -ENOMEM; return -ENOMEM;
assert(t);
t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED;
r = message_append_field_string(t, BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path); r = message_append_field_string(t, BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path);
@ -657,10 +666,12 @@ _public_ int sd_bus_message_new_method_call(
assert_return(member_name_is_valid(member), -EINVAL); assert_return(member_name_is_valid(member), -EINVAL);
assert_return(m, -EINVAL); assert_return(m, -EINVAL);
t = message_new(bus, SD_BUS_MESSAGE_METHOD_CALL); r = sd_bus_message_new(bus, &t, SD_BUS_MESSAGE_METHOD_CALL);
if (!t) if (r < 0)
return -ENOMEM; return -ENOMEM;
assert(t);
r = message_append_field_string(t, BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path); r = message_append_field_string(t, BUS_MESSAGE_HEADER_PATH, SD_BUS_TYPE_OBJECT_PATH, path, &t->path);
if (r < 0) if (r < 0)
goto fail; goto fail;
@ -702,10 +713,12 @@ static int message_new_reply(
assert_return(call->bus->state != BUS_UNSET, -ENOTCONN); assert_return(call->bus->state != BUS_UNSET, -ENOTCONN);
assert_return(m, -EINVAL); assert_return(m, -EINVAL);
t = message_new(call->bus, type); r = sd_bus_message_new(call->bus, &t, type);
if (!t) if (r < 0)
return -ENOMEM; return -ENOMEM;
assert(t);
t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED;
t->reply_cookie = BUS_MESSAGE_COOKIE(call); t->reply_cookie = BUS_MESSAGE_COOKIE(call);
if (t->reply_cookie == 0) if (t->reply_cookie == 0)
@ -858,10 +871,12 @@ int bus_message_new_synthetic_error(
assert(sd_bus_error_is_set(e)); assert(sd_bus_error_is_set(e));
assert(m); assert(m);
t = message_new(bus, SD_BUS_MESSAGE_METHOD_ERROR); r = sd_bus_message_new(bus, &t, SD_BUS_MESSAGE_METHOD_ERROR);
if (!t) if (r < 0)
return -ENOMEM; return -ENOMEM;
assert(t);
t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED; t->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED;
t->reply_cookie = cookie; t->reply_cookie = cookie;
@ -2857,13 +2872,13 @@ static int bus_message_close_header(sd_bus_message *m) {
return 0; return 0;
} }
int bus_message_seal(sd_bus_message *m, uint64_t cookie, usec_t timeout) { _public_ int sd_bus_message_seal(sd_bus_message *m, uint64_t cookie, uint64_t timeout_usec) {
struct bus_body_part *part; struct bus_body_part *part;
size_t a; size_t a;
unsigned i; unsigned i;
int r; int r;
assert(m); assert_return(m, -EINVAL);
if (m->sealed) if (m->sealed)
return -EPERM; return -EPERM;
@ -2913,7 +2928,7 @@ int bus_message_seal(sd_bus_message *m, uint64_t cookie, usec_t timeout) {
else else
m->header->dbus1.serial = (uint32_t) cookie; m->header->dbus1.serial = (uint32_t) cookie;
m->timeout = m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED ? 0 : timeout; m->timeout = m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED ? 0 : timeout_usec;
/* Add padding at the end of the fields part, since we know /* Add padding at the end of the fields part, since we know
* the body needs to start at an 8 byte alignment. We made * the body needs to start at an 8 byte alignment. We made
@ -5787,10 +5802,12 @@ int bus_message_remarshal(sd_bus *bus, sd_bus_message **m) {
case SD_BUS_MESSAGE_METHOD_RETURN: case SD_BUS_MESSAGE_METHOD_RETURN:
case SD_BUS_MESSAGE_METHOD_ERROR: case SD_BUS_MESSAGE_METHOD_ERROR:
n = message_new(bus, (*m)->header->type); r = sd_bus_message_new(bus, &n, (*m)->header->type);
if (!n) if (r < 0)
return -ENOMEM; return -ENOMEM;
assert(n);
n->reply_cookie = (*m)->reply_cookie; n->reply_cookie = (*m)->reply_cookie;
r = message_append_reply_cookie(n, n->reply_cookie); r = message_append_reply_cookie(n, n->reply_cookie);
@ -5833,7 +5850,7 @@ int bus_message_remarshal(sd_bus *bus, sd_bus_message **m) {
if (timeout == 0 && !((*m)->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)) if (timeout == 0 && !((*m)->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED))
timeout = BUS_DEFAULT_TIMEOUT; timeout = BUS_DEFAULT_TIMEOUT;
r = bus_message_seal(n, BUS_MESSAGE_COOKIE(*m), timeout); r = sd_bus_message_seal(n, BUS_MESSAGE_COOKIE(*m), timeout);
if (r < 0) if (r < 0)
return r; return r;

1
src/libsystemd/sd-bus/bus-message.h
View file

@ -187,7 +187,6 @@ static inline bool BUS_MESSAGE_IS_GVARIANT(sd_bus_message *m) {
return m->header->version == 2; return m->header->version == 2;
} }
int bus_message_seal(sd_bus_message *m, uint64_t serial, usec_t timeout);
int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz); int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz);
int bus_message_read_strv_extend(sd_bus_message *m, char ***l); int bus_message_read_strv_extend(sd_bus_message *m, char ***l);

4
src/libsystemd/sd-bus/sd-bus.c
View file

@ -1412,7 +1412,7 @@ static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) {
if (timeout == 0) if (timeout == 0)
timeout = BUS_DEFAULT_TIMEOUT; timeout = BUS_DEFAULT_TIMEOUT;
return bus_message_seal(m, ++b->cookie, timeout); return sd_bus_message_seal(m, ++b->cookie, timeout);
} }
static int bus_remarshal_message(sd_bus *b, sd_bus_message **m) { static int bus_remarshal_message(sd_bus *b, sd_bus_message **m) {
@ -1452,7 +1452,7 @@ int bus_seal_synthetic_message(sd_bus *b, sd_bus_message *m) {
* pick a fixed, artificial one. We use (uint32_t) -1 rather * pick a fixed, artificial one. We use (uint32_t) -1 rather
* than (uint64_t) -1 since dbus1 only had 32bit identifiers, * than (uint64_t) -1 since dbus1 only had 32bit identifiers,
* even though kdbus can do 64bit. */ * even though kdbus can do 64bit. */
return bus_message_seal(m, 0xFFFFFFFFULL, 0); return sd_bus_message_seal(m, 0xFFFFFFFFULL, 0);
} }
static int bus_write_message(sd_bus *bus, sd_bus_message *m, bool hint_sync_call, size_t *idx) { static int bus_write_message(sd_bus *bus, sd_bus_message *m, bool hint_sync_call, size_t *idx) {

4
src/libsystemd/sd-bus/test-bus-gvariant.c
View file

@ -153,7 +153,7 @@ static void test_marshal(void) {
4712, "second-string-parameter", "(a(si))", 2, "Y", 5, "Z", 6, 4712, "second-string-parameter", "(a(si))", 2, "Y", 5, "Z", 6,
4713, "third-string-parameter", "(uu)", 1, 2) >= 0); 4713, "third-string-parameter", "(uu)", 1, 2) >= 0);
assert_se(bus_message_seal(m, 4711, 0) >= 0); assert_se(sd_bus_message_seal(m, 4711, 0) >= 0);
#if HAVE_GLIB #if HAVE_GLIB
{ {
@ -209,7 +209,7 @@ static void test_marshal(void) {
assert_se(sd_bus_message_append(m, "as", 0) >= 0); assert_se(sd_bus_message_append(m, "as", 0) >= 0);
assert_se(bus_message_seal(m, 4712, 0) >= 0); assert_se(sd_bus_message_seal(m, 4712, 0) >= 0);
assert_se(bus_message_dump(m, NULL, BUS_MESSAGE_DUMP_WITH_HEADER) >= 0); assert_se(bus_message_dump(m, NULL, BUS_MESSAGE_DUMP_WITH_HEADER) >= 0);
} }

4
src/libsystemd/sd-bus/test-bus-marshal.c
View file

@ -196,7 +196,7 @@ int main(int argc, char *argv[]) {
r = sd_bus_message_append(m, "a(stdo)", 1, "foo", 815ULL, 47.0, "/"); r = sd_bus_message_append(m, "a(stdo)", 1, "foo", 815ULL, 47.0, "/");
assert_se(r >= 0); assert_se(r >= 0);
r = bus_message_seal(m, 4711, 0); r = sd_bus_message_seal(m, 4711, 0);
assert_se(r >= 0); assert_se(r >= 0);
bus_message_dump(m, stdout, BUS_MESSAGE_DUMP_WITH_HEADER); bus_message_dump(m, stdout, BUS_MESSAGE_DUMP_WITH_HEADER);
@ -359,7 +359,7 @@ int main(int argc, char *argv[]) {
r = sd_bus_message_copy(copy, m, true); r = sd_bus_message_copy(copy, m, true);
assert_se(r >= 0); assert_se(r >= 0);
r = bus_message_seal(copy, 4712, 0); r = sd_bus_message_seal(copy, 4712, 0);
assert_se(r >= 0); assert_se(r >= 0);
fclose(ms); fclose(ms);

2
src/libsystemd/sd-bus/test-bus-match.c
View file

@ -121,7 +121,7 @@ int main(int argc, char *argv[]) {
assert_se(sd_bus_message_new_signal(bus, &m, "/foo/bar", "bar.x", "waldo") >= 0); assert_se(sd_bus_message_new_signal(bus, &m, "/foo/bar", "bar.x", "waldo") >= 0);
assert_se(sd_bus_message_append(m, "ssssas", "one", "two", "/prefix/three", "prefix.four", 3, "pi", "pa", "po") >= 0); assert_se(sd_bus_message_append(m, "ssssas", "one", "two", "/prefix/three", "prefix.four", 3, "pi", "pa", "po") >= 0);
assert_se(bus_message_seal(m, 1, 0) >= 0); assert_se(sd_bus_message_seal(m, 1, 0) >= 0);
zero(mask); zero(mask);
assert_se(bus_match_run(NULL, &root, m) == 0); assert_se(bus_match_run(NULL, &root, m) == 0);

3
src/systemd/sd-bus.h
View file

@ -216,6 +216,7 @@ void *sd_bus_slot_get_current_userdata(sd_bus_slot *slot);
/* Message object */ /* Message object */
int sd_bus_message_new(sd_bus *bus, sd_bus_message **m, uint8_t type);
int sd_bus_message_new_signal(sd_bus *bus, sd_bus_message **m, const char *path, const char *interface, const char *member); int sd_bus_message_new_signal(sd_bus *bus, sd_bus_message **m, const char *path, const char *interface, const char *member);
int sd_bus_message_new_method_call(sd_bus *bus, sd_bus_message **m, const char *destination, const char *path, const char *interface, const char *member); int sd_bus_message_new_method_call(sd_bus *bus, sd_bus_message **m, const char *destination, const char *path, const char *interface, const char *member);
int sd_bus_message_new_method_return(sd_bus_message *call, sd_bus_message **m); int sd_bus_message_new_method_return(sd_bus_message *call, sd_bus_message **m);
@ -227,6 +228,8 @@ int sd_bus_message_new_method_errnof(sd_bus_message *call, sd_bus_message **m, i
sd_bus_message* sd_bus_message_ref(sd_bus_message *m); sd_bus_message* sd_bus_message_ref(sd_bus_message *m);
sd_bus_message* sd_bus_message_unref(sd_bus_message *m); sd_bus_message* sd_bus_message_unref(sd_bus_message *m);
int sd_bus_message_seal(sd_bus_message *m, uint64_t cookie, uint64_t timeout_usec);
int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type); int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type);
int sd_bus_message_get_cookie(sd_bus_message *m, uint64_t *cookie); int sd_bus_message_get_cookie(sd_bus_message *m, uint64_t *cookie);
int sd_bus_message_get_reply_cookie(sd_bus_message *m, uint64_t *cookie); int sd_bus_message_get_reply_cookie(sd_bus_message *m, uint64_t *cookie);