Hi Denis,
2010/11/22 Denis Kenzior <denk...@gmail.com>:
>> If there is an existing active call when dialing the existing call will
>> be automatically put on hold. The dialing result handling depended on
>> the voicecall driver putting the call on hold before the dial command
>> callback is called.
>>
>> However, this is not true on isimodem driver, where the dial request
>> returns immediately before the existing call have changed its
>> status. The dial result handling now checks if the active call has been
>> resulted from the dial request.
>> ---
>> src/voicecall.c | 18 ++++++++++++++++--
>> 1 files changed, 16 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/voicecall.c b/src/voicecall.c
>> index bd64432..e3ce2a5 100644
>> --- a/src/voicecall.c
>> +++ b/src/voicecall.c
>> @@ -68,6 +68,7 @@ struct voicecall {
>> char *message;
>> uint8_t icon_id;
>> gboolean untracked;
>> + gboolean dial_result_handled;
>> };
>>
>> struct dial_request {
>> @@ -1096,9 +1097,20 @@ 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)
>> + v->call->status == CALL_STATUS_ALERTING)
>> return v;
>> +
>> + /*
>> + * 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) {
>> + v->dial_result_handled = TRUE;
>> + return v;
>> + }
>
> I really don't see how this can work, since you never reset
> dial_result_handled to FALSE anywhere.
Huh? voicecall_create() uses g_new0().
For each outbound call there should be exactly one dial request, once
that is returned in dial_handle_result(), the dial_result_handled
should be TRUE.
I'll fix the above code.
>> }
>>
>> call = synthesize_outgoing_call(vc, number);
>> @@ -1119,6 +1131,8 @@ static struct voicecall *dial_handle_result(struct
>> ofono_voicecall *vc,
>>
>> *need_to_emit = TRUE;
>>
>> + v->dial_result_handled = TRUE;
>> +
>
> dial_handle_result is ever called once, why do you need to set this here?
This prevents mixing this call with the call dialed next.
> This seems to be the wrong way to go, is there any way for you to delay
> returning from the dial operation until the call is put on hold?
While it is technically possible it does not make much sense.
--
Pekka.Pessi mail at nokia.com
_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
