mirror of git://git.sysmocom.de/ofono
simfs: Add unknown sim phase check
This commit is contained in:
parent
a8c94c044f
commit
d06c03f099
|
@ -554,7 +554,8 @@ static gboolean sim_fs_op_check_cached(struct sim_fs *fs)
|
||||||
enum ofono_sim_file_structure structure;
|
enum ofono_sim_file_structure structure;
|
||||||
int record_length;
|
int record_length;
|
||||||
|
|
||||||
if (imsi == NULL || op->info_only == TRUE)
|
if (imsi == NULL || phase == OFONO_SIM_PHASE_UNKNOWN ||
|
||||||
|
op->info_only == TRUE)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
path = g_strdup_printf(SIM_CACHE_PATH, imsi, phase, op->id);
|
path = g_strdup_printf(SIM_CACHE_PATH, imsi, phase, op->id);
|
||||||
|
@ -836,6 +837,9 @@ char *sim_fs_get_cached_image(struct sim_fs *fs, int id)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
phase = ofono_sim_get_phase(fs->sim);
|
phase = ofono_sim_get_phase(fs->sim);
|
||||||
|
if (phase == OFONO_SIM_PHASE_UNKNOWN)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
path = g_strdup_printf(SIM_IMAGE_CACHE_PATH, imsi, phase, id);
|
path = g_strdup_printf(SIM_IMAGE_CACHE_PATH, imsi, phase, id);
|
||||||
|
|
||||||
TFR(stat(path, &st_buf));
|
TFR(stat(path, &st_buf));
|
||||||
|
@ -907,6 +911,9 @@ void sim_fs_check_version(struct sim_fs *fs)
|
||||||
int len;
|
int len;
|
||||||
char *path;
|
char *path;
|
||||||
|
|
||||||
|
if (imsi == NULL || phase == OFONO_SIM_PHASE_UNKNOWN)
|
||||||
|
return;
|
||||||
|
|
||||||
if (read_file(&version, 1, SIM_CACHE_VERSION, imsi, phase) == 1)
|
if (read_file(&version, 1, SIM_CACHE_VERSION, imsi, phase) == 1)
|
||||||
if (version == SIM_FS_VERSION)
|
if (version == SIM_FS_VERSION)
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue