From: Jakub Pawlowski <jpawlowski@google.com>
To: linux-bluetooth@vger.kernel.org
Cc: Jakub Pawlowski <jpawlowski@google.com>
Subject: [PATCH v3 7/8] core: adapter: filter discovery results when filered discovery is used
Date: Tue, 24 Mar 2015 00:57:19 -0700 [thread overview]
Message-ID: <1427183840-8089-7-git-send-email-jpawlowski@google.com> (raw)
In-Reply-To: <1427183840-8089-1-git-send-email-jpawlowski@google.com>
This patch adds filtering to device found event, and enforces lack
of RSSI delta for filtered scan.
When filtering, we compare against each client filter. That
additionally removes some of reports.
---
src/adapter.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 72 insertions(+), 1 deletion(-)
diff --git a/src/adapter.c b/src/adapter.c
index 8b98c41..f96d05a 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -5249,6 +5249,67 @@ static void adapter_msd_notify(struct btd_adapter *adapter,
}
}
+static gint g_strcmp(gconstpointer a, gconstpointer b)
+{
+ return strcmp(a, b);
+}
+
+static bool is_filter_match(GSList *discovery_filter, struct eir_data *eir_data,
+ int8_t rssi)
+{
+ GSList *l, *m;
+ bool got_match = false;
+
+ for (l = discovery_filter; l != NULL && got_match != true;
+ l = g_slist_next(l)) {
+ struct watch_client *client = l->data;
+ struct discovery_filter *item = client->discovery_filter;
+
+ /* if one of currently running scans is regular scan, then
+ * return all devices as matches
+ */
+ if (item == NULL) {
+ got_match = true;
+ continue;
+ }
+
+ /* if someone started discovery with empty uuids, he wants all
+ * devices in given proximity.
+ */
+ if (item->uuids == NULL)
+ got_match = true;
+ else
+ for (m = item->uuids; m != NULL && got_match != true;
+ m = g_slist_next(m))
+ /* m->data contains string representation of
+ * uuid.
+ */
+ if (g_slist_find_custom(eir_data->services,
+ m->data,
+ g_strcmp) != NULL)
+ got_match = true;
+
+ if (got_match) {
+ /* we have service match, check proximity */
+ if (item->rssi != DISTANCE_VAL_INVALID &&
+ item->rssi > rssi)
+ got_match = false;
+ if (item->pathloss != DISTANCE_VAL_INVALID &&
+ (eir_data->tx_power == 127 ||
+ eir_data->tx_power - rssi > item->pathloss))
+ got_match = false;
+
+ if (got_match)
+ return true;
+ }
+ }
+
+ if (!got_match)
+ return false;
+
+ return true;
+}
+
static void update_found_devices(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
@@ -5315,8 +5376,18 @@ static void update_found_devices(struct btd_adapter *adapter,
return;
}
+ if (adapter->filtered_discovery &&
+ !is_filter_match(adapter->discovery_list, &eir_data, rssi)) {
+ eir_data_free(&eir_data);
+ return;
+ }
+
device_set_legacy(dev, legacy);
- device_set_rssi(dev, rssi);
+
+ if (adapter->filtered_discovery)
+ device_set_rssi_with_delta(dev, rssi, 0);
+ else
+ device_set_rssi(dev, rssi);
if (eir_data.appearance != 0)
device_set_appearance(dev, eir_data.appearance);
--
2.2.0.rc0.207.ga3a616c
next prev parent reply other threads:[~2015-03-24 7:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 7:57 [PATCH v3 1/8] core: device: add device_set_rssi_no_delta Jakub Pawlowski
2015-03-24 7:57 ` [PATCH v3 2/8] core/adapter: Refactor of scan type Jakub Pawlowski
2015-03-24 9:18 ` Luiz Augusto von Dentz
2015-03-24 19:54 ` Jakub Pawlowski
2015-03-24 7:57 ` [PATCH v3 3/8] core: adapter: Add SetDiscoveryFilter method Jakub Pawlowski
2015-03-24 7:57 ` [PATCH v3 4/8] core: adapter: Add parameter parsing to SetDiscoveryFilter Jakub Pawlowski
2015-03-24 7:57 ` [PATCH v3 5/8] core: adapter: set the filter for each discovery client Jakub Pawlowski
2015-03-24 7:57 ` [PATCH v3 6/8] core: adapter: start proper discovery depending on filter type Jakub Pawlowski
2015-03-24 7:57 ` Jakub Pawlowski [this message]
2015-03-24 7:57 ` [PATCH v3 8/8] client: main: add support for SetDiscoveryFilter Jakub Pawlowski
2015-03-24 9:35 ` Luiz Augusto von Dentz
2015-03-24 20:03 ` Jakub Pawlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427183840-8089-7-git-send-email-jpawlowski@google.com \
--to=jpawlowski@google.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox