src/profile: Add GoepL2CapPsm in SDP record

As per the MAP & PBAP v1.2 SDP table, it should contain the GoepL2CapPsm
in its SDP record. This patch adds the same.

The below test cases verifies the presence of GoepL2CapPsm attribute is
in SDP record.
TC_PSE_CON_BV_02_C - PASS
TC_MSE_CON_BV_02_C - PASS

Git repo link:
https://git.kernel.org/cgit/bluetooth/bluez.git/commit/?id=b46e6a6ad1ef3cde070b984c3b32e6f872f2f40f

Change-Id: Ia06200ce19bfdff296d96de07b4e494d56aa5513

diff --git a/src/profile.c b/src/profile.c
index 99948a7..63ab276 100644 (file)
--- a/src/profile.c
+++ b/src/profile.c
@@ -549,6 +549,9 @@
                <attribute id=\"0x0317\">                               \
                        <uint32 value=\"0x00000003\"/>                  \
                </attribute>                                            \
+               <attribute id=\"0x0200\">                               \
+                       <uint16 value=\"%u\" name=\"psm\"/>             \
+               </attribute>                                            \
        </record>"
 
 #define MAS_RECORD                                                     \
@@ -598,6 +601,9 @@
                <attribute id=\"0x0317\">                               \
                        <uint32 value=\"0x0000007f\"/>                  \
                </attribute>                                            \
+               <attribute id=\"0x0200\">                               \
+                       <uint16 value=\"%u\" name=\"psm\"/>             \
+               </attribute>                                            \
        </record>"
 
 #define MNS_RECORD                                                     \
@@ -638,12 +644,12 @@
                <attribute id=\"0x0100\">                               \
                        <text value=\"%s\"/>                            \
                </attribute>                                            \
-               <attribute id=\"0x0200\">                               \
-                       <uint16 value=\"%u\" name=\"psm\"/>             \
-               </attribute>                                            \
                <attribute id=\"0x0317\">                               \
                        <uint32 value=\"0x0000007f\"/>                  \
                </attribute>                                            \
+               <attribute id=\"0x0200\">                               \
+                       <uint16 value=\"%u\" name=\"psm\"/>             \
+               </attribute>                                            \
        </record>"
 
 #define SYNC_RECORD                                                    \
@@ -2179,15 +2185,29 @@ static char *get_pce_record(struct ext_profile *ext, struct ext_io *l2cap,
 static char *get_pse_record(struct ext_profile *ext, struct ext_io *l2cap,
                                                        struct ext_io *rfcomm)
 {
-       return g_strdup_printf(PSE_RECORD, rfcomm->chan, ext->version,
-                                                               ext->name);
+       uint16_t psm = 0;
+       uint8_t chan = 0;
+
+       if (l2cap)
+               psm = l2cap->psm;
+       if (rfcomm)
+               chan = rfcomm->chan;
+
+       return g_strdup_printf(PSE_RECORD, chan, ext->version, ext->name, psm);
 }
 
 static char *get_mas_record(struct ext_profile *ext, struct ext_io *l2cap,
                                                        struct ext_io *rfcomm)
 {
-       return g_strdup_printf(MAS_RECORD, rfcomm->chan, ext->version,
-                                                               ext->name);
+       uint16_t psm = 0;
+       uint8_t chan = 0;
+
+       if (l2cap)
+               psm = l2cap->psm;
+       if (rfcomm)
+               chan = rfcomm->chan;
+
+       return g_strdup_printf(MAS_RECORD, chan, ext->version, ext->name, psm);
 }
 
 static char *get_mns_record(struct ext_profile *ext, struct ext_io *l2cap,
@@ -2410,6 +2430,8 @@ static struct default_settings {
                .uuid           = OBEX_PSE_UUID,
                .name           = "Phone Book Access",
                .channel        = PBAP_DEFAULT_CHANNEL,
+               .psm            = BTD_PROFILE_PSM_AUTO,
+               .mode           = BT_IO_MODE_ERTM,
                .authorize      = true,
                .get_record     = get_pse_record,
                .version        = 0x0101,
@@ -2424,6 +2446,8 @@ static struct default_settings {
                .uuid           = OBEX_MAS_UUID,
                .name           = "Message Access",
                .channel        = MAS_DEFAULT_CHANNEL,
+               .psm            = BTD_PROFILE_PSM_AUTO,
+               .mode           = BT_IO_MODE_ERTM,
                .authorize      = true,
                .get_record     = get_mas_record,
                .version        = 0x0100