[PATCH] emulator: Fix start of RING event

[PATCH] emulator: Fix start of RING event

[=?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis]

[-- Attachment #1: Type: text/plain, Size: 1730 bytes --]

RING event should only be sent when callsetup indicator is set to
Incoming and there is no active call.

If call indicator is set to inactive while callsetup is
already set to Incoming (waiting call has generated +CCWA),
no RING event should be sent.

Ref.: PTS test TC_AG_TWC_BV_02_I
---
 src/emulator.c |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/emulator.c b/src/emulator.c
index 262e782..0fa6eac 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -1219,23 +1219,12 @@ void ofono_emulator_set_indicator(struct ofono_emulator *em,
 	}
 
 	/*
-	 * Ring timer should be started when:
-	 * - callsetup indicator is set to Incoming and there is no active call
-	 *   (not a waiting call)
-	 * - or call indicator is set to inactive while callsetup is already
-	 *   set to Incoming.
+	 * Ring timer should be started when callsetup indicator is set to
+	 * Incoming and there is no active call (not a waiting call).
 	 * In those cases, a first RING should be sent just after the +CIEV
 	 * Ring timer should be stopped for all other values of callsetup
 	 */
-	if (waiting)
-		return;
-
-	/* Call state went from active/held + waiting -> incoming */
-	if (call && value == OFONO_EMULATOR_CALL_INACTIVE &&
-			cs_ind->value == OFONO_EMULATOR_CALLSETUP_INCOMING)
-		goto start_ring;
-
-	if (!callsetup)
+	if (!callsetup || waiting)
 		return;
 
 	if (value != OFONO_EMULATOR_CALLSETUP_INCOMING) {
@@ -1247,7 +1236,6 @@ void ofono_emulator_set_indicator(struct ofono_emulator *em,
 		return;
 	}
 
-start_ring:
 	notify_ring(em);
 	em->callsetup_source = g_timeout_add_seconds(RING_TIMEOUT,
 							notify_ring, em);
-- 
1.7.1

Re: [PATCH] emulator: Fix start of RING event

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 1646 bytes --]

Hi Fred,

On 02/09/2012 08:12 AM, Frédéric Danis wrote:
> RING event should only be sent when callsetup indicator is set to
> Incoming and there is no active call.
> 
> If call indicator is set to inactive while callsetup is
> already set to Incoming (waiting call has generated +CCWA),
> no RING event should be sent.
> 
> Ref.: PTS test TC_AG_TWC_BV_02_I
> ---
>  src/emulator.c |   18 +++---------------
>  1 files changed, 3 insertions(+), 15 deletions(-)
> 

After looking at the test case, it seems to be dealing with testing the
consequences of CHLD=1.  Essentially dropping the current active call
and accepting the waiting call.  The logic you're changing is also
dealing with a slightly different case, namely if the active call is
dropped by the remote party during a waiting call.

In the case of CHLD=1, the sequence should be one of these:

1. Active Call Index -> Disconnected, Waiting call Index -> Active

In the case of remote party dropping the Active call, the sequences can be:

1. Active Call Index -> Disconnected, Waiting Call Index -> Incoming

The logic has to be modified to handle the transition state (e.g. call
indicator going from 1 to 0, and waiting call present) and send the
proper indicators when the final state is reached.  Likely our handling
of the 'waiting' variable is incorrect, we cannot rely on the values of
callsetup and call, but instead should try to find any calls in the
'WAITING' state.

I believe that sending a call=0, then callsetup=0, call=1 is acceptable,
but ideally in the case of CHLD=1 we should be sending callsetup=0 only.

Regards,
-Denis