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

[S] Change in osmo-tetra[master]: Added keyfile loading

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33998 ) Change subject: Added keyfile loading ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c Gerrit-Change-Number: 33998 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:24:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added keyfile parsing code and various crypto improvements

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33997 ) Change subject: Added keyfile parsing code and various crypto improvements ...................................................................... Patch Set 2: (1 comment) File src/crypto/tetra_crypto.c: https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/26f8ecc4_a639c136 PS2, Line 194: exit > I'm not yet sure how/where load_keystore() is called, but if it's called unconditionally then we sho […] ok, it's in the next commit, and it's optional. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:24:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added keyfile parsing code and various crypto improvements

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33997 ) Change subject: Added keyfile parsing code and various crypto improvements ...................................................................... Patch Set 2: Code-Review+1 (3 comments) Patchset: PS2: commit log lines shouldn't usually exceed 72chars length, see https://www.gitkraken.com/learn/git/best-practices/git-commit-message I think my git setup would warn me locally if I attempted to commit longer lines, but maybe that's a local setting. File src/crypto/tetra_crypto.c: https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/fa17beb0_ddb95659 PS2, Line 194: exit I'm not yet sure how/where load_keystore() is called, but if it's called unconditionally then we shouldn't exit the program if the file doesn't exist. Not everyone will need crypto support. https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/3172eddd_62d9248b PS2, Line 232: (uint32_t *) &tcdb->keys[i].key[0], (uint32_t *) &tcdb->keys[i].key[1], : (uint32_t *) &tcdb->keys[i].key[2], (uint32_t *) &tcdb->keys[i].key[3], : (uint32_t *) &tcdb->keys[i].key[4], (uint32_t *) &tcdb->keys[i].key[5], : (uint32_t *) &tcdb->keys[i].key[6], (uint32_t *) &tcdb->keys[i].key[7], : (uint32_t *) &tcdb->keys[i].key[8], (uint32_t *) &tcdb->keys[i].key[9]); JFYI, not a change request: we'd have osmo_hexparse in libosmocore for hex-ascii-to-bytearray-conversion. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:23:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixed makefile to also clean crypto subdirectory

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33996 ) Change subject: Fixed makefile to also clean crypto subdirectory ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 Gerrit-Change-Number: 33996 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 06:27:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34007 ) Change subject: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do ...................................................................... ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do The command wasn't used the correct dict to allow the encoders to work. Related: OS#6121 Change-Id: Ic2bc179b413a6b139e07e3e55b93ff921cb020a9 --- M pySim/ara_m.py 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ara_m.py b/pySim/ara_m.py index e2e6da1..8144381 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -354,7 +354,7 @@ ref_do_content += [{'aid_ref_empty_do': None}] ref_do_content += [{'dev_app_id_ref_do': opts.device_app_id}] if opts.pkg_ref: - ref_do_content += [{'pkg_ref_do': opts.pkg_ref}] + ref_do_content += [{'pkg_ref_do': {'package_name_string': opts.pkg_ref}}] # AR ar_do_content = [] if opts.apdu_never: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic2bc179b413a6b139e07e3e55b93ff921cb020a9 Gerrit-Change-Number: 34007 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: Fix the remaining functions using the broken Card.update_ust() call

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34008 ) Change subject: Fix the remaining functions using the broken Card.update_ust() call ...................................................................... Fix the remaining functions using the broken Card.update_ust() call Card.update_ust() got replaced by the file operation ust_update(). In addition to Change-Id I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e Fixes: f8d2e2ba0892 ("split pySim/legacy/{cards,utils} from pySim/{cards,utils}") Change-Id: Ie6405cae37493a2101e5089a8d11766fbfed4518 --- M pySim/ts_31_102.py M pySim/ts_31_103.py 2 files changed, 27 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index a90139d..c7a58f1 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -660,12 +660,14 @@ super().__init__() def do_est_service_enable(self, arg): - """Enable a service within EF.UST""" - self._cmd.card.update_est(int(arg), 1) + """Enable a service within EF.EST""" + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_est_service_disable(self, arg): - """Disable a service within EF.UST""" - self._cmd.card.update_est(int(arg), 0) + """Disable a service within EF.EST""" + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) # TS 31.102 Section 4.2.48 class EF_ACL(TransparentEF): @@ -1062,11 +1064,13 @@ def do_prose_service_activate(self, arg): """Activate a service within EF.5G_PROSE_ST""" - self._cmd.card.update_ust(int(arg), 1) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_prose_service_deactivate(self, arg): """Deactivate a service within EF.5G_PROSE_ST""" - self._cmd.card.update_ust(int(arg), 0) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) # TS 31.102 Section 4.4.13.3 (Rel 17) class EF_5G_PROSE_DD(TransparentEF): diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 19ade2b..4327a1a 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -111,11 +111,13 @@ def do_ist_service_activate(self, arg): """Activate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 1) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_ist_service_deactivate(self, arg): """Deactivate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 0) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) def do_ist_service_check(self, arg): """Check consistency between services of this file and files present/activated. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie6405cae37493a2101e5089a8d11766fbfed4518 Gerrit-Change-Number: 34008 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: Fix the remaining functions using the broken Card.update_ust() call

by laforge

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34008 ) Change subject: Fix the remaining functions using the broken Card.update_ust() call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie6405cae37493a2101e5089a8d11766fbfed4518 Gerrit-Change-Number: 34008 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 29 Jul 2023 06:23:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do

by laforge

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34007 ) Change subject: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic2bc179b413a6b139e07e3e55b93ff921cb020a9 Gerrit-Change-Number: 34007 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 29 Jul 2023 06:22:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: utils.py: remove superfluous import from itself

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34002 ) Change subject: utils.py: remove superfluous import from itself ...................................................................... utils.py: remove superfluous import from itself b2h() is already available. Change-Id: Ied513a08cc8b5091dd467106250f1e6b5067c3a8 --- M pySim/utils.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 1541e2e..6cacdaa 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -537,7 +537,6 @@ from Cryptodome.Cipher import AES # pylint: disable=no-name-in-module from Cryptodome.Util.strxor import strxor - from pySim.utils import b2h # We pass in hex string and now need to work on bytes ki_bytes = bytes(h2b(ki_hex)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ied513a08cc8b5091dd467106250f1e6b5067c3a8 Gerrit-Change-Number: 34002 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: utils.py: remove superfluous import from itself

by laforge

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34002 ) Change subject: utils.py: remove superfluous import from itself ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ied513a08cc8b5091dd467106250f1e6b5067c3a8 Gerrit-Change-Number: 34002 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 29 Jul 2023 06:22:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: Fix the remaining functions using the broken Card.update_ust() call

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34008 ) Change subject: Fix the remaining functions using the broken Card.update_ust() call ...................................................................... Fix the remaining functions using the broken Card.update_ust() call Card.update_ust() got replaced by the file operation ust_update(). In addition to Change-Id I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e Fixes: f8d2e2ba0892 ("split pySim/legacy/{cards,utils} from pySim/{cards,utils}") Change-Id: Ie6405cae37493a2101e5089a8d11766fbfed4518 --- M pySim/ts_31_102.py M pySim/ts_31_103.py 2 files changed, 27 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/08/34008/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index a90139d..c7a58f1 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -660,12 +660,14 @@ super().__init__() def do_est_service_enable(self, arg): - """Enable a service within EF.UST""" - self._cmd.card.update_est(int(arg), 1) + """Enable a service within EF.EST""" + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_est_service_disable(self, arg): - """Disable a service within EF.UST""" - self._cmd.card.update_est(int(arg), 0) + """Disable a service within EF.EST""" + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) # TS 31.102 Section 4.2.48 class EF_ACL(TransparentEF): @@ -1062,11 +1064,13 @@ def do_prose_service_activate(self, arg): """Activate a service within EF.5G_PROSE_ST""" - self._cmd.card.update_ust(int(arg), 1) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_prose_service_deactivate(self, arg): """Deactivate a service within EF.5G_PROSE_ST""" - self._cmd.card.update_ust(int(arg), 0) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) # TS 31.102 Section 4.4.13.3 (Rel 17) class EF_5G_PROSE_DD(TransparentEF): diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 19ade2b..4327a1a 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -111,11 +111,13 @@ def do_ist_service_activate(self, arg): """Activate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 1) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_ist_service_deactivate(self, arg): """Deactivate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 0) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) def do_ist_service_check(self, arg): """Check consistency between services of this file and files present/activated. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie6405cae37493a2101e5089a8d11766fbfed4518 Gerrit-Change-Number: 34008 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34007 ) Change subject: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do ...................................................................... ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do The command wasn't used the correct dict to allow the encoders to work. Related: OS#6121 Change-Id: Ic2bc179b413a6b139e07e3e55b93ff921cb020a9 --- M pySim/ara_m.py 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/07/34007/1 diff --git a/pySim/ara_m.py b/pySim/ara_m.py index e2e6da1..8144381 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -354,7 +354,7 @@ ref_do_content += [{'aid_ref_empty_do': None}] ref_do_content += [{'dev_app_id_ref_do': opts.device_app_id}] if opts.pkg_ref: - ref_do_content += [{'pkg_ref_do': opts.pkg_ref}] + ref_do_content += [{'pkg_ref_do': {'package_name_string': opts.pkg_ref}}] # AR ar_do_content = [] if opts.apdu_never: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic2bc179b413a6b139e07e3e55b93ff921cb020a9 Gerrit-Change-Number: 34007 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: example: Remove calls to osmo_ipa_process_msg()

by arehbein

arehbein has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33205 ) Change subject: example: Remove calls to osmo_ipa_process_msg() ...................................................................... Abandoned The Gerrit patch upload from July 24 included this change from in another -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I53283ec7bd7f07dfa612681ae84af93d5cd098b9 Gerrit-Change-Number: 33205 Gerrit-PatchSet: 12 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: cosmetic: Document foce_two_phase feature based on specs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34006 ) Change subject: cosmetic: Document foce_two_phase feature based on specs ...................................................................... cosmetic: Document foce_two_phase feature based on specs Change-Id: I4f8e3d0dcb721d51838b50aba5b40d0551c8d0c5 --- M src/bts.cpp 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/34006/1 diff --git a/src/bts.cpp b/src/bts.cpp index 177544a..fe48018 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -970,6 +970,12 @@ LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single TS uplink transmission " "(one phase packet access)\n"); if (bts->pcu->vty.force_two_phase) { + /* 3GPP TS 44.018 3.5.2.1.3.1: "If the establishment cause in the + * CHANNEL REQUEST message indicates a request for one phase packet access, + * the network may grant either a one phase packet access or a single block + * packet access for the mobile station. If a single block packet access is + * granted, it forces the mobile station to perform a two phase packet access." + */ LOGP(DRLCMAC, LOGL_DEBUG, "Forcing two phase access\n"); chan_req.single_block = true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4f8e3d0dcb721d51838b50aba5b40d0551c8d0c5 Gerrit-Change-Number: 34006 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Initial selection of packet-access-procedure mode based on or...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34005 ) Change subject: rlcmac: Initial selection of packet-access-procedure mode based on originating cause ...................................................................... rlcmac: Initial selection of packet-access-procedure mode based on originating cause Change-Id: I930a1fcf23506f75562a6795f9a6e42b187d2974 --- M include/osmocom/gprs/rlcmac/llc_queue.h M src/rlcmac/gre.c M src/rlcmac/llc_queue.c 3 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/05/34005/1 diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h b/include/osmocom/gprs/rlcmac/llc_queue.h index 7149f76..dd7528c 100644 --- a/include/osmocom/gprs/rlcmac/llc_queue.h +++ b/include/osmocom/gprs/rlcmac/llc_queue.h @@ -27,6 +27,7 @@ struct gprs_llc_prio_queue { enum gprs_rlcmac_radio_priority radio_prio; /* Radio prio of this queue, range (1..4) */ + enum osmo_gprs_rlcmac_llc_sapi sapi; /* LLC SAPI of this queue */ struct gprs_codel codel_state; struct llist_head queue; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ }; @@ -50,6 +51,7 @@ enum osmo_gprs_rlcmac_llc_sapi sapi, enum gprs_rlcmac_radio_priority radio_prio); struct msgb *gprs_rlcmac_llc_queue_dequeue(struct gprs_rlcmac_llc_queue *q, bool can_discard); enum gprs_rlcmac_radio_priority gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q); +enum osmo_gprs_rlcmac_llc_sapi gprs_rlcmac_llc_queue_highest_llc_sapi_pending(struct gprs_rlcmac_llc_queue *q); void gprs_rlcmac_llc_queue_merge_prepend(struct gprs_rlcmac_llc_queue *q, struct gprs_rlcmac_llc_queue *old_q); diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c index 59cf0f5..0eb6a8c 100644 --- a/src/rlcmac/gre.c +++ b/src/rlcmac/gre.c @@ -198,6 +198,9 @@ /* Create a new UL TBF and start Packet access procedure to get an UL assignment if needed */ int gprs_rlcmac_entity_start_ul_tbf_pkt_acc_proc_if_needed(struct gprs_rlcmac_entity *gre) { + enum osmo_gprs_rlcmac_llc_sapi tx_sapi; + enum gprs_rlcmac_tbf_ul_ass_type ul_ass_type; + /* TS 44.060 5.3 "In packet idle mode, upper layers may require the * transfer of a upper layer PDU, which implicitly triggers the * establishment of a TBF and the transition to packet transfer mode." */ @@ -212,8 +215,27 @@ gre->ul_tbf = gprs_rlcmac_ul_tbf_alloc(gre); if (!gre->ul_tbf) return -ENOMEM; + + tx_sapi = gprs_rlcmac_llc_queue_highest_radio_prio_pending(gre->llc_queue); + /* 3GPP TS 44.018 3.5.2.1.2 "Initiation of the packet access procedure: channel request" */ + switch (tx_sapi) { + case OSMO_GPRS_RLCMAC_LLC_SAPI_GMM: + /* "If the purpose [...] is to send a Page Response, a Cell update (the mobile + * station was in GMM READY state before the cell reselection) or for any other + * GPRS Mobility Management or GPRS Session Management procedure, the mobile station + * shall request a one phase packet access" */ + ul_ass_type = GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE; + break; + default: + /* "If the purpose [...] is to send user data and the requested RLC mode is + * acknowledged mode, the mobile station shall request either a one phase packet + * access or a single block packet access." */ + /* TODO: We always use 1phase for now... ideally we should decide + * based on amount of Tx data and configured MultiSlot Class? */ + ul_ass_type = GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE; + } /* We always use 1phase for now... */ - return gprs_rlcmac_tbf_ul_ass_start(gre->ul_tbf, GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE); + return gprs_rlcmac_tbf_ul_ass_start(gre->ul_tbf, ul_ass_type); } int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, diff --git a/src/rlcmac/llc_queue.c b/src/rlcmac/llc_queue.c index 83c926e..d1f923a 100644 --- a/src/rlcmac/llc_queue.c +++ b/src/rlcmac/llc_queue.c @@ -47,6 +47,7 @@ for (i = 0; i < ARRAY_SIZE(q->pq); i++) { for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { q->pq[i][j].radio_prio = i; /* enum gprs_rlcmac_radio_priority, range (0..3) */ + q->pq[i][j].sapi = i + 1; /* osmo_gprs_rlcmac_llc_sapi, range (1..11) */ INIT_LLIST_HEAD(&q->pq[i][j].queue); gprs_codel_init(&q->pq[i][j].codel_state); } @@ -222,6 +223,14 @@ return prioq->radio_prio; } +enum osmo_gprs_rlcmac_llc_sapi gprs_rlcmac_llc_queue_highest_llc_sapi_pending(struct gprs_rlcmac_llc_queue *q) +{ + struct gprs_llc_prio_queue *prioq = gprs_rlcmac_llc_queue_find_msg(q); + OSMO_ASSERT(prioq); + return prioq->sapi; +} + + /* Merge old_q messages into q, prepending them. old_q must be freed by the caller. */ void gprs_rlcmac_llc_queue_merge_prepend(struct gprs_rlcmac_llc_queue *q, struct gprs_rlcmac_llc_queue *old_q) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I930a1fcf23506f75562a6795f9a6e42b187d2974 Gerrit-Change-Number: 34005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: Reimplement ust_service_activate and ust_service_deactivate for USIM/...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/33985 ) Change subject: Reimplement ust_service_activate and ust_service_deactivate for USIM/EF.UST ...................................................................... Reimplement ust_service_activate and ust_service_deactivate for USIM/EF.UST Fixes: f8d2e2ba0892 ("split pySim/legacy/{cards,utils} from pySim/{cards,utils}") Change-Id: I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e --- M pySim/ts_31_102.py M pySim/ts_31_102_telecom.py 2 files changed, 33 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index dc674b2..a90139d 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -466,11 +466,13 @@ def do_ust_service_activate(self, arg): """Activate a service within EF.UST""" - self._cmd.card.update_ust(int(arg), 1) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_ust_service_deactivate(self, arg): """Deactivate a service within EF.UST""" - self._cmd.card.update_ust(int(arg), 0) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) def do_ust_service_check(self, arg): """Check consistency between services of this file and files present/activated. diff --git a/pySim/ts_31_102_telecom.py b/pySim/ts_31_102_telecom.py index a0098c7..575ccae 100644 --- a/pySim/ts_31_102_telecom.py +++ b/pySim/ts_31_102_telecom.py @@ -120,7 +120,26 @@ cmd.lchan.select_file(self) return num_problems + def ust_update(self, cmd, activate=[], deactivate=[]): + service_data, sw = cmd.lchan.read_binary() + service_data = h2b(service_data) + for service in activate: + nbyte, nbit = EF_UServiceTable._bit_byte_offset_for_service(service) + if nbyte > len(service_data): + missing = nbyte - service_data + service_data.extend(missing * "00") + service_data[nbyte] |= (1 << nbit) + + for service in deactivate: + nbyte, nbit = EF_UServiceTable._bit_byte_offset_for_service(service) + if nbyte > len(service_data): + missing = nbyte - service_data + service_data.extend(missing * "00") + service_data[nbyte] &= ~(1 << nbit) + + service_data = b2h(service_data) + cmd.lchan.update_binary(service_data) # TS 31.102 Section 4.4.2.1 class EF_PBR(LinFixedEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e Gerrit-Change-Number: 33985 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: Reimplement ust_service_activate and ust_service_deactivate for USIM/...

by laforge

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33985 ) Change subject: Reimplement ust_service_activate and ust_service_deactivate for USIM/EF.UST ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File pySim/ts_31_102_telecom.py: https://gerrit.osmocom.org/c/pysim/+/33985/comment/15d67c96_64c88a50 PS1, Line 143: > I guess a library function also shouldn't print hex-dumps to the command line. […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e Gerrit-Change-Number: 33985 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 28 Jul 2023 15:34:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 ) Change subject: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF ...................................................................... pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF Change-Id: I34b31c292c00b6880311906ce6713a8e3c69a0d2 --- M pcu/PCU_Tests.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/34003/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 82ecb57..e381c59 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3198,6 +3198,7 @@ var PacketDlAssign dl_tbf_ass; var RlcmacDlBlock dl_block; var uint32_t poll_fn; + var uint32_t dl_fn; var uint32_t sched_fn; var GprsMS ms; timer T := 5.0; @@ -3224,11 +3225,12 @@ f_ms_establish_ul_tbf(ms); /* Wait until PCU starts requesting for UL block on this TBF: */ - f_ms_wait_usf(ms); + dl_fn := f_ms_wait_usf(ms, nr := f_ms_tx_TsTrxBtsNum(ms)); + sched_fn := f_next_pdch_block(dl_fn); /* Send one UL block (with TLLI since we are in One-Phase Access contention resolution) and make sure it is ACKED fine */ - f_ms_tx_ul_data_block(ms, data, with_tlli := true, fn := ms.ul_tbf.start_time_fn, + f_ms_tx_ul_data_block(ms, data, with_tlli := true, fn := sched_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, poll_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 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: I34b31c292c00b6880311906ce6713a8e3c69a0d2 Gerrit-Change-Number: 34003 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34004 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown ...................................................................... pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown Related: OS#6118 Change-Id: I9af8792fe4c44b5dd1aab5a2d4b7d3c2a2366d12 --- M pcu/PCU_Tests.ttcn M pcu/expected-results.xml 2 files changed, 86 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/34004/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index e381c59..d844736 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3252,6 +3252,75 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test DL TBF assignment over PACCH if Multislot class is unknown both at PCU + * and SGSN (eg. because MS started 1-phase access and SGSN answered back). + * Since the msclass is unknown, it shouldn't assign multiple timeslots since + * the MS may not support it. Related OS#6118. */ +testcase TC_dl_multislot_tbf_ms_class_unknown() runs on RAW_PCU_Test_CT +{ + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS)); + var RlcmacDlBlock dl_block; + var octetstring payload; + var template (value) LlcBlockHdr blk_hdr; + var template (value) LlcBlocks blocks; + var uint32_t sched_fn; + var uint32_t dl_fn; + var template RlcmacDlBlock acknack_tmpl; + var GprsMS ms; + var octetstring data := f_rnd_octstring(10); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Only 1 TRX with 8 PDCH */ + f_PCUIF_PDCHMask_set(info_ind, '11111111'B, 0); + f_PCUIF_PDCHMask_set(info_ind, '00000000'B, (1 .. 7)); + + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Establish an Uplink TBF. 1 TS is assigned over AGCH. */ + f_ms_establish_ul_tbf(ms); + + /* Wait until PCU starts requesting for UL block on this TBF: */ + dl_fn := f_ms_wait_usf(ms, nr := f_ms_tx_TsTrxBtsNum(ms)); + sched_fn := f_next_pdch_block(dl_fn); + + /* Send one UL block (with TLLI since we are in One-Phase Access + * contention resolution) and make sure it is ACKED fine. */ + payload := f_rnd_octstring(16); /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */ + blk_hdr := t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), + more := false, e := true); + blocks := { t_RLCMAC_LLCBLOCK(payload, blk_hdr) }; + /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ + f_ms_tx_ul_data_blocks_gprs(ms, blocks, cv := 15, with_tlli := true, fn := sched_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* UL block should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.bvc[0].cell_id)); + + acknack_tmpl := tr_RLCMAC_UL_ACK_NACK_GPRS(ms.ul_tbf.tfi, + tr_UlAckNackGprs(ms.tlli, + tr_AckNackDescription(final_ack := '0'B))) + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl, nr := f_ms_tx_TsTrxBtsNum(ms)); + + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, racap := omit)); + dl_block := f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS, nr := f_ms_tx_TsTrxBtsNum(ms)); + if (f_dltbf_num_slots(ms.dl_tbf) != 1) { + setverdict(fail, "Expected 1 PDCH slots allocated but got ", f_dltbf_num_slots(ms.dl_tbf)); + f_shutdown(__BFILE__, __LINE__); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + testcase TC_dl_multislot_tbf_ms_class_from_2phase() runs on RAW_PCU_Test_CT { var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS)); var RlcmacDlBlock dl_block; @@ -7436,6 +7505,7 @@ execute( TC_pcuif_fh_pkt_ass_dl() ); execute( TC_multitrx_multims_alloc() ); execute( TC_dl_multislot_tbf_ms_class_from_sgsn() ); + execute( TC_dl_multislot_tbf_ms_class_unknown() ); execute( TC_dl_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_tbf_reestablish_with_pkt_resource_req() ); diff --git a/pcu/expected-results.xml b/pcu/expected-results.xml index eccff6f..2a25934 100644 --- a/pcu/expected-results.xml +++ b/pcu/expected-results.xml @@ -93,6 +93,12 @@ PCU_Tests.ttcn:MASKED TC_dl_multislot_tbf_ms_class_from_sgsn testcase </failure> </testcase> + <testcase classname='PCU_Tests' name='TC_dl_multislot_tbf_ms_class_unknown' time='MASKED'> + <failure type='fail-verdict'>Expected 1 PDCH slots allocated but got 4 + PCU_Tests.ttcn:MASKED PCU_Tests control part + PCU_Tests.ttcn:MASKED TC_dl_multislot_tbf_ms_class_unknown testcase + </failure> + </testcase> <testcase classname='PCU_Tests' name='TC_dl_multislot_tbf_ms_class_from_2phase' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_ul_multislot_tbf_ms_class_from_2phase' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_ul_tbf_reestablish_with_pkt_resource_req' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34004 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: I9af8792fe4c44b5dd1aab5a2d4b7d3c2a2366d12 Gerrit-Change-Number: 34004 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixups and clarifying comments for msgb tail modifications

by wbokslag

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/34000 to look at the new patch set (#2). Change subject: Fixups and clarifying comments for msgb tail modifications ...................................................................... Fixups and clarifying comments for msgb tail modifications Added fixups for msgb len field whenever the tail is modified Also, added some clarifying comments Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db --- M src/lower_mac/tetra_lower_mac.c M src/tetra_llc.c M src/tetra_upper_mac.c 3 files changed, 30 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/00/34000/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db Gerrit-Change-Number: 34000 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added stub for decryption and full keystream application functions

by wbokslag

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 to look at the new patch set (#2). Change subject: Added stub for decryption and full keystream application functions ...................................................................... Added stub for decryption and full keystream application functions Added stub functions for keystream generation and identity decryption Also added implementations for mac resource decryption, voice decryption and identity decryption. Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 --- M src/crypto/tetra_crypto.c M src/crypto/tetra_crypto.h 2 files changed, 179 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/01/34001/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 Gerrit-Change-Number: 34001 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Added keyfile loading

by wbokslag

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/33998 to look at the new patch set (#3). Change subject: Added keyfile loading ...................................................................... Added keyfile loading Added an additional command line flag -k to tetra-rx that allows for the loading of a file containing network and key definitions. Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c --- M src/tetra-rx.c 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/98/33998/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c Gerrit-Change-Number: 33998 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added keyfile parsing code and various crypto improvements

by wbokslag

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 to look at the new patch set (#2). Change subject: Added keyfile parsing code and various crypto improvements ...................................................................... Added keyfile parsing code and various crypto improvements Added keyfile parsing code, as well as various other improvements such as definition/enum updates and freeing the tetra_crypto_context when done Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f --- M src/crypto/tetra_crypto.c M src/crypto/tetra_crypto.h M src/tetra-rx.c 3 files changed, 118 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/97/33997/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Added keyfile loading in tetra-rx

by wbokslag

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-tetra/+/33998 to look at the new patch set (#2). Change subject: Added keyfile loading in tetra-rx ...................................................................... Added keyfile loading in tetra-rx Added an additional command line flag -k to tetra-rx that allows for the loading of a file containing network and key definitions. Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c --- M src/tetra-rx.c 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/98/33998/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c Gerrit-Change-Number: 33998 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: utils.py: remove superflouse import from itself

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34002 ) Change subject: utils.py: remove superflouse import from itself ...................................................................... utils.py: remove superflouse import from itself b2h() is already available. Change-Id: Ied513a08cc8b5091dd467106250f1e6b5067c3a8 --- M pySim/utils.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/34002/1 diff --git a/pySim/utils.py b/pySim/utils.py index 735468e..c838a31 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -537,7 +537,6 @@ from Cryptodome.Cipher import AES # pylint: disable=no-name-in-module from Cryptodome.Util.strxor import strxor - from pySim.utils import b2h # We pass in hex string and now need to work on bytes ki_bytes = bytes(h2b(ki_hex)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ied513a08cc8b5091dd467106250f1e6b5067c3a8 Gerrit-Change-Number: 34002 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: Reimplement ust_service_activate and ust_service_deactivate for USIM/...

by lynxis lazus

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/33985 to look at the new patch set (#2). Change subject: Reimplement ust_service_activate and ust_service_deactivate for USIM/EF.UST ...................................................................... Reimplement ust_service_activate and ust_service_deactivate for USIM/EF.UST Fixes: f8d2e2ba0892 ("split pySim/legacy/{cards,utils} from pySim/{cards,utils}") Change-Id: I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e --- M pySim/ts_31_102.py M pySim/ts_31_102_telecom.py 2 files changed, 33 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/33985/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e Gerrit-Change-Number: 33985 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-tetra[master]: Added stub for decryption and full keystream application functions

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34001 ) Change subject: Added stub for decryption and full keystream application functions ...................................................................... Added stub for decryption and full keystream application functions Added stub functions for keystream generation and identity decryption Also added implementations for mac resource decryption, voice decryption and identity decryption. Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 --- M src/crypto/tetra_crypto.c M src/crypto/tetra_crypto.h 2 files changed, 179 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/01/34001/1 diff --git a/src/crypto/tetra_crypto.c b/src/crypto/tetra_crypto.c index 9515a25..d5edde7 100644 --- a/src/crypto/tetra_crypto.c +++ b/src/crypto/tetra_crypto.c @@ -150,19 +150,176 @@ return ((tm->tn - 1) | (tm->fn << 2) | (tm->mn << 7) | ((hn & 0x7FFF) << 13) | (dir << 28)); } -int decrypt_identity(struct tetra_crypto_state *tcs, struct tetra_addr *addr) +void tb5_stub(uint8_t *cn, uint8_t *la, uint8_t *cc, uint8_t *key, uint8_t *eck) { - return 0; + /* FIXME: implement */ + memset(eck, 0, 10); } -int decrypt_mac_element(struct tetra_crypto_state *tcs, struct tetra_tmvsap_prim *tmvp, struct tetra_key *key, int l1_len, int tmpdu_offset) +void ta61_stub(uint8_t *key, uint8_t *esi, uint8_t *ssi) { - return 0; + /* FIXME: implement */ + memcpy(ssi, esi, 3); } -int decrypt_voice_timeslot(struct tetra_crypto_state *tcs, struct tetra_tdma_time *tdma_time, int16_t *type1_block) +void tea1_stub(uint32_t iv, uint8_t *eck, uint32_t num_bytes, uint8_t *ks) { - return 0; + /* FIXME: implement */ + memset(ks, 0, num_bytes); +} + +void tea2_stub(uint32_t iv, uint8_t *eck, uint32_t num_bytes, uint8_t *ks) +{ + /* FIXME: implement */ + memset(ks, 0, num_bytes); +} + +void tea3_stub(uint32_t iv, uint8_t *eck, uint32_t num_bytes, uint8_t *ks) +{ + /* FIXME: implement */ + memset(ks, 0, num_bytes); +} + +static bool generate_keystream(struct tetra_crypto_state *tcs, struct tetra_key *key, struct tetra_tdma_time *t, uint16_t hn, int num_bits, uint8_t *ks_out) +{ + if (!key) + return false; + + /* Construct IV and prepare buf for bytewise keystream */ + int num_bytes = (num_bits + 7) / 8; + uint8_t ks_bytes[num_bytes]; + uint32_t iv = tea_build_iv(t, hn, 0); + + /* Compute ECK from net info and CK */ + if (tcs->cn < 0 || tcs->la < 0 || tcs->cc < 0) { + /* Missing data for TB5 */ + memset(ks_out, 0, num_bytes); + return false; + } + + uint8_t eck[10]; + uint8_t cn[2] = {(tcs->cn >> 8) & 0xFF, tcs->cn & 0xFF}; + uint8_t la[2] = {(tcs->la >> 8) & 0xFF, tcs->la & 0xFF}; + uint8_t cc[1] = {tcs->cc & 0xFF}; + tb5_stub(cn, la, cc, key->key, eck); + + switch (key->network_info->ksg_type) { + case KSG_TEA1: + tea1_stub(iv, eck, num_bytes, ks_bytes); + break; + case KSG_TEA2: + tea2_stub(iv, eck, num_bytes, ks_bytes); + break; + case KSG_TEA3: + tea3_stub(iv, eck, num_bytes, ks_bytes); + break; + default: + fprintf(stderr, "tetra_crypto: KSG type %d not supported\n", key->network_info->ksg_type); + return false; + } + + for (int i = 0; i < num_bytes; i++) + for (int j = 0; j < 8; j++) + ks_out[i * 8 + j] = (ks_bytes[i] >> (7-j)) & 1; + + /* Expand keystream bytes into ubit format */ + for (int i = 0; i < num_bits; i++) + ks_out[i] = (ks_bytes[num_bits / 8] >> (7-(num_bits % 8))) & 1; + + return true; +} + +bool decrypt_identity(struct tetra_crypto_state *tcs, struct tetra_addr *addr) +{ + /* TODO FIXME maybe extend tetra_addr to contain is_encrypted bool */ + if (!tcs->cck) + return false; + + // Perform in-place decryption + uint8_t ab_addr[3] = {addr->ssi >> 16, addr->ssi >> 8, addr->ssi}; + ta61_stub(tcs->cck->key, ab_addr, ab_addr); + addr->ssi = (ab_addr[0] << 16) | (ab_addr[1] << 8) | ab_addr[2]; + return true; +} + +bool decrypt_mac_element(struct tetra_crypto_state *tcs, struct tetra_tmvsap_prim *tmvp, struct tetra_key *key, int l1_len, int tmpdu_offset) +{ + if (!key || l1_len - tmpdu_offset <= 0) + return false; + + if (tcs->cn < 0 || tcs->la < 0 || tcs->cc < 0) { + printf("tetra_crypto: can't compute TB5 due to incomplete network info (carr %d la %d cc %d)\n", + tcs->cn, tcs->la, tcs->cc); + return false; + } + + struct tetra_tdma_time *tdma_time = &tmvp->u.unitdata.tdma_time; + + // Compute keystream offset to apply + /* TODO FIXME maybe we can rework channel type setting in lower mac, and + avoid using TETRA_LC_UNKNOWN below */ + uint32_t ks_skip_bits = 0; + if (tmvp->u.unitdata.blk_num == BLK_2 && ( + tmvp->u.unitdata.lchan == TETRA_LC_SCH_HD || + tmvp->u.unitdata.lchan == TETRA_LC_UNKNOWN)) { + ks_skip_bits = 216; + printf("tetra_crypto: 2nd half slot; skipping bits\n"); + } + + // Compute keystream + struct msgb *msg = tmvp->oph.msg; + int ct_len = l1_len - tmpdu_offset; + int ks_num_bits = ks_skip_bits + ct_len; + uint8_t *ct_start = msg->l1h + tmpdu_offset; + uint8_t ks[ks_num_bits]; + + if (!generate_keystream(tcs, key, tdma_time, tcs->hn, ks_num_bits, ks)) { + printf("tetra_crypto: addr %8d -> key %4d, time %5d/%s, tmpdu offset %d, FAILED\n", + key->addr, key->index, tcs->hn, tetra_tdma_time_dump(tdma_time), tmpdu_offset); + return false; + } + + // Apply keystream + for (int i = 0; i < ct_len; i++) + ct_start[i] = ct_start[i] ^ ks[i + ks_skip_bits]; + + printf("tetra_crypto: addr %8d -> key %4d, time %5d/%s, tmpdu offset %d, decrypting %d bits\n", + key->addr, key->index, tcs->hn, tetra_tdma_time_dump(tdma_time), tmpdu_offset, ct_len); + + return true; +} + +bool decrypt_voice_timeslot(struct tetra_crypto_state *tcs, struct tetra_tdma_time *tdma_time, int16_t *type1_block) +{ + /* TODO FIXME implement proper key selection for voice blocks */ + struct tetra_key *key = tcs->cck; + if (!key) + return false; + + if (tcs->cn < 0 || tcs->la < 0 || tcs->cc < 0) { + printf("tetra_crypto: can't compute TB5 due to incomplete network info (carr %d la %d cc %d)\n", + tcs->cn, tcs->la, tcs->cc); + return false; + } + + // Compute keystream + int ks_num_bits = 137*2; // two half slots of voice + uint8_t ks[ks_num_bits]; + if (!generate_keystream(tcs, key, tdma_time, tcs->hn, ks_num_bits, ks)) { + printf("tetra_crypto: addr %8d -> key %4d, time %5d/%s, traffic FAILED\n", + key->addr, key->index, tcs->hn, tetra_tdma_time_dump(tdma_time)); + return false; + } + + // Apply keystream + for (int i = 0; i < 137; i++) { + type1_block[i + 1] = type1_block[i + 1] ^ ks[i]; + type1_block[i + 139] = type1_block[i + 139] ^ ks[i + 137]; + } + + printf("tetra_crypto: addr %8d -> key %4d, time %5d/%s, decrypted voice\n", + key->addr, key->index, tcs->hn, tetra_tdma_time_dump(tdma_time)); + return true; } int load_keystore(char *tetra_keyfile) diff --git a/src/crypto/tetra_crypto.h b/src/crypto/tetra_crypto.h index e50a45e..ace4c04 100644 --- a/src/crypto/tetra_crypto.h +++ b/src/crypto/tetra_crypto.h @@ -111,9 +111,9 @@ /* Keystream generation and decryption functions */ uint32_t tea_build_iv(struct tetra_tdma_time *tm, uint16_t hn, uint8_t dir); -int decrypt_identity(struct tetra_crypto_state *tcs, struct tetra_addr *addr); -int decrypt_mac_element(struct tetra_crypto_state *tcs, struct tetra_tmvsap_prim *tmvp, struct tetra_key *key, int l1_len, int tmpdu_offset); -int decrypt_voice_timeslot(struct tetra_crypto_state *tcs, struct tetra_tdma_time *tdma_time, int16_t *type1_bits); +bool decrypt_identity(struct tetra_crypto_state *tcs, struct tetra_addr *addr); +bool decrypt_mac_element(struct tetra_crypto_state *tcs, struct tetra_tmvsap_prim *tmvp, struct tetra_key *key, int l1_len, int tmpdu_offset); +bool decrypt_voice_timeslot(struct tetra_crypto_state *tcs, struct tetra_tdma_time *tdma_time, int16_t *type1_bits); /* Key selection and crypto state management */ struct tetra_netinfo *get_network_info(int mcc, int mnc); -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I4e6147f206ad6046f32e08015ec9721b64382ca1 Gerrit-Change-Number: 34001 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixed makefile to also clean crypto subdirectory

by pespin

Attention is currently required from: wbokslag. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33996 ) Change subject: Fixed makefile to also clean crypto subdirectory ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 Gerrit-Change-Number: 33996 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Fri, 28 Jul 2023 14:25:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: restructure the va code to add rach support

by Hoernchen

Attention is currently required from: fixeria, pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33944 ) Change subject: ms: restructure the va code to add rach support ...................................................................... Patch Set 8: (6 comments) File Transceiver52M/grgsm_vitac/grgsm_vitac.h: https://gerrit.osmocom.org/c/osmo-trx/+/33944/comment/1d340463_adcb2a78 PS6, Line 61: MULTI_VER_TARGET_ATTR_CLANGONLY > Why removing this? If on purpose, please explain in the commit message. Done https://gerrit.osmocom.org/c/osmo-trx/+/33944/comment/e1a195e2_e6f73de0 PS6, Line 62: detect_burst_access_burst > `detect_burst_ab()` for consistency with `detect_burst_nb()` then? Done File Transceiver52M/grgsm_vitac/grgsm_vitac.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/33944/comment/3789d5b7_47636c20 PS6, Line 77: MULTI_VER_TARGET_ATTR NO_UBSAN > Why removing this? If on purpose, please explain in the commit message. Done https://gerrit.osmocom.org/c/osmo-trx/+/33944/comment/0e60bd3a_b2b20e16 PS6, Line 42: d_sync_training_seq[N_ACCESS_BITS]; ///<encoded training sequence of a SCH burst > I find this confusing: the comment mentions SCH, the symbol name contains `_sync_`, and the `N_ACCES […] Done https://gerrit.osmocom.org/c/osmo-trx/+/33944/comment/d8d832f5_153e8238 PS6, Line 71: gr_complex startpoint = train_seq[i][0] == 0 ? gr_complex(1.0, 0.0) : gr_complex(-1.0, 0.0); > Unrelated spacing changes. […] This file was mostly unformatted before to keep it "in sync" with gr-gsm, but now, due to all those changes, trying to keep the original formatting is pointless, which is why it now got automatically reformatted with the osmo-trx (kernel) coding style, which has longer line limits. https://gerrit.osmocom.org/c/osmo-trx/+/33944/comment/08319b31_b6f07db3 PS6, Line 139: gmsk_output[i] = j * gr_complex(encoded_symbol, 0.0) * gmsk_output[i - 1]; > Again, I am fine with proper formatting, but it makes your patch harder to read. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4a5cedc8c9a3289c75ce7b914eac286e601ebed0 Gerrit-Change-Number: 33944 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jul 2023 14:23:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixups and clarifying comments for msgb tail modifications

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/34000 ) Change subject: Fixups and clarifying comments for msgb tail modifications ...................................................................... Fixups and clarifying comments for msgb tail modifications Added fixups for msgb len field whenever the tail is modified Also, added some clarifying comments Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db --- M src/lower_mac/tetra_lower_mac.c M src/tetra_llc.c M src/tetra_upper_mac.c 3 files changed, 30 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/00/34000/1 diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c index 21998f7..f8e7810 100644 --- a/src/lower_mac/tetra_lower_mac.c +++ b/src/lower_mac/tetra_lower_mac.c @@ -325,23 +325,26 @@ int pdu_bits = 0; uint32_t offset = 0; - uint8_t *orig_head = msg->head; - uint8_t *orig_tail = msg->tail; + uint8_t *orig_head = msg->head; /* The true start of the timeslot */ + uint8_t *orig_tail = msg->tail; /* The true end of the timeslot */ while (offset < tbp->type1_bits - 16) { /* send Rx time along with the TMV-UNITDATA.ind primitive */ memcpy(&tup->tdma_time, &tcd->time, sizeof(tup->tdma_time)); + + /* Parse MAC element in timeslot (just one, possibly more later in the loop) */ pdu_bits = upper_mac_prim_recv(&ttp->oph, tms); - if (pdu_bits < 0) { - /* -1 is returned when pdu fills slot or length could not be determined */ + /* Check if we are done (-1 returned) */ + if (pdu_bits < 0) break; - } - /* Increment head and l1h ptrs and reset tail to end of msg (may be altered by removing FCS) */ + /* Not done */ + /* Increment head and l1h ptrs */ + /* Reset tail to end of msg (may be altered by removing FCS) */ offset += pdu_bits; - msg->head = orig_head + offset; - msg->tail = orig_tail; - msg->len = msg->tail - msg->head; + msg->head = orig_head + offset; /* New head is old head plus parsed len from prev msg */ + msg->tail = orig_tail; /* Restore original tail */ + msg->len = msg->tail - msg->head; /* Fixup len */ msg->l1h = msg->head; msg->l2h = 0; msg->l3h = 0; diff --git a/src/tetra_llc.c b/src/tetra_llc.c index b8a378d..cdbfea0 100644 --- a/src/tetra_llc.c +++ b/src/tetra_llc.c @@ -122,6 +122,7 @@ tetra_llc_pdu_parse(&lpp, msg->l2h, len); msg->l3h = lpp.tl_sdu; msg->tail = msg->l3h + lpp.tl_sdu_len; // Strips off FCS (if present) + msg->len = msg->tail - msg->head; printf("TM-SDU(%s)", tetra_get_llc_pdut_dec_name(lpp.pdu_type)); if (lpp.have_fcs) { diff --git a/src/tetra_upper_mac.c b/src/tetra_upper_mac.c index 94a58ce..3b2092b 100644 --- a/src/tetra_upper_mac.c +++ b/src/tetra_upper_mac.c @@ -175,12 +175,14 @@ } else { pdu_bits = rsd.macpdu_length * 8; /* Length given */ msg->tail = msg->head + pdu_bits; + msg->len = msg->tail - msg->head; } /* Strip fill bits */ if (rsd.fill_bits) { int num_fill_bits = get_num_fill_bits(msg->l1h, msgb_l1len(msg)); msg->tail -= num_fill_bits; + msg->len = msg->tail - msg->head; } /* Decrypt buffer if encrypted and key available */ @@ -301,6 +303,7 @@ if (fillbits_present) { int num_fill_bits = get_num_fill_bits(msg->l1h, msgb_l1len(msg)); msg->tail -= num_fill_bits; + msg->len = msg->tail - msg->head; } /* Decrypt (if required) */ @@ -349,9 +352,11 @@ /* Determine msg len, strip fill bits if any */ msg->tail = msg->head + length_indicator * 8; + msg->len = msg->tail - msg->head; if (fillbits_present) { num_fill_bits = get_num_fill_bits(msg->l1h, msgb_l1len(msg)); msg->tail -= num_fill_bits; + msg->len = msg->tail - msg->head; } /* Decrypt (if required) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/34000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ia725edbeafe26bd2ea9b5a1810d0b26bc79d84db Gerrit-Change-Number: 34000 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-trx[master]: transceiver: add experimental viterbi equalizer support

by pespin

Attention is currently required from: Hoernchen, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33930 ) Change subject: transceiver: add experimental viterbi equalizer support ...................................................................... Patch Set 14: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d Gerrit-Change-Number: 33930 Gerrit-PatchSet: 14 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 28 Jul 2023 14:18:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-msc[master]: ASCI: Add debugging and error logging to VGCS/VBS call control

by pespin

Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33965 ) Change subject: ASCI: Add debugging and error logging to VGCS/VBS call control ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3fbce71e47e9670f58e46e7c2a0f26a1bbc1a46e Gerrit-Change-Number: 33965 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:46:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Add templates to send and receive GCC/BCC call control messages

by pespin

Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 ) Change subject: ASCI: Add templates to send and receive GCC/BCC call control messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 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: I9ff5587a9fda1ea756891fc39a20cfd05924f628 Gerrit-Change-Number: 33973 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:46:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by pespin

Attention is currently required from: jolly, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 2: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/bc4c7eff_14f9… PS2, Line 68: inout charstring, CallParameters, ASCI_Event; imho this makes general handlig of Coord port more difficult, since one needs to check for different kind of messages when receiving from the port. Why not simply transforming the enum to str (enum2str()) and back when sending over the port? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:45:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33999 ) Change subject: ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33999 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: I941c5db5235785841f3368ef908a409bbb12150e Gerrit-Change-Number: 33999 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:44:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[L] Change in osmo-trx[master]: ms/va: add test tool and data

by Hoernchen

Attention is currently required from: laforge, fixeria. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33945 ) Change subject: ms/va: add test tool and data ...................................................................... Patch Set 11: (8 comments) File utils/Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/872b1a46_5f73e678 PS10, Line 2: .. > You wouldn't need these relative paths if you used `$(top_srcdir)`. Done https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/91330db1_753b756f PS10, Line 2: AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../Transceiver52M/arch/common -I${srcdir}/../Transceiver52M/device/common -I${srcdir}/../Transceiver52M > Also, for the sake of readability, one item per line please. Done https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/00b40a68_5b00a727 PS10, Line 3: lpthread > This is actually not a compiler flag, so `LDADD` is a better fit. […] Done https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/e29cd63d_9fadaa10 PS10, Line 4: LIBOSMOCODING_CFLAGS > Is libosmocoding also needed by your new tool? If not, move it to `osmo_prbs_tool_CFLAGS`. Done https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/efe03561_fb1b351c PS10, Line 13: burst-gen > Add `osmo-` prefix for consistency with `osmo-prbs-tool`? Done https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/938e5130_13136168 PS10, Line 15: burst_gen_SOURCES = va-test/burst-gen.cpp ${srcdir}/../Transceiver52M/grgsm_vitac/grgsm_vitac.cpp ${srcdir}/../Transceiver52M/grgsm_vitac/viterbi_detector.cc > Same here, one file per line please. Done https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/ef80e976_4e38a8f3 PS10, Line 17: ../Transceiver52M/libtransceiver_common.la \ > tabs vs spaces Done File utils/va-test/burst-gen.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/33945/comment/4a64fe8d_a67c31ca PS10, Line 524: int main() > doesn't compiler warn about missing `return (int)`? No, see https://en.cppreference.com/w/cpp/language/main_function 4) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db Gerrit-Change-Number: 33945 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:38:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-trx[master]: transceiver: add experimental viterbi equalizer support

by Hoernchen

Attention is currently required from: Hoernchen, laforge, pespin. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33930 to look at the new patch set (#14). Change subject: transceiver: add experimental viterbi equalizer support ...................................................................... transceiver: add experimental viterbi equalizer support The VA is already being used by the ms side and is part of the original gsm design. It only works for gmsk, 4sps, and needs a bit of rx burst scaling and burst shifting. Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d --- M CommonLibs/config_defs.h M CommonLibs/trx_vty.c M Transceiver52M/Makefile.am M Transceiver52M/Transceiver.cpp M Transceiver52M/osmo-trx.cpp M Transceiver52M/radioInterface.h 6 files changed, 131 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/30/33930/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9d7a4ff72e323832a94d885d5714fcde01ceeb3d Gerrit-Change-Number: 33930 Gerrit-PatchSet: 14 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[L] Change in osmo-trx[master]: ms/va: add test tool and data

by Hoernchen

Attention is currently required from: Hoernchen, laforge. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33945 to look at the new patch set (#12). Change subject: ms/va: add test tool and data ...................................................................... ms/va: add test tool and data It just uses the viterbi equalizer and the sigproclib to generate and demodulate bursts and prints the bits, only useful for development. Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db --- M .checkpatch.conf M .gitignore M utils/Makefile.am A utils/va-test/burst-gen.cpp A utils/va-test/demodbits_tsc7.s8 A utils/va-test/nb_chunk_tsc7.cfile 6 files changed, 568 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/45/33945/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db Gerrit-Change-Number: 33945 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: restructure the va code to add rach support

by Hoernchen

Attention is currently required from: Hoernchen, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/33944 to look at the new patch set (#8). Change subject: ms: restructure the va code to add rach support ...................................................................... ms: restructure the va code to add rach support This commit adds support for rach bursts to the viterbi equalizer, which is currently only being used by the ms side, so the equalizer can be used by the osmo-trx network side, too. The difference is that rach bursts are shorter than any other burst type (due to unknown TA) and start with diffrent tail bits. This drops the multiversioning which was only working for x86 anyway because it can't be combined with no_ubsan. Change-Id: I4a5cedc8c9a3289c75ce7b914eac286e601ebed0 --- M Transceiver52M/grgsm_vitac/constants.h M Transceiver52M/grgsm_vitac/grgsm_vitac.cpp M Transceiver52M/grgsm_vitac/grgsm_vitac.h M Transceiver52M/ms/ms_rx_lower.cpp M Transceiver52M/ms/ms_upper.cpp 5 files changed, 131 insertions(+), 96 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/44/33944/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4a5cedc8c9a3289c75ce7b914eac286e601ebed0 Gerrit-Change-Number: 33944 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-msc[master]: ASCI: Add debugging and error logging to VGCS/VBS call control

by jolly

Attention is currently required from: laforge. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/33965 to look at the new patch set (#2). Change subject: ASCI: Add debugging and error logging to VGCS/VBS call control ...................................................................... ASCI: Add debugging and error logging to VGCS/VBS call control Change-Id: I3fbce71e47e9670f58e46e7c2a0f26a1bbc1a46e Related: OS#4854 --- M src/libmsc/msc_vgcs.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/65/33965/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3fbce71e47e9670f58e46e7c2a0f26a1bbc1a46e Gerrit-Change-Number: 33965 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-msc[master]: ASCI: Add debugging and error logging to VGCS/VBS call control

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33965 ) Change subject: ASCI: Add debugging and error logging to VGCS/VBS call control ...................................................................... Patch Set 1: (1 comment) File src/libmsc/msc_vgcs.c: https://gerrit.osmocom.org/c/osmo-msc/+/33965/comment/d9f52177_a0d8fcdd PS1, Line 639: Create > "Creating ... […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3fbce71e47e9670f58e46e7c2a0f26a1bbc1a46e Gerrit-Change-Number: 33965 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:21:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Add templates to send and receive GCC/BCC call control messages

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 ) Change subject: ASCI: Add templates to send and receive GCC/BCC call control messages ...................................................................... Patch Set 2: (2 comments) File library/L3_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973/comment/5cd9ad79_9eec… PS1, Line 3599: template PDU_ML3_MS_NW ts_ML3_MO_BCC(integer tid, octetstring bcc) := { > The send templates (ts_*) should have a template (value) qualifier, like the examples above. Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973/comment/925f04dc_7550… PS1, Line 3626: template PDU_M > likewise here. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 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: I9ff5587a9fda1ea756891fc39a20cfd05924f628 Gerrit-Change-Number: 33973 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:21:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Allow incoming VGCS/VBS connections at RAN_Emulation.ttcnpp

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33976 ) Change subject: ASCI: Allow incoming VGCS/VBS connections at RAN_Emulation.ttcnpp ...................................................................... Patch Set 2: (1 comment) File library/RAN_Emulation.ttcnpp: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33976/comment/ebbf48fd_b72c… PS1, Line 1352: handoverRequest := true; > I guess either the handoverRequest + *PointCode variable should be renamed, or at least there should […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33976 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: I3fc0c5efe7d9f270804e7295aeb65cfe7898bd7e Gerrit-Change-Number: 33976 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:20:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by jolly

Attention is currently required from: laforge, fixeria. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 2: (3 comments) File msc/MSC_Tests_ASCI.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/2cdb63d4_dcbf… PS1, Line 50: type integer ASCI_TEST; : const ASCI_TEST ASCI_TEST_NO_CALLREF := 1; : const ASCI_TEST ASCI_TEST_SETUP_REFUSE := 2; : const ASCI_TEST ASCI_TEST_ASSIGN_FAIL := 3; : const ASCI_TEST ASCI_TEST_COMPLETE_VGCS := 4; : const ASCI_TEST ASCI_TEST_COMPLETE_VBS := 5; > one could also simply add the new enum type as something that can be sent over the existing port coo […] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/69fbea98_2895… PS1, Line 58: type component asci_CT extends MTC_CT { > Just a friendly note (not critical): it's better to mark module-local types, altsteps, and functions […] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/b0822e86_44c5… PS1, Line 65: const charstring COORD_SETUP := "SETUP"; > full ack Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jul 2023 13:20:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 3 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by jolly

Attention is currently required from: jolly, fixeria. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 to look at the new patch set (#2). Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... ASCI: Add tests for voice group/broadcast calls at MSC Related: OS#4854 Change-Id: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.cfg M msc/MSC_Tests.ttcn A msc/MSC_Tests_ASCI.ttcn 4 files changed, 692 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/33979/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Add templates to send and receive GCC/BCC call control messages

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 to look at the new patch set (#2). Change subject: ASCI: Add templates to send and receive GCC/BCC call control messages ...................................................................... ASCI: Add templates to send and receive GCC/BCC call control messages Related: OS#4854 Change-Id: I9ff5587a9fda1ea756891fc39a20cfd05924f628 --- M library/L3_Templates.ttcn 1 file changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/33973/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33973 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: I9ff5587a9fda1ea756891fc39a20cfd05924f628 Gerrit-Change-Number: 33973 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

9 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33999 ) Change subject: ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp ...................................................................... ASCI: Rename handoverRequest to n_connect in RAN_Emulation.ttcnpp The expectation table is used to deliver new connections with Handover Request as well as with VGCS/VBS Setup and VGCS/VBS Assignment Request. "handoverRequest" is renamed to "n_connect". Related: OS#4854 Change-Id: I941c5db5235785841f3368ef908a409bbb12150e --- M library/RAN_Emulation.ttcnpp M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 3 files changed, 51 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/33999/1 diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 99753da..40929ee 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -1266,9 +1266,9 @@ PROC.reply(RAN_register:{l3_info, vc_hdlr}) to vc_hdlr; } - [] PROC.getcall(RAN_register_handoverRequest:{?,?}) -> param(targetPointCode, vc_hdlr) { + [] PROC.getcall(RAN_register_n_connect:{?,?}) -> param(targetPointCode, vc_hdlr) { f_create_expect(omit, vc_hdlr, targetPointCode); - PROC.reply(RAN_register_handoverRequest:{targetPointCode, vc_hdlr}) to vc_hdlr; + PROC.reply(RAN_register_n_connect:{targetPointCode, vc_hdlr}) to vc_hdlr; } [] PROC.getcall(RAN_register_sccp_cr_without_payload:{?}) -> param(vc_hdlr) { @@ -1305,7 +1305,7 @@ type record ExpectData { /* L3 payload based on which we can match it */ octetstring l3_payload optional, - integer handoverRequestPointCode optional, + integer n_connectPointCode optional, boolean sccp_cr_without_payload, /* component reference for this connection */ RAN_ConnHdlr vc_conn @@ -1313,7 +1313,7 @@ /* procedure based port to register for incoming connections */ signature RAN_register(in octetstring l3, in RAN_ConnHdlr hdlr); -signature RAN_register_handoverRequest(in integer targetPointCode, in RAN_ConnHdlr hdlr); +signature RAN_register_n_connect(in integer targetPointCode, in RAN_ConnHdlr hdlr); signature RAN_register_sccp_cr_without_payload(in RAN_ConnHdlr hdlr); /* procedure based port to register for incoming IMSI/TMSI */ @@ -1327,7 +1327,7 @@ signature RAN_continue_after_n_sd(N_Sd_Array last_n_sd, in RAN_ConnHdlr hdlr); type port RAN_PROC_PT procedure { - inout RAN_register, RAN_register_imsi, RAN_unregister_imsi, RAN_register_handoverRequest, + inout RAN_register, RAN_register_imsi, RAN_unregister_imsi, RAN_register_n_connect, RAN_register_sccp_cr_without_payload, RAN_last_n_sd, RAN_continue_after_n_sd; } with { extension "internal" }; @@ -1337,40 +1337,40 @@ runs on RAN_Emulation_CT return RAN_ConnHdlr { var RAN_ConnHdlr ret := null; var octetstring l3_info; - var boolean handoverRequest := false; - var integer handoverRequestPointCode; + var boolean n_connect := false; + var integer n_connectPointCode; var integer i; if (ischosen(conn_ind.userData.pdu.bssmap.completeLayer3Information)) { l3_info := conn_ind.userData.pdu.bssmap.completeLayer3Information.layer3Information.layer3info; log("ExpectedCreateCallback completeLayer3Information"); } else if (ischosen(conn_ind.userData.pdu.bssmap.handoverRequest)) { - handoverRequest := true; - handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); - log("ExpectedCreateCallback handoverRequest ", handoverRequestPointCode); + n_connect := true; + n_connectPointCode := bit2int(conn_ind.calledAddress.signPointCode); + log("ExpectedCreateCallback handoverRequest ", n_connectPointCode); } else if (ischosen(conn_ind.userData.pdu.bssmap.vGCS_VBSSetup)) { - handoverRequest := true; - handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); - log("ExpectedCreateCallback VGCS/VBS Setup ", handoverRequestPointCode); + n_connect := true; + n_connectPointCode := bit2int(conn_ind.calledAddress.signPointCode); + log("ExpectedCreateCallback VGCS/VBS Setup ", n_connectPointCode); } else if (ischosen(conn_ind.userData.pdu.bssmap.vGCS_VBSAssignmentRequest)) { - handoverRequest := true; - handoverRequestPointCode := bit2int(conn_ind.calledAddress.signPointCode); - log("ExpectedCreateCallback VGCS/VBS Assignment ", handoverRequestPointCode); + n_connect := true; + n_connectPointCode := bit2int(conn_ind.calledAddress.signPointCode); + log("ExpectedCreateCallback VGCS/VBS Assignment ", n_connectPointCode); } else { - setverdict(fail, "N-CONNECT.ind with L3 != COMPLETE L3 nor a Handover Request"); + setverdict(fail, "N-CONNECT.ind with L3 != COMPLETE L3 nor a new BSS connection"); mtc.stop; } for (i := 0; i < sizeof(ExpectTable); i:= i+1) { - if (handoverRequest) { - log("ExpectTable[", i, "].handoverRequestPointCode = ", ExpectTable[i].handoverRequestPointCode, - " ==? ", handoverRequestPointCode); - if (ExpectTable[i].handoverRequestPointCode == handoverRequestPointCode) { + if (n_connect) { + log("ExpectTable[", i, "].n_connectPointCode = ", ExpectTable[i].n_connectPointCode, + " ==? ", n_connectPointCode); + if (ExpectTable[i].n_connectPointCode == n_connectPointCode) { ret := ExpectTable[i].vc_conn; /* release this entry to be used again */ - ExpectTable[i].handoverRequestPointCode := omit; + ExpectTable[i].n_connectPointCode := omit; ExpectTable[i].vc_conn := null; - log("Found Expect[", i, "] for handoverRequest handled at ", ret); + log("Found Expect[", i, "] for N-CONNECT handled at ", ret); return ret; } else { continue; @@ -1436,25 +1436,25 @@ #endif private function f_create_expect(template octetstring l3, RAN_ConnHdlr hdlr, - template integer handoverRequestPointCode := omit) + template integer n_connectPointCode := omit) runs on RAN_Emulation_CT { var integer i; - log("f_create_expect(l3 := ", l3, ", handoverRequest := ", handoverRequestPointCode); + log("f_create_expect(l3 := ", l3, ", n_connectPointCode := ", n_connectPointCode); for (i := 0; i < sizeof(ExpectTable); i := i+1) { if (not ispresent(ExpectTable[i].l3_payload) and not ExpectTable[i].sccp_cr_without_payload - and not ispresent(ExpectTable[i].handoverRequestPointCode)) { + and not ispresent(ExpectTable[i].n_connectPointCode)) { if (ispresent(l3)) { ExpectTable[i].l3_payload := valueof(l3); } else { ExpectTable[i].sccp_cr_without_payload := true; } - if (ispresent(handoverRequestPointCode)) { - ExpectTable[i].handoverRequestPointCode := valueof(handoverRequestPointCode); + if (ispresent(n_connectPointCode)) { + ExpectTable[i].n_connectPointCode := valueof(n_connectPointCode); } ExpectTable[i].vc_conn := hdlr; - if (ispresent(handoverRequestPointCode)) { - log("Created Expect[", i, "] for handoverRequest to be handled at ", hdlr); + if (ispresent(n_connectPointCode)) { + log("Created Expect[", i, "] for N-CONNECT to be handled at ", hdlr); } else { log("Created Expect[", i, "] for ", l3, " to be handled at ", hdlr); } @@ -1499,7 +1499,7 @@ runs on RAN_Emulation_CT { for (var integer i := 0; i < sizeof(ExpectTable); i := i+1) { ExpectTable[i].l3_payload := omit; - ExpectTable[i].handoverRequestPointCode := omit; + ExpectTable[i].n_connectPointCode := omit; ExpectTable[i].sccp_cr_without_payload := false; } } diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 64e2aff..d4723e5 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1969,9 +1969,9 @@ } } -function f_create_bssmap_exp_handoverRequest(integer targetPointCode) runs on BSC_ConnHdlr { - BSSAP_PROC.call(RAN_register_handoverRequest:{targetPointCode, self}) { - [] BSSAP_PROC.getreply(RAN_register_handoverRequest:{?, ?}) {}; +function f_create_bssmap_exp_n_connect(integer targetPointCode) runs on BSC_ConnHdlr { + BSSAP_PROC.call(RAN_register_n_connect:{targetPointCode, self}) { + [] BSSAP_PROC.getreply(RAN_register_n_connect:{?, ?}) {}; } } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 75b7688..d955f02 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -5819,7 +5819,7 @@ /* Ok, that went well, now the other BSC is handovering back here -- * from now on this here is the new BSS. */ - f_create_bssmap_exp_handoverRequest(193); + f_create_bssmap_exp_n_connect(193); var template BSSMAP_IE_EncryptionInformation encryptionInformation; var template BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm; @@ -5883,7 +5883,7 @@ bss_rtp_ip := "1.2.3.4"; } f_init_handler(pars); - f_create_bssmap_exp_handoverRequest(194); + f_create_bssmap_exp_n_connect(194); var template BSSMAP_IE_EncryptionInformation encryptionInformation; var template BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm; @@ -6218,7 +6218,7 @@ /* inter-MSC handover back to the first MSC */ - f_create_bssmap_exp_handoverRequest(193); + f_create_bssmap_exp_n_connect(193); cil := { cIl_CGI := { ts_BSSMAP_CI_CGI('262'H, '42'H, 23, 42) } }; /* old BSS sends Handover Required, via inter-MSC E link: like -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33999 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: I941c5db5235785841f3368ef908a409bbb12150e Gerrit-Change-Number: 33999 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ASCI: Add integer type to BSC_ConnHdlr_Coord_PT port

by jolly

jolly has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33977 ) Change subject: ASCI: Add integer type to BSC_ConnHdlr_Coord_PT port ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33977 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: I2bb9bec5b084ad5e2a46caa91d1908d2c6781132 Gerrit-Change-Number: 33977 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Added keyfile loading

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33998 ) Change subject: Added keyfile loading ...................................................................... Added keyfile loading Added an additional command line flag -k to tetra-rx that allows for the loading of a file containing network and key definitions. Also added parsing code in tetra_crypto.c to interpret said definitions, and maintain a global tetra_crypto_database struct. Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c --- M src/tetra-rx.c 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/98/33998/1 diff --git a/src/tetra-rx.c b/src/tetra-rx.c index b37b4c0..121e7b7 100644 --- a/src/tetra-rx.c +++ b/src/tetra-rx.c @@ -53,11 +53,14 @@ trs = talloc_zero(tetra_tall_ctx, struct tetra_rx_state); trs->burst_cb_priv = tms; - while ((opt = getopt(argc, argv, "d:")) != -1) { + while ((opt = getopt(argc, argv, "d:k:")) != -1) { switch (opt) { case 'd': tms->dumpdir = strdup(optarg); break; + case 'k': + load_keystore(optarg); + break; default: fprintf(stderr, "Unknown option %c\n", opt); } -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c Gerrit-Change-Number: 33998 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

[S] Change in osmo-tetra[master]: Fixed makefile to also clean crypto subdirectory

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33996 ) Change subject: Fixed makefile to also clean crypto subdirectory ...................................................................... Fixed makefile to also clean crypto subdirectory Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 --- M src/Makefile 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/96/33996/1 diff --git a/src/Makefile b/src/Makefile index 9b12484..b424ea4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -30,4 +30,4 @@ tunctl: tunctl.o clean: - @rm -f tunctl float_to_bits crc_test tetra-rx conv_enc_test *.o phy/*.o lower_mac/*.o *.a + @rm -f tunctl float_to_bits crc_test tetra-rx conv_enc_test *.o phy/*.o lower_mac/*.o crypto/*.o *.a -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 Gerrit-Change-Number: 33996 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

9 months, 3 weeks

1
0
0 0

2024

2023

2022

gerrit-log July 2023