diff options
| author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2012-05-21 11:07:13 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2012-05-23 11:30:47 +0300 |
| commit | 2296e03f07df61d0d5b6a4c1ce133345fbd62f76 (patch) | |
| tree | c74105b362435dc8b100656adf576d39c08d1df1 /client | |
| parent | ef722fbdfaf7d11e4d6163c215bf33f885600086 (diff) | |
| download | obexd-2296e03f07df61d0d5b6a4c1ce133345fbd62f76.tar.gz | |
client: Replace parameter dict with conventional ones
Diffstat (limited to 'client')
| -rw-r--r-- | client/manager.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/client/manager.c b/client/manager.c index 94bcbdf..9bb1465 100644 --- a/client/manager.c +++ b/client/manager.c @@ -105,8 +105,7 @@ done: } static int parse_device_dict(DBusMessageIter *iter, - const char **source, const char **dest, const char **target, - uint8_t *channel) + const char **source, const char **target, uint8_t *channel) { while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_DICT_ENTRY) { DBusMessageIter entry, value; @@ -122,8 +121,6 @@ static int parse_device_dict(DBusMessageIter *iter, case DBUS_TYPE_STRING: if (g_str_equal(key, "Source") == TRUE) dbus_message_iter_get_basic(&value, source); - else if (g_str_equal(key, "Destination") == TRUE) - dbus_message_iter_get_basic(&value, dest); else if (g_str_equal(key, "Target") == TRUE) dbus_message_iter_get_basic(&value, target); break; @@ -163,9 +160,20 @@ static DBusMessage *create_session(DBusConnection *connection, uint8_t channel = 0; dbus_message_iter_init(message, &iter); + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) + return g_dbus_create_error(message, + "org.openobex.Error.InvalidArguments", NULL); + + dbus_message_iter_get_basic(&iter, &dest); + dbus_message_iter_next(&iter); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) + return g_dbus_create_error(message, + "org.openobex.Error.InvalidArguments", NULL); + dbus_message_iter_recurse(&iter, &dict); - parse_device_dict(&dict, &source, &dest, &target, &channel); + parse_device_dict(&dict, &source, &target, &channel); if (dest == NULL || target == NULL) return g_dbus_create_error(message, "org.openobex.Error.InvalidArguments", NULL); @@ -223,7 +231,7 @@ static DBusMessage *remove_session(DBusConnection *connection, static const GDBusMethodTable client_methods[] = { { GDBUS_ASYNC_METHOD("CreateSession", - GDBUS_ARGS({ "devices", "a{sv}" }), + GDBUS_ARGS({ "destination", "s" }, { "args", "a{sv}" }), GDBUS_ARGS({ "session", "o" }), create_session) }, { GDBUS_ASYNC_METHOD("RemoveSession", GDBUS_ARGS({ "session", "o" }), NULL, remove_session) }, |