12:04 a.m.
This set of patches concerns mmsd and implements the first task listed in the
MMS Delivery Report section of TODO.
Ronald Tessier (6):
mmsutil: Add delivery report to send_req struct
doc: Modify SendMessage D-Bus API
service: Retrieve delivery-report parameter
mmsutil: Encode delivery-report in send_req msg
unit: Add delivery_report to send_req testing
test: Support delivery_report in Send-Message script
doc/service-api.txt | 3 ++-
src/mmsutil.c | 9 ++++++++-
src/mmsutil.h | 6 ++++++
src/service.c | 12 +++++++++++-
test/send-message | 19 +++++++++++++------
unit/test-mmsutil.c | 3 ++-
6 files changed, 42 insertions(+), 10 deletions(-)
--
1.7.4.1
12:04 a.m.
New subject: [PATCH 1/6] mmsutil: Add delivery report to send_req struct
---
src/mmsutil.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/mmsutil.h b/src/mmsutil.h
index 79c74db..6c7b37f 100644
--- a/src/mmsutil.h
+++ b/src/mmsutil.h
@@ -105,6 +105,7 @@ struct mms_send_req {
char *to;
time_t date;
char *content_type;
+ gboolean dr;
};
struct mms_send_conf {
--
1.7.4.1
12:04 a.m.
New subject: [PATCH 2/6] doc: Modify SendMessage D-Bus API
---
doc/service-api.txt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/doc/service-api.txt b/doc/service-api.txt
index 36e1161..57e8942 100644
--- a/doc/service-api.txt
+++ b/doc/service-api.txt
@@ -36,7 +36,8 @@ Methods array{object,dict} GetMessages()
Possible Errors: [service].Error.InvalidArguments
[service].Error.TransientFailure
- object SendMessage(array{string} recipients, string smil,
+ object SendMessage(array{string} recipients,
+ boolean delivery-report, string smil,
array{string id, string content-type,
string filename})
--
1.7.4.1
5:10 p.m.
New subject: [PATCH 2/6] doc: Modify SendMessage D-Bus API
Hi Ronald,
doc/service-api.txt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/doc/service-api.txt b/doc/service-api.txt
index 36e1161..57e8942 100644
--- a/doc/service-api.txt
+++ b/doc/service-api.txt
@@ -36,7 +36,8 @@ Methods array{object,dict} GetMessages()
Possible Errors: [service].Error.InvalidArguments
[service].Error.TransientFailure
- object SendMessage(array{string} recipients, string smil,
+ object SendMessage(array{string} recipients,
+ boolean delivery-report, string smil,
array{string id, string content-type,
string filename})
I think we should do it the same as we do for oFono. Make this is global
settings. Since you don't do that on a per message basis anyway.
Regards
Marcel
12:04 a.m.
New subject: [PATCH 3/6] service: Retrieve delivery-report parameter
---
src/service.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/service.c b/src/service.c
index 83e1fe1..8150c29 100644
--- a/src/service.c
+++ b/src/service.c
@@ -456,6 +456,14 @@ static gboolean send_message_get_args(DBusMessage *dbus_msg,
if (!dbus_message_iter_next(&top_iter))
return FALSE;
+ if (dbus_message_iter_get_arg_type(&top_iter) != DBUS_TYPE_BOOLEAN)
+ return FALSE;
+
+ dbus_message_iter_get_basic(&top_iter, &msg->sr.dr);
+
+ if (!dbus_message_iter_next(&top_iter))
+ return FALSE;
+
if (dbus_message_iter_get_arg_type(&top_iter) != DBUS_TYPE_STRING)
return FALSE;
@@ -982,7 +990,9 @@ release_msg:
static const GDBusMethodTable service_methods[] = {
{ GDBUS_METHOD("SendMessage",
- GDBUS_ARGS({ "recipients", "as" }, { "smil",
"s" },
+ GDBUS_ARGS({ "recipients", "as" },
+ { "delivery_report", "b" },
+ { "smil", "s" },
{ "attachments", "a(sss)" }),
GDBUS_ARGS({ "path", "o" }),
send_message) },
--
1.7.4.1
12:04 a.m.
New subject: [PATCH 4/6] mmsutil: Encode delivery-report in send_req msg
---
src/mmsutil.c | 9 ++++++++-
src/mmsutil.h | 5 +++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/mmsutil.c b/src/mmsutil.c
index 89f1c29..a9a12eb 100644
--- a/src/mmsutil.c
+++ b/src/mmsutil.c
@@ -1395,7 +1395,7 @@ static header_encoder encoder_for_type(enum mms_header header)
case MMS_HEADER_DATE:
return NULL;
case MMS_HEADER_DELIVERY_REPORT:
- return NULL;
+ return encode_short;
case MMS_HEADER_DELIVERY_TIME:
return NULL;
case MMS_HEADER_EXPIRY:
@@ -1614,12 +1614,19 @@ static gboolean mms_encode_send_req(struct mms_message *msg,
{
const char *empty_from = "";
GSList *item;
+ enum mms_message_value_bool dr;
+
+ if (msg->sr.dr == TRUE)
+ dr = MMS_MESSAGE_VALUE_BOOL_YES;
+ else
+ dr = MMS_MESSAGE_VALUE_BOOL_NO;
if (mms_encode_headers(fb, MMS_HEADER_MESSAGE_TYPE, &msg->type,
MMS_HEADER_TRANSACTION_ID, &msg->transaction_id,
MMS_HEADER_MMS_VERSION, &msg->version,
MMS_HEADER_FROM, &empty_from,
MMS_HEADER_TO, &msg->sr.to,
+ MMS_HEADER_DELIVERY_REPORT, &dr,
MMS_HEADER_CONTENT_TYPE, &msg->sr.content_type,
MMS_HEADER_INVALID) == FALSE)
return FALSE;
diff --git a/src/mmsutil.h b/src/mmsutil.h
index 6c7b37f..cc3ec67 100644
--- a/src/mmsutil.h
+++ b/src/mmsutil.h
@@ -73,6 +73,11 @@ enum mms_message_sender_visibility {
MMS_MESSAGE_SENDER_VISIBILITY_SHOW = 129,
};
+enum mms_message_value_bool {
+ MMS_MESSAGE_VALUE_BOOL_YES = 128,
+ MMS_MESSAGE_VALUE_BOOL_NO = 129,
+};
+
enum mms_message_version {
MMS_MESSAGE_VERSION_1_0 = 0x90,
MMS_MESSAGE_VERSION_1_1 = 0x91,
--
1.7.4.1
12:04 a.m.
New subject: [PATCH 5/6] unit: Add delivery_report to send_req testing
---
unit/test-mmsutil.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/unit/test-mmsutil.c b/unit/test-mmsutil.c
index 30a6c6c..4efbbcc 100644
--- a/unit/test-mmsutil.c
+++ b/unit/test-mmsutil.c
@@ -935,6 +935,7 @@ static const struct mms_encode_test mms_m_send_req_test_1 = {
{.sr = {
.status = MMS_MESSAGE_STATUS_DRAFT,
.to = "0123456789",
+ .dr = TRUE,
.content_type = CT_MULTIPART_MIXED,
} }
},
@@ -942,7 +943,7 @@ static const struct mms_encode_test mms_m_send_req_test_1 = {
0x36, 0x37, 0x38, 0x39, 0x61, 0x62, 0x63, 0x64, 0x65,
0x66, 0x5F, 0x73, 0x72, 0x31, 0x00, 0x8D, 0x92, 0x89,
0x01, 0x81, 0x97, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
- 0x36, 0x37, 0x38, 0x39, 0x00, 0x84, 0xA3
+ 0x36, 0x37, 0x38, 0x39, 0x00, 0x86, 0x80, 0x84, 0xA3
}
};
--
1.7.4.1
12:04 a.m.
New subject: [PATCH 6/6] test: Support delivery_report in Send-Message script
---
test/send-message | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/test/send-message b/test/send-message
index 558fdaa..8522375 100755
--- a/test/send-message
+++ b/test/send-message
@@ -4,20 +4,23 @@ import sys
import dbus
import csv
-if (len(sys.argv) < 4):
+if (len(sys.argv) < 5):
print "Usage: %s"\
" <recipient>,..."\
+ "<delivery-report>"\
" <smil-file-path>"\
" <<content-id>,<content-type>,<file-path>>,..."\
% (sys.argv[0])
print "Sample(Related): %s"\
" \"+33611111111,+33622222222\""\
+ " \"TRUE\""\
" \"smil.txt\""\
" \"cid-1,text/plain,text.txt\""\
" \"cid-2,image/jpeg,image.jpg\""\
% (sys.argv[0])
print "Sample(Mixed): %s"\
" \"+33611111111,+33622222222\""\
+ " \"FALSE\""\
" \"\""\
" \"cid-1,text/plain,text.txt\""\
" \"cid-2,image/jpeg,image.jpg\""\
@@ -42,18 +45,22 @@ for r in reader:
for i in r:
recipients.append(dbus.String(i))
+if sys.argv[2].capitalize() == 'True':
+ delivery = True
+else:
+ delivery = False
-if sys.argv[2] == "":
+if sys.argv[3] == "":
print "Send MMS as Mixed"
smil = ""
else:
print "Send MMS as Related"
- print "Smil path: %s" % (sys.argv[2])
- file = open(sys.argv[2],"r")
+ print "Smil path: %s" % (sys.argv[3])
+ file = open(sys.argv[3],"r")
smil = dbus.String(file.read())
attachments = dbus.Array([],signature=dbus.Signature('(sss)'))
-for a in sys.argv[3:]:
+for a in sys.argv[4:]:
print "Attachment: (%s)" % a
reader = csv.reader([a])
for r in reader:
@@ -62,6 +69,6 @@ for a in sys.argv[3:]:
dbus.String(r[2])
), signature=None))
-path = service.SendMessage(recipients, smil, attachments)
+path = service.SendMessage(recipients, delivery, smil, attachments)
print path
--
1.7.4.1
3737
days inactive
3750
days old
10 comments
2 participants
participants (2)
-
Marcel Holtmann -
Ronald Tessier