- gerrit-log - lists.osmocom.org

Change in libosmocore[master]: logging: fix coding style issues in _output_buf()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27011 ) Change subject: logging: fix coding style issues in _output_buf() ...................................................................... logging: fix coding style issues in _output_buf() Change-Id: Ia794dbf51045361ee40815f708344c88abe87a96 --- M src/logging.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/27011/1 diff --git a/src/logging.c b/src/logging.c index 148bb27..5336e53 100644 --- a/src/logging.c +++ b/src/logging.c @@ -580,19 +580,19 @@ * message in '\n'. If so, nip the last '\n' away, insert the source file info and re-append an * '\n'. All this to allow LOGP("start..."); LOGPC("...end\n") constructs. */ if (target->print_filename_pos == LOG_FILENAME_POS_LINE_END - && offset > 0 && buf[offset-1] == '\n') { + && offset > 0 && buf[offset - 1] == '\n') { switch (target->print_filename2) { case LOG_FILENAME_NONE: break; case LOG_FILENAME_PATH: - offset --; + offset--; ret = snprintf(buf + offset, rem, " (%s:%d)\n", file, line); if (ret < 0) goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); break; case LOG_FILENAME_BASENAME: - offset --; + offset--; ret = snprintf(buf + offset, rem, " (%s:%d)\n", const_basename(file), line); if (ret < 0) goto err; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia794dbf51045361ee40815f708344c88abe87a96 Gerrit-Change-Number: 27011 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: tests/logging: ensure both stream and wqueue modes are tested

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27009 ) Change subject: tests/logging: ensure both stream and wqueue modes are tested ...................................................................... tests/logging: ensure both stream and wqueue modes are tested Change-Id: I37e789b5b287d72c443f50fd99a5284bc7296c0b --- M tests/logging/logging_test.c R tests/logging/logging_test_stream.err C tests/logging/logging_test_wqueue.err M tests/testsuite.at 4 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/27009/1 diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index ac6fc52..12a7374 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -78,6 +78,11 @@ log_set_print_category(stderr_target, 1); log_set_use_color(stderr_target, 0); + if (argc > 1 && !strcmp(argv[1], "wqueue")) + log_target_file_switch_to_wqueue(stderr_target); + else + log_target_file_switch_to_stream(stderr_target); + log_parse_category_mask(stderr_target, "DRLL:DCC"); log_parse_category_mask(stderr_target, "DRLL"); diff --git a/tests/logging/logging_test.err b/tests/logging/logging_test_stream.err similarity index 100% rename from tests/logging/logging_test.err rename to tests/logging/logging_test_stream.err diff --git a/tests/logging/logging_test.err b/tests/logging/logging_test_wqueue.err similarity index 100% copy from tests/logging/logging_test.err copy to tests/logging/logging_test_wqueue.err diff --git a/tests/testsuite.at b/tests/testsuite.at index 882203e..5da08e5 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -168,11 +168,18 @@ AT_CHECK([$abs_top_builddir/tests/gprs/gprs_test], [0], [expout], [ignore]) AT_CLEANUP -AT_SETUP([logging]) -AT_KEYWORDS([logging]) +AT_SETUP([logging_stream]) +AT_KEYWORDS([logging_stream]) cat $abs_srcdir/logging/logging_test.ok > expout -cat $abs_srcdir/logging/logging_test.err > experr -AT_CHECK([$abs_top_builddir/tests/logging/logging_test], [0], [expout], [experr]) +cat $abs_srcdir/logging/logging_test_stream.err > experr +AT_CHECK([$abs_top_builddir/tests/logging/logging_test stream], [0], [expout], [experr]) +AT_CLEANUP + +AT_SETUP([logging_wqueue]) +AT_KEYWORDS([logging_wqueue]) +cat $abs_srcdir/logging/logging_test.ok > expout +cat $abs_srcdir/logging/logging_test_wqueue.err > experr +AT_CHECK([$abs_top_builddir/tests/logging/logging_test wqueue], [0], [expout], [experr]) AT_CLEANUP AT_SETUP([codec]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I37e789b5b287d72c443f50fd99a5284bc7296c0b Gerrit-Change-Number: 27009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27008 ) Change subject: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax ...................................................................... ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax On some systems /bin/sh is a symbolic link to bash, so everything works fine. On systems where /bin/sh is a real sh, copy fails: cp: cannot access 'open5gs-{smf,upf,nrf}.yaml': No such file or directory Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Related: SYS#5602 --- M ttcn3-pgw-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 0f6ee5d..662e49b 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -15,7 +15,7 @@ mkdir $VOL_BASE_DIR/pgw cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/ -cp open5gs-{smf,upf,nrf}.yaml $VOL_BASE_DIR/pgw/ +cp open5gs-*.yaml $VOL_BASE_DIR/pgw/ SUBNET=18 network_create $SUBNET -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Gerrit-Change-Number: 27008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27008 ) Change subject: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Gerrit-Change-Number: 27008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jan 2022 12:56:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27008 ) Change subject: ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax ...................................................................... ttcn3-pgw-test: fix jenkins.sh: do not use bash specific syntax On some systems /bin/sh is a symbolic link to bash, so everything works fine. On systems where /bin/sh is a real sh, copy fails: cp: cannot access 'open5gs-{smf,upf,nrf}.yaml': No such file or directory Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Related: SYS#5602 --- M ttcn3-pgw-test/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/08/27008/1 diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 0f6ee5d..662e49b 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -15,7 +15,7 @@ mkdir $VOL_BASE_DIR/pgw cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/ -cp open5gs-{smf,upf,nrf}.yaml $VOL_BASE_DIR/pgw/ +cp open5gs-*.yaml $VOL_BASE_DIR/pgw/ SUBNET=18 network_create $SUBNET -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I64e9ddefdb6deb21b3bce3bc1af875a92919e6c9 Gerrit-Change-Number: 27008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test-sccplite: set OSMO_SUT_{HOST,PORT}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27007 ) Change subject: ttcn3-bsc-test-sccplite: set OSMO_SUT_{HOST,PORT} ...................................................................... ttcn3-bsc-test-sccplite: set OSMO_SUT_{HOST,PORT} This enables the test suite to obtain talloc reports between the test case executions, which get stored together with the PCAP files. Change-Id: I4e5474e8fc51d2ba8a0baca68e11df1346d7d4ab --- M ttcn3-bsc-test/jenkins-sccplite.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/07/27007/1 diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 7565a8d..0a3c073 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -48,6 +48,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4242" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4e5474e8fc51d2ba8a0baca68e11df1346d7d4ab Gerrit-Change-Number: 27007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test-vamos: set OSMO_SUT_{HOST,PORT}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27006 ) Change subject: ttcn3-bsc-test-vamos: set OSMO_SUT_{HOST,PORT} ...................................................................... ttcn3-bsc-test-vamos: set OSMO_SUT_{HOST,PORT} This enables the test suite to obtain talloc reports between the test case executions, which get stored together with the PCAP files. Change-Id: Ia9525778fcecc60177be651624e2b2cf9bc75422 --- M ttcn3-bsc-test-vamos/jenkins.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/06/27006/1 diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index e8ec34d..f37711f 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -62,6 +62,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4242" \ -v $VOL_BASE_DIR/bsc-tester:/data \ --name ${BUILD_TAG}-ttcn3-bsc-test \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia9525778fcecc60177be651624e2b2cf9bc75422 Gerrit-Change-Number: 27006 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_ran: add decoder for RAN/RNC originated messages

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26955 ) Change subject: ranap_common_ran: add decoder for RAN/RNC originated messages ...................................................................... Patch Set 5: (6 comments) Patchset: PS5: Mostly cosmetic notes, not a merge blocker. File include/osmocom/ranap/ranap_common.h: https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/27b84377_1802f520 PS5, Line 599: funktions Tippfehler: functions File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/7030b23e_7396dc5d PS5, Line 90: unsuccessfulOutcome successfulOutcome? I think it's not critical, given that 'procedureCode' is present in all union members at the same position. But still may be confusing. https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/da00cf9b_8956d22e PS5, Line 102: unsuccessfulOutcome outcome? I think it's not critical, given that 'procedureCode' is present in all union members at the same position. But still may be confusing. https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/2ef5a507_79f42b5f PS5, Line 124: unsuccessful copy-paste: successful https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/0b68a617_a523c973 PS5, Line 132: unsuccessful Neither unsuccessful not successful, so this word should be removed. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98 Gerrit-Change-Number: 26955 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jan 2022 10:16:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_cn: add functions for direct access to decoder

by fixeria

Attention is currently required from: neels, daniel, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/27002 ) Change subject: ranap_common_cn: add functions for direct access to decoder ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/27002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I14d2ed8e597a5d12024a6a6c72ff011dbeb2549d Gerrit-Change-Number: 27002 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 29 Jan 2022 09:50:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: gsm_7bit_encode_n(): use regular malloc() instead of calloc()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22543 ) Change subject: gsm_7bit_encode_n(): use regular malloc() instead of calloc() ...................................................................... Patch Set 2: (1 comment) File src/gsm/gsm_utils.c: https://gerrit.osmocom.org/c/libosmocore/+/22543/comment/dd46e343_896a80a9 PS1, Line 332: uint8_t *data = malloc(septet_len + 1); > I was thinking about alloca() too, we already use it in src/conv.c. […] I suggest to stay with the heap allocation for now. alloca() is nice, but it's a more radical change compared to calloc() -> malloc(). I am not confident enough that using the stack here is does not introduce non-obvious pitfalls. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6956cbd83b2999dbcf8e2d210134b0a166c33efb Gerrit-Change-Number: 22543 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jan 2022 20:12:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log