Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 19 Jun 2020 15:56:23 -0700
In-Reply-To: <20200619225623.10200-1-michaelfsun@google.com>
Message-Id: <20200619155612.bluez.v4.3.I55df963e4055bf1778db6f9e46f166b88472e051@changeid>
Mime-Version: 1.0
References: <20200619225623.10200-1-michaelfsun@google.com>
Subject: [bluez PATCH v4 3/3] btmgmt: Add command "add" into "monitor" btmgmt submenu
From:   Michael Sun <michaelfsun@google.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     luiz.von.dentz@intel.com, mcchou@chromium.org,
        chromeos-bluetooth-upstreaming@chromium.org, alainm@chromium.org,
        Michael Sun <michaelfsun@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

This patch introduces a new command =E2=80=98add=E2=80=99 within "monitor" =
submenu to
allow users to add advertisement monitor filters and get back monitor
handlers. An event handler is also added to handle kernel issued
MGMT_EV_ADV_MONITOR_ADDED events. The command will work with the new
MGMT opcode MGMT_OP_ADD_ADV_MONITOR. This patch only adds support for
adding pattern based filters.

Tested on Atlas Chromebook with a sample stdout below:
[mgmt]# add -p 0:1:c504 1:a:9a55beef
Advertisement monitor with handle:0x0005 added
[mgmt]# add -p 0:1:xxxx
Failed to parse monitor patterns.
Usage: add <-p|-h> [options...]
Monitor Types:
        -p <ad_type:offset:pattern>...  Pattern Monitor
e.g.:
        add -p 0:1:c504 1:a:9a55beef

Reviewed-by: Miao-chen Chou <mcchou@chromium.org>

Signed-off-by: Michael Sun <michaelfsun@google.com>
---

Changes in v4:
- Use regular options instead of optget options per feedback, and fix
endianness

Changes in v3:
- Fix build errors

Changes in v2:
- Move add command into submenu and fix build warnings

 tools/btmgmt.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index 1c46041ccb18..48c9e58872f3 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -1013,6 +1013,20 @@ static void advertising_removed(uint16_t index, uint=
16_t len,
 	print("hci%u advertising_removed: instance %u", index, ev->instance);
 }
=20
+static void advmon_added(uint16_t index, uint16_t len, const void *param,
+							void *user_data)
+{
+	const struct mgmt_ev_adv_monitor_added *ev =3D param;
+
+	if (len < sizeof(*ev)) {
+		error("Too small (%u bytes) %s event", len, __func__);
+		return;
+	}
+
+	print("hci%u %s: handle %u", index, __func__,
+					le16_to_cpu(ev->monitor_handle));
+}
+
 static void advmon_removed(uint16_t index, uint16_t len, const void *param=
,
 							void *user_data)
 {
@@ -4658,6 +4672,112 @@ static void cmd_advmon_features(int argc, char **ar=
gv)
 	}
 }
=20
+static void advmon_add_rsp(uint8_t status, uint16_t len, const void *param=
,
+							void *user_data)
+{
+	const struct mgmt_rp_add_adv_patterns_monitor *rp =3D param;
+
+	if (status !=3D MGMT_STATUS_SUCCESS) {
+		error("Could not add advertisement monitor with status "
+				"0x%02x (%s)", status, mgmt_errstr(status));
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	print("Advertisement monitor with handle:0x%04x added",
+					le16_to_cpu(rp->monitor_handle));
+	return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
+static bool str2pattern(struct mgmt_adv_pattern *pattern, const char *str)
+{
+	int type_len, offset_len, offset_end_pos, str_len;
+	int i, j;
+	char pattern_str[62] =3D { 0 };
+	char tmp;
+
+	if (sscanf(str, "%2hhx%n:%2hhx%n:%s", &pattern->ad_type, &type_len,
+			&pattern->offset, &offset_end_pos, pattern_str) !=3D 3)
+		return false;
+
+	offset_len =3D offset_end_pos - type_len - 1;
+	str_len =3D strlen(pattern_str);
+	pattern->length =3D str_len / 2 + str_len % 2;
+
+	if (type_len > 2 || offset_len > 2 ||
+					pattern->offset + pattern->length > 31)
+		return false;
+
+	for (i =3D 0, j =3D 0; i < str_len; i++, j++) {
+		if (sscanf(&pattern_str[i++], "%2hhx", &pattern->value[j])
+									!=3D 1)
+			return false;
+		if (i < str_len && sscanf(&pattern_str[i], "%1hhx", &tmp) !=3D 1)
+			return false;
+	}
+
+	return true;
+}
+
+static void advmon_add_usage(void)
+{
+	bt_shell_usage();
+	print("Monitor Types:\n\t-p <ad_type:offset:pattern>..."
+		"\tPattern Monitor\ne.g.:\n\tadd -p 0:1:c504 1:a:9a55beef");
+}
+
+static bool advmon_add_pattern(int argc, char **argv)
+{
+	uint16_t index;
+	int i, cp_len;
+	struct mgmt_cp_add_adv_monitor *cp =3D NULL;
+	bool success =3D false;
+
+	index =3D mgmt_index;
+	if (index =3D=3D MGMT_INDEX_NONE)
+		index =3D 0;
+
+	cp_len =3D sizeof(struct mgmt_cp_add_adv_monitor) +
+			argc * sizeof(struct mgmt_adv_pattern);
+
+	cp =3D malloc0(cp_len);
+	cp->pattern_count =3D argc;
+
+	for (i =3D 0; i < argc; i++) {
+		if (!str2pattern(&cp->patterns[i], argv[i])) {
+			error("Failed to parse monitor patterns.");
+			goto done;
+		}
+	}
+
+	if (!mgmt_send(mgmt, MGMT_OP_ADD_ADV_PATTERNS_MONITOR, index, cp_len,
+					cp, advmon_add_rsp, NULL, NULL)) {
+		error("Unable to send \"Add Advertising Monitor\" command");
+		goto done;
+	}
+
+	success =3D true;
+
+done:
+	free(cp);
+	return success;
+}
+
+static void cmd_advmon_add(int argc, char **argv)
+{
+	bool success =3D false;
+
+	if (strcasecmp(argv[1], "-p") =3D=3D 0 && argc > 2) {
+		argc -=3D 2;
+		argv +=3D 2;
+		success =3D advmon_add_pattern(argc, argv);
+	}
+
+	if (!success) {
+		advmon_add_usage();
+		bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+}
+
 static void advmon_remove_rsp(uint8_t status, uint16_t len, const void *pa=
ram,
 							void *user_data)
 {
@@ -4748,6 +4868,8 @@ static void register_mgmt_callbacks(struct mgmt *mgmt=
, uint16_t index)
 						advertising_added, NULL, NULL);
 	mgmt_register(mgmt, MGMT_EV_ADVERTISING_REMOVED, index,
 					advertising_removed, NULL, NULL);
+	mgmt_register(mgmt, MGMT_EV_ADV_MONITOR_ADDED, index, advmon_added,
+								NULL, NULL);
 	mgmt_register(mgmt, MGMT_EV_ADV_MONITOR_REMOVED, index, advmon_removed,
 								NULL, NULL);
 }
@@ -4775,6 +4897,8 @@ static const struct bt_shell_menu monitor_menu =3D {
 					"features"			},
 	{ "remove",		"<handle>",
 		cmd_advmon_remove,	"Remove advertisement monitor "	},
+	{ "add",		"<-p|-h> [options...]",
+		cmd_advmon_add,		"Add advertisement monitor"	},
 	{ } },
 };
=20
--=20
2.27.0.111.gc72c7da667-goog