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

Do not use chld=1 on mpty when another held 

If we're trying to hangup an active MPTY call, and we have
calls on hold we shouldn't use CHLD=1 (release_all_active)
since this will have the side-effect of activating the held
calls
This commit is contained in:
Denis Kenzior 2009-06-12 00:19:14 -05:00
parent 3a7164c0e7
commit 46ac5c564c
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/voicecall.c
View File

@ -1010,22 +1010,33 @@ static DBusMessage *multiparty_hangup(DBusConnection *conn,
calls->flags |= VOICECALLS_FLAG_PENDING;
calls->pending = dbus_message_ref(msg);
/* We have waiting calls, can't use +CHLD to release */
if (voicecalls_have_waiting(calls)) {
calls->flags |= VOICECALLS_FLAG_MULTI_RELEASE;
voicecalls_release_queue(modem, calls->multiparty_list);
voicecalls_release_next(modem);
} else {
/* We don't have waiting calls, as we can't use +CHLD to release */
if (!voicecalls_have_waiting(calls)) {
struct voicecall *v = calls->multiparty_list->data;
if (v->call->status == CALL_STATUS_HELD)
if (v->call->status == CALL_STATUS_HELD) {
calls->ops->release_all_held(modem, generic_callback,
calls);
else
goto out;
}
/* Multiparty is currently active, if we have held calls
* we shouldn't use release_all_active here since this also
* has the side-effect of activating held calls
*/
if (!voicecalls_have_held(calls)) {
calls->ops->release_all_active(modem, generic_callback,
calls);
calls);
goto out;
}
}
/* Fall back to the old-fashioned way */
calls->flags |= VOICECALLS_FLAG_MULTI_RELEASE;
voicecalls_release_queue(modem, calls->multiparty_list);
voicecalls_release_next(modem);
out:
return NULL;
}