diff --git a/.gitignore b/.gitignore
index a0c9389..a207a0f 100644
--- a/.gitignore
+++ b/.gitignore
tools/rctest
tools/scotest
tools/amptest
+tools/oobtest
tools/sdptool
tools/avtest
tools/bdaddr
diff --git a/Makefile.tools b/Makefile.tools
index 8a4d9ed..e42e42d 100644
--- a/Makefile.tools
+++ b/Makefile.tools
tools/btmgmt tools/btinfo tools/btattach \
tools/btsnoop tools/btproxy \
tools/btiotest tools/mcaptest tools/cltest \
- tools/seq2bseq tools/ibeacon \
+ tools/oobtest tools/seq2bseq tools/ibeacon \
tools/btgatt-client tools/btgatt-server
tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
tools_cltest_SOURCES = tools/cltest.c
tools_cltest_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
+tools_oobtest_SOURCES = tools/oobtest.c
+tools_oobtest_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la
+
tools_seq2bseq_SOURCES = tools/seq2bseq.c
tools_ibeacon_SOURCES = tools/ibeacon.c monitor/bt.h
diff --git a/tools/oobtest.c b/tools/oobtest.c
new file mode 100644
index 0000000..358cc25
--- /dev/null
+++ b/tools/oobtest.c
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2011-2012 Intel Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <bluetooth/bluetooth.h>
+
+#include "lib/mgmt.h"
+
+#include "monitor/mainloop.h"
+#include "src/shared/util.h"
+#include "src/shared/mgmt.h"
+
+static struct mgmt *mgmt;
+static uint16_t index1 = MGMT_INDEX_NONE;
+static uint16_t index2 = MGMT_INDEX_NONE;
+static bdaddr_t bdaddr1;
+static bdaddr_t bdaddr2;
+
+static void new_link_key_event(uint16_t index, uint16_t len,
+ const void *param, void *user_data)
+{
+ const struct mgmt_ev_new_link_key *ev = param;
+ char str[18];
+ int i;
+
+ ba2str(&ev->key.addr.bdaddr, str);
+
+ printf("[Index %u]\n", index);
+ printf(" New link key: %s\n", str);
+ printf(" Type: %u\n", ev->key.type);
+ printf(" Key: ");
+ for (i = 0; i < 16; i++)
+ printf("%02x", ev->key.val[i]);
+ printf("\n");
+}
+
+static void pair_device_complete(uint8_t status, uint16_t len,
+ const void *param, void *user_data)
+{
+ uint16_t index = PTR_TO_UINT(user_data);
+
+ if (status) {
+ fprintf(stderr, "Pair device from index %u failed: %s\n",
+ index, mgmt_errstr(status));
+ }
+
+ mainloop_quit();
+}
+
+static void pair_device(uint16_t index, const bdaddr_t *bdaddr)
+{
+ struct mgmt_cp_pair_device cp;
+ char str[18];
+
+ ba2str(bdaddr, str);
+
+ printf("[Index %u]\n", index);
+ printf(" Starting pairing: %s\n", str);
+
+ memset(&cp, 0, sizeof(cp));
+ bacpy(&cp.addr.bdaddr, bdaddr);
+ cp.addr.type = BDADDR_BREDR;
+ cp.io_cap = 0x03;
+
+ mgmt_send(mgmt, MGMT_OP_PAIR_DEVICE, index, sizeof(cp), &cp,
+ pair_device_complete,
+ UINT_TO_PTR(index), NULL);
+}
+
+static void add_remote_oob_data_complete(uint8_t status, uint16_t len,
+ const void *param, void *user_data)
+{
+ const struct mgmt_addr_info *rp = param;
+ uint16_t index = PTR_TO_UINT(user_data);
+ char str[18];
+
+ if (status) {
+ fprintf(stderr, "Adding OOB data for index %u failed: %s\n",
+ index, mgmt_errstr(status));
+ }
+
+ ba2str(&rp->bdaddr, str);
+
+ printf("[Index %u]\n", index);
+ printf(" Remote data added: %s\n", str);
+
+ if (index == index1)
+ pair_device(index1, &bdaddr2);
+}
+
+static void add_remote_oob_data(uint16_t index, const bdaddr_t *bdaddr,
+ const uint8_t *hash192, const uint8_t *rand192,
+ const uint8_t *hash256, const uint8_t *rand256)
+{
+ struct mgmt_cp_add_remote_oob_data cp;
+
+ memset(&cp, 0, sizeof(cp));
+ bacpy(&cp.addr.bdaddr, bdaddr);
+ cp.addr.type = BDADDR_BREDR;
+ memcpy(cp.hash192, hash192, 16);
+ memcpy(cp.rand192, rand192, 16);
+ if (hash256 && rand256) {
+ memcpy(cp.hash256, hash256, 16);
+ memcpy(cp.rand256, rand256, 16);
+ } else {
+ memset(cp.hash256, 0, 16);
+ memset(cp.rand256, 0, 16);
+ }
+
+ mgmt_send(mgmt, MGMT_OP_ADD_REMOTE_OOB_DATA, index, sizeof(cp), &cp,
+ add_remote_oob_data_complete,
+ UINT_TO_PTR(index), NULL);
+}
+
+static void read_oob_data_complete(uint8_t status, uint16_t len,
+ const void *param, void *user_data)
+{
+ const struct mgmt_rp_read_local_oob_ext_data *rp = param;
+ uint16_t index = PTR_TO_UINT(user_data);
+ const uint8_t *hash192, *rand192, *hash256, *rand256;
+ int i;
+
+ if (status) {
+ fprintf(stderr, "Reading OOB data for index %u failed: %s\n",
+ index, mgmt_errstr(status));
+ mainloop_quit();
+ }
+
+ printf("[Index %u]\n", index);
+
+ hash192 = rp->hash192;
+ rand192 = rp->randomizer192;
+
+ printf(" Hash C from P-192: ");
+ for (i = 0; i < 16; i++)
+ printf("%02x", rp->hash192[i]);
+ printf("\n");
+
+ printf(" Randomizer R with P-192: ");
+ for (i = 0; i < 16; i++)
+ printf("%02x", rp->randomizer192[i]);
+ printf("\n");
+
+ if (len < sizeof(*rp)) {
+ hash256 = NULL;
+ rand256 = NULL;
+ goto done;
+ }
+
+ hash256 = rp->hash256;
+ rand256 = rp->randomizer256;
+
+ printf(" Hash C from P-256: ");
+ for (i = 0; i < 16; i++)
+ printf("%02x", rp->hash256[i]);
+ printf("\n");
+
+ printf(" Randomizer R with P-256: ");
+ for (i = 0; i < 16; i++)
+ printf("%02x", rp->randomizer256[i]);
+ printf("\n");
+
+done:
+ if (index == index1)
+ add_remote_oob_data(index2, &bdaddr1,
+ hash192, rand192, hash256, rand256);
+ else if (index == index2)
+ add_remote_oob_data(index1, &bdaddr2,
+ hash192, rand192, hash256, rand256);
+}
+
+static void clear_link_keys(uint16_t index)
+{
+ struct mgmt_cp_load_link_keys cp;
+
+ memset(&cp, 0, sizeof(cp));
+ cp.debug_keys = 0x00;
+ cp.key_count = cpu_to_le16(0);
+
+ mgmt_send(mgmt, MGMT_OP_LOAD_LINK_KEYS, index,
+ sizeof(cp), &cp, NULL, NULL, NULL);
+}
+
+static void clear_remote_oob_data(uint16_t index)
+{
+ struct mgmt_cp_remove_remote_oob_data cp;
+
+ memset(&cp, 0, sizeof(cp));
+ bacpy(&cp.addr.bdaddr, BDADDR_ANY);
+ cp.addr.type = BDADDR_BREDR;
+
+ mgmt_send(mgmt, MGMT_OP_REMOVE_REMOTE_OOB_DATA, index,
+ sizeof(cp), &cp, NULL, NULL, NULL);
+}
+
+static void read_info(uint8_t status, uint16_t len, const void *param,
+ void *user_data)
+{
+ const struct mgmt_rp_read_info *rp = param;
+ uint16_t index = PTR_TO_UINT(user_data);
+ uint32_t supported_settings;
+ uint8_t val = 0x01;
+ char str[18];
+
+ if (status) {
+ fprintf(stderr, "Reading info for index %u failed: %s\n",
+ index, mgmt_errstr(status));
+ mainloop_quit();
+ }
+
+ ba2str(&rp->bdaddr, str);
+
+ printf("[Index %u]\n", index);
+ printf(" Address: %s\n", str);
+
+ if (index == index1)
+ bacpy(&bdaddr1, &rp->bdaddr);
+ else if (index == index2)
+ bacpy(&bdaddr2, &rp->bdaddr);
+
+ mgmt_register(mgmt, MGMT_EV_NEW_LINK_KEY, index,
+ new_link_key_event,
+ UINT_TO_PTR(index), NULL);
+
+ supported_settings = le32_to_cpu(rp->supported_settings);
+
+ mgmt_send(mgmt, MGMT_OP_SET_SSP, index, 1, &val,
+ NULL, NULL, NULL);
+
+ if (supported_settings & MGMT_SETTING_SECURE_CONN)
+ mgmt_send(mgmt, MGMT_OP_SET_SECURE_CONN, index, 1, &val,
+ NULL, NULL, NULL);
+
+ mgmt_send(mgmt, MGMT_OP_SET_BONDABLE, index, 1, &val,
+ NULL, NULL, NULL);
+ mgmt_send(mgmt, MGMT_OP_SET_CONNECTABLE, index, 1, &val,
+ NULL, NULL, NULL);
+ mgmt_send(mgmt, MGMT_OP_SET_POWERED, index, 1, &val,
+ NULL, NULL, NULL);
+
+ clear_link_keys(index);
+ clear_remote_oob_data(index);
+
+ mgmt_send(mgmt, MGMT_OP_READ_LOCAL_OOB_DATA, index, 0, NULL,
+ read_oob_data_complete,
+ UINT_TO_PTR(index), NULL);
+}
+
+static void read_index_list(uint8_t status, uint16_t len, const void *param,
+ void *user_data)
+{
+ const struct mgmt_rp_read_index_list *rp = param;
+ uint16_t count;
+ int i;
+
+ if (status) {
+ fprintf(stderr, "Reading index list failed: %s\n",
+ mgmt_errstr(status));
+ mainloop_quit();
+ }
+
+ count = le16_to_cpu(rp->num_controllers);
+
+ if (count < 2) {
+ fprintf(stderr, "At least 2 controllers are required\n");
+ mainloop_quit();
+ }
+
+ for (i = 0; i < count; i++) {
+ uint16_t index = cpu_to_le16(rp->index[i]);
+
+ if (index < index1)
+ index1 = index;
+ }
+
+ for (i = 0; i < count; i++) {
+ uint16_t index = cpu_to_le16(rp->index[i]);
+
+ if (index < index2 && index > index1)
+ index2 = index;
+ }
+
+ printf("Selecting index %u for initiator\n", index1);
+ printf("Selecting index %u for acceptor\n", index2);
+
+ mgmt_send(mgmt, MGMT_OP_READ_INFO, index1, 0, NULL,
+ read_info, UINT_TO_PTR(index1), NULL);
+ mgmt_send(mgmt, MGMT_OP_READ_INFO, index2, 0, NULL,
+ read_info, UINT_TO_PTR(index2), NULL);
+}
+
+static void signal_callback(int signum, void *user_data)
+{
+ switch (signum) {
+ case SIGINT:
+ case SIGTERM:
+ mainloop_quit();
+ break;
+ }
+}
+
+int main(int argc ,char *argv[])
+{
+ sigset_t mask;
+ int exit_status;
+
+ mainloop_init();
+
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGINT);
+ sigaddset(&mask, SIGTERM);
+
+ mainloop_set_signal(&mask, signal_callback, NULL, NULL);
+
+ mgmt = mgmt_new_default();
+ if (!mgmt) {
+ fprintf(stderr, "Failed to open management socket\n");
+ return EXIT_FAILURE;
+ }
+
+ if (!mgmt_send(mgmt, MGMT_OP_READ_INDEX_LIST,
+ MGMT_INDEX_NONE, 0, NULL,
+ read_index_list, NULL, NULL)) {
+ fprintf(stderr, "Failed to read index list\n");
+ exit_status = EXIT_FAILURE;
+ goto done;
+ }
+
+ exit_status = mainloop_run();
+
+done:
+ mgmt_unref(mgmt);
+
+ return exit_status;
+}