- gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: gsmtap_util: Simplify sink
by arehbein 08 Nov '23

08 Nov '23

Attention is currently required from: arehbein, laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34881?usp=email ) Change subject: gsmtap_util: Simplify sink ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4025920d5f62d17133e9b5fe81cd34a88c4f20b5 Gerrit-Change-Number: 34881 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 08 Nov 2023 18:16:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ctrl: Add cell barred
by matanp 07 Nov '23

07 Nov '23

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34968?usp=email ) Change subject: ctrl: Add cell barred ...................................................................... ctrl: Add cell barred Change-Id: I6dc45fa1d76707be0d9f9d4391550be598ed0a6d --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 43 insertions(+), 0 deletions(-) Approvals: matanp: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index cfcbe9d..4311145 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -1262,6 +1262,39 @@ CTRL_CMD_DEFINE_WO(bts_rach_access_control_class_allow, "rach-access-control-class allow"); +static int verify_bts_rach_cell_barred(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int bar = atoi(cmd->value); + + if ((bar != 0) && (bar != 1)) + return 1; + + return 0; +} + +static int get_bts_rach_cell_barred(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + + cmd->reply = talloc_asprintf(cmd, "%u", bts->si_common.rach_control.cell_bar); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +static int set_bts_rach_cell_barred(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + bts->si_common.rach_control.cell_bar = atoi(cmd->value); + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE(bts_rach_cell_barred, "rach-cell-barred"); + /* Return space concatenated set of tuples <UARFCN>,<scrambling code>,<diversity bit> */ static int get_bts_neighbor_list_si2quater_uarfcn(struct ctrl_cmd *cmd, void *data) { @@ -1364,6 +1397,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class_bar); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class_allow); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_cell_barred); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si2quater_uarfcn); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_si2quater_earfcn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34968?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6dc45fa1d76707be0d9f9d4391550be598ed0a6d Gerrit-Change-Number: 34968 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: ctrl: Add cell barred
by matanp 07 Nov '23

07 Nov '23

matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34968?usp=email ) Change subject: ctrl: Add cell barred ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34968?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6dc45fa1d76707be0d9f9d4391550be598ed0a6d Gerrit-Change-Number: 34968 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Tue, 07 Nov 2023 19:27:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: logging_gsmtap: Temporarily disable logging when sending the logs
by laforge 07 Nov '23

07 Nov '23

Attention is currently required from: arehbein, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34966?usp=email ) Change subject: logging_gsmtap: Temporarily disable logging when sending the logs ...................................................................... Patch Set 2: (2 comments) File src/core/logging_gsmtap.c: https://gerrit.osmocom.org/c/libosmocore/+/34966/comment/97b4a79f_937de618 PS1, Line 117: the > small addition (while we're at it): The verb is missing, so maybe sth. like […] Done https://gerrit.osmocom.org/c/libosmocore/+/34966/comment/bdbd6fb9_709908d6 PS1, Line 119: target->loglevel = LOGL_FATAL + 1; > Unlike sub-systems, it's highly unlikely that we'd add log levels - I don't think we ever have. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34966?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 34966 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Nov 2023 18:07:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: logging_gsmtap: Temporarily disable logging when sending the logs
by laforge 07 Nov '23

07 Nov '23

Attention is currently required from: arehbein, daniel, laforge. laforge has uploaded a new patch set (#2) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/libosmocore/+/34966?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder 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 --- M src/core/logging_gsmtap.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/34966/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34966?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 34966 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmocore[master]: logging_gsmtap: Temporarily disable logging when sending the logs
by laforge 07 Nov '23

07 Nov '23

Attention is currently required from: arehbein, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34966?usp=email ) Change subject: logging_gsmtap: Temporarily disable logging when sending the logs ...................................................................... Patch Set 1: (1 comment) File src/core/logging_gsmtap.c: https://gerrit.osmocom.org/c/libosmocore/+/34966/comment/4a2b36c5_74e13db0 PS1, Line 119: target->loglevel = LOGL_FATAL + 1; > Just learned something new from reviewing another patch... […] Unlike sub-systems, it's highly unlikely that we'd add log levels - I don't think we ever have. But still, UINT8_MAX should do the trick. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34966?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 34966 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Nov 2023 18:05:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc-nat[master]: the git:// protocol is deprecated for a long time; use https:// instead
by laforge 07 Nov '23

07 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/34981?usp=email ) Change subject: the git:// protocol is deprecated for a long time; use https:// instead ...................................................................... the git:// protocol is deprecated for a long time; use https:// instead Change-Id: Ic31d381b25d31f6ab5ce609a544321bc74008902 --- M README.md M debian/control M debian/copyright 3 files changed, 14 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/README.md b/README.md index 7c66e35..84fdbc1 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ You can clone from the official osmo-bsc-nat.git repository using - git clone git://git.osmocom.org/osmo-bsc-nat.git + git clone https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc-nat -There is a cgit interface at https://git.osmocom.org/osmo-bsc-nat/ +There is a gitea web interface for browsing at <https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc-nat> Documentation ------------- diff --git a/debian/control b/debian/control index 0b093d0..bf7eb60 100644 --- a/debian/control +++ b/debian/control @@ -18,8 +18,8 @@ libosmo-mgcp-client-dev (>= 1.9.0), osmo-gsm-manuals-dev (>= 1.2.0) Standards-Version: 3.9.8 -Vcs-Git: git://git.osmocom.org/osmo-bsc-nat.git -Vcs-Browser: https://git.osmocom.org/osmo-bsc-nat/ +Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc-nat +Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc-nat Homepage: https://projects.osmocom.org/projects/osmo-bsc-nat Package: osmo-bsc-nat diff --git a/debian/copyright b/debian/copyright index c8d37a5..f543482 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: osmo-bsc-nat -Source: git://git.osmocom.org/osmo-bsc-nat +Source: https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc-nat Files: * Copyright: 2021 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/34981?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ic31d381b25d31f6ab5ce609a544321bc74008902 Gerrit-Change-Number: 34981 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc-nat[master]: the git:// protocol is deprecated for a long time; use https:// instead
by laforge 07 Nov '23

07 Nov '23

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/34981?usp=email ) Change subject: the git:// protocol is deprecated for a long time; use https:// instead ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/34981?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ic31d381b25d31f6ab5ce609a544321bc74008902 Gerrit-Change-Number: 34981 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 07 Nov 2023 16:52:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: add HNBGW_Tests.TC_second_rab_assignment
by laforge 07 Nov '23

07 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?usp=email ) Change subject: add HNBGW_Tests.TC_second_rab_assignment ...................................................................... add HNBGW_Tests.TC_second_rab_assignment Related: SYS#6624 Related: osmo-hnbgw I25bf19981cd75a87a7ceb3382dae1ec626ae475c Change-Id: Iadaba0e5e82ad6d163ad509904ede213e2462d5c --- M hnbgw/HNBGW_Tests.ttcn M library/ranap/RANAP_Templates.ttcn 2 files changed, 132 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 505beab..adb32bd 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -2596,6 +2596,73 @@ f_shutdown_helper(); } +/* In the field, we encountered a "normal" RAB Assignment that concludes successfully, followed by another RAB + * Assignment that has different SDU subflow parameters, and does not contain RTP information. At the time of writing, + * it seems that the second RAB Assignment causes a crash. Play through this scenario. */ +friend function f_tc_second_rab_assignment(charstring id, TestHdlrParams pars) runs on ConnHdlr { + var MgcpCommand mgcp_cmd; + var RANAP_PDU tx; + timer T := 5.0; + + f_init_handler(pars); + f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + + tx := f_build_initial_ue(g_pars); + f_iuh2iu_connect(tx); + + f_create_rab(pars.mgcp_pars); + + /* Now send a second RAB Assignment with different subflows and omitting transportLayerInformation. (Assuming + * the first RAB Assignment's transportLayerInformation remains in use unchanged.) */ + var template RAB_SetupOrModifyList rab_sml; + rab_sml := ts_RAB_SML2(t_RAB_id(23), + ts_RabParams, + user_plane_info := omit, + transport_layer_info := omit); + tx := valueof(ts_RANAP_RabAssReq(rab_sml)); + BSSAP.send(tx); + T.start; + + /* Expect this secondary RAB Assignment to go through unchanged. */ + f_rua_expect(tx); + + /* I'm guessing that the RAB Assignment Response also omits transportLayerInformation, so far not known because + * osmo-hnbgw crashed before we could receive the response. */ + + /* Send back RAB Assignment Response via Iuh */ + var template RAB_SetupOrModifiedList rab_smdl; + rab_smdl := ts_RAB_SMdL_no_tla(t_RAB_id(23)); + tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); + RUA.send(tx); + f_bssap_expect(tx); + + /* Send Iu Release */ + tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + f_iu2iuh(tx); + + T.start; + alt { + [] as_mgcp_dlcx(pars) {} + [] T.timeout { + setverdict(fail, "Timeout waiting for DLCX"); + } + } + + tx := valueof(ts_RANAP_IuReleaseComplete()); + f_iuh2iu(tx); +} + +testcase TC_second_rab_assignment() runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + f_init(); + + vc_conn := f_start_handler_with_pars(refers(f_tc_second_rab_assignment), t_pars(3)); + vc_conn.done; + + f_shutdown_helper(); +} + control { execute(TC_hnb_register()); execute(TC_hnb_register_duplicate()); @@ -2643,6 +2710,8 @@ execute( TC_sgsnpool_sccp_n_pcstate_detaches_cnlink() ); execute( TC_sgsnpool_sccp_n_pcstate_attaches_cnlink() ); + execute(TC_second_rab_assignment()); + /* Run at the end since it makes osmo-hnbgw <= 1.3.0 crash: OS#5676 */ execute(TC_hnb_reregister_reuse_sctp_assoc()); diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 051195f..018cb81 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -1331,6 +1331,42 @@ } } } +/* Like ts_RAB_SML(), but more control on presence/absence of individual IEs */ +template (value) RAB_SetupOrModifyList ts_RAB_SML2( + template (value) RAB_ID rab_id, + template (omit) RAB_Parameters rab_params, + template (omit) UserPlaneInformation user_plane_info, + template (omit) TransportLayerInformation transport_layer_info + ) := { { + { + id := id_RAB_SetupOrModifyItem, + firstCriticality := reject, + firstValue := { + rAB_SetupOrModifyItemFirst := { + rAB_ID := rab_id, + nAS_SynchronisationIndicator := omit, + rAB_Parameters := rab_params, + userPlaneInformation := user_plane_info, + transportLayerInformation := transport_layer_info, + service_Handover := omit, + iE_Extensions := omit + } + }, + secondCriticality := ignore, + secondValue := { + rAB_SetupOrModifyItemSecond := { + pDP_TypeInformation := omit, + dataVolumeReportingIndication := omit, + dl_GTP_PDU_SequenceNumber := omit, + ul_GTP_PDU_SequenceNumber := omit, + dl_N_PDU_SequenceNumber := omit, + ul_N_PDU_SequenceNumber := omit, + iE_Extensions := omit + } + } + } +} } + template (value) TransportLayerInformation ts_TLI_ps(template (value) TransportLayerAddress tla, template (value) GTP_TEI gtp_tei) := { transportLayerAddress := tla, @@ -1431,6 +1467,22 @@ } } } +template (value) RAB_SetupOrModifiedList ts_RAB_SMdL_no_tla(template (value) RAB_ID rab_id) := { { + { + id := id_RAB_SetupOrModifiedItem, + criticality := ignore, + value_ := { + rAB_SetupOrModifiedItem := { + rAB_ID := rab_id, + transportLayerAddress := omit, + iuTransportAssociation := omit, + dl_dataVolumes := omit, + iE_Extensions := omit + } + } + } +} } + template (value) RAB_SetupOrModifiedList ts_RAB_SMdL_ps(template (value) RAB_ID rab_id, template (value) TransportLayerAddress tla, template (value) GTP_TEI gtp_tei) := { { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?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: Iadaba0e5e82ad6d163ad509904ede213e2462d5c Gerrit-Change-Number: 34973 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: logging: ensure ANSI color escape is sent in same line/before newline
by laforge 07 Nov '23

07 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34975?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 --- M src/core/logging.c M tests/loggingrb/logging_test.err 2 files changed, 24 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified 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 @@ -[1;31mYou should see this -[0;m[1;32mYou should see this -[0;m \ No newline at end of file +[1;31mYou should see this[0;m +[1;32mYou should see this[0;m -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34975?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433 Gerrit-Change-Number: 34975 Gerrit-PatchSet: 5 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log