espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-18 06:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #521 from michal-narajowski/mesh-porting-fixes

Browse Source 
Mesh fixes after PTS testing

X-Original-Commit: 42e65ef90fa8a65639f1a316460d95f2121cb771
This commit is contained in:
Michał Narajowski
2017-09-01 15:23:54 +02:00
committed by GitHub
parent 5ce27f2e8e 12112a7dc1
commit 84f8e645be
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/src/prov.c
+24 -8
View File
@@ -254,6 +254,7 @@ static struct os_mbuf *adv_buf_create(void)
PROV_XMIT_INT, BUF_TIMEOUT);
if (!buf) {
BT_ERR("Out of provisioning buffers");
assert(0);
return NULL;
}
@@ -455,6 +456,16 @@ static void prov_buf_init(struct os_mbuf *buf, u8_t type)
net_buf_simple_add_u8(buf, type);
}
static void prov_send_fail_msg(u8_t err)
{
struct os_mbuf *buf = PROV_BUF(2);
prov_buf_init(buf, PROV_FAILED);
net_buf_simple_add_u8(buf, err);
prov_send(buf);
os_mbuf_free_chain(buf);
}
static void prov_invite(const u8_t *data)
{
struct os_mbuf *buf = PROV_BUF(12);
@@ -668,15 +679,25 @@ static void prov_start(const u8_t *data)
if (data[0] != PROV_ALG_P256) {
BT_ERR("Unknown algorithm 0x%02x", data[0]);
prov_send_fail_msg(PROV_ERR_NVAL_FMT);
return;
}
if (data[1] > 0x01) {
BT_ERR("Invalid public key value: 0x%02x", data[1]);
prov_send_fail_msg(PROV_ERR_NVAL_FMT);
return;
}
memcpy(&link.conf_inputs[12], data, 5);
/* TODO: reset link when auth fails? */
link.expect = PROV_PUB_KEY;
if (prov_auth(data[2], data[3], data[4]) < 0) {
BT_ERR("Invalid authentication method");
BT_ERR("Invalid authentication method: 0x%02x; "
"action: 0x%02x; size: 0x%02x", data[2], data[3], data[4]);
prov_send_fail_msg(PROV_ERR_NVAL_FMT);
}
}
@@ -1051,12 +1072,7 @@ static void close_link(u8_t err, u8_t reason)
#if (MYNEWT_VAL(BLE_MESH_PB_ADV))
if (err) {
struct os_mbuf *buf = PROV_BUF(2);
prov_buf_init(buf, PROV_FAILED);
net_buf_simple_add_u8(buf, err);
prov_send(buf);
os_mbuf_free_chain(buf);
prov_send_fail_msg(err);
}
link.rx.seg = 0;
@@ -1187,7 +1203,7 @@ static void prov_msg_recv(void)
if (type != PROV_FAILED && type != link.expect) {
BT_WARN("Unexpected msg 0x%02x != 0x%02x", type, link.expect);
close_link(PROV_ERR_UNEXP_PDU, CLOSE_REASON_FAILED);
prov_send_fail_msg(PROV_ERR_UNEXP_PDU);
return;
}