4:47 p.m.
Hi,
The first patch removes the MMS reception part from TODO file which
has been done some times ago.
This model of error management applies also for MMS emission, except that
it shouldn't be silent because initiated by the user.
Sébastien Bianti (2):
TODO: MMS reception error management done
service: emit signal when send has failed
TODO | 13 -------------
src/service.c | 32 ++++++++++++++++++++------------
2 files changed, 20 insertions(+), 25 deletions(-)
--
1.7.4.4
4:47 p.m.
New subject: [PATCH 1/2] TODO: MMS reception error management done
---
TODO | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/TODO b/TODO
index c75468d..95a40c7 100644
--- a/TODO
+++ b/TODO
@@ -30,19 +30,6 @@ MMS Submission
"org.ofono.mms.Message" interface implementation.
Owner: Sebastien Bianti <sebastien.bianti(a)linux.intel.com>
-MMS Reception
-=============
-
-- Add MMS Automatic Retrieval support.
- Error cases should handled and reported to the application layer.
-
- Priority: High
- Complexity: C4
- Depends: META file support, MMS M-Retrieve.conf PDU decoding support,
- "org.ofono.mms.Message" interface implementation, HTTP GWeb POST request
- support.
- Owner: Ronald Tessier <ronald.tessier(a)linux.intel.com>
-
D-Bus API
=========
--
1.7.4.4
4:47 p.m.
New subject: [PATCH 2/2] service: emit signal when send has failed
Event if status doesn't really change, we need to alert the application
by sending the same value "draft" which means the message hasn't been
received.
---
src/service.c | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/service.c b/src/service.c
index f89fd3f..8dd0a2e 100644
--- a/src/service.c
+++ b/src/service.c
@@ -596,16 +596,23 @@ static gboolean result_request_send_conf(struct mms_request
*request)
size_t len;
char *path;
- if (request->status != 200)
+ if (request->msg == NULL)
return FALSE;
+ uuid = request->msg->uuid;
+
+ path = g_strdup_printf("%s/%s/%s", MMS_PATH, service->identity, uuid);
+
+ if (request->status != 200)
+ goto error;
+
msg = g_try_new0(struct mms_message, 1);
if (msg == NULL)
- return FALSE;
+ goto error;
if (mmap_file(request->data_path, &pdu, &len) == FALSE) {
mms_message_free(msg);
- return FALSE;
+ goto error;
}
if (mms_message_decode(pdu, len, msg) == FALSE) {
@@ -615,7 +622,7 @@ static gboolean result_request_send_conf(struct mms_request *request)
mms_message_free(msg);
- return FALSE;
+ goto error;
}
mms_debug("response status : %d", msg->sc.rsp_status);
@@ -626,26 +633,27 @@ static gboolean result_request_send_conf(struct mms_request
*request)
unlink(request->data_path);
- if (request->msg == NULL)
- return FALSE;
-
- uuid = request->msg->uuid;
-
meta = mms_store_meta_open(service->identity, uuid);
if (meta == NULL)
- return FALSE;
+ goto error;
g_key_file_set_string(meta, "info", "state", "sent");
mms_store_meta_close(service->identity, uuid, meta, TRUE);
- path = g_strdup_printf("%s/%s/%s", MMS_PATH, service->identity, uuid);
-
emit_msg_status_changed(path, "sent");
g_free(path);
return TRUE;
+
+error:
+ if (request->attempt == MAX_ATTEMPTS)
+ emit_msg_status_changed(path, "draft");
+
+ g_free(path);
+
+ return FALSE;
}
static void append_message(const char *path, const struct mms_service *service,
--
1.7.4.4
12:30 p.m.
Hi Sebastien,
The first patch removes the MMS reception part from TODO file which
has been done some times ago.
This model of error management applies also for MMS emission, except that
it shouldn't be silent because initiated by the user.
Sébastien Bianti (2):
TODO: MMS reception error management done
service: emit signal when send has failed
TODO | 13 -------------
src/service.c | 32 ++++++++++++++++++++------------
2 files changed, 20 insertions(+), 25 deletions(-)
both patches have been applied.
Regards
Marcel
2951
days inactive
2953
days old
3 comments
2 participants
participants (2)
-
Marcel Holtmann -
Sébastien Bianti