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

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40819?usp=email ) Change subject: 5gc: Implement UE-initiated de-registration procedure ...................................................................... 5gc: Implement UE-initiated de-registration procedure Change-Id: Iab438d5a7cc5f2ba58943e4568c1fb5e5f41f99d Related: SYS#7073 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M deps/Makefile M library/NG_NAS_Osmo_Templates.ttcn 4 files changed, 59 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/40819/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 30615f2..0b71059 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -291,6 +291,7 @@ private function f_TC_register() runs on ConnHdlr { f_register(); + f_deregister(); } testcase TC_ng_register() runs on MTC_CT { f_init(); @@ -305,6 +306,7 @@ private function f_TC_periodic_registration_updating() runs on ConnHdlr { f_register(); f_periodic_register_update(); + f_deregister(); } testcase TC_periodic_registration_updating() runs on MTC_CT { f_init(); @@ -322,6 +324,7 @@ f_sleep(1.0); f_ping4(g_pars.ue_pars.run_prog_pars.ping_hostname); f_pdu_sess_release(); + f_deregister(); } testcase TC_ng_register_ping4() runs on MTC_CT { f_init(); diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index fe96b45..81ad34f 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -423,6 +423,33 @@ as_ngap_handle_configuration_update(); } +/* 3GPP TS 24.501 5.5.2.2 UE-initiated de-registration procedure, + * 3GPP TS 23.502 4.2.2.3.2 UE-initiated Deregistration */ +function f_deregister() runs on ConnHdlr { + var template (value) NG_NAS_UL_Message_Type nas_ul_msg; + var NG_NAS_DL_Message_Type rx_nas; + + nas_ul_msg := cs_NG_DEREGISTRATION_REQUEST_MO(crs_DeregisterType ('0'B,/* p_SwitchOff */ + '0'B,/* p_ReReg */ + '01'B/* p_Access */), + g_pars.kset_id, + cs_NG_MobileIdentity_Guti(omit, g_pars.ue_pars.guti)); + NGAP.send(nas_ul_msg); + + NGAP.receive(cr_NG_DEREGISTRATION_ACCEPT_MO); + as_ngap_handle_UeContextReleaseCmd(); +} + +private altstep as_ngap_handle_UeContextReleaseCmd() runs on ConnHdlr { + var NGAP_PDU rx_ngap; + + [] NGAP.receive(mw_ngap_initMsg(mw_n2_UEContextReleaseCommand)) -> value rx_ngap { + var AMF_UE_NGAP_ID amf_id := valueof(f_NGAP_get_AMF_UE_NGAP_ID(rx_ngap)); + var RAN_UE_NGAP_ID ran_id := valueof(f_NGAP_get_RAN_UE_NGAP_ID(rx_ngap)); + NGAP.send(m_ngap_succMsg(f_ts_n2_UEContextReleaseComplete(amf_id, ran_id, f_ULI()))); + } +} + /* Handle a PDUSessionResourceSetupRequestTransfer contained inside NGAP InitialContextSetupRequest and return a Result for InitialContextSetupResponse */ private function f_pdu_handle_session_resource_released_item(PDUSessionResourceToReleaseItemRelCmd cmd) runs on ConnHdlr return PDUSessionResourceReleasedItemRelRes { diff --git a/deps/Makefile b/deps/Makefile index 818d610..4dba0a1 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -72,7 +72,7 @@ # Use tag names from 'git describe --tags' or commit hashes. This way we get # exact commits of deps when doing regression testing. -nas_commit= dcb175be8b2d9b4daf3e8a4ebf27da3caae8f7cb +nas_commit= ab43cccb96db6067ffba1c763b47cb25cd61b780 titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da titan.ProtocolEmulations.M3UA_commit= b58f92046e48a7b1ed531e243a2319ebca53bf4c titan.ProtocolEmulations.SCCP_commit= 750a3e836831e58eae59d4757ef5d0c759f9ca5d diff --git a/library/NG_NAS_Osmo_Templates.ttcn b/library/NG_NAS_Osmo_Templates.ttcn index c1c8b44..4f8e8cc 100644 --- a/library/NG_NAS_Osmo_Templates.ttcn +++ b/library/NG_NAS_Osmo_Templates.ttcn @@ -405,6 +405,34 @@ } } +/* 24.501 cl. 8.2.12 (UE originating deregister) */ +template (value) NG_NAS_UL_Message_Type +cs_NG_DEREGISTRATION_REQUEST_MO(template (value) DeregisterType p_DeregisterType, + template (value) NAS_KeySetIdentifier p_KSI, + template (value) NG_MobileIdentity p_MobileId) := +{ + deregistration_RequestMO := { + protocolDiscriminator := tsc_EPD_GMM, /* cl. 9.2 M V 1 */ + spareHalfOctet := tsc_SpareHalfOctet, /* cl. 9.3 M V 1/2 */ + securityHeaderType := tsc_SHT_NoSecurityProtection, + messageType := tsc_MT_NG_DeregistrationRequest_MO, /* cl. 9.7 M V 1 */ + ngKSI := p_KSI, /* cl. 9.11.3.32 M V 1/2 */ + deregistrationType := p_DeregisterType, /* cl. 9.11.3.20 M V 1/2 */ + ngMobileId := p_MobileId /* cl. 9.11.3.4 M LV 5-? */ + } +} + +/* 24.501 cl. 8.2.13 De-registration accept (UE originating de-registration) */ +template (present) NG_NAS_DL_Message_Type cr_NG_DEREGISTRATION_ACCEPT_MO := +{ + deregistration_Accept := { + protocolDiscriminator := tsc_EPD_GMM, /* cl. 9.2 M V 1 */ + spareHalfOctet := tsc_SpareHalfOctet, /* cl. 9.3 M V 1/2 */ + securityHeaderType := tsc_SHT_NoSecurityProtection, + messageType := tsc_MT_NG_DeregistrationAccept_MO /* cl. 9.7 M V 1 */ + } +}; + /* 24.501 cl. 8.2.19 */ template (present) NG_NAS_DL_Message_Type cr_NG_CONFIGURATION_UPDATE_COMMAND(template ConfigUpdateInd p_ConfigUpdateInd := *, -- 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: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iab438d5a7cc5f2ba58943e4568c1fb5e5f41f99d Gerrit-Change-Number: 40819 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month

1
0
0 0

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

by pespin

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

1 month

1
0
0 0

[S] Change in osmo-uecups[master]: cosmetic: Improve comments on cancellable thread safety

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email ) Change subject: cosmetic: Improve comments on cancellable thread safety ...................................................................... cosmetic: Improve comments on cancellable thread safety * Move the comment explaining safety measures to the top of the thread function * Document that special care must be taken in mutual exclusion zones within the thread code. Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 --- M daemon/gtp_endpoint.c M daemon/tun_device.c 2 files changed, 21 insertions(+), 10 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/daemon/gtp_endpoint.c b/daemon/gtp_endpoint.c index 7892d4e..87d333c 100644 --- a/daemon/gtp_endpoint.c +++ b/daemon/gtp_endpoint.c @@ -124,11 +124,16 @@ } } -/* one thread for reading from each GTP/UDP socket (GTP decapsulation -> tun) - * IMPORTANT!: All logging functions in this function block must be called with - * PTHREAD_CANCEL_DISABLE set, otherwise the thread could be cancelled while - * holding the logging mutex, hence causing deadlock with main (or other) - * thread. */ +/* One thread for reading from each GTP/UDP socket (GTP decapsulation -> tun) + * IMPORTANT!: Since this thread is cancellable (deferred type): + * - All osmo logging functions in this thread must be called with PTHREAD_CANCEL_DISABLE set, + * otherwise the thread could be cancelled while holding the libosmocore logging mutex, hence causing + * deadlock with main (or other) thread. + * - Within pthread_rwlock_*(&d->rwlock) mutual exclusion zone, if we ever do any call considered + * a cancellation point (see "man pthreads"), then make sure to do the call protected with + * PTHREAD_CANCEL_DISABLE set, otherwise we may leave the d->rwlock held forever and cause a deadlock + * with main (or other) thread. + */ static void *gtp_endpoint_thread(void *arg) { struct gtp_endpoint *ep = (struct gtp_endpoint *)arg; diff --git a/daemon/tun_device.c b/daemon/tun_device.c index ee4fbcc..40b6ec3 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -212,7 +212,16 @@ return rc; } -/* one thread for reading from each TUN device (TUN -> GTP encapsulation) */ +/* One thread for reading from each TUN device (TUN -> GTP encapsulation) + * IMPORTANT!: Since this thread is cancellable (deferred type): + * - All osmo logging functions in this thread must be called with PTHREAD_CANCEL_DISABLE set, + * otherwise the thread could be cancelled while holding the libosmocore logging mutex, hence causing + * deadlock with main (or other) thread. + * - Within pthread_rwlock_*(&d->rwlock) mutual exclusion zone, if we ever do any call considered + * a cancellation point (see "man pthreads"), then make sure to do the call protected with + * PTHREAD_CANCEL_DISABLE set, otherwise we may leave the d->rwlock held forever and cause a deadlock + * with main (or other) thread. + */ static void *tun_device_thread(void *arg) { struct tun_device *tun = (struct tun_device *)arg; @@ -223,10 +232,6 @@ uint8_t base_buffer[payload_off_4byte_aligned + MAX_UDP_PACKET]; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); - /* IMPORTANT!: All logging functions in this function block must be called with - * PTHREAD_CANCEL_DISABLE set, otherwise the thread could be cancelled while - * holding the logging mutex, hence causing deadlock with main (or other) - * thread. */ snprintf(thread_name, sizeof(thread_name), "Rx%s", tun->devname); pthread_setname_np(pthread_self(), thread_name); @@ -269,6 +274,7 @@ continue; } rc = tx_gtp1u_pkt(t, base_buffer, buffer, nread); + /* pthread_rwlock_unlock() was called inside tx_gtp1u_pkt(). */ if (rc < 0) { LOGTUN_NC(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 Gerrit-Change-Number: 40798 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 month

1
0
0 0

[S] Change in osmo-uecups[master]: tun_device: Introduce helper macro LOGTUN_NC()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email ) Change subject: tun_device: Introduce helper macro LOGTUN_NC() ...................................................................... tun_device: Introduce helper macro LOGTUN_NC() Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 --- M daemon/tun_device.c 1 file changed, 14 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/daemon/tun_device.c b/daemon/tun_device.c index b32c08a..ee4fbcc 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -46,6 +46,16 @@ #define LOGTUN(tun, lvl, fmt, args ...) \ LOGP(DTUN, lvl, "%s: " fmt, (tun)->devname, ## args) +/* LOGTUN "No Cancel": Use within the pthread which can be pthread_cancel()ed, in + * order to avoid exiting with the logging mutex held and causing a deadlock afterwards. */ +#define LOGTUN_NC(ep, lvl, fmt, args ...) \ + do { \ + int _old_cancelst_unused; \ + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &_old_cancelst_unused); \ + LOGTUN(tun, lvl, fmt, ## args); \ + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &_old_cancelst_unused); \ + } while (0) + /* extracted information from a packet */ struct pkt_info { struct sockaddr_storage saddr; @@ -211,7 +221,6 @@ /* Make sure "buffer" below ends up aligned to 4byte so that it can access struct iphdr in a 4-byte aligned way. */ const size_t payload_off_4byte_aligned = ((sizeof(struct gtp1_header) + sizeof(struct gtp1_exthdr)) + 3) & (~0x3); uint8_t base_buffer[payload_off_4byte_aligned + MAX_UDP_PACKET]; - int old_cancelst_unused; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); /* IMPORTANT!: All logging functions in this function block must be called with @@ -231,18 +240,14 @@ /* 1) read from tun */ rc = read(tun->fd, buffer, MAX_UDP_PACKET); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_FATAL, "Error readingfrom tun device: %s\n", strerror(errno)); + LOGTUN_NC(tun, LOGL_FATAL, "Error readingfrom tun device: %s\n", strerror(errno)); exit(1); } nread = rc; rc = parse_pkt(&pinfo, buffer, nread); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_NOTICE, "Error parsing IP packet: %s\n", - osmo_hexdump(buffer, nread)); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); + LOGTUN_NC(tun, LOGL_NOTICE, "Error parsing IP packet: %s\n", osmo_hexdump(buffer, nread)); continue; } @@ -260,15 +265,12 @@ getnameinfo((const struct sockaddr *)&pinfo.saddr, sizeof(pinfo.saddr), host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV); - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); + LOGTUN_NC(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); continue; } rc = tx_gtp1u_pkt(t, base_buffer, buffer, nread); if (rc < 0) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); - LOGTUN(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); + LOGTUN_NC(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 Gerrit-Change-Number: 40797 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 month

1
0
0 0

[S] Change in osmo-uecups[master]: cosmetic: Improve comments on cancellable thread safety

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email ) Change subject: cosmetic: Improve comments on cancellable thread safety ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40798?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 Gerrit-Change-Number: 40798 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 13:04:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[S] Change in osmo-uecups[master]: tun_device: Introduce helper macro LOGTUN_NC()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email ) Change subject: tun_device: Introduce helper macro LOGTUN_NC() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40797?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 Gerrit-Change-Number: 40797 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 13:04:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month

1
0
0 0

[XL] Change in osmo-sgsn[master]: Adopt iu_client from osmo-iuh

by Jenkins Builder

Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40812?usp=email ) Change subject: Adopt iu_client from osmo-iuh ...................................................................... Patch Set 1: (15 comments) File include/osmocom/sgsn/iu_client.h: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/cac97608_81c710b6?us… : PS1, Line 70: typedef int (* ranap_iu_recv_cb_t )(struct msgb *msg, struct gprs_ra_id *ra_id, do not add new typedefs Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/bbb47fa4_e85b0453?us… : PS1, Line 70: typedef int (* ranap_iu_recv_cb_t )(struct msgb *msg, struct gprs_ra_id *ra_id, space prohibited after that '*' (ctx:BxW) Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/44836e91_67482f63?us… : PS1, Line 70: typedef int (* ranap_iu_recv_cb_t )(struct msgb *msg, struct gprs_ra_id *ra_id, space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/dd039823_5be72d30?us… : PS1, Line 73: typedef int (* ranap_iu_event_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, do not add new typedefs Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/a227921d_4f1ab95d?us… : PS1, Line 73: typedef int (* ranap_iu_event_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, space prohibited after that '*' (ctx:BxW) Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/6794df86_bf12acda?us… : PS1, Line 73: typedef int (* ranap_iu_event_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, space prohibited before that close parenthesis ')' Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/69b3e3e9_6343b807?us… : PS1, Line 76: typedef int (* ranap_iu_rab_ass_resp_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, uint8_t rab_id, space prohibited after that '*' (ctx:BxW) Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/e104cdc5_fc2dc166?us… : PS1, Line 76: typedef int (* ranap_iu_rab_ass_resp_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, uint8_t rab_id, space prohibited before that close parenthesis ')' File src/sgsn/iu_client.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/52a3f888_d4fecf0d?us… : PS1, Line 399: msg = ranap_new_msg_sec_mod_cmd(vec->ik, send_ck? vec->ck : NULL, spaces required around that '?' (ctx:VxW) Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/ed4c6631_c206cb83?us… : PS1, Line 443: -- not used at present -- please, no spaces at the start of a line Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/ccde724d_c7a57127?us… : PS1, Line 443: -- not used at present -- space prohibited after that '--' (ctx:ExW) Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/5054efe2_390b3179?us… : PS1, Line 443: -- not used at present -- space prohibited before that '--' (ctx:WxE) Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/0eff36f1_faa4e5db?us… : PS1, Line 527: if (ies->presenceMask & DIRECTTRANSFERIES_RANAP_RAC_PRESENT) { braces {} are not necessary for single statement blocks Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/bd1ae5ee_fbe47a3a?us… : PS1, Line 669: else else should follow close brace '}' Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-sgsn/+/40812/comment/cf22a764_f5af726d?us… : PS1, Line 874: LOGPIUC(log_level, ", for %s %08x\n", is_ps? "PTMSI" : "TMSI", *tmsi_or_ptmsi); spaces required around that '?' (ctx:VxW) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9c0d9667ddcb57b52eae34da942acfc1688c1418 Gerrit-Change-Number: 40812 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 01 Aug 2025 13:03:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month

1
0
0 0

[S] Change in osmo-sgsn[master]: routing area: add LOGRA() logging macro

by lynxis lazus

Attention is currently required from: fixeria, pespin. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40692?usp=email ) Change subject: routing area: add LOGRA() logging macro ...................................................................... Patch Set 3: (2 comments) File include/osmocom/sgsn/gprs_routing_area.h: https://gerrit.osmocom.org/c/osmo-sgsn/+/40692/comment/77f959ad_ae4a8037?us… : PS2, Line 15: char __log_rai_buf[32]; \ > are you sure 32 is enough? sounds a bit tight. I used the same size as libosmocore uses it in osmo_rai_name2(). But it is enought because it should be only 18 chars including '\0'. 901-070-65535-254 https://gerrit.osmocom.org/c/osmo-sgsn/+/40692/comment/e587bd79_b3e233ea?us… : PS2, Line 16: osmo_rai_name2_buf > Yeah, I had similar problems in libosmo-sigtran. I'm in favour of using _buf() here. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ib287b70c34b21ce64bc864f69fcf6af5fa0698b9 Gerrit-Change-Number: 40692 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 12:56:09 +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>

1 month

1
0
0 0

[M] Change in osmo-sgsn[master]: routing area: introduce ran_type on the RA

by lynxis lazus

Attention is currently required from: daniel, fixeria, pespin. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40688?usp=email ) Change subject: routing area: introduce ran_type on the RA ...................................................................... Patch Set 3: (1 comment) File src/sgsn/gprs_routing_area.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/40688/comment/b4b6075a_b74d4e97?us… : PS2, Line 201: valid for GERAN > Most of the previous api is related to geran. But will it do in a following commit. I'll do it later in https://gerrit.osmocom.org/c/osmo-sgsn/+/40811 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I59c35f1a4912ff11574bb31e4fe424816993548c Gerrit-Change-Number: 40688 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Aug 2025 12:56:02 +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> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 month

1
0
0 0

[M] Change in osmo-sgsn[master]: tests: RA: add tests when a RA/cell moves GERAN <=> UTRAN

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/40814?usp=email ) Change subject: tests: RA: add tests when a RA/cell moves GERAN <=> UTRAN ...................................................................... tests: RA: add tests when a RA/cell moves GERAN <=> UTRAN Change-Id: I1035e6cecdc5b2898bfb11817e569cd02fa7fa48 --- M tests/gprs_routing_area/gprs_routing_area_test.c M tests/gprs_routing_area/gprs_routing_area_test.ok 2 files changed, 103 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/14/40814/1 diff --git a/tests/gprs_routing_area/gprs_routing_area_test.c b/tests/gprs_routing_area/gprs_routing_area_test.c index b3f8ed1..42950be 100644 --- a/tests/gprs_routing_area/gprs_routing_area_test.c +++ b/tests/gprs_routing_area/gprs_routing_area_test.c @@ -24,6 +24,7 @@ #include <osmocom/core/rate_ctr.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/apn.h> +#include <osmocom/gsm/gsm23003.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/gsup.h> #include <osmocom/gprs/gprs_bssgp.h> @@ -537,6 +538,100 @@ cleanup_test(); } +/* check if a GERAN RA/cell with the same LAC as an already register UTRAN gets rejected */ +void test_routing_area_mv_utran_geran_reject(void) +{ + int rc; + + /* GERAN */ + struct osmo_routing_area_id geran_rai = { + .lac = { + .plmn = { .mcc = 262, .mnc = 42, .mnc_3_digits = false }, + .lac = 24 + }, + .rac = 43 + }; + struct osmo_cell_global_id_ps cgi_ps = { + .rai = geran_rai, + .cell_identity = 9998, + }; + uint16_t nsei = 2, bvci = 3; + + /* UTRAN */ + struct osmo_routing_area_id utran_rai = { + .lac = { + .plmn = { .mcc = 262, .mnc = 42, .mnc_3_digits = false }, + .lac = 24 + }, + .rac = 43 + }; + struct osmo_rnc_id rnc_id = { + .plmn = utran_rai.lac.plmn, + .rnc_id = 2222 + }; + + sgsn = sgsn_instance_alloc(tall_sgsn_ctx); + + printf("Testing Routing Area mv utran -> geran\n"); + + printf(" Registering UTRAN RA\n"); + rc = sgsn_ra_utran_register(&utran_rai, &rnc_id); + OSMO_ASSERT(rc == 0); + + printf(" Registering GERAN RA/cell via BVC Reset Ind (should fail)\n"); + rc = sgsn_ra_bvc_reset_ind(nsei, bvci, &cgi_ps); + OSMO_ASSERT(rc != 0); + + cleanup_test(); +} + +/* check if a UTRAN RA with the same LAC as an already register GERAN RA gets rejected */ +void test_routing_area_mv_geran_utran_reject(void) +{ + int rc; + + /* GERAN */ + struct osmo_routing_area_id geran_rai = { + .lac = { + .plmn = { .mcc = 262, .mnc = 42, .mnc_3_digits = false }, + .lac = 24 + }, + .rac = 43 + }; + struct osmo_cell_global_id_ps cgi_ps = { + .rai = geran_rai, + .cell_identity = 9998, + }; + uint16_t nsei = 2, bvci = 3; + + /* UTRAN */ + struct osmo_routing_area_id utran_rai = { + .lac = { + .plmn = { .mcc = 262, .mnc = 42, .mnc_3_digits = false }, + .lac = 24 + }, + .rac = 43 + }; + struct osmo_rnc_id rnc_id = { + .plmn = utran_rai.lac.plmn, + .rnc_id = 2222 + }; + + sgsn = sgsn_instance_alloc(tall_sgsn_ctx); + + printf("Testing Routing Area mv geran -> utran\n"); + + printf(" Registering GERAN RA/cell via BVC Reset Ind\n"); + rc = sgsn_ra_bvc_reset_ind(nsei, bvci, &cgi_ps); + OSMO_ASSERT(rc == 0); + + printf(" Registering UTRAN RA (should fail)\n"); + rc = sgsn_ra_utran_register(&utran_rai, &rnc_id); + OSMO_ASSERT(rc != 0); + + cleanup_test(); +} + static struct log_info_cat gprs_categories[] = { [DMM] = { .name = "DMM", @@ -601,6 +696,8 @@ test_routing_area_paging(); test_routing_area_geran_geran_sig_reset(); test_routing_area_geran_geran_bvci_change(); + test_routing_area_mv_geran_utran_reject(); + test_routing_area_mv_utran_geran_reject(); printf("Done\n"); talloc_report_full(osmo_sgsn_ctx, stderr); diff --git a/tests/gprs_routing_area/gprs_routing_area_test.ok b/tests/gprs_routing_area/gprs_routing_area_test.ok index 4ce9944..002baaa 100644 --- a/tests/gprs_routing_area/gprs_routing_area_test.ok +++ b/tests/gprs_routing_area/gprs_routing_area_test.ok @@ -20,4 +20,10 @@ Checking cell on BVCI B Ensure only 1 RA is present Ensure only 1 cell is present +Testing Routing Area mv geran -> utran + Registering GERAN RA/cell via BVC Reset Ind + Registering UTRAN RA (should fail) +Testing Routing Area mv utran -> geran + Registering UTRAN RA + Registering GERAN RA/cell via BVC Reset Ind (should fail) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/40814?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: I1035e6cecdc5b2898bfb11817e569cd02fa7fa48 Gerrit-Change-Number: 40814 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2025