Bluetooth: Mesh: Fix dropping valid proxy configration messages

Johan Hedberg · Anas Nashif · commit c67f64ed36b0 · 2017-10-19T05:34:48.000-04:00
Proxy configuration messages are allowed (in fact required) to use
unassigned addresses, so they should be exempt from this check.

Signed-off-by: Johan Hedberg &lt;johan.hedberg@intel.com&gt;
diff --git a/subsys/bluetooth/host/mesh/net.c b/subsys/bluetooth/host/mesh/net.c
@@ -1125,7 +1125,8 @@ int bt_mesh_net_decode(struct net_buf_simple *data, enum bt_mesh_net_if net_if,
 
 	BT_DBG("Decryption successful. Payload len %u", buf->len);
 
-	if (rx->dst == BT_MESH_ADDR_UNASSIGNED) {
+	if (net_if != BT_MESH_NET_IF_PROXY_CFG &&
+	    rx->dst == BT_MESH_ADDR_UNASSIGNED) {
 		BT_ERR("Destination address is unassigned; dropping packet");
 		return -EBADMSG;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1125,7 +1125,8 @@ int bt_mesh_net_decode(struct net_buf_simple *data, enum bt_mesh_net_if net_if,`
`1125`	`1125`
`1126`	`1126`	`BT_DBG("Decryption successful. Payload len %u", buf->len);`
`1127`	`1127`
`1128`		`- if (rx->dst == BT_MESH_ADDR_UNASSIGNED) {`
	`1128`	`+ if (net_if != BT_MESH_NET_IF_PROXY_CFG &&`
	`1129`	`+ rx->dst == BT_MESH_ADDR_UNASSIGNED) {`
`1129`	`1130`	`BT_ERR("Destination address is unassigned; dropping packet");`
`1130`	`1131`	`return -EBADMSG;`
`1131`	`1132`	`}`