From fd7d3c495ee89f3115788b356533571ecf9b6df1 Mon Sep 17 00:00:00 2001 From: Nishant Chaprana Date: Thu, 17 Sep 2015 18:16:03 +0530 Subject: [PATCH] D-BUS: dev_passwd_id should be "q" because it uses DBUS_TYPE_UINT16 This corrects the type of dev_passwd_id in GONegotiationRequest event. This field is packed as DBUS_TYPE_UINT16 but in wpas_dbus_interface_signals it was "i" which is DBUS_TYPE_INT32. Signed-off-by: Nishant Chaprana --- doc/dbus.doxygen | 2 +- wpa_supplicant/dbus/dbus_new.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen index d46e50016..912bc7cd2 100644 --- a/doc/dbus.doxygen +++ b/doc/dbus.doxygen @@ -1415,7 +1415,7 @@ Interface for performing P2P (Wi-Fi Peer-to-Peer) P2P Device operations.
  • -

    GONegotiationRequest ( o : path, i : dev_passwd_id, y : device_go_intent )

    +

    GONegotiationRequest ( o : path, q : dev_passwd_id, y : device_go_intent )

  • diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index aaeabb5b2..f594959e6 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -3228,7 +3228,7 @@ static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = { { "GONegotiationRequest", WPAS_DBUS_NEW_IFACE_P2PDEVICE, { { "path", "o", ARG_OUT }, - { "dev_passwd_id", "i", ARG_OUT }, + { "dev_passwd_id", "q", ARG_OUT }, { "device_go_intent", "y", ARG_OUT }, END_ARGS }