- gerrit-log - lists.osmocom.org

Change in pysim[master]: utils.py: Fix some tuple type annotations
by laforge 10 Feb '22

10 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27133 ) Change subject: utils.py: Fix some tuple type annotations ...................................................................... utils.py: Fix some tuple type annotations Change-Id: I869b0268383f6babd9b51d0ddfce448a1d2dda1e --- M pySim/utils.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 4eb539b..3e79034 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -161,7 +161,7 @@ # length value coding is equal to BER-TLV -def comprehensiontlv_parse_one(binary:bytes) -> (dict, int, bytes, bytes): +def comprehensiontlv_parse_one(binary:bytes) -> Tuple[dict, int, bytes, bytes]: """Parse a single TLV IE at the start of the given binary data. Args: binary : binary input data of BER-TLV length field @@ -311,7 +311,7 @@ else: raise ValueError("Length > 32bits not supported") -def bertlv_parse_one(binary:bytes) -> (dict, int, bytes, bytes): +def bertlv_parse_one(binary:bytes) -> Tuple[dict, int, bytes, bytes]: """Parse a single TLV IE at the start of the given binary data. Args: binary : binary input data of BER-TLV length field -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I869b0268383f6babd9b51d0ddfce448a1d2dda1e Gerrit-Change-Number: 27133 Gerrit-PatchSet: 2 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

1 0

Change in pysim[master]: utils.py: type annotations for DataObject related methods
by laforge 10 Feb '22

10 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27132 ) Change subject: utils.py: type annotations for DataObject related methods ...................................................................... utils.py: type annotations for DataObject related methods Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 --- M pySim/utils.py 1 file changed, 31 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 0a9be86..4eb539b 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1170,7 +1170,7 @@ simply has any number of different TLVs that may occur in any order at any point, ISO 7816 has the habit of specifying TLV data but with very spcific ordering, or specific choices of tags at specific points in a stream. This class tries to represent this.""" - def __init__(self, name, desc = None, tag = None): + def __init__(self, name:str, desc:str = None, tag:int = None): """ Args: name: A brief, all-lowercase, underscore separated string identifier @@ -1186,10 +1186,10 @@ def __str__(self): return self.name - def __repr__(self): + def __repr__(self) -> str: return '%s(%s)' % (self.__class__, self.name) - def __or__(self, other): + def __or__(self, other) -> 'DataObjectChoice': """OR-ing DataObjects together renders a DataObjectChoice.""" if isinstance(other, DataObject): # DataObject | DataObject = DataObjectChoice @@ -1197,17 +1197,19 @@ else: raise TypeError - def __add__(self, other): + def __add__(self, other) -> 'DataObjectCollection': """ADD-ing DataObjects together renders a DataObjectCollection.""" if isinstance(other, DataObject): # DataObject + DataObject = DataObjectCollectin return DataObjectCollection(None, members=[self, other]) + else: + raise TypeError - def _compute_tag(self): + def _compute_tag(self) -> int: """Compute the tag (sometimes the tag encodes part of the value).""" return self.tag - def to_dict(self): + def to_dict(self) -> dict: """Return a dict in form "name: decoded_value" """ return {self.name: self.decoded} @@ -1219,13 +1221,13 @@ """ @abc.abstractmethod - def to_bytes(self): + def to_bytes(self) -> bytes: """Encode the internal state of this instance into the TLV value part. Returns: binary bytes encoding the internal state """ - def from_tlv(self, do:bytes): + def from_tlv(self, do:bytes) -> bytes: """Parse binary TLV representation into internal state. The resulting decoded representation is _not_ returned, but just internalized in the object instance! Args: @@ -1241,7 +1243,7 @@ # return remaining bytes return do[2+length:] - def to_tlv(self): + def to_tlv(self) -> bytes: """Encode internal representation to binary TLV. Returns: bytes encoded in TLV format. @@ -1250,7 +1252,7 @@ return bytes(self._compute_tag()) + bytes(len(val)) + val # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[dict, bytes]: """Decode a single DOs from the input data. Args: binary : binary bytes of encoded data @@ -1265,12 +1267,12 @@ return (self.to_dict(), remainder) # 'codec' interface - def encode(self): + def encode(self) -> bytes: return self.to_tlv() class TL0_DataObject(DataObject): """Data Object that has Tag, Len=0 and no Value part.""" - def __init__(self, name, desc, tag, val=None): + def __init__(self, name:str, desc:str, tag:int, val=None): super().__init__(name, desc, tag) self.val = val @@ -1279,7 +1281,7 @@ raise ValueError self.decoded = self.val - def to_bytes(self): + def to_bytes(self) -> bytes: return b'' @@ -1287,7 +1289,7 @@ """A DataObjectCollection consits of multiple Data Objects identified by their tags. A given encoded DO may contain any of them in any order, and may contain multiple instances of each DO.""" - def __init__(self, name, desc = None, members=None): + def __init__(self, name:str, desc:str = None, members=None): self.name = name self.desc = desc self.members = members or [] @@ -1296,15 +1298,15 @@ self.members_by_tag = { m.tag:m for m in members } self.members_by_name = { m.name:m for m in members } - def __str__(self): + def __str__(self) -> str: member_strs = [str(x) for x in self.members] return '%s(%s)' % (self.name, ','.join(member_strs)) - def __repr__(self): + def __repr__(self) -> str: member_strs = [repr(x) for x in self.members] return '%s(%s)' % (self.__class__, ','.join(member_strs)) - def __add__(self, other): + def __add__(self, other) -> 'DataObjectCollection': """Extending DataCollections with other DataCollections or DataObjects.""" if isinstance(other, DataObjectCollection): # adding one collection to another @@ -1317,7 +1319,7 @@ raise TypeError # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[List, bytes]: """Decode any number of DOs from the collection until the end of the input data, or uninitialized memory (0xFF) is found. Args: @@ -1343,7 +1345,7 @@ return (res, remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: res = bytearray() for i in decoded: obj = self.members_by_name(i[0]) @@ -1358,7 +1360,7 @@ """We overload the add operator here to avoid inheriting it from DataObjecCollection.""" raise TypeError - def __or__(self, other): + def __or__(self, other) -> 'DataObjectChoice': """OR-ing a Choice to another choice extends the choice, as does OR-ing a DataObject.""" if isinstance(other, DataObjectChoice): # adding one collection to another @@ -1371,7 +1373,7 @@ raise TypeError # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[dict, bytes]: """Decode a single DOs from the choice based on the tag. Args: binary : binary bytes of encoded data @@ -1389,7 +1391,7 @@ return (obj.to_dict(), remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: obj = self.members_by_name(decoded[0]) return obj.to_tlv() @@ -1398,20 +1400,20 @@ ordered sequence of DOs or choices of DOs that have to appear as per the specification. By wrapping them into this formal DataObjectSequence, we can offer convenience methods for encoding or decoding an entire sequence.""" - def __init__(self, name, desc=None, sequence=None): + def __init__(self, name:str, desc:str=None, sequence=None): self.sequence = sequence or [] self.name = name self.desc = desc - def __str__(self): + def __str__(self) -> str: member_strs = [str(x) for x in self.sequence] return '%s(%s)' % (self.name, ','.join(member_strs)) - def __repr__(self): + def __repr__(self) -> str: member_strs = [repr(x) for x in self.sequence] return '%s(%s)' % (self.__class__, ','.join(member_strs)) - def __add__(self, other): + def __add__(self, other) -> 'DataObjectSequence': """Add (append) a DataObject or DataObjectChoice to the sequence.""" if isinstance(other, 'DataObject'): return DataObjectSequence(self.name, self.desc, self.sequence + [other]) @@ -1421,7 +1423,7 @@ return DataObjectSequence(self.name, self.desc, self.sequence + other.sequence) # 'codec' interface - def decode(self, binary:bytes): + def decode(self, binary:bytes) -> Tuple[list, bytes]: """Decode a sequence by calling the decoder of each element in the sequence. Args: binary : binary bytes of encoded data @@ -1437,7 +1439,7 @@ return (res, remainder) # 'codec' interface - def decode_multi(self, do:bytes): + def decode_multi(self, do:bytes) -> Tuple[list, bytes]: """Decode multiple occurrences of the sequence from the binary input data. Args: do : binary input data to be decoded @@ -1458,7 +1460,7 @@ return (res, remainder) # 'codec' interface - def encode(self, decoded): + def encode(self, decoded) -> bytes: """Encode a sequence by calling the encoder of each element in the sequence.""" encoded = bytearray() i = 0 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 Gerrit-PatchSet: 2 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

1 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST
by laforge 10 Feb '22

10 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27127 ) Change subject: Better decode of EF.UST, EF.EST and EF.IST ...................................................................... Better decode of EF.UST, EF.EST and EF.IST So far, we only returned an array of service numbers like [ 2, 4, 5, 9 ] which is not very friendly to the human reader. In EF.SST we already had more verbose decoding including a description of each service. Let's add the same principle to EF.UST, EST and IST The same output above now looks like this: { "1": { "description": "Local Phone Book", "activated": false }, "2": { "description": "Fixed Dialling Numbers (FDN)", "activated": true }, "3": { "description": "Extension 2", "activated": false }, "4": { "description": "Service Dialling Numbers (SDN)", "activated": true }, "5": { "description": "Extension3", "activated": true }, "6": { "description": "Barred Dialling Numbers (BDN)", "activated": false }, "7": { "description": "Extension4", "activated": false }, "9": { "description": "Incoming Call Information (ICI and ICT)", "activated": true } } Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 --- M pySim/ts_31_102.py M pySim/ts_31_103.py 2 files changed, 46 insertions(+), 39 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f6f6c00..e2ab925 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -165,6 +165,13 @@ 135: 'Support for Trusted non-3GPP access networks by USIM' } +# Mapping between USIM Enbled Service Number and its description +EF_EST_map = { + 1: 'Fixed Dialling Numbers (FDN)', + 2: 'Barred Dialling Numbers (BDN)', + 3: 'APN Control List (ACL)' +} + LOCI_STATUS_map = { 0: 'updated', 1: 'not updated', @@ -282,6 +289,7 @@ import enum from struct import unpack, pack +from typing import Tuple from construct import * from construct import Optional as COptional from pySim.construct import * @@ -519,30 +527,49 @@ self._construct = Int8ub # TS 31.102 Section 4.2.8 -class EF_UST(TransparentEF): - def __init__(self, fid='6f38', sfid=0x04, name='EF.UST', desc='USIM Service Table', size={1,17}): +class EF_UServiceTable(TransparentEF): + def __init__(self, fid, sfid, name, desc, size, table): super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size=size) + self.table = table # add those commands to the general commands of a TransparentEF self.shell_commands += [self.AddlShellCommands()] + @staticmethod + def _bit_byte_offset_for_service(service:int) -> Tuple[int, int]: + i = service - 1 + byte_offset = i//8 + bit_offset = (i % 8) + return (byte_offset, bit_offset) def _decode_bin(self, in_bin): - ret = [] + ret = {} for i in range (0, len(in_bin)): byte = in_bin[i] for bitno in range(0,7): - if byte & (1 << bitno): - ret.append(i * 8 + bitno + 1) + service_nr = i * 8 + bitno + 1 + ret[service_nr] = { + 'activated': True if byte & (1 << bitno) else False + } + if service_nr in self.table: + ret[service_nr]['description'] = self.table[service_nr] return ret def _encode_bin(self, in_json): - # FIXME: size this to length of file - ret = bytearray(20) - for srv in in_json: - print("srv=%d"%srv) - srv = srv-1 - byte_nr = srv // 8 - # FIXME: detect if service out of range was selected - bit_nr = srv % 8 - ret[byte_nr] |= (1 << bit_nr) - return ret + # compute the required binary size + bin_len = 0 + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_UServiceTable._bit_byte_offset_for_service(service_nr) + if byte_offset >= bin_len: + bin_len = byte_offset+1 + # encode the actual data + out = bytearray(b'\x00' * bin_len) + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_UServiceTable._bit_byte_offset_for_service(service_nr) + if in_json[srv]['activated'] == True: + bit = 1 + else: + bit = 0 + out[byte_offset] |= (bit) << bit_offset + return out @with_default_category('File-Specific Commands') class AddlShellCommands(CommandSet): def __init__(self): @@ -991,7 +1018,7 @@ 'User controlled PLMN Selector with Access Technology'), EF_HPPLMN(), EF_ACMmax(), - EF_UST(), + EF_UServiceTable('6f38', 0x04, 'EF.UST', 'USIM Service Table', size={1,17}, table=EF_UST_map), CyclicEF('6f39', None, 'EF.ACM', 'Accumulated call meter', rec_len={3,3}), TransparentEF('6f3e', None, 'EF.GID1', 'Group Identifier Level 1'), TransparentEF('6f3f', None, 'EF.GID2', 'Group Identifier Level 2'), @@ -1027,7 +1054,7 @@ EF_ADN('6f4d', None, 'EF.BDN', 'Barred Dialling Numbers'), EF_EXT('6f55', None, 'EF.EXT4', 'Extension4 (BDN/SSC)'), EF_CMI(), - EF_UST('6f56', 0x05, 'EF.EST', 'Enabled Services Table', size={1,None}), + EF_UServiceTable('6f56', 0x05, 'EF.EST', 'Enabled Services Table', size={1,None}, table=EF_EST_map), EF_ACL(), EF_DCK(), EF_CNL(), diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 9c7843f..6b69990 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -26,7 +26,7 @@ from pySim.utils import * from pySim.tlv import * from pySim.ts_51_011 import EF_AD, EF_SMS, EF_SMSS, EF_SMSR, EF_SMSP -from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred +from pySim.ts_31_102 import ADF_USIM, EF_FromPreferred, EF_UServiceTable import pySim.ts_102_221 from pySim.ts_102_221 import EF_ARR @@ -101,26 +101,6 @@ super().__init__(fid=fid, sfid=sfid, name=name, desc=desc) self._tlv = EF_IMPU.impu -# TS 31.103 Section 4.2.7 -class EF_IST(TransparentEF): - def __init__(self, fid='6f07', sfid=0x07, name='EF.IST', desc='ISIM Service Table'): - super().__init__(fid=fid, sfid=sfid, name=name, desc=desc, size={1,4}) - # add those commands to the general commands of a TransparentEF - self.shell_commands += [self.AddlShellCommands()] - - @with_default_category('File-Specific Commands') - class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - - def do_ist_service_activate(self, arg): - """Activate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 1) - - def do_ist_service_deactivate(self, arg): - """Deactivate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 0) - # TS 31.103 Section 4.2.8 class EF_PCSCF(LinFixedEF): def __init__(self, fid='6f09', sfid=None, name='EF.P-CSCF', desc='P-CSCF Address'): @@ -192,7 +172,7 @@ EF_IMPU(), EF_AD(), EF_ARR('6f06', 0x06), - EF_IST(), + EF_UServiceTable('6f07', 0x07, 'EF.IST', 'ISIM Service Table', {1,None}, EF_IST_map), EF_PCSCF(), EF_GBABP(), EF_GBANL(), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 Gerrit-Change-Number: 27127 Gerrit-PatchSet: 5 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

1 0

Change in pysim[master]: ts_31_102: TLV._tlv must point to the class, not an instance
by laforge 10 Feb '22

10 Feb '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27135 ) Change subject: ts_31_102: TLV._tlv must point to the class, not an instance ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie4878ad6a92feafe47e375c4f5f3f198921e1e95 Gerrit-Change-Number: 27135 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 18:31:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: utils.py: type annotations for DataObject related methods
by laforge 10 Feb '22

10 Feb '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27132 ) Change subject: utils.py: type annotations for DataObject related methods ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File pySim/utils.py: https://gerrit.osmocom.org/c/pysim/+/27132/comment/738c8c3d_3454501c PS1, Line 1173: desc:str = None, tag:int = None > Optional[str], Optional[int] respectively. I'm addressing those in a later commit as I've meanwhile re-formatted the entire code base. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I291a429e9fe9f1a3fd95dcba3020b0e982154c97 Gerrit-Change-Number: 27132 Gerrit-PatchSet: 2 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 18:31:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST
by laforge 10 Feb '22

10 Feb '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27127 ) Change subject: Better decode of EF.UST, EF.EST and EF.IST ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I34f64d1043698dc385619b2fdda23cb541675f76 Gerrit-Change-Number: 27127 Gerrit-PatchSet: 5 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-Comment-Date: Thu, 10 Feb 2022 18:28:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers
by pespin 10 Feb '22

10 Feb '22

Attention is currently required from: iedemam. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I'd argue it's not the duty of stats to be "friendly as filenames", but rather something specific to whatever statsd consumer on the other side. It's probably also easy on the other side to sanitize names in case they need to be used in file names? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Thu, 10 Feb 2022 17:47:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-hnbgw[master]: ranap_rab_ass: add function to check if RAB is in FailureList
by dexter 10 Feb '22

10 Feb '22

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27139 ) Change subject: ranap_rab_ass: add function to check if RAB is in FailureList ...................................................................... ranap_rab_ass: add function to check if RAB is in FailureList A RANAP RAB-AssignmentResponse may contain a FailedList. In order to detect that a RAB Assignment failed at the HNB we need to be able to check if the RAB we are dealing with is contained an such a FailedList. Change-Id: I4319f7caa45ea758ccd792cc8570521df075cf45 Related: OS#5152 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 4 files changed, 94 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/39/27139/1 diff --git a/include/osmocom/hnbgw/ranap_rab_ass.h b/include/osmocom/hnbgw/ranap_rab_ass.h index f4d5cb6..b3406f0 100644 --- a/include/osmocom/hnbgw/ranap_rab_ass.h +++ b/include/osmocom/hnbgw/ranap_rab_ass.h @@ -14,3 +14,5 @@ uint8_t rab_id); int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr, uint8_t rab_id); + +bool ranap_rab_ass_resp_ies_check_failure(RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id); diff --git a/src/osmo-hnbgw/ranap_rab_ass.c b/src/osmo-hnbgw/ranap_rab_ass.c index 23505f2..89d4b1b 100644 --- a/src/osmo-hnbgw/ranap_rab_ass.c +++ b/src/osmo-hnbgw/ranap_rab_ass.c @@ -141,8 +141,7 @@ { /* Make sure we indeed deal with a setup-or-modified list */ if (!(ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT)) { - RANAP_DEBUG - ("Decoding failed, the RANAP RAB AssignmentResponse did not contain a setup-or-modified list!\n"); + RANAP_DEBUG("RANAP RAB AssignmentResponse did not contain a setup-or-modified list!\n"); return NULL; } @@ -153,6 +152,23 @@ return ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[index]; } +/* Pick the indexed item from the RAB failed list and return a pointer to it */ +static RANAP_IE_t *failed_list_item_from_rab_ass_resp(const RANAP_RAB_AssignmentResponseIEs_t *ies, + unsigned int index) +{ + /* Make sure we indeed deal with a failed list */ + if (!(ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_FAILEDLIST_PRESENT)) { + RANAP_DEBUG("RANAP RAB AssignmentResponse did not contain a failed list!\n"); + return NULL; + } + + /* Detect the end of the list */ + if (index >= ies->raB_FailedList.raB_FailedList_ies.list.count) + return NULL; + + return ies->raB_FailedList.raB_FailedList_ies.list.array[index]; +} + /* find the RAB specified by rab_id in ies and when found, decode the result into items_ies */ static int decode_rab_smditms_from_resp_ies(RANAP_RAB_SetupOrModifiedItemIEs_t *items_ies, RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) @@ -184,6 +200,37 @@ } } +/* See comment above decode_rab_smditms_from_resp_ies() */ +static int decode_rab_flitms_from_resp_ies(RANAP_RAB_FailedItemIEs_t *items_ies, + RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) +{ + RANAP_IE_t *failed_list_ie; + RANAP_RAB_FailedItem_t *rab_failed_item; + int rc; + uint8_t rab_id_decoded; + unsigned int index = 0; + + while (1) { + failed_list_ie = failed_list_item_from_rab_ass_resp(ies, index); + if (!failed_list_ie) + return -EINVAL; + + rc = ranap_decode_rab_faileditemies_fromlist(items_ies, &failed_list_ie->value); + if (rc < 0) + return -EINVAL; + + rab_failed_item = &items_ies->raB_FailedItem; + /* The RAB-ID is defined as a bitstring with a size of 8 (1 byte), + * See also RANAP-IEs.asn, RAB-ID ::= BIT STRING (SIZE (8)) */ + rab_id_decoded = rab_failed_item->rAB_ID.buf[0]; + if (rab_id_decoded == rab_id) + return index; + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_FailedItem, items_ies); + index++; + } +} + /* find the RAB specified by rab_id in ies and when found, decode the result into item */ static int decode_rab_smditms_from_req_ies(RANAP_RAB_SetupOrModifyItemFirst_t *item, RANAP_RAB_AssignmentRequestIEs_t *ies, uint8_t rab_id) @@ -477,3 +524,25 @@ return rc; } + +/*! Check if a specific RAB is present in an RAB-Failed-Item-List inside RANAP_RAB_AssignmentResponseIEs. + * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentResponseIEs. + * \ptmap[in] rab_id expected rab id to look for. + * \returns true when RAB could be identified as failed; false otherwise */ +bool ranap_rab_ass_resp_ies_check_failure(RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) +{ + RANAP_RAB_FailedItemIEs_t _rab_failed_items_ies; + RANAP_RAB_FailedItemIEs_t *rab_failed_items_ies = &_rab_failed_items_ies; + int rc; + bool result = true; + + /* If we can get a failed item for the specified RAB ID, then we know that the + * HNB reported the RAB Assignment as failed */ + rc = decode_rab_flitms_from_resp_ies(rab_failed_items_ies, ies, rab_id); + if (rc < 0) + result = false; + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_FailedItem, rab_failed_items_ies); + + return result; +} diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index d7bee09..2d1efdf 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -269,6 +269,25 @@ ranap_cn_rx_co_free(&message); } +void test_ranap_rab_ass_resp_ies_check_failure(void) +{ + int rc; + ranap_message message; + bool rab_failed_at_hnb; + uint8_t testvec[] = { + 0x60, 0x00, 0x00, 0x11, 0x00, 0x00, 0x01, 0x00, + 0x23, 0x40, 0x0a, 0x00, 0x00, 0x01, 0x00, 0x22, + 0x40, 0x03, 0x05, 0xd0, 0x00 + }; + + rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); + OSMO_ASSERT(rc == 0); + rab_failed_at_hnb = + ranap_rab_ass_resp_ies_check_failure(&message.msg.raB_AssignmentResponseIEs, 23); + printf("ranap_rab_ass_resp_ies_check_failure rab_failed_at_hnb=%u\n", rab_failed_at_hnb); + ranap_cn_rx_co_free(&message); +} + static const struct log_info_cat log_cat[] = { [DRANAP] = { .name = "RANAP", .loglevel = LOGL_DEBUG, .enabled = 1, @@ -329,6 +348,7 @@ test_ranap_rab_ass_resp_extract_inet_addr(); test_ranap_rab_ass_req_replace_inet_addr(); test_ranap_rab_ass_resp_replace_inet_addr(); + test_ranap_rab_ass_resp_ies_check_failure(); test_cleanup(); return 0; diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index 97756cb..3ce997d 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -14,3 +14,4 @@ before: addr=10.9.1.164, port=1034 ranap_rab_ass_resp_replace_inet_addr rc=0 after: addr=1.2.3.4, port=1234 +ranap_rab_ass_resp_ies_check_failure rab_failed_at_hnb=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4319f7caa45ea758ccd792cc8570521df075cf45 Gerrit-Change-Number: 27139 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-hnbgw[master]: ranap_rab_ass: ensure specific rab_id
by dexter 10 Feb '22

10 Feb '22

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27138 ) Change subject: ranap_rab_ass: ensure specific rab_id ...................................................................... ranap_rab_ass: ensure specific rab_id The parser functions currently ignore the rab_id. An exception is ranap_rab_ass_req_ies_extract_inet_addr, which extracts the rab_id of the first RAB. To make the handling of the RAB assignment parsing more robust lets add a rab_id parameter to the other functions. This parameter can then be used to ensure thet the correct RAB is handled. Change-Id: I2259ffce9f4b508c555d60618c5983ac6294e0ae Related: OS#5152 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 4 files changed, 116 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/38/27138/1 diff --git a/include/osmocom/hnbgw/ranap_rab_ass.h b/include/osmocom/hnbgw/ranap_rab_ass.h index 4cb8e37..f4d5cb6 100644 --- a/include/osmocom/hnbgw/ranap_rab_ass.h +++ b/include/osmocom/hnbgw/ranap_rab_ass.h @@ -6,8 +6,11 @@ RANAP_RAB_AssignmentResponseIEs_t *rab_assignment_response_ies); int ranap_rab_ass_req_ies_extract_inet_addr(struct osmo_sockaddr *addr, uint8_t *rab_id, - RANAP_RAB_AssignmentRequestIEs_t *ies); -int ranap_rab_ass_resp_ies_extract_inet_addr(struct osmo_sockaddr *addr, RANAP_RAB_AssignmentResponseIEs_t *ies); + RANAP_RAB_AssignmentRequestIEs_t *ies, unsigned int index); +int ranap_rab_ass_resp_ies_extract_inet_addr(struct osmo_sockaddr *addr, RANAP_RAB_AssignmentResponseIEs_t *ies, + uint8_t rab_id); -int ranap_rab_ass_req_ies_replace_inet_addr(RANAP_RAB_AssignmentRequestIEs_t *ies, struct osmo_sockaddr *addr); -int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr); +int ranap_rab_ass_req_ies_replace_inet_addr(RANAP_RAB_AssignmentRequestIEs_t *ies, struct osmo_sockaddr *addr, + uint8_t rab_id); +int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr, + uint8_t rab_id); diff --git a/src/osmo-hnbgw/ranap_rab_ass.c b/src/osmo-hnbgw/ranap_rab_ass.c index f5d86a1..23505f2 100644 --- a/src/osmo-hnbgw/ranap_rab_ass.c +++ b/src/osmo-hnbgw/ranap_rab_ass.c @@ -111,10 +111,9 @@ return rc; } -/* Pick the first item from the RAB setup-or-modify list and return the first protocol-ie-field-pair. This is based on - * the assumption that a PS call will only assign a signle RAB. This could be different for video calls and IMS but - * those are in practice a corner case, so we go for this simplified assumption for now. */ -static RANAP_ProtocolIE_FieldPair_t *prot_ie_field_pair_from_ass_req_ies(const RANAP_RAB_AssignmentRequestIEs_t *ies) +/* Pick the indexed item from the RAB setup-or-modify list and return the first protocol-ie-field-pair. */ +static RANAP_ProtocolIE_FieldPair_t *prot_ie_field_pair_from_ass_req_ies(const RANAP_RAB_AssignmentRequestIEs_t *ies, + unsigned int index) { RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair; RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; @@ -126,14 +125,19 @@ return NULL; } - protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[0]; + /* Detect the end of the list */ + if (index >= ies->raB_SetupOrModifyList.list.count) + return NULL; + + protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[index]; protocol_ie_field_pair = protocol_ie_container_pair->list.array[0]; return protocol_ie_field_pair; } -/* See also comment above prot_ie_field_pair_from_ass_req_ies */ -static RANAP_IE_t *setup_or_modif_item_from_rab_ass_resp(const RANAP_RAB_AssignmentResponseIEs_t *ies) +/* Pick the indexed item from the RAB setup-or-modified list and return a pointer to it */ +static RANAP_IE_t *setup_or_modif_item_from_rab_ass_resp(const RANAP_RAB_AssignmentResponseIEs_t *ies, + unsigned int index) { /* Make sure we indeed deal with a setup-or-modified list */ if (!(ies->presenceMask & RAB_ASSIGNMENTRESPONSEIES_RANAP_RAB_SETUPORMODIFIEDLIST_PRESENT)) { @@ -142,16 +146,82 @@ return NULL; } - return ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[0]; + /* Detect the end of the list */ + if (index >= ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.count) + return NULL; + + return ies->raB_SetupOrModifiedList.raB_SetupOrModifiedList_ies.list.array[index]; +} + +/* find the RAB specified by rab_id in ies and when found, decode the result into items_ies */ +static int decode_rab_smditms_from_resp_ies(RANAP_RAB_SetupOrModifiedItemIEs_t *items_ies, + RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) +{ + RANAP_IE_t *setup_or_modified_list_ie; + RANAP_RAB_SetupOrModifiedItem_t *rab_setup_or_modified_item; + int rc; + uint8_t rab_id_decoded; + unsigned int index = 0; + + while (1) { + setup_or_modified_list_ie = setup_or_modif_item_from_rab_ass_resp(ies, index); + if (!setup_or_modified_list_ie) + return -EINVAL; + + rc = ranap_decode_rab_setupormodifieditemies_fromlist(items_ies, &setup_or_modified_list_ie->value); + if (rc < 0) + return -EINVAL; + + rab_setup_or_modified_item = &items_ies->raB_SetupOrModifiedItem; + /* The RAB-ID is defined as a bitstring with a size of 8 (1 byte), + * See also RANAP-IEs.asn, RAB-ID ::= BIT STRING (SIZE (8)) */ + rab_id_decoded = rab_setup_or_modified_item->rAB_ID.buf[0]; + if (rab_id_decoded == rab_id) + return index; + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, items_ies); + index++; + } +} + +/* find the RAB specified by rab_id in ies and when found, decode the result into item */ +static int decode_rab_smditms_from_req_ies(RANAP_RAB_SetupOrModifyItemFirst_t *item, + RANAP_RAB_AssignmentRequestIEs_t *ies, uint8_t rab_id) +{ + RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; + int rc; + uint8_t rab_id_decoded; + unsigned int index = 0; + + while (1) { + protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies, index); + if (!protocol_ie_field_pair) + return -EINVAL; + + if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) { + RANAP_DEBUG + ("Decoding failed, the protocol IE field-pair is not of type RANAP RAB setup-or-modify-item!\n"); + return -EINVAL; + } + + rc = ranap_decode_rab_setupormodifyitemfirst(item, &protocol_ie_field_pair->firstValue); + if (rc < 0) + return -EINVAL; + + rab_id_decoded = item->rAB_ID.buf[0]; + if (rab_id_decoded == rab_id) + return index; + } } /*! Extract IP address and port from RANAP_RAB_AssignmentRequestIEs. * \ptmap[out] addr user provided memory to store extracted RTP stream IP-Address and port number. * \ptmap[out] rab_id pointer to store RAB-ID (optional, can be NULL). * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentRequestIEs. + * \ptmap[in] index index of the SetupOrModifyItem (e.g. 0 for the first list item). * \returns 0 on success; negative on error. */ int ranap_rab_ass_req_ies_extract_inet_addr(struct osmo_sockaddr *addr, uint8_t *rab_id, - RANAP_RAB_AssignmentRequestIEs_t *ies) + RANAP_RAB_AssignmentRequestIEs_t *ies, unsigned int index) { RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; RANAP_RAB_SetupOrModifyItemFirst_t _rab_setup_or_modify_item_first; @@ -161,7 +231,7 @@ uint16_t port; int rc; - protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies); + protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies, index); if (!protocol_ie_field_pair) return -EINVAL; @@ -219,26 +289,20 @@ /*! Extract IP address and port from RANAP_RAB_AssignmentResponseIEs. * \ptmap[out] addr user provided memory to store extracted RTP stream IP-Address and port number. * \ptmap[in] ies user provided memory with RANAP_RAB_AssignmentResponseIEs. + * \ptmap[in] rab_id expected rab id to look for. * \returns 0 on success; negative on error. */ -int ranap_rab_ass_resp_ies_extract_inet_addr(struct osmo_sockaddr *addr, RANAP_RAB_AssignmentResponseIEs_t *ies) +int ranap_rab_ass_resp_ies_extract_inet_addr(struct osmo_sockaddr *addr, RANAP_RAB_AssignmentResponseIEs_t *ies, uint8_t rab_id) { - RANAP_IE_t *setup_or_modified_list_ie; RANAP_RAB_SetupOrModifiedItemIEs_t _rab_setup_or_modified_items_ies; RANAP_RAB_SetupOrModifiedItemIEs_t *rab_setup_or_modified_items_ies = &_rab_setup_or_modified_items_ies; RANAP_RAB_SetupOrModifiedItem_t *rab_setup_or_modified_item; uint16_t port; int rc; - setup_or_modified_list_ie = setup_or_modif_item_from_rab_ass_resp(ies); - if (!setup_or_modified_list_ie) + rc = decode_rab_smditms_from_resp_ies(rab_setup_or_modified_items_ies, ies, rab_id); + if (rc < 0) return -EINVAL; - rc = ranap_decode_rab_setupormodifieditemies_fromlist(rab_setup_or_modified_items_ies, - &setup_or_modified_list_ie->value); - if (rc < 0) { - return -EINVAL; - } - rab_setup_or_modified_item = &rab_setup_or_modified_items_ies->raB_SetupOrModifiedItem; /* Decode IP-Address */ @@ -276,8 +340,9 @@ /*! Replace IP address and port in RANAP_RAB_AssignmentRequestIEs. * \ptmap[inout] ies user provided memory with RANAP_RAB_AssignmentRequestIEs. * \ptmap[in] addr user provided memory that contains the new RTP stream IP-Address and port number. + * \ptmap[in] rab_id expected rab id to look for. * \returns 0 on success; negative on error. */ -int ranap_rab_ass_req_ies_replace_inet_addr(RANAP_RAB_AssignmentRequestIEs_t *ies, struct osmo_sockaddr *addr) +int ranap_rab_ass_req_ies_replace_inet_addr(RANAP_RAB_AssignmentRequestIEs_t *ies, struct osmo_sockaddr *addr, uint8_t rab_id) { RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair; RANAP_RAB_SetupOrModifyItemFirst_t _rab_setup_or_modify_item_first; @@ -287,20 +352,10 @@ struct osmo_sockaddr addr_old; bool uses_x213_nsap; int rc; + int index; - protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies); - if (!protocol_ie_field_pair) - return -EINVAL; - - if (protocol_ie_field_pair->id != RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) { - RANAP_DEBUG("Rewriting transport layer information failed, unexpected IE field-pair type!\n"); - return -EINVAL; - } - - /* Decode setup-or-modifiy item (first) */ - rc = ranap_decode_rab_setupormodifyitemfirst(rab_setup_or_modify_item_first, - &protocol_ie_field_pair->firstValue); - if (rc < 0) + index = decode_rab_smditms_from_req_ies(rab_setup_or_modify_item_first, ies, rab_id); + if (index < 0) return -EINVAL; /* Replace transport-layer-information */ @@ -332,6 +387,7 @@ } /* Reencode transport-layer-information */ + protocol_ie_field_pair = prot_ie_field_pair_from_ass_req_ies(ies, index); rc = ANY_fromType_aper(&protocol_ie_field_pair->firstValue, &asn_DEF_RANAP_RAB_SetupOrModifyItemFirst, rab_setup_or_modify_item_first); if (rc < 0) { @@ -354,8 +410,9 @@ /*! Replace IP address and port in RANAP_RAB_AssignmentResponseIEs. * \ptmap[inout] ies user provided memory with RANAP_RAB_AssignmentResponseIEs. * \ptmap[in] addr user provided memory that contains the new RTP stream IP-Address and port number. + * \ptmap[in] rab_id expected rab id to look for. * \returns 0 on success; negative on error. */ -int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr) +int ranap_rab_ass_resp_ies_replace_inet_addr(RANAP_RAB_AssignmentResponseIEs_t *ies, struct osmo_sockaddr *addr, uint8_t rab_id) { RANAP_IE_t *setup_or_modified_list_ie; RANAP_RAB_SetupOrModifiedItemIEs_t _rab_setup_or_modified_items_ies; @@ -367,14 +424,10 @@ struct osmo_sockaddr addr_old; bool uses_x213_nsap; int rc; + int index; - setup_or_modified_list_ie = setup_or_modif_item_from_rab_ass_resp(ies); - if (!setup_or_modified_list_ie) - return -EINVAL; - - rc = ranap_decode_rab_setupormodifieditemies_fromlist(rab_setup_or_modified_items_ies, - &setup_or_modified_list_ie->value); - if (rc < 0) + index = decode_rab_smditms_from_resp_ies(rab_setup_or_modified_items_ies, ies, rab_id); + if (index < 0) return -EINVAL; rab_setup_or_modified_item = &rab_setup_or_modified_items_ies->raB_SetupOrModifiedItem; @@ -402,6 +455,7 @@ rab_setup_or_modified_item->iuTransportAssociation = &temp_transport_layer_information->iuTransportAssociation; /* Reencode modified setup or modified list */ + setup_or_modified_list_ie = setup_or_modif_item_from_rab_ass_resp(ies, index); rc = ANY_fromType_aper(&setup_or_modified_list_ie->value, &asn_DEF_RANAP_RAB_SetupOrModifiedItem, rab_setup_or_modified_items_ies); if (rc < 0) { diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.c b/tests/ranap_rab_ass/ranap_rab_ass_test.c index c67b5aa..d7bee09 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.c +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.c @@ -121,7 +121,7 @@ rc = ranap_ran_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, &rab_id, &message.msg.raB_AssignmentRequestIEs); + rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, &rab_id, &message.msg.raB_AssignmentRequestIEs, 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("ranap_rab_ass_req_extract_inet_addr rc=%d\n", rc); printf("RESULT: addr=%s, port=%u, rab-id=%02x\n", addr_str.ip, addr_str.port, rab_id); @@ -145,7 +145,7 @@ rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec, sizeof(testvec)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs); + rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs, 7); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("ranap_rab_ass_resp_extract_inet_addr rc=%d\n", rc); printf("RESULT: addr=%s, port=%u\n", addr_str.ip, addr_str.port); @@ -158,6 +158,7 @@ struct osmo_sockaddr addr; struct osmo_sockaddr_str addr_str; ranap_message message; + uint8_t rab_id; uint8_t testvec_in[] = { 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x01, 0x00, 0x36, 0x40, 0x52, 0x00, 0x00, 0x01, 0x00, 0x35, @@ -190,10 +191,10 @@ rc = ranap_ran_rx_co_decode(talloc_asn1_ctx, &message, testvec_in, sizeof(testvec_in)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, NULL, &message.msg.raB_AssignmentRequestIEs); + rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, &rab_id, &message.msg.raB_AssignmentRequestIEs, 0); OSMO_ASSERT(rc == 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); - printf("before: addr=%s, port=%u\n", addr_str.ip, addr_str.port); + printf("before: addr=%s, port=%u, rab_id=%u\n", addr_str.ip, addr_str.port, rab_id); memset(&addr_str, 0, sizeof(addr_str)); addr_str.af = AF_INET; @@ -201,13 +202,13 @@ osmo_strlcpy(addr_str.ip, "1.2.3.4", sizeof(addr_str.ip)); osmo_sockaddr_str_to_sockaddr(&addr_str, &addr.u.sas); - rc = ranap_rab_ass_req_ies_replace_inet_addr(&message.msg.raB_AssignmentRequestIEs, &addr); + rc = ranap_rab_ass_req_ies_replace_inet_addr(&message.msg.raB_AssignmentRequestIEs, &addr, rab_id); printf("ranap_rab_ass_req_replace_inet_addr rc=%d\n", rc); - rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, NULL, &message.msg.raB_AssignmentRequestIEs); + rc = ranap_rab_ass_req_ies_extract_inet_addr(&addr, &rab_id, &message.msg.raB_AssignmentRequestIEs, 0); OSMO_ASSERT(rc == 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); - printf("after: addr=%s, port=%u\n", addr_str.ip, addr_str.port); + printf("after: addr=%s, port=%u, rab_id=%u\n", addr_str.ip, addr_str.port, rab_id); rc = ranap_rab_ass_req_encode(testvec_in, sizeof(testvec_in), &message.msg.raB_AssignmentRequestIEs); OSMO_ASSERT(rc == sizeof(testvec_in)); @@ -242,7 +243,7 @@ rc = ranap_cn_rx_co_decode(talloc_asn1_ctx, &message, testvec_in, sizeof(testvec_in)); OSMO_ASSERT(rc == 0); - rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs); + rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs, 6); OSMO_ASSERT(rc == 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("before: addr=%s, port=%u\n", addr_str.ip, addr_str.port); @@ -253,10 +254,10 @@ osmo_strlcpy(addr_str.ip, "1.2.3.4", sizeof(addr_str.ip)); osmo_sockaddr_str_to_sockaddr(&addr_str, &addr.u.sas); - rc = ranap_rab_ass_resp_ies_replace_inet_addr(&message.msg.raB_AssignmentResponseIEs, &addr); + rc = ranap_rab_ass_resp_ies_replace_inet_addr(&message.msg.raB_AssignmentResponseIEs, &addr, 6); printf("ranap_rab_ass_resp_replace_inet_addr rc=%d\n", rc); - rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs); + rc = ranap_rab_ass_resp_ies_extract_inet_addr(&addr, &message.msg.raB_AssignmentResponseIEs, 6); OSMO_ASSERT(rc == 0); osmo_sockaddr_str_from_sockaddr(&addr_str, &addr.u.sas); printf("after: addr=%s, port=%u\n", addr_str.ip, addr_str.port); diff --git a/tests/ranap_rab_ass/ranap_rab_ass_test.ok b/tests/ranap_rab_ass/ranap_rab_ass_test.ok index f7b4b67..97756cb 100644 --- a/tests/ranap_rab_ass/ranap_rab_ass_test.ok +++ b/tests/ranap_rab_ass/ranap_rab_ass_test.ok @@ -8,9 +8,9 @@ RESULT: addr=10.9.1.162, port=8054, rab-id=11 ranap_rab_ass_resp_extract_inet_addr rc=0 RESULT: addr=10.9.1.164, port=1034 -before: addr=10.9.1.162, port=8122 +before: addr=10.9.1.162, port=8122, rab_id=39 ranap_rab_ass_req_replace_inet_addr rc=0 -after: addr=1.2.3.4, port=1234 +after: addr=1.2.3.4, port=1234, rab_id=39 before: addr=10.9.1.164, port=1034 ranap_rab_ass_resp_replace_inet_addr rc=0 after: addr=1.2.3.4, port=1234 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2259ffce9f4b508c555d60618c5983ac6294e0ae Gerrit-Change-Number: 27138 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers
by iedemam 10 Feb '22

10 Feb '22

iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... stats: sanitize tcp stat name identifiers The identifiers being used in tcp_stats are not friendly as filenames. This change sanitizes the identifiers before they are used. BEFORE: ipa-oml,r=127.0.0.1:45749<->l=127.0.0.1:3002 AFTER: ipa-oml_r_127_0_0_1_45749_-_l_127_0_0_1_3002 Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 --- M src/stats_tcp.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/27137/1 diff --git a/src/stats_tcp.c b/src/stats_tcp.c index dec5b5d..c2694f1 100644 --- a/src/stats_tcp.c +++ b/src/stats_tcp.c @@ -123,6 +123,7 @@ osmo_sock_get_name2(stats_tcp_entry->fd->fd)); else snprintf(stat_name, sizeof(stat_name), "%s", osmo_sock_get_name2(stats_tcp_entry->fd->fd)); + osmo_identifier_sanitize_buf(stat_name, ":", '_'); osmo_stat_item_group_set_name(stats_tcp_entry->stats_tcp, stat_name); osmo_stat_item_set(osmo_stat_item_group_get_item(stats_tcp_entry->stats_tcp, STATS_TCP_UNACKED), -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log