bluetooth: mesh: net: use subnet credentials when relaying (ef43b944) · Commits · Wenxi XU / zephyr

subsys/bluetooth/mesh/net.c

+21 −5

Changes for subsys/bluetooth/mesh/net.c: 21 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -683,7 +683,7 @@ static bool relay_to_adv(enum bt_mesh_net_if net_if)
		}

		static void bt_mesh_net_relay(struct net_buf_simple *sbuf,
		struct bt_mesh_net_rx *rx)
		struct bt_mesh_net_rx *rx, bool update_nid)
		{
		const struct bt_mesh_net_cred *cred;
		struct bt_mesh_adv *adv;
		@@ -730,8 +730,8 @@ static void bt_mesh_net_relay(struct net_buf_simple *sbuf,

		LOG_DBG("Relaying packet. TTL is now %u", TTL(adv->b.data));

		/* Update NID if RX or RX was with friend credentials */
		if (rx->friend_cred) {
		/* Update NID if RX, RX was with friend credentials or when bridging the message */
		if (rx->friend_cred \|\| update_nid) {
		adv->b.data[0] &= 0x80; /* Clear everything except IVI */
		adv->b.data[0] \|= cred->nid;
		}
		@@ -765,14 +765,30 @@ done:
		}

		#if IS_ENABLED(CONFIG_BT_MESH_BRG_CFG_SRV)
		static bool find_subnet_cb(struct bt_mesh_subnet sub, void cb_data)
		{
		uint16_t *net_idx = cb_data;

		return sub->net_idx == *net_idx;
		}

		static void bt_mesh_sbr_check_cb(uint16_t new_net_idx, void *user_data)
		{
		struct pdu_ctx ctx = (struct pdu_ctx )user_data;

		if (new_net_idx < BT_MESH_BRG_CFG_NETIDX_NOMATCH) {
		struct bt_mesh_subnet *subnet = bt_mesh_subnet_find(find_subnet_cb, &new_net_idx);

		if (!subnet) {
		LOG_ERR("Failed to find subnet 0x%04x", new_net_idx);
		return;
		}

		ctx->rx->sub = subnet;
		ctx->rx->ctx.net_idx = new_net_idx;

		net_buf_simple_restore(ctx->sbuf, ctx->state);
		bt_mesh_net_relay(ctx->sbuf, ctx->rx);
		bt_mesh_net_relay(ctx->sbuf, ctx->rx, true);
		}
		}
		#endif
		@@ -912,7 +928,7 @@ void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
		if (!BT_MESH_ADDR_IS_UNICAST(rx.ctx.recv_dst) \|\|
		(!rx.local_match && !rx.friend_match)) {
		net_buf_simple_restore(&buf, &state);
		bt_mesh_net_relay(&buf, &rx);
		bt_mesh_net_relay(&buf, &rx, false);
		}

		#if IS_ENABLED(CONFIG_BT_MESH_BRG_CFG_SRV)

Admin message