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

[S] Change in osmo-ttcn3-hacks[master]: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?usp=email ) Change subject: GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp ...................................................................... GTPv2: set TEID and SeqNr in ts_GTP2C_CreateSessionResp Change-Id: I83f1f4f78adb9cd85758513420479327ea73187a --- M epdg/EPDG_Tests.ttcn M library/GTPv2_Templates.ttcn 2 files changed, 16 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 99a4721..f58cf96 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -429,7 +429,9 @@ teid_list := { fteid_u_ie }, qos := ts_GTP2C_BearerQos('09'O, 0,0,0,0), charging_id := ts_GTP2C_ChargingID(g_pars.teic_local)); - GTP2.send(ts_GTP2C_CreateSessionResp({ fteid_c_ie }, paa, { ts_GTP2C_BcGrouped(bctx_ies) } )); + GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.teic_remote, rx_msg.sequenceNumber, + { fteid_c_ie }, paa, + { ts_GTP2C_BcGrouped(bctx_ies) } )); setverdict(pass); } [] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg { diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index 4af82e8..1ccbcb8 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -838,10 +838,12 @@ }}); template (value) PDU_GTPCv2 -ts_GTP2C_CreateSessionResp(template (value) FullyQualifiedTEID_List fteids, +ts_GTP2C_CreateSessionResp(template (value) OCT4 d_teid, + template (value) OCT3 seq, + template (value) FullyQualifiedTEID_List fteids, template (value) PDN_AddressAllocation addr, template (omit) BearerContextGrouped_List bearerContextGrouped := omit) := -ts_PDU_GTP2C('00000000'O, '000000'O, '21'O, { +ts_PDU_GTP2C(d_teid, seq, '21'O, { createSessionResponse := { cause := ts_GTP2C_Cause(Request_accepted, '0'B), changeReportingAction := omit, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35357?usp=email 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: I83f1f4f78adb9cd85758513420479327ea73187a Gerrit-Change-Number: 35357 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in pysim[master]: decode security attributes compact field in FCP

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35363?usp=email ) Change subject: decode security attributes compact field in FCP ...................................................................... decode security attributes compact field in FCP When we select files, we currently display the security attributes compact field as raw bytes only. Let's decode this field using construct so that it gets displayed in human readable form. Change-Id: Iaa1167349027222e69a561d20a4c595fba2fdd2b Related: OS#6211 --- M pySim/ts_102_221.py 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/35363/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index ac0dc84..56da542 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -175,7 +175,18 @@ # ETSI TS 102 221 11.1.1.4.7.1 class SecurityAttribCompact(BER_TLV_IE, tag=0x8c): - _construct = GreedyBytes + # see also ISO/IEC 7816-4, section 5.4.3.1, table 16, 17 and 20 + F = Struct('delete_self'/Flag, 'terminate'/Flag, 'activate'/Flag, 'deactivate'/Flag) + FCNT = Struct('create_df|write,append_record'/Flag, + 'create_ef|update,erase'/Flag, + 'delete_file|read,search'/Flag) + _construct = Struct('access_mode'/Select(BitStruct(Const(1, Bit), 'propritary'/BitsInteger(4), 'file_contents'/FCNT), + BitStruct(Const(0, Bit), 'file'/F, 'file_contents'/FCNT)), + 'security_conditions'/Array(this._.total_len - 1, Select(BitStruct('no_condition'/Const(0x00,BitsInteger(8))), + BitStruct('never'/Const(0xff, BitsInteger(8))), + BitStruct('match_all'/Flag, 'secure_msg'/Flag, + 'ext_auth'/Flag, 'user_auth'/Flag, + 'SEID'/BitsInteger(4))))) # ETSI TS 102 221 11.1.1.4.7.2 class SecurityAttribExpanded(BER_TLV_IE, tag=0xab): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35363?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa1167349027222e69a561d20a4c595fba2fdd2b Gerrit-Change-Number: 35363 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind

by fixeria

Attention is currently required from: daniel, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email ) Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1 Gerrit-Change-Number: 35354 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Dec 2023 11:25:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-iuh[master]: iu_client: Use local variable to track conn_id

by fixeria

Attention is currently required from: daniel, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email ) Change subject: iu_client: Use local variable to track conn_id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I967a311e2ad5af585c032426cc6b0680c3313b0f Gerrit-Change-Number: 35353 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Dec 2023 11:22:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester-virtual: kill old instances

by fixeria

Attention is currently required from: jolly, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35362?usp=email ) Change subject: jobs/osmo-gsm-tester-virtual: kill old instances ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35362?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6fc874d319d74aabdc33c10910cbcca2978d5bbb Gerrit-Change-Number: 35362 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Dec 2023 10:14:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)

by fixeria

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email ) Change subject: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email 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: I8143c6e9448a663fee2111a91415cc58fbcb2133 Gerrit-Change-Number: 35361 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 14 Dec 2023 10:13:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester-virtual: kill old instances

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/35362?usp=email ) Change subject: jobs/osmo-gsm-tester-virtual: kill old instances ...................................................................... jobs/osmo-gsm-tester-virtual: kill old instances Make sure osmo-gsm-tester gets killed eventually, even if a bug causes it to run forever or if aborted manually. * add a name to the docker container * kill the docker container if it runs longer than 24h with docker-cleanup.sh * rename fix_permissions_trap to clean_up_trap and kill it there, when it is still running before the job starts and after it is done (in my testing this did not kill it after pressing abort, but it would be killed either at the start of the next job running on the same jenkins node, or after 24h by docker-cleanup.sh) Related: OS#6304 Change-Id: I6fc874d319d74aabdc33c10910cbcca2978d5bbb --- M jobs/osmo-gsm-tester-runner.yml M scripts/docker-cleanup.sh 2 files changed, 31 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/35362/1 diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 83040dc..4909fe7 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -226,14 +226,15 @@ - copy_artifact: repo: osmo-gsm-tester_build-osmocom-bb - shell: | - # Set a trap to fix workspace permissions on exit - fix_permissions() { + # Set a trap to fix workspace permissions / kill the docker container on exit + clean_up() { + docker kill "osmo-gsm-tester-virtual" || true docker run --rm \ -v "$WORKSPACE":/workspace \ debian:bullseye \ chmod -R a+rwX /workspace/ } - fix_permissions_trap() { + clean_up_trap() { set +x echo echo "### Clean up ###" @@ -241,12 +242,12 @@ set -x trap - EXIT INT TERM 0 - fix_permissions + clean_up } - trap fix_permissions_trap EXIT INT TERM 0 + trap clean_up_trap EXIT INT TERM 0 # Make sure no test results from a previous run remain - fix_permissions + clean_up rm -rf trial-* # Build the docker image @@ -277,6 +278,7 @@ -w /build -i \ -v "$PWD:/build" \ -v "$HOME/.ssh:/home/build/.ssh:ro" \ + --name=osmo-gsm-tester-virtual \ --cap-add=sys_nice \ $USER/osmo-gsm-tester \ /bin/bash -c 'LANG="en_US.utf8" LC_ALL="en_US.UTF-8" LC_LANG="en_US.UTF-8" PATH="$PWD/osmo-gsm-tester/src:${PATH}" ./osmo-gsm-tester/contrib/jenkins-run.sh' diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh index b905d3c..982ccea 100755 --- a/scripts/docker-cleanup.sh +++ b/scripts/docker-cleanup.sh @@ -18,7 +18,7 @@ fi case "$name" in - jenkins-*|*ttcn3*) ;; + jenkins-*|*ttcn3*|osmo-gsm-tester*) ;; *) echo "$name: does not match name pattern" continue -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35362?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6fc874d319d74aabdc33c10910cbcca2978d5bbb Gerrit-Change-Number: 35362 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0)

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email ) Change subject: Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0) ...................................................................... Fix TC_rll_est_ind (contention resolution on DCCH SAPI 0) The BTS rejects establishment without contention resolution on DCCH SAPI 0. This only applies if channel activation type is for immediate assignment. The Test expects the establishment on DCCH SAPI 0 to fail, if channel activation type is for immediate assignment and to pass, if the channel activation type is for normal assignment. Related: OS#6309 Change-Id: I8143c6e9448a663fee2111a91415cc58fbcb2133 --- M bts/BTS_Tests.ttcn 1 file changed, 33 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/35361/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 82a83cf..7ca92d9 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2520,11 +2520,12 @@ } /* Establish dedicated channel: L1CTL + RSL side */ -private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies := {}) runs on ConnHdlr { +private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies := {}, + RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) runs on ConnHdlr { var ChannelDescription ch_desc; /* Activate channel on BTS side */ - f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies); + f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies, act_type := act_type); /* Craft channel description (with or without frequency hopping parameters) */ if (g_pars.fhp.enabled) { @@ -7169,19 +7170,22 @@ } friend type record RllTestCase { - uint3_t sapi, - RslLinkId link_id, - octetstring l3, - boolean exp + uint3_t sapi, + RslLinkId link_id, + octetstring l3, + boolean exp, + RSL_IE_ActivationType act_type } friend type record of RllTestCase RllTestCases; friend template RllTestCase t_EITC(template (present) uint3_t sapi, template (present) RslLinkId id, - octetstring l3, boolean exp) := { + octetstring l3, boolean exp, + RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) := { sapi := sapi, link_id := id, l3 := l3, - exp := exp + exp := exp, + act_type := act_type } /* execute the same callback function with a set of different parameters (tcs) on a @@ -7216,7 +7220,7 @@ RSL.clear; /* activate the logical channel */ - f_est_dchan(); + f_est_dchan(act_type := tc.act_type); L1CTL.clear; f_tx_lapdm(ts_LAPDm_SABM(tc.sapi, cr_MO_CMD, true, tc.l3), tc.link_id); @@ -7254,8 +7258,10 @@ var RllTestCases tcs := { /* SAPI0 establishment (contention resolution) */ valueof(t_EITC(0, ts_RslLinkID_DCCH(0), '01020304'O, true)), - /* normal SAPI0 establishment */ - valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true)), + /* normal SAPI0 establishment (immediate assignment) */ + valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, false)), + /* normal SAPI0 establishment (normal assignment) */ + valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true, t_RSL_IE_ActType_ASS)), /* SAPI 3 doesn't support contention resolution */ valueof(t_EITC(3, ts_RslLinkID_DCCH(3), '01020304'O, false)), valueof(t_EITC(3, ts_RslLinkID_SACCH(3), '01020304'O, false)), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35361?usp=email 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: I8143c6e9448a663fee2111a91415cc58fbcb2133 Gerrit-Change-Number: 35361 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in osmo-iuh[master]: iu_client: Handle empty CR and InitialUE Message in DATA.ind

by osmith

Attention is currently required from: daniel, neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email ) Change subject: iu_client: Handle empty CR and InitialUE Message in DATA.ind ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I749ede737b9ac15bca37bbb16f3988b0db1125c1 Gerrit-Change-Number: 35354 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Dec 2023 09:33:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-iuh[master]: iu_client: Use local variable to track conn_id

by osmith

Attention is currently required from: daniel, neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email ) Change subject: iu_client: Use local variable to track conn_id ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/35353?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I967a311e2ad5af585c032426cc6b0680c3313b0f Gerrit-Change-Number: 35353 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Dec 2023 09:26:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023