This implements the Get functions of SupportedMonitorTypes and
SupportedFeatures.
The following test was performed.
- Issue dbus-send to read SupportedMonitorTypes and SupportedFeatures.
Reviewed-by: Yun-Hao Chung <howardchung@xxxxxxxxxx>
Reviewed-by: Manish Mandlik <mmandlik@xxxxxxxxxxxx>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@xxxxxxxxxxxx>
---
(no changes since v1)
src/adv_monitor.c | 128 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 123 insertions(+), 5 deletions(-)
diff --git a/src/adv_monitor.c b/src/adv_monitor.c
index 8e7dad8dd..54e67bf2c 100644
--- a/src/adv_monitor.c
+++ b/src/adv_monitor.c
@@ -28,6 +28,9 @@
#include <dbus/dbus.h>
#include <gdbus/gdbus.h>
+#include "lib/bluetooth.h"
+#include "lib/mgmt.h"
+
#include "adapter.h"
#include "dbus-common.h"
#include "log.h"
@@ -43,6 +46,12 @@ struct btd_adv_monitor_manager {
struct mgmt *mgmt;
uint16_t adapter_id;
char *path;
+
+ uint32_t supported_features; /* MGMT_ADV_MONITOR_FEATURE_MASK_* */
+ uint32_t enabled_features; /* MGMT_ADV_MONITOR_FEATURE_MASK_* */
+ uint16_t max_num_monitors;
+ uint8_t max_num_patterns;
+
};
static const GDBusMethodTable adv_monitor_methods[] = {
@@ -55,10 +64,78 @@ static const GDBusMethodTable adv_monitor_methods[] = {
{ }
};
+enum monitor_type {
+ MONITOR_TYPE_OR_PATTERNS,
+};
+
+const struct adv_monitor_type {
+ enum monitor_type type;
+ const char *name;
+} supported_types[] = {
+ { MONITOR_TYPE_OR_PATTERNS, "or_patterns" },
+ { },
+};
+
+/* Gets SupportedMonitorTypes property */
+static gboolean get_supported_monitor_types(const GDBusPropertyTable *property,
+ DBusMessageIter *iter,
+ void *data)
+{
+ DBusMessageIter entry;
+ const struct adv_monitor_type *t;
+ struct btd_adv_monitor_manager *manager = data;
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING,
+ &entry);
+
+ for (t = supported_types; t->name; t++) {
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING,
+ &t->name);
+ }
+
+ dbus_message_iter_close_container(iter, &entry);
+
+ return TRUE;
+}
+
+const struct adv_monitor_feature {
+ uint32_t mask;
+ const char *name;
+} supported_features[] = {
+ { MGMT_ADV_MONITOR_FEATURE_MASK_OR_PATTERNS, "controller-patterns" },
+ { }
+};
+
+/* Gets SupportedFeatures property */
+static gboolean get_supported_features(const GDBusPropertyTable *property,
+ DBusMessageIter *iter,
+ void *data)
+{
+ DBusMessageIter entry;
+ const struct adv_monitor_feature *f;
+ struct btd_adv_monitor_manager *manager = data;
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING,
+ &entry);
+
+ for (f = supported_features; f->name; f++) {
+ if (manager->supported_features & f->mask) {
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING,
+ &f->name);
+ }
+ }
+
+ dbus_message_iter_close_container(iter, &entry);
+
+ return TRUE;
+}
+
static const GDBusPropertyTable adv_monitor_properties[] = {
- {"SupportedMonitorTypes", "as", NULL, NULL, NULL,
+ {"SupportedMonitorTypes", "as", get_supported_monitor_types, NULL, NULL,
G_DBUS_PROPERTY_FLAG_EXPERIMENTAL},
- {"SupportedFeatures", "as", NULL, NULL, NULL},
+ {"SupportedFeatures", "as", get_supported_features, NULL, NULL},
{ }
};
@@ -106,6 +183,42 @@ static void manager_destroy(struct btd_adv_monitor_manager *manager)
manager_free(manager);
}
+/* Initiates manager's members based on the return of
+ * MGMT_OP_READ_ADV_MONITOR_FEATURES
+ */
+static void read_adv_monitor_features_cb(uint8_t status, uint16_t length,
+ const void *param,
+ void *user_data)
+{
+ const struct mgmt_rp_read_adv_monitor_features *rp = param;
+ struct btd_adv_monitor_manager *manager = user_data;
+
+ if (status != MGMT_STATUS_SUCCESS || !param) {
+ btd_error(manager->adapter_id, "Failed to Read Adv Monitor "
+ "Features with status 0x%02x", status);
+ return;
+ }
+
+ if (length < sizeof(*rp)) {
+ btd_error(manager->adapter_id,
+ "Wrong size of Read Adv Monitor Features "
+ "response");
+ return;
+ }
+
+ manager->supported_features = le32_to_cpu(rp->supported_features);
+ manager->enabled_features = le32_to_cpu(rp->enabled_features);
+ manager->max_num_monitors = le16_to_cpu(rp->max_num_handles);
+ manager->max_num_patterns = rp->max_num_patterns;
+
+ btd_info(manager->adapter_id, "Adv Monitor Manager created with "
+ "supported features:0x%08x, enabled features:0x%08x, "
+ "max number of supported monitors:%d, "
+ "max number of supported patterns:%d",
+ manager->supported_features, manager->enabled_features,
+ manager->max_num_monitors, manager->max_num_patterns);
+}
+
/* Creates a manager and registers its D-Bus interface */
struct btd_adv_monitor_manager *btd_adv_monitor_manager_create(
struct btd_adapter *adapter,
@@ -129,9 +242,14 @@ struct btd_adv_monitor_manager *btd_adv_monitor_manager_create(
return NULL;
}
- btd_info(manager->adapter_id,
- "Adv Monitor Manager created for adapter %s",
- adapter_get_path(manager->adapter));
+ if (!mgmt_send(manager->mgmt, MGMT_OP_READ_ADV_MONITOR_FEATURES,
+ manager->adapter_id, 0, NULL,
+ read_adv_monitor_features_cb, manager, NULL)) {
+ btd_error(manager->adapter_id,
+ "Failed to send Read Adv Monitor Features");
+ manager_destroy(manager);
+ return NULL;
+ }
return manager;
}
--
2.26.2
