sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

ussd: Cancel pending requests when unregistering 

And reset state to idle before unregistering the D-Bus interface.
This may occur e.g. when we receive REFRESH from STK.
This commit is contained in:
Slava Monich 2018-05-23 16:48:01 +03:00 committed by Denis Kenzior
parent ff85d63149
commit ecc3f1bf73
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ussd.c
View File

@ -810,6 +810,22 @@ static void ussd_unregister(struct ofono_atom *atom)
DBusConnection *conn = ofono_dbus_get_connection();
struct ofono_modem *modem = __ofono_atom_get_modem(atom);
const char *path = __ofono_atom_get_path(atom);
DBusMessage *reply;
if (ussd->pending) {
reply = __ofono_error_canceled(ussd->pending);
__ofono_dbus_pending_reply(&ussd->pending, reply);
}
if (ussd->cancel) {
reply = dbus_message_new_method_return(ussd->cancel);
__ofono_dbus_pending_reply(&ussd->cancel, reply);
}
if (ussd->req)
ussd_request_finish(ussd, -ECANCELED, 0, NULL, 0);
ussd_change_state(ussd, USSD_STATE_IDLE);
g_slist_free_full(ussd->ss_control_list, ssc_entry_destroy);
ussd->ss_control_list = NULL;