espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-26 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

host/mesh: fix clients array indexing in proxy_srv

Browse Source 
In proxy_srv clients were indexed using wrong handle values. Now each
client has its own handle that is always initialized and is not
connected with connection handle.
This commit is contained in:
Krzysztof Kopyściński
2022-04-19 16:07:48 +02:00
committed by Szymon Janc
parent 7ee72efb48
commit 534afc8c48
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/src/proxy_msg.h
+1
View File
@@ -45,6 +45,7 @@ struct bt_mesh_proxy_role {
struct bt_mesh_proxy_client {
struct bt_mesh_proxy_role *cli;
uint16_t conn_handle;
uint16_t filter[MYNEWT_VAL(BLE_MESH_PROXY_FILTER_SIZE)];
enum __packed {
NONE,
nimble/host/mesh/src/proxy_srv.c
+26 -2
View File
@@ -62,7 +62,27 @@ static int conn_count;
struct bt_mesh_proxy_client *find_client(uint16_t conn_handle)
{
return &clients[conn_handle];
int i;
for (i = 0; i < ARRAY_SIZE(clients); i++) {
if (clients[i].conn_handle == conn_handle) {
return &clients[i];
}
}
return NULL;
}
static struct bt_mesh_proxy_client *get_client(uint16_t conn_handle)
{
int i;
for (i = 0; i < ARRAY_SIZE(clients); i++) {
if (clients[i].conn_handle == 0xffff) {
clients[i].conn_handle = conn_handle;
return &clients[i];
}
}
return NULL;
}
/* Next subnet in queue to be advertised */
@@ -811,7 +831,8 @@ static void gatt_connected(uint16_t conn_handle)
conn_count++;
client = find_client(conn_handle);
client = get_client(conn_handle);
assert(client);
client->filter_type = NONE;
(void)memset(client->filter, 0, sizeof(client->filter));
@@ -844,6 +865,8 @@ static void gatt_disconnected(struct ble_gap_conn_desc conn, uint8_t reason)
bt_mesh_proxy_role_cleanup(client->cli);
client->cli = NULL;
}
client->conn_handle = 0xffff;
}
void notify_complete(void)
@@ -970,6 +993,7 @@ int bt_mesh_proxy_init(void)
#if (MYNEWT_VAL(BLE_MESH_GATT_PROXY))
k_work_init(&clients[i].send_beacons, proxy_send_beacons);
#endif
clients[i].conn_handle = 0xffff;
}
resolve_svc_handles();