June 2023 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-sccp[master]: vty: Improve output of show cs7 instance <0-15> asp
by pespin 27 Jun '23

27 Jun '23

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33518 to look at the new patch set (#2). Change subject: vty: Improve output of show cs7 instance <0-15> asp ...................................................................... vty: Improve output of show cs7 instance <0-15> asp Related: SYS#6488 Change-Id: Id22bd4e74fb6f79950adba58862d379203d36760 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 58 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/18/33518/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id22bd4e74fb6f79950adba58862d379203d36760 Gerrit-Change-Number: 33518 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-sccp[master]: vty: Improve output of show cs7 instance <0-15> asp
by pespin 27 Jun '23

27 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33518 ) Change subject: vty: Improve output of show cs7 instance <0-15> asp ...................................................................... vty: Improve output of show cs7 instance <0-15> asp Related: SYS#6488 Change-Id: Id22bd4e74fb6f79950adba58862d379203d36760 --- M src/osmo_ss7_vty.c 1 file changed, 39 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/18/33518/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index ebec5f6..192fba6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -790,6 +790,24 @@ return CMD_SUCCESS; } +static char *as_list_for_asp(const struct osmo_ss7_asp *asp, char *buf, size_t buf_len) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + const struct osmo_ss7_as *as; + unsigned int count = 0; + llist_for_each_entry(as, &asp->inst->as_list, list) { + if (!osmo_ss7_as_has_asp(as, asp)) + continue; + OSMO_STRBUF_PRINTF(sb, "%s%s", count != 0 ? "," : "", as->cfg.name); + count++; + break; + } + + if (count == 0) + OSMO_STRBUF_PRINTF(sb, "?"); + return buf; +} + DEFUN(show_cs7_asp, show_cs7_asp_cmd, "show cs7 instance <0-15> asp", SHOW_STR CS7_STR INST_STR INST_STR "Application Server Process (ASP)\n") @@ -797,6 +815,7 @@ struct osmo_ss7_instance *inst; struct osmo_ss7_asp *asp; char buf[512]; + char as_buf[64]; int id = atoi(argv[0]); inst = osmo_ss7_instance_find(id); @@ -805,9 +824,9 @@ return CMD_WARNING; } - vty_out(vty, " Effect Primary%s", VTY_NEWLINE); - vty_out(vty, "ASP Name AS Name State Type Remote IP Addr:Rmt Port SCTP%s", VTY_NEWLINE); - vty_out(vty, "------------ ------------ ------------- ---- ----------------------- ----------%s", VTY_NEWLINE); + vty_out(vty, " Effect Primary%s", VTY_NEWLINE); + vty_out(vty, "ASP Name AS Name State Type Role Remote IP Addr:Rmt Port SCTP Role%s", VTY_NEWLINE); + vty_out(vty, "------------ ------------ ------------- ---- ---- ----------------------- ---------%s", VTY_NEWLINE); llist_for_each_entry(asp, &inst->asp_list, list) { if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA && asp->cfg.remote.port == 0 && asp->server) { @@ -819,11 +838,15 @@ snprintf(buf, sizeof(buf), "%s:%s", hostbuf, portbuf); } else osmo_ss7_asp_peer_snprintf(buf, sizeof(buf), &asp->cfg.remote); - vty_out(vty, "%-12s %-12s %-13s %-4s %-14s %-10s%s", - asp->cfg.name, "?", + vty_out(vty, "%-12s %-12s %-13s %-4s %-4s %-23s %-9s%s", + asp->cfg.name, + as_list_for_asp(asp, as_buf, sizeof(as_buf)), asp->fi? osmo_fsm_inst_state_name(asp->fi) : "uninitialized", get_value_string(osmo_ss7_asp_protocol_vals, asp->cfg.proto), - buf, "", VTY_NEWLINE); + osmo_str_tolower(get_value_string(osmo_ss7_asp_role_names, asp->cfg.role)), + buf, + asp->cfg.is_server ? "server" : "client", + VTY_NEWLINE); } return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id22bd4e74fb6f79950adba58862d379203d36760 Gerrit-Change-Number: 33518 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: net/templates/run: let user confirm close of tmux
by osmith 27 Jun '23

27 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/33517 ) Change subject: net/templates/run: let user confirm close of tmux ...................................................................... net/templates/run: let user confirm close of tmux Don't immediately close tmux on exit. Without this patch the error messages printed in error code paths are not visible to the user. Change-Id: I4a98e7eb7691b7b954ee7edd4ed488ae3c1dd835 --- M net/templates/run.sh 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/17/33517/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index d4edbaa..e9f10de 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -8,6 +8,15 @@ exec tmux new-session -s "$tmux_session" -n "RUN" "$0" "inside-tmux" fi +exit_confirm() { + trap - EXIT INT TERM 0 + if [ "${TERMINAL}" = "tmux" ]; then + echo "Hit enter to close tmux" + read enter_to_continue + fi +} +trap exit_confirm EXIT INT TERM 0 + if ! ../fill_config.py --check-stale; then echo echo "WARNING: STALE CONFIGS - your net configs are older than the templates they should be based on!" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/33517 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I4a98e7eb7691b7b954ee7edd4ed488ae3c1dd835 Gerrit-Change-Number: 33517 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: ECU in UL path: move it from trx model to l1sap
by pespin 27 Jun '23

27 Jun '23

Attention is currently required from: falconia, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33471 ) Change subject: ECU in UL path: move it from trx model to l1sap ...................................................................... Patch Set 1: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/33471/comment/4fbfd81a_57076fe8 PS1, Line 1901: if (lchan->ecu_state) > FACCH is handled separately by `l1sap_ph_data_ind()`, so this condition makes no sense here. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iac577975c9ab50cb8ebbc035c661c1880e7cecec Gerrit-Change-Number: 33471 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Jun 2023 10:14:29 +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

1 0

[M] Change in osmo-bts[master]: ECU in UL path: move it from trx model to l1sap
by pespin 27 Jun '23

27 Jun '23

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33471 ) Change subject: ECU in UL path: move it from trx model to l1sap ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iac577975c9ab50cb8ebbc035c661c1880e7cecec Gerrit-Change-Number: 33471 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Tue, 27 Jun 2023 10:14:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: ECU in UL path: move it from trx model to l1sap
by fixeria 27 Jun '23

27 Jun '23

Attention is currently required from: falconia, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33471 ) Change subject: ECU in UL path: move it from trx model to l1sap ...................................................................... Patch Set 1: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/33471/comment/ccfdfacb_1237c3cd PS1, Line 1901: if (lchan->ecu_state) > before there was an extra condition here: rc != GSM_MACBLOCK_LEN […] FACCH is handled separately by `l1sap_ph_data_ind()`, so this condition makes no sense here. Only speech frames are expected in this function. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iac577975c9ab50cb8ebbc035c661c1880e7cecec Gerrit-Change-Number: 33471 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Jun 2023 10:11:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: ECU in UL path: move state alloc/free to l1sap
by pespin 27 Jun '23

27 Jun '23

Attention is currently required from: falconia, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33470 ) Change subject: ECU in UL path: move state alloc/free to l1sap ...................................................................... Patch Set 1: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/33470/comment/e1f2aafe_da9616e7 PS1, Line 2214: lchan->ecu_state = osmo_ecu_init(trx, lchan2ecu_codec(lchan)); > > (is the lchan allocated using talloc? in osmo-bts?) […] ACK thanks. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic98a2eb26b5a99bc4a89ad07ae87c9a86b921418 Gerrit-Change-Number: 33470 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Jun 2023 10:07:02 +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

1 0

[M] Change in osmo-bts[master]: ECU in UL path: move it from trx model to l1sap
by pespin 27 Jun '23

27 Jun '23

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33471 ) Change subject: ECU in UL path: move it from trx model to l1sap ...................................................................... Patch Set 1: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/33471/comment/b003c3db_d20aa72c PS1, Line 1901: if (lchan->ecu_state) before there was an extra condition here: rc != GSM_MACBLOCK_LEN Now it seems to be the opposite? if (msg->len ... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iac577975c9ab50cb8ebbc035c661c1880e7cecec Gerrit-Change-Number: 33471 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Tue, 27 Jun 2023 10:05:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-msc[master]: CC: don't start guard timer on mid-call MNCC messages
by osmith 27 Jun '23

27 Jun '23

Attention is currently required from: falconia, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33472 ) Change subject: CC: don't start guard timer on mid-call MNCC messages ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Sorry for the breakage, it's very likely that this comes from my patches. […] I can't reproduce it. Just tested osmo-msc master (+ master of all other repos) with a real BTS, connected two MS and calls and SMS work as expected. Also the same ttcn3 tests are passing as before my large patchset was merged. Please create an issue with details and link it here. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibe2dd53f8e9e06d175b64df67d2a2e3e2d4155aa Gerrit-Change-Number: 33472 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Jun 2023 10:02:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: ECU in UL path: move state alloc/free to l1sap
by fixeria 27 Jun '23

27 Jun '23

Attention is currently required from: falconia, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33470 ) Change subject: ECU in UL path: move state alloc/free to l1sap ...................................................................... Patch Set 1: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/33470/comment/85dda42d_463aff8b PS1, Line 2214: lchan->ecu_state = osmo_ecu_init(trx, lchan2ecu_codec(lchan)); > (is the lchan allocated using talloc? in osmo-bts?) No, the closest talloc-allocated object in the hierarchy is `trx`. Each `struct gsm_bts_trx` has a static array of `struct gsm_bts_trx_ts`, and each `struct gsm_bts_trx_ts` in its turn has a static array of lchans. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic98a2eb26b5a99bc4a89ad07ae87c9a86b921418 Gerrit-Change-Number: 33470 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Jun 2023 09:52:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0