Hi Jeevaka,
On 09/09/2010 07:31 AM, Jeevaka Badrappan wrote:
> ---
> src/stk.c | 141
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 140 insertions(+), 1 deletions(-)
>
> diff --git a/src/stk.c b/src/stk.c
> index 3fda2af..ff194f1 100644
> --- a/src/stk.c
> +++ b/src/stk.c
> @@ -1590,6 +1590,142 @@ static gboolean handle_command_set_up_call(const
> struct stk_command *cmd,
> return FALSE;
> }
>
> +static void send_ussd_callback(int error, int dcs, const unsigned char *msg,
> + int msg_len, void *userdata)
> +{
> + struct ofono_stk *stk = userdata;
> + struct ofono_error failure = { .type = OFONO_ERROR_TYPE_FAILURE };
> + struct stk_response rsp;
> + enum sms_charset charset;
> +
> + if (stk->pending_cmd->send_ussd.alpha_id &&
> + stk->pending_cmd->send_ussd.alpha_id[0])
> + stk_alpha_id_unset(stk);
> +
> + switch (error) {
> + case OFONO_USSD_FAILURE_NONE:
> + memset(&rsp, 0, sizeof(rsp));
> +
> + rsp.result.type = STK_RESULT_TYPE_SUCCESS;
> +
> + if (cbs_dcs_decode(dcs, NULL, NULL, &charset,
> + NULL, NULL, NULL)) {
> + if (charset == SMS_CHARSET_7BIT)
> + rsp.send_ussd.text.dcs = 0x00;
> + else if (charset == SMS_CHARSET_8BIT)
> + rsp.send_ussd.text.dcs = 0x04;
> + else if (charset == SMS_CHARSET_UCS2)
> + rsp.send_ussd.text.dcs = 0x08;
> + } else
> + rsp.send_ussd.text.dcs = -1;
As mentioned before, let us not bother with dcs == -1. If the DCS
cannot be parsed, then simply fail.
> +
> + rsp.send_ussd.text.text = msg;
> + rsp.send_ussd.text.len = msg_len;
> +
> + if (stk_respond(stk, &rsp, stk_command_cb))
> + stk_command_cb(&failure, stk);
> +
> + break;
> + case OFONO_USSD_FAILURE_USER_TERMINATED:
> + send_simple_response(stk,
> + STK_RESULT_TYPE_USSD_OR_SS_USER_TERMINATION);
> + break;
> + case OFONO_USSD_FAILURE_TIMED_OUT:
> + send_simple_response(stk, STK_RESULT_TYPE_NETWORK_UNAVAILABLE);
> + break;
> + case OFONO_USSD_FAILURE_RETURN_ERROR:
> + send_simple_response(stk, STK_RESULT_TYPE_USSD_RETURN_ERROR);
> + break;
> + }
> +}
> +
> +static gboolean handle_command_send_ussd(const struct stk_command *cmd,
> + struct stk_response *rsp,
> + struct ofono_stk *stk)
> +{
> + struct ofono_modem *modem = __ofono_atom_get_modem(stk->atom);
> + static unsigned char busy_on_ss_result[] = { 0x03 };
> + static unsigned char busy_on_ussd_result[] = { 0x08 };
> + int err;
> +
> + struct ofono_atom *cf_atom;
> + struct ofono_atom *cb_atom;
> + struct ofono_atom *cs_atom;
> + struct ofono_atom *ussd_atom;
> +
> + struct ofono_call_forwarding *cf;
> + struct ofono_call_barring *cb;
> + struct ofono_call_settings *cs;
> + struct ofono_ussd *ussd;
> +
> + cf_atom = __ofono_modem_find_atom(modem,
> OFONO_ATOM_TYPE_CALL_FORWARDING);
> + cb_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_CALL_BARRING);
> + cs_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_CALL_SETTINGS);
> + ussd_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_USSD);
> +
> + if (cf_atom && __ofono_atom_get_registered(cf_atom)) {
> + cf = __ofono_atom_get_data(cf_atom);
> + if (__ofono_call_forwarding_is_busy(cf)) {
> + rsp->result.type = STK_RESULT_TYPE_TERMINAL_BUSY;
> + rsp->result.additional_len = sizeof(busy_on_ss_result);
> + rsp->result.additional = busy_on_ss_result;
> + return TRUE;
> + }
> + }
Actually I prefer something like:
struct ofono_atom *atom;
struct ofono_ussd *ussd;
atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_CALL_FORWARDING);
if (atom && __ofono_atom_get_registered(atom)) {
struct ofono_call_forwarding *cf = __ofono_atom_get_data(atom);
....
}
> +
> + if (cb_atom && __ofono_atom_get_registered(cb_atom)) {
> + cb = __ofono_atom_get_data(cb_atom);
> + if (__ofono_call_barring_is_busy(cb)) {
> + rsp->result.type = STK_RESULT_TYPE_TERMINAL_BUSY;
> + rsp->result.additional_len = sizeof(busy_on_ss_result);
> + rsp->result.additional = busy_on_ss_result;
> + return TRUE;
> + }
> + }
> +
> + if (cs_atom && __ofono_atom_get_registered(cs_atom)) {
> + cs = __ofono_atom_get_data(cs_atom);
> + if (__ofono_call_settings_is_busy(cs)) {
> + rsp->result.type = STK_RESULT_TYPE_TERMINAL_BUSY;
> + rsp->result.additional_len = sizeof(busy_on_ss_result);
> + rsp->result.additional = busy_on_ss_result;
> + return TRUE;
> + }
> + }
> +
> + if (!ussd_atom || !__ofono_atom_get_registered(ussd_atom)) {
> + rsp->result.type = STK_RESULT_TYPE_NOT_CAPABLE;
> + return TRUE;
> + }
> +
> + ussd = __ofono_atom_get_data(ussd_atom);
> +
> + if (__ofono_ussd_is_busy(ussd)) {
> + rsp->result.type = STK_RESULT_TYPE_TERMINAL_BUSY;
> + rsp->result.additional_len = sizeof(busy_on_ussd_result);
> + rsp->result.additional = busy_on_ussd_result;
> + return TRUE;
> + }
> +
> + err = __ofono_ussd_initiate(ussd, cmd->send_ussd.ussd_string.dcs,
> + cmd->send_ussd.ussd_string.string,
> + cmd->send_ussd.ussd_string.len,
> + send_ussd_callback, stk);
> +
> + if (err >= 0)
> + return FALSE;
> +
> + if (err == -ENOSYS) {
> + rsp->result.type = STK_RESULT_TYPE_NOT_CAPABLE;
> + return TRUE;
> + }
> +
> + if (cmd->send_ussd.alpha_id && cmd->send_ussd.alpha_id[0])
> + stk_alpha_id_set(stk, cmd->send_ussd.alpha_id);
> +
> + return FALSE;
> +}
> +
> static void stk_proactive_command_cancel(struct ofono_stk *stk)
> {
> if (stk->immediate_response)
> @@ -1740,7 +1876,10 @@ void ofono_stk_proactive_command_notify(struct
> ofono_stk *stk,
> respond = handle_command_set_up_call(stk->pending_cmd,
> &rsp, stk);
> break;
> -
> + case STK_COMMAND_TYPE_SEND_USSD:
> + respond = handle_command_send_ussd(stk->pending_cmd,
> + &rsp, stk);
> + break;
> default:
> rsp.result.type = STK_RESULT_TYPE_COMMAND_NOT_UNDERSTOOD;
> break;
Rest is looking fine to me.
Regards,
-Denis
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
