June 2023 - gerrit-log - lists.osmocom.org

[L] Change in pysim[master]: Add support for encoding/decoding SMS in TPDU and SMPP format
by laforge 17 Jun '23

17 Jun '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33347 ) Change subject: Add support for encoding/decoding SMS in TPDU and SMPP format ...................................................................... Add support for encoding/decoding SMS in TPDU and SMPP format This is important when talking OTA with a SIM. Change-Id: I0d95e62c1e7183a7851d1fe38df0f5133830cb1f --- M contrib/jenkins.sh A ota_test.py M pySim/sms.py M requirements.txt M setup.py A sms_test.py A tests/test_sms.py 7 files changed, 547 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/33347/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0309877..185ade5 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -22,6 +22,7 @@ . venv/bin/activate pip install -r requirements.txt + pip install git+https://github.com/hologram-io/smpp.pdu # Execute automatically discovered unit tests first python -m unittest discover -v -s tests/ diff --git a/ota_test.py b/ota_test.py new file mode 100755 index 0000000..dad4de1 --- /dev/null +++ b/ota_test.py @@ -0,0 +1,57 @@ +#!/usr/bin/python3 + +from pySim.ota import * +from pySim.sms import SMS_SUBMIT, SMS_DELIVER, AddressField +from pySim.utils import h2b, h2b + +# KIC1 + KID1 of 8988211000000515398 +#KIC1 = h2b('C039ED58F7B81446105E79EBFD373038') +#KID1 = h2b('1799B93FE53F430BD7FD4810C77E1FDF') +#KIC3 = h2b('167F2576D64C8D41862954875C8D7979') +#KID3 = h2b('ECAE122B0E6AE4186D6487D50FDC0922') + +# KIC1 + KID1 of 8988211000000467285 +KIC1 = h2b('D0FDA31990D8D64178601317191669B4') +KID1 = h2b('D24EB461799C5E035C77451FD9404463') +KIC3 = h2b('C21DD66ACAC13CB3BC8B331B24AFB57B') +KID3 = h2b('12110C78E678C25408233076AA033615') + +od = OtaKeyset(algo_crypt='triple_des_cbc2', kic_idx=3, kic=KIC3, + algo_auth='triple_des_cbc2', kid_idx=3, kid=KID3) +print(od.crypt) +print(od.auth) + +dialect = OtaDialectSms() + +# RAM: B00000 +# SIM RFM: B00010 +# USIM RFM: B00011 +tar = h2b('B00011') + +spi = {'counter':'no_counter', 'ciphering':True, 'rc_cc_ds': 'cc', 'por_in_submit':False, + 'por_shall_be_ciphered':True, 'por_rc_cc_ds': 'cc', 'por': 'por_required'} +outp = dialect.encode_cmd(od, tar, spi, apdu=b'\x00\xa4\x00\x04\x02\x3f\x00') +print("result: %s" % b2h(outp)) + +with_udh = b'\x02\x70\x00' + outp +print("with_udh: %s" % b2h(with_udh)) + + +da = AddressField('12345678', 'unknown', 'isdn_e164') +#tpdu = SMS_SUBMIT(tp_udhi=True, tp_mr=0x23, tp_da=da, tp_pid=0x7F, tp_dcs=0xF6, tp_udl=3, tp_ud=with_udh) +tpdu = SMS_DELIVER(tp_udhi=True, tp_oa=da, tp_pid=0x7F, tp_dcs=0xF6, tp_scts=h2b('22705200000000'), tp_udl=3, tp_ud=with_udh) +print(tpdu) +print("tpdu: %s" % b2h(tpdu.toBytes())) + +spi = {'counter':'no_counter', 'ciphering':True, 'rc_cc_ds': 'cc', 'por_in_submit':False, + 'por_shall_be_ciphered':True, 'por_rc_cc_ds': 'cc', 'por': 'por_required'} +dialect.decode_resp(od, spi, '027100001c12b000119660ebdb81be189b5e4389e9e7ab2bc0954f963ad869ed7c') + +spi = {'counter':'no_counter', 'ciphering':True, 'rc_cc_ds': 'cc', 'por_in_submit':False, + 'por_shall_be_ciphered':False, 'por_rc_cc_ds': 'cc', 'por': 'por_required'} +dialect.decode_resp(od, spi, '027100001612b000110000000000000055f47118381175fb01612f') + +spi = {'counter':'no_counter', 'ciphering':True, 'rc_cc_ds': 'cc', 'por_in_submit':False, + 'por_shall_be_ciphered':False, 'por_rc_cc_ds': 'no_rc_cc_ds', 'por': 'por_required'} +dialect.decode_resp(od, spi, '027100000e0ab000110000000000000001612f') + diff --git a/pySim/sms.py b/pySim/sms.py index a281213..40b07b0 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -18,20 +18,24 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import typing -from construct import Int8ub, Bytes -from construct import Struct, Tell, this, RepeatUntil +import abc +from construct import Int8ub, Byte, Bytes, Bit, Flag, BitsInteger, Flag +from construct import Struct, Enum, Tell, BitStruct, this, Padding +from construct import Prefixed, GreedyRange, GreedyBytes +from pySim.construct import HexAdapter, BcdAdapter, TonNpi from pySim.utils import Hexstr, h2b, b2h +from smpp.pdu import pdu_types + BytesOrHex = typing.Union[Hexstr, bytes] class UserDataHeader: # a single IE in the user data header - ie_c = Struct('offset'/Tell, 'iei'/Int8ub, 'length'/Int8ub, 'data'/Bytes(this.length)) + ie_c = Struct('iei'/Int8ub, 'length'/Int8ub, 'value'/Bytes(this.length)) # parser for the full UDH: Length octet followed by sequence of IEs - _construct = Struct('udhl'/Int8ub, - # FIXME: somehow the below lambda is not working, we always only get the first IE? - 'ies'/RepeatUntil(lambda obj,lst,ctx: ctx._io.tell() > 1+this.udhl, ie_c)) + _construct = Struct('ies'/Prefixed(Int8ub, GreedyRange(ie_c)), + 'data'/GreedyBytes) def __init__(self, ies=[]): self.ies = ies @@ -50,4 +54,341 @@ if isinstance(inb, str): inb = h2b(inb) res = cls._construct.parse(inb) - return cls(res['ies']), inb[1+res['udhl']:] + return cls(res['ies']), res['data'] + + def toBytes(self) -> bytes: + return self._construct.build({'ies':self.ies, 'data':b''}) + + +def smpp_dcs_is_8bit(dcs: pdu_types.DataCoding) -> bool: + """Determine if the given SMPP data coding scheme is 8-bit or not.""" + if dcs == pdu_types.DataCoding(pdu_types.DataCodingScheme.DEFAULT, + pdu_types.DataCodingDefault.OCTET_UNSPECIFIED): + return True + if dcs == pdu_types.DataCoding(pdu_types.DataCodingScheme.DEFAULT, + pdu_types.DataCodingDefault.OCTET_UNSPECIFIED_COMMON): + return True + if dcs.scheme == pdu_types.DataCodingScheme.GSM_MESSAGE_CLASS and dcs.schemeData['msgCoding'] == pdu_types.DataCodingGsmMsgCoding.DATA_8BIT: + return True + else: + return False + +def ensure_smpp_is_8bit(dcs: pdu_types.DataCoding): + """Assert if given SMPP data coding scheme is not 8-bit.""" + if not smpp_dcs_is_8bit(dcs): + raise ValueError('We only support 8bit coded SMS for now') + +class AddressField: + """Representation of an address field as used in SMS T-PDU.""" + _construct = Struct('addr_len'/Int8ub, + 'type_of_addr'/TonNpi, + 'digits'/BcdAdapter(Bytes(this.addr_len//2 + this.addr_len%2)), + 'tell'/Tell) + + def __init__(self, digits, ton='unknown', npi='unknown'): + self.ton = ton + self.npi = npi + self.digits = digits + + def __str__(self): + return 'AddressField(TON=%s, NPI=%s, %s)' % (self.ton, self.npi, self.digits) + + @classmethod + def fromBytes(cls, inb: BytesOrHex) -> typing.Tuple['AddressField', bytes]: + """Construct an AddressField instance from the binary T-PDU address format.""" + if isinstance(inb, str): + inb = h2b(inb) + res = cls._construct.parse(inb) + #print("size: %s" % cls._construct.sizeof()) + ton = res['type_of_addr']['type_of_number'] + npi = res['type_of_addr']['numbering_plan_id'] + # return resulting instance + remainder bytes + return cls(res['digits'][:res['addr_len']], ton, npi), inb[res['tell']:] + + @classmethod + def fromSmpp(cls, addr, ton, npi) -> 'AddressField': + """Construct an AddressField from {source,dest}_addr_{,ton,npi} attributes of smpp.pdu.""" + smpp_map_npi = { + 'UNKNOWN': 'unknown', + 'ISDN': 'isdn_e164', + 'DATA': 'data_x121', + 'TELEX': 'telex_f69', + 'LAND_MOBILE': 'sc_specific6', + 'NATIONAL': 'national', + 'PRIVATE': 'private', + 'ERMES': 'ermes', + } + smpp_map_ton = { + 'UNKNOWN': 'unknown', + 'INTERNATIONAL': 'international', + 'NATIONAL': 'national', + 'NETWORK_SPECIFIC': 'network_specific', + 'SUBSCRIBER_NUMBER': 'short_code', + 'ALPHANUMERIC': 'alphanumeric', + 'ABBREVIATED': 'abbreviated', + } + # return the resulting instance + return cls(addr.decode('ascii'), smpp_map_ton[ton.name], smpp_map_npi[npi.name]) + + + def toBytes(self) -> bytes: + """Encode the AddressField into the binary representation as used in T-PDU.""" + num_digits = len(self.digits) + if num_digits % 2: + self.digits += 'f' + d = { + 'addr_len': num_digits, + 'type_of_addr': { + 'ext': True, + 'type_of_number': self.ton, + 'numbering_plan_id': self.npi, + }, + 'digits': self.digits, + } + return self._construct.build(d) + + +class SMS_TPDU(abc.ABC): + """Base class for a SMS T-PDU.""" + def __init__(self, **kwargs): + self.tp_mti = kwargs.get('tp_mti', None) + self.tp_rp = kwargs.get('tp_rp', False) + self.tp_udhi = kwargs.get('tp_udhi', False) + self.tp_pid = kwargs.get('tp_pid', None) + self.tp_dcs = kwargs.get('tp_dcs', None) + self.tp_udl = kwargs.get('tp_udl', None) + self.tp_ud = kwargs.get('tp_ud', None) + + + +class SMS_DELIVER(SMS_TPDU): + """Representation of a SMS-DELIVER T-PDU. This is the Network to MS/UE (downlink) direction.""" + flags_construct = BitStruct('tp_rp'/Flag, 'tp_udhi'/Flag, 'tp_rp'/Flag, 'tp_sri'/Flag, + Padding(1), 'tp_mms'/Flag, 'tp_mti'/BitsInteger(2)) + def __init__(self, **kwargs): + kwargs['tp_mti'] = 0 + super().__init__(**kwargs) + self.tp_lp = kwargs.get('tp_lp', False) + self.tp_mms = kwargs.get('tp_mms', False) + self.tp_oa = kwargs.get('tp_oa', None) + self.tp_scts = kwargs.get('tp_scts', None) + self.tp_sri = kwargs.get('tp_sri', False) + + def __repr__(self): + return '%s(MTI=%s, MMS=%s, LP=%s, RP=%s, UDHI=%s, SRI=%s, OA=%s, PID=%2x, DCS=%x, SCTS=%s, UDL=%u, UD=%s)' % (self.__class__.__name__, self.tp_mti, self.tp_mms, self.tp_lp, self.tp_rp, self.tp_udhi, self.tp_sri, self.tp_oa, self.tp_pid, self.tp_dcs, self.tp_scts, self.tp_udl, self.tp_ud) + + @classmethod + def fromBytes(cls, inb: BytesOrHex) -> 'SMS_DELIVER': + """Construct a SMS_DELIVER instance from the binary encoded format as used in T-PDU.""" + if isinstance(inb, str): + inb = h2b(inb) + flags = inb[0] + d = SMS_DELIVER.flags_construct.parse(inb) + oa, remainder = AddressField.fromBytes(inb[1:]) + d['tp_oa'] = oa + offset = 0 + d['tp_pid'] = remainder[offset] + offset += 1 + d['tp_dcs'] = remainder[offset] + offset += 1 + # TODO: further decode + d['tp_scts'] = remainder[offset:offset+7] + offset += 7 + d['tp_udl'] = remainder[offset] + offset += 1 + d['tp_ud'] = remainder[offset:] + return cls(**d) + + def toBytes(self) -> bytes: + """Encode a SMS_DELIVER instance to the binary encoded format as used in T-PDU.""" + outb = bytearray() + d = { + 'tp_mti': self.tp_mti, 'tp_mms': self.tp_mms, 'tp_lp': self.tp_lp, + 'tp_rp': self.tp_rp, 'tp_udhi': self.tp_udhi, 'tp_sri': self.tp_sri, + } + flags = SMS_DELIVER.flags_construct.build(d) + outb.extend(flags) + outb.extend(self.tp_oa.toBytes()) + outb.append(self.tp_pid) + outb.append(self.tp_dcs) + outb.extend(self.tp_scts) + outb.append(self.tp_udl) + outb.extend(self.tp_ud) + + return outb + + @classmethod + def fromSmpp(cls, smpp_pdu) -> 'SMS_DELIVER': + """Construct a SMS_DELIVER instance from the deliver format used by smpp.pdu.""" + if smpp_pdu.id == pdu_types.CommandId.submit_sm: + return cls.fromSmppSubmit(cls, smpp_pdu) + else: + raise ValueError('Unsupported SMPP commandId %s' % smpp_pdu.id) + + @classmethod + def fromSmppSubmit(cls, smpp_pdu) -> 'SMS_DELIVER': + """Construct a SMS_DELIVER instance from the submit format used by smpp.pdu.""" + ensure_smpp_is_8bit(smpp_pdu.params['data_coding']) + tp_oa = AddressField.fromSmpp(smpp_pdu.params['source_addr'], + smpp_pdu.params['source_addr_ton'], + smpp_pdu.params['source_addr_npi']) + tp_ud = smpp_pdu.params['short_message'] + d = { + 'tp_lp': False, + 'tp_mms': False, + 'tp_oa': tp_oa, + 'tp_scts': h2b('22705200000000'), # FIXME + 'tp_sri': False, + 'tp_rp': False, + 'tp_udhi': pdu_types.EsmClassGsmFeatures.UDHI_INDICATOR_SET in smpp_pdu.params['esm_class'].gsmFeatures, + 'tp_pid': smpp_pdu.params['protocol_id'], + 'tp_dcs': 0xF6, # we only deal with binary SMS here + 'tp_udl': len(tp_ud), + 'tp_ud': tp_ud, + } + return cls(**d) + + + +class SMS_SUBMIT(SMS_TPDU): + """Representation of a SMS-SUBMIT T-PDU. This is the MS/UE -> network (uplink) direction.""" + flags_construct = BitStruct('tp_srr'/Flag, 'tp_udhi'/Flag, 'tp_rp'/Flag, + 'tp_vpf'/Enum(BitsInteger(2), none=0, relative=2, enhanced=1, absolute=3), + 'tp_rd'/Flag, 'tp_mti'/BitsInteger(2)) + def __init__(self, **kwargs): + kwargs['tp_mti'] = 1 + super().__init__(**kwargs) + self.tp_rd = kwargs.get('tp_rd', False) + self.tp_vpf = kwargs.get('tp_vpf', 'none') + self.tp_srr = kwargs.get('tp_srr', False) + self.tp_mr = kwargs.get('tp_mr', None) + self.tp_da = kwargs.get('tp_da', None) + self.tp_vp = kwargs.get('tp_vp', None) + + def __repr__(self): + return '%s(MTI=%s, RD=%s, VPF=%u, RP=%s, UDHI=%s, SRR=%s, DA=%s, PID=%2x, DCS=%x, VP=%s, UDL=%u, UD=%s)' % (self.__class__.__name__, self.tp_mti, self.tp_rd, self.tp_vpf, self.tp_rp, self.tp_udhi, self.tp_srr, self.tp_da, self.tp_pid, self.tp_dcs, self.tp_vp, self.tp_udl, self.tp_ud) + + @classmethod + def fromBytes(cls, inb:BytesOrHex) -> 'SMS_SUBMIT': + """Construct a SMS_SUBMIT instance from the binary encoded format as used in T-PDU.""" + offset = 0 + if isinstance(inb, str): + inb = h2b(inb) + d = SMS_SUBMIT.flags_construct.parse(inb) + offset += 1 + d['tp_mr']= inb[offset] + offset += 1 + da, remainder = AddressField.fromBytes(inb[2:]) + d['tp_da'] = da + + offset = 0 + d['tp_pid'] = remainder[offset] + offset += 1 + d['tp_dcs'] = remainder[offset] + offset += 1 + if d['tp_vpf'] == 'none': + pass + elif d['tp_vpf'] == 'relative': + # TODO: further decode + d['tp_vp'] = remainder[offset:offset+1] + offset += 1 + elif d['tp_vpf'] == 'enhanced': + # TODO: further decode + d['tp_vp'] = remainder[offset:offset+7] + offset += 7 + pass + elif d['tp_vpf'] == 'absolute': + # TODO: further decode + d['tp_vp'] = remainder[offset:offset+7] + offset += 7 + pass + else: + raise ValueError('Invalid VPF: %s' % d['tp_vpf']) + d['tp_udl'] = remainder[offset] + offset += 1 + d['tp_ud'] = remainder[offset:] + return cls(**d) + + def toBytes(self) -> bytes: + """Encode a SMS_SUBMIT instance to the binary encoded format as used in T-PDU.""" + outb = bytearray() + d = { + 'tp_mti': self.tp_mti, 'tp_rd': self.tp_rd, 'tp_vpf': self.tp_vpf, + 'tp_rp': self.tp_rp, 'tp_udhi': self.tp_udhi, 'tp_srr': self.tp_srr, + } + flags = SMS_SUBMIT.flags_construct.build(d) + outb.extend(flags) + outb.append(self.tp_mr) + outb.extend(self.tp_da.toBytes()) + outb.append(self.tp_pid) + outb.append(self.tp_dcs) + if self.tp_vpf != 'none': + outb.extend(self.tp_vp) + outb.append(self.tp_udl) + outb.extend(self.tp_ud) + return outb + + @classmethod + def fromSmpp(cls, smpp_pdu) -> 'SMS_SUBMIT': + """Construct a SMS_DELIVER instance from the format used by smpp.pdu.""" + if smpp_pdu.id == pdu_types.CommandId.submit_sm: + return cls.fromSmppSubmit(cls, smpp_pdu) + else: + raise ValueError('Unsupported SMPP commandId %s' % smpp_pdu.id) + + @classmethod + def fromSmppSubmit(cls, smpp_pdu) -> 'SMS_SUBMIT': + """Construct a SMS_DELIVER instance from the submit format used by smpp.pdu.""" + ensure_smpp_is_8bit(smpp_pdu.params['data_coding']) + tp_da = AddressField.fromSmpp(smpp_pdu.params['destination_addr'], + smpp_pdu.params['dest_addr_ton'], + smpp_pdu.params['dest_addr_npi']) + tp_ud = smpp_pdu.params['short_message'] + #vp_smpp = smpp_pdu.params['validity_period'] + #if not vp_smpp: + # vpf = 'none' + d = { + 'tp_rd': True if smpp_pdu.params['replace_if_present_flag'].name == 'REPLACE' else False, + 'tp_vpf': None, # vpf, + 'tp_rp': False, # related to ['registered_delivery'] ? + 'tp_udhi': pdu_types.EsmClassGsmFeatures.UDHI_INDICATOR_SET in smpp_pdu.params['esm_class'].gsmFeatures, + 'tp_srr': True if smpp_pdu.params['registered_delivery'] else False, + 'tp_mr': 0, # FIXME: sm_default_msg_id ? + 'tp_da': tp_da, + 'tp_pid': smpp_pdu.params['protocol_id'], + 'tp_dcs': 0xF6, # FIXME: we only deal with binary SMS here + 'tp_vp': None, # FIXME: implement VPF conversion + 'tp_udl': len(tp_ud), + 'tp_ud': tp_ud, + } + return cls(**d) + + def toSmpp(self) -> pdu_types.PDU: + """Translate a SMS_DELIVER instance to a smpp.pdu.pdu_types.SubmitSM instance.""" + esm_class = pdu_types.EsmClass(pdu_types.EsmClassMode.DEFAULT, pdu_types.EsmClassType.DEFAULT) + reg_del = pdu_types.RegisteredDelivery(pdu_types.RegisteredDeliveryReceipt.NO_SMSC_DELIVERY_RECEIPT_REQUESTED) + if self.tp_rp: + repl_if = pdu_types.ReplaceIfPresentFlag.REPLACE + else: + repl_if = pdu_types.ReplaceIfPresentFlag.DO_NOT_REPLACE + # we only deal with binary SMS here: + if self.tp_dcs != 0xF6: + raise ValueError('Unsupported DCS: We only support DCS=0xF6 for now') + dc = pdu_types.DataCoding(pdu_types.DataCodingScheme.DEFAULT, pdu_types.DataCodingDefault.OCTET_UNSPECIFIED) + return pdu_types.SubmitSM(service_type='', + source_addr_ton=pdu_types.AddrTon.ALPHANUMERIC, + source_addr_npi=pdu_types.AddrNpi.UNKNOWN, + source_addr='simcard', + dest_addr_ton=FIXME(self.tp_da.ton), + dest_addr_npi=FIXME(self.tp_da.npi), + destination_addr=self.tp_da.digits, + esm_class=esm_class, + protocol_id=self.tp_pid, + priority_flag=pdu_types.PriorityFlag.LEVEL_0, + #schedule_delivery_time, + #validity_period, + registered_delivery=reg_del, + replace_if_present_flag=repl_if, + data_coding=dc, + #sm_default_msg_id, + short_message=self.tp_ud) diff --git a/requirements.txt b/requirements.txt index b12cb4d..4332b66 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,4 @@ colorlog pycryptodomex packaging +git+https://github.com/hologram-io/smpp.pdu diff --git a/setup.py b/setup.py index d4fb15f..5678c55 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ "colorlog", "pycryptodomex", "packaging", + "smpp.pdu @ git+https://github.com/hologram-io/smpp.pdu", ], scripts=[ 'pySim-prog.py', diff --git a/sms_test.py b/sms_test.py new file mode 100755 index 0000000..a163f1a --- /dev/null +++ b/sms_test.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 + +from pySim.sms import * +from pprint import pprint as pp +from construct import setGlobalPrintPrivateEntries + + +print(UserDataHeader.fromBytes('027100')) +print(UserDataHeader.fromBytes('027100abcdef')) +print(UserDataHeader.fromBytes('03710110')) +print(UserDataHeader.fromBytes('0571007001ffabcd')) + +setGlobalPrintPrivateEntries(True) +pp(AddressField.fromBytes('0480214399')) + +s = SMS_SUBMIT.fromBytes('550d0b911614261771f000f5a78c0b050423f423f40003010201424547494e3a56434152440d0a56455253494f4e3a322e310d0a4e3a4d650d0a54454c3b505245463b43454c4c3b564f4943453a2b36313431363237313137300d0a54454c3b484f4d453b564f4943453a2b36313339353337303437310d0a54454c3b574f524b3b564f4943453a2b36313339363734373031350d0a454e443a') +pp(s) +print(s.tp_da) +pp(b2h(s.toBytes())) + +d = SMS_DELIVER.fromBytes('0408D0E5759A0E7FF6907090307513000824010101BB400101') +pp(d) +pp(b2h(d.toBytes())) diff --git a/tests/test_sms.py b/tests/test_sms.py new file mode 100644 index 0000000..8355224 --- /dev/null +++ b/tests/test_sms.py @@ -0,0 +1,105 @@ +#!/usr/bin/env python3 + +import unittest +from pySim.utils import h2b, b2h +from pySim.sms import * + +class Test_SMS_UDH(unittest.TestCase): + def test_single_ie(self): + udh, tail = UserDataHeader.fromBytes('027100') + self.assertEqual(len(udh.ies), 1) + ie = udh.ies[0] + self.assertEqual(ie.iei, 0x71) + self.assertEqual(ie.length, 0) + self.assertEqual(ie.value, b'') + self.assertEqual(tail, b'') + + def test_single_ie_tail(self): + udh, tail = UserDataHeader.fromBytes('027100abcdef') + self.assertEqual(len(udh.ies), 1) + ie = udh.ies[0] + self.assertEqual(ie.iei, 0x71) + self.assertEqual(ie.length, 0) + self.assertEqual(ie.value, b'') + self.assertEqual(tail, b'\xab\xcd\xef') + + def test_single_ie_value(self): + udh, tail = UserDataHeader.fromBytes('03710110') + self.assertEqual(len(udh.ies), 1) + ie = udh.ies[0] + self.assertEqual(ie.iei, 0x71) + self.assertEqual(ie.length, 1) + self.assertEqual(ie.value, b'\x10') + self.assertEqual(tail, b'') + + def test_two_ie_data_tail(self): + udh, tail = UserDataHeader.fromBytes('0571007001ffabcd') + self.assertEqual(len(udh.ies), 2) + ie = udh.ies[0] + self.assertEqual(ie.iei, 0x71) + self.assertEqual(ie.length, 0) + self.assertEqual(ie.value, b'') + ie = udh.ies[1] + self.assertEqual(ie.iei, 0x70) + self.assertEqual(ie.length, 1) + self.assertEqual(ie.value, b'\xff') + self.assertEqual(tail, b'\xab\xcd') + + def test_toBytes(self): + indata = h2b('0571007001ff') + udh, tail = UserDataHeader.fromBytes(indata) + encoded = udh.toBytes() + self.assertEqual(encoded, indata) + +class Test_AddressField(unittest.TestCase): + def test_fromBytes(self): + encoded = h2b('0480214399') + af, trailer = AddressField.fromBytes(encoded) + self.assertEqual(trailer, b'\x99') + self.assertEqual(af.ton, 'unknown') + self.assertEqual(af.npi, 'unknown') + self.assertEqual(af.digits, '1234') + + def test_fromBytes_odd(self): + af, trailer = AddressField.fromBytes('038021f399') + self.assertEqual(trailer, b'\x99') + self.assertEqual(af.ton, 'unknown') + self.assertEqual(af.npi, 'unknown') + self.assertEqual(af.digits, '123') + + def test_toBytes(self): + encoded = h2b('04802143') + af, trailer = AddressField.fromBytes(encoded) + self.assertEqual(af.toBytes(), encoded) + + def test_toBytes_odd(self): + af = AddressField('12345', 'international', 'isdn_e164') + encoded = af.toBytes() + self.assertEqual(encoded, h2b('05912143f5')) + + +class Test_SUBMIT(unittest.TestCase): + def test_fromBytes(self): + s = SMS_SUBMIT.fromBytes('550d0b911614261771f000f5a78c0b050423f423f40003010201424547494e3a56434152440d0a56455253494f4e3a322e310d0a4e3a4d650d0a54454c3b505245463b43454c4c3b564f4943453a2b36313431363237313137300d0a54454c3b484f4d453b564f4943453a2b36313339353337303437310d0a54454c3b574f524b3b564f4943453a2b36313339363734373031350d0a454e443a') + self.assertEqual(s.tp_mti, 1) + self.assertEqual(s.tp_rd, True) + self.assertEqual(s.tp_vpf, 'relative') + self.assertEqual(s.tp_rp, False) + self.assertEqual(s.tp_udhi, True) + self.assertEqual(s.tp_srr, False) + self.assertEqual(s.tp_pid, 0) + self.assertEqual(s.tp_dcs, 0xf5) + self.assertEqual(s.tp_udl, 140) + +class Test_DELIVER(unittest.TestCase): + def test_fromBytes(self): + d = SMS_DELIVER.fromBytes('0408D0E5759A0E7FF6907090307513000824010101BB400101') + self.assertEqual(d.tp_mti, 0) + self.assertEqual(d.tp_mms, True) + self.assertEqual(d.tp_lp, False) + self.assertEqual(d.tp_rp, False) + self.assertEqual(d.tp_udhi, False) + self.assertEqual(d.tp_sri, False) + self.assertEqual(d.tp_pid, 0x7f) + self.assertEqual(d.tp_dcs, 0xf6) + self.assertEqual(d.tp_udl, 8) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0d95e62c1e7183a7851d1fe38df0f5133830cb1f Gerrit-Change-Number: 33347 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream: Set state to closed before calling disconnect_cb()
by fixeria 17 Jun '23

17 Jun '23

Attention is currently required from: daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33344 ) Change subject: stream: Set state to closed before calling disconnect_cb() ...................................................................... Patch Set 2: Verified+1 Code-Review+2 (1 comment) Patchset: PS1: > I ran the ttcn3 cbc tests here but still hat +8 test failures. No coredump though. […] I gave this patch a try, and AFAICS it fixes the problem. In my case only `TC_cell_failure_restart_active_bsc` and `TC_cell_failure_restart_active_mme` failed, which were known to fail before the regression. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I40ceb17c32d1f58f8d0eeda8d1d794cf3f478e83 Gerrit-Change-Number: 33344 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Jun 2023 11:02:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsm/ipa: Add segmentation callback
by fixeria 17 Jun '23

17 Jun '23

Attention is currently required from: arehbein, pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33083 ) Change subject: gsm/ipa: Add segmentation callback ...................................................................... Patch Set 9: (3 comments) File src/gsm/ipa.c: https://gerrit.osmocom.org/c/libosmocore/+/33083/comment/6e1c17af_700eabb2 PS2, Line 730: msg->data_len < total_len > Seems better to me, as that would prevent more error cases Ah, I see. I forgot that `msg->data_len` is the maximum length the buffer can hold, while `msg->len` is how much is used out of `msg->data_len`. Fine then. File src/gsm/ipa.c: https://gerrit.osmocom.org/c/libosmocore/+/33083/comment/dcc21e55_f1eb6463 PS8, Line 735: const struct ipaccess_head *hh = (const struct ipaccess_head *) msg->data; > You could declare this at the start of the function (we usually declare variables at the start of th […] Agreeing with Pau here. There is no strict requirement to declare variables at the top of the respective block, but in this specific case we can improve code readability a bit by doing `msgb_length(msg) < sizeof(*hh)` above. https://gerrit.osmocom.org/c/libosmocore/+/33083/comment/11bc0665_6da6a3c8 PS8, Line 738: if (msgb_tailroom(msg) + msgb_length(msg) < total_len) { > iiuc the problem here is that the allocated msgb space is not going to be enough to fit in what IPA message expects. ack. > Talking about that in the log message would be a lot more usefu for the user? since that probably means the dev has to increase the msgb size when allocating it? Indeed, the logging message should be more specific. Something like `msgb (len=%zu) is not large enough to fit received IPA message (len=%zu)` maybe? Also, this is not expected to happen too often, so `OSMO_UNLIKELY`? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Gerrit-Change-Number: 33083 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Jun 2023 09:48:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: core/osmo_io: Rename variables for readability
by fixeria 17 Jun '23

17 Jun '23

Attention is currently required from: arehbein. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33345 ) Change subject: core/osmo_io: Rename variables for readability ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3d752ce91a1b16c855522f643d10a52ef28a8a84 Gerrit-Change-Number: 33345 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Jun 2023 09:15:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Set state to closed before calling disconnect_cb()
by laforge 17 Jun '23

17 Jun '23

Attention is currently required from: fixeria, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33344 ) Change subject: stream: Set state to closed before calling disconnect_cb() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I40ceb17c32d1f58f8d0eeda8d1d794cf3f478e83 Gerrit-Change-Number: 33344 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Jun 2023 06:29:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-mgw[master]: mgw: Allow auditing speciall 'null' endpoint
by laforge 17 Jun '23

17 Jun '23

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33312 ) Change subject: mgw: Allow auditing speciall 'null' endpoint ...................................................................... Patch Set 3: (1 comment) File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/c/osmo-mgw/+/33312/comment/8c29417a_2f57b272 PS2, Line 473: > The main discussion to start with would be: Do we still want the null endpoint to be per-trunk? That […] I would think of the null endpoint as something global, not per-trunk -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia409b16e9211e6261e2e0f21288544289d6f3733 Gerrit-Change-Number: 33312 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Jun 2023 06:28:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Set state to closed before calling disconnect_cb()
by daniel 17 Jun '23

17 Jun '23

Attention is currently required from: fixeria, daniel. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33344 to look at the new patch set (#2). Change subject: stream: Set state to closed before calling disconnect_cb() ...................................................................... stream: Set state to closed before calling disconnect_cb() Fixes recent crashes in ttcn-cbc-test Change-Id: I40ceb17c32d1f58f8d0eeda8d1d794cf3f478e83 Related: OS#6063 --- M src/stream.c 1 file changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/44/33344/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I40ceb17c32d1f58f8d0eeda8d1d794cf3f478e83 Gerrit-Change-Number: 33344 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-hnbgw[master]: tweak lots of logging
by laforge 17 Jun '23

17 Jun '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33171 ) Change subject: tweak lots of logging ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I41275d8c3e272177976a9302795884666c35cd06 Gerrit-Change-Number: 33171 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Jun 2023 06:16:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-hnbgw[master]: startup config tests: show default 'msc 0', 'sgsn 0'
by laforge 17 Jun '23

17 Jun '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33330 ) Change subject: startup config tests: show default 'msc 0', 'sgsn 0' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia4e43fa9b5d9fda1ae374d3d31965aafe85d493d Gerrit-Change-Number: 33330 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Jun 2023 06:13:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Make name optional, add _set_name() API
by laforge 17 Jun '23

17 Jun '23

Attention is currently required from: pespin, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33341 ) Change subject: osmo_io: Make name optional, add _set_name() API ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Adding Harald because in our early discussions we agreed to have the name mandatory in osmo_io. […] I think the ability to change it is definitely good. Not sure if we should make it optional upon creation. Not sure what we gain by that, other than more objects in our code we don't have proper context for when logging or introspecting. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If2772a3ccaa98616e0189862a49ab0243435e343 Gerrit-Change-Number: 33341 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sat, 17 Jun 2023 06:12:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0