Hi, > -----Original Message----- > From: Zheng, Wu [mailto:wu.zheng@xxxxxxxxx] > Sent: Friday, August 03, 2012 2:42 PM > To: Vani-dineshbhai PATEL X > Cc: linux-bluetooth@xxxxxxxxxxxxxxx > Subject: RE: [PATCH BlueZ V2 3/5] AVRCP: Add browsing channel support > > Hi, > > > -----Original Message----- > > From: linux-bluetooth-owner@xxxxxxxxxxxxxxx > > [mailto:linux-bluetooth-owner@xxxxxxxxxxxxxxx] On Behalf Of > > Vani-dineshbhai PATEL > > Sent: Friday, August 03, 2012 2:45 PM > > To: User Name; Luiz Augusto; Lucas De Marchi > > Cc: Vani; Joohi; Vani > > Subject: [PATCH BlueZ V2 3/5] AVRCP: Add browsing channel support > > > > From: Vani Patel <vani.patel@xxxxxxxxxxxxxx> > > > > Implements browsing channel creation and release. > > --- > > audio/avctp.c | 232 > > ++++++++++++++++++++++++++++++++++++++++++++++++++++----- > > 1 files changed, 213 insertions(+), 19 deletions(-) > > > > diff --git a/audio/avctp.c b/audio/avctp.c index 33ca007..ff0c57e > > 100644 > > --- a/audio/avctp.c > > +++ b/audio/avctp.c > > @@ -41,6 +41,7 @@ > > #include <bluetooth/bluetooth.h> > > #include <bluetooth/sdp.h> > > #include <bluetooth/uuid.h> > > +#include <bluetooth/l2cap.h> > > > > #include <glib.h> > > > > @@ -119,6 +120,7 @@ struct avctp_state_callback { struct avctp_server { > > bdaddr_t src; > > GIOChannel *control_io; > > + GIOChannel *browsing_io; > > GSList *sessions; > > }; > > > > @@ -137,9 +139,12 @@ struct avctp { > > int uinput; > > > > GIOChannel *control_io; > > + GIOChannel *browsing_io; > > guint control_io_id; > > + guint browsing_io_id; > > > > uint16_t control_mtu; > > + uint16_t browsing_mtu; > > > > uint8_t key_quirks[256]; > > GSList *handlers; > > @@ -326,6 +331,17 @@ static void avctp_disconnected(struct avctp > *session) > > if (!session) > > return; > > > > + if (session->browsing_io) { > > + g_io_channel_shutdown(session->browsing_io, TRUE, > NULL); > > + g_io_channel_unref(session->browsing_io); > > + session->browsing_io = NULL; > > + } > > + > > + if (session->browsing_io_id) { > > + g_source_remove(session->browsing_io_id); > > + session->browsing_io_id = 0; > > + } > > + > > if (session->control_io) { > > g_io_channel_shutdown(session->control_io, TRUE, NULL); > > g_io_channel_unref(session->control_io); > > @@ -432,6 +448,42 @@ static void handle_response(struct avctp > > *session, struct avctp_header *avctp, > > } > > } > > > > +static gboolean session_browsing_cb(GIOChannel *chan, GIOCondition > cond, > > + gpointer data) > > +{ > > + struct avctp *session = data; > > + uint8_t *buf; > > + struct avctp_header *avctp; > > + int ret, sock; > > + > > + buf = (uint8_t *)malloc(session->browsing_mtu); > > + if (!(cond & G_IO_IN)) > > + return FALSE; > > + > > + sock = g_io_channel_unix_get_fd(session->browsing_io); > > + ret = read(sock, buf, session->browsing_mtu); > > + > > + if (ret <= 0) > > + goto failed; > > + > > + if ((unsigned int) ret < sizeof(struct avctp_header)) { > > + error("Too small AVRCP packet on browsing channel"); > > + goto failed; > > + } > > + > > + avctp = (struct avctp_header *) buf; > > + > > + if (avctp->packet_type != AVCTP_PACKET_SINGLE) > > + goto failed; > > + > > + free(buf); > > + return TRUE; > > + > > +failed: > > + free(buf); > > + return FALSE; > > +} > > + > > static gboolean session_cb(GIOChannel *chan, GIOCondition cond, > > gpointer data) > > { > > @@ -614,6 +666,47 @@ static void init_uinput(struct avctp *session) > > DBG("AVRCP: uinput initialized for %s", address); } > > > > +static void avctp_connect_browsing_cb(GIOChannel *chan, > > + GError *err, > > + gpointer data) > > +{ > > + struct avctp *session = data; > > + char address[18]; > > + uint16_t imtu; > > + GError *gerr = NULL; > > + > > + if (err) { > > + error("Browsing: %s", err->message); > > + g_io_channel_shutdown(chan, TRUE, NULL); > > + g_io_channel_unref(chan); > > + session->browsing_io = NULL; > > + return; > > + } > > + > > + bt_io_get(chan, BT_IO_L2CAP, &gerr, > > + BT_IO_OPT_DEST, &address, > > + BT_IO_OPT_IMTU, &imtu, > > + BT_IO_OPT_INVALID); > > + if (gerr) { > > + error("%s", gerr->message); > > + g_io_channel_shutdown(chan, TRUE, NULL); > > + g_io_channel_unref(chan); > > + session->browsing_io = NULL; > > + error("%s", gerr->message); > > + g_error_free(gerr); > > + return; > > + } > > + > > + if (!session->browsing_io) > > + session->browsing_io = g_io_channel_ref(chan); > > + > > + session->browsing_mtu = imtu; > > + > > + session->browsing_io_id = g_io_add_watch(chan, > > + G_IO_IN | G_IO_ERR | G_IO_HUP | > G_IO_NVAL, > > + (GIOFunc) session_browsing_cb, session); } > > + > > static void avctp_connect_cb(GIOChannel *chan, GError *err, gpointer > > data) { > > struct avctp *session = data; > > @@ -652,6 +745,32 @@ static void avctp_connect_cb(GIOChannel *chan, > > GError *err, gpointer data) > > (GIOFunc) session_cb, session); > > } > > > > +static void auth_browsing_cb(DBusError *derr, void *user_data) { > > + struct avctp *session = user_data; > > + GError *err = NULL; > > + > > + if (session->browsing_io_id) { > > + g_source_remove(session->browsing_io_id); > > + session->browsing_io_id = 0; > > + } > > + > > + if (derr && dbus_error_is_set(derr)) { > > + error("Browsing Access denied: %s", derr->message); > > + return; > > + } > > + > > + if (!bt_io_accept(session->browsing_io, > avctp_connect_browsing_cb, > > + session, NULL, &err)) { > > + error("Browsing bt_io_accept: %s", err->message); > > + if (session && session->browsing_io) { > > + g_io_channel_unref(session->browsing_io); > > + session->browsing_io = NULL; > > + } > > + g_error_free(err); > > + } > > +} > > + > > static void auth_cb(DBusError *derr, void *user_data) { > > struct avctp *session = user_data; > > @@ -730,6 +849,65 @@ static struct avctp *avctp_get_internal(const > > bdaddr_t *src, > > return session; > > } > > > > +static void avctp_control_confirm(struct avctp *session, GIOChannel > *chan, > > + struct audio_device *dev) > > +{ > > + if (session->control_io) { > > + error("Refusing unexpected connect from"); > > + goto drop; > > + } > > + > > + avctp_set_state(session, AVCTP_STATE_CONNECTING); > > + session->control_io = g_io_channel_ref(chan); > > + > > + if (audio_device_request_authorization(dev, AVRCP_TARGET_UUID, > > + auth_cb, session) < 0) > > + goto drop; > > + > > + session->control_io_id = g_io_add_watch(chan, G_IO_ERR | > G_IO_HUP | > > + G_IO_NVAL, session_cb, > session); > > + return; > > + > > +drop: > > + if (!session || !session->control_io) > > + g_io_channel_shutdown(chan, TRUE, NULL); > > + > > + if (session && session->control_io) > > + g_io_channel_unref(session->control_io); > > + > > + if (session) > > + avctp_set_state(session, AVCTP_STATE_DISCONNECTED); } > > + > > +static void avctp_browsing_confirm(struct avctp *session, GIOChannel > *chan, > > + struct audio_device *dev) > > +{ > > + > > + if (!session->control_io) { > > + error("Browsing: Refusing unexpected connect from"); > > + goto drop; > > + } > > + > > + if (session->browsing_io) { > > + error("Browsing channel already exists"); > > + goto drop; > > + } > > + > > + session->browsing_io = g_io_channel_ref(chan); > > + > > + if (audio_device_request_authorization(dev, AVRCP_TARGET_UUID, > > + auth_browsing_cb, session) < > 0) > > + goto drop; > > + return; > > + > > +drop: > > + if (!session || !session->control_io || !session->browsing_io) > > + g_io_channel_shutdown(chan, TRUE, NULL); > > + > > + if (session && session->browsing_io) > > + g_io_channel_unref(session->browsing_io); > > +} > > + > > static void avctp_confirm_cb(GIOChannel *chan, gpointer data) { > > struct avctp *session; > > @@ -737,11 +915,13 @@ static void avctp_confirm_cb(GIOChannel *chan, > > gpointer data) > > char address[18]; > > bdaddr_t src, dst; > > GError *err = NULL; > > + uint16_t psm; > > > > bt_io_get(chan, BT_IO_L2CAP, &err, > > BT_IO_OPT_SOURCE_BDADDR, &src, > > BT_IO_OPT_DEST_BDADDR, &dst, > > BT_IO_OPT_DEST, address, > > + BT_IO_OPT_PSM, &psm, > > BT_IO_OPT_INVALID); > > if (err) { > > error("%s", err->message); > > @@ -772,40 +952,38 @@ static void avctp_confirm_cb(GIOChannel *chan, > > gpointer data) > > goto drop; > > } > > > > - if (session->control_io) { > > - error("Refusing unexpected connect from %s", address); > > - goto drop; > > + switch (psm) { > > + case AVCTP_CONTROL_PSM: > > + avctp_control_confirm(session, chan, dev); > > Break needed? > > > + case AVCTP_BROWSING_PSM: > > + avctp_browsing_confirm(session, chan, dev); > > Break needed? > Thank you for pointing it. I will rectify it. > Best regards > > } > > > > - avctp_set_state(session, AVCTP_STATE_CONNECTING); > > - session->control_io = g_io_channel_ref(chan); > > - > > - if (audio_device_request_authorization(dev, AVRCP_TARGET_UUID, > > - auth_cb, session) < 0) > > - goto drop; > > - > > - session->control_io_id = g_io_add_watch(chan, G_IO_ERR | > G_IO_HUP | > > - G_IO_NVAL, session_cb, > session); > > return; > > > > drop: > > - if (!session || !session->control_io) > > - g_io_channel_shutdown(chan, TRUE, NULL); > > - if (session) > > + if (session && session->browsing_io) > > + g_io_channel_unref(session->browsing_io); > > + > > + if (session && session->control_io) > > + g_io_channel_unref(session->control_io); > > + > > + if (session && psm == AVCTP_CONTROL_PSM) > > avctp_set_state(session, AVCTP_STATE_DISCONNECTED); } > > > > -static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean > > master) > > +static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean > > master, > > + uint8_t mode, uint16_t psm) > > { > > GError *err = NULL; > > GIOChannel *io; > > - > > io = bt_io_listen(BT_IO_L2CAP, NULL, avctp_confirm_cb, NULL, > > NULL, &err, > > BT_IO_OPT_SOURCE_BDADDR, src, > > - BT_IO_OPT_PSM, AVCTP_CONTROL_PSM, > > + BT_IO_OPT_PSM, psm, > > BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, > > BT_IO_OPT_MASTER, master, > > + BT_IO_OPT_MODE, mode, > > BT_IO_OPT_INVALID); > > if (!io) { > > error("%s", err->message); > > @@ -825,12 +1003,25 @@ int avctp_register(const bdaddr_t *src, > > gboolean > > master) > > > > server = g_new0(struct avctp_server, 1); > > > > - server->control_io = avctp_server_socket(src, master); > > + server->control_io = avctp_server_socket(src, master, > > L2CAP_MODE_BASIC, > > + > AVCTP_CONTROL_PSM); > > if (!server->control_io) { > > g_free(server); > > return -1; > > } > > > > + server->browsing_io = avctp_server_socket(src, master, > > L2CAP_MODE_ERTM, > > + > AVCTP_BROWSING_PSM); > > + if (!server->browsing_io) { > > + if (server->control_io) { > > + g_io_channel_shutdown(server->control_io, TRUE, > NULL); > > + g_io_channel_unref(server->control_io); > > + server->control_io = NULL; > > + } > > + g_free(server); > > + return -1; > > + } > > + > > bacpy(&server->src, src); > > > > servers = g_slist_append(servers, server); @@ -862,6 +1053,9 @@ > void > > avctp_unregister(const bdaddr_t *src) > > avctp_disconnected(server->sessions->data); > > > > servers = g_slist_remove(servers, server); > > + g_io_channel_shutdown(server->browsing_io, TRUE, NULL); > > + g_io_channel_unref(server->browsing_io); > > + server->browsing_io = NULL; > > > > g_io_channel_shutdown(server->control_io, TRUE, NULL); > > g_io_channel_unref(server->control_io); > > -- > > 1.7.5.4 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe > > linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx > > More majordomo info at http://vger.kernel.org/majordomo-info.html Regards, Vani -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
