Hi Oleg,

On 03/13/2012 08:46 AM, Oleg Zhurakivskyy wrote:
> ---
>  src/call-forwarding.c |   19 ++++++++++---------
>  1 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/src/call-forwarding.c b/src/call-forwarding.c
> index 7e5edcb..ad5050b 100644
> --- a/src/call-forwarding.c
> +++ b/src/call-forwarding.c
> @@ -525,19 +525,18 @@ static void get_query_cf_callback(const struct ofono_error *error, int total,
>  		DBG("%s conditions:", cf_type_lut[cf->query_next]);
>  
>  		cf_cond_list_print(l);
> -
> -		if (cf->query_next == CALL_FORWARDING_TYPE_NOT_REACHABLE)
> -			cf->flags |= CALL_FORWARDING_FLAG_CACHED;
>  	}
>  
> -	if (cf->query_next == CALL_FORWARDING_TYPE_NOT_REACHABLE) {
> -		DBusMessage *reply = cf_get_properties_reply(cf->pending, cf);
> -		__ofono_dbus_pending_reply(&cf->pending, reply);
> +	if (cf->query_next++ < cf->query_end) {
> +		get_query_next_cf_cond(cf);
>  		return;
>  	}
>  
> -	cf->query_next++;
> -	get_query_next_cf_cond(cf);
> +	if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
> +		cf->flags |= CALL_FORWARDING_FLAG_CACHED;
> +
> +	__ofono_dbus_pending_reply(&cf->pending,
> +				cf_get_properties_reply(cf->pending, cf));
>  }
>  
>  static inline void get_query_next_cf_cond(struct ofono_call_forwarding *cf)
> @@ -565,7 +564,9 @@ static DBusMessage *cf_get_properties(DBusConnection *conn, DBusMessage *msg,
>  
>  	cf->pending = dbus_message_ref(msg);
>  	cf->query_next = 0;
> -
> +	cf->query_end = is_cfu_enabled(cf) ?
> +					CALL_FORWARDING_TYPE_UNCONDITIONAL :
> +					CALL_FORWARDING_TYPE_NOT_REACHABLE;
>  	get_query_next_cf_cond(cf);
>  
>  	return NULL;

What if we're running GetProperties for the first time and CFU is active
at the network, but for some reason (e.g. driver doesn't implement it)
the SIM call forwarding rules are absent.  Won't we query conditional
CFs needlessly here?

Regards,
-Denis