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

voicecall: prefer release_specific() over hang_up_active/hangup_all 

release_specific() has the call_id as parameter in difference to the more unspecific
calls hangup_all and hangup_active.
This commit is contained in:
Alexander Couzens 2017-07-25 16:43:03 +02:00
parent 8f00ef8b3b
commit d43fde3c5e
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/voicecall.c
View File

@ -542,10 +542,18 @@ static DBusMessage *voicecall_hangup(DBusConnection *conn,
if (vc->dial_req && vc->dial_req->call != v)
return __ofono_error_busy(msg);
switch (call->status) {
case CALL_STATUS_DISCONNECTED:
if (call->status == CALL_STATUS_DISCONNECTED)
return __ofono_error_failed(msg);
if (vc->driver->release_specific) {
vc->pending = dbus_message_ref(msg);
vc->driver->release_specific(vc, call->id,
generic_callback, vc);
return NULL;
}
switch (call->status) {
case CALL_STATUS_INCOMING:
if (vc->driver->hangup_all == NULL &&
vc->driver->hangup_active == NULL)
@ -615,14 +623,7 @@ static DBusMessage *voicecall_hangup(DBusConnection *conn,
break;
}
if (vc->driver->release_specific == NULL)
return __ofono_error_not_implemented(msg);
vc->pending = dbus_message_ref(msg);
vc->driver->release_specific(vc, call->id,
generic_callback, vc);
return NULL;
return __ofono_error_not_implemented(msg);
}
static DBusMessage *voicecall_answer(DBusConnection *conn,