Hi Andrei,
> Handle read info complete callback from mgmt interface.
> ---
> android/main.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 89 insertions(+), 12 deletions(-)
>
> diff --git a/android/main.c b/android/main.c
> index a100013..a2ed8a4 100644
> --- a/android/main.c
> +++ b/android/main.c
> @@ -54,6 +54,7 @@
> #include "log.h"
> #include "hcid.h"
> #include "sdpd.h"
> +#include "bt_adapter.h"
>
> #include "lib/bluetooth.h"
> #include "lib/mgmt.h"
> @@ -69,6 +70,8 @@ static struct mgmt *mgmt_if = NULL;
> static uint8_t mgmt_version = 0;
> static uint8_t mgmt_revision = 0;
>
> +struct bt_adapter *default_adapter = NULL;
> +
> static int sdp_start(void)
> {
> DBG("");
> @@ -118,34 +121,108 @@ static GOptionEntry options[] = {
> { NULL }
> };
>
> -static void read_info_complete(uint8_t status, uint16_t length,
> +static void load_link_keys_complete(uint8_t status, uint16_t length,
> const void *param, void *user_data)
> {
> - /* TODO: Store Controller information */
> -
> - /**
> - * Register all event notification handlers for controller.
> - *
> - * The handlers are registered after a succcesful read of the
> - * controller info. From now on they can track updates and
> - * notifications.
> - */
> + DBG("status %u", status);
> }
>
> +static void load_link_keys(struct bt_adapter *adapter, GSList *keys)
> +{
> + struct mgmt_cp_load_link_keys *cp;
> + size_t key_len = g_slist_length(keys);
> + struct mgmt_link_key_info *key;
> + size_t len;
> +
> + DBG("");
> +
> + len = sizeof(*cp) + key_len * sizeof(*key);
> + cp = g_try_malloc0(len);
> + if (cp == NULL) {
> + error("%s: Not enough memory for link keys loading", __func__);
> + return;
> + }
I am really fine with just using g_malloc0 and aborting the program in case of memory allocation errors.
> +
> + cp->debug_keys = 0;
> + cp->key_count = htobs(key_len);
> +
> + mgmt_send(adapter->mgmt, MGMT_OP_LOAD_LINK_KEYS, adapter->dev_id, len,
> + cp, load_link_keys_complete, adapter, NULL);
> +
> + free(cp);
> +}
> +
> +static void read_info_complete(uint8_t status, uint16_t length,
> + const void *param, void *user_data)
> +{
> + struct bt_adapter *adapter = user_data;
> + const struct mgmt_rp_read_info *rp = param;
> +
> + DBG("");
> +
> + if (status != MGMT_STATUS_SUCCESS) {
> + error("Failed to read info for index %u: %s (0x%02x)",
> + adapter->dev_id, mgmt_errstr(status), status);
> + goto failed;
> + }
> +
> + if (length < sizeof(*rp)) {
> + error("Too small read info complete response");
> + goto failed;
> + }
> +
> + if (bacmp(&rp->bdaddr, BDADDR_ANY) == 0) {
> + error("No Bluetooth address for index %u", adapter->dev_id);
> + goto failed;
> + }
> +
> + /* Store adapter information */
> + bacpy(&adapter->bdaddr, &rp->bdaddr);
> + adapter->dev_class = rp->dev_class[0] | (rp->dev_class[1] << 8) |
> + (rp->dev_class[2] << 16);
> + adapter->name = g_strdup((const char *) rp->name);
> + adapter->short_name = g_strdup((const char *) rp->short_name);
Don't bother with the short name.
> +
> + adapter->supported_settings = btohs(rp->supported_settings);
> + adapter->current_settings = btohs(rp->current_settings);
> +
> + /* TODO: Register all event notification handlers */
> +
> + if (adapter->current_settings & MGMT_SETTING_POWERED)
> + adapter_start(adapter);
> +
> + /* dummy link keys loading */
The comment is wrong here. Just load the link keys. Even an empty list of keys needs to be loaded.
> + load_link_keys(adapter, NULL);
> +
> + return;
> +
> +failed:
> + default_adapter = NULL;
> +}
>
> static void mgmt_index_added_event(uint16_t index, uint16_t length,
> const void *param, void *user_data)
> {
> info("%s: index %u", __func__, index);
>
> + if (default_adapter != NULL) {
if (default_adapter)
> + DBG("skip event for index %d", index);
If you copy code from src/adapter.c that uses %u for the index, then be consistent.
> + return;
> + }
> +
> + default_adapter = bt_adapter_new(index, mgmt_if);
> + if (default_adapter == NULL) {
And here again, just assume memory allocation succeeds.
> + error("Unable to create new adapter for index %u", index);
> + return;
> + }
> +
> DBG("sending read info command for index %u", index);
>
> if (mgmt_send(mgmt_if, MGMT_OP_READ_INFO, index, 0, NULL,
> - read_info_complete, NULL, NULL) > 0)
> + read_info_complete, default_adapter, NULL) > 0)
> return;
>
> error("Failed to read adapter info for index %u", index);
> -
> }
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
