| Message ID | 20230316213312.159370-1-inga.stotland@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bc961998a842529a12d5fcb590d4435022c9fcbe |
| Headers | show |
| Series | [BlueZ,v2,1/2] tools/mesh-cfgclient: Prevent storing duplicate models | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/CheckPatch | success | CheckPatch PASS |
| tedd_an/GitLint | success | Gitlint PASS |
| tedd_an/BuildEll | success | Build ELL PASS |
| tedd_an/BluezMake | success | Bluez Make PASS |
| tedd_an/MakeCheck | success | Bluez Make Check PASS |
| tedd_an/MakeDistcheck | success | Make Distcheck PASS |
| tedd_an/CheckValgrind | success | Check Valgrind PASS |
| tedd_an/CheckSmatch | success | CheckSparse PASS |
| tedd_an/bluezmakeextell | success | Make External ELL PASS |
| tedd_an/IncrementalBuild | success | Incremental Build PASS |
| tedd_an/ScanBuild | success | Scan Build PASS |
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=730979 ---Test result--- Test Summary: CheckPatch PASS 1.09 seconds GitLint PASS 0.71 seconds BuildEll PASS 27.08 seconds BluezMake PASS 849.17 seconds MakeCheck PASS 11.94 seconds MakeDistcheck PASS 148.63 seconds CheckValgrind PASS 245.05 seconds CheckSmatch PASS 327.65 seconds bluezmakeextell PASS 98.21 seconds IncrementalBuild PASS 1415.53 seconds ScanBuild PASS 1023.62 seconds --- Regards, Linux Bluetooth
Hello: This series was applied to bluetooth/bluez.git (master) by Brian Gix <brian.gix@gmail.com>: On Thu, 16 Mar 2023 14:33:11 -0700 you wrote: > This fixes the situation when subsequent requests to get a node > composition result in appending element's model list with duplicate models. > This adds a check for a presence of a model on an element when attempting > to add a new model ID to a model list on this element. > --- > tools/mesh/mesh-db.c | 17 ++++++++++++----- > tools/mesh/remote.c | 9 +++++++++ > 2 files changed, 21 insertions(+), 5 deletions(-) Here is the summary with links: - [BlueZ,v2,1/2] tools/mesh-cfgclient: Prevent storing duplicate models https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=bc961998a842 - [BlueZ,v2,2/2] tools/mesh-cfgclient: Auto request own composition data https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=551a0c80ab33 You are awesome, thank you!
diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c index c0c05a29a..1d047691d 100644 --- a/tools/mesh/mesh-db.c +++ b/tools/mesh/mesh-db.c @@ -1964,28 +1964,35 @@ bool mesh_db_node_set_composition(uint16_t unicast, uint8_t *data, uint16_t len) while (len >= 2 && m--) { mod_id = l_get_le16(data); + data += 2; + len -= 2; + + jobj = get_model(unicast, unicast + i, mod_id, false); + if (jobj) + continue; jobj = init_model(mod_id); if (!jobj) goto fail; json_object_array_add(jmods, jobj); - data += 2; - len -= 2; } while (len >= 4 && v--) { mod_id = l_get_le16(data + 2); mod_id = l_get_le16(data) << 16 | mod_id; + data += 4; + len -= 4; + + jobj = get_model(unicast, unicast + i, mod_id, true); + if (jobj) + continue; jobj = init_vendor_model(mod_id); if (!jobj) goto fail; json_object_array_add(jmods, jobj); - - data += 4; - len -= 4; } i++; diff --git a/tools/mesh/remote.c b/tools/mesh/remote.c index cee711dec..b917ae9df 100644 --- a/tools/mesh/remote.c +++ b/tools/mesh/remote.c @@ -54,6 +54,11 @@ struct rejected_addr { static struct l_queue *nodes; static struct l_queue *reject_list; +static bool match_mod_id(const void *a, const void *b) +{ + return a == b; +} + static int compare_mod_id(const void *a, const void *b, void *user_data) { uint32_t id1 = L_PTR_TO_UINT(a); @@ -227,6 +232,10 @@ bool remote_set_model(uint16_t unicast, uint8_t ele_idx, uint32_t mod_id, if (!vendor) mod_id = VENDOR_ID_MASK | mod_id; + if (l_queue_find(rmt->els[ele_idx], match_mod_id, + L_UINT_TO_PTR(mod_id))) + return true; + l_queue_insert(rmt->els[ele_idx], L_UINT_TO_PTR(mod_id), compare_mod_id, NULL);