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

[S] Change in libosmocore[master]: vty/test: Validate optional-multi-choice param followed by optional-m...
by fixeria 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, neels, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41705?usp=email ) Change subject: vty/test: Validate optional-multi-choice param followed by optional-multi-choice param ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41705?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4517437c19190200181fecb9bbaf075b507ad7f3 Gerrit-Change-Number: 41705 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 12:46:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: vty/test: Validate optional-multi-choice param followed by optional-m...
by laforge 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, fixeria, neels, osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41705?usp=email ) Change subject: vty/test: Validate optional-multi-choice param followed by optional-multi-choice param ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41705?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4517437c19190200181fecb9bbaf075b507ad7f3 Gerrit-Change-Number: 41705 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 12:45:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: vty: assert in optional param followed by optional-multi-choice param...
by pespin 18 Dec '25

18 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41704?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Fix [2/2] ...................................................................... vty: assert in optional param followed by optional-multi-choice param: Fix [2/2] in cmd_make_descr, cp during the asserting iteration looks like this: (gdb) print cp $18 = 0x555555c1939d ") [(one|two|three)" As a result, first multiple is set to 0 and later on logic was missing for this specific case. Change-Id: I4c184db53bec28ab42bcd45e033733d850eea5d2 Fixes: b55f4d2df21b966c3953264d8961f259814f4650 Related: OS#6360 --- M src/vty/command.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/vty/command.c b/src/vty/command.c index 8594290..c1bda8a 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -443,6 +443,12 @@ while (isspace((int)*cp) && *cp != '\0') cp++; + /* Explicitly detect optional multi-choice braces like [(one|two)]. */ + if (cp[0] == '[' && cp[1] == '(') { + optional_brace = 1; + cp++; + } + if (*cp == '(') { multiple = 1; cp++; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41704?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4c184db53bec28ab42bcd45e033733d850eea5d2 Gerrit-Change-Number: 41704 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: vty: assert in optional param followed by optional-multi-choice param...
by pespin 18 Dec '25

18 Dec '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] ...................................................................... vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] The test added below makes cmd_make_descvec() assert in "OSMO_ASSERT(multiple);" line, so it's expected to fail during CI. Follow-up patch provides a fixes for it. Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Related: b55f4d2df21b966c3953264d8961f259814f4650 Related: OS#6360 --- M tests/vty/vty_transcript_test.c M tests/vty/vty_transcript_test.vty 2 files changed, 37 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/tests/vty/vty_transcript_test.c b/tests/vty/vty_transcript_test.c index 5602c50..5f8157a 100644 --- a/tests/vty/vty_transcript_test.c +++ b/tests/vty/vty_transcript_test.c @@ -207,6 +207,17 @@ return CMD_SUCCESS; } +DEFUN(multi3, multi3_cmd, + "multi3 (foo|bar) [(one|two|three)]", + "multi3 test command\n" "foo\nbar\n" "1\n2\n3\n") +{ + OSMO_ASSERT(argc > 0); + vty_out(vty, "ok argc=%d %s%s%s%s", argc, argv[0], + argc > 1 ? " " : "", argc > 1 ? argv[1] : "", + VTY_NEWLINE); + return CMD_SUCCESS; +} + #define X(f) (1 << f) enum { @@ -380,6 +391,7 @@ install_element_ve(&multi0_cmd); install_element_ve(&multi1_cmd); install_element_ve(&multi2_cmd); + install_element_ve(&multi3_cmd); install_element(CONFIG_NODE, &cfg_attr_test_cmd); install_node(&attr_test_node, NULL); diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index 7df2a60..a1c044a 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -3,6 +3,7 @@ multi0 (one|two|three) multi1 ([one]|[two]|[three]) multi2 [(one|two|three)] + multi3 (foo|bar) [(one|two|three)] vty_transcript_test> multi0 ? one 1 @@ -67,6 +68,27 @@ vty_transcript_test> multi2 ok argc=0 +vty_transcript_test> multi3 ? + foo foo + bar bar + +vty_transcript_test> multi3 foo ? + [one] 1 + [two] 2 + [three] 3 + +vty_transcript_test> multi3 foo +ok argc=1 foo + +vty_transcript_test> multi3 bar +ok argc=1 bar + +vty_transcript_test> multi3 foo one +ok argc=2 foo one + +vty_transcript_test> multi3 bar three +ok argc=2 bar three + vty_transcript_test> multi0 thr ok argc=1 three @@ -76,6 +98,9 @@ vty_transcript_test> multi2 t % Ambiguous command. +vty_transcript_test> multi3 foo t +% Ambiguous command. + vty_transcript_test> single0 one ok argc=1 one -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Gerrit-Change-Number: 35961 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: vty: assert in optional param followed by optional-multi-choice param...
by pespin 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, fixeria, neels. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: deleteVote Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Gerrit-Change-Number: 35961 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: vty: assert in optional param followed by optional-multi-choice param...
by pespin 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, fixeria, neels. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] ...................................................................... Patch Set 5: Code-Review+2 Verified+1 (1 comment) Patchset: PS5: I'm removing the jenkins -1 since I'm merging this together with the fix and they are properly named to show they go together. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Gerrit-Change-Number: 35961 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 12:43:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: vty: assert in optional param followed by optional-multi-choice param...
by pespin 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41704?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Fix [2/2] ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41704?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4c184db53bec28ab42bcd45e033733d850eea5d2 Gerrit-Change-Number: 41704 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 12:42:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: vty/test: Validate optional-multi-choice param followed by optional-m...
by pespin 18 Dec '25

18 Dec '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41705?usp=email ) Change subject: vty/test: Validate optional-multi-choice param followed by optional-multi-choice param ...................................................................... vty/test: Validate optional-multi-choice param followed by optional-multi-choice param Change-Id: I4517437c19190200181fecb9bbaf075b507ad7f3 --- M tests/vty/vty_transcript_test.c M tests/vty/vty_transcript_test.vty 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/41705/1 diff --git a/tests/vty/vty_transcript_test.c b/tests/vty/vty_transcript_test.c index 5f8157a..ac5bb75 100644 --- a/tests/vty/vty_transcript_test.c +++ b/tests/vty/vty_transcript_test.c @@ -218,6 +218,17 @@ return CMD_SUCCESS; } +DEFUN(multi4, multi4_cmd, + "multi4 [(foo|bar)] [(one|two|three)]", + "multi4 test command\n" "foo\nbar\n" "1\n2\n3\n") +{ + vty_out(vty, "ok argc=%d%s%s%s%s%s", argc, + argc > 0 ? " " : "", argc > 0 ? argv[0] : "", + argc > 1 ? " " : "", argc > 1 ? argv[1] : "", + VTY_NEWLINE); + return CMD_SUCCESS; +} + #define X(f) (1 << f) enum { @@ -392,6 +403,7 @@ install_element_ve(&multi1_cmd); install_element_ve(&multi2_cmd); install_element_ve(&multi3_cmd); + install_element_ve(&multi4_cmd); install_element(CONFIG_NODE, &cfg_attr_test_cmd); install_node(&attr_test_node, NULL); diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index a1c044a..938c949 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -4,6 +4,7 @@ multi1 ([one]|[two]|[three]) multi2 [(one|two|three)] multi3 (foo|bar) [(one|two|three)] + multi4 [(foo|bar)] [(one|two|three)] vty_transcript_test> multi0 ? one 1 @@ -89,6 +90,27 @@ vty_transcript_test> multi3 bar three ok argc=2 bar three +vty_transcript_test> multi4 ? + [foo] foo + [bar] bar + +vty_transcript_test> multi4 foo ? + [one] 1 + [two] 2 + [three] 3 + +vty_transcript_test> multi4 foo +ok argc=1 foo + +vty_transcript_test> multi4 bar +ok argc=1 bar + +vty_transcript_test> multi4 foo one +ok argc=2 foo one + +vty_transcript_test> multi3 bar three +ok argc=2 bar three + vty_transcript_test> multi0 thr ok argc=1 three @@ -101,6 +123,9 @@ vty_transcript_test> multi3 foo t % Ambiguous command. +vty_transcript_test> multi4 foo t +% Ambiguous command. + vty_transcript_test> single0 one ok argc=1 one -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41705?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4517437c19190200181fecb9bbaf075b507ad7f3 Gerrit-Change-Number: 41705 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: vty: assert in optional param followed by optional-multi-choice param...
by osmith 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, fixeria, neels, pespin. osmith has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email ) Change subject: vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Gerrit-Change-Number: 35961 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 18 Dec 2025 12:36:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[master]: vty: assert in optional param followed by optional-multi-choice param...
by pespin 18 Dec '25

18 Dec '25

Attention is currently required from: falconia, neels, osmith, pespin. pespin has uploaded a new patch set (#5) to the change originally created by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified-1 by Jenkins Builder Change subject: vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] ...................................................................... vty: assert in optional param followed by optional-multi-choice param: Reproduce [1/2] The test added below makes cmd_make_descvec() assert in "OSMO_ASSERT(multiple);" line, so it's expected to fail during CI. Follow-up patch provides a fixes for it. Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Related: b55f4d2df21b966c3953264d8961f259814f4650 Related: OS#6360 --- M tests/vty/vty_transcript_test.c M tests/vty/vty_transcript_test.vty 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/35961/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35961?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ad93a304ce498ba9d57fc7e2fd238e6c16e29e0 Gerrit-Change-Number: 35961 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0