* [PATCH BlueZ v2] mesh: Fix names of dbus management interface input arguments
@ 2019-11-20 10:49 Rafał Gajda
2019-11-20 22:53 ` Gix, Brian
0 siblings, 1 reply; 2+ messages in thread
From: Rafał Gajda @ 2019-11-20 10:49 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Rafał Gajda
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>
---
v2 - Fixed coding standard
mesh/manager.c | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/mesh/manager.c b/mesh/manager.c
index adbb01280..1fb9df5e6 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
@@ -750,36 +750,34 @@ 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, "AddNode", 0, add_node_call,
+ "", "ay", "uuid");
l_dbus_interface_method(iface, "ImportRemoteNode", 0, import_node_call,
- "", "qyay", "", "primary",
- "count", "dev_key");
+ "", "qyay", "primary", "count", "dev_key");
l_dbus_interface_method(iface, "DeleteRemoteNode", 0, delete_node_call,
- "", "qy", "", "primary", "count");
+ "", "qy", "primary", "count");
l_dbus_interface_method(iface, "UnprovisionedScan", 0, start_scan_call,
- "", "q", "", "seconds");
+ "", "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");
+ "", "q", "net_index");
l_dbus_interface_method(iface, "UpdateSubnet", 0, update_subnet_call,
- "", "q", "", "net_index");
+ "", "q", "net_index");
l_dbus_interface_method(iface, "DeleteSubnet", 0, delete_subnet_call,
- "", "q", "", "net_index");
+ "", "q", "net_index");
l_dbus_interface_method(iface, "ImportSubnet", 0, import_subnet_call,
- "", "qay", "", "net_index", "net_key");
+ "", "qay", "net_index", "net_key");
l_dbus_interface_method(iface, "CreateAppKey", 0, create_appkey_call,
- "", "qq", "", "net_index", "app_index");
+ "", "qq", "net_index", "app_index");
l_dbus_interface_method(iface, "UpdateAppKey", 0, update_appkey_call,
- "", "q", "", "app_index");
+ "", "q", "app_index");
l_dbus_interface_method(iface, "DeleteAppKey", 0, delete_appkey_call,
- "", "q", "", "app_index");
+ "", "q", "app_index");
l_dbus_interface_method(iface, "ImportAppKey", 0, import_appkey_call,
- "", "qqay", "", "net_index", "app_index",
- "app_key");
+ "", "qqay", "net_index", "app_index", "app_key");
l_dbus_interface_method(iface, "SetKeyPhase", 0, set_key_phase_call,
- "", "qy", "", "net_index", "phase");
+ "", "qy", "net_index", "phase");
}
bool manager_dbus_init(struct l_dbus *bus)
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH BlueZ v2] mesh: Fix names of dbus management interface input arguments
2019-11-20 10:49 [PATCH BlueZ v2] mesh: Fix names of dbus management interface input arguments Rafał Gajda
@ 2019-11-20 22:53 ` Gix, Brian
0 siblings, 0 replies; 2+ messages in thread
From: Gix, Brian @ 2019-11-20 22:53 UTC (permalink / raw)
To: linux-bluetooth, rafal.gajda
Applied, Thanks
On Wed, 2019-11-20 at 11:49 +0100, Rafał Gajda wrote:
> 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>
> ---
>
> v2 - Fixed coding standard
>
> mesh/manager.c | 30 ++++++++++++++----------------
> 1 file changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/mesh/manager.c b/mesh/manager.c
> index adbb01280..1fb9df5e6 100644
> --- a/mesh/manager.c
> +++ b/mesh/manager.c
> @@ -750,36 +750,34 @@ 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, "AddNode", 0, add_node_call,
> + "", "ay", "uuid");
> l_dbus_interface_method(iface, "ImportRemoteNode", 0, import_node_call,
> - "", "qyay", "", "primary",
> - "count", "dev_key");
> + "", "qyay", "primary", "count", "dev_key");
> l_dbus_interface_method(iface, "DeleteRemoteNode", 0, delete_node_call,
> - "", "qy", "", "primary", "count");
> + "", "qy", "primary", "count");
> l_dbus_interface_method(iface, "UnprovisionedScan", 0, start_scan_call,
> - "", "q", "", "seconds");
> + "", "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");
> + "", "q", "net_index");
> l_dbus_interface_method(iface, "UpdateSubnet", 0, update_subnet_call,
> - "", "q", "", "net_index");
> + "", "q", "net_index");
> l_dbus_interface_method(iface, "DeleteSubnet", 0, delete_subnet_call,
> - "", "q", "", "net_index");
> + "", "q", "net_index");
> l_dbus_interface_method(iface, "ImportSubnet", 0, import_subnet_call,
> - "", "qay", "", "net_index", "net_key");
> + "", "qay", "net_index", "net_key");
> l_dbus_interface_method(iface, "CreateAppKey", 0, create_appkey_call,
> - "", "qq", "", "net_index", "app_index");
> + "", "qq", "net_index", "app_index");
> l_dbus_interface_method(iface, "UpdateAppKey", 0, update_appkey_call,
> - "", "q", "", "app_index");
> + "", "q", "app_index");
> l_dbus_interface_method(iface, "DeleteAppKey", 0, delete_appkey_call,
> - "", "q", "", "app_index");
> + "", "q", "app_index");
> l_dbus_interface_method(iface, "ImportAppKey", 0, import_appkey_call,
> - "", "qqay", "", "net_index", "app_index",
> - "app_key");
> + "", "qqay", "net_index", "app_index", "app_key");
> l_dbus_interface_method(iface, "SetKeyPhase", 0, set_key_phase_call,
> - "", "qy", "", "net_index", "phase");
> + "", "qy", "net_index", "phase");
> }
>
> bool manager_dbus_init(struct l_dbus *bus)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-20 22:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-20 10:49 [PATCH BlueZ v2] mesh: Fix names of dbus management interface input arguments Rafał Gajda
2019-11-20 22:53 ` Gix, Brian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).