diff mbox series

[v1] obex: Implement support for message listing format version 1.1 for MCE

Message ID 20241220125812.84592-1-quic_amisjain@quicinc.com (mailing list archive)
State New
Headers show
Series [v1] obex: Implement support for message listing format version 1.1 for MCE | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/BuildEll success Build ELL PASS
tedd_an/BluezMake success Bluez Make PASS
tedd_an/MakeCheck success Bluez Make Check PASS
tedd_an/MakeDistcheck success Make Distcheck PASS
tedd_an/CheckValgrind success Check Valgrind PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/ScanBuild success Scan Build PASS

Commit Message

Amisha Jain Dec. 20, 2024, 12:58 p.m. UTC 
As per spec, Messages-Listing Format Version 1.1 is being marked
mandatory feature to be supported in MAP 1.3 & above versions.
This change is added for MAP client role.

This change is required for passing below testcases-
1) MAP/MCE/MFB/BV-01-C
Verify that the MCE correctly advertises the correct feature bits
in the MNS SDP record.
2) MAP/MCE/MFB/BV-03-C
Verify that the MCE correctly advertises the correct MapSupportedFeatures
bits in the MNS SDP record during MAS connection.

Also add the Messages-Listing Format Version 1.1 as supported
in mns sdp record.

---
 obexd/client/map.c | 169 +++++++++++++++++++++++++++++++++++++++++++++
 src/profile.c      |   2 +-
 2 files changed, 170 insertions(+), 1 deletion(-)

Comments

bluez.test.bot@gmail.com Dec. 20, 2024, 1:55 p.m. UTC | #1 
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=919889

---Test result---

Test Summary:
CheckPatch                    PENDING   0.29 seconds
GitLint                       PENDING   0.29 seconds
BuildEll                      PASS      20.37 seconds
BluezMake                     PASS      1588.78 seconds
MakeCheck                     PASS      13.59 seconds
MakeDistcheck                 PASS      158.66 seconds
CheckValgrind                 PASS      216.52 seconds
CheckSmatch                   PASS      276.62 seconds
bluezmakeextell               PASS      100.63 seconds
IncrementalBuild              PENDING   0.36 seconds
ScanBuild                     PASS      865.97 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz Dec. 20, 2024, 2:47 p.m. UTC | #2 
Hi Amisha,

On Fri, Dec 20, 2024 at 7:58 AM Amisha Jain <quic_amisjain@quicinc.com> wrote:
>
> As per spec, Messages-Listing Format Version 1.1 is being marked
> mandatory feature to be supported in MAP 1.3 & above versions.
> This change is added for MAP client role.
>
> This change is required for passing below testcases-
> 1) MAP/MCE/MFB/BV-01-C
> Verify that the MCE correctly advertises the correct feature bits
> in the MNS SDP record.
> 2) MAP/MCE/MFB/BV-03-C
> Verify that the MCE correctly advertises the correct MapSupportedFeatures
> bits in the MNS SDP record during MAS connection.
>
> Also add the Messages-Listing Format Version 1.1 as supported
> in mns sdp record.
>
> ---
>  obexd/client/map.c | 169 +++++++++++++++++++++++++++++++++++++++++++++
>  src/profile.c      |   2 +-
>  2 files changed, 170 insertions(+), 1 deletion(-)
>
> diff --git a/obexd/client/map.c b/obexd/client/map.c
> index 29b0ed96e..c6f3dd342 100644
> --- a/obexd/client/map.c
> +++ b/obexd/client/map.c
> @@ -123,6 +123,11 @@ struct map_msg {
>         uint64_t attachment_size;
>         uint8_t flags;
>         char *folder;
> +       char *delivery_status;
> +       uint64_t conversation_id;
> +       char *conversation_name;
> +       char *direction;
> +       char *attachment_mime_types;
>         GDBusPendingPropertySet pending;
>  };
>
> @@ -418,6 +423,10 @@ static void map_msg_free(void *data)
>         g_free(msg->recipient_address);
>         g_free(msg->type);
>         g_free(msg->status);
> +       g_free(msg->delivery_status);
> +       g_free(msg->conversation_name);
> +       g_free(msg->direction);
> +       g_free(msg->attachment_mime_types);
>         g_free(msg);
>  }
>
> @@ -778,6 +787,93 @@ static void set_deleted(const GDBusPropertyTable *property,
>         set_status(property, iter, id, STATUS_DELETE, data);
>  }
>
> +static gboolean delivery_status_exists(const GDBusPropertyTable *property,
> +                                                               void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       return msg->delivery_status != NULL;
> +}
> +
> +static gboolean get_delivery_status(const GDBusPropertyTable *property,
> +                                       DBusMessageIter *iter, void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
> +                                               &msg->delivery_status);
> +
> +       return TRUE;
> +}
> +
> +static gboolean get_conversation_id(const GDBusPropertyTable *property,
> +                                       DBusMessageIter *iter, void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64,
> +                                               &msg->conversation_id);
> +
> +       return TRUE;
> +}
> +
> +static gboolean conversation_name_exists(const GDBusPropertyTable *property,
> +                                                               void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       return msg->conversation_name != NULL;
> +}
> +
> +static gboolean get_conversation_name(const GDBusPropertyTable *property,
> +                                       DBusMessageIter *iter, void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
> +                                               &msg->conversation_name);
> +
> +       return TRUE;
> +}
> +
> +static gboolean direction_exists(const GDBusPropertyTable *property,
> +                                                               void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       return msg->direction != NULL;
> +}
> +
> +static gboolean get_direction(const GDBusPropertyTable *property,
> +                                       DBusMessageIter *iter, void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
> +                                                       &msg->direction);
> +
> +       return TRUE;
> +}
> +
> +static gboolean attachment_mime_exists(const GDBusPropertyTable *property,
> +                                                               void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       return msg->attachment_mime_types != NULL;
> +}
> +
> +static gboolean get_attachment_mime_types(const GDBusPropertyTable *property,
> +                                       DBusMessageIter *iter, void *data)
> +{
> +       struct map_msg *msg = data;
> +
> +       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
> +                                               &msg->attachment_mime_types);
> +
> +       return TRUE;
> +}
> +
>  static const GDBusMethodTable map_msg_methods[] = {
>         { GDBUS_METHOD("Get",
>                         GDBUS_ARGS({ "targetfile", "s" },
> @@ -809,6 +905,13 @@ static const GDBusPropertyTable map_msg_properties[] = {
>         { "Sent", "b", get_sent },
>         { "Protected", "b", get_protected },
>         { "Deleted", "b", NULL, set_deleted },
> +       { "DeliveryStatus", "s", get_delivery_status, NULL, delivery_status_exists },
> +       { "ConversationId", "t", get_conversation_id },
> +       { "ConversationName", "s", get_conversation_name, NULL,
> +                                               conversation_name_exists },
> +       { "Direction", "s", get_direction, NULL, direction_exists },
> +       { "AttachmentMimeTypes", "s", get_attachment_mime_types, NULL,
> +                                                       attachment_mime_exists },

Before you go ahead adding new properties you need to update
org.bluez.obex.Message interface explaining what each new property
represents, if they are optional, etc.

>         { }
>  };
>
> @@ -1061,6 +1164,67 @@ static void parse_protected(struct map_msg *msg, const char *value)
>                                                 MAP_MSG_INTERFACE, "Protected");
>  }
>
> +static void parse_delivery_status(struct map_msg *msg, const char *value)
> +{
> +       if (g_strcmp0(msg->delivery_status, value) == 0)
> +               return;
> +
> +       g_free(msg->delivery_status);
> +       msg->delivery_status = g_strdup(value);
> +
> +       g_dbus_emit_property_changed(conn, msg->path,
> +                                       MAP_MSG_INTERFACE, "DeliveryStatus");
> +}
> +
> +static void parse_conversation_id(struct map_msg *msg, const char *value)
> +{
> +       uint64_t conversation_id = strtoull(value, NULL, 16);
> +
> +       if (msg->conversation_id == conversation_id)
> +               return;
> +
> +       msg->conversation_id = conversation_id;
> +
> +       g_dbus_emit_property_changed(conn, msg->path,
> +                                       MAP_MSG_INTERFACE, "ConversationId");
> +}
> +
> +static void parse_conversation_name(struct map_msg *msg, const char *value)
> +{
> +       if (g_strcmp0(msg->conversation_name, value) == 0)
> +               return;
> +
> +       g_free(msg->conversation_name);
> +       msg->conversation_name = g_strdup(value);
> +
> +       g_dbus_emit_property_changed(conn, msg->path,
> +                                               MAP_MSG_INTERFACE, "ConversationName");
> +}
> +
> +static void parse_direction(struct map_msg *msg, const char *value)
> +{
> +       if (g_strcmp0(msg->direction, value) == 0)
> +               return;
> +
> +       g_free(msg->direction);
> +       msg->direction = g_strdup(value);
> +
> +       g_dbus_emit_property_changed(conn, msg->path,
> +                                               MAP_MSG_INTERFACE, "Direction");
> +}
> +
> +static void parse_mime_types(struct map_msg *msg, const char *value)
> +{
> +       if (g_strcmp0(msg->attachment_mime_types, value) == 0)
> +               return;
> +
> +       g_free(msg->attachment_mime_types);
> +       msg->attachment_mime_types = g_strdup(value);
> +
> +       g_dbus_emit_property_changed(conn, msg->path,
> +                                               MAP_MSG_INTERFACE, "AttachmentMimeTypes");
> +}
> +
>  static const struct map_msg_parser {
>         const char *name;
>         void (*func) (struct map_msg *msg, const char *value);
> @@ -1081,6 +1245,11 @@ static const struct map_msg_parser {
>                 { "read", parse_read },
>                 { "sent", parse_sent },
>                 { "protected", parse_protected },
> +               { "delivery_status", parse_delivery_status},
> +               { "conversation_id", parse_conversation_id},
> +               { "conversation_name", parse_conversation_name},
> +               { "direction", parse_direction},
> +               { "attachment_mime_types", parse_mime_types},
>                 { }
>  };
>
> diff --git a/src/profile.c b/src/profile.c
> index 6bc6778de..70ac058f4 100644
> --- a/src/profile.c
> +++ b/src/profile.c
> @@ -563,7 +563,7 @@
>                         <text value=\"%s\"/>                            \
>                 </attribute>                                            \
>                 <attribute id=\"0x0317\">                               \
> -                       <uint32 value=\"0x0000007f\"/>                  \
> +                       <uint32 value=\"0x0000027f\"/>                  \
>                 </attribute>                                            \
>                 <attribute id=\"0x0200\">                               \
>                         <uint16 value=\"%u\" name=\"psm\"/>             \

Are you bumping the version here? I guess we want to update the
documentation about the profiles versions as well.

> --
> 2.34.1
>
>
diff mbox series

Patch

diff --git a/obexd/client/map.c b/obexd/client/map.c
index 29b0ed96e..c6f3dd342 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -123,6 +123,11 @@  struct map_msg {
 	uint64_t attachment_size;
 	uint8_t flags;
 	char *folder;
+	char *delivery_status;
+	uint64_t conversation_id;
+	char *conversation_name;
+	char *direction;
+	char *attachment_mime_types;
 	GDBusPendingPropertySet pending;
 };
 
@@ -418,6 +423,10 @@  static void map_msg_free(void *data)
 	g_free(msg->recipient_address);
 	g_free(msg->type);
 	g_free(msg->status);
+	g_free(msg->delivery_status);
+	g_free(msg->conversation_name);
+	g_free(msg->direction);
+	g_free(msg->attachment_mime_types);
 	g_free(msg);
 }
 
@@ -778,6 +787,93 @@  static void set_deleted(const GDBusPropertyTable *property,
 	set_status(property, iter, id, STATUS_DELETE, data);
 }
 
+static gboolean delivery_status_exists(const GDBusPropertyTable *property,
+								void *data)
+{
+	struct map_msg *msg = data;
+
+	return msg->delivery_status != NULL;
+}
+
+static gboolean get_delivery_status(const GDBusPropertyTable *property,
+					DBusMessageIter *iter, void *data)
+{
+	struct map_msg *msg = data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+						&msg->delivery_status);
+
+	return TRUE;
+}
+
+static gboolean get_conversation_id(const GDBusPropertyTable *property,
+					DBusMessageIter *iter, void *data)
+{
+	struct map_msg *msg = data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64,
+						&msg->conversation_id);
+
+	return TRUE;
+}
+
+static gboolean conversation_name_exists(const GDBusPropertyTable *property,
+								void *data)
+{
+	struct map_msg *msg = data;
+
+	return msg->conversation_name != NULL;
+}
+
+static gboolean get_conversation_name(const GDBusPropertyTable *property,
+					DBusMessageIter *iter, void *data)
+{
+	struct map_msg *msg = data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+						&msg->conversation_name);
+
+	return TRUE;
+}
+
+static gboolean direction_exists(const GDBusPropertyTable *property,
+								void *data)
+{
+	struct map_msg *msg = data;
+
+	return msg->direction != NULL;
+}
+
+static gboolean get_direction(const GDBusPropertyTable *property,
+					DBusMessageIter *iter, void *data)
+{
+	struct map_msg *msg = data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+							&msg->direction);
+
+	return TRUE;
+}
+
+static gboolean attachment_mime_exists(const GDBusPropertyTable *property,
+								void *data)
+{
+	struct map_msg *msg = data;
+
+	return msg->attachment_mime_types != NULL;
+}
+
+static gboolean get_attachment_mime_types(const GDBusPropertyTable *property,
+					DBusMessageIter *iter, void *data)
+{
+	struct map_msg *msg = data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
+						&msg->attachment_mime_types);
+
+	return TRUE;
+}
+
 static const GDBusMethodTable map_msg_methods[] = {
 	{ GDBUS_METHOD("Get",
 			GDBUS_ARGS({ "targetfile", "s" },
@@ -809,6 +905,13 @@  static const GDBusPropertyTable map_msg_properties[] = {
 	{ "Sent", "b", get_sent },
 	{ "Protected", "b", get_protected },
 	{ "Deleted", "b", NULL, set_deleted },
+	{ "DeliveryStatus", "s", get_delivery_status, NULL, delivery_status_exists },
+	{ "ConversationId", "t", get_conversation_id },
+	{ "ConversationName", "s", get_conversation_name, NULL,
+						conversation_name_exists },
+	{ "Direction", "s", get_direction, NULL, direction_exists },
+	{ "AttachmentMimeTypes", "s", get_attachment_mime_types, NULL,
+							attachment_mime_exists },
 	{ }
 };
 
@@ -1061,6 +1164,67 @@  static void parse_protected(struct map_msg *msg, const char *value)
 						MAP_MSG_INTERFACE, "Protected");
 }
 
+static void parse_delivery_status(struct map_msg *msg, const char *value)
+{
+	if (g_strcmp0(msg->delivery_status, value) == 0)
+		return;
+
+	g_free(msg->delivery_status);
+	msg->delivery_status = g_strdup(value);
+
+	g_dbus_emit_property_changed(conn, msg->path,
+					MAP_MSG_INTERFACE, "DeliveryStatus");
+}
+
+static void parse_conversation_id(struct map_msg *msg, const char *value)
+{
+	uint64_t conversation_id = strtoull(value, NULL, 16);
+
+	if (msg->conversation_id == conversation_id)
+		return;
+
+	msg->conversation_id = conversation_id;
+
+	g_dbus_emit_property_changed(conn, msg->path,
+					MAP_MSG_INTERFACE, "ConversationId");
+}
+
+static void parse_conversation_name(struct map_msg *msg, const char *value)
+{
+	if (g_strcmp0(msg->conversation_name, value) == 0)
+		return;
+
+	g_free(msg->conversation_name);
+	msg->conversation_name = g_strdup(value);
+
+	g_dbus_emit_property_changed(conn, msg->path,
+						MAP_MSG_INTERFACE, "ConversationName");
+}
+
+static void parse_direction(struct map_msg *msg, const char *value)
+{
+	if (g_strcmp0(msg->direction, value) == 0)
+		return;
+
+	g_free(msg->direction);
+	msg->direction = g_strdup(value);
+
+	g_dbus_emit_property_changed(conn, msg->path,
+						MAP_MSG_INTERFACE, "Direction");
+}
+
+static void parse_mime_types(struct map_msg *msg, const char *value)
+{
+	if (g_strcmp0(msg->attachment_mime_types, value) == 0)
+		return;
+
+	g_free(msg->attachment_mime_types);
+	msg->attachment_mime_types = g_strdup(value);
+
+	g_dbus_emit_property_changed(conn, msg->path,
+						MAP_MSG_INTERFACE, "AttachmentMimeTypes");
+}
+
 static const struct map_msg_parser {
 	const char *name;
 	void (*func) (struct map_msg *msg, const char *value);
@@ -1081,6 +1245,11 @@  static const struct map_msg_parser {
 		{ "read", parse_read },
 		{ "sent", parse_sent },
 		{ "protected", parse_protected },
+		{ "delivery_status", parse_delivery_status},
+		{ "conversation_id", parse_conversation_id},
+		{ "conversation_name", parse_conversation_name},
+		{ "direction", parse_direction},
+		{ "attachment_mime_types", parse_mime_types},
 		{ }
 };
 
diff --git a/src/profile.c b/src/profile.c
index 6bc6778de..70ac058f4 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -563,7 +563,7 @@ 
 			<text value=\"%s\"/>				\
 		</attribute>						\
 		<attribute id=\"0x0317\">				\
-			<uint32 value=\"0x0000007f\"/>			\
+			<uint32 value=\"0x0000027f\"/>			\
 		</attribute>						\
 		<attribute id=\"0x0200\">				\
 			<uint16 value=\"%u\" name=\"psm\"/>		\