Merge pull request #29 from monich/service-denied

[mms-lib] Only report status REFUSED for errors 225, 229 and 235
sailfishos · Apr 22, 2014 · 2c9bb47 · 2c9bb47
2 parents bbb8ca2 + 0ab4a7c
commit 2c9bb47
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 2 deletions.
diff --git a/mms-lib/src/mms_task_send.c b/mms-lib/src/mms_task_send.c
@@ -81,7 +81,15 @@ mms_task_send_done(
                         }
                     } else {
                         MMS_ERR("MMSC responded with %u", pdu->sc.rsp_status);
-                        state = MMS_SEND_STATE_REFUSED;
+                        switch (pdu->sc.rsp_status) {
+                        case MMS_MESSAGE_RSP_STATUS_ERR_PERM_SERVICE_DENIED:
+                        case MMS_MESSAGE_RSP_STATUS_ERR_PERM_LACK_OF_PREPAID:
+                        case MMS_MESSAGE_RSP_STATUS_ERR_PERM_CONTENT_NOT_ACCEPTED:
+                            state = MMS_SEND_STATE_REFUSED;
+                            break;
+                        default:
+                            break;
+                        }
                     }
                 } else {
                     MMS_ERR("Unexpected response from MMSC");

diff --git a/mms-lib/test/send/data/Reject/0001.png → mms-lib/test/send/data/Failure/0001.png b/mms-lib/test/send/data/Reject/0001.png → mms-lib/test/send/data/Failure/0001.png
diff --git a/mms-lib/test/send/data/Reject/m-send.conf → mms-lib/test/send/data/Failure/m-send.conf b/mms-lib/test/send/data/Reject/m-send.conf → mms-lib/test/send/data/Failure/m-send.conf
diff --git a/mms-lib/test/send/data/Reject/test.txt → mms-lib/test/send/data/Failure/test.txt b/mms-lib/test/send/data/Reject/test.txt → mms-lib/test/send/data/Failure/test.txt
diff --git a/mms-lib/test/send/data/ServiceDenied/0001.png b/mms-lib/test/send/data/ServiceDenied/0001.png
diff --git a/mms-lib/test/send/data/ServiceDenied/m-send.conf b/mms-lib/test/send/data/ServiceDenied/m-send.conf
diff --git a/mms-lib/test/send/data/ServiceDenied/test.txt b/mms-lib/test/send/data/ServiceDenied/test.txt
@@ -0,0 +1 @@
+MMS Center rejection test
diff --git a/mms-lib/test/send/test_send.c b/mms-lib/test/send/test_send.c
@@ -122,7 +122,7 @@ static const TestDesc send_tests[] = {
         MMS_SEND_STATE_SENDING,
         "TestMessageId"
     },{
-        "Reject",
+        "ServiceDenied",
         ATTACHMENTS(test_files_reject),
         "Rejection test",
         "+1234567890",
@@ -135,6 +135,20 @@ static const TestDesc send_tests[] = {
         SOUP_STATUS_OK,
         MMS_SEND_STATE_REFUSED,
         NULL
+    },{
+        "Failure",
+        ATTACHMENTS(test_files_reject),
+        "Failure test",
+        "+1234567890",
+        NULL,
+        NULL,
+        NULL,
+        0,
+        "m-send.conf",
+        MMS_CONTENT_TYPE,
+        SOUP_STATUS_OK,
+        MMS_SEND_STATE_SEND_ERROR,
+        NULL
     }
 };