Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   =?UTF-8?q?Rafa=C5=82=20Gajda?= <rafal.gajda@silvair.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     =?UTF-8?q?Rafa=C5=82=20Gajda?= <rafal.gajda@silvair.com>
Subject: [PATCH BlueZ] mesh: Fix names of dbus management interface input arguments
Date:   Wed, 20 Nov 2019 10:09:29 +0100
Message-Id: <20191120090930.3993-1-rafal.gajda@silvair.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Previously names for method arguments in "org.bluez.mesh.Management1"
would not register properly, being shifted by one:
     <method name="ImportRemoteNode">
		 <arg name="" type="q" direction="in"/>
		 <arg name="primary" type="y" direction="in"/>
		 <arg name="count" type="ay" direction="in"/>
	 </method>

 This fixes this issue:
	 <method name="ImportRemoteNode">
		 <arg name="primary" type="q" direction="in"/>
		 <arg name="count" type="y" direction="in"/>
		 <arg name="dev_key" type="ay" direction="in"/>
	 </method>
---
 mesh/manager.c | 60 ++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/mesh/manager.c b/mesh/manager.c
index adbb01280..1ad6c126d 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
@@ -750,37 +750,35 @@ static struct l_dbus_message *set_key_phase_call(struct l_dbus *dbus,
 
 static void setup_management_interface(struct l_dbus_interface *iface)
 {
-	l_dbus_interface_method(iface, "AddNode", 0, add_node_call, "", "ay",
-								"uuid");
-	l_dbus_interface_method(iface, "ImportRemoteNode", 0, import_node_call,
-						"", "qyay", "", "primary",
-						"count", "dev_key");
-	l_dbus_interface_method(iface, "DeleteRemoteNode", 0, delete_node_call,
-					"", "qy", "", "primary", "count");
-	l_dbus_interface_method(iface, "UnprovisionedScan", 0, start_scan_call,
-							"", "q", "", "seconds");
-	l_dbus_interface_method(iface, "UnprovisionedScanCancel", 0,
-						cancel_scan_call, "", "");
-	l_dbus_interface_method(iface, "CreateSubnet", 0, create_subnet_call,
-						"", "q", "", "net_index");
-	l_dbus_interface_method(iface, "UpdateSubnet", 0, update_subnet_call,
-						"", "q", "", "net_index");
-	l_dbus_interface_method(iface, "DeleteSubnet", 0, delete_subnet_call,
-						"", "q", "", "net_index");
-	l_dbus_interface_method(iface, "ImportSubnet", 0, import_subnet_call,
-					"", "qay", "", "net_index", "net_key");
-	l_dbus_interface_method(iface, "CreateAppKey", 0, create_appkey_call,
-					"", "qq", "", "net_index", "app_index");
-	l_dbus_interface_method(iface, "UpdateAppKey", 0, update_appkey_call,
-						"", "q", "", "app_index");
-	l_dbus_interface_method(iface, "DeleteAppKey", 0, delete_appkey_call,
-						"", "q", "", "app_index");
-	l_dbus_interface_method(iface, "ImportAppKey", 0, import_appkey_call,
-				"", "qqay", "", "net_index", "app_index",
-								"app_key");
-	l_dbus_interface_method(iface, "SetKeyPhase", 0, set_key_phase_call,
-					"", "qy", "", "net_index", "phase");
-}
+    l_dbus_interface_method(iface, "AddNode", 0, add_node_call, "",
+                            "ay", "uuid");
+    l_dbus_interface_method(iface, "ImportRemoteNode", 0, import_node_call, "",
+                            "qyay", "primary", "count", "dev_key");
+    l_dbus_interface_method(iface, "DeleteRemoteNode", 0, delete_node_call, "",
+                            "qy", "primary", "count");
+    l_dbus_interface_method(iface, "UnprovisionedScan", 0, start_scan_call, "",
+                            "q", "seconds");
+    l_dbus_interface_method(iface, "UnprovisionedScanCancel", 0, cancel_scan_call, "",
+                            "");
+    l_dbus_interface_method(iface, "CreateSubnet", 0, create_subnet_call, "",
+                            "q", "net_index");
+    l_dbus_interface_method(iface, "UpdateSubnet", 0, update_subnet_call, "",
+                            "q", "net_index");
+    l_dbus_interface_method(iface, "DeleteSubnet", 0, delete_subnet_call, "",
+                            "q", "net_index");
+    l_dbus_interface_method(iface, "ImportSubnet", 0, import_subnet_call, "",
+                            "qay", "net_index", "net_key");
+    l_dbus_interface_method(iface, "CreateAppKey", 0, create_appkey_call, "",
+                            "qq", "net_index", "app_index");
+    l_dbus_interface_method(iface, "UpdateAppKey", 0, update_appkey_call, "",
+                            "q", "app_index");
+    l_dbus_interface_method(iface, "DeleteAppKey", 0, delete_appkey_call, "",
+                            "q", "app_index");
+    l_dbus_interface_method(iface, "ImportAppKey", 0, import_appkey_call, "",
+                            "qqay", "net_index", "app_index", "app_key");
+    l_dbus_interface_method(iface, "SetKeyPhase", 0, set_key_phase_call, "",
+                            "qy", "net_index", "phase");
+ }
 
 bool manager_dbus_init(struct l_dbus *bus)
 {
-- 
2.22.0