*** Meshctl "sub-add" command oversight fix ***
cover *** Meshctl "sub-add" command oversight fix ***
From: Jefferson Zhai <[email protected]>
What motivated me to do this patch was that I noticed that the meshctl's "sub-add" command in the config menu strangely did not support adding subscriptions to vendor models, while all the other similar commands like "pub-set" and "bind" all do support vendor model IDs. This patch fixes this odd oversight.
Jefferson Zhai (1):
FIX: Fixed oversight of not supporting vendor model in Meshctl tool's
sub-add command
tools/mesh-gatt/config-client.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/1 FIX: Fixed oversight of not supporting vendor model in Meshctl tool's sub-add command
From: Jefferson Zhai <[email protected]>
--- tools/mesh-gatt/config-client.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
tools/mesh-gatt/config-client.c +11 -5
@@ -972,7 +972,7 @@ static void cmd_sub_add(int argc, char *argv[]) n =mesh_opcode_set (OP_CONFIG_MODEL_SUB_ADD , msg); parm_cnt =read_input_parameters (argc, argv); -if (parm_cnt !=3 ) { +if (parm_cnt !=3 && parm_cnt !=4 ) {bt_shell_printf ("Bad arguments: %s\n" , argv[1 ]);return bt_shell_noninteractive_quit (EXIT_FAILURE ); }
@@ -984,9 +984,15 @@ static void cmd_sub_add(int argc, char *argv[])/* Subscription Address */ put_le16 (parms[1 ], msg + n); n +=2 ; -/* SIG Model ID */ -put_le16 (parms[2 ], msg + n); - n +=2 ; +/* Model ID */ +if (parm_cnt ==4 ) { +put_le16 (parms[3 ], msg + n); +put_le16 (parms[2 ], msg + n +2 ); + n +=4 ; + }else { +put_le16 (parms[2 ], msg + n); + n +=2 ; + }if (!config_send (msg, n)) {bt_shell_printf ("Failed to send \"ADD SUBSCRIPTION\"\n" );
@@ -1222,7 +1228,7 @@ static const struct bt_shell_menu cfg_menu = { cmd_hb_sub_set, "Set heartbeat subscribe"}, {"hb-sub-get" ,NULL , cmd_hb_sub_get, "Get heartbeat subscribe"}, - {"sub-add", "<ele_addr> <sub_addr> <model id>", + {"sub-add", "<ele_addr> <sub_addr> <mod id> [cid]", cmd_sub_add, "Add subscription"}, {"sub-get", "<ele_addr> <model id>", cmd_sub_get, "Get subscription"},
Signature · 1 line
2.25.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=576179
---Test result---
Test Summary:
CheckPatch PASS 1.54 seconds GitLint FAIL 1.01 seconds Prep - Setup ELL PASS 42.84 seconds Build - Prep PASS 0.50 seconds Build - Configure PASS 8.04 seconds Build - Make PASS 181.53 seconds Make Check PASS 8.99 seconds Make Distcheck PASS 216.82 seconds Build w/ext ELL - Configure PASS 8.07 seconds Build w/ext ELL - Make PASS 172.39 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[BlueZ,1/1] FIX: Fixed oversight of not supporting vendor model in Meshctl tool's sub-add command
1: T1 Title exceeds max length (97>80): "[BlueZ,1/1] FIX: Fixed oversight of not supporting vendor model in Meshctl tool's sub-add command"
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=576179
---Test result---
Test Summary:
CheckPatch PASS 0.50 seconds GitLint FAIL 0.32 seconds Prep - Setup ELL PASS 53.92 seconds Build - Prep PASS 0.26 seconds Build - Configure PASS 10.35 seconds Build - Make PASS 236.27 seconds Make Check PASS 9.43 seconds Make Distcheck PASS 278.09 seconds Build w/ext ELL - Configure PASS 9.71 seconds Build w/ext ELL - Make PASS 220.00 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[BlueZ,1/1] FIX: Fixed oversight of not supporting vendor model in Meshctl tool's sub-add command
1: T1 Title exceeds max length (97>80): "[BlueZ,1/1] FIX: Fixed oversight of not supporting vendor model in Meshctl tool's sub-add command"
---
Regards,
Linux Bluetooth
Re: [PATCH BlueZ 1/1] FIX: Fixed oversight of not supporting vendor model in Meshctl tool's sub-add command
In reply to Jefferson ZhaiApplied with minor fix-up of commit message.
Quoted 47 lines · Jefferson Zhai
From: Jefferson Zhai <[email protected]>
---
tools/mesh-gatt/config-client.c | 16 +++++++++++-----1 file changed, 11 insertions(+), 5 deletions(-)tools/mesh-gatt/config-client.c +0
-0@@ -972,7 +972,7 @@ static void cmd_sub_add(int argc, char *argv[]) n = mesh_opcode_set(OP_CONFIG_MODEL_SUB_ADD, msg);
parm_cnt =read_input_parameters(argc, argv);
- if (parm_cnt!= 3) {
+ if (parm_cnt!= 3 &&parm_cnt!= 4) {bt_shell_printf("Bad arguments: %s\n", argv[1]); returnbt_shell_noninteractive_quit(EXIT_FAILURE); }tools/mesh-gatt/config-client.c +9
-3@@ -984,9 +984,15 @@ static void cmd_sub_add(int argc, char *argv[]) /* Subscription Address */ put_le16(parms[1], msg + n); n += 2; - /* SIG Model ID */ - put_le16(parms[2], msg + n); - n += 2; + /* Model ID */ + if (parm_cnt == 4) { + put_le16(parms[3], msg + n); + put_le16(parms[2], msg + n + 2); + n += 4; + } else { + put_le16(parms[2], msg + n); + n += 2; + }
if (!config_send(msg, n)) {
bt_shell_printf("Failed to send \"ADD SUBSCRIPTION\"\n");tools/mesh-gatt/config-client.c +1
-1@@ -1222,7 +1228,7 @@ static const struct bt_shell_menu cfg_menu = { cmd_hb_sub_set, "Set heartbeat subscribe"}, {"hb-sub-get", NULL, cmd_hb_sub_get, "Get heartbeat subscribe"}, - {"sub-add", "<ele_addr> <sub_addr> <model id>", + {"sub-add", "<ele_addr> <sub_addr> <mod id> [cid]", cmd_sub_add, "Add subscription"}, {"sub-get", "<ele_addr> <model id>", cmd_sub_get, "Get subscription"},