- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: RAW_NS: SNS Changeweight: remove IPv4/IPv6 element in SNS Ack
by lynxis lazus 09 Dec '24

09 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39064?usp=email ) Change subject: RAW_NS: SNS Changeweight: remove IPv4/IPv6 element in SNS Ack ...................................................................... RAW_NS: SNS Changeweight: remove IPv4/IPv6 element in SNS Ack When changweights of a NS-VC via SNS, the SNS Ack should only contains the IEs "List of IP4/6 elements" if the cause code is Unknown IP endpoint. However the libosmocore/ns2 code isn't following this behavior yet. Change-Id: Ibf00cbab0c6691cdb72fe592ee30e122dd8f4783 --- M library/RAW_NS.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/39064/1 diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp index 7ab09e9..976adcc 100644 --- a/library/RAW_NS.ttcnpp +++ b/library/RAW_NS.ttcnpp @@ -588,13 +588,13 @@ nsvc_cfg.provider.ip.local_udp_port, w_sig, w_user) }; NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit)); } else { var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, w_sig, w_user) }; NSCP[idx].send(ts_SNS_CHG_WEIGHT(g_nsconfig.nsei, 25, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 25, omit, omit, omit)); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39064?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: Ibf00cbab0c6691cdb72fe592ee30e122dd8f4783 Gerrit-Change-Number: 39064 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: RAW_NS: SNS Add: handle IPv4/IPv6 element in SNS Ack
by lynxis lazus 09 Dec '24

09 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39063?usp=email ) Change subject: RAW_NS: SNS Add: handle IPv4/IPv6 element in SNS Ack ...................................................................... RAW_NS: SNS Add: handle IPv4/IPv6 element in SNS Ack When adding a new NS-VC via SNS Add, the SNS Ack should only contains the IEs "List of IP4/6 elements" if the cause code is Unknown IP endpoint. However the libosmocore/ns2 code isn't following this behavior yet. Change-Id: I18c659e43db79400c1b428ed745267a5e6e59102 --- M library/RAW_NS.ttcnpp 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/39063/1 diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp index da1a0cc..7ab09e9 100644 --- a/library/RAW_NS.ttcnpp +++ b/library/RAW_NS.ttcnpp @@ -503,18 +503,36 @@ log("f_outgoing_sns_add(idx_add=", idx_add, ")"); var PDU_NS rx; var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[idx_add]; + var template IP4_Elements ack_v4 := omit; + var template IP6_Elements ack_v6 := omit; + + if (istemplatekind(cause, "*")) { + ack_v4 := *; + ack_v6 := *; + } else if (isvalue(cause) and valueof(cause) == NS_CAUSE_UNKNOWN_IP_ENDPOINT) { + if (nsvc_cfg.provider.ip.address_family == AF_INET) { + ack_v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + } else { + ack_v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, + nsvc_cfg.provider.ip.local_udp_port, + w_sig, w_user) }; + } + } + if (nsvc_cfg.provider.ip.address_family == AF_INET) { var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, w_sig, w_user) }; NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, v4)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, v4)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, ack_v4)); } else { var template (omit) IP6_Elements v6 := { ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip, nsvc_cfg.provider.ip.local_udp_port, w_sig, w_user) }; NSCP[idx].send(ts_SNS_ADD(g_nsconfig.nsei, 23, omit, v6)); - rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, omit, v6)); + rx := f_ns_exp(tr_SNS_ACK(g_nsconfig.nsei, 23, cause, omit, ack_v6)); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39063?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: I18c659e43db79400c1b428ed745267a5e6e59102 Gerrit-Change-Number: 39063 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in libosmocore[master]: Gb/NS: SNS: SNS Ack don't add List of IP4/6 Elements on success.
by lynxis lazus 09 Dec '24

09 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/39062?usp=email ) Change subject: Gb/NS: SNS: SNS Ack don't add List of IP4/6 Elements on success. ...................................................................... Gb/NS: SNS: SNS Ack don't add List of IP4/6 Elements on success. SNS Add can't fail with Unknown IP Endpoint. SNS Change Weight shouldn't contain the endpoint in the successful case. Related: OS#6611 Change-Id: If99b204a9d754323e53746b31bc13df53a653b7d --- M src/gb/gprs_ns2_sns.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/39062/1 diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c index 29ccfb0..4a9bb18 100644 --- a/src/gb/gprs_ns2_sns.c +++ b/src/gb/gprs_ns2_sns.c @@ -1268,7 +1268,7 @@ } /* TODO: correct behaviour is to answer to the *same* NSVC from which the SNS_ADD was received */ - ns2_tx_sns_ack(gss->sns_nsvc, trans_id, NULL, v4_list, num_v4, v6_list, num_v6); + ns2_tx_sns_ack(gss->sns_nsvc, trans_id, NULL, NULL, 0, NULL, 0); gprs_ns2_start_alive_all_nsvcs(gss->nse); } @@ -1440,7 +1440,8 @@ ns2_tx_sns_ack(gss->sns_nsvc, trans_id, &cause, NULL, 0, NULL, 0); return; } - ns2_tx_sns_ack(gss->sns_nsvc, trans_id, NULL, v4_list, num_v4, v6_list, num_v6); + + ns2_tx_sns_ack(gss->sns_nsvc, trans_id, NULL, NULL, 0, NULL, 0); } static void ns2_sns_st_configured(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39062?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If99b204a9d754323e53746b31bc13df53a653b7d Gerrit-Change-Number: 39062 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: use new osmocom-bb binary packages
by osmith 09 Dec '24

09 Dec '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39061?usp=email ) Change subject: testenv: use new osmocom-bb binary packages ...................................................................... testenv: use new osmocom-bb binary packages When using --binary-packages, use the osmocom-bb-trxcon etc. binary packages that are now available, instead of only installing the dependencies as binary packages and building these components from source. Change-Id: I072ea55d12060b4ef04ee9775ef116d553090e9a --- M _testenv/testenv/podman_install.py M bts/run_fake_trx.sh M bts/testenv_generic.cfg M bts/testenv_hopping.cfg M bts/testenv_oml.cfg 5 files changed, 8 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/39061/1 diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 9033c14..2c5ae5a 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -11,25 +11,16 @@ import testenv.podman git_dir = None -bb_dir = None -trxcon_dir = None -virtphy_dir = None sccp_dir = None jobs = None def init(): global git_dir - global bb_dir - global trxcon_dir - global virtphy_dir global sccp_dir global jobs git_dir = os.path.join(testenv.args.cache, "git") - bb_dir = os.path.join(git_dir, "osmocom-bb") - trxcon_dir = os.path.join(bb_dir, "src/host/trxcon") - virtphy_dir = os.path.join(bb_dir, "src/host/virt_phy") sccp_dir = os.path.join(git_dir, "libosmo-sigtran") jobs = multiprocessing.cpu_count() + 1 @@ -101,24 +92,6 @@ testenv.cmd.run(["apt-get", "-q", "install", "-y", "--no-install-recommends"] + pkgs) -def clone_osmocom_bb(): - if os.path.exists(bb_dir): - logging.debug("osmocom-bb: already cloned") - return - - testenv.cmd.run( - [ - "git", - "-C", - git_dir, - "clone", - "--depth", - "1", - "https://gerrit.osmocom.org/osmocom-bb", - ] - ) - - def clone_libosmo_sigtran(): if os.path.exists(sccp_dir): logging.debug("libosmo-sigtran: already cloned") @@ -137,34 +110,6 @@ ) -def from_source_trxcon(): - trxcon_in_srcdir = os.path.join(trxcon_dir, "src/trxcon") - - if not os.path.exists(trxcon_in_srcdir): - clone_osmocom_bb() - apt_install(["libosmocore-dev"]) - logging.info("Building trxcon") - testenv.cmd.run(["autoreconf", "-fi"], cwd=trxcon_dir) - testenv.cmd.run(["./configure"], cwd=trxcon_dir) - testenv.cmd.run(["make", "-j", f"{jobs}"], cwd=trxcon_dir) - - testenv.cmd.run(["ln", "-s", trxcon_in_srcdir, "/usr/local/bin/trxcon"]) - - -def from_source_virtphy(): - virtphy_in_srcdir = os.path.join(virtphy_dir, "src/virtphy") - - if not os.path.exists(virtphy_in_srcdir): - clone_osmocom_bb() - apt_install(["libosmocore-dev"]) - logging.info("Building virtphy") - testenv.cmd.run(["autoreconf", "-fi"], cwd=virtphy_dir) - testenv.cmd.run(["./configure"], cwd=virtphy_dir) - testenv.cmd.run(["make", "-j", f"{jobs}"], cwd=virtphy_dir) - - testenv.cmd.run(["ln", "-s", virtphy_in_srcdir, "/usr/local/bin/virtphy"]) - - def from_source_sccp_demo_user(): sccp_demo_user_path = os.path.join(sccp_dir, "examples/sccp_demo_user") @@ -196,12 +141,6 @@ def from_source(cfg, cfg_name, section): program = cfg[section]["program"].split(" ", 1)[0] - if program == "trxcon": - return from_source_trxcon() - if program == "virtphy": - return from_source_virtphy() - if program == "run_fake_trx.sh": - return clone_osmocom_bb() if program == "run_sccp_demo_user.sh": return from_source_sccp_demo_user() diff --git a/bts/run_fake_trx.sh b/bts/run_fake_trx.sh index 860dec7..a1d869e 100755 --- a/bts/run_fake_trx.sh +++ b/bts/run_fake_trx.sh @@ -3,8 +3,8 @@ # fake trx is part of osmo-trx if [ "$TESTENV_BINARY_REPO" = 1 ]; then - # testenv with --binary-repo -> osmocom-bb cloned separately - FAKE_TRX_DIR="$TESTENV_GIT_DIR"/osmocom-bb/src/target/trx_toolkit + # testenv with --binary-repo -> osmocom-bb-trx-toolkit package + FAKE_TRX_DIR="/usr/share/osmocom-bb/trx_toolkit" elif [ -n "$TESTENV_SRC_DIR" ]; then # testenv without --binary-repo -> osmocom-bb cloned via osmo-dev FAKE_TRX_DIR="$TESTENV_SRC_DIR"/osmocom-bb/src/target/trx_toolkit diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg index f33e616..34a39dc 100644 --- a/bts/testenv_generic.cfg +++ b/bts/testenv_generic.cfg @@ -11,10 +11,12 @@ [fake-trx] program=run_fake_trx.sh make=.make.osmocom-bb.clone +package=osmocom-bb-trx-toolkit [trxcon] program=trxcon make=trxcon +package=osmocom-bb-trxcon [bts] program=respawn.sh osmo-bts-trx diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg index 5adf485..a97c050 100644 --- a/bts/testenv_hopping.cfg +++ b/bts/testenv_hopping.cfg @@ -14,10 +14,12 @@ [fake-trx] program=run_fake_trx.sh make=.make.osmocom-bb.clone +package=osmocom-bb-trx-toolkit [trxcon] program=trxcon make=trxcon +package=osmocom-bb-trxcon [bts] program=respawn.sh osmo-bts-trx diff --git a/bts/testenv_oml.cfg b/bts/testenv_oml.cfg index 77a6fda..d6354fd 100644 --- a/bts/testenv_oml.cfg +++ b/bts/testenv_oml.cfg @@ -5,10 +5,12 @@ [fake-trx] program=run_fake_trx.sh make=.make.osmocom-bb.clone +package=osmocom-bb-trx-toolkit [trxcon] program=trxcon make=trxcon +package=osmocom-bb-trxcon [bts] prepare=osmo-config-merge osmo-bts.cfg osmo-bts-oml.confmerge > osmo-bts-oml.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39061?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: I072ea55d12060b4ef04ee9775ef116d553090e9a Gerrit-Change-Number: 39061 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in libosmo-abis[master]: ipaccess: Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif
by osmith 09 Dec '24

09 Dec '24

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39042?usp=email ) Change subject: ipaccess: Use new osmo_ipa_ka_fsm_inst APIs from libosmo-netif ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39042?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6164a44847fcd88d08c77f977d928c2fdf657719 Gerrit-Change-Number: 39042 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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-Comment-Date: Mon, 09 Dec 2024 13:39:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in libosmo-netif[master]: ipa: Add osmo_ipa_ka_fsm_inst APIs
by osmith 09 Dec '24

09 Dec '24

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39035?usp=email ) Change subject: ipa: Add osmo_ipa_ka_fsm_inst APIs ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/ipa_keepalive.c: https://gerrit.osmocom.org/c/libosmo-netif/+/39035/comment/952f2812_7850173… : PS4, Line 177: /* no permitted events aside from E_START, which is handled in allstate_events */ ```suggestion /* no permitted events aside from E_STOP, which is handled in allstate_events */ ``` -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39035?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5c36e06e0dc29ec4679b20ad6c426f051b659acd Gerrit-Change-Number: 39035 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 09 Dec 2024 13:35:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: SNS Add: handle NS_Alive while waiting for SNS_Ack
by pespin 09 Dec '24

09 Dec '24

Attention is currently required from: lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39060?usp=email ) Change subject: PCU_Tests_SNS: SNS Add: handle NS_Alive while waiting for SNS_Ack ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39060?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: I10646d9acfe280ddfb8852a4d5c37882aae99874 Gerrit-Change-Number: 39060 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 09 Dec 2024 13:21:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: PCU_Tests_SNS: SNS Add: handle NS_Alive while waiting for SNS_Ack
by lynxis lazus 09 Dec '24

09 Dec '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39060?usp=email ) Change subject: PCU_Tests_SNS: SNS Add: handle NS_Alive while waiting for SNS_Ack ...................................................................... PCU_Tests_SNS: SNS Add: handle NS_Alive while waiting for SNS_Ack Similiar to 61ccea9ecadc ("PCU_Tests_SNS: del/change weight: don't fail on NS"), the SNS Add procedure might have to handle a NS Alive PDU in the receiving queue while waiting for a SNS ACK. Related: OS#6611 Change-Id: I10646d9acfe280ddfb8852a4d5c37882aae99874 --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/39060/1 diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 263e205..07f147c 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -303,7 +303,9 @@ /* create another NS codec port on the tester side */ f_init_ns_codec(mp_nsconfig, 2); + g_handle_rx_alive := true; f_outgoing_sns_add(idx_add := 2, w_sig := 0, w_user := 1, idx := 0); + g_handle_rx_alive := false; /* wait for one ALIVE cycle, then ACK any further ALIVE in the background */ as_rx_alive_tx_ack(oneshot := true, idx := 2); @@ -316,6 +318,8 @@ /* Test adding an already present IP endpoint at runtime */ testcase TC_sns_add_nack() runs on RAW_Test_CT { + g_handle_rx_alive := true; + f_sns_bringup_1c1u(); f_outgoing_sns_add(idx_add := 0, w_sig := 0, w_user := 1, idx := 0, cause := NS_CAUSE_PROTOCOL_ERROR_UNSPECIFIED); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39060?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: I10646d9acfe280ddfb8852a4d5c37882aae99874 Gerrit-Change-Number: 39060 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: assign random TEID-C to Context Req/Resp/Ack messages
by lynxis lazus 09 Dec '24

09 Dec '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38921?usp=email ) Change subject: SGSN: assign random TEID-C to Context Req/Resp/Ack messages ...................................................................... SGSN: assign random TEID-C to Context Req/Resp/Ack messages Change-Id: Icac28280a810e8d24eeeaaae1fb1a15278fde8da --- M library/GTP_Emulation.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn index c5ac029..c5e4e24 100644 --- a/library/GTP_Emulation.ttcn +++ b/library/GTP_Emulation.ttcn @@ -337,4 +337,7 @@ } } +function f_gtp_teid_random() return OCT4 { + return f_rnd_octstring(4); +} } diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 2ddeaff..c854b72 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -3037,6 +3037,7 @@ private function f_TC_sgsn_context_req_in(charstring id) runs on BSSGP_ConnHdlr { var integer seq_nr := f_rnd_int(65535); var Gtp1cUnitdata gtpc_ud; + var OCT4 teidc := f_gtp_teid_random(); timer T; var Gtp1cPeer peer := { @@ -3052,7 +3053,7 @@ * The MME requests information about the MS by sending SGSN Context Request. */ var template (value) GTPC_PDUs ctx_req; ctx_req := ts_SGSNContextReqPDU(rai := ts_RoutingAreaIdentity('250'H, 'F99'H, '4242'O, 'DE'O), - teic := '12345678'O, + teic := teidc, sgsn_addr_control := f_inet_addr(mp_ggsn_ip), ptmsi := ts_PTMSI(g_pars.p_tmsi), ptmsi_sig := ts_PTMSI_sig('010203'O)); @@ -3118,6 +3119,7 @@ private function f_TC_sgsn_context_req_out(charstring id) runs on BSSGP_ConnHdlr { var integer seq_nr := f_rnd_int(65535); var Gtp1cUnitdata gtpc_ud; + var OCT4 teidc := f_gtp_teid_random(); timer T; /* The MS goes to GERAN/UTRAN from an LTE cell */ @@ -3164,7 +3166,7 @@ var template (value) GTPC_PDUs ctx_rsp; ctx_rsp := ts_SGSNContextRespPDU(cause := GTP_CAUSE_REQUEST_ACCEPTED, imsi := g_pars.imsi, - teic := '12345678'O, + teic := teidc, mm_context := ts_MM_ContextGSM(kc), pdp_ctx_list := { pdp_ctx }); GTP[GTP_GGSN_IDX].send(ts_GTPC_SGSNContextResp(gtpc_ud.peer, '12345678'O, seq_nr, ctx_rsp)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38921?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: Icac28280a810e8d24eeeaaae1fb1a15278fde8da Gerrit-Change-Number: 38921 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN: Remove mm context triplets
by lynxis lazus 09 Dec '24

09 Dec '24

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38922?usp=email ) Change subject: SGSN: Remove mm context triplets ...................................................................... SGSN: Remove mm context triplets Only triplets which hasn't been used should be included. The MME will only request and sent back a single set of tuples. There shouldn't any left overs. Change-Id: I60a3331396cb9905ec9a4df9b1e65a3291a51058 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index c854b72..c6c2c0a 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -3068,16 +3068,6 @@ var octetstring sgsn_addr := f_inet_addr(mp_sgsn_gtp_ip); ctx_rsp.sgsn_ContextResponse.sgsn_addr_controlPlane := tr_GsnAddr(sgsn_addr); - /* Match MM Context */ - if (ispresent(g_pars.vec)) { - /* XXX: this is only valid for GERAN */ - var octetstring triplet := g_pars.vec.rand & g_pars.vec.sres & g_pars.vec.kc; - ctx_rsp.sgsn_ContextResponse.mm_Context := tr_MM_ContextGSM(kc := g_pars.vec.kc, - triplet := triplet); - /* TODO: 7.5.4 "The IMEISV shall, if available, be included in the MM Context". - * See also 3GPP TS 29.060, section 7.7.28 and Table 47A */ - } - /* TODO: match PDP Context */ T.start(2.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38922?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: I60a3331396cb9905ec9a4df9b1e65a3291a51058 Gerrit-Change-Number: 38922 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log