From 8103400f26cea0c717ecfadc54382c5342ae5fb5 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 8 Jan 2013 11:36:57 +0200 Subject: [PATCH] core: Move mgmt PIN code handling into adapter code --- src/adapter.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++- src/mgmt.c | 98 +-------------------------------------------------- src/mgmt.h | 2 -- 3 files changed, 95 insertions(+), 100 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index e9bd981b8..bbf557e39 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -4254,7 +4254,43 @@ int btd_adapter_pincode_reply(struct btd_adapter *adapter, const bdaddr_t *bdaddr, const char *pin, size_t pin_len) { - return mgmt_pincode_reply(adapter->dev_id, bdaddr, pin, pin_len); + unsigned int id; + char addr[18]; + + ba2str(bdaddr, addr); + DBG("hci%u addr %s pinlen %zu", adapter->dev_id, addr, pin_len); + + if (pin == NULL) { + struct mgmt_cp_pin_code_neg_reply cp; + + memset(&cp, 0, sizeof(cp)); + bacpy(&cp.addr.bdaddr, bdaddr); + cp.addr.type = BDADDR_BREDR; + + id = mgmt_reply(adapter->mgmt, MGMT_OP_PIN_CODE_NEG_REPLY, + adapter->dev_id, sizeof(cp), &cp, + NULL, NULL, NULL); + } else { + struct mgmt_cp_pin_code_reply cp; + + if (pin_len > 16) + return -EINVAL; + + memset(&cp, 0, sizeof(cp)); + bacpy(&cp.addr.bdaddr, bdaddr); + cp.addr.type = BDADDR_BREDR; + cp.pin_len = pin_len; + memcpy(cp.pin_code, pin, pin_len); + + id = mgmt_reply(adapter->mgmt, MGMT_OP_PIN_CODE_REPLY, + adapter->dev_id, sizeof(cp), &cp, + NULL, NULL, NULL); + } + + if (id == 0) + return -EIO; + + return 0; } int btd_adapter_confirm_reply(struct btd_adapter *adapter, @@ -4273,6 +4309,58 @@ int btd_adapter_passkey_reply(struct btd_adapter *adapter, passkey); } +static void pin_code_request_callback(uint16_t index, uint16_t length, + const void *param, void *user_data) +{ + const struct mgmt_ev_pin_code_request *ev = param; + struct btd_adapter *adapter = user_data; + struct btd_device *device; + gboolean display = FALSE; + char pin[17]; + ssize_t pinlen; + char addr[18]; + int err; + + if (length < sizeof(*ev)) { + error("Too small PIN code request event"); + return; + } + + ba2str(&ev->addr.bdaddr, addr); + + DBG("hci%u %s", adapter->dev_id, addr); + + device = adapter_get_device(adapter, addr, ev->addr.type); + if (!device) { + error("Unable to get device object for %s", addr); + return; + } + + memset(pin, 0, sizeof(pin)); + pinlen = btd_adapter_get_pin(adapter, device, pin, &display); + if (pinlen > 0 && (!ev->secure || pinlen == 16)) { + if (display && device_is_bonding(device, NULL)) { + err = device_notify_pincode(device, ev->secure, pin); + if (err < 0) { + error("device_notify_pin: %s", strerror(-err)); + btd_adapter_pincode_reply(adapter, + &ev->addr.bdaddr, + NULL, 0); + } + } else { + btd_adapter_pincode_reply(adapter, &ev->addr.bdaddr, + pin, pinlen); + } + return; + } + + err = device_request_pincode(device, ev->secure); + if (err < 0) { + error("device_request_pin: %s", strerror(-err)); + btd_adapter_pincode_reply(adapter, &ev->addr.bdaddr, NULL, 0); + } +} + int adapter_cancel_bonding(struct btd_adapter *adapter, const bdaddr_t *bdaddr, uint8_t addr_type) { @@ -5209,6 +5297,11 @@ static void read_info_complete(uint8_t status, uint16_t length, device_unblocked_callback, adapter, NULL); + mgmt_register(adapter->mgmt, MGMT_EV_PIN_CODE_REQUEST, + adapter->dev_id, + pin_code_request_callback, + adapter, NULL); + set_dev_class(adapter, adapter->major_class, adapter->minor_class); set_name(adapter, btd_adapter_get_name(adapter)); diff --git a/src/mgmt.c b/src/mgmt.c index 4dff8cd45..c525ff3ba 100644 --- a/src/mgmt.c +++ b/src/mgmt.c @@ -85,102 +85,6 @@ static bool get_adapter_and_device(uint16_t index, return true; } -int mgmt_pincode_reply(int index, const bdaddr_t *bdaddr, const char *pin, - size_t pin_len) -{ - char buf[MGMT_HDR_SIZE + sizeof(struct mgmt_cp_pin_code_reply)]; - struct mgmt_hdr *hdr = (void *) buf; - size_t buf_len; - char addr[18]; - - ba2str(bdaddr, addr); - DBG("index %d addr %s pinlen %zu", index, addr, pin_len); - - memset(buf, 0, sizeof(buf)); - - if (pin == NULL) { - struct mgmt_cp_pin_code_neg_reply *cp; - - hdr->opcode = htobs(MGMT_OP_PIN_CODE_NEG_REPLY); - hdr->len = htobs(sizeof(*cp)); - hdr->index = htobs(index); - - cp = (void *) &buf[sizeof(*hdr)]; - bacpy(&cp->addr.bdaddr, bdaddr); - cp->addr.type = BDADDR_BREDR; - - buf_len = sizeof(*hdr) + sizeof(*cp); - } else { - struct mgmt_cp_pin_code_reply *cp; - - if (pin_len > 16) - return -EINVAL; - - hdr->opcode = htobs(MGMT_OP_PIN_CODE_REPLY); - hdr->len = htobs(sizeof(*cp)); - hdr->index = htobs(index); - - cp = (void *) &buf[sizeof(*hdr)]; - bacpy(&cp->addr.bdaddr, bdaddr); - cp->addr.type = BDADDR_BREDR; - cp->pin_len = pin_len; - memcpy(cp->pin_code, pin, pin_len); - - buf_len = sizeof(*hdr) + sizeof(*cp); - } - - if (write(mgmt_sock, buf, buf_len) < 0) - return -errno; - - return 0; -} - -static void mgmt_pin_code_request(uint16_t index, void *buf, size_t len) -{ - struct mgmt_ev_pin_code_request *ev = buf; - struct btd_adapter *adapter; - struct btd_device *device; - gboolean display = FALSE; - char pin[17]; - ssize_t pinlen; - char addr[18]; - int err; - - if (len < sizeof(*ev)) { - error("Too small pin_code_request event"); - return; - } - - ba2str(&ev->addr.bdaddr, addr); - - DBG("hci%u %s", index, addr); - - if (!get_adapter_and_device(index, &ev->addr, &adapter, &device, true)) - return; - - memset(pin, 0, sizeof(pin)); - pinlen = btd_adapter_get_pin(adapter, device, pin, &display); - if (pinlen > 0 && (!ev->secure || pinlen == 16)) { - if (display && device_is_bonding(device, NULL)) { - err = device_notify_pincode(device, ev->secure, pin); - if (err < 0) { - error("device_notify_pin: %s", strerror(-err)); - mgmt_pincode_reply(index, &ev->addr.bdaddr, - NULL, 0); - } - } else { - mgmt_pincode_reply(index, &ev->addr.bdaddr, pin, pinlen); - } - return; - } - - err = device_request_pincode(device, ev->secure); - if (err < 0) { - error("device_request_pin: %s", strerror(-err)); - mgmt_pincode_reply(index, &ev->addr.bdaddr, NULL, 0); - } -} - int mgmt_confirm_reply(int index, const bdaddr_t *bdaddr, uint8_t bdaddr_type, gboolean success) { @@ -455,7 +359,7 @@ static gboolean mgmt_event(GIOChannel *channel, GIOCondition cond, DBG("connect_failed event"); break; case MGMT_EV_PIN_CODE_REQUEST: - mgmt_pin_code_request(index, buf + MGMT_HDR_SIZE, len); + DBG("pin_code_request event"); break; case MGMT_EV_USER_CONFIRM_REQUEST: mgmt_user_confirm_request(index, buf + MGMT_HDR_SIZE, len); diff --git a/src/mgmt.h b/src/mgmt.h index fe5cd03cd..d184da64b 100644 --- a/src/mgmt.h +++ b/src/mgmt.h @@ -25,8 +25,6 @@ int mgmt_setup(void); void mgmt_cleanup(void); -int mgmt_pincode_reply(int index, const bdaddr_t *bdaddr, const char *pin, - size_t pin_len); int mgmt_confirm_reply(int index, const bdaddr_t *bdaddr, uint8_t bdaddr_type, gboolean success); int mgmt_passkey_reply(int index, const bdaddr_t *bdaddr, uint8_t bdaddr_type, -- 2.47.3