- gerrit-log - lists.osmocom.org

Change in pysim[master]: utils.py: type annotations for DataObject related methods

by laforge

laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/27132/1 diff --git a/pySim/utils.py b/pySim/utils.py index 0a9be86..9f47197 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils.py: Fix some tuple type annotations

by laforge

laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/33/27133/1 diff --git a/pySim/utils.py b/pySim/utils.py index 9f47197..325499d 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Add hnbgw test

by dexter

Attention is currently required from: laforge, daniel. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 ) Change subject: Add hnbgw test ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: To me this looks good. I have the tests running already. I think it might make sense to squash the whole patchset into one patch. The testsuite is completely new and this patch is only the first patch followed by a series of improvements. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0a2fb795aec83337eda8d9972e6ff264ead61076 Gerrit-Change-Number: 27106 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 14:18:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Add hnbgw test

by dexter

Attention is currently required from: laforge, daniel. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 ) Change subject: Add hnbgw test ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0a2fb795aec83337eda8d9972e6ff264ead61076 Gerrit-Change-Number: 27106 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 14:15:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Handle nested security condition data objects

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27129 ) Change subject: ts_102_221: Handle nested security condition data objects ...................................................................... Patch Set 2: (3 comments) File pySim/ts_102_221.py: https://gerrit.osmocom.org/c/pysim/+/27129/comment/c04026c1_a6f9d08d PS1, Line 479: def from_bytes(self, binary:bytes): > Missing type hint: […] true for this specific implementation of the abstrac method, but in general i's basically any python type, just as long as it can be json-serialized. https://gerrit.osmocom.org/c/pysim/+/27129/comment/271bb72c_04830da9 PS1, Line 486: def to_bytes(self): > Missing type hint: […] Done https://gerrit.osmocom.org/c/pysim/+/27129/comment/e762d684_16b80310 PS1, Line 489: ++ > Looks like you meant '+=' here? This could be done simpler: […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Gerrit-Change-Number: 27129 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 14:13:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 12: (1 comment) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/19bcbb26_681… PS12, Line 22: RUN_ARGS="-v $(CURDIR):/data --user $(UID)" \ Add --rm here too? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 12 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:59:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_51_011: Fix type annotation for Tuple[int, int]

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27131 ) Change subject: ts_51_011: Fix type annotation for Tuple[int, int] ...................................................................... ts_51_011: Fix type annotation for Tuple[int, int] Thanks to Vadim for pointing this out. Change-Id: I7ee1309331902bafab3c9fc6bc33ca713f8c7832 --- M pySim/ts_51_011.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/31/27131/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index a7f9f97..dd7b788 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -325,6 +325,7 @@ from pySim.utils import * from pySim.tlv import * +from typing import Tuple from struct import pack, unpack from construct import * from construct import Optional as COptional @@ -528,7 +529,7 @@ super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self.table = table @staticmethod - def _bit_byte_offset_for_service(service:int) -> (int, int): + def _bit_byte_offset_for_service(service:int) -> Tuple[int, int]: i = service - 1 byte_offset = i//4 bit_offset = (i % 4) * 2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ee1309331902bafab3c9fc6bc33ca713f8c7832 Gerrit-Change-Number: 27131 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by laforge

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27127 to look at the new patch set (#3). 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(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/27/27127/3 -- 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: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by laforge

Attention is currently required from: fixeria. 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 2: (1 comment) File pySim/ts_31_102.py: https://gerrit.osmocom.org/c/pysim/+/27127/comment/b078df5f_bd31840c PS2, Line 536: (int, int) > This looks wrong. Should be: […] I just copid this from ts_51_001.EF_ServiceTable._bit_byte_offset_for_service - I guess it's wrong there, too? -- 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: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:52:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: tests: in46a_test: Make coverity happy when calling in46a_from_eua

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 ) Change subject: tests: in46a_test: Make coverity happy when calling in46a_from_eua ...................................................................... tests: in46a_test: Make coverity happy when calling in46a_from_eua Coverity warns around that test code: "Overrunning struct type in46_addr of 20 bytes by passing it to a function which accesses it at byte offset 39." That's basically because in64a_from_eua expects to be passed a 2 element array to be filled. The second element, though, is only accessed in the case where an IPv4v6 EUA is passed, so in the cases where the test explicitly passes an IPv4 or IPv6 EUA it's not really an issue, hence coverity throwing a false positive here. Let's anyway rewrite the code to pass a 2 element array for completeness, since it doesn't hurt and makes coverity happy. Related: Coverity CID#249006 Change-Id: Idfc9104f48eeee6e7f11ebc5c17d4b0e4b2fe9e2 --- M tests/lib/in46a_test.c 1 file changed, 19 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/lib/in46a_test.c b/tests/lib/in46a_test.c index d6c4f47..d576124 100644 --- a/tests/lib/in46a_test.c +++ b/tests/lib/in46a_test.c @@ -146,7 +146,7 @@ static void test_in46a_from_eua(void) { - struct in46_addr ia; + struct in46_addr ia[2]; struct ul66_t eua; const uint8_t v4_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4 }; const uint8_t v4_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4, 1,2,3,4 }; @@ -155,35 +155,35 @@ printf("Testing in46a_from_eua() with IPv4 addresses\n"); /* default: v4 unspec */ - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == 0); /* invalid */ eua.v[0] = 0x23; eua.v[1] = PDP_EUA_TYPE_v4; eua.l = 6; - OSMO_ASSERT(in46a_from_eua(&eua, &ia) < 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) < 0); /* invalid */ eua.v[0] = PDP_EUA_ORG_IETF; eua.v[1] = 0x23; eua.l = 6; - OSMO_ASSERT(in46a_from_eua(&eua, &ia) < 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) < 0); /* unspecified V4 */ memcpy(eua.v, v4_unspec, sizeof(v4_unspec)); eua.l = sizeof(v4_unspec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == 0); /* specified V4 */ memcpy(eua.v, v4_spec, sizeof(v4_spec)); eua.l = sizeof(v4_spec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == htonl(0x01020304)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == htonl(0x01020304)); } static void test_in46a_netmasklen(void) @@ -318,7 +318,7 @@ static void test_in46a_from_eua_v6(void) { - struct in46_addr ia; + struct in46_addr ia[2]; struct ul66_t eua; const uint8_t v6_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v6 }; const uint8_t v6_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v6, @@ -331,16 +331,16 @@ /* unspecified V6 */ memcpy(eua.v, v6_unspec, sizeof(v6_unspec)); eua.l = sizeof(v6_unspec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 16); - OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia.v6)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 16); + OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia[0].v6)); /* specified V6 */ memcpy(eua.v, v6_spec, sizeof(v6_spec)); eua.l = sizeof(v6_spec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 16); - OSMO_ASSERT(!memcmp(&ia.v6, v6_spec+2, ia.len)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 16); + OSMO_ASSERT(!memcmp(&ia[0].v6, v6_spec+2, ia[0].len)); } static void test_in46a_from_eua_v4v6(void) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idfc9104f48eeee6e7f11ebc5c17d4b0e4b2fe9e2 Gerrit-Change-Number: 27097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: tests: in46a_test: Make coverity happy when calling in46a_from_eua

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 ) Change subject: tests: in46a_test: Make coverity happy when calling in46a_from_eua ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idfc9104f48eeee6e7f11ebc5c17d4b0e4b2fe9e2 Gerrit-Change-Number: 27097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:49:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 12: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/f2f194f0_1a4… PS12, Line 15: Unfortunately, osmo-config-merge is not capable of removing text blocks : or substituting specific parts, so we fall-back to using sed where it's : needed. one might add some kind of syntax for this in osmo-config-merge at a later point. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 12 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:49:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26681 ) Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:48:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: tests: in46a_test: Make coverity happy when calling in46a_from_eua

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 ) Change subject: tests: in46a_test: Make coverity happy when calling in46a_from_eua ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idfc9104f48eeee6e7f11ebc5c17d4b0e4b2fe9e2 Gerrit-Change-Number: 27097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:47:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26681 ) Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... Patch Set 10: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:45:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Makefile: run $(nproc) parallel jobs for target 'deps'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27124 ) Change subject: Makefile: run $(nproc) parallel jobs for target 'deps' ...................................................................... Makefile: run $(nproc) parallel jobs for target 'deps' Change-Id: I53112a20d78d12bcc2764c1fc5567eb26bfa46cc --- M Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/Makefile b/Makefile index 87ce759..91c826c 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ .PHONY: deps deps: - $(MAKE) -C deps + $(MAKE) $(PARALLEL_MAKE) -C deps # deps-update target for backwards compat; now does the same as 'make deps' .PHONY: deps-update -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53112a20d78d12bcc2764c1fc5567eb26bfa46cc Gerrit-Change-Number: 27124 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 12 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:37:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by fixeria

Attention is currently required from: laforge. fixeria 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 2: (1 comment) File pySim/ts_31_102.py: https://gerrit.osmocom.org/c/pysim/+/27127/comment/554738c8_5bb690fb PS2, Line 536: (int, int) This looks wrong. Should be: Tuple[int, int] (make sure that you have Tuple imported from typing) -- 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: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:36:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26681 ) Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:35:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Makefile: run $(nproc) parallel jobs for target 'deps'

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27124 ) Change subject: Makefile: run $(nproc) parallel jobs for target 'deps' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53112a20d78d12bcc2764c1fc5567eb26bfa46cc Gerrit-Change-Number: 27124 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:32:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Implement proper parsing of EF.DIR

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27130 ) Change subject: ts_102_221: Implement proper parsing of EF.DIR ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Gerrit-Change-Number: 27130 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:24:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Handle nested security condition data objects

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27129 ) Change subject: ts_102_221: Handle nested security condition data objects ...................................................................... Patch Set 1: Code-Review-1 (4 comments) Patchset: PS1: CR-1 due to non-existing '++' operator. File pySim/ts_102_221.py: https://gerrit.osmocom.org/c/pysim/+/27129/comment/dd3716c5_a707e707 PS1, Line 479: def from_bytes(self, binary:bytes): Missing type hint: -> list https://gerrit.osmocom.org/c/pysim/+/27129/comment/0930b7e7_ca64a633 PS1, Line 486: def to_bytes(self): Missing type hint: -> bytes https://gerrit.osmocom.org/c/pysim/+/27129/comment/acfaf1d3_640866c6 PS1, Line 489: ++ Looks like you meant '+=' here? This could be done simpler: encoded = [self.children.encode(e) for e in self.decoded] return b''.join(encoded) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Gerrit-Change-Number: 27129 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:22:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Implement proper parsing of EF.DIR

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27130 ) Change subject: ts_102_221: Implement proper parsing of EF.DIR ...................................................................... ts_102_221: Implement proper parsing of EF.DIR EF.DIR can not only contain the AID + Label of TS 102 221, but can also contain any of the DOs specified in ISO7816-4. Let's imoplement this based on the modern pySim.tlv parser Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Closes: OS#5410 --- A pySim/iso7816_4.py M pySim/ts_102_221.py 2 files changed, 76 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/30/27130/1 diff --git a/pySim/iso7816_4.py b/pySim/iso7816_4.py new file mode 100644 index 0000000..ea838cf --- /dev/null +++ b/pySim/iso7816_4.py @@ -0,0 +1,62 @@ +# coding=utf-8 +"""Utilities / Functions related to ISO 7816-4 + +(C) 2022 by Harald Welte <laforge(a)osmocom.org> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +""" + +from construct import * +from pySim.construct import * +from pySim.utils import * +from pySim.filesystem import * +from pySim.tlv import * + +# Table 91 + Section 8.2.1.2 +class ApplicationId(BER_TLV_IE, tag=0x4f): + _construct = GreedyBytes + +# Table 91 +class ApplicationLabel(BER_TLV_IE, tag=0x50): + _construct = GreedyBytes + +# Table 91 + Section 5.3.1.2 +class FileReference(BER_TLV_IE, tag=0x51): + _construct = GreedyBytes + +# Table 91 +class CommandApdu(BER_TLV_IE, tag=0x52): + _construct = GreedyBytes + +# Table 91 +class DiscretionaryData(BER_TLV_IE, tag=0x53): + _construct = GreedyBytes + +# Table 91 +class DiscretionaryTemplate(BER_TLV_IE, tag=0x73): + _construct = GreedyBytes + +# Table 91 + RFC1738 / RFC2396 +class URL(BER_TLV_IE, tag=0x5f50): + _construct = GreedyString('ascii') + +# Table 91 +class ApplicationRelatedDOSet(BER_TLV_IE, tag=0x61): + _construct = GreedyBytes + +# Section 8.2.1.3 Application Template +class ApplicationTemplate(BER_TLV_IE, tag=0x61, nested=[ApplicationId, ApplicationLabel, FileReference, + CommandApdu, DiscretionaryData, DiscretionaryTemplate,URL, + ApplicationRelatedDOSet]): + pass diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 88855bf..d35ebe1 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -22,10 +22,12 @@ from pySim.construct import * from pySim.utils import * from pySim.filesystem import * +from pySim.tlv import * from bidict import bidict from pySim.profile import CardProfile from pySim.profile import match_uicc from pySim.profile import match_sim +import pySim.iso7816_4 as iso7816_4 # A UICC will usually also support 2G functionality. If this is the case, we # need to add DF_GSM and DF_TELECOM along with the UICC related files @@ -504,18 +506,20 @@ # TS 102 221 Section 13.1 class EF_DIR(LinFixedEF): + class ApplicationLabel(BER_TLV_IE, tag=0x50): + # TODO: UCS-2 coding option as per Annex A of TS 102 221 + _construct = GreedyString('ascii') + + class ApplicationTemplate(BER_TLV_IE, tag=0x61, + nested=[iso7816_4.ApplicationId, ApplicationLabel, iso7816_4.FileReference, + iso7816_4.CommandApdu, iso7816_4.DiscretionaryData, + iso7816_4.DiscretionaryTemplate, iso7816_4.URL, + iso7816_4.ApplicationRelatedDOSet]): + pass + def __init__(self, fid='2f00', sfid=0x1e, name='EF.DIR', desc='Application Directory'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={5,54}) - - def _decode_record_hex(self, raw_hex_data): - raw_hex_data = raw_hex_data.upper() - atempl_base_tlv = TLV(['61']) - atempl_base = atempl_base_tlv.parse(raw_hex_data) - atempl_TLV_MAP = {'4F': 'aid_value', 50:'label'} - atempl_tlv = TLV(atempl_TLV_MAP) - atempl = atempl_tlv.parse(atempl_base['61']) - # FIXME: "All other Dos are according to ISO/IEC 7816-4" - return tlv_key_replace(atempl_TLV_MAP, atempl) + self._tlv = EF_DIR.ApplicationTemplate # TS 102 221 Section 13.2 class EF_ICCID(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Gerrit-Change-Number: 27130 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26681 ) Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:10:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Makefile: run $(nproc) parallel jobs for target 'deps'

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27124 ) Change subject: Makefile: run $(nproc) parallel jobs for target 'deps' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53112a20d78d12bcc2764c1fc5567eb26bfa46cc Gerrit-Change-Number: 27124 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:09:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_msg_factory: add missing apidoc

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27128 ) Change subject: ranap_msg_factory: add missing apidoc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7484413980acdf17fde9ed0f97cf7f97e0ef3ae4 Gerrit-Change-Number: 27128 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:09:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory

by fixeria

Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/26681 to look at the new patch set (#10). Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... ttcn3-bts-test: move generic config files into a directory Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 --- M ttcn3-bts-test/Dockerfile R ttcn3-bts-test/generic/BTS_Tests.cfg R ttcn3-bts-test/generic/osmo-bsc.cfg R ttcn3-bts-test/generic/osmo-bts.cfg M ttcn3-bts-test/jenkins.sh 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/81/26681/10 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

Attention is currently required from: osmith, laforge. fixeria has uploaded a new patch set (#11) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... ttcn3-bts-test: use osmo-config-merge to generate config files This uses the config files from osmo-ttcn3-hacks.git instead of keeping local copies around here, which has shown many times will get out of sync. Extract the original files (*.src.cfg) from the testsuite image (ttcn3-bts-test) and merge them with the local *.confmerge files using osmo-config-merge. Use the resulting files (*.gen.cfg). Unfortunately, osmo-config-merge is not capable of removing text blocks or substituting specific parts, so we fall-back to using sed where it's needed. A good example is 'log gsmtap 127.0.0.1', as there is no command for removing a logging target of such type. Co-Authored-By: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> Co-Authored-By: Oliver Smith <osmith(a)sysmocom.de> Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 --- M .gitignore M ttcn3-bts-test/Dockerfile M ttcn3-bts-test/Makefile D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bsc.cfg A ttcn3-bts-test/generic/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bts.cfg A ttcn3-bts-test/generic/osmo-bts.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 14 files changed, 323 insertions(+), 854 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/20622/11 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 11 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Test RAB Assignment ReleaseRequest

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120 ) Change subject: hnbgw: Test RAB Assignment ReleaseRequest ...................................................................... Patch Set 1: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120/comment/04765f13_cbf0… PS1, Line 904: alt { This was already in some previous patch. It probably makes sense to put it in a function or an altstep. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90d4b1d335a32ab6e2590616149f3a34825d2046 Gerrit-Change-Number: 27120 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:02:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ranap: Add templates for RAB Assignment ReleaseRequest

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27119 ) Change subject: ranap: Add templates for RAB Assignment ReleaseRequest ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27119 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie22253c84651119c4da91053eb4d79ad8f4abe7d Gerrit-Change-Number: 27119 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:01:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Match on connection IP/port in CRCX/MDCX

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27118 ) Change subject: hnbgw: Match on connection IP/port in CRCX/MDCX ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I465a677a29bf4e7a95245d480a241bd840eea75f Gerrit-Change-Number: 27118 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:00:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Add receive templates for SDP and use those in {CR,MD}CX

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27117 ) Change subject: MGCP_Templates: Add receive templates for SDP and use those in {CR,MD}CX ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc46888b1b7913d399c79ab735841844ff0487ad Gerrit-Change-Number: 27117 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 13:00:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Use helper function for the rab assignment

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27116 ) Change subject: hnbgw: Use helper function for the rab assignment ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27116/comment/003f18b9_95d2… PS1, Line 168: } This looks like it should have been fixed in some earlier patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I95625796ee3c75e36637794018e5db27d022dddb Gerrit-Change-Number: 27116 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:59:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Check for DLCX on Iu Release as well

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27115 ) Change subject: hnbgw: Check for DLCX on Iu Release as well ...................................................................... Patch Set 1: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27115/comment/ddda05eb_c1de… PS1, Line 844: repeat; You could probably simply do count := count +1; if (count == 1) repeat; and drop one of the alts. Not a big problem though. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id53e99e51dbc6b9af67503ba6ecbc8990a7de4c9 Gerrit-Change-Number: 27115 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:58:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: First working RAB Assignment

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27114 ) Change subject: hnbgw: First working RAB Assignment ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27114/comment/0dbbd6e9_8bb3… PS1, Line 574: /* build a RANAP RAB AssignmentRespons based on the TestHdlrParams */ Response -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5eae9f23ba6cf5e85a7daa025c4672c0a02031ca Gerrit-Change-Number: 27114 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:56:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ranap: Add more RAB-related templates

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27113 ) Change subject: ranap: Add more RAB-related templates ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File library/ranap/RANAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27113/comment/a35e4d3c_d615… PS1, Line 1345: criticality := ignore, this looks like a different patch, but fine anyway. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I363428ab4af869bb1aa4470b33fa52366cbda8b4 Gerrit-Change-Number: 27113 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:53:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Connect MGCP ports in f_start_handler_create

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27112 ) Change subject: hnbgw: Connect MGCP ports in f_start_handler_create ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0c9c0c84bc38abded319581eae46807f0294115e Gerrit-Change-Number: 27112 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:52:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Add tests for Iuh->Iu disconnect

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27111 ) Change subject: hnbgw: Add tests for Iuh->Iu disconnect ...................................................................... Patch Set 1: (1 comment) File library/RUA_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27111/comment/e668a46a_753d… PS1, Line 59: RUA_Conn_Req, Sounds like you want to introduce a RUA_PDU? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c1858382483af94542af9eb6977d360f26fdaef Gerrit-Change-Number: 27111 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:52:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Add hnbgw test

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 ) Change subject: Add hnbgw test ...................................................................... Patch Set 1: Code-Review+1 (6 comments) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/6c9d5bae_4ccb… PS1, Line 212: /*function f_start_handler(void_fn fn, template (omit) TestHdlrParams pars := omit) Can this be dropped? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/e255ea6a_b4c0… PS1, Line 218: /*private function f_tc_hnb_register_request(charstring id) runs on HNBGW_ConnHdlr { Can this be dropped? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/9d7c5b0d_aef9… PS1, Line 224: //var HNBGW_ConnHdlr vc_conn; Can this be dropped? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/470bbd3b_c5af… PS1, Line 247: //var HNBGW_ConnHdlr vc_conn; Can this be dropped? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/e604765e_e50c… PS1, Line 267: //RANAP.receive(); Can this be dropped? File hnbgw/MSC_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/e996cb9f_48d1… PS1, Line 96: // FIXME FIXME what? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0a2fb795aec83337eda8d9972e6ff264ead61076 Gerrit-Change-Number: 27106 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:50:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory

by fixeria

Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/26681 to look at the new patch set (#9). Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... ttcn3-bts-test: move generic config files into a directory Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 --- R ttcn3-bts-test/generic/BTS_Tests.cfg R ttcn3-bts-test/generic/osmo-bsc.cfg R ttcn3-bts-test/generic/osmo-bts.cfg M ttcn3-bts-test/jenkins.sh 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/81/26681/9 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

Attention is currently required from: osmith, laforge. fixeria has uploaded a new patch set (#10) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... ttcn3-bts-test: use osmo-config-merge to generate config files This uses the config files from osmo-ttcn3-hacks.git instead of keeping local copies around here, which has shown many times will get out of sync. Download the original files using wget (*.src.cfg) and merge them with the local *.confmerge files using osmo-config-merge (*.gen.cfg). Unfortunately, osmo-config-merge is not capable of removing text blocks or substituting specific parts, so we fall-back to using sed where it's needed. A good example is 'log gsmtap 127.0.0.1', as there is no command for removing a logging target of such type. Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 --- M .gitignore M ttcn3-bts-test/Dockerfile M ttcn3-bts-test/Makefile D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bsc.cfg A ttcn3-bts-test/generic/osmo-bsc.confmerge D ttcn3-bts-test/generic/osmo-bts.cfg A ttcn3-bts-test/generic/osmo-bts.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 14 files changed, 323 insertions(+), 854 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/20622/10 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 10 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by fixeria

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 9: (2 comments) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/b204a4d6_efb… PS9, Line 24: FORCE_FETCH: > FORCE_FETCH is not needed, cfg above is already a phony target. […] If I remove FORCE_FETCH, make says: make: Nothing to be done for 'cfg'. even if I change original files in the image. So we better keep it. File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/8e9ac5aa_cf3… PS6, Line 139: cp osmo-bsc-generic.gen.cfg $VOL_BASE_DIR/bsc/ > Ah right, I did not not see that... but still, it needs to be […] I see the problem now. It did not affect my tests because the next patch fixes it (renames 'osmo-bsc-generic.gen.cfg' to 'generic/osmo-bsc.gen.cfg'). Let's just rebase this patch on top of I1bc5c51306525c6829e9d8e2991555a99c9b49a2. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 9 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:25:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Add f_ran_register_exp()

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27109 ) Change subject: RAN_Emulation: Add f_ran_register_exp() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27109 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9d38dbdf589ed0f5999a5aeeb31b10ca5d07de16 Gerrit-Change-Number: 27109 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:21:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Don't decode L3 if g_ran_ops.decode_dtap == false

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27108 ) Change subject: RAN_Emulation: Don't decode L3 if g_ran_ops.decode_dtap == false ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04a9197ac0b68c2dcb7542d035dc70c9f2b90473 Gerrit-Change-Number: 27108 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:20:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Iuh_Emulation: Introduce Iuh_ConnHdlr component type

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27107 ) Change subject: Iuh_Emulation: Introduce Iuh_ConnHdlr component type ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icbffedceb65f791306fde74f3bc5b8fe964148b9 Gerrit-Change-Number: 27107 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Feb 2022 12:18:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: ts_102_221: Handle nested security condition data objects

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27129 ) Change subject: ts_102_221: Handle nested security condition data objects ...................................................................... ts_102_221: Handle nested security condition data objects ISO 7816-4 Section 5.4.3.2 "Expanded Format" permits for nesting of security conditions using boolean operators OR, AND, NOT. Let's implement decoding and encoding of these. An example decoded looks like: pySIM-shell (MF/EF.ARR)> read_record_decoded 1 [ [ { "access_mode": [ "activate_file_or_record", "deactivate_file_or_record", "update_erase" ] }, { "or": [ { "control_reference_template": "ADM1" }, { "control_reference_template": "ADM2" } ] } ], [ { "access_mode": [ "read_search_compare" ] }, { "always": null } ] ] Prior to this patch, pySim would raise "ValueError: Unknown Tag 0xa0 in bytearray" Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Closes: OS#5411 --- M pySim/ts_102_221.py 1 file changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/29/27129/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 7cc3025..88855bf 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -470,8 +470,37 @@ Always_DO = TL0_DataObject('always', 'Always', 0x90) Never_DO = TL0_DataObject('never', 'Never', 0x97) + +class Nested_DO(DataObject): + """A DO that nests another DO/Choice/Sequence""" + def __init__(self, name, tag, choice): + super().__init__(name, tag=tag) + self.children = choice + def from_bytes(self, binary:bytes): + remainder = binary + self.decoded = [] + while remainder: + rc, remainder = self.children.decode(remainder) + self.decoded.append(rc) + return self.decoded + def to_bytes(self): + ret = b'' + for e in self.decoded: + ret ++ self.children.encode(e) + return ret + +OR_Template = DataObjectChoice('or_template', 'OR-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +OR_DO = Nested_DO('or', 0xa0, OR_Template) +AND_Template = DataObjectChoice('and_template', 'AND-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +AND_DO = Nested_DO('and', 0xa7, AND_Template) +NOT_Template = DataObjectChoice('not_template', 'NOT-Template', + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) +NOT_DO = Nested_DO('not', 0xaf, NOT_Template) SC_DO = DataObjectChoice('security_condition', 'Security Condition', - members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO()]) + members=[Always_DO, Never_DO, SecCondByte_DO(), SecCondByte_DO(0x9e), CRT_DO(), + OR_DO, AND_DO, NOT_DO]) # TS 102 221 Section 13.1 class EF_DIR(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icb09cf3a90303a86fc77406b8b0806b5c926f1be Gerrit-Change-Number: 27129 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by laforge

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27127 to look at the new patch set (#2). 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, 45 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/27/27127/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: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_msg_factory: add missing apidoc

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27128 ) Change subject: ranap_msg_factory: add missing apidoc ...................................................................... ranap_msg_factory: add missing apidoc The functions ranap_new_msg_iu_rel_req and ranap_new_msg_rab_rel_req lack apidoc strings. Change-Id: I7484413980acdf17fde9ed0f97cf7f97e0ef3ae4 --- M src/ranap_msg_factory.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/28/27128/1 diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index 60dc9e0..b871343 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -876,6 +876,7 @@ return msg; } +/*! \brief generate RANAP IU RELEASE REQUEST message */ struct msgb *ranap_new_msg_iu_rel_req(const RANAP_Cause_t *cause) { RANAP_Iu_ReleaseRequestIEs_t ies; @@ -905,6 +906,7 @@ return msg; } +/*! \brief generate RANAP RAB RELEASE REQUEST message */ struct msgb *ranap_new_msg_rab_rel_req(uint8_t rab_id, const RANAP_Cause_t *cause) { RANAP_RAB_ReleaseItemIEs_t item_ies; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I7484413980acdf17fde9ed0f97cf7f97e0ef3ae4 Gerrit-Change-Number: 27128 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: WIP: pySim-shell: support TS 102 220 administrative commands

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27126 ) Change subject: WIP: pySim-shell: support TS 102 220 administrative commands ...................................................................... WIP: pySim-shell: support TS 102 220 administrative commands Change-Id: I5b1ffb1334afa18d62beb642268066a30deb7ea6 --- M pySim-shell.py M pySim/commands.py M pySim/filesystem.py 3 files changed, 66 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/26/27126/1 diff --git a/pySim-shell.py b/pySim-shell.py index 8e8a1a6..0a2e5b0 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -169,6 +169,7 @@ self._onchange_conserve_write('conserve_write', False, self.conserve_write) self._onchange_apdu_trace('apdu_trace', False, self.apdu_trace) self.register_command_set(Iso7816Commands()) + self.register_command_set(Ts102221Commands()) self.register_command_set(PySimCommands()) self.iccid, sw = self.card.read_iccid() rs.select('MF', self) @@ -624,6 +625,51 @@ else: raise ValueError("error: cannot authenticate, no adm-pin!") +@with_default_category('TS 102 222 Commands') +class Ts102221Commands(CommandSet): + """Administrative commands for telecommunication aplpications.""" + def __init__(self): + super().__init__() + + def do_delete_file(self, opts): + """Delete the specified file. DANGEROUS!""" + path = opts.arg_list[0] + f = self._cmd.rs.get_file_for_selectable(path) + (data, sw) = self._cmd.card._scc.delete_file(f.fid) + + def complete_delete_file(self, text, line, begidx, endidx) -> List[str]: + """Command Line tab completion for DELETE FILE""" + index_dict = { 1: self._cmd.rs.selected_file.get_selectable_names() } + return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) + + def do_terminate_df(self, opts): + """Terminate the specified DF. DANGEROUS!""" + path = opts.arg_list[0] + f = self._cmd.rs.get_file_for_selectable(path) + (data, sw) = self._cmd.card._scc.terminate_df(f.fid) + + def complete_terminate_df(self, text, line, begidx, endidx) -> List[str]: + """Command Line tab completion for TERMINATE DF""" + index_dict = { 1: self._cmd.rs.selected_file.get_selectable_names() } + return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) + + def do_terminate_ef(self, opts): + """Terminate the specified EF. DANGEROUS!""" + path = opts.arg_list[0] + f = self._cmd.rs.get_file_for_selectable(path) + (data, sw) = self._cmd.card._scc.terminate_ef(f.fid) + + def complete_terminate_ef(self, text, line, begidx, endidx) -> List[str]: + """Command Line tab completion for TERMINATE EF""" + index_dict = { 1: self._cmd.rs.selected_file.get_selectable_names() } + return self._cmd.index_based_complete(text, line, begidx, endidx, index_dict=index_dict) + + def do_terminate_card_usage(self, opts): + """Terminate the Card. SUPER DANGEROUS!""" + (data, sw) = self._cmd.card._scc.terminate_card_usage() + + + @with_default_category('ISO7816 Commands') class Iso7816Commands(CommandSet): def __init__(self): diff --git a/pySim/commands.py b/pySim/commands.py index 674e184..9dc273c 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -431,6 +431,22 @@ """ return self._tp.send_apdu_checksw(self.cla_byte + '44000002' + fid) + def delete_file(self, fid): + """Execute DELETE FILE command as per TS 102 222 Section 6.4""" + return self._tp.send_apdu_checksw(self.cla_byte + 'e4000002' + fid) + + def terminate_df(self, fid): + """Execute TERMINATE DF command as per TS 102 222 Section 6.7""" + return self._tp.send_apdu_checksw(self.cla_byte + 'e6000002' + fid) + + def terminate_ef(self, fid): + """Execute TERMINATE EF command as per TS 102 222 Section 6.8""" + return self._tp.send_apdu_checksw(self.cla_byte + 'e8000002' + fid) + + def terminate_card_usage(self): + """Execute TERMINATE CARD USAGE command as per TS 102 222 Section 6.9""" + return self._tp.send_apdu_checksw(self.cla_byte + 'fe000000') + def manage_channel(self, mode='open', lchan_nr=0): """Execute MANAGE CHANNEL command as per TS 102 221 Section 11.1.17. diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 7100b21..d9c7475 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1265,6 +1265,10 @@ (data, sw) = self.card._scc.status() return self.selected_file.decode_select_response(data) + def get_file_for_selectable(self, name:str): + sels = self.selected_file.get_selectables() + return sels[name] + def activate_file(self, name:str): """Request ACTIVATE FILE of specified file.""" sels = self.selected_file.get_selectables() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5b1ffb1334afa18d62beb642268066a30deb7ea6 Gerrit-Change-Number: 27126 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in pysim[master]: Better decode of EF.UST, EF.EST and EF.IST

by laforge

laforge has uploaded this change for review. ( 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, 44 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/27/27127/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f6f6c00..da2d7ce 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', @@ -519,30 +526,48 @@ 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) -> (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] = { + 'description' : self.table[service_nr] if service_nr in self.table else None, + 'activated': True if byte & (1 << bitno) else False + } 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 +1016,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 +1052,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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log