From 018c23adcf0c951a44016453a7be96c6f09c79a4 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Mon, 7 Jan 2013 11:19:02 +0200
Subject: [PATCH] core: Move mgmt link keys loading to adapter code

---
 src/adapter.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++--
 src/mgmt.c    | 49 ---------------------------------------
 src/mgmt.h    |  1 -
 3 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 55ccabc51..ae864b8d4 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1930,6 +1930,67 @@ failed:
 	return ltk;
 }
 
+static void load_link_keys_complete(uint8_t status, uint16_t length,
+					const void *param, void *user_data)
+{
+	struct btd_adapter *adapter = user_data;
+
+	if (status != MGMT_STATUS_SUCCESS) {
+		error("Failed to load link keys for hci%u: %s (0x%02x)",
+				adapter->dev_id, mgmt_errstr(status), status);
+		return;
+	}
+
+	DBG("link keys loaded for hci%u", adapter->dev_id);
+}
+
+static int load_link_keys(struct btd_adapter *adapter, GSList *keys,
+							bool debug_keys)
+{
+	struct mgmt_cp_load_link_keys *cp;
+	struct mgmt_link_key_info *key;
+	size_t key_count, cp_size;
+	unsigned int id;
+	GSList *l;
+
+	key_count = g_slist_length(keys);
+
+	DBG("hci%u keys %zu debug_keys %d", adapter->dev_id, key_count,
+								debug_keys);
+
+	cp_size = sizeof(*cp) + (key_count * sizeof(*key));
+
+	cp = g_try_malloc0(cp_size);
+	if (cp == NULL)
+		return -ENOMEM;
+
+	cp->debug_keys = debug_keys;
+	cp->key_count = htobs(key_count);
+
+	for (l = keys, key = cp->keys; l != NULL; l = g_slist_next(l), key++) {
+		struct link_key_info *info = l->data;
+
+		bacpy(&key->addr.bdaddr, &info->bdaddr);
+		key->addr.type = BDADDR_BREDR;
+		key->type = info->type;
+		memcpy(key->val, info->key, 16);
+		key->pin_len = info->pin_len;
+	}
+
+	id = mgmt_send(adapter->mgmt, MGMT_OP_LOAD_LINK_KEYS,
+				adapter->dev_id, cp_size, cp,
+				load_link_keys_complete, adapter, NULL);
+
+	g_free(cp);
+
+	if (id == 0) {
+		error("Failed to load link keys for hci%u", adapter->dev_id);
+		return -EIO;
+	}
+
+	return 0;
+}
+
 static void load_devices(struct btd_adapter *adapter)
 {
 	char filename[PATH_MAX + 1];
@@ -2009,8 +2070,7 @@ free:
 
 	closedir(dir);
 
-	err = mgmt_load_link_keys(adapter->dev_id, keys.keys,
-							main_opts.debug_keys);
+	err = load_link_keys(adapter, keys.keys, main_opts.debug_keys);
 	if (err < 0)
 		error("Unable to load link keys: %s (%d)",
 							strerror(-err), -err);
diff --git a/src/mgmt.c b/src/mgmt.c
index 7523cc740..bed27954d 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -976,55 +976,6 @@ void mgmt_cleanup(void)
 	}
 }
 
-int mgmt_load_link_keys(int index, GSList *keys, gboolean debug_keys)
-{
-	char *buf;
-	struct mgmt_hdr *hdr;
-	struct mgmt_cp_load_link_keys *cp;
-	struct mgmt_link_key_info *key;
-	size_t key_count, cp_size;
-	GSList *l;
-	int err;
-
-	key_count = g_slist_length(keys);
-
-	DBG("index %d keys %zu debug_keys %d", index, key_count, debug_keys);
-
-	cp_size = sizeof(*cp) + (key_count * sizeof(*key));
-
-	buf = g_try_malloc0(sizeof(*hdr) + cp_size);
-	if (buf == NULL)
-		return -ENOMEM;
-
-	hdr = (void *) buf;
-	hdr->opcode = htobs(MGMT_OP_LOAD_LINK_KEYS);
-	hdr->len = htobs(cp_size);
-	hdr->index = htobs(index);
-
-	cp = (void *) (buf + sizeof(*hdr));
-	cp->debug_keys = debug_keys;
-	cp->key_count = htobs(key_count);
-
-	for (l = keys, key = cp->keys; l != NULL; l = g_slist_next(l), key++) {
-		struct link_key_info *info = l->data;
-
-		bacpy(&key->addr.bdaddr, &info->bdaddr);
-		key->addr.type = BDADDR_BREDR;
-		key->type = info->type;
-		memcpy(key->val, info->key, 16);
-		key->pin_len = info->pin_len;
-	}
-
-	if (write(mgmt_sock, buf, sizeof(*hdr) + cp_size) < 0)
-		err = -errno;
-	else
-		err = 0;
-
-	g_free(buf);
-
-	return err;
-}
-
 int mgmt_create_bonding(int index, const bdaddr_t *bdaddr, uint8_t addr_type,
 								uint8_t io_cap)
 {
diff --git a/src/mgmt.h b/src/mgmt.h
index 174c6a7cf..71c42b10b 100644
--- a/src/mgmt.h
+++ b/src/mgmt.h
@@ -25,7 +25,6 @@
 int mgmt_setup(void);
 void mgmt_cleanup(void);
 
-int mgmt_load_link_keys(int index, GSList *keys, gboolean debug_keys);
 int mgmt_load_ltks(int index, GSList *keys);
 
 int mgmt_create_bonding(int index, const bdaddr_t *bdaddr, uint8_t addr_type,
-- 
2.47.3