5:28 p.m.
The kernel sends NL80211_ATTR_SCAN_START_TIME_TSF with CMD_TRIGGER and
RRM requires this value for beacon measurement reports.
The start time is parsed during CMD_TRIGGER and set into the scan context.
A getter was added to obtain this time value for an already triggered
scan.
---
src/scan.c | 31 +++++++++++++++++++++++++++++++
src/scan.h | 2 ++
2 files changed, 33 insertions(+)
-v3:
* Added getter for scan triggered time rather than storing it in each
bss individually.
diff --git a/src/scan.c b/src/scan.c
index e007ce5d..43e4cb84 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -91,6 +91,9 @@ struct scan_context {
unsigned int start_cmd_id;
/* Non-zero if GET_SCAN is still running */
unsigned int get_scan_cmd_id;
+
+ /* The time the current scan was started. Reported in TRIGGER_SCAN */
+ uint64_t start_time_tsf;
/*
* Whether the top request in the queue has triggered the current
* scan. May be set and cleared multiple times during a single
@@ -778,6 +781,25 @@ bool scan_periodic_stop(uint64_t wdev_id)
return true;
}
+uint64_t scan_get_triggered_time(uint64_t wdev_id, uint32_t id)
+{
+ struct scan_context *sc;
+ struct scan_request *sr;
+
+ sc = l_queue_find(scan_contexts, scan_context_match, &wdev_id);
+ if (!sc)
+ return 0;
+
+ sr = l_queue_find(sc->requests, scan_request_match, L_UINT_TO_PTR(id));
+ if (!sr)
+ return 0;
+
+ if (!sc->triggered)
+ return 0;
+
+ return sc->start_time_tsf;
+}
+
static void scan_periodic_timeout(struct l_timeout *timeout, void *user_data)
{
struct scan_context *sc = user_data;
@@ -1439,6 +1461,7 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
uint32_t wiphy_id;
struct scan_context *sc;
bool active_scan = false;
+ uint64_t start_time_tsf = 0;
cmd = l_genl_msg_get_command(msg);
@@ -1461,6 +1484,12 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
case NL80211_ATTR_SCAN_SSIDS:
active_scan = true;
break;
+ case NL80211_ATTR_SCAN_START_TIME_TSF:
+ if (len != sizeof(uint64_t))
+ return;
+
+ start_time_tsf = l_get_u64(data);
+ break;
}
}
@@ -1543,6 +1572,8 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
else
sc->state = SCAN_STATE_PASSIVE;
+ sc->start_time_tsf = start_time_tsf;
+
break;
case NL80211_CMD_SCAN_ABORTED:
diff --git a/src/scan.h b/src/scan.h
index 8fc2aa56..b6c4e12d 100644
--- a/src/scan.h
+++ b/src/scan.h
@@ -124,6 +124,8 @@ void scan_periodic_start(uint64_t wdev_id, scan_trigger_func_t
trigger,
scan_notify_func_t func, void *userdata);
bool scan_periodic_stop(uint64_t wdev_id);
+uint64_t scan_get_triggered_time(uint64_t wdev_id, uint32_t id);
+
void scan_bss_free(struct scan_bss *bss);
int scan_bss_rank_compare(const void *a, const void *b, void *user);
--
2.17.1