assert(d);
assert(d);
- (*d)->size = offsetof(struct kdbus_msg_data, data) + length + 1;
+ (*d)->size = offsetof(struct kdbus_msg_data, str) + length + 1;
(*d)->type = KDBUS_MSG_DST_NAME;
- memcpy((*d)->data, s, length + 1);
+ memcpy((*d)->str, s, length + 1);
*d = (struct kdbus_msg_data*) ((uint8_t*) *d + ALIGN8((*d)->size));
}
if (r < 0)
return errno == EAGAIN ? 0 : -errno;
- return 0;
+ return 1;
}
static void close_kdbus_msg(struct kdbus_msg *k) {
size_t total, n_bytes = 0, idx = 0;
struct kdbus_creds *creds = NULL;
uint64_t nsec = 0;
+ const char *destination = NULL;
int r;
assert(bus);
creds = &d->creds;
else if (d->type == KDBUS_MSG_TIMESTAMP)
nsec = d->ts_ns;
+ else if (d->type == KDBUS_MSG_DST_NAME)
+ destination = d->str;
}
if (!h)
return r;
}
+ if (k->src_id == KDBUS_SRC_ID_KERNEL)
+ m->sender = "org.freedesktop.DBus";
+ else {
+ snprintf(m->sender_buffer, sizeof(m->sender_buffer), ":1.%llu", (unsigned long long) k->src_id);
+ m->sender = m->sender_buffer;
+ }
+
+ if (!m->destination) {
+ if (destination)
+ m->destination = destination;
+ else if (k->dst_id != KDBUS_DST_ID_WELL_KNOWN_NAME &&
+ k->dst_id != KDBUS_DST_ID_BROADCAST) {
+ snprintf(m->destination_buffer, sizeof(m->destination_buffer), ":1.%llu", (unsigned long long) k->dst_id);
+ m->destination = m->destination_buffer;
+ }
+ }
+
/* We take possession of the kmsg struct now */
m->kdbus = k;
m->free_kdbus = true;
else
close_kdbus_msg(k);
- return r;
+ return r < 0 ? r : 1;
}
int bus_kernel_create(const char *name, char **s) {