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

[M] Change in osmo-sgsn[master]: VTY: make max-sdu-size for GPRS SM QoS configurable

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40822?usp=email ) Change subject: VTY: make max-sdu-size for GPRS SM QoS configurable ...................................................................... VTY: make max-sdu-size for GPRS SM QoS configurable Change-Id: I0819da18dafecf322f8902643dae8dbcaa5dc98b --- M src/sgsn/gprs_sm.c M src/sgsn/sgsn_vty.c 2 files changed, 72 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/22/40822/1 diff --git a/src/sgsn/gprs_sm.c b/src/sgsn/gprs_sm.c index bcf2923..c292505 100644 --- a/src/sgsn/gprs_sm.c +++ b/src/sgsn/gprs_sm.c @@ -63,7 +63,7 @@ }, }; -static struct gsm48_qos default_qos = { +struct gsm48_qos gprs_sm_default_qos = { .delay_class = 4, /* best effort */ .reliab_class = GSM48_QOS_RC_LLC_UN_RLC_ACK_DATA_PROT, .peak_tput = GSM48_QOS_PEAK_TPUT_32000bps, @@ -206,7 +206,7 @@ /* FIXME: copy QoS parameters from original request */ //msgb_lv_put(msg, pdp->lib->qos_neg.l, pdp->lib->qos_neg.v); - msgb_lv_put(msg, sizeof(default_qos), (uint8_t *)&default_qos); + msgb_lv_put(msg, sizeof(gprs_sm_default_qos), (uint8_t *)&gprs_sm_default_qos); /* Radio priority 10.5.7.2 */ msgb_v_put(msg, pdp->lib->radio_pri); diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 7279167..37d966f 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -66,6 +66,8 @@ #include <osmocom/ranap/iu_client.h> #endif +extern struct gsm48_qos gprs_sm_default_qos; + static struct sgsn_config *g_cfg = NULL; const struct value_string sgsn_auth_pol_strs[] = { @@ -382,6 +384,28 @@ } else vty_out(vty, " no compression v42bis%s", VTY_NEWLINE); +#define QOS_SM_DEFAULT_CMD "qos-sm default" +#define QOS_SM_DEFAULT_CMD_DOC \ + "QoS (Quality of Service) configuration for the GPRS SM layer\n" \ + "Default QoS parameters\n" + + /* QoS defaults */ + switch (gprs_sm_default_qos.max_sdu_size) { + case GSM48_QOS_MAXSDU_1502: + vty_out(vty, " " QOS_SM_DEFAULT_CMD " max-sdu-size 1502%s", VTY_NEWLINE); + break; + case GSM48_QOS_MAXSDU_1510: + vty_out(vty, " " QOS_SM_DEFAULT_CMD " max-sdu-size 1510%s", VTY_NEWLINE); + break; + case GSM48_QOS_MAXSDU_1520: + vty_out(vty, " " QOS_SM_DEFAULT_CMD " max-sdu-size 1520%s", VTY_NEWLINE); + break; + default: + vty_out(vty, " " QOS_SM_DEFAULT_CMD " max-sdu-size %u%s", + gprs_sm_default_qos.max_sdu_size * 10, VTY_NEWLINE); + break; + } + llist_for_each_entry(mme, &sgsn->mme_list, list) { config_write_mme(vty, mme, " "); } @@ -1621,6 +1645,49 @@ return CMD_SUCCESS; } +DEFUN(cfg_qos_sm_default_max_sdu_size, + cfg_qos_sm_default_max_sdu_size_cmd, + QOS_SM_DEFAULT_CMD " max-sdu-size (<10-1500>)", + QOS_SM_DEFAULT_CMD_DOC + "Maximum SDU (Service Data Unit) size\n" + "SDU size (must be a multiple of 10)\n") +{ + int size = atoi(argv[0]); + + switch (size) { + case 1502: + gprs_sm_default_qos.max_sdu_size = GSM48_QOS_MAXSDU_1502; + break; + case 1510: + gprs_sm_default_qos.max_sdu_size = GSM48_QOS_MAXSDU_1510; + break; + case 1520: + gprs_sm_default_qos.max_sdu_size = GSM48_QOS_MAXSDU_1520; + break; + default: + if (size < 1 || size > 1500) + return CMD_WARNING; + if (size % 10 != 0) { + vty_out(vty, "%% SDU size in range 1..1500 " + "must be a multiple of 10%s", VTY_NEWLINE); + return CMD_WARNING; + } + gprs_sm_default_qos.max_sdu_size = size / 10; + break; + } + + return CMD_SUCCESS; +} + +ALIAS(cfg_qos_sm_default_max_sdu_size, + cfg_qos_sm_default_max_sdu_size_15xx_cmd, + QOS_SM_DEFAULT_CMD " max-sdu-size (1502|1510|1520)", + QOS_SM_DEFAULT_CMD_DOC + "Maximum SDU (Service Data Unit) size\n" + "1502 octets\n" + "1510 octets\n" + "1520 octets\n"); + #if BUILD_IU DEFUN(cfg_sgsn_cs7_instance_iu, cfg_sgsn_cs7_instance_iu_cmd, @@ -1895,6 +1962,9 @@ install_element(SGSN_NODE, &cfg_comp_v42bis_cmd); install_element(SGSN_NODE, &cfg_comp_v42bisp_cmd); + install_element(SGSN_NODE, &cfg_qos_sm_default_max_sdu_size_cmd); + install_element(SGSN_NODE, &cfg_qos_sm_default_max_sdu_size_15xx_cmd); + install_element(SGSN_NODE, &cfg_sgsn_mme_cmd); install_element(SGSN_NODE, &cfg_sgsn_no_mme_cmd); install_node(&mme_node, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40822?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0819da18dafecf322f8902643dae8dbcaa5dc98b Gerrit-Change-Number: 40822 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

15 hours, 33 minutes

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master-builds: fix repos_url for enftables

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40820?usp=email ) Change subject: jobs/master-builds: fix repos_url for enftables ...................................................................... jobs/master-builds: fix repos_url for enftables enftables is not in Gerrit, use the Gitea URL instead. Change-Id: I3a50a4498c22c56129a40e410ab30c0e6bfee1ec Fixes: 46ad4f8 ("jobs/master-builds: add logger_gsmtap and enftables") --- M jobs/master-builds.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index af8432a..b522774 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -322,7 +322,7 @@ cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - enftables: - repos_url: '{gerrit_url}/erlang/{repos}' + repos_url: '{gitea_url}/erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - osmo-e1-hardware: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40820?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: I3a50a4498c22c56129a40e410ab30c0e6bfee1ec Gerrit-Change-Number: 40820 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

16 hours, 42 minutes

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master-builds: fix repos_url for enftables

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ci/+/40820?usp=email ) Change subject: jobs/master-builds: fix repos_url for enftables ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40820?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: I3a50a4498c22c56129a40e410ab30c0e6bfee1ec Gerrit-Change-Number: 40820 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 20:27:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

16 hours, 42 minutes

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: rebar.lock: bump logger_gsmtap version

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40821?usp=email ) Change subject: rebar.lock: bump logger_gsmtap version ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40821?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ia478352f9aeeec405b286f8a9fc8cbd492450e30 Gerrit-Change-Number: 40821 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 20:26:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

16 hours, 44 minutes

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master-builds: fix repos_url for enftables

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ci/+/40820?usp=email ) Change subject: jobs/master-builds: fix repos_url for enftables ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40820?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: I3a50a4498c22c56129a40e410ab30c0e6bfee1ec Gerrit-Change-Number: 40820 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 20:26:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

16 hours, 44 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: NGAP_Templates: Fixes and improvements for UEContextReleaseComplete

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40818?usp=email ) Change subject: NGAP_Templates: Fixes and improvements for UEContextReleaseComplete ...................................................................... NGAP_Templates: Fixes and improvements for UEContextReleaseComplete The existing templates for UEContextReleaseComplete were completelly wrong, probably due to copy-paste when introducing them. This commit fixes all those problems and allows passing optional parameters. * procedureCode was wrong * Criticality of several fields was wrong * Type of resource list was wrong, and marked as mandatory while it was optional. Change-Id: I50da7cd4cb15d8e6b2c68b21a4e4be93e3973593 --- M library/ngap/NGAP_Templates.ttcn 1 file changed, 154 insertions(+), 50 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/library/ngap/NGAP_Templates.ttcn b/library/ngap/NGAP_Templates.ttcn index 5ffe2a5..3dec8ef 100644 --- a/library/ngap/NGAP_Templates.ttcn +++ b/library/ngap/NGAP_Templates.ttcn @@ -1913,36 +1913,88 @@ /** * @see ETSI TS 138 413 V16.12.0 (2023-05) Clause 9.2.2.6 UE CONTEXT RELEASE COMPLETE */ - template (value) SuccessfulOutcome m_n2_UEContextReleaseComplete( - in template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, - in template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, - in template (value) PDUSessionResourceSetupListSURes p_pDUSessionResourceSetupListSURes - ) := { - procedureCode := id_InitialContextSetup, + template (value) SuccessfulOutcome m_n2_UEContextReleaseComplete(template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, + template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID) + := { + procedureCode := id_UEContextRelease, criticality := reject, value_ := { - PDUSessionResourceSetupResponse := { - protocolIEs := { - { - id := id_AMF_UE_NGAP_ID, - criticality := reject, - value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } - }, - { - id := id_RAN_UE_NGAP_ID, - criticality := reject, - value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } - }, - { - id := id_PDUSessionResourceSetupListSURes, - criticality := reject, - value_ := { PDUSessionResourceSetupListSURes := p_pDUSessionResourceSetupListSURes } - } - } - } + UEContextReleaseComplete := { + protocolIEs := { + { + id := id_AMF_UE_NGAP_ID, + criticality := ignore, + value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } + }, + { + id := id_RAN_UE_NGAP_ID, + criticality := ignore, + value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } + } + } + } } } // End of template m_n2_UEContextReleaseComplete + function f_ts_n2_UEContextReleaseComplete(template (value) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, + template (value) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, + template (omit) UserLocationInformation p_userLocationInformation := omit, + template (omit) InfoOnRecommendedCellsAndRANNodesForPaging p_infoOnRecommendedCellsAndRANNodesForPaging := omit, + template (omit) PDUSessionResourceListCxtRelCpl p_pDUSessionResourceListCxtRelCpl := omit, + template (omit) CriticalityDiagnostics p_criticalityDiagnostics := omit, + template (omit) PagingAssisDataforCEcapabUE p_pagingAssisDataforCEcapabUE := omit) + return template (value) SuccessfulOutcome { + + var template (value) SuccessfulOutcome pdu := m_n2_UEContextReleaseComplete(p_amfUeNgapID, p_ranUeNgapID); + var integer idx := lengthof(pdu.value_.UEContextReleaseComplete.protocolIEs); + + if (isvalue(p_userLocationInformation)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_UserLocationInformation, + criticality := ignore, + value_ := { UserLocationInformation := p_userLocationInformation } + }; + idx := idx + 1; + } + + if (isvalue(p_infoOnRecommendedCellsAndRANNodesForPaging)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_InfoOnRecommendedCellsAndRANNodesForPaging, + criticality := reject, + value_ := { InfoOnRecommendedCellsAndRANNodesForPaging := p_infoOnRecommendedCellsAndRANNodesForPaging } + }; + idx := idx + 1; + } + + if (isvalue(p_pDUSessionResourceListCxtRelCpl)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_PDUSessionResourceListCxtRelCpl, + criticality := reject, + value_ := { PDUSessionResourceListCxtRelCpl := p_pDUSessionResourceListCxtRelCpl } + }; + idx := idx + 1; + } + + if (isvalue(p_criticalityDiagnostics)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_CriticalityDiagnostics, + criticality := ignore, + value_ := { CriticalityDiagnostics := p_criticalityDiagnostics } + }; + idx := idx + 1; + } + + if (isvalue(p_pagingAssisDataforCEcapabUE)) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_PagingAssisDataforCEcapabUE, + criticality := ignore, + value_ := { PagingAssisDataforCEcapabUE := p_pagingAssisDataforCEcapabUE } + } + idx := idx + 1; + } + return pdu; + } + } // End of group Send group Receive { @@ -1950,36 +2002,88 @@ /** * @see ETSI TS 138 413 V16.12.0 (2023-05) Clause 9.2.2.6 UE CONTEXT RELEASE COMPLETE */ - template (present) SuccessfulOutcome mw_n2_UEContextReleaseComplete( - template (present) AMF_UE_NGAP_ID p_amfUeNgapID := ?, - template (present) RAN_UE_NGAP_ID p_ranUeNgapID := ?, - template (present) PDUSessionResourceSetupListSURes p_pDUSessionResourceSetupListSURes := ? - ) := { - procedureCode := id_InitialContextSetup, + template (present) SuccessfulOutcome mw_n2_UEContextReleaseComplete(template (present) AMF_UE_NGAP_ID p_amfUeNgapID := ?, + template (present) RAN_UE_NGAP_ID p_ranUeNgapID := ?) + := { + procedureCode := id_UEContextRelease, criticality := reject, value_ := { - PDUSessionResourceSetupResponse := { - protocolIEs := { - { - id := id_AMF_UE_NGAP_ID, - criticality := reject, - value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } - }, - { - id := id_RAN_UE_NGAP_ID, - criticality := reject, - value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } - }, - { - id := id_PDUSessionResourceSetupListSURes, - criticality := reject, - value_ := { PDUSessionResourceSetupListSURes := p_pDUSessionResourceSetupListSURes } - } - } - } + UEContextReleaseComplete := { + protocolIEs := { + { + id := id_AMF_UE_NGAP_ID, + criticality := ignore, + value_ := { AMF_UE_NGAP_ID := p_amfUeNgapID } + }, + { + id := id_RAN_UE_NGAP_ID, + criticality := ignore, + value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID } + } + } + } } } // End of template mw_n2_UEContextReleaseComplete + function f_tr_n2_UEContextReleaseComplete(template (present) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID, + template (present) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID, + template UserLocationInformation p_userLocationInformation := omit, + template InfoOnRecommendedCellsAndRANNodesForPaging p_infoOnRecommendedCellsAndRANNodesForPaging := omit, + template PDUSessionResourceListCxtRelCpl p_pDUSessionResourceListCxtRelCpl := omit, + template CriticalityDiagnostics p_criticalityDiagnostics := omit, + template PagingAssisDataforCEcapabUE p_pagingAssisDataforCEcapabUE := omit) + return template (present) SuccessfulOutcome { + + var template (present) SuccessfulOutcome pdu := m_n2_UEContextReleaseComplete(p_amfUeNgapID, p_ranUeNgapID); + var integer idx := lengthof(pdu.value_.UEContextReleaseComplete.protocolIEs); + + if (not istemplatekind(p_userLocationInformation, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_UserLocationInformation, + criticality := ignore, + value_ := { UserLocationInformation := p_userLocationInformation } + }; + idx := idx + 1; + } + + if (not istemplatekind(p_infoOnRecommendedCellsAndRANNodesForPaging, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_InfoOnRecommendedCellsAndRANNodesForPaging, + criticality := reject, + value_ := { InfoOnRecommendedCellsAndRANNodesForPaging := p_infoOnRecommendedCellsAndRANNodesForPaging } + }; + idx := idx + 1; + } + + if (not istemplatekind(p_pDUSessionResourceListCxtRelCpl, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_PDUSessionResourceListCxtRelCpl, + criticality := reject, + value_ := { PDUSessionResourceListCxtRelCpl := p_pDUSessionResourceListCxtRelCpl } + }; + idx := idx + 1; + } + + if (not istemplatekind(p_criticalityDiagnostics, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_CriticalityDiagnostics, + criticality := ignore, + value_ := { CriticalityDiagnostics := p_criticalityDiagnostics } + }; + idx := idx + 1; + } + + if (not istemplatekind(p_pagingAssisDataforCEcapabUE, "omit")) { + pdu.value_.UEContextReleaseComplete.protocolIEs[idx] := { + id := id_PagingAssisDataforCEcapabUE, + criticality := ignore, + value_ := { PagingAssisDataforCEcapabUE := p_pagingAssisDataforCEcapabUE } + } + idx := idx + 1; + } + return pdu; + } + } // End of group Receive } // End of group UE_CONTEXT_RELEASE_COMPLETE -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40818?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: I50da7cd4cb15d8e6b2c68b21a4e4be93e3973593 Gerrit-Change-Number: 40818 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>

16 hours, 44 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: {S1AP,NGAP}_Emulation: Simplify lookup code

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40817?usp=email ) Change subject: {S1AP,NGAP}_Emulation: Simplify lookup code ...................................................................... {S1AP,NGAP}_Emulation: Simplify lookup code Simplify code matching IDs. Explicitly test, log and exit function called with both IDs passed as "omit". Change-Id: I02f33c191d131c6325f3608ceec80be6f036aa84 --- M library/NGAP_Emulation.ttcn M library/S1AP_Emulation.ttcn 2 files changed, 34 insertions(+), 26 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn index 7b7d93d..aa4b485 100644 --- a/library/NGAP_Emulation.ttcn +++ b/library/NGAP_Emulation.ttcn @@ -36,6 +36,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from DNS_Helpers all; import from SCTP_Templates all; @@ -262,24 +263,27 @@ private function f_assoc_id_by_ngap_ids(template (omit) AMF_UE_NGAP_ID amf_id, template (omit) RAN_UE_NGAP_ID ran_id) runs on NGAP_Emulation_CT return integer { - var integer i; - for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) { + if (istemplatekind(ran_id, "omit") and istemplatekind(amf_id, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected call f_assoc_id_by_ngap_ids(omit, omit)"); + } + for (var integer i := 0; i < sizeof(NGapAssociationTable); i := i+1) { if (not isvalue(NGapAssociationTable[i].ran_ue_ngap_id)) { continue; } - if (istemplatekind(ran_id, "omit") or - match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) { - if (istemplatekind(amf_id, "omit")) { - return i; - } else { - if (match(NGapAssociationTable[i].amf_ue_ngap_id, amf_id)) { - return i; - } - } + if (not istemplatekind(ran_id, "omit") and + not match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) { + continue; } + /* ran_id matched, check amf_id now: */ + if (not istemplatekind(amf_id, "omit") and + not match(NGapAssociationTable[i].amf_ue_ngap_id, amf_id)) { + continue; + } + return i; } - setverdict(fail, "NGAP Association Table not found by RAN-ID=", ran_id, " AMF-ID=", amf_id); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("NGAP Association Table not found by RAN-ID=", ran_id, " AMF-ID=", amf_id)); + return -1; /* make ttcn3 compiler happy */ } private function f_assoc_id_by_comp(NGAP_ConnHdlr client) diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index 55a3380..b3e7731 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -51,6 +51,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from DNS_Helpers all; @@ -207,24 +208,27 @@ private function f_assoc_id_by_s1ap_ids(template (omit) MME_UE_S1AP_ID mme_id, template (omit) ENB_UE_S1AP_ID enb_id) runs on S1AP_Emulation_CT return integer { - var integer i; - for (i := 0; i < sizeof(S1apAssociationTable); i := i+1) { + if (istemplatekind(enb_id, "omit") and istemplatekind(mme_id, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected call f_assoc_id_by_s1ap_ids(omit, omit)"); + } + for (var integer i := 0; i < sizeof(S1apAssociationTable); i := i+1) { if (not isvalue(S1apAssociationTable[i].enb_ue_s1ap_id)) { continue; } - if (istemplatekind(enb_id, "omit") or - match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { - if (istemplatekind(mme_id, "omit")) { - return i; - } else { - if (match(S1apAssociationTable[i].mme_ue_s1ap_id, mme_id)) { - return i; - } - } + if (not istemplatekind(enb_id, "omit") and + not match(S1apAssociationTable[i].enb_ue_s1ap_id, enb_id)) { + continue; } + /* enb_id matched, check mme_id now: */ + if (not istemplatekind(mme_id, "omit") and + not match(S1apAssociationTable[i].mme_ue_s1ap_id, mme_id)) { + continue; + } + return i; } - setverdict(fail, "S1AP Association Table not found by ENB-ID=", enb_id, " MME-ID=", mme_id); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("S1AP Association Table not found by ENB-ID=", enb_id, " MME-ID=", mme_id)); + return -1; /* make ttcn3 compiler happy */ } private function f_assoc_id_by_comp(S1AP_ConnHdlr client) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40817?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: I02f33c191d131c6325f3608ceec80be6f036aa84 Gerrit-Change-Number: 40817 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

16 hours, 44 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: NGAP_Templates: Fixes and improvements for UEContextReleaseComplete

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40818?usp=email ) Change subject: NGAP_Templates: Fixes and improvements for UEContextReleaseComplete ...................................................................... Patch Set 1: (1 comment) File library/ngap/NGAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40818/comment/07c2b43b_f805… : PS1, Line 2012: protocolIEs > Godness, more spaces! Let's hit the overscan area of a screen :D Yeah sorry about that but I'm trying to keep the spacing similar to the original ngap.git I imported it from, so we can spot and merge changes from there more easily. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40818?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: I50da7cd4cb15d8e6b2c68b21a4e4be93e3973593 Gerrit-Change-Number: 40818 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-Comment-Date: Fri, 01 Aug 2025 20:25:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

16 hours, 44 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Implement UE-initiated de-registration procedure

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?usp=email ) Change subject: 5gc: Implement UE-initiated de-registration procedure ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?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: Iab438d5a7cc5f2ba58943e4568c1fb5e5f41f99d Gerrit-Change-Number: 40819 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 20:17:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

16 hours, 52 minutes

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: rebar.lock: bump logger_gsmtap version

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40821?usp=email ) Change subject: rebar.lock: bump logger_gsmtap version ...................................................................... rebar.lock: bump logger_gsmtap version The new version has some compiler warnings fixed: * e0d803f ("logger_gsmtap: handle_info(): fix unused argument") * 13f8748 ("Fix warning: behaviour logger_handler undefined") Change-Id: Ia478352f9aeeec405b286f8a9fc8cbd492450e30 --- M rebar.lock 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/21/40821/1 diff --git a/rebar.lock b/rebar.lock index 02a4edf..647bca0 100644 --- a/rebar.lock +++ b/rebar.lock @@ -23,7 +23,7 @@ 0}, {<<"logger_gsmtap">>, {git,"https://gitea.osmocom.org/erlang/logger_gsmtap.git", - {ref,"e0d803fc1b1b1b66ec0c6986d1c542423ebc0320"}}, + {ref,"5194badde912a8179f2a818155ee2b01f9e6377e"}}, 0}, {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.4.1">>},1}, {<<"pfcplib">>, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40821?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ia478352f9aeeec405b286f8a9fc8cbd492450e30 Gerrit-Change-Number: 40821 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

17 hours, 5 minutes

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2025