Change in pysim[master]: ts_51_011: Convert EF_ADN and EF_ACC to Construct

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27184 ) Change subject: ts_51_011: Convert EF_ADN and EF_ACC to Construct ...................................................................... ts_51_011: Convert EF_ADN and EF_ACC to Construct this has the benefit of providing encoding support for free. Change-Id: I31c118082e92892486c3688de2197c0c6dd2750e --- M pySim/ts_51_011.py 1 file changed, 7 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index c29b54c..890b85b 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -343,13 +343,12 @@ class EF_ADN(LinFixedEF): def __init__(self, fid='6f3a', sfid=None, name='EF.ADN', desc='Abbreviated Dialing Numbers', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={14, 30}, **kwargs) - - def _decode_record_bin(self, raw_bin_data): - alpha_id_len = len(raw_bin_data) - 14 - alpha_id = raw_bin_data[:alpha_id_len] - u = unpack('!BB10sBB', raw_bin_data[-14:]) - return {'alpha_id': alpha_id, 'len_of_bcd': u[0], 'ton_npi': u[1], - 'dialing_nr': u[2], 'cap_conf_id': u[3], 'ext1_record_id': u[4]} + self._construct = Struct('alpha_id'/COptional(GsmStringAdapter(Rpad(Bytes(this._.total_len-14)), codec='ascii')), + 'len_of_bcd'/Int8ub, + 'ton_npi'/TonNpi, + 'dialing_nr'/BcdAdapter(Rpad(Bytes(10))), + 'cap_conf_id'/Int8ub, + 'ext1_record_id'/Int8ub) # TS 51.011 Section 10.5.5 class EF_SMS(LinFixedEF): @@ -656,12 +655,7 @@ def __init__(self, fid='6f78', sfid=None, name='EF.ACC', desc='Access Control Class', size={2, 2}, **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size, **kwargs) - - def _decode_bin(self, raw_bin): - return {'acc': unpack('!H', raw_bin)[0]} - - def _encode_bin(self, abstract): - return pack('!H', abstract['acc']) + self._construct = HexAdapter(Bytes(2)) # TS 51.011 Section 10.3.16 class EF_LOCI(TransparentEF): 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I31c118082e92892486c3688de2197c0c6dd2750e Gerrit-Change-Number: 27184 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged