michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Check TTL max value on transport TX

Browse source 
Adds check for TTL max in the transport send functions, and moves
setting of default TTL to transport.

Fixes #29855.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
This commit is contained in:
Trond Einar Snekvik 2020-11-07 15:31:34 +01:00 • committed by Carles Cufí
commit a2aad2b3f8
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/bluetooth/mesh/net.c
View file

@ -457,10 +457,6 @@ int bt_mesh_net_send(struct bt_mesh_net_tx *tx, struct net_buf *buf,
BT_DBG("Payload len %u: %s", buf->len, bt_hex(buf->data, buf->len));
BT_DBG("Seq 0x%06x", bt_mesh.seq);
if (tx->ctx->send_ttl == BT_MESH_TTL_DEFAULT) {
tx->ctx->send_ttl = bt_mesh_default_ttl_get();
}
cred = net_tx_cred_get(tx);
err = net_header_encode(tx, cred->nid, &buf->b);
if (err) {

21
subsys/bluetooth/mesh/transport.c
View file

@ -492,12 +492,7 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
tx->blocked = blocked;
tx->started = 0;
tx->ctl = !!ctl_op;
if (net_tx->ctx->send_ttl == BT_MESH_TTL_DEFAULT) {
tx->ttl = bt_mesh_default_ttl_get();
} else {
tx->ttl = net_tx->ctx->send_ttl;
}
tx->ttl = net_tx->ctx->send_ttl;
BT_DBG("SeqZero 0x%04x (segs: %u)",
(uint16_t)(tx->seq_auth & TRANS_SEQ_ZERO_MASK), tx->nack_count);
@ -632,6 +627,13 @@ int bt_mesh_trans_send(struct bt_mesh_net_tx *tx, struct net_buf_simple *msg,
return -EINVAL;
}
if (tx->ctx->send_ttl == BT_MESH_TTL_DEFAULT) {
tx->ctx->send_ttl = bt_mesh_default_ttl_get();
} else if (tx->ctx->send_ttl > BT_MESH_TTL_MAX) {
BT_ERR("TTL too large (max 127)");
return -EINVAL;
}
if (msg->len > BT_MESH_SDU_UNSEG_MAX) {
tx->ctx->send_rel = true;
}
@ -988,6 +990,13 @@ int bt_mesh_ctl_send(struct bt_mesh_net_tx *tx, uint8_t ctl_op, void *data,
{
struct net_buf_simple buf;
if (tx->ctx->send_ttl == BT_MESH_TTL_DEFAULT) {
tx->ctx->send_ttl = bt_mesh_default_ttl_get();
} else if (tx->ctx->send_ttl > BT_MESH_TTL_MAX) {
BT_ERR("TTL too large (max 127)");
return -EINVAL;
}
net_buf_simple_init_with_data(&buf, data, data_len);
if (data_len > BT_MESH_SDU_UNSEG_MAX) {