- gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: osmo_git_clone_url: git.osmocom.org -> gitea
by osmith 27 Sep '22

27 Sep '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29485 ) Change subject: osmo_git_clone_url: git.osmocom.org -> gitea ...................................................................... osmo_git_clone_url: git.osmocom.org -> gitea Update the function to not use legacy URLs anymore and allow adding future gitea URLs more easily. Update the description of the function to reflect the new motivation for using this. Change-Id: Ibf53ca2c444fae82af73e417410faa5b16f5de59 --- M scripts/common.sh 1 file changed, 10 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/common.sh b/scripts/common.sh index 23a3380..6d93cc8 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -1,7 +1,7 @@ #!/bin/sh # Various functions and variables used in multiple osmo-ci shell scripts OSMO_CI_DIR="$(realpath "$(dirname "$0")/..")" -OSMO_GIT_URL="https://git.osmocom.org" +OSMO_GIT_URL_GITEA="https://gitea.osmocom.org" OSMO_GIT_URL_GERRIT="https://gerrit.osmocom.org" # Osmocom repositories of which we want to build release tarballs automatically, and list the current versions at @@ -120,13 +120,18 @@ fi } -# Print git clone URL for an Osmocom git repository. Prefer the gerrit clone URL, because cloning from the regular URL -# sometimes results in the "garbage at end of loose object" error (OS#4083). +# Echo git clone URL for an Osmocom git repository. For projects developed on +# gerrit, use the gerrit URL to avoid the mirror sync delay, for other +# repositories use the gitea URL. +# https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure # $1: Osmocom project (e.g. "osmo-hlr") osmo_git_clone_url() { case "$1" in - rtl-sdr|osmo-fl2k|libosmo-dsp|libgtpnl|libasn1c|libusrp|libsmpp34) - echo "$OSMO_GIT_URL"/"$1" + libgtpnl|libasn1c|libsmpp34) + echo "$OSMO_GIT_URL_GITEA"/cellular-infrastructure/"$1" + ;; + rtl-sdr|osmo-fl2k|libosmo-dsp|libusrp) + echo "$OSMO_GIT_URL_GITEA"/sdr/"$1" ;; *) echo "$OSMO_GIT_URL_GERRIT"/"$1" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibf53ca2c444fae82af73e417410faa5b16f5de59 Gerrit-Change-Number: 29485 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(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-MessageType: merged

1 0

Change in osmo-ci[master]: coverity: use osmo_git_clone_url
by osmith 27 Sep '22

27 Sep '22

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29487 ) Change subject: coverity: use osmo_git_clone_url ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29487 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I17590d0b0b46274e2ceb007e20d7d1dc039f4e8d Gerrit-Change-Number: 29487 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 12:06:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: cosmetic: osmux: Drop extra empty line
by pespin 27 Sep '22

27 Sep '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29491 ) Change subject: cosmetic: osmux: Drop extra empty line ...................................................................... cosmetic: osmux: Drop extra empty line Change-Id: I679a62c49290dfeb9e2c63890daa67002bfe3339 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index ab49cd5..706de07 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -583,7 +583,6 @@ * \param[in] conn connection to disable */ void conn_osmux_disable(struct mgcp_conn_rtp *conn) { - OSMO_ASSERT(conn->osmux.state != OSMUX_STATE_DISABLED); LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I679a62c49290dfeb9e2c63890daa67002bfe3339 Gerrit-Change-Number: 29491 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-mgw[master]: osmux: Allocate rate counters during initialization of osmux conn
by pespin 27 Sep '22

27 Sep '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29490 ) Change subject: osmux: Allocate rate counters during initialization of osmux conn ...................................................................... osmux: Allocate rate counters during initialization of osmux conn Let's not delay allocation of rate counters until the osmux conn is fully enabled, since we may want to count stuff before that point in time. Fixes crash accessing null conn->osmux.ctrg in MGCP_Test.TC_two_crcx_and_rtp_osmux_bidir. Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 --- M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c 3 files changed, 19 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index 58d9095..1da7c8b 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -14,6 +14,7 @@ struct mgcp_conn_rtp; int osmux_init(int role, struct mgcp_trunk *trunk); +int osmux_init_conn(struct mgcp_conn_rtp *conn); int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, const struct osmo_sockaddr *addr); void conn_osmux_disable(struct mgcp_conn_rtp *conn); diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 1f21888..ab49cd5 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -500,6 +500,19 @@ return 0; } +/*! Initialize Osmux bits of a conn. + * \param[in] conn Osmux connection to initialize + * \returns 0 on success, negative on ERROR */ +int osmux_init_conn(struct mgcp_conn_rtp *conn) +{ + if (conn_osmux_allocate_local_cid(conn) == -1) + return -1; + conn->osmux.ctrg = rate_ctr_group_alloc(conn->conn, &rate_ctr_group_osmux_desc, conn->ctrg->idx); + + conn->osmux.state = OSMUX_STATE_ACTIVATING; + return 0; +} + /*! enable OSXMUX circuit for a specified connection. * \param[in] endp mgcp endpoint (configuration) * \param[in] conn connection to disable @@ -561,8 +574,6 @@ osmux_xfrm_output_set_tx_cb(conn->osmux.out, scheduled_from_osmux_tx_rtp_cb, conn); - conn->osmux.ctrg = rate_ctr_group_alloc(conn->conn, &rate_ctr_group_osmux_desc, conn->ctrg->idx); - conn->osmux.state = OSMUX_STATE_ENABLED; return 0; @@ -591,11 +602,12 @@ osmux_handle_put(conn->osmux.in); conn->osmux.remote_cid = 0; conn->osmux.remote_cid_present = false; - - rate_ctr_group_free(conn->osmux.ctrg); - conn->osmux.ctrg = NULL; } + conn_osmux_release_local_cid(conn); + + rate_ctr_group_free(conn->osmux.ctrg); + conn->osmux.ctrg = NULL; } /*! relase OSXMUX cid, that had been allocated to this connection. diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index e748c5b..711ca31 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1003,8 +1003,7 @@ conn->osmux.state = OSMUX_STATE_DISABLED; /* If X-Osmux (remote CID) was received (-1 is wilcard), alloc next avail CID as local CID */ if (remote_osmux_cid >= -1) { - conn->osmux.state = OSMUX_STATE_ACTIVATING; - if (conn_osmux_allocate_local_cid(conn) == -1) { + if (osmux_init_conn(conn) < 0) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_NO_OSMUX)); goto error2; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 Gerrit-Change-Number: 29490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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-MessageType: merged

1 0

Change in osmo-mgw[master]: osmux: Allocate rate counters during initialization of osmux conn
by pespin 27 Sep '22

27 Sep '22

Attention is currently required from: osmith, neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29490 ) Change subject: osmux: Allocate rate counters during initialization of osmux conn ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File src/libosmo-mgcp/mgcp_osmux.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29490/comment/7fbb516d_700a9700 PS1, Line 503: an conn > ("a conn") […] Ack https://gerrit.osmocom.org/c/osmo-mgw/+/29490/comment/4db6502c_9885877a PS1, Line 508: conn_osmux_allocate_local_cid > commit log says nothing about allocating the cid earlier. […] It's not being allocated earlier, the code is moved inside this function and it's called at the same code path as below. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 Gerrit-Change-Number: 29490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 12:05:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: osmo_git_clone_url: git.osmocom.org -> gitea
by pespin 27 Sep '22

27 Sep '22

Attention is currently required from: osmith, neels, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29485 ) Change subject: osmo_git_clone_url: git.osmocom.org -> gitea ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibf53ca2c444fae82af73e417410faa5b16f5de59 Gerrit-Change-Number: 29485 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 12:05:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: Allocate rate counters during initialization of osmux conn
by fixeria 27 Sep '22

27 Sep '22

Attention is currently required from: osmith, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29490 ) Change subject: osmux: Allocate rate counters during initialization of osmux conn ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/libosmo-mgcp/mgcp_osmux.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29490/comment/61cd3b02_34f99c2f PS1, Line 503: an conn > ("a conn") […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 Gerrit-Change-Number: 29490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 12:00:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: Allocate rate counters during initialization of osmux conn
by pespin 27 Sep '22

27 Sep '22

Attention is currently required from: osmith, pespin, fixeria. Hello osmith, Jenkins Builder, neels, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29490 to look at the new patch set (#2). Change subject: osmux: Allocate rate counters during initialization of osmux conn ...................................................................... osmux: Allocate rate counters during initialization of osmux conn Let's not delay allocation of rate counters until the osmux conn is fully enabled, since we may want to count stuff before that point in time. Fixes crash accessing null conn->osmux.ctrg in MGCP_Test.TC_two_crcx_and_rtp_osmux_bidir. Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 --- M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c 3 files changed, 19 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/90/29490/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 Gerrit-Change-Number: 29490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-mgw[master]: cosmetic: osmux: Drop extra empty line
by neels 27 Sep '22

27 Sep '22

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29491 ) Change subject: cosmetic: osmux: Drop extra empty line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29491 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I679a62c49290dfeb9e2c63890daa67002bfe3339 Gerrit-Change-Number: 29491 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 11:20:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: osmux: Allocate rate counters during initialization of osmux conn
by neels 27 Sep '22

27 Sep '22

Attention is currently required from: osmith, pespin, fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29490 ) Change subject: osmux: Allocate rate counters during initialization of osmux conn ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File src/libosmo-mgcp/mgcp_osmux.c: https://gerrit.osmocom.org/c/osmo-mgw/+/29490/comment/f2021c4a_aa05101f PS1, Line 503: an conn ("a conn") because of AUTOBRIEF, end the summary with a '.' https://gerrit.osmocom.org/c/osmo-mgw/+/29490/comment/25a27178_30f93be8 PS1, Line 508: conn_osmux_allocate_local_cid commit log says nothing about allocating the cid earlier. seems to be orthogonal to ctrg change? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic31d3567f4d24e628f8983d8362e5c7c2f66ec02 Gerrit-Change-Number: 29490 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 11:19:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log