assert(m);
assert(m->sealed);
- assert(!m->kdbus);
+
+ if (m->kdbus)
+ return 0;
if (m->destination) {
r = parse_unique_name(m->destination, &unique);
if (m->body)
append_payload_vec(&d, m->body, m->header->body_size);
- m->kdbus->size = (uint8_t*) m - (uint8_t*) m->kdbus;
+ m->kdbus->size = (uint8_t*) d - (uint8_t*) m->kdbus;
assert(m->kdbus->size <= sz);
+ m->free_kdbus = true;
+
return 0;
}
continue;
l = d->size - offsetof(struct kdbus_msg_data, data);
-
if (idx == sizeof(struct bus_header) &&
l == BUS_MESSAGE_FIELDS_SIZE(m))
m->fields = d->data;
else if (idx == sizeof(struct bus_header) + ALIGN8(BUS_MESSAGE_FIELDS_SIZE(m)) &&
l == BUS_MESSAGE_BODY_SIZE(m))
m->body = d->data;
- else {
+ else if (!(idx == 0 && l == sizeof(struct bus_header)) &&
+ !(idx == sizeof(struct bus_header) + BUS_MESSAGE_FIELDS_SIZE(m))) {
sd_bus_message_unref(m);
return -EBADMSG;
}
if (errno == EAGAIN)
return 0;
- if (errno != EMSGSIZE)
+ if (errno != ENOBUFS)
return -errno;
sz *= 2;
free(b->unique_name);
free(b->auth_buffer);
free(b->address);
+ free(b->kernel);
free(b->exec_path);
strv_free(b->exec_argv);
int main(int argc, char *argv[]) {
_cleanup_close_ int bus_ref = -1;
_cleanup_free_ char *bus_name = NULL, *address = NULL;
- const char *ua = NULL, *ub = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
+ const char *ua = NULL, *ub = NULL, *the_string = NULL;
sd_bus *a, *b;
int r;
printf("unique b: %s\n", ub);
+ r = sd_bus_emit_signal(a, "/foo", "waldo.com", "Piep", "s", "I am a string");
+ assert_se(r >= 0);
+
+ r = sd_bus_process(b, &m);
+ assert_se(r > 0);
+ assert_se(m);
+
+ r = sd_bus_message_read(m, "s", &the_string);
+ assert_se(r >= 0);
+ assert_se(streq(the_string, "I am a string"));
+
sd_bus_unref(a);
sd_bus_unref(b);
#endif
/* TODO:
+ * - instead of adding in padding iovec when sending simply extend header buffer
* - add page donation logic
* - api for appending/reading fixed arrays
* - merge busctl into systemctl or so?