bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: RFCOMM: Add a argument server to bt_rfcomm_server.accept

Browse Source 
In current implementation, the `accept` cannot be identified if the
same one `accept` callback is passed by the upper layer.

Similar with `accept` of `bt_l2cap_server.accept`, add a parameter
`server` to the `bt_rfcomm_server.accept` callback.

Add a argument `server` to function bt_hfp_hf_accept() to avoid
building issue for HFP_HF.

Add a argument `server` to function rfcomm_accept() to avoid building
issue for shell/rfcomm.c.

Signed-off-by: Lyle Zhu <lyle.zhu@nxp.com>
This commit is contained in:
Lyle Zhu 2024-12-27 20:51:50 +08:00 committed by Benjamin Cabé
parent 87b2a3006c
commit 40993fe507
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/zephyr/bluetooth/classic/rfcomm.h
View File

@ -144,11 +144,13 @@ struct bt_rfcomm_server {
* authorization.
*
* @param conn The connection that is requesting authorization
* @param server Pointer to the server structure this callback relates to
* @param dlc Pointer to received the allocated dlc
*
* @return 0 in case of success or negative value in case of error.
*/
int (*accept)(struct bt_conn *conn, struct bt_rfcomm_dlc **dlc);
int (*accept)(struct bt_conn *conn, struct bt_rfcomm_server *server,
struct bt_rfcomm_dlc **dlc);
struct bt_rfcomm_server *_next;
};

3
subsys/bluetooth/host/classic/hfp_hf.c
View File

@ -716,7 +716,8 @@ static void hfp_hf_sent(struct bt_rfcomm_dlc *dlc, int err)
LOG_DBG("DLC %p sent cb (err %d)", dlc, err);
}
static int bt_hfp_hf_accept(struct bt_conn *conn, struct bt_rfcomm_dlc **dlc)
static int bt_hfp_hf_accept(struct bt_conn *conn, struct bt_rfcomm_server *server,
struct bt_rfcomm_dlc **dlc)
{
int i;
static struct bt_rfcomm_dlc_ops ops = {

2
subsys/bluetooth/host/classic/rfcomm.c
View File

@ -495,7 +495,7 @@ static struct bt_rfcomm_dlc *rfcomm_dlc_accept(struct bt_rfcomm_session *session
return NULL;
}
if (server->accept(session->br_chan.chan.conn, &dlc) < 0) {
if (server->accept(session->br_chan.chan.conn, server, &dlc) < 0) {
LOG_DBG("Incoming connection rejected");
return NULL;
}

3
subsys/bluetooth/host/classic/shell/rfcomm.c
View File

@ -126,7 +126,8 @@ static struct bt_rfcomm_dlc rfcomm_dlc = {
.mtu = 30,
};
static int rfcomm_accept(struct bt_conn *conn, struct bt_rfcomm_dlc **dlc)
static int rfcomm_accept(struct bt_conn *conn, struct bt_rfcomm_server *server,
struct bt_rfcomm_dlc **dlc)
{
bt_shell_print("Incoming RFCOMM conn %p", conn);