mirror of git://git.sysmocom.de/ofono
voicecall: fix dial result handling
The existing call will be automatically put on hold if there is an existing active call when dialing. On some modems the dial request returns only after the dialed call is active and the existing call has been put on hold. However, on isimodem driver the dial request returns immediately before the existing call has changed its status. With isimodem driver the dial_handle_result() selected the existing call from the list when it should have created a new one. The dial result handling now guards againt returning a previously dialed active call as result.
This commit is contained in:
parent
7c3a800267
commit
da444beb2d
|
@ -68,6 +68,7 @@ struct voicecall {
|
|||
char *message;
|
||||
uint8_t icon_id;
|
||||
gboolean untracked;
|
||||
gboolean dial_result_handled;
|
||||
};
|
||||
|
||||
struct dial_request {
|
||||
|
@ -1092,9 +1093,18 @@ static struct voicecall *dial_handle_result(struct ofono_voicecall *vc,
|
|||
v = l->data;
|
||||
|
||||
if (v->call->status == CALL_STATUS_DIALING ||
|
||||
v->call->status == CALL_STATUS_ALERTING ||
|
||||
v->call->status == CALL_STATUS_ACTIVE)
|
||||
return v;
|
||||
v->call->status == CALL_STATUS_ALERTING)
|
||||
goto handled;
|
||||
|
||||
/*
|
||||
* Dial request may return before existing active call
|
||||
* is put on hold or after dialed call has got active
|
||||
*/
|
||||
if (v->call->status == CALL_STATUS_ACTIVE &&
|
||||
v->call->direction ==
|
||||
CALL_DIRECTION_MOBILE_ORIGINATED &&
|
||||
!v->dial_result_handled)
|
||||
goto handled;
|
||||
}
|
||||
|
||||
call = synthesize_outgoing_call(vc, number);
|
||||
|
@ -1115,6 +1125,9 @@ static struct voicecall *dial_handle_result(struct ofono_voicecall *vc,
|
|||
|
||||
*need_to_emit = TRUE;
|
||||
|
||||
handled:
|
||||
v->dial_result_handled = TRUE;
|
||||
|
||||
return v;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue