From e613c686a6d87d2debb61b0bed951ec12e535d30 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 5 Nov 2010 09:05:23 -0500 Subject: sim: Don't read EFest if the file is not available --- src/sim.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/sim.c b/src/sim.c index 2ee2b29e..0792b1ca 100644 --- a/src/sim.c +++ b/src/sim.c @@ -1434,11 +1434,19 @@ static void sim_efust_read_cb(int ok, int length, int record, sim->efust = g_memdup(data, length); sim->efust_length = length; - ofono_sim_read(sim, SIM_EFEST_FILEID, - OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, - sim_efest_read_cb, sim); + /* + * Check whether the SIM provides EFest file + * According to 31.102, section 4.2.24 and 4.2.44 the EFest file + * must be present if EFfdn or EFbdn are present + */ + if (sim_ust_is_available(sim->efust, sim->efust_length, + SIM_UST_SERVICE_ENABLED_SERVICE_TABLE)) { + ofono_sim_read(sim, SIM_EFEST_FILEID, + OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, + sim_efest_read_cb, sim); - return; + return; + } out: sim_retrieve_imsi(sim); -- cgit v1.2.3