From: Nishant Chaprana <n.chaprana@samsung.com>
Date: Thu, 17 Sep 2015 12:46:03 +0000 (+0530)
Subject: D-BUS: dev_passwd_id should be "q" because it uses DBUS_TYPE_UINT16
X-Git-Tag: hostap_2_5~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd7d3c495ee89f3115788b356533571ecf9b6df1;p=thirdparty%2Fhostap.git

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 <n.chaprana@samsung.com>
---

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.
   </li>
 
   <li>
-    <h3>GONegotiationRequest ( o : path, i : dev_passwd_id, y : device_go_intent )</h3>
+    <h3>GONegotiationRequest ( o : path, q : dev_passwd_id, y : device_go_intent )</h3>
   </li>
 
   <li>
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
 	  }