[PATCH v4 1/2] dbus: Add Terminated error

[PATCH v4 1/2] dbus: Add Terminated error

[Philippe Nunes]

[-- Attachment #1: Type: text/plain, Size: 1225 bytes --]

---
 src/dbus.c  |    8 ++++++++
 src/ofono.h |    1 +
 2 files changed, 9 insertions(+)

diff --git a/src/dbus.c b/src/dbus.c
index 3f5c12d..1f9f9ba 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -409,6 +409,14 @@ DBusMessage *__ofono_error_not_recognized(DBusMessage *msg)
 					"String not recognized as USSD/SS");
 }
 
+DBusMessage *__ofono_error_terminated_by_network(DBusMessage *msg)
+{
+	return g_dbus_create_error(msg, OFONO_ERROR_INTERFACE
+					".Terminated",
+					"Operation is terminated by the"
+					" network");
+}
+
 DBusMessage *__ofono_error_from_error(const struct ofono_error *error,
 						DBusMessage *msg)
 {
diff --git a/src/ofono.h b/src/ofono.h
index aca81b4..e20d8fa 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -66,6 +66,7 @@ DBusMessage *__ofono_error_emergency_active(DBusMessage *msg);
 DBusMessage *__ofono_error_incorrect_password(DBusMessage *msg);
 DBusMessage *__ofono_error_not_allowed(DBusMessage *msg);
 DBusMessage *__ofono_error_not_recognized(DBusMessage *msg);
+DBusMessage *__ofono_error_terminated_by_network(DBusMessage *msg);
 
 DBusMessage *__ofono_error_from_error(const struct ofono_error *error,
 						DBusMessage *msg);
-- 
1.7.9.5

[PATCH v4 2/2] ussd: Recover idle state after a transaction error

[Philippe Nunes]

[-- Attachment #1: Type: text/plain, Size: 757 bytes --]

The "USSD terminated by network" notification is handled to recover
the idle state in case of USSD transaction error.
---
 src/ussd.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/ussd.c b/src/ussd.c
index 74888b2..60b1f6b 100644
--- a/src/ussd.c
+++ b/src/ussd.c
@@ -414,6 +414,16 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs,
 		return;
 	}
 
+	if (status == OFONO_USSD_STATUS_TERMINATED) {
+		ussd_change_state(ussd, USSD_STATE_IDLE);
+
+		if (ussd->pending == NULL)
+			return;
+
+		reply = __ofono_error_terminated_by_network(ussd->pending);
+		goto out;
+	}
+
 	if (status == OFONO_USSD_STATUS_NOT_SUPPORTED) {
 		ussd_change_state(ussd, USSD_STATE_IDLE);
 
-- 
1.7.9.5

Re: [PATCH v4 2/2] ussd: Recover idle state after a transaction error

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

Hi Philippe,

On 09/06/2012 09:21 AM, Philippe Nunes wrote:
> The "USSD terminated by network" notification is handled to recover
> the idle state in case of USSD transaction error.
> ---
>   src/ussd.c |   10 ++++++++++
>   1 file changed, 10 insertions(+)
>

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH v4 1/2] dbus: Add Terminated error

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]

Hi Philippe,

On 09/06/2012 09:21 AM, Philippe Nunes wrote:
> ---
>   src/dbus.c  |    8 ++++++++
>   src/ofono.h |    1 +
>   2 files changed, 9 insertions(+)
>

The patch has been applied with a few changes:

> diff --git a/src/dbus.c b/src/dbus.c
> index 3f5c12d..1f9f9ba 100644
> --- a/src/dbus.c
> +++ b/src/dbus.c
> @@ -409,6 +409,14 @@ DBusMessage *__ofono_error_not_recognized(DBusMessage *msg)
>   					"String not recognized as USSD/SS");
>   }
>
> +DBusMessage *__ofono_error_terminated_by_network(DBusMessage *msg)

I amended the patch to read '__ofono_error_network_terminated'

> +{
> +	return g_dbus_create_error(msg, OFONO_ERROR_INTERFACE
> +					".Terminated",
> +					"Operation is terminated by the"

and changed "is" to "was"

> +					" network");
> +}
> +
>   DBusMessage *__ofono_error_from_error(const struct ofono_error *error,
>   						DBusMessage *msg)
>   {
> diff --git a/src/ofono.h b/src/ofono.h
> index aca81b4..e20d8fa 100644
> --- a/src/ofono.h
> +++ b/src/ofono.h
> @@ -66,6 +66,7 @@ DBusMessage *__ofono_error_emergency_active(DBusMessage *msg);
>   DBusMessage *__ofono_error_incorrect_password(DBusMessage *msg);
>   DBusMessage *__ofono_error_not_allowed(DBusMessage *msg);
>   DBusMessage *__ofono_error_not_recognized(DBusMessage *msg);
> +DBusMessage *__ofono_error_terminated_by_network(DBusMessage *msg);
>
>   DBusMessage *__ofono_error_from_error(const struct ofono_error *error,
>   						DBusMessage *msg);

Regards,
-Denis