avrcp: Fix browsing support in SDP record

Browsing features shall only be marked as supported when ERTM is also
available.

Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index b45649d45c0fcc4f3d1c764ac2de853540ce265f..5c66cfe23ceade49deb8f26dca6d2e1de60f0bd6 100644 (file)
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -1735,7 +1735,7 @@ static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean central,
        return io;
 }
 
-int avctp_register(struct btd_adapter *adapter, gboolean central)
+int avctp_register(struct btd_adapter *adapter, bool central, bool *browsing)
 {
        struct avctp_server *server;
        const bdaddr_t *src = btd_adapter_get_address(adapter);
@@ -1753,6 +1753,8 @@ int avctp_register(struct btd_adapter *adapter, gboolean central)
 #ifndef TIZEN_FEATURE_BLUEZ_MODIFY
        server->browsing_io = avctp_server_socket(src, central, BT_IO_MODE_ERTM,
                                                        AVCTP_BROWSING_PSM);
+       if (browsing)
+               *browsing = server->browsing_io ? true : false;
 #endif
 
        server->adapter = btd_adapter_ref(adapter);

diff --git a/profiles/audio/avctp.h b/profiles/audio/avctp.h
index bc8cb659781b914a9dad9577e47492f126e94b16..e880ee4dce4cd980b3326bb350b388936b38f99d 100755 (executable)
--- a/profiles/audio/avctp.h
+++ b/profiles/audio/avctp.h
@@ -152,7 +152,7 @@ unsigned int avctp_add_state_cb(struct btd_device *dev, avctp_state_cb cb,
                                                        void *user_data);
 gboolean avctp_remove_state_cb(unsigned int id);
 
-int avctp_register(struct btd_adapter *adapter, gboolean central);
+int avctp_register(struct btd_adapter *adapter, bool central, bool *browsing);
 void avctp_unregister(struct btd_adapter *adapter);
 
 struct avctp *avctp_connect(struct btd_device *device);

diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 743208fb73fb581e8956651fc9b2688b737aabba..6d0e90cb3ec0a6a45081c0d924bbcb22c5dec0cb 100644 (file)
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -211,6 +211,7 @@ struct get_total_number_of_items_rsp {
 
 struct avrcp_server {
        struct btd_adapter *adapter;
+       bool browsing;
        uint32_t tg_record_id;
        uint32_t ct_record_id;
        GSList *players;
@@ -389,15 +390,44 @@ unsigned int pos_timer_id = 0;
 #endif
 
 #ifdef TIZEN_FEATURE_BLUEZ_AVRCP_CONTROL
-static sdp_record_t *avrcp_ct_record(void)
+static void avrcp_browsing_record(sdp_record_t *record, sdp_data_t *version)
 {
-       sdp_list_t *svclass_id, *pfseq, *apseq, *apseq1, *root;
+       sdp_list_t *apseq;
+       uuid_t l2cap, avctp;
+       sdp_list_t *aproto, *proto[2];
+       sdp_data_t *psm;
+       uint16_t ap = AVCTP_BROWSING_PSM;
+
+       sdp_uuid16_create(&l2cap, L2CAP_UUID);
+       proto[0] = sdp_list_append(NULL, &l2cap);
+       psm = sdp_data_alloc(SDP_UINT16, &ap);
+       proto[0] = sdp_list_append(proto[0], psm);
+       apseq = sdp_list_append(NULL, proto[0]);
+
+       sdp_uuid16_create(&avctp, AVCTP_UUID);
+       proto[1] = sdp_list_append(NULL, &avctp);
+       proto[1] = sdp_list_append(proto[1], version);
+       apseq = sdp_list_append(apseq, proto[1]);
+
+       aproto = sdp_list_append(NULL, apseq);
+       sdp_set_add_access_protos(record, aproto);
+
+       free(psm);
+       sdp_list_free(proto[0], NULL);
+       sdp_list_free(proto[1], NULL);
+       sdp_list_free(apseq, NULL);
+       sdp_list_free(aproto, NULL);
+}
+
+static sdp_record_t *avrcp_ct_record(bool browsing)
+{
+       sdp_list_t *svclass_id, *pfseq, *apseq, *root;
        uuid_t root_uuid, l2cap, avctp, avrct, avrctr;
        sdp_profile_desc_t profile[1];
-       sdp_list_t *aproto, *aproto1, *proto[2], *proto1[2];
+       sdp_list_t *aproto, *proto[2];
        sdp_record_t *record;
        sdp_data_t *psm[2], *version, *features;
-       uint16_t lp = AVCTP_CONTROL_PSM, ap = AVCTP_BROWSING_PSM;
+       uint16_t lp = AVCTP_CONTROL_PSM;
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        uint16_t avctp_ver = 0x0104;
        uint16_t feat = 0;
@@ -412,8 +442,7 @@ static sdp_record_t *avrcp_ct_record(void)
        uint16_t feat = (AVRCP_FEATURE_CATEGORY_1 |
                                                AVRCP_FEATURE_CATEGORY_2 |
                                                AVRCP_FEATURE_CATEGORY_3 |
-                                               AVRCP_FEATURE_CATEGORY_4 |
-                                               AVRCP_FEATURE_BROWSING);
+                                               AVRCP_FEATURE_CATEGORY_4);
 #endif
 
        record = sdp_record_alloc();
@@ -448,19 +477,10 @@ static sdp_record_t *avrcp_ct_record(void)
        sdp_set_access_protos(record, aproto);
 
        /* Additional Protocol Descriptor List */
-       sdp_uuid16_create(&l2cap, L2CAP_UUID);
-       proto1[0] = sdp_list_append(NULL, &l2cap);
-       psm[1] = sdp_data_alloc(SDP_UINT16, &ap);
-       proto1[0] = sdp_list_append(proto1[0], psm[1]);
-       apseq1 = sdp_list_append(NULL, proto1[0]);
-
-       sdp_uuid16_create(&avctp, AVCTP_UUID);
-       proto1[1] = sdp_list_append(NULL, &avctp);
-       proto1[1] = sdp_list_append(proto1[1], version);
-       apseq1 = sdp_list_append(apseq1, proto1[1]);
-
-       aproto1 = sdp_list_append(NULL, apseq1);
-       sdp_set_add_access_protos(record, aproto1);
+       if (browsing) {
+               feat |= AVRCP_FEATURE_BROWSING;
+               avrcp_browsing_record(record, version);
+       }
 
        /* Bluetooth Profile Descriptor List */
        sdp_uuid16_create(&profile[0].uuid, AV_REMOTE_PROFILE_ID);
@@ -477,15 +497,10 @@ static sdp_record_t *avrcp_ct_record(void)
        sdp_set_info_attr(record, "AVRCP CT", NULL, NULL);
 
        free(psm[0]);
-       free(psm[1]);
        free(version);
        sdp_list_free(proto[0], NULL);
        sdp_list_free(proto[1], NULL);
        sdp_list_free(apseq, NULL);
-       sdp_list_free(proto1[0], NULL);
-       sdp_list_free(proto1[1], NULL);
-       sdp_list_free(aproto1, NULL);
-       sdp_list_free(apseq1, NULL);
        sdp_list_free(pfseq, NULL);
        sdp_list_free(aproto, NULL);
        sdp_list_free(root, NULL);
@@ -496,20 +511,18 @@ static sdp_record_t *avrcp_ct_record(void)
 #endif
 
 #ifdef TIZEN_FEATURE_BLUEZ_AVRCP_TARGET
-static sdp_record_t *avrcp_tg_record(void)
+static sdp_record_t *avrcp_tg_record(bool browsing)
 {
-       sdp_list_t *svclass_id, *pfseq, *apseq, *root, *apseq_browsing;
+       sdp_list_t *svclass_id, *pfseq, *apseq, *root;
        uuid_t root_uuid, l2cap, avctp, avrtg;
        sdp_profile_desc_t profile[1];
        sdp_list_t *aproto_control, *proto_control[2];
        sdp_record_t *record;
-       sdp_data_t *psm_control, *version, *features, *psm_browsing;
 #ifndef TIZEN_FEATURE_BLUEZ_MODIFY
        sdp_list_t *aproto_browsing;
 #endif
-       sdp_list_t *proto_browsing[2] = {0};
+       sdp_data_t *psm_control, *version, *features;
        uint16_t lp = AVCTP_CONTROL_PSM;
-       uint16_t lp_browsing = AVCTP_BROWSING_PSM;
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        uint16_t avctp_ver = 0x0104;
        uint16_t feat = 0;
@@ -526,7 +539,6 @@ static sdp_record_t *avrcp_tg_record(void)
                                        AVRCP_FEATURE_CATEGORY_2 |
                                        AVRCP_FEATURE_CATEGORY_3 |
                                        AVRCP_FEATURE_CATEGORY_4 |
-                                       AVRCP_FEATURE_BROWSING |
                                        AVRCP_FEATURE_PLAYER_SETTINGS);
 #endif
        record = sdp_record_alloc();
@@ -557,19 +569,11 @@ static sdp_record_t *avrcp_tg_record(void)
 
        aproto_control = sdp_list_append(NULL, apseq);
        sdp_set_access_protos(record, aproto_control);
-       proto_browsing[0] = sdp_list_append(NULL, &l2cap);
-       psm_browsing = sdp_data_alloc(SDP_UINT16, &lp_browsing);
-       proto_browsing[0] = sdp_list_append(proto_browsing[0], psm_browsing);
-       apseq_browsing = sdp_list_append(NULL, proto_browsing[0]);
-
-       proto_browsing[1] = sdp_list_append(NULL, &avctp);
-       proto_browsing[1] = sdp_list_append(proto_browsing[1], version);
-       apseq_browsing = sdp_list_append(apseq_browsing, proto_browsing[1]);
-
-#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
-       aproto_browsing = sdp_list_append(NULL, apseq_browsing);
-       sdp_set_add_access_protos(record, aproto_browsing);
-#endif
+       /* Additional Protocol Descriptor List */
+       if (browsing) {
+               feat |= AVRCP_FEATURE_BROWSING;
+               avrcp_browsing_record(record, version);
+       }
 
        /* Bluetooth Profile Descriptor List */
        sdp_uuid16_create(&profile[0].uuid, AV_REMOTE_PROFILE_ID);
@@ -585,14 +589,6 @@ static sdp_record_t *avrcp_tg_record(void)
 
        sdp_set_info_attr(record, "AVRCP TG", NULL, NULL);
 
-       free(psm_browsing);
-       sdp_list_free(proto_browsing[0], NULL);
-       sdp_list_free(proto_browsing[1], NULL);
-       sdp_list_free(apseq_browsing, NULL);
-#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
-       sdp_list_free(aproto_browsing, NULL);
-#endif
-
        free(psm_control);
        free(version);
        sdp_list_free(proto_control[0], NULL);
@@ -4891,12 +4887,14 @@ static void state_changed(struct btd_device *device, avctp_state_t old_state,
 static struct avrcp_server *avrcp_server_register(struct btd_adapter *adapter)
 {
        struct avrcp_server *server;
+       bool browsing;
 
-       if (avctp_register(adapter, TRUE) < 0)
+       if (avctp_register(adapter, TRUE, &browsing) < 0)
                return NULL;
 
        server = g_new0(struct avrcp_server, 1);
        server->adapter = btd_adapter_ref(adapter);
+       server->browsing = browsing;
 
        servers = g_slist_append(servers, server);
 
@@ -5295,7 +5293,7 @@ static int avrcp_target_server_probe(struct btd_profile *p,
                return -EPROTONOSUPPORT;
 
 done:
-       record = avrcp_tg_record();
+       record = avrcp_tg_record(server->browsing);
        if (!record) {
                error("Unable to allocate new service record");
                avrcp_target_server_remove(p, adapter);
@@ -5383,7 +5381,7 @@ static int avrcp_controller_server_probe(struct btd_profile *p,
                return -EPROTONOSUPPORT;
 
 done:
-       record = avrcp_ct_record();
+       record = avrcp_ct_record(server->browsing);
        if (!record) {
                error("Unable to allocate new service record");
                avrcp_controller_server_remove(p, adapter);