* [PATCH 1/2] Internal and Driver API changes for Send USSD proactive command @ 2010-09-06 9:21 Jeevaka Badrappan 2010-09-06 9:21 ` [PATCH 2/2] stk and stkutil " Jeevaka Badrappan 2010-09-07 14:54 ` [PATCH 1/2] Internal and Driver API " Denis Kenzior 0 siblings, 2 replies; 8+ messages in thread From: Jeevaka Badrappan @ 2010-09-06 9:21 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 33666 bytes --] --- drivers/atmodem/atutil.c | 111 +++++++++++++++++++++++++++++++++++++ drivers/atmodem/atutil.h | 25 +++++++++ drivers/atmodem/ussd.c | 136 +++++++++++++++++++++++++++++++--------------- drivers/isimodem/ussd.c | 55 +++++++++++-------- include/types.h | 2 + include/ussd.h | 8 ++- plugins/atgen.c | 59 ++++++++++++++++++++ plugins/phonesim.c | 53 ++++++++++++++++++ src/call-barring.c | 5 ++ src/call-forwarding.c | 5 ++ src/call-settings.c | 5 ++ src/ofono.h | 26 +++++++++ src/smsutil.h | 6 +- src/ussd.c | 131 +++++++++++++++++++++++++++++++++++++++----- 14 files changed, 541 insertions(+), 86 deletions(-) diff --git a/drivers/atmodem/atutil.c b/drivers/atmodem/atutil.c index f566237..a3c3297 100644 --- a/drivers/atmodem/atutil.c +++ b/drivers/atmodem/atutil.c @@ -341,3 +341,114 @@ gboolean at_util_parse_sms_index_delivery(GAtResult *result, const char *prefix, return TRUE; } + +int at_util_charset_string_to_charset(const char *charsetstr) +{ + int charset = -1; + + if (!g_strcmp0(charsetstr, "GSM")) + charset = AT_UTIL_CHARSET_GSM; + else if (!g_strcmp0(charsetstr, "HEX")) + charset = AT_UTIL_CHARSET_HEX; + else if (!g_strcmp0(charsetstr, "IRA")) + charset = AT_UTIL_CHARSET_IRA; + else if (!g_strcmp0(charsetstr, "PCCP437")) + charset = AT_UTIL_CHARSET_PCCP437; + else if (!g_strcmp0(charsetstr, "PCDN")) + charset = AT_UTIL_CHARSET_PCDN; + else if (!g_strcmp0(charsetstr, "UCS2")) + charset = AT_UTIL_CHARSET_UCS2; + else if (!g_strcmp0(charsetstr, "UTF-8")) + charset = AT_UTIL_CHARSET_UTF8; + else if (!g_strcmp0(charsetstr, "8859-1")) + charset = AT_UTIL_CHARSET_8859_1; + else if (!g_strcmp0(charsetstr, "8859-2")) + charset = AT_UTIL_CHARSET_8859_2; + else if (!g_strcmp0(charsetstr, "8859-3")) + charset = AT_UTIL_CHARSET_8859_3; + else if (!g_strcmp0(charsetstr, "8859-4")) + charset = AT_UTIL_CHARSET_8859_4; + else if (!g_strcmp0(charsetstr, "8859-5")) + charset = AT_UTIL_CHARSET_8859_5; + else if (!g_strcmp0(charsetstr, "8859-6")) + charset = AT_UTIL_CHARSET_8859_6; + else if (!g_strcmp0(charsetstr, "8859-C")) + charset = AT_UTIL_CHARSET_8859_C; + else if (!g_strcmp0(charsetstr, "8859-A")) + charset = AT_UTIL_CHARSET_8859_A; + else if (!g_strcmp0(charsetstr, "8859-G")) + charset = AT_UTIL_CHARSET_8859_G; + else if (!g_strcmp0(charsetstr, "8859-H")) + charset = AT_UTIL_CHARSET_8859_H; + + return charset; +} + +gboolean at_util_parse_charsets(GAtResult *result, int *supported) +{ + GAtResultIter iter; + const char *charset; + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "+CSCS:")) + return FALSE; + + /* Some modems don't report CSCS in a proper list */ + g_at_result_iter_open_list(&iter); + + while (g_at_result_iter_next_string(&iter, &charset)) { + if (!g_strcmp0(charset, "GSM")) + *supported |= AT_UTIL_CHARSET_GSM; + else if (!g_strcmp0(charset, "HEX")) + *supported |= AT_UTIL_CHARSET_HEX; + else if (!g_strcmp0(charset, "IRA")) + *supported |= AT_UTIL_CHARSET_IRA; + else if (!g_strcmp0(charset, "PCCP437")) + *supported |= AT_UTIL_CHARSET_PCCP437; + else if (!g_strcmp0(charset, "PCDN")) + *supported |= AT_UTIL_CHARSET_PCDN; + else if (!g_strcmp0(charset, "UCS2")) + *supported |= AT_UTIL_CHARSET_UCS2; + else if (!g_strcmp0(charset, "UTF-8")) + *supported |= AT_UTIL_CHARSET_UTF8; + else if (!g_strcmp0(charset, "8859-1")) + *supported |= AT_UTIL_CHARSET_8859_1; + else if (!g_strcmp0(charset, "8859-2")) + *supported |= AT_UTIL_CHARSET_8859_2; + else if (!g_strcmp0(charset, "8859-3")) + *supported |= AT_UTIL_CHARSET_8859_3; + else if (!g_strcmp0(charset, "8859-4")) + *supported |= AT_UTIL_CHARSET_8859_4; + else if (!g_strcmp0(charset, "8859-5")) + *supported |= AT_UTIL_CHARSET_8859_5; + else if (!g_strcmp0(charset, "8859-6")) + *supported |= AT_UTIL_CHARSET_8859_6; + else if (!g_strcmp0(charset, "8859-C")) + *supported |= AT_UTIL_CHARSET_8859_C; + else if (!g_strcmp0(charset, "8859-A")) + *supported |= AT_UTIL_CHARSET_8859_A; + else if (!g_strcmp0(charset, "8859-G")) + *supported |= AT_UTIL_CHARSET_8859_G; + else if (!g_strcmp0(charset, "8859-H")) + *supported |= AT_UTIL_CHARSET_8859_H; + } + + g_at_result_iter_close_list(&iter); + + return TRUE; +} + +const char *at_util_parse_read_charset(GAtResult *result) +{ + GAtResultIter iter; + const char *str; + + g_at_result_iter_init(&iter, result); + + if (!g_at_result_iter_next(&iter, "+CSCS:")) + return NULL; + + g_at_result_iter_next_string(&iter, &str); + return str; +} diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h index 9e0a84b..4bc30fa 100644 --- a/drivers/atmodem/atutil.h +++ b/drivers/atmodem/atutil.h @@ -27,6 +27,27 @@ enum at_util_sms_store { AT_UTIL_SMS_STORE_BM = 4, }; +/* 3GPP TS 27.007 Release 8 Section 5.5 */ +enum at_util_charset { + AT_UTIL_CHARSET_GSM = 0, + AT_UTIL_CHARSET_HEX = 1, + AT_UTIL_CHARSET_IRA = 2, + AT_UTIL_CHARSET_PCCP437 = 3, + AT_UTIL_CHARSET_PCDN = 4, + AT_UTIL_CHARSET_UCS2 = 5, + AT_UTIL_CHARSET_UTF8 = 6, + AT_UTIL_CHARSET_8859_1 = 7, + AT_UTIL_CHARSET_8859_2 = 8, + AT_UTIL_CHARSET_8859_3 = 9, + AT_UTIL_CHARSET_8859_4 = 10, + AT_UTIL_CHARSET_8859_5 = 11, + AT_UTIL_CHARSET_8859_6 = 12, + AT_UTIL_CHARSET_8859_C = 13, + AT_UTIL_CHARSET_8859_A = 14, + AT_UTIL_CHARSET_8859_G = 15, + AT_UTIL_CHARSET_8859_H = 16, +}; + void decode_at_error(struct ofono_error *error, const char *final); gint at_util_call_compare_by_status(gconstpointer a, gconstpointer b); gint at_util_call_compare_by_phone_number(gconstpointer a, gconstpointer b); @@ -46,6 +67,10 @@ gboolean at_util_parse_sms_index_delivery(GAtResult *result, const char *prefix, enum at_util_sms_store *store, int *index); +int at_util_charset_string_to_charset(const char *charset); +gboolean at_util_parse_charsets(GAtResult *result, int *supported); +const char *at_util_parse_read_charset(GAtResult *result); + struct cb_data { void *cb; void *data; diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c index 1e1fc25..d3531bb 100644 --- a/drivers/atmodem/ussd.c +++ b/drivers/atmodem/ussd.c @@ -44,23 +44,39 @@ static const char *cusd_prefix[] = { "+CUSD:", NULL }; static const char *none_prefix[] = { NULL }; +static const char *cscs_prefix[] = { "+CSCS:", NULL }; struct ussd_data { GAtChat *chat; unsigned int vendor; + int charset; }; +static void read_charset_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct ussd_data *data = user_data; + const char *charset = NULL; + + if (!ok) + return; + + charset = at_util_parse_read_charset(result); + + if (charset) + data->charset = at_util_charset_string_to_charset(charset); +} + static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) { GAtResultIter iter; int status; - int dcs; const char *content; - char *converted = NULL; - gboolean udhi; + char *msg = NULL; + long msg_len = 0; + int dcs; + struct ussd_data *data = ofono_ussd_get_data(ussd); enum sms_charset charset; - gboolean compressed; - gboolean iso639; g_at_result_iter_init(&iter, result); @@ -73,34 +89,46 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) if (!g_at_result_iter_next_string(&iter, &content)) goto out; - if (g_at_result_iter_next_number(&iter, &dcs)) { - if (!cbs_dcs_decode(dcs, &udhi, NULL, &charset, - &compressed, NULL, &iso639)) - goto out; - - if (udhi || compressed || iso639) - goto out; - } else - charset = SMS_CHARSET_7BIT; + if (!g_at_result_iter_next_number(&iter, &dcs)) + goto out; - if (charset == SMS_CHARSET_7BIT) - converted = convert_gsm_to_utf8((const guint8 *) content, - strlen(content), NULL, NULL, 0); + if (!cbs_dcs_decode(dcs, NULL, NULL, &charset, NULL, NULL, NULL)) + goto out; - else if (charset == SMS_CHARSET_8BIT) { - /* TODO: Figure out what to do with 8 bit data */ + if (charset == SMS_CHARSET_7BIT) { + switch (data->charset) { + case AT_UTIL_CHARSET_GSM: + msg = convert_gsm_to_utf8((const guint8 *) content, + strlen(content), NULL, &msg_len, 0); + break; + case AT_UTIL_CHARSET_PCCP437: + case AT_UTIL_CHARSET_PCDN: + case AT_UTIL_CHARSET_8859_1: + case AT_UTIL_CHARSET_IRA: + default: + DBG("charset:%d not supported", data->charset); + status = 4; /* Not supported */ + } + } else if (charset == SMS_CHARSET_8BIT) { + /* MT/TA converts each 8 bit octet into two IRA character + * long hexadecimal number (e.g. octet with integer value 42 + * is presented to TE as two characters 2A (IRA 50 and 65)) + */ ofono_error("8-bit coded USSD response received"); status = 4; /* Not supported */ - } else { - /* No other encoding is mentioned in TS27007 7.15 */ + } else { + /* No other encoding is mentioned in TS27.007 7.15 */ ofono_error("Unsupported USSD data coding scheme (%02x)", dcs); status = 4; /* Not supported */ } out: - ofono_ussd_notify(ussd, status, converted); + if (!msg || !msg_len) + status = OFONO_USSD_STATUS_NOTIFY; - g_free(converted); + ofono_ussd_notify(ussd, status, -1, (const guint8 *) msg, (int) msg_len); + + g_free(msg); } static void cusd_request_cb(gboolean ok, GAtResult *result, gpointer user_data) @@ -117,14 +145,17 @@ static void cusd_request_cb(gboolean ok, GAtResult *result, gpointer user_data) cusd_parse(result, ussd); } -static void at_ussd_request(struct ofono_ussd *ussd, const char *str, - ofono_ussd_cb_t cb, void *user_data) +static void at_ussd_request(struct ofono_ussd *ussd, int dcs, + const unsigned char *str, int str_len, + ofono_ussd_cb_t cb, void *user_data) { struct ussd_data *data = ofono_ussd_get_data(ussd); struct cb_data *cbd = cb_data_new(cb, user_data); + int dcs_value = 0x0f; // GSM 7 bit default alphabet unsigned char *converted = NULL; - int dcs; - int max_len; + unsigned char coded_str[256]; + long coded_str_len; + long num_packed; long written; char buf[256]; @@ -133,40 +164,53 @@ static void at_ussd_request(struct ofono_ussd *ussd, const char *str, cbd->user = ussd; - converted = convert_utf8_to_gsm(str, strlen(str), NULL, &written, 0); + if (dcs == -1) { + converted = convert_utf8_to_gsm((const char *) str, str_len, NULL, &written, 0); - if (!converted) - goto error; - else { - dcs = 15; - max_len = 182; - } + if (!converted) + goto error; - if (written > max_len) - goto error; + /* As per 3GPP TS 23.038, When this character set is used, + * the characters of the message are packed in octets as shown in section 6.1.2.1.1, + * and the message can consist of up to 160 characters. + */ + pack_7bit_own_buf(converted, written, 0, TRUE, + &num_packed, 0, coded_str); - snprintf(buf, sizeof(buf), "AT+CUSD=1,\"%.*s\",%d", - (int) written, converted, dcs); + g_free(converted); + converted = NULL; + coded_str_len = num_packed; - g_free(converted); - converted = NULL; + if (coded_str_len > OFONO_MAX_USSD_LENGTH) + goto error; + } else { + if (str_len > OFONO_MAX_USSD_LENGTH) + goto error; + + memcpy(coded_str, str, str_len); + coded_str_len = str_len; + dcs_value = dcs; + } + + snprintf(buf, sizeof(buf), "AT+CUSD=1,\"%.*s\",%d", + (int) coded_str_len, coded_str, dcs_value); if (data->vendor == OFONO_VENDOR_QUALCOMM_MSM) { /* Ensure that the modem is using GSM character set. It * seems it defaults to IRA and then umlauts are not * properly encoded. The modem returns some weird from - * of Latin-1, but it is not really Latin-1 either. */ + * of Latin-1, but it is not really Latin-1 either. + */ g_at_chat_send(data->chat, "AT+CSCS=\"GSM\"", none_prefix, - NULL, NULL, NULL); + NULL, NULL, NULL); } if (g_at_chat_send(data->chat, buf, cusd_prefix, - cusd_request_cb, cbd, g_free) > 0) + cusd_request_cb, cbd, g_free) > 0) return; error: g_free(cbd); - g_free(converted); CALLBACK_WITH_FAILURE(cb, user_data); } @@ -244,9 +288,13 @@ static int at_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor, data = g_new0(struct ussd_data, 1); data->chat = g_at_chat_clone(chat); data->vendor = vendor; + data->charset = -1; ofono_ussd_set_data(ussd, data); + g_at_chat_send(chat, "AT+CSCS?", cscs_prefix, read_charset_cb, data, + NULL); + g_at_chat_send(chat, "AT+CUSD=1", NULL, at_ussd_register, ussd, NULL); return 0; diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c index 330a141..c02fc55 100644 --- a/drivers/isimodem/ussd.c +++ b/drivers/isimodem/ussd.c @@ -74,7 +74,9 @@ static void ussd_parse(struct ofono_ussd *ussd, const void *restrict data, { const unsigned char *msg = data; int status = OFONO_USSD_STATUS_NOT_SUPPORTED; - char *converted = NULL; + int msg_len = 0; + int dcs = -1; + unsigned char *coded_msg = NULL; if (!msg || len < 4) goto out; @@ -84,14 +86,11 @@ static void ussd_parse(struct ofono_ussd *ussd, const void *restrict data, if (msg[3] == 0 || (size_t)(msg[3] + 4) > len) goto out; - converted = ussd_decode(msg[1], msg[3], msg + 4); - - if (converted) - status = OFONO_USSD_STATUS_NOTIFY; - + dcs = msg[1]; + msg_len = msg[3]; + coded_msg = (guint8 *) msg+4; out: - ofono_ussd_notify(ussd, status, converted); - g_free(converted); + ofono_ussd_notify(ussd, status, dcs, coded_msg, msg_len); } @@ -129,7 +128,7 @@ error: } static GIsiRequest *ussd_send(GIsiClient *client, - uint8_t *str, size_t len, + int dcs, uint8_t *str, size_t len, void *data, GDestroyNotify notify) { const uint8_t msg[] = { @@ -138,7 +137,7 @@ static GIsiRequest *ussd_send(GIsiClient *client, 0x01, /* subblock count */ SS_GSM_USSD_STRING, 4 + len + 3, /* subblock length */ - 0x0f, /* DCS */ + dcs, /* DCS */ len, /* string length */ /* USSD string goes here */ }; @@ -152,8 +151,9 @@ static GIsiRequest *ussd_send(GIsiClient *client, ussd_send_resp_cb, data, notify); } -static void isi_request(struct ofono_ussd *ussd, const char *str, - ofono_ussd_cb_t cb, void *data) +static void isi_request(struct ofono_ussd *ussd, int dcs, + const unsigned char *str, int str_len, + ofono_ussd_cb_t cb, void *data) { struct ussd_data *ud = ofono_ussd_get_data(ussd); struct isi_cb_data *cbd = isi_cb_data_new(ussd, cb, data); @@ -162,24 +162,35 @@ static void isi_request(struct ofono_ussd *ussd, const char *str, unsigned char *converted = NULL; long num_packed; long written; + int dcs_value = 0x0f; // GSM 7 bit default alphabet if (!cbd) goto error; - converted = convert_utf8_to_gsm(str, strlen(str), NULL, &written, 0); - if (!converted) - goto error; + if (dcs == -1) { + converted = convert_utf8_to_gsm((const char *) str, str_len, NULL, &written, 0); - packed = pack_7bit_own_buf(converted, written, 0, TRUE, - &num_packed, 0, buf); + if (!converted) + goto error; - g_free(converted); + packed = pack_7bit_own_buf(converted, written, 0, TRUE, + &num_packed, 0, buf); - if (written > SS_MAX_USSD_LENGTH) - goto error; + g_free(converted); - if (ussd_send(ud->client, packed, num_packed, cbd, g_free)) - return; + if (written > SS_MAX_USSD_LENGTH) + goto error; + + if (ussd_send(ud->client, dcs_value, packed, num_packed, cbd, g_free)) + return; + } else { + dcs_value = dcs; + if (str_len > SS_MAX_USSD_LENGTH) + goto error; + + if (ussd_send(ud->client, dcs_value, (guint8 *) str, str_len, cbd, g_free)) + return; + } error: CALLBACK_WITH_FAILURE(cb, data); diff --git a/include/types.h b/include/types.h index 6098cba..e25ff02 100644 --- a/include/types.h +++ b/include/types.h @@ -77,6 +77,8 @@ struct ofono_error { }; #define OFONO_MAX_PHONE_NUMBER_LENGTH 20 +#define OFONO_MAX_USSD_LENGTH 160 + struct ofono_phone_number { char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1]; diff --git a/include/ussd.h b/include/ussd.h index 96e04cb..e3b43f7 100644 --- a/include/ussd.h +++ b/include/ussd.h @@ -45,13 +45,15 @@ struct ofono_ussd_driver { const char *name; int (*probe)(struct ofono_ussd *ussd, unsigned int vendor, void *data); void (*remove)(struct ofono_ussd *ussd); - void (*request)(struct ofono_ussd *ussd, const char *str, - ofono_ussd_cb_t, void *data); + void (*request)(struct ofono_ussd *ussd, int dcs, + const unsigned char *str, int str_len, + ofono_ussd_cb_t, void *data); void (*cancel)(struct ofono_ussd *ussd, ofono_ussd_cb_t cb, void *data); }; -void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str); +void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, + const unsigned char *str, int str_len); int ofono_ussd_driver_register(const struct ofono_ussd_driver *d); void ofono_ussd_driver_unregister(const struct ofono_ussd_driver *d); diff --git a/plugins/atgen.c b/plugins/atgen.c index a6eee60..8d54c0a 100644 --- a/plugins/atgen.c +++ b/plugins/atgen.c @@ -25,6 +25,8 @@ #include <errno.h> #include <stdlib.h> +#include <string.h> +#include <stdio.h> #include <glib.h> #include <gatchat.h> @@ -50,10 +52,14 @@ #include <ofono/voicecall.h> #include <drivers/atmodem/sim-poll.h> +#include <drivers/atmodem/atutil.h> #include <ofono/gprs.h> #include <ofono/gprs-context.h> +static const char *none_prefix[] = { NULL }; +static const char *cscs_prefix[] = { "+CSCS:", NULL }; + static const char *tty_opts[] = { "Baud", "Read", @@ -66,6 +72,57 @@ static const char *tty_opts[] = { NULL, }; +static const char *best_charset(int supported) +{ + const char *charset = "Invalid"; + + if (supported & AT_UTIL_CHARSET_GSM) + charset = "GSM"; + + if (supported & AT_UTIL_CHARSET_UTF8) + charset = "UTF-8"; + + return charset; +} + +static void set_charset_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + if (!ok) + ofono_error("Setting character set failed"); +} + +static void list_charsets_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct ofono_modem *modem = user_data; + GAtChat *chat = ofono_modem_get_data(modem); + const char *charset; + int supported = 0; + char buf[32]; + + if (!ok) + return; + + if (!at_util_parse_charsets(result, &supported)) + return; + + charset = best_charset(supported); + snprintf(buf, sizeof(buf), "AT+CSCS=\"%s\"", charset); + + if( !g_at_chat_send(chat, buf, none_prefix, set_charset_cb, modem, NULL)) + ofono_error("AT+CSCS=%s request failed", charset); +} + +static void list_charsets(struct ofono_modem *modem) +{ + GAtChat *chat = ofono_modem_get_data(modem); + + if (!g_at_chat_send(chat, "AT+CSCS=?", cscs_prefix, + list_charsets_cb, modem, NULL) > 0) + ofono_error("AT+CSCS=? request failed"); +} + static int atgen_probe(struct ofono_modem *modem) { return 0; @@ -172,6 +229,8 @@ static void atgen_pre_sim(struct ofono_modem *modem) if (sim) ofono_sim_inserted_notify(sim, TRUE); + + list_charsets(modem); } static void atgen_post_sim(struct ofono_modem *modem) diff --git a/plugins/phonesim.c b/plugins/phonesim.c index d3caa20..7c20786 100644 --- a/plugins/phonesim.c +++ b/plugins/phonesim.c @@ -64,6 +64,7 @@ #include <drivers/atmodem/atutil.h> static const char *none_prefix[] = { NULL }; +static const char *cscs_prefix[] = { "+CSCS:", NULL }; struct phonesim_data { GAtMux *mux; @@ -72,6 +73,56 @@ struct phonesim_data { gboolean use_mux; }; +static const char *best_charset(int supported) +{ + const char *charset = "Invalid"; + + if (supported & AT_UTIL_CHARSET_UCS2) + charset = "UCS2"; + + if (supported & AT_UTIL_CHARSET_GSM) + charset = "GSM"; + + return charset; +} + +static void set_charset_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + if (!ok) + ofono_error("Setting character set failed"); +} + +static void list_charsets_cb(gboolean ok, GAtResult *result, + gpointer user_data) +{ + struct ofono_modem *modem = user_data; + struct phonesim_data *data = ofono_modem_get_data(modem); + const char *charset; + int supported = 0; + char buf[32]; + + if (!ok) + return; + + if (!at_util_parse_charsets(result, &supported)) + return; + + charset = best_charset(supported); + snprintf(buf, sizeof(buf), "AT+CSCS=\"%s\"", charset); + + if (!g_at_chat_send(data->chat, buf, none_prefix, set_charset_cb, modem, NULL)) + ofono_error("Setting charset: %s failed", charset); + } + +static void list_charsets(struct ofono_modem *modem) +{ + struct phonesim_data *data = ofono_modem_get_data(modem); + if (!g_at_chat_send(data->chat, "AT+CSCS=?", cscs_prefix, + list_charsets_cb, modem, NULL)) + ofono_error("AT+CSCS=? request failed"); +} + static int phonesim_probe(struct ofono_modem *modem) { struct phonesim_data *data; @@ -321,6 +372,8 @@ static void phonesim_pre_sim(struct ofono_modem *modem) if (sim) ofono_sim_inserted_notify(sim, TRUE); + + list_charsets(modem); } static void phonesim_post_sim(struct ofono_modem *modem) diff --git a/src/call-barring.c b/src/call-barring.c index 7607f3f..a0ac689 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -580,6 +580,11 @@ static void cb_unregister_ss_controls(struct ofono_call_barring *cb) __ofono_ussd_passwd_unregister(cb->ussd, "353"); } +gboolean __ofono_call_barring_is_busy(struct ofono_call_barring *cb) +{ + return cb->pending ? TRUE : FALSE; +} + static inline void cb_append_property(struct ofono_call_barring *cb, DBusMessageIter *dict, int start, int end, int cls, const char *property) diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 4e77144..3e9265b 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -1092,6 +1092,11 @@ static void cf_unregister_ss_controls(struct ofono_call_forwarding *cf) __ofono_ussd_ssc_unregister(cf->ussd, "004"); } +gboolean __ofono_call_forwarding_is_busy(struct ofono_call_forwarding *cf) +{ + return cf->pending ? TRUE : FALSE; +} + int ofono_call_forwarding_driver_register(const struct ofono_call_forwarding_driver *d) { DBG("driver: %p, name: %s", d, d->name); diff --git a/src/call-settings.c b/src/call-settings.c index ab20062..9c536e9 100644 --- a/src/call-settings.c +++ b/src/call-settings.c @@ -778,6 +778,11 @@ static void cs_unregister_ss_controls(struct ofono_call_settings *cs) __ofono_ussd_ssc_unregister(cs->ussd, "77"); } +gboolean __ofono_call_settings_is_busy(struct ofono_call_settings *cs) +{ + return cs->pending ? TRUE : FALSE; +} + static DBusMessage *generate_get_properties_reply(struct ofono_call_settings *cs, DBusMessage *msg) { diff --git a/src/ofono.h b/src/ofono.h index d95f2f2..43368d5 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -163,9 +163,18 @@ gboolean __ofono_modem_remove_atom_watch(struct ofono_modem *modem, void __ofono_atom_free(struct ofono_atom *atom); #include <ofono/call-barring.h> + +gboolean __ofono_call_barring_is_busy(struct ofono_call_barring *cb); + #include <ofono/call-forwarding.h> + +gboolean __ofono_call_forwarding_is_busy(struct ofono_call_forwarding *cf); + #include <ofono/call-meter.h> #include <ofono/call-settings.h> + +gboolean __ofono_call_settings_is_busy(struct ofono_call_settings *cs); + #include <ofono/cbs.h> #include <ofono/devinfo.h> #include <ofono/phonebook.h> @@ -235,6 +244,13 @@ gboolean __ofono_ssn_mt_watch_remove(struct ofono_ssn *ssn, int id); #include <ofono/ussd.h> +enum ofono_ussd_failure{ + OFONO_USSD_FAILURE_NONE = 0x0, + OFONO_USSD_FAILURE_USER_TERMINATED, + OFONO_USSD_FAILURE_RETURN_ERROR, + OFONO_USSD_FAILURE_TIMED_OUT, +}; + typedef gboolean (*ofono_ussd_ssc_cb_t)(int type, const char *sc, const char *sia, const char *sib, @@ -245,6 +261,10 @@ typedef gboolean (*ofono_ussd_passwd_cb_t)(const char *sc, const char *old, const char *new, DBusMessage *msg, void *data); +typedef void (*ofono_ussd_request_cb_t)(int error, int dcs, + const unsigned char *str, + int str_len, void *data); + gboolean __ofono_ussd_ssc_register(struct ofono_ussd *ussd, const char *sc, ofono_ussd_ssc_cb_t cb, void *data, ofono_destroy_func destroy); @@ -255,6 +275,12 @@ gboolean __ofono_ussd_passwd_register(struct ofono_ussd *ussd, const char *sc, ofono_destroy_func destroy); void __ofono_ussd_passwd_unregister(struct ofono_ussd *ussd, const char *sc); +gboolean __ofono_ussd_is_busy(struct ofono_ussd *ussd); + +int __ofono_ussd_initiate(struct ofono_ussd *ussd, int dcs, + const unsigned char *str, int str_len, + ofono_ussd_request_cb_t cb, void *user_data); + #include <ofono/netreg.h> typedef void (*ofono_netreg_status_notify_cb_t)(int status, int lac, int ci, diff --git a/src/smsutil.h b/src/smsutil.h index 3c6b3ae..a29dbb3 100644 --- a/src/smsutil.h +++ b/src/smsutil.h @@ -148,9 +148,9 @@ enum sms_class { }; enum sms_charset { - SMS_CHARSET_7BIT = 0, - SMS_CHARSET_8BIT = 1, - SMS_CHARSET_UCS2 = 2, + SMS_CHARSET_7BIT = 0x00, + SMS_CHARSET_8BIT = 0x04, + SMS_CHARSET_UCS2 = 0x08, }; enum sms_mwi_type { diff --git a/src/ussd.c b/src/ussd.c index 825d560..465272c 100644 --- a/src/ussd.c +++ b/src/ussd.c @@ -34,6 +34,7 @@ #include "ofono.h" #include "common.h" +#include "smsutil.h" #define SUPPLEMENTARY_SERVICES_INTERFACE "org.ofono.SupplementaryServices" @@ -46,6 +47,15 @@ enum ussd_state { USSD_STATE_RESPONSE_SENT, }; +struct ussd_request { + struct ofono_ussd *ussd; + int dcs; + unsigned char *str; + int str_len; + ofono_ussd_request_cb_t cb; + void *user_data; +}; + struct ofono_ussd { int state; DBusMessage *pending; @@ -56,6 +66,7 @@ struct ofono_ussd { const struct ofono_ussd_driver *driver; void *driver_data; struct ofono_atom *atom; + struct ussd_request *req; }; struct ssc_entry { @@ -306,15 +317,55 @@ static void ussd_change_state(struct ofono_ussd *ussd, int state) "State", DBUS_TYPE_STRING, &value); } -void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) +static void ussd_request_finish(struct ofono_ussd *ussd, int error, int dcs, + const unsigned char *str, int str_len) +{ + struct ussd_request *req = ussd->req; + + if (req && req->cb) { + req->cb(error, dcs, str, str_len, req->user_data); + g_free(req->str); + g_free(req); + ussd->req = NULL; + } +} + +static int ussd_status_to_failure_code(int status) +{ + switch (status) { + case OFONO_USSD_STATUS_TIMED_OUT: + return OFONO_USSD_FAILURE_TIMED_OUT; + case OFONO_USSD_STATUS_NOT_SUPPORTED: + return OFONO_USSD_FAILURE_RETURN_ERROR; + } + + return OFONO_USSD_FAILURE_NONE; +} + +void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, + const unsigned char *str, int str_len) { DBusConnection *conn = ofono_dbus_get_connection(); const char *ussdstr = "USSD"; + const char *utf8_str = NULL; const char sig[] = { DBUS_TYPE_STRING, 0 }; DBusMessage *reply; DBusMessageIter iter; DBusMessageIter variant; + if (ussd->req && + (status == OFONO_USSD_STATUS_NOTIFY || + status == OFONO_USSD_STATUS_TERMINATED || + status == OFONO_USSD_STATUS_TIMED_OUT || + status == OFONO_USSD_STATUS_NOT_SUPPORTED)) { + + ussd_request_finish(ussd, ussd_status_to_failure_code(status), + dcs, str, str_len); + + ussd_change_state(ussd, USSD_STATE_IDLE); + return; + } + if (status == OFONO_USSD_STATUS_NOT_SUPPORTED) { ussd_change_state(ussd, USSD_STATE_IDLE); @@ -334,15 +385,24 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) reply = __ofono_error_timed_out(ussd->pending); goto out; } + + if (str) { + if (dcs == -1) + utf8_str = (const char *) str; + else + utf8_str = ussd_decode(dcs, str_len, str); + } + + if (!utf8_str) { + utf8_str = ""; + status = OFONO_USSD_STATUS_NOTIFY; + } /* TODO: Rework this in the Agent framework */ if (ussd->state == USSD_STATE_ACTIVE) { reply = dbus_message_new_method_return(ussd->pending); - if (!str) - str = ""; - dbus_message_iter_init_append(reply, &iter); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, @@ -352,7 +412,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) &variant); dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING, - &str); + &utf8_str); dbus_message_iter_close_container(&iter, &variant); @@ -364,10 +424,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) } else if (ussd->state == USSD_STATE_RESPONSE_SENT) { reply = dbus_message_new_method_return(ussd->pending); - if (!str) - str = ""; - - dbus_message_append_args(reply, DBUS_TYPE_STRING, &str, + dbus_message_append_args(reply, DBUS_TYPE_STRING, &utf8_str, DBUS_TYPE_INVALID); if (status == OFONO_USSD_STATUS_ACTION_REQUIRED) @@ -387,9 +444,6 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) signal_name = "NotificationReceived"; } - if (!str) - str = ""; - g_dbus_emit_signal(conn, path, SUPPLEMENTARY_SERVICES_INTERFACE, signal_name, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID); @@ -436,6 +490,7 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg, { struct ofono_ussd *ussd = data; const char *str; + int dcs = -1; if (ussd->pending) return __ofono_error_busy(msg); @@ -465,7 +520,8 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg, ussd->pending = dbus_message_ref(msg); - ussd->driver->request(ussd, str, ussd_callback, ussd); + ussd->driver->request(ussd, dcs, (const guint8 *) str, strlen(str), + ussd_callback, ussd); return NULL; } @@ -496,6 +552,7 @@ static DBusMessage *ussd_respond(DBusConnection *conn, DBusMessage *msg, { struct ofono_ussd *ussd = data; const char *str; + int dcs = -1; if (ussd->pending) return __ofono_error_busy(msg); @@ -515,7 +572,8 @@ static DBusMessage *ussd_respond(DBusConnection *conn, DBusMessage *msg, ussd->pending = dbus_message_ref(msg); - ussd->driver->request(ussd, str, ussd_response_callback, ussd); + ussd->driver->request(ussd, dcs, (const guint8 *) str, strlen(str), + ussd_response_callback, ussd); return NULL; } @@ -543,6 +601,9 @@ static void ussd_cancel_callback(const struct ofono_error *error, void *data) reply = dbus_message_new_method_return(ussd->cancel); __ofono_dbus_pending_reply(&ussd->cancel, reply); + if (ussd->req) + ussd_request_finish(ussd, -1, USSD_STATE_USER_ACTION, NULL, -1); + ussd_change_state(ussd, USSD_STATE_IDLE); } @@ -741,3 +802,45 @@ void *ofono_ussd_get_data(struct ofono_ussd *ussd) { return ussd->driver_data; } + +static void ussd_request_callback(const struct ofono_error *error, void *data) +{ + struct ofono_ussd *ussd = data; + + if (error->type != OFONO_ERROR_TYPE_NO_ERROR) + ussd_request_finish(ussd, OFONO_USSD_FAILURE_RETURN_ERROR, -1, NULL, -1); + else + ussd_change_state(ussd,USSD_STATE_ACTIVE); +} + +gboolean __ofono_ussd_is_busy(struct ofono_ussd *ussd) +{ + if (ussd->pending || ussd->state != USSD_STATE_IDLE || ussd->req) + return TRUE; + + return FALSE; +} + +int __ofono_ussd_initiate(struct ofono_ussd *ussd, int dcs, + const unsigned char *str, int str_len, + ofono_ussd_request_cb_t cb, void *user_data) +{ + struct ussd_request *req; + + if (!ussd->driver->request) + return -ENOSYS; + + req = g_try_new0(struct ussd_request, 1); + req->dcs = dcs; + req->str = g_memdup(str, str_len); + req->str_len = str_len; + req->cb = cb; + req->user_data = user_data; + + ussd->req = req; + + ussd->driver->request(ussd, dcs, str, str_len, ussd_request_callback, + ussd); + + return 0; +} -- 1.7.0.4 ---------------------------------------------------------------- Please note: This e-mail may contain confidential information intended solely for the addressee. If you have received this e-mail in error, please do not disclose it to anyone, notify the sender promptly, and delete the message from your system. Thank you. ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] stk and stkutil changes for Send USSD proactive command 2010-09-06 9:21 [PATCH 1/2] Internal and Driver API changes for Send USSD proactive command Jeevaka Badrappan @ 2010-09-06 9:21 ` Jeevaka Badrappan 2010-09-06 23:54 ` Andrzej Zaborowski 2010-09-07 14:58 ` [PATCH 2/2] stk and stkutil changes for Send USSD proactive command Denis Kenzior 2010-09-07 14:54 ` [PATCH 1/2] Internal and Driver API " Denis Kenzior 1 sibling, 2 replies; 8+ messages in thread From: Jeevaka Badrappan @ 2010-09-06 9:21 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 8834 bytes --] --- src/stk.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- src/stkutil.c | 22 +++++++++ src/stkutil.h | 13 +++++ 3 files changed, 169 insertions(+), 3 deletions(-) diff --git a/src/stk.c b/src/stk.c index 3fda2af..5d84141 100644 --- a/src/stk.c +++ b/src/stk.c @@ -56,10 +56,8 @@ struct ofono_stk { void (*cancel_cmd)(struct ofono_stk *stk); GQueue *envelope_q; DBusMessage *pending; - struct stk_timer timers[8]; guint timers_source; - int timeout; int short_timeout; struct stk_agent *session_agent; @@ -1590,6 +1588,136 @@ 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)) + rsp.send_ussd.text.dcs = -1; + else + rsp.send_ussd.text.dcs = charset; + + 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; + } + } + + 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 +1868,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; diff --git a/src/stkutil.c b/src/stkutil.c index ae4cc32..48d409b 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -4170,6 +4170,22 @@ static gboolean build_dataobj_text(struct stk_tlv_builder *tlv, return stk_tlv_builder_close_container(tlv); } +/* Defined in TS 102.223 Section 8.15 - USSD specific case*/ +static gboolean build_dataobj_ussd_text(struct stk_tlv_builder *tlv, + const void *data, gboolean cr) +{ + const struct stk_ussd_text *text = data; + unsigned char tag = STK_DATA_OBJECT_TYPE_TEXT; + + if (!text->text || !text->len) + return TRUE; + + return stk_tlv_builder_open_container(tlv, cr, tag, FALSE) && + stk_tlv_builder_append_byte(tlv, text->dcs) && + stk_tlv_builder_append_bytes(tlv, text->text, text->len) && + stk_tlv_builder_close_container(tlv); +} + /* Described in TS 131.111 Section 8.17 */ static gboolean build_dataobj_ussd_string(struct stk_tlv_builder *tlv, const void *data, gboolean cr) @@ -5459,6 +5475,12 @@ const unsigned char *stk_pdu_from_response(const struct stk_response *response, case STK_COMMAND_TYPE_LANGUAGE_NOTIFICATION: case STK_COMMAND_TYPE_LAUNCH_BROWSER: break; + case STK_COMMAND_TYPE_SEND_USSD: + ok = build_dataobj(&builder, + build_dataobj_ussd_text, DATAOBJ_FLAG_CR, + &response->send_ussd.text, + NULL); + break; default: return NULL; }; diff --git a/src/stkutil.h b/src/stkutil.h index 44d167a..fac0553 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -237,6 +237,7 @@ enum stk_result_type { STK_RESULT_TYPE_GO_BACK = 0x11, STK_RESULT_TYPE_NO_RESPONSE = 0x12, STK_RESULT_TYPE_HELP_REQUESTED = 0x13, + STK_RESULT_TYPE_USSD_OR_SS_USER_TERMINATION = 0x14, /* 0x20 to 0x2F are used to indicate that SIM should retry */ STK_RESULT_TYPE_TERMINAL_BUSY = 0x20, @@ -254,6 +255,7 @@ enum stk_result_type { STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD = 0x32, STK_RESULT_TYPE_COMMAND_ID_UNKNOWN = 0x33, STK_RESULT_TYPE_MINIMUM_NOT_MET = 0x36, + STK_RESULT_TYPE_USSD_RETURN_ERROR = 0x37, STK_RESULT_TYPE_CALL_CONTROL_PERMANENT = 0x39, STK_RESULT_TYPE_BIP_ERROR = 0x3A, STK_RESULT_TYPE_ACCESS_TECHNOLOGY_ERROR = 0x3B, @@ -1374,6 +1376,12 @@ struct stk_answer_text { */ }; +struct stk_ussd_text { + const unsigned char *text; + int dcs; + int len; +}; + struct stk_response_get_inkey { struct stk_answer_text text; struct stk_duration duration; @@ -1445,6 +1453,10 @@ struct stk_response_run_at_command { const char *at_response; }; +struct stk_response_send_ussd { + struct stk_ussd_text text; +}; + struct stk_response { unsigned char number; unsigned char type; @@ -1474,6 +1486,7 @@ struct stk_response { struct stk_response_generic send_dtmf; struct stk_response_generic language_notification; struct stk_response_generic launch_browser; + struct stk_response_send_ussd send_ussd; }; void (*destructor)(struct stk_response *response); -- 1.7.0.4 ---------------------------------------------------------------- Please note: This e-mail may contain confidential information intended solely for the addressee. If you have received this e-mail in error, please do not disclose it to anyone, notify the sender promptly, and delete the message from your system. Thank you. ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] stk and stkutil changes for Send USSD proactive command 2010-09-06 9:21 ` [PATCH 2/2] stk and stkutil " Jeevaka Badrappan @ 2010-09-06 23:54 ` Andrzej Zaborowski 2010-09-07 4:10 ` [PATCH 2/2] stk and stkutil changes for Send USSD proactivecommand Jeevaka.Badrappan 2010-09-07 14:58 ` [PATCH 2/2] stk and stkutil changes for Send USSD proactive command Denis Kenzior 1 sibling, 1 reply; 8+ messages in thread From: Andrzej Zaborowski @ 2010-09-06 23:54 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 2769 bytes --] Hi, On 6 September 2010 11:21, Jeevaka Badrappan <jeevaka.badrappan@elektrobit.com> wrote: > --- > src/stk.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- > src/stkutil.c | 22 +++++++++ > src/stkutil.h | 13 +++++ > 3 files changed, 169 insertions(+), 3 deletions(-) > > diff --git a/src/stk.c b/src/stk.c > index 3fda2af..5d84141 100644 > --- a/src/stk.c > +++ b/src/stk.c > @@ -56,10 +56,8 @@ struct ofono_stk { > void (*cancel_cmd)(struct ofono_stk *stk); > GQueue *envelope_q; > DBusMessage *pending; > - > struct stk_timer timers[8]; > guint timers_source; > - > int timeout; > int short_timeout; > struct stk_agent *session_agent; > @@ -1590,6 +1588,136 @@ 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)) > + rsp.send_ussd.text.dcs = -1; > + else > + rsp.send_ussd.text.dcs = charset; What is the meaning of that -1? I don't see this value handled in stkutil. The rest of this patch looks okay to me, but you have some formatting issues: space after '(' above, and the first hunk removes empty lines. Other than that I think Denis might want you to split this patch into stk patch and stkutil patch. With regards to 1/2 he'll probably want one patch for atmodem, one for isimodem, one for include, one for plugin, etc. Also I think it's fair to assume that the charset is IRA and there's not need to account for other possibilities, but other might have different opinions. And I'm not sure if the enum sms_charset values change should be global, or translation should be done here in stk.c. Best regards ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH 2/2] stk and stkutil changes for Send USSD proactivecommand 2010-09-06 23:54 ` Andrzej Zaborowski @ 2010-09-07 4:10 ` Jeevaka.Badrappan 0 siblings, 0 replies; 8+ messages in thread From: Jeevaka.Badrappan @ 2010-09-07 4:10 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 1429 bytes --] Hi Andrew, > What is the meaning of that -1? I don't see this value handled in stkutil. If dcs is -1, then the text is assumed to be in UTF-8. Will add the -1 handling in stkutil.h > The rest of this patch looks okay to me, but you have some formatting > issues: space after '(' above, and the first hunk removes empty lines. > Other than that I think Denis might want you to split this patch into stk patch and stkutil patch > With regards to 1/2 he'll probably want one patch for atmodem, one for isimodem, one for include, one for plugin, etc. Also I think it's fair to assume that the charset is > IRA and there's not need to account for other possibilities, but other might have different opinions. And I'm not sure if the enum sms_charset values change should be > global, or translation should be done here in stk.c. Since the USSD driver API is changed, its not possible to split the 1st patch into one for atmodem, one for isimodem, one for include. Changes in plugin and atutil can be delivered as a separate patch. Thanks and Regards, jeevaka ---------------------------------------------------------------- Please note: This e-mail may contain confidential information intended solely for the addressee. If you have received this e-mail in error, please do not disclose it to anyone, notify the sender promptly, and delete the message from your system. Thank you. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] stk and stkutil changes for Send USSD proactive command 2010-09-06 9:21 ` [PATCH 2/2] stk and stkutil " Jeevaka Badrappan 2010-09-06 23:54 ` Andrzej Zaborowski @ 2010-09-07 14:58 ` Denis Kenzior 1 sibling, 0 replies; 8+ messages in thread From: Denis Kenzior @ 2010-09-07 14:58 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 9326 bytes --] On 09/06/2010 04:21 AM, Jeevaka Badrappan wrote: > --- > src/stk.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- > src/stkutil.c | 22 +++++++++ > src/stkutil.h | 13 +++++ > 3 files changed, 169 insertions(+), 3 deletions(-) Changes to stkutil should come in a separate patch. > > diff --git a/src/stk.c b/src/stk.c > index 3fda2af..5d84141 100644 > --- a/src/stk.c > +++ b/src/stk.c > @@ -56,10 +56,8 @@ struct ofono_stk { > void (*cancel_cmd)(struct ofono_stk *stk); > GQueue *envelope_q; > DBusMessage *pending; > - > struct stk_timer timers[8]; > guint timers_source; > - > int timeout; > int short_timeout; > struct stk_agent *session_agent; Please don't ever do this. The empty lines are there for a reason. If you disagree, then send a separate RFC patch. > @@ -1590,6 +1588,136 @@ 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)) > + rsp.send_ussd.text.dcs = -1; > + else > + rsp.send_ussd.text.dcs = charset; > + > + 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; > + } > + } > + > + 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 +1868,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; > diff --git a/src/stkutil.c b/src/stkutil.c > index ae4cc32..48d409b 100644 > --- a/src/stkutil.c > +++ b/src/stkutil.c > @@ -4170,6 +4170,22 @@ static gboolean build_dataobj_text(struct stk_tlv_builder *tlv, > return stk_tlv_builder_close_container(tlv); > } > > +/* Defined in TS 102.223 Section 8.15 - USSD specific case*/ > +static gboolean build_dataobj_ussd_text(struct stk_tlv_builder *tlv, > + const void *data, gboolean cr) > +{ > + const struct stk_ussd_text *text = data; > + unsigned char tag = STK_DATA_OBJECT_TYPE_TEXT; > + > + if (!text->text || !text->len) > + return TRUE; > + > + return stk_tlv_builder_open_container(tlv, cr, tag, FALSE) && > + stk_tlv_builder_append_byte(tlv, text->dcs) && > + stk_tlv_builder_append_bytes(tlv, text->text, text->len) && > + stk_tlv_builder_close_container(tlv); > +} > + > /* Described in TS 131.111 Section 8.17 */ > static gboolean build_dataobj_ussd_string(struct stk_tlv_builder *tlv, > const void *data, gboolean cr) > @@ -5459,6 +5475,12 @@ const unsigned char *stk_pdu_from_response(const struct stk_response *response, > case STK_COMMAND_TYPE_LANGUAGE_NOTIFICATION: > case STK_COMMAND_TYPE_LAUNCH_BROWSER: > break; > + case STK_COMMAND_TYPE_SEND_USSD: > + ok = build_dataobj(&builder, > + build_dataobj_ussd_text, DATAOBJ_FLAG_CR, > + &response->send_ussd.text, > + NULL); > + break; > default: > return NULL; > }; > diff --git a/src/stkutil.h b/src/stkutil.h > index 44d167a..fac0553 100644 > --- a/src/stkutil.h > +++ b/src/stkutil.h > @@ -237,6 +237,7 @@ enum stk_result_type { > STK_RESULT_TYPE_GO_BACK = 0x11, > STK_RESULT_TYPE_NO_RESPONSE = 0x12, > STK_RESULT_TYPE_HELP_REQUESTED = 0x13, > + STK_RESULT_TYPE_USSD_OR_SS_USER_TERMINATION = 0x14, > > /* 0x20 to 0x2F are used to indicate that SIM should retry */ > STK_RESULT_TYPE_TERMINAL_BUSY = 0x20, > @@ -254,6 +255,7 @@ enum stk_result_type { > STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD = 0x32, > STK_RESULT_TYPE_COMMAND_ID_UNKNOWN = 0x33, > STK_RESULT_TYPE_MINIMUM_NOT_MET = 0x36, > + STK_RESULT_TYPE_USSD_RETURN_ERROR = 0x37, > STK_RESULT_TYPE_CALL_CONTROL_PERMANENT = 0x39, > STK_RESULT_TYPE_BIP_ERROR = 0x3A, > STK_RESULT_TYPE_ACCESS_TECHNOLOGY_ERROR = 0x3B, > @@ -1374,6 +1376,12 @@ struct stk_answer_text { > */ Modifications to the enum should also be in a separate patch. > }; > > +struct stk_ussd_text { > + const unsigned char *text; > + int dcs; > + int len; > +}; > + > struct stk_response_get_inkey { > struct stk_answer_text text; > struct stk_duration duration; > @@ -1445,6 +1453,10 @@ struct stk_response_run_at_command { > const char *at_response; > }; > > +struct stk_response_send_ussd { > + struct stk_ussd_text text; > +}; > + > struct stk_response { > unsigned char number; > unsigned char type; > @@ -1474,6 +1486,7 @@ struct stk_response { > struct stk_response_generic send_dtmf; > struct stk_response_generic language_notification; > struct stk_response_generic launch_browser; > + struct stk_response_send_ussd send_ussd; > }; > > void (*destructor)(struct stk_response *response); Regards, -Denis ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] Internal and Driver API changes for Send USSD proactive command 2010-09-06 9:21 [PATCH 1/2] Internal and Driver API changes for Send USSD proactive command Jeevaka Badrappan 2010-09-06 9:21 ` [PATCH 2/2] stk and stkutil " Jeevaka Badrappan @ 2010-09-07 14:54 ` Denis Kenzior 2010-09-07 17:29 ` Jeevaka.Badrappan 1 sibling, 1 reply; 8+ messages in thread From: Denis Kenzior @ 2010-09-07 14:54 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 36906 bytes --] Hi Jeevaka, On 09/06/2010 04:21 AM, Jeevaka Badrappan wrote: > --- > drivers/atmodem/atutil.c | 111 +++++++++++++++++++++++++++++++++++++ > drivers/atmodem/atutil.h | 25 +++++++++ > drivers/atmodem/ussd.c | 136 +++++++++++++++++++++++++++++++--------------- > drivers/isimodem/ussd.c | 55 +++++++++++-------- > include/types.h | 2 + > include/ussd.h | 8 ++- > plugins/atgen.c | 59 ++++++++++++++++++++ > plugins/phonesim.c | 53 ++++++++++++++++++ > src/call-barring.c | 5 ++ > src/call-forwarding.c | 5 ++ > src/call-settings.c | 5 ++ > src/ofono.h | 26 +++++++++ > src/smsutil.h | 6 +- > src/ussd.c | 131 +++++++++++++++++++++++++++++++++++++++----- > 14 files changed, 541 insertions(+), 86 deletions(-) > > diff --git a/drivers/atmodem/atutil.c b/drivers/atmodem/atutil.c > index f566237..a3c3297 100644 > --- a/drivers/atmodem/atutil.c > +++ b/drivers/atmodem/atutil.c > @@ -341,3 +341,114 @@ gboolean at_util_parse_sms_index_delivery(GAtResult *result, const char *prefix, > > return TRUE; > } > + > +int at_util_charset_string_to_charset(const char *charsetstr) > +{ The preference is gboolean func(const char *charsetstr, enum at_util_charset *ret) > + int charset = -1; > + > + if (!g_strcmp0(charsetstr, "GSM")) > + charset = AT_UTIL_CHARSET_GSM; > + else if (!g_strcmp0(charsetstr, "HEX")) > + charset = AT_UTIL_CHARSET_HEX; > + else if (!g_strcmp0(charsetstr, "IRA")) > + charset = AT_UTIL_CHARSET_IRA; > + else if (!g_strcmp0(charsetstr, "PCCP437")) > + charset = AT_UTIL_CHARSET_PCCP437; > + else if (!g_strcmp0(charsetstr, "PCDN")) > + charset = AT_UTIL_CHARSET_PCDN; > + else if (!g_strcmp0(charsetstr, "UCS2")) > + charset = AT_UTIL_CHARSET_UCS2; > + else if (!g_strcmp0(charsetstr, "UTF-8")) > + charset = AT_UTIL_CHARSET_UTF8; > + else if (!g_strcmp0(charsetstr, "8859-1")) > + charset = AT_UTIL_CHARSET_8859_1; > + else if (!g_strcmp0(charsetstr, "8859-2")) > + charset = AT_UTIL_CHARSET_8859_2; > + else if (!g_strcmp0(charsetstr, "8859-3")) > + charset = AT_UTIL_CHARSET_8859_3; > + else if (!g_strcmp0(charsetstr, "8859-4")) > + charset = AT_UTIL_CHARSET_8859_4; > + else if (!g_strcmp0(charsetstr, "8859-5")) > + charset = AT_UTIL_CHARSET_8859_5; > + else if (!g_strcmp0(charsetstr, "8859-6")) > + charset = AT_UTIL_CHARSET_8859_6; > + else if (!g_strcmp0(charsetstr, "8859-C")) > + charset = AT_UTIL_CHARSET_8859_C; > + else if (!g_strcmp0(charsetstr, "8859-A")) > + charset = AT_UTIL_CHARSET_8859_A; > + else if (!g_strcmp0(charsetstr, "8859-G")) > + charset = AT_UTIL_CHARSET_8859_G; > + else if (!g_strcmp0(charsetstr, "8859-H")) > + charset = AT_UTIL_CHARSET_8859_H; > + > + return charset; > +} > + > +gboolean at_util_parse_charsets(GAtResult *result, int *supported) > +{ Maybe name this into at_util_parse_cscs_supported? > + GAtResultIter iter; > + const char *charset; > + > + g_at_result_iter_init(&iter, result); > + > + if (!g_at_result_iter_next(&iter, "+CSCS:")) > + return FALSE; > + > + /* Some modems don't report CSCS in a proper list */ > + g_at_result_iter_open_list(&iter); > + > + while (g_at_result_iter_next_string(&iter, &charset)) { > + if (!g_strcmp0(charset, "GSM")) > + *supported |= AT_UTIL_CHARSET_GSM; > + else if (!g_strcmp0(charset, "HEX")) > + *supported |= AT_UTIL_CHARSET_HEX; > + else if (!g_strcmp0(charset, "IRA")) > + *supported |= AT_UTIL_CHARSET_IRA; > + else if (!g_strcmp0(charset, "PCCP437")) > + *supported |= AT_UTIL_CHARSET_PCCP437; > + else if (!g_strcmp0(charset, "PCDN")) > + *supported |= AT_UTIL_CHARSET_PCDN; > + else if (!g_strcmp0(charset, "UCS2")) > + *supported |= AT_UTIL_CHARSET_UCS2; > + else if (!g_strcmp0(charset, "UTF-8")) > + *supported |= AT_UTIL_CHARSET_UTF8; > + else if (!g_strcmp0(charset, "8859-1")) > + *supported |= AT_UTIL_CHARSET_8859_1; > + else if (!g_strcmp0(charset, "8859-2")) > + *supported |= AT_UTIL_CHARSET_8859_2; > + else if (!g_strcmp0(charset, "8859-3")) > + *supported |= AT_UTIL_CHARSET_8859_3; > + else if (!g_strcmp0(charset, "8859-4")) > + *supported |= AT_UTIL_CHARSET_8859_4; > + else if (!g_strcmp0(charset, "8859-5")) > + *supported |= AT_UTIL_CHARSET_8859_5; > + else if (!g_strcmp0(charset, "8859-6")) > + *supported |= AT_UTIL_CHARSET_8859_6; > + else if (!g_strcmp0(charset, "8859-C")) > + *supported |= AT_UTIL_CHARSET_8859_C; > + else if (!g_strcmp0(charset, "8859-A")) > + *supported |= AT_UTIL_CHARSET_8859_A; > + else if (!g_strcmp0(charset, "8859-G")) > + *supported |= AT_UTIL_CHARSET_8859_G; > + else if (!g_strcmp0(charset, "8859-H")) > + *supported |= AT_UTIL_CHARSET_8859_H; Can't you simply call at_util_charset_string_to_charset here? > + } > + > + g_at_result_iter_close_list(&iter); > + > + return TRUE; > +} > + > +const char *at_util_parse_read_charset(GAtResult *result) > +{ You might want to redo this function with the following signature: gboolean at_util_parse_cscs_query(GAtResult *result, enum at_util_charset *out) > + GAtResultIter iter; > + const char *str; > + > + g_at_result_iter_init(&iter, result); > + > + if (!g_at_result_iter_next(&iter, "+CSCS:")) > + return NULL; > + > + g_at_result_iter_next_string(&iter, &str); > + return str; > +} > diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h > index 9e0a84b..4bc30fa 100644 > --- a/drivers/atmodem/atutil.h > +++ b/drivers/atmodem/atutil.h > @@ -27,6 +27,27 @@ enum at_util_sms_store { > AT_UTIL_SMS_STORE_BM = 4, > }; > > +/* 3GPP TS 27.007 Release 8 Section 5.5 */ > +enum at_util_charset { > + AT_UTIL_CHARSET_GSM = 0, > + AT_UTIL_CHARSET_HEX = 1, > + AT_UTIL_CHARSET_IRA = 2, > + AT_UTIL_CHARSET_PCCP437 = 3, > + AT_UTIL_CHARSET_PCDN = 4, > + AT_UTIL_CHARSET_UCS2 = 5, > + AT_UTIL_CHARSET_UTF8 = 6, > + AT_UTIL_CHARSET_8859_1 = 7, > + AT_UTIL_CHARSET_8859_2 = 8, > + AT_UTIL_CHARSET_8859_3 = 9, > + AT_UTIL_CHARSET_8859_4 = 10, > + AT_UTIL_CHARSET_8859_5 = 11, > + AT_UTIL_CHARSET_8859_6 = 12, > + AT_UTIL_CHARSET_8859_C = 13, > + AT_UTIL_CHARSET_8859_A = 14, > + AT_UTIL_CHARSET_8859_G = 15, > + AT_UTIL_CHARSET_8859_H = 16, > +}; > + > void decode_at_error(struct ofono_error *error, const char *final); > gint at_util_call_compare_by_status(gconstpointer a, gconstpointer b); > gint at_util_call_compare_by_phone_number(gconstpointer a, gconstpointer b); > @@ -46,6 +67,10 @@ gboolean at_util_parse_sms_index_delivery(GAtResult *result, const char *prefix, > enum at_util_sms_store *store, > int *index); > > +int at_util_charset_string_to_charset(const char *charset); > +gboolean at_util_parse_charsets(GAtResult *result, int *supported); > +const char *at_util_parse_read_charset(GAtResult *result); > + > struct cb_data { > void *cb; > void *data; atutil.[ch] needs to be a separate patch. > diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c > index 1e1fc25..d3531bb 100644 > --- a/drivers/atmodem/ussd.c > +++ b/drivers/atmodem/ussd.c > @@ -44,23 +44,39 @@ > > static const char *cusd_prefix[] = { "+CUSD:", NULL }; > static const char *none_prefix[] = { NULL }; > +static const char *cscs_prefix[] = { "+CSCS:", NULL }; > > struct ussd_data { > GAtChat *chat; > unsigned int vendor; > + int charset; > }; > > +static void read_charset_cb(gboolean ok, GAtResult *result, > + gpointer user_data) > +{ > + struct ussd_data *data = user_data; > + const char *charset = NULL; > + > + if (!ok) > + return; > + > + charset = at_util_parse_read_charset(result); > + > + if (charset) > + data->charset = at_util_charset_string_to_charset(charset); > +} > + > static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) > { > GAtResultIter iter; > int status; > - int dcs; > const char *content; > - char *converted = NULL; > - gboolean udhi; > + char *msg = NULL; > + long msg_len = 0; > + int dcs; > + struct ussd_data *data = ofono_ussd_get_data(ussd); > enum sms_charset charset; > - gboolean compressed; > - gboolean iso639; > > g_at_result_iter_init(&iter, result); > > @@ -73,34 +89,46 @@ static void cusd_parse(GAtResult *result, struct ofono_ussd *ussd) > if (!g_at_result_iter_next_string(&iter, &content)) > goto out; > > - if (g_at_result_iter_next_number(&iter, &dcs)) { > - if (!cbs_dcs_decode(dcs, &udhi, NULL, &charset, > - &compressed, NULL, &iso639)) > - goto out; > - > - if (udhi || compressed || iso639) > - goto out; > - } else > - charset = SMS_CHARSET_7BIT; > + if (!g_at_result_iter_next_number(&iter, &dcs)) > + goto out; > > - if (charset == SMS_CHARSET_7BIT) > - converted = convert_gsm_to_utf8((const guint8 *) content, > - strlen(content), NULL, NULL, 0); > + if (!cbs_dcs_decode(dcs, NULL, NULL, &charset, NULL, NULL, NULL)) > + goto out; > > - else if (charset == SMS_CHARSET_8BIT) { > - /* TODO: Figure out what to do with 8 bit data */ > + if (charset == SMS_CHARSET_7BIT) { > + switch (data->charset) { > + case AT_UTIL_CHARSET_GSM: > + msg = convert_gsm_to_utf8((const guint8 *) content, > + strlen(content), NULL, &msg_len, 0); > + break; > + case AT_UTIL_CHARSET_PCCP437: > + case AT_UTIL_CHARSET_PCDN: > + case AT_UTIL_CHARSET_8859_1: > + case AT_UTIL_CHARSET_IRA: > + default: > + DBG("charset:%d not supported", data->charset); > + status = 4; /* Not supported */ > + } > + } else if (charset == SMS_CHARSET_8BIT) { > + /* MT/TA converts each 8 bit octet into two IRA character > + * long hexadecimal number (e.g. octet with integer value 42 > + * is presented to TE as two characters 2A (IRA 50 and 65)) > + */ > ofono_error("8-bit coded USSD response received"); > status = 4; /* Not supported */ If we're not handling 8BIT USSDs, what exactly is the point of this exercise? > - } else { > - /* No other encoding is mentioned in TS27007 7.15 */ > + } else { Whats up with the double space after the }? > + /* No other encoding is mentioned in TS27.007 7.15 */ > ofono_error("Unsupported USSD data coding scheme (%02x)", dcs); > status = 4; /* Not supported */ > } > > out: > - ofono_ussd_notify(ussd, status, converted); > + if (!msg || !msg_len) > + status = OFONO_USSD_STATUS_NOTIFY; > > - g_free(converted); > + ofono_ussd_notify(ussd, status, -1, (const guint8 *) msg, (int) msg_len); Err, why are we passing UTF8 text as binary data + len? I'm lost. You either do UTF8 always, or full binary always. > + > + g_free(msg); > } > > static void cusd_request_cb(gboolean ok, GAtResult *result, gpointer user_data) > @@ -117,14 +145,17 @@ static void cusd_request_cb(gboolean ok, GAtResult *result, gpointer user_data) > cusd_parse(result, ussd); > } > > -static void at_ussd_request(struct ofono_ussd *ussd, const char *str, > - ofono_ussd_cb_t cb, void *user_data) > +static void at_ussd_request(struct ofono_ussd *ussd, int dcs, > + const unsigned char *str, int str_len, > + ofono_ussd_cb_t cb, void *user_data) > { > struct ussd_data *data = ofono_ussd_get_data(ussd); > struct cb_data *cbd = cb_data_new(cb, user_data); > + int dcs_value = 0x0f; // GSM 7 bit default alphabet > unsigned char *converted = NULL; > - int dcs; > - int max_len; > + unsigned char coded_str[256]; > + long coded_str_len; > + long num_packed; > long written; > char buf[256]; > > @@ -133,40 +164,53 @@ static void at_ussd_request(struct ofono_ussd *ussd, const char *str, > > cbd->user = ussd; > > - converted = convert_utf8_to_gsm(str, strlen(str), NULL, &written, 0); > + if (dcs == -1) { > + converted = convert_utf8_to_gsm((const char *) str, str_len, NULL, &written, 0); Get rid of this. The core either passes a raw USSD data or UTF8. There's no mix and match here. > > - if (!converted) > - goto error; > - else { > - dcs = 15; > - max_len = 182; > - } > + if (!converted) > + goto error; > > - if (written > max_len) > - goto error; > + /* As per 3GPP TS 23.038, When this character set is used, > + * the characters of the message are packed in octets as shown in section 6.1.2.1.1, > + * and the message can consist of up to 160 characters. > + */ > + pack_7bit_own_buf(converted, written, 0, TRUE, > + &num_packed, 0, coded_str); CUSD does not take packed GSM data, so I'm lost here > > - snprintf(buf, sizeof(buf), "AT+CUSD=1,\"%.*s\",%d", > - (int) written, converted, dcs); > + g_free(converted); > + converted = NULL; > + coded_str_len = num_packed; > > - g_free(converted); > - converted = NULL; > + if (coded_str_len > OFONO_MAX_USSD_LENGTH) > + goto error; > + } else { > + if (str_len > OFONO_MAX_USSD_LENGTH) > + goto error; > + > + memcpy(coded_str, str, str_len); > + coded_str_len = str_len; > + dcs_value = dcs; > + } > + > + snprintf(buf, sizeof(buf), "AT+CUSD=1,\"%.*s\",%d", > + (int) coded_str_len, coded_str, dcs_value); > > if (data->vendor == OFONO_VENDOR_QUALCOMM_MSM) { > /* Ensure that the modem is using GSM character set. It > * seems it defaults to IRA and then umlauts are not > * properly encoded. The modem returns some weird from > - * of Latin-1, but it is not really Latin-1 either. */ > + * of Latin-1, but it is not really Latin-1 either. > + */ > g_at_chat_send(data->chat, "AT+CSCS=\"GSM\"", none_prefix, > - NULL, NULL, NULL); > + NULL, NULL, NULL); > } > > if (g_at_chat_send(data->chat, buf, cusd_prefix, > - cusd_request_cb, cbd, g_free) > 0) > + cusd_request_cb, cbd, g_free) > 0) > return; > > error: > g_free(cbd); > - g_free(converted); > > CALLBACK_WITH_FAILURE(cb, user_data); > } > @@ -244,9 +288,13 @@ static int at_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor, > data = g_new0(struct ussd_data, 1); > data->chat = g_at_chat_clone(chat); > data->vendor = vendor; > + data->charset = -1; > > ofono_ussd_set_data(ussd, data); > > + g_at_chat_send(chat, "AT+CSCS?", cscs_prefix, read_charset_cb, data, > + NULL); > + > g_at_chat_send(chat, "AT+CUSD=1", NULL, at_ussd_register, ussd, NULL); > > return 0; > diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c > index 330a141..c02fc55 100644 > --- a/drivers/isimodem/ussd.c > +++ b/drivers/isimodem/ussd.c > @@ -74,7 +74,9 @@ static void ussd_parse(struct ofono_ussd *ussd, const void *restrict data, > { > const unsigned char *msg = data; > int status = OFONO_USSD_STATUS_NOT_SUPPORTED; > - char *converted = NULL; > + int msg_len = 0; > + int dcs = -1; > + unsigned char *coded_msg = NULL; > > if (!msg || len < 4) > goto out; > @@ -84,14 +86,11 @@ static void ussd_parse(struct ofono_ussd *ussd, const void *restrict data, > if (msg[3] == 0 || (size_t)(msg[3] + 4) > len) > goto out; > > - converted = ussd_decode(msg[1], msg[3], msg + 4); > - > - if (converted) > - status = OFONO_USSD_STATUS_NOTIFY; > - > + dcs = msg[1]; > + msg_len = msg[3]; > + coded_msg = (guint8 *) msg+4; > out: > - ofono_ussd_notify(ussd, status, converted); > - g_free(converted); > + ofono_ussd_notify(ussd, status, dcs, coded_msg, msg_len); > } > > > @@ -129,7 +128,7 @@ error: > } > > static GIsiRequest *ussd_send(GIsiClient *client, > - uint8_t *str, size_t len, > + int dcs, uint8_t *str, size_t len, > void *data, GDestroyNotify notify) > { > const uint8_t msg[] = { > @@ -138,7 +137,7 @@ static GIsiRequest *ussd_send(GIsiClient *client, > 0x01, /* subblock count */ > SS_GSM_USSD_STRING, > 4 + len + 3, /* subblock length */ > - 0x0f, /* DCS */ > + dcs, /* DCS */ > len, /* string length */ > /* USSD string goes here */ > }; > @@ -152,8 +151,9 @@ static GIsiRequest *ussd_send(GIsiClient *client, > ussd_send_resp_cb, data, notify); > } > > -static void isi_request(struct ofono_ussd *ussd, const char *str, > - ofono_ussd_cb_t cb, void *data) > +static void isi_request(struct ofono_ussd *ussd, int dcs, > + const unsigned char *str, int str_len, > + ofono_ussd_cb_t cb, void *data) > { > struct ussd_data *ud = ofono_ussd_get_data(ussd); > struct isi_cb_data *cbd = isi_cb_data_new(ussd, cb, data); > @@ -162,24 +162,35 @@ static void isi_request(struct ofono_ussd *ussd, const char *str, > unsigned char *converted = NULL; > long num_packed; > long written; > + int dcs_value = 0x0f; // GSM 7 bit default alphabet > > if (!cbd) > goto error; > > - converted = convert_utf8_to_gsm(str, strlen(str), NULL, &written, 0); > - if (!converted) > - goto error; > + if (dcs == -1) { > + converted = convert_utf8_to_gsm((const char *) str, str_len, NULL, &written, 0); > > - packed = pack_7bit_own_buf(converted, written, 0, TRUE, > - &num_packed, 0, buf); > + if (!converted) > + goto error; > > - g_free(converted); > + packed = pack_7bit_own_buf(converted, written, 0, TRUE, > + &num_packed, 0, buf); > > - if (written > SS_MAX_USSD_LENGTH) > - goto error; > + g_free(converted); > > - if (ussd_send(ud->client, packed, num_packed, cbd, g_free)) > - return; > + if (written > SS_MAX_USSD_LENGTH) > + goto error; > + > + if (ussd_send(ud->client, dcs_value, packed, num_packed, cbd, g_free)) > + return; > + } else { > + dcs_value = dcs; > + if (str_len > SS_MAX_USSD_LENGTH) > + goto error; > + > + if (ussd_send(ud->client, dcs_value, (guint8 *) str, str_len, cbd, g_free)) > + return; > + } > > error: > CALLBACK_WITH_FAILURE(cb, data); > diff --git a/include/types.h b/include/types.h > index 6098cba..e25ff02 100644 > --- a/include/types.h > +++ b/include/types.h > @@ -77,6 +77,8 @@ struct ofono_error { > }; > > #define OFONO_MAX_PHONE_NUMBER_LENGTH 20 > +#define OFONO_MAX_USSD_LENGTH 160 > + > > struct ofono_phone_number { > char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1]; > diff --git a/include/ussd.h b/include/ussd.h > index 96e04cb..e3b43f7 100644 > --- a/include/ussd.h > +++ b/include/ussd.h > @@ -45,13 +45,15 @@ struct ofono_ussd_driver { > const char *name; > int (*probe)(struct ofono_ussd *ussd, unsigned int vendor, void *data); > void (*remove)(struct ofono_ussd *ussd); > - void (*request)(struct ofono_ussd *ussd, const char *str, > - ofono_ussd_cb_t, void *data); > + void (*request)(struct ofono_ussd *ussd, int dcs, > + const unsigned char *str, int str_len, > + ofono_ussd_cb_t, void *data); > void (*cancel)(struct ofono_ussd *ussd, > ofono_ussd_cb_t cb, void *data); > }; > > -void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str); > +void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, > + const unsigned char *str, int str_len); > > int ofono_ussd_driver_register(const struct ofono_ussd_driver *d); > void ofono_ussd_driver_unregister(const struct ofono_ussd_driver *d); > diff --git a/plugins/atgen.c b/plugins/atgen.c > index a6eee60..8d54c0a 100644 > --- a/plugins/atgen.c > +++ b/plugins/atgen.c > @@ -25,6 +25,8 @@ > > #include <errno.h> > #include <stdlib.h> > +#include <string.h> > +#include <stdio.h> > > #include <glib.h> > #include <gatchat.h> > @@ -50,10 +52,14 @@ > #include <ofono/voicecall.h> > > #include <drivers/atmodem/sim-poll.h> > +#include <drivers/atmodem/atutil.h> > > #include <ofono/gprs.h> > #include <ofono/gprs-context.h> > > +static const char *none_prefix[] = { NULL }; > +static const char *cscs_prefix[] = { "+CSCS:", NULL }; > + > static const char *tty_opts[] = { > "Baud", > "Read", > @@ -66,6 +72,57 @@ static const char *tty_opts[] = { > NULL, > }; > > +static const char *best_charset(int supported) > +{ > + const char *charset = "Invalid"; > + > + if (supported & AT_UTIL_CHARSET_GSM) > + charset = "GSM"; > + > + if (supported & AT_UTIL_CHARSET_UTF8) > + charset = "UTF-8"; > + > + return charset; > +} > + > +static void set_charset_cb(gboolean ok, GAtResult *result, > + gpointer user_data) > +{ > + if (!ok) > + ofono_error("Setting character set failed"); > +} > + > +static void list_charsets_cb(gboolean ok, GAtResult *result, > + gpointer user_data) > +{ > + struct ofono_modem *modem = user_data; > + GAtChat *chat = ofono_modem_get_data(modem); > + const char *charset; > + int supported = 0; > + char buf[32]; > + > + if (!ok) > + return; > + > + if (!at_util_parse_charsets(result, &supported)) > + return; > + > + charset = best_charset(supported); > + snprintf(buf, sizeof(buf), "AT+CSCS=\"%s\"", charset); > + > + if( !g_at_chat_send(chat, buf, none_prefix, set_charset_cb, modem, NULL)) > + ofono_error("AT+CSCS=%s request failed", charset); > +} > + > +static void list_charsets(struct ofono_modem *modem) > +{ > + GAtChat *chat = ofono_modem_get_data(modem); > + > + if (!g_at_chat_send(chat, "AT+CSCS=?", cscs_prefix, > + list_charsets_cb, modem, NULL) > 0) > + ofono_error("AT+CSCS=? request failed"); > +} > + > static int atgen_probe(struct ofono_modem *modem) > { > return 0; > @@ -172,6 +229,8 @@ static void atgen_pre_sim(struct ofono_modem *modem) > > if (sim) > ofono_sim_inserted_notify(sim, TRUE); > + > + list_charsets(modem); > } > All atgen changes should be in a separate patch > static void atgen_post_sim(struct ofono_modem *modem) > diff --git a/plugins/phonesim.c b/plugins/phonesim.c > index d3caa20..7c20786 100644 > --- a/plugins/phonesim.c > +++ b/plugins/phonesim.c > @@ -64,6 +64,7 @@ > #include <drivers/atmodem/atutil.h> > > static const char *none_prefix[] = { NULL }; > +static const char *cscs_prefix[] = { "+CSCS:", NULL }; > > struct phonesim_data { > GAtMux *mux; > @@ -72,6 +73,56 @@ struct phonesim_data { > gboolean use_mux; > }; > > +static const char *best_charset(int supported) > +{ > + const char *charset = "Invalid"; > + > + if (supported & AT_UTIL_CHARSET_UCS2) > + charset = "UCS2"; > + > + if (supported & AT_UTIL_CHARSET_GSM) > + charset = "GSM"; > + > + return charset; > +} > + > +static void set_charset_cb(gboolean ok, GAtResult *result, > + gpointer user_data) > +{ > + if (!ok) > + ofono_error("Setting character set failed"); > +} > + > +static void list_charsets_cb(gboolean ok, GAtResult *result, > + gpointer user_data) > +{ > + struct ofono_modem *modem = user_data; > + struct phonesim_data *data = ofono_modem_get_data(modem); > + const char *charset; > + int supported = 0; > + char buf[32]; > + > + if (!ok) > + return; > + > + if (!at_util_parse_charsets(result, &supported)) > + return; > + > + charset = best_charset(supported); > + snprintf(buf, sizeof(buf), "AT+CSCS=\"%s\"", charset); > + > + if (!g_at_chat_send(data->chat, buf, none_prefix, set_charset_cb, modem, NULL)) > + ofono_error("Setting charset: %s failed", charset); > + } > + > +static void list_charsets(struct ofono_modem *modem) > +{ > + struct phonesim_data *data = ofono_modem_get_data(modem); > + if (!g_at_chat_send(data->chat, "AT+CSCS=?", cscs_prefix, > + list_charsets_cb, modem, NULL)) > + ofono_error("AT+CSCS=? request failed"); > +} > + > static int phonesim_probe(struct ofono_modem *modem) > { > struct phonesim_data *data; > @@ -321,6 +372,8 @@ static void phonesim_pre_sim(struct ofono_modem *modem) > > if (sim) > ofono_sim_inserted_notify(sim, TRUE); > + > + list_charsets(modem); > } > phonesim changes should be in a separate patch. > static void phonesim_post_sim(struct ofono_modem *modem) > diff --git a/src/call-barring.c b/src/call-barring.c > index 7607f3f..a0ac689 100644 > --- a/src/call-barring.c > +++ b/src/call-barring.c > @@ -580,6 +580,11 @@ static void cb_unregister_ss_controls(struct ofono_call_barring *cb) > __ofono_ussd_passwd_unregister(cb->ussd, "353"); > } > > +gboolean __ofono_call_barring_is_busy(struct ofono_call_barring *cb) > +{ > + return cb->pending ? TRUE : FALSE; > +} > + > static inline void cb_append_property(struct ofono_call_barring *cb, > DBusMessageIter *dict, int start, > int end, int cls, const char *property) This should be in a separate patch along with the declaration in ofono.h. > diff --git a/src/call-forwarding.c b/src/call-forwarding.c > index 4e77144..3e9265b 100644 > --- a/src/call-forwarding.c > +++ b/src/call-forwarding.c > @@ -1092,6 +1092,11 @@ static void cf_unregister_ss_controls(struct ofono_call_forwarding *cf) > __ofono_ussd_ssc_unregister(cf->ussd, "004"); > } > > +gboolean __ofono_call_forwarding_is_busy(struct ofono_call_forwarding *cf) > +{ > + return cf->pending ? TRUE : FALSE; > +} > + This should be in a separate patch along with the declaration in ofono.h. > int ofono_call_forwarding_driver_register(const struct ofono_call_forwarding_driver *d) > { > DBG("driver: %p, name: %s", d, d->name); > diff --git a/src/call-settings.c b/src/call-settings.c > index ab20062..9c536e9 100644 > --- a/src/call-settings.c > +++ b/src/call-settings.c > @@ -778,6 +778,11 @@ static void cs_unregister_ss_controls(struct ofono_call_settings *cs) > __ofono_ussd_ssc_unregister(cs->ussd, "77"); > } > > +gboolean __ofono_call_settings_is_busy(struct ofono_call_settings *cs) > +{ > + return cs->pending ? TRUE : FALSE; > +} > + This should be in a separate patch along with the declaration in ofono.h. > static DBusMessage *generate_get_properties_reply(struct ofono_call_settings *cs, > DBusMessage *msg) > { > diff --git a/src/ofono.h b/src/ofono.h > index d95f2f2..43368d5 100644 > --- a/src/ofono.h > +++ b/src/ofono.h > @@ -163,9 +163,18 @@ gboolean __ofono_modem_remove_atom_watch(struct ofono_modem *modem, > void __ofono_atom_free(struct ofono_atom *atom); > > #include <ofono/call-barring.h> > + > +gboolean __ofono_call_barring_is_busy(struct ofono_call_barring *cb); > + > #include <ofono/call-forwarding.h> > + > +gboolean __ofono_call_forwarding_is_busy(struct ofono_call_forwarding *cf); > + > #include <ofono/call-meter.h> > #include <ofono/call-settings.h> > + > +gboolean __ofono_call_settings_is_busy(struct ofono_call_settings *cs); > + > #include <ofono/cbs.h> > #include <ofono/devinfo.h> > #include <ofono/phonebook.h> > @@ -235,6 +244,13 @@ gboolean __ofono_ssn_mt_watch_remove(struct ofono_ssn *ssn, int id); > > #include <ofono/ussd.h> > > +enum ofono_ussd_failure{ > + OFONO_USSD_FAILURE_NONE = 0x0, > + OFONO_USSD_FAILURE_USER_TERMINATED, > + OFONO_USSD_FAILURE_RETURN_ERROR, > + OFONO_USSD_FAILURE_TIMED_OUT, > +}; > + Please check the coding-style.txt document for enum declarations. > typedef gboolean (*ofono_ussd_ssc_cb_t)(int type, > const char *sc, > const char *sia, const char *sib, > @@ -245,6 +261,10 @@ typedef gboolean (*ofono_ussd_passwd_cb_t)(const char *sc, > const char *old, const char *new, > DBusMessage *msg, void *data); > > +typedef void (*ofono_ussd_request_cb_t)(int error, int dcs, > + const unsigned char *str, > + int str_len, void *data); > + > gboolean __ofono_ussd_ssc_register(struct ofono_ussd *ussd, const char *sc, > ofono_ussd_ssc_cb_t cb, void *data, > ofono_destroy_func destroy); > @@ -255,6 +275,12 @@ gboolean __ofono_ussd_passwd_register(struct ofono_ussd *ussd, const char *sc, > ofono_destroy_func destroy); > void __ofono_ussd_passwd_unregister(struct ofono_ussd *ussd, const char *sc); > > +gboolean __ofono_ussd_is_busy(struct ofono_ussd *ussd); > + > +int __ofono_ussd_initiate(struct ofono_ussd *ussd, int dcs, > + const unsigned char *str, int str_len, > + ofono_ussd_request_cb_t cb, void *user_data); > + > #include <ofono/netreg.h> > > typedef void (*ofono_netreg_status_notify_cb_t)(int status, int lac, int ci, > diff --git a/src/smsutil.h b/src/smsutil.h > index 3c6b3ae..a29dbb3 100644 > --- a/src/smsutil.h > +++ b/src/smsutil.h > @@ -148,9 +148,9 @@ enum sms_class { > }; > > enum sms_charset { > - SMS_CHARSET_7BIT = 0, > - SMS_CHARSET_8BIT = 1, > - SMS_CHARSET_UCS2 = 2, > + SMS_CHARSET_7BIT = 0x00, > + SMS_CHARSET_8BIT = 0x04, > + SMS_CHARSET_UCS2 = 0x08, Please don't mess with this enum, the USSD DCS has nothing to do with SMS. > }; > > enum sms_mwi_type { > diff --git a/src/ussd.c b/src/ussd.c > index 825d560..465272c 100644 > --- a/src/ussd.c > +++ b/src/ussd.c > @@ -34,6 +34,7 @@ > #include "ofono.h" > > #include "common.h" > +#include "smsutil.h" > > #define SUPPLEMENTARY_SERVICES_INTERFACE "org.ofono.SupplementaryServices" > > @@ -46,6 +47,15 @@ enum ussd_state { > USSD_STATE_RESPONSE_SENT, > }; > > +struct ussd_request { > + struct ofono_ussd *ussd; > + int dcs; > + unsigned char *str; > + int str_len; > + ofono_ussd_request_cb_t cb; > + void *user_data; > +}; > + > struct ofono_ussd { > int state; > DBusMessage *pending; > @@ -56,6 +66,7 @@ struct ofono_ussd { > const struct ofono_ussd_driver *driver; > void *driver_data; > struct ofono_atom *atom; > + struct ussd_request *req; > }; > > struct ssc_entry { > @@ -306,15 +317,55 @@ static void ussd_change_state(struct ofono_ussd *ussd, int state) > "State", DBUS_TYPE_STRING, &value); > } > > -void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) > +static void ussd_request_finish(struct ofono_ussd *ussd, int error, int dcs, > + const unsigned char *str, int str_len) > +{ > + struct ussd_request *req = ussd->req; > + > + if (req && req->cb) { > + req->cb(error, dcs, str, str_len, req->user_data); > + g_free(req->str); > + g_free(req); > + ussd->req = NULL; > + } > +} > + > +static int ussd_status_to_failure_code(int status) > +{ > + switch (status) { > + case OFONO_USSD_STATUS_TIMED_OUT: > + return OFONO_USSD_FAILURE_TIMED_OUT; > + case OFONO_USSD_STATUS_NOT_SUPPORTED: > + return OFONO_USSD_FAILURE_RETURN_ERROR; > + } > + > + return OFONO_USSD_FAILURE_NONE; > +} > + > +void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, > + const unsigned char *str, int str_len) > { > DBusConnection *conn = ofono_dbus_get_connection(); > const char *ussdstr = "USSD"; > + const char *utf8_str = NULL; > const char sig[] = { DBUS_TYPE_STRING, 0 }; > DBusMessage *reply; > DBusMessageIter iter; > DBusMessageIter variant; > > + if (ussd->req && > + (status == OFONO_USSD_STATUS_NOTIFY || > + status == OFONO_USSD_STATUS_TERMINATED || > + status == OFONO_USSD_STATUS_TIMED_OUT || > + status == OFONO_USSD_STATUS_NOT_SUPPORTED)) { > + > + ussd_request_finish(ussd, ussd_status_to_failure_code(status), > + dcs, str, str_len); > + > + ussd_change_state(ussd, USSD_STATE_IDLE); > + return; > + } > + > if (status == OFONO_USSD_STATUS_NOT_SUPPORTED) { > ussd_change_state(ussd, USSD_STATE_IDLE); > > @@ -334,15 +385,24 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) > reply = __ofono_error_timed_out(ussd->pending); > goto out; > } > + > + if (str) { > + if (dcs == -1) > + utf8_str = (const char *) str; > + else > + utf8_str = ussd_decode(dcs, str_len, str); > + } > + > + if (!utf8_str) { > + utf8_str = ""; > + status = OFONO_USSD_STATUS_NOTIFY; > + } > > /* TODO: Rework this in the Agent framework */ > if (ussd->state == USSD_STATE_ACTIVE) { > > reply = dbus_message_new_method_return(ussd->pending); > > - if (!str) > - str = ""; > - > dbus_message_iter_init_append(reply, &iter); > > dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, > @@ -352,7 +412,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) > &variant); > > dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING, > - &str); > + &utf8_str); > > dbus_message_iter_close_container(&iter, &variant); > > @@ -364,10 +424,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) > } else if (ussd->state == USSD_STATE_RESPONSE_SENT) { > reply = dbus_message_new_method_return(ussd->pending); > > - if (!str) > - str = ""; > - > - dbus_message_append_args(reply, DBUS_TYPE_STRING, &str, > + dbus_message_append_args(reply, DBUS_TYPE_STRING, &utf8_str, > DBUS_TYPE_INVALID); > > if (status == OFONO_USSD_STATUS_ACTION_REQUIRED) > @@ -387,9 +444,6 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, const char *str) > signal_name = "NotificationReceived"; > } > > - if (!str) > - str = ""; > - > g_dbus_emit_signal(conn, path, > SUPPLEMENTARY_SERVICES_INTERFACE, signal_name, > DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID); > @@ -436,6 +490,7 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg, > { > struct ofono_ussd *ussd = data; > const char *str; > + int dcs = -1; > > if (ussd->pending) > return __ofono_error_busy(msg); > @@ -465,7 +520,8 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg, > > ussd->pending = dbus_message_ref(msg); > > - ussd->driver->request(ussd, str, ussd_callback, ussd); > + ussd->driver->request(ussd, dcs, (const guint8 *) str, strlen(str), > + ussd_callback, ussd); > > return NULL; > } > @@ -496,6 +552,7 @@ static DBusMessage *ussd_respond(DBusConnection *conn, DBusMessage *msg, > { > struct ofono_ussd *ussd = data; > const char *str; > + int dcs = -1; > > if (ussd->pending) > return __ofono_error_busy(msg); > @@ -515,7 +572,8 @@ static DBusMessage *ussd_respond(DBusConnection *conn, DBusMessage *msg, > > ussd->pending = dbus_message_ref(msg); > > - ussd->driver->request(ussd, str, ussd_response_callback, ussd); > + ussd->driver->request(ussd, dcs, (const guint8 *) str, strlen(str), > + ussd_response_callback, ussd); > > return NULL; > } > @@ -543,6 +601,9 @@ static void ussd_cancel_callback(const struct ofono_error *error, void *data) > reply = dbus_message_new_method_return(ussd->cancel); > __ofono_dbus_pending_reply(&ussd->cancel, reply); > > + if (ussd->req) > + ussd_request_finish(ussd, -1, USSD_STATE_USER_ACTION, NULL, -1); > + > ussd_change_state(ussd, USSD_STATE_IDLE); > } > > @@ -741,3 +802,45 @@ void *ofono_ussd_get_data(struct ofono_ussd *ussd) > { > return ussd->driver_data; > } > + > +static void ussd_request_callback(const struct ofono_error *error, void *data) > +{ > + struct ofono_ussd *ussd = data; > + > + if (error->type != OFONO_ERROR_TYPE_NO_ERROR) > + ussd_request_finish(ussd, OFONO_USSD_FAILURE_RETURN_ERROR, -1, NULL, -1); > + else > + ussd_change_state(ussd,USSD_STATE_ACTIVE); > +} > + > +gboolean __ofono_ussd_is_busy(struct ofono_ussd *ussd) > +{ > + if (ussd->pending || ussd->state != USSD_STATE_IDLE || ussd->req) > + return TRUE; > + > + return FALSE; > +} > + > +int __ofono_ussd_initiate(struct ofono_ussd *ussd, int dcs, > + const unsigned char *str, int str_len, > + ofono_ussd_request_cb_t cb, void *user_data) > +{ > + struct ussd_request *req; > + > + if (!ussd->driver->request) > + return -ENOSYS; > + > + req = g_try_new0(struct ussd_request, 1); > + req->dcs = dcs; > + req->str = g_memdup(str, str_len); > + req->str_len = str_len; > + req->cb = cb; > + req->user_data = user_data; > + > + ussd->req = req; > + > + ussd->driver->request(ussd, dcs, str, str_len, ussd_request_callback, > + ussd); > + > + return 0; > +} Regards, -Denis ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH 1/2] Internal and Driver API changes for Send USSD proactive command 2010-09-07 14:54 ` [PATCH 1/2] Internal and Driver API " Denis Kenzior @ 2010-09-07 17:29 ` Jeevaka.Badrappan 2010-09-07 22:56 ` Denis Kenzior 0 siblings, 1 reply; 8+ messages in thread From: Jeevaka.Badrappan @ 2010-09-07 17:29 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 4229 bytes --] Hi Denis, > > - else if (charset == SMS_CHARSET_8BIT) { > - /* TODO: Figure out what to do with 8 bit data */ > + if (charset == SMS_CHARSET_7BIT) { > + switch (data->charset) { > + case AT_UTIL_CHARSET_GSM: > + msg = convert_gsm_to_utf8((const guint8 *) content, > + strlen(content), NULL, &msg_len, 0); > + break; > + case AT_UTIL_CHARSET_PCCP437: > + case AT_UTIL_CHARSET_PCDN: > + case AT_UTIL_CHARSET_8859_1: > + case AT_UTIL_CHARSET_IRA: > + default: > + DBG("charset:%d not supported", data->charset); > + status = 4; /* Not supported */ > + } > + } else if (charset == SMS_CHARSET_8BIT) { > + /* MT/TA converts each 8 bit octet into two IRA character > + * long hexadecimal number (e.g. octet with integer value 42 > + * is presented to TE as two characters 2A (IRA 50 and 65)) > + */ > ofono_error("8-bit coded USSD response received"); > status = 4; /* Not supported */ > If we're not handling 8BIT USSDs, what exactly is the point of this exercise? Based on the dcs received from network and TE character set chosen, modem converts the received ussd response string. DCS_from_network TE_char_set Conversion done by Modem GSM 7-bit default PCCP437 GSM 7-bit default alphabet to PCCP437 PCDN GSM 7-bit default alphabet to PCDN ISO8859-1 GSM 7-bit default alphabet to 8859-1 IRA GSM 7-bit default alphabet to IRA GSM 7-bit None 8-bit - In this case, modem doesn't relay on the chosen TE character set. Modem converts each 8-bit octet into two IRA character long hexadecimal number I left the 8-bit USSD case unhandled, as I didn't find the conversion function for converting the IRA to the 8-bit data. Also 3GPP TS Specification, doesn't have any information on what needs to be done if the dcs received is UCS2. > - g_free(converted); > + ofono_ussd_notify(ussd, status, -1, (const guint8 *) msg, (int) > +msg_len); > Err, why are we passing UTF8 text as binary data + len? I'm lost. You either do UTF8 always, or full binary always. > > - converted = convert_utf8_to_gsm(str, strlen(str), NULL, &written, 0); > + if (dcs == -1) { > + converted = convert_utf8_to_gsm((const char *) str, str_len, NULL, > +&written, 0); > Get rid of this. The core either passes a raw USSD data or UTF8. > There's no mix and match here. As you know, USSD string coming via dbus interface will be in UTF8 format. Whereas, USSD string coming from the USAT will be in binary data + len. Do you mean to say that the core will convert the UTF-8 USSD string coming from the user(dbus interface) into GSM 8-bit and send it to the driver side? > - if (written > max_len) > - goto error; > + /* As per 3GPP TS 23.038, When this character set is used, > + * the characters of the message are packed in octets as shown in section 6.1.2.1.1, > + * and the message can consist of up to 160 characters. > + */ > + pack_7bit_own_buf(converted, written, 0, TRUE, > + &num_packed, 0, coded_str); > CUSD does not take packed GSM data, so I'm lost here As you know, when a message is coded in 7-bit default alphabet, the message can then consists of upto 182 user charcters. I just packed it so that the maximum message length will be 160 characters for all the cases. Do you mean, CUSD won't take packed GSM data? > > enum sms_charset { > - SMS_CHARSET_7BIT = 0, > - SMS_CHARSET_8BIT = 1, > - SMS_CHARSET_UCS2 = 2, > + SMS_CHARSET_7BIT = 0x00, > + SMS_CHARSET_8BIT = 0x04, > + SMS_CHARSET_UCS2 = 0x08, > Please don't mess with this enum, the USSD DCS has nothing to do with SMS. I agree the SMS dcs is different from the CBS dcs. But this enumeration is just used within ofono for knowing the coding scheme used. Currently, we are using this enumeration in SMS, CBS and USSD as well. I have just changed the values so that it matches with the USAT values. Since, this enumeration is used to just determine the character sets, I didn't find any valid reason why we have to introduce a new enumeration just with the USAT specific values. Thanks and Regards, Jeevaka ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] Internal and Driver API changes for Send USSD proactive command 2010-09-07 17:29 ` Jeevaka.Badrappan @ 2010-09-07 22:56 ` Denis Kenzior 0 siblings, 0 replies; 8+ messages in thread From: Denis Kenzior @ 2010-09-07 22:56 UTC (permalink / raw) To: ofono [-- Attachment #1: Type: text/plain, Size: 5637 bytes --] Hi Jeevaka, On 09/07/2010 12:29 PM, Jeevaka.Badrappan(a)elektrobit.com wrote: > > Hi Denis, > >> >> - else if (charset == SMS_CHARSET_8BIT) { >> - /* TODO: Figure out what to do with 8 bit data */ >> + if (charset == SMS_CHARSET_7BIT) { >> + switch (data->charset) { >> + case AT_UTIL_CHARSET_GSM: >> + msg = convert_gsm_to_utf8((const guint8 *) > content, >> + strlen(content), NULL, &msg_len, > 0); >> + break; >> + case AT_UTIL_CHARSET_PCCP437: >> + case AT_UTIL_CHARSET_PCDN: >> + case AT_UTIL_CHARSET_8859_1: >> + case AT_UTIL_CHARSET_IRA: >> + default: >> + DBG("charset:%d not supported", data->charset); >> + status = 4; /* Not supported */ >> + } >> + } else if (charset == SMS_CHARSET_8BIT) { >> + /* MT/TA converts each 8 bit octet into two IRA > character >> + * long hexadecimal number (e.g. octet with integer value > 42 >> + * is presented to TE as two characters 2A (IRA 50 and > 65)) >> + */ >> ofono_error("8-bit coded USSD response received"); >> status = 4; /* Not supported */ > >> If we're not handling 8BIT USSDs, what exactly is the point of this > exercise? > > Based on the dcs received from network and TE character set chosen, > modem converts the received ussd response string. > > DCS_from_network TE_char_set > Conversion done by Modem > GSM 7-bit default > PCCP437 GSM 7-bit > default alphabet to PCCP437 > PCDN GSM > 7-bit default alphabet to PCDN > ISO8859-1 GSM > 7-bit default alphabet to 8859-1 > IRA GSM > 7-bit default alphabet to IRA > GSM 7-bit None The basic problem here is that the modem should be configured into UTF8 or GSM mode. All other character sets are pointless. This also runs into trouble when the modem supports UCS2. Phonebook driver has to switch to UCS2 when importing the phonebook, so if a USSD arrives during the import, the results are undefined and most likely vendor specific. > > 8-bit - In this case, modem doesn't relay on the chosen TE > character set. Modem converts each 8-bit octet into > two IRA character long hexadecimal number > > I left the 8-bit USSD case unhandled, as I didn't find the conversion > function for converting the IRA to the 8-bit data. > Also 3GPP TS Specification, doesn't have any information on what needs > to be done if the dcs received is UCS2. For the 8-bit case it is just raw data given in hex. E.g. 4142 -> 0x41 0x42 -> AB in ASCII. UCS2 is completely undefined by the specification and is modem specific. >> Get rid of this. The core either passes a raw USSD data or UTF8. >> There's no mix and match here. > > As you know, USSD string coming via dbus interface will be in UTF8 > format. Whereas, USSD string > coming from the USAT will be in binary data + len. > > Do you mean to say that the core will convert the UTF-8 USSD string > coming from the user(dbus interface) into GSM 8-bit and send it to the > driver side? > Correct. The core has to handle this. If the user enters simple text, that should be converted into GSM first and packed, before giving it to the driver. For ISI the modem accepts raw data + dcs, so the data can be simply copied and sent as-is. For AT modems you will have to unpack from 7bit packed into 7bit unpacked and send it to the modem. Same thing in the reverse direction. >> - if (written > max_len) >> - goto error; >> + /* As per 3GPP TS 23.038, When this character set is > used, >> + * the characters of the message are packed in octets as > shown in section 6.1.2.1.1, >> + * and the message can consist of up to 160 characters. >> + */ >> + pack_7bit_own_buf(converted, written, 0, TRUE, >> + &num_packed, 0, coded_str); > >> CUSD does not take packed GSM data, so I'm lost here > > As you know, when a message is coded in 7-bit default alphabet, the > message can then consists of upto 182 user charcters. > I just packed it so that the maximum message length will be 160 > characters for all the cases. Do you mean, CUSD won't take packed GSM > data? CUSD does not take packed data. More over, sending 8-bit data is not well defined by the specification. In the best case the 8-bit data will have to be hex-encoded. Handling of UCS2 data is undefined. > >> >> enum sms_charset { >> - SMS_CHARSET_7BIT = 0, >> - SMS_CHARSET_8BIT = 1, >> - SMS_CHARSET_UCS2 = 2, >> + SMS_CHARSET_7BIT = 0x00, >> + SMS_CHARSET_8BIT = 0x04, >> + SMS_CHARSET_UCS2 = 0x08, > >> Please don't mess with this enum, the USSD DCS has nothing to do with > SMS. > > I agree the SMS dcs is different from the CBS dcs. But this enumeration > is just used within ofono for knowing the coding scheme used. > Currently, we are using this enumeration in SMS, CBS and USSD as well. I > have just changed the values so that it matches with the USAT > values. Since, this enumeration is used to just determine the character > sets, I didn't find any valid reason why we have to introduce a > new enumeration just with the USAT specific values. I know what you're trying to do, and you are abusing the system here. In fact, messing with this enum is not needed at all. The only place where this information is truly required is in the callback that composes the USSD terminal response. E.g. maps between the USSD dcs of 7bit/8bit/ucs2 into the Text data object DCS sent to the sim via the Terminal Response. So I agree, a new enum is not required, and neither is messing with this one. Regards, -Denis ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-09-07 22:56 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-09-06 9:21 [PATCH 1/2] Internal and Driver API changes for Send USSD proactive command Jeevaka Badrappan 2010-09-06 9:21 ` [PATCH 2/2] stk and stkutil " Jeevaka Badrappan 2010-09-06 23:54 ` Andrzej Zaborowski 2010-09-07 4:10 ` [PATCH 2/2] stk and stkutil changes for Send USSD proactivecommand Jeevaka.Badrappan 2010-09-07 14:58 ` [PATCH 2/2] stk and stkutil changes for Send USSD proactive command Denis Kenzior 2010-09-07 14:54 ` [PATCH 1/2] Internal and Driver API " Denis Kenzior 2010-09-07 17:29 ` Jeevaka.Badrappan 2010-09-07 22:56 ` Denis Kenzior
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.