laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33151 )

Change subject: utils: Remove format_xplmn leading zeros in MNC ......................................................................

utils: Remove format_xplmn leading zeros in MNC

Change-Id: I803edafbd892c2b32b884d0b39fed61967a3d68b --- M pySim/utils.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 18 insertions(+), 10 deletions(-)

Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified

diff --git a/pySim/utils.py b/pySim/utils.py index 537014f..c6362fa 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -594,8 +594,8 @@ plmn_chars = 6 # first three bytes (six ascii hex chars) plmn_str = threehexbytes[:plmn_chars] - res['mcc'] = dec_mcc_from_plmn(plmn_str) - res['mnc'] = dec_mnc_from_plmn(plmn_str) + res['mcc'] = dec_mcc_from_plmn_str(plmn_str) + res['mnc'] = dec_mnc_from_plmn_str(plmn_str) return res

@@ -603,11 +603,10 @@ s = "" for rec_data in hexstr_to_Nbytearr(hexstr, 3): rec_info = dec_xplmn(rec_data) - if rec_info['mcc'] == 0xFFF and rec_info['mnc'] == 0xFFF: + if not rec_info['mcc'] and not rec_info['mnc']: rec_str = "unused" else: - rec_str = "MCC: %03d MNC: %03d" % ( - rec_info['mcc'], rec_info['mnc']) + rec_str = "MCC: %s MNC: %s" % (rec_info['mcc'], rec_info['mnc']) s += "\t%s # %s\n" % (rec_data, rec_str) return s

diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok index f9476df..45acd79 100644 --- a/pysim-testdata/sysmoISIM-SJA2.ok +++ b/pysim-testdata/sysmoISIM-SJA2.ok @@ -103,7 +103,7 @@ Service 59 - MMS User Connectivity Parameters

EHPLMN: - 00f110 # MCC: 001 MNC: 001 + 00f110 # MCC: 001 MNC: 01 ffffff # unused ffffff # unused ffffff # unused diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index b4277f4..b793cc0 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -105,10 +105,10 @@ Service 59 - MMS User Connectivity Parameters

FPLMN: - 62f201 # MCC: 262 MNC: 010 - 62f202 # MCC: 262 MNC: 020 - 62f203 # MCC: 262 MNC: 030 - 62f207 # MCC: 262 MNC: 070 + 62f201 # MCC: 262 MNC: 10 + 62f202 # MCC: 262 MNC: 20 + 62f203 # MCC: 262 MNC: 30 + 62f207 # MCC: 262 MNC: 70

USIM Service Table: 9e6b1dfc67f6580000 Service 2 - Fixed Dialling Numbers (FDN)