lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

November 2023

  • 1 participants
  • 1508 discussions
[S] Change in libosmocore[osmith/1.9.2]: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error
by pespin 28 Nov '23

28 Nov '23
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email ) Change subject: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iee361d740845257fa62c9093e30e8079fa933827 Gerrit-Change-Number: 35145 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 Nov 2023 12:00:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[M] Change in osmo-bts[master]: Transmit invalid AMR speech blocks instead of dummy FACCH
by jolly 28 Nov '23

28 Nov '23
Attention is currently required from: falconia, fixeria, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email ) Change subject: Transmit invalid AMR speech blocks instead of dummy FACCH ...................................................................... Patch Set 2: (6 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/ae389c39_b8a82383 PS2, Line 12: TCH/HS > TCH/AHS, not TCH/HS. Done File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/81449da0_c741db9e PS2, Line 541: AMR > Maybe say TCH/AFS rather than just AMR, for consistency. Done https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/298e64c5_24a77de1 PS2, Line 541: * - If the channel mode is AMR, transmit a dummy with speech > And yes, as @falcon@freecalypso. […] Done https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/aac791c5_2168bf2d PS2, Line 578: dummy_facch: > Alternatively, we can move generation of dummy FACCH into a `static inline` function (`src/osmo-bts- […] I implemented the suggestion by @pespin@sysmocom.de. Moving code to an inline function is ok with TCH/F, but not TCH/H, because there is an additional check that refers, if FACCH is not allowed at the FN of the requested bursts: "if (!sched_tchh_dl_facch_map[br->fn % 26])" File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/edee87f2_ae025ee5 PS2, Line 453: /* - If the channel mode is TCH/HS or TCH/EFS, transmit a dummy > The overall structure of the comment after your change no longer makes sense. […] Done https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/6e6d4645_de5d7773 PS2, Line 453: TCH/EFS > If we are keeping the whole comment structure as-is (see my other comment), this part should read TC […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3 Gerrit-Change-Number: 35132 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 Nov 2023 12:00:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment
1 0
0 0
[M] Change in osmo-bts[master]: Transmit invalid AMR speech blocks instead of dummy FACCH
by jolly 28 Nov '23

28 Nov '23
Attention is currently required from: falconia, jolly, pespin. Hello Jenkins Builder, falconia, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Transmit invalid AMR speech blocks instead of dummy FACCH ...................................................................... Transmit invalid AMR speech blocks instead of dummy FACCH Every BTS needs to have some graceful handling for the scenario where it is time to send out a speech frame on TCH DL, but there is no frame to be sent. One possible solution is to transmit dummy FACCH, but this option is unattractive for TCH/AHS where FACCH displaces two speech frames rather than one. A more elegant solution is to emit a speech frame that is bad, causing the MS receiver to declare a BFI condition to trigger substitution and muting procedure. A bad frame is generated by gsm0503_tch_{afs,ahs}_encode() by setting the playload length to 0. Depends: libosmocore.git I82ce2adf995a4b42d1f378c5819f88d773b9104a Related: OS#6049 Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 57 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/35132/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3 Gerrit-Change-Number: 35132 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset
1 0
0 0
[S] Change in libosmocore[osmith/1.9.2]: Disable uring when building for embedded
by osmith 28 Nov '23

28 Nov '23
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35147?usp=email ) Change subject: Disable uring when building for embedded ...................................................................... Disable uring when building for embedded Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Related: OS#6233 (cherry picked from commit 0266b531c5f261e3e3a0235d2681bedd8b9e0f31) --- M configure.ac 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/35147/1 diff --git a/configure.ac b/configure.ac index 2fc9895..29a9570 100644 --- a/configure.ac +++ b/configure.ac @@ -403,6 +403,7 @@ AM_CONDITIONAL(ENABLE_LIBSCTP, false) AM_CONDITIONAL(ENABLE_LIBUSB, false) AM_CONDITIONAL(ENABLE_PCSC, false) + AM_CONDITIONAL(ENABLE_URING, false) AM_CONDITIONAL(ENABLE_PSEUDOTALLOC, true) AM_CONDITIONAL(ENABLE_SERCOM_STUB, true) AM_CONDITIONAL(EMBEDDED, true) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Gerrit-Change-Number: 35147 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
[S] Change in libosmocore[osmith/1.9.2]: logging_gsmtap: Temporarily disable logging when sending the logs
by osmith 28 Nov '23

28 Nov '23
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35146?usp=email ) Change subject: logging_gsmtap: Temporarily disable logging when sending the logs ...................................................................... logging_gsmtap: Temporarily disable logging when sending the logs This avoids an infinite recursion when sending a gsmtap log message causes a log message. Temporarily set target->loglevel higher than LOGL_FATAL, which effectively disables logging for that target. Other targets like stderr will still log this message so there is still an indication that something went wrong. Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Related: OS#6213 (cherry picked from commit f2629675aac5f95ae3c01f86f5bb3f342a1c1f9b) --- M src/core/logging_gsmtap.c 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/35146/1 diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index dfd059b..7775c27 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -65,6 +65,7 @@ struct timeval tv; int rc; const char *file_basename; + unsigned int _level; /* get timestamp ASAP */ osmo_gettimeofday(&tv, NULL); @@ -114,7 +115,11 @@ } msgb_put(msg, rc); + /* Ensure that any error occurring when sending the log message doesn't cause infinite recursion */ + _level = target->loglevel; + target->loglevel = UINT8_MAX; rc = gsmtap_sendmsg(target->tgt_gsmtap.gsmtap_inst, msg); + target->loglevel = _level; if (rc) msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 35146 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
[S] Change in libosmocore[osmith/1.9.2]: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error
by osmith 28 Nov '23

28 Nov '23
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email ) Change subject: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error ...................................................................... sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error It's fine changing the define because due to the previous error it means basically that it was never used so far, because using it triggers a compilation error. The error was introduced because I ended up not using this in the past after submitting this code, and now that I want to use it it went noticed that it fails. Change-Id: Iee361d740845257fa62c9093e30e8079fa933827 (cherry picked from commit d9a5c8d32f10af0479c87b957fd7e23cecb8fcce) --- M include/osmocom/core/sockaddr_str.h 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/35145/1 diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index 2d3e7e9..c646f49 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -63,7 +63,7 @@ ((R)->af == AF_INET6) ? "[" : "", \ (R)->ip, \ ((R)->af == AF_INET6) ? "]" : "", \ - (R)->port : 0 + (R)->port #define OSMO_SOCKADDR_STR_FMT_ARGS(R) \ ((R) && (R)->af == AF_INET6) ? "[" : "", \ (R) ? (R)->ip : "NULL", \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iee361d740845257fa62c9093e30e8079fa933827 Gerrit-Change-Number: 35145 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
[S] Change in libosmocore[osmith/1.9.2]: Bump version: 1.9.1.3-128b-dirty → 1.9.2
by osmith 28 Nov '23

28 Nov '23
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35148?usp=email ) Change subject: Bump version: 1.9.1.3-128b-dirty → 1.9.2 ...................................................................... Bump version: 1.9.1.3-128b-dirty → 1.9.2 Change-Id: I0feec4b39d59f11c2f6d77bcac96c89de549fcd5 --- M debian/changelog M src/core/Makefile.am 2 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/35148/1 diff --git a/debian/changelog b/debian/changelog index 012a76d..9a06fe9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libosmocore (1.9.2) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error + + [ Daniel Willmann ] + * logging_gsmtap: Temporarily disable logging when sending the logs + * Disable uring when building for embedded + + -- Oliver Smith <osmith(a)sysmocom.de> Tue, 28 Nov 2023 12:59:15 +0100 + libosmocore (1.9.1) unstable; urgency=medium [ Manawyrm ] diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 109aae7..796e906 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=21:1:0 +LIBVERSION=21:2:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35148?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: I0feec4b39d59f11c2f6d77bcac96c89de549fcd5 Gerrit-Change-Number: 35148 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests: tell PCU a more realistic BTS model
by dexter 28 Nov '23

28 Nov '23
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35144?usp=email ) Change subject: PCU_Tests: tell PCU a more realistic BTS model ...................................................................... PCU_Tests: tell PCU a more realistic BTS model In ts_PCUIF_INFO_default we set the bts_model member to PCU_IF_BTS_MODEL_UNSPEC. This means that the PCU will not know the BTS model and thus it is not able to comply to the specific pecularities of the BTS model that is used. In PCU_Tests.ttcn we simulate the behavior of an OsmoBTS with OsmoTRX, therefore we should set the BTS model to PCU_IF_BTS_MODEL_TRX. This will also fix the problems we have with unexpected DUMMY messages we currently receive since in an OsmoTRX based BTS model those frames will be generated by OsmoTRX and do not appear on the PCUIF interface. When the BTS model is left unspecified, then the PCU will generate those DUMMY messages and irretate the testsuite. Related: OS#6191 Change-Id: I6b516eece6acc96ebde9759bcb609197a245dd84 --- M pcu/PCU_Tests.ttcn 1 file changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/35144/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index fb935d9..442d617 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -112,7 +112,7 @@ remote_port := { mp_nsconfig.nsvc[0].provider.ip.local_udp_port, 0 }, remote_addr := f_PCUIF_RemoteAddr( f_PCUIF_AF2addr_type(mp_nsconfig.nsvc[0].provider.ip.address_family), mp_nsconfig.nsvc[0].provider.ip.local_ip), - bts_model := PCU_IF_BTS_MODEL_UNSPEC + bts_model := PCU_IF_BTS_MODEL_TRX } /* Passed in RAN-INFO message from emulated neighbor using RIM */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6b516eece6acc96ebde9759bcb609197a245dd84 Gerrit-Change-Number: 35144 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange
1 0
0 0
[S] Change in libosmocore[osmith/1.9.1]: Bump version: 1.9.0.1-7d414-dirty → 1.9.1
by osmith 28 Nov '23

28 Nov '23
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35143?usp=email ) Change subject: Bump version: 1.9.0.1-7d414-dirty → 1.9.1 ...................................................................... Bump version: 1.9.0.1-7d414-dirty → 1.9.1 Change-Id: I2ce06826d6b11bcd88daa99fada77a05f740eb7a --- M debian/changelog M src/core/Makefile.am 2 files changed, 17 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index c9184df..012a76d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmocore (1.9.1) unstable; urgency=medium + + [ Manawyrm ] + * logging: ensure ANSI color escape is sent in same line/before newline + + -- Oliver Smith <osmith(a)sysmocom.de> Tue, 28 Nov 2023 11:21:41 +0100 + libosmocore (1.9.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 326c68d..109aae7 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=21:0:0 +LIBVERSION=21:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.1 Gerrit-Change-Id: I2ce06826d6b11bcd88daa99fada77a05f740eb7a Gerrit-Change-Number: 35143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[S] Change in libosmocore[osmith/1.9.1]: logging: ensure ANSI color escape is sent in same line/before newline
by osmith 28 Nov '23

28 Nov '23
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email ) Change subject: logging: ensure ANSI color escape is sent in same line/before newline ...................................................................... logging: ensure ANSI color escape is sent in same line/before newline This fixes multi-line color clobbering in logging daemons like systemd-journald, which work with single-lines only. Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433 Closes: OS#6249 (cherry picked from commit 11a416827dd9f2da6b7c1db0e1e83adb1e6e5cc8) --- M src/core/logging.c M tests/loggingrb/logging_test.err 2 files changed, 25 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/core/logging.c b/src/core/logging.c index c6774f5..dc19cf3 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -616,7 +616,15 @@ } if (target->use_color && c_subsys) { - ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END); + /* Ensure the last color escape is sent before the newline + * (to not clobber journald, which works on single-lines only) */ + if (offset > 0 && buf[offset - 1] == '\n') { + offset--; rem++; + ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END "\n"); + } else { + ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END); + } + if (ret < 0) goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); diff --git a/tests/loggingrb/logging_test.err b/tests/loggingrb/logging_test.err index b59d2e8..e070561 100644 --- a/tests/loggingrb/logging_test.err +++ b/tests/loggingrb/logging_test.err @@ -1,3 +1,2 @@ -You should see this -You should see this - \ No newline at end of file +You should see this +You should see this -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.1 Gerrit-Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433 Gerrit-Change-Number: 35142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: manawyrm <osmocom.account(a)tbspace.de> Gerrit-MessageType: merged
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30
  • 31
  • ...
  • 151
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.