- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_periodic_registration_updating

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40799?usp=email ) Change subject: 5gc: Introduce test TC_periodic_registration_updating ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40799?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: I63da25a3927cb459563d4325adc690beb8a67451 Gerrit-Change-Number: 40799 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Jul 2025 19:38:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[XS] Change in pysim[master]: pySim.esim.saip.FsNodeADF: Fix __str__ method

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/40759?usp=email ) Change subject: pySim.esim.saip.FsNodeADF: Fix __str__ method ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/40759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I919d7c46575e0ebcdf3b979347a5cdd1a9feb294 Gerrit-Change-Number: 40759 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 31 Jul 2025 19:36:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 3 days

1
0
0 0

[XS] Change in ...logger_gsmtap[master]: contrib/jenkins.sh: add build verification script

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/40800?usp=email ) Change subject: contrib/jenkins.sh: add build verification script ...................................................................... contrib/jenkins.sh: add build verification script Change-Id: I3183112c96c92716edb4fb485621d14d531166cc --- A contrib/jenkins.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/logger_gsmtap refs/changes/00/40800/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..d58398d --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,5 @@ +#!/bin/sh -ex + +rebar3 clean +rebar3 compile +rebar3 dialyzer -- To view, visit https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/40800?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/logger_gsmtap Gerrit-Branch: master Gerrit-Change-Id: I3183112c96c92716edb4fb485621d14d531166cc Gerrit-Change-Number: 40800 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[XS] Change in ...logger_gsmtap[master]: logger_gsmtap.app.src: add vim modeline and syntax hint

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/40801?usp=email ) Change subject: logger_gsmtap.app.src: add vim modeline and syntax hint ...................................................................... logger_gsmtap.app.src: add vim modeline and syntax hint Change-Id: Id8cd8e1ab19ed2209ff1d867a7026b7663920013 --- M src/logger_gsmtap.app.src 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/logger_gsmtap refs/changes/01/40801/1 diff --git a/src/logger_gsmtap.app.src b/src/logger_gsmtap.app.src index 0307fb0..8eb1a26 100644 --- a/src/logger_gsmtap.app.src +++ b/src/logger_gsmtap.app.src @@ -1,3 +1,5 @@ +%% -*- erlang -*- + {application, logger_gsmtap, [ {description, "GSMTAP handler for Erlang's Logger module"}, {vsn, semver}, @@ -9,3 +11,5 @@ {licenses, ["Mozilla Public License 2.0"]}, {links, [{"Gitea", "https://gitea.osmocom.org/erlang/logger_gsmtap"}]} ]}. + +%% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/40801?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/logger_gsmtap Gerrit-Branch: master Gerrit-Change-Id: Id8cd8e1ab19ed2209ff1d867a7026b7663920013 Gerrit-Change-Number: 40801 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[M] Change in ...logger_gsmtap[master]: Create GSMTAP sink to avoid ICMP errors

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/39553?usp=email ) Change subject: Create GSMTAP sink to avoid ICMP errors ...................................................................... Abandoned I've pushed patches directly to gerrit in order to have the same commit hashes as in https://gitea.osmocom.org/erlang/logger_gsmtap, so that gitea can easily be turned into a mirror (without breaking projects that already reference commit hashes, like osmo-s1gw.git). New patches will go through the normal review process via gerrit. -- To view, visit https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/39553?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: erlang/logger_gsmtap Gerrit-Branch: master Gerrit-Change-Id: I1b103bb16d2e9f0bc6296a2feda138364ed640e2 Gerrit-Change-Number: 39553 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[L] Change in ...logger_gsmtap[master]: Initial commit

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/39552?usp=email ) Change subject: Initial commit ...................................................................... Abandoned I've pushed patches directly to gerrit in order to have the same commit hashes as in https://gitea.osmocom.org/erlang/logger_gsmtap, so that gitea can easily be turned into a mirror (without breaking projects that already reference commit hashes, like osmo-s1gw.git). New patches will go through the normal review process via gerrit. -- To view, visit https://gerrit.osmocom.org/c/erlang/logger_gsmtap/+/39552?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: erlang/logger_gsmtap Gerrit-Branch: master Gerrit-Change-Id: I30fad55b6e9d8d9f975de4deb2f97c1e98ae5c5e Gerrit-Change-Number: 39552 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: 5gc: Introduce test TC_periodic_registration_updating

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40799?usp=email ) Change subject: 5gc: Introduce test TC_periodic_registration_updating ...................................................................... 5gc: Introduce test TC_periodic_registration_updating Related: SYS#7073 Change-Id: I63da25a3927cb459563d4325adc690beb8a67451 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M 5gc/expected-results.xml 3 files changed, 50 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/40799/1 diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 9eb6f30..30615f2 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -92,7 +92,8 @@ cn_gtpu_ip := omit, cn_gtpu_teid := omit, qfi := omit, - ue_ip := omit + ue_ip := omit, + guti := omit } type component MTC_CT { @@ -301,6 +302,20 @@ vc_conn.done; } +private function f_TC_periodic_registration_updating() runs on ConnHdlr { + f_register(); + f_periodic_register_update(); +} +testcase TC_periodic_registration_updating() runs on MTC_CT { + f_init(); + 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_periodic_registration_updating), pars); + vc_conn.done; +} + private function f_TC_register_ping4() runs on ConnHdlr { f_register(); f_pdu_sess_establish(); @@ -340,6 +355,7 @@ execute( TC_ng_setup_unknown_global_gnb_id_plmn() ); execute( TC_ng_setup_wrong_tac() ); execute( TC_ng_register() ); + execute( TC_periodic_registration_updating() ); execute( TC_ng_register_ping4() ); execute( TC_ng_register_ping4_256() ); } diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 144b00b..fe96b45 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -79,7 +79,8 @@ charstring cn_gtpu_ip optional, OCT4 cn_gtpu_teid optional, OCT1 qfi optional, - charstring ue_ip optional + charstring ue_ip optional, + octetstring guti optional }; type record RunProgParams { @@ -388,6 +389,35 @@ as_ngap_handle_sec_mode(); NGAP.receive(cr_NG_REGISTRATION_ACCEPT) -> value rx_nas; + g_pars.ue_pars.guti := rx_nas.registration_Accept.guti.otherDigits; + NGAP.send(cs_NG_REGISTRATION_COMPLETE); + + as_ngap_handle_configuration_update(); +} + +function f_periodic_register_update() 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_REGISTRATION_REQUEST(cs_RegistrationType(tsc_NG_RegistrationPeriodic, '1'B), + g_pars.kset_id.nasKeySetId, + g_pars.kset_id.tsc, + cs_NG_MobileIdentity_Guti(omit, g_pars.ue_pars.guti), + p_UESecurityCap := f_UE_SecurityCapability()); + NGAP.send(nas_ul_msg); + + /* Expect updated KSI from network following 5G Core standards + * (open5gs.git 70310979c58fe186e9eaa06bec9d9a31f24ff7a1): */ + if (g_pars.kset_id.nasKeySetId != tsc_NasKsi_NoKey) { + if (g_pars.kset_id.nasKeySetId == '110'B) { + g_pars.kset_id.nasKeySetId := '000'B; + } else { + g_pars.kset_id.nasKeySetId := int2bit(bit2int(g_pars.kset_id.nasKeySetId) + 1, 3); + } + } + + NGAP.receive(cr_NG_REGISTRATION_ACCEPT) -> value rx_nas; + g_pars.ue_pars.guti := rx_nas.registration_Accept.guti.otherDigits; NGAP.send(cs_NG_REGISTRATION_COMPLETE); as_ngap_handle_configuration_update(); diff --git a/5gc/expected-results.xml b/5gc/expected-results.xml index 98dee58..a94eb6f 100644 --- a/5gc/expected-results.xml +++ b/5gc/expected-results.xml @@ -1,9 +1,10 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='1' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='7' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <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'/> + <testcase classname='C5G_Tests' name='TC_periodic_registration_updating' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register_ping4' time='MASKED'/> <testcase classname='C5G_Tests' name='TC_ng_register_ping4_256' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40799?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: I63da25a3927cb459563d4325adc690beb8a67451 Gerrit-Change-Number: 40799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/98/40798/1 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: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: Ic1ffe68c1637cb06787d4193347cb4200c819154 Gerrit-Change-Number: 40798 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

[S] Change in osmo-uecups[master]: gtp_endpoint: Avoid deadlocks logging while thread is cancelled

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-uecups/+/40788?usp=email ) Change subject: gtp_endpoint: Avoid deadlocks logging while thread is cancelled ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > I would prefer this included in LOGEP, or a version of the macro that contains those setcancelstate […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/40788?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: I1e141175440402a7db34f3d246104c6ea38031fb Gerrit-Change-Number: 40788 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 31 Jul 2025 15:25:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

2 weeks, 3 days

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/97/40797/1 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: newchange Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I4748a968bedcefe9892d5350a47310908c95d131 Gerrit-Change-Number: 40797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 3 days

1
0
0 0

2025

2024

2023

2022

gerrit-log