Skip to content

Add support for remaining simple types. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HugoNikanor wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for remaining simple types. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b7f0c5
dbus/message: Fix appending primitive data types.
Feb 3, 2022
0896374
Fix dbus-message-get-args without type signature.
Feb 4, 2022
22fcd8a
dbus_value_to_scm implement remaining basic types.
Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 42 additions & 7 deletions libguile-dbus/dbus-message-func.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ GDBUS_DEFINE(gdbus_messsage_new_signal, "%make-dbus-message/signal", 3,
}
#undef FUNC_NAME

/* See https://dbus.freedesktop.org/doc/api/html/group__DBusProtocol.html */
GDBUS_DEFINE(gdbus_message_append_args, "%dbus-message-append-args", 2,
(SCM message, SCM args),
"Append arguments ARGS to the MESSAGE.")
Expand Down Expand Up @@ -178,13 +179,19 @@ GDBUS_DEFINE(gdbus_message_append_args, "%dbus-message-append-args", 2,
gdbus_error(FUNC_NAME, "Unknown type", scm_type);
}
switch (symbol->value) {
case DBUS_TYPE_BOOLEAN: {
/* This makes any non-false value true */
dbus_bool_t value = scm_is_true(scm_value);
dbus_message_iter_append_basic(&iter, symbol->value, &value);
break;
}
case DBUS_TYPE_BYTE: {
unsigned char value = scm_to_uchar(scm_value);
unsigned char value = scm_to_uint8(scm_value);
dbus_message_iter_append_basic(&iter, symbol->value, &value);
break;
}
case DBUS_TYPE_INT16: {
dbus_int16_t value = scm_to_short(scm_value);
dbus_int16_t value = scm_to_int16(scm_value);
dbus_message_iter_append_basic(&iter, symbol->value, &value);
break;
}
Expand All @@ -208,8 +215,33 @@ GDBUS_DEFINE(gdbus_message_append_args, "%dbus-message-append-args", 2,
dbus_message_iter_append_basic(&iter, symbol->value, &value);
break;
}
case DBUS_TYPE_UINT64: {
dbus_uint64_t value = scm_to_uint64(scm_value);
dbus_message_iter_append_basic(&iter, symbol->value, &value);
break;
}
/* Object paths and signatures technically have to be validated,
but are otherwise identical to strings. See
https://dbus.freedesktop.org/doc/dbus-specification.html#type-system */
case DBUS_TYPE_OBJECT_PATH:
case DBUS_TYPE_SIGNATURE:
case DBUS_TYPE_STRING: {
char* value = scm_to_locale_string(scm_value);
char* value = scm_to_utf8_stringn(scm_value, NULL);
dbus_message_iter_append_basic(&iter, symbol->value, &value);
break;
}
case DBUS_TYPE_DOUBLE: {
/* While techincly not exactly correct, since DBUS_TYPE_DOUBLE
marks an 8-byte IEEE754 double, while C doesn't have that
guarantee, it will still be right in 99%+ of cases */
double value = scm_to_double(scm_value);
dbus_message_iter_append_basic(&iter, symbol->value, &value);
break;
}
case DBUS_TYPE_UNIX_FD: {
/* Explicitly the system dependant int types, since
file descriptors are system dependant */
int value = scm_to_uint(scm_fileno(scm_value));
dbus_message_iter_append_basic(&iter, symbol->value, &value);
break;
}
Expand Down Expand Up @@ -241,8 +273,7 @@ GDBUS_DEFINE(gdbus_message_append_args, "%dbus-message-append-args", 2,
break;
}

case DBUS_TYPE_UINT64:
case DBUS_TYPE_DOUBLE:
default:
gdbus_error(FUNC_NAME, "Unsupported yet",
scm_list_2(message, args));
}
Expand Down Expand Up @@ -271,18 +302,22 @@ GDBUS_DEFINE(gdbus_message_get_args, "%dbus-message-get-args", 2,

if (scm_is_false(types)) {
if (! dbus_message_iter_init(data->message, &iter)) {
/* Message had no arguments, return our empty list */
return result;
}

for (; dbus_message_iter_has_next(&iter); dbus_message_iter_next(&iter)) {
int c_type = dbus_message_iter_get_arg_type(&iter);
int c_type;
while ((c_type = dbus_message_iter_get_arg_type(&iter))
!= DBUS_TYPE_INVALID) {
SCM type = dbus_type_to_scm(c_type);
DBusBasicValue c_value;

dbus_message_iter_get_basic(&iter, &c_value);

SCM value = dbus_value_to_scm(c_type, c_value);
result = scm_append(scm_list_2(result, scm_list_2(type, value)));

dbus_message_iter_next(&iter);
}
} else {
if (! dbus_message_iter_init(data->message, &iter)) {
Expand Down
18 changes: 15 additions & 3 deletions libguile-dbus/symbols.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ SCM dbus_value_to_scm(int type, DBusBasicValue value)
case DBUS_TYPE_INT16:
return scm_from_short(value.i16);

case DBUS_TYPE_INT32:
return scm_from_int32(value.i32);

case DBUS_TYPE_UINT16:
return scm_from_uint16(value.u16);

case DBUS_TYPE_INT32:
return scm_from_int32(value.i32);

case DBUS_TYPE_UINT32:
return scm_from_uint32(value.u32);

Expand All @@ -91,9 +91,21 @@ SCM dbus_value_to_scm(int type, DBusBasicValue value)
case DBUS_TYPE_DOUBLE:
return scm_from_double(value.dbl);

case DBUS_TYPE_OBJECT_PATH:
case DBUS_TYPE_SIGNATURE:
case DBUS_TYPE_STRING:
return scm_from_locale_string(value.str);

case DBUS_TYPE_BOOLEAN:
switch (value.bool_val) {
case TRUE: return SCM_BOOL_T;
case FALSE: return SCM_BOOL_F;
default: return SCM_BOOL_F; /* possibly throw errer here instead */
}

case DBUS_TYPE_UNIX_FD:
return scm_from_int(value.fd);

default:
return SCM_BOOL_F; /* The type is unsupported yet. */
}
Expand Down