diff options
| author | Andrzej Zaborowski <andrew.zaborowski@intel.com> | 2010-06-07 12:08:33 +0200 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-06-09 13:07:09 -0500 |
| commit | 4dcb3fed2a1b3ec3f55d38bd12eb22508fac6a3f (patch) | |
| tree | 09f53faa82462fa7bd6440287db40f6e9efe99d4 /src/simutil.c | |
| parent | 9f925b3620efbc88b31d6e651b3306a0b980e810 (diff) | |
| download | ofono-4dcb3fed2a1b3ec3f55d38bd12eb22508fac6a3f.tar.bz2 | |
simutil: Fix MMC MNC encoding for 2-digit MNCs.
Diffstat (limited to 'src/simutil.c')
| -rw-r--r-- | src/simutil.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/simutil.c b/src/simutil.c index 7291729e..3315299b 100644 --- a/src/simutil.c +++ b/src/simutil.c @@ -117,6 +117,8 @@ static struct sim_ef_info ef_db[] = { { 0x6FE3, 0x0000, BINARY, 18, PIN, PIN }, }; +static inline int to_semi_oct(char in); + void simple_tlv_iter_init(struct simple_tlv_iter *iter, const unsigned char *pdu, unsigned int len) { @@ -844,19 +846,14 @@ void sim_parse_mcc_mnc(const guint8 *bcd, char *mcc, char *mnc) void sim_encode_mcc_mnc(guint8 *out, const char *mcc, const char *mnc) { - char str[7] = "ffffff"; - - str[0] = mcc[0]; - str[1] = mcc[1]; - if (mcc[2]) - str[2] = mcc[2]; + out[0] = to_semi_oct(mcc[0]); + out[0] |= to_semi_oct(mcc[1]) << 4; - str[4] = mnc[0]; - str[5] = mnc[1]; - if (mnc[2]) - str[3] = mnc[2]; + out[1] = mcc[2] ? to_semi_oct(mcc[2]) : 0xf; + out[1] |= (mnc[2] ? to_semi_oct(mnc[2]) : 0xf) << 4; - encode_bcd_number(str, out); + out[2] = to_semi_oct(mnc[0]); + out[2] |= to_semi_oct(mnc[1]) << 4; } static gint spdi_operator_compare(gconstpointer a, gconstpointer b) |