Bluetooth: Mesh: Initialize msg_ctx when re-encrypting friend msg (48526b69) · Commits · Wenxi XU / zephyr

Set app_idx and net_idx in the msg_ctx before calling bt_mesh_keys_resolve when re-encrypting friend messages, as they'll be referenced inside the function. Signed-off-by:

Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>

subsys/bluetooth/mesh/friend.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -350,7 +350,12 @@ static int unseg_app_sdu_unpack(struct bt_mesh_friend *frnd,
		struct unseg_app_sdu_meta *meta)
		{
		uint16_t app_idx = FRIEND_ADV(buf)->app_idx;
		struct bt_mesh_net_rx net;
		struct bt_mesh_net_rx net = {
		.ctx = {
		.app_idx = app_idx,
		.net_idx = frnd->subnet->net_idx,
		},
		};
		int err;

		meta->subnet = frnd->subnet;
		@@ -427,6 +432,8 @@ static int unseg_app_sdu_prepare(struct bt_mesh_friend *frnd,
		return 0;
		}

		BT_DBG("Re-encrypting friend pdu");

		err = unseg_app_sdu_decrypt(frnd, buf, &meta);
		if (err) {
		BT_WARN("Decryption failed! %d", err);

Admin message