Hi Philippe,
On 06/28/2011 12:16 PM, Philippe Nunes wrote:
> stk: add modifications
> ---
> src/stk.c | 221
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 221 insertions(+), 0 deletions(-)
>
> diff --git a/src/stk.c b/src/stk.c
> index 9575f0e..4bf6a08 100644
> --- a/src/stk.c
> +++ b/src/stk.c
> @@ -41,6 +41,7 @@
> #include "smsutil.h"
> #include "stkutil.h"
> #include "stkagent.h"
> +#include "gprs.h"
> #include "util.h"
>
> static GSList *g_drivers = NULL;
> @@ -79,6 +80,13 @@ struct ofono_stk {
>
> __ofono_sms_sim_download_cb_t sms_pp_cb;
> void *sms_pp_userdata;
> + struct stk_channel channel;
> + struct ofono_gprs_primary_context context;
> + gsize tx_avail;
> + gboolean link_on_demand;
> + struct ofono_gprs *gprs;
> + struct stk_bearer_description bearer_desc;
> + enum stk_transport_protocol_type protocol;
Since BIP related stuff has quite a bit of parameters, can we group this
all into an anonymous structure here?
e.g. something like
...
struct {
..
..
} bip; or bip_data.
> };
>
> struct envelope_op {
> @@ -104,6 +112,12 @@ static void timers_update(struct ofono_stk *stk);
> result.additional_len = sizeof(addn_info); \
> result.additional = addn_info; \
>
> +/*
> + * Channel identifier is attributed by default to 1 since only one channel
> + * is open per time
> + */
> +#define DEFAULT_CHANNEL_ID 1
> +
> static int stk_respond(struct ofono_stk *stk, struct stk_response *rsp,
> ofono_stk_generic_cb_t cb)
> {
> @@ -532,6 +546,113 @@ static void stk_alpha_id_unset(struct ofono_stk *stk)
> stk_agent_request_cancel(stk->current_agent);
> }
>
> +static void ofono_stk_activate_context_cb(int error, const char *interface,
> + const char *ip,
> + void *data)
> +{
> +}
> +
> +static void stk_open_channel(struct ofono_stk *stk)
> +{
> + const struct stk_command_open_channel *oc;
> + struct stk_response rsp;
> + struct ofono_error failure = { .type = OFONO_ERROR_TYPE_FAILURE };
> + int err;
> +
> + if (stk->pending_cmd == NULL ||
> + stk->pending_cmd->type != STK_COMMAND_TYPE_OPEN_CHANNEL)
> + return;
Why do you feel the need to check this? If the command is canceled, then
this function should never be called, right?
> +
> + oc = &stk->pending_cmd->open_channel;
> +
> + memset(&rsp, 0, sizeof(rsp));
> + rsp.result.type = STK_RESULT_TYPE_SUCCESS;
> +
> + if (oc->data_dest_addr.type == STK_ADDRESS_IPV6) {
> + /*
> + * For now, only the bearer type "GPRS / UTRAN packet service /
> + * E-UTRAN" is supported.
> + * For such bearer, according 3GPP TS 31.111, the packet data
> + * protocol type is IP, so only IPv4 addresses are considered.
> + */
> + rsp.result.type = STK_RESULT_TYPE_NOT_CAPABLE;
> + goto out;
> + }
> +
> + stk->channel.id = DEFAULT_CHANNEL_ID;
> + stk->tx_avail = oc->buf_size;
> +
> + memset(&stk->context, 0, sizeof(stk->context));
> + stk->context.proto = OFONO_GPRS_PROTO_IP;
> +
> + if (oc->apn) {
> + if (strlen(oc->apn) > OFONO_GPRS_MAX_APN_LENGTH) {
> + rsp.result.type = STK_RESULT_TYPE_NOT_CAPABLE;
> + goto out;
> + }
doc/coding-style.txt item M1
> + strcpy(stk->context.apn, oc->apn);
> + }
> +
> + if (oc->text_usr) {
> + if (strlen(oc->text_usr) > OFONO_GPRS_MAX_APN_LENGTH) {
> + rsp.result.type = STK_RESULT_TYPE_NOT_CAPABLE;
> + goto out;
> + }
doc/coding-style.txt item M1
> + strcpy(stk->context.username, oc->text_usr);
> + }
> +
> + if (oc->text_passwd) {
> + if (strlen(oc->text_passwd) > OFONO_GPRS_MAX_APN_LENGTH) {
> + rsp.result.type = STK_RESULT_TYPE_NOT_CAPABLE;
> + goto out;
> + }
doc/coding-style.txt item M1
> + strcpy(stk->context.password, oc->text_passwd);
> + }
> +
> + memcpy(&stk->bearer_desc, &oc->bearer_desc,
> + sizeof(struct stk_bearer_description));
> + stk->protocol = oc->uti.protocol;
> + stk->link_on_demand = (stk->pending_cmd->qualifier &
> + STK_OPEN_CHANNEL_FLAG_IMMEDIATE) ? FALSE : TRUE;
> +
> + if (stk->link_on_demand) {
> + rsp.open_channel.channel.id = stk->channel.id;
> + rsp.open_channel.channel.status =
> + STK_CHANNEL_PACKET_DATA_SERVICE_NOT_ACTIVATED;
> + rsp.open_channel.buf_size = oc->buf_size;
> + goto out;
> + }
> +
> + err = __ofono_gprs_activate_context(stk->gprs, &stk->context,
> + ofono_stk_activate_context_cb, stk);
> +
> + if (err == -EBUSY) {
> + rsp.result.type = STK_RESULT_TYPE_BIP_ERROR;
> + goto out;
> + } else if (err < 0) {
> + rsp.result.type = STK_RESULT_TYPE_NOT_CAPABLE;
> + goto out;
> + }
> +
> + /* In background mode, send the terminal response now */
> + if (stk->pending_cmd->qualifier & STK_OPEN_CHANNEL_FLAG_BACKGROUND) {
> + rsp.open_channel.channel.id = stk->channel.id;
> + rsp.open_channel.channel.status =
> + STK_CHANNEL_PACKET_DATA_SERVICE_NOT_ACTIVATED;
> + rsp.open_channel.buf_size = oc->buf_size;
> + goto out;
> + }
> +
> + /* wait for the PDP context activation to send the Terminal Response */
> + return;
> +
> +out:
> + if (stk_respond(stk, &rsp, stk_command_cb))
> + stk_command_cb(&failure, stk);
> +
> +}
> +
> +
Why two empty lines?
> static int duration_to_msecs(const struct stk_duration *duration)
> {
> int msecs = duration->interval;
> @@ -2601,6 +2722,101 @@ static gboolean handle_command_launch_browser(const
> struct stk_command *cmd,
> return FALSE;
> }
>
> +static void confirm_open_channel_cb(enum stk_agent_result result,
> + gboolean confirm,
> + void *user_data)
> +{
> + struct ofono_stk *stk = user_data;
> +
> + switch (result) {
> + case STK_AGENT_RESULT_TIMEOUT:
> + confirm = FALSE;
> + /* Fall through */
> +
> + case STK_AGENT_RESULT_OK:
> + if (confirm)
> + break;
> +
> + send_simple_response(stk, STK_RESULT_TYPE_USER_REJECT);
> + return;
> +
> + case STK_AGENT_RESULT_TERMINATE:
> + default:
> + send_simple_response(stk, STK_RESULT_TYPE_USER_TERMINATED);
> + return;
> + }
> +
> + stk_open_channel(stk);
> +}
> +
> +static gboolean handle_command_open_channel(const struct stk_command *cmd,
> + struct stk_response *rsp,
> + struct ofono_stk *stk)
> +{
> + struct ofono_modem *modem = __ofono_atom_get_modem(stk->atom);
> + const struct stk_command_open_channel *oc = &cmd->open_channel;
> + struct ofono_atom *gprs_atom;
> + int err;
> +
> + /* Check first if channel is available */
> + if (stk->channel.id) {
> + unsigned char addnl_info[1];
> +
> + addnl_info[0] = STK_RESULT_ADDNL_BIP_PB_NO_CHANNEL_AVAIL;
> + ADD_ERROR_RESULT(rsp->result, STK_RESULT_TYPE_BIP_ERROR,
> + addnl_info);
> + return TRUE;
> + }
> +
> + gprs_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_GPRS);
> + if (gprs_atom == NULL || !__ofono_atom_get_registered(gprs_atom)) {
> + rsp->result.type = STK_RESULT_TYPE_NOT_CAPABLE;
> + return TRUE;
> + }
> +
> + stk->gprs = __ofono_atom_get_data(gprs_atom);
I suggest using find_modem again, and not storing this value here. In
general I'd like to keep the ofono_stk structure members to a minimum.
If you can obtain the info (easily) elsewhere, please do so.
> + stk->respond_on_exit = TRUE;
> + stk->cancel_cmd = stk_request_cancel;
> +
> + /*
> + * Don't ask for user confirmation if AID is a null data object
> + * or is not provided
> + */
> + if (oc->alpha_id && oc->alpha_id[0] != '\0') {
> + char *alpha_id;
> +
> + alpha_id = dbus_apply_text_attributes(oc->alpha_id,
> + &oc->text_attr);
> + if (alpha_id == NULL) {
> + rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD;
> + return TRUE;
> + }
> +
> + err = stk_agent_confirm_open_channel(stk->current_agent,
> + alpha_id,
> + &oc->icon_id,
> + confirm_open_channel_cb,
> + stk, NULL,
> + stk->timeout * 1000);
> + g_free(alpha_id);
> +
> + if (err < 0) {
> + unsigned char no_cause_result[] = { 0x00 };
> +
> + ADD_ERROR_RESULT(rsp->result,
> + STK_RESULT_TYPE_TERMINAL_BUSY,
> + no_cause_result);
> + return TRUE;
> + }
> +
> + return FALSE;
> + }
> +
> + stk_open_channel(stk);
> +
> + return FALSE;
> +}
> +
> static void stk_proactive_command_cancel(struct ofono_stk *stk)
> {
> if (stk->immediate_response)
> @@ -2794,6 +3010,11 @@ void ofono_stk_proactive_command_notify(struct
> ofono_stk *stk,
> &rsp, stk);
> break;
>
> + case STK_COMMAND_TYPE_OPEN_CHANNEL:
> + respond = handle_command_open_channel(stk->pending_cmd,
> + &rsp, stk);
> + break;
> +
> default:
> rsp.result.type = STK_RESULT_TYPE_COMMAND_NOT_UNDERSTOOD;
> break;
Regards,
-Denis
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
