Function reads file length, record length, file status etc, but doesn't retrieve any EF-contents. Request for EFadn is added, but this commit just debugs the response. --- include/sim.h | 11 +++++++++++ src/sim.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/include/sim.h b/include/sim.h index 42b19bd..8dd6131 100644 --- a/include/sim.h +++ b/include/sim.h @@ -82,6 +82,7 @@ typedef void (*ofono_sim_file_info_cb_t)(const struct ofono_error *error, enum ofono_sim_file_structure structure, int recordlength, const unsigned char access[3], + unsigned char file_status, void *data); typedef void (*ofono_sim_read_cb_t)(const struct ofono_error *error, @@ -206,6 +207,16 @@ int ofono_sim_write(struct ofono_sim *sim, int id, int ofono_sim_read_bytes(struct ofono_sim *sim, int id, unsigned short offset, unsigned short num_bytes, ofono_sim_file_read_cb_t cb, void *data); + +/* + * This function reads only general info from SIM-file with + * requested id (file length, record length, file status etc), + * not any records. + */ +int ofono_sim_read_info(struct ofono_sim *sim, int id, + enum ofono_sim_file_structure expected, + ofono_sim_file_read_cb_t cb, void *data); + #ifdef __cplusplus } #endif diff --git a/src/sim.c b/src/sim.c index 6f10d4c..f0633bb 100644 --- a/src/sim.c +++ b/src/sim.c @@ -1183,6 +1183,15 @@ static void sim_efphase_read_cb(int ok, int length, int record, sim->phase = data[0]; } +static void sim_info_read_cb(int ok, int length, int record, + const unsigned char *file_status, + int record_length, void *userdata) +{ + DBG("OK: %d, length: %d, record: %d, \ + file_status: %x, record_length: %d", + ok, length, record, file_status[0], record_length); +} + static void sim_initialize_after_pin(struct ofono_sim *sim) { ofono_sim_read(sim, SIM_EFPHASE_FILEID, @@ -1530,7 +1539,7 @@ int ofono_sim_read_bytes(struct ofono_sim *sim, int id, return -1; return sim_fs_read(sim->simfs, id, OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, - offset, num_bytes, cb, data); + FALSE, offset, num_bytes, cb, data); } int ofono_sim_read(struct ofono_sim *sim, int id, @@ -1540,7 +1549,24 @@ int ofono_sim_read(struct ofono_sim *sim, int id, if (sim == NULL) return -1; - return sim_fs_read(sim->simfs, id, expected_type, 0, 0, cb, data); + return sim_fs_read(sim->simfs, id, expected_type, FALSE, + 0, 0, cb, data); +} + +int ofono_sim_read_info(struct ofono_sim *sim, int id, + enum ofono_sim_file_structure expected_type, + ofono_sim_file_read_cb_t cb, void *data) +{ + /* + * Retrieve EF-info only (file length, record length, file status etc). + * So this function doesn't retrieve actual EF-contents. + */ + + if (sim == NULL) + return -1; + + return sim_fs_read(sim->simfs, id, expected_type, TRUE, + 0, 0, cb, data); } int ofono_sim_write(struct ofono_sim *sim, int id, -- 1.6.3.3

--- src/simutil.c | 5 ++++- src/simutil.h | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/simutil.c b/src/simutil.c index 65ce1ac..04ba975 100644 --- a/src/simutil.c +++ b/src/simutil.c @@ -1405,7 +1405,8 @@ gboolean sim_parse_3g_get_response(const unsigned char *data, int len, gboolean sim_parse_2g_get_response(const unsigned char *response, int len, int *file_len, int *record_len, - int *structure, unsigned char *access) + int *structure, unsigned char *access, + unsigned char *file_status) { if (len < 14 || response[6] != 0x04) return FALSE; @@ -1420,6 +1421,8 @@ gboolean sim_parse_2g_get_response(const unsigned char *response, int len, access[1] = response[9]; access[2] = response[10]; + *file_status = response[11]; + if (response[13] == 0x01 || response[13] == 0x03) *record_len = response[14]; else diff --git a/src/simutil.h b/src/simutil.h index 54b99a0..bd8e4ac 100644 --- a/src/simutil.h +++ b/src/simutil.h @@ -57,6 +57,14 @@ enum sim_file_access { SIM_FILE_ACCESS_NEVER = 15, }; +/* 51.011 Section 9.3 */ +enum sim_file_status { + SIM_FILE_STATUS_INVALID = 0x00, + SIM_FILE_STATUS_NOT_INVALID = 0x01, + SIM_FILE_STATUS_INVALID_BUT_ACCESS = 0x04, + SIM_FILE_STATUS_NOT_AVAILABLE = 0xFF, +}; + /* 131.102 Section 4.2.8 */ enum sim_ust_service { SIM_UST_SERVICE_LOCAL_PHONE_BOOK = 0, @@ -425,7 +433,8 @@ gboolean sim_parse_3g_get_response(const unsigned char *data, int len, gboolean sim_parse_2g_get_response(const unsigned char *response, int len, int *file_len, int *record_len, - int *structure, unsigned char *access); + int *structure, unsigned char *access, + unsigned char *file_status); gboolean sim_ust_is_available(unsigned char *service_ust, unsigned char len, enum sim_ust_service index); -- 1.6.3.3

--- drivers/isimodem/sim.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c index e2ea275..bd7e9d6 100644 --- a/drivers/isimodem/sim.c +++ b/drivers/isimodem/sim.c @@ -54,6 +54,7 @@ struct file_info { int structure; int record_length; unsigned char access[3]; + unsigned char file_status; }; /* Returns file info */ @@ -66,7 +67,7 @@ static gboolean fake_file_info(gpointer user) DBG("Returning static file_info for %04x", fi->fileid); CALLBACK_WITH_SUCCESS(cb, fi->length, fi->structure, fi->record_length, - fi->access, cbd->data); + fi->access, fi->file_status, cbd->data); g_free(cbd); return FALSE; } @@ -76,8 +77,10 @@ static void isi_read_file_info(struct ofono_sim *sim, int fileid, { int i; static struct file_info const info[] = { - { SIM_EFSPN_FILEID, 17, 0, 0, { 0x0f, 0xff, 0xff } }, - { SIM_EF_ICCID_FILEID, 10, 0, 0, { 0x0f, 0xff, 0xff } }, + { SIM_EFSPN_FILEID, 17, 0, 0, { 0x0f, 0xff, 0xff }, + SIM_FILE_STATUS_NOT_INVALID }, + { SIM_EF_ICCID_FILEID, 10, 0, 0, { 0x0f, 0xff, 0xff }, + SIM_FILE_STATUS_NOT_INVALID }, }; int N = sizeof(info) / sizeof(info[0]); struct isi_cb_data *cbd; @@ -91,7 +94,8 @@ static void isi_read_file_info(struct ofono_sim *sim, int fileid, } DBG("Not implemented (fileid = %04x)", fileid); - CALLBACK_WITH_FAILURE(cb, -1, -1, -1, NULL, data); + CALLBACK_WITH_FAILURE(cb, -1, -1, -1, NULL, + SIM_FILE_STATUS_NOT_AVAILABLE, data); } static gboolean spn_resp_cb(GIsiClient *client, -- 1.6.3.3

If FD is enabled, halt SIM initialization procedure. New property (FixedDialing) is added. If FD is enabled, this has been signalled via DBUS. --- src/sim.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 72 insertions(+), 9 deletions(-) diff --git a/src/sim.c b/src/sim.c index f0633bb..4836f55 100644 --- a/src/sim.c +++ b/src/sim.c @@ -71,6 +71,7 @@ struct ofono_sim { unsigned char efest_length; unsigned char *efsst; unsigned char efsst_length; + gboolean fixed_dialing; char *imsi; @@ -307,6 +308,9 @@ static DBusMessage *sim_get_properties(DBusConnection *conn, ofono_dbus_dict_append(&dict, "SubscriberIdentity", DBUS_TYPE_STRING, &sim->imsi); + ofono_dbus_dict_append(&dict, "FixedDialing", DBUS_TYPE_BOOLEAN, + &sim->fixed_dialing); + if (sim->mnc_length) { char mcc[OFONO_MAX_MCC_LENGTH + 1]; char mnc[OFONO_MAX_MNC_LENGTH + 1]; @@ -1061,12 +1065,41 @@ static void sim_retrieve_imsi(struct ofono_sim *sim) sim->driver->read_imsi(sim, sim_imsi_cb, sim); } +static void sim_info_read_cb(int ok, int length, int record, + const unsigned char *file_status, + int record_length, void *userdata) +{ + struct ofono_sim *sim = userdata; + DBusConnection *conn = ofono_dbus_get_connection(); + const char *path = __ofono_atom_get_path(sim->atom); + + if (!ok) + goto out; + + if (*file_status != SIM_FILE_STATUS_NOT_INVALID) { + + sim->fixed_dialing = TRUE; + + ofono_dbus_signal_property_changed(conn, path, + OFONO_SIM_MANAGER_INTERFACE, + "FixedDialing", + DBUS_TYPE_BOOLEAN, + &sim->fixed_dialing); + return; + } + +out: + sim_retrieve_imsi(sim); +} + static void sim_efsst_read_cb(int ok, int length, int record, const unsigned char *data, int record_length, void *userdata) { struct ofono_sim *sim = userdata; + sim->fixed_dialing = FALSE; + if (!ok) goto out; @@ -1078,6 +1111,21 @@ static void sim_efsst_read_cb(int ok, int length, int record, sim->efsst = g_memdup(data, length); sim->efsst_length = length; + /* + * Check if Fixed Dialing is enabled in the SIM-card + * (TS 11.11/TS 51.011, Section 9.3: FDN capability request). + * If FDN is activated and ADN is invalidated, + * don't continue initialization routine. + */ + if (sim_sst_is_active(sim->efsst, sim->efsst_length, + SIM_SST_SERVICE_FDN)) { + + ofono_sim_read_info(sim, SIM_EFADN_FILEID, + OFONO_SIM_FILE_STRUCTURE_FIXED, + sim_info_read_cb, sim); + return; + } + out: sim_retrieve_imsi(sim); } @@ -1087,6 +1135,8 @@ static void sim_efest_read_cb(int ok, int length, int record, int record_length, void *userdata) { struct ofono_sim *sim = userdata; + DBusConnection *conn = ofono_dbus_get_connection(); + const char *path = __ofono_atom_get_path(sim->atom); if (!ok) goto out; @@ -1099,6 +1149,24 @@ static void sim_efest_read_cb(int ok, int length, int record, sim->efest = g_memdup(data, length); sim->efest_length = length; + /* + * Check if Fixed Dialing is enabled in the USIM-card + * (TS 31.102, Section 5.3.2: FDN capability request). + * If FDN is activated, don't continue initialization routine. + */ + if (sim_est_is_active(sim->efest, sim->efest_length, + SIM_EST_SERVICE_FDN)) { + + sim->fixed_dialing = TRUE; + + ofono_dbus_signal_property_changed(conn, path, + OFONO_SIM_MANAGER_INTERFACE, + "FixedDialing", + DBUS_TYPE_BOOLEAN, + &sim->fixed_dialing); + return; + } + out: sim_retrieve_imsi(sim); } @@ -1109,6 +1177,8 @@ static void sim_efust_read_cb(int ok, int length, int record, { struct ofono_sim *sim = userdata; + sim->fixed_dialing = FALSE; + if (!ok) goto out; @@ -1183,15 +1253,6 @@ static void sim_efphase_read_cb(int ok, int length, int record, sim->phase = data[0]; } -static void sim_info_read_cb(int ok, int length, int record, - const unsigned char *file_status, - int record_length, void *userdata) -{ - DBG("OK: %d, length: %d, record: %d, \ - file_status: %x, record_length: %d", - ok, length, record, file_status[0], record_length); -} - static void sim_initialize_after_pin(struct ofono_sim *sim) { ofono_sim_read(sim, SIM_EFPHASE_FILEID, @@ -1691,6 +1752,8 @@ static void sim_free_state(struct ofono_sim *sim) sim->efimg = NULL; sim->efimg_length = 0; } + + sim->fixed_dialing = FALSE; } void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted) -- 1.6.3.3

Hi Petteri, can we please make this a bit more verbose. I want to have some description on what this is intended for. So something along the line that you can detect that the SIM card is in fixed dialing mode. That this means you can make emergency calls only etc. So what is the impact for the application developers and what is expected from them todo. Remember that these docs are not just for us, they are for the application developers and need to be as verbose as possible. So they go off into the right direction ;) Regards Marcel

Hi Petteri, On 10/12/2010 10:18 AM, Petteri Tikander wrote: Using 0 instead of SIM_FILE_STATUS_NOT_INVALID seems better. Regards, -Denis

Hi Petteri, On 10/12/2010 10:18 AM, Petteri Tikander wrote: I suggest breaking this out into a separate patch and shuffling patch 4 and path 5 to follow after this patch. This patch should also come before the changes to ofono_sim_read_info. Is this function actually used? This sim fs changes should precede this patch. Regards, -Denis

Hi Petteri, On 10/12/2010 10:18 AM, Petteri Tikander wrote: I suggest moving the conn and path variable declarations into the if statement below. The empty line above is not needed Why do you reset fixed_dialing to FALSE here? I suggest moving these variable declarations to the if statement below. Again, why set this to FALSE here? This seems to be unrelated to the rest of the patch. And here? I suggest you simply reset fixed_dialing to FALSE inside sim_free_state Regards, -Denis

Hi Denis, and thanks for comments OK. I'll send in the next order (naturally updated versions according to the comments): 2/8, 3/8, 1/8 (header-change only), 4/8, 5/8, (6/8 applied), 1/8 (source code change: ofono_sim_read_info, no call-back handling), 7/8, 8/8 Yes, but not with that debug-content. I'll separate this patch into two patches (header/source), and send source-patch in logical order (where ofono_sim_read/ofono_sim_read_cb are really used without just debugging). OK.

Hi Denis, What about passing in 0 (INVALID)? Because I handle file_status as an bit-field, unsigned char-type seems to be proper type for file_status, not signed-type (for negative values). I didn't find file-status in the 3G-response encoding either. Well, status byte- coding gives similar return-value ('Selected file invalidated'). OK, for FDN- support I need to check the ADN-file status only from 2G-response. But later this issue can be implemented more properly. Br, Petteri