May 2025 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: asp: Avoid double-free of received msg if conn is teared down

by pespin

Attention is currently required from: daniel, fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40327?usp=email ) Change subject: asp: Avoid double-free of received msg if conn is teared down ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > API users that may not expect/want this Then it's a bug in the users of the API. I don't think it's bad that by default the ctx of the msg is the one configured in osmo_iofd. We already have multiple releases of osmo_iofd with the previous behavior, so yet another reason not to change that. In any of the cases, this patch is about fixing a msgb coming from *stream* object, not iofd object. Again, it always worked like that since new APIs related to osmo_iofd implementation were introduced, so changing that now is also problematic for something I think is fine as is now. -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I69f80f611c14db2b328dafd4a90247c6f2dac6fd Gerrit-Change-Number: 40327 Gerrit-PatchSet: 3 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 12:28:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: 5gc: testenv: use TESTENV_INSTALL_DIR

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/40380/1 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: newchange 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>

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: deduplicate make_dir

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/40378/1 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: newchange 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>

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: fix TESTENV_INSTALL_DIR

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/40379/1 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: newchange 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>

3 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: asp: Avoid double-free of received msg if conn is teared down

by fixeria

Attention is currently required from: daniel, laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40327?usp=email ) Change subject: asp: Avoid double-free of received msg if conn is teared down ...................................................................... Patch Set 3: (2 comments) Patchset: PS2: > So what's the root problem according to you? […] The root problem is that `iofd` code is transferring the talloc ownership to API users that may not expect/want this. As I suggested in the ticket, in my view talloc ownership should be explicitly **taken** by the user of `iofd` (be it netif stuff or whatever else), and not given away by the `iofd` itself. I am not against fine-grained talloc ownership, and you can still achieve that by doing `talloc_steal()` like you're doing in this patch and did in `lapdm` code in libosmocore. Let's just allocate the `msgb` as a child of the `tall_msgb_ctx` by default and leave it up to the user of `iofd`: whether `talloc_steal()` explicitly (if needed) or keep it there for performance reasons. Patchset: PS3: > ping. This is a fix for a severe bug and has been here for 1 week and a half and almost no feedback. Please add `Related: OS#6728` and feel free to merge: I am not blocking. But I still see this as a band-aid solution treating the symptoms, but not the "disease". There definitely are other places where we (and even worse, our customers) will be bitten by this again and again. Feels like we're fighting the hydra. -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I69f80f611c14db2b328dafd4a90247c6f2dac6fd Gerrit-Change-Number: 40327 Gerrit-PatchSet: 3 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 10:45:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: asp: Avoid double-free of received msg if conn is teared down

by osmith

Attention is currently required from: daniel, fixeria, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40327?usp=email ) Change subject: asp: Avoid double-free of received msg if conn is teared down ...................................................................... Patch Set 3: Code-Review+1 -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I69f80f611c14db2b328dafd4a90247c6f2dac6fd Gerrit-Change-Number: 40327 Gerrit-PatchSet: 3 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 10:05:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: asp: Avoid double-free of received msg if conn is teared down

by pespin

Attention is currently required from: daniel, fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40327?usp=email ) Change subject: asp: Avoid double-free of received msg if conn is teared down ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: ping. This is a fix for a severe bug and has been here for 1 week and a half and almost no feedback. -- 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: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I69f80f611c14db2b328dafd4a90247c6f2dac6fd Gerrit-Change-Number: 40327 Gerrit-PatchSet: 3 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 10:02:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Initial ConnHdlr support

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40376?usp=email ) Change subject: 5gc: Initial ConnHdlr support ...................................................................... 5gc: Initial ConnHdlr support With this we can already send an InitialUEMessage(Registration Request) to the 5GC and see if everything is configured properly there. Change-Id: I094b6775198dfcbf4041c3af423baa6f5072b97d --- M 5gc/C5G_Tests.ttcn M 5gc/expected-results.xml M library/NGAP_Functions.ttcn 3 files changed, 54 insertions(+), 40 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved jolly: Looks good to me, but someone else must approve diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 70bb0d9..823d216 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -56,18 +56,7 @@ /* parameters of emulated UE */ type record UeParams { hexstring imsi, - charstring ue_ip, - //NAS_EPS_Types.GUTI guti optional, - octetstring kasme optional, - - /* TEI (Control) local side, S11 (SGW) */ - OCT4 s11_teic_local, - /* TEI (Control) remote side, S11 (SGW) */ - OCT4 s11_teic_remote optional, - /* TEI (Control) local side, S5c (PGW) */ - OCT4 s5c_teic_local, - /* TEI (Control) remote side, S5c (PGW) */ - OCT4 s5c_teic_remote optional//, + charstring ue_ip } type component MTC_CT { @@ -80,11 +69,9 @@ var UeParams g_ue_pars[NUM_UE]; } -type component ConnHdlr /* extends GTP2_ConnHdlr */ { +type component ConnHdlr extends NGAP_ConnHdlr { var ConnHdlrPars g_pars; timer g_Tguard := 30.0; - - //var Gtp1cPeer g_gn_iface_peer := { connId := 1, remName := mp_gn_remote_ip, remPort := mp_gn_remote_port }; } type record ConnHdlrPars { @@ -141,25 +128,11 @@ NGAP_UNIT[num].receive(NGAPEM_Event:{up_down:=NGAPEM_EVENT_UP}); } friend function f_init_one_ue(inout UeParams uep, integer imsi_suffix) { -/* + uep := { imsi := f_gen_imsi(imsi_suffix), - ue_ip := "192.168.123.50", - guti := omit, - kasme := omit, - s11_teic_local := '00000000'O, - s11_teic_remote := omit, - s5c_teic_local := '00000000'O, - s5c_teic_remote := omit, - bearer := { - ebi := omit, - s11_teid_local := omit, - s11_teid_remote := omit, - s5c_teid_local := omit, - s5c_teid_remote := omit - } + ue_ip := "192.168.123.50" } -*/ } friend function f_init_ngap(integer imsi_suffix) runs on MTC_CT { var integer i; @@ -193,8 +166,8 @@ vc_conn := ConnHdlr.create(id); /* NGAP part */ -// connect(vc_conn:NGAP, vc_NGAP[ngap_idx]:NGAP_CLIENT); -// connect(vc_conn:NGAP_PROC, vc_NGAP[ngap_idx]:NGAP_PROC); + connect(vc_conn:NGAP, vc_NGAP[ngap_idx]:NGAP_CLIENT); + connect(vc_conn:NGAP_PROC, vc_NGAP[ngap_idx]:NGAP_PROC); /* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we cannot have * a stand-alone 'derefers()' call, see https://www.eclipse.org/forums/index.php/t/1091364/ */ @@ -218,9 +191,13 @@ activate(as_Tguard()); } +private template (value) NGAP_IEs.TAI ts_ngran_NGAP_TAI(NGRANParams ngran_pars) := { + pLMNIdentity := ngran_pars.global_ngran_id.globalGNB_ID.pLMNIdentity, + tAC := ngran_pars.supported_ta_list[0].tAC, + iE_Extensions := omit +} - -friend function f_ngap_setup(integer idx := 0, template NGAP_IEs.Cause cause := omit) runs on MTC_CT { +friend function f_ngap_setup(integer idx := 0, template (omit) NGAP_IEs.Cause cause := omit) runs on MTC_CT { var template (present) NGAP_IEs.Cause exp_cause := ?; var boolean exp_fail := false; timer T := 5.0; @@ -259,6 +236,30 @@ } } } + +private function f_register() runs on ConnHdlr { + var template (value) UserLocationInformation p_ueLocInf; + var template (value) NGAP_PDU tx_pdu; + + p_ueLocInf := m_uPTransportLayerInformation_userLocationInformationNR( + m_userLocationInformationNR( + g_pars.ngran_pars[g_pars.c5g_idx].cell_identity.nR_CGI, + ts_ngran_NGAP_TAI(g_pars.ngran_pars[g_pars.c5g_idx]) + + )); + + + tx_pdu := m_ngap_initMsg(m_n2_initialUeMessage(g_pars.c5g_idx, + '7e004179000d0109f1500000000079890040642e02f070'O, /* Registration request */ + p_ueLocInf, + mo_Signalling)); + + NGAP.send(tx_pdu); + f_sleep(5.0); + + /* TODO: handle Auth, SecurityModeCommand, InitialContextSetup, PDUSessionresource, */ +} + /* NG Setup procedure to 5GC using a Global gNB ID containing unknown/foreign PLMN. * Related: https://github.com/open5gs/open5gs/issues/3544 */ testcase TC_ng_setup_unknown_global_gnb_id_plmn() runs on MTC_CT { @@ -280,11 +281,25 @@ f_ngap_setup(0); } +private function f_TC_register(ConnHdlrPars pars) runs on ConnHdlr { + f_init_handler(pars); + f_register(); +} +testcase TC_ng_register() runs on MTC_CT { + f_init_ngap(4); + f_ngap_setup(0); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_register), pars); + vc_conn.done; +} control { execute( TC_ng_setup() ); execute( TC_ng_setup_unknown_global_gnb_id_plmn() ); execute( TC_ng_setup_wrong_tac() ); + execute( TC_ng_register() ); } diff --git a/5gc/expected-results.xml b/5gc/expected-results.xml index 3652aab..2120ba4 100644 --- a/5gc/expected-results.xml +++ b/5gc/expected-results.xml @@ -3,4 +3,5 @@ <testcase classname='C5G_Tests' name='TC_ng_setup_unknown_global_gnb_id_plmn' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_setup_wrong_tac' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_setup' time='MASKED'/> + <testcase classname='C5G_Tests' name='TC_ng_register' time='MASKED'/> </testsuite> diff --git a/library/NGAP_Functions.ttcn b/library/NGAP_Functions.ttcn index a35ccf3..7ab2f5a 100644 --- a/library/NGAP_Functions.ttcn +++ b/library/NGAP_Functions.ttcn @@ -57,11 +57,9 @@ { if (ischosen(ngap.initiatingMessage)) { var InitiatingMessage im := ngap.initiatingMessage; - select (ngap) { - case (?) { - return omit; - /* TODO */ - /* return im.value_.InitialUEMessage.protocolIEs[0].value_.RAN_UE_NGAP_ID; */ + select (im) { + case (mw_n2_initialUeMessage) { + return im.value_.InitialUEMessage.protocolIEs[0].value_.RAN_UE_NGAP_ID; } /* TODO */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40376?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: I094b6775198dfcbf4041c3af423baa6f5072b97d Gerrit-Change-Number: 40376 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Initial ConnHdlr support

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40376?usp=email ) Change subject: 5gc: Initial ConnHdlr support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40376?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: I094b6775198dfcbf4041c3af423baa6f5072b97d Gerrit-Change-Number: 40376 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 09:54:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Initial ConnHdlr support

by jolly

Attention is currently required from: pespin. jolly has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40376?usp=email ) Change subject: 5gc: Initial ConnHdlr support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40376?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: I094b6775198dfcbf4041c3af423baa6f5072b97d Gerrit-Change-Number: 40376 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 09:52:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025