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

host/mesh: Fix regression in PB-ADV

Browse Source 
After #35702, the provisioner is unable to mark a link as closed, as
it depends on the send_end callback to be called, so it can start its
timer. PB-Adv keeps a reference to the buffers of reliable messages,
which prevents this callback to be invoked, as the buffer destructor is
never called.

Move scheduling of the retransmit timer to the initial transmission, and
replace the timer based LINK_CLOSE message tx duration with a message
counting solution.

This is port of 534177b2ca02f52ad04d8da08167a3e847242de7
This commit is contained in:
Krzysztof Kopyściński
2021-11-10 06:24:00 +01:00
committed by Krzysztof Kopyściński
parent 4b0e349592
commit 7baecc0fa4
1 changed files with 63 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/src/pb_adv.c
+63 -55
View File
@@ -55,10 +55,10 @@
/* Acked messages, will do retransmissions manually, taking acks into account:
*/
#define RETRANSMITS_RELIABLE 0
/* Unacked messages: */
#define RETRANSMITS_UNRELIABLE 2
/* PDU acks: */
#define RETRANSMITS_ACK 2
/* Link close retransmits: */
#define RETRANSMITS_LINK_CLOSE 2
enum {
ADV_LINK_ACTIVE, /* Link has been opened */
@@ -126,20 +126,27 @@ static void link_open(struct prov_rx *rx, struct os_mbuf *buf);
static void link_ack(struct prov_rx *rx, struct os_mbuf *buf);
static void link_close(struct prov_rx *rx, struct os_mbuf *buf);
static void prov_link_close(enum prov_bearer_link_status status);
static void close_link(enum prov_bearer_link_status status);
static void buf_sent(int err, void *user_data)
{
BT_DBG("buf_send");
if (!link.tx.buf[0]) {
if (atomic_test_and_clear_bit(link.flags, ADV_LINK_CLOSING)) {
close_link(PROV_BEARER_LINK_STATUS_SUCCESS);
return;
}
}
BT_DBG("submit retransmit");
k_work_reschedule(&link.tx.retransmit, RETRANSMIT_TIMEOUT);
static void buf_start(uint16_t duration, int err, void *user_data)
{
if (err) {
buf_sent(err, user_data);
}
}
static struct bt_mesh_send_cb buf_sent_cb = {
.start = buf_start,
.end = buf_sent,
};
@@ -569,18 +576,14 @@ static void send_reliable(void)
BT_DBG("%u bytes: %s", buf->om_len, bt_hex(buf->om_data, buf->om_len));
if (i + 1 < ARRAY_SIZE(link.tx.buf) && link.tx.buf[i + 1]) {
bt_mesh_adv_send(buf, NULL, NULL);
} else {
bt_mesh_adv_send(buf, &buf_sent_cb, NULL);
}
bt_mesh_adv_send(buf, NULL, NULL);
}
k_work_reschedule(&link.tx.retransmit, RETRANSMIT_TIMEOUT);
}
static void prov_retransmit(struct ble_npl_event *work)
{
int32_t timeout_ms;
BT_DBG("");
if (!atomic_test_bit(link.flags, ADV_LINK_ACTIVE)) {
@@ -588,45 +591,25 @@ static void prov_retransmit(struct ble_npl_event *work)
return;
}
/*
* According to mesh profile spec (5.3.1.4.3), the close message should
* be restransmitted at least three times. Retransmit the link_close
* message until CLOSING_TIMEOUT has elapsed.
*/
if (atomic_test_bit(link.flags, ADV_LINK_CLOSING)) {
timeout_ms = CLOSING_TIMEOUT;
} else {
timeout_ms = TRANSACTION_TIMEOUT;
}
if (k_uptime_get() - link.tx.start > timeout_ms) {
if (atomic_test_bit(link.flags, ADV_LINK_CLOSING)) {
close_link(PROV_BEARER_LINK_STATUS_SUCCESS);
} else {
BT_WARN("Giving up transaction");
prov_link_close(PROV_BEARER_LINK_STATUS_TIMEOUT);
}
if (k_uptime_get() - link.tx.start > TRANSACTION_TIMEOUT) {
BT_WARN("Giving up transaction");
prov_link_close(PROV_BEARER_LINK_STATUS_FAIL);
return;
}
send_reliable();
}
static int bearer_ctl_send(uint8_t op, const void *data, uint8_t data_len,
bool reliable)
static struct os_mbuf *ctl_buf_create(uint8_t op, const void *data, uint8_t data_len,
uint8_t retransmits)
{
struct os_mbuf *buf;
BT_DBG("op 0x%02x data_len %u", op, data_len);
prov_clear_tx();
k_work_reschedule(&link.prot_timer, PROTOCOL_TIMEOUT);
buf = adv_buf_create(reliable ? RETRANSMITS_RELIABLE :
RETRANSMITS_UNRELIABLE);
buf = adv_buf_create(retransmits);
if (!buf) {
return -ENOBUFS;
return NULL;
}
net_buf_add_be32(buf, link.id);
@@ -634,16 +617,35 @@ static int bearer_ctl_send(uint8_t op, const void *data, uint8_t data_len,
net_buf_add_u8(buf, 0x00);
net_buf_add_u8(buf, GPC_CTL(op));
net_buf_add_mem(buf, data, data_len);
return buf;
}
if (reliable) {
link.tx.start = k_uptime_get();
link.tx.buf[0] = buf;
send_reliable();
} else {
bt_mesh_adv_send(buf, &buf_sent_cb, NULL);
net_buf_unref(buf);
static int bearer_ctl_send(struct os_mbuf *buf)
{
if (!buf) {
return -ENOMEM;
}
prov_clear_tx();
k_work_reschedule(&link.prot_timer, PROTOCOL_TIMEOUT);
link.tx.start = k_uptime_get();
link.tx.buf[0] = buf;
send_reliable();
return 0;
}
static int bearer_ctl_send_unacked(struct os_mbuf *buf)
{
if (!buf) {
return -ENOMEM;
}
prov_clear_tx();
k_work_reschedule(&link.prot_timer, PROTOCOL_TIMEOUT);
bt_mesh_adv_send(buf, &buf_sent_cb, NULL);
net_buf_unref(buf);
return 0;
}
@@ -720,6 +722,8 @@ static int prov_send_adv(struct os_mbuf *msg,
static void link_open(struct prov_rx *rx, struct os_mbuf *buf)
{
int err;
BT_DBG("len %u", buf->om_len);
if (buf->om_len < 16) {
@@ -729,13 +733,14 @@ static void link_open(struct prov_rx *rx, struct os_mbuf *buf)
if (atomic_test_bit(link.flags, ADV_LINK_ACTIVE)) {
/* Send another link ack if the provisioner missed the last */
if (link.id == rx->link_id) {
BT_DBG("Resending link ack");
bearer_ctl_send(LINK_ACK, NULL, 0, false);
} else {
if (link.id != rx->link_id) {
BT_DBG("Ignoring bearer open: link already active");
return;
}
BT_DBG("Resending link ack");
/* Ignore errors, message will be attempted again if we keep receiving link open: */
(void)bearer_ctl_send_unacked(ctl_buf_create(LINK_ACK, NULL, 0, RETRANSMITS_ACK));
return;
}
@@ -748,7 +753,11 @@ static void link_open(struct prov_rx *rx, struct os_mbuf *buf)
atomic_set_bit(link.flags, ADV_LINK_ACTIVE);
net_buf_simple_reset(link.rx.buf);
bearer_ctl_send(LINK_ACK, NULL, 0, false);
err = bearer_ctl_send_unacked(ctl_buf_create(LINK_ACK, NULL, 0, RETRANSMITS_ACK));
if (err) {
reset_adv_link();
return;
}
link.cb->link_opened(&pb_adv, link.cb_data);
}
@@ -828,9 +837,7 @@ static int prov_link_open(const uint8_t uuid[16], int32_t timeout,
net_buf_simple_reset(link.rx.buf);
bearer_ctl_send(LINK_OPEN, uuid, 16, true);
return 0;
return bearer_ctl_send(ctl_buf_create(LINK_OPEN, uuid, 16, RETRANSMITS_RELIABLE));
}
static int prov_link_accept(const struct prov_bearer_cb *cb, void *cb_data)
@@ -858,7 +865,8 @@ static void prov_link_close(enum prov_bearer_link_status status)
return;
}
bearer_ctl_send(LINK_CLOSE, &status, 1, true);
/* Ignore errors, the link will time out eventually if this doesn't get sent */
bearer_ctl_send_unacked(ctl_buf_create(LINK_CLOSE, &status, 1, RETRANSMITS_LINK_CLOSE));
}
void pb_adv_init(void)