michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Split gatt services to pb-gatt and proxy

Browse source 
Split gatt services to pb-gatt-srv and proxy-srv.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
This commit is contained in:
Lingao Meng 2021-08-18 16:56:31 +08:00 • committed by Christopher Friedt
commit b2889903a3
8 changed files with 410 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

7
subsys/bluetooth/mesh/CMakeLists.txt
View file

@ -39,9 +39,12 @@ zephyr_library_sources_ifdef(CONFIG_BT_MESH_PROVISIONER provisioner.c)
zephyr_library_sources_ifdef(CONFIG_BT_MESH_PB_ADV pb_adv.c)
zephyr_library_sources_ifdef(CONFIG_BT_MESH_PB_GATT pb_gatt.c)
zephyr_library_sources_ifdef(CONFIG_BT_MESH_PB_GATT
pb_gatt.c
pb_gatt_srv.c
)
zephyr_library_sources_ifdef(CONFIG_BT_MESH_GATT_SERVER gatt_services.c)
zephyr_library_sources_ifdef(CONFIG_BT_MESH_GATT_PROXY proxy_srv.c)
zephyr_library_sources_ifdef(CONFIG_BT_MESH_GATT proxy_msg.c)

5
subsys/bluetooth/mesh/Kconfig
View file

@ -158,10 +158,9 @@ config BT_MESH_PROXY_USE_DEVICE_NAME
config BT_MESH_PROXY_FILTER_SIZE
int "Maximum number of filter entries per Proxy Client"
default 3 if BT_MESH_GATT_PROXY
default 1
default 3
range 1 32767
depends on BT_MESH_GATT_SERVER
depends on BT_MESH_GATT_PROXY
help
This option specifies how many Proxy Filter entries the local
node supports.

16
subsys/bluetooth/mesh/adv_ext.c
View file

@ -171,15 +171,25 @@ static void send_pending_adv(struct k_work *work)
}
}
if (!IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER)) {
return;
}
/* No more pending buffers */
if (IS_ENABLED(CONFIG_BT_MESH_GATT_SERVER)) {
BT_DBG("Proxy Advertising");
if (bt_mesh_is_provisioned()) {
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {
err = bt_mesh_proxy_adv_start();
BT_DBG("Proxy Advertising");
}
} else if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
err = bt_mesh_prov_adv_start();
BT_DBG("PB-GATT Advertising");
}
if (!err) {
atomic_set_bit(adv.flags, ADV_FLAG_PROXY);
}
}
}
static void schedule_send(void)
{

9
subsys/bluetooth/mesh/adv_legacy.c
View file

@ -137,8 +137,15 @@ static void adv_thread(void *p1, void *p2, void *p3)
* to bt_mesh_adv_start:
*/
adv_timeout = SYS_FOREVER_MS;
bt_mesh_proxy_adv_start();
if (bt_mesh_is_provisioned()) {
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {
(void)bt_mesh_proxy_adv_start();
BT_DBG("Proxy Advertising");
}
} else if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
(void)bt_mesh_prov_adv_start();
BT_DBG("PB-GATT Advertising");
}
buf = net_buf_get(&bt_mesh_adv_queue,
SYS_TIMEOUT_MS(adv_timeout));

9
subsys/bluetooth/mesh/main.c
View file

@ -305,7 +305,7 @@ int bt_mesh_init(const struct bt_mesh_prov *prov,
return err;
}
if (IS_ENABLED(CONFIG_BT_MESH_GATT)) {
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {
bt_mesh_proxy_init();
}
@ -354,14 +354,13 @@ int bt_mesh_start(void)
bt_mesh_beacon_disable();
}
/* For PB-GATT provision, will enable in le disconnect handler. */
if (bt_mesh_prov_link.bearer->type == BT_MESH_PROV_ADV) {
if (!IS_ENABLED(CONFIG_BT_MESH_PROV) || !bt_mesh_prov_active() ||
bt_mesh_prov_link.bearer->type == BT_MESH_PROV_ADV) {
if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT)) {
(void)bt_mesh_proxy_prov_disable();
}
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY) &&
bt_mesh_gatt_proxy_get() != BT_MESH_GATT_PROXY_NOT_SUPPORTED) {
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {
(void)bt_mesh_proxy_gatt_enable();
bt_mesh_adv_update();
}

329
subsys/bluetooth/mesh/pb_gatt_srv.c Normal file
View file

@ -0,0 +1,329 @@
/*
* Copyright (c) 2017 Intel Corporation
* Copyright (c) 2021 Lingao Meng
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <sys/byteorder.h>
#include <net/buf.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/conn.h>
#include <bluetooth/gatt.h>
#include <bluetooth/mesh.h>
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROV)
#define LOG_MODULE_NAME bt_mesh_pb_gatt_srv
#include "common/log.h"
#include "mesh.h"
#include "adv.h"
#include "net.h"
#include "rpl.h"
#include "transport.h"
#include "host/ecc.h"
#include "prov.h"
#include "beacon.h"
#include "foundation.h"
#include "access.h"
#include "proxy.h"
#include "proxy_msg.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;
static ssize_t gatt_recv(struct bt_conn *conn,
const struct bt_gatt_attr *attr, const void *buf,
uint16_t len, uint16_t offset, uint8_t flags)
{
const uint8_t *data = buf;
if (cli.conn != conn) {
BT_ERR("No PB-GATT Client found");
return -ENOTCONN;
}
if (len < 1) {
BT_WARN("Too small Proxy PDU");
return -EINVAL;
}
if (PDU_TYPE(data) != BT_MESH_PROXY_PROV) {
BT_WARN("Proxy PDU type doesn't match GATT service");
return -EINVAL;
}
return bt_mesh_proxy_msg_recv(&cli, buf, len);
}
static void gatt_connected(struct bt_conn *conn, uint8_t err)
{
struct bt_conn_info info;
bt_conn_get_info(conn, &info);
if (info.role != BT_CONN_ROLE_SLAVE ||
!service_registered || bt_mesh_is_provisioned()) {
return;
}
cli.conn = bt_conn_ref(conn);
BT_DBG("conn %p err 0x%02x", (void *)conn, err);
net_buf_simple_reset(&cli.buf);
}
static void gatt_disconnected(struct bt_conn *conn, uint8_t reason)
{
struct bt_conn_info info;
bt_conn_get_info(conn, &info);
if (info.role != BT_CONN_ROLE_SLAVE ||
!service_registered) {
return;
}
if (cli.conn != conn) {
BT_WARN("No PB-GATT Client found");
return;
}
BT_DBG("conn %p reason 0x%02x", (void *)conn, reason);
bt_mesh_pb_gatt_close(conn);
if (bt_mesh_is_provisioned()) {
(void)bt_mesh_proxy_prov_disable();
if (IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY)) {
(void)bt_mesh_proxy_gatt_enable();
}
}
bt_conn_unref(cli.conn);
cli.conn = NULL;
bt_mesh_adv_update();
}
struct net_buf_simple *bt_mesh_proxy_get_buf(void)
{
struct net_buf_simple *buf = &cli.buf;
net_buf_simple_reset(buf);
return buf;
}
static void prov_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
{
BT_DBG("value 0x%04x", value);
}
static ssize_t prov_ccc_write(struct bt_conn *conn,
const struct bt_gatt_attr *attr, uint16_t value)
{
if (cli.conn != conn) {
BT_ERR("No PB-GATT Client found");
return -ENOTCONN;
}
BT_DBG("value 0x%04x", value);
if (value != BT_GATT_CCC_NOTIFY) {
BT_WARN("Client wrote 0x%04x instead enabling notify", value);
return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
}
bt_mesh_pb_gatt_open(conn);
return sizeof(value);
}
/* Mesh Provisioning Service Declaration */
static struct _bt_gatt_ccc prov_ccc =
BT_GATT_CCC_INITIALIZER(prov_ccc_changed, prov_ccc_write, NULL);
static struct bt_gatt_attr prov_attrs[] = {
BT_GATT_PRIMARY_SERVICE(BT_UUID_MESH_PROV),
BT_GATT_CHARACTERISTIC(BT_UUID_MESH_PROV_DATA_IN,
BT_GATT_CHRC_WRITE_WITHOUT_RESP,
BT_GATT_PERM_WRITE, NULL, gatt_recv,
NULL),
BT_GATT_CHARACTERISTIC(BT_UUID_MESH_PROV_DATA_OUT,
BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_NONE,
NULL, NULL, NULL),
BT_GATT_CCC_MANAGED(&prov_ccc,
BT_GATT_PERM_READ | BT_GATT_PERM_WRITE),
};
static struct bt_gatt_service prov_svc = BT_GATT_SERVICE(prov_attrs);
int bt_mesh_proxy_prov_enable(void)
{
BT_DBG("");
if (bt_mesh_is_provisioned()) {
return -ENOTSUP;
}
if (service_registered) {
return -EBUSY;
}
(void)bt_gatt_service_register(&prov_svc);
service_registered = true;
prov_fast_adv = true;
return 0;
}
int bt_mesh_proxy_prov_disable(void)
{
BT_DBG("");
if (!service_registered) {
return -EALREADY;
}
bt_gatt_service_unregister(&prov_svc);
service_registered = false;
bt_mesh_adv_update();
return 0;
}
static uint8_t prov_svc_data[20] = {
BT_UUID_16_ENCODE(BT_UUID_MESH_PROV_VAL),
};
static const struct bt_data prov_ad[] = {
BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
BT_DATA_BYTES(BT_DATA_UUID16_ALL,
BT_UUID_16_ENCODE(BT_UUID_MESH_PROV_VAL)),
BT_DATA(BT_DATA_SVC_DATA16, prov_svc_data, sizeof(prov_svc_data)),
};
int bt_mesh_pb_gatt_send(struct bt_conn *conn, struct net_buf_simple *buf,
bt_gatt_complete_func_t end, void *user_data)
{
if (cli.conn != conn) {
BT_ERR("No PB-GATT Client found");
return -ENOTCONN;
}
return bt_mesh_proxy_msg_send(&cli, BT_MESH_PROXY_PROV, buf, end, user_data);
}
static size_t gatt_prov_adv_create(struct bt_data prov_sd[1])
{
const struct bt_mesh_prov *prov = bt_mesh_prov_get();
size_t uri_len;
memcpy(prov_svc_data + 2, prov->uuid, 16);
sys_put_be16(prov->oob_info, prov_svc_data + 18);
if (!prov->uri) {
return 0;
}
uri_len = strlen(prov->uri);
if (uri_len > 29) {
/* There's no way to shorten an URI */
BT_WARN("Too long URI to fit advertising packet");
return 0;
}
prov_sd[0].type = BT_DATA_URI;
prov_sd[0].data_len = uri_len;
prov_sd[0].data = (const uint8_t *)prov->uri;
return 1;
}
static int gatt_send(struct bt_conn *conn,
const void *data, uint16_t len,
bt_gatt_complete_func_t end, void *user_data)
{
BT_DBG("%u bytes: %s", len, bt_hex(data, len));
struct bt_gatt_notify_params params = {
.data = data,
.len = len,
.attr = &prov_attrs[3],
.user_data = user_data,
.func = end,
};
return bt_gatt_notify_cb(conn, &params);
}
int bt_mesh_prov_adv_start(void)
{
BT_DBG("");
if (!service_registered || bt_mesh_is_provisioned()) {
return -ENOTSUP;
}
struct bt_le_adv_param fast_adv_param = {
.options = ADV_OPT_PROV,
ADV_FAST_INT,
};
struct bt_data prov_sd[1];
size_t prov_sd_len;
int err;
prov_sd_len = gatt_prov_adv_create(prov_sd);
if (!prov_fast_adv) {
struct bt_le_adv_param slow_adv_param = {
.options = ADV_OPT_PROV,
ADV_SLOW_INT,
};
return bt_mesh_adv_start(&slow_adv_param, SYS_FOREVER_MS, prov_ad,
ARRAY_SIZE(prov_ad), prov_sd, prov_sd_len);
}
/* Advertise 60 seconds using fast interval */
err = bt_mesh_adv_start(&fast_adv_param, (60 * MSEC_PER_SEC),
prov_ad, ARRAY_SIZE(prov_ad),
prov_sd, prov_sd_len);
if (!err) {
prov_fast_adv = false;
}
return err;
}
/* Add `_2` suffix forces this callback to be called
* after proxy_srv's conn_cb.
*/
BT_CONN_CB_DEFINE(conn_callbacks_2) = {
.connected = gatt_connected,
.disconnected = gatt_disconnected,
};

37
subsys/bluetooth/mesh/proxy.h
View file

@ -4,21 +4,35 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_SUBSYS_BLUETOOTH_MESH_PROXY_H_
#define ZEPHYR_SUBSYS_BLUETOOTH_MESH_PROXY_H_
#if defined(CONFIG_BT_MESH_DEBUG_USE_ID_ADDR)
#define ADV_OPT_USE_IDENTITY BT_LE_ADV_OPT_USE_IDENTITY
#else
#define ADV_OPT_USE_IDENTITY 0
#endif
#include <bluetooth/gatt.h>
#if defined(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME)
#define ADV_OPT_USE_NAME BT_LE_ADV_OPT_USE_NAME
#else
#define ADV_OPT_USE_NAME 0
#endif
#define BT_MESH_PROXY_NET_PDU 0x00
#define BT_MESH_PROXY_BEACON 0x01
#define BT_MESH_PROXY_CONFIG 0x02
#define BT_MESH_PROXY_PROV 0x03
#define ADV_OPT_PROXY \
(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_SCANNABLE | \
BT_LE_ADV_OPT_ONE_TIME | ADV_OPT_USE_IDENTITY | \
ADV_OPT_USE_NAME)
int bt_mesh_pb_gatt_send(struct bt_conn *conn, struct net_buf_simple *buf,
bt_gatt_complete_func_t end, void *user_data);
#define ADV_OPT_PROV \
(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_SCANNABLE | \
BT_LE_ADV_OPT_ONE_TIME | ADV_OPT_USE_IDENTITY | \
BT_LE_ADV_OPT_USE_NAME)
int bt_mesh_proxy_prov_enable(void);
int bt_mesh_proxy_prov_disable(void);
#define ADV_SLOW_INT \
.interval_min = BT_GAP_ADV_SLOW_INT_MIN, \
.interval_max = BT_GAP_ADV_SLOW_INT_MAX
#define ADV_FAST_INT \
.interval_min = BT_GAP_ADV_FAST_INT_MIN_2, \
.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
int bt_mesh_proxy_gatt_enable(void);
int bt_mesh_proxy_gatt_disable(void);
@ -29,6 +43,7 @@ void bt_mesh_proxy_beacon_send(struct bt_mesh_subnet *sub);
struct net_buf_simple *bt_mesh_proxy_get_buf(void);
int bt_mesh_proxy_adv_start(void);
int bt_mesh_prov_adv_start(void);
void bt_mesh_proxy_identity_start(struct bt_mesh_subnet *sub);
void bt_mesh_proxy_identity_stop(struct bt_mesh_subnet *sub);

343
subsys/bluetooth/mesh/gatt_services.c → subsys/bluetooth/mesh/proxy_srv.c
View file

@ -31,54 +31,9 @@
#include "proxy.h"
#include "proxy_msg.h"
/* Mesh Profile 1.0 Section 6.6:
* "The timeout for the SAR transfer is 20 seconds. When the timeout
* expires, the Proxy Server shall disconnect."
*/
#define PROXY_SAR_TIMEOUT K_SECONDS(20)
#define CLIENT_BUF_SIZE 65
#if defined(CONFIG_BT_MESH_DEBUG_USE_ID_ADDR)
#define ADV_OPT_USE_IDENTITY BT_LE_ADV_OPT_USE_IDENTITY
#else
#define ADV_OPT_USE_IDENTITY 0
#endif
#if defined(CONFIG_BT_MESH_PROXY_USE_DEVICE_NAME)
#define ADV_OPT_USE_NAME BT_LE_ADV_OPT_USE_NAME
#else
#define ADV_OPT_USE_NAME 0
#endif
#define ADV_OPT_PROV \
(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_SCANNABLE | \
BT_LE_ADV_OPT_ONE_TIME | ADV_OPT_USE_IDENTITY | \
BT_LE_ADV_OPT_USE_NAME)
#define ADV_OPT_PROXY \
(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_SCANNABLE | \
BT_LE_ADV_OPT_ONE_TIME | ADV_OPT_USE_IDENTITY | \
ADV_OPT_USE_NAME)
#define ADV_SLOW_INT \
.interval_min = BT_GAP_ADV_SLOW_INT_MIN, \
.interval_max = BT_GAP_ADV_SLOW_INT_MAX
#define ADV_FAST_INT \
.interval_min = BT_GAP_ADV_FAST_INT_MIN_2, \
.interval_max = BT_GAP_ADV_FAST_INT_MAX_2
#if defined(CONFIG_BT_MESH_GATT_PROXY)
static void proxy_send_beacons(struct k_work *work);
static void proxy_filter_recv(struct bt_conn *conn,
struct bt_mesh_net_rx *rx, struct net_buf_simple *buf);
#endif /* CONFIG_BT_MESH_GATT_PROXY */
#if defined(CONFIG_BT_MESH_PB_GATT)
static bool prov_fast_adv;
#endif /* CONFIG_BT_MESH_PB_GATT */
static int proxy_send(struct bt_conn *conn,
const void *data, uint16_t len,
bt_gatt_complete_func_t end, void *user_data);
@ -92,32 +47,20 @@ static struct bt_mesh_proxy_client {
REJECT,
PROV,
} filter_type;
#if defined(CONFIG_BT_MESH_GATT_PROXY)
struct k_work send_beacons;
#endif /* CONFIG_BT_MESH_GATT_PROXY */
} clients[CONFIG_BT_MAX_CONN] = {
[0 ... (CONFIG_BT_MAX_CONN - 1)] = {
#if defined(CONFIG_BT_MESH_GATT_PROXY)
.send_beacons = Z_WORK_INITIALIZER(proxy_send_beacons),
#endif /* CONFIG_BT_MESH_GATT_PROXY */
.cli.cb = {
.send = proxy_send,
#if defined(CONFIG_BT_MESH_GATT_PROXY)
.recv = proxy_filter_recv,
#endif /* CONFIG_BT_MESH_GATT_PROXY */
},
},
};
static uint8_t __noinit client_buf_data[CLIENT_BUF_SIZE * CONFIG_BT_MAX_CONN];
/* Track which service is enabled */
static enum {
MESH_GATT_NONE,
MESH_GATT_PROV,
MESH_GATT_PROXY,
} gatt_svc = MESH_GATT_NONE;
static bool service_registered;
static int conn_count;
static struct bt_mesh_proxy_client *find_client(struct bt_conn *conn)
@ -133,8 +76,6 @@ static struct bt_mesh_proxy_client *find_client(struct bt_conn *conn)
return NULL;
}
#define ATTR_IS_PROV(attr) (attr->user_data != NULL)
static ssize_t gatt_recv(struct bt_conn *conn,
const struct bt_gatt_attr *attr, const void *buf,
uint16_t len, uint16_t offset, uint8_t flags)
@ -151,7 +92,7 @@ static ssize_t gatt_recv(struct bt_conn *conn,
return -EINVAL;
}
if (ATTR_IS_PROV(attr) != (PDU_TYPE(data) == BT_MESH_PROXY_PROV)) {
if (PDU_TYPE(data) == BT_MESH_PROXY_PROV) {
BT_WARN("Proxy PDU type doesn't match GATT service");
return -EINVAL;
}
@ -159,8 +100,6 @@ static ssize_t gatt_recv(struct bt_conn *conn,
return bt_mesh_proxy_msg_recv(&client->cli, buf, len);
}
#if defined(CONFIG_BT_MESH_GATT_PROXY)
/* Next subnet in queue to be advertised */
static struct bt_mesh_subnet *beacon_sub;
@ -701,16 +640,16 @@ int bt_mesh_proxy_gatt_enable(void)
BT_DBG("");
if (gatt_svc == MESH_GATT_PROXY) {
return -EALREADY;
if (!bt_mesh_is_provisioned()) {
return -ENOTSUP;
}
if (gatt_svc != MESH_GATT_NONE) {
if (service_registered) {
return -EBUSY;
}
(void)bt_gatt_service_register(&proxy_svc);
gatt_svc = MESH_GATT_PROXY;
service_registered = true;
for (i = 0; i < ARRAY_SIZE(clients); i++) {
if (clients[i].cli.conn) {
@ -743,18 +682,14 @@ int bt_mesh_proxy_gatt_disable(void)
{
BT_DBG("");
if (gatt_svc == MESH_GATT_NONE) {
if (!service_registered) {
return -EALREADY;
}
if (gatt_svc != MESH_GATT_PROXY) {
return -EBUSY;
}
bt_mesh_proxy_gatt_disconnect();
bt_gatt_service_unregister(&proxy_svc);
gatt_svc = MESH_GATT_NONE;
service_registered = false;
return 0;
}
@ -832,11 +767,6 @@ bool bt_mesh_proxy_relay(struct net_buf *buf, uint16_t dst)
continue;
}
if (client->filter_type == PROV) {
BT_ERR("Invalid PDU type for Proxy Client");
return -EINVAL;
}
/* Proxy PDU sending modifies the original buffer,
* so we need to make a copy.
*/
@ -864,7 +794,6 @@ bool bt_mesh_proxy_relay(struct net_buf *buf, uint16_t dst)
return relayed;
}
#endif /* CONFIG_BT_MESH_GATT_PROXY */
static void gatt_connected(struct bt_conn *conn, uint8_t err)
{
@ -872,7 +801,8 @@ static void gatt_connected(struct bt_conn *conn, uint8_t err)
struct bt_conn_info info;
bt_conn_get_info(conn, &info);
if (info.role != BT_CONN_ROLE_PERIPHERAL) {
if (info.role != BT_CONN_ROLE_PERIPHERAL ||
!service_registered) {
return;
}
@ -903,7 +833,8 @@ static void gatt_disconnected(struct bt_conn *conn, uint8_t reason)
struct bt_mesh_proxy_client *client;
bt_conn_get_info(conn, &info);
if (info.role != BT_CONN_ROLE_PERIPHERAL) {
if (info.role != BT_CONN_ROLE_PERIPHERAL ||
!service_registered) {
return;
}
@ -917,17 +848,6 @@ static void gatt_disconnected(struct bt_conn *conn, uint8_t reason)
return;
}
if (IS_ENABLED(CONFIG_BT_MESH_PB_GATT) && client->filter_type == PROV) {
bt_mesh_pb_gatt_close(conn);
client->filter_type = NONE;
if (bt_mesh_is_provisioned() &&
IS_ENABLED(CONFIG_BT_MESH_GATT_PROXY) &&
bt_mesh_gatt_proxy_get() != BT_MESH_GATT_PROXY_NOT_SUPPORTED) {
(void)bt_mesh_proxy_gatt_enable();
}
}
/* If this fails, the work handler exits early, as
* there's no active connection.
*/
@ -938,196 +858,16 @@ static void gatt_disconnected(struct bt_conn *conn, uint8_t reason)
bt_mesh_adv_update();
}
struct net_buf_simple *bt_mesh_proxy_get_buf(void)
{
struct net_buf_simple *buf = &clients[0].cli.buf;
net_buf_simple_reset(buf);
return buf;
}
#if defined(CONFIG_BT_MESH_PB_GATT)
static void prov_ccc_changed(const struct bt_gatt_attr *attr, uint16_t value)
{
BT_DBG("value 0x%04x", value);
}
static ssize_t prov_ccc_write(struct bt_conn *conn,
const struct bt_gatt_attr *attr, uint16_t value)
{
struct bt_mesh_proxy_client *client;
BT_DBG("value 0x%04x", value);
if (value != BT_GATT_CCC_NOTIFY) {
BT_WARN("Client wrote 0x%04x instead enabling notify", value);
return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
}
/* If a connection exists there must be a client */
client = find_client(conn);
__ASSERT(client, "No client for connection");
if (client->filter_type == NONE) {
client->filter_type = PROV;
bt_mesh_pb_gatt_open(conn);
}
return sizeof(value);
}
/* Mesh Provisioning Service Declaration */
static struct _bt_gatt_ccc prov_ccc =
BT_GATT_CCC_INITIALIZER(prov_ccc_changed, prov_ccc_write, NULL);
static struct bt_gatt_attr prov_attrs[] = {
BT_GATT_PRIMARY_SERVICE(BT_UUID_MESH_PROV),
BT_GATT_CHARACTERISTIC(BT_UUID_MESH_PROV_DATA_IN,
BT_GATT_CHRC_WRITE_WITHOUT_RESP,
BT_GATT_PERM_WRITE, NULL, gatt_recv,
(void *)1),
BT_GATT_CHARACTERISTIC(BT_UUID_MESH_PROV_DATA_OUT,
BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_NONE,
NULL, NULL, NULL),
BT_GATT_CCC_MANAGED(&prov_ccc,
BT_GATT_PERM_READ | BT_GATT_PERM_WRITE),
};
static struct bt_gatt_service prov_svc = BT_GATT_SERVICE(prov_attrs);
int bt_mesh_proxy_prov_enable(void)
{
int i;
BT_DBG("");
if (gatt_svc == MESH_GATT_PROV) {
return -EALREADY;
}
if (gatt_svc != MESH_GATT_NONE) {
return -EBUSY;
}
(void)bt_gatt_service_register(&prov_svc);
gatt_svc = MESH_GATT_PROV;
prov_fast_adv = true;
for (i = 0; i < ARRAY_SIZE(clients); i++) {
if (clients[i].cli.conn) {
clients[i].filter_type = PROV;
}
}
return 0;
}
int bt_mesh_proxy_prov_disable(void)
{
BT_DBG("");
if (gatt_svc == MESH_GATT_NONE) {
return -EALREADY;
}
if (gatt_svc != MESH_GATT_PROV) {
return -EBUSY;
}
bt_gatt_service_unregister(&prov_svc);
gatt_svc = MESH_GATT_NONE;
bt_mesh_adv_update();
return 0;
}
static uint8_t prov_svc_data[20] = {
BT_UUID_16_ENCODE(BT_UUID_MESH_PROV_VAL),
};
static const struct bt_data prov_ad[] = {
BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
BT_DATA_BYTES(BT_DATA_UUID16_ALL,
BT_UUID_16_ENCODE(BT_UUID_MESH_PROV_VAL)),
BT_DATA(BT_DATA_SVC_DATA16, prov_svc_data, sizeof(prov_svc_data)),
};
int bt_mesh_pb_gatt_send(struct bt_conn *conn, struct net_buf_simple *buf,
bt_gatt_complete_func_t end, void *user_data)
{
struct bt_mesh_proxy_client *client = find_client(conn);
if (!client) {
BT_ERR("No Proxy Client found");
return -ENOTCONN;
}
if (client->filter_type != PROV) {
BT_ERR("Invalid PDU type for Proxy Client");
return -EINVAL;
}
return bt_mesh_proxy_msg_send(&client->cli, BT_MESH_PROXY_PROV, buf, end, user_data);
}
static size_t gatt_prov_adv_create(struct bt_data prov_sd[1])
{
const struct bt_mesh_prov *prov = bt_mesh_prov_get();
size_t uri_len;
memcpy(prov_svc_data + 2, prov->uuid, 16);
sys_put_be16(prov->oob_info, prov_svc_data + 18);
if (!prov->uri) {
return 0;
}
uri_len = strlen(prov->uri);
if (uri_len > 29) {
/* There's no way to shorten an URI */
BT_WARN("Too long URI to fit advertising packet");
return 0;
}
prov_sd[0].type = BT_DATA_URI;
prov_sd[0].data_len = uri_len;
prov_sd[0].data = (const uint8_t *)prov->uri;
return 1;
}
#endif /* CONFIG_BT_MESH_PB_GATT */
static int proxy_send(struct bt_conn *conn,
const void *data, uint16_t len,
bt_gatt_complete_func_t end, void *user_data)
{
const struct bt_gatt_attr *attr = NULL;
BT_DBG("%u bytes: %s", len, bt_hex(data, len));
#if defined(CONFIG_BT_MESH_GATT_PROXY)
if (gatt_svc == MESH_GATT_PROXY) {
attr = &proxy_attrs[3];
}
#endif /* CONFIG_BT_MESH_GATT_PROXY */
#if defined(CONFIG_BT_MESH_PB_GATT)
if (gatt_svc == MESH_GATT_PROV) {
attr = &prov_attrs[3];
}
#endif /* CONFIG_BT_MESH_PB_GATT */
if (!attr) {
return -ENOENT;
}
struct bt_gatt_notify_params params = {
.data = data,
.len = len,
.attr = attr,
.attr = &proxy_attrs[3],
.user_data = user_data,
.func = end,
};
@ -1139,56 +879,17 @@ int bt_mesh_proxy_adv_start(void)
{
BT_DBG("");
if (gatt_svc == MESH_GATT_NONE) {
return -ENOENT;
}
#if defined(CONFIG_BT_MESH_PB_GATT)
if (!bt_mesh_is_provisioned()) {
struct bt_le_adv_param fast_adv_param = {
.options = ADV_OPT_PROV,
ADV_FAST_INT,
};
struct bt_data prov_sd[1];
size_t prov_sd_len;
int err;
prov_sd_len = gatt_prov_adv_create(prov_sd);
if (!prov_fast_adv) {
struct bt_le_adv_param slow_adv_param = {
.options = ADV_OPT_PROV,
ADV_SLOW_INT,
};
return bt_mesh_adv_start(&slow_adv_param,
SYS_FOREVER_MS, prov_ad,
ARRAY_SIZE(prov_ad), prov_sd,
prov_sd_len);
}
/* Advertise 60 seconds using fast interval */
err = bt_mesh_adv_start(&fast_adv_param, (60 * MSEC_PER_SEC),
prov_ad, ARRAY_SIZE(prov_ad),
prov_sd, prov_sd_len);
if (!err) {
prov_fast_adv = false;
}
return err;
}
#endif /* CONFIG_BT_MESH_PB_GATT */
#if defined(CONFIG_BT_MESH_GATT_PROXY)
if (bt_mesh_is_provisioned()) {
return gatt_proxy_advertise(next_sub());
}
#endif /* CONFIG_BT_MESH_GATT_PROXY */
if (!service_registered || !bt_mesh_is_provisioned()) {
return -ENOTSUP;
}
static struct bt_conn_cb conn_callbacks = {
return gatt_proxy_advertise(next_sub());
}
/* Add `_1` suffix forces proxy conn_cb to precede pb_gatt conn_cb.
* As we may register proxy services in pb_gatt disconnect cb.
*/
BT_CONN_CB_DEFINE(conn_callbacks_1) = {
.connected = gatt_connected,
.disconnected = gatt_disconnected,
};
@ -1207,7 +908,5 @@ int bt_mesh_proxy_init(void)
bt_mesh_proxy_msg_init(&client->cli);
}
bt_conn_cb_register(&conn_callbacks);
return 0;
}