diff mbox series

[BlueZ,4/4] tools/mesh-cfgclient: Add waiting for 'JoinComplete'

Message ID 20200408205255.45112-5-michal.lowas-rzechonek@silvair.com (mailing list archive)
State Superseded
Delegated to: Brian Gix
Headers show
Series mesh: Always deliver tokens via JoinComplete | expand

Commit Message

Michał Lowas-Rzechonek April 8, 2020, 8:52 p.m. UTC 
From: Przemysław Fierek <przemyslaw.fierek@silvair.com>

---
 tools/mesh-cfgclient.c | 73 ++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 32 deletions(-)

Comments

Stotland, Inga April 9, 2020, 6:23 a.m. UTC | #1 
Hi Fierek,

On Wed, 2020-04-08 at 22:52 +0200, Michał Lowas-Rzechonek wrote:
> From: Przemysław Fierek <
> przemyslaw.fierek@silvair.com
> >
> 
> ---
>  tools/mesh-cfgclient.c | 73 ++++++++++++++++++++++++--------------
> ----
>  1 file changed, 41 insertions(+), 32 deletions(-)
> 
> diff --git a/tools/mesh-cfgclient.c b/tools/mesh-cfgclient.c
> index 5b018eb4a..c5b6938ed 100644
> --- a/tools/mesh-cfgclient.c
> +++ b/tools/mesh-cfgclient.c
> @@ -707,44 +707,13 @@ static void attach_node_setup(struct
> l_dbus_message *msg, void *user_data)
>  static void create_net_reply(struct l_dbus_proxy *proxy,
>  				struct l_dbus_message *msg, void
> *user_data)
>  {
> -	char *str;
> -	uint64_t tmp;
> -
>  	if (l_dbus_message_is_error(msg)) {
>  		const char *name;
>  
>  		l_dbus_message_get_error(msg, &name, NULL);
>  		l_error("Failed to create network: %s", name);
>  		return;
> -
> -	}
> -
> -	if (!l_dbus_message_get_arguments(msg, "t", &tmp))
> -		return;
> -
> -	local = l_new(struct meshcfg_node, 1);
> -	local->token.u64 = l_get_be64(&tmp);
> -	str = l_util_hexstring(&local->token.u8[0], 8);
> -	bt_shell_printf("Created new node with token %s\n", str);
> -	l_free(str);
> -
> -	if (!mesh_db_create(cfg_fname, local->token.u8,
> -						"Mesh Config Client
> Network")) {
> -		l_free(local);
> -		local = NULL;
> -		return;
>  	}
> -
> -	mesh_db_set_addr_range(low_addr, high_addr);
> -	keys_add_net_key(PRIMARY_NET_IDX);
> -	mesh_db_net_key_add(PRIMARY_NET_IDX);
> -
> -	remote_add_node(app.uuid, 0x0001, 1, PRIMARY_NET_IDX);
> -	mesh_db_add_node(app.uuid, 0x0001, 1, PRIMARY_NET_IDX);
> -
> -	l_dbus_proxy_method_call(net_proxy, "Attach",
> attach_node_setup,
> -						attach_node_reply,
> NULL,
> -						NULL);
>  }
>  
>  static void create_net_setup(struct l_dbus_message *msg, void
> *user_data)
> @@ -1727,7 +1696,7 @@ static struct l_dbus_message
> *add_node_fail_call(struct l_dbus *dbus,
>  static void setup_prov_iface(struct l_dbus_interface *iface)
>  {
>  	l_dbus_interface_method(iface, "ScanResult", 0,
> scan_result_call, "",
> -						"naya{sv}", "rssi",
> "data", "options");
> +					"naya{sv}", "rssi", "data",
> "options");
>  
>  	l_dbus_interface_method(iface, "RequestProvData", 0,
> req_prov_call,
>  				"qq", "y", "net_index", "unicast",
> "count");
> @@ -1779,6 +1748,43 @@ static bool crpl_getter(struct l_dbus *dbus,
>  	return true;
>  }
>  
> +static struct l_dbus_message *join_complete(struct l_dbus *dbus,
> +						struct l_dbus_message
> *message,
> +						void *user_data)
> +{
> +	char *str;
> +	uint64_t tmp;
> +
> +	if (!l_dbus_message_get_arguments(message, "t", &tmp))
> +		return l_dbus_message_new_error(message, dbus_err_args,
> NULL);
> +
> +	local = l_new(struct meshcfg_node, 1);
> +	local->token.u64 = l_get_be64(&tmp);
> +	str = l_util_hexstring(&local->token.u8[0], 8);
> +	bt_shell_printf("Created new node with token %s\n", str);
> +	l_free(str);
> +
> +	if (!mesh_db_create(cfg_fname, local->token.u8,
> +					"Mesh Config Client Network"))
> {
> +		l_free(local);
> +		local = NULL;
> +		return l_dbus_message_new_error(message, dbus_err_fail,
> NULL);
> +	}
> +
> +	mesh_db_set_addr_range(low_addr, high_addr);
> +	keys_add_net_key(PRIMARY_NET_IDX);
> +	mesh_db_net_key_add(PRIMARY_NET_IDX);
> +
> +	remote_add_node(app.uuid, 0x0001, 1, PRIMARY_NET_IDX);
> +	mesh_db_add_node(app.uuid, 0x0001, 1, PRIMARY_NET_IDX);
> +
> +	l_dbus_proxy_method_call(net_proxy, "Attach",
> attach_node_setup,
> +						attach_node_reply,
> NULL,
> +						NULL);

I don't think it's a good idea to call Attach() before sending a
successful reply to JoinComplete. One way of dealing with this (to
avoid creating a separate menu command for attaching) would be to wrap
Attach in l_idle_oneshot() 

> +
> +	return l_dbus_message_new_method_return(message);
> +}
> +
>  static void setup_app_iface(struct l_dbus_interface *iface)
>  {
>  	l_dbus_interface_property(iface, "CompanyID", 0, "q",
> cid_getter,
> @@ -1789,6 +1795,9 @@ static void setup_app_iface(struct
> l_dbus_interface *iface)
>  									
> NULL);
>  	l_dbus_interface_property(iface, "CRPL", 0, "q", crpl_getter,
> NULL);
>  
> +	l_dbus_interface_method(iface, "JoinComplete", 0,
> join_complete,
> +							"", "t",
> "token");
> +
>  	/* TODO: Methods */
>  }

Regards,
Inga
diff mbox series

Patch

diff --git a/tools/mesh-cfgclient.c b/tools/mesh-cfgclient.c
index 5b018eb4a..c5b6938ed 100644
--- a/tools/mesh-cfgclient.c
+++ b/tools/mesh-cfgclient.c
@@ -707,44 +707,13 @@  static void attach_node_setup(struct l_dbus_message *msg, void *user_data)
 static void create_net_reply(struct l_dbus_proxy *proxy,
 				struct l_dbus_message *msg, void *user_data)
 {
-	char *str;
-	uint64_t tmp;
-
 	if (l_dbus_message_is_error(msg)) {
 		const char *name;
 
 		l_dbus_message_get_error(msg, &name, NULL);
 		l_error("Failed to create network: %s", name);
 		return;
-
-	}
-
-	if (!l_dbus_message_get_arguments(msg, "t", &tmp))
-		return;
-
-	local = l_new(struct meshcfg_node, 1);
-	local->token.u64 = l_get_be64(&tmp);
-	str = l_util_hexstring(&local->token.u8[0], 8);
-	bt_shell_printf("Created new node with token %s\n", str);
-	l_free(str);
-
-	if (!mesh_db_create(cfg_fname, local->token.u8,
-						"Mesh Config Client Network")) {
-		l_free(local);
-		local = NULL;
-		return;
 	}
-
-	mesh_db_set_addr_range(low_addr, high_addr);
-	keys_add_net_key(PRIMARY_NET_IDX);
-	mesh_db_net_key_add(PRIMARY_NET_IDX);
-
-	remote_add_node(app.uuid, 0x0001, 1, PRIMARY_NET_IDX);
-	mesh_db_add_node(app.uuid, 0x0001, 1, PRIMARY_NET_IDX);
-
-	l_dbus_proxy_method_call(net_proxy, "Attach", attach_node_setup,
-						attach_node_reply, NULL,
-						NULL);
 }
 
 static void create_net_setup(struct l_dbus_message *msg, void *user_data)
@@ -1727,7 +1696,7 @@  static struct l_dbus_message *add_node_fail_call(struct l_dbus *dbus,
 static void setup_prov_iface(struct l_dbus_interface *iface)
 {
 	l_dbus_interface_method(iface, "ScanResult", 0, scan_result_call, "",
-						"naya{sv}", "rssi", "data", "options");
+					"naya{sv}", "rssi", "data", "options");
 
 	l_dbus_interface_method(iface, "RequestProvData", 0, req_prov_call,
 				"qq", "y", "net_index", "unicast", "count");
@@ -1779,6 +1748,43 @@  static bool crpl_getter(struct l_dbus *dbus,
 	return true;
 }
 
+static struct l_dbus_message *join_complete(struct l_dbus *dbus,
+						struct l_dbus_message *message,
+						void *user_data)
+{
+	char *str;
+	uint64_t tmp;
+
+	if (!l_dbus_message_get_arguments(message, "t", &tmp))
+		return l_dbus_message_new_error(message, dbus_err_args, NULL);
+
+	local = l_new(struct meshcfg_node, 1);
+	local->token.u64 = l_get_be64(&tmp);
+	str = l_util_hexstring(&local->token.u8[0], 8);
+	bt_shell_printf("Created new node with token %s\n", str);
+	l_free(str);
+
+	if (!mesh_db_create(cfg_fname, local->token.u8,
+					"Mesh Config Client Network")) {
+		l_free(local);
+		local = NULL;
+		return l_dbus_message_new_error(message, dbus_err_fail, NULL);
+	}
+
+	mesh_db_set_addr_range(low_addr, high_addr);
+	keys_add_net_key(PRIMARY_NET_IDX);
+	mesh_db_net_key_add(PRIMARY_NET_IDX);
+
+	remote_add_node(app.uuid, 0x0001, 1, PRIMARY_NET_IDX);
+	mesh_db_add_node(app.uuid, 0x0001, 1, PRIMARY_NET_IDX);
+
+	l_dbus_proxy_method_call(net_proxy, "Attach", attach_node_setup,
+						attach_node_reply, NULL,
+						NULL);
+
+	return l_dbus_message_new_method_return(message);
+}
+
 static void setup_app_iface(struct l_dbus_interface *iface)
 {
 	l_dbus_interface_property(iface, "CompanyID", 0, "q", cid_getter,
@@ -1789,6 +1795,9 @@  static void setup_app_iface(struct l_dbus_interface *iface)
 									NULL);
 	l_dbus_interface_property(iface, "CRPL", 0, "q", crpl_getter, NULL);
 
+	l_dbus_interface_method(iface, "JoinComplete", 0, join_complete,
+							"", "t", "token");
+
 	/* TODO: Methods */
 }