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

[L] Change in osmo-ttcn3-hacks[master]: hnbgw: add CN pool tests
by neels 11 Jul '23

11 Jul '23

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486 to look at the new patch set (#5). Change subject: hnbgw: add CN pool tests ...................................................................... hnbgw: add CN pool tests docker-playground.git needs a config file change to be committed at the same time as this patch, see 'Related'. Depends: osmo-ttcn3-hacks I94aa0b2adfc48b98cb4b1efe595c2432fc603d6c Change-Id: I027a059faed3f140f8801f84338956cd004043b5 --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M hnbgw/osmo-hnbgw-with-pfcp.cfg M hnbgw/osmo-hnbgw.cfg M hnbgw/osmo-stp.cfg M library/L3_Templates.ttcn M library/Osmocom_Types.ttcn 7 files changed, 959 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/33486/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486 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: I027a059faed3f140f8801f84338956cd004043b5 Gerrit-Change-Number: 33486 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: cdma_ruim: Fix unit tests and actually enable them
by fixeria 11 Jul '23

11 Jul '23

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33704 ) Change subject: cdma_ruim: Fix unit tests and actually enable them ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: Thanks. I didn't pay enough attention to unit tests and fscked up :( File pySim/cdma_ruim.py: https://gerrit.osmocom.org/c/pysim/+/33704/comment/5ebeaa00_2e14f3fc PS1, Line 136: HexAdapter Not sure if we want hex here, I would just change `'0000'` to `b'0000'` above. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 Gerrit-Change-Number: 33704 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 19:11:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-ttcn3-hacks[master]: hnbgw: add CN pool tests
by neels 11 Jul '23

11 Jul '23

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486 ) Change subject: hnbgw: add CN pool tests ...................................................................... Patch Set 4: (1 comment) File hnbgw/osmo-stp.cfg: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486/comment/b833214d_fd2b… PS2, Line 41: asp virt-msc1-0 23907 2905 m3ua > Not funcionally mandatory in the case of osmo-stp because the check is in simple_ss7_client (because […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486 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: I027a059faed3f140f8801f84338956cd004043b5 Gerrit-Change-Number: 33486 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 19:10:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: cdma_ruim: Fix unit tests and actually enable them
by laforge 11 Jul '23

11 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33704 ) Change subject: cdma_ruim: Fix unit tests and actually enable them ...................................................................... cdma_ruim: Fix unit tests and actually enable them As pySim.cdma_ruim was not imported by test_files.py, the unit tests were apparently never executed and hence didn't pass. Let's fix both of those problems. Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 --- M pySim/cdma_ruim.py M tests/test_files.py 2 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/33704/1 diff --git a/pySim/cdma_ruim.py b/pySim/cdma_ruim.py index 3fab558..6556600 100644 --- a/pySim/cdma_ruim.py +++ b/pySim/cdma_ruim.py @@ -91,7 +91,7 @@ _test_de_encode = [ ( "010801536b796c696e6b204e57ffffffffffffffffffffffffffffffffffffffffffff", - { 'rfu0' : 0, 'show_in_hsa' : True, 'rfu2' : 0, + { 'rfu1' : 0, 'show_in_hsa' : True, 'rfu2' : 0, 'char_encoding' : 8, 'lang_ind' : 1, 'spn' : 'Skylink NW' } ), ] @@ -115,7 +115,7 @@ '''3.4.33 Administrative Data''' _test_de_encode = [ - ( "000000", { 'ms_operation_mode' : 'normal', 'additional_info' : '0000', 'rfu' : '' } ), + ( "000000", { 'ms_operation_mode' : 'normal', 'additional_info' : '0000', 'rfu' : b'' } ), ] class OP_MODE(enum.IntEnum): @@ -133,7 +133,7 @@ # Byte 1: Display Condition 'ms_operation_mode'/Enum(Byte, self.OP_MODE), # Bytes 2-3: Additional information - 'additional_info'/Bytes(2), + 'additional_info'/HexAdapter(Bytes(2)), # Bytes 4..: RFU 'rfu'/GreedyBytesRFU, ) diff --git a/tests/test_files.py b/tests/test_files.py index 3fb1062..fe520fb 100755 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -29,6 +29,7 @@ import pySim.ts_51_011 import pySim.sysmocom_sja2 import pySim.gsm_r +import pySim.cdma_ruim def get_qualified_name(c): """return the qualified (by module) name of a class.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icdf4621eb68d05a4948ae9efeb81a007d48e1bb7 Gerrit-Change-Number: 33704 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: osmo-bts-trx: pull the AMR header in tch_dl_dequeue()
by fixeria 11 Jul '23

11 Jul '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33703 ) Change subject: osmo-bts-trx: pull the AMR header in tch_dl_dequeue() ...................................................................... osmo-bts-trx: pull the AMR header in tch_dl_dequeue() The goal is to unify encoding functions in tx_tch[fh]_fn(), so that in a follow-up change adding CSD we could use a switch statement. Change-Id: I15318e497b236128f779769e4fa99f307ea431ea Related: OS#1572 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 28 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/33703/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index b8f8322..7abbb26 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -402,6 +402,7 @@ LOGL1SB(DL1P, LOGL_NOTICE, l1ts, br, "Transmitting 'bad AMR frame'\n"); goto free_bad_msg; } + msg_tch->l2h += sizeof(struct amr_hdr); /* pull the AMR header */ break; default: inval_mode2: @@ -490,12 +491,13 @@ /* the first FN 4,13,21 defines that CMI is included in frame, * the first FN 0,8,17 defines that CMR is included in frame. */ - gsm0503_tch_afs_encode(bursts_p, msg->l2h + sizeof(struct amr_hdr), - msgb_l2len(msg) - sizeof(struct amr_hdr), - !sched_tchf_dl_amr_cmi_map[br->fn % 26], - chan_state->codec, chan_state->codecs, - chan_state->dl_ft, - chan_state->dl_cmr); + gsm0503_tch_afs_encode(bursts_p, + msgb_l2(msg), msgb_l2len(msg), + !sched_tchf_dl_amr_cmi_map[br->fn % 26], + chan_state->codec, + chan_state->codecs, + chan_state->dl_ft, + chan_state->dl_cmr); } else { gsm0503_tch_fr_encode(bursts_p, msg->l2h, msgb_l2len(msg), 1); } diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 97b8582..541feab 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -412,12 +412,13 @@ /* the first FN 4,13,21 or 5,14,22 defines that CMI is included * in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is * included in frame. */ - gsm0503_tch_ahs_encode(bursts_p, msg->l2h + sizeof(struct amr_hdr), - msgb_l2len(msg) - sizeof(struct amr_hdr), - !sched_tchh_dl_amr_cmi_map[br->fn % 26], - chan_state->codec, chan_state->codecs, - chan_state->dl_ft, - chan_state->dl_cmr); + gsm0503_tch_ahs_encode(bursts_p, + msgb_l2(msg), msgb_l2len(msg), + !sched_tchh_dl_amr_cmi_map[br->fn % 26], + chan_state->codec, + chan_state->codecs, + chan_state->dl_ft, + chan_state->dl_cmr); } else { gsm0503_tch_hr_encode(bursts_p, msg->l2h, msgb_l2len(msg)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I15318e497b236128f779769e4fa99f307ea431ea Gerrit-Change-Number: 33703 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: osmo-bts-trx: implement FACCH/[FH] support for CSD
by fixeria 11 Jul '23

11 Jul '23

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/33586 to look at the new patch set (#8). Change subject: osmo-bts-trx: implement FACCH/[FH] support for CSD ...................................................................... osmo-bts-trx: implement FACCH/[FH] support for CSD The FACCH/[FH] coding rules are specified in 3GPP TS 45.003, sections 4.2 and 4.3. The key difference is that unlike with speech channels, FACCH does not replace data frames completely, but disturb a fixed amount of bits fom them. This is why we need to use separate gsm0503_tch_[fh]r_facch_{en,de}code() API for data channels. Change-Id: I4c6736e84c271240d457998de688c0baf59fe578 Depends: libosmocore.git I0c7a9c180dcafe64e6aebe53518d3d11e1f29886 Related: OS#1572 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 160 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/33586/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33586 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4c6736e84c271240d457998de688c0baf59fe578 Gerrit-Change-Number: 33586 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in pysim[master]: Introduce concept of CardProfileAddon
by laforge 11 Jul '23

11 Jul '23

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33699 ) Change subject: Introduce concept of CardProfileAddon ...................................................................... Patch Set 3: Code-Review-1 (1 comment) File pySim/filesystem.py: https://gerrit.osmocom.org/c/pysim/+/33699/comment/f6ccdb67_83ccdcb8 PS3, Line 1310: for addon_cls in self.profile.addons: this must not happen in the constructor, as pySim-trace also uses RuntimeState. So nothing here may need to talk to the card... -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5866590b6d48f85eb889c9b1b8ab27936d2378b9 Gerrit-Change-Number: 33699 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 11 Jul 2023 17:34:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: cards: card_detect for pure UICC/SIM differentiation
by laforge 11 Jul '23

11 Jul '23

laforge has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/33698 ) Change subject: cards: card_detect for pure UICC/SIM differentiation ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I01009955fe1bef811a30d21ef347fb1bbccc7619 Gerrit-Change-Number: 33698 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 0

[S] Change in pysim[master]: pySim/filesystem.py: remove unused class FileData
by laforge 11 Jul '23

11 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33701 ) Change subject: pySim/filesystem.py: remove unused class FileData ...................................................................... pySim/filesystem.py: remove unused class FileData Change-Id: I62eb446e4995a532227a45c8cc521f5f80535d93 --- M pySim/filesystem.py 1 file changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/33701/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index cb3b403..2bcd363 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1765,14 +1765,6 @@ cmd_app.unregister_command_set(c) -class FileData: - """Represent the runtime, on-card data.""" - - def __init__(self, fdesc): - self.desc = fdesc - self.fcp = None - - def interpret_sw(sw_data: dict, sw: str): """Interpret a given status word. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I62eb446e4995a532227a45c8cc521f5f80535d93 Gerrit-Change-Number: 33701 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: pySim-shell: Iterate over CardApplication sub-classes
by laforge 11 Jul '23

11 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33700 ) Change subject: pySim-shell: Iterate over CardApplication sub-classes ...................................................................... pySim-shell: Iterate over CardApplication sub-classes Rather than having to know and explicitly list every CardApplication, let's iterate over the __subclasses__ of the CardApplication base class. Change-Id: Ia6918e49d73d80acfaf09506e604d4929d37f1b6 --- M pySim-shell.py 1 file changed, 32 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/00/33700/1 diff --git a/pySim-shell.py b/pySim-shell.py index b48abc7..5281eab 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -41,6 +41,7 @@ import os import sys +import inspect from pathlib import Path from io import StringIO @@ -54,16 +55,11 @@ from pySim.utils import sanitize_pin_adm, tabulate_str_list, boxed_heading_str, Hexstr from pySim.card_handler import CardHandler, CardHandlerAuto -from pySim.filesystem import RuntimeState, CardDF, CardADF, CardModel +from pySim.filesystem import RuntimeState, CardDF, CardADF, CardModel, CardApplication from pySim.profile import CardProfile from pySim.cdma_ruim import CardProfileRUIM from pySim.ts_102_221 import CardProfileUICC from pySim.ts_102_222 import Ts102222Commands -from pySim.ts_31_102 import CardApplicationUSIM -from pySim.ts_31_103 import CardApplicationISIM -from pySim.ts_31_104 import CardApplicationHPSIM -from pySim.ara_m import CardApplicationARAM -from pySim.global_platform import CardApplicationISD from pySim.gsm_r import DF_EIRENE from pySim.cat import ProactiveCommand @@ -72,6 +68,15 @@ # calling of SysmocomSJA2.add_files. See CardModel.apply_matching_models import pySim.sysmocom_sja2 +# we need to import these modules so that the various sub-classes of +# CardProfile are created, which will be used in init_card() to iterate +# over all known CardProfile sub-classes. +import pySim.ts_31_102 +import pySim.ts_31_103 +import pySim.ts_31_104 +import pySim.ara_m +import pySim.global_platform + from pySim.card_key_provider import CardKeyProviderCsv, card_key_provider_register, card_key_provider_get_field @@ -116,17 +121,16 @@ print("Info: Card is of type: %s" % str(profile)) - # FIXME: This shouln't be here, the profile should add the applications, - # however, we cannot simply put his into ts_102_221.py since we would - # have to e.g. import CardApplicationUSIM from ts_31_102.py, which already - # imports from ts_102_221.py. This means we will end up with a circular - # import, which needs to be resolved first. + # FIXME: this shouldn't really be here but somewhere else/more generic. + # We cannot do it within pySim/profile.py as that would create circular + # dependencies between the individual profiles and profile.py. if isinstance(profile, CardProfileUICC): - profile.add_application(CardApplicationUSIM()) - profile.add_application(CardApplicationISIM()) - profile.add_application(CardApplicationHPSIM()) - profile.add_application(CardApplicationARAM()) - profile.add_application(CardApplicationISD()) + for app_cls in CardApplication.__subclasses__(): + constr_sig = inspect.signature(app_cls.__init__) + # skip any intermediary sub-classes such as CardApplicationSD + if len(constr_sig.parameters) != 1: + continue + profile.add_application(app_cls()) # We have chosen SimCard() above, but we now know it actually is an UICC # so it's safe to assume it supports USIM application (which we're adding above). # IF we don't do this, we will have a SimCard but try USIM specific commands like -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia6918e49d73d80acfaf09506e604d4929d37f1b6 Gerrit-Change-Number: 33700 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0