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

[S] Change in osmo-bts[master]: pcu_sock: print SAPI and msg_id when sending confirmation

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34240 ) Change subject: pcu_sock: print SAPI and msg_id when sending confirmation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibd5b4225e597b69eaabaeee437fb637943a55602 Gerrit-Change-Number: 34240 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 13:35:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 13:24:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by fixeria

Attention is currently required from: pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 13:20:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: debian: fix build on ubuntu 20.04 without liburing

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34260 ) Change subject: debian: fix build on ubuntu 20.04 without liburing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59 Gerrit-Change-Number: 34260 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 13:06:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: debian: fix build on ubuntu 20.04 without liburing

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34260 ) Change subject: debian: fix build on ubuntu 20.04 without liburing ...................................................................... debian: fix build on ubuntu 20.04 without liburing Ubuntu 20.04 is based on debian 11, but does not have liburing. Extend the logic to cover this distribution too, so building packages for it isn't stuck anymore on libosmocore not being able to resolve the liburing-dev dependency. I have verified that this makes libosmocore properly build with/without liburing on debian 10, 11 and ubuntu 20.04 and 22.04. Fixes: e486e012 ("debian: depend on liburing-dev for debian >= 11") Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59 --- M debian/control M debian/rules 2 files changed, 23 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/34260/1 diff --git a/debian/control b/debian/control index 1f1975e..e6b96e1 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Maintainer: Osmocom team <openbsc(a)lists.osmocom.org> Section: libs Priority: optional +# liburing-dev: don't try to install it on debian 10 and ubuntu 20.04 Build-Depends: debhelper (>= 10), autotools-dev, autoconf, @@ -19,7 +20,7 @@ libusb-1.0-0-dev, libmnl-dev, libsystemd-dev, - base-files (<< 11) | liburing-dev, + liburing-dev | base-files (<< 11) | ubuntu-keyring (<< 2021), python3:native Standards-Version: 3.9.8 Vcs-Git: https://gitea.osmocom.org/osmocom/libosmocore diff --git a/debian/rules b/debian/rules index efa5adc..f0105b4 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ override_dh_auto_test: dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) -# Set --disable-uring for debian < 11 based distributions +# Set --disable-uring for debian 10 and ubuntu 20.04 override_dh_auto_configure: set -x && \ CONFIGURE_FLAGS=" \ @@ -33,8 +33,8 @@ --enable-static \ --enable-systemd-logging \ "; \ - base_ver="$$(dpkg -l base-files | grep "^ii" | awk '{print $$3}')"; \ - if dpkg --compare-versions "$$base_ver" lt 11; then \ + distro_v=$$(. /etc/os-release && echo $$VERSION_ID); \ + if [ "$$distro_v" = 10 ] || [ "$$distro_v" = 20.04 ]; then \ CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --disable-uring"; \ fi; \ dh_auto_configure -- $$CONFIGURE_FLAGS -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If18d6543fae9537c8b188e90499491bda3fdfe59 Gerrit-Change-Number: 34260 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: dia2gsup: initial refactoring

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34254 ) Change subject: dia2gsup: initial refactoring ...................................................................... dia2gsup: initial refactoring Do some refactoring to the core infrastructure of the tests before adding new testsi. Among others: - Move Tguard to main component - Avoid having to call f_init_handler in each handler (do it automatically during f_start_handler()). Change-Id: I4a1bf6ca03549688704815e3fec4e5152d0181a6 --- M dia2gsup/DIA2GSUP_Tests.ttcn 1 file changed, 40 insertions(+), 21 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/dia2gsup/DIA2GSUP_Tests.ttcn b/dia2gsup/DIA2GSUP_Tests.ttcn index d709512..6a3f85c 100644 --- a/dia2gsup/DIA2GSUP_Tests.ttcn +++ b/dia2gsup/DIA2GSUP_Tests.ttcn @@ -1,5 +1,6 @@ module DIA2GSUP_Tests { +import from Misc_Helpers all; import from General_Types all; import from Osmocom_Types all; import from L3_Common all; @@ -21,11 +22,11 @@ var IPA_Emulation_CT vc_GSUP_IPA; port IPA_CTRL_PT GSUP_IPA_EVENT; + timer g_Tguard; }; type component D2G_ConnHdlr extends DIAMETER_ConnHdlr, GSUP_ConnHdlr { var D2G_ConnHdlrPars g_pars; - timer g_Tguard := 30.0; }; type record D2G_ConnHdlrPars { @@ -33,7 +34,7 @@ AuthVector vec optional }; -private function f_init_pars(integer imsi_suffix) +private function f_init_pars(integer imsi_suffix := 1) runs on MTC_CT return D2G_ConnHdlrPars { var D2G_ConnHdlrPars pars := { imsi := f_gen_imsi(imsi_suffix), @@ -59,10 +60,9 @@ charstring mp_diam_realm := "localdomain"; } -private altstep as_Tguard() runs on D2G_ConnHdlr { +private altstep as_Tguard() runs on MTC_CT { [] g_Tguard.timeout { - setverdict(fail, "Tguard timeout"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); } } @@ -95,18 +95,18 @@ } } -private function f_init_handler(D2G_ConnHdlrPars pars, float t_guard := 20.0) runs on D2G_ConnHdlr { +private type function void_fn(charstring id) runs on D2G_ConnHdlr; + +private function f_init_handler(void_fn fn, charstring id, D2G_ConnHdlrPars pars) runs on D2G_ConnHdlr { g_pars := pars; - activate(as_Tguard()); - g_Tguard.start(t_guard); /* tell GSUP dispatcher to send this IMSI to us */ f_create_gsup_expect(hex2str(g_pars.imsi)); + + fn.apply(id); } -private type function void_fn(charstring id, D2G_ConnHdlrPars pars) runs on D2G_ConnHdlr; - -private function f_start_handler_with_pars(void_fn fn, D2G_ConnHdlrPars pars) +private function f_start_handler(void_fn fn, D2G_ConnHdlrPars pars) runs on MTC_CT return D2G_ConnHdlr { var D2G_ConnHdlr vc_conn; var charstring id := testcasename(); @@ -121,7 +121,7 @@ DIAMETER_UNIT.receive(DiameterCapabilityExchgInd:?); - vc_conn.start(derefers(fn)(id, pars)); + vc_conn.start(f_init_handler(fn, id, pars)); return vc_conn; } @@ -154,13 +154,17 @@ vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); } -private function f_init() runs on MTC_CT { +private function f_init(float t_guard := 40.0) runs on MTC_CT { + + g_Tguard.start(t_guard); + activate(as_Tguard()); + f_init_gsup(testcasename()); f_init_diameter(testcasename()); } -private function f_DIA_AI() runs on D2G_ConnHdlr { +private function f_DIA_AI_success() runs on D2G_ConnHdlr { var PDU_DIAMETER rx_dia; var UINT32 hbh_id := f_rnd_octstring(4); var UINT32 ete_id := f_rnd_octstring(4); @@ -191,25 +195,25 @@ [] DIAMETER.receive(tr_DIA_AIA) { setverdict(pass); } + [] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); + } } } -private function f_TC_authinfo_normal(charstring id, D2G_ConnHdlrPars pars) runs on D2G_ConnHdlr { - f_init_handler(pars); - f_DIA_AI(); +private function f_TC_authinfo_normal(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_success(); } testcase TC_authinfo_normal() runs on MTC_CT { - var D2G_ConnHdlrPars pars := f_init_pars(1); + var D2G_ConnHdlrPars pars := f_init_pars(); var D2G_ConnHdlr vc_conn; f_init(); - f_sleep(10.0); - vc_conn := f_start_handler_with_pars(refers(f_TC_authinfo_normal), pars); + vc_conn := f_start_handler(refers(f_TC_authinfo_normal), pars); vc_conn.done; setverdict(pass); } - control { execute ( TC_authinfo_normal() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34254 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: I4a1bf6ca03549688704815e3fec4e5152d0181a6 Gerrit-Change-Number: 34254 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: dia2gsup: initial refactoring

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34254 ) Change subject: dia2gsup: initial refactoring ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34254 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: I4a1bf6ca03549688704815e3fec4e5152d0181a6 Gerrit-Change-Number: 34254 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 11:50:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: dia2gsup: initial refactoring

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34254 ) Change subject: dia2gsup: initial refactoring ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34254 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: I4a1bf6ca03549688704815e3fec4e5152d0181a6 Gerrit-Change-Number: 34254 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 09:39:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-dia2gsup: Avoid retrieving unexisting talloc report

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34253 ) Change subject: ttcn3-dia2gsup: Avoid retrieving unexisting talloc report ...................................................................... ttcn3-dia2gsup: Avoid retrieving unexisting talloc report The OSMO_SUT_{HOST,PORT} envvars are used to trigger retrieving of talloc reportes from the VTY port in osmo-ttcn3-hacks.git ttcn3-tcpdump-stop.sh. osmo_dia2gsup is an erland app and hence it makes no sense trying to retrieve such information. Change-Id: I6ee3fa83758e09898d1cd05bf15bc3428e2ffd11 --- M ttcn3-dia2gsup-test/jenkins.sh 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ttcn3-dia2gsup-test/jenkins.sh b/ttcn3-dia2gsup-test/jenkins.sh index d8acc43..87eea24 100755 --- a/ttcn3-dia2gsup-test/jenkins.sh +++ b/ttcn3-dia2gsup-test/jenkins.sh @@ -33,8 +33,6 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ - -e "OSMO_SUT_PORT=4258" \ -v $VOL_BASE_DIR/dia2gsup-tester:/data \ --name ${BUILD_TAG}-ttcn3-dia2gsup-test \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6ee3fa83758e09898d1cd05bf15bc3428e2ffd11 Gerrit-Change-Number: 34253 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 6: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/eed2ee66_fde2d946 PS1, Line 552: if (pch->confirmed_imm_ass) > I take your criticism seriously. […] My sincere opinion here is that we are really taking much more time than initially expected to apply all these changes, specially because some changes have been made which had to be reverted/redone since stuff was not looked at with enough detail or long vision back then. I am also not happy with how the change process have been done but here we are. Let's try at least to be clear and compile the different changes that were made v10->v11, since it's right now quite difficult to gasp due to all the different patchsets. That's really the problem imho, not the fact that we need to bump the PCUIF N times imho. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Aug 2023 09:11:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023