if (bus && bus->state == BUS_UNSET)
return -ENOTCONN;
- t = message_new(bus, SD_BUS_MESSAGE_TYPE_SIGNAL);
+ t = message_new(bus, SD_BUS_MESSAGE_SIGNAL);
if (!t)
return -ENOMEM;
sd_bus_message *t;
int r;
- if (!path)
+ if (destination && !service_name_is_valid(destination))
return -EINVAL;
- if (!member)
+ if (!object_path_is_valid(path))
+ return -EINVAL;
+ if (interface && !interface_name_is_valid(interface))
+ return -EINVAL;
+ if (!member_name_is_valid(member))
return -EINVAL;
if (!m)
return -EINVAL;
if (bus && bus->state == BUS_UNSET)
return -ENOTCONN;
- t = message_new(bus, SD_BUS_MESSAGE_TYPE_METHOD_CALL);
+ t = message_new(bus, SD_BUS_MESSAGE_METHOD_CALL);
if (!t)
return -ENOMEM;
return -EINVAL;
if (!call->sealed)
return -EPERM;
- if (call->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+ if (call->header->type != SD_BUS_MESSAGE_METHOD_CALL)
return -EINVAL;
if (!m)
return -EINVAL;
sd_bus_message *call,
sd_bus_message **m) {
- return message_new_reply(bus, call, SD_BUS_MESSAGE_TYPE_METHOD_RETURN, m);
+ return message_new_reply(bus, call, SD_BUS_MESSAGE_METHOD_RETURN, m);
}
int sd_bus_message_new_method_error(
if (!m)
return -EINVAL;
- r = message_new_reply(bus, call, SD_BUS_MESSAGE_TYPE_METHOD_ERROR, &t);
+ r = message_new_reply(bus, call, SD_BUS_MESSAGE_METHOD_ERROR, &t);
if (r < 0)
return r;
return r;
}
+int sd_bus_message_new_method_errorf(
+ sd_bus *bus,
+ sd_bus_message *call,
+ sd_bus_message **m,
+ const char *name,
+ const char *format,
+ ...) {
+
+ _cleanup_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ va_list ap;
+ int r;
+
+ assert_return(name, -EINVAL);
+ assert_return(m, -EINVAL);
+
+ va_start(ap, format);
+ r = bus_error_setfv(&error, name, format, ap);
+ va_end(ap);
+
+ if (r < 0)
+ return r;
+
+ return sd_bus_message_new_method_error(bus, call, &error, m);
+}
+
+int sd_bus_message_new_method_errno(
+ sd_bus *bus,
+ sd_bus_message *call,
+ int error,
+ const sd_bus_error *p,
+ sd_bus_message **m) {
+
+ _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+
+ if (sd_bus_error_is_set(p))
+ return sd_bus_message_new_method_error(bus, call, p, m);
+
+ sd_bus_error_set_errno(&berror, error);
+
+ return sd_bus_message_new_method_error(bus, call, &berror, m);
+}
+
+int sd_bus_message_new_method_errnof(
+ sd_bus *bus,
+ sd_bus_message *call,
+ sd_bus_message **m,
+ int error,
+ const char *format,
+ ...) {
+
+ _cleanup_free_ sd_bus_error berror = SD_BUS_ERROR_NULL;
+ va_list ap;
+ int r;
+
+ va_start(ap, format);
+ r = bus_error_set_errnofv(&berror, error, format, ap);
+ va_end(ap);
+
+ if (r < 0)
+ return r;
+
+ return sd_bus_message_new_method_error(bus, call, &berror, m);
+}
+
int bus_message_new_synthetic_error(
sd_bus *bus,
uint64_t serial,
assert(sd_bus_error_is_set(e));
assert(m);
- t = message_new(bus, SD_BUS_MESSAGE_TYPE_METHOD_ERROR);
+ t = message_new(bus, SD_BUS_MESSAGE_METHOD_ERROR);
if (!t)
return -ENOMEM;
goto fail;
}
+ r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_ERROR_NAME, SD_BUS_TYPE_STRING, e->name, &t->error.name);
+ if (r < 0)
+ goto fail;
+
+ if (e->message) {
+ r = message_append_basic(t, SD_BUS_TYPE_STRING, e->message, (const void**) &t->error.message);
+ if (r < 0)
+ goto fail;
+ }
+
*m = t;
return 0;
if (!m)
return -EINVAL;
- return m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_CALL ? !!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) : 0;
+ return m->header->type == SD_BUS_MESSAGE_METHOD_CALL ? !!(m->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED) : 0;
}
const char *sd_bus_message_get_path(sd_bus_message *m) {
if (!m)
return -EINVAL;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_SIGNAL)
+ if (m->header->type != SD_BUS_MESSAGE_SIGNAL)
return 0;
if (interface && (!m->interface || !streq(m->interface, interface)))
if (!m)
return -EINVAL;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+ if (m->header->type != SD_BUS_MESSAGE_METHOD_CALL)
return 0;
if (interface && (!m->interface || !streq(m->interface, interface)))
if (!m)
return -EINVAL;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR)
+ if (m->header->type != SD_BUS_MESSAGE_METHOD_ERROR)
return 0;
if (name && (!m->error.name || !streq(m->error.name, name)))
return -EINVAL;
if (m->sealed)
return -EPERM;
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_CALL)
+ if (m->header->type != SD_BUS_MESSAGE_METHOD_CALL)
return -EPERM;
if (b)
part->mapped = psz;
part->data = n;
- part->munmap_this = true;
}
+
+ part->munmap_this = true;
} else {
- n = realloc(part->data, sz);
+ n = realloc(part->data, MAX(sz, 1u));
if (!n) {
m->poisoned = true;
return -ENOMEM;
assert(contents);
assert(array_size);
- if (!signature_is_single(contents))
+ if (!signature_is_single(contents, true))
return -EINVAL;
alignment = bus_type_get_alignment(contents[0]);
assert(c);
assert(contents);
- if (!signature_is_single(contents))
+ if (!signature_is_single(contents, false))
return -EINVAL;
if (*contents == SD_BUS_TYPE_DICT_ENTRY_BEGIN)
void *a;
int r;
- if (!m)
- return -EINVAL;
- if (!memfd)
- return -EINVAL;
- if (m->sealed)
- return -EPERM;
- if (m->poisoned)
- return -ESTALE;
+ assert_return(m, -EINVAL);
+ assert_return(memfd, -EINVAL);
+ assert_return(!m->sealed, -EPERM);
+ assert_return(!m->poisoned, -ESTALE);
r = sd_memfd_set_sealed(memfd, true);
if (r < 0)
return 0;
}
+int sd_bus_message_append_strv(sd_bus_message *m, char **l) {
+ char **i;
+ int r;
+
+ assert_return(m, -EINVAL);
+ assert_return(!m->sealed, -EPERM);
+ assert_return(!m->poisoned, -ESTALE);
+
+ r = sd_bus_message_open_container(m, 'a', "s");
+ if (r < 0)
+ return r;
+
+ STRV_FOREACH(i, l) {
+ r = sd_bus_message_append_basic(m, 's', *i);
+ if (r < 0)
+ return r;
+ }
+
+ return sd_bus_message_close_container(m);
+}
+
int bus_body_part_map(struct bus_body_part *part) {
void *p;
size_t psz;
int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p) {
struct bus_container *c;
- int r;
void *q;
+ int r;
if (!m)
return -EINVAL;
return -EPERM;
if (!bus_type_is_basic(type))
return -EINVAL;
- if (!p)
- return -EINVAL;
c = message_get_container(m);
if (!c->signature || c->signature[c->index] == 0)
+ return -ENXIO;
+
+ if (message_end_of_array(m, m->rindex))
return 0;
if (c->signature[c->index] != type)
}
m->rindex = rindex;
- *(const char**) p = q;
+ if (p)
+ *(const char**) p = q;
+
break;
}
return -EBADMSG;
m->rindex = rindex;
- *(const char**) p = q;
+
+ if (p)
+ *(const char**) p = q;
break;
}
switch (type) {
case SD_BUS_TYPE_BYTE:
- *(uint8_t*) p = *(uint8_t*) q;
+ if (p)
+ *(uint8_t*) p = *(uint8_t*) q;
break;
case SD_BUS_TYPE_BOOLEAN:
- *(int*) p = !!*(uint32_t*) q;
+ if (p)
+ *(unsigned*) p = !!*(uint32_t*) q;
break;
case SD_BUS_TYPE_INT16:
case SD_BUS_TYPE_UINT16:
- *(uint16_t*) p = BUS_MESSAGE_BSWAP16(m, *(uint16_t*) q);
+ if (p)
+ *(uint16_t*) p = BUS_MESSAGE_BSWAP16(m, *(uint16_t*) q);
break;
case SD_BUS_TYPE_INT32:
case SD_BUS_TYPE_UINT32:
- *(uint32_t*) p = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q);
+ if (p)
+ *(uint32_t*) p = BUS_MESSAGE_BSWAP32(m, *(uint32_t*) q);
break;
case SD_BUS_TYPE_INT64:
case SD_BUS_TYPE_UINT64:
case SD_BUS_TYPE_DOUBLE:
- *(uint64_t*) p = BUS_MESSAGE_BSWAP64(m, *(uint64_t*) q);
+ if (p)
+ *(uint64_t*) p = BUS_MESSAGE_BSWAP64(m, *(uint64_t*) q);
break;
case SD_BUS_TYPE_UNIX_FD: {
if (j >= m->n_fds)
return -EBADMSG;
- *(int*) p = m->fds[j];
+ if (p)
+ *(int*) p = m->fds[j];
break;
}
assert(contents);
assert(array_size);
- if (!signature_is_single(contents))
+ if (!signature_is_single(contents, true))
return -EINVAL;
alignment = bus_type_get_alignment(contents[0]);
assert(c);
assert(contents);
- if (!signature_is_single(contents))
+ if (!signature_is_single(contents, false))
return -EINVAL;
if (*contents == SD_BUS_TYPE_DICT_ENTRY_BEGIN)
c = message_get_container(m);
if (!c->signature || c->signature[c->index] == 0)
+ return -ENXIO;
+
+ if (message_end_of_array(m, m->rindex))
return 0;
signature = strdup(contents);
struct bus_container *c;
int r;
- if (!m)
- return -EINVAL;
- if (!m->sealed)
- return -EPERM;
+ assert_return(m, -EINVAL);
+ assert_return(m->sealed, -EPERM);
c = message_get_container(m);
unsigned n_array, n_struct;
TypeStack stack[BUS_CONTAINER_DEPTH];
unsigned stack_ptr = 0;
+ unsigned n_loop = 0;
int r;
assert(m);
- if (!types)
+ if (isempty(types))
return 0;
/* Ideally, we'd just call ourselves recursively on every
* in a single stackframe. We hence implement our own
* home-grown stack in an array. */
- n_array = (unsigned) -1;
- n_struct = strlen(types);
+ n_array = (unsigned) -1; /* lenght of current array entries */
+ n_struct = strlen(types); /* length of current struct contents signature */
for (;;) {
const char *t;
+ n_loop++;
+
if (n_array == 0 || (n_array == (unsigned) -1 && n_struct == 0)) {
r = type_stack_pop(stack, ELEMENTSOF(stack), &stack_ptr, &types, &n_struct, &n_array);
if (r < 0)
r = sd_bus_message_read_basic(m, *t, p);
if (r < 0)
return r;
- if (r == 0)
+
+ if (r == 0) {
+ if (n_loop <= 1)
+ return 0;
+
return -ENXIO;
+ }
break;
}
r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, s);
if (r < 0)
return r;
- if (r == 0)
+ if (r == 0) {
+ if (n_loop <= 1)
+ return 0;
+
return -ENXIO;
+ }
}
if (n_array == (unsigned) -1) {
r = sd_bus_message_enter_container(m, SD_BUS_TYPE_VARIANT, s);
if (r < 0)
return r;
- if (r == 0)
+ if (r == 0) {
+ if (n_loop <= 1)
+ return 0;
+
return -ENXIO;
+ }
r = type_stack_push(stack, ELEMENTSOF(stack), &stack_ptr, types, n_struct, n_array);
if (r < 0)
r = sd_bus_message_enter_container(m, *t == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY, s);
if (r < 0)
return r;
- if (r == 0)
+ if (r == 0) {
+ if (n_loop <= 1)
+ return 0;
return -ENXIO;
+ }
}
if (n_array == (unsigned) -1) {
switch (m->header->type) {
- case SD_BUS_MESSAGE_TYPE_SIGNAL:
+ case SD_BUS_MESSAGE_SIGNAL:
if (!m->path || !m->interface || !m->member)
return -EBADMSG;
break;
- case SD_BUS_MESSAGE_TYPE_METHOD_CALL:
+ case SD_BUS_MESSAGE_METHOD_CALL:
if (!m->path || !m->member)
return -EBADMSG;
break;
- case SD_BUS_MESSAGE_TYPE_METHOD_RETURN:
+ case SD_BUS_MESSAGE_METHOD_RETURN:
if (m->reply_serial == 0)
return -EBADMSG;
break;
- case SD_BUS_MESSAGE_TYPE_METHOD_ERROR:
+ case SD_BUS_MESSAGE_METHOD_ERROR:
if (m->reply_serial == 0 || !m->error.name)
return -EBADMSG;
}
/* Try to read the error message, but if we can't it's a non-issue */
- if (m->header->type == SD_BUS_MESSAGE_TYPE_METHOD_ERROR)
+ if (m->header->type == SD_BUS_MESSAGE_METHOD_ERROR)
sd_bus_message_read(m, "s", &m->error.message);
return 0;
return message_append_field_string(m, SD_BUS_MESSAGE_HEADER_DESTINATION, SD_BUS_TYPE_STRING, destination, &m->destination);
}
-int bus_message_dump(sd_bus_message *m) {
+int bus_message_dump(sd_bus_message *m, FILE *f, bool with_header) {
const char *u = NULL, *uu = NULL, *s = NULL;
char **cmdline = NULL;
unsigned level = 1;
assert(m);
- printf("Message %p\n"
- "\tn_ref=%u\n"
- "\tendian=%c\n"
- "\ttype=%i\n"
- "\tflags=%u\n"
- "\tversion=%u\n"
- "\tserial=%u\n"
- "\tfields_size=%u\n"
- "\tbody_size=%u\n"
- "\tpath=%s\n"
- "\tinterface=%s\n"
- "\tmember=%s\n"
- "\tdestination=%s\n"
- "\tsender=%s\n"
- "\tsignature=%s\n"
- "\treply_serial=%u\n"
- "\terror.name=%s\n"
- "\terror.message=%s\n"
- "\tsealed=%s\n"
- "\tn_body_parts=%u\n",
- m,
- m->n_ref,
- m->header->endian,
- m->header->type,
- m->header->flags,
- m->header->version,
- BUS_MESSAGE_SERIAL(m),
- BUS_MESSAGE_FIELDS_SIZE(m),
- BUS_MESSAGE_BODY_SIZE(m),
- strna(m->path),
- strna(m->interface),
- strna(m->member),
- strna(m->destination),
- strna(m->sender),
- strna(m->root_container.signature),
- m->reply_serial,
- strna(m->error.name),
- strna(m->error.message),
- yes_no(m->sealed),
- m->n_body_parts);
-
- if (m->pid != 0)
- printf("\tpid=%lu\n", (unsigned long) m->pid);
- if (m->tid != 0)
- printf("\ttid=%lu\n", (unsigned long) m->tid);
- if (m->uid_valid)
- printf("\tuid=%lu\n", (unsigned long) m->uid);
- if (m->gid_valid)
- printf("\tgid=%lu\n", (unsigned long) m->gid);
- if (m->pid_starttime != 0)
- printf("\tpid_starttime=%llu\n", (unsigned long long) m->pid_starttime);
- if (m->monotonic != 0)
- printf("\tmonotonic=%llu\n", (unsigned long long) m->monotonic);
- if (m->realtime != 0)
- printf("\trealtime=%llu\n", (unsigned long long) m->realtime);
- if (m->exe)
- printf("\texe=[%s]\n", m->exe);
- if (m->comm)
- printf("\tcomm=[%s]\n", m->comm);
- if (m->tid_comm)
- printf("\ttid_comm=[%s]\n", m->tid_comm);
- if (m->label)
- printf("\tlabel=[%s]\n", m->label);
- if (m->cgroup)
- printf("\tcgroup=[%s]\n", m->cgroup);
-
- sd_bus_message_get_unit(m, &u);
- if (u)
- printf("\tunit=[%s]\n", u);
- sd_bus_message_get_user_unit(m, &uu);
- if (uu)
- printf("\tuser_unit=[%s]\n", uu);
- sd_bus_message_get_session(m, &s);
- if (s)
- printf("\tsession=[%s]\n", s);
- if (sd_bus_message_get_owner_uid(m, &owner) >= 0)
- printf("\towner_uid=%lu\n", (unsigned long) owner);
- if (sd_bus_message_get_audit_loginuid(m, &audit_loginuid) >= 0)
- printf("\taudit_loginuid=%lu\n", (unsigned long) audit_loginuid);
- if (sd_bus_message_get_audit_sessionid(m, &audit_sessionid) >= 0)
- printf("\taudit_sessionid=%lu\n", (unsigned long) audit_sessionid);
-
- printf("\tCAP_KILL=%i\n", sd_bus_message_has_effective_cap(m, 5));
-
- if (sd_bus_message_get_cmdline(m, &cmdline) >= 0) {
- char **c;
-
- fputs("\tcmdline=[", stdout);
- STRV_FOREACH(c, cmdline) {
- if (c != cmdline)
- putchar(' ');
-
- fputs(*c, stdout);
- }
+ if (!f)
+ f = stdout;
+
+ if (with_header) {
+ fprintf(f,
+ "Message %p\n"
+ "\tn_ref=%u\n"
+ "\tendian=%c\n"
+ "\ttype=%i\n"
+ "\tflags=%u\n"
+ "\tversion=%u\n"
+ "\tserial=%u\n"
+ "\tfields_size=%u\n"
+ "\tbody_size=%u\n"
+ "\tpath=%s\n"
+ "\tinterface=%s\n"
+ "\tmember=%s\n"
+ "\tdestination=%s\n"
+ "\tsender=%s\n"
+ "\tsignature=%s\n"
+ "\treply_serial=%u\n"
+ "\tsealed=%s\n"
+ "\tn_body_parts=%u\n",
+ m,
+ m->n_ref,
+ m->header->endian,
+ m->header->type,
+ m->header->flags,
+ m->header->version,
+ BUS_MESSAGE_SERIAL(m),
+ BUS_MESSAGE_FIELDS_SIZE(m),
+ BUS_MESSAGE_BODY_SIZE(m),
+ strna(m->path),
+ strna(m->interface),
+ strna(m->member),
+ strna(m->destination),
+ strna(m->sender),
+ strna(m->root_container.signature),
+ m->reply_serial,
+ yes_no(m->sealed),
+ m->n_body_parts);
+
+ if (sd_bus_error_is_set(&m->error))
+ fprintf(f,
+ "\terror.name=%s\n"
+ "\terror.message=%s\n",
+ strna(m->error.name),
+ strna(m->error.message));
+
+ if (m->pid != 0)
+ fprintf(f, "\tpid=%lu\n", (unsigned long) m->pid);
+ if (m->tid != 0)
+ fprintf(f, "\ttid=%lu\n", (unsigned long) m->tid);
+ if (m->uid_valid)
+ fprintf(f, "\tuid=%lu\n", (unsigned long) m->uid);
+ if (m->gid_valid)
+ fprintf(f, "\tgid=%lu\n", (unsigned long) m->gid);
+ if (m->pid_starttime != 0)
+ fprintf(f, "\tpid_starttime=%llu\n", (unsigned long long) m->pid_starttime);
+ if (m->monotonic != 0)
+ fprintf(f, "\tmonotonic=%llu\n", (unsigned long long) m->monotonic);
+ if (m->realtime != 0)
+ fprintf(f, "\trealtime=%llu\n", (unsigned long long) m->realtime);
+ if (m->exe)
+ fprintf(f, "\texe=[%s]\n", m->exe);
+ if (m->comm)
+ fprintf(f, "\tcomm=[%s]\n", m->comm);
+ if (m->tid_comm)
+ fprintf(f, "\ttid_comm=[%s]\n", m->tid_comm);
+ if (m->label)
+ fprintf(f, "\tlabel=[%s]\n", m->label);
+ if (m->cgroup)
+ fprintf(f, "\tcgroup=[%s]\n", m->cgroup);
+
+ sd_bus_message_get_unit(m, &u);
+ if (u)
+ fprintf(f, "\tunit=[%s]\n", u);
+ sd_bus_message_get_user_unit(m, &uu);
+ if (uu)
+ fprintf(f, "\tuser_unit=[%s]\n", uu);
+ sd_bus_message_get_session(m, &s);
+ if (s)
+ fprintf(f, "\tsession=[%s]\n", s);
+ if (sd_bus_message_get_owner_uid(m, &owner) >= 0)
+ fprintf(f, "\towner_uid=%lu\n", (unsigned long) owner);
+ if (sd_bus_message_get_audit_loginuid(m, &audit_loginuid) >= 0)
+ fprintf(f, "\taudit_loginuid=%lu\n", (unsigned long) audit_loginuid);
+ if (sd_bus_message_get_audit_sessionid(m, &audit_sessionid) >= 0)
+ fprintf(f, "\taudit_sessionid=%lu\n", (unsigned long) audit_sessionid);
+
+ r = sd_bus_message_has_effective_cap(m, 5);
+ if (r >= 0)
+ fprintf(f, "\tCAP_KILL=%s\n", yes_no(r));
+
+ if (sd_bus_message_get_cmdline(m, &cmdline) >= 0) {
+ char **c;
+
+ fputs("\tcmdline=[", f);
+ STRV_FOREACH(c, cmdline) {
+ if (c != cmdline)
+ fputc(' ', f);
+
+ fputs(*c, f);
+ }
- fputs("]\n", stdout);
+ fputs("]\n", f);
+ }
}
r = sd_bus_message_rewind(m, true);
return r;
}
- printf("BEGIN_MESSAGE \"%s\" {\n", strempty(m->root_container.signature));
+ fprintf(f, "BEGIN_MESSAGE \"%s\" {\n", strempty(m->root_container.signature));
for(;;) {
_cleanup_free_ char *prefix = NULL;
return log_oom();
if (type == SD_BUS_TYPE_ARRAY)
- printf("%s} END_ARRAY \n", prefix);
+ fprintf(f, "%s} END_ARRAY \n", prefix);
else if (type == SD_BUS_TYPE_VARIANT)
- printf("%s} END_VARIANT\n", prefix);
+ fprintf(f, "%s} END_VARIANT\n", prefix);
else if (type == SD_BUS_TYPE_STRUCT)
- printf("%s} END_STRUCT\n", prefix);
+ fprintf(f, "%s} END_STRUCT\n", prefix);
else if (type == SD_BUS_TYPE_DICT_ENTRY)
- printf("%s} END_DICT_ENTRY\n", prefix);
+ fprintf(f, "%s} END_DICT_ENTRY\n", prefix);
continue;
}
}
if (type == SD_BUS_TYPE_ARRAY)
- printf("%sBEGIN_ARRAY \"%s\" {\n", prefix, contents);
+ fprintf(f, "%sBEGIN_ARRAY \"%s\" {\n", prefix, contents);
else if (type == SD_BUS_TYPE_VARIANT)
- printf("%sBEGIN_VARIANT \"%s\" {\n", prefix, contents);
+ fprintf(f, "%sBEGIN_VARIANT \"%s\" {\n", prefix, contents);
else if (type == SD_BUS_TYPE_STRUCT)
- printf("%sBEGIN_STRUCT \"%s\" {\n", prefix, contents);
+ fprintf(f, "%sBEGIN_STRUCT \"%s\" {\n", prefix, contents);
else if (type == SD_BUS_TYPE_DICT_ENTRY)
- printf("%sBEGIN_DICT_ENTRY \"%s\" {\n", prefix, contents);
+ fprintf(f, "%sBEGIN_DICT_ENTRY \"%s\" {\n", prefix, contents);
level ++;
return r;
}
+ assert(r > 0);
+
switch (type) {
case SD_BUS_TYPE_BYTE:
- printf("%sBYTE: %u\n", prefix, basic.u8);
+ fprintf(f, "%sBYTE: %u\n", prefix, basic.u8);
break;
case SD_BUS_TYPE_BOOLEAN:
- printf("%sBOOLEAN: %s\n", prefix, yes_no(basic.i));
+ fprintf(f, "%sBOOLEAN: %s\n", prefix, yes_no(basic.i));
break;
case SD_BUS_TYPE_INT16:
- printf("%sINT16: %i\n", prefix, basic.s16);
+ fprintf(f, "%sINT16: %i\n", prefix, basic.s16);
break;
case SD_BUS_TYPE_UINT16:
- printf("%sUINT16: %u\n", prefix, basic.u16);
+ fprintf(f, "%sUINT16: %u\n", prefix, basic.u16);
break;
case SD_BUS_TYPE_INT32:
- printf("%sINT32: %i\n", prefix, basic.s32);
+ fprintf(f, "%sINT32: %i\n", prefix, basic.s32);
break;
case SD_BUS_TYPE_UINT32:
- printf("%sUINT32: %u\n", prefix, basic.u32);
+ fprintf(f, "%sUINT32: %u\n", prefix, basic.u32);
break;
case SD_BUS_TYPE_INT64:
- printf("%sINT64: %lli\n", prefix, (long long) basic.s64);
+ fprintf(f, "%sINT64: %lli\n", prefix, (long long) basic.s64);
break;
case SD_BUS_TYPE_UINT64:
- printf("%sUINT64: %llu\n", prefix, (unsigned long long) basic.u64);
+ fprintf(f, "%sUINT64: %llu\n", prefix, (unsigned long long) basic.u64);
break;
case SD_BUS_TYPE_DOUBLE:
- printf("%sDOUBLE: %g\n", prefix, basic.d64);
+ fprintf(f, "%sDOUBLE: %g\n", prefix, basic.d64);
break;
case SD_BUS_TYPE_STRING:
- printf("%sSTRING: \"%s\"\n", prefix, basic.string);
+ fprintf(f, "%sSTRING: \"%s\"\n", prefix, basic.string);
break;
case SD_BUS_TYPE_OBJECT_PATH:
- printf("%sOBJECT_PATH: \"%s\"\n", prefix, basic.string);
+ fprintf(f, "%sOBJECT_PATH: \"%s\"\n", prefix, basic.string);
break;
case SD_BUS_TYPE_SIGNATURE:
- printf("%sSIGNATURE: \"%s\"\n", prefix, basic.string);
+ fprintf(f, "%sSIGNATURE: \"%s\"\n", prefix, basic.string);
break;
case SD_BUS_TYPE_UNIX_FD:
- printf("%sUNIX_FD: %i\n", prefix, basic.i);
+ fprintf(f, "%sUNIX_FD: %i\n", prefix, basic.i);
break;
default:
}
}
- printf("} END_MESSAGE\n");
+ fprintf(f, "} END_MESSAGE\n");
return 0;
}
return 0;
}
-int bus_message_to_errno(sd_bus_message *m) {
- assert(m);
+int sd_bus_message_get_errno(sd_bus_message *m) {
+ assert_return(m, -EINVAL);
- if (m->header->type != SD_BUS_MESSAGE_TYPE_METHOD_ERROR)
+ if (m->header->type != SD_BUS_MESSAGE_METHOD_ERROR)
return 0;
- return bus_error_to_errno(&m->error);
+ return sd_bus_error_get_errno(&m->error);
+}
+
+const char* sd_bus_message_get_signature(sd_bus_message *m, int complete) {
+ struct bus_container *c;
+
+ if (!m)
+ return NULL;
+
+ c = complete ? &m->root_container : message_get_container(m);
+ return c->signature ?: "";
+}
+
+int sd_bus_message_copy(sd_bus_message *m, sd_bus_message *source, int all) {
+ bool done_something = false;
+ int r;
+
+ assert_return(m, -EINVAL);
+ assert_return(source, -EINVAL);
+ assert_return(!m->sealed, -EPERM);
+ assert_return(source->sealed, -EPERM);
+
+ do {
+ const char *contents;
+ char type;
+ union {
+ uint8_t u8;
+ uint16_t u16;
+ int16_t s16;
+ uint32_t u32;
+ int32_t s32;
+ uint64_t u64;
+ int64_t s64;
+ double d64;
+ const char *string;
+ int i;
+ } basic;
+
+ r = sd_bus_message_peek_type(source, &type, &contents);
+ if (r < 0)
+ return r;
+ if (r == 0)
+ break;
+
+ done_something = true;
+
+ if (bus_type_is_container(type) > 0) {
+
+ r = sd_bus_message_enter_container(source, type, contents);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_open_container(m, type, contents);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_copy(m, source, true);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_close_container(m);
+ if (r < 0)
+ return r;
+
+ r = sd_bus_message_exit_container(source);
+ if (r < 0)
+ return r;
+
+ continue;
+ }
+
+ r = sd_bus_message_read_basic(source, type, &basic);
+ if (r < 0)
+ return r;
+
+ assert(r > 0);
+
+ if (type == SD_BUS_TYPE_OBJECT_PATH ||
+ type == SD_BUS_TYPE_SIGNATURE ||
+ type == SD_BUS_TYPE_STRING)
+ r = sd_bus_message_append_basic(m, type, basic.string);
+ else
+ r = sd_bus_message_append_basic(m, type, &basic);
+
+ if (r < 0)
+ return r;
+
+ } while (all);
+
+ return done_something;
+}
+
+int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *contents) {
+ const char *c;
+ char t;
+ int r;
+
+ assert_return(m, -EINVAL);
+ assert_return(m->sealed, -EPERM);
+ assert_return(!type || bus_type_is_valid(type), -EINVAL);
+ assert_return(!contents || signature_is_valid(contents, true), -EINVAL);
+ assert_return(type || contents, -EINVAL);
+ assert_return(!contents || !type || bus_type_is_container(type), -EINVAL);
+
+ r = sd_bus_message_peek_type(m, &t, &c);
+ if (r <= 0)
+ return r;
+
+ if (type != 0 && type != t)
+ return 0;
+
+ if (contents && !streq_ptr(contents, c))
+ return 0;
+
+ return 1;
}
~ianmdlvl / elogind.git / blobdiff