diff --git a/lib/mgmt.h b/lib/mgmt.h
index 83f9f77..fa684e8 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
uint8_t eir[HCI_MAX_EIR_LENGTH];
} __packed;
-#define MGMT_EV_REMOTE_NAME 0x0012
-struct mgmt_ev_remote_name {
- bdaddr_t bdaddr;
- uint8_t name[MGMT_MAX_NAME_LENGTH];
-} __packed;
-
-#define MGMT_EV_DISCOVERING 0x0013
+#define MGMT_EV_DISCOVERING 0x0012
-#define MGMT_EV_DEVICE_BLOCKED 0x0014
+#define MGMT_EV_DEVICE_BLOCKED 0x0013
struct mgmt_ev_device_blocked {
bdaddr_t bdaddr;
} __packed;
-#define MGMT_EV_DEVICE_UNBLOCKED 0x0015
+#define MGMT_EV_DEVICE_UNBLOCKED 0x0014
struct mgmt_ev_device_unblocked {
bdaddr_t bdaddr;
} __packed;
diff --git a/mgmt/main.c b/mgmt/main.c
index 45d989d..d13d19f 100644
--- a/mgmt/main.c
+++ b/mgmt/main.c
return 0;
}
-static int mgmt_remote_name(int mgmt_sk, uint16_t index,
- struct mgmt_ev_remote_name *ev, uint16_t len)
-{
- if (len != sizeof(*ev)) {
- fprintf(stderr,
- "Invalid remote_name event length (%u bytes)\n", len);
- return -EINVAL;
- }
-
- if (monitor || discovery) {
- char addr[18];
- ba2str(&ev->bdaddr, addr);
- printf("hci%u %s name %s\n", index, addr, ev->name);
- }
-
- return 0;
-}
-
static void pin_rsp(int mgmt_sk, uint16_t op, uint16_t id, uint8_t status,
void *rsp, uint16_t len, void *user_data)
{
return mgmt_name_changed(mgmt_sk, index, data, len);
case MGMT_EV_DEVICE_FOUND:
return mgmt_device_found(mgmt_sk, index, data, len);
- case MGMT_EV_REMOTE_NAME:
- return mgmt_remote_name(mgmt_sk, index, data, len);
case MGMT_EV_PIN_CODE_REQUEST:
return mgmt_request_pin(mgmt_sk, index, data, len);
case MGMT_EV_USER_CONFIRM_REQUEST:
diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index 8314581..6d98ad9 100644
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
eir, HCI_MAX_EIR_LENGTH);
}
-static void mgmt_remote_name(int sk, uint16_t index, void *buf, size_t len)
-{
- struct mgmt_ev_remote_name *ev = buf;
- struct controller_info *info;
- char addr[18];
-
- if (len < sizeof(*ev)) {
- error("Too small mgmt_remote_name packet");
- return;
- }
-
- if (index > max_index) {
- error("Unexpected index %u in remote_name event", index);
- return;
- }
-
- info = &controllers[index];
-
- ba2str(&ev->bdaddr, addr);
- DBG("hci%u addr %s, name %s", index, addr, ev->name);
-
- btd_event_remote_name(&info->bdaddr, &ev->bdaddr, (char *) ev->name);
-}
-
static void mgmt_discovering(int sk, uint16_t index, void *buf, size_t len)
{
struct mgmt_mode *ev = buf;
case MGMT_EV_DEVICE_FOUND:
mgmt_device_found(sk, index, buf + MGMT_HDR_SIZE, len);
break;
- case MGMT_EV_REMOTE_NAME:
- mgmt_remote_name(sk, index, buf + MGMT_HDR_SIZE, len);
- break;
case MGMT_EV_DISCOVERING:
mgmt_discovering(sk, index, buf + MGMT_HDR_SIZE, len);
break;