From: Jouni Malinen Date: Wed, 31 Dec 2014 08:45:50 +0000 (+0200) Subject: D-Bus: Fix ServiceDiscoveryResponse to accept int32 dialog_token X-Git-Tag: hostap_2_4~611 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=2544394406424f0157b3e3a259a57a4b0fb0b202 D-Bus: Fix ServiceDiscoveryResponse to accept int32 dialog_token The ServiceDiscoveryRequest signal uses int32 for encoding dialog_token for some reason (even though this is a u8 field). ServiceDiscoveryResponse is supposed to accept the values from the signal as-is, so extend that to accept int32 in addition to the previously used uint32. Signed-off-by: Jouni Malinen --- diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c index 1a17e65..b1238ad 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c +++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c @@ -2638,7 +2638,8 @@ DBusMessage * wpas_dbus_handler_p2p_service_sd_res( entry.type == DBUS_TYPE_INT32) { freq = entry.uint32_value; } else if (!os_strcmp(entry.key, "dialog_token") && - entry.type == DBUS_TYPE_UINT32) { + (entry.type == DBUS_TYPE_UINT32 || + entry.type == DBUS_TYPE_INT32)) { dlg_tok = entry.uint32_value; } else if (!os_strcmp(entry.key, "tlvs")) { if (entry.type != DBUS_TYPE_ARRAY ||