From e11abb5deebe4fad888d421bb7dbf249ee16ed28 Mon Sep 17 00:00:00 2001 From: evgeny Date: Thu, 29 Oct 2026 20:29:55 +0100 Subject: [PATCH] Ignore cached BlueZ advertisements when discovering live BLE peers --- lib/ble/ble_bluez.c | 15 ++++++++------- lib/ble/tests/test_ble_bluez.c | 4 +++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/ble/ble_bluez.c b/lib/ble/ble_bluez.c index f912a2dde..8d4804bf5 100644 --- a/lib/ble/ble_bluez.c +++ b/lib/ble/ble_bluez.c @@ -323,7 +323,8 @@ static int subscribed(sd_bus_message* m, void* arg, sd_bus_error* error) { (unsigned long long)l->id, l->mtu); l->opened = 1; ble_backend_opened(l->backend->owner, l->id, l->mtu); return 0; } -static int properties(struct ble_backend* b, const char* path, const char* interface, sd_bus_message* m) { +/* Snapshot содержит также старые объявления; только live-событие обновляет discovery/last_seen. */ +static int properties(struct ble_backend* b, const char* path, const char* interface, sd_bus_message* m, int live) { const char *key, *type, *uuid = NULL; int r, resolved = -1, connected = -1, rssi = 127, have_data = 0; uint16_t mtu = 0; @@ -382,7 +383,7 @@ static int properties(struct ble_backend* b, const char* path, const char* inter (unsigned long long)l->id, l->connected, l->resolved, l->opened); if (l->connected && l->resolved && !l->opened && !l->query) query_link(l); } - if (have_data && strlen(path) < BLE_ENDPOINT_MAX) { + if (live && have_data && strlen(path) < BLE_ENDPOINT_MAX) { struct ble_endpoint ep = {0}; strcpy(ep.id, path); ble_backend_broadcast(b->owner, &ep, data, data_size, rssi); } } @@ -398,11 +399,11 @@ static int properties(struct ble_backend* b, const char* path, const char* inter } return 0; } -static int interfaces(struct ble_backend* b, const char* path, sd_bus_message* m) { +static int interfaces(struct ble_backend* b, const char* path, sd_bus_message* m, int live) { int r = sd_bus_message_enter_container(m, 'a', "{sa{sv}}"); const char* iface; if (r < 0) return r; while ((r = sd_bus_message_enter_container(m, 'e', "sa{sv}")) > 0) { - if ((r = sd_bus_message_read(m, "s", &iface)) < 0 || (r = properties(b, path, iface, m)) < 0) return r; + if ((r = sd_bus_message_read(m, "s", &iface)) < 0 || (r = properties(b, path, iface, m, live)) < 0) return r; sd_bus_message_exit_container(m); } if (r < 0) return r; @@ -412,7 +413,7 @@ static int managed_objects(struct ble_backend* b, sd_bus_message* m) { int r = sd_bus_message_enter_container(m, 'a', "{oa{sa{sv}}}"); const char* path; if (r < 0) return r; while ((r = sd_bus_message_enter_container(m, 'e', "oa{sa{sv}}")) > 0) { - if ((r = sd_bus_message_read(m, "o", &path)) < 0 || (r = interfaces(b, path, m)) < 0) return r; + if ((r = sd_bus_message_read(m, "o", &path)) < 0 || (r = interfaces(b, path, m, 0)) < 0) return r; sd_bus_message_exit_container(m); } if (r < 0) return r; @@ -448,14 +449,14 @@ static int connected(sd_bus_message* m, void* arg, sd_bus_error* error) { static int signal_changed(sd_bus_message* m, void* arg, sd_bus_error* error) { (void)error; struct ble_backend* b = arg; const char* iface; int r = sd_bus_message_read(m, "s", &iface); - if (r >= 0) r = properties(b, sd_bus_message_get_path(m), iface, m); + if (r >= 0) r = properties(b, sd_bus_message_get_path(m), iface, m, 1); if (r < 0) DEBUG_WARN(CAT, "BLE invalid BlueZ PropertiesChanged: %s", strerror(-r)); return 0; } static int object_added(sd_bus_message* m, void* arg, sd_bus_error* error) { (void)error; struct ble_backend* b = arg; const char* path; int r = sd_bus_message_read(m, "o", &path); - if (r >= 0) r = interfaces(b, path, m); + if (r >= 0) r = interfaces(b, path, m, 1); if (r < 0) DEBUG_WARN(CAT, "BLE invalid BlueZ InterfacesAdded: %s", strerror(-r)); return 0; } diff --git a/lib/ble/tests/test_ble_bluez.c b/lib/ble/tests/test_ble_bluez.c index 36151f142..736537e3b 100644 --- a/lib/ble/tests/test_ble_bluez.c +++ b/lib/ble/tests/test_ble_bluez.c @@ -83,12 +83,14 @@ static int remote_write(sd_bus_message* m, void* arg, sd_bus_error* e) { static int remote_state(sd_bus* b, const char* path, const char* i, const char* name, sd_bus_message* m, void* arg, sd_bus_error* e) { (void)b; (void)path; (void)i; (void)arg; (void)e; + if (!strcmp(name, "ManufacturerData")) return sd_bus_message_append(m, "a{qv}", 1, 0xffff, "ay", 3, 'a', 'b', 'c'); return sd_bus_message_append(m, "b", !strcmp(name, "Connected") || remote_resolved); } static const sd_bus_vtable device_vtable[] = { SD_BUS_VTABLE_START(0), SD_BUS_METHOD("Connect", "", "", simple, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_PROPERTY("Connected", "b", remote_state, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("ServicesResolved", "b", remote_state, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), + SD_BUS_PROPERTY("ManufacturerData", "a{qv}", remote_state, 0, 0), SD_BUS_VTABLE_END }; static const sd_bus_vtable remote_vtable[] = { @@ -165,7 +167,7 @@ int main(void) { ua = uasync_create(); CHECK(ua); struct ble_config config = {0}; config.node_id = 200; config.company_id = 0xffff; config.callbacks.status = status; config.callbacks.connection = connection; config.callbacks.broadcast = broadcast; - transport = ble_create(ua, &config); CHECK(transport && !ble_start(transport)); poll_all(); CHECK(ready == 1); + transport = ble_create(ua, &config); CHECK(transport && !ble_start(transport)); poll_all(); CHECK(ready == 1 && broadcasts == 0); CHECK(!ble_advertise(transport, "abc", 3)); poll_all(); CHECK(advertisement_count == 2); CHECK(!ble_advertise(transport, "def", 3)); poll_all(); CHECK(advertisement_count == 3); announce();