- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: testenv: deduplicate make_dir
by osmith 27 May '25

27 May '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40378?usp=email ) Change subject: testenv: deduplicate make_dir ...................................................................... testenv: deduplicate make_dir Generate the osmo-dev make dir path in one location, in testenv.cmd which gets imported by testenv.osmo_dev instead of doing it in both. This makes it easier to bump make_dir_version when necessary. Change-Id: Id3cb30e1ea126daf04dac227a2bf39b746549ec9 --- M _testenv/testenv/cmd.py M _testenv/testenv/osmo_dev.py 2 files changed, 12 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 9a81e30..5da27fe 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -9,6 +9,9 @@ env_extra = {} install_dir = None +make_dir = None +# osmo-dev make dir version, bump when making incompatible changes +make_dir_version = 2 def init_env(): @@ -16,6 +19,7 @@ changes here.""" global env_extra global install_dir + global make_dir if testenv.args.podman: if testenv.args.binary_repo: @@ -48,9 +52,11 @@ if not testenv.args.binary_repo: if testenv.args.podman: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "podman", "make2") + make_dir = os.path.join(testenv.args.cache, "podman", "make") else: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "host", "make2") + make_dir = os.path.join(testenv.args.cache, "host", "make") + make_dir += str(make_dir_version) + env_extra["OSMO_DEV_MAKE_DIR"] = make_dir if testenv.args.kernel == "debian": env_extra["TESTENV_QEMU_KERNEL"] = "debian" diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 02fe2e8..8b83367 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -7,7 +7,6 @@ import testenv import testenv.cmd -make_dir = None init_done = False @@ -54,20 +53,17 @@ def init(): global init_done - global make_dir if init_done: return extra_opts = [] if testenv.args.podman: - make_dir = os.path.join(testenv.args.cache, "podman", "make") extra_opts = [ "--install-prefix", os.path.join(testenv.args.cache, "podman/usr"), ] else: - make_dir = os.path.join(testenv.args.cache, "host", "make") extra_opts = [ "--install-prefix", os.path.join(testenv.args.cache, "host/usr"), @@ -76,17 +72,13 @@ if testenv.args.jobs: extra_opts += [f"-j{testenv.args.jobs}"] - # Make dirs created without passing --autoreconf-in-src-copy to - # gen_makefile.py (as previous versions of testenv did) are incompatible. - # Add the "2" to avoid potential conflicts. - make_dir += "2" - + # Bump testenv.cmd.make_dir_version when making incompatible changes cmd = [ "./gen_makefile.py", "--build-debug", "--no-make-check", "--make-dir", - make_dir, + testenv.cmd.make_dir, "--no-ldconfig", "--src-dir", testenv.src_dir, @@ -135,7 +127,7 @@ logging.debug("No osmo-dev make targets found in testenv.cfg") return - makefile_path = os.path.join(make_dir, "Makefile") + makefile_path = os.path.join(testenv.cmd.make_dir, "Makefile") with open(makefile_path) as f: makefile = f.read() @@ -152,4 +144,4 @@ sys.exit(1) logging.info("Building test components") - testenv.cmd.run(["make"] + targets, cwd=make_dir) + testenv.cmd.run(["make"] + targets, cwd=testenv.cmd.make_dir) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40378?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3cb30e1ea126daf04dac227a2bf39b746549ec9 Gerrit-Change-Number: 40378 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: 5gc: testenv: use TESTENV_INSTALL_DIR
by osmith 27 May '25

27 May '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email ) Change subject: 5gc: testenv: use TESTENV_INSTALL_DIR ...................................................................... 5gc: testenv: use TESTENV_INSTALL_DIR Change-Id: I412e53d132957a877a9a0478df3ac2fe31327a6c --- M 5gc/open5gs/open5gs_prepare.sh 1 file changed, 2 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/5gc/open5gs/open5gs_prepare.sh b/5gc/open5gs/open5gs_prepare.sh index 2946f21..7378980 100755 --- a/5gc/open5gs/open5gs_prepare.sh +++ b/5gc/open5gs/open5gs_prepare.sh @@ -1,20 +1,7 @@ #!/bin/sh -ex -set_ogs_sysconf_dir() { - if [ -z "$OSMO_DEV_MAKE_DIR" ]; then - # With --binary-repo - OGS_INSTALL_DIR="/" - OGS_SYSCONF_DIR="$OGS_INSTALL_DIR/etc/" - else - # Without --binary-repo - OGS_INSTALL_DIR="$OSMO_DEV_MAKE_DIR"/.. - OGS_SYSCONF_DIR="$OGS_INSTALL_DIR/usr/etc/" - fi -} - adjust_sysconfdir_config() { - sed -i "s~@sysconfdir@~$1~g" $2 + sed -i "s~@sysconfdir@~$TESTENV_INSTALL_DIR/etc/~g" $1 } -set_ogs_sysconf_dir -adjust_sysconfdir_config "$OGS_SYSCONF_DIR" ./*.yaml +adjust_sysconfdir_config ./*.yaml -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I412e53d132957a877a9a0478df3ac2fe31327a6c Gerrit-Change-Number: 40380 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: fix TESTENV_INSTALL_DIR
by osmith 27 May '25

27 May '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40379?usp=email ) Change subject: testenv: fix TESTENV_INSTALL_DIR ...................................................................... testenv: fix TESTENV_INSTALL_DIR When osmo-dev is used (no --binary-repo arg is set), then set TESTENV_INSTALL_DIR and --install-prefix for osmo-dev to: <cache dir>/osmo-ttcn3-testenv/{podman,host}/install Old --install-prefix: <cache dir>/osmo-ttcn3-testenv/{podman,host}/usr Old TESTENV_INSTALL_DIR: <cache dir>/osmo-ttcn3-testenv/{podman,host} The old behavior was misleading, because: * It resulted in configs getting installed into: <cache dir>/osmo-ttcn3-testenv/{podman,host}/usr/etc/... * TESTENV_INSTALL_DIR looked like it would point at the install dir (because there is usr inside that directory), but it was actually pointing at the top dir of the install dir. Fixes: 143b1000 ("testenv: add TESTENV_INSTALL_DIR") Change-Id: Id94936338a6eb74dee0b3f4668cbaca309b269e4 --- M _testenv/README.md M _testenv/testenv/cmd.py M _testenv/testenv/osmo_dev.py 3 files changed, 14 insertions(+), 23 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/_testenv/README.md b/_testenv/README.md index 53d3440..a1ba73d 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -232,8 +232,8 @@ * `TESTENV_INSTALL_DIR`: The directory into which the SUT binaries and other files are installed. It is set to `/` for `--podman --binary-repo`, - `~/.cache/osmo-ttcn3-testenv/podman` for `--podman` and - `~/.cache/osmo-ttcn3-testenv/host` otherwise. The + `~/.cache/osmo-ttcn3-testenv/podman/install` for `--podman` and + `~/.cache/osmo-ttcn3-testenv/host/install` otherwise. The `~/.cache/osmo-ttcn3-testenv` part can be changed with the `--cache` argument. Different cache directories for podman and for the host are used as it is very likely that the binary objects from both are incompatible. @@ -245,10 +245,10 @@ * `OSMO_DEV_MAKE_DIR`: This variable is unset if `--binary-repo` is used as argument. Otherwise it - is set to `~/.cache/osmo-ttcn3-testenv/host/make2` or - `~/.cache/osmo-ttcn3-testenv/podman/make2` (with `--podman`) by default. The - `~/.cache/osmo-ttcn3-testenv` part can be changed with the `--cache` - argument. + is set to `~/.cache/osmo-ttcn3-testenv/host/make<version>` or + `~/.cache/osmo-ttcn3-testenv/podman/make<version>` (with `--podman`) by + default. The `~/.cache/osmo-ttcn3-testenv` part can be changed with the + `--cache` argument. * `TESTENV_QEMU_KERNEL`: Is only set if `-C`/`--custom-kernel` or `-D`/`--debian-kernel` parameters diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 5da27fe..e65f777 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -11,7 +11,7 @@ install_dir = None make_dir = None # osmo-dev make dir version, bump when making incompatible changes -make_dir_version = 2 +make_dir_version = 3 def init_env(): @@ -25,17 +25,17 @@ if testenv.args.binary_repo: install_dir = "/" else: - install_dir = os.path.join(testenv.args.cache, "podman") + install_dir = os.path.join(testenv.args.cache, "podman/install") else: - install_dir = os.path.join(testenv.args.cache, "host") + install_dir = os.path.join(testenv.args.cache, "host/install") if not testenv.args.binary_repo: - pkg_config_path = os.path.join(install_dir, "usr/lib/pkgconfig") + pkg_config_path = os.path.join(install_dir, "lib/pkgconfig") if "PKG_CONFIG_PATH" in os.environ: pkg_config_path += f":{os.environ.get('PKG_CONFIG_PATH')}" pkg_config_path += ":/usr/lib/pkgconfig" - ld_library_path = os.path.join(install_dir, "usr/lib") + ld_library_path = os.path.join(install_dir, "lib") if "LD_LIBRARY_PATH" in os.environ: ld_library_path += f":{os.environ.get('LD_LIBRARY_PATH')}" ld_library_path += ":/usr/lib" @@ -83,7 +83,7 @@ path += f":{os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite)}" if install_dir and install_dir != "/": - path += f":{os.path.join(install_dir, 'usr/bin')}" + path += f":{os.path.join(install_dir, 'bin')}" if podman: path += ":/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 8b83367..45912ae 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -58,17 +58,6 @@ return extra_opts = [] - if testenv.args.podman: - extra_opts = [ - "--install-prefix", - os.path.join(testenv.args.cache, "podman/usr"), - ] - else: - extra_opts = [ - "--install-prefix", - os.path.join(testenv.args.cache, "host/usr"), - ] - if testenv.args.jobs: extra_opts += [f"-j{testenv.args.jobs}"] @@ -77,6 +66,8 @@ "./gen_makefile.py", "--build-debug", "--no-make-check", + "--install-prefix", + testenv.cmd.install_dir, "--make-dir", testenv.cmd.make_dir, "--no-ldconfig", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40379?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id94936338a6eb74dee0b3f4668cbaca309b269e4 Gerrit-Change-Number: 40379 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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>

1 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce tests to validate incoming TCP conn with unkown A...
by pespin 27 May '25

27 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40333?usp=email ) Change subject: stp: ipa: Introduce tests to validate incoming TCP conn with unkown AS (ipa_unit_id) ...................................................................... stp: ipa: Introduce tests to validate incoming TCP conn with unkown AS (ipa_unit_id) Change-Id: If6a9f54a19f6a4d833bbf66aad5dafd7e9917f82 --- M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml 2 files changed, 46 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 537cac4..8a34054 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -177,18 +177,15 @@ } -/* "accept-asp-connections pre-configured" and client from unknown source */ +/* "accept-asp-connections pre-configured" and client from unknown ASP source + * (but known AS/ipa_unit_name) */ testcase TC_unknown_client_nodynamic() runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); /* Build an ASP unknown (port) from osmo-stp: */ - ipa_configs := { - { asp_name := "ipa-asp-unknown", - as_name := ipa_configs[0].as_name, - is_server := false, - remote_port := ipa_configs[0].remote_port, - local_port := 3000 } - }; + ipa_configs[0].asp_name := "ipa-asp-unknown"; + ipa_configs[0].local_port := 3000; + f_init_common(); f_vty_cs7_listen_ipa_cmd("accept-asp-connections pre-configured", ipa_configs[0].remote_port); f_init_ipa(ipa_configs := ipa_configs); @@ -199,7 +196,25 @@ setverdict(pass); } -/* "accept-asp-connections pre-configured" and client from known source */ +/* "accept-asp-connections pre-configured" and client from known ASP (TCP endpoint) + * but unknown AS (ipa_unit_name) */ +testcase TC_unknown_as_client_nodynamic() runs on IPA_CT { + var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + /* Build an AS unknown (ipa_unit_id) from osmo-stp: */ + ipa_configs[0].as_name := "ipa-as-unknown"; + + f_init_common(); + f_vty_cs7_listen_ipa_cmd("accept-asp-connections pre-configured", ipa_configs[0].remote_port); + f_init_ipa(ipa_configs := ipa_configs); + f_connect_ipa(0, false); + + /* switch back to default */ + f_vty_cs7_listen_ipa_cmd("accept-asp-connections dynamic-permitted", ipa_configs[0].remote_port); + setverdict(pass); +} + +/* "accept-asp-connections pre-configured" and client from known source (ASP & AS) */ testcase TC_known_client_nodynamic() runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); @@ -215,18 +230,14 @@ } -/* "accept-asp-connections dynamic-permitted" and client from unknown source */ +/* "accept-asp-connections dynamic-permitted" and client from unknown ASP source + * (but known AS/ipa_unit_name) */ testcase TC_unknown_client_dynamic() runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); /* Build an ASP unknown (port) from osmo-stp: */ - ipa_configs := { - { asp_name := "ipa-asp-unknown2", - as_name := ipa_configs[0].as_name, - is_server := false, - remote_port := ipa_configs[0].remote_port, - local_port := 3001 } - }; + ipa_configs[0].asp_name := "ipa-asp-unknown"; + ipa_configs[0].local_port := 3001; f_init_common(); f_init_ipa(ipa_configs := ipa_configs); @@ -234,6 +245,20 @@ setverdict(pass); } +/* "accept-asp-connections dynamic-permitted" and client from known ASP (TCP endpoint) + * but unknown AS (ipa_unit_name) */ +testcase TC_unknown_as_client_dynamic() runs on IPA_CT { + var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + /* Build an AS unknown (ipa_unit_id) from osmo-stp: */ + ipa_configs[0].as_name := "ipa-as-unknown"; + + f_init_common(); + f_init_ipa(ipa_configs := ipa_configs); + f_connect_ipa(0, false); + setverdict(pass); +} + private function f_tc_tmt_override(boolean unknwon_dynamic_asp) runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender", @@ -463,8 +488,10 @@ control { execute( TC_unknown_client_nodynamic() ); + execute( TC_unknown_as_client_nodynamic() ); execute( TC_known_client_nodynamic() ); execute( TC_unknown_client_dynamic() ); + execute( TC_unknown_as_client_dynamic() ); execute( TC_tmt_override() ); execute( TC_unknown_client_dynamic_tmt_override() ); execute( TC_tmt_loadshare_roundrobin() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 44088fc..88e8d17 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -45,8 +45,10 @@ <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv_cli' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_nodynamic' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_as_client_nodynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_known_client_nodynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_as_client_dynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_override' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_override' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40333?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If6a9f54a19f6a4d833bbf66aad5dafd7e9917f82 Gerrit-Change-Number: 40333 Gerrit-PatchSet: 3 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>

1 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv.yml: Add ttcn3-5gc-test-ogs
by pespin 27 May '25

27 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40374?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv.yml: Add ttcn3-5gc-test-ogs ...................................................................... jobs/ttcn3-testsuites-testenv.yml: Add ttcn3-5gc-test-ogs Depends: osmo-ttcn3-hacks.git Change-Id I867433c87c6da2f0d1f299245aedf4830acbf539 Change-Id: I6ef174b64ab5f0561b62f315be28bb6710ac125c --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 076bbe3..709b109 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -128,6 +128,12 @@ timer: H 09 * * * email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + - ttcn3-5gc-test-ogs: # ~1 min + testsuite: 5gc + args: -b osmocom:nightly + timer: H 09 * * * + email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com + - ttcn3-s1gw-test: # ~2 min testsuite: s1gw args: -b osmocom:nightly -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40374?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6ef174b64ab5f0561b62f315be28bb6710ac125c Gerrit-Change-Number: 40374 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>

1 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv.yml: Add ttcn3-5gc-test-ogs
by fixeria 27 May '25

27 May '25

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/40374?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv.yml: Add ttcn3-5gc-test-ogs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40374?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6ef174b64ab5f0561b62f315be28bb6710ac125c Gerrit-Change-Number: 40374 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: Tue, 27 May 2025 12:47:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: 5gc: testenv: use TESTENV_INSTALL_DIR
by fixeria 27 May '25

27 May '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email ) Change subject: 5gc: testenv: use TESTENV_INSTALL_DIR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I412e53d132957a877a9a0478df3ac2fe31327a6c Gerrit-Change-Number: 40380 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 12:46:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: fix TESTENV_INSTALL_DIR
by fixeria 27 May '25

27 May '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40379?usp=email ) Change subject: testenv: fix TESTENV_INSTALL_DIR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40379?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id94936338a6eb74dee0b3f4668cbaca309b269e4 Gerrit-Change-Number: 40379 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 12:46:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: deduplicate make_dir
by fixeria 27 May '25

27 May '25

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40378?usp=email ) Change subject: testenv: deduplicate make_dir ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40378?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3cb30e1ea126daf04dac227a2bf39b746549ec9 Gerrit-Change-Number: 40378 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 12:46:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: asp: Avoid double-free of received msg if conn is teared down
by pespin 27 May '25

27 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40327?usp=email ) Change subject: asp: Avoid double-free of received msg if conn is teared down ...................................................................... asp: Avoid double-free of received msg if conn is teared down """ 20250516192255921 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){WAIT_ID_RESP}: Received Event IPA_CCM_ID_RESP (ipa.c:120) 20250516192255921 DLMI DEBUG Rx IPA CCM ID_RESP: Unit_ID='0/1/2' MAC_Address='' Location_1='' Location_2='' Equipment_Version='' Software_Version='' Unit_Name='mahlzeit' Serial_Number='' (ipa.c:233) 20250516192255921 DLSS7 NOTICE IPA_ASP(ipa-asp-loadshare-sender0){WAIT_ID_RESP}: Cannot find any definition for IPA Unit Name 'mahlzeit' (xua_asp_fsm.c:968) 20250516192255921 DLSS7 INFO ipa-asp-loadshare-sender0: connection closed (ss7_asp.c:1159) 20250516192255921 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){WAIT_ID_RESP}: Received Event SCTP-COMM_DOWN.ind (ss7_asp.c:1165) 20250516192255922 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){WAIT_ID_RESP}: state_chg to ASP_DOWN (xua_asp_fsm.c:1154) 20250516192255922 DLSS7 DEBUG XUA_AS(ipa-as-loadshare-sender){AS_DOWN}: Received Event ASPAS-ASP_DOWN.ind (xua_asp_fsm.c:370) 20250516192255922 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){ASP_DOWN}: No Layer Manager, dropping M-ASP_DOWN.indication (xua_asp_fsm.c:119) 20250516192255922 DLSS7 DEBUG IPA_ASP(ipa-asp-loadshare-sender0){ASP_DOWN}: No Layer Manager, dropping M-SCTP_RELEASE.indication (xua_asp_fsm.c:119) Program terminated with signal SIGABRT, Aborted. #0 0x000076bb9898ceec in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #0 0x000076bb9898ceec in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x000076bb9893dfb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x000076bb98928472 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x000076bb98ae6496 in ?? () from /lib/x86_64-linux-gnu/libtalloc.so.2 #4 0x000076bb98b1b869 in msgb_free (m=0x5f957de3e750) at ../../../src_copy/libosmocore/src/core/msgb.c:119 #5 0x000076bb98bab8c8 in ipa_rx_msg_ccm (asp=0x5f957de3da50, msg=0x5f957de3e750) at ../../src_copy/libosmo-sigtran/src/ipa.c:137 #6 0x000076bb98bac135 in ipa_rx_msg (asp=0x5f957de3da50, msg=0x5f957de3e750, sls=0 '\000') at ../../src_copy/libosmo-sigtran/src/ipa.c:321 #7 0x000076bb98bca44f in ss7_asp_ipa_srv_conn_rx_cb (conn=0x5f957ddba4a0, res=49, msg=0x5f957de3e750) at ../../src_copy/libosmo-sigtran/src/ss7_asp.c:895 #8 0x000076bb988efcb1 in stream_srv_iofd_read_cb (iofd=0x5f957ddd8e40, res=49, msg=0x5f957de3e750) at ../../src_copy/libosmo-netif/src/stream_srv.c:732 #9 0x000076bb98b23c3c in iofd_handle_segmented_read (iofd=0x5f957ddd8e40, msg=0x5f957de3e750, rc=49) at ../../../src_copy/libosmocore/src/core/osmo_io.c:357 #10 0x000076bb98b23d2b in iofd_handle_recv (iofd=0x5f957ddd8e40, msg=0x5f957de3e750, rc=49, hdr=0x0) at ../../../src_copy/libosmocore/src/core/osmo_io.c:384 #11 0x000076bb98b257b7 in iofd_poll_ofd_cb_recvmsg_sendmsg (ofd=0x5f957ddd8ef0, what=1) at ../../../src_copy/libosmocore/src/core/osmo_io_poll.c:64 #12 0x000076bb98b25b32 in iofd_poll_ofd_cb_dispatch (ofd=0x5f957ddd8ef0, what=1) at ../../../src_copy/libosmocore/src/core/osmo_io_poll.c:136 #13 0x000076bb98b2907b in poll_disp_fds (n_fd=6) at ../../../src_copy/libosmocore/src/core/select.c:419 #14 0x000076bb98b29191 in _osmo_select_main (polling=0) at ../../../src_copy/libosmocore/src/core/select.c:457 #15 0x000076bb98b291ac in osmo_select_main (polling=0) at ../../../src_copy/libosmocore/src/core/select.c:496 #16 0x00005f9553dd9a21 in main (argc=3, argv=0x7ffe754fac38) at ../../src_copy/libosmo-sigtran/stp/stp_main.c:270 """ Related: OS#6728 Change-Id: I69f80f611c14db2b328dafd4a90247c6f2dac6fd --- M src/ss7_asp.c 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 735c5fd..61e5415 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -879,6 +879,14 @@ int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); + + /* Reparent msg to srv_link, to avoid "msg" being automatically freed if + * "conn" is teared down during msg handling (or if its associated + * dynamic ASP becomes unused), which would then result in a double-free + * if same code path then explicitly frees the msgb through msgb_free(). + */ + talloc_steal(link, msg); if (res <= 0) { if (res == -EAGAIN) { @@ -899,10 +907,18 @@ int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); unsigned int ppid; int flags; int rc = 0; + /* Reparent msg to srv_link, to avoid "msg" being automatically freed if + * "conn" is teared down during msg handling (or if its associated + * dynamic ASP becomes unused), which would then result in a double-free + * if same code path then explicitly frees the msgb through msgb_free(). + */ + talloc_steal(link, msg); + /* process the received xUA message */ flags = msgb_sctp_msg_flags(msg); @@ -964,9 +980,17 @@ int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); + struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); const struct xua_common_hdr *hdr; int rc; + /* Reparent msg to srv_link, to avoid "msg" being automatically freed if + * "conn" is teared down during msg handling (or if its associated + * dynamic ASP becomes unused), which would then result in a double-free + * if same code path then explicitly frees the msgb through msgb_free(). + */ + talloc_steal(link, msg); + if (res <= 0) { if (res == -EAGAIN) { msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40327?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I69f80f611c14db2b328dafd4a90247c6f2dac6fd Gerrit-Change-Number: 40327 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log