Make PNN / OPL work.

This commit is contained in:
Andrzej Zaborowski 2009-07-18 01:42:31 +02:00 committed by Denis Kenzior
parent 8469412e7b
commit 983d16ca37
2 changed files with 10 additions and 6 deletions

View File

@ -1206,12 +1206,12 @@ static void sim_opl_read_cb(struct ofono_modem *modem, int ok,
if (structure != OFONO_SIM_FILE_STRUCTURE_FIXED)
return;
if (length < 8 || record_length < 8 || length < record_length)
if (record_length < 8 || length < record_length)
return;
total = length / record_length;
sim_eons_add_pnn_record(netreg->eons, record, data, record_length);
sim_eons_add_opl_record(netreg->eons, data, record_length);
if (record != total)
return;

View File

@ -338,13 +338,17 @@ static struct sim_eons_operator_info *
for (i = 0; i < OFONO_MAX_MCC_LENGTH; i++)
if (mcc[i] != opl->mcc[i] &&
!(opl->mcc[i] == 'd' && mcc[i]))
continue;
!(opl->mcc[i] == 'b' && mcc[i]))
break;
if (i < OFONO_MAX_MCC_LENGTH)
continue;
for (i = 0; i < OFONO_MAX_MNC_LENGTH; i++)
if (mnc[i] != opl->mnc[i] &&
!(opl->mnc[i] == 'd' && mnc[i]))
continue;
!(opl->mnc[i] == 'b' && mnc[i]))
break;
if (i < OFONO_MAX_MNC_LENGTH)
continue;
if (opl->lac_tac_low == 0 && opl->lac_tac_high == 0xfffe)
break;