tools/mesh-gatt: Fix status messages processing
PATCH 2/6 tools/mesh-gatt: Fix status messages processing
The status messages was processed and displayed even if they do not belong to the present model. This fix ensure that the status messages are processed only if they have the correct opcode.
--- tools/mesh-gatt/node.c | 11 +++++++++++ tools/mesh-gatt/onoff-model.c | 23 ++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)
tools/mesh-gatt/node.c +0 -0
@@ -470,6 +470,8 @@ static bool deliver_model_data(struct mesh_element*
element, uint16_t src,
uint16_t app_idx, uint8_t *data, uint16_t
len)
{
GList *l;
+ uint32_t opcode;
+ int n;
for(l = element->models; l; l = l->next) {
struct mesh_model *model = l->data;
@@ -482,6 +484,15 @@ static bool deliver_model_data(struct mesh_element* element, uint16_t src,
return true;
}
+ if (mesh_opcode_get(data, len, &opcode, &n)) {
+ len -= n;
+ data += n;
+ } else
+ return false;
+ bt_shell_printf("Unknown Model Message received (%d) opcode %x\n",
+ len, opcode);
+ print_byte_array("\t",data, len);
+
return false;
}
tools/mesh-gatt/onoff-model.c +1 -0
@@ -99,6 +99,7 @@ static bool client_msg_recvd(uint16_t src, uint8_t *data, {uint32_t opcode;int n; +char s[128 ];if (mesh_opcode_get (data, len, &opcode, &n)) { len -= n;
@@ -106,27 +107,27 @@ static bool client_msg_recvd(uint16_t src, uint8_t
*data,
} else
return false;
- bt_shell_printf("On Off Model Message received (%d) opcode %x\n",
- len,
opcode);
- print_byte_array("\t",data, len);
-
switch (opcode) {
default:
return false;
case OP_GENERIC_ONOFF_STATUS:
+ bt_shell_printf("On Off Model Message received (%d) opcode
%x\n",
+ len, opcode);
+ print_byte_array("\t",data, len);
if (len != 1 && len != 3)
break;
- bt_shell_printf("Node %4.4x: Off Status present = %s",
- src, data[0] ? "ON" :
"OFF");
-
+ snprintf(s, sizeof(s), "Node %4.4x: On Off Status present =
%s",
+ src, data[0] ? "ON" : "OFF");
if (len == 3) {
- bt_shell_printf(", target = %s",
- data[1] ? "ON" : "OFF");
+ snprintf(s + strlen(s), sizeof(s), ", target = %s",
+ data[1] ? "ON" : "OFF");
+ bt_shell_printf("%s\n", s);
print_remaining_time(data[2]);
- } else
- bt_shell_printf("\n");
+ }else
+ bt_shell_printf("%s\n", s);
+
break;
}
Signature · 1 line
2.25.1