- gerrit-log - lists.osmocom.org

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

by daniel

Attention is currently required from: pespin, dexter. Hello Jenkins Builder, laforge, pespin, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 to look at the new patch set (#2). Change subject: Add hnbgw tests ...................................................................... Add hnbgw tests Some tests for osmo-hnbgw with mgw support: * hnb register * ranap connect/disconnect * rab assignment/release Change-Id: I0a2fb795aec83337eda8d9972e6ff264ead61076 --- A hnbgw/HNBGW_Tests.cfg A hnbgw/HNBGW_Tests.default A hnbgw/HNBGW_Tests.ttcn A hnbgw/gen_links.sh A hnbgw/osmo-hnbgw.cfg A hnbgw/osmo-stp.cfg A hnbgw/regen_makefile.sh A library/RUA_Emulation.ttcn 8 files changed, 1,722 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/27106/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0a2fb795aec83337eda8d9972e6ff264ead61076 Gerrit-Change-Number: 27106 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

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

by daniel

Attention is currently required from: pespin, dexter. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 ) Change subject: Add hnbgw tests ...................................................................... Patch Set 2: (7 comments) Patchset: PS1: > To me this looks good. I have the tests running already. […] Yeah, you're right. I merged multiple patches into this one now. File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/f6990540_0d27… PS1, Line 212: /*function f_start_handler(void_fn fn, template (omit) TestHdlrParams pars := omit) > Can this be dropped? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/a5aee836_6b61… PS1, Line 218: /*private function f_tc_hnb_register_request(charstring id) runs on HNBGW_ConnHdlr { > Can this be dropped? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/e526a2a8_1dd0… PS1, Line 224: //var HNBGW_ConnHdlr vc_conn; > Can this be dropped? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/211777cb_6942… PS1, Line 247: //var HNBGW_ConnHdlr vc_conn; > Can this be dropped? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/a02d23a1_11d4… PS1, Line 267: //RANAP.receive(); > Can this be dropped? Done File hnbgw/MSC_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106/comment/c3e85194_ccad… PS1, Line 96: // FIXME > FIXME what? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0a2fb795aec83337eda8d9972e6ff264ead61076 Gerrit-Change-Number: 27106 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:27:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add Flag bits + Data to COL_INFO

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26985 ) Change subject: contrib/simtrace.lua: Add Flag bits + Data to COL_INFO ...................................................................... Patch Set 3: Code-Review+2 (1 comment) File contrib/simtrace.lua: https://gerrit.osmocom.org/c/simtrace2/+/26985/comment/a3563396_f39258c6 PS1, Line 93: if is_pbrx().value == 1 then > Using ternary operator may improve readability here: […] Done -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0aa3d68172022907fbe8371aaca6538df0649dfe Gerrit-Change-Number: 26985 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:02:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: card_emu_uart_interrupt: ASSERT if we get called with wrong uart_chan

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26997 ) Change subject: card_emu_uart_interrupt: ASSERT if we get called with wrong uart_chan ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I022eee86a5a3b5077abe59897161578ed960f1b1 Gerrit-Change-Number: 26997 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:02:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: cardem: Report the VCC voltage (if supported)

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26996 ) Change subject: cardem: Report the VCC voltage (if supported) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Idcecad553fb36380e916378e1420488acbbfa8e3 Gerrit-Change-Number: 26996 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:02:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add Flag bits + Data to COL_INFO

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26985 ) Change subject: contrib/simtrace.lua: Add Flag bits + Data to COL_INFO ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0aa3d68172022907fbe8371aaca6538df0649dfe Gerrit-Change-Number: 26985 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:01:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

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

by laforge

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

2 years, 3 months

1
0
0 0

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

by laforge

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

2 years, 3 months

1
0
0 0

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

by laforge

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

2 years, 3 months

1
0
0 0

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

by laforge

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

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: tasks/ttcn3-slave.yml: also install libosmocore-utils

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26688 ) Change subject: tasks/ttcn3-slave.yml: also install libosmocore-utils ...................................................................... tasks/ttcn3-slave.yml: also install libosmocore-utils This package provides osmo-config-merge, which is going to be used by docker-playground for generating configuration files. Change-Id: I87e54440a6b399aa0f0461ebf668991b5cdd0b07 Related: https://gerrit.osmocom.org/c/docker-playground/+/20622 --- M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml index fbfc1ec..5e15254 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml @@ -24,9 +24,11 @@ filename: obs_osmocom update_cache: yes -- name: install titan +- name: install titan and libosmocore-utils apt: - name: eclipse-titan + name: + - eclipse-titan + - libosmocore-utils update_cache: yes cache_valid_time: 3600 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I87e54440a6b399aa0f0461ebf668991b5cdd0b07 Gerrit-Change-Number: 26688 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: tasks/ttcn3-slave.yml: also install libosmocore-utils

by laforge

Attention is currently required from: fixeria, pespin, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26688 ) Change subject: tasks/ttcn3-slave.yml: also install libosmocore-utils ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I87e54440a6b399aa0f0461ebf668991b5cdd0b07 Gerrit-Change-Number: 26688 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 11 Feb 2022 13:59:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common: add decoder for RAB-FailedList

by laforge

Attention is currently required from: daniel, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27136 ) Change subject: ranap_common: add decoder for RAB-FailedList ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/ranap_common.c: https://gerrit.osmocom.org/c/osmo-iuh/+/27136/comment/a372e934_9840a3a1 PS1, Line 598: RANAP_DEBUG a more general review issue that seems to affect all of the surrounding code: A decoder error should be more than a _DEBUG_ message. Not important to fix it in this patch, but in general that's very unusual and should probably be addressed. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0f42487968f2a39f2425068c001950509a3bd28f Gerrit-Change-Number: 27136 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 13:58:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: ensure specific rab_id

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/27138 ) Change subject: ranap_rab_ass: ensure specific rab_id ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: is the index (locigal sequence number in order of occurrence) really the most useful way to specify this, as opposed to the RAB ID of the RAB? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2259ffce9f4b508c555d60618c5983ac6294e0ae Gerrit-Change-Number: 27138 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 13:57:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by laforge

Attention is currently required from: iedemam, pespin, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: > What's strange to me then is why don't we have already some sort of API to sanitize string so that t […] I think the fundamental problem is that many of us never really used the statsd exporter much, so all our current sanitizing needs were oriented towards CTRL interface, whether directly or indirectly. PS1: Yes, the patch is simple but I don't really think the generated strings are less ugly. stastd may be happy, but _-_ sequences? ... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 13:55:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Test GTP-U Echo Request/Response

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27105 ) Change subject: ggsn: Test GTP-U Echo Request/Response ...................................................................... ggsn: Test GTP-U Echo Request/Response Change-Id: Id92180be948ee3f5246c7befec666698a1b074f3 --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 28 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index ae24eeb..5ec535c 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1213,6 +1213,18 @@ T_default.stop; } + testcase TC_echo_req_resp_gtpu() runs on GT_CT { + f_init(); + GTPU.send(ts_GTPU_PING(g_peer_u, g_d_seq_nr)); + T_default.start; + alt { + [] GTPU.receive(tr_GTPU_PONG(g_peer_u)) { setverdict(pass); }; + [] GTPU.receive { repeat; }; + [] T_default.timeout { setverdict(fail); } + } + T_default.stop; + } + /* Test if the parser can cope with PCO that only contain either a * single primary DNS or a secondary DNS. */ testcase TC_pdp4_act_deact_with_single_dns() runs on GT_CT { @@ -1600,6 +1612,7 @@ execute(TC_pdp46_act_deact_apn4()); execute(TC_echo_req_resp()); + execute(TC_echo_req_resp_gtpu()); execute(TC_pdp_act2_recovery()); execute(TC_act_deact_retrans_duplicate()); diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 8f6098a..0a9c5e9 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -1121,7 +1121,7 @@ } /* generalized GTP-U send template */ - template PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { + template (value) PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { /* N-PDU Number flag (PN): the GTP-U header contains a meaningful N-PDU Number field if the PN * flag is set to 1. */ pn_bit := '0'B, /* we assume the encoder overwrites this if an optional part is given */ @@ -1153,8 +1153,9 @@ } - /* template matching reception of GTP-U echo-request */ + /* template matching reception of GTP-U echo-request/response */ template Gtp1uUnitdata tr_GTPU_PING(template GtpPeer peer) := tr_GTPU_MsgType(peer, echoRequest, '00000000'O); + template Gtp1uUnitdata tr_GTPU_PONG(template GtpPeer peer) := tr_GTPU_MsgType(peer, echoResponse, '00000000'O); /* template matching reception of GTP-U GPDU */ template GTPU_IEs t_GPDU(template octetstring data) := { @@ -1167,6 +1168,18 @@ gtpu := tr_GTP1U_PDU('FF'O, teid, t_GPDU(data)) } + template GTPU_IEs ts_UEchoReqPDU := { + echoRequest_IEs := { + private_extension_gtpu := omit + } + } + + /* master template for sending a GTP-C echo request */ + template (value) Gtp1uUnitdata ts_GTPU_PING(GtpPeer peer, uint16_t seq) := { + peer := peer, + gtpu := ts_GTP1U_PDU(echoRequest, seq, '00000000'O, valueof(ts_UEchoReqPDU)) + } + template GTPU_IEs ts_UEchoRespPDU(OCT1 restart_counter) := { echoResponse_IEs := { recovery_gtpu := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27105 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: Id92180be948ee3f5246c7befec666698a1b074f3 Gerrit-Change-Number: 27105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Split gtpu_access tests into several separated tests

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27145 ) Change subject: ggsn: Split gtpu_access tests into several separated tests ...................................................................... ggsn: Split gtpu_access tests into several separated tests Those tests validated several different scenarios, let's better handle them separately one at a time, it makes it easier to understand the behavior of the SUT and see what needs to be fixed. Change-Id: I39342fcf2366030ce743dd4b4773f0fff5d61b9f --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 103 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 5ec535c..cebd6f2 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1001,22 +1001,64 @@ f_wait_gtpu_fail(ctx); } - /* Check that attempting RA with another ll src addr won't work, packet dropped: */ - var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8); - f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_ll_wrong)); - f_wait_gtpu_fail(ctx); - /* Check if we can use valid global src addr, should work */ var OCT16 saddr_glob := f_ipv6_global(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_glob, dns1_addr)); f_wait_icmp6_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Check that attempting RA with another ll src addr won't work, packet dropped: */ + testcase TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + + var OCT16 saddr_ll := f_ipv6_link_local(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); + var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8); + f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_ll_wrong)); + f_wait_gtpu_fail(ctx); + + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong global src addr are dropped by GGSN */ + testcase TC_pdp6_act_deact_gtpu_access_wrong_global_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + + var OCT16 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '0003'O); + var OCT16 saddr_glob := f_ipv6_global(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); var OCT16 saddr_wrong := f_ipv6_mangle(saddr_glob); f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); - /* Send an IPv4 ICMP ECHO REQUEST to APN6, should fail (packet dropped) */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Send an IPv4 ICMP ECHO REQUEST to APN6, should fail (packet dropped */ + testcase TC_pdp6_act_deact_gtpu_access_ipv4_apn6() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + var OCT4 saddr_v4 := f_inet_addr("192.168.10.2"); var OCT4 daddr_v4 := f_inet_addr("8.8.8.8"); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_v4, daddr_v4)); @@ -1161,15 +1203,38 @@ f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong global src addr are dropped by GGSN */ + testcase TC_pdp4_act_deact_gtpu_access_wrong_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + f_PCO_ensure_no_duplicates(ctx.pco_neg); + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4.ipv4_address; var OCT4 saddr_wrong := substr(saddr, 0, 3) & (saddr[3] xor4b '11'O); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); + } + + /* Send an IPv6 RA to APN4, should fail (packet dropped) */ + testcase TC_pdp4_act_deact_gtpu_access_ipv6_apn4() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + /* Send an IPv6 RA to APN4, should fail (packet dropped) */ var OCT16 saddr_v6 := f_inet6_addr("fde4:8dba:82e1:2000:1:2:3:4"); f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_v6)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); } @@ -1415,15 +1480,36 @@ f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong ipv4 src addr are dropped by GGSN on APN IPv4v6 */ + testcase TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4andIPv6.ipv4_address; var OCT4 saddr_wrong := substr(saddr, 0, 3) & (saddr[3] xor4b '11'O); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); - /* Send an IPv6 RA to APN4, should fail (packet dropped) */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong ipv6 global src addr are dropped by GGSN on APN IPv4v6 */ + testcase TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + var OCT16 saddr_v6 := f_inet6_addr("fde4:8dba:82e1:2000:1:2:3:4"); f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_v6)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); } @@ -1591,6 +1677,8 @@ execute(TC_pdp4_act_deact_ipcp_pap_broken()); execute(TC_pdp4_act_deact_pcodns()); execute(TC_pdp4_act_deact_gtpu_access()); + execute(TC_pdp4_act_deact_gtpu_access_wrong_saddr()); + execute(TC_pdp4_act_deact_gtpu_access_ipv6_apn4()); execute(TC_pdp4_clients_interact_with_txseq()); execute(TC_pdp4_clients_interact_without_txseq()); execute(TC_pdp4_act_deact_with_single_dns()); @@ -1600,6 +1688,9 @@ execute(TC_pdp6_act_deact_pcodns()); execute(TC_pdp6_act_deact_icmp6()); execute(TC_pdp6_act_deact_gtpu_access()); + execute(TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr()); + execute(TC_pdp6_act_deact_gtpu_access_wrong_global_saddr()); + execute(TC_pdp6_act_deact_gtpu_access_ipv4_apn6()); execute(TC_pdp6_clients_interact()); execute(TC_pdp46_act_deact()); @@ -1608,6 +1699,8 @@ execute(TC_pdp46_act_deact_pcodns4()); execute(TC_pdp46_act_deact_pcodns6()); execute(TC_pdp46_act_deact_gtpu_access()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6()); execute(TC_pdp46_clients_interact()); execute(TC_pdp46_act_deact_apn4()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27145 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: I39342fcf2366030ce743dd4b4773f0fff5d61b9f Gerrit-Change-Number: 27145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Split gtpu_access tests into several separated tests

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27145 ) Change subject: ggsn: Split gtpu_access tests into several separated tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27145 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: I39342fcf2366030ce743dd4b4773f0fff5d61b9f Gerrit-Change-Number: 27145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 13:51:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/Native_Functions: add f_inet6_ntoa()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27146 ) Change subject: library/Native_Functions: add f_inet6_ntoa() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27146 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: I0858cf8cb44a6673e19f3496c362d68fcdd7b18d Gerrit-Change-Number: 27146 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 13:51:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: cosmetic: Switch to consistent four-spaces indent; run autopep8

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27141 ) Change subject: cosmetic: Switch to consistent four-spaces indent; run autopep8 ...................................................................... cosmetic: Switch to consistent four-spaces indent; run autopep8 We had a mixture of tab and 4space based indenting, which is a bad idea. 4space is the standard in python, so convert all our code to that. The result unfortuantely still shoed even more inconsistencies, so I've decided to run autopep8 on the entire code base. Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim/__init__.py M pySim/ara_m.py M pySim/card_handler.py M pySim/card_key_provider.py M pySim/cards.py M pySim/cat.py M pySim/commands.py M pySim/construct.py M pySim/exceptions.py M pySim/filesystem.py M pySim/gsm_r.py M pySim/iso7816_4.py M pySim/jsonpath.py M pySim/profile.py M pySim/sysmocom_sja2.py M pySim/tlv.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_51_011.py M pySim/utils.py 29 files changed, 7,420 insertions(+), 6,468 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 Gerrit-Change-Number: 27141 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: utils: Fix missing Optional[] in type annotations

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27142 ) Change subject: utils: Fix missing Optional[] in type annotations ...................................................................... utils: Fix missing Optional[] in type annotations Thanks to Vadim for pointing this out Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e --- M pySim/utils.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 3ce3e58..555aa82 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1253,7 +1253,7 @@ has the habit of specifying TLV data but with very spcific ordering, or specific choices of tags at specific points in a stream. This class tries to represent this.""" - def __init__(self, name: str, desc: str = None, tag: int = None): + def __init__(self, name: str, desc: Optional[str] = None, tag: Optional[int] = None): """ Args: name: A brief, all-lowercase, underscore separated string identifier @@ -1376,7 +1376,7 @@ A given encoded DO may contain any of them in any order, and may contain multiple instances of each DO.""" - def __init__(self, name: str, desc: str = None, members=None): + def __init__(self, name: str, desc: Optional[str] = None, members=None): self.name = name self.desc = desc self.members = members or [] @@ -1491,7 +1491,7 @@ By wrapping them into this formal DataObjectSequence, we can offer convenience methods for encoding or decoding an entire sequence.""" - def __init__(self, name: str, desc: str = None, sequence=None): + def __init__(self, name: str, desc: Optional[str] = None, sequence=None): self.sequence = sequence or [] self.name = name self.desc = desc 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e Gerrit-Change-Number: 27142 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in pysim[master]: cosmetic: Switch to consistent four-spaces indent; run autopep8

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27141 ) Change subject: cosmetic: Switch to consistent four-spaces indent; run autopep8 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 Gerrit-Change-Number: 27141 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 13:50:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/Native_Functions: add f_inet6_ntoa()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27146 ) Change subject: library/Native_Functions: add f_inet6_ntoa() ...................................................................... library/Native_Functions: add f_inet6_ntoa() We have f_inet_ntoa() for converting IPv4 addresses to strings, but so far there was no similar function for IPv6 addresses. Change-Id: I0858cf8cb44a6673e19f3496c362d68fcdd7b18d --- M library/Native_FunctionDefs.cc M library/Native_Functions.ttcn 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/27146/1 diff --git a/library/Native_FunctionDefs.cc b/library/Native_FunctionDefs.cc index 78ca4d1..7139a62 100644 --- a/library/Native_FunctionDefs.cc +++ b/library/Native_FunctionDefs.cc @@ -76,6 +76,19 @@ return CHARSTRING(str); } +CHARSTRING f__inet6__ntoa(const OCTETSTRING& in) +{ + char buf[INET6_ADDRSTRLEN] = { 0 }; + TTCN_Buffer ttcn_buffer(in); + + const void *src = (const void *)ttcn_buffer.get_data(); + const char *str = inet_ntop(AF_INET6, src, buf, sizeof(buf)); + if (str == NULL) + fprintf(stderr, "inet_ntop failed: %s\n", strerror(errno)); + + return CHARSTRING((const char *)buf); +} + CHARSTRING f__str__tolower(const CHARSTRING& in) { TTCN_Buffer ttcn_buffer(in); diff --git a/library/Native_Functions.ttcn b/library/Native_Functions.ttcn index c43004a..c9cc948 100644 --- a/library/Native_Functions.ttcn +++ b/library/Native_Functions.ttcn @@ -11,6 +11,8 @@ external function f_inet_ntoa(in octetstring oct) return charstring; /* like inet_ntoa() but input is host byte order */ external function f_inet_hntoa(in octetstring oct) return charstring; + /* direct import of inet_ntop(AF_INET6) C function, input net byte order */ + external function f_inet6_ntoa(in octetstring oct) return charstring; /* convert content of charstring to lower-case using tolower(3) */ external function f_str_tolower(in charstring input) return charstring; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27146 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: I0858cf8cb44a6673e19f3496c362d68fcdd7b18d Gerrit-Change-Number: 27146 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Test GTP-U Echo Request/Response

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27105 ) Change subject: ggsn: Test GTP-U Echo Request/Response ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27105 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: Id92180be948ee3f5246c7befec666698a1b074f3 Gerrit-Change-Number: 27105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:50:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by fixeria

Attention is currently required from: iedemam. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> 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: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:48:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Split gtpu_access tests into several separated tests

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27145 ) Change subject: ggsn: Split gtpu_access tests into several separated tests ...................................................................... ggsn: Split gtpu_access tests into several separated tests Those tests validated several different scenarios, let's better handle them separately one at a time, it makes it easier to understand the behavior of the SUT and see what needs to be fixed. Change-Id: I39342fcf2366030ce743dd4b4773f0fff5d61b9f --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 103 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/27145/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 5ec535c..cebd6f2 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1001,22 +1001,64 @@ f_wait_gtpu_fail(ctx); } - /* Check that attempting RA with another ll src addr won't work, packet dropped: */ - var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8); - f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_ll_wrong)); - f_wait_gtpu_fail(ctx); - /* Check if we can use valid global src addr, should work */ var OCT16 saddr_glob := f_ipv6_global(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_glob, dns1_addr)); f_wait_icmp6_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Check that attempting RA with another ll src addr won't work, packet dropped: */ + testcase TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + + var OCT16 saddr_ll := f_ipv6_link_local(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); + var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8); + f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_ll_wrong)); + f_wait_gtpu_fail(ctx); + + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong global src addr are dropped by GGSN */ + testcase TC_pdp6_act_deact_gtpu_access_wrong_global_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + + var OCT16 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '0003'O); + var OCT16 saddr_glob := f_ipv6_global(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); var OCT16 saddr_wrong := f_ipv6_mangle(saddr_glob); f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); - /* Send an IPv4 ICMP ECHO REQUEST to APN6, should fail (packet dropped) */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Send an IPv4 ICMP ECHO REQUEST to APN6, should fail (packet dropped */ + testcase TC_pdp6_act_deact_gtpu_access_ipv4_apn6() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + var OCT4 saddr_v4 := f_inet_addr("192.168.10.2"); var OCT4 daddr_v4 := f_inet_addr("8.8.8.8"); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_v4, daddr_v4)); @@ -1161,15 +1203,38 @@ f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong global src addr are dropped by GGSN */ + testcase TC_pdp4_act_deact_gtpu_access_wrong_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + f_PCO_ensure_no_duplicates(ctx.pco_neg); + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4.ipv4_address; var OCT4 saddr_wrong := substr(saddr, 0, 3) & (saddr[3] xor4b '11'O); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); + } + + /* Send an IPv6 RA to APN4, should fail (packet dropped) */ + testcase TC_pdp4_act_deact_gtpu_access_ipv6_apn4() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + /* Send an IPv6 RA to APN4, should fail (packet dropped) */ var OCT16 saddr_v6 := f_inet6_addr("fde4:8dba:82e1:2000:1:2:3:4"); f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_v6)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); } @@ -1415,15 +1480,36 @@ f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong ipv4 src addr are dropped by GGSN on APN IPv4v6 */ + testcase TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4andIPv6.ipv4_address; var OCT4 saddr_wrong := substr(saddr, 0, 3) & (saddr[3] xor4b '11'O); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); - /* Send an IPv6 RA to APN4, should fail (packet dropped) */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong ipv6 global src addr are dropped by GGSN on APN IPv4v6 */ + testcase TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + var OCT16 saddr_v6 := f_inet6_addr("fde4:8dba:82e1:2000:1:2:3:4"); f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_v6)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); } @@ -1591,6 +1677,8 @@ execute(TC_pdp4_act_deact_ipcp_pap_broken()); execute(TC_pdp4_act_deact_pcodns()); execute(TC_pdp4_act_deact_gtpu_access()); + execute(TC_pdp4_act_deact_gtpu_access_wrong_saddr()); + execute(TC_pdp4_act_deact_gtpu_access_ipv6_apn4()); execute(TC_pdp4_clients_interact_with_txseq()); execute(TC_pdp4_clients_interact_without_txseq()); execute(TC_pdp4_act_deact_with_single_dns()); @@ -1600,6 +1688,9 @@ execute(TC_pdp6_act_deact_pcodns()); execute(TC_pdp6_act_deact_icmp6()); execute(TC_pdp6_act_deact_gtpu_access()); + execute(TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr()); + execute(TC_pdp6_act_deact_gtpu_access_wrong_global_saddr()); + execute(TC_pdp6_act_deact_gtpu_access_ipv4_apn6()); execute(TC_pdp6_clients_interact()); execute(TC_pdp46_act_deact()); @@ -1608,6 +1699,8 @@ execute(TC_pdp46_act_deact_pcodns4()); execute(TC_pdp46_act_deact_pcodns6()); execute(TC_pdp46_act_deact_gtpu_access()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6()); execute(TC_pdp46_clients_interact()); execute(TC_pdp46_act_deact_apn4()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27145 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: I39342fcf2366030ce743dd4b4773f0fff5d61b9f Gerrit-Change-Number: 27145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by pespin

Attention is currently required from: iedemam, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> 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: iedemam <michael(a)kapsulate.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:41:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: cosmetic: Switch to consistent four-spaces indent; run autopep8

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27141 to look at the new patch set (#3). Change subject: cosmetic: Switch to consistent four-spaces indent; run autopep8 ...................................................................... cosmetic: Switch to consistent four-spaces indent; run autopep8 We had a mixture of tab and 4space based indenting, which is a bad idea. 4space is the standard in python, so convert all our code to that. The result unfortuantely still shoed even more inconsistencies, so I've decided to run autopep8 on the entire code base. Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim/__init__.py M pySim/ara_m.py M pySim/card_handler.py M pySim/card_key_provider.py M pySim/cards.py M pySim/cat.py M pySim/commands.py M pySim/construct.py M pySim/exceptions.py M pySim/filesystem.py M pySim/gsm_r.py M pySim/iso7816_4.py M pySim/jsonpath.py M pySim/profile.py M pySim/sysmocom_sja2.py M pySim/tlv.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_51_011.py M pySim/utils.py 29 files changed, 7,420 insertions(+), 6,468 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/27141/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 Gerrit-Change-Number: 27141 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

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

by laforge

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

2 years, 3 months

1
0
0 0

Change in pysim[master]: filesystem.py: Accept both a class or an instance as TLV._tlv member

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27140 ) Change subject: filesystem.py: Accept both a class or an instance as TLV._tlv member ...................................................................... filesystem.py: Accept both a class or an instance as TLV._tlv member As we've seen in recent patches, this has been a source of bugs, so let's be tolerant and deal with both. Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6 --- M pySim/filesystem.py 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 7100b21..cfca708 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -532,7 +532,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -559,7 +559,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -585,7 +585,7 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -612,7 +612,7 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -771,7 +771,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_bin_data.hex()} @@ -798,7 +798,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -825,7 +825,7 @@ if self._construct: return b2h(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -851,7 +851,7 @@ if self._construct: return self._construct.build(abstract_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -909,7 +909,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -936,7 +936,7 @@ if self._construct: return parse_construct(self._construct, raw_bin_data) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_tlv(raw_bin_data) return t.to_dict() return {'raw': raw_hex_data} @@ -962,7 +962,7 @@ if self._construct: return b2h(filter_dict(self._construct.build(abstract_data))) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return b2h(t.to_tlv()) raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) @@ -988,7 +988,7 @@ if self._construct: return filter_dict(self._construct.build(abstract_data)) elif self._tlv: - t = self._tlv() + t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) return t.to_tlv() raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6 Gerrit-Change-Number: 27140 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

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

by laforge

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

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by laforge

Attention is currently required from: iedemam, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> 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: iedemam <michael(a)kapsulate.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:30:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by pespin

Attention is currently required from: iedemam, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > There is no sanitation in osmo_stat_item_group_set_name(). […] What's strange to me then is why don't we have already some sort of API to sanitize string so that the resulting string is a valid statsd string. That would be helpful, because there can be lots of chars which are not accepted. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:04:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

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

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27130 to look at the new patch set (#7). Change subject: ts_102_221: Implement proper parsing of EF.DIR ...................................................................... ts_102_221: Implement proper parsing of EF.DIR EF.DIR can not only contain the AID + Label of TS 102 221, but can also contain any of the DOs specified in ISO7816-4. Let's imoplement this based on the modern pySim.tlv parser Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Closes: OS#5410 --- A pySim/iso7816_4.py M pySim/ts_102_221.py 2 files changed, 78 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/30/27130/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Gerrit-Change-Number: 27130 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by pespin

Attention is currently required from: iedemam, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/27134/comment/660ce509_0c823ec8 PS3, Line 346: snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%u", unit_data.trx_id); > Done Hmm that's probably because there's only one line per link in ip.access Abis, because each TRX has its own RSL ipa connection, so each line is line 0 of its own link. I'd like to hear Harald's opinion regarding this topic. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:02:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: make/Makefile: allow overriding '-it' for target 'run'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27143 ) Change subject: make/Makefile: allow overriding '-it' for target 'run' ...................................................................... make/Makefile: allow overriding '-it' for target 'run' Allocating a pseudo-TTY (-t, --tty) fails when 'run' is executed inside of a Jenkins or cron script. This change fixes ttcn3-bts-test, which invokes 'run' to fetch the config files. Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d Fixes: If15461240f3037c142c176fc7da745a1701ae3f8 --- M alpine-lighttpd/Makefile M gr-gsm-master/Makefile M make/Makefile M nplab-m3ua-test/Makefile M nplab-sua-test/Makefile M open5gs-latest/Makefile M openbts-umts/Makefile M osmo-bsc-master/Makefile M osmo-bts-master/Makefile M osmo-gbproxy-latest/Makefile M osmo-gbproxy-master/Makefile M osmo-gerrit-libosmo/Makefile M osmo-ggsn-latest/Makefile M osmo-ggsn-master/Makefile M osmo-gsm-tester/Makefile M osmo-hlr-master/Makefile M osmo-hnbgw-master/Makefile M osmo-hnodeb-master/Makefile M osmo-mgw-master/Makefile M osmo-msc-master/Makefile M osmo-nitb-master/Makefile M osmo-pcu-master/Makefile M osmo-ran/Makefile M osmo-ran/split/ran-bsc_mgw/Makefile M osmo-ran/split/ran-bts_pcu/Makefile M osmo-ran/split/ran-trx-ipc/Makefile M osmo-ran/split/ran-trx-uhd/Makefile M osmo-remsim-latest/Makefile M osmo-remsim-master/Makefile M osmo-sgsn-master/Makefile M osmo-smlc-master/Makefile M osmo-stp-master/Makefile M sctp-test/Makefile M sigtran-tests/Makefile M systemd/Makefile M ttcn3-bsc-test-vamos/Makefile M ttcn3-bsc-test/Makefile M ttcn3-cbc-test/Makefile M ttcn3-hnodeb-test/Makefile M ttcn3-msc-test/Makefile M ttcn3-nitb-sysinfo/Makefile M ttcn3-pcap-client-test/Makefile M ttcn3-pcu-test/Makefile M ttcn3-sccp-test/Makefile M ttcn3-sgsn-test/Makefile M ttcn3-smlc-test/Makefile M ttcn3-stp-test/Makefile 47 files changed, 48 insertions(+), 45 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved; Verified diff --git a/alpine-lighttpd/Makefile b/alpine-lighttpd/Makefile index 27e1529..109875f 100644 --- a/alpine-lighttpd/Makefile +++ b/alpine-lighttpd/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network pdn --ip 172.20.0.10 --ip6 fd10:5741:8e20:0000::10 -v httpd-vol:/etc/lighttpd/lighttpd.conf.d --stop-signal SIGINT +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network pdn --ip 172.20.0.10 --ip6 fd10:5741:8e20:0000::10 -v httpd-vol:/etc/lighttpd/lighttpd.conf.d --stop-signal SIGINT include ../make/Makefile diff --git a/gr-gsm-master/Makefile b/gr-gsm-master/Makefile index b030a43..aece960 100644 --- a/gr-gsm-master/Makefile +++ b/gr-gsm-master/Makefile @@ -1,4 +1,5 @@ RUN_ARGS?= \ + -it --rm \ --privileged \ -v /dev/bus/usb:/dev/bus/usb diff --git a/make/Makefile b/make/Makefile index b2d344e..20733b0 100644 --- a/make/Makefile +++ b/make/Makefile @@ -38,6 +38,7 @@ OSMO_STP_BRANCH?=master OPEN5GS_BRANCH?=main BUILD_ARGS?= +RUN_ARGS?=-it UPSTREAM_DISTRO?=debian:bullseye DISTRO?=debian-bullseye @@ -167,4 +168,4 @@ run: - docker run $(RUN_ARGS) -it $(IMAGE) $(RUN_CMD) + docker run $(RUN_ARGS) $(IMAGE) $(RUN_CMD) diff --git a/nplab-m3ua-test/Makefile b/nplab-m3ua-test/Makefile index 0631fd3..1fc6815 100644 --- a/nplab-m3ua-test/Makefile +++ b/nplab-m3ua-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.7.2 +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.7.2 include ../make/Makefile diff --git a/nplab-sua-test/Makefile b/nplab-sua-test/Makefile index 273a334..db51491 100644 --- a/nplab-sua-test/Makefile +++ b/nplab-sua-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.6.3 +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.6.3 include ../make/Makefile diff --git a/open5gs-latest/Makefile b/open5gs-latest/Makefile index 95c99bb..0338f4f 100644 --- a/open5gs-latest/Makefile +++ b/open5gs-latest/Makefile @@ -1,5 +1,5 @@ DATA_DIR?=$(shell pwd) USER_ID?=$(shell id -u) -RUN_ARGS=-v $(DATA_DIR):/data --user $(USER_ID) --network host --rm +RUN_ARGS=-it --rm -v $(DATA_DIR):/data --user $(USER_ID) --network host include ../make/Makefile diff --git a/openbts-umts/Makefile b/openbts-umts/Makefile index b030a43..aece960 100644 --- a/openbts-umts/Makefile +++ b/openbts-umts/Makefile @@ -1,4 +1,5 @@ RUN_ARGS?= \ + -it --rm \ --privileged \ -v /dev/bus/usb:/dev/bus/usb diff --git a/osmo-bsc-master/Makefile b/osmo-bsc-master/Makefile index af827f6..ed16a7f 100644 --- a/osmo-bsc-master/Makefile +++ b/osmo-bsc-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data include ../make/Makefile diff --git a/osmo-bts-master/Makefile b/osmo-bts-master/Makefile index 80ae1f3..0332b05 100644 --- a/osmo-bts-master/Makefile +++ b/osmo-bts-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data include ../make/Makefile diff --git a/osmo-gbproxy-latest/Makefile b/osmo-gbproxy-latest/Makefile index 9e5fb05..ac24e7a 100644 --- a/osmo-gbproxy-latest/Makefile +++ b/osmo-gbproxy-latest/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data include ../make/Makefile diff --git a/osmo-gbproxy-master/Makefile b/osmo-gbproxy-master/Makefile index 9e5fb05..ac24e7a 100644 --- a/osmo-gbproxy-master/Makefile +++ b/osmo-gbproxy-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.22 -v gbproxy-vol:/data include ../make/Makefile diff --git a/osmo-gerrit-libosmo/Makefile b/osmo-gerrit-libosmo/Makefile index b08f5c0..af68c2a 100644 --- a/osmo-gerrit-libosmo/Makefile +++ b/osmo-gerrit-libosmo/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--tmpfs /tmpfs:exec +RUN_ARGS?=-it --tmpfs /tmpfs:exec include ../make/Makefile diff --git a/osmo-ggsn-latest/Makefile b/osmo-ggsn-latest/Makefile index 0142467..d8c16fb 100644 --- a/osmo-ggsn-latest/Makefile +++ b/osmo-ggsn-latest/Makefile @@ -1,5 +1,5 @@ RUN_ARGS?= \ - --rm \ + -it --rm \ --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --sysctl net.ipv6.conf.all.forwarding=1 \ diff --git a/osmo-ggsn-master/Makefile b/osmo-ggsn-master/Makefile index 0142467..d8c16fb 100644 --- a/osmo-ggsn-master/Makefile +++ b/osmo-ggsn-master/Makefile @@ -1,5 +1,5 @@ RUN_ARGS?= \ - --rm \ + -it --rm \ --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --sysctl net.ipv6.conf.all.forwarding=1 \ diff --git a/osmo-gsm-tester/Makefile b/osmo-gsm-tester/Makefile index 03366a0..76107df 100644 --- a/osmo-gsm-tester/Makefile +++ b/osmo-gsm-tester/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --privileged --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --network sigtran --ip 172.18.50.21 -v ogt-vol:/data +RUN_ARGS?=-it --rm --privileged --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun --network sigtran --ip 172.18.50.21 -v ogt-vol:/data include ../make/Makefile diff --git a/osmo-hlr-master/Makefile b/osmo-hlr-master/Makefile index 77d4f8b..d0d0b57 100644 --- a/osmo-hlr-master/Makefile +++ b/osmo-hlr-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data include ../make/Makefile diff --git a/osmo-hnbgw-master/Makefile b/osmo-hnbgw-master/Makefile index 47c3999..cadd43d 100644 --- a/osmo-hnbgw-master/Makefile +++ b/osmo-hnbgw-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data include ../make/Makefile diff --git a/osmo-hnodeb-master/Makefile b/osmo-hnodeb-master/Makefile index 47c3999..cadd43d 100644 --- a/osmo-hnodeb-master/Makefile +++ b/osmo-hnodeb-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.170 -v hnbgw-vol:/data include ../make/Makefile diff --git a/osmo-mgw-master/Makefile b/osmo-mgw-master/Makefile index dc9b67b..8ce072e 100644 --- a/osmo-mgw-master/Makefile +++ b/osmo-mgw-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.180 -v mgw-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.180 -v mgw-vol:/data include ../make/Makefile diff --git a/osmo-msc-master/Makefile b/osmo-msc-master/Makefile index 77d4f8b..d0d0b57 100644 --- a/osmo-msc-master/Makefile +++ b/osmo-msc-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.10 -v msc-vol:/data include ../make/Makefile diff --git a/osmo-nitb-master/Makefile b/osmo-nitb-master/Makefile index 44dde23..e5ff25e 100644 --- a/osmo-nitb-master/Makefile +++ b/osmo-nitb-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v nitb-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v nitb-vol:/data include ../make/Makefile diff --git a/osmo-pcu-master/Makefile b/osmo-pcu-master/Makefile index 87350c2..6c9351e 100644 --- a/osmo-pcu-master/Makefile +++ b/osmo-pcu-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.211 -v pcu-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.211 -v pcu-vol:/data include ../make/Makefile diff --git a/osmo-ran/Makefile b/osmo-ran/Makefile index 80b1069..505dd43 100644 --- a/osmo-ran/Makefile +++ b/osmo-ran/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data include ../make/Makefile diff --git a/osmo-ran/split/ran-bsc_mgw/Makefile b/osmo-ran/split/ran-bsc_mgw/Makefile index 0239a23..1732b0a 100644 --- a/osmo-ran/split/ran-bsc_mgw/Makefile +++ b/osmo-ran/split/ran-bsc_mgw/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data include ../../../make/Makefile diff --git a/osmo-ran/split/ran-bts_pcu/Makefile b/osmo-ran/split/ran-bts_pcu/Makefile index 3d539d1..7d2397c 100644 --- a/osmo-ran/split/ran-bts_pcu/Makefile +++ b/osmo-ran/split/ran-bts_pcu/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.201 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.201 -v bsc-vol:/data include ../../../make/Makefile diff --git a/osmo-ran/split/ran-trx-ipc/Makefile b/osmo-ran/split/ran-trx-ipc/Makefile index 1d99f06..509b9fc 100644 --- a/osmo-ran/split/ran-trx-ipc/Makefile +++ b/osmo-ran/split/ran-trx-ipc/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.202 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data include ../../../make/Makefile diff --git a/osmo-ran/split/ran-trx-uhd/Makefile b/osmo-ran/split/ran-trx-uhd/Makefile index 1d99f06..509b9fc 100644 --- a/osmo-ran/split/ran-trx-uhd/Makefile +++ b/osmo-ran/split/ran-trx-uhd/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.202 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.202 -v bsc-vol:/data include ../../../make/Makefile diff --git a/osmo-remsim-latest/Makefile b/osmo-remsim-latest/Makefile index 2e0e850..9273a98 100644 --- a/osmo-remsim-latest/Makefile +++ b/osmo-remsim-latest/Makefile @@ -1,3 +1,3 @@ -#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data +#RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data include ../make/Makefile diff --git a/osmo-remsim-master/Makefile b/osmo-remsim-master/Makefile index 2e0e850..9273a98 100644 --- a/osmo-remsim-master/Makefile +++ b/osmo-remsim-master/Makefile @@ -1,3 +1,3 @@ -#RUN_ARGS?=--rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data +#RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.210 -v bts-vol:/data include ../make/Makefile diff --git a/osmo-sgsn-master/Makefile b/osmo-sgsn-master/Makefile index 6bbd766..53984b8 100644 --- a/osmo-sgsn-master/Makefile +++ b/osmo-sgsn-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.21 -v sgsn-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.21 -v sgsn-vol:/data include ../make/Makefile diff --git a/osmo-smlc-master/Makefile b/osmo-smlc-master/Makefile index af827f6..ed16a7f 100644 --- a/osmo-smlc-master/Makefile +++ b/osmo-smlc-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.20 -v bsc-vol:/data include ../make/Makefile diff --git a/osmo-stp-master/Makefile b/osmo-stp-master/Makefile index 3fcea34..00ffbb1 100644 --- a/osmo-stp-master/Makefile +++ b/osmo-stp-master/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.200 -v stp-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.200 -v stp-vol:/data include ../make/Makefile diff --git a/sctp-test/Makefile b/sctp-test/Makefile index 79a894e..f23042c 100644 --- a/sctp-test/Makefile +++ b/sctp-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm +RUN_ARGS?=-it --rm include ../make/Makefile diff --git a/sigtran-tests/Makefile b/sigtran-tests/Makefile index b7a6cb8..32250b0 100644 --- a/sigtran-tests/Makefile +++ b/sigtran-tests/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.18.0.3 +RUN_ARGS?=-it --rm --network sigtran --ip 172.18.0.3 include ../make/Makefile diff --git a/systemd/Makefile b/systemd/Makefile index 80b1069..505dd43 100644 --- a/systemd/Makefile +++ b/systemd/Makefile @@ -1,2 +1,2 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.25.200 -v bsc-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.25.200 -v bsc-vol:/data include ../make/Makefile diff --git a/ttcn3-bsc-test-vamos/Makefile b/ttcn3-bsc-test-vamos/Makefile index 913c072..b397e14 100644 --- a/ttcn3-bsc-test-vamos/Makefile +++ b/ttcn3-bsc-test-vamos/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.31.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.31.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-bsc-test/Makefile b/ttcn3-bsc-test/Makefile index cbcd544..b1b6459 100644 --- a/ttcn3-bsc-test/Makefile +++ b/ttcn3-bsc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-cbc-test/Makefile b/ttcn3-cbc-test/Makefile index 34897fd..93bfac3 100644 --- a/ttcn3-cbc-test/Makefile +++ b/ttcn3-cbc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.23.202 +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202 include ../make/Makefile diff --git a/ttcn3-hnodeb-test/Makefile b/ttcn3-hnodeb-test/Makefile index ce2919e..991d941 100644 --- a/ttcn3-hnodeb-test/Makefile +++ b/ttcn3-hnodeb-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.33.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.33.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-msc-test/Makefile b/ttcn3-msc-test/Makefile index 7f46da4..2a5112c 100644 --- a/ttcn3-msc-test/Makefile +++ b/ttcn3-msc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.20.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-nitb-sysinfo/Makefile b/ttcn3-nitb-sysinfo/Makefile index 7b2593b..19d5917 100644 --- a/ttcn3-nitb-sysinfo/Makefile +++ b/ttcn3-nitb-sysinfo/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.5.230 -v ttcn3-nitb-sysinfo-vol:/data include ../make/Makefile diff --git a/ttcn3-pcap-client-test/Makefile b/ttcn3-pcap-client-test/Makefile index 1c6de69..32fa2d7 100644 --- a/ttcn3-pcap-client-test/Makefile +++ b/ttcn3-pcap-client-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 include ../make/Makefile diff --git a/ttcn3-pcu-test/Makefile b/ttcn3-pcu-test/Makefile index b172280..a207496 100644 --- a/ttcn3-pcu-test/Makefile +++ b/ttcn3-pcu-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.1.202 -v pcu-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.1.202 -v pcu-test-vol:/data include ../make/Makefile diff --git a/ttcn3-sccp-test/Makefile b/ttcn3-sccp-test/Makefile index cbcd544..b1b6459 100644 --- a/ttcn3-sccp-test/Makefile +++ b/ttcn3-sccp-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-sgsn-test/Makefile b/ttcn3-sgsn-test/Makefile index f96cf22..8be872e 100644 --- a/ttcn3-sgsn-test/Makefile +++ b/ttcn3-sgsn-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--rm --network sigtran --ip 172.19.1.202 -v sgsn-test-vol:/data +RUN_ARGS?=-it --rm --network sigtran --ip 172.19.1.202 -v sgsn-test-vol:/data include ../make/Makefile diff --git a/ttcn3-smlc-test/Makefile b/ttcn3-smlc-test/Makefile index 34897fd..93bfac3 100644 --- a/ttcn3-smlc-test/Makefile +++ b/ttcn3-smlc-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.23.202 +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.23.202 include ../make/Makefile diff --git a/ttcn3-stp-test/Makefile b/ttcn3-stp-test/Makefile index cbcd544..b1b6459 100644 --- a/ttcn3-stp-test/Makefile +++ b/ttcn3-stp-test/Makefile @@ -1,3 +1,3 @@ -RUN_ARGS?=--sysctl net.ipv6.conf.all.disable_ipv6=0 --rm --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data +RUN_ARGS?=-it --rm --sysctl net.ipv6.conf.all.disable_ipv6=0 --network sigtran --ip 172.18.2.202 -v ggsn-test-vol:/data include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d Gerrit-Change-Number: 27143 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: make/Makefile: allow overriding '-it' for target 'run'

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27143 ) Change subject: make/Makefile: allow overriding '-it' for target 'run' ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d Gerrit-Change-Number: 27143 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:01:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

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

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27130 ) Change subject: ts_102_221: Implement proper parsing of EF.DIR ...................................................................... Patch Set 6: (1 comment) File pySim/ts_102_221.py: https://gerrit.osmocom.org/c/pysim/+/27130/comment/19633b3f_a7ed3f42 PS6, Line 512: ApplicationLabel > the code actually works as expected, it is just pylint that complains about it. Good to know it works when passed to the metaclass (or whatever it's called). Then adding a special comment should do the trick (untested): class ApplicationTemplate(BER_TLV_IE, tag=0x61, '# pylint: disable=E0602' nested=[ ... ]) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Gerrit-Change-Number: 27130 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 11:56:38 +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

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: make/Makefile: allow overriding '-it' for target 'run'

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27143 ) Change subject: make/Makefile: allow overriding '-it' for target 'run' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d Gerrit-Change-Number: 27143 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 11:54:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

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

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27130 ) Change subject: ts_102_221: Implement proper parsing of EF.DIR ...................................................................... Patch Set 6: (1 comment) File pySim/ts_102_221.py: https://gerrit.osmocom.org/c/pysim/+/27130/comment/6758db7c_7f1cdea0 PS6, Line 512: ApplicationLabel > So pylint complains that this variable is undefined: […] the code actually works as expected, it is just pylint that complains about it. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Gerrit-Change-Number: 27130 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 11:45:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in pysim[master]: filesystem.py: Accept both a class or an instance as TLV._tlv member

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27140 ) Change subject: filesystem.py: Accept both a class or an instance as TLV._tlv member ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0a5ec2a860104ffe4524c647105a42505ac394d6 Gerrit-Change-Number: 27140 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 11:44:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in openbsc[master]: libbsc: fix potential null-dereference in abis_nm_perform_test()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/27144 ) Change subject: libbsc: fix potential null-dereference in abis_nm_perform_test() ...................................................................... libbsc: fix potential null-dereference in abis_nm_perform_test() Change-Id: I93d816a20ba208e9fd32a1fc172a78ccd326e1ba Related: OS#5450 --- M openbsc/src/libbsc/abis_nm.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 922c2d5..c1e2b53 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -1993,6 +1993,8 @@ if (!msg) msg = nm_msgb_alloc(); + if (!msg) + return -ENOMEM; msgb_tv_push(msg, NM_ATT_AUTON_REPORT, auton_report); msgb_tv_push(msg, NM_ATT_TEST_NO, test_nr); -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/27144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I93d816a20ba208e9fd32a1fc172a78ccd326e1ba Gerrit-Change-Number: 27144 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in openbsc[master]: libbsc: fix potential null-dereference in abis_nm_perform_test()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/27144 ) Change subject: libbsc: fix potential null-dereference in abis_nm_perform_test() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/27144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I93d816a20ba208e9fd32a1fc172a78ccd326e1ba Gerrit-Change-Number: 27144 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 11:12:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: stats: sanitize tcp stat name identifiers

by iedemam

Attention is currently required from: daniel. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27137 ) Change subject: stats: sanitize tcp stat name identifiers ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Oh then I'd expect osmo_stat_item_group_set_name to already do some sanitizing, maybe that's not cor […] There is no sanitation in osmo_stat_item_group_set_name(). Locating it there ensures clean names but removes some of the flexibility in how you choose to sanitize the strings. Other uses of osmo_identifier_sanitize_buf() throughout the code specify various target and replacement chars. One issue I see when debugging this is that we are sanitizing on every call to fill_stats(), so every "stats-tcp interval" seconds, these group names are being set. I understand that can be useful if the connection changes but perhaps some optimization can be done. I want to keep this change as simple as possible though and I see myself expanding the scope already. :-) I'll leave it to Daniel to weigh in. What's the minimal change we can make to fix these bogus names. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib04c2f5bfcbd6c19dd87debf1fc053abf0b9bef2 Gerrit-Change-Number: 27137 Gerrit-PatchSet: 1 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 10:48:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in openbsc[master]: libbsc: fix potential null-dereference in abis_nm_perform_test()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/27144 ) Change subject: libbsc: fix potential null-dereference in abis_nm_perform_test() ...................................................................... libbsc: fix potential null-dereference in abis_nm_perform_test() Change-Id: I93d816a20ba208e9fd32a1fc172a78ccd326e1ba Related: OS#5450 --- M openbsc/src/libbsc/abis_nm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/44/27144/1 diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 922c2d5..c1e2b53 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -1993,6 +1993,8 @@ if (!msg) msg = nm_msgb_alloc(); + if (!msg) + return -ENOMEM; msgb_tv_push(msg, NM_ATT_AUTON_REPORT, auton_report); msgb_tv_push(msg, NM_ATT_TEST_NO, test_nr); -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/27144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I93d816a20ba208e9fd32a1fc172a78ccd326e1ba Gerrit-Change-Number: 27144 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name

by iedemam

Attention is currently required from: pespin, fixeria. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: (1 comment) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/27134/comment/f6cfc7c0_6830729e PS3, Line 346: snprintf(stat_name, sizeof(stat_name), "ipa-rsl-%u", unit_data.trx_id); > No luck. All zero values again. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 10:36:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-hnbgw[master]: ranap_rab_ass: ensure specific rab_id

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27138 to look at the new patch set (#2). Change subject: ranap_rab_ass: ensure specific rab_id ...................................................................... ranap_rab_ass: ensure specific rab_id The parser functions currently ignore the rab_id. An exception is ranap_rab_ass_req_ies_extract_inet_addr, which extracts the rab_id of the first RAB. To make the handling of the RAB assignment parsing more robust lets add a rab_id parameter to the other functions. This parameter can then be used to ensure thet the correct RAB is handled. Change-Id: I2259ffce9f4b508c555d60618c5983ac6294e0ae Related: OS#5152 --- M include/osmocom/hnbgw/ranap_rab_ass.h M src/osmo-hnbgw/ranap_rab_ass.c M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 4 files changed, 116 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/38/27138/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/27138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2259ffce9f4b508c555d60618c5983ac6294e0ae Gerrit-Change-Number: 27138 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: make/Makefile: allow overriding '-it' for target 'run'

by osmith

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27143 ) Change subject: make/Makefile: allow overriding '-it' for target 'run' ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Maybe this makes it easier for other reviewers: start with make/Makefile, what happens is "-it" is removed from the run: target, moved to the RUN_ARGS variable. Then "-it" is added to RUN_ARGS of all existing users to not change behavior, except for ttcn3-bts-test where it should not be used anymore. LGTM! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d Gerrit-Change-Number: 27143 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 10:00:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

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

by dexter

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

2 years, 3 months

1
0
0 0

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

by dexter

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

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log