Bluetooth: Mesh: Move command buffer to proxy_msg.c

Move command buffer alloc to proxy_msg.c.

Signed-off-by: Lingao Meng <[email protected]>

Author: LingaoM

subsys/bluetooth/mesh/main.c

@@ -306,10 +306,6 @@ int bt_mesh_init(const struct bt_mesh_prov *prov,
 		return err;
 	}
 
-	if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {
-		bt_mesh_proxy_init();
-	}
-
 	if (IS_ENABLED(CONFIG_BT_MESH_PROV)) {
 		err = bt_mesh_prov_init(prov);
 		if (err) {

subsys/bluetooth/mesh/pb_gatt_srv.c

@@ -32,23 +32,14 @@
 #include "proxy_msg.h"
 #include "pb_gatt_srv.h"
 
-#define CLIENT_BUF_SIZE 66
-
 static bool prov_fast_adv;
 
 static int gatt_send(struct bt_conn *conn,
 		     const void *data, uint16_t len,
 		     bt_gatt_complete_func_t end, void *user_data);
 
-static uint8_t __noinit client_buf_data[CLIENT_BUF_SIZE];
 static struct bt_mesh_proxy_role cli = {
 	.cb.send = gatt_send,
-	.buf = {
-		.__buf = client_buf_data,
-		.data  = client_buf_data,
-		.size  = CLIENT_BUF_SIZE,
-		.len   = CLIENT_BUF_SIZE,
-	},
 };
 
 static bool service_registered;
@@ -91,7 +82,7 @@ static void gatt_connected(struct bt_conn *conn, uint8_t err)
 
 	BT_DBG("conn %p err 0x%02x", (void *)conn, err);
 
-	net_buf_simple_reset(&cli.buf);
+	bt_mesh_proxy_msg_init(&cli);
 }
 
 static void gatt_disconnected(struct bt_conn *conn, uint8_t reason)

subsys/bluetooth/mesh/proxy.h

@@ -47,5 +47,3 @@ void bt_mesh_proxy_identity_stop(struct bt_mesh_subnet *sub);
 
 bool bt_mesh_proxy_relay(struct net_buf *buf, uint16_t dst);
 void bt_mesh_proxy_addr_add(struct net_buf_simple *buf, uint16_t addr);
-
-int bt_mesh_proxy_init(void);

subsys/bluetooth/mesh/proxy_msg.c

@@ -48,6 +48,18 @@
 
 #define PDU_HDR(sar, type) (sar << 6 | (type & BIT_MASK(6)))
 
+#define PB_GATT_BUF_LEN_MAX	66
+#define PROXY_BUF_LEN_MAX	30
+
+#if defined(CONFIG_BT_MESH_PB_GATT)
+#define PROXY_MSG_FIRST_BUF_LEN PB_GATT_BUF_LEN_MAX
+#else
+#define PROXY_MSG_FIRST_BUF_LEN PROXY_BUF_LEN_MAX
+#endif
+
+static uint8_t __noinit bufs[PROXY_MSG_FIRST_BUF_LEN +
+			     ((CONFIG_BT_MAX_CONN - 1) * PROXY_BUF_LEN_MAX)];
+
 static void proxy_sar_timeout(struct k_work *work)
 {
 	struct bt_mesh_proxy_role *role;
@@ -245,5 +257,29 @@ int bt_mesh_proxy_msg_send(struct bt_mesh_proxy_role *role, uint8_t type,
 
 void bt_mesh_proxy_msg_init(struct bt_mesh_proxy_role *role)
 {
+	uint8_t i, len;
+	uint8_t *buf;
+
+	/* Check if buf has been allocated, in this way, we no longer need
+	 * to repeat the operation.
+	 */
+	if (role->buf.__buf) {
+		net_buf_simple_reset(&role->buf);
+		return;
+	}
+
+	i = bt_conn_index(role->conn);
+	if (!i) {
+		len = PROXY_MSG_FIRST_BUF_LEN;
+		buf = bufs;
+	} else {
+		len = PROXY_BUF_LEN_MAX;
+		buf = &bufs[PROXY_MSG_FIRST_BUF_LEN + (PROXY_BUF_LEN_MAX * (i - 1))];
+	}
+
+	net_buf_simple_init_with_data(&role->buf, buf, len);
+
+	net_buf_simple_reset(&role->buf);
+
 	k_work_init_delayable(&role->sar_timer, proxy_sar_timeout);
 }

subsys/bluetooth/mesh/proxy_srv.c

@@ -58,8 +58,6 @@ static struct bt_mesh_proxy_client {
 	},
 };
 
-static uint8_t __noinit client_buf_data[CLIENT_BUF_SIZE * CONFIG_BT_MAX_CONN];
-
 static bool service_registered;
 static int conn_count;
 
@@ -824,7 +822,8 @@ static void gatt_connected(struct bt_conn *conn, uint8_t err)
 	client->cli.conn = bt_conn_ref(conn);
 	client->filter_type = NONE;
 	(void)memset(client->filter, 0, sizeof(client->filter));
-	net_buf_simple_reset(&client->cli.buf);
+
+	bt_mesh_proxy_msg_init(&client->cli);
 }
 
 static void gatt_disconnected(struct bt_conn *conn, uint8_t reason)
@@ -893,20 +892,3 @@ BT_CONN_CB_DEFINE(conn_callbacks_1) = {
 	.connected = gatt_connected,
 	.disconnected = gatt_disconnected,
 };
-
-int bt_mesh_proxy_init(void)
-{
-	int i;
-
-	/* Initialize the client receive buffers */
-	for (i = 0; i < ARRAY_SIZE(clients); i++) {
-		struct bt_mesh_proxy_client *client = &clients[i];
-
-		net_buf_simple_init_with_data(&client->cli.buf,
-			client_buf_data + (i * CLIENT_BUF_SIZE), CLIENT_BUF_SIZE);
-
-		bt_mesh_proxy_msg_init(&client->cli);
-	}
-
-	return 0;
-}