2019-05-16 14:43:00

by Daniele Biagetti

[permalink] [raw]

Subject: [PATCH 1/4] meshctl: Subscription Delete message added to configuration client

---

Subscription delete command/message added to the
configuration client model.

Signed-off-by: Daniele Biagetti <[email protected]>

---
tools/mesh/config-client.c | 40 ++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)

diff --git a/tools/mesh/config-client.c b/tools/mesh/config-client.c
index df2643622..bff38e7a3 100644
--- a/tools/mesh/config-client.c
+++ b/tools/mesh/config-client.c
@@ -1042,6 +1042,44 @@ static void cmd_sub_get(int argc, char *argv[])
return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}

+static void cmd_sub_del(int argc, char *argv[])
+{
+ uint16_t n;
+ uint8_t msg[32];
+ int parm_cnt;
+
+ if (IS_UNASSIGNED(target)) {
+ bt_shell_printf("Destination not set\n");
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ n = mesh_opcode_set(OP_CONFIG_MODEL_SUB_DELETE, msg);
+
+ parm_cnt = read_input_parameters(argc, argv);
+ if (parm_cnt != 3) {
+ bt_shell_printf("Bad arguments: %s\n", argv[1]);
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ /* Per Mesh Profile 4.3.2.19 */
+ /* Element Address */
+ put_le16(parms[0], msg + n);
+ n += 2;
+ /* Subscription Address */
+ put_le16(parms[1], msg + n);
+ n += 2;
+ /* SIG Model ID */
+ put_le16(parms[2], msg + n);
+ n += 2;
+
+ if (!config_send(msg, n)) {
+ bt_shell_printf("Failed to send \"ADD SUBSCRIPTION\"\n");
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
static void cmd_mod_appidx_get(int argc, char *argv[])
{
uint16_t n;
@@ -1237,6 +1275,8 @@ static const struct bt_shell_menu cfg_menu = {
cmd_sub_add, "Add subscription"},
{"sub-get", "<ele_addr> <model id>",
cmd_sub_get, "Get subscription"},
+ {"sub-del", "<ele_addr> <sub_addr> <model id>",
+ cmd_sub_del, "Delete subscription"},
{"node-reset", NULL, cmd_node_reset,
"Reset a node and remove it from network"},
{} },
--
2.19.2.windows.1

2019-05-20 05:39:42

by Stotland, Inga

[permalink] [raw]

Subject: Re: [PATCH 1/4] meshctl: Subscription Delete message added to configuration client

---

Hi Daniele,

On Thu, 2019-05-16 at 16:35 +0200, Daniele Biagetti wrote:
> Subscription delete command/message added to the
> configuration client model.
>
> Signed-off-by: Daniele Biagetti <[email protected]>

The submitted patches should not contain "Signed-off-by"

>
> ---
> tools/mesh/config-client.c | 40
> ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 40 insertions(+)
>
> diff --git a/tools/mesh/config-client.c b/tools/mesh/config-client.c
> index df2643622..bff38e7a3 100644
> --- a/tools/mesh/config-client.c
> +++ b/tools/mesh/config-client.c
> @@ -1042,6 +1042,44 @@ static void cmd_sub_get(int argc, char
> *argv[])
> return bt_shell_noninteractive_quit(EXIT_SUCCESS);
> }
>
> +static void cmd_sub_del(int argc, char *argv[])
> +{
> + uint16_t n;
> + uint8_t msg[32];
> + int parm_cnt;
> +
> + if (IS_UNASSIGNED(target)) {
> + bt_shell_printf("Destination not set\n");
> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
> + }
> +
> + n = mesh_opcode_set(OP_CONFIG_MODEL_SUB_DELETE, msg);
> +
> + parm_cnt = read_input_parameters(argc, argv);
> + if (parm_cnt != 3) {
> + bt_shell_printf("Bad arguments: %s\n", argv[1]);
> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
> + }
> +
> + /* Per Mesh Profile 4.3.2.19 */
> + /* Element Address */
> + put_le16(parms[0], msg + n);
> + n += 2;
> + /* Subscription Address */
> + put_le16(parms[1], msg + n);
> + n += 2;
> + /* SIG Model ID */
> + put_le16(parms[2], msg + n);
> + n += 2;
> +
> + if (!config_send(msg, n)) {
> + bt_shell_printf("Failed to send \"ADD
> SUBSCRIPTION\"\n");
> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
> + }
> +
> + return bt_shell_noninteractive_quit(EXIT_SUCCESS);
> +}
> +
> static void cmd_mod_appidx_get(int argc, char *argv[])
> {
> uint16_t n;
> @@ -1237,6 +1275,8 @@ static const struct bt_shell_menu cfg_menu = {
> cmd_sub_add, "Add subscription"},
> {"sub-get", "<ele_addr> <model id>",
> cmd_sub_get, "Get subscription"},
> + {"sub-del", "<ele_addr> <sub_addr> <model id>",
> + cmd_sub_del, "Delete subscription"},
> {"node-reset", NULL, cmd_node_res
> et,
> "Reset a node and remove it from
> network"},
> {} },

Could you please re-format your patches so they do not contain DOS
style end-of-line (^M)?

Please make sure that you follow the guidelines from
bluez/doc/coding-style.txt

Also, a general comment about commit message style: it is strongly
preferred that the commit subject line statement is in imprerative
mood, see good description here:
https://gist.github.com/robertpainsi/b632364184e70900af4ab688decf6f53

Ome more thing. In general, when submitting a patch set, i.e., more
than one patch, it's a good practice to precede the set with a cover
letter (i.e., use --cover-letter option with your "git format-patch"
command) that describes what is the purpose of this patch set. When
submitting a single patch, a descriptive commit message is normally
sufficient enough.

Best regards,

Inga

---

Attachments:

smime.p7s (3.19 kB)