diff options
| author | Rafał Gajda <rafal.gajda@silvair.com> | 2019-11-20 10:09:29 +0100 |
|---|---|---|
| committer | Brian Gix <brian.gix@intel.com> | 2019-11-20 14:48:16 -0800 |
| commit | 56d144ca8fe035c0c36e9e007757b00d6c4ed585 (patch) | |
| tree | 3bbaab0825c37e29a704f214ad606b3bb7275b22 /mesh/manager.c | |
| parent | 81f7c2e15f0a73ca4551a5979f10686acd6a4670 (diff) | |
| download | bluez-56d144ca8fe035c0c36e9e007757b00d6c4ed585.tar.gz | |
mesh: Fix dbus management interface input params
Previously input parameters 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>
Diffstat (limited to 'mesh/manager.c')
| -rw-r--r-- | mesh/manager.c | 60 |
1 files 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) { |