Bluetooth: Mesh: proxy: update delayable work

Switch to the new API. Adds check for a pending buffer in the SAR
timeout handler.

Signed-off-by: Peter Bigot <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>

Author: pabigot

subsys/bluetooth/mesh/proxy.c

@@ -96,7 +96,7 @@ static struct bt_mesh_proxy_client {
 #if defined(CONFIG_BT_MESH_GATT_PROXY)
 	struct k_work send_beacons;
 #endif
-	struct k_delayed_work    sar_timer;
+	struct k_work_delayable  sar_timer;
 	struct net_buf_simple    buf;
 } clients[CONFIG_BT_MAX_CONN] = {
 	[0 ... (CONFIG_BT_MAX_CONN - 1)] = {
@@ -132,15 +132,22 @@ static struct bt_mesh_proxy_client *find_client(struct bt_conn *conn)
 
 static void proxy_sar_timeout(struct k_work *work)
 {
-	struct bt_mesh_proxy_client *client;
+	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
+	struct bt_mesh_proxy_client *client =
+		CONTAINER_OF(dwork, struct bt_mesh_proxy_client, sar_timer);
 
-	BT_WARN("Proxy SAR timeout");
+	if (!client->conn) {
+		return;
+	}
 
-	client = CONTAINER_OF(work, struct bt_mesh_proxy_client, sar_timer);
-	if (client->conn) {
-		bt_conn_disconnect(client->conn,
-				   BT_HCI_ERR_REMOTE_USER_TERM_CONN);
+	if (!client->buf.len) {
+		BT_DBG("No pending Proxy SAR message");
+		return;
 	}
+
+	BT_WARN("Proxy SAR timeout");
+
+	bt_conn_disconnect(client->conn, BT_HCI_ERR_REMOTE_USER_TERM_CONN);
 }
 
 #if defined(CONFIG_BT_MESH_GATT_PROXY)
@@ -501,7 +508,7 @@ static ssize_t proxy_recv(struct bt_conn *conn,
 			return -EINVAL;
 		}
 
-		k_delayed_work_submit(&client->sar_timer, PROXY_SAR_TIMEOUT);
+		k_work_reschedule(&client->sar_timer, PROXY_SAR_TIMEOUT);
 		client->msg_type = PDU_TYPE(data);
 		net_buf_simple_add_mem(&client->buf, data + 1, len - 1);
 		break;
@@ -517,7 +524,7 @@ static ssize_t proxy_recv(struct bt_conn *conn,
 			return -EINVAL;
 		}
 
-		k_delayed_work_submit(&client->sar_timer, PROXY_SAR_TIMEOUT);
+		k_work_reschedule(&client->sar_timer, PROXY_SAR_TIMEOUT);
 		net_buf_simple_add_mem(&client->buf, data + 1, len - 1);
 		break;
 
@@ -532,7 +539,10 @@ static ssize_t proxy_recv(struct bt_conn *conn,
 			return -EINVAL;
 		}
 
-		k_delayed_work_cancel(&client->sar_timer);
+		/* If this fails, the work handler exits early, as there's no
+		 * active SAR buffer.
+		 */
+		(void)k_work_cancel_delayable(&client->sar_timer);
 		net_buf_simple_add_mem(&client->buf, data + 1, len - 1);
 		proxy_complete_pdu(client);
 		break;
@@ -592,7 +602,10 @@ static void proxy_disconnected(struct bt_conn *conn, uint8_t reason)
 				bt_mesh_pb_gatt_close(conn);
 			}
 
-			k_delayed_work_cancel(&client->sar_timer);
+			/* If this fails, the work handler exits early, as
+			 * there's no active connection.
+			 */
+			(void)k_work_cancel_delayable(&client->sar_timer);
 			bt_conn_unref(client->conn);
 			client->conn = NULL;
 			break;
@@ -1368,7 +1381,7 @@ int bt_mesh_proxy_init(void)
 		client->buf.size = CLIENT_BUF_SIZE;
 		client->buf.__buf = client_buf_data + (i * CLIENT_BUF_SIZE);
 
-		k_delayed_work_init(&client->sar_timer, proxy_sar_timeout);
+		k_work_init_delayable(&client->sar_timer, proxy_sar_timeout);
 	}
 
 	bt_conn_cb_register(&conn_callbacks);